From 1d4b1f0a21c7405889d82d60ab0f7a6b3d1e3ed9 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 9 Mar 2018 09:11:29 -0800
Subject: [PATCH 001/143] Have Git ignore local versions of modules

When installing modules as part of local development, Composer
adds the files for those modules. This commit updates .gitignore
to exclude those files from the repository so we can manage those
changes more efficiently.
---
 .gitignore | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5719176..6f7029b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,9 +16,16 @@ core
 # Core's dependencies are managed with Composer.
 vendor
 
+# Ignore local versions of modules.
+modules/contrib/*
+
+# Ignore local database dumps.
+db_dumps
+
 # Ignore configuration files that may contain sensitive information.
-sites/*/settings*.php
+sites/*/*settings*.php*
 sites/*/services*.yml
+sites/default/default.services.*
 
 # Ignore paths that contain user-generated content.
 sites/*/files

From f083aa194508d588151f91973ee797daac884de1 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 9 Mar 2018 10:18:28 -0800
Subject: [PATCH 002/143] Move most of these files to a `/web/` subdirectory

This repository has essentially been based in an existing `/web/`
directory. Moving most of its files to a new subdirectory will
allow us to include the files that have been one level above this.
---
 themes/uswds/LICENSE.txt                      | 339 ------------------
 autoload.php => web/autoload.php              |   0
 index.php => web/index.php                    |   0
 {modules => web/modules}/README.txt           |   0
 {profiles => web/profiles}/README.txt         |   0
 robots.txt => web/robots.txt                  |   0
 {sites => web/sites}/README.txt               |   0
 {sites => web/sites}/development.services.yml |   0
 .../sites}/example.settings.local.php         |   0
 {sites => web/sites}/example.sites.php        |   0
 {themes => web/themes}/README.txt             |   0
 {themes => web/themes}/nsf/.gitignore         |   0
 {themes => web/themes}/nsf/README.md          |   0
 .../themes}/nsf/assets/CONTRIBUTING.md        |   0
 {themes => web/themes}/nsf/assets/LICENSE.md  |   0
 {themes => web/themes}/nsf/assets/README.md   |   0
 .../themes}/nsf/assets/css/uswds.css          |   0
 .../themes}/nsf/assets/css/uswds.css.map      |   0
 .../themes}/nsf/assets/css/uswds.min.css      |   0
 .../themes}/nsf/assets/css/uswds.min.css.map  |   0
 .../fonts/merriweather-bold-webfont.eot       | Bin
 .../fonts/merriweather-bold-webfont.ttf       | Bin
 .../fonts/merriweather-bold-webfont.woff      | Bin
 .../fonts/merriweather-bold-webfont.woff2     | Bin
 .../fonts/merriweather-italic-webfont.eot     | Bin
 .../fonts/merriweather-italic-webfont.ttf     | Bin
 .../fonts/merriweather-italic-webfont.woff    | Bin
 .../fonts/merriweather-italic-webfont.woff2   | Bin
 .../fonts/merriweather-light-webfont.eot      | Bin
 .../fonts/merriweather-light-webfont.ttf      | Bin
 .../fonts/merriweather-light-webfont.woff     | Bin
 .../fonts/merriweather-light-webfont.woff2    | Bin
 .../fonts/merriweather-regular-webfont.eot    | Bin
 .../fonts/merriweather-regular-webfont.ttf    | Bin
 .../fonts/merriweather-regular-webfont.woff   | Bin
 .../fonts/merriweather-regular-webfont.woff2  | Bin
 .../fonts/sourcesanspro-bold-webfont.eot      | Bin
 .../fonts/sourcesanspro-bold-webfont.ttf      | Bin
 .../fonts/sourcesanspro-bold-webfont.woff     | Bin
 .../fonts/sourcesanspro-bold-webfont.woff2    | Bin
 .../fonts/sourcesanspro-italic-webfont.eot    | Bin
 .../fonts/sourcesanspro-italic-webfont.ttf    | Bin
 .../fonts/sourcesanspro-italic-webfont.woff   | Bin
 .../fonts/sourcesanspro-italic-webfont.woff2  | Bin
 .../fonts/sourcesanspro-light-webfont.eot     | Bin
 .../fonts/sourcesanspro-light-webfont.ttf     | Bin
 .../fonts/sourcesanspro-light-webfont.woff    | Bin
 .../fonts/sourcesanspro-light-webfont.woff2   | Bin
 .../fonts/sourcesanspro-regular-webfont.eot   | Bin
 .../fonts/sourcesanspro-regular-webfont.ttf   | Bin
 .../fonts/sourcesanspro-regular-webfont.woff  | Bin
 .../fonts/sourcesanspro-regular-webfont.woff2 | Bin
 .../themes}/nsf/assets/img/alerts/error.png   | Bin
 .../themes}/nsf/assets/img/alerts/error.svg   |   0
 .../themes}/nsf/assets/img/alerts/info.png    | Bin
 .../themes}/nsf/assets/img/alerts/info.svg    |   0
 .../themes}/nsf/assets/img/alerts/success.png | Bin
 .../themes}/nsf/assets/img/alerts/success.svg |   0
 .../themes}/nsf/assets/img/alerts/warning.png | Bin
 .../themes}/nsf/assets/img/alerts/warning.svg |   0
 .../nsf/assets/img/angle-arrow-down-hover.png | Bin
 .../nsf/assets/img/angle-arrow-down-hover.svg |   0
 .../img/angle-arrow-down-primary-hover.png    | Bin
 .../img/angle-arrow-down-primary-hover.svg    |   0
 .../assets/img/angle-arrow-down-primary.png   | Bin
 .../assets/img/angle-arrow-down-primary.svg   |   0
 .../nsf/assets/img/angle-arrow-down.png       | Bin
 .../nsf/assets/img/angle-arrow-down.svg       |   0
 .../img/angle-arrow-up-primary-hover.png      | Bin
 .../img/angle-arrow-up-primary-hover.svg      |   0
 .../nsf/assets/img/angle-arrow-up-primary.png | Bin
 .../nsf/assets/img/angle-arrow-up-primary.svg |   0
 .../themes}/nsf/assets/img/arrow-both.png     | Bin
 .../themes}/nsf/assets/img/arrow-both.svg     |   0
 .../themes}/nsf/assets/img/arrow-down.png     | Bin
 .../themes}/nsf/assets/img/arrow-down.svg     |   0
 .../themes}/nsf/assets/img/arrow-right.png    | Bin
 .../themes}/nsf/assets/img/arrow-right.svg    |   0
 .../themes}/nsf/assets/img/circle-124.png     | Bin
 .../themes}/nsf/assets/img/close-primary.png  | Bin
 .../themes}/nsf/assets/img/close-primary.svg  |   0
 .../themes}/nsf/assets/img/close.png          | Bin
 .../themes}/nsf/assets/img/close.svg          |   0
 .../themes}/nsf/assets/img/correct8.png       | Bin
 .../themes}/nsf/assets/img/correct8.svg       |   0
 .../themes}/nsf/assets/img/correct9.png       | Bin
 .../themes}/nsf/assets/img/correct9.svg       |   0
 .../assets/img/external-link-alt-hover.png    | Bin
 .../assets/img/external-link-alt-hover.svg    |   0
 .../nsf/assets/img/external-link-alt.png      | Bin
 .../nsf/assets/img/external-link-alt.svg      |   0
 .../nsf/assets/img/external-link-hover.png    | Bin
 .../nsf/assets/img/external-link-hover.svg    |   0
 .../themes}/nsf/assets/img/external-link.png  | Bin
 .../themes}/nsf/assets/img/external-link.svg  |   0
 .../nsf/assets/img/favicons/favicon-114.png   | Bin
 .../nsf/assets/img/favicons/favicon-144.png   | Bin
 .../nsf/assets/img/favicons/favicon-16.png    | Bin
 .../nsf/assets/img/favicons/favicon-192.png   | Bin
 .../nsf/assets/img/favicons/favicon-40.png    | Bin
 .../nsf/assets/img/favicons/favicon-57.png    | Bin
 .../nsf/assets/img/favicons/favicon-72.png    | Bin
 .../nsf/assets/img/favicons/favicon.ico       | Bin
 .../nsf/assets/img/favicons/favicon.png       | Bin
 .../themes}/nsf/assets/img/hero.png           | Bin
 .../themes}/nsf/assets/img/icon-dot-gov.svg   |   0
 .../themes}/nsf/assets/img/icon-https.svg     |   0
 .../themes}/nsf/assets/img/logo-img.png       | Bin
 .../themes}/nsf/assets/img/minus-alt.png      | Bin
 .../themes}/nsf/assets/img/minus-alt.svg      |   0
 .../themes}/nsf/assets/img/minus.png          | Bin
 .../themes}/nsf/assets/img/minus.svg          |   0
 .../themes}/nsf/assets/img/plus-alt.png       | Bin
 .../themes}/nsf/assets/img/plus-alt.svg       |   0
 .../themes}/nsf/assets/img/plus.png           | Bin
 .../themes}/nsf/assets/img/plus.svg           |   0
 .../themes}/nsf/assets/img/search-alt.png     | Bin
 .../themes}/nsf/assets/img/search-alt.svg     |   0
 .../themes}/nsf/assets/img/search-primary.png | Bin
 .../themes}/nsf/assets/img/search-primary.svg |   0
 .../themes}/nsf/assets/img/search.png         | Bin
 .../themes}/nsf/assets/img/search.svg         |   0
 .../img/social-icons/png/facebook25.png       | Bin
 .../nsf/assets/img/social-icons/png/rss25.png | Bin
 .../assets/img/social-icons/png/twitter16.png | Bin
 .../assets/img/social-icons/png/youtube15.png | Bin
 .../img/social-icons/svg/facebook25.svg       |   0
 .../nsf/assets/img/social-icons/svg/rss25.svg |   0
 .../assets/img/social-icons/svg/twitter16.svg |   0
 .../assets/img/social-icons/svg/youtube15.svg |   0
 .../themes}/nsf/assets/img/us_flag_small.png  | Bin
 {themes => web/themes}/nsf/assets/js/uswds.js |   0
 .../themes}/nsf/assets/js/uswds.min.js        |   0
 .../themes}/nsf/assets/js/uswds.min.js.map    |   0
 .../themes}/nsf/assets/scss/_all.scss         |   0
 .../assets/scss/components/_accordions.scss   |   0
 .../nsf/assets/scss/components/_alerts.scss   |   0
 .../nsf/assets/scss/components/_banner.scss   |   0
 .../nsf/assets/scss/components/_footer.scss   |   0
 .../nsf/assets/scss/components/_forms.scss    |   0
 .../assets/scss/components/_graphic-list.scss |   0
 .../nsf/assets/scss/components/_header.scss   |   0
 .../nsf/assets/scss/components/_hero.scss     |   0
 .../nsf/assets/scss/components/_layout.scss   |   0
 .../assets/scss/components/_media-block.scss  |   0
 .../assets/scss/components/_navigation.scss   |   0
 .../nsf/assets/scss/components/_search.scss   |   0
 .../nsf/assets/scss/components/_section.scss  |   0
 .../nsf/assets/scss/components/_sidenav.scss  |   0
 .../nsf/assets/scss/components/_skipnav.scss  |   0
 .../themes}/nsf/assets/scss/core/_base.scss   |   0
 .../nsf/assets/scss/core/_defaults.scss       |   0
 .../themes}/nsf/assets/scss/core/_fonts.scss  |   0
 .../nsf/assets/scss/core/_grid-settings.scss  |   0
 .../themes}/nsf/assets/scss/core/_grid.scss   |   0
 .../nsf/assets/scss/core/_utilities.scss      |   0
 .../nsf/assets/scss/core/_variables.scss      |   0
 .../nsf/assets/scss/elements/_buttons.scss    |   0
 .../nsf/assets/scss/elements/_embed.scss      |   0
 .../nsf/assets/scss/elements/_figure.scss     |   0
 .../nsf/assets/scss/elements/_inputs.scss     |   0
 .../nsf/assets/scss/elements/_labels.scss     |   0
 .../nsf/assets/scss/elements/_list.scss       |   0
 .../nsf/assets/scss/elements/_table.scss      |   0
 .../nsf/assets/scss/elements/_typography.scss |   0
 .../lib/_bourbon-deprecated-upcoming.scss     |   0
 .../themes}/nsf/assets/scss/lib/_bourbon.scss |   0
 .../nsf/assets/scss/lib/_neat-helpers.scss    |   0
 .../themes}/nsf/assets/scss/lib/_neat.scss    |   0
 .../nsf/assets/scss/lib/_normalize.scss       |   0
 .../assets/scss/lib/addons/_border-color.scss |   0
 .../scss/lib/addons/_border-radius.scss       |   0
 .../assets/scss/lib/addons/_border-style.scss |   0
 .../assets/scss/lib/addons/_border-width.scss |   0
 .../nsf/assets/scss/lib/addons/_buttons.scss  |   0
 .../nsf/assets/scss/lib/addons/_clearfix.scss |   0
 .../nsf/assets/scss/lib/addons/_ellipsis.scss |   0
 .../assets/scss/lib/addons/_font-stacks.scss  |   0
 .../assets/scss/lib/addons/_hide-text.scss    |   0
 .../nsf/assets/scss/lib/addons/_margin.scss   |   0
 .../nsf/assets/scss/lib/addons/_padding.scss  |   0
 .../nsf/assets/scss/lib/addons/_position.scss |   0
 .../nsf/assets/scss/lib/addons/_prefixer.scss |   0
 .../assets/scss/lib/addons/_retina-image.scss |   0
 .../nsf/assets/scss/lib/addons/_size.scss     |   0
 .../assets/scss/lib/addons/_text-inputs.scss  |   0
 .../scss/lib/addons/_timing-functions.scss    |   0
 .../nsf/assets/scss/lib/addons/_triangle.scss |   0
 .../assets/scss/lib/addons/_word-wrap.scss    |   0
 .../nsf/assets/scss/lib/css3/_animation.scss  |   0
 .../nsf/assets/scss/lib/css3/_appearance.scss |   0
 .../scss/lib/css3/_backface-visibility.scss   |   0
 .../scss/lib/css3/_background-image.scss      |   0
 .../nsf/assets/scss/lib/css3/_background.scss |   0
 .../assets/scss/lib/css3/_border-image.scss   |   0
 .../nsf/assets/scss/lib/css3/_calc.scss       |   0
 .../nsf/assets/scss/lib/css3/_columns.scss    |   0
 .../nsf/assets/scss/lib/css3/_filter.scss     |   0
 .../nsf/assets/scss/lib/css3/_flex-box.scss   |   0
 .../nsf/assets/scss/lib/css3/_font-face.scss  |   0
 .../scss/lib/css3/_font-feature-settings.scss |   0
 .../scss/lib/css3/_hidpi-media-query.scss     |   0
 .../nsf/assets/scss/lib/css3/_hyphens.scss    |   0
 .../scss/lib/css3/_image-rendering.scss       |   0
 .../nsf/assets/scss/lib/css3/_keyframes.scss  |   0
 .../scss/lib/css3/_linear-gradient.scss       |   0
 .../assets/scss/lib/css3/_perspective.scss    |   0
 .../assets/scss/lib/css3/_placeholder.scss    |   0
 .../scss/lib/css3/_radial-gradient.scss       |   0
 .../nsf/assets/scss/lib/css3/_selection.scss  |   0
 .../scss/lib/css3/_text-decoration.scss       |   0
 .../nsf/assets/scss/lib/css3/_transform.scss  |   0
 .../nsf/assets/scss/lib/css3/_transition.scss |   0
 .../assets/scss/lib/css3/_user-select.scss    |   0
 .../scss/lib/functions/_assign-inputs.scss    |   0
 .../scss/lib/functions/_contains-falsy.scss   |   0
 .../assets/scss/lib/functions/_contains.scss  |   0
 .../assets/scss/lib/functions/_is-length.scss |   0
 .../assets/scss/lib/functions/_is-light.scss  |   0
 .../assets/scss/lib/functions/_is-number.scss |   0
 .../assets/scss/lib/functions/_is-size.scss   |   0
 .../scss/lib/functions/_modular-scale.scss    |   0
 .../scss/lib/functions/_new-breakpoint.scss   |   0
 .../assets/scss/lib/functions/_private.scss   |   0
 .../assets/scss/lib/functions/_px-to-em.scss  |   0
 .../assets/scss/lib/functions/_px-to-rem.scss |   0
 .../nsf/assets/scss/lib/functions/_shade.scss |   0
 .../scss/lib/functions/_strip-units.scss      |   0
 .../nsf/assets/scss/lib/functions/_tint.scss  |   0
 .../functions/_transition-property-name.scss  |   0
 .../assets/scss/lib/functions/_unpack.scss    |   0
 .../nsf/assets/scss/lib/grid/_box-sizing.scss |   0
 .../scss/lib/grid/_direction-context.scss     |   0
 .../scss/lib/grid/_display-context.scss       |   0
 .../assets/scss/lib/grid/_fill-parent.scss    |   0
 .../nsf/assets/scss/lib/grid/_media.scss      |   0
 .../nsf/assets/scss/lib/grid/_omega.scss      |   0
 .../scss/lib/grid/_outer-container.scss       |   0
 .../nsf/assets/scss/lib/grid/_pad.scss        |   0
 .../nsf/assets/scss/lib/grid/_private.scss    |   0
 .../nsf/assets/scss/lib/grid/_row.scss        |   0
 .../nsf/assets/scss/lib/grid/_shift.scss      |   0
 .../assets/scss/lib/grid/_span-columns.scss   |   0
 .../assets/scss/lib/grid/_to-deprecate.scss   |   0
 .../assets/scss/lib/grid/_visual-grid.scss    |   0
 .../scss/lib/helpers/_convert-units.scss      |   0
 .../scss/lib/helpers/_directional-values.scss |   0
 .../lib/helpers/_font-source-declaration.scss |   0
 .../helpers/_gradient-positions-parser.scss   |   0
 .../lib/helpers/_linear-angle-parser.scss     |   0
 .../lib/helpers/_linear-gradient-parser.scss  |   0
 .../lib/helpers/_linear-positions-parser.scss |   0
 .../helpers/_linear-side-corner-parser.scss   |   0
 .../scss/lib/helpers/_radial-arg-parser.scss  |   0
 .../lib/helpers/_radial-gradient-parser.scss  |   0
 .../lib/helpers/_radial-positions-parser.scss |   0
 .../scss/lib/helpers/_render-gradients.scss   |   0
 .../lib/helpers/_shape-size-stripper.scss     |   0
 .../assets/scss/lib/helpers/_str-to-num.scss  |   0
 .../nsf/assets/scss/lib/mixins/_clearfix.scss |   0
 .../scss/lib/settings/_asset-pipeline.scss    |   0
 .../scss/lib/settings/_disable-warnings.scss  |   0
 .../nsf/assets/scss/lib/settings/_grid.scss   |   0
 .../assets/scss/lib/settings/_prefixer.scss   |   0
 .../assets/scss/lib/settings/_px-to-em.scss   |   0
 .../scss/lib/settings/_visual-grid.scss       |   0
 .../themes}/nsf/assets/scss/uswds.scss        |   0
 {themes => web/themes}/nsf/logo.png           | Bin
 {themes => web/themes}/nsf/nsf.info.yml       |   0
 {themes => web/themes}/nsf/nsf.theme          |   0
 {themes => web/themes}/nsf/package-lock.json  |   0
 {themes => web/themes}/nsf/package.json       |   0
 .../themes}/nsf/preprocess/README.md          |   0
 {themes => web/themes}/nsf/process/README.md  |   0
 .../themes}/nsf/sass/_variables.scss          |   0
 {themes => web/themes}/nsf/sass/uswds.scss    |   0
 .../fields/field--field-subtitle.html.twig    |   0
 .../system/layout/page--front.html.twig       |   0
 .../templates/system/layout/page.html.twig    |   0
 {themes => web/themes}/uswds/.gitignore       |   0
 .../themes/uswds}/LICENSE.txt                 |   0
 {themes => web/themes}/uswds/README.md        |   0
 {themes => web/themes}/uswds/composer.json    |   0
 {themes => web/themes}/uswds/css/style.css    |   0
 .../uswds/examples/my_subtheme/.gitignore     |   0
 .../uswds/examples/my_subtheme/README.md      |   0
 .../uswds/examples/my_subtheme/logo.svg       |   0
 .../my_subtheme.info.yml.rename-me            |   0
 .../uswds/examples/my_subtheme/package.json   |   0
 .../examples/my_subtheme/preprocess/README.md |   0
 .../examples/my_subtheme/process/README.md    |   0
 .../examples/my_subtheme/sass/_variables.scss |   0
 .../examples/my_subtheme/sass/uswds.scss      |   0
 {themes => web/themes}/uswds/form/README.md   |   0
 .../themes}/uswds/form/form.form.inc          |   0
 .../themes}/uswds/form/node.form.inc          |   0
 .../themes}/uswds/form/search_block.form.inc  |   0
 .../uswds/form/user_login_form.form.inc       |   0
 .../uswds/form/user_profile_form.form.inc     |   0
 .../uswds/form/user_register_form.form.inc    |   0
 .../themes}/uswds/includes/base_themes.inc    |   0
 .../themes}/uswds/includes/edge_to_edge.inc   |   0
 .../themes}/uswds/includes/forms.inc          |   0
 .../themes}/uswds/includes/menus.inc          |   0
 {themes => web/themes}/uswds/logo.svg         |   0
 .../preprocess/block/block.preprocess.inc     |   0
 .../block__local_actions_block.preprocess.inc |   0
 ...tem_menu_block__footer_menu.preprocess.inc |   0
 ...tem_menu_block__mobile_menu.preprocess.inc |   0
 ...em_menu_block__primary_menu.preprocess.inc |   0
 ..._menu_block__secondary_menu.preprocess.inc |   0
 ...m_menu_block__sidebar_first.preprocess.inc |   0
 .../block/page_title.preprocess.inc           |   0
 .../preprocess/element/details.preprocess.inc |   0
 .../element/form_element.preprocess.inc       |   0
 .../element/form_element_label.preprocess.inc |   0
 .../element/vertical_tabs.preprocess.inc      |   0
 .../preprocess/layout/page.preprocess.inc     |   0
 .../menu/menu__footer_menu.preprocess.inc     |   0
 .../menu/menu__mobile_menu.preprocess.inc     |   0
 .../menu/menu__primary_menu.preprocess.inc    |   0
 .../menu/menu__secondary_menu.preprocess.inc  |   0
 .../menu/menu_local_action.preprocess.inc     |   0
 .../menu/menu_local_tasks.preprocess.inc      |   0
 .../paragraph/paragraph.preprocess.inc        |   0
 {themes => web/themes}/uswds/screenshot.png   | Bin
 .../block--system-branding-block.html.twig    |   0
 ...--system-menu-block--footer_menu.html.twig |   0
 ...--system-menu-block--mobile_menu.html.twig |   0
 ...-system-menu-block--primary_menu.html.twig |   0
 ...ystem-menu-block--secondary_menu.html.twig |   0
 ...system-menu-block--sidebar_first.html.twig |   0
 .../system/block/breadcrumb.html.twig         |   0
 .../system/block/status-messages.html.twig    |   0
 .../system/element/details.html.twig          |   0
 .../system/element/form-element.html.twig     |   0
 .../templates/system/layout/page.html.twig    |   0
 .../system/menu/menu--footer_menu.html.twig   |   0
 .../system/menu/menu--mobile_menu.html.twig   |   0
 .../system/menu/menu--primary_menu.html.twig  |   0
 .../menu/menu--secondary_menu.html.twig       |   0
 .../system/menu/menu--sidebar_first.html.twig |   0
 .../system/menu/menu-local-tasks.html.twig    |   0
 .../system/paragraph/paragraph.html.twig      |   0
 .../uswds/government-banner.html.twig         |   0
 .../themes}/uswds/theme-settings.php          |   0
 {themes => web/themes}/uswds/uswds.info.yml   |   0
 .../themes}/uswds/uswds.libraries.yml         |   0
 {themes => web/themes}/uswds/uswds.theme      |   0
 update.php => web/update.php                  |   0
 web.config => web/web.config                  |   0
 351 files changed, 339 deletions(-)
 delete mode 100644 themes/uswds/LICENSE.txt
 rename autoload.php => web/autoload.php (100%)
 rename index.php => web/index.php (100%)
 rename {modules => web/modules}/README.txt (100%)
 rename {profiles => web/profiles}/README.txt (100%)
 rename robots.txt => web/robots.txt (100%)
 rename {sites => web/sites}/README.txt (100%)
 rename {sites => web/sites}/development.services.yml (100%)
 rename {sites => web/sites}/example.settings.local.php (100%)
 rename {sites => web/sites}/example.sites.php (100%)
 rename {themes => web/themes}/README.txt (100%)
 rename {themes => web/themes}/nsf/.gitignore (100%)
 rename {themes => web/themes}/nsf/README.md (100%)
 rename {themes => web/themes}/nsf/assets/CONTRIBUTING.md (100%)
 rename {themes => web/themes}/nsf/assets/LICENSE.md (100%)
 rename {themes => web/themes}/nsf/assets/README.md (100%)
 rename {themes => web/themes}/nsf/assets/css/uswds.css (100%)
 rename {themes => web/themes}/nsf/assets/css/uswds.css.map (100%)
 rename {themes => web/themes}/nsf/assets/css/uswds.min.css (100%)
 rename {themes => web/themes}/nsf/assets/css/uswds.min.css.map (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-bold-webfont.eot (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-bold-webfont.ttf (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-bold-webfont.woff (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-bold-webfont.woff2 (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-italic-webfont.eot (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-italic-webfont.ttf (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-italic-webfont.woff (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-italic-webfont.woff2 (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-light-webfont.eot (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-light-webfont.ttf (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-light-webfont.woff (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-light-webfont.woff2 (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-regular-webfont.eot (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-regular-webfont.ttf (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-regular-webfont.woff (100%)
 rename {themes => web/themes}/nsf/assets/fonts/merriweather-regular-webfont.woff2 (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-bold-webfont.eot (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-bold-webfont.ttf (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-bold-webfont.woff (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-bold-webfont.woff2 (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-italic-webfont.eot (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-italic-webfont.ttf (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-italic-webfont.woff (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-italic-webfont.woff2 (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-light-webfont.eot (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-light-webfont.ttf (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-light-webfont.woff (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-light-webfont.woff2 (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-regular-webfont.eot (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-regular-webfont.ttf (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-regular-webfont.woff (100%)
 rename {themes => web/themes}/nsf/assets/fonts/sourcesanspro-regular-webfont.woff2 (100%)
 rename {themes => web/themes}/nsf/assets/img/alerts/error.png (100%)
 rename {themes => web/themes}/nsf/assets/img/alerts/error.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/alerts/info.png (100%)
 rename {themes => web/themes}/nsf/assets/img/alerts/info.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/alerts/success.png (100%)
 rename {themes => web/themes}/nsf/assets/img/alerts/success.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/alerts/warning.png (100%)
 rename {themes => web/themes}/nsf/assets/img/alerts/warning.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-down-hover.png (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-down-hover.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-down-primary-hover.png (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-down-primary-hover.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-down-primary.png (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-down-primary.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-down.png (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-down.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-up-primary-hover.png (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-up-primary-hover.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-up-primary.png (100%)
 rename {themes => web/themes}/nsf/assets/img/angle-arrow-up-primary.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/arrow-both.png (100%)
 rename {themes => web/themes}/nsf/assets/img/arrow-both.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/arrow-down.png (100%)
 rename {themes => web/themes}/nsf/assets/img/arrow-down.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/arrow-right.png (100%)
 rename {themes => web/themes}/nsf/assets/img/arrow-right.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/circle-124.png (100%)
 rename {themes => web/themes}/nsf/assets/img/close-primary.png (100%)
 rename {themes => web/themes}/nsf/assets/img/close-primary.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/close.png (100%)
 rename {themes => web/themes}/nsf/assets/img/close.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/correct8.png (100%)
 rename {themes => web/themes}/nsf/assets/img/correct8.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/correct9.png (100%)
 rename {themes => web/themes}/nsf/assets/img/correct9.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/external-link-alt-hover.png (100%)
 rename {themes => web/themes}/nsf/assets/img/external-link-alt-hover.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/external-link-alt.png (100%)
 rename {themes => web/themes}/nsf/assets/img/external-link-alt.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/external-link-hover.png (100%)
 rename {themes => web/themes}/nsf/assets/img/external-link-hover.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/external-link.png (100%)
 rename {themes => web/themes}/nsf/assets/img/external-link.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/favicons/favicon-114.png (100%)
 rename {themes => web/themes}/nsf/assets/img/favicons/favicon-144.png (100%)
 rename {themes => web/themes}/nsf/assets/img/favicons/favicon-16.png (100%)
 rename {themes => web/themes}/nsf/assets/img/favicons/favicon-192.png (100%)
 rename {themes => web/themes}/nsf/assets/img/favicons/favicon-40.png (100%)
 rename {themes => web/themes}/nsf/assets/img/favicons/favicon-57.png (100%)
 rename {themes => web/themes}/nsf/assets/img/favicons/favicon-72.png (100%)
 rename {themes => web/themes}/nsf/assets/img/favicons/favicon.ico (100%)
 rename {themes => web/themes}/nsf/assets/img/favicons/favicon.png (100%)
 rename {themes => web/themes}/nsf/assets/img/hero.png (100%)
 rename {themes => web/themes}/nsf/assets/img/icon-dot-gov.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/icon-https.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/logo-img.png (100%)
 rename {themes => web/themes}/nsf/assets/img/minus-alt.png (100%)
 rename {themes => web/themes}/nsf/assets/img/minus-alt.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/minus.png (100%)
 rename {themes => web/themes}/nsf/assets/img/minus.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/plus-alt.png (100%)
 rename {themes => web/themes}/nsf/assets/img/plus-alt.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/plus.png (100%)
 rename {themes => web/themes}/nsf/assets/img/plus.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/search-alt.png (100%)
 rename {themes => web/themes}/nsf/assets/img/search-alt.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/search-primary.png (100%)
 rename {themes => web/themes}/nsf/assets/img/search-primary.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/search.png (100%)
 rename {themes => web/themes}/nsf/assets/img/search.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/social-icons/png/facebook25.png (100%)
 rename {themes => web/themes}/nsf/assets/img/social-icons/png/rss25.png (100%)
 rename {themes => web/themes}/nsf/assets/img/social-icons/png/twitter16.png (100%)
 rename {themes => web/themes}/nsf/assets/img/social-icons/png/youtube15.png (100%)
 rename {themes => web/themes}/nsf/assets/img/social-icons/svg/facebook25.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/social-icons/svg/rss25.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/social-icons/svg/twitter16.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/social-icons/svg/youtube15.svg (100%)
 rename {themes => web/themes}/nsf/assets/img/us_flag_small.png (100%)
 rename {themes => web/themes}/nsf/assets/js/uswds.js (100%)
 rename {themes => web/themes}/nsf/assets/js/uswds.min.js (100%)
 rename {themes => web/themes}/nsf/assets/js/uswds.min.js.map (100%)
 rename {themes => web/themes}/nsf/assets/scss/_all.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_accordions.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_alerts.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_banner.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_footer.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_forms.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_graphic-list.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_header.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_hero.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_layout.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_media-block.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_navigation.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_search.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_section.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_sidenav.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/components/_skipnav.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/core/_base.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/core/_defaults.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/core/_fonts.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/core/_grid-settings.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/core/_grid.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/core/_utilities.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/core/_variables.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/elements/_buttons.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/elements/_embed.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/elements/_figure.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/elements/_inputs.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/elements/_labels.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/elements/_list.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/elements/_table.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/elements/_typography.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/_bourbon-deprecated-upcoming.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/_bourbon.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/_neat-helpers.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/_neat.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/_normalize.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_border-color.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_border-radius.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_border-style.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_border-width.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_buttons.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_clearfix.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_ellipsis.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_font-stacks.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_hide-text.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_margin.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_padding.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_position.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_prefixer.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_retina-image.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_size.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_text-inputs.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_timing-functions.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_triangle.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/addons/_word-wrap.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_animation.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_appearance.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_backface-visibility.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_background-image.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_background.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_border-image.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_calc.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_columns.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_filter.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_flex-box.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_font-face.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_font-feature-settings.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_hidpi-media-query.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_hyphens.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_image-rendering.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_keyframes.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_linear-gradient.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_perspective.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_placeholder.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_radial-gradient.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_selection.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_text-decoration.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_transform.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_transition.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/css3/_user-select.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_assign-inputs.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_contains-falsy.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_contains.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_is-length.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_is-light.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_is-number.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_is-size.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_modular-scale.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_new-breakpoint.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_private.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_px-to-em.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_px-to-rem.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_shade.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_strip-units.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_tint.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_transition-property-name.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/functions/_unpack.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_box-sizing.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_direction-context.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_display-context.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_fill-parent.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_media.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_omega.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_outer-container.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_pad.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_private.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_row.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_shift.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_span-columns.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_to-deprecate.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/grid/_visual-grid.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_convert-units.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_directional-values.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_font-source-declaration.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_gradient-positions-parser.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_linear-angle-parser.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_linear-gradient-parser.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_linear-positions-parser.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_linear-side-corner-parser.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_radial-arg-parser.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_radial-gradient-parser.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_radial-positions-parser.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_render-gradients.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_shape-size-stripper.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/helpers/_str-to-num.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/mixins/_clearfix.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/settings/_asset-pipeline.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/settings/_disable-warnings.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/settings/_grid.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/settings/_prefixer.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/settings/_px-to-em.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/lib/settings/_visual-grid.scss (100%)
 rename {themes => web/themes}/nsf/assets/scss/uswds.scss (100%)
 rename {themes => web/themes}/nsf/logo.png (100%)
 rename {themes => web/themes}/nsf/nsf.info.yml (100%)
 rename {themes => web/themes}/nsf/nsf.theme (100%)
 rename {themes => web/themes}/nsf/package-lock.json (100%)
 rename {themes => web/themes}/nsf/package.json (100%)
 rename {themes => web/themes}/nsf/preprocess/README.md (100%)
 rename {themes => web/themes}/nsf/process/README.md (100%)
 rename {themes => web/themes}/nsf/sass/_variables.scss (100%)
 rename {themes => web/themes}/nsf/sass/uswds.scss (100%)
 rename {themes => web/themes}/nsf/templates/system/fields/field--field-subtitle.html.twig (100%)
 rename {themes => web/themes}/nsf/templates/system/layout/page--front.html.twig (100%)
 rename {themes => web/themes}/nsf/templates/system/layout/page.html.twig (100%)
 rename {themes => web/themes}/uswds/.gitignore (100%)
 rename {themes/bootstrap => web/themes/uswds}/LICENSE.txt (100%)
 rename {themes => web/themes}/uswds/README.md (100%)
 rename {themes => web/themes}/uswds/composer.json (100%)
 rename {themes => web/themes}/uswds/css/style.css (100%)
 rename {themes => web/themes}/uswds/examples/my_subtheme/.gitignore (100%)
 rename {themes => web/themes}/uswds/examples/my_subtheme/README.md (100%)
 rename {themes => web/themes}/uswds/examples/my_subtheme/logo.svg (100%)
 rename {themes => web/themes}/uswds/examples/my_subtheme/my_subtheme.info.yml.rename-me (100%)
 rename {themes => web/themes}/uswds/examples/my_subtheme/package.json (100%)
 rename {themes => web/themes}/uswds/examples/my_subtheme/preprocess/README.md (100%)
 rename {themes => web/themes}/uswds/examples/my_subtheme/process/README.md (100%)
 rename {themes => web/themes}/uswds/examples/my_subtheme/sass/_variables.scss (100%)
 rename {themes => web/themes}/uswds/examples/my_subtheme/sass/uswds.scss (100%)
 rename {themes => web/themes}/uswds/form/README.md (100%)
 rename {themes => web/themes}/uswds/form/form.form.inc (100%)
 rename {themes => web/themes}/uswds/form/node.form.inc (100%)
 rename {themes => web/themes}/uswds/form/search_block.form.inc (100%)
 rename {themes => web/themes}/uswds/form/user_login_form.form.inc (100%)
 rename {themes => web/themes}/uswds/form/user_profile_form.form.inc (100%)
 rename {themes => web/themes}/uswds/form/user_register_form.form.inc (100%)
 rename {themes => web/themes}/uswds/includes/base_themes.inc (100%)
 rename {themes => web/themes}/uswds/includes/edge_to_edge.inc (100%)
 rename {themes => web/themes}/uswds/includes/forms.inc (100%)
 rename {themes => web/themes}/uswds/includes/menus.inc (100%)
 rename {themes => web/themes}/uswds/logo.svg (100%)
 rename {themes => web/themes}/uswds/preprocess/block/block.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/block/block__local_actions_block.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/block/block__system_menu_block__footer_menu.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/block/block__system_menu_block__mobile_menu.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/block/block__system_menu_block__primary_menu.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/block/block__system_menu_block__secondary_menu.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/block/block__system_menu_block__sidebar_first.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/block/page_title.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/element/details.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/element/form_element.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/element/form_element_label.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/element/vertical_tabs.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/layout/page.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/menu/menu__footer_menu.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/menu/menu__mobile_menu.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/menu/menu__primary_menu.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/menu/menu__secondary_menu.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/menu/menu_local_action.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/menu/menu_local_tasks.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/preprocess/paragraph/paragraph.preprocess.inc (100%)
 rename {themes => web/themes}/uswds/screenshot.png (100%)
 rename {themes => web/themes}/uswds/templates/system/block/block--system-branding-block.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/block/block--system-menu-block--footer_menu.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/block/block--system-menu-block--mobile_menu.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/block/block--system-menu-block--primary_menu.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/block/block--system-menu-block--secondary_menu.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/block/block--system-menu-block--sidebar_first.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/block/breadcrumb.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/block/status-messages.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/element/details.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/element/form-element.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/layout/page.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/menu/menu--footer_menu.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/menu/menu--mobile_menu.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/menu/menu--primary_menu.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/menu/menu--secondary_menu.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/menu/menu--sidebar_first.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/menu/menu-local-tasks.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/system/paragraph/paragraph.html.twig (100%)
 rename {themes => web/themes}/uswds/templates/uswds/government-banner.html.twig (100%)
 rename {themes => web/themes}/uswds/theme-settings.php (100%)
 rename {themes => web/themes}/uswds/uswds.info.yml (100%)
 rename {themes => web/themes}/uswds/uswds.libraries.yml (100%)
 rename {themes => web/themes}/uswds/uswds.theme (100%)
 rename update.php => web/update.php (100%)
 rename web.config => web/web.config (100%)

diff --git a/themes/uswds/LICENSE.txt b/themes/uswds/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/themes/uswds/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/autoload.php b/web/autoload.php
similarity index 100%
rename from autoload.php
rename to web/autoload.php
diff --git a/index.php b/web/index.php
similarity index 100%
rename from index.php
rename to web/index.php
diff --git a/modules/README.txt b/web/modules/README.txt
similarity index 100%
rename from modules/README.txt
rename to web/modules/README.txt
diff --git a/profiles/README.txt b/web/profiles/README.txt
similarity index 100%
rename from profiles/README.txt
rename to web/profiles/README.txt
diff --git a/robots.txt b/web/robots.txt
similarity index 100%
rename from robots.txt
rename to web/robots.txt
diff --git a/sites/README.txt b/web/sites/README.txt
similarity index 100%
rename from sites/README.txt
rename to web/sites/README.txt
diff --git a/sites/development.services.yml b/web/sites/development.services.yml
similarity index 100%
rename from sites/development.services.yml
rename to web/sites/development.services.yml
diff --git a/sites/example.settings.local.php b/web/sites/example.settings.local.php
similarity index 100%
rename from sites/example.settings.local.php
rename to web/sites/example.settings.local.php
diff --git a/sites/example.sites.php b/web/sites/example.sites.php
similarity index 100%
rename from sites/example.sites.php
rename to web/sites/example.sites.php
diff --git a/themes/README.txt b/web/themes/README.txt
similarity index 100%
rename from themes/README.txt
rename to web/themes/README.txt
diff --git a/themes/nsf/.gitignore b/web/themes/nsf/.gitignore
similarity index 100%
rename from themes/nsf/.gitignore
rename to web/themes/nsf/.gitignore
diff --git a/themes/nsf/README.md b/web/themes/nsf/README.md
similarity index 100%
rename from themes/nsf/README.md
rename to web/themes/nsf/README.md
diff --git a/themes/nsf/assets/CONTRIBUTING.md b/web/themes/nsf/assets/CONTRIBUTING.md
similarity index 100%
rename from themes/nsf/assets/CONTRIBUTING.md
rename to web/themes/nsf/assets/CONTRIBUTING.md
diff --git a/themes/nsf/assets/LICENSE.md b/web/themes/nsf/assets/LICENSE.md
similarity index 100%
rename from themes/nsf/assets/LICENSE.md
rename to web/themes/nsf/assets/LICENSE.md
diff --git a/themes/nsf/assets/README.md b/web/themes/nsf/assets/README.md
similarity index 100%
rename from themes/nsf/assets/README.md
rename to web/themes/nsf/assets/README.md
diff --git a/themes/nsf/assets/css/uswds.css b/web/themes/nsf/assets/css/uswds.css
similarity index 100%
rename from themes/nsf/assets/css/uswds.css
rename to web/themes/nsf/assets/css/uswds.css
diff --git a/themes/nsf/assets/css/uswds.css.map b/web/themes/nsf/assets/css/uswds.css.map
similarity index 100%
rename from themes/nsf/assets/css/uswds.css.map
rename to web/themes/nsf/assets/css/uswds.css.map
diff --git a/themes/nsf/assets/css/uswds.min.css b/web/themes/nsf/assets/css/uswds.min.css
similarity index 100%
rename from themes/nsf/assets/css/uswds.min.css
rename to web/themes/nsf/assets/css/uswds.min.css
diff --git a/themes/nsf/assets/css/uswds.min.css.map b/web/themes/nsf/assets/css/uswds.min.css.map
similarity index 100%
rename from themes/nsf/assets/css/uswds.min.css.map
rename to web/themes/nsf/assets/css/uswds.min.css.map
diff --git a/themes/nsf/assets/fonts/merriweather-bold-webfont.eot b/web/themes/nsf/assets/fonts/merriweather-bold-webfont.eot
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-bold-webfont.eot
rename to web/themes/nsf/assets/fonts/merriweather-bold-webfont.eot
diff --git a/themes/nsf/assets/fonts/merriweather-bold-webfont.ttf b/web/themes/nsf/assets/fonts/merriweather-bold-webfont.ttf
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-bold-webfont.ttf
rename to web/themes/nsf/assets/fonts/merriweather-bold-webfont.ttf
diff --git a/themes/nsf/assets/fonts/merriweather-bold-webfont.woff b/web/themes/nsf/assets/fonts/merriweather-bold-webfont.woff
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-bold-webfont.woff
rename to web/themes/nsf/assets/fonts/merriweather-bold-webfont.woff
diff --git a/themes/nsf/assets/fonts/merriweather-bold-webfont.woff2 b/web/themes/nsf/assets/fonts/merriweather-bold-webfont.woff2
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-bold-webfont.woff2
rename to web/themes/nsf/assets/fonts/merriweather-bold-webfont.woff2
diff --git a/themes/nsf/assets/fonts/merriweather-italic-webfont.eot b/web/themes/nsf/assets/fonts/merriweather-italic-webfont.eot
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-italic-webfont.eot
rename to web/themes/nsf/assets/fonts/merriweather-italic-webfont.eot
diff --git a/themes/nsf/assets/fonts/merriweather-italic-webfont.ttf b/web/themes/nsf/assets/fonts/merriweather-italic-webfont.ttf
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-italic-webfont.ttf
rename to web/themes/nsf/assets/fonts/merriweather-italic-webfont.ttf
diff --git a/themes/nsf/assets/fonts/merriweather-italic-webfont.woff b/web/themes/nsf/assets/fonts/merriweather-italic-webfont.woff
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-italic-webfont.woff
rename to web/themes/nsf/assets/fonts/merriweather-italic-webfont.woff
diff --git a/themes/nsf/assets/fonts/merriweather-italic-webfont.woff2 b/web/themes/nsf/assets/fonts/merriweather-italic-webfont.woff2
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-italic-webfont.woff2
rename to web/themes/nsf/assets/fonts/merriweather-italic-webfont.woff2
diff --git a/themes/nsf/assets/fonts/merriweather-light-webfont.eot b/web/themes/nsf/assets/fonts/merriweather-light-webfont.eot
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-light-webfont.eot
rename to web/themes/nsf/assets/fonts/merriweather-light-webfont.eot
diff --git a/themes/nsf/assets/fonts/merriweather-light-webfont.ttf b/web/themes/nsf/assets/fonts/merriweather-light-webfont.ttf
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-light-webfont.ttf
rename to web/themes/nsf/assets/fonts/merriweather-light-webfont.ttf
diff --git a/themes/nsf/assets/fonts/merriweather-light-webfont.woff b/web/themes/nsf/assets/fonts/merriweather-light-webfont.woff
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-light-webfont.woff
rename to web/themes/nsf/assets/fonts/merriweather-light-webfont.woff
diff --git a/themes/nsf/assets/fonts/merriweather-light-webfont.woff2 b/web/themes/nsf/assets/fonts/merriweather-light-webfont.woff2
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-light-webfont.woff2
rename to web/themes/nsf/assets/fonts/merriweather-light-webfont.woff2
diff --git a/themes/nsf/assets/fonts/merriweather-regular-webfont.eot b/web/themes/nsf/assets/fonts/merriweather-regular-webfont.eot
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-regular-webfont.eot
rename to web/themes/nsf/assets/fonts/merriweather-regular-webfont.eot
diff --git a/themes/nsf/assets/fonts/merriweather-regular-webfont.ttf b/web/themes/nsf/assets/fonts/merriweather-regular-webfont.ttf
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-regular-webfont.ttf
rename to web/themes/nsf/assets/fonts/merriweather-regular-webfont.ttf
diff --git a/themes/nsf/assets/fonts/merriweather-regular-webfont.woff b/web/themes/nsf/assets/fonts/merriweather-regular-webfont.woff
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-regular-webfont.woff
rename to web/themes/nsf/assets/fonts/merriweather-regular-webfont.woff
diff --git a/themes/nsf/assets/fonts/merriweather-regular-webfont.woff2 b/web/themes/nsf/assets/fonts/merriweather-regular-webfont.woff2
similarity index 100%
rename from themes/nsf/assets/fonts/merriweather-regular-webfont.woff2
rename to web/themes/nsf/assets/fonts/merriweather-regular-webfont.woff2
diff --git a/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.eot b/web/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.eot
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-bold-webfont.eot
rename to web/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.eot
diff --git a/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.ttf b/web/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.ttf
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-bold-webfont.ttf
rename to web/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.ttf
diff --git a/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.woff b/web/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.woff
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-bold-webfont.woff
rename to web/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.woff
diff --git a/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.woff2 b/web/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.woff2
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-bold-webfont.woff2
rename to web/themes/nsf/assets/fonts/sourcesanspro-bold-webfont.woff2
diff --git a/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.eot b/web/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.eot
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-italic-webfont.eot
rename to web/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.eot
diff --git a/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.ttf b/web/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.ttf
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-italic-webfont.ttf
rename to web/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.ttf
diff --git a/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.woff b/web/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.woff
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-italic-webfont.woff
rename to web/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.woff
diff --git a/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.woff2 b/web/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.woff2
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-italic-webfont.woff2
rename to web/themes/nsf/assets/fonts/sourcesanspro-italic-webfont.woff2
diff --git a/themes/nsf/assets/fonts/sourcesanspro-light-webfont.eot b/web/themes/nsf/assets/fonts/sourcesanspro-light-webfont.eot
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-light-webfont.eot
rename to web/themes/nsf/assets/fonts/sourcesanspro-light-webfont.eot
diff --git a/themes/nsf/assets/fonts/sourcesanspro-light-webfont.ttf b/web/themes/nsf/assets/fonts/sourcesanspro-light-webfont.ttf
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-light-webfont.ttf
rename to web/themes/nsf/assets/fonts/sourcesanspro-light-webfont.ttf
diff --git a/themes/nsf/assets/fonts/sourcesanspro-light-webfont.woff b/web/themes/nsf/assets/fonts/sourcesanspro-light-webfont.woff
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-light-webfont.woff
rename to web/themes/nsf/assets/fonts/sourcesanspro-light-webfont.woff
diff --git a/themes/nsf/assets/fonts/sourcesanspro-light-webfont.woff2 b/web/themes/nsf/assets/fonts/sourcesanspro-light-webfont.woff2
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-light-webfont.woff2
rename to web/themes/nsf/assets/fonts/sourcesanspro-light-webfont.woff2
diff --git a/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.eot b/web/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.eot
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-regular-webfont.eot
rename to web/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.eot
diff --git a/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.ttf b/web/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.ttf
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-regular-webfont.ttf
rename to web/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.ttf
diff --git a/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.woff b/web/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.woff
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-regular-webfont.woff
rename to web/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.woff
diff --git a/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.woff2 b/web/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.woff2
similarity index 100%
rename from themes/nsf/assets/fonts/sourcesanspro-regular-webfont.woff2
rename to web/themes/nsf/assets/fonts/sourcesanspro-regular-webfont.woff2
diff --git a/themes/nsf/assets/img/alerts/error.png b/web/themes/nsf/assets/img/alerts/error.png
similarity index 100%
rename from themes/nsf/assets/img/alerts/error.png
rename to web/themes/nsf/assets/img/alerts/error.png
diff --git a/themes/nsf/assets/img/alerts/error.svg b/web/themes/nsf/assets/img/alerts/error.svg
similarity index 100%
rename from themes/nsf/assets/img/alerts/error.svg
rename to web/themes/nsf/assets/img/alerts/error.svg
diff --git a/themes/nsf/assets/img/alerts/info.png b/web/themes/nsf/assets/img/alerts/info.png
similarity index 100%
rename from themes/nsf/assets/img/alerts/info.png
rename to web/themes/nsf/assets/img/alerts/info.png
diff --git a/themes/nsf/assets/img/alerts/info.svg b/web/themes/nsf/assets/img/alerts/info.svg
similarity index 100%
rename from themes/nsf/assets/img/alerts/info.svg
rename to web/themes/nsf/assets/img/alerts/info.svg
diff --git a/themes/nsf/assets/img/alerts/success.png b/web/themes/nsf/assets/img/alerts/success.png
similarity index 100%
rename from themes/nsf/assets/img/alerts/success.png
rename to web/themes/nsf/assets/img/alerts/success.png
diff --git a/themes/nsf/assets/img/alerts/success.svg b/web/themes/nsf/assets/img/alerts/success.svg
similarity index 100%
rename from themes/nsf/assets/img/alerts/success.svg
rename to web/themes/nsf/assets/img/alerts/success.svg
diff --git a/themes/nsf/assets/img/alerts/warning.png b/web/themes/nsf/assets/img/alerts/warning.png
similarity index 100%
rename from themes/nsf/assets/img/alerts/warning.png
rename to web/themes/nsf/assets/img/alerts/warning.png
diff --git a/themes/nsf/assets/img/alerts/warning.svg b/web/themes/nsf/assets/img/alerts/warning.svg
similarity index 100%
rename from themes/nsf/assets/img/alerts/warning.svg
rename to web/themes/nsf/assets/img/alerts/warning.svg
diff --git a/themes/nsf/assets/img/angle-arrow-down-hover.png b/web/themes/nsf/assets/img/angle-arrow-down-hover.png
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-down-hover.png
rename to web/themes/nsf/assets/img/angle-arrow-down-hover.png
diff --git a/themes/nsf/assets/img/angle-arrow-down-hover.svg b/web/themes/nsf/assets/img/angle-arrow-down-hover.svg
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-down-hover.svg
rename to web/themes/nsf/assets/img/angle-arrow-down-hover.svg
diff --git a/themes/nsf/assets/img/angle-arrow-down-primary-hover.png b/web/themes/nsf/assets/img/angle-arrow-down-primary-hover.png
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-down-primary-hover.png
rename to web/themes/nsf/assets/img/angle-arrow-down-primary-hover.png
diff --git a/themes/nsf/assets/img/angle-arrow-down-primary-hover.svg b/web/themes/nsf/assets/img/angle-arrow-down-primary-hover.svg
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-down-primary-hover.svg
rename to web/themes/nsf/assets/img/angle-arrow-down-primary-hover.svg
diff --git a/themes/nsf/assets/img/angle-arrow-down-primary.png b/web/themes/nsf/assets/img/angle-arrow-down-primary.png
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-down-primary.png
rename to web/themes/nsf/assets/img/angle-arrow-down-primary.png
diff --git a/themes/nsf/assets/img/angle-arrow-down-primary.svg b/web/themes/nsf/assets/img/angle-arrow-down-primary.svg
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-down-primary.svg
rename to web/themes/nsf/assets/img/angle-arrow-down-primary.svg
diff --git a/themes/nsf/assets/img/angle-arrow-down.png b/web/themes/nsf/assets/img/angle-arrow-down.png
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-down.png
rename to web/themes/nsf/assets/img/angle-arrow-down.png
diff --git a/themes/nsf/assets/img/angle-arrow-down.svg b/web/themes/nsf/assets/img/angle-arrow-down.svg
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-down.svg
rename to web/themes/nsf/assets/img/angle-arrow-down.svg
diff --git a/themes/nsf/assets/img/angle-arrow-up-primary-hover.png b/web/themes/nsf/assets/img/angle-arrow-up-primary-hover.png
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-up-primary-hover.png
rename to web/themes/nsf/assets/img/angle-arrow-up-primary-hover.png
diff --git a/themes/nsf/assets/img/angle-arrow-up-primary-hover.svg b/web/themes/nsf/assets/img/angle-arrow-up-primary-hover.svg
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-up-primary-hover.svg
rename to web/themes/nsf/assets/img/angle-arrow-up-primary-hover.svg
diff --git a/themes/nsf/assets/img/angle-arrow-up-primary.png b/web/themes/nsf/assets/img/angle-arrow-up-primary.png
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-up-primary.png
rename to web/themes/nsf/assets/img/angle-arrow-up-primary.png
diff --git a/themes/nsf/assets/img/angle-arrow-up-primary.svg b/web/themes/nsf/assets/img/angle-arrow-up-primary.svg
similarity index 100%
rename from themes/nsf/assets/img/angle-arrow-up-primary.svg
rename to web/themes/nsf/assets/img/angle-arrow-up-primary.svg
diff --git a/themes/nsf/assets/img/arrow-both.png b/web/themes/nsf/assets/img/arrow-both.png
similarity index 100%
rename from themes/nsf/assets/img/arrow-both.png
rename to web/themes/nsf/assets/img/arrow-both.png
diff --git a/themes/nsf/assets/img/arrow-both.svg b/web/themes/nsf/assets/img/arrow-both.svg
similarity index 100%
rename from themes/nsf/assets/img/arrow-both.svg
rename to web/themes/nsf/assets/img/arrow-both.svg
diff --git a/themes/nsf/assets/img/arrow-down.png b/web/themes/nsf/assets/img/arrow-down.png
similarity index 100%
rename from themes/nsf/assets/img/arrow-down.png
rename to web/themes/nsf/assets/img/arrow-down.png
diff --git a/themes/nsf/assets/img/arrow-down.svg b/web/themes/nsf/assets/img/arrow-down.svg
similarity index 100%
rename from themes/nsf/assets/img/arrow-down.svg
rename to web/themes/nsf/assets/img/arrow-down.svg
diff --git a/themes/nsf/assets/img/arrow-right.png b/web/themes/nsf/assets/img/arrow-right.png
similarity index 100%
rename from themes/nsf/assets/img/arrow-right.png
rename to web/themes/nsf/assets/img/arrow-right.png
diff --git a/themes/nsf/assets/img/arrow-right.svg b/web/themes/nsf/assets/img/arrow-right.svg
similarity index 100%
rename from themes/nsf/assets/img/arrow-right.svg
rename to web/themes/nsf/assets/img/arrow-right.svg
diff --git a/themes/nsf/assets/img/circle-124.png b/web/themes/nsf/assets/img/circle-124.png
similarity index 100%
rename from themes/nsf/assets/img/circle-124.png
rename to web/themes/nsf/assets/img/circle-124.png
diff --git a/themes/nsf/assets/img/close-primary.png b/web/themes/nsf/assets/img/close-primary.png
similarity index 100%
rename from themes/nsf/assets/img/close-primary.png
rename to web/themes/nsf/assets/img/close-primary.png
diff --git a/themes/nsf/assets/img/close-primary.svg b/web/themes/nsf/assets/img/close-primary.svg
similarity index 100%
rename from themes/nsf/assets/img/close-primary.svg
rename to web/themes/nsf/assets/img/close-primary.svg
diff --git a/themes/nsf/assets/img/close.png b/web/themes/nsf/assets/img/close.png
similarity index 100%
rename from themes/nsf/assets/img/close.png
rename to web/themes/nsf/assets/img/close.png
diff --git a/themes/nsf/assets/img/close.svg b/web/themes/nsf/assets/img/close.svg
similarity index 100%
rename from themes/nsf/assets/img/close.svg
rename to web/themes/nsf/assets/img/close.svg
diff --git a/themes/nsf/assets/img/correct8.png b/web/themes/nsf/assets/img/correct8.png
similarity index 100%
rename from themes/nsf/assets/img/correct8.png
rename to web/themes/nsf/assets/img/correct8.png
diff --git a/themes/nsf/assets/img/correct8.svg b/web/themes/nsf/assets/img/correct8.svg
similarity index 100%
rename from themes/nsf/assets/img/correct8.svg
rename to web/themes/nsf/assets/img/correct8.svg
diff --git a/themes/nsf/assets/img/correct9.png b/web/themes/nsf/assets/img/correct9.png
similarity index 100%
rename from themes/nsf/assets/img/correct9.png
rename to web/themes/nsf/assets/img/correct9.png
diff --git a/themes/nsf/assets/img/correct9.svg b/web/themes/nsf/assets/img/correct9.svg
similarity index 100%
rename from themes/nsf/assets/img/correct9.svg
rename to web/themes/nsf/assets/img/correct9.svg
diff --git a/themes/nsf/assets/img/external-link-alt-hover.png b/web/themes/nsf/assets/img/external-link-alt-hover.png
similarity index 100%
rename from themes/nsf/assets/img/external-link-alt-hover.png
rename to web/themes/nsf/assets/img/external-link-alt-hover.png
diff --git a/themes/nsf/assets/img/external-link-alt-hover.svg b/web/themes/nsf/assets/img/external-link-alt-hover.svg
similarity index 100%
rename from themes/nsf/assets/img/external-link-alt-hover.svg
rename to web/themes/nsf/assets/img/external-link-alt-hover.svg
diff --git a/themes/nsf/assets/img/external-link-alt.png b/web/themes/nsf/assets/img/external-link-alt.png
similarity index 100%
rename from themes/nsf/assets/img/external-link-alt.png
rename to web/themes/nsf/assets/img/external-link-alt.png
diff --git a/themes/nsf/assets/img/external-link-alt.svg b/web/themes/nsf/assets/img/external-link-alt.svg
similarity index 100%
rename from themes/nsf/assets/img/external-link-alt.svg
rename to web/themes/nsf/assets/img/external-link-alt.svg
diff --git a/themes/nsf/assets/img/external-link-hover.png b/web/themes/nsf/assets/img/external-link-hover.png
similarity index 100%
rename from themes/nsf/assets/img/external-link-hover.png
rename to web/themes/nsf/assets/img/external-link-hover.png
diff --git a/themes/nsf/assets/img/external-link-hover.svg b/web/themes/nsf/assets/img/external-link-hover.svg
similarity index 100%
rename from themes/nsf/assets/img/external-link-hover.svg
rename to web/themes/nsf/assets/img/external-link-hover.svg
diff --git a/themes/nsf/assets/img/external-link.png b/web/themes/nsf/assets/img/external-link.png
similarity index 100%
rename from themes/nsf/assets/img/external-link.png
rename to web/themes/nsf/assets/img/external-link.png
diff --git a/themes/nsf/assets/img/external-link.svg b/web/themes/nsf/assets/img/external-link.svg
similarity index 100%
rename from themes/nsf/assets/img/external-link.svg
rename to web/themes/nsf/assets/img/external-link.svg
diff --git a/themes/nsf/assets/img/favicons/favicon-114.png b/web/themes/nsf/assets/img/favicons/favicon-114.png
similarity index 100%
rename from themes/nsf/assets/img/favicons/favicon-114.png
rename to web/themes/nsf/assets/img/favicons/favicon-114.png
diff --git a/themes/nsf/assets/img/favicons/favicon-144.png b/web/themes/nsf/assets/img/favicons/favicon-144.png
similarity index 100%
rename from themes/nsf/assets/img/favicons/favicon-144.png
rename to web/themes/nsf/assets/img/favicons/favicon-144.png
diff --git a/themes/nsf/assets/img/favicons/favicon-16.png b/web/themes/nsf/assets/img/favicons/favicon-16.png
similarity index 100%
rename from themes/nsf/assets/img/favicons/favicon-16.png
rename to web/themes/nsf/assets/img/favicons/favicon-16.png
diff --git a/themes/nsf/assets/img/favicons/favicon-192.png b/web/themes/nsf/assets/img/favicons/favicon-192.png
similarity index 100%
rename from themes/nsf/assets/img/favicons/favicon-192.png
rename to web/themes/nsf/assets/img/favicons/favicon-192.png
diff --git a/themes/nsf/assets/img/favicons/favicon-40.png b/web/themes/nsf/assets/img/favicons/favicon-40.png
similarity index 100%
rename from themes/nsf/assets/img/favicons/favicon-40.png
rename to web/themes/nsf/assets/img/favicons/favicon-40.png
diff --git a/themes/nsf/assets/img/favicons/favicon-57.png b/web/themes/nsf/assets/img/favicons/favicon-57.png
similarity index 100%
rename from themes/nsf/assets/img/favicons/favicon-57.png
rename to web/themes/nsf/assets/img/favicons/favicon-57.png
diff --git a/themes/nsf/assets/img/favicons/favicon-72.png b/web/themes/nsf/assets/img/favicons/favicon-72.png
similarity index 100%
rename from themes/nsf/assets/img/favicons/favicon-72.png
rename to web/themes/nsf/assets/img/favicons/favicon-72.png
diff --git a/themes/nsf/assets/img/favicons/favicon.ico b/web/themes/nsf/assets/img/favicons/favicon.ico
similarity index 100%
rename from themes/nsf/assets/img/favicons/favicon.ico
rename to web/themes/nsf/assets/img/favicons/favicon.ico
diff --git a/themes/nsf/assets/img/favicons/favicon.png b/web/themes/nsf/assets/img/favicons/favicon.png
similarity index 100%
rename from themes/nsf/assets/img/favicons/favicon.png
rename to web/themes/nsf/assets/img/favicons/favicon.png
diff --git a/themes/nsf/assets/img/hero.png b/web/themes/nsf/assets/img/hero.png
similarity index 100%
rename from themes/nsf/assets/img/hero.png
rename to web/themes/nsf/assets/img/hero.png
diff --git a/themes/nsf/assets/img/icon-dot-gov.svg b/web/themes/nsf/assets/img/icon-dot-gov.svg
similarity index 100%
rename from themes/nsf/assets/img/icon-dot-gov.svg
rename to web/themes/nsf/assets/img/icon-dot-gov.svg
diff --git a/themes/nsf/assets/img/icon-https.svg b/web/themes/nsf/assets/img/icon-https.svg
similarity index 100%
rename from themes/nsf/assets/img/icon-https.svg
rename to web/themes/nsf/assets/img/icon-https.svg
diff --git a/themes/nsf/assets/img/logo-img.png b/web/themes/nsf/assets/img/logo-img.png
similarity index 100%
rename from themes/nsf/assets/img/logo-img.png
rename to web/themes/nsf/assets/img/logo-img.png
diff --git a/themes/nsf/assets/img/minus-alt.png b/web/themes/nsf/assets/img/minus-alt.png
similarity index 100%
rename from themes/nsf/assets/img/minus-alt.png
rename to web/themes/nsf/assets/img/minus-alt.png
diff --git a/themes/nsf/assets/img/minus-alt.svg b/web/themes/nsf/assets/img/minus-alt.svg
similarity index 100%
rename from themes/nsf/assets/img/minus-alt.svg
rename to web/themes/nsf/assets/img/minus-alt.svg
diff --git a/themes/nsf/assets/img/minus.png b/web/themes/nsf/assets/img/minus.png
similarity index 100%
rename from themes/nsf/assets/img/minus.png
rename to web/themes/nsf/assets/img/minus.png
diff --git a/themes/nsf/assets/img/minus.svg b/web/themes/nsf/assets/img/minus.svg
similarity index 100%
rename from themes/nsf/assets/img/minus.svg
rename to web/themes/nsf/assets/img/minus.svg
diff --git a/themes/nsf/assets/img/plus-alt.png b/web/themes/nsf/assets/img/plus-alt.png
similarity index 100%
rename from themes/nsf/assets/img/plus-alt.png
rename to web/themes/nsf/assets/img/plus-alt.png
diff --git a/themes/nsf/assets/img/plus-alt.svg b/web/themes/nsf/assets/img/plus-alt.svg
similarity index 100%
rename from themes/nsf/assets/img/plus-alt.svg
rename to web/themes/nsf/assets/img/plus-alt.svg
diff --git a/themes/nsf/assets/img/plus.png b/web/themes/nsf/assets/img/plus.png
similarity index 100%
rename from themes/nsf/assets/img/plus.png
rename to web/themes/nsf/assets/img/plus.png
diff --git a/themes/nsf/assets/img/plus.svg b/web/themes/nsf/assets/img/plus.svg
similarity index 100%
rename from themes/nsf/assets/img/plus.svg
rename to web/themes/nsf/assets/img/plus.svg
diff --git a/themes/nsf/assets/img/search-alt.png b/web/themes/nsf/assets/img/search-alt.png
similarity index 100%
rename from themes/nsf/assets/img/search-alt.png
rename to web/themes/nsf/assets/img/search-alt.png
diff --git a/themes/nsf/assets/img/search-alt.svg b/web/themes/nsf/assets/img/search-alt.svg
similarity index 100%
rename from themes/nsf/assets/img/search-alt.svg
rename to web/themes/nsf/assets/img/search-alt.svg
diff --git a/themes/nsf/assets/img/search-primary.png b/web/themes/nsf/assets/img/search-primary.png
similarity index 100%
rename from themes/nsf/assets/img/search-primary.png
rename to web/themes/nsf/assets/img/search-primary.png
diff --git a/themes/nsf/assets/img/search-primary.svg b/web/themes/nsf/assets/img/search-primary.svg
similarity index 100%
rename from themes/nsf/assets/img/search-primary.svg
rename to web/themes/nsf/assets/img/search-primary.svg
diff --git a/themes/nsf/assets/img/search.png b/web/themes/nsf/assets/img/search.png
similarity index 100%
rename from themes/nsf/assets/img/search.png
rename to web/themes/nsf/assets/img/search.png
diff --git a/themes/nsf/assets/img/search.svg b/web/themes/nsf/assets/img/search.svg
similarity index 100%
rename from themes/nsf/assets/img/search.svg
rename to web/themes/nsf/assets/img/search.svg
diff --git a/themes/nsf/assets/img/social-icons/png/facebook25.png b/web/themes/nsf/assets/img/social-icons/png/facebook25.png
similarity index 100%
rename from themes/nsf/assets/img/social-icons/png/facebook25.png
rename to web/themes/nsf/assets/img/social-icons/png/facebook25.png
diff --git a/themes/nsf/assets/img/social-icons/png/rss25.png b/web/themes/nsf/assets/img/social-icons/png/rss25.png
similarity index 100%
rename from themes/nsf/assets/img/social-icons/png/rss25.png
rename to web/themes/nsf/assets/img/social-icons/png/rss25.png
diff --git a/themes/nsf/assets/img/social-icons/png/twitter16.png b/web/themes/nsf/assets/img/social-icons/png/twitter16.png
similarity index 100%
rename from themes/nsf/assets/img/social-icons/png/twitter16.png
rename to web/themes/nsf/assets/img/social-icons/png/twitter16.png
diff --git a/themes/nsf/assets/img/social-icons/png/youtube15.png b/web/themes/nsf/assets/img/social-icons/png/youtube15.png
similarity index 100%
rename from themes/nsf/assets/img/social-icons/png/youtube15.png
rename to web/themes/nsf/assets/img/social-icons/png/youtube15.png
diff --git a/themes/nsf/assets/img/social-icons/svg/facebook25.svg b/web/themes/nsf/assets/img/social-icons/svg/facebook25.svg
similarity index 100%
rename from themes/nsf/assets/img/social-icons/svg/facebook25.svg
rename to web/themes/nsf/assets/img/social-icons/svg/facebook25.svg
diff --git a/themes/nsf/assets/img/social-icons/svg/rss25.svg b/web/themes/nsf/assets/img/social-icons/svg/rss25.svg
similarity index 100%
rename from themes/nsf/assets/img/social-icons/svg/rss25.svg
rename to web/themes/nsf/assets/img/social-icons/svg/rss25.svg
diff --git a/themes/nsf/assets/img/social-icons/svg/twitter16.svg b/web/themes/nsf/assets/img/social-icons/svg/twitter16.svg
similarity index 100%
rename from themes/nsf/assets/img/social-icons/svg/twitter16.svg
rename to web/themes/nsf/assets/img/social-icons/svg/twitter16.svg
diff --git a/themes/nsf/assets/img/social-icons/svg/youtube15.svg b/web/themes/nsf/assets/img/social-icons/svg/youtube15.svg
similarity index 100%
rename from themes/nsf/assets/img/social-icons/svg/youtube15.svg
rename to web/themes/nsf/assets/img/social-icons/svg/youtube15.svg
diff --git a/themes/nsf/assets/img/us_flag_small.png b/web/themes/nsf/assets/img/us_flag_small.png
similarity index 100%
rename from themes/nsf/assets/img/us_flag_small.png
rename to web/themes/nsf/assets/img/us_flag_small.png
diff --git a/themes/nsf/assets/js/uswds.js b/web/themes/nsf/assets/js/uswds.js
similarity index 100%
rename from themes/nsf/assets/js/uswds.js
rename to web/themes/nsf/assets/js/uswds.js
diff --git a/themes/nsf/assets/js/uswds.min.js b/web/themes/nsf/assets/js/uswds.min.js
similarity index 100%
rename from themes/nsf/assets/js/uswds.min.js
rename to web/themes/nsf/assets/js/uswds.min.js
diff --git a/themes/nsf/assets/js/uswds.min.js.map b/web/themes/nsf/assets/js/uswds.min.js.map
similarity index 100%
rename from themes/nsf/assets/js/uswds.min.js.map
rename to web/themes/nsf/assets/js/uswds.min.js.map
diff --git a/themes/nsf/assets/scss/_all.scss b/web/themes/nsf/assets/scss/_all.scss
similarity index 100%
rename from themes/nsf/assets/scss/_all.scss
rename to web/themes/nsf/assets/scss/_all.scss
diff --git a/themes/nsf/assets/scss/components/_accordions.scss b/web/themes/nsf/assets/scss/components/_accordions.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_accordions.scss
rename to web/themes/nsf/assets/scss/components/_accordions.scss
diff --git a/themes/nsf/assets/scss/components/_alerts.scss b/web/themes/nsf/assets/scss/components/_alerts.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_alerts.scss
rename to web/themes/nsf/assets/scss/components/_alerts.scss
diff --git a/themes/nsf/assets/scss/components/_banner.scss b/web/themes/nsf/assets/scss/components/_banner.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_banner.scss
rename to web/themes/nsf/assets/scss/components/_banner.scss
diff --git a/themes/nsf/assets/scss/components/_footer.scss b/web/themes/nsf/assets/scss/components/_footer.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_footer.scss
rename to web/themes/nsf/assets/scss/components/_footer.scss
diff --git a/themes/nsf/assets/scss/components/_forms.scss b/web/themes/nsf/assets/scss/components/_forms.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_forms.scss
rename to web/themes/nsf/assets/scss/components/_forms.scss
diff --git a/themes/nsf/assets/scss/components/_graphic-list.scss b/web/themes/nsf/assets/scss/components/_graphic-list.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_graphic-list.scss
rename to web/themes/nsf/assets/scss/components/_graphic-list.scss
diff --git a/themes/nsf/assets/scss/components/_header.scss b/web/themes/nsf/assets/scss/components/_header.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_header.scss
rename to web/themes/nsf/assets/scss/components/_header.scss
diff --git a/themes/nsf/assets/scss/components/_hero.scss b/web/themes/nsf/assets/scss/components/_hero.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_hero.scss
rename to web/themes/nsf/assets/scss/components/_hero.scss
diff --git a/themes/nsf/assets/scss/components/_layout.scss b/web/themes/nsf/assets/scss/components/_layout.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_layout.scss
rename to web/themes/nsf/assets/scss/components/_layout.scss
diff --git a/themes/nsf/assets/scss/components/_media-block.scss b/web/themes/nsf/assets/scss/components/_media-block.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_media-block.scss
rename to web/themes/nsf/assets/scss/components/_media-block.scss
diff --git a/themes/nsf/assets/scss/components/_navigation.scss b/web/themes/nsf/assets/scss/components/_navigation.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_navigation.scss
rename to web/themes/nsf/assets/scss/components/_navigation.scss
diff --git a/themes/nsf/assets/scss/components/_search.scss b/web/themes/nsf/assets/scss/components/_search.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_search.scss
rename to web/themes/nsf/assets/scss/components/_search.scss
diff --git a/themes/nsf/assets/scss/components/_section.scss b/web/themes/nsf/assets/scss/components/_section.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_section.scss
rename to web/themes/nsf/assets/scss/components/_section.scss
diff --git a/themes/nsf/assets/scss/components/_sidenav.scss b/web/themes/nsf/assets/scss/components/_sidenav.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_sidenav.scss
rename to web/themes/nsf/assets/scss/components/_sidenav.scss
diff --git a/themes/nsf/assets/scss/components/_skipnav.scss b/web/themes/nsf/assets/scss/components/_skipnav.scss
similarity index 100%
rename from themes/nsf/assets/scss/components/_skipnav.scss
rename to web/themes/nsf/assets/scss/components/_skipnav.scss
diff --git a/themes/nsf/assets/scss/core/_base.scss b/web/themes/nsf/assets/scss/core/_base.scss
similarity index 100%
rename from themes/nsf/assets/scss/core/_base.scss
rename to web/themes/nsf/assets/scss/core/_base.scss
diff --git a/themes/nsf/assets/scss/core/_defaults.scss b/web/themes/nsf/assets/scss/core/_defaults.scss
similarity index 100%
rename from themes/nsf/assets/scss/core/_defaults.scss
rename to web/themes/nsf/assets/scss/core/_defaults.scss
diff --git a/themes/nsf/assets/scss/core/_fonts.scss b/web/themes/nsf/assets/scss/core/_fonts.scss
similarity index 100%
rename from themes/nsf/assets/scss/core/_fonts.scss
rename to web/themes/nsf/assets/scss/core/_fonts.scss
diff --git a/themes/nsf/assets/scss/core/_grid-settings.scss b/web/themes/nsf/assets/scss/core/_grid-settings.scss
similarity index 100%
rename from themes/nsf/assets/scss/core/_grid-settings.scss
rename to web/themes/nsf/assets/scss/core/_grid-settings.scss
diff --git a/themes/nsf/assets/scss/core/_grid.scss b/web/themes/nsf/assets/scss/core/_grid.scss
similarity index 100%
rename from themes/nsf/assets/scss/core/_grid.scss
rename to web/themes/nsf/assets/scss/core/_grid.scss
diff --git a/themes/nsf/assets/scss/core/_utilities.scss b/web/themes/nsf/assets/scss/core/_utilities.scss
similarity index 100%
rename from themes/nsf/assets/scss/core/_utilities.scss
rename to web/themes/nsf/assets/scss/core/_utilities.scss
diff --git a/themes/nsf/assets/scss/core/_variables.scss b/web/themes/nsf/assets/scss/core/_variables.scss
similarity index 100%
rename from themes/nsf/assets/scss/core/_variables.scss
rename to web/themes/nsf/assets/scss/core/_variables.scss
diff --git a/themes/nsf/assets/scss/elements/_buttons.scss b/web/themes/nsf/assets/scss/elements/_buttons.scss
similarity index 100%
rename from themes/nsf/assets/scss/elements/_buttons.scss
rename to web/themes/nsf/assets/scss/elements/_buttons.scss
diff --git a/themes/nsf/assets/scss/elements/_embed.scss b/web/themes/nsf/assets/scss/elements/_embed.scss
similarity index 100%
rename from themes/nsf/assets/scss/elements/_embed.scss
rename to web/themes/nsf/assets/scss/elements/_embed.scss
diff --git a/themes/nsf/assets/scss/elements/_figure.scss b/web/themes/nsf/assets/scss/elements/_figure.scss
similarity index 100%
rename from themes/nsf/assets/scss/elements/_figure.scss
rename to web/themes/nsf/assets/scss/elements/_figure.scss
diff --git a/themes/nsf/assets/scss/elements/_inputs.scss b/web/themes/nsf/assets/scss/elements/_inputs.scss
similarity index 100%
rename from themes/nsf/assets/scss/elements/_inputs.scss
rename to web/themes/nsf/assets/scss/elements/_inputs.scss
diff --git a/themes/nsf/assets/scss/elements/_labels.scss b/web/themes/nsf/assets/scss/elements/_labels.scss
similarity index 100%
rename from themes/nsf/assets/scss/elements/_labels.scss
rename to web/themes/nsf/assets/scss/elements/_labels.scss
diff --git a/themes/nsf/assets/scss/elements/_list.scss b/web/themes/nsf/assets/scss/elements/_list.scss
similarity index 100%
rename from themes/nsf/assets/scss/elements/_list.scss
rename to web/themes/nsf/assets/scss/elements/_list.scss
diff --git a/themes/nsf/assets/scss/elements/_table.scss b/web/themes/nsf/assets/scss/elements/_table.scss
similarity index 100%
rename from themes/nsf/assets/scss/elements/_table.scss
rename to web/themes/nsf/assets/scss/elements/_table.scss
diff --git a/themes/nsf/assets/scss/elements/_typography.scss b/web/themes/nsf/assets/scss/elements/_typography.scss
similarity index 100%
rename from themes/nsf/assets/scss/elements/_typography.scss
rename to web/themes/nsf/assets/scss/elements/_typography.scss
diff --git a/themes/nsf/assets/scss/lib/_bourbon-deprecated-upcoming.scss b/web/themes/nsf/assets/scss/lib/_bourbon-deprecated-upcoming.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/_bourbon-deprecated-upcoming.scss
rename to web/themes/nsf/assets/scss/lib/_bourbon-deprecated-upcoming.scss
diff --git a/themes/nsf/assets/scss/lib/_bourbon.scss b/web/themes/nsf/assets/scss/lib/_bourbon.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/_bourbon.scss
rename to web/themes/nsf/assets/scss/lib/_bourbon.scss
diff --git a/themes/nsf/assets/scss/lib/_neat-helpers.scss b/web/themes/nsf/assets/scss/lib/_neat-helpers.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/_neat-helpers.scss
rename to web/themes/nsf/assets/scss/lib/_neat-helpers.scss
diff --git a/themes/nsf/assets/scss/lib/_neat.scss b/web/themes/nsf/assets/scss/lib/_neat.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/_neat.scss
rename to web/themes/nsf/assets/scss/lib/_neat.scss
diff --git a/themes/nsf/assets/scss/lib/_normalize.scss b/web/themes/nsf/assets/scss/lib/_normalize.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/_normalize.scss
rename to web/themes/nsf/assets/scss/lib/_normalize.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_border-color.scss b/web/themes/nsf/assets/scss/lib/addons/_border-color.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_border-color.scss
rename to web/themes/nsf/assets/scss/lib/addons/_border-color.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_border-radius.scss b/web/themes/nsf/assets/scss/lib/addons/_border-radius.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_border-radius.scss
rename to web/themes/nsf/assets/scss/lib/addons/_border-radius.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_border-style.scss b/web/themes/nsf/assets/scss/lib/addons/_border-style.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_border-style.scss
rename to web/themes/nsf/assets/scss/lib/addons/_border-style.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_border-width.scss b/web/themes/nsf/assets/scss/lib/addons/_border-width.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_border-width.scss
rename to web/themes/nsf/assets/scss/lib/addons/_border-width.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_buttons.scss b/web/themes/nsf/assets/scss/lib/addons/_buttons.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_buttons.scss
rename to web/themes/nsf/assets/scss/lib/addons/_buttons.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_clearfix.scss b/web/themes/nsf/assets/scss/lib/addons/_clearfix.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_clearfix.scss
rename to web/themes/nsf/assets/scss/lib/addons/_clearfix.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_ellipsis.scss b/web/themes/nsf/assets/scss/lib/addons/_ellipsis.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_ellipsis.scss
rename to web/themes/nsf/assets/scss/lib/addons/_ellipsis.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_font-stacks.scss b/web/themes/nsf/assets/scss/lib/addons/_font-stacks.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_font-stacks.scss
rename to web/themes/nsf/assets/scss/lib/addons/_font-stacks.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_hide-text.scss b/web/themes/nsf/assets/scss/lib/addons/_hide-text.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_hide-text.scss
rename to web/themes/nsf/assets/scss/lib/addons/_hide-text.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_margin.scss b/web/themes/nsf/assets/scss/lib/addons/_margin.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_margin.scss
rename to web/themes/nsf/assets/scss/lib/addons/_margin.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_padding.scss b/web/themes/nsf/assets/scss/lib/addons/_padding.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_padding.scss
rename to web/themes/nsf/assets/scss/lib/addons/_padding.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_position.scss b/web/themes/nsf/assets/scss/lib/addons/_position.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_position.scss
rename to web/themes/nsf/assets/scss/lib/addons/_position.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_prefixer.scss b/web/themes/nsf/assets/scss/lib/addons/_prefixer.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_prefixer.scss
rename to web/themes/nsf/assets/scss/lib/addons/_prefixer.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_retina-image.scss b/web/themes/nsf/assets/scss/lib/addons/_retina-image.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_retina-image.scss
rename to web/themes/nsf/assets/scss/lib/addons/_retina-image.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_size.scss b/web/themes/nsf/assets/scss/lib/addons/_size.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_size.scss
rename to web/themes/nsf/assets/scss/lib/addons/_size.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_text-inputs.scss b/web/themes/nsf/assets/scss/lib/addons/_text-inputs.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_text-inputs.scss
rename to web/themes/nsf/assets/scss/lib/addons/_text-inputs.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_timing-functions.scss b/web/themes/nsf/assets/scss/lib/addons/_timing-functions.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_timing-functions.scss
rename to web/themes/nsf/assets/scss/lib/addons/_timing-functions.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_triangle.scss b/web/themes/nsf/assets/scss/lib/addons/_triangle.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_triangle.scss
rename to web/themes/nsf/assets/scss/lib/addons/_triangle.scss
diff --git a/themes/nsf/assets/scss/lib/addons/_word-wrap.scss b/web/themes/nsf/assets/scss/lib/addons/_word-wrap.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/addons/_word-wrap.scss
rename to web/themes/nsf/assets/scss/lib/addons/_word-wrap.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_animation.scss b/web/themes/nsf/assets/scss/lib/css3/_animation.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_animation.scss
rename to web/themes/nsf/assets/scss/lib/css3/_animation.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_appearance.scss b/web/themes/nsf/assets/scss/lib/css3/_appearance.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_appearance.scss
rename to web/themes/nsf/assets/scss/lib/css3/_appearance.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_backface-visibility.scss b/web/themes/nsf/assets/scss/lib/css3/_backface-visibility.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_backface-visibility.scss
rename to web/themes/nsf/assets/scss/lib/css3/_backface-visibility.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_background-image.scss b/web/themes/nsf/assets/scss/lib/css3/_background-image.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_background-image.scss
rename to web/themes/nsf/assets/scss/lib/css3/_background-image.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_background.scss b/web/themes/nsf/assets/scss/lib/css3/_background.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_background.scss
rename to web/themes/nsf/assets/scss/lib/css3/_background.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_border-image.scss b/web/themes/nsf/assets/scss/lib/css3/_border-image.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_border-image.scss
rename to web/themes/nsf/assets/scss/lib/css3/_border-image.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_calc.scss b/web/themes/nsf/assets/scss/lib/css3/_calc.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_calc.scss
rename to web/themes/nsf/assets/scss/lib/css3/_calc.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_columns.scss b/web/themes/nsf/assets/scss/lib/css3/_columns.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_columns.scss
rename to web/themes/nsf/assets/scss/lib/css3/_columns.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_filter.scss b/web/themes/nsf/assets/scss/lib/css3/_filter.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_filter.scss
rename to web/themes/nsf/assets/scss/lib/css3/_filter.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_flex-box.scss b/web/themes/nsf/assets/scss/lib/css3/_flex-box.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_flex-box.scss
rename to web/themes/nsf/assets/scss/lib/css3/_flex-box.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_font-face.scss b/web/themes/nsf/assets/scss/lib/css3/_font-face.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_font-face.scss
rename to web/themes/nsf/assets/scss/lib/css3/_font-face.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_font-feature-settings.scss b/web/themes/nsf/assets/scss/lib/css3/_font-feature-settings.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_font-feature-settings.scss
rename to web/themes/nsf/assets/scss/lib/css3/_font-feature-settings.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_hidpi-media-query.scss b/web/themes/nsf/assets/scss/lib/css3/_hidpi-media-query.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_hidpi-media-query.scss
rename to web/themes/nsf/assets/scss/lib/css3/_hidpi-media-query.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_hyphens.scss b/web/themes/nsf/assets/scss/lib/css3/_hyphens.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_hyphens.scss
rename to web/themes/nsf/assets/scss/lib/css3/_hyphens.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_image-rendering.scss b/web/themes/nsf/assets/scss/lib/css3/_image-rendering.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_image-rendering.scss
rename to web/themes/nsf/assets/scss/lib/css3/_image-rendering.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_keyframes.scss b/web/themes/nsf/assets/scss/lib/css3/_keyframes.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_keyframes.scss
rename to web/themes/nsf/assets/scss/lib/css3/_keyframes.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_linear-gradient.scss b/web/themes/nsf/assets/scss/lib/css3/_linear-gradient.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_linear-gradient.scss
rename to web/themes/nsf/assets/scss/lib/css3/_linear-gradient.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_perspective.scss b/web/themes/nsf/assets/scss/lib/css3/_perspective.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_perspective.scss
rename to web/themes/nsf/assets/scss/lib/css3/_perspective.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_placeholder.scss b/web/themes/nsf/assets/scss/lib/css3/_placeholder.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_placeholder.scss
rename to web/themes/nsf/assets/scss/lib/css3/_placeholder.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_radial-gradient.scss b/web/themes/nsf/assets/scss/lib/css3/_radial-gradient.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_radial-gradient.scss
rename to web/themes/nsf/assets/scss/lib/css3/_radial-gradient.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_selection.scss b/web/themes/nsf/assets/scss/lib/css3/_selection.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_selection.scss
rename to web/themes/nsf/assets/scss/lib/css3/_selection.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_text-decoration.scss b/web/themes/nsf/assets/scss/lib/css3/_text-decoration.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_text-decoration.scss
rename to web/themes/nsf/assets/scss/lib/css3/_text-decoration.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_transform.scss b/web/themes/nsf/assets/scss/lib/css3/_transform.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_transform.scss
rename to web/themes/nsf/assets/scss/lib/css3/_transform.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_transition.scss b/web/themes/nsf/assets/scss/lib/css3/_transition.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_transition.scss
rename to web/themes/nsf/assets/scss/lib/css3/_transition.scss
diff --git a/themes/nsf/assets/scss/lib/css3/_user-select.scss b/web/themes/nsf/assets/scss/lib/css3/_user-select.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/css3/_user-select.scss
rename to web/themes/nsf/assets/scss/lib/css3/_user-select.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_assign-inputs.scss b/web/themes/nsf/assets/scss/lib/functions/_assign-inputs.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_assign-inputs.scss
rename to web/themes/nsf/assets/scss/lib/functions/_assign-inputs.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_contains-falsy.scss b/web/themes/nsf/assets/scss/lib/functions/_contains-falsy.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_contains-falsy.scss
rename to web/themes/nsf/assets/scss/lib/functions/_contains-falsy.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_contains.scss b/web/themes/nsf/assets/scss/lib/functions/_contains.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_contains.scss
rename to web/themes/nsf/assets/scss/lib/functions/_contains.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_is-length.scss b/web/themes/nsf/assets/scss/lib/functions/_is-length.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_is-length.scss
rename to web/themes/nsf/assets/scss/lib/functions/_is-length.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_is-light.scss b/web/themes/nsf/assets/scss/lib/functions/_is-light.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_is-light.scss
rename to web/themes/nsf/assets/scss/lib/functions/_is-light.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_is-number.scss b/web/themes/nsf/assets/scss/lib/functions/_is-number.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_is-number.scss
rename to web/themes/nsf/assets/scss/lib/functions/_is-number.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_is-size.scss b/web/themes/nsf/assets/scss/lib/functions/_is-size.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_is-size.scss
rename to web/themes/nsf/assets/scss/lib/functions/_is-size.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_modular-scale.scss b/web/themes/nsf/assets/scss/lib/functions/_modular-scale.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_modular-scale.scss
rename to web/themes/nsf/assets/scss/lib/functions/_modular-scale.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_new-breakpoint.scss b/web/themes/nsf/assets/scss/lib/functions/_new-breakpoint.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_new-breakpoint.scss
rename to web/themes/nsf/assets/scss/lib/functions/_new-breakpoint.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_private.scss b/web/themes/nsf/assets/scss/lib/functions/_private.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_private.scss
rename to web/themes/nsf/assets/scss/lib/functions/_private.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_px-to-em.scss b/web/themes/nsf/assets/scss/lib/functions/_px-to-em.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_px-to-em.scss
rename to web/themes/nsf/assets/scss/lib/functions/_px-to-em.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_px-to-rem.scss b/web/themes/nsf/assets/scss/lib/functions/_px-to-rem.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_px-to-rem.scss
rename to web/themes/nsf/assets/scss/lib/functions/_px-to-rem.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_shade.scss b/web/themes/nsf/assets/scss/lib/functions/_shade.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_shade.scss
rename to web/themes/nsf/assets/scss/lib/functions/_shade.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_strip-units.scss b/web/themes/nsf/assets/scss/lib/functions/_strip-units.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_strip-units.scss
rename to web/themes/nsf/assets/scss/lib/functions/_strip-units.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_tint.scss b/web/themes/nsf/assets/scss/lib/functions/_tint.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_tint.scss
rename to web/themes/nsf/assets/scss/lib/functions/_tint.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_transition-property-name.scss b/web/themes/nsf/assets/scss/lib/functions/_transition-property-name.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_transition-property-name.scss
rename to web/themes/nsf/assets/scss/lib/functions/_transition-property-name.scss
diff --git a/themes/nsf/assets/scss/lib/functions/_unpack.scss b/web/themes/nsf/assets/scss/lib/functions/_unpack.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/functions/_unpack.scss
rename to web/themes/nsf/assets/scss/lib/functions/_unpack.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_box-sizing.scss b/web/themes/nsf/assets/scss/lib/grid/_box-sizing.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_box-sizing.scss
rename to web/themes/nsf/assets/scss/lib/grid/_box-sizing.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_direction-context.scss b/web/themes/nsf/assets/scss/lib/grid/_direction-context.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_direction-context.scss
rename to web/themes/nsf/assets/scss/lib/grid/_direction-context.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_display-context.scss b/web/themes/nsf/assets/scss/lib/grid/_display-context.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_display-context.scss
rename to web/themes/nsf/assets/scss/lib/grid/_display-context.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_fill-parent.scss b/web/themes/nsf/assets/scss/lib/grid/_fill-parent.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_fill-parent.scss
rename to web/themes/nsf/assets/scss/lib/grid/_fill-parent.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_media.scss b/web/themes/nsf/assets/scss/lib/grid/_media.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_media.scss
rename to web/themes/nsf/assets/scss/lib/grid/_media.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_omega.scss b/web/themes/nsf/assets/scss/lib/grid/_omega.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_omega.scss
rename to web/themes/nsf/assets/scss/lib/grid/_omega.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_outer-container.scss b/web/themes/nsf/assets/scss/lib/grid/_outer-container.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_outer-container.scss
rename to web/themes/nsf/assets/scss/lib/grid/_outer-container.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_pad.scss b/web/themes/nsf/assets/scss/lib/grid/_pad.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_pad.scss
rename to web/themes/nsf/assets/scss/lib/grid/_pad.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_private.scss b/web/themes/nsf/assets/scss/lib/grid/_private.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_private.scss
rename to web/themes/nsf/assets/scss/lib/grid/_private.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_row.scss b/web/themes/nsf/assets/scss/lib/grid/_row.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_row.scss
rename to web/themes/nsf/assets/scss/lib/grid/_row.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_shift.scss b/web/themes/nsf/assets/scss/lib/grid/_shift.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_shift.scss
rename to web/themes/nsf/assets/scss/lib/grid/_shift.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_span-columns.scss b/web/themes/nsf/assets/scss/lib/grid/_span-columns.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_span-columns.scss
rename to web/themes/nsf/assets/scss/lib/grid/_span-columns.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_to-deprecate.scss b/web/themes/nsf/assets/scss/lib/grid/_to-deprecate.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_to-deprecate.scss
rename to web/themes/nsf/assets/scss/lib/grid/_to-deprecate.scss
diff --git a/themes/nsf/assets/scss/lib/grid/_visual-grid.scss b/web/themes/nsf/assets/scss/lib/grid/_visual-grid.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/grid/_visual-grid.scss
rename to web/themes/nsf/assets/scss/lib/grid/_visual-grid.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_convert-units.scss b/web/themes/nsf/assets/scss/lib/helpers/_convert-units.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_convert-units.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_convert-units.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_directional-values.scss b/web/themes/nsf/assets/scss/lib/helpers/_directional-values.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_directional-values.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_directional-values.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_font-source-declaration.scss b/web/themes/nsf/assets/scss/lib/helpers/_font-source-declaration.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_font-source-declaration.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_font-source-declaration.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_gradient-positions-parser.scss b/web/themes/nsf/assets/scss/lib/helpers/_gradient-positions-parser.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_gradient-positions-parser.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_gradient-positions-parser.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_linear-angle-parser.scss b/web/themes/nsf/assets/scss/lib/helpers/_linear-angle-parser.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_linear-angle-parser.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_linear-angle-parser.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_linear-gradient-parser.scss b/web/themes/nsf/assets/scss/lib/helpers/_linear-gradient-parser.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_linear-gradient-parser.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_linear-gradient-parser.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_linear-positions-parser.scss b/web/themes/nsf/assets/scss/lib/helpers/_linear-positions-parser.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_linear-positions-parser.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_linear-positions-parser.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_linear-side-corner-parser.scss b/web/themes/nsf/assets/scss/lib/helpers/_linear-side-corner-parser.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_linear-side-corner-parser.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_linear-side-corner-parser.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_radial-arg-parser.scss b/web/themes/nsf/assets/scss/lib/helpers/_radial-arg-parser.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_radial-arg-parser.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_radial-arg-parser.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_radial-gradient-parser.scss b/web/themes/nsf/assets/scss/lib/helpers/_radial-gradient-parser.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_radial-gradient-parser.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_radial-gradient-parser.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_radial-positions-parser.scss b/web/themes/nsf/assets/scss/lib/helpers/_radial-positions-parser.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_radial-positions-parser.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_radial-positions-parser.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_render-gradients.scss b/web/themes/nsf/assets/scss/lib/helpers/_render-gradients.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_render-gradients.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_render-gradients.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_shape-size-stripper.scss b/web/themes/nsf/assets/scss/lib/helpers/_shape-size-stripper.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_shape-size-stripper.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_shape-size-stripper.scss
diff --git a/themes/nsf/assets/scss/lib/helpers/_str-to-num.scss b/web/themes/nsf/assets/scss/lib/helpers/_str-to-num.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/helpers/_str-to-num.scss
rename to web/themes/nsf/assets/scss/lib/helpers/_str-to-num.scss
diff --git a/themes/nsf/assets/scss/lib/mixins/_clearfix.scss b/web/themes/nsf/assets/scss/lib/mixins/_clearfix.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/mixins/_clearfix.scss
rename to web/themes/nsf/assets/scss/lib/mixins/_clearfix.scss
diff --git a/themes/nsf/assets/scss/lib/settings/_asset-pipeline.scss b/web/themes/nsf/assets/scss/lib/settings/_asset-pipeline.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/settings/_asset-pipeline.scss
rename to web/themes/nsf/assets/scss/lib/settings/_asset-pipeline.scss
diff --git a/themes/nsf/assets/scss/lib/settings/_disable-warnings.scss b/web/themes/nsf/assets/scss/lib/settings/_disable-warnings.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/settings/_disable-warnings.scss
rename to web/themes/nsf/assets/scss/lib/settings/_disable-warnings.scss
diff --git a/themes/nsf/assets/scss/lib/settings/_grid.scss b/web/themes/nsf/assets/scss/lib/settings/_grid.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/settings/_grid.scss
rename to web/themes/nsf/assets/scss/lib/settings/_grid.scss
diff --git a/themes/nsf/assets/scss/lib/settings/_prefixer.scss b/web/themes/nsf/assets/scss/lib/settings/_prefixer.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/settings/_prefixer.scss
rename to web/themes/nsf/assets/scss/lib/settings/_prefixer.scss
diff --git a/themes/nsf/assets/scss/lib/settings/_px-to-em.scss b/web/themes/nsf/assets/scss/lib/settings/_px-to-em.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/settings/_px-to-em.scss
rename to web/themes/nsf/assets/scss/lib/settings/_px-to-em.scss
diff --git a/themes/nsf/assets/scss/lib/settings/_visual-grid.scss b/web/themes/nsf/assets/scss/lib/settings/_visual-grid.scss
similarity index 100%
rename from themes/nsf/assets/scss/lib/settings/_visual-grid.scss
rename to web/themes/nsf/assets/scss/lib/settings/_visual-grid.scss
diff --git a/themes/nsf/assets/scss/uswds.scss b/web/themes/nsf/assets/scss/uswds.scss
similarity index 100%
rename from themes/nsf/assets/scss/uswds.scss
rename to web/themes/nsf/assets/scss/uswds.scss
diff --git a/themes/nsf/logo.png b/web/themes/nsf/logo.png
similarity index 100%
rename from themes/nsf/logo.png
rename to web/themes/nsf/logo.png
diff --git a/themes/nsf/nsf.info.yml b/web/themes/nsf/nsf.info.yml
similarity index 100%
rename from themes/nsf/nsf.info.yml
rename to web/themes/nsf/nsf.info.yml
diff --git a/themes/nsf/nsf.theme b/web/themes/nsf/nsf.theme
similarity index 100%
rename from themes/nsf/nsf.theme
rename to web/themes/nsf/nsf.theme
diff --git a/themes/nsf/package-lock.json b/web/themes/nsf/package-lock.json
similarity index 100%
rename from themes/nsf/package-lock.json
rename to web/themes/nsf/package-lock.json
diff --git a/themes/nsf/package.json b/web/themes/nsf/package.json
similarity index 100%
rename from themes/nsf/package.json
rename to web/themes/nsf/package.json
diff --git a/themes/nsf/preprocess/README.md b/web/themes/nsf/preprocess/README.md
similarity index 100%
rename from themes/nsf/preprocess/README.md
rename to web/themes/nsf/preprocess/README.md
diff --git a/themes/nsf/process/README.md b/web/themes/nsf/process/README.md
similarity index 100%
rename from themes/nsf/process/README.md
rename to web/themes/nsf/process/README.md
diff --git a/themes/nsf/sass/_variables.scss b/web/themes/nsf/sass/_variables.scss
similarity index 100%
rename from themes/nsf/sass/_variables.scss
rename to web/themes/nsf/sass/_variables.scss
diff --git a/themes/nsf/sass/uswds.scss b/web/themes/nsf/sass/uswds.scss
similarity index 100%
rename from themes/nsf/sass/uswds.scss
rename to web/themes/nsf/sass/uswds.scss
diff --git a/themes/nsf/templates/system/fields/field--field-subtitle.html.twig b/web/themes/nsf/templates/system/fields/field--field-subtitle.html.twig
similarity index 100%
rename from themes/nsf/templates/system/fields/field--field-subtitle.html.twig
rename to web/themes/nsf/templates/system/fields/field--field-subtitle.html.twig
diff --git a/themes/nsf/templates/system/layout/page--front.html.twig b/web/themes/nsf/templates/system/layout/page--front.html.twig
similarity index 100%
rename from themes/nsf/templates/system/layout/page--front.html.twig
rename to web/themes/nsf/templates/system/layout/page--front.html.twig
diff --git a/themes/nsf/templates/system/layout/page.html.twig b/web/themes/nsf/templates/system/layout/page.html.twig
similarity index 100%
rename from themes/nsf/templates/system/layout/page.html.twig
rename to web/themes/nsf/templates/system/layout/page.html.twig
diff --git a/themes/uswds/.gitignore b/web/themes/uswds/.gitignore
similarity index 100%
rename from themes/uswds/.gitignore
rename to web/themes/uswds/.gitignore
diff --git a/themes/bootstrap/LICENSE.txt b/web/themes/uswds/LICENSE.txt
similarity index 100%
rename from themes/bootstrap/LICENSE.txt
rename to web/themes/uswds/LICENSE.txt
diff --git a/themes/uswds/README.md b/web/themes/uswds/README.md
similarity index 100%
rename from themes/uswds/README.md
rename to web/themes/uswds/README.md
diff --git a/themes/uswds/composer.json b/web/themes/uswds/composer.json
similarity index 100%
rename from themes/uswds/composer.json
rename to web/themes/uswds/composer.json
diff --git a/themes/uswds/css/style.css b/web/themes/uswds/css/style.css
similarity index 100%
rename from themes/uswds/css/style.css
rename to web/themes/uswds/css/style.css
diff --git a/themes/uswds/examples/my_subtheme/.gitignore b/web/themes/uswds/examples/my_subtheme/.gitignore
similarity index 100%
rename from themes/uswds/examples/my_subtheme/.gitignore
rename to web/themes/uswds/examples/my_subtheme/.gitignore
diff --git a/themes/uswds/examples/my_subtheme/README.md b/web/themes/uswds/examples/my_subtheme/README.md
similarity index 100%
rename from themes/uswds/examples/my_subtheme/README.md
rename to web/themes/uswds/examples/my_subtheme/README.md
diff --git a/themes/uswds/examples/my_subtheme/logo.svg b/web/themes/uswds/examples/my_subtheme/logo.svg
similarity index 100%
rename from themes/uswds/examples/my_subtheme/logo.svg
rename to web/themes/uswds/examples/my_subtheme/logo.svg
diff --git a/themes/uswds/examples/my_subtheme/my_subtheme.info.yml.rename-me b/web/themes/uswds/examples/my_subtheme/my_subtheme.info.yml.rename-me
similarity index 100%
rename from themes/uswds/examples/my_subtheme/my_subtheme.info.yml.rename-me
rename to web/themes/uswds/examples/my_subtheme/my_subtheme.info.yml.rename-me
diff --git a/themes/uswds/examples/my_subtheme/package.json b/web/themes/uswds/examples/my_subtheme/package.json
similarity index 100%
rename from themes/uswds/examples/my_subtheme/package.json
rename to web/themes/uswds/examples/my_subtheme/package.json
diff --git a/themes/uswds/examples/my_subtheme/preprocess/README.md b/web/themes/uswds/examples/my_subtheme/preprocess/README.md
similarity index 100%
rename from themes/uswds/examples/my_subtheme/preprocess/README.md
rename to web/themes/uswds/examples/my_subtheme/preprocess/README.md
diff --git a/themes/uswds/examples/my_subtheme/process/README.md b/web/themes/uswds/examples/my_subtheme/process/README.md
similarity index 100%
rename from themes/uswds/examples/my_subtheme/process/README.md
rename to web/themes/uswds/examples/my_subtheme/process/README.md
diff --git a/themes/uswds/examples/my_subtheme/sass/_variables.scss b/web/themes/uswds/examples/my_subtheme/sass/_variables.scss
similarity index 100%
rename from themes/uswds/examples/my_subtheme/sass/_variables.scss
rename to web/themes/uswds/examples/my_subtheme/sass/_variables.scss
diff --git a/themes/uswds/examples/my_subtheme/sass/uswds.scss b/web/themes/uswds/examples/my_subtheme/sass/uswds.scss
similarity index 100%
rename from themes/uswds/examples/my_subtheme/sass/uswds.scss
rename to web/themes/uswds/examples/my_subtheme/sass/uswds.scss
diff --git a/themes/uswds/form/README.md b/web/themes/uswds/form/README.md
similarity index 100%
rename from themes/uswds/form/README.md
rename to web/themes/uswds/form/README.md
diff --git a/themes/uswds/form/form.form.inc b/web/themes/uswds/form/form.form.inc
similarity index 100%
rename from themes/uswds/form/form.form.inc
rename to web/themes/uswds/form/form.form.inc
diff --git a/themes/uswds/form/node.form.inc b/web/themes/uswds/form/node.form.inc
similarity index 100%
rename from themes/uswds/form/node.form.inc
rename to web/themes/uswds/form/node.form.inc
diff --git a/themes/uswds/form/search_block.form.inc b/web/themes/uswds/form/search_block.form.inc
similarity index 100%
rename from themes/uswds/form/search_block.form.inc
rename to web/themes/uswds/form/search_block.form.inc
diff --git a/themes/uswds/form/user_login_form.form.inc b/web/themes/uswds/form/user_login_form.form.inc
similarity index 100%
rename from themes/uswds/form/user_login_form.form.inc
rename to web/themes/uswds/form/user_login_form.form.inc
diff --git a/themes/uswds/form/user_profile_form.form.inc b/web/themes/uswds/form/user_profile_form.form.inc
similarity index 100%
rename from themes/uswds/form/user_profile_form.form.inc
rename to web/themes/uswds/form/user_profile_form.form.inc
diff --git a/themes/uswds/form/user_register_form.form.inc b/web/themes/uswds/form/user_register_form.form.inc
similarity index 100%
rename from themes/uswds/form/user_register_form.form.inc
rename to web/themes/uswds/form/user_register_form.form.inc
diff --git a/themes/uswds/includes/base_themes.inc b/web/themes/uswds/includes/base_themes.inc
similarity index 100%
rename from themes/uswds/includes/base_themes.inc
rename to web/themes/uswds/includes/base_themes.inc
diff --git a/themes/uswds/includes/edge_to_edge.inc b/web/themes/uswds/includes/edge_to_edge.inc
similarity index 100%
rename from themes/uswds/includes/edge_to_edge.inc
rename to web/themes/uswds/includes/edge_to_edge.inc
diff --git a/themes/uswds/includes/forms.inc b/web/themes/uswds/includes/forms.inc
similarity index 100%
rename from themes/uswds/includes/forms.inc
rename to web/themes/uswds/includes/forms.inc
diff --git a/themes/uswds/includes/menus.inc b/web/themes/uswds/includes/menus.inc
similarity index 100%
rename from themes/uswds/includes/menus.inc
rename to web/themes/uswds/includes/menus.inc
diff --git a/themes/uswds/logo.svg b/web/themes/uswds/logo.svg
similarity index 100%
rename from themes/uswds/logo.svg
rename to web/themes/uswds/logo.svg
diff --git a/themes/uswds/preprocess/block/block.preprocess.inc b/web/themes/uswds/preprocess/block/block.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/block/block.preprocess.inc
rename to web/themes/uswds/preprocess/block/block.preprocess.inc
diff --git a/themes/uswds/preprocess/block/block__local_actions_block.preprocess.inc b/web/themes/uswds/preprocess/block/block__local_actions_block.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/block/block__local_actions_block.preprocess.inc
rename to web/themes/uswds/preprocess/block/block__local_actions_block.preprocess.inc
diff --git a/themes/uswds/preprocess/block/block__system_menu_block__footer_menu.preprocess.inc b/web/themes/uswds/preprocess/block/block__system_menu_block__footer_menu.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/block/block__system_menu_block__footer_menu.preprocess.inc
rename to web/themes/uswds/preprocess/block/block__system_menu_block__footer_menu.preprocess.inc
diff --git a/themes/uswds/preprocess/block/block__system_menu_block__mobile_menu.preprocess.inc b/web/themes/uswds/preprocess/block/block__system_menu_block__mobile_menu.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/block/block__system_menu_block__mobile_menu.preprocess.inc
rename to web/themes/uswds/preprocess/block/block__system_menu_block__mobile_menu.preprocess.inc
diff --git a/themes/uswds/preprocess/block/block__system_menu_block__primary_menu.preprocess.inc b/web/themes/uswds/preprocess/block/block__system_menu_block__primary_menu.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/block/block__system_menu_block__primary_menu.preprocess.inc
rename to web/themes/uswds/preprocess/block/block__system_menu_block__primary_menu.preprocess.inc
diff --git a/themes/uswds/preprocess/block/block__system_menu_block__secondary_menu.preprocess.inc b/web/themes/uswds/preprocess/block/block__system_menu_block__secondary_menu.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/block/block__system_menu_block__secondary_menu.preprocess.inc
rename to web/themes/uswds/preprocess/block/block__system_menu_block__secondary_menu.preprocess.inc
diff --git a/themes/uswds/preprocess/block/block__system_menu_block__sidebar_first.preprocess.inc b/web/themes/uswds/preprocess/block/block__system_menu_block__sidebar_first.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/block/block__system_menu_block__sidebar_first.preprocess.inc
rename to web/themes/uswds/preprocess/block/block__system_menu_block__sidebar_first.preprocess.inc
diff --git a/themes/uswds/preprocess/block/page_title.preprocess.inc b/web/themes/uswds/preprocess/block/page_title.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/block/page_title.preprocess.inc
rename to web/themes/uswds/preprocess/block/page_title.preprocess.inc
diff --git a/themes/uswds/preprocess/element/details.preprocess.inc b/web/themes/uswds/preprocess/element/details.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/element/details.preprocess.inc
rename to web/themes/uswds/preprocess/element/details.preprocess.inc
diff --git a/themes/uswds/preprocess/element/form_element.preprocess.inc b/web/themes/uswds/preprocess/element/form_element.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/element/form_element.preprocess.inc
rename to web/themes/uswds/preprocess/element/form_element.preprocess.inc
diff --git a/themes/uswds/preprocess/element/form_element_label.preprocess.inc b/web/themes/uswds/preprocess/element/form_element_label.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/element/form_element_label.preprocess.inc
rename to web/themes/uswds/preprocess/element/form_element_label.preprocess.inc
diff --git a/themes/uswds/preprocess/element/vertical_tabs.preprocess.inc b/web/themes/uswds/preprocess/element/vertical_tabs.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/element/vertical_tabs.preprocess.inc
rename to web/themes/uswds/preprocess/element/vertical_tabs.preprocess.inc
diff --git a/themes/uswds/preprocess/layout/page.preprocess.inc b/web/themes/uswds/preprocess/layout/page.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/layout/page.preprocess.inc
rename to web/themes/uswds/preprocess/layout/page.preprocess.inc
diff --git a/themes/uswds/preprocess/menu/menu__footer_menu.preprocess.inc b/web/themes/uswds/preprocess/menu/menu__footer_menu.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/menu/menu__footer_menu.preprocess.inc
rename to web/themes/uswds/preprocess/menu/menu__footer_menu.preprocess.inc
diff --git a/themes/uswds/preprocess/menu/menu__mobile_menu.preprocess.inc b/web/themes/uswds/preprocess/menu/menu__mobile_menu.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/menu/menu__mobile_menu.preprocess.inc
rename to web/themes/uswds/preprocess/menu/menu__mobile_menu.preprocess.inc
diff --git a/themes/uswds/preprocess/menu/menu__primary_menu.preprocess.inc b/web/themes/uswds/preprocess/menu/menu__primary_menu.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/menu/menu__primary_menu.preprocess.inc
rename to web/themes/uswds/preprocess/menu/menu__primary_menu.preprocess.inc
diff --git a/themes/uswds/preprocess/menu/menu__secondary_menu.preprocess.inc b/web/themes/uswds/preprocess/menu/menu__secondary_menu.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/menu/menu__secondary_menu.preprocess.inc
rename to web/themes/uswds/preprocess/menu/menu__secondary_menu.preprocess.inc
diff --git a/themes/uswds/preprocess/menu/menu_local_action.preprocess.inc b/web/themes/uswds/preprocess/menu/menu_local_action.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/menu/menu_local_action.preprocess.inc
rename to web/themes/uswds/preprocess/menu/menu_local_action.preprocess.inc
diff --git a/themes/uswds/preprocess/menu/menu_local_tasks.preprocess.inc b/web/themes/uswds/preprocess/menu/menu_local_tasks.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/menu/menu_local_tasks.preprocess.inc
rename to web/themes/uswds/preprocess/menu/menu_local_tasks.preprocess.inc
diff --git a/themes/uswds/preprocess/paragraph/paragraph.preprocess.inc b/web/themes/uswds/preprocess/paragraph/paragraph.preprocess.inc
similarity index 100%
rename from themes/uswds/preprocess/paragraph/paragraph.preprocess.inc
rename to web/themes/uswds/preprocess/paragraph/paragraph.preprocess.inc
diff --git a/themes/uswds/screenshot.png b/web/themes/uswds/screenshot.png
similarity index 100%
rename from themes/uswds/screenshot.png
rename to web/themes/uswds/screenshot.png
diff --git a/themes/uswds/templates/system/block/block--system-branding-block.html.twig b/web/themes/uswds/templates/system/block/block--system-branding-block.html.twig
similarity index 100%
rename from themes/uswds/templates/system/block/block--system-branding-block.html.twig
rename to web/themes/uswds/templates/system/block/block--system-branding-block.html.twig
diff --git a/themes/uswds/templates/system/block/block--system-menu-block--footer_menu.html.twig b/web/themes/uswds/templates/system/block/block--system-menu-block--footer_menu.html.twig
similarity index 100%
rename from themes/uswds/templates/system/block/block--system-menu-block--footer_menu.html.twig
rename to web/themes/uswds/templates/system/block/block--system-menu-block--footer_menu.html.twig
diff --git a/themes/uswds/templates/system/block/block--system-menu-block--mobile_menu.html.twig b/web/themes/uswds/templates/system/block/block--system-menu-block--mobile_menu.html.twig
similarity index 100%
rename from themes/uswds/templates/system/block/block--system-menu-block--mobile_menu.html.twig
rename to web/themes/uswds/templates/system/block/block--system-menu-block--mobile_menu.html.twig
diff --git a/themes/uswds/templates/system/block/block--system-menu-block--primary_menu.html.twig b/web/themes/uswds/templates/system/block/block--system-menu-block--primary_menu.html.twig
similarity index 100%
rename from themes/uswds/templates/system/block/block--system-menu-block--primary_menu.html.twig
rename to web/themes/uswds/templates/system/block/block--system-menu-block--primary_menu.html.twig
diff --git a/themes/uswds/templates/system/block/block--system-menu-block--secondary_menu.html.twig b/web/themes/uswds/templates/system/block/block--system-menu-block--secondary_menu.html.twig
similarity index 100%
rename from themes/uswds/templates/system/block/block--system-menu-block--secondary_menu.html.twig
rename to web/themes/uswds/templates/system/block/block--system-menu-block--secondary_menu.html.twig
diff --git a/themes/uswds/templates/system/block/block--system-menu-block--sidebar_first.html.twig b/web/themes/uswds/templates/system/block/block--system-menu-block--sidebar_first.html.twig
similarity index 100%
rename from themes/uswds/templates/system/block/block--system-menu-block--sidebar_first.html.twig
rename to web/themes/uswds/templates/system/block/block--system-menu-block--sidebar_first.html.twig
diff --git a/themes/uswds/templates/system/block/breadcrumb.html.twig b/web/themes/uswds/templates/system/block/breadcrumb.html.twig
similarity index 100%
rename from themes/uswds/templates/system/block/breadcrumb.html.twig
rename to web/themes/uswds/templates/system/block/breadcrumb.html.twig
diff --git a/themes/uswds/templates/system/block/status-messages.html.twig b/web/themes/uswds/templates/system/block/status-messages.html.twig
similarity index 100%
rename from themes/uswds/templates/system/block/status-messages.html.twig
rename to web/themes/uswds/templates/system/block/status-messages.html.twig
diff --git a/themes/uswds/templates/system/element/details.html.twig b/web/themes/uswds/templates/system/element/details.html.twig
similarity index 100%
rename from themes/uswds/templates/system/element/details.html.twig
rename to web/themes/uswds/templates/system/element/details.html.twig
diff --git a/themes/uswds/templates/system/element/form-element.html.twig b/web/themes/uswds/templates/system/element/form-element.html.twig
similarity index 100%
rename from themes/uswds/templates/system/element/form-element.html.twig
rename to web/themes/uswds/templates/system/element/form-element.html.twig
diff --git a/themes/uswds/templates/system/layout/page.html.twig b/web/themes/uswds/templates/system/layout/page.html.twig
similarity index 100%
rename from themes/uswds/templates/system/layout/page.html.twig
rename to web/themes/uswds/templates/system/layout/page.html.twig
diff --git a/themes/uswds/templates/system/menu/menu--footer_menu.html.twig b/web/themes/uswds/templates/system/menu/menu--footer_menu.html.twig
similarity index 100%
rename from themes/uswds/templates/system/menu/menu--footer_menu.html.twig
rename to web/themes/uswds/templates/system/menu/menu--footer_menu.html.twig
diff --git a/themes/uswds/templates/system/menu/menu--mobile_menu.html.twig b/web/themes/uswds/templates/system/menu/menu--mobile_menu.html.twig
similarity index 100%
rename from themes/uswds/templates/system/menu/menu--mobile_menu.html.twig
rename to web/themes/uswds/templates/system/menu/menu--mobile_menu.html.twig
diff --git a/themes/uswds/templates/system/menu/menu--primary_menu.html.twig b/web/themes/uswds/templates/system/menu/menu--primary_menu.html.twig
similarity index 100%
rename from themes/uswds/templates/system/menu/menu--primary_menu.html.twig
rename to web/themes/uswds/templates/system/menu/menu--primary_menu.html.twig
diff --git a/themes/uswds/templates/system/menu/menu--secondary_menu.html.twig b/web/themes/uswds/templates/system/menu/menu--secondary_menu.html.twig
similarity index 100%
rename from themes/uswds/templates/system/menu/menu--secondary_menu.html.twig
rename to web/themes/uswds/templates/system/menu/menu--secondary_menu.html.twig
diff --git a/themes/uswds/templates/system/menu/menu--sidebar_first.html.twig b/web/themes/uswds/templates/system/menu/menu--sidebar_first.html.twig
similarity index 100%
rename from themes/uswds/templates/system/menu/menu--sidebar_first.html.twig
rename to web/themes/uswds/templates/system/menu/menu--sidebar_first.html.twig
diff --git a/themes/uswds/templates/system/menu/menu-local-tasks.html.twig b/web/themes/uswds/templates/system/menu/menu-local-tasks.html.twig
similarity index 100%
rename from themes/uswds/templates/system/menu/menu-local-tasks.html.twig
rename to web/themes/uswds/templates/system/menu/menu-local-tasks.html.twig
diff --git a/themes/uswds/templates/system/paragraph/paragraph.html.twig b/web/themes/uswds/templates/system/paragraph/paragraph.html.twig
similarity index 100%
rename from themes/uswds/templates/system/paragraph/paragraph.html.twig
rename to web/themes/uswds/templates/system/paragraph/paragraph.html.twig
diff --git a/themes/uswds/templates/uswds/government-banner.html.twig b/web/themes/uswds/templates/uswds/government-banner.html.twig
similarity index 100%
rename from themes/uswds/templates/uswds/government-banner.html.twig
rename to web/themes/uswds/templates/uswds/government-banner.html.twig
diff --git a/themes/uswds/theme-settings.php b/web/themes/uswds/theme-settings.php
similarity index 100%
rename from themes/uswds/theme-settings.php
rename to web/themes/uswds/theme-settings.php
diff --git a/themes/uswds/uswds.info.yml b/web/themes/uswds/uswds.info.yml
similarity index 100%
rename from themes/uswds/uswds.info.yml
rename to web/themes/uswds/uswds.info.yml
diff --git a/themes/uswds/uswds.libraries.yml b/web/themes/uswds/uswds.libraries.yml
similarity index 100%
rename from themes/uswds/uswds.libraries.yml
rename to web/themes/uswds/uswds.libraries.yml
diff --git a/themes/uswds/uswds.theme b/web/themes/uswds/uswds.theme
similarity index 100%
rename from themes/uswds/uswds.theme
rename to web/themes/uswds/uswds.theme
diff --git a/update.php b/web/update.php
similarity index 100%
rename from update.php
rename to web/update.php
diff --git a/web.config b/web/web.config
similarity index 100%
rename from web.config
rename to web/web.config

From 0fadb7900a1dbcb863737ad205783c930b965621 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 9 Mar 2018 10:23:12 -0800
Subject: [PATCH 003/143] Remove old `modules` and `themes` directories

This is part of reorganizing these files within a `/web/` directory.
---
 modules/contrib/config_update/LICENSE.txt     |  339 ---
 modules/contrib/config_update/README.txt      |   13 -
 .../config_update/config_update.info.yml      |   12 -
 .../config_update/config_update.module        |   21 -
 .../config_update/config_update.services.yml  |   20 -
 .../config_update/config_update_ui/README.txt |  173 --
 .../config_update_ui.drush.inc                |  351 ---
 .../config_update_ui.drush_testing.inc        |   31 -
 .../config_update_ui.info.yml                 |   14 -
 .../config_update_ui.libraries.yml            |    5 -
 .../config_update_ui.links.task.yml           |    5 -
 .../config_update_ui/config_update_ui.module  |   37 -
 .../config_update_ui.permissions.yml          |    8 -
 .../config_update_ui.routing.yml              |   43 -
 .../css/config_update_ui.report.css           |   13 -
 .../src/Controller/ConfigUpdateController.php |  656 -----
 .../src/Form/ConfigDeleteConfirmForm.php      |  144 --
 .../src/Form/ConfigImportConfirmForm.php      |  146 --
 .../src/Form/ConfigRevertConfirmForm.php      |  146 --
 .../src/Tests/ConfigProfileOverridesTest.php  |   97 -
 .../src/Tests/ConfigUpdateTest.php            |  521 ----
 .../src/ConfigDeleteInterface.php             |   37 -
 .../config_update/src/ConfigDiffInterface.php |   46 -
 .../config_update/src/ConfigDiffer.php        |  184 --
 .../src/ConfigListByProviderInterface.php     |   37 -
 .../config_update/src/ConfigListInterface.php |   74 -
 .../config_update/src/ConfigLister.php        |  251 --
 .../src/ConfigListerWithProviders.php         |  148 --
 .../config_update/src/ConfigRevertEvent.php   |   66 -
 .../src/ConfigRevertInterface.php             |   96 -
 .../config_update/src/ConfigReverter.php      |  222 --
 .../tests/src/Unit/ConfigDifferTest.php       |  308 ---
 .../tests/src/Unit/ConfigListerTest.php       |  265 ---
 modules/contrib/features/LICENSE.txt          |  339 ---
 modules/contrib/features/composer.json        |    8 -
 .../install/features.bundle.default.yml       |   98 -
 .../config/install/features.settings.yml      |    3 -
 .../config/schema/features.schema.yml         |  207 --
 .../contrib/features/drush/features.drush.inc |  911 -------
 modules/contrib/features/features.info.yml    |   14 -
 modules/contrib/features/features.install     |   31 -
 modules/contrib/features/features.module      |   56 -
 modules/contrib/features/features.routing.yml |    6 -
 .../contrib/features/features.services.yml    |   38 -
 .../features_ui/css/features_ui.admin.css     |  286 ---
 .../modules/features_ui/features_ui.admin.inc |  175 --
 .../modules/features_ui/features_ui.info.yml  |   14 -
 .../features_ui/features_ui.libraries.yml     |   11 -
 .../features_ui/features_ui.links.action.yml  |    5 -
 .../features_ui/features_ui.links.menu.yml    |    5 -
 .../features_ui/features_ui.links.task.yml    |   14 -
 .../modules/features_ui/features_ui.module    |   55 -
 .../features_ui/features_ui.routing.yml       |  104 -
 .../features_ui/js/features_ui.admin.js       |  401 ----
 .../src/Controller/FeaturesUIController.php   |  193 --
 .../src/Form/AssignmentAlterForm.php          |   76 -
 .../src/Form/AssignmentBaseForm.php           |   61 -
 .../src/Form/AssignmentConfigureForm.php      |  445 ----
 .../src/Form/AssignmentCoreForm.php           |   54 -
 .../src/Form/AssignmentExcludeForm.php        |  131 -
 .../src/Form/AssignmentFormBase.php           |  176 --
 .../src/Form/AssignmentOptionalForm.php       |   54 -
 .../src/Form/AssignmentProfileForm.php        |   88 -
 .../src/Form/AssignmentSiteForm.php           |   54 -
 .../features_ui/src/Form/FeaturesDiffForm.php |  270 ---
 .../features_ui/src/Form/FeaturesEditForm.php | 1092 ---------
 .../src/Form/FeaturesExportForm.php           |  564 -----
 .../src/Tests/FeaturesBundleUITest.php        |  188 --
 .../src/Tests/FeaturesCreateUITest.php        |  184 --
 .../features_ui/src/Tests/FeaturesUITest.php  |   49 -
 .../features/src/ConfigurationItem.php        |  351 ---
 .../src/Controller/FeaturesController.php     |   77 -
 .../features/src/Entity/FeaturesBundle.php    |  310 ---
 .../contrib/features/src/FeaturesAssigner.php |  447 ----
 .../src/FeaturesAssignerInterface.php         |  228 --
 .../src/FeaturesAssignmentMethodBase.php      |  124 -
 .../src/FeaturesAssignmentMethodInterface.php |   56 -
 .../src/FeaturesAssignmentMethodManager.php   |   32 -
 .../features/src/FeaturesBundleInterface.php  |  240 --
 .../src/FeaturesConfigDependencyManager.php   |   59 -
 .../features/src/FeaturesConfigInstaller.php  |  109 -
 .../src/FeaturesExtensionStorages.php         |  121 -
 .../FeaturesExtensionStoragesInterface.php    |   87 -
 .../src/FeaturesGenerationMethodBase.php      |  111 -
 .../src/FeaturesGenerationMethodInterface.php |   67 -
 .../src/FeaturesGenerationMethodManager.php   |   33 -
 .../features/src/FeaturesGenerator.php        |  173 --
 .../src/FeaturesGeneratorInterface.php        |  103 -
 .../features/src/FeaturesInstallStorage.php   |  155 --
 .../contrib/features/src/FeaturesManager.php  | 1382 -----------
 .../features/src/FeaturesManagerInterface.php |  647 -----
 modules/contrib/features/src/Package.php      |  554 -----
 .../FeaturesAssignmentAlter.php               |   63 -
 .../FeaturesAssignmentBaseType.php            |   68 -
 .../FeaturesAssignmentCoreType.php            |   37 -
 .../FeaturesAssignmentDependency.php          |   26 -
 .../FeaturesAssignmentExclude.php             |  149 --
 .../FeaturesAssignmentExisting.php            |   58 -
 .../FeaturesAssignmentForwardDependency.php   |   78 -
 .../FeaturesAssignmentNamespace.php           |   38 -
 .../FeaturesAssignmentOptionalType.php        |   33 -
 .../FeaturesAssignmentPackages.php            |   53 -
 .../FeaturesAssignmentProfile.php             |  177 --
 .../FeaturesAssignmentSiteType.php            |   36 -
 .../FeaturesGenerationArchive.php             |  292 ---
 .../FeaturesGenerationWrite.php               |  237 --
 .../config/install/core.date_format.short.yml |    7 -
 .../config/install/system.cron.yml            |    3 -
 .../test_feature/test_feature.features.yml    |    3 -
 .../test_feature/test_feature.info.yml        |   13 -
 .../config/install/core.date_format.long.yml  |    7 -
 .../test_mybundle_core.features.yml           |    3 -
 .../test_mybundle_core.info.yml               |   13 -
 .../Entity/FeaturesBundleIntegrationTest.php  |   82 -
 .../tests/src/Kernel/FeaturesAssignTest.php   |  834 -------
 .../tests/src/Kernel/FeaturesAssignerTest.php |   58 -
 .../tests/src/Kernel/FeaturesGenerateTest.php |  210 --
 .../src/Kernel/FeaturesManagerKernelTest.php  |  103 -
 .../tests/src/Unit/ConfigurationItemTest.php  |   21 -
 .../tests/src/Unit/FeaturesBundleTest.php     |  206 --
 .../tests/src/Unit/FeaturesManagerTest.php    |  798 -------
 .../features/tests/src/Unit/PackageTest.php   |   53 -
 modules/ctools/LICENSE.txt                    |  339 ---
 modules/ctools/composer.json                  |   40 -
 .../ctools/config/schema/ctools.schema.yml    |   63 -
 modules/ctools/ctools.info.yml                |   11 -
 modules/ctools/ctools.module                  |   64 -
 modules/ctools/ctools.services.yml            |   38 -
 .../config/schema/ctools_block.schema.yml     |   28 -
 .../ctools_block/ctools_block.info.yml        |   14 -
 .../src/Plugin/Block/EntityField.php          |  376 ---
 .../src/Plugin/Deriver/EntityFieldDeriver.php |   65 -
 ...e.node.ctools_block_field_test.promote.yml |   23 -
 ...y.node.ctools_block_field_test.default.yml |   62 -
 ...y.node.ctools_block_field_test.default.yml |   18 -
 ...ay.node.ctools_block_field_test.teaser.yml |   27 -
 ...ield.node.ctools_block_field_test.body.yml |   23 -
 ...de.ctools_block_field_test.field_image.yml |   37 -
 .../field.storage.node.field_image.yml        |   31 -
 .../node.type.ctools_block_field_test.yml     |   18 -
 .../ctools_block_field_test.info.yml          |   20 -
 .../src/Functional/EntityFieldBlockTest.php   |  132 --
 .../ctools_views/ctools_views.info.yml        |   15 -
 .../modules/ctools_views/ctools_views.module  |  104 -
 .../ctools_views/src/Plugin/Display/Block.php |  438 ----
 .../Tests/CToolsViewsBasicViewBlockTest.php   |  350 ---
 .../ctools_views_test_views.info.yml          |   20 -
 .../views.view.ctools_views_entity_test.yml   |  543 -----
 .../views.view.ctools_views_test_view.yml     |  949 --------
 modules/ctools/src/Access/AccessInterface.php |    9 -
 modules/ctools/src/Access/TempstoreAccess.php |   51 -
 .../src/Ajax/OpenModalWizardCommand.php       |   23 -
 .../ctools/src/Annotation/Relationship.php    |   54 -
 .../src/ConstraintConditionInterface.php      |   26 -
 .../ctools/src/Context/AutomaticContext.php   |   25 -
 .../src/Context/EntityLazyLoadContext.php     |   66 -
 modules/ctools/src/ContextMapper.php          |   50 -
 modules/ctools/src/ContextMapperInterface.php |   21 -
 .../ctools/src/ContextNotFoundException.php   |    6 -
 .../Controller/WizardEntityFormController.php |   52 -
 .../src/Controller/WizardFormController.php   |   82 -
 modules/ctools/src/Event/WizardEvent.php      |   41 -
 modules/ctools/src/Form/AjaxFormTrait.php     |   43 -
 .../ctools/src/Form/ConditionConfigure.php    |  182 --
 modules/ctools/src/Form/ConditionDelete.php   |  210 --
 modules/ctools/src/Form/ContextConfigure.php  |  254 --
 modules/ctools/src/Form/ContextDelete.php     |   85 -
 modules/ctools/src/Form/ManageConditions.php  |  224 --
 modules/ctools/src/Form/ManageContext.php     |  327 ---
 .../src/Form/ManageResolverRelationships.php  |  205 --
 .../ctools/src/Form/RelationshipConfigure.php |  152 --
 modules/ctools/src/Form/RequiredContext.php   |  212 --
 .../ctools/src/Form/RequiredContextDelete.php |  194 --
 .../Form/ResolverRelationshipConfigure.php    |  182 --
 .../src/Form/ResolverRelationshipDelete.php   |  150 --
 .../src/ParamConverter/TempstoreConverter.php |  169 --
 .../ctools/src/Plugin/Block/EntityView.php    |  105 -
 .../src/Plugin/BlockPluginCollection.php      |   53 -
 .../src/Plugin/BlockVariantInterface.php      |   96 -
 .../ctools/src/Plugin/BlockVariantTrait.php   |  130 -
 .../src/Plugin/Condition/EntityBundle.php     |  160 --
 .../ctools/src/Plugin/Condition/NodeType.php  |   41 -
 .../src/Plugin/Deriver/EntityBundle.php       |   53 -
 .../src/Plugin/Deriver/EntityDeriverBase.php  |   51 -
 .../src/Plugin/Deriver/EntityViewDeriver.php  |   28 -
 .../TypedDataEntityRelationshipDeriver.php    |   24 -
 .../TypedDataLanguageRelationshipDeriver.php  |   40 -
 .../Deriver/TypedDataPropertyDeriverBase.php  |  113 -
 .../Deriver/TypedDataRelationshipDeriver.php  |   75 -
 .../DisplayVariant/BlockDisplayVariant.php    |  226 --
 .../src/Plugin/PluginWizardInterface.php      |   25 -
 .../TypedDataEntityRelationship.php           |   36 -
 .../TypedDataLanguageRelationship.php         |   35 -
 .../Relationship/TypedDataRelationship.php    |   77 -
 .../ctools/src/Plugin/RelationshipBase.php    |   10 -
 .../src/Plugin/RelationshipInterface.php      |   27 -
 .../ctools/src/Plugin/RelationshipManager.php |   35 -
 .../Plugin/RelationshipManagerInterface.php   |   10 -
 .../src/Plugin/VariantCollectionInterface.php |   50 -
 .../src/Plugin/VariantCollectionTrait.php     |   67 -
 .../src/Plugin/VariantPluginCollection.php    |   43 -
 .../src/Routing/Enhancer/WizardEnhancer.php   |   34 -
 modules/ctools/src/SerializableTempstore.php  |   13 -
 .../src/SerializableTempstoreFactory.php      |   27 -
 .../src/Testing/EntityCreationTrait.php       |   55 -
 .../src/Tests/Wizard/CToolsWizardTest.php     |  136 --
 modules/ctools/src/TypedDataResolver.php      |  253 --
 .../src/Wizard/EntityFormWizardBase.php       |  180 --
 .../src/Wizard/EntityFormWizardInterface.php  |   39 -
 modules/ctools/src/Wizard/FormWizardBase.php  |  465 ----
 .../ctools/src/Wizard/FormWizardInterface.php |  182 --
 modules/ctools/src/Wizard/WizardFactory.php   |  129 -
 .../src/Wizard/WizardFactoryInterface.php     |   42 -
 .../ctools-wizard-trail-links.html.twig       |   14 -
 .../templates/ctools-wizard-trail.html.twig   |   14 -
 ...tools_wizard_test_config_entity.schema.yml |   18 -
 .../ctools_wizard_test.info.yml               |   12 -
 .../ctools_wizard_test.links.action.yml       |    6 -
 .../ctools_wizard_test.links.menu.yml         |    7 -
 .../ctools_wizard_test.routing.yml            |   82 -
 .../src/Entity/ExampleConfigEntity.php        |   83 -
 .../src/ExampleConfigEntityInterface.php      |   26 -
 .../src/ExampleConfigEntityListBuilder.php    |   49 -
 .../Form/ExampleConfigEntityDeleteForm.php    |   52 -
 .../Form/ExampleConfigEntityExistingForm.php  |   37 -
 .../Form/ExampleConfigEntityExternalForm.php  |   66 -
 .../Form/ExampleConfigEntityGeneralForm.php   |   46 -
 .../src/Form/ExampleConfigEntityOneForm.php   |   62 -
 .../src/Form/ExampleConfigEntityTwoForm.php   |   47 -
 .../ctools_wizard_test/src/Form/OneForm.php   |   71 -
 .../ctools_wizard_test/src/Form/TwoForm.php   |   69 -
 .../src/Wizard/EntityAddWizardTest.php        |   15 -
 .../src/Wizard/EntityEditWizardTest.php       |   71 -
 .../src/Wizard/WizardTest.php                 |   82 -
 .../src/Kernel/RelationshipManagerTest.php    |   63 -
 .../src/Kernel/RelationshipsTestBase.php      |   96 -
 .../src/Kernel/SerializableTempstoreTest.php  |   64 -
 .../TypedDataEntityRelationshipPluginTest.php |   46 -
 ...ypedDataLanguageRelationshipPluginTest.php |   36 -
 .../TypedDataRelationshipPluginTest.php       |  103 -
 .../src/Kernel/TypedDataResolverTest.php      |  105 -
 .../src/Unit/BlockDisplayVariantTest.php      |   90 -
 .../src/Unit/BlockPluginCollectionTest.php    |   81 -
 .../tests/src/Unit/BlockVariantTraitTest.php  |  149 --
 .../tests/src/Unit/ContextMapperTest.php      |  104 -
 .../src/Unit/VariantCollectionTraitTest.php   |  209 --
 modules/devel/LICENSE.txt                     |  339 ---
 modules/devel/README.txt                      |   47 -
 modules/devel/composer.json                   |   45 -
 .../devel/config/install/devel.settings.yml   |    8 -
 .../config/install/devel.toolbar.settings.yml |    9 -
 .../config/install/system.menu.devel.yml      |    9 -
 modules/devel/config/schema/devel.schema.yml  |   53 -
 modules/devel/css/devel-rtl.css               |    0
 modules/devel/css/devel.css                   |   42 -
 modules/devel/css/devel.toolbar.css           |   38 -
 modules/devel/devel.api.php                   |   25 -
 modules/devel/devel.info.yml                  |   14 -
 modules/devel/devel.install                   |   49 -
 modules/devel/devel.libraries.yml             |   11 -
 modules/devel/devel.links.menu.yml            |   93 -
 modules/devel/devel.links.task.yml            |   18 -
 modules/devel/devel.module                    |  616 -----
 modules/devel/devel.permissions.yml           |   14 -
 modules/devel/devel.routing.yml               |  278 ---
 modules/devel/devel.services.yml              |   32 -
 modules/devel/devel_generate/README.txt       |   44 -
 .../devel_generate/devel_generate.batch.inc   |   25 -
 .../devel_generate/devel_generate.info.yml    |   13 -
 .../devel_generate/devel_generate.module      |  145 --
 .../devel_generate.permissions.yml            |    5 -
 .../devel_generate/devel_generate.routing.yml |    2 -
 .../devel_generate.services.yml               |    4 -
 .../devel/devel_generate/drush.services.yml   |    7 -
 .../drush/devel_generate.drush8.inc           |  196 --
 .../src/Annotation/DevelGenerate.php          |   86 -
 .../src/Commands/DevelGenerateCommands.php    |  191 --
 .../devel_generate/src/DevelGenerateBase.php  |  172 --
 .../src/DevelGenerateBaseInterface.php        |   77 -
 .../src/DevelGenerateException.php            |   12 -
 .../src/DevelGeneratePermissions.php          |   62 -
 .../src/DevelGeneratePluginManager.php        |   31 -
 .../src/Form/DevelGenerateForm.php            |  114 -
 .../DevelGenerate/ContentDevelGenerate.php    |  506 ----
 .../DevelGenerate/MenuDevelGenerate.php       |  405 ----
 .../DevelGenerate/TermDevelGenerate.php       |  258 --
 .../DevelGenerate/UserDevelGenerate.php       |  204 --
 .../DevelGenerate/VocabularyDevelGenerate.php |  175 --
 .../src/Routing/DevelGenerateRoutes.php       |   57 -
 .../src/Tests/DevelGenerateTest.php           |  175 --
 .../devel_generate_example.info.yml           |   14 -
 .../devel_generate_example.module             |    1 -
 .../DevelGenerate/ExampleDevelGenerate.php    |   88 -
 .../tests/src/DevelGenerateManagerTest.php    |   93 -
 modules/devel/drush.services.yml              |    6 -
 modules/devel/drush/devel.drush8.inc          |  276 ---
 modules/devel/drush/develDrushTest.php        |   38 -
 modules/devel/icons/bebebe/cog.svg            |    1 -
 modules/devel/icons/ffffff/cog.svg            |    1 -
 modules/devel/kint/README.txt                 |   37 -
 modules/devel/kint/kint.info.yml              |   13 -
 modules/devel/kint/kint.module                |   65 -
 modules/devel/kint/kint.permissions.yml       |    4 -
 modules/devel/kint/kint.services.yml          |    5 -
 modules/devel/kint/kint/.gitignore            |    3 -
 modules/devel/kint/kint/Kint.class.php        |  836 -------
 modules/devel/kint/kint/LICENCE               |   20 -
 modules/devel/kint/kint/README.md             |  141 --
 modules/devel/kint/kint/composer.json         |   29 -
 modules/devel/kint/kint/config.default.php    |   94 -
 modules/devel/kint/kint/decorators/plain.php  |  335 ---
 modules/devel/kint/kint/decorators/rich.php   |  319 ---
 modules/devel/kint/kint/examples/overview.php |  176 --
 .../devel/kint/kint/inc/kintObject.class.php  |   19 -
 .../devel/kint/kint/inc/kintParser.class.php  |  608 -----
 .../kint/kint/inc/kintVariableData.class.php  |  102 -
 .../kint/kint/parsers/custom/classmethods.php |  150 --
 .../kint/kint/parsers/custom/classstatics.php |   49 -
 .../devel/kint/kint/parsers/custom/color.php  |  400 ----
 .../devel/kint/kint/parsers/custom/fspath.php |   69 -
 .../devel/kint/kint/parsers/custom/json.php   |   19 -
 .../kint/kint/parsers/custom/microtime.php    |   60 -
 .../kint/parsers/custom/objectiterateable.php |   22 -
 .../kint/parsers/custom/splobjectstorage.php  |   24 -
 .../kint/kint/parsers/custom/timestamp.php    |   29 -
 .../devel/kint/kint/parsers/custom/xml.php    |   25 -
 .../kint/kint/parsers/objects/closure.php     |   47 -
 .../kint/kint/parsers/objects/smarty.php      |   35 -
 .../kint/kint/parsers/objects/splfileinfo.php |   70 -
 modules/devel/kint/kint/view/base.js          |  437 ----
 modules/devel/kint/kint/view/base.less        |  413 ----
 .../kint/kint/view/compiled/aante-light.css   |  397 ----
 modules/devel/kint/kint/view/compiled/kint.js |   10 -
 .../kint/kint/view/compiled/original.css      |    1 -
 .../kint/view/compiled/solarized-dark.css     |    1 -
 .../kint/kint/view/compiled/solarized.css     |    1 -
 .../kint/kint/view/themes/aante-light.less    |  154 --
 .../devel/kint/kint/view/themes/original.less |   43 -
 .../kint/kint/view/themes/solarized-dark.less |   39 -
 .../kint/kint/view/themes/solarized.less      |   29 -
 .../kint/src/Plugin/Devel/Dumper/Kint.php     |   51 -
 modules/devel/kint/src/Twig/KintExtension.php |  154 --
 modules/devel/run-tests-drush.sh              |   21 -
 modules/devel/src/Annotation/DevelDumper.php  |   44 -
 modules/devel/src/Commands/DevelCommands.php  |  264 ---
 .../Controller/ContainerInfoController.php    |  274 ---
 .../devel/src/Controller/DevelController.php  |  189 --
 .../src/Controller/ElementInfoController.php  |  162 --
 .../src/Controller/EntityDebugController.php  |  143 --
 .../Controller/EntityTypeInfoController.php   |  154 --
 .../src/Controller/EventInfoController.php    |  136 --
 .../src/Controller/LayoutInfoController.php   |   91 -
 .../src/Controller/RouteInfoController.php    |  203 --
 .../src/Controller/SwitchUserController.php   |  120 -
 modules/devel/src/DevelDumperBase.php         |   45 -
 modules/devel/src/DevelDumperInterface.php    |   59 -
 modules/devel/src/DevelDumperManager.php      |  142 --
 .../devel/src/DevelDumperManagerInterface.php |  102 -
 .../devel/src/DevelDumperPluginManager.php    |   71 -
 .../src/DevelDumperPluginManagerInterface.php |   24 -
 modules/devel/src/EntityTypeInfo.php          |  103 -
 .../ErrorHandlerSubscriber.php                |   57 -
 .../ThemeInfoRebuildSubscriber.php            |  116 -
 modules/devel/src/Form/ConfigEditor.php       |  146 --
 modules/devel/src/Form/ConfigsList.php        |   85 -
 modules/devel/src/Form/DevelReinstall.php     |  154 --
 modules/devel/src/Form/ExecutePHP.php         |   55 -
 .../src/Form/RouterRebuildConfirmForm.php     |   86 -
 modules/devel/src/Form/SettingsForm.php       |  191 --
 modules/devel/src/Form/SwitchUserForm.php     |  108 -
 modules/devel/src/Form/SystemStateEdit.php    |  189 --
 .../devel/src/Form/ToolbarSettingsForm.php    |  118 -
 .../src/Plugin/Block/DevelExecutePHP.php      |   33 -
 .../src/Plugin/Block/SwitchUserBlock.php      |  286 ---
 .../src/Plugin/Derivative/DevelLocalTask.php  |  106 -
 .../src/Plugin/Devel/Dumper/ChromePhp.php     |   40 -
 .../src/Plugin/Devel/Dumper/DoctrineDebug.php |   69 -
 .../Plugin/Devel/Dumper/DrupalVariable.php    |   61 -
 .../devel/src/Plugin/Devel/Dumper/FirePhp.php |   41 -
 .../src/Plugin/Devel/Dumper/VarDumper.php     |   47 -
 .../devel/src/Plugin/Mail/DevelMailLog.php    |  188 --
 .../src/Plugin/Menu/DestinationMenuLink.php   |   32 -
 .../src/Plugin/Menu/MenuItemMenuLink.php      |   11 -
 .../src/Plugin/Menu/RouteDetailMenuLink.php   |   29 -
 modules/devel/src/Render/FilteredMarkup.php   |   23 -
 modules/devel/src/Routing/RouteSubscriber.php |  156 --
 modules/devel/src/ToolbarHandler.php          |  181 --
 modules/devel/src/Twig/Extension/Debug.php    |  201 --
 .../css/devel_dumper_test.css                 |    0
 .../devel_dumper_test.info.yml                |   12 -
 .../devel_dumper_test.libraries.yml           |    7 -
 .../devel_dumper_test.routing.yml             |   39 -
 .../devel_dumper_test/js/devel_dumper_test.js |    0
 .../src/Controller/DumperTestController.php   |   89 -
 .../Devel/Dumper/AvailableTestDumper.php      |   60 -
 .../Devel/Dumper/NotAvailableTestDumper.php   |   41 -
 .../devel_entity_test.info.yml                |   16 -
 .../devel_entity_test.links.task.yml          |    2 -
 .../devel_entity_test.module                  |   29 -
 .../src/Entity/DevelEntityTestCanonical.php   |   44 -
 .../src/Entity/DevelEntityTestEdit.php        |   44 -
 .../src/Entity/DevelEntityTestNoLinks.php     |   41 -
 .../Derivative/DevelEntityTestLocalTasks.php  |   31 -
 .../modules/devel_test/devel_test.info.yml    |   12 -
 .../modules/devel_test/devel_test.module      |   20 -
 .../modules/devel_test/devel_test.routing.yml |    7 -
 .../devel_test/devel_test.services.yml        |    6 -
 .../src/Controller/DevelTestController.php    |   24 -
 .../src/Routing/TestRouteSubscriber.php       |   20 -
 .../src/Functional/DevelContainerInfoTest.php |  261 --
 .../src/Functional/DevelControllerTest.php    |  122 -
 .../tests/src/Functional/DevelDumperTest.php  |  165 --
 .../src/Functional/DevelElementInfoTest.php   |  151 --
 .../Functional/DevelEntityTypeInfoTest.php    |  158 --
 .../src/Functional/DevelErrorHandlerTest.php  |  161 --
 .../src/Functional/DevelEventInfoTest.php     |  135 --
 .../src/Functional/DevelLayoutInfoTest.php    |  151 --
 .../src/Functional/DevelMenuLinksTest.php     |  109 -
 .../Functional/DevelModulesReinstallTest.php  |   60 -
 .../src/Functional/DevelRequirementsTest.php  |   33 -
 .../src/Functional/DevelRouteInfoTest.php     |  197 --
 .../src/Functional/DevelRouterRebuildTest.php |   46 -
 .../src/Functional/DevelStateEditorTest.php   |  209 --
 .../src/Functional/DevelSwitchUserTest.php    |  313 ---
 .../tests/src/Functional/DevelToolbarTest.php |  268 ---
 .../src/Functional/DevelWebAssertHelper.php   |   34 -
 .../tests/src/Kernel/DevelDumperTestTrait.php |  127 -
 .../Kernel/DevelEnforcedDependenciesTest.php  |   80 -
 .../tests/src/Kernel/DevelMailLogTest.php     |  202 --
 .../tests/src/Kernel/DevelQueryDebugTest.php  |  127 -
 .../src/Kernel/DevelTwigExtensionTest.php     |  203 --
 modules/devel/webprofiler/README.md           |   92 -
 modules/devel/webprofiler/composer.json       |   15 -
 .../config/install/webprofiler.config.yml     |   28 -
 .../config/schema/webprofiler.schema.yml      |   35 -
 .../devel/webprofiler/console.services.yml    |   14 -
 .../translations/en/webprofiler.benchmark.yml |   20 -
 .../translations/en/webprofiler.export.yml    |   15 -
 .../translations/en/webprofiler.list.yml      |   14 -
 .../translations/es/webprofiler.benchmark.yml |   20 -
 .../translations/es/webprofiler.export.yml    |   15 -
 .../translations/es/webprofiler.list.yml      |   14 -
 .../devel/webprofiler/css/app/dashboard.css   |  582 -----
 modules/devel/webprofiler/css/timeline.css    |  106 -
 .../devel/webprofiler/images/caret-down.svg   |    1 -
 .../js/app/collections/collectors.js          |   35 -
 modules/devel/webprofiler/js/app/helpers.js   |  107 -
 modules/devel/webprofiler/js/app/main.js      |  105 -
 .../webprofiler/js/app/models/collector.js    |   15 -
 .../webprofiler/js/app/routers/collectors.js  |   48 -
 .../webprofiler/js/app/views/collector.js     |   29 -
 .../js/app/views/collectorsList.js            |   21 -
 .../devel/webprofiler/js/app/views/details.js |   20 -
 .../devel/webprofiler/js/app/views/layout.js  |   83 -
 modules/devel/webprofiler/js/database.js      |   68 -
 modules/devel/webprofiler/js/timeline.js      |  223 --
 .../src/Access/AccessManagerWrapper.php       |   83 -
 .../Asset/CssCollectionRendererWrapper.php    |   40 -
 .../src/Asset/JsCollectionRendererWrapper.php |   40 -
 .../src/Cache/CacheBackendWrapper.php         |  176 --
 .../src/Cache/CacheFactoryWrapper.php         |   62 -
 .../src/Command/BenchmarkCommand.php          |  311 ---
 .../webprofiler/src/Command/BenchmarkData.php |   57 -
 .../webprofiler/src/Command/ExportCommand.php |  160 --
 .../webprofiler/src/Command/ListCommand.php   |   82 -
 .../src/Compiler/DecoratorPass.php            |   33 -
 .../webprofiler/src/Compiler/ProfilerPass.php |   64 -
 .../webprofiler/src/Compiler/ServicePass.php  |  108 -
 .../webprofiler/src/Compiler/StoragePass.php  |   32 -
 .../src/Config/ConfigFactoryWrapper.php       |   44 -
 .../src/Controller/DashboardController.php    |  243 --
 .../src/Controller/DatabaseController.php     |   95 -
 .../src/Controller/ToolbarController.php      |  108 -
 .../src/DataCollector/AssetsDataCollector.php |  107 -
 .../src/DataCollector/BlocksDataCollector.php |  149 --
 .../src/DataCollector/CacheDataCollector.php  |  172 --
 .../src/DataCollector/ConfigDataCollector.php |   68 -
 .../DataCollector/DatabaseDataCollector.php   |  256 --
 .../src/DataCollector/DevelDataCollector.php  |  103 -
 .../src/DataCollector/DrupalDataCollector.php |  134 --
 .../DrupalDataCollectorTrait.php              |  115 -
 .../src/DataCollector/EventsDataCollector.php |  144 --
 .../DataCollector/ExtensionDataCollector.php  |  156 --
 .../src/DataCollector/FormsDataCollector.php  |   81 -
 .../src/DataCollector/HttpDataCollector.php   |  175 --
 .../src/DataCollector/MailDataCollector.php   |   99 -
 .../PerformanceTimingDataCollector.php        |   83 -
 .../DataCollector/PhpConfigDataCollector.php  |  163 --
 .../DataCollector/RequestDataCollector.php    |   83 -
 .../DataCollector/RoutingDataCollector.php    |   91 -
 .../DataCollector/ServicesDataCollector.php   |  162 --
 .../src/DataCollector/StateDataCollector.php  |   65 -
 .../src/DataCollector/ThemeDataCollector.php  |  257 --
 .../src/DataCollector/TimeDataCollector.php   |  157 --
 .../TranslationsDataCollector.php             |   99 -
 .../src/DataCollector/UserDataCollector.php   |  141 --
 .../src/DataCollector/ViewsDataCollector.php  |  118 -
 modules/devel/webprofiler/src/Decorator.php   |   94 -
 .../TraceableContainer.php                    |   66 -
 .../src/DrupalDataCollectorInterface.php      |   67 -
 .../Config/ConfigEntityStorageDecorator.php   |  221 --
 .../Config/RoleStorageDecorator.php           |   19 -
 .../Config/ShortcutSetStorageDecorator.php    |   56 -
 .../Config/VocabularyStorageDecorator.php     |   19 -
 .../src/Entity/EntityDecorator.php            |   24 -
 .../src/Entity/EntityManagerWrapper.php       |  239 --
 .../src/Entity/EntityViewBuilderDecorator.php |   92 -
 .../EventDispatcherTraceableInterface.php     |   19 -
 .../TraceableEventDispatcher.php              |  193 --
 .../WebprofilerEventSubscriber.php            |   97 -
 .../devel/webprofiler/src/Form/ConfigForm.php |  237 --
 .../src/Form/FormBuilderWrapper.php           |   61 -
 .../src/Form/ProfilesFilterForm.php           |   86 -
 .../src/Frontend/PerformanceTimingData.php    |   81 -
 .../webprofiler/src/Helper/ClassShortener.php |   34 -
 .../src/Helper/ClassShortenerInterface.php    |   17 -
 .../src/Helper/IdeLinkGenerator.php           |   40 -
 .../src/Helper/IdeLinkGeneratorInterface.php  |   17 -
 .../src/Http/HttpClientMiddleware.php         |   84 -
 .../src/Mail/MailManagerWrapper.php           |   94 -
 .../src/Profiler/DatabaseProfilerStorage.php  |  158 --
 .../src/Profiler/FileProfilerStorage.php      |   24 -
 .../webprofiler/src/Profiler/Profiler.php     |   77 -
 .../src/Profiler/ProfilerStorageFactory.php   |   26 -
 .../src/Profiler/ProfilerStorageManager.php   |   52 -
 .../src/Profiler/TemplateManager.php          |  130 -
 .../WebprofilerRequestMatcher.php             |   50 -
 .../src/Routing/TokenConverter.php            |   46 -
 .../StackMiddleware/WebprofilerMiddleware.php |   41 -
 .../webprofiler/src/State/StateWrapper.php    |  125 -
 modules/devel/webprofiler/src/Stopwatch.php   |  543 -----
 .../TranslationManagerWrapper.php             |   69 -
 .../src/Theme/ThemeNegotiatorWrapper.php      |   80 -
 .../src/Twig/Dumper/HtmlDumper.php            |   35 -
 .../src/Twig/Extension/ProfilerExtension.php  |   93 -
 .../src/Views/TraceableViewExecutable.php     |  156 --
 .../Views/ViewExecutableFactoryWrapper.php    |   47 -
 .../src/WebprofilerServiceProvider.php        |  117 -
 .../templates/Collector/assets.html.twig      |  133 --
 .../templates/Collector/blocks.html.twig      |  113 -
 .../templates/Collector/cache.html.twig       |   63 -
 .../templates/Collector/config.html.twig      |   37 -
 .../templates/Collector/database.html.twig    |  168 --
 .../templates/Collector/devel.html.twig       |   24 -
 .../templates/Collector/drupal.html.twig      |   66 -
 .../templates/Collector/events.html.twig      |   82 -
 .../templates/Collector/extensions.html.twig  |   95 -
 .../templates/Collector/forms.html.twig       |   67 -
 .../templates/Collector/http.html.twig        |   77 -
 .../templates/Collector/mail.html.twig        |   76 -
 .../Collector/performance_timing.html.twig    |   76 -
 .../templates/Collector/php_config.html.twig  |   52 -
 .../templates/Collector/request.html.twig     |  206 --
 .../templates/Collector/routing.html.twig     |   50 -
 .../templates/Collector/services.html.twig    |  149 --
 .../templates/Collector/state.html.twig       |   36 -
 .../templates/Collector/theme.html.twig       |  147 --
 .../templates/Collector/time.html.twig        |   59 -
 .../Collector/translations.html.twig          |   85 -
 .../templates/Collector/user.html.twig        |   63 -
 .../templates/Collector/views.html.twig       |   58 -
 .../Profiler/webprofiler_dashboard.html.twig  |   57 -
 .../Profiler/webprofiler_loader.html.twig     |   73 -
 .../Profiler/webprofiler_panel.html.twig      |    1 -
 .../Profiler/webprofiler_toolbar.css.twig     |  311 ---
 .../Profiler/webprofiler_toolbar.html.twig    |   35 -
 .../src/FunctionalJavascript/ToolbarTest.php  |   79 -
 .../WebprofilerTestBase.php                   |   80 -
 .../tests/src/Kernel/DecoratorTest.php        |   65 -
 .../DataCollector/AssetsDataCollectorTest.php |   68 -
 .../DataCollector/CacheDataCollectorTest.php  |   69 -
 .../DataCollector/DataCollectorBaseTest.php   |   40 -
 .../devel/webprofiler/webprofiler.info.yml    |   16 -
 modules/devel/webprofiler/webprofiler.install |  188 --
 .../webprofiler/webprofiler.libraries.yml     |   63 -
 .../webprofiler/webprofiler.links.menu.yml    |    5 -
 .../webprofiler/webprofiler.links.task.yml    |    9 -
 .../devel/webprofiler/webprofiler.make.yml    |   12 -
 modules/devel/webprofiler/webprofiler.module  |   51 -
 .../webprofiler/webprofiler.permissions.yml   |    7 -
 .../devel/webprofiler/webprofiler.routing.yml |   81 -
 .../webprofiler/webprofiler.services.yml      |  262 --
 modules/diff/LICENSE.txt                      |  339 ---
 modules/diff/README.txt                       |   27 -
 modules/diff/composer.json                    |   40 -
 modules/diff/config/install/diff.settings.yml |   16 -
 .../core.entity_view_mode.node.diff.yml       |   12 -
 modules/diff/config/schema/diff.schema.yml    |  205 --
 modules/diff/css/diff.colors.css              |   23 -
 modules/diff/css/diff.double-column.css       |   51 -
 modules/diff/css/diff.general.css             |   90 -
 modules/diff/css/diff.single-column.css       |   51 -
 modules/diff/css/diff.visual-inline.css       |    7 -
 modules/diff/diff.api.php                     |   60 -
 modules/diff/diff.info.yml                    |   11 -
 modules/diff/diff.install                     |  144 --
 modules/diff/diff.libraries.yml               |   34 -
 modules/diff/diff.links.menu.yml              |    5 -
 modules/diff/diff.links.task.yml              |    9 -
 modules/diff/diff.module                      |   76 -
 modules/diff/diff.routing.yml                 |   25 -
 modules/diff/diff.services.yml                |   36 -
 modules/diff/diff.views.inc                   |   38 -
 modules/diff/js/diff.js                       |   69 -
 .../diff/src/Annotation/DiffLayoutBuilder.php |   39 -
 .../diff/src/Annotation/FieldDiffBuilder.php  |   51 -
 .../src/Controller/NodeRevisionController.php |   53 -
 .../Controller/PluginRevisionController.php   |  327 ---
 modules/diff/src/DiffBuilderManager.php       |  268 ---
 modules/diff/src/DiffEntityComparison.php     |  354 ---
 modules/diff/src/DiffEntityParser.php         |  107 -
 modules/diff/src/DiffFormatter.php            |   30 -
 modules/diff/src/DiffLayoutBase.php           |  350 ---
 modules/diff/src/DiffLayoutInterface.php      |   33 -
 modules/diff/src/DiffLayoutManager.php        |  119 -
 modules/diff/src/FieldDiffBuilderBase.php     |  151 --
 .../diff/src/FieldDiffBuilderInterface.php    |   54 -
 modules/diff/src/FieldReferenceInterface.php  |   31 -
 modules/diff/src/Form/FieldsSettingsForm.php  |  528 -----
 modules/diff/src/Form/GeneralSettingsForm.php |  245 --
 .../diff/src/Form/RevisionOverviewForm.php    |  422 ----
 .../Plugin/diff/Field/CommentFieldBuilder.php |  104 -
 .../Plugin/diff/Field/CoreFieldBuilder.php    |   91 -
 .../Field/EntityReferenceFieldBuilder.php     |   89 -
 .../Plugin/diff/Field/FileFieldBuilder.php    |  149 --
 .../Plugin/diff/Field/ImageFieldBuilder.php   |  167 --
 .../Plugin/diff/Field/LinkFieldBuilder.php    |   91 -
 .../Plugin/diff/Field/ListFieldBuilder.php    |   96 -
 .../Plugin/diff/Field/TextFieldBuilder.php    |  103 -
 .../Field/TextWithSummaryFieldBuilder.php     |  121 -
 .../diff/Layout/SplitFieldsDiffLayout.php     |  281 ---
 .../diff/Layout/UnifiedFieldsDiffLayout.php   |  267 ---
 .../diff/Layout/VisualInlineDiffLayout.php    |  200 --
 .../diff/src/Plugin/views/field/DiffFrom.php  |   97 -
 .../src/Plugin/views/field/DiffPluginBase.php |  166 --
 .../diff/src/Plugin/views/field/DiffTo.php    |   22 -
 .../diff/src/Routing/DiffRouteProvider.php    |   54 -
 modules/diff/src/Routing/RouteSubscriber.php  |   29 -
 modules/diff/src/Tests/DiffAdminFormsTest.php |  228 --
 modules/diff/src/Tests/DiffLocaleTest.php     |  206 --
 .../diff/src/Tests/DiffPluginEntityTest.php   |   97 -
 modules/diff/src/Tests/DiffPluginFileTest.php |  288 ---
 modules/diff/src/Tests/DiffPluginTest.php     |  232 --
 modules/diff/src/Tests/DiffPluginTestBase.php |   49 -
 .../diff/src/Tests/DiffPluginVariousTest.php  |  426 ----
 modules/diff/src/Tests/DiffRevisionTest.php   |  454 ----
 modules/diff/src/Tests/DiffTestBase.php       |   89 -
 modules/diff/src/Tests/DiffViewModeTest.php   |   59 -
 modules/diff/src/Tests/DiffViewsTest.php      |   87 -
 .../diff/src/VisualDiffThemeNegotiator.php    |   74 -
 .../install/filter.format.basic_html.yml      |   50 -
 .../optional/views.view.test_diff_view.yml    |  418 ----
 .../modules/diff_test/diff_test.info.yml      |   18 -
 .../tests/modules/diff_test/diff_test.module  |   34 -
 .../diff/Field/TestHeavierTextPlugin.php      |   48 -
 .../diff/Field/TestLighterTextPlugin.php      |   48 -
 .../tests/src/Kernel/DiffControllerTest.php   |   96 -
 .../Unit/VisualDiffThemeNegotiatorTest.php    |  134 --
 modules/masquerade/LICENSE.txt                |  339 ---
 modules/masquerade/README.txt                 |   78 -
 modules/masquerade/composer.json              |    5 -
 modules/masquerade/masquerade.api.php         |   47 -
 modules/masquerade/masquerade.info.yml        |   14 -
 modules/masquerade/masquerade.install         |   16 -
 modules/masquerade/masquerade.links.menu.yml  |    6 -
 modules/masquerade/masquerade.module          |  275 ---
 modules/masquerade/masquerade.permissions.yml |   10 -
 modules/masquerade/masquerade.routing.yml     |   26 -
 modules/masquerade/masquerade.services.yml    |   22 -
 .../src/Access/SwitchAccessCheck.php          |   58 -
 .../src/Access/UnmasqueradeAccessCheck.php    |   42 -
 .../src/Cache/MasqueradeCacheContext.php      |   38 -
 .../src/Controller/SwitchController.php       |  149 --
 .../masquerade/src/Form/MasqueradeForm.php    |  113 -
 modules/masquerade/src/Masquerade.php         |  195 --
 .../masquerade/src/MasqueradePermissions.php  |   53 -
 .../src/Plugin/Block/MasqueradeBlock.php      |   99 -
 .../src/Tests/MasqueradeAccessTest.php        |  122 -
 .../src/Tests/MasqueradeCacheTest.php         |   60 -
 .../masquerade/src/Tests/MasqueradeTest.php   |   49 -
 .../src/Tests/MasqueradeWebTestBase.php       |  270 ---
 modules/pathauto/LICENSE.txt                  |  339 ---
 modules/pathauto/README.md                    |   83 -
 .../config/install/pathauto.settings.yml      |   13 -
 ...stem.action.pathauto_update_alias_node.yml |    9 -
 ...stem.action.pathauto_update_alias_user.yml |    9 -
 .../config/schema/pathauto.schema.yml         |   36 -
 .../config/schema/pathauto_pattern.schema.yml |   40 -
 modules/pathauto/pathauto.api.php             |  160 --
 modules/pathauto/pathauto.info.yml            |   20 -
 modules/pathauto/pathauto.install             |  301 ---
 modules/pathauto/pathauto.js                  |   21 -
 modules/pathauto/pathauto.libraries.yml       |    9 -
 modules/pathauto/pathauto.links.action.yml    |    6 -
 modules/pathauto/pathauto.links.task.yml      |   23 -
 modules/pathauto/pathauto.module              |  188 --
 modules/pathauto/pathauto.permissions.yml     |    6 -
 modules/pathauto/pathauto.routing.yml         |   54 -
 modules/pathauto/pathauto.services.yml        |   26 -
 modules/pathauto/pathauto.tokens.inc          |   49 -
 modules/pathauto/src/AliasCleaner.php         |  351 ---
 .../pathauto/src/AliasCleanerInterface.php    |  103 -
 modules/pathauto/src/AliasStorageHelper.php   |  255 --
 .../src/AliasStorageHelperInterface.php       |  117 -
 .../src/AliasTypeBatchUpdateInterface.php     |   31 -
 modules/pathauto/src/AliasTypeInterface.php   |   48 -
 modules/pathauto/src/AliasTypeManager.php     |   71 -
 modules/pathauto/src/AliasUniquifier.php      |  167 --
 .../pathauto/src/AliasUniquifierInterface.php |   42 -
 modules/pathauto/src/Annotation/AliasType.php |   37 -
 .../pathauto/src/Entity/PathautoPattern.php   |  370 ---
 .../PathautoSettingsCacheTag.php              |   54 -
 .../pathauto/src/Form/PathautoAdminDelete.php |  185 --
 .../src/Form/PathautoBulkUpdateForm.php       |  164 --
 .../src/Form/PathautoSettingsForm.php         |  266 ---
 .../pathauto/src/Form/PatternDisableForm.php  |   52 -
 modules/pathauto/src/Form/PatternEditForm.php |  285 ---
 .../pathauto/src/Form/PatternEnableForm.php   |   52 -
 modules/pathauto/src/MessengerInterface.php   |   20 -
 modules/pathauto/src/PathautoGenerator.php    |  365 ---
 .../src/PathautoGeneratorInterface.php        |   89 -
 modules/pathauto/src/PathautoItem.php         |   58 -
 .../pathauto/src/PathautoPatternInterface.php |  181 --
 .../src/PathautoPatternListBuilder.php        |   51 -
 modules/pathauto/src/PathautoState.php        |   97 -
 modules/pathauto/src/PathautoWidget.php       |   71 -
 .../src/Plugin/Action/UpdateAction.php        |   36 -
 .../Plugin/Deriver/EntityAliasTypeDeriver.php |   94 -
 .../src/Plugin/pathauto/AliasType/Broken.php  |   24 -
 .../AliasType/EntityAliasTypeBase.php         |  342 ---
 .../pathauto/AliasType/ForumAliasType.php     |  106 -
 .../src/Tests/PathautoBulkUpdateTest.php      |  156 --
 .../Tests/PathautoEnablingEntityTypesTest.php |   87 -
 .../pathauto/src/Tests/PathautoLocaleTest.php |  201 --
 .../src/Tests/PathautoMassDeleteTest.php      |  200 --
 .../src/Tests/PathautoNodeWebTest.php         |  292 ---
 .../src/Tests/PathautoSettingsFormWebTest.php |  240 --
 .../src/Tests/PathautoTaxonomyWebTest.php     |  102 -
 .../src/Tests/PathautoTestHelperTrait.php     |  190 --
 modules/pathauto/src/Tests/PathautoUiTest.php |  189 --
 .../src/Tests/PathautoUserWebTest.php         |   92 -
 modules/pathauto/src/VerboseMessenger.php     |   63 -
 .../config/install/views.view.articles.yml    |  231 --
 .../pathauto_views_test.info.yml              |   14 -
 .../tests/src/Kernel/PathautoKernelTest.php   |  572 -----
 .../tests/src/Kernel/PathautoTokenTest.php    |   78 -
 .../tests/src/Unit/VerboseMessengerTest.php   |   59 -
 modules/rules/.gitignore                      |    1 -
 modules/rules/.travis.yml                     |   78 -
 modules/rules/LICENSE.txt                     |  339 ---
 modules/rules/README.md                       |   77 -
 modules/rules/composer.json                   |   14 -
 modules/rules/composer.lock                   |  261 --
 .../rules/config/install/rules.settings.yml   |    4 -
 .../config/schema/rules.action.schema.yml     |   34 -
 .../config/schema/rules.condition.schema.yml  |   13 -
 .../config/schema/rules.context.schema.yml    |   30 -
 .../config/schema/rules.data_types.schema.yml |   17 -
 .../config/schema/rules.expression.schema.yml |  116 -
 modules/rules/config/schema/rules.schema.yml  |   84 -
 modules/rules/d7-tests/rules.test             | 2107 -----------------
 modules/rules/js/autocomplete.js              |  171 --
 modules/rules/phpcs.xml.dist                  |   43 -
 modules/rules/rules.info.yml                  |   14 -
 modules/rules/rules.libraries.yml             |    9 -
 modules/rules/rules.links.action.yml          |   15 -
 modules/rules/rules.links.menu.yml            |    7 -
 modules/rules/rules.links.task.yml            |   19 -
 modules/rules/rules.module                    |  159 --
 modules/rules/rules.permissions.yml           |   19 -
 modules/rules/rules.routing.yml               |   89 -
 modules/rules/rules.rules.events.yml          |   51 -
 modules/rules/rules.rules_ui.yml              |   12 -
 modules/rules/rules.services.yml              |   64 -
 .../src/Annotation/RulesDataProcessor.php     |   40 -
 .../rules/src/Annotation/RulesExpression.php  |   44 -
 .../ComponentConfigResolver.php               |   40 -
 .../EventComponentResolver.php                |   62 -
 .../src/Context/AnnotatedClassDiscovery.php   |   38 -
 .../Context/Annotation/ContextDefinition.php  |   51 -
 .../Context/ContextAwarePluginInterface.php   |   60 -
 modules/rules/src/Context/ContextConfig.php   |  190 --
 .../rules/src/Context/ContextDefinition.php   |  120 -
 .../Context/ContextDefinitionInterface.php    |   71 -
 .../Context/ContextHandlerIntegrityTrait.php  |  155 --
 .../rules/src/Context/ContextHandlerTrait.php |  327 ---
 .../src/Context/ContextProviderInterface.php  |   65 -
 .../src/Context/ContextProviderTrait.php      |   68 -
 .../src/Context/DataProcessorInterface.php    |   29 -
 .../src/Context/DataProcessorManager.php      |   24 -
 .../src/Context/DataProcessorManagerTrait.php |   45 -
 .../Context/GlobalContextRepositoryTrait.php  |   45 -
 .../src/Controller/AutocompleteController.php |   46 -
 .../Controller/RulesComponentListBuilder.php  |   43 -
 .../Controller/RulesReactionListBuilder.php   |   43 -
 .../rules/src/Core/Annotation/Condition.php   |   46 -
 .../rules/src/Core/Annotation/RulesAction.php |   74 -
 modules/rules/src/Core/ConditionManager.php   |   53 -
 .../ConfigurationAccessControlInterface.php   |   32 -
 .../Core/ConfigurationAccessControlTrait.php  |   67 -
 .../rules/src/Core/ExecutablePluginTrait.php  |   45 -
 modules/rules/src/Core/RulesActionBase.php    |  129 -
 .../rules/src/Core/RulesActionInterface.php   |   44 -
 modules/rules/src/Core/RulesActionManager.php |   57 -
 .../src/Core/RulesActionManagerInterface.php  |   26 -
 modules/rules/src/Core/RulesConditionBase.php |   72 -
 .../src/Core/RulesConditionInterface.php      |   24 -
 ...RulesConfigurableEventHandlerInterface.php |  103 -
 .../src/Core/RulesDefaultEventHandler.php     |   35 -
 .../src/Core/RulesEventHandlerInterface.php   |   39 -
 modules/rules/src/Core/RulesEventManager.php  |   98 -
 .../src/Engine/ActionExpressionContainer.php  |  136 --
 .../ActionExpressionContainerInterface.php    |   24 -
 .../src/Engine/ActionExpressionInterface.php  |   10 -
 .../Engine/ConditionExpressionContainer.php   |  164 --
 .../ConditionExpressionContainerInterface.php |   25 -
 .../Engine/ConditionExpressionInterface.php   |   28 -
 .../src/Engine/ExecutionMetadataState.php     |  121 -
 .../ExecutionMetadataStateInterface.php       |   87 -
 modules/rules/src/Engine/ExecutionState.php   |  203 --
 .../src/Engine/ExecutionStateInterface.php    |  135 --
 modules/rules/src/Engine/ExpressionBase.php   |  151 --
 .../src/Engine/ExpressionContainerBase.php    |  105 -
 .../Engine/ExpressionContainerInterface.php   |   70 -
 .../rules/src/Engine/ExpressionInterface.php  |  146 --
 .../rules/src/Engine/ExpressionManager.php    |   92 -
 .../src/Engine/ExpressionManagerInterface.php |   84 -
 .../rules/src/Engine/IntegrityViolation.php   |   78 -
 .../Engine/IntegrityViolationInterface.php    |   73 -
 .../src/Engine/IntegrityViolationList.php     |   91 -
 modules/rules/src/Engine/RulesComponent.php   |  348 ---
 .../src/Engine/RulesComponentRepository.php   |  118 -
 .../RulesComponentRepositoryInterface.php     |   69 -
 .../RulesComponentResolverInterface.php       |   25 -
 .../rules/src/Entity/ReactionRuleConfig.php   |  262 --
 .../rules/src/Entity/ReactionRuleStorage.php  |  153 --
 .../rules/src/Entity/RulesComponentConfig.php |  264 ---
 modules/rules/src/Event/EntityEvent.php       |   14 -
 modules/rules/src/Event/SystemCronEvent.php   |   16 -
 modules/rules/src/Event/SystemLoggerEvent.php |   14 -
 modules/rules/src/Event/UserLoginEvent.php    |   34 -
 modules/rules/src/Event/UserLogoutEvent.php   |   16 -
 .../ConfigurableEventHandlerBase.php          |   52 -
 .../ConfigurableEventHandlerEntityBundle.php  |   67 -
 .../GenericEventSubscriber.php                |  136 --
 .../RedirectEventSubscriber.php               |   42 -
 .../src/Exception/EvaluationException.php     |   10 -
 .../src/Exception/IntegrityException.php      |   10 -
 .../Exception/InvalidArgumentException.php    |   10 -
 .../Exception/InvalidExpressionException.php  |   10 -
 .../rules/src/Exception/LogicException.php    |   10 -
 .../src/Exception/OutOfBoundsException.php    |   10 -
 .../rules/src/Exception/RulesException.php    |   12 -
 modules/rules/src/Form/AddExpressionForm.php  |  104 -
 modules/rules/src/Form/BreakLockForm.php      |  122 -
 .../rules/src/Form/DeleteExpressionForm.php   |   85 -
 modules/rules/src/Form/EditExpressionForm.php |  145 --
 .../rules/src/Form/EmbeddedComponentForm.php  |   77 -
 .../Form/Expression/ActionContainerForm.php   |   89 -
 .../rules/src/Form/Expression/ActionForm.php  |  143 --
 .../Expression/ConditionContainerForm.php     |   89 -
 .../src/Form/Expression/ConditionForm.php     |  158 --
 .../src/Form/Expression/ContextFormTrait.php  |  147 --
 .../Expression/ExpressionFormInterface.php    |   42 -
 .../Form/Expression/ExpressionFormTrait.php   |   28 -
 .../rules/src/Form/Expression/RuleForm.php    |   44 -
 .../rules/src/Form/ReactionRuleAddForm.php    |   87 -
 .../rules/src/Form/ReactionRuleEditForm.php   |  142 --
 .../rules/src/Form/RulesComponentAddForm.php  |   50 -
 .../rules/src/Form/RulesComponentEditForm.php |  101 -
 .../rules/src/Form/RulesComponentFormBase.php |  112 -
 modules/rules/src/Form/RulesSettingsForm.php  |  101 -
 modules/rules/src/Logger/RulesLog.php         |   75 -
 .../rules/src/Logger/RulesLoggerChannel.php   |   80 -
 .../src/Plugin/Condition/DataComparison.php   |   92 -
 .../src/Plugin/Condition/DataIsEmpty.php      |   47 -
 .../src/Plugin/Condition/DataListContains.php |   56 -
 .../src/Plugin/Condition/DataListCountIs.php  |   64 -
 .../src/Plugin/Condition/EntityHasField.php   |   46 -
 .../src/Plugin/Condition/EntityIsNew.php      |   40 -
 .../src/Plugin/Condition/EntityIsOfBundle.php |   72 -
 .../src/Plugin/Condition/EntityIsOfType.php   |   49 -
 .../src/Plugin/Condition/NodeIsOfType.php     |   44 -
 .../src/Plugin/Condition/NodeIsPromoted.php   |   39 -
 .../src/Plugin/Condition/NodeIsPublished.php  |   39 -
 .../src/Plugin/Condition/NodeIsSticky.php     |   39 -
 .../src/Plugin/Condition/PathAliasExists.php  |   90 -
 .../src/Plugin/Condition/PathHasAlias.php     |   88 -
 .../Condition/UserHasEntityFieldAccess.php    |  106 -
 .../src/Plugin/Condition/UserHasRole.php      |   70 -
 .../src/Plugin/Condition/UserIsBlocked.php    |   39 -
 .../rules/src/Plugin/RulesAction/BanIP.php    |   97 -
 .../Plugin/RulesAction/DataCalculateValue.php |   83 -
 .../src/Plugin/RulesAction/DataConvert.php    |  101 -
 .../Plugin/RulesAction/DataListItemAdd.php    |   72 -
 .../Plugin/RulesAction/DataListItemRemove.php |   46 -
 .../rules/src/Plugin/RulesAction/DataSet.php  |   64 -
 .../src/Plugin/RulesAction/EntityCreate.php   |   98 -
 .../RulesAction/EntityCreateDeriver.php       |  123 -
 .../src/Plugin/RulesAction/EntityDelete.php   |   37 -
 .../Plugin/RulesAction/EntityFetchByField.php |  119 -
 .../Plugin/RulesAction/EntityFetchById.php    |  100 -
 .../RulesAction/EntityPathAliasCreate.php     |   86 -
 .../EntityPathAliasCreateDeriver.php          |   80 -
 .../src/Plugin/RulesAction/EntitySave.php     |   67 -
 .../Plugin/RulesAction/PathAliasCreate.php    |   91 -
 .../RulesAction/PathAliasDeleteByAlias.php    |   75 -
 .../RulesAction/PathAliasDeleteByPath.php     |   75 -
 .../RulesAction/RulesComponentAction.php      |  124 -
 .../RulesComponentActionDeriver.php           |   77 -
 .../Plugin/RulesAction/SendAccountEmail.php   |   43 -
 .../src/Plugin/RulesAction/SystemMessage.php  |   53 -
 .../Plugin/RulesAction/SystemPageRedirect.php |  113 -
 .../Plugin/RulesAction/SystemSendEmail.php    |  129 -
 .../src/Plugin/RulesAction/UserBlock.php      |   99 -
 .../src/Plugin/RulesAction/UserRoleAdd.php    |   78 -
 .../src/Plugin/RulesAction/UserRoleRemove.php |   75 -
 .../src/Plugin/RulesAction/UserUnblock.php    |   58 -
 .../src/Plugin/RulesAction/VariableAdd.php    |   54 -
 .../RulesDataProcessor/NumericOffset.php      |   29 -
 .../RulesDataProcessor/TokenProcessor.php     |   73 -
 .../Plugin/RulesEvent/EntityDeleteDeriver.php |   72 -
 .../Plugin/RulesEvent/EntityInsertDeriver.php |   72 -
 .../RulesEvent/EntityPresaveDeriver.php       |   76 -
 .../Plugin/RulesEvent/EntityUpdateDeriver.php |   76 -
 .../Plugin/RulesEvent/EntityViewDeriver.php   |   72 -
 .../src/Plugin/RulesExpression/ActionSet.php  |   35 -
 .../rules/src/Plugin/RulesExpression/Rule.php |  241 --
 .../Plugin/RulesExpression/RuleInterface.php  |   77 -
 .../Plugin/RulesExpression/RulesAction.php    |  170 --
 .../src/Plugin/RulesExpression/RulesAnd.php   |   54 -
 .../Plugin/RulesExpression/RulesCondition.php |  204 --
 .../src/Plugin/RulesExpression/RulesLoop.php  |  126 -
 .../src/Plugin/RulesExpression/RulesOr.php    |   41 -
 .../src/Routing/RulesUiRouteEnhancer.php      |   58 -
 .../src/Routing/RulesUiRouteSubscriber.php    |  121 -
 modules/rules/src/Rules.php                   |   30 -
 modules/rules/src/RulesServiceProvider.php    |   23 -
 .../Ui/RulesUiComponentProviderInterface.php  |   32 -
 modules/rules/src/Ui/RulesUiConfigHandler.php |  168 --
 modules/rules/src/Ui/RulesUiDefinition.php    |  160 --
 .../rules/src/Ui/RulesUiHandlerInterface.php  |  148 --
 modules/rules/src/Ui/RulesUiHandlerTrait.php  |   44 -
 modules/rules/src/Ui/RulesUiManager.php       |   41 -
 .../rules/src/Ui/RulesUiManagerInterface.php  |   49 -
 modules/rules/src/Ui/TempStoreTrait.php       |  281 ---
 .../schema/rules_test.action.schema.yml       |    6 -
 .../modules/rules_test/rules_test.info.yml    |   13 -
 .../Plugin/Condition/TestConditionFalse.php   |   32 -
 .../Condition/TestConditionProvider.php       |   38 -
 .../Plugin/Condition/TestConditionTrue.php    |   32 -
 .../Plugin/Condition/TestTextCondition.php    |   39 -
 .../src/Plugin/RulesAction/TestLogAction.php  |   73 -
 .../src/Plugin/RulesAction/TestNodeAction.php |   43 -
 .../Plugin/RulesAction/TestStringAction.php   |   36 -
 ...component.rules_test_default_component.yml |   42 -
 .../rules_test_default_component.info.yml     |   14 -
 .../install/rules_test_ui_embed.settings.yml  |   11 -
 .../schema/rules_test_ui_embed.schema.yml     |   17 -
 .../modules/rules_test_ui_embed/css/test.css  |    3 -
 .../rules_test_ui_embed.info.yml              |   13 -
 .../rules_test_ui_embed.links.menu.yml        |    6 -
 .../rules_test_ui_embed.routing.yml           |   10 -
 .../rules_test_ui_embed.rules_ui.yml          |    6 -
 .../src/Form/SettingsForm.php                 |  111 -
 .../Functional/ConfigureAndExecuteTest.php    |  113 -
 .../src/Functional/RulesBrowserTestBase.php   |   79 -
 .../tests/src/Functional/RulesUiEmbedTest.php |   64 -
 .../tests/src/Functional/TempStorageTest.php  |   85 -
 .../rules/tests/src/Functional/UiPageTest.php |  148 --
 .../src/Kernel/ConfigEntityDefaultsTest.php   |   74 -
 .../tests/src/Kernel/ConfigEntityTest.php     |  123 -
 .../tests/src/Kernel/ConfigSchemaTest.php     |   48 -
 .../Kernel/ConfigurableEventHandlerTest.php   |  134 --
 .../src/Kernel/ContextIntegrationTest.php     |  109 -
 .../tests/src/Kernel/CoreIntegrationTest.php  |  319 ---
 .../tests/src/Kernel/DataProcessorTest.php    |   52 -
 .../src/Kernel/Engine/AutocompleteTest.php    |  366 ---
 .../Kernel/Engine/MetadataAssertionTest.php   |  173 --
 .../rules/tests/src/Kernel/EntityViewTest.php |   70 -
 .../tests/src/Kernel/EventIntegrationTest.php |  282 ---
 .../Kernel/RedirectEventSubscriberTest.php    |   49 -
 .../tests/src/Kernel/RulesDrupalTestBase.php  |   99 -
 .../tests/src/Kernel/RulesEngineTest.php      |  171 --
 .../rules/tests/src/Kernel/RulesMailTest.php  |   68 -
 .../tests/src/Kernel/RulesUiEmbedTest.php     |   53 -
 .../tests/src/Kernel/TokenIntegrationTest.php |   44 -
 .../rules/tests/src/Unit/ActionSetTest.php    |  107 -
 .../src/Unit/ContextHandlerTraitTest.php      |   54 -
 .../src/Unit/Integration/Action/BanIPTest.php |  122 -
 .../Action/DataCalculateValueTest.php         |  133 --
 .../Integration/Action/DataConvertTest.php    |  164 --
 .../Action/DataListItemAddTest.php            |  158 --
 .../Action/DataListItemRemoveTest.php         |   56 -
 .../Unit/Integration/Action/DataSetTest.php   |   63 -
 .../Integration/Action/EntityCreateTest.php   |  158 --
 .../Integration/Action/EntityDeleteTest.php   |   52 -
 .../Action/EntityFetchByFieldTest.php         |  177 --
 .../Action/EntityFetchByIdTest.php            |   79 -
 .../Action/EntityPathAliasCreateTest.php      |  118 -
 .../Integration/Action/EntitySaveTest.php     |   77 -
 .../Action/PathAliasCreateTest.php            |   84 -
 .../Action/PathAliasDeleteByAliasTest.php     |   64 -
 .../Action/PathAliasDeleteByPathTest.php      |   67 -
 .../Action/RulesActionAccessTest.php          |   59 -
 .../Action/RulesComponentActionTest.php       |  193 --
 .../Action/SendAccountEmailTest.php           |   86 -
 .../Integration/Action/SystemMessageTest.php  |  153 --
 .../Action/SystemPageRedirectTest.php         |  176 --
 .../Action/SystemSendEmailTest.php            |  132 --
 .../Unit/Integration/Action/UserBlockTest.php |  168 --
 .../Integration/Action/UserRoleAddTest.php    |  165 --
 .../Integration/Action/UserRoleRemoveTest.php |   94 -
 .../Integration/Action/UserUnblockTest.php    |  102 -
 .../Integration/Action/VariableAddTest.php    |   33 -
 .../Condition/ConditionAccessTest.php         |   59 -
 .../Condition/ConditionManagerTest.php        |   30 -
 .../Condition/DataComparisonTest.php          |  218 --
 .../Integration/Condition/DataIsEmptyTest.php |  106 -
 .../Condition/EntityHasFieldTest.php          |   53 -
 .../Integration/Condition/EntityIsNewTest.php |   43 -
 .../Condition/EntityIsOfBundleTest.php        |   59 -
 .../Condition/EntityIsOfTypeTest.php          |   51 -
 .../Condition/ListContainsTest.php            |  124 -
 .../Integration/Condition/ListCountIsTest.php |   85 -
 .../Condition/NodeIsOfTypeTest.php            |   52 -
 .../Condition/NodeIsPromotedTest.php          |   56 -
 .../Condition/NodeIsPublishedTest.php         |   56 -
 .../Condition/NodeIsStickyTest.php            |   56 -
 .../Condition/PathAliasExistsTest.php         |  102 -
 .../Condition/PathHasAliasTest.php            |  102 -
 .../UserHasEntityFieldAccessTest.php          |   88 -
 .../Integration/Condition/UserHasRoleTest.php |  111 -
 .../Condition/UserIsBlockedTest.php           |   54 -
 .../Engine/AnnotationProcessingTest.php       |  146 --
 .../Unit/Integration/Engine/AutoSaveTest.php  |   37 -
 .../Engine/ExpressionSerializationTest.php    |   94 -
 .../Integration/Engine/IntegrityCheckTest.php |  420 ----
 .../src/Unit/Integration/Engine/LoopTest.php  |  317 ---
 .../PrepareExecutionMetadataStateTest.php     |  114 -
 .../Integration/Engine/RulesComponentTest.php |   88 -
 .../Integration/Event/EntityDeleteTest.php    |   25 -
 .../Integration/Event/EntityInsertTest.php    |   25 -
 .../Integration/Event/EntityPresaveTest.php   |   30 -
 .../Integration/Event/EntityUpdateTest.php    |   30 -
 .../Unit/Integration/Event/EntityViewTest.php |   25 -
 .../Unit/Integration/Event/EventTestBase.php  |   32 -
 .../Event/SystemLoggerEventTest.php           |   23 -
 .../Unit/Integration/Event/UserLoginTest.php  |   22 -
 .../Unit/Integration/Event/UserLogoutTest.php |   22 -
 .../RulesAction/RulesActionManagerTest.php    |   30 -
 .../RulesAction/RulesAdminAccessTest.php      |   61 -
 .../RulesEntityIntegrationTestBase.php        |  177 --
 .../Integration/RulesIntegrationTestBase.php  |  298 ---
 modules/rules/tests/src/Unit/RuleTest.php     |  254 --
 .../tests/src/Unit/RulesActionBaseTest.php    |   58 -
 modules/rules/tests/src/Unit/RulesAndTest.php |   98 -
 .../src/Unit/RulesConditionContainerTest.php  |  185 --
 .../tests/src/Unit/RulesConditionTest.php     |  149 --
 .../tests/src/Unit/RulesLoggerChannelTest.php |  204 --
 modules/rules/tests/src/Unit/RulesOrTest.php  |   98 -
 .../tests/src/Unit/RulesUnitTestBase.php      |   71 -
 modules/scheduler/.travis.yml                 |   89 -
 modules/scheduler/LICENSE.txt                 |  339 ---
 modules/scheduler/README.md                   |   94 -
 modules/scheduler/composer.json               |   33 -
 .../config/install/scheduler.settings.yml     |   19 -
 ...views.view.scheduler_scheduled_content.yml |  852 -------
 .../config/schema/scheduler.schema.yml        |   98 -
 .../scheduler/js/scheduler_vertical_tabs.js   |   45 -
 modules/scheduler/phpcs.xml.dist              |   27 -
 .../content_types/scheduler_form_pane.inc     |   57 -
 modules/scheduler/scheduler.admin.inc         |  185 --
 modules/scheduler/scheduler.api.php           |  123 -
 modules/scheduler/scheduler.drush.inc         |   34 -
 modules/scheduler/scheduler.info.yml          |   21 -
 modules/scheduler/scheduler.install           |  105 -
 modules/scheduler/scheduler.libraries.yml     |    6 -
 modules/scheduler/scheduler.links.menu.yml    |    5 -
 modules/scheduler/scheduler.links.task.yml    |   11 -
 modules/scheduler/scheduler.module            |  587 -----
 modules/scheduler/scheduler.permissions.yml   |    9 -
 modules/scheduler/scheduler.routing.yml       |   27 -
 modules/scheduler/scheduler.services.yml      |   13 -
 modules/scheduler/scheduler.tokens.inc        |   66 -
 ...uler_handler_field_scheduler_countdown.inc |  157 --
 .../scheduler_rules_integration.info.yml      |   13 -
 .../scheduler_rules_integration.module        |   74 -
 ...heduler_rules_integration.rules.events.yml |   64 -
 ...duler_rules_integration.rules_defaults.inc |  144 --
 ...stingNodeIsScheduledForPublishingEvent.php |   35 -
 ...ingNodeIsScheduledForUnpublishingEvent.php |   35 -
 .../NewNodeIsScheduledForPublishingEvent.php  |   35 -
 ...NewNodeIsScheduledForUnpublishingEvent.php |   35 -
 .../SchedulerHasPublishedThisNodeEvent.php    |   34 -
 .../SchedulerHasUnpublishedThisNodeEvent.php  |   34 -
 .../NodeIsScheduledForPublishing.php          |   35 -
 .../NodeIsScheduledForUnpublishing.php        |   35 -
 .../Plugin/Condition/PublishingIsEnabled.php  |   37 -
 .../Condition/UnpublishingIsEnabled.php       |   37 -
 .../src/Plugin/RulesAction/PublishNow.php     |   36 -
 .../RulesAction/RemovePublishingDate.php      |   46 -
 .../RulesAction/RemoveUnpublishingDate.php    |   46 -
 .../Plugin/RulesAction/SetPublishingDate.php  |   55 -
 .../RulesAction/SetUnpublishingDate.php       |   55 -
 .../src/Plugin/RulesAction/UnpublishNow.php   |   36 -
 .../src/Access/ScheduledListAccess.php        |   60 -
 .../Controller/LightweightCronController.php  |   47 -
 .../SchedulerMissingDateException.php         |   14 -
 .../SchedulerNodeTypeNotEnabledException.php  |   14 -
 .../scheduler/src/Form/SchedulerAdminForm.php |  156 --
 .../scheduler/src/Form/SchedulerCronForm.php  |  166 --
 .../TimestampDatetimeNoDefaultWidget.php      |   87 -
 .../SchedulerPublishOnConstraint.php          |   32 -
 .../SchedulerPublishOnConstraintValidator.php |   28 -
 .../SchedulerUnpublishOnConstraint.php        |   53 -
 ...chedulerUnpublishOnConstraintValidator.php |   58 -
 .../src/Plugin/views/access/Scheduler.php     |   59 -
 modules/scheduler/src/SchedulerEvent.php      |   50 -
 modules/scheduler/src/SchedulerEvents.php     |   98 -
 modules/scheduler/src/SchedulerManager.php    |  462 ----
 .../scheduler_access_test.info.yml            |   13 -
 .../scheduler_access_test.install             |   26 -
 .../scheduler_access_test.module              |   34 -
 ...isplay.node.scheduler_api_test.default.yml |   80 -
 ...isplay.node.scheduler_api_test.default.yml |   38 -
 ...ler_api_test.field_approved_publishing.yml |   25 -
 ...r_api_test.field_approved_unpublishing.yml |   25 -
 ...storage.node.field_approved_publishing.yml |   20 -
 ...orage.node.field_approved_unpublishing.yml |   20 -
 .../install/node.type.scheduler_api_test.yml  |   32 -
 .../scheduler_api_test.info.yml               |   13 -
 .../scheduler_api_test.install                |   34 -
 .../scheduler_api_test.module                 |  121 -
 .../scheduler_api_test.services.yml           |    5 -
 .../src/EventSubscriber.php                   |  141 --
 .../Functional/SchedulerAdminSettingsTest.php |   52 -
 .../tests/src/Functional/SchedulerApiTest.php |  380 ---
 .../src/Functional/SchedulerBasicTest.php     |   81 -
 .../Functional/SchedulerBrowserTestBase.php   |  156 --
 .../Functional/SchedulerDefaultTimeTest.php   |   83 -
 .../Functional/SchedulerDeleteNodeTest.php    |  102 -
 .../Functional/SchedulerDevelGenerateTest.php |  174 --
 .../Functional/SchedulerFieldsDisplayTest.php |  107 -
 .../SchedulerLightweightCronTest.php          |   76 -
 .../SchedulerMetaInformationTest.php          |   48 -
 .../Functional/SchedulerMultilingualTest.php  |  230 --
 .../Functional/SchedulerNodeAccessTest.php    |   88 -
 .../SchedulerNonEnabledTypeTest.php           |  164 --
 .../src/Functional/SchedulerPastDatesTest.php |   87 -
 .../Functional/SchedulerPermissionsTest.php   |   79 -
 .../src/Functional/SchedulerRequiredTest.php  |  227 --
 .../Functional/SchedulerRevisioningTest.php   |  170 --
 .../Functional/SchedulerRulesActionsTest.php  |  282 ---
 .../SchedulerRulesConditionsTest.php          |  261 --
 .../Functional/SchedulerRulesEventsTest.php   |  227 --
 ...chedulerScheduledContentListAccessTest.php |  142 --
 .../Functional/SchedulerStatusReportTest.php  |   31 -
 .../Functional/SchedulerTokenReplaceTest.php  |   68 -
 .../Functional/SchedulerValidationTest.php    |   82 -
 modules/token/.travis.yml                     |   96 -
 modules/token/LICENSE.txt                     |  339 ---
 modules/token/README.md                       |   33 -
 modules/token/css/jquery.treetable.css        |   28 -
 modules/token/css/token.css                   |   32 -
 modules/token/css/token.treetable.theme.css   |   50 -
 modules/token/js/jquery.treetable.js          |  629 -----
 modules/token/js/token.js                     |   58 -
 .../TokenAutocompleteController.php           |   78 -
 .../src/Controller/TokenCacheController.php   |   21 -
 .../src/Controller/TokenDevelController.php   |  109 -
 .../src/Controller/TokenTreeController.php    |   56 -
 modules/token/src/Element/TokenTreeTable.php  |  155 --
 .../src/Plugin/Derivative/DevelLocalTask.php  |   56 -
 modules/token/src/Routing/RouteSubscriber.php |   74 -
 modules/token/src/Tests/TokenBlockTest.php    |   72 -
 .../token/src/Tests/TokenCurrentPageTest.php  |   66 -
 modules/token/src/Tests/TokenFieldUiTest.php  |  280 ---
 modules/token/src/Tests/TokenMenuTest.php     |  459 ----
 modules/token/src/Tests/TokenTestBase.php     |   21 -
 modules/token/src/Tests/TokenTestTrait.php    |  111 -
 modules/token/src/Tests/TokenURLTest.php      |   51 -
 modules/token/src/Tests/TokenUserTest.php     |  116 -
 .../token/src/Tests/Tree/AutocompleteTest.php |   61 -
 modules/token/src/Tests/Tree/HelpPageTest.php |   69 -
 .../src/Tests/Tree/TokenTreeTestTrait.php     |  131 -
 modules/token/src/Tests/Tree/TreeTest.php     |  148 --
 modules/token/src/Token.php                   |  213 --
 modules/token/src/TokenEntityMapper.php       |   82 -
 .../token/src/TokenEntityMapperInterface.php  |   53 -
 modules/token/src/TokenInterface.php          |   75 -
 modules/token/src/TokenServiceProvider.php    |   20 -
 modules/token/src/TreeBuilder.php             |  267 ---
 modules/token/src/TreeBuilderInterface.php    |   79 -
 .../token/templates/token-tree-link.html.twig |   19 -
 .../core.date_format.token_module_test.yml    |    6 -
 .../Controller/TokenTreeBrowseController.php  |   37 -
 .../token_module_test.info.yml                |   12 -
 .../token_module_test.module                  |   32 -
 .../token_module_test.routing.yml             |    7 -
 .../token_module_test.tokens.inc              |   13 -
 ....entity_form_display.user.user.default.yml |   23 -
 .../field.field.user.user.user_picture.yml    |   31 -
 .../field.storage.user.user_picture.yml       |   25 -
 .../token_user_picture.info.yml               |   14 -
 modules/token/tests/src/Kernel/ArrayTest.php  |   60 -
 modules/token/tests/src/Kernel/BookTest.php   |  107 -
 .../token/tests/src/Kernel/CommentTest.php    |  102 -
 modules/token/tests/src/Kernel/DateTest.php   |   35 -
 modules/token/tests/src/Kernel/EntityTest.php |  104 -
 modules/token/tests/src/Kernel/FieldTest.php  |  708 ------
 modules/token/tests/src/Kernel/FileTest.php   |   55 -
 .../token/tests/src/Kernel/KernelTestBase.php |   33 -
 modules/token/tests/src/Kernel/NodeTest.php   |   99 -
 modules/token/tests/src/Kernel/RandomTest.php |   27 -
 .../token/tests/src/Kernel/TaxonomyTest.php   |  151 --
 modules/token/tests/src/Kernel/UnitTest.php   |  119 -
 modules/token/token.drush.inc                 |   20 -
 modules/token/token.info.yml                  |   10 -
 modules/token/token.install                   |  316 ---
 modules/token/token.libraries.yml             |   25 -
 modules/token/token.links.task.yml            |    3 -
 modules/token/token.module                    |  788 ------
 modules/token/token.pages.inc                 |   61 -
 modules/token/token.routing.yml               |   22 -
 modules/token/token.services.yml              |   12 -
 modules/token/token.tokens.inc                | 1721 --------------
 modules/tour_ui/LICENSE.txt                   |  339 ---
 modules/tour_ui/README.txt                    |    1 -
 .../src/Controller/TourTipController.php      |  127 -
 modules/tour_ui/src/Form/TourDeleteForm.php   |   19 -
 modules/tour_ui/src/Form/TourForm.php         |  313 ---
 .../tour_ui/src/Form/TourTipDeleteForm.php    |  116 -
 modules/tour_ui/src/Form/TourTipForm.php      |  186 --
 .../tour_ui/tip/TipPluginTextExtended.php     |  210 --
 modules/tour_ui/src/Tests/TourUITest.php      |  189 --
 .../tour_ui/src/TourAccessControlHandler.php  |   25 -
 modules/tour_ui/src/TourListBuilder.php       |  122 -
 modules/tour_ui/tour_ui.info.yml              |   14 -
 modules/tour_ui/tour_ui.links.action.yml      |    5 -
 modules/tour_ui/tour_ui.links.menu.yml        |    5 -
 modules/tour_ui/tour_ui.module                |   34 -
 modules/tour_ui/tour_ui.permissions.yml       |    3 -
 modules/tour_ui/tour_ui.routing.yml           |   54 -
 modules/typed_data/.gitignore                 |    1 -
 modules/typed_data/.travis.yml                |   76 -
 modules/typed_data/LICENSE.txt                |  339 ---
 modules/typed_data/README.md                  |   61 -
 modules/typed_data/composer.json              |   16 -
 modules/typed_data/composer.lock              |  258 --
 modules/typed_data/phpcs.xml.dist             |   33 -
 .../typed_data/src/Annotation/DataFilter.php  |   30 -
 .../src/Annotation/TypedDataFormWidget.php    |   39 -
 .../src/Context/AnnotatedClassDiscovery.php   |   37 -
 .../Context/Annotation/ContextDefinition.php  |   51 -
 .../src/Context/ContextDefinition.php         |  120 -
 .../Context/ContextDefinitionInterface.php    |   71 -
 modules/typed_data/src/DataFetcher.php        |  320 ---
 .../typed_data/src/DataFetcherInterface.php   |  122 -
 modules/typed_data/src/DataFetcherTrait.php   |   44 -
 modules/typed_data/src/DataFilterBase.php     |   71 -
 .../typed_data/src/DataFilterInterface.php    |  111 -
 modules/typed_data/src/DataFilterManager.php  |   24 -
 .../src/DataFilterManagerInterface.php        |   29 -
 .../src/Exception/FilterException.php         |   11 -
 .../Exception/InvalidArgumentException.php    |   10 -
 .../src/Exception/LogicException.php          |   10 -
 .../src/Exception/TypedDataException.php      |   12 -
 modules/typed_data/src/Form/SubformState.php  |   60 -
 .../typed_data/src/PlaceholderResolver.php    |  205 --
 .../src/PlaceholderResolverInterface.php      |  108 -
 .../src/PlaceholderResolverTrait.php          |   44 -
 .../Plugin/TypedDataFilter/DefaultFilter.php  |   72 -
 .../TypedDataFilter/EntityUrlFilter.php       |   45 -
 .../TypedDataFilter/FormatDateFilter.php      |  127 -
 .../Plugin/TypedDataFilter/LowerFilter.php    |   42 -
 .../TypedDataFilter/StripTagsFilter.php       |   41 -
 .../TypedDataFormWidget/SelectWidget.php      |  102 -
 .../TypedDataFormWidget/TextInputWidget.php   |  108 -
 modules/typed_data/src/Util/StateTrait.php    |   46 -
 .../typed_data/src/Widget/FormWidgetBase.php  |   69 -
 .../src/Widget/FormWidgetInterface.php        |   96 -
 .../src/Widget/FormWidgetManager.php          |   22 -
 .../src/Widget/FormWidgetManagerInterface.php |   31 -
 .../src/Widget/FormWidgetManagerTrait.php     |   44 -
 .../src/FormWidgetExampleController.php       |   36 -
 .../src/FormWidgetExampleForm.php             |  124 -
 .../typed_data_widget_test.info.yml           |   12 -
 .../typed_data_widget_test.links.menu.yml     |    6 -
 .../typed_data_widget_test.routing.yml        |   14 -
 .../TypedDataFormWidget/SelectWidgetTest.php  |  128 -
 .../TextInputWidgetTest.php                   |  127 -
 .../src/Kernel/DataDefinitionFetcherTest.php  |  261 --
 .../tests/src/Kernel/DataFetcherTest.php      |  284 ---
 .../tests/src/Kernel/DataFilterTest.php       |  136 --
 .../src/Kernel/PlaceholderResolverTest.php    |  272 ---
 .../src/Traits/BrowserTestHelpersTrait.php    |   77 -
 modules/typed_data/typed_data.info.yml        |   10 -
 modules/typed_data/typed_data.services.yml    |   12 -
 modules/workbench_access-8.x-1.x/.travis.yml  |   75 -
 modules/workbench_access-8.x-1.x/README.md    |  100 -
 .../workbench_access-8.x-1.x/composer.json    |    7 -
 ...ld.storage.user.field_workbench_access.yml |   18 -
 .../install/workbench_access.settings.yml     |    6 -
 .../config/schema/workbench_access.schema.yml |   46 -
 .../schema/workbench_access.views.schema.yml  |   46 -
 .../js/workbench_access.js                    |   19 -
 .../src/AccessControlHierarchyBase.php        |  374 ---
 .../src/AccessControlHierarchyInterface.php   |  240 --
 .../src/Annotation/AccessControlHierarchy.php |   75 -
 .../Controller/WorkbenchAccessSections.php    |  104 -
 .../src/Form/WorkbenchAccessByRoleForm.php    |  131 -
 .../src/Form/WorkbenchAccessByUserForm.php    |  285 ---
 .../src/Form/WorkbenchAccessConfigForm.php    |  239 --
 .../Plugin/AccessControlHierarchy/Menu.php    |  183 --
 .../AccessControlHierarchy/Taxonomy.php       |  158 --
 .../src/Plugin/Block/WorkbenchAccessBlock.php |   60 -
 .../TaxonomyHierarchySelection.php            |   77 -
 .../UserFilteredSelection.php                 |   41 -
 .../src/Plugin/views/field/Section.php        |   90 -
 .../src/Plugin/views/field/UserSection.php    |   61 -
 .../src/Plugin/views/filter/Section.php       |  229 --
 .../src/RoleSectionStorage.php                |  161 --
 .../src/RoleSectionStorageInterface.php       |   89 -
 .../Tests/WorkbenchAccessNodeTypeFormTest.php |   72 -
 .../src/Tests/WorkbenchAccessTestBase.php     |  103 -
 .../src/UserSectionStorage.php                |  174 --
 .../src/UserSectionStorage.php.orig           |  176 --
 .../src/UserSectionStorageInterface.php       |   88 -
 .../src/WorkbenchAccessManager.php            |  439 ----
 .../src/WorkbenchAccessManagerInterface.php   |  154 --
 .../DerivedAccessControlHierarchy.php         |   35 -
 .../DerivedAccessControlPlugins.php           |   25 -
 .../workbench_access_test.info.yml            |    7 -
 .../src/Functional/AccessByRoleFormTest.php   |   69 -
 .../src/Functional/AccessByUserFormTest.php   |  105 -
 .../tests/src/Functional/ConfigFormTest.php   |   57 -
 .../tests/src/Functional/NodeFormTest.php     |   90 -
 .../Functional/WorkbenchAccessTestTrait.php   |  145 --
 .../tests/src/Kernel/NodeAccessTest.php       |  157 --
 .../tests/src/Kernel/SectionCacheTest.php     |  109 -
 ...WorkbenchAccessDerivativeDiscoveryTest.php |   43 -
 .../src/Unit/UserSectionStorageUnitTest.php   |   55 -
 .../workbench_access.drush.inc                |  165 --
 .../workbench_access.info.yml                 |   11 -
 .../workbench_access.install                  |   46 -
 .../workbench_access.libraries.yml            |    7 -
 .../workbench_access.links.menu.yml           |    5 -
 .../workbench_access.links.task.yml           |   10 -
 .../workbench_access.module                   |  254 --
 .../workbench_access.permissions.yml          |   29 -
 .../workbench_access.routing.yml              |   31 -
 .../workbench_access.services.yml             |   10 -
 modules/workflow/CHANGELOG.txt                |    7 -
 modules/workflow/LICENSE.txt                  |  339 ---
 .../config/install/workflow.settings.yml      |    1 -
 .../block.block.workflowtransitionform.yml    |   19 -
 ...n.change_a_node_to_next_workflow_state.yml |   21 -
 .../config/schema/workflow.schema.yml         |   82 -
 .../config/schema/workflow.state.schema.yml   |   27 -
 .../schema/workflow.transition.schema.yml     |   27 -
 .../config/schema/workflow.views.schema.yml   |    4 -
 .../install/workflow_access.settings.yml      |    1 -
 .../config/schema/workflow_access.schema.yml  |    6 -
 .../src/Form/WorkflowAccessRoleForm.php       |  143 --
 .../src/Form/WorkflowAccessSettingsForm.php   |   74 -
 .../workflow_access/workflow_access.info.yml  |   13 -
 .../workflow_access/workflow_access.install   |   41 -
 .../workflow_access.links.task.yml            |   15 -
 .../workflow_access/workflow_access.module    |  300 ---
 .../workflow_access.routing.yml               |   21 -
 .../src/Form/WorkflowCleanupSettingsForm.php  |  138 --
 .../workflow_cleanup.info.yml                 |   13 -
 .../workflow_cleanup.links.task.yml           |    7 -
 .../workflow_cleanup/workflow_cleanup.module  |   26 -
 .../workflow_cleanup.routing.yml              |    7 -
 .../modules/workflow_devel/README.txt         |    3 -
 .../workflow_devel/workflow_devel.info.yml    |   14 -
 .../workflow_devel/workflow_devel.module      |  143 --
 .../workflow_field/workflowfield.info.yml     |   12 -
 .../src/Form/WorkflowTransitionRevertForm.php |  133 --
 .../src/WorkflowAccessControlHandler.php      |  144 --
 .../src/WorkflowPermissions.php               |   71 -
 .../workflow_operations.info.yml              |   14 -
 .../workflow_operations.module                |   97 -
 .../workflow_operations.permissions.yml       |    2 -
 .../workflow_operations.routing.yml           |   10 -
 .../src/Controller/WorkflowListBuilder.php    |  104 -
 .../Controller/WorkflowStateListBuilder.php   |  421 ----
 .../src/Controller/WorkflowUiController.php   |   24 -
 .../Form/WorkflowConfigTransitionFormBase.php |  191 --
 .../WorkflowConfigTransitionLabelForm.php     |  103 -
 .../Form/WorkflowConfigTransitionRoleForm.php |  181 --
 .../modules/workflow_ui/workflow_ui.info.yml  |   17 -
 .../modules/workflow_ui/workflow_ui.install   |   24 -
 .../workflow_ui/workflow_ui.links.action.yml  |   13 -
 .../workflow_ui/workflow_ui.links.menu.yml    |    7 -
 .../workflow_ui/workflow_ui.links.task.yml    |   28 -
 .../modules/workflow_ui/workflow_ui.module    |   93 -
 .../workflow_ui/workflow_ui.routing.yml       |   46 -
 .../WorkflowTransitionListController.php      |  203 --
 .../src/Element/WorkflowTransitionElement.php |  576 -----
 modules/workflow/src/Entity/Workflow.php      |  468 ----
 .../src/Entity/WorkflowConfigTransition.php   |  234 --
 .../WorkflowConfigTransitionInterface.php     |   69 -
 .../workflow/src/Entity/WorkflowInterface.php |  169 --
 .../workflow/src/Entity/WorkflowManager.php   |  426 ----
 .../src/Entity/WorkflowManagerInterface.php   |  152 --
 .../Entity/WorkflowScheduledTransition.php    |  257 --
 modules/workflow/src/Entity/WorkflowState.php |  587 -----
 .../workflow/src/Entity/WorkflowStorage.php   |  107 -
 .../src/Entity/WorkflowTransition.php         | 1103 ---------
 .../Entity/WorkflowTransitionInterface.php    |  277 ---
 modules/workflow/src/Form/WorkflowForm.php    |  247 --
 .../src/Form/WorkflowTransitionForm.php       |  210 --
 .../Action/WorkflowNodeGivenStateAction.php   |   79 -
 .../Action/WorkflowNodeNextStateAction.php    |   71 -
 .../Plugin/Action/WorkflowStateActionBase.php |  232 --
 .../Plugin/Block/WorkflowTransitionBlock.php  |   89 -
 .../WorkflowDefaultFormatter.php              |  252 --
 .../Plugin/Field/FieldType/WorkflowItem.php   |  406 ----
 .../FieldWidget/WorkflowDefaultWidget.php     |  248 --
 .../Constraint/WorkflowFieldConstraint.php    |   36 -
 .../WorkflowFieldConstraintValidator.php      |   92 -
 .../src/Plugin/views/filter/WorkflowState.php |   55 -
 .../src/WorkflowAccessControlHandler.php      |  139 --
 modules/workflow/src/WorkflowPermissions.php  |   79 -
 .../WorkflowScheduledTransitionViewsData.php  |   22 -
 .../src/WorkflowTransitionListBuilder.php     |  326 ---
 .../src/WorkflowTransitionViewsData.php       |  173 --
 modules/workflow/workflow.api.php             |  431 ----
 modules/workflow/workflow.field.inc           |  156 --
 modules/workflow/workflow.form.inc            |  277 ---
 modules/workflow/workflow.info.yml            |   17 -
 modules/workflow/workflow.install             |  109 -
 modules/workflow/workflow.links.task.yml      |   32 -
 modules/workflow/workflow.module              |  716 ------
 modules/workflow/workflow.permissions.yml     |   10 -
 modules/workflow/workflow.routing.yml         |  144 --
 modules/workflow/workflow.services.yml        |   10 -
 modules/workflow/workflow.views.inc           |   30 -
 themes/bootstrap/.csslintrc                   |   38 -
 themes/bootstrap/.githooks.js.hbs             |   83 -
 themes/bootstrap/.gitignore                   |   14 -
 themes/bootstrap/Gruntfile.js                 |   20 -
 themes/bootstrap/README.md                    |   44 -
 themes/bootstrap/autoload-fix.php             |   19 -
 themes/bootstrap/bootstrap.api.php            |   63 -
 themes/bootstrap/bootstrap.breakpoints.yml    |   36 -
 themes/bootstrap/bootstrap.drush.inc          |  110 -
 themes/bootstrap/bootstrap.info.yml           |   87 -
 themes/bootstrap/bootstrap.libraries.yml      |  145 --
 themes/bootstrap/bootstrap.theme              |  148 --
 themes/bootstrap/bower.json                   |    7 -
 themes/bootstrap/composer.json                |   30 -
 .../config/install/bootstrap.settings.yml     |   17 -
 .../block.block.bootstrap_account_menu.yml    |   23 -
 .../block.block.bootstrap_branding.yml        |   22 -
 .../block.block.bootstrap_breadcrumbs.yml     |   19 -
 .../block.block.bootstrap_content.yml         |   19 -
 .../optional/block.block.bootstrap_footer.yml |   23 -
 .../optional/block.block.bootstrap_help.yml   |   19 -
 .../block.block.bootstrap_local_actions.yml   |   17 -
 .../block.block.bootstrap_local_tasks.yml     |   19 -
 .../block.block.bootstrap_main_menu.yml       |   23 -
 .../block.block.bootstrap_messages.yml        |   19 -
 .../block.block.bootstrap_page_title.yml      |   17 -
 .../block.block.bootstrap_powered.yml         |   19 -
 .../optional/block.block.bootstrap_search.yml |   19 -
 .../optional/block.block.bootstrap_tools.yml  |   23 -
 .../config/schema/bootstrap.schema.yml        |    5 -
 .../css/3.0.0/overrides-amelia.min.css        |    1 -
 .../css/3.0.0/overrides-cerulean.min.css      |    1 -
 .../css/3.0.0/overrides-cosmo.min.css         |    1 -
 .../css/3.0.0/overrides-cyborg.min.css        |    1 -
 .../css/3.0.0/overrides-flatly.min.css        |    1 -
 .../css/3.0.0/overrides-journal.min.css       |    1 -
 .../css/3.0.0/overrides-readable.min.css      |    1 -
 .../css/3.0.0/overrides-simplex.min.css       |    1 -
 .../css/3.0.0/overrides-slate.min.css         |    1 -
 .../css/3.0.0/overrides-spacelab.min.css      |    1 -
 .../css/3.0.0/overrides-united.min.css        |    1 -
 themes/bootstrap/css/3.0.0/overrides.min.css  |    1 -
 .../css/3.0.1/overrides-amelia.min.css        |    1 -
 .../css/3.0.1/overrides-cerulean.min.css      |    1 -
 .../css/3.0.1/overrides-cosmo.min.css         |    1 -
 .../css/3.0.1/overrides-cyborg.min.css        |    1 -
 .../css/3.0.1/overrides-flatly.min.css        |    1 -
 .../css/3.0.1/overrides-journal.min.css       |    1 -
 .../css/3.0.1/overrides-readable.min.css      |    1 -
 .../css/3.0.1/overrides-simplex.min.css       |    1 -
 .../css/3.0.1/overrides-slate.min.css         |    1 -
 .../css/3.0.1/overrides-spacelab.min.css      |    1 -
 .../css/3.0.1/overrides-united.min.css        |    1 -
 themes/bootstrap/css/3.0.1/overrides.min.css  |    1 -
 .../css/3.0.2/overrides-amelia.min.css        |    1 -
 .../css/3.0.2/overrides-cerulean.min.css      |    1 -
 .../css/3.0.2/overrides-cosmo.min.css         |    1 -
 .../css/3.0.2/overrides-cyborg.min.css        |    1 -
 .../css/3.0.2/overrides-flatly.min.css        |    1 -
 .../css/3.0.2/overrides-journal.min.css       |    1 -
 .../css/3.0.2/overrides-readable.min.css      |    1 -
 .../css/3.0.2/overrides-simplex.min.css       |    1 -
 .../css/3.0.2/overrides-slate.min.css         |    1 -
 .../css/3.0.2/overrides-spacelab.min.css      |    1 -
 .../css/3.0.2/overrides-united.min.css        |    1 -
 .../css/3.0.2/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.0.2/overrides.min.css  |    1 -
 .../css/3.0.3/overrides-amelia.min.css        |    1 -
 .../css/3.0.3/overrides-cerulean.min.css      |    1 -
 .../css/3.0.3/overrides-cosmo.min.css         |    1 -
 .../css/3.0.3/overrides-cyborg.min.css        |    1 -
 .../css/3.0.3/overrides-flatly.min.css        |    1 -
 .../css/3.0.3/overrides-journal.min.css       |    1 -
 .../css/3.0.3/overrides-readable.min.css      |    1 -
 .../css/3.0.3/overrides-simplex.min.css       |    1 -
 .../css/3.0.3/overrides-slate.min.css         |    1 -
 .../css/3.0.3/overrides-spacelab.min.css      |    1 -
 .../css/3.0.3/overrides-united.min.css        |    1 -
 .../css/3.0.3/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.0.3/overrides.min.css  |    1 -
 .../css/3.1.0/overrides-amelia.min.css        |    1 -
 .../css/3.1.0/overrides-cerulean.min.css      |    1 -
 .../css/3.1.0/overrides-cosmo.min.css         |    1 -
 .../css/3.1.0/overrides-cyborg.min.css        |    1 -
 .../css/3.1.0/overrides-flatly.min.css        |    1 -
 .../css/3.1.0/overrides-journal.min.css       |    1 -
 .../css/3.1.0/overrides-lumen.min.css         |    1 -
 .../css/3.1.0/overrides-readable.min.css      |    1 -
 .../css/3.1.0/overrides-simplex.min.css       |    1 -
 .../css/3.1.0/overrides-slate.min.css         |    1 -
 .../css/3.1.0/overrides-spacelab.min.css      |    1 -
 .../css/3.1.0/overrides-superhero.min.css     |    1 -
 .../css/3.1.0/overrides-united.min.css        |    1 -
 .../css/3.1.0/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.1.0/overrides.min.css  |    1 -
 .../css/3.1.1/overrides-amelia.min.css        |    1 -
 .../css/3.1.1/overrides-cerulean.min.css      |    1 -
 .../css/3.1.1/overrides-cosmo.min.css         |    1 -
 .../css/3.1.1/overrides-cyborg.min.css        |    1 -
 .../css/3.1.1/overrides-darkly.min.css        |    1 -
 .../css/3.1.1/overrides-flatly.min.css        |    1 -
 .../css/3.1.1/overrides-journal.min.css       |    1 -
 .../css/3.1.1/overrides-lumen.min.css         |    1 -
 .../css/3.1.1/overrides-readable.min.css      |    1 -
 .../css/3.1.1/overrides-simplex.min.css       |    1 -
 .../css/3.1.1/overrides-slate.min.css         |    1 -
 .../css/3.1.1/overrides-spacelab.min.css      |    1 -
 .../css/3.1.1/overrides-superhero.min.css     |    1 -
 .../css/3.1.1/overrides-united.min.css        |    1 -
 .../css/3.1.1/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.1.1/overrides.min.css  |    1 -
 .../css/3.2.0/overrides-amelia.min.css        |    1 -
 .../css/3.2.0/overrides-cerulean.min.css      |    1 -
 .../css/3.2.0/overrides-cosmo.min.css         |    1 -
 .../css/3.2.0/overrides-cyborg.min.css        |    1 -
 .../css/3.2.0/overrides-darkly.min.css        |    1 -
 .../css/3.2.0/overrides-flatly.min.css        |    1 -
 .../css/3.2.0/overrides-journal.min.css       |    1 -
 .../css/3.2.0/overrides-lumen.min.css         |    1 -
 .../css/3.2.0/overrides-paper.min.css         |    1 -
 .../css/3.2.0/overrides-readable.min.css      |    1 -
 .../css/3.2.0/overrides-sandstone.min.css     |    1 -
 .../css/3.2.0/overrides-simplex.min.css       |    1 -
 .../css/3.2.0/overrides-slate.min.css         |    1 -
 .../css/3.2.0/overrides-spacelab.min.css      |    1 -
 .../css/3.2.0/overrides-superhero.min.css     |    1 -
 .../css/3.2.0/overrides-united.min.css        |    1 -
 .../css/3.2.0/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.2.0/overrides.min.css  |    1 -
 .../css/3.3.0/overrides-amelia.min.css        |    1 -
 .../css/3.3.0/overrides-cerulean.min.css      |    1 -
 .../css/3.3.0/overrides-cosmo.min.css         |    1 -
 .../css/3.3.0/overrides-cyborg.min.css        |    1 -
 .../css/3.3.0/overrides-darkly.min.css        |    1 -
 .../css/3.3.0/overrides-flatly.min.css        |    1 -
 .../css/3.3.0/overrides-journal.min.css       |    1 -
 .../css/3.3.0/overrides-lumen.min.css         |    1 -
 .../css/3.3.0/overrides-paper.min.css         |    1 -
 .../css/3.3.0/overrides-readable.min.css      |    1 -
 .../css/3.3.0/overrides-sandstone.min.css     |    1 -
 .../css/3.3.0/overrides-simplex.min.css       |    1 -
 .../css/3.3.0/overrides-slate.min.css         |    1 -
 .../css/3.3.0/overrides-spacelab.min.css      |    1 -
 .../css/3.3.0/overrides-superhero.min.css     |    1 -
 .../css/3.3.0/overrides-united.min.css        |    1 -
 .../css/3.3.0/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.3.0/overrides.min.css  |    1 -
 .../css/3.3.1/overrides-cerulean.min.css      |    1 -
 .../css/3.3.1/overrides-cosmo.min.css         |    1 -
 .../css/3.3.1/overrides-cyborg.min.css        |    1 -
 .../css/3.3.1/overrides-darkly.min.css        |    1 -
 .../css/3.3.1/overrides-flatly.min.css        |    1 -
 .../css/3.3.1/overrides-journal.min.css       |    1 -
 .../css/3.3.1/overrides-lumen.min.css         |    1 -
 .../css/3.3.1/overrides-paper.min.css         |    1 -
 .../css/3.3.1/overrides-readable.min.css      |    1 -
 .../css/3.3.1/overrides-sandstone.min.css     |    1 -
 .../css/3.3.1/overrides-simplex.min.css       |    1 -
 .../css/3.3.1/overrides-slate.min.css         |    1 -
 .../css/3.3.1/overrides-spacelab.min.css      |    1 -
 .../css/3.3.1/overrides-superhero.min.css     |    1 -
 .../css/3.3.1/overrides-united.min.css        |    1 -
 .../css/3.3.1/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.3.1/overrides.min.css  |    1 -
 .../css/3.3.2/overrides-cerulean.min.css      |    1 -
 .../css/3.3.2/overrides-cosmo.min.css         |    1 -
 .../css/3.3.2/overrides-cyborg.min.css        |    1 -
 .../css/3.3.2/overrides-darkly.min.css        |    1 -
 .../css/3.3.2/overrides-flatly.min.css        |    1 -
 .../css/3.3.2/overrides-journal.min.css       |    1 -
 .../css/3.3.2/overrides-lumen.min.css         |    1 -
 .../css/3.3.2/overrides-paper.min.css         |    1 -
 .../css/3.3.2/overrides-readable.min.css      |    1 -
 .../css/3.3.2/overrides-sandstone.min.css     |    1 -
 .../css/3.3.2/overrides-simplex.min.css       |    1 -
 .../css/3.3.2/overrides-slate.min.css         |    1 -
 .../css/3.3.2/overrides-spacelab.min.css      |    1 -
 .../css/3.3.2/overrides-superhero.min.css     |    1 -
 .../css/3.3.2/overrides-united.min.css        |    1 -
 .../css/3.3.2/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.3.2/overrides.min.css  |    1 -
 .../css/3.3.4/overrides-cerulean.min.css      |    1 -
 .../css/3.3.4/overrides-cosmo.min.css         |    1 -
 .../css/3.3.4/overrides-cyborg.min.css        |    1 -
 .../css/3.3.4/overrides-darkly.min.css        |    1 -
 .../css/3.3.4/overrides-flatly.min.css        |    1 -
 .../css/3.3.4/overrides-journal.min.css       |    1 -
 .../css/3.3.4/overrides-lumen.min.css         |    1 -
 .../css/3.3.4/overrides-paper.min.css         |    1 -
 .../css/3.3.4/overrides-readable.min.css      |    1 -
 .../css/3.3.4/overrides-sandstone.min.css     |    1 -
 .../css/3.3.4/overrides-simplex.min.css       |    1 -
 .../css/3.3.4/overrides-slate.min.css         |    1 -
 .../css/3.3.4/overrides-spacelab.min.css      |    1 -
 .../css/3.3.4/overrides-superhero.min.css     |    1 -
 .../css/3.3.4/overrides-united.min.css        |    1 -
 .../css/3.3.4/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.3.4/overrides.min.css  |    1 -
 .../css/3.3.5/overrides-cerulean.min.css      |    1 -
 .../css/3.3.5/overrides-cosmo.min.css         |    1 -
 .../css/3.3.5/overrides-cyborg.min.css        |    1 -
 .../css/3.3.5/overrides-darkly.min.css        |    1 -
 .../css/3.3.5/overrides-flatly.min.css        |    1 -
 .../css/3.3.5/overrides-journal.min.css       |    1 -
 .../css/3.3.5/overrides-lumen.min.css         |    1 -
 .../css/3.3.5/overrides-paper.min.css         |    1 -
 .../css/3.3.5/overrides-readable.min.css      |    1 -
 .../css/3.3.5/overrides-sandstone.min.css     |    1 -
 .../css/3.3.5/overrides-simplex.min.css       |    1 -
 .../css/3.3.5/overrides-slate.min.css         |    1 -
 .../css/3.3.5/overrides-spacelab.min.css      |    1 -
 .../css/3.3.5/overrides-superhero.min.css     |    1 -
 .../css/3.3.5/overrides-united.min.css        |    1 -
 .../css/3.3.5/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.3.5/overrides.min.css  |    1 -
 .../css/3.3.6/overrides-cerulean.min.css      |    1 -
 .../css/3.3.6/overrides-cosmo.min.css         |    1 -
 .../css/3.3.6/overrides-cyborg.min.css        |    1 -
 .../css/3.3.6/overrides-darkly.min.css        |    1 -
 .../css/3.3.6/overrides-flatly.min.css        |    1 -
 .../css/3.3.6/overrides-journal.min.css       |    1 -
 .../css/3.3.6/overrides-lumen.min.css         |    1 -
 .../css/3.3.6/overrides-paper.min.css         |    1 -
 .../css/3.3.6/overrides-readable.min.css      |    1 -
 .../css/3.3.6/overrides-sandstone.min.css     |    1 -
 .../css/3.3.6/overrides-simplex.min.css       |    1 -
 .../css/3.3.6/overrides-slate.min.css         |    1 -
 .../css/3.3.6/overrides-spacelab.min.css      |    1 -
 .../css/3.3.6/overrides-superhero.min.css     |    1 -
 .../css/3.3.6/overrides-united.min.css        |    1 -
 .../css/3.3.6/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.3.6/overrides.min.css  |    1 -
 .../css/3.3.7/overrides-cerulean.min.css      |    1 -
 .../css/3.3.7/overrides-cosmo.min.css         |    1 -
 .../css/3.3.7/overrides-cyborg.min.css        |    1 -
 .../css/3.3.7/overrides-darkly.min.css        |    1 -
 .../css/3.3.7/overrides-flatly.min.css        |    1 -
 .../css/3.3.7/overrides-journal.min.css       |    1 -
 .../css/3.3.7/overrides-lumen.min.css         |    1 -
 .../css/3.3.7/overrides-paper.min.css         |    1 -
 .../css/3.3.7/overrides-readable.min.css      |    1 -
 .../css/3.3.7/overrides-sandstone.min.css     |    1 -
 .../css/3.3.7/overrides-simplex.min.css       |    1 -
 .../css/3.3.7/overrides-slate.min.css         |    1 -
 .../css/3.3.7/overrides-spacelab.min.css      |    1 -
 .../css/3.3.7/overrides-superhero.min.css     |    1 -
 .../css/3.3.7/overrides-united.min.css        |    1 -
 .../css/3.3.7/overrides-yeti.min.css          |    1 -
 themes/bootstrap/css/3.3.7/overrides.min.css  |    1 -
 themes/bootstrap/css/README.md                |    7 -
 themes/bootstrap/css/images/required.svg      |    1 -
 themes/bootstrap/deprecated.php               |  868 -------
 themes/bootstrap/docs/Contributing.md         |   65 -
 themes/bootstrap/docs/Getting-Started.md      |  127 -
 themes/bootstrap/docs/Maintainers.md          |  185 --
 themes/bootstrap/docs/README.md               |   71 -
 themes/bootstrap/docs/Sub-Theming.md          |   66 -
 themes/bootstrap/docs/Templates.md            |    5 -
 themes/bootstrap/docs/Theme-Settings.md       |  603 -----
 themes/bootstrap/docs/Utility.md              |    5 -
 themes/bootstrap/docs/plugins/Alter.md        |  133 --
 themes/bootstrap/docs/plugins/Form.md         |  112 -
 themes/bootstrap/docs/plugins/Preprocess.md   |  118 -
 themes/bootstrap/docs/plugins/Prerender.md    |  118 -
 themes/bootstrap/docs/plugins/Process.md      |   98 -
 themes/bootstrap/docs/plugins/Provider.md     |    9 -
 themes/bootstrap/docs/plugins/README.md       |   70 -
 themes/bootstrap/docs/plugins/Setting.md      |  160 --
 themes/bootstrap/docs/plugins/Update.md       |    9 -
 themes/bootstrap/favicon.ico                  |  Bin 1150 -> 0 bytes
 themes/bootstrap/grunt/clean-vendor-dirs.js   |   21 -
 themes/bootstrap/grunt/compile.js             |  157 --
 themes/bootstrap/grunt/config/autoprefixer.js |   23 -
 themes/bootstrap/grunt/config/clean.js        |    6 -
 themes/bootstrap/grunt/config/csslint.js      |   13 -
 themes/bootstrap/grunt/config/cssmin.js       |   25 -
 themes/bootstrap/grunt/config/githooks.js     |   15 -
 themes/bootstrap/grunt/config/watch.js        |    8 -
 themes/bootstrap/grunt/sync.js                |  196 --
 themes/bootstrap/icons.inc                    |   41 -
 themes/bootstrap/js/attributes.js             |  228 --
 themes/bootstrap/js/dropdown.js               |   76 -
 themes/bootstrap/js/drupal.bootstrap.js       |  237 --
 themes/bootstrap/js/misc/ajax.js              |  191 --
 themes/bootstrap/js/misc/autocomplete.js      |   36 -
 themes/bootstrap/js/misc/batch.js             |   43 -
 themes/bootstrap/js/misc/collapse.js          |  181 --
 themes/bootstrap/js/misc/dialog.ajax.js       |  263 --
 themes/bootstrap/js/misc/dialog.js            |  104 -
 themes/bootstrap/js/misc/form.js              |   30 -
 themes/bootstrap/js/misc/progress.js          |   73 -
 themes/bootstrap/js/misc/states.js            |   30 -
 themes/bootstrap/js/misc/tabledrag.js         |  457 ----
 themes/bootstrap/js/misc/vertical-tabs.js     |  267 ---
 themes/bootstrap/js/modal.js                  |  219 --
 themes/bootstrap/js/modules/filter/filter.js  |   35 -
 .../image_widget_crop/ImageWidgetCrop.js      |   11 -
 .../bootstrap/js/modules/views/ajax_view.js   |   24 -
 themes/bootstrap/js/popover.js                |  123 -
 themes/bootstrap/js/text/text.js              |   65 -
 themes/bootstrap/js/theme-settings.js         |  202 --
 themes/bootstrap/js/theme.js                  |  174 --
 themes/bootstrap/js/tooltip.js                |   48 -
 themes/bootstrap/logo.svg                     |   26 -
 themes/bootstrap/package.json                 |   83 -
 themes/bootstrap/screenshot.png               |  Bin 19493 -> 0 bytes
 .../src/Annotation/BootstrapAlter.php         |   24 -
 .../src/Annotation/BootstrapConstant.php      |   64 -
 .../src/Annotation/BootstrapForm.php          |   24 -
 .../src/Annotation/BootstrapPreprocess.php    |   22 -
 .../src/Annotation/BootstrapPrerender.php     |   22 -
 .../src/Annotation/BootstrapProcess.php       |   22 -
 .../src/Annotation/BootstrapProvider.php      |   98 -
 .../src/Annotation/BootstrapSetting.php       |   87 -
 .../src/Annotation/BootstrapUpdate.php        |   63 -
 .../src/Annotation/PluginCallback.php         |   79 -
 themes/bootstrap/src/Bootstrap.php            | 1159 ---------
 .../src/Plugin/Alter/AlterInterface.php       |   33 -
 .../src/Plugin/Alter/ElementInfo.php          |   87 -
 .../src/Plugin/Alter/LibraryInfo.php          |  125 -
 .../src/Plugin/Alter/PageAttachments.php      |   37 -
 .../src/Plugin/Alter/ThemeRegistry.php        |  149 --
 .../src/Plugin/Alter/ThemeSuggestions.php     |  369 ---
 themes/bootstrap/src/Plugin/AlterManager.php  |   29 -
 themes/bootstrap/src/Plugin/Form/FormBase.php |   56 -
 .../src/Plugin/Form/FormInterface.php         |   85 -
 .../src/Plugin/Form/NodePreviewFormSelect.php |   52 -
 .../src/Plugin/Form/SearchBlockForm.php       |   30 -
 .../bootstrap/src/Plugin/Form/SearchForm.php  |   33 -
 .../src/Plugin/Form/SystemThemeSettings.php   |  189 --
 themes/bootstrap/src/Plugin/FormManager.php   |   29 -
 themes/bootstrap/src/Plugin/PluginBase.php    |   36 -
 themes/bootstrap/src/Plugin/PluginManager.php |  140 --
 .../Plugin/Preprocess/BootstrapCarousel.php   |   89 -
 .../Plugin/Preprocess/BootstrapDropdown.php   |  150 --
 .../src/Plugin/Preprocess/BootstrapModal.php  |   53 -
 .../src/Plugin/Preprocess/BootstrapPanel.php  |  138 --
 .../src/Plugin/Preprocess/Breadcrumb.php      |   63 -
 .../Preprocess/FieldMultipleValueForm.php     |   48 -
 .../src/Plugin/Preprocess/FileLink.php        |  122 -
 .../src/Plugin/Preprocess/FileUploadHelp.php  |  112 -
 .../src/Plugin/Preprocess/FilterTips.php      |  109 -
 .../src/Plugin/Preprocess/FormElement.php     |   71 -
 .../Plugin/Preprocess/FormElementLabel.php    |   33 -
 .../src/Plugin/Preprocess/ImageWidget.php     |   38 -
 .../bootstrap/src/Plugin/Preprocess/Input.php |   47 -
 .../src/Plugin/Preprocess/InputButton.php     |   38 -
 .../ItemListBootstrapCarouselIndicators.php   |   26 -
 .../Plugin/Preprocess/ItemListDropdown.php    |   25 -
 .../bootstrap/src/Plugin/Preprocess/Links.php |   42 -
 .../src/Plugin/Preprocess/MenuLocalAction.php |   69 -
 .../bootstrap/src/Plugin/Preprocess/Page.php  |   33 -
 .../src/Plugin/Preprocess/PreprocessBase.php  |  117 -
 .../Plugin/Preprocess/PreprocessInterface.php |   28 -
 .../src/Plugin/Preprocess/ProgressBar.php     |   35 -
 .../src/Plugin/Preprocess/Region.php          |   49 -
 .../src/Plugin/Preprocess/Select.php          |   40 -
 .../bootstrap/src/Plugin/Preprocess/Table.php |   43 -
 .../src/Plugin/Preprocess/ViewsViewTable.php  |   18 -
 .../src/Plugin/PreprocessManager.php          |   29 -
 .../src/Plugin/Prerender/Captcha.php          |   29 -
 .../src/Plugin/Prerender/Dropbutton.php       |   38 -
 .../bootstrap/src/Plugin/Prerender/Link.php   |   72 -
 .../src/Plugin/Prerender/Operations.php       |   23 -
 .../src/Plugin/Prerender/PrerenderBase.php    |   34 -
 .../Plugin/Prerender/PrerenderInterface.php   |   27 -
 .../bootstrap/src/Plugin/PrerenderManager.php |   56 -
 .../bootstrap/src/Plugin/Process/Actions.php  |   33 -
 .../src/Plugin/Process/ActionsDropbutton.php  |   49 -
 .../src/Plugin/Process/ManagedFile.php        |   33 -
 .../src/Plugin/Process/ProcessBase.php        |   46 -
 .../src/Plugin/Process/ProcessInterface.php   |   39 -
 .../bootstrap/src/Plugin/Process/Search.php   |   33 -
 .../src/Plugin/Process/TextFormat.php         |   51 -
 .../bootstrap/src/Plugin/ProcessManager.php   |  177 --
 .../bootstrap/src/Plugin/Provider/Custom.php  |   47 -
 .../src/Plugin/Provider/JsDelivr.php          |  200 --
 .../src/Plugin/Provider/ProviderBase.php      |  171 --
 .../src/Plugin/Provider/ProviderInterface.php |  111 -
 .../bootstrap/src/Plugin/ProviderManager.php  |   46 -
 .../Setting/Advanced/Cdn/CdnCustomCss.php     |   42 -
 .../Setting/Advanced/Cdn/CdnCustomCssMin.php  |   42 -
 .../Setting/Advanced/Cdn/CdnCustomJs.php      |   42 -
 .../Setting/Advanced/Cdn/CdnCustomJsMin.php   |   42 -
 .../Setting/Advanced/Cdn/CdnJsdelivrTheme.php |   60 -
 .../Advanced/Cdn/CdnJsdelivrVersion.php       |   71 -
 .../Setting/Advanced/Cdn/CdnProvider.php      |  209 --
 .../Setting/Advanced/IncludeDeprecated.php    |   30 -
 .../Advanced/SuppressDeprecatedWarnings.php   |   46 -
 .../Components/Breadcrumbs/Breadcrumb.php     |   35 -
 .../Components/Breadcrumbs/BreadcrumbHome.php |   46 -
 .../Breadcrumbs/BreadcrumbTitle.php           |   46 -
 .../Components/Navbar/NavbarInverse.php       |   30 -
 .../Components/Navbar/NavbarPosition.php      |   36 -
 .../Setting/Components/Region/RegionWells.php |  107 -
 .../General/Buttons/ButtonColorize.php        |   34 -
 .../Setting/General/Buttons/ButtonIconize.php |   33 -
 .../Setting/General/Buttons/ButtonSize.php    |   36 -
 .../General/Container/FluidContainer.php      |   33 -
 .../Forms/FormsHasErrorValueToggle.php        |   39 -
 .../General/Forms/FormsRequiredHasError.php   |   30 -
 .../General/Forms/FormsSmartDescriptions.php  |   30 -
 .../FormsSmartDescriptionsAllowedTags.php     |   46 -
 .../Forms/FormsSmartDescriptionsLimit.php     |   46 -
 .../General/Images/ImageResponsive.php        |   30 -
 .../Setting/General/Images/ImageShape.php     |   39 -
 .../Setting/General/Tables/TableBordered.php  |   30 -
 .../Setting/General/Tables/TableCondensed.php |   30 -
 .../Setting/General/Tables/TableHover.php     |   30 -
 .../General/Tables/TableResponsive.php        |   36 -
 .../Setting/General/Tables/TableStriped.php   |   30 -
 .../JavaScript/Modals/ModalAnimation.php      |   56 -
 .../JavaScript/Modals/ModalBackdrop.php       |   45 -
 .../JavaScript/Modals/ModalEnabled.php        |   53 -
 .../JavaScript/Modals/ModalKeyboard.php       |   40 -
 .../Setting/JavaScript/Modals/ModalShow.php   |   40 -
 .../Setting/JavaScript/Modals/ModalSize.php   |   45 -
 .../JavaScript/Popovers/PopoverAnimation.php  |   57 -
 .../JavaScript/Popovers/PopoverContainer.php  |   40 -
 .../JavaScript/Popovers/PopoverContent.php    |   40 -
 .../JavaScript/Popovers/PopoverDelay.php      |   40 -
 .../JavaScript/Popovers/PopoverEnabled.php    |   52 -
 .../JavaScript/Popovers/PopoverHtml.php       |   40 -
 .../JavaScript/Popovers/PopoverPlacement.php  |   51 -
 .../JavaScript/Popovers/PopoverSelector.php   |   44 -
 .../JavaScript/Popovers/PopoverTitle.php      |   40 -
 .../JavaScript/Popovers/PopoverTrigger.php    |   46 -
 .../Popovers/PopoverTriggerAutoclose.php      |   40 -
 .../JavaScript/Tooltips/TooltipAnimation.php  |   57 -
 .../JavaScript/Tooltips/TooltipContainer.php  |   40 -
 .../JavaScript/Tooltips/TooltipDelay.php      |   40 -
 .../JavaScript/Tooltips/TooltipEnabled.php    |   54 -
 .../JavaScript/Tooltips/TooltipHtml.php       |   40 -
 .../JavaScript/Tooltips/TooltipPlacement.php  |   51 -
 .../JavaScript/Tooltips/TooltipSelector.php   |   40 -
 .../JavaScript/Tooltips/TooltipTrigger.php    |   46 -
 .../bootstrap/src/Plugin/Setting/Schemas.php  |  223 --
 .../src/Plugin/Setting/SettingBase.php        |  210 --
 .../src/Plugin/Setting/SettingInterface.php   |  132 --
 .../bootstrap/src/Plugin/SettingManager.php   |   72 -
 .../src/Plugin/Update/UpdateBase.php          |  100 -
 .../src/Plugin/Update/UpdateInterface.php     |  101 -
 themes/bootstrap/src/Plugin/UpdateManager.php |  153 --
 themes/bootstrap/src/Theme.php                |  766 ------
 themes/bootstrap/src/ThemeSettings.php        |  256 --
 themes/bootstrap/src/Utility/ArrayObject.php  |  404 ----
 themes/bootstrap/src/Utility/Attributes.php   |  170 --
 themes/bootstrap/src/Utility/Crypt.php        |   37 -
 .../src/Utility/DrupalAttributes.php          |  352 ---
 themes/bootstrap/src/Utility/Element.php      |  835 -------
 themes/bootstrap/src/Utility/Storage.php      |  254 --
 themes/bootstrap/src/Utility/StorageItem.php  |  163 --
 themes/bootstrap/src/Utility/Unicode.php      |  112 -
 themes/bootstrap/src/Utility/Variables.php    |  116 -
 themes/bootstrap/starterkits/cdn/README.md    |   29 -
 .../starterkits/cdn/THEMENAME.libraries.yml   |    4 -
 .../starterkits/cdn/THEMENAME.starterkit.yml  |   23 -
 .../bootstrap/starterkits/cdn/THEMENAME.theme |    7 -
 .../cdn/config/install/THEMENAME.settings.yml |   17 -
 .../cdn/config/schema/THEMENAME.schema.yml    |    5 -
 .../bootstrap/starterkits/cdn/css/style.css   |    3 -
 themes/bootstrap/starterkits/cdn/favicon.ico  |  Bin 1150 -> 0 bytes
 themes/bootstrap/starterkits/cdn/logo.svg     |   26 -
 .../bootstrap/starterkits/cdn/screenshot.png  |  Bin 19493 -> 0 bytes
 .../starterkits/cdn/templates/README.md       |    3 -
 themes/bootstrap/starterkits/less/README.md   |   65 -
 .../starterkits/less/THEMENAME.libraries.yml  |   19 -
 .../starterkits/less/THEMENAME.starterkit.yml |   24 -
 .../starterkits/less/THEMENAME.theme          |    7 -
 .../config/install/THEMENAME.settings.yml     |   15 -
 .../less/config/schema/THEMENAME.schema.yml   |    5 -
 .../bootstrap/starterkits/less/css/style.css  |    4 -
 themes/bootstrap/starterkits/less/favicon.ico |  Bin 1150 -> 0 bytes
 .../starterkits/less/images/required.svg      |    0
 .../starterkits/less/less/bootstrap.less      |   61 -
 .../starterkits/less/less/component/ajax.less |   44 -
 .../less/less/component/alert.less            |   31 -
 .../less/less/component/field.less            |   25 -
 .../starterkits/less/less/component/file.less |   61 -
 .../less/less/component/filter.less           |   26 -
 .../starterkits/less/less/component/form.less |  102 -
 .../starterkits/less/less/component/icon.less |   22 -
 .../less/less/component/navbar.less           |   68 -
 .../starterkits/less/less/component/node.less |   11 -
 .../less/less/component/panel.less            |   14 -
 .../less/less/component/progress-bar.less     |   25 -
 .../less/less/component/table-drag.less       |   35 -
 .../starterkits/less/less/component/tabs.less |  130 -
 .../less/less/component/toolbar.less          |   44 -
 .../less/less/jquery-ui/autocomplete.less     |   51 -
 .../starterkits/less/less/overrides.less      |   69 -
 .../starterkits/less/less/style.less          |    5 -
 .../less/less/variable-overrides.less         |    9 -
 themes/bootstrap/starterkits/less/logo.svg    |   26 -
 .../bootstrap/starterkits/less/screenshot.png |  Bin 19493 -> 0 bytes
 .../starterkits/less/templates/README.md      |    3 -
 themes/bootstrap/starterkits/sass/README.md   |   58 -
 .../starterkits/sass/THEMENAME.libraries.yml  |   19 -
 .../starterkits/sass/THEMENAME.starterkit.yml |   24 -
 .../starterkits/sass/THEMENAME.theme          |    7 -
 .../config/install/THEMENAME.settings.yml     |   15 -
 .../sass/config/schema/THEMENAME.schema.yml   |    5 -
 themes/bootstrap/starterkits/sass/favicon.ico |  Bin 1150 -> 0 bytes
 .../starterkits/sass/images/required.svg      |    1 -
 themes/bootstrap/starterkits/sass/logo.svg    |   26 -
 .../bootstrap/starterkits/sass/screenshot.png |  Bin 32370 -> 0 bytes
 .../sass/scss/_default-variables.scss         |   14 -
 .../starterkits/sass/scss/_overrides.scss     |   69 -
 .../sass/scss/component/_ajax.scss            |   44 -
 .../sass/scss/component/_alert.scss           |   31 -
 .../sass/scss/component/_field.scss           |   25 -
 .../sass/scss/component/_file.scss            |   61 -
 .../sass/scss/component/_filter.scss          |   26 -
 .../sass/scss/component/_form.scss            |  102 -
 .../sass/scss/component/_icon.scss            |   22 -
 .../sass/scss/component/_navbar.scss          |   69 -
 .../sass/scss/component/_node.scss            |   11 -
 .../sass/scss/component/_panel.scss           |   14 -
 .../sass/scss/component/_progress-bar.scss    |   25 -
 .../sass/scss/component/_table-drag.scss      |   35 -
 .../sass/scss/component/_tabs.scss            |  130 -
 .../sass/scss/component/_toolbar.scss         |   44 -
 .../sass/scss/jquery-ui/_autocomplete.scss    |   51 -
 .../starterkits/sass/scss/style.scss          |    8 -
 .../starterkits/sass/templates/README.md      |    3 -
 .../templates/block/block--bare.html.twig     |   50 -
 .../block--local-actions-block.html.twig      |   14 -
 .../block/block--local-tasks-block.html.twig  |   16 -
 .../block/block--page-title-block.html.twig   |    9 -
 .../templates/block/block--search.html.twig   |   53 -
 .../block--system-branding-block.html.twig    |   30 -
 ...lock--system-menu-block--account.html.twig |   47 -
 .../block--system-menu-block--main.html.twig  |   47 -
 .../templates/block/block--system.html.twig   |    9 -
 .../templates/block/block-list.html.twig      |   23 -
 .../bootstrap/templates/block/block.html.twig |   67 -
 .../bootstrap/bootstrap-carousel.html.twig    |   58 -
 .../bootstrap/bootstrap-dropdown.html.twig    |   25 -
 .../bootstrap/bootstrap-modal.html.twig       |   95 -
 .../bootstrap/bootstrap-panel.html.twig       |  118 -
 ...t--bootstrap-carousel-indicators.html.twig |   28 -
 .../bootstrap/item-list--dropdown.html.twig   |   42 -
 .../field/field-multiple-value-form.html.twig |   36 -
 .../bootstrap/templates/field/field.html.twig |   81 -
 .../templates/file/file-link.html.twig        |   40 -
 .../templates/file/file-upload-help.html.twig |   23 -
 .../templates/file/image-widget.html.twig     |   29 -
 .../templates/filter/filter-tips.html.twig    |   14 -
 .../filter/text-format-wrapper.html.twig      |   27 -
 .../templates/input/datetime-form.html.twig   |   17 -
 .../input/datetime-wrapper.html.twig          |   30 -
 .../input/form-element-label.html.twig        |   48 -
 .../templates/input/form-element.html.twig    |  101 -
 .../input/input--button--split.html.twig      |   58 -
 .../templates/input/input--button.html.twig   |   48 -
 .../input/input--form-control.html.twig       |   32 -
 .../bootstrap/templates/input/input.html.twig |   44 -
 .../templates/input/select.html.twig          |   61 -
 .../templates/input/textarea.html.twig        |   28 -
 .../templates/menu/menu--account.html.twig    |   56 -
 .../templates/menu/menu--main.html.twig       |   56 -
 .../templates/menu/menu-local-task.html.twig  |   22 -
 .../templates/menu/menu-local-tasks.html.twig |   25 -
 .../bootstrap/templates/menu/menu.html.twig   |   56 -
 .../bootstrap/templates/node/node.html.twig   |  102 -
 .../templates/system/breadcrumb.html.twig     |   24 -
 .../templates/system/container.html.twig      |   29 -
 .../bootstrap/templates/system/html.html.twig |   74 -
 .../templates/system/image.html.twig          |   19 -
 .../templates/system/links.html.twig          |   62 -
 .../templates/system/page-title.html.twig     |   21 -
 .../bootstrap/templates/system/page.html.twig |  168 --
 .../templates/system/pager.html.twig          |   98 -
 .../templates/system/progress-bar.html.twig   |   38 -
 .../system/region--no-wrapper.html.twig       |   19 -
 .../templates/system/region.html.twig         |   27 -
 .../system/status-messages.html.twig          |   67 -
 .../system/system-themes-page.html.twig       |   95 -
 .../templates/system/table.html.twig          |  132 --
 .../views/views-exposed-form.html.twig        |   23 -
 .../views/views-mini-pager.html.twig          |   36 -
 .../views/views-view-table.html.twig          |  132 --
 .../templates/views/views-view.html.twig      |   97 -
 2024 files changed, 184187 deletions(-)
 delete mode 100644 modules/contrib/config_update/LICENSE.txt
 delete mode 100644 modules/contrib/config_update/README.txt
 delete mode 100644 modules/contrib/config_update/config_update.info.yml
 delete mode 100644 modules/contrib/config_update/config_update.module
 delete mode 100644 modules/contrib/config_update/config_update.services.yml
 delete mode 100644 modules/contrib/config_update/config_update_ui/README.txt
 delete mode 100644 modules/contrib/config_update/config_update_ui/config_update_ui.drush.inc
 delete mode 100644 modules/contrib/config_update/config_update_ui/config_update_ui.drush_testing.inc
 delete mode 100644 modules/contrib/config_update/config_update_ui/config_update_ui.info.yml
 delete mode 100644 modules/contrib/config_update/config_update_ui/config_update_ui.libraries.yml
 delete mode 100644 modules/contrib/config_update/config_update_ui/config_update_ui.links.task.yml
 delete mode 100644 modules/contrib/config_update/config_update_ui/config_update_ui.module
 delete mode 100644 modules/contrib/config_update/config_update_ui/config_update_ui.permissions.yml
 delete mode 100644 modules/contrib/config_update/config_update_ui/config_update_ui.routing.yml
 delete mode 100644 modules/contrib/config_update/config_update_ui/css/config_update_ui.report.css
 delete mode 100644 modules/contrib/config_update/config_update_ui/src/Controller/ConfigUpdateController.php
 delete mode 100644 modules/contrib/config_update/config_update_ui/src/Form/ConfigDeleteConfirmForm.php
 delete mode 100644 modules/contrib/config_update/config_update_ui/src/Form/ConfigImportConfirmForm.php
 delete mode 100644 modules/contrib/config_update/config_update_ui/src/Form/ConfigRevertConfirmForm.php
 delete mode 100644 modules/contrib/config_update/config_update_ui/src/Tests/ConfigProfileOverridesTest.php
 delete mode 100644 modules/contrib/config_update/config_update_ui/src/Tests/ConfigUpdateTest.php
 delete mode 100644 modules/contrib/config_update/src/ConfigDeleteInterface.php
 delete mode 100644 modules/contrib/config_update/src/ConfigDiffInterface.php
 delete mode 100644 modules/contrib/config_update/src/ConfigDiffer.php
 delete mode 100644 modules/contrib/config_update/src/ConfigListByProviderInterface.php
 delete mode 100644 modules/contrib/config_update/src/ConfigListInterface.php
 delete mode 100644 modules/contrib/config_update/src/ConfigLister.php
 delete mode 100644 modules/contrib/config_update/src/ConfigListerWithProviders.php
 delete mode 100644 modules/contrib/config_update/src/ConfigRevertEvent.php
 delete mode 100644 modules/contrib/config_update/src/ConfigRevertInterface.php
 delete mode 100644 modules/contrib/config_update/src/ConfigReverter.php
 delete mode 100644 modules/contrib/config_update/tests/src/Unit/ConfigDifferTest.php
 delete mode 100644 modules/contrib/config_update/tests/src/Unit/ConfigListerTest.php
 delete mode 100644 modules/contrib/features/LICENSE.txt
 delete mode 100644 modules/contrib/features/composer.json
 delete mode 100644 modules/contrib/features/config/install/features.bundle.default.yml
 delete mode 100644 modules/contrib/features/config/install/features.settings.yml
 delete mode 100644 modules/contrib/features/config/schema/features.schema.yml
 delete mode 100644 modules/contrib/features/drush/features.drush.inc
 delete mode 100644 modules/contrib/features/features.info.yml
 delete mode 100644 modules/contrib/features/features.install
 delete mode 100644 modules/contrib/features/features.module
 delete mode 100644 modules/contrib/features/features.routing.yml
 delete mode 100644 modules/contrib/features/features.services.yml
 delete mode 100644 modules/contrib/features/modules/features_ui/css/features_ui.admin.css
 delete mode 100644 modules/contrib/features/modules/features_ui/features_ui.admin.inc
 delete mode 100644 modules/contrib/features/modules/features_ui/features_ui.info.yml
 delete mode 100644 modules/contrib/features/modules/features_ui/features_ui.libraries.yml
 delete mode 100644 modules/contrib/features/modules/features_ui/features_ui.links.action.yml
 delete mode 100644 modules/contrib/features/modules/features_ui/features_ui.links.menu.yml
 delete mode 100644 modules/contrib/features/modules/features_ui/features_ui.links.task.yml
 delete mode 100644 modules/contrib/features/modules/features_ui/features_ui.module
 delete mode 100644 modules/contrib/features/modules/features_ui/features_ui.routing.yml
 delete mode 100644 modules/contrib/features/modules/features_ui/js/features_ui.admin.js
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Controller/FeaturesUIController.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/AssignmentAlterForm.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/AssignmentBaseForm.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/AssignmentConfigureForm.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/AssignmentCoreForm.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/AssignmentExcludeForm.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/AssignmentFormBase.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/AssignmentOptionalForm.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/AssignmentProfileForm.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/AssignmentSiteForm.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/FeaturesDiffForm.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/FeaturesEditForm.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Form/FeaturesExportForm.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Tests/FeaturesBundleUITest.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Tests/FeaturesCreateUITest.php
 delete mode 100644 modules/contrib/features/modules/features_ui/src/Tests/FeaturesUITest.php
 delete mode 100644 modules/contrib/features/src/ConfigurationItem.php
 delete mode 100644 modules/contrib/features/src/Controller/FeaturesController.php
 delete mode 100644 modules/contrib/features/src/Entity/FeaturesBundle.php
 delete mode 100644 modules/contrib/features/src/FeaturesAssigner.php
 delete mode 100644 modules/contrib/features/src/FeaturesAssignerInterface.php
 delete mode 100644 modules/contrib/features/src/FeaturesAssignmentMethodBase.php
 delete mode 100644 modules/contrib/features/src/FeaturesAssignmentMethodInterface.php
 delete mode 100644 modules/contrib/features/src/FeaturesAssignmentMethodManager.php
 delete mode 100644 modules/contrib/features/src/FeaturesBundleInterface.php
 delete mode 100644 modules/contrib/features/src/FeaturesConfigDependencyManager.php
 delete mode 100644 modules/contrib/features/src/FeaturesConfigInstaller.php
 delete mode 100644 modules/contrib/features/src/FeaturesExtensionStorages.php
 delete mode 100644 modules/contrib/features/src/FeaturesExtensionStoragesInterface.php
 delete mode 100644 modules/contrib/features/src/FeaturesGenerationMethodBase.php
 delete mode 100644 modules/contrib/features/src/FeaturesGenerationMethodInterface.php
 delete mode 100644 modules/contrib/features/src/FeaturesGenerationMethodManager.php
 delete mode 100644 modules/contrib/features/src/FeaturesGenerator.php
 delete mode 100644 modules/contrib/features/src/FeaturesGeneratorInterface.php
 delete mode 100644 modules/contrib/features/src/FeaturesInstallStorage.php
 delete mode 100644 modules/contrib/features/src/FeaturesManager.php
 delete mode 100644 modules/contrib/features/src/FeaturesManagerInterface.php
 delete mode 100644 modules/contrib/features/src/Package.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentAlter.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentBaseType.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentCoreType.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentDependency.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentExclude.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentExisting.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentForwardDependency.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentNamespace.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentOptionalType.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentPackages.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentProfile.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentSiteType.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesGeneration/FeaturesGenerationArchive.php
 delete mode 100644 modules/contrib/features/src/Plugin/FeaturesGeneration/FeaturesGenerationWrite.php
 delete mode 100644 modules/contrib/features/tests/modules/test_feature/config/install/core.date_format.short.yml
 delete mode 100644 modules/contrib/features/tests/modules/test_feature/config/install/system.cron.yml
 delete mode 100644 modules/contrib/features/tests/modules/test_feature/test_feature.features.yml
 delete mode 100644 modules/contrib/features/tests/modules/test_feature/test_feature.info.yml
 delete mode 100644 modules/contrib/features/tests/modules/test_mybundle_core/config/install/core.date_format.long.yml
 delete mode 100644 modules/contrib/features/tests/modules/test_mybundle_core/test_mybundle_core.features.yml
 delete mode 100644 modules/contrib/features/tests/modules/test_mybundle_core/test_mybundle_core.info.yml
 delete mode 100644 modules/contrib/features/tests/src/Kernel/Entity/FeaturesBundleIntegrationTest.php
 delete mode 100644 modules/contrib/features/tests/src/Kernel/FeaturesAssignTest.php
 delete mode 100644 modules/contrib/features/tests/src/Kernel/FeaturesAssignerTest.php
 delete mode 100644 modules/contrib/features/tests/src/Kernel/FeaturesGenerateTest.php
 delete mode 100644 modules/contrib/features/tests/src/Kernel/FeaturesManagerKernelTest.php
 delete mode 100644 modules/contrib/features/tests/src/Unit/ConfigurationItemTest.php
 delete mode 100644 modules/contrib/features/tests/src/Unit/FeaturesBundleTest.php
 delete mode 100644 modules/contrib/features/tests/src/Unit/FeaturesManagerTest.php
 delete mode 100644 modules/contrib/features/tests/src/Unit/PackageTest.php
 delete mode 100644 modules/ctools/LICENSE.txt
 delete mode 100644 modules/ctools/composer.json
 delete mode 100644 modules/ctools/config/schema/ctools.schema.yml
 delete mode 100644 modules/ctools/ctools.info.yml
 delete mode 100644 modules/ctools/ctools.module
 delete mode 100644 modules/ctools/ctools.services.yml
 delete mode 100644 modules/ctools/modules/ctools_block/config/schema/ctools_block.schema.yml
 delete mode 100644 modules/ctools/modules/ctools_block/ctools_block.info.yml
 delete mode 100644 modules/ctools/modules/ctools_block/src/Plugin/Block/EntityField.php
 delete mode 100644 modules/ctools/modules/ctools_block/src/Plugin/Deriver/EntityFieldDeriver.php
 delete mode 100644 modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml
 delete mode 100644 modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml
 delete mode 100644 modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml
 delete mode 100644 modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml
 delete mode 100644 modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml
 delete mode 100644 modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.field_image.yml
 delete mode 100644 modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.storage.node.field_image.yml
 delete mode 100644 modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml
 delete mode 100644 modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml
 delete mode 100644 modules/ctools/modules/ctools_block/tests/src/Functional/EntityFieldBlockTest.php
 delete mode 100644 modules/ctools/modules/ctools_views/ctools_views.info.yml
 delete mode 100644 modules/ctools/modules/ctools_views/ctools_views.module
 delete mode 100644 modules/ctools/modules/ctools_views/src/Plugin/Display/Block.php
 delete mode 100644 modules/ctools/modules/ctools_views/src/Tests/CToolsViewsBasicViewBlockTest.php
 delete mode 100644 modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/ctools_views_test_views.info.yml
 delete mode 100644 modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/test_views/views.view.ctools_views_entity_test.yml
 delete mode 100644 modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/test_views/views.view.ctools_views_test_view.yml
 delete mode 100644 modules/ctools/src/Access/AccessInterface.php
 delete mode 100644 modules/ctools/src/Access/TempstoreAccess.php
 delete mode 100644 modules/ctools/src/Ajax/OpenModalWizardCommand.php
 delete mode 100644 modules/ctools/src/Annotation/Relationship.php
 delete mode 100644 modules/ctools/src/ConstraintConditionInterface.php
 delete mode 100644 modules/ctools/src/Context/AutomaticContext.php
 delete mode 100644 modules/ctools/src/Context/EntityLazyLoadContext.php
 delete mode 100644 modules/ctools/src/ContextMapper.php
 delete mode 100644 modules/ctools/src/ContextMapperInterface.php
 delete mode 100644 modules/ctools/src/ContextNotFoundException.php
 delete mode 100644 modules/ctools/src/Controller/WizardEntityFormController.php
 delete mode 100644 modules/ctools/src/Controller/WizardFormController.php
 delete mode 100644 modules/ctools/src/Event/WizardEvent.php
 delete mode 100644 modules/ctools/src/Form/AjaxFormTrait.php
 delete mode 100644 modules/ctools/src/Form/ConditionConfigure.php
 delete mode 100644 modules/ctools/src/Form/ConditionDelete.php
 delete mode 100644 modules/ctools/src/Form/ContextConfigure.php
 delete mode 100644 modules/ctools/src/Form/ContextDelete.php
 delete mode 100644 modules/ctools/src/Form/ManageConditions.php
 delete mode 100644 modules/ctools/src/Form/ManageContext.php
 delete mode 100644 modules/ctools/src/Form/ManageResolverRelationships.php
 delete mode 100644 modules/ctools/src/Form/RelationshipConfigure.php
 delete mode 100644 modules/ctools/src/Form/RequiredContext.php
 delete mode 100644 modules/ctools/src/Form/RequiredContextDelete.php
 delete mode 100644 modules/ctools/src/Form/ResolverRelationshipConfigure.php
 delete mode 100644 modules/ctools/src/Form/ResolverRelationshipDelete.php
 delete mode 100644 modules/ctools/src/ParamConverter/TempstoreConverter.php
 delete mode 100644 modules/ctools/src/Plugin/Block/EntityView.php
 delete mode 100644 modules/ctools/src/Plugin/BlockPluginCollection.php
 delete mode 100644 modules/ctools/src/Plugin/BlockVariantInterface.php
 delete mode 100644 modules/ctools/src/Plugin/BlockVariantTrait.php
 delete mode 100644 modules/ctools/src/Plugin/Condition/EntityBundle.php
 delete mode 100644 modules/ctools/src/Plugin/Condition/NodeType.php
 delete mode 100644 modules/ctools/src/Plugin/Deriver/EntityBundle.php
 delete mode 100644 modules/ctools/src/Plugin/Deriver/EntityDeriverBase.php
 delete mode 100644 modules/ctools/src/Plugin/Deriver/EntityViewDeriver.php
 delete mode 100644 modules/ctools/src/Plugin/Deriver/TypedDataEntityRelationshipDeriver.php
 delete mode 100644 modules/ctools/src/Plugin/Deriver/TypedDataLanguageRelationshipDeriver.php
 delete mode 100644 modules/ctools/src/Plugin/Deriver/TypedDataPropertyDeriverBase.php
 delete mode 100644 modules/ctools/src/Plugin/Deriver/TypedDataRelationshipDeriver.php
 delete mode 100644 modules/ctools/src/Plugin/DisplayVariant/BlockDisplayVariant.php
 delete mode 100644 modules/ctools/src/Plugin/PluginWizardInterface.php
 delete mode 100644 modules/ctools/src/Plugin/Relationship/TypedDataEntityRelationship.php
 delete mode 100644 modules/ctools/src/Plugin/Relationship/TypedDataLanguageRelationship.php
 delete mode 100644 modules/ctools/src/Plugin/Relationship/TypedDataRelationship.php
 delete mode 100644 modules/ctools/src/Plugin/RelationshipBase.php
 delete mode 100644 modules/ctools/src/Plugin/RelationshipInterface.php
 delete mode 100644 modules/ctools/src/Plugin/RelationshipManager.php
 delete mode 100644 modules/ctools/src/Plugin/RelationshipManagerInterface.php
 delete mode 100644 modules/ctools/src/Plugin/VariantCollectionInterface.php
 delete mode 100644 modules/ctools/src/Plugin/VariantCollectionTrait.php
 delete mode 100644 modules/ctools/src/Plugin/VariantPluginCollection.php
 delete mode 100644 modules/ctools/src/Routing/Enhancer/WizardEnhancer.php
 delete mode 100644 modules/ctools/src/SerializableTempstore.php
 delete mode 100644 modules/ctools/src/SerializableTempstoreFactory.php
 delete mode 100644 modules/ctools/src/Testing/EntityCreationTrait.php
 delete mode 100644 modules/ctools/src/Tests/Wizard/CToolsWizardTest.php
 delete mode 100644 modules/ctools/src/TypedDataResolver.php
 delete mode 100644 modules/ctools/src/Wizard/EntityFormWizardBase.php
 delete mode 100644 modules/ctools/src/Wizard/EntityFormWizardInterface.php
 delete mode 100644 modules/ctools/src/Wizard/FormWizardBase.php
 delete mode 100644 modules/ctools/src/Wizard/FormWizardInterface.php
 delete mode 100644 modules/ctools/src/Wizard/WizardFactory.php
 delete mode 100644 modules/ctools/src/Wizard/WizardFactoryInterface.php
 delete mode 100644 modules/ctools/templates/ctools-wizard-trail-links.html.twig
 delete mode 100644 modules/ctools/templates/ctools-wizard-trail.html.twig
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/config/schema/ctools_wizard_test_config_entity.schema.yml
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.info.yml
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.links.action.yml
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.links.menu.yml
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.routing.yml
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Entity/ExampleConfigEntity.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/ExampleConfigEntityInterface.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/ExampleConfigEntityListBuilder.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityDeleteForm.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityExistingForm.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityExternalForm.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityGeneralForm.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityOneForm.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityTwoForm.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Form/OneForm.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Form/TwoForm.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/EntityAddWizardTest.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/EntityEditWizardTest.php
 delete mode 100644 modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/WizardTest.php
 delete mode 100644 modules/ctools/tests/src/Kernel/RelationshipManagerTest.php
 delete mode 100644 modules/ctools/tests/src/Kernel/RelationshipsTestBase.php
 delete mode 100644 modules/ctools/tests/src/Kernel/SerializableTempstoreTest.php
 delete mode 100644 modules/ctools/tests/src/Kernel/TypedDataEntityRelationshipPluginTest.php
 delete mode 100644 modules/ctools/tests/src/Kernel/TypedDataLanguageRelationshipPluginTest.php
 delete mode 100644 modules/ctools/tests/src/Kernel/TypedDataRelationshipPluginTest.php
 delete mode 100644 modules/ctools/tests/src/Kernel/TypedDataResolverTest.php
 delete mode 100644 modules/ctools/tests/src/Unit/BlockDisplayVariantTest.php
 delete mode 100644 modules/ctools/tests/src/Unit/BlockPluginCollectionTest.php
 delete mode 100644 modules/ctools/tests/src/Unit/BlockVariantTraitTest.php
 delete mode 100644 modules/ctools/tests/src/Unit/ContextMapperTest.php
 delete mode 100644 modules/ctools/tests/src/Unit/VariantCollectionTraitTest.php
 delete mode 100644 modules/devel/LICENSE.txt
 delete mode 100644 modules/devel/README.txt
 delete mode 100644 modules/devel/composer.json
 delete mode 100644 modules/devel/config/install/devel.settings.yml
 delete mode 100644 modules/devel/config/install/devel.toolbar.settings.yml
 delete mode 100644 modules/devel/config/install/system.menu.devel.yml
 delete mode 100644 modules/devel/config/schema/devel.schema.yml
 delete mode 100644 modules/devel/css/devel-rtl.css
 delete mode 100644 modules/devel/css/devel.css
 delete mode 100644 modules/devel/css/devel.toolbar.css
 delete mode 100644 modules/devel/devel.api.php
 delete mode 100644 modules/devel/devel.info.yml
 delete mode 100644 modules/devel/devel.install
 delete mode 100644 modules/devel/devel.libraries.yml
 delete mode 100644 modules/devel/devel.links.menu.yml
 delete mode 100644 modules/devel/devel.links.task.yml
 delete mode 100644 modules/devel/devel.module
 delete mode 100644 modules/devel/devel.permissions.yml
 delete mode 100644 modules/devel/devel.routing.yml
 delete mode 100644 modules/devel/devel.services.yml
 delete mode 100644 modules/devel/devel_generate/README.txt
 delete mode 100644 modules/devel/devel_generate/devel_generate.batch.inc
 delete mode 100644 modules/devel/devel_generate/devel_generate.info.yml
 delete mode 100644 modules/devel/devel_generate/devel_generate.module
 delete mode 100644 modules/devel/devel_generate/devel_generate.permissions.yml
 delete mode 100644 modules/devel/devel_generate/devel_generate.routing.yml
 delete mode 100644 modules/devel/devel_generate/devel_generate.services.yml
 delete mode 100644 modules/devel/devel_generate/drush.services.yml
 delete mode 100644 modules/devel/devel_generate/drush/devel_generate.drush8.inc
 delete mode 100644 modules/devel/devel_generate/src/Annotation/DevelGenerate.php
 delete mode 100644 modules/devel/devel_generate/src/Commands/DevelGenerateCommands.php
 delete mode 100644 modules/devel/devel_generate/src/DevelGenerateBase.php
 delete mode 100644 modules/devel/devel_generate/src/DevelGenerateBaseInterface.php
 delete mode 100644 modules/devel/devel_generate/src/DevelGenerateException.php
 delete mode 100644 modules/devel/devel_generate/src/DevelGeneratePermissions.php
 delete mode 100644 modules/devel/devel_generate/src/DevelGeneratePluginManager.php
 delete mode 100644 modules/devel/devel_generate/src/Form/DevelGenerateForm.php
 delete mode 100644 modules/devel/devel_generate/src/Plugin/DevelGenerate/ContentDevelGenerate.php
 delete mode 100644 modules/devel/devel_generate/src/Plugin/DevelGenerate/MenuDevelGenerate.php
 delete mode 100644 modules/devel/devel_generate/src/Plugin/DevelGenerate/TermDevelGenerate.php
 delete mode 100644 modules/devel/devel_generate/src/Plugin/DevelGenerate/UserDevelGenerate.php
 delete mode 100644 modules/devel/devel_generate/src/Plugin/DevelGenerate/VocabularyDevelGenerate.php
 delete mode 100644 modules/devel/devel_generate/src/Routing/DevelGenerateRoutes.php
 delete mode 100644 modules/devel/devel_generate/src/Tests/DevelGenerateTest.php
 delete mode 100644 modules/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.info.yml
 delete mode 100644 modules/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.module
 delete mode 100644 modules/devel/devel_generate/tests/modules/devel_generate_example/src/Plugin/DevelGenerate/ExampleDevelGenerate.php
 delete mode 100644 modules/devel/devel_generate/tests/src/DevelGenerateManagerTest.php
 delete mode 100644 modules/devel/drush.services.yml
 delete mode 100644 modules/devel/drush/devel.drush8.inc
 delete mode 100644 modules/devel/drush/develDrushTest.php
 delete mode 100644 modules/devel/icons/bebebe/cog.svg
 delete mode 100644 modules/devel/icons/ffffff/cog.svg
 delete mode 100644 modules/devel/kint/README.txt
 delete mode 100644 modules/devel/kint/kint.info.yml
 delete mode 100644 modules/devel/kint/kint.module
 delete mode 100644 modules/devel/kint/kint.permissions.yml
 delete mode 100644 modules/devel/kint/kint.services.yml
 delete mode 100644 modules/devel/kint/kint/.gitignore
 delete mode 100644 modules/devel/kint/kint/Kint.class.php
 delete mode 100644 modules/devel/kint/kint/LICENCE
 delete mode 100644 modules/devel/kint/kint/README.md
 delete mode 100644 modules/devel/kint/kint/composer.json
 delete mode 100644 modules/devel/kint/kint/config.default.php
 delete mode 100644 modules/devel/kint/kint/decorators/plain.php
 delete mode 100644 modules/devel/kint/kint/decorators/rich.php
 delete mode 100644 modules/devel/kint/kint/examples/overview.php
 delete mode 100644 modules/devel/kint/kint/inc/kintObject.class.php
 delete mode 100644 modules/devel/kint/kint/inc/kintParser.class.php
 delete mode 100644 modules/devel/kint/kint/inc/kintVariableData.class.php
 delete mode 100644 modules/devel/kint/kint/parsers/custom/classmethods.php
 delete mode 100644 modules/devel/kint/kint/parsers/custom/classstatics.php
 delete mode 100644 modules/devel/kint/kint/parsers/custom/color.php
 delete mode 100644 modules/devel/kint/kint/parsers/custom/fspath.php
 delete mode 100644 modules/devel/kint/kint/parsers/custom/json.php
 delete mode 100644 modules/devel/kint/kint/parsers/custom/microtime.php
 delete mode 100644 modules/devel/kint/kint/parsers/custom/objectiterateable.php
 delete mode 100644 modules/devel/kint/kint/parsers/custom/splobjectstorage.php
 delete mode 100644 modules/devel/kint/kint/parsers/custom/timestamp.php
 delete mode 100644 modules/devel/kint/kint/parsers/custom/xml.php
 delete mode 100644 modules/devel/kint/kint/parsers/objects/closure.php
 delete mode 100644 modules/devel/kint/kint/parsers/objects/smarty.php
 delete mode 100644 modules/devel/kint/kint/parsers/objects/splfileinfo.php
 delete mode 100644 modules/devel/kint/kint/view/base.js
 delete mode 100644 modules/devel/kint/kint/view/base.less
 delete mode 100644 modules/devel/kint/kint/view/compiled/aante-light.css
 delete mode 100644 modules/devel/kint/kint/view/compiled/kint.js
 delete mode 100644 modules/devel/kint/kint/view/compiled/original.css
 delete mode 100644 modules/devel/kint/kint/view/compiled/solarized-dark.css
 delete mode 100644 modules/devel/kint/kint/view/compiled/solarized.css
 delete mode 100644 modules/devel/kint/kint/view/themes/aante-light.less
 delete mode 100644 modules/devel/kint/kint/view/themes/original.less
 delete mode 100644 modules/devel/kint/kint/view/themes/solarized-dark.less
 delete mode 100644 modules/devel/kint/kint/view/themes/solarized.less
 delete mode 100644 modules/devel/kint/src/Plugin/Devel/Dumper/Kint.php
 delete mode 100644 modules/devel/kint/src/Twig/KintExtension.php
 delete mode 100644 modules/devel/run-tests-drush.sh
 delete mode 100644 modules/devel/src/Annotation/DevelDumper.php
 delete mode 100644 modules/devel/src/Commands/DevelCommands.php
 delete mode 100644 modules/devel/src/Controller/ContainerInfoController.php
 delete mode 100644 modules/devel/src/Controller/DevelController.php
 delete mode 100644 modules/devel/src/Controller/ElementInfoController.php
 delete mode 100644 modules/devel/src/Controller/EntityDebugController.php
 delete mode 100644 modules/devel/src/Controller/EntityTypeInfoController.php
 delete mode 100644 modules/devel/src/Controller/EventInfoController.php
 delete mode 100644 modules/devel/src/Controller/LayoutInfoController.php
 delete mode 100644 modules/devel/src/Controller/RouteInfoController.php
 delete mode 100644 modules/devel/src/Controller/SwitchUserController.php
 delete mode 100644 modules/devel/src/DevelDumperBase.php
 delete mode 100644 modules/devel/src/DevelDumperInterface.php
 delete mode 100644 modules/devel/src/DevelDumperManager.php
 delete mode 100644 modules/devel/src/DevelDumperManagerInterface.php
 delete mode 100644 modules/devel/src/DevelDumperPluginManager.php
 delete mode 100644 modules/devel/src/DevelDumperPluginManagerInterface.php
 delete mode 100644 modules/devel/src/EntityTypeInfo.php
 delete mode 100644 modules/devel/src/EventSubscriber/ErrorHandlerSubscriber.php
 delete mode 100644 modules/devel/src/EventSubscriber/ThemeInfoRebuildSubscriber.php
 delete mode 100644 modules/devel/src/Form/ConfigEditor.php
 delete mode 100644 modules/devel/src/Form/ConfigsList.php
 delete mode 100644 modules/devel/src/Form/DevelReinstall.php
 delete mode 100644 modules/devel/src/Form/ExecutePHP.php
 delete mode 100644 modules/devel/src/Form/RouterRebuildConfirmForm.php
 delete mode 100644 modules/devel/src/Form/SettingsForm.php
 delete mode 100644 modules/devel/src/Form/SwitchUserForm.php
 delete mode 100644 modules/devel/src/Form/SystemStateEdit.php
 delete mode 100644 modules/devel/src/Form/ToolbarSettingsForm.php
 delete mode 100644 modules/devel/src/Plugin/Block/DevelExecutePHP.php
 delete mode 100644 modules/devel/src/Plugin/Block/SwitchUserBlock.php
 delete mode 100644 modules/devel/src/Plugin/Derivative/DevelLocalTask.php
 delete mode 100644 modules/devel/src/Plugin/Devel/Dumper/ChromePhp.php
 delete mode 100644 modules/devel/src/Plugin/Devel/Dumper/DoctrineDebug.php
 delete mode 100644 modules/devel/src/Plugin/Devel/Dumper/DrupalVariable.php
 delete mode 100644 modules/devel/src/Plugin/Devel/Dumper/FirePhp.php
 delete mode 100644 modules/devel/src/Plugin/Devel/Dumper/VarDumper.php
 delete mode 100644 modules/devel/src/Plugin/Mail/DevelMailLog.php
 delete mode 100644 modules/devel/src/Plugin/Menu/DestinationMenuLink.php
 delete mode 100644 modules/devel/src/Plugin/Menu/MenuItemMenuLink.php
 delete mode 100644 modules/devel/src/Plugin/Menu/RouteDetailMenuLink.php
 delete mode 100644 modules/devel/src/Render/FilteredMarkup.php
 delete mode 100644 modules/devel/src/Routing/RouteSubscriber.php
 delete mode 100644 modules/devel/src/ToolbarHandler.php
 delete mode 100644 modules/devel/src/Twig/Extension/Debug.php
 delete mode 100644 modules/devel/tests/modules/devel_dumper_test/css/devel_dumper_test.css
 delete mode 100644 modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.info.yml
 delete mode 100644 modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.libraries.yml
 delete mode 100644 modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.routing.yml
 delete mode 100644 modules/devel/tests/modules/devel_dumper_test/js/devel_dumper_test.js
 delete mode 100644 modules/devel/tests/modules/devel_dumper_test/src/Controller/DumperTestController.php
 delete mode 100644 modules/devel/tests/modules/devel_dumper_test/src/Plugin/Devel/Dumper/AvailableTestDumper.php
 delete mode 100644 modules/devel/tests/modules/devel_dumper_test/src/Plugin/Devel/Dumper/NotAvailableTestDumper.php
 delete mode 100644 modules/devel/tests/modules/devel_entity_test/devel_entity_test.info.yml
 delete mode 100644 modules/devel/tests/modules/devel_entity_test/devel_entity_test.links.task.yml
 delete mode 100644 modules/devel/tests/modules/devel_entity_test/devel_entity_test.module
 delete mode 100644 modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestCanonical.php
 delete mode 100644 modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestEdit.php
 delete mode 100644 modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestNoLinks.php
 delete mode 100644 modules/devel/tests/modules/devel_entity_test/src/Plugin/Derivative/DevelEntityTestLocalTasks.php
 delete mode 100644 modules/devel/tests/modules/devel_test/devel_test.info.yml
 delete mode 100644 modules/devel/tests/modules/devel_test/devel_test.module
 delete mode 100644 modules/devel/tests/modules/devel_test/devel_test.routing.yml
 delete mode 100644 modules/devel/tests/modules/devel_test/devel_test.services.yml
 delete mode 100644 modules/devel/tests/modules/devel_test/src/Controller/DevelTestController.php
 delete mode 100644 modules/devel/tests/modules/devel_test/src/Routing/TestRouteSubscriber.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelContainerInfoTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelControllerTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelDumperTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelElementInfoTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelEntityTypeInfoTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelErrorHandlerTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelEventInfoTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelLayoutInfoTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelMenuLinksTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelModulesReinstallTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelRequirementsTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelRouteInfoTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelRouterRebuildTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelStateEditorTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelSwitchUserTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelToolbarTest.php
 delete mode 100644 modules/devel/tests/src/Functional/DevelWebAssertHelper.php
 delete mode 100644 modules/devel/tests/src/Kernel/DevelDumperTestTrait.php
 delete mode 100644 modules/devel/tests/src/Kernel/DevelEnforcedDependenciesTest.php
 delete mode 100644 modules/devel/tests/src/Kernel/DevelMailLogTest.php
 delete mode 100644 modules/devel/tests/src/Kernel/DevelQueryDebugTest.php
 delete mode 100644 modules/devel/tests/src/Kernel/DevelTwigExtensionTest.php
 delete mode 100644 modules/devel/webprofiler/README.md
 delete mode 100644 modules/devel/webprofiler/composer.json
 delete mode 100644 modules/devel/webprofiler/config/install/webprofiler.config.yml
 delete mode 100644 modules/devel/webprofiler/config/schema/webprofiler.schema.yml
 delete mode 100644 modules/devel/webprofiler/console.services.yml
 delete mode 100644 modules/devel/webprofiler/console/translations/en/webprofiler.benchmark.yml
 delete mode 100644 modules/devel/webprofiler/console/translations/en/webprofiler.export.yml
 delete mode 100644 modules/devel/webprofiler/console/translations/en/webprofiler.list.yml
 delete mode 100644 modules/devel/webprofiler/console/translations/es/webprofiler.benchmark.yml
 delete mode 100644 modules/devel/webprofiler/console/translations/es/webprofiler.export.yml
 delete mode 100644 modules/devel/webprofiler/console/translations/es/webprofiler.list.yml
 delete mode 100644 modules/devel/webprofiler/css/app/dashboard.css
 delete mode 100644 modules/devel/webprofiler/css/timeline.css
 delete mode 100644 modules/devel/webprofiler/images/caret-down.svg
 delete mode 100644 modules/devel/webprofiler/js/app/collections/collectors.js
 delete mode 100644 modules/devel/webprofiler/js/app/helpers.js
 delete mode 100644 modules/devel/webprofiler/js/app/main.js
 delete mode 100644 modules/devel/webprofiler/js/app/models/collector.js
 delete mode 100644 modules/devel/webprofiler/js/app/routers/collectors.js
 delete mode 100644 modules/devel/webprofiler/js/app/views/collector.js
 delete mode 100644 modules/devel/webprofiler/js/app/views/collectorsList.js
 delete mode 100644 modules/devel/webprofiler/js/app/views/details.js
 delete mode 100644 modules/devel/webprofiler/js/app/views/layout.js
 delete mode 100644 modules/devel/webprofiler/js/database.js
 delete mode 100644 modules/devel/webprofiler/js/timeline.js
 delete mode 100644 modules/devel/webprofiler/src/Access/AccessManagerWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Asset/CssCollectionRendererWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Asset/JsCollectionRendererWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Cache/CacheBackendWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Cache/CacheFactoryWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Command/BenchmarkCommand.php
 delete mode 100644 modules/devel/webprofiler/src/Command/BenchmarkData.php
 delete mode 100644 modules/devel/webprofiler/src/Command/ExportCommand.php
 delete mode 100644 modules/devel/webprofiler/src/Command/ListCommand.php
 delete mode 100644 modules/devel/webprofiler/src/Compiler/DecoratorPass.php
 delete mode 100644 modules/devel/webprofiler/src/Compiler/ProfilerPass.php
 delete mode 100644 modules/devel/webprofiler/src/Compiler/ServicePass.php
 delete mode 100644 modules/devel/webprofiler/src/Compiler/StoragePass.php
 delete mode 100644 modules/devel/webprofiler/src/Config/ConfigFactoryWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Controller/DashboardController.php
 delete mode 100644 modules/devel/webprofiler/src/Controller/DatabaseController.php
 delete mode 100644 modules/devel/webprofiler/src/Controller/ToolbarController.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/AssetsDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/BlocksDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/CacheDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/ConfigDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/DevelDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/DrupalDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/EventsDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/ExtensionDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/FormsDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/HttpDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/MailDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/PerformanceTimingDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/PhpConfigDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/RequestDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/RoutingDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/ServicesDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/StateDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/ThemeDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/TimeDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/TranslationsDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/UserDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/DataCollector/ViewsDataCollector.php
 delete mode 100644 modules/devel/webprofiler/src/Decorator.php
 delete mode 100644 modules/devel/webprofiler/src/DependencyInjection/TraceableContainer.php
 delete mode 100644 modules/devel/webprofiler/src/DrupalDataCollectorInterface.php
 delete mode 100644 modules/devel/webprofiler/src/Entity/Decorators/Config/ConfigEntityStorageDecorator.php
 delete mode 100644 modules/devel/webprofiler/src/Entity/Decorators/Config/RoleStorageDecorator.php
 delete mode 100644 modules/devel/webprofiler/src/Entity/Decorators/Config/ShortcutSetStorageDecorator.php
 delete mode 100644 modules/devel/webprofiler/src/Entity/Decorators/Config/VocabularyStorageDecorator.php
 delete mode 100644 modules/devel/webprofiler/src/Entity/EntityDecorator.php
 delete mode 100644 modules/devel/webprofiler/src/Entity/EntityManagerWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Entity/EntityViewBuilderDecorator.php
 delete mode 100644 modules/devel/webprofiler/src/EventDispatcher/EventDispatcherTraceableInterface.php
 delete mode 100644 modules/devel/webprofiler/src/EventDispatcher/TraceableEventDispatcher.php
 delete mode 100644 modules/devel/webprofiler/src/EventSubscriber/WebprofilerEventSubscriber.php
 delete mode 100644 modules/devel/webprofiler/src/Form/ConfigForm.php
 delete mode 100644 modules/devel/webprofiler/src/Form/FormBuilderWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Form/ProfilesFilterForm.php
 delete mode 100644 modules/devel/webprofiler/src/Frontend/PerformanceTimingData.php
 delete mode 100644 modules/devel/webprofiler/src/Helper/ClassShortener.php
 delete mode 100644 modules/devel/webprofiler/src/Helper/ClassShortenerInterface.php
 delete mode 100644 modules/devel/webprofiler/src/Helper/IdeLinkGenerator.php
 delete mode 100644 modules/devel/webprofiler/src/Helper/IdeLinkGeneratorInterface.php
 delete mode 100644 modules/devel/webprofiler/src/Http/HttpClientMiddleware.php
 delete mode 100644 modules/devel/webprofiler/src/Mail/MailManagerWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Profiler/DatabaseProfilerStorage.php
 delete mode 100644 modules/devel/webprofiler/src/Profiler/FileProfilerStorage.php
 delete mode 100644 modules/devel/webprofiler/src/Profiler/Profiler.php
 delete mode 100644 modules/devel/webprofiler/src/Profiler/ProfilerStorageFactory.php
 delete mode 100644 modules/devel/webprofiler/src/Profiler/ProfilerStorageManager.php
 delete mode 100644 modules/devel/webprofiler/src/Profiler/TemplateManager.php
 delete mode 100644 modules/devel/webprofiler/src/RequestMatcher/WebprofilerRequestMatcher.php
 delete mode 100644 modules/devel/webprofiler/src/Routing/TokenConverter.php
 delete mode 100644 modules/devel/webprofiler/src/StackMiddleware/WebprofilerMiddleware.php
 delete mode 100644 modules/devel/webprofiler/src/State/StateWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Stopwatch.php
 delete mode 100644 modules/devel/webprofiler/src/StringTranslation/TranslationManagerWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Theme/ThemeNegotiatorWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/Twig/Dumper/HtmlDumper.php
 delete mode 100644 modules/devel/webprofiler/src/Twig/Extension/ProfilerExtension.php
 delete mode 100644 modules/devel/webprofiler/src/Views/TraceableViewExecutable.php
 delete mode 100644 modules/devel/webprofiler/src/Views/ViewExecutableFactoryWrapper.php
 delete mode 100644 modules/devel/webprofiler/src/WebprofilerServiceProvider.php
 delete mode 100644 modules/devel/webprofiler/templates/Collector/assets.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/blocks.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/cache.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/config.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/database.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/devel.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/drupal.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/events.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/extensions.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/forms.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/http.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/mail.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/performance_timing.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/php_config.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/request.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/routing.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/services.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/state.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/theme.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/time.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/translations.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/user.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Collector/views.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Profiler/webprofiler_dashboard.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Profiler/webprofiler_loader.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Profiler/webprofiler_panel.html.twig
 delete mode 100644 modules/devel/webprofiler/templates/Profiler/webprofiler_toolbar.css.twig
 delete mode 100644 modules/devel/webprofiler/templates/Profiler/webprofiler_toolbar.html.twig
 delete mode 100644 modules/devel/webprofiler/tests/src/FunctionalJavascript/ToolbarTest.php
 delete mode 100644 modules/devel/webprofiler/tests/src/FunctionalJavascript/WebprofilerTestBase.php
 delete mode 100644 modules/devel/webprofiler/tests/src/Kernel/DecoratorTest.php
 delete mode 100644 modules/devel/webprofiler/tests/src/Unit/DataCollector/AssetsDataCollectorTest.php
 delete mode 100644 modules/devel/webprofiler/tests/src/Unit/DataCollector/CacheDataCollectorTest.php
 delete mode 100644 modules/devel/webprofiler/tests/src/Unit/DataCollector/DataCollectorBaseTest.php
 delete mode 100644 modules/devel/webprofiler/webprofiler.info.yml
 delete mode 100644 modules/devel/webprofiler/webprofiler.install
 delete mode 100644 modules/devel/webprofiler/webprofiler.libraries.yml
 delete mode 100644 modules/devel/webprofiler/webprofiler.links.menu.yml
 delete mode 100644 modules/devel/webprofiler/webprofiler.links.task.yml
 delete mode 100644 modules/devel/webprofiler/webprofiler.make.yml
 delete mode 100644 modules/devel/webprofiler/webprofiler.module
 delete mode 100644 modules/devel/webprofiler/webprofiler.permissions.yml
 delete mode 100644 modules/devel/webprofiler/webprofiler.routing.yml
 delete mode 100644 modules/devel/webprofiler/webprofiler.services.yml
 delete mode 100644 modules/diff/LICENSE.txt
 delete mode 100644 modules/diff/README.txt
 delete mode 100644 modules/diff/composer.json
 delete mode 100644 modules/diff/config/install/diff.settings.yml
 delete mode 100644 modules/diff/config/optional/core.entity_view_mode.node.diff.yml
 delete mode 100644 modules/diff/config/schema/diff.schema.yml
 delete mode 100644 modules/diff/css/diff.colors.css
 delete mode 100644 modules/diff/css/diff.double-column.css
 delete mode 100644 modules/diff/css/diff.general.css
 delete mode 100644 modules/diff/css/diff.single-column.css
 delete mode 100644 modules/diff/css/diff.visual-inline.css
 delete mode 100644 modules/diff/diff.api.php
 delete mode 100644 modules/diff/diff.info.yml
 delete mode 100644 modules/diff/diff.install
 delete mode 100644 modules/diff/diff.libraries.yml
 delete mode 100644 modules/diff/diff.links.menu.yml
 delete mode 100644 modules/diff/diff.links.task.yml
 delete mode 100644 modules/diff/diff.module
 delete mode 100644 modules/diff/diff.routing.yml
 delete mode 100644 modules/diff/diff.services.yml
 delete mode 100644 modules/diff/diff.views.inc
 delete mode 100644 modules/diff/js/diff.js
 delete mode 100644 modules/diff/src/Annotation/DiffLayoutBuilder.php
 delete mode 100644 modules/diff/src/Annotation/FieldDiffBuilder.php
 delete mode 100644 modules/diff/src/Controller/NodeRevisionController.php
 delete mode 100644 modules/diff/src/Controller/PluginRevisionController.php
 delete mode 100644 modules/diff/src/DiffBuilderManager.php
 delete mode 100644 modules/diff/src/DiffEntityComparison.php
 delete mode 100644 modules/diff/src/DiffEntityParser.php
 delete mode 100644 modules/diff/src/DiffFormatter.php
 delete mode 100644 modules/diff/src/DiffLayoutBase.php
 delete mode 100644 modules/diff/src/DiffLayoutInterface.php
 delete mode 100644 modules/diff/src/DiffLayoutManager.php
 delete mode 100644 modules/diff/src/FieldDiffBuilderBase.php
 delete mode 100644 modules/diff/src/FieldDiffBuilderInterface.php
 delete mode 100644 modules/diff/src/FieldReferenceInterface.php
 delete mode 100644 modules/diff/src/Form/FieldsSettingsForm.php
 delete mode 100644 modules/diff/src/Form/GeneralSettingsForm.php
 delete mode 100644 modules/diff/src/Form/RevisionOverviewForm.php
 delete mode 100644 modules/diff/src/Plugin/diff/Field/CommentFieldBuilder.php
 delete mode 100644 modules/diff/src/Plugin/diff/Field/CoreFieldBuilder.php
 delete mode 100644 modules/diff/src/Plugin/diff/Field/EntityReferenceFieldBuilder.php
 delete mode 100644 modules/diff/src/Plugin/diff/Field/FileFieldBuilder.php
 delete mode 100644 modules/diff/src/Plugin/diff/Field/ImageFieldBuilder.php
 delete mode 100644 modules/diff/src/Plugin/diff/Field/LinkFieldBuilder.php
 delete mode 100644 modules/diff/src/Plugin/diff/Field/ListFieldBuilder.php
 delete mode 100644 modules/diff/src/Plugin/diff/Field/TextFieldBuilder.php
 delete mode 100644 modules/diff/src/Plugin/diff/Field/TextWithSummaryFieldBuilder.php
 delete mode 100644 modules/diff/src/Plugin/diff/Layout/SplitFieldsDiffLayout.php
 delete mode 100644 modules/diff/src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php
 delete mode 100644 modules/diff/src/Plugin/diff/Layout/VisualInlineDiffLayout.php
 delete mode 100644 modules/diff/src/Plugin/views/field/DiffFrom.php
 delete mode 100644 modules/diff/src/Plugin/views/field/DiffPluginBase.php
 delete mode 100644 modules/diff/src/Plugin/views/field/DiffTo.php
 delete mode 100644 modules/diff/src/Routing/DiffRouteProvider.php
 delete mode 100644 modules/diff/src/Routing/RouteSubscriber.php
 delete mode 100644 modules/diff/src/Tests/DiffAdminFormsTest.php
 delete mode 100644 modules/diff/src/Tests/DiffLocaleTest.php
 delete mode 100644 modules/diff/src/Tests/DiffPluginEntityTest.php
 delete mode 100644 modules/diff/src/Tests/DiffPluginFileTest.php
 delete mode 100644 modules/diff/src/Tests/DiffPluginTest.php
 delete mode 100644 modules/diff/src/Tests/DiffPluginTestBase.php
 delete mode 100644 modules/diff/src/Tests/DiffPluginVariousTest.php
 delete mode 100644 modules/diff/src/Tests/DiffRevisionTest.php
 delete mode 100644 modules/diff/src/Tests/DiffTestBase.php
 delete mode 100644 modules/diff/src/Tests/DiffViewModeTest.php
 delete mode 100644 modules/diff/src/Tests/DiffViewsTest.php
 delete mode 100644 modules/diff/src/VisualDiffThemeNegotiator.php
 delete mode 100644 modules/diff/tests/modules/diff_test/config/install/filter.format.basic_html.yml
 delete mode 100644 modules/diff/tests/modules/diff_test/config/optional/views.view.test_diff_view.yml
 delete mode 100644 modules/diff/tests/modules/diff_test/diff_test.info.yml
 delete mode 100644 modules/diff/tests/modules/diff_test/diff_test.module
 delete mode 100644 modules/diff/tests/modules/diff_test/src/Plugin/diff/Field/TestHeavierTextPlugin.php
 delete mode 100644 modules/diff/tests/modules/diff_test/src/Plugin/diff/Field/TestLighterTextPlugin.php
 delete mode 100644 modules/diff/tests/src/Kernel/DiffControllerTest.php
 delete mode 100644 modules/diff/tests/src/Unit/VisualDiffThemeNegotiatorTest.php
 delete mode 100644 modules/masquerade/LICENSE.txt
 delete mode 100644 modules/masquerade/README.txt
 delete mode 100644 modules/masquerade/composer.json
 delete mode 100644 modules/masquerade/masquerade.api.php
 delete mode 100644 modules/masquerade/masquerade.info.yml
 delete mode 100644 modules/masquerade/masquerade.install
 delete mode 100644 modules/masquerade/masquerade.links.menu.yml
 delete mode 100644 modules/masquerade/masquerade.module
 delete mode 100644 modules/masquerade/masquerade.permissions.yml
 delete mode 100644 modules/masquerade/masquerade.routing.yml
 delete mode 100644 modules/masquerade/masquerade.services.yml
 delete mode 100644 modules/masquerade/src/Access/SwitchAccessCheck.php
 delete mode 100644 modules/masquerade/src/Access/UnmasqueradeAccessCheck.php
 delete mode 100644 modules/masquerade/src/Cache/MasqueradeCacheContext.php
 delete mode 100644 modules/masquerade/src/Controller/SwitchController.php
 delete mode 100644 modules/masquerade/src/Form/MasqueradeForm.php
 delete mode 100644 modules/masquerade/src/Masquerade.php
 delete mode 100644 modules/masquerade/src/MasqueradePermissions.php
 delete mode 100644 modules/masquerade/src/Plugin/Block/MasqueradeBlock.php
 delete mode 100644 modules/masquerade/src/Tests/MasqueradeAccessTest.php
 delete mode 100644 modules/masquerade/src/Tests/MasqueradeCacheTest.php
 delete mode 100644 modules/masquerade/src/Tests/MasqueradeTest.php
 delete mode 100644 modules/masquerade/src/Tests/MasqueradeWebTestBase.php
 delete mode 100644 modules/pathauto/LICENSE.txt
 delete mode 100644 modules/pathauto/README.md
 delete mode 100644 modules/pathauto/config/install/pathauto.settings.yml
 delete mode 100644 modules/pathauto/config/optional/system.action.pathauto_update_alias_node.yml
 delete mode 100644 modules/pathauto/config/optional/system.action.pathauto_update_alias_user.yml
 delete mode 100644 modules/pathauto/config/schema/pathauto.schema.yml
 delete mode 100644 modules/pathauto/config/schema/pathauto_pattern.schema.yml
 delete mode 100644 modules/pathauto/pathauto.api.php
 delete mode 100644 modules/pathauto/pathauto.info.yml
 delete mode 100644 modules/pathauto/pathauto.install
 delete mode 100644 modules/pathauto/pathauto.js
 delete mode 100644 modules/pathauto/pathauto.libraries.yml
 delete mode 100644 modules/pathauto/pathauto.links.action.yml
 delete mode 100644 modules/pathauto/pathauto.links.task.yml
 delete mode 100644 modules/pathauto/pathauto.module
 delete mode 100644 modules/pathauto/pathauto.permissions.yml
 delete mode 100644 modules/pathauto/pathauto.routing.yml
 delete mode 100644 modules/pathauto/pathauto.services.yml
 delete mode 100644 modules/pathauto/pathauto.tokens.inc
 delete mode 100644 modules/pathauto/src/AliasCleaner.php
 delete mode 100644 modules/pathauto/src/AliasCleanerInterface.php
 delete mode 100644 modules/pathauto/src/AliasStorageHelper.php
 delete mode 100644 modules/pathauto/src/AliasStorageHelperInterface.php
 delete mode 100644 modules/pathauto/src/AliasTypeBatchUpdateInterface.php
 delete mode 100644 modules/pathauto/src/AliasTypeInterface.php
 delete mode 100644 modules/pathauto/src/AliasTypeManager.php
 delete mode 100644 modules/pathauto/src/AliasUniquifier.php
 delete mode 100644 modules/pathauto/src/AliasUniquifierInterface.php
 delete mode 100644 modules/pathauto/src/Annotation/AliasType.php
 delete mode 100644 modules/pathauto/src/Entity/PathautoPattern.php
 delete mode 100644 modules/pathauto/src/EventSubscriber/PathautoSettingsCacheTag.php
 delete mode 100644 modules/pathauto/src/Form/PathautoAdminDelete.php
 delete mode 100644 modules/pathauto/src/Form/PathautoBulkUpdateForm.php
 delete mode 100644 modules/pathauto/src/Form/PathautoSettingsForm.php
 delete mode 100644 modules/pathauto/src/Form/PatternDisableForm.php
 delete mode 100644 modules/pathauto/src/Form/PatternEditForm.php
 delete mode 100644 modules/pathauto/src/Form/PatternEnableForm.php
 delete mode 100644 modules/pathauto/src/MessengerInterface.php
 delete mode 100644 modules/pathauto/src/PathautoGenerator.php
 delete mode 100644 modules/pathauto/src/PathautoGeneratorInterface.php
 delete mode 100644 modules/pathauto/src/PathautoItem.php
 delete mode 100644 modules/pathauto/src/PathautoPatternInterface.php
 delete mode 100644 modules/pathauto/src/PathautoPatternListBuilder.php
 delete mode 100644 modules/pathauto/src/PathautoState.php
 delete mode 100644 modules/pathauto/src/PathautoWidget.php
 delete mode 100644 modules/pathauto/src/Plugin/Action/UpdateAction.php
 delete mode 100644 modules/pathauto/src/Plugin/Deriver/EntityAliasTypeDeriver.php
 delete mode 100644 modules/pathauto/src/Plugin/pathauto/AliasType/Broken.php
 delete mode 100644 modules/pathauto/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php
 delete mode 100644 modules/pathauto/src/Plugin/pathauto/AliasType/ForumAliasType.php
 delete mode 100644 modules/pathauto/src/Tests/PathautoBulkUpdateTest.php
 delete mode 100644 modules/pathauto/src/Tests/PathautoEnablingEntityTypesTest.php
 delete mode 100644 modules/pathauto/src/Tests/PathautoLocaleTest.php
 delete mode 100644 modules/pathauto/src/Tests/PathautoMassDeleteTest.php
 delete mode 100644 modules/pathauto/src/Tests/PathautoNodeWebTest.php
 delete mode 100644 modules/pathauto/src/Tests/PathautoSettingsFormWebTest.php
 delete mode 100644 modules/pathauto/src/Tests/PathautoTaxonomyWebTest.php
 delete mode 100644 modules/pathauto/src/Tests/PathautoTestHelperTrait.php
 delete mode 100644 modules/pathauto/src/Tests/PathautoUiTest.php
 delete mode 100644 modules/pathauto/src/Tests/PathautoUserWebTest.php
 delete mode 100644 modules/pathauto/src/VerboseMessenger.php
 delete mode 100644 modules/pathauto/tests/modules/pathauto_views_test/config/install/views.view.articles.yml
 delete mode 100644 modules/pathauto/tests/modules/pathauto_views_test/pathauto_views_test.info.yml
 delete mode 100644 modules/pathauto/tests/src/Kernel/PathautoKernelTest.php
 delete mode 100644 modules/pathauto/tests/src/Kernel/PathautoTokenTest.php
 delete mode 100644 modules/pathauto/tests/src/Unit/VerboseMessengerTest.php
 delete mode 100644 modules/rules/.gitignore
 delete mode 100644 modules/rules/.travis.yml
 delete mode 100644 modules/rules/LICENSE.txt
 delete mode 100644 modules/rules/README.md
 delete mode 100644 modules/rules/composer.json
 delete mode 100644 modules/rules/composer.lock
 delete mode 100644 modules/rules/config/install/rules.settings.yml
 delete mode 100644 modules/rules/config/schema/rules.action.schema.yml
 delete mode 100644 modules/rules/config/schema/rules.condition.schema.yml
 delete mode 100644 modules/rules/config/schema/rules.context.schema.yml
 delete mode 100644 modules/rules/config/schema/rules.data_types.schema.yml
 delete mode 100644 modules/rules/config/schema/rules.expression.schema.yml
 delete mode 100644 modules/rules/config/schema/rules.schema.yml
 delete mode 100644 modules/rules/d7-tests/rules.test
 delete mode 100644 modules/rules/js/autocomplete.js
 delete mode 100644 modules/rules/phpcs.xml.dist
 delete mode 100644 modules/rules/rules.info.yml
 delete mode 100644 modules/rules/rules.libraries.yml
 delete mode 100644 modules/rules/rules.links.action.yml
 delete mode 100644 modules/rules/rules.links.menu.yml
 delete mode 100644 modules/rules/rules.links.task.yml
 delete mode 100644 modules/rules/rules.module
 delete mode 100644 modules/rules/rules.permissions.yml
 delete mode 100644 modules/rules/rules.routing.yml
 delete mode 100644 modules/rules/rules.rules.events.yml
 delete mode 100644 modules/rules/rules.rules_ui.yml
 delete mode 100644 modules/rules/rules.services.yml
 delete mode 100644 modules/rules/src/Annotation/RulesDataProcessor.php
 delete mode 100644 modules/rules/src/Annotation/RulesExpression.php
 delete mode 100644 modules/rules/src/ComponentResolver/ComponentConfigResolver.php
 delete mode 100644 modules/rules/src/ComponentResolver/EventComponentResolver.php
 delete mode 100644 modules/rules/src/Context/AnnotatedClassDiscovery.php
 delete mode 100644 modules/rules/src/Context/Annotation/ContextDefinition.php
 delete mode 100644 modules/rules/src/Context/ContextAwarePluginInterface.php
 delete mode 100644 modules/rules/src/Context/ContextConfig.php
 delete mode 100644 modules/rules/src/Context/ContextDefinition.php
 delete mode 100644 modules/rules/src/Context/ContextDefinitionInterface.php
 delete mode 100644 modules/rules/src/Context/ContextHandlerIntegrityTrait.php
 delete mode 100644 modules/rules/src/Context/ContextHandlerTrait.php
 delete mode 100644 modules/rules/src/Context/ContextProviderInterface.php
 delete mode 100644 modules/rules/src/Context/ContextProviderTrait.php
 delete mode 100644 modules/rules/src/Context/DataProcessorInterface.php
 delete mode 100644 modules/rules/src/Context/DataProcessorManager.php
 delete mode 100644 modules/rules/src/Context/DataProcessorManagerTrait.php
 delete mode 100644 modules/rules/src/Context/GlobalContextRepositoryTrait.php
 delete mode 100644 modules/rules/src/Controller/AutocompleteController.php
 delete mode 100644 modules/rules/src/Controller/RulesComponentListBuilder.php
 delete mode 100644 modules/rules/src/Controller/RulesReactionListBuilder.php
 delete mode 100644 modules/rules/src/Core/Annotation/Condition.php
 delete mode 100644 modules/rules/src/Core/Annotation/RulesAction.php
 delete mode 100644 modules/rules/src/Core/ConditionManager.php
 delete mode 100644 modules/rules/src/Core/ConfigurationAccessControlInterface.php
 delete mode 100644 modules/rules/src/Core/ConfigurationAccessControlTrait.php
 delete mode 100644 modules/rules/src/Core/ExecutablePluginTrait.php
 delete mode 100644 modules/rules/src/Core/RulesActionBase.php
 delete mode 100644 modules/rules/src/Core/RulesActionInterface.php
 delete mode 100644 modules/rules/src/Core/RulesActionManager.php
 delete mode 100644 modules/rules/src/Core/RulesActionManagerInterface.php
 delete mode 100644 modules/rules/src/Core/RulesConditionBase.php
 delete mode 100644 modules/rules/src/Core/RulesConditionInterface.php
 delete mode 100644 modules/rules/src/Core/RulesConfigurableEventHandlerInterface.php
 delete mode 100644 modules/rules/src/Core/RulesDefaultEventHandler.php
 delete mode 100644 modules/rules/src/Core/RulesEventHandlerInterface.php
 delete mode 100644 modules/rules/src/Core/RulesEventManager.php
 delete mode 100644 modules/rules/src/Engine/ActionExpressionContainer.php
 delete mode 100644 modules/rules/src/Engine/ActionExpressionContainerInterface.php
 delete mode 100644 modules/rules/src/Engine/ActionExpressionInterface.php
 delete mode 100644 modules/rules/src/Engine/ConditionExpressionContainer.php
 delete mode 100644 modules/rules/src/Engine/ConditionExpressionContainerInterface.php
 delete mode 100644 modules/rules/src/Engine/ConditionExpressionInterface.php
 delete mode 100644 modules/rules/src/Engine/ExecutionMetadataState.php
 delete mode 100644 modules/rules/src/Engine/ExecutionMetadataStateInterface.php
 delete mode 100644 modules/rules/src/Engine/ExecutionState.php
 delete mode 100644 modules/rules/src/Engine/ExecutionStateInterface.php
 delete mode 100644 modules/rules/src/Engine/ExpressionBase.php
 delete mode 100644 modules/rules/src/Engine/ExpressionContainerBase.php
 delete mode 100644 modules/rules/src/Engine/ExpressionContainerInterface.php
 delete mode 100644 modules/rules/src/Engine/ExpressionInterface.php
 delete mode 100644 modules/rules/src/Engine/ExpressionManager.php
 delete mode 100644 modules/rules/src/Engine/ExpressionManagerInterface.php
 delete mode 100644 modules/rules/src/Engine/IntegrityViolation.php
 delete mode 100644 modules/rules/src/Engine/IntegrityViolationInterface.php
 delete mode 100644 modules/rules/src/Engine/IntegrityViolationList.php
 delete mode 100644 modules/rules/src/Engine/RulesComponent.php
 delete mode 100644 modules/rules/src/Engine/RulesComponentRepository.php
 delete mode 100644 modules/rules/src/Engine/RulesComponentRepositoryInterface.php
 delete mode 100644 modules/rules/src/Engine/RulesComponentResolverInterface.php
 delete mode 100644 modules/rules/src/Entity/ReactionRuleConfig.php
 delete mode 100644 modules/rules/src/Entity/ReactionRuleStorage.php
 delete mode 100644 modules/rules/src/Entity/RulesComponentConfig.php
 delete mode 100644 modules/rules/src/Event/EntityEvent.php
 delete mode 100644 modules/rules/src/Event/SystemCronEvent.php
 delete mode 100644 modules/rules/src/Event/SystemLoggerEvent.php
 delete mode 100644 modules/rules/src/Event/UserLoginEvent.php
 delete mode 100644 modules/rules/src/Event/UserLogoutEvent.php
 delete mode 100644 modules/rules/src/EventHandler/ConfigurableEventHandlerBase.php
 delete mode 100644 modules/rules/src/EventHandler/ConfigurableEventHandlerEntityBundle.php
 delete mode 100644 modules/rules/src/EventSubscriber/GenericEventSubscriber.php
 delete mode 100644 modules/rules/src/EventSubscriber/RedirectEventSubscriber.php
 delete mode 100644 modules/rules/src/Exception/EvaluationException.php
 delete mode 100644 modules/rules/src/Exception/IntegrityException.php
 delete mode 100644 modules/rules/src/Exception/InvalidArgumentException.php
 delete mode 100644 modules/rules/src/Exception/InvalidExpressionException.php
 delete mode 100644 modules/rules/src/Exception/LogicException.php
 delete mode 100644 modules/rules/src/Exception/OutOfBoundsException.php
 delete mode 100644 modules/rules/src/Exception/RulesException.php
 delete mode 100644 modules/rules/src/Form/AddExpressionForm.php
 delete mode 100644 modules/rules/src/Form/BreakLockForm.php
 delete mode 100644 modules/rules/src/Form/DeleteExpressionForm.php
 delete mode 100644 modules/rules/src/Form/EditExpressionForm.php
 delete mode 100644 modules/rules/src/Form/EmbeddedComponentForm.php
 delete mode 100644 modules/rules/src/Form/Expression/ActionContainerForm.php
 delete mode 100644 modules/rules/src/Form/Expression/ActionForm.php
 delete mode 100644 modules/rules/src/Form/Expression/ConditionContainerForm.php
 delete mode 100644 modules/rules/src/Form/Expression/ConditionForm.php
 delete mode 100644 modules/rules/src/Form/Expression/ContextFormTrait.php
 delete mode 100644 modules/rules/src/Form/Expression/ExpressionFormInterface.php
 delete mode 100644 modules/rules/src/Form/Expression/ExpressionFormTrait.php
 delete mode 100644 modules/rules/src/Form/Expression/RuleForm.php
 delete mode 100644 modules/rules/src/Form/ReactionRuleAddForm.php
 delete mode 100644 modules/rules/src/Form/ReactionRuleEditForm.php
 delete mode 100644 modules/rules/src/Form/RulesComponentAddForm.php
 delete mode 100644 modules/rules/src/Form/RulesComponentEditForm.php
 delete mode 100644 modules/rules/src/Form/RulesComponentFormBase.php
 delete mode 100644 modules/rules/src/Form/RulesSettingsForm.php
 delete mode 100644 modules/rules/src/Logger/RulesLog.php
 delete mode 100644 modules/rules/src/Logger/RulesLoggerChannel.php
 delete mode 100644 modules/rules/src/Plugin/Condition/DataComparison.php
 delete mode 100644 modules/rules/src/Plugin/Condition/DataIsEmpty.php
 delete mode 100644 modules/rules/src/Plugin/Condition/DataListContains.php
 delete mode 100644 modules/rules/src/Plugin/Condition/DataListCountIs.php
 delete mode 100644 modules/rules/src/Plugin/Condition/EntityHasField.php
 delete mode 100644 modules/rules/src/Plugin/Condition/EntityIsNew.php
 delete mode 100644 modules/rules/src/Plugin/Condition/EntityIsOfBundle.php
 delete mode 100644 modules/rules/src/Plugin/Condition/EntityIsOfType.php
 delete mode 100644 modules/rules/src/Plugin/Condition/NodeIsOfType.php
 delete mode 100644 modules/rules/src/Plugin/Condition/NodeIsPromoted.php
 delete mode 100644 modules/rules/src/Plugin/Condition/NodeIsPublished.php
 delete mode 100644 modules/rules/src/Plugin/Condition/NodeIsSticky.php
 delete mode 100644 modules/rules/src/Plugin/Condition/PathAliasExists.php
 delete mode 100644 modules/rules/src/Plugin/Condition/PathHasAlias.php
 delete mode 100644 modules/rules/src/Plugin/Condition/UserHasEntityFieldAccess.php
 delete mode 100644 modules/rules/src/Plugin/Condition/UserHasRole.php
 delete mode 100644 modules/rules/src/Plugin/Condition/UserIsBlocked.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/BanIP.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/DataCalculateValue.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/DataConvert.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/DataListItemAdd.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/DataListItemRemove.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/DataSet.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/EntityCreate.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/EntityCreateDeriver.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/EntityDelete.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/EntityFetchByField.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/EntityFetchById.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/EntityPathAliasCreate.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/EntityPathAliasCreateDeriver.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/EntitySave.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/PathAliasCreate.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/PathAliasDeleteByAlias.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/PathAliasDeleteByPath.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/RulesComponentAction.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/RulesComponentActionDeriver.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/SendAccountEmail.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/SystemMessage.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/SystemPageRedirect.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/SystemSendEmail.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/UserBlock.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/UserRoleAdd.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/UserRoleRemove.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/UserUnblock.php
 delete mode 100644 modules/rules/src/Plugin/RulesAction/VariableAdd.php
 delete mode 100644 modules/rules/src/Plugin/RulesDataProcessor/NumericOffset.php
 delete mode 100644 modules/rules/src/Plugin/RulesDataProcessor/TokenProcessor.php
 delete mode 100644 modules/rules/src/Plugin/RulesEvent/EntityDeleteDeriver.php
 delete mode 100644 modules/rules/src/Plugin/RulesEvent/EntityInsertDeriver.php
 delete mode 100644 modules/rules/src/Plugin/RulesEvent/EntityPresaveDeriver.php
 delete mode 100644 modules/rules/src/Plugin/RulesEvent/EntityUpdateDeriver.php
 delete mode 100644 modules/rules/src/Plugin/RulesEvent/EntityViewDeriver.php
 delete mode 100644 modules/rules/src/Plugin/RulesExpression/ActionSet.php
 delete mode 100644 modules/rules/src/Plugin/RulesExpression/Rule.php
 delete mode 100644 modules/rules/src/Plugin/RulesExpression/RuleInterface.php
 delete mode 100644 modules/rules/src/Plugin/RulesExpression/RulesAction.php
 delete mode 100644 modules/rules/src/Plugin/RulesExpression/RulesAnd.php
 delete mode 100644 modules/rules/src/Plugin/RulesExpression/RulesCondition.php
 delete mode 100644 modules/rules/src/Plugin/RulesExpression/RulesLoop.php
 delete mode 100644 modules/rules/src/Plugin/RulesExpression/RulesOr.php
 delete mode 100644 modules/rules/src/Routing/RulesUiRouteEnhancer.php
 delete mode 100644 modules/rules/src/Routing/RulesUiRouteSubscriber.php
 delete mode 100644 modules/rules/src/Rules.php
 delete mode 100644 modules/rules/src/RulesServiceProvider.php
 delete mode 100644 modules/rules/src/Ui/RulesUiComponentProviderInterface.php
 delete mode 100644 modules/rules/src/Ui/RulesUiConfigHandler.php
 delete mode 100644 modules/rules/src/Ui/RulesUiDefinition.php
 delete mode 100644 modules/rules/src/Ui/RulesUiHandlerInterface.php
 delete mode 100644 modules/rules/src/Ui/RulesUiHandlerTrait.php
 delete mode 100644 modules/rules/src/Ui/RulesUiManager.php
 delete mode 100644 modules/rules/src/Ui/RulesUiManagerInterface.php
 delete mode 100644 modules/rules/src/Ui/TempStoreTrait.php
 delete mode 100644 modules/rules/tests/modules/rules_test/config/schema/rules_test.action.schema.yml
 delete mode 100644 modules/rules/tests/modules/rules_test/rules_test.info.yml
 delete mode 100644 modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionFalse.php
 delete mode 100644 modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionProvider.php
 delete mode 100644 modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionTrue.php
 delete mode 100644 modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestTextCondition.php
 delete mode 100644 modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestLogAction.php
 delete mode 100644 modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestNodeAction.php
 delete mode 100644 modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestStringAction.php
 delete mode 100644 modules/rules/tests/modules/rules_test_default_component/config/install/rules.component.rules_test_default_component.yml
 delete mode 100644 modules/rules/tests/modules/rules_test_default_component/rules_test_default_component.info.yml
 delete mode 100644 modules/rules/tests/modules/rules_test_ui_embed/config/install/rules_test_ui_embed.settings.yml
 delete mode 100644 modules/rules/tests/modules/rules_test_ui_embed/config/schema/rules_test_ui_embed.schema.yml
 delete mode 100644 modules/rules/tests/modules/rules_test_ui_embed/css/test.css
 delete mode 100644 modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.info.yml
 delete mode 100644 modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.links.menu.yml
 delete mode 100644 modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.routing.yml
 delete mode 100644 modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.rules_ui.yml
 delete mode 100644 modules/rules/tests/modules/rules_test_ui_embed/src/Form/SettingsForm.php
 delete mode 100644 modules/rules/tests/src/Functional/ConfigureAndExecuteTest.php
 delete mode 100644 modules/rules/tests/src/Functional/RulesBrowserTestBase.php
 delete mode 100644 modules/rules/tests/src/Functional/RulesUiEmbedTest.php
 delete mode 100644 modules/rules/tests/src/Functional/TempStorageTest.php
 delete mode 100644 modules/rules/tests/src/Functional/UiPageTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/ConfigEntityDefaultsTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/ConfigEntityTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/ConfigSchemaTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/ConfigurableEventHandlerTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/ContextIntegrationTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/CoreIntegrationTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/DataProcessorTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/Engine/AutocompleteTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/Engine/MetadataAssertionTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/EntityViewTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/EventIntegrationTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/RedirectEventSubscriberTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/RulesDrupalTestBase.php
 delete mode 100644 modules/rules/tests/src/Kernel/RulesEngineTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/RulesMailTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/RulesUiEmbedTest.php
 delete mode 100644 modules/rules/tests/src/Kernel/TokenIntegrationTest.php
 delete mode 100644 modules/rules/tests/src/Unit/ActionSetTest.php
 delete mode 100644 modules/rules/tests/src/Unit/ContextHandlerTraitTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/BanIPTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/DataCalculateValueTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/DataConvertTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/DataListItemAddTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/DataListItemRemoveTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/DataSetTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/EntityCreateTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/EntityDeleteTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/EntityFetchByFieldTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/EntityFetchByIdTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/EntityPathAliasCreateTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/EntitySaveTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/PathAliasCreateTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByAliasTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByPathTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/RulesActionAccessTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/RulesComponentActionTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/SendAccountEmailTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/SystemMessageTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/SystemPageRedirectTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/SystemSendEmailTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/UserBlockTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/UserRoleAddTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/UserRoleRemoveTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/UserUnblockTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Action/VariableAddTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/ConditionAccessTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/ConditionManagerTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/DataComparisonTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/DataIsEmptyTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/EntityHasFieldTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/EntityIsNewTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfBundleTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfTypeTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/ListContainsTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/ListCountIsTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/NodeIsOfTypeTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/NodeIsPromotedTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/NodeIsPublishedTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/NodeIsStickyTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/PathAliasExistsTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/PathHasAliasTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/UserHasEntityFieldAccessTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/UserHasRoleTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Condition/UserIsBlockedTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Engine/AnnotationProcessingTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Engine/AutoSaveTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Engine/ExpressionSerializationTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Engine/IntegrityCheckTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Engine/LoopTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Engine/PrepareExecutionMetadataStateTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Engine/RulesComponentTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Event/EntityDeleteTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Event/EntityInsertTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Event/EntityPresaveTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Event/EntityUpdateTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Event/EntityViewTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Event/EventTestBase.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Event/SystemLoggerEventTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Event/UserLoginTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/Event/UserLogoutTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/RulesAction/RulesActionManagerTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/RulesAction/RulesAdminAccessTest.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/RulesEntityIntegrationTestBase.php
 delete mode 100644 modules/rules/tests/src/Unit/Integration/RulesIntegrationTestBase.php
 delete mode 100644 modules/rules/tests/src/Unit/RuleTest.php
 delete mode 100644 modules/rules/tests/src/Unit/RulesActionBaseTest.php
 delete mode 100644 modules/rules/tests/src/Unit/RulesAndTest.php
 delete mode 100644 modules/rules/tests/src/Unit/RulesConditionContainerTest.php
 delete mode 100644 modules/rules/tests/src/Unit/RulesConditionTest.php
 delete mode 100644 modules/rules/tests/src/Unit/RulesLoggerChannelTest.php
 delete mode 100644 modules/rules/tests/src/Unit/RulesOrTest.php
 delete mode 100644 modules/rules/tests/src/Unit/RulesUnitTestBase.php
 delete mode 100644 modules/scheduler/.travis.yml
 delete mode 100644 modules/scheduler/LICENSE.txt
 delete mode 100644 modules/scheduler/README.md
 delete mode 100644 modules/scheduler/composer.json
 delete mode 100644 modules/scheduler/config/install/scheduler.settings.yml
 delete mode 100644 modules/scheduler/config/install/views.view.scheduler_scheduled_content.yml
 delete mode 100644 modules/scheduler/config/schema/scheduler.schema.yml
 delete mode 100644 modules/scheduler/js/scheduler_vertical_tabs.js
 delete mode 100644 modules/scheduler/phpcs.xml.dist
 delete mode 100644 modules/scheduler/plugins/content_types/scheduler_form_pane.inc
 delete mode 100644 modules/scheduler/scheduler.admin.inc
 delete mode 100644 modules/scheduler/scheduler.api.php
 delete mode 100644 modules/scheduler/scheduler.drush.inc
 delete mode 100644 modules/scheduler/scheduler.info.yml
 delete mode 100644 modules/scheduler/scheduler.install
 delete mode 100644 modules/scheduler/scheduler.libraries.yml
 delete mode 100644 modules/scheduler/scheduler.links.menu.yml
 delete mode 100644 modules/scheduler/scheduler.links.task.yml
 delete mode 100644 modules/scheduler/scheduler.module
 delete mode 100644 modules/scheduler/scheduler.permissions.yml
 delete mode 100644 modules/scheduler/scheduler.routing.yml
 delete mode 100644 modules/scheduler/scheduler.services.yml
 delete mode 100644 modules/scheduler/scheduler.tokens.inc
 delete mode 100644 modules/scheduler/scheduler_handler_field_scheduler_countdown.inc
 delete mode 100644 modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.info.yml
 delete mode 100644 modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.module
 delete mode 100644 modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules.events.yml
 delete mode 100644 modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules_defaults.inc
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForPublishingEvent.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForUnpublishingEvent.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForPublishingEvent.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForUnpublishingEvent.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasPublishedThisNodeEvent.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasUnpublishedThisNodeEvent.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForPublishing.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForUnpublishing.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/PublishingIsEnabled.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/UnpublishingIsEnabled.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/PublishNow.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemovePublishingDate.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemoveUnpublishingDate.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetPublishingDate.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetUnpublishingDate.php
 delete mode 100644 modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/UnpublishNow.php
 delete mode 100644 modules/scheduler/src/Access/ScheduledListAccess.php
 delete mode 100644 modules/scheduler/src/Controller/LightweightCronController.php
 delete mode 100644 modules/scheduler/src/Exception/SchedulerMissingDateException.php
 delete mode 100644 modules/scheduler/src/Exception/SchedulerNodeTypeNotEnabledException.php
 delete mode 100644 modules/scheduler/src/Form/SchedulerAdminForm.php
 delete mode 100644 modules/scheduler/src/Form/SchedulerCronForm.php
 delete mode 100644 modules/scheduler/src/Plugin/Field/FieldWidget/TimestampDatetimeNoDefaultWidget.php
 delete mode 100644 modules/scheduler/src/Plugin/Validation/Constraint/SchedulerPublishOnConstraint.php
 delete mode 100644 modules/scheduler/src/Plugin/Validation/Constraint/SchedulerPublishOnConstraintValidator.php
 delete mode 100644 modules/scheduler/src/Plugin/Validation/Constraint/SchedulerUnpublishOnConstraint.php
 delete mode 100644 modules/scheduler/src/Plugin/Validation/Constraint/SchedulerUnpublishOnConstraintValidator.php
 delete mode 100644 modules/scheduler/src/Plugin/views/access/Scheduler.php
 delete mode 100644 modules/scheduler/src/SchedulerEvent.php
 delete mode 100644 modules/scheduler/src/SchedulerEvents.php
 delete mode 100644 modules/scheduler/src/SchedulerManager.php
 delete mode 100644 modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.info.yml
 delete mode 100644 modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.install
 delete mode 100644 modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.module
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_form_display.node.scheduler_api_test.default.yml
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_view_display.node.scheduler_api_test.default.yml
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_publishing.yml
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_unpublishing.yml
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_publishing.yml
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_unpublishing.yml
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/config/install/node.type.scheduler_api_test.yml
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.info.yml
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.install
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.module
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.services.yml
 delete mode 100644 modules/scheduler/tests/modules/scheduler_api_test/src/EventSubscriber.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerAdminSettingsTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerApiTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerBasicTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerBrowserTestBase.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerDefaultTimeTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerDeleteNodeTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerDevelGenerateTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerFieldsDisplayTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerLightweightCronTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerMetaInformationTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerMultilingualTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerNodeAccessTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerNonEnabledTypeTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerPastDatesTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerPermissionsTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerRequiredTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerRevisioningTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerRulesActionsTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerRulesConditionsTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerRulesEventsTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerScheduledContentListAccessTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerStatusReportTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerTokenReplaceTest.php
 delete mode 100644 modules/scheduler/tests/src/Functional/SchedulerValidationTest.php
 delete mode 100644 modules/token/.travis.yml
 delete mode 100644 modules/token/LICENSE.txt
 delete mode 100644 modules/token/README.md
 delete mode 100644 modules/token/css/jquery.treetable.css
 delete mode 100644 modules/token/css/token.css
 delete mode 100644 modules/token/css/token.treetable.theme.css
 delete mode 100644 modules/token/js/jquery.treetable.js
 delete mode 100644 modules/token/js/token.js
 delete mode 100644 modules/token/src/Controller/TokenAutocompleteController.php
 delete mode 100644 modules/token/src/Controller/TokenCacheController.php
 delete mode 100644 modules/token/src/Controller/TokenDevelController.php
 delete mode 100644 modules/token/src/Controller/TokenTreeController.php
 delete mode 100644 modules/token/src/Element/TokenTreeTable.php
 delete mode 100644 modules/token/src/Plugin/Derivative/DevelLocalTask.php
 delete mode 100644 modules/token/src/Routing/RouteSubscriber.php
 delete mode 100644 modules/token/src/Tests/TokenBlockTest.php
 delete mode 100644 modules/token/src/Tests/TokenCurrentPageTest.php
 delete mode 100644 modules/token/src/Tests/TokenFieldUiTest.php
 delete mode 100644 modules/token/src/Tests/TokenMenuTest.php
 delete mode 100644 modules/token/src/Tests/TokenTestBase.php
 delete mode 100644 modules/token/src/Tests/TokenTestTrait.php
 delete mode 100644 modules/token/src/Tests/TokenURLTest.php
 delete mode 100644 modules/token/src/Tests/TokenUserTest.php
 delete mode 100644 modules/token/src/Tests/Tree/AutocompleteTest.php
 delete mode 100644 modules/token/src/Tests/Tree/HelpPageTest.php
 delete mode 100644 modules/token/src/Tests/Tree/TokenTreeTestTrait.php
 delete mode 100644 modules/token/src/Tests/Tree/TreeTest.php
 delete mode 100644 modules/token/src/Token.php
 delete mode 100644 modules/token/src/TokenEntityMapper.php
 delete mode 100644 modules/token/src/TokenEntityMapperInterface.php
 delete mode 100644 modules/token/src/TokenInterface.php
 delete mode 100644 modules/token/src/TokenServiceProvider.php
 delete mode 100644 modules/token/src/TreeBuilder.php
 delete mode 100644 modules/token/src/TreeBuilderInterface.php
 delete mode 100644 modules/token/templates/token-tree-link.html.twig
 delete mode 100644 modules/token/tests/modules/token_module_test/config/install/core.date_format.token_module_test.yml
 delete mode 100644 modules/token/tests/modules/token_module_test/src/Controller/TokenTreeBrowseController.php
 delete mode 100644 modules/token/tests/modules/token_module_test/token_module_test.info.yml
 delete mode 100644 modules/token/tests/modules/token_module_test/token_module_test.module
 delete mode 100644 modules/token/tests/modules/token_module_test/token_module_test.routing.yml
 delete mode 100644 modules/token/tests/modules/token_module_test/token_module_test.tokens.inc
 delete mode 100644 modules/token/tests/modules/token_user_picture/config/install/core.entity_form_display.user.user.default.yml
 delete mode 100644 modules/token/tests/modules/token_user_picture/config/install/field.field.user.user.user_picture.yml
 delete mode 100644 modules/token/tests/modules/token_user_picture/config/install/field.storage.user.user_picture.yml
 delete mode 100644 modules/token/tests/modules/token_user_picture/token_user_picture.info.yml
 delete mode 100644 modules/token/tests/src/Kernel/ArrayTest.php
 delete mode 100644 modules/token/tests/src/Kernel/BookTest.php
 delete mode 100644 modules/token/tests/src/Kernel/CommentTest.php
 delete mode 100644 modules/token/tests/src/Kernel/DateTest.php
 delete mode 100644 modules/token/tests/src/Kernel/EntityTest.php
 delete mode 100644 modules/token/tests/src/Kernel/FieldTest.php
 delete mode 100644 modules/token/tests/src/Kernel/FileTest.php
 delete mode 100644 modules/token/tests/src/Kernel/KernelTestBase.php
 delete mode 100644 modules/token/tests/src/Kernel/NodeTest.php
 delete mode 100644 modules/token/tests/src/Kernel/RandomTest.php
 delete mode 100644 modules/token/tests/src/Kernel/TaxonomyTest.php
 delete mode 100644 modules/token/tests/src/Kernel/UnitTest.php
 delete mode 100644 modules/token/token.drush.inc
 delete mode 100644 modules/token/token.info.yml
 delete mode 100644 modules/token/token.install
 delete mode 100644 modules/token/token.libraries.yml
 delete mode 100644 modules/token/token.links.task.yml
 delete mode 100644 modules/token/token.module
 delete mode 100644 modules/token/token.pages.inc
 delete mode 100644 modules/token/token.routing.yml
 delete mode 100644 modules/token/token.services.yml
 delete mode 100644 modules/token/token.tokens.inc
 delete mode 100644 modules/tour_ui/LICENSE.txt
 delete mode 100644 modules/tour_ui/README.txt
 delete mode 100644 modules/tour_ui/src/Controller/TourTipController.php
 delete mode 100644 modules/tour_ui/src/Form/TourDeleteForm.php
 delete mode 100644 modules/tour_ui/src/Form/TourForm.php
 delete mode 100644 modules/tour_ui/src/Form/TourTipDeleteForm.php
 delete mode 100644 modules/tour_ui/src/Form/TourTipForm.php
 delete mode 100644 modules/tour_ui/src/Plugin/tour_ui/tip/TipPluginTextExtended.php
 delete mode 100644 modules/tour_ui/src/Tests/TourUITest.php
 delete mode 100644 modules/tour_ui/src/TourAccessControlHandler.php
 delete mode 100644 modules/tour_ui/src/TourListBuilder.php
 delete mode 100644 modules/tour_ui/tour_ui.info.yml
 delete mode 100644 modules/tour_ui/tour_ui.links.action.yml
 delete mode 100644 modules/tour_ui/tour_ui.links.menu.yml
 delete mode 100644 modules/tour_ui/tour_ui.module
 delete mode 100644 modules/tour_ui/tour_ui.permissions.yml
 delete mode 100644 modules/tour_ui/tour_ui.routing.yml
 delete mode 100644 modules/typed_data/.gitignore
 delete mode 100644 modules/typed_data/.travis.yml
 delete mode 100644 modules/typed_data/LICENSE.txt
 delete mode 100644 modules/typed_data/README.md
 delete mode 100644 modules/typed_data/composer.json
 delete mode 100644 modules/typed_data/composer.lock
 delete mode 100644 modules/typed_data/phpcs.xml.dist
 delete mode 100644 modules/typed_data/src/Annotation/DataFilter.php
 delete mode 100644 modules/typed_data/src/Annotation/TypedDataFormWidget.php
 delete mode 100644 modules/typed_data/src/Context/AnnotatedClassDiscovery.php
 delete mode 100644 modules/typed_data/src/Context/Annotation/ContextDefinition.php
 delete mode 100644 modules/typed_data/src/Context/ContextDefinition.php
 delete mode 100644 modules/typed_data/src/Context/ContextDefinitionInterface.php
 delete mode 100644 modules/typed_data/src/DataFetcher.php
 delete mode 100644 modules/typed_data/src/DataFetcherInterface.php
 delete mode 100644 modules/typed_data/src/DataFetcherTrait.php
 delete mode 100644 modules/typed_data/src/DataFilterBase.php
 delete mode 100644 modules/typed_data/src/DataFilterInterface.php
 delete mode 100644 modules/typed_data/src/DataFilterManager.php
 delete mode 100644 modules/typed_data/src/DataFilterManagerInterface.php
 delete mode 100644 modules/typed_data/src/Exception/FilterException.php
 delete mode 100644 modules/typed_data/src/Exception/InvalidArgumentException.php
 delete mode 100644 modules/typed_data/src/Exception/LogicException.php
 delete mode 100644 modules/typed_data/src/Exception/TypedDataException.php
 delete mode 100644 modules/typed_data/src/Form/SubformState.php
 delete mode 100644 modules/typed_data/src/PlaceholderResolver.php
 delete mode 100644 modules/typed_data/src/PlaceholderResolverInterface.php
 delete mode 100644 modules/typed_data/src/PlaceholderResolverTrait.php
 delete mode 100644 modules/typed_data/src/Plugin/TypedDataFilter/DefaultFilter.php
 delete mode 100644 modules/typed_data/src/Plugin/TypedDataFilter/EntityUrlFilter.php
 delete mode 100644 modules/typed_data/src/Plugin/TypedDataFilter/FormatDateFilter.php
 delete mode 100644 modules/typed_data/src/Plugin/TypedDataFilter/LowerFilter.php
 delete mode 100644 modules/typed_data/src/Plugin/TypedDataFilter/StripTagsFilter.php
 delete mode 100644 modules/typed_data/src/Plugin/TypedDataFormWidget/SelectWidget.php
 delete mode 100644 modules/typed_data/src/Plugin/TypedDataFormWidget/TextInputWidget.php
 delete mode 100644 modules/typed_data/src/Util/StateTrait.php
 delete mode 100644 modules/typed_data/src/Widget/FormWidgetBase.php
 delete mode 100644 modules/typed_data/src/Widget/FormWidgetInterface.php
 delete mode 100644 modules/typed_data/src/Widget/FormWidgetManager.php
 delete mode 100644 modules/typed_data/src/Widget/FormWidgetManagerInterface.php
 delete mode 100644 modules/typed_data/src/Widget/FormWidgetManagerTrait.php
 delete mode 100644 modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleController.php
 delete mode 100644 modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleForm.php
 delete mode 100644 modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.info.yml
 delete mode 100644 modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.links.menu.yml
 delete mode 100644 modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.routing.yml
 delete mode 100644 modules/typed_data/tests/src/Functional/TypedDataFormWidget/SelectWidgetTest.php
 delete mode 100644 modules/typed_data/tests/src/Functional/TypedDataFormWidget/TextInputWidgetTest.php
 delete mode 100644 modules/typed_data/tests/src/Kernel/DataDefinitionFetcherTest.php
 delete mode 100644 modules/typed_data/tests/src/Kernel/DataFetcherTest.php
 delete mode 100644 modules/typed_data/tests/src/Kernel/DataFilterTest.php
 delete mode 100644 modules/typed_data/tests/src/Kernel/PlaceholderResolverTest.php
 delete mode 100644 modules/typed_data/tests/src/Traits/BrowserTestHelpersTrait.php
 delete mode 100644 modules/typed_data/typed_data.info.yml
 delete mode 100644 modules/typed_data/typed_data.services.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/.travis.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/README.md
 delete mode 100644 modules/workbench_access-8.x-1.x/composer.json
 delete mode 100644 modules/workbench_access-8.x-1.x/config/install/field.storage.user.field_workbench_access.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/config/install/workbench_access.settings.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/config/schema/workbench_access.schema.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/config/schema/workbench_access.views.schema.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/js/workbench_access.js
 delete mode 100644 modules/workbench_access-8.x-1.x/src/AccessControlHierarchyBase.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/AccessControlHierarchyInterface.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Annotation/AccessControlHierarchy.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Controller/WorkbenchAccessSections.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByRoleForm.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByUserForm.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessConfigForm.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Menu.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Taxonomy.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Plugin/Block/WorkbenchAccessBlock.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/TaxonomyHierarchySelection.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/UserFilteredSelection.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Plugin/views/field/Section.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Plugin/views/field/UserSection.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Plugin/views/filter/Section.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/RoleSectionStorage.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/RoleSectionStorageInterface.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Tests/WorkbenchAccessNodeTypeFormTest.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/Tests/WorkbenchAccessTestBase.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/UserSectionStorage.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/UserSectionStorage.php.orig
 delete mode 100644 modules/workbench_access-8.x-1.x/src/UserSectionStorageInterface.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/WorkbenchAccessManager.php
 delete mode 100644 modules/workbench_access-8.x-1.x/src/WorkbenchAccessManagerInterface.php
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/src/Plugin/AccessControlHierarchy/DerivedAccessControlHierarchy.php
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/src/Plugin/Derivative/DerivedAccessControlPlugins.php
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/workbench_access_test.info.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByRoleFormTest.php
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByUserFormTest.php
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/src/Functional/ConfigFormTest.php
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/src/Functional/NodeFormTest.php
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/src/Functional/WorkbenchAccessTestTrait.php
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/src/Kernel/NodeAccessTest.php
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/src/Kernel/SectionCacheTest.php
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/src/Kernel/WorkbenchAccessDerivativeDiscoveryTest.php
 delete mode 100644 modules/workbench_access-8.x-1.x/tests/src/Unit/UserSectionStorageUnitTest.php
 delete mode 100644 modules/workbench_access-8.x-1.x/workbench_access.drush.inc
 delete mode 100644 modules/workbench_access-8.x-1.x/workbench_access.info.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/workbench_access.install
 delete mode 100644 modules/workbench_access-8.x-1.x/workbench_access.libraries.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/workbench_access.links.menu.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/workbench_access.links.task.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/workbench_access.module
 delete mode 100644 modules/workbench_access-8.x-1.x/workbench_access.permissions.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/workbench_access.routing.yml
 delete mode 100644 modules/workbench_access-8.x-1.x/workbench_access.services.yml
 delete mode 100644 modules/workflow/CHANGELOG.txt
 delete mode 100644 modules/workflow/LICENSE.txt
 delete mode 100644 modules/workflow/config/install/workflow.settings.yml
 delete mode 100644 modules/workflow/config/optional/block.block.workflowtransitionform.yml
 delete mode 100644 modules/workflow/config/optional/system.action.change_a_node_to_next_workflow_state.yml
 delete mode 100644 modules/workflow/config/schema/workflow.schema.yml
 delete mode 100644 modules/workflow/config/schema/workflow.state.schema.yml
 delete mode 100644 modules/workflow/config/schema/workflow.transition.schema.yml
 delete mode 100644 modules/workflow/config/schema/workflow.views.schema.yml
 delete mode 100644 modules/workflow/modules/workflow_access/config/install/workflow_access.settings.yml
 delete mode 100644 modules/workflow/modules/workflow_access/config/schema/workflow_access.schema.yml
 delete mode 100644 modules/workflow/modules/workflow_access/src/Form/WorkflowAccessRoleForm.php
 delete mode 100644 modules/workflow/modules/workflow_access/src/Form/WorkflowAccessSettingsForm.php
 delete mode 100644 modules/workflow/modules/workflow_access/workflow_access.info.yml
 delete mode 100644 modules/workflow/modules/workflow_access/workflow_access.install
 delete mode 100644 modules/workflow/modules/workflow_access/workflow_access.links.task.yml
 delete mode 100644 modules/workflow/modules/workflow_access/workflow_access.module
 delete mode 100644 modules/workflow/modules/workflow_access/workflow_access.routing.yml
 delete mode 100644 modules/workflow/modules/workflow_cleanup/src/Form/WorkflowCleanupSettingsForm.php
 delete mode 100644 modules/workflow/modules/workflow_cleanup/workflow_cleanup.info.yml
 delete mode 100644 modules/workflow/modules/workflow_cleanup/workflow_cleanup.links.task.yml
 delete mode 100644 modules/workflow/modules/workflow_cleanup/workflow_cleanup.module
 delete mode 100644 modules/workflow/modules/workflow_cleanup/workflow_cleanup.routing.yml
 delete mode 100644 modules/workflow/modules/workflow_devel/README.txt
 delete mode 100644 modules/workflow/modules/workflow_devel/workflow_devel.info.yml
 delete mode 100644 modules/workflow/modules/workflow_devel/workflow_devel.module
 delete mode 100644 modules/workflow/modules/workflow_field/workflowfield.info.yml
 delete mode 100644 modules/workflow/modules/workflow_operations/src/Form/WorkflowTransitionRevertForm.php
 delete mode 100644 modules/workflow/modules/workflow_operations/src/WorkflowAccessControlHandler.php
 delete mode 100644 modules/workflow/modules/workflow_operations/src/WorkflowPermissions.php
 delete mode 100644 modules/workflow/modules/workflow_operations/workflow_operations.info.yml
 delete mode 100644 modules/workflow/modules/workflow_operations/workflow_operations.module
 delete mode 100644 modules/workflow/modules/workflow_operations/workflow_operations.permissions.yml
 delete mode 100644 modules/workflow/modules/workflow_operations/workflow_operations.routing.yml
 delete mode 100644 modules/workflow/modules/workflow_ui/src/Controller/WorkflowListBuilder.php
 delete mode 100644 modules/workflow/modules/workflow_ui/src/Controller/WorkflowStateListBuilder.php
 delete mode 100644 modules/workflow/modules/workflow_ui/src/Controller/WorkflowUiController.php
 delete mode 100644 modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionFormBase.php
 delete mode 100644 modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionLabelForm.php
 delete mode 100644 modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionRoleForm.php
 delete mode 100644 modules/workflow/modules/workflow_ui/workflow_ui.info.yml
 delete mode 100644 modules/workflow/modules/workflow_ui/workflow_ui.install
 delete mode 100644 modules/workflow/modules/workflow_ui/workflow_ui.links.action.yml
 delete mode 100644 modules/workflow/modules/workflow_ui/workflow_ui.links.menu.yml
 delete mode 100644 modules/workflow/modules/workflow_ui/workflow_ui.links.task.yml
 delete mode 100644 modules/workflow/modules/workflow_ui/workflow_ui.module
 delete mode 100644 modules/workflow/modules/workflow_ui/workflow_ui.routing.yml
 delete mode 100644 modules/workflow/src/Controller/WorkflowTransitionListController.php
 delete mode 100644 modules/workflow/src/Element/WorkflowTransitionElement.php
 delete mode 100644 modules/workflow/src/Entity/Workflow.php
 delete mode 100644 modules/workflow/src/Entity/WorkflowConfigTransition.php
 delete mode 100644 modules/workflow/src/Entity/WorkflowConfigTransitionInterface.php
 delete mode 100644 modules/workflow/src/Entity/WorkflowInterface.php
 delete mode 100644 modules/workflow/src/Entity/WorkflowManager.php
 delete mode 100644 modules/workflow/src/Entity/WorkflowManagerInterface.php
 delete mode 100644 modules/workflow/src/Entity/WorkflowScheduledTransition.php
 delete mode 100644 modules/workflow/src/Entity/WorkflowState.php
 delete mode 100644 modules/workflow/src/Entity/WorkflowStorage.php
 delete mode 100644 modules/workflow/src/Entity/WorkflowTransition.php
 delete mode 100644 modules/workflow/src/Entity/WorkflowTransitionInterface.php
 delete mode 100644 modules/workflow/src/Form/WorkflowForm.php
 delete mode 100644 modules/workflow/src/Form/WorkflowTransitionForm.php
 delete mode 100644 modules/workflow/src/Plugin/Action/WorkflowNodeGivenStateAction.php
 delete mode 100644 modules/workflow/src/Plugin/Action/WorkflowNodeNextStateAction.php
 delete mode 100644 modules/workflow/src/Plugin/Action/WorkflowStateActionBase.php
 delete mode 100644 modules/workflow/src/Plugin/Block/WorkflowTransitionBlock.php
 delete mode 100644 modules/workflow/src/Plugin/Field/FieldFormatter/WorkflowDefaultFormatter.php
 delete mode 100644 modules/workflow/src/Plugin/Field/FieldType/WorkflowItem.php
 delete mode 100644 modules/workflow/src/Plugin/Field/FieldWidget/WorkflowDefaultWidget.php
 delete mode 100644 modules/workflow/src/Plugin/Validation/Constraint/WorkflowFieldConstraint.php
 delete mode 100644 modules/workflow/src/Plugin/Validation/Constraint/WorkflowFieldConstraintValidator.php
 delete mode 100644 modules/workflow/src/Plugin/views/filter/WorkflowState.php
 delete mode 100644 modules/workflow/src/WorkflowAccessControlHandler.php
 delete mode 100644 modules/workflow/src/WorkflowPermissions.php
 delete mode 100644 modules/workflow/src/WorkflowScheduledTransitionViewsData.php
 delete mode 100644 modules/workflow/src/WorkflowTransitionListBuilder.php
 delete mode 100644 modules/workflow/src/WorkflowTransitionViewsData.php
 delete mode 100644 modules/workflow/workflow.api.php
 delete mode 100644 modules/workflow/workflow.field.inc
 delete mode 100644 modules/workflow/workflow.form.inc
 delete mode 100644 modules/workflow/workflow.info.yml
 delete mode 100644 modules/workflow/workflow.install
 delete mode 100644 modules/workflow/workflow.links.task.yml
 delete mode 100644 modules/workflow/workflow.module
 delete mode 100644 modules/workflow/workflow.permissions.yml
 delete mode 100644 modules/workflow/workflow.routing.yml
 delete mode 100644 modules/workflow/workflow.services.yml
 delete mode 100644 modules/workflow/workflow.views.inc
 delete mode 100644 themes/bootstrap/.csslintrc
 delete mode 100644 themes/bootstrap/.githooks.js.hbs
 delete mode 100644 themes/bootstrap/.gitignore
 delete mode 100644 themes/bootstrap/Gruntfile.js
 delete mode 100644 themes/bootstrap/README.md
 delete mode 100644 themes/bootstrap/autoload-fix.php
 delete mode 100644 themes/bootstrap/bootstrap.api.php
 delete mode 100644 themes/bootstrap/bootstrap.breakpoints.yml
 delete mode 100644 themes/bootstrap/bootstrap.drush.inc
 delete mode 100644 themes/bootstrap/bootstrap.info.yml
 delete mode 100644 themes/bootstrap/bootstrap.libraries.yml
 delete mode 100644 themes/bootstrap/bootstrap.theme
 delete mode 100644 themes/bootstrap/bower.json
 delete mode 100644 themes/bootstrap/composer.json
 delete mode 100644 themes/bootstrap/config/install/bootstrap.settings.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_account_menu.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_branding.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_breadcrumbs.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_content.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_footer.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_help.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_local_actions.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_local_tasks.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_main_menu.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_messages.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_page_title.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_powered.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_search.yml
 delete mode 100644 themes/bootstrap/config/optional/block.block.bootstrap_tools.yml
 delete mode 100644 themes/bootstrap/config/schema/bootstrap.schema.yml
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides-amelia.min.css
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.0.0/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides-amelia.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.0.1/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-amelia.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.0.2/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-amelia.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.0.3/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-amelia.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-lumen.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-superhero.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.1.0/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-amelia.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-darkly.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-lumen.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-superhero.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.1.1/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-amelia.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-darkly.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-lumen.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-paper.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-sandstone.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-superhero.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.2.0/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-amelia.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-darkly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-lumen.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-paper.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-sandstone.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-superhero.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.3.0/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-darkly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-lumen.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-paper.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-sandstone.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-superhero.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.3.1/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-darkly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-lumen.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-paper.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-sandstone.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-superhero.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.3.2/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-darkly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-lumen.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-paper.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-sandstone.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-superhero.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.3.4/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-darkly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-lumen.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-paper.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-sandstone.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-superhero.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.3.5/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-darkly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-lumen.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-paper.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-sandstone.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-superhero.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.3.6/overrides.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-cerulean.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-cosmo.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-cyborg.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-darkly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-flatly.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-journal.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-lumen.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-paper.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-readable.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-sandstone.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-simplex.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-slate.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-spacelab.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-superhero.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-united.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides-yeti.min.css
 delete mode 100644 themes/bootstrap/css/3.3.7/overrides.min.css
 delete mode 100644 themes/bootstrap/css/README.md
 delete mode 100644 themes/bootstrap/css/images/required.svg
 delete mode 100644 themes/bootstrap/deprecated.php
 delete mode 100644 themes/bootstrap/docs/Contributing.md
 delete mode 100644 themes/bootstrap/docs/Getting-Started.md
 delete mode 100644 themes/bootstrap/docs/Maintainers.md
 delete mode 100644 themes/bootstrap/docs/README.md
 delete mode 100644 themes/bootstrap/docs/Sub-Theming.md
 delete mode 100644 themes/bootstrap/docs/Templates.md
 delete mode 100644 themes/bootstrap/docs/Theme-Settings.md
 delete mode 100644 themes/bootstrap/docs/Utility.md
 delete mode 100644 themes/bootstrap/docs/plugins/Alter.md
 delete mode 100644 themes/bootstrap/docs/plugins/Form.md
 delete mode 100644 themes/bootstrap/docs/plugins/Preprocess.md
 delete mode 100644 themes/bootstrap/docs/plugins/Prerender.md
 delete mode 100644 themes/bootstrap/docs/plugins/Process.md
 delete mode 100644 themes/bootstrap/docs/plugins/Provider.md
 delete mode 100644 themes/bootstrap/docs/plugins/README.md
 delete mode 100644 themes/bootstrap/docs/plugins/Setting.md
 delete mode 100644 themes/bootstrap/docs/plugins/Update.md
 delete mode 100644 themes/bootstrap/favicon.ico
 delete mode 100644 themes/bootstrap/grunt/clean-vendor-dirs.js
 delete mode 100644 themes/bootstrap/grunt/compile.js
 delete mode 100644 themes/bootstrap/grunt/config/autoprefixer.js
 delete mode 100644 themes/bootstrap/grunt/config/clean.js
 delete mode 100644 themes/bootstrap/grunt/config/csslint.js
 delete mode 100644 themes/bootstrap/grunt/config/cssmin.js
 delete mode 100644 themes/bootstrap/grunt/config/githooks.js
 delete mode 100644 themes/bootstrap/grunt/config/watch.js
 delete mode 100644 themes/bootstrap/grunt/sync.js
 delete mode 100644 themes/bootstrap/icons.inc
 delete mode 100644 themes/bootstrap/js/attributes.js
 delete mode 100644 themes/bootstrap/js/dropdown.js
 delete mode 100644 themes/bootstrap/js/drupal.bootstrap.js
 delete mode 100644 themes/bootstrap/js/misc/ajax.js
 delete mode 100644 themes/bootstrap/js/misc/autocomplete.js
 delete mode 100644 themes/bootstrap/js/misc/batch.js
 delete mode 100644 themes/bootstrap/js/misc/collapse.js
 delete mode 100644 themes/bootstrap/js/misc/dialog.ajax.js
 delete mode 100644 themes/bootstrap/js/misc/dialog.js
 delete mode 100644 themes/bootstrap/js/misc/form.js
 delete mode 100644 themes/bootstrap/js/misc/progress.js
 delete mode 100644 themes/bootstrap/js/misc/states.js
 delete mode 100644 themes/bootstrap/js/misc/tabledrag.js
 delete mode 100644 themes/bootstrap/js/misc/vertical-tabs.js
 delete mode 100644 themes/bootstrap/js/modal.js
 delete mode 100644 themes/bootstrap/js/modules/filter/filter.js
 delete mode 100644 themes/bootstrap/js/modules/image_widget_crop/ImageWidgetCrop.js
 delete mode 100644 themes/bootstrap/js/modules/views/ajax_view.js
 delete mode 100644 themes/bootstrap/js/popover.js
 delete mode 100644 themes/bootstrap/js/text/text.js
 delete mode 100644 themes/bootstrap/js/theme-settings.js
 delete mode 100644 themes/bootstrap/js/theme.js
 delete mode 100644 themes/bootstrap/js/tooltip.js
 delete mode 100644 themes/bootstrap/logo.svg
 delete mode 100644 themes/bootstrap/package.json
 delete mode 100644 themes/bootstrap/screenshot.png
 delete mode 100644 themes/bootstrap/src/Annotation/BootstrapAlter.php
 delete mode 100644 themes/bootstrap/src/Annotation/BootstrapConstant.php
 delete mode 100644 themes/bootstrap/src/Annotation/BootstrapForm.php
 delete mode 100644 themes/bootstrap/src/Annotation/BootstrapPreprocess.php
 delete mode 100644 themes/bootstrap/src/Annotation/BootstrapPrerender.php
 delete mode 100644 themes/bootstrap/src/Annotation/BootstrapProcess.php
 delete mode 100644 themes/bootstrap/src/Annotation/BootstrapProvider.php
 delete mode 100644 themes/bootstrap/src/Annotation/BootstrapSetting.php
 delete mode 100644 themes/bootstrap/src/Annotation/BootstrapUpdate.php
 delete mode 100644 themes/bootstrap/src/Annotation/PluginCallback.php
 delete mode 100644 themes/bootstrap/src/Bootstrap.php
 delete mode 100644 themes/bootstrap/src/Plugin/Alter/AlterInterface.php
 delete mode 100644 themes/bootstrap/src/Plugin/Alter/ElementInfo.php
 delete mode 100644 themes/bootstrap/src/Plugin/Alter/LibraryInfo.php
 delete mode 100644 themes/bootstrap/src/Plugin/Alter/PageAttachments.php
 delete mode 100644 themes/bootstrap/src/Plugin/Alter/ThemeRegistry.php
 delete mode 100644 themes/bootstrap/src/Plugin/Alter/ThemeSuggestions.php
 delete mode 100644 themes/bootstrap/src/Plugin/AlterManager.php
 delete mode 100644 themes/bootstrap/src/Plugin/Form/FormBase.php
 delete mode 100644 themes/bootstrap/src/Plugin/Form/FormInterface.php
 delete mode 100644 themes/bootstrap/src/Plugin/Form/NodePreviewFormSelect.php
 delete mode 100644 themes/bootstrap/src/Plugin/Form/SearchBlockForm.php
 delete mode 100644 themes/bootstrap/src/Plugin/Form/SearchForm.php
 delete mode 100644 themes/bootstrap/src/Plugin/Form/SystemThemeSettings.php
 delete mode 100644 themes/bootstrap/src/Plugin/FormManager.php
 delete mode 100644 themes/bootstrap/src/Plugin/PluginBase.php
 delete mode 100644 themes/bootstrap/src/Plugin/PluginManager.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/BootstrapCarousel.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/BootstrapModal.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/BootstrapPanel.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/Breadcrumb.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/FieldMultipleValueForm.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/FileLink.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/FileUploadHelp.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/FilterTips.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/FormElement.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/FormElementLabel.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/ImageWidget.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/Input.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/InputButton.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/ItemListBootstrapCarouselIndicators.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/ItemListDropdown.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/Links.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/MenuLocalAction.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/Page.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/PreprocessBase.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/PreprocessInterface.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/ProgressBar.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/Region.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/Select.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/Table.php
 delete mode 100644 themes/bootstrap/src/Plugin/Preprocess/ViewsViewTable.php
 delete mode 100644 themes/bootstrap/src/Plugin/PreprocessManager.php
 delete mode 100644 themes/bootstrap/src/Plugin/Prerender/Captcha.php
 delete mode 100644 themes/bootstrap/src/Plugin/Prerender/Dropbutton.php
 delete mode 100644 themes/bootstrap/src/Plugin/Prerender/Link.php
 delete mode 100644 themes/bootstrap/src/Plugin/Prerender/Operations.php
 delete mode 100644 themes/bootstrap/src/Plugin/Prerender/PrerenderBase.php
 delete mode 100644 themes/bootstrap/src/Plugin/Prerender/PrerenderInterface.php
 delete mode 100644 themes/bootstrap/src/Plugin/PrerenderManager.php
 delete mode 100644 themes/bootstrap/src/Plugin/Process/Actions.php
 delete mode 100644 themes/bootstrap/src/Plugin/Process/ActionsDropbutton.php
 delete mode 100644 themes/bootstrap/src/Plugin/Process/ManagedFile.php
 delete mode 100644 themes/bootstrap/src/Plugin/Process/ProcessBase.php
 delete mode 100644 themes/bootstrap/src/Plugin/Process/ProcessInterface.php
 delete mode 100644 themes/bootstrap/src/Plugin/Process/Search.php
 delete mode 100644 themes/bootstrap/src/Plugin/Process/TextFormat.php
 delete mode 100644 themes/bootstrap/src/Plugin/ProcessManager.php
 delete mode 100644 themes/bootstrap/src/Plugin/Provider/Custom.php
 delete mode 100644 themes/bootstrap/src/Plugin/Provider/JsDelivr.php
 delete mode 100644 themes/bootstrap/src/Plugin/Provider/ProviderBase.php
 delete mode 100644 themes/bootstrap/src/Plugin/Provider/ProviderInterface.php
 delete mode 100644 themes/bootstrap/src/Plugin/ProviderManager.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomCss.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomCssMin.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomJs.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomJsMin.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnJsdelivrTheme.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnJsdelivrVersion.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnProvider.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Advanced/IncludeDeprecated.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Advanced/SuppressDeprecatedWarnings.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/Breadcrumb.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/BreadcrumbHome.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/BreadcrumbTitle.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Components/Navbar/NavbarInverse.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Components/Navbar/NavbarPosition.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Components/Region/RegionWells.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonColorize.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonIconize.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonSize.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Container/FluidContainer.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Forms/FormsHasErrorValueToggle.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Forms/FormsRequiredHasError.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptions.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptionsAllowedTags.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptionsLimit.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Images/ImageResponsive.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Images/ImageShape.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Tables/TableBordered.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Tables/TableCondensed.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Tables/TableHover.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Tables/TableResponsive.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/General/Tables/TableStriped.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalAnimation.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalBackdrop.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalEnabled.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalKeyboard.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalShow.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalSize.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverAnimation.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverContainer.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverContent.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverDelay.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverEnabled.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverHtml.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverPlacement.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverSelector.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTitle.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTrigger.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTriggerAutoclose.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipAnimation.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipContainer.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipDelay.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipEnabled.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipHtml.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipPlacement.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipSelector.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipTrigger.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/Schemas.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/SettingBase.php
 delete mode 100644 themes/bootstrap/src/Plugin/Setting/SettingInterface.php
 delete mode 100644 themes/bootstrap/src/Plugin/SettingManager.php
 delete mode 100644 themes/bootstrap/src/Plugin/Update/UpdateBase.php
 delete mode 100644 themes/bootstrap/src/Plugin/Update/UpdateInterface.php
 delete mode 100644 themes/bootstrap/src/Plugin/UpdateManager.php
 delete mode 100644 themes/bootstrap/src/Theme.php
 delete mode 100644 themes/bootstrap/src/ThemeSettings.php
 delete mode 100644 themes/bootstrap/src/Utility/ArrayObject.php
 delete mode 100644 themes/bootstrap/src/Utility/Attributes.php
 delete mode 100644 themes/bootstrap/src/Utility/Crypt.php
 delete mode 100644 themes/bootstrap/src/Utility/DrupalAttributes.php
 delete mode 100644 themes/bootstrap/src/Utility/Element.php
 delete mode 100644 themes/bootstrap/src/Utility/Storage.php
 delete mode 100644 themes/bootstrap/src/Utility/StorageItem.php
 delete mode 100644 themes/bootstrap/src/Utility/Unicode.php
 delete mode 100644 themes/bootstrap/src/Utility/Variables.php
 delete mode 100644 themes/bootstrap/starterkits/cdn/README.md
 delete mode 100644 themes/bootstrap/starterkits/cdn/THEMENAME.libraries.yml
 delete mode 100644 themes/bootstrap/starterkits/cdn/THEMENAME.starterkit.yml
 delete mode 100644 themes/bootstrap/starterkits/cdn/THEMENAME.theme
 delete mode 100644 themes/bootstrap/starterkits/cdn/config/install/THEMENAME.settings.yml
 delete mode 100644 themes/bootstrap/starterkits/cdn/config/schema/THEMENAME.schema.yml
 delete mode 100644 themes/bootstrap/starterkits/cdn/css/style.css
 delete mode 100644 themes/bootstrap/starterkits/cdn/favicon.ico
 delete mode 100644 themes/bootstrap/starterkits/cdn/logo.svg
 delete mode 100644 themes/bootstrap/starterkits/cdn/screenshot.png
 delete mode 100644 themes/bootstrap/starterkits/cdn/templates/README.md
 delete mode 100644 themes/bootstrap/starterkits/less/README.md
 delete mode 100644 themes/bootstrap/starterkits/less/THEMENAME.libraries.yml
 delete mode 100644 themes/bootstrap/starterkits/less/THEMENAME.starterkit.yml
 delete mode 100644 themes/bootstrap/starterkits/less/THEMENAME.theme
 delete mode 100644 themes/bootstrap/starterkits/less/config/install/THEMENAME.settings.yml
 delete mode 100644 themes/bootstrap/starterkits/less/config/schema/THEMENAME.schema.yml
 delete mode 100644 themes/bootstrap/starterkits/less/css/style.css
 delete mode 100644 themes/bootstrap/starterkits/less/favicon.ico
 delete mode 100644 themes/bootstrap/starterkits/less/images/required.svg
 delete mode 100644 themes/bootstrap/starterkits/less/less/bootstrap.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/ajax.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/alert.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/field.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/file.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/filter.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/form.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/icon.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/navbar.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/node.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/panel.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/progress-bar.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/table-drag.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/tabs.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/component/toolbar.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/jquery-ui/autocomplete.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/overrides.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/style.less
 delete mode 100644 themes/bootstrap/starterkits/less/less/variable-overrides.less
 delete mode 100644 themes/bootstrap/starterkits/less/logo.svg
 delete mode 100644 themes/bootstrap/starterkits/less/screenshot.png
 delete mode 100644 themes/bootstrap/starterkits/less/templates/README.md
 delete mode 100644 themes/bootstrap/starterkits/sass/README.md
 delete mode 100644 themes/bootstrap/starterkits/sass/THEMENAME.libraries.yml
 delete mode 100644 themes/bootstrap/starterkits/sass/THEMENAME.starterkit.yml
 delete mode 100644 themes/bootstrap/starterkits/sass/THEMENAME.theme
 delete mode 100644 themes/bootstrap/starterkits/sass/config/install/THEMENAME.settings.yml
 delete mode 100644 themes/bootstrap/starterkits/sass/config/schema/THEMENAME.schema.yml
 delete mode 100644 themes/bootstrap/starterkits/sass/favicon.ico
 delete mode 100644 themes/bootstrap/starterkits/sass/images/required.svg
 delete mode 100644 themes/bootstrap/starterkits/sass/logo.svg
 delete mode 100644 themes/bootstrap/starterkits/sass/screenshot.png
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/_default-variables.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/_overrides.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_ajax.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_alert.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_field.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_file.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_filter.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_form.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_icon.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_navbar.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_node.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_panel.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_progress-bar.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_table-drag.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_tabs.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/component/_toolbar.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/jquery-ui/_autocomplete.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/scss/style.scss
 delete mode 100644 themes/bootstrap/starterkits/sass/templates/README.md
 delete mode 100644 themes/bootstrap/templates/block/block--bare.html.twig
 delete mode 100644 themes/bootstrap/templates/block/block--local-actions-block.html.twig
 delete mode 100644 themes/bootstrap/templates/block/block--local-tasks-block.html.twig
 delete mode 100644 themes/bootstrap/templates/block/block--page-title-block.html.twig
 delete mode 100644 themes/bootstrap/templates/block/block--search.html.twig
 delete mode 100644 themes/bootstrap/templates/block/block--system-branding-block.html.twig
 delete mode 100644 themes/bootstrap/templates/block/block--system-menu-block--account.html.twig
 delete mode 100644 themes/bootstrap/templates/block/block--system-menu-block--main.html.twig
 delete mode 100644 themes/bootstrap/templates/block/block--system.html.twig
 delete mode 100644 themes/bootstrap/templates/block/block-list.html.twig
 delete mode 100644 themes/bootstrap/templates/block/block.html.twig
 delete mode 100644 themes/bootstrap/templates/bootstrap/bootstrap-carousel.html.twig
 delete mode 100644 themes/bootstrap/templates/bootstrap/bootstrap-dropdown.html.twig
 delete mode 100644 themes/bootstrap/templates/bootstrap/bootstrap-modal.html.twig
 delete mode 100644 themes/bootstrap/templates/bootstrap/bootstrap-panel.html.twig
 delete mode 100644 themes/bootstrap/templates/bootstrap/item-list--bootstrap-carousel-indicators.html.twig
 delete mode 100644 themes/bootstrap/templates/bootstrap/item-list--dropdown.html.twig
 delete mode 100644 themes/bootstrap/templates/field/field-multiple-value-form.html.twig
 delete mode 100644 themes/bootstrap/templates/field/field.html.twig
 delete mode 100644 themes/bootstrap/templates/file/file-link.html.twig
 delete mode 100644 themes/bootstrap/templates/file/file-upload-help.html.twig
 delete mode 100644 themes/bootstrap/templates/file/image-widget.html.twig
 delete mode 100644 themes/bootstrap/templates/filter/filter-tips.html.twig
 delete mode 100644 themes/bootstrap/templates/filter/text-format-wrapper.html.twig
 delete mode 100644 themes/bootstrap/templates/input/datetime-form.html.twig
 delete mode 100644 themes/bootstrap/templates/input/datetime-wrapper.html.twig
 delete mode 100644 themes/bootstrap/templates/input/form-element-label.html.twig
 delete mode 100644 themes/bootstrap/templates/input/form-element.html.twig
 delete mode 100644 themes/bootstrap/templates/input/input--button--split.html.twig
 delete mode 100644 themes/bootstrap/templates/input/input--button.html.twig
 delete mode 100644 themes/bootstrap/templates/input/input--form-control.html.twig
 delete mode 100644 themes/bootstrap/templates/input/input.html.twig
 delete mode 100644 themes/bootstrap/templates/input/select.html.twig
 delete mode 100644 themes/bootstrap/templates/input/textarea.html.twig
 delete mode 100644 themes/bootstrap/templates/menu/menu--account.html.twig
 delete mode 100644 themes/bootstrap/templates/menu/menu--main.html.twig
 delete mode 100644 themes/bootstrap/templates/menu/menu-local-task.html.twig
 delete mode 100644 themes/bootstrap/templates/menu/menu-local-tasks.html.twig
 delete mode 100644 themes/bootstrap/templates/menu/menu.html.twig
 delete mode 100644 themes/bootstrap/templates/node/node.html.twig
 delete mode 100644 themes/bootstrap/templates/system/breadcrumb.html.twig
 delete mode 100644 themes/bootstrap/templates/system/container.html.twig
 delete mode 100644 themes/bootstrap/templates/system/html.html.twig
 delete mode 100644 themes/bootstrap/templates/system/image.html.twig
 delete mode 100644 themes/bootstrap/templates/system/links.html.twig
 delete mode 100644 themes/bootstrap/templates/system/page-title.html.twig
 delete mode 100644 themes/bootstrap/templates/system/page.html.twig
 delete mode 100644 themes/bootstrap/templates/system/pager.html.twig
 delete mode 100644 themes/bootstrap/templates/system/progress-bar.html.twig
 delete mode 100644 themes/bootstrap/templates/system/region--no-wrapper.html.twig
 delete mode 100644 themes/bootstrap/templates/system/region.html.twig
 delete mode 100644 themes/bootstrap/templates/system/status-messages.html.twig
 delete mode 100644 themes/bootstrap/templates/system/system-themes-page.html.twig
 delete mode 100644 themes/bootstrap/templates/system/table.html.twig
 delete mode 100644 themes/bootstrap/templates/views/views-exposed-form.html.twig
 delete mode 100644 themes/bootstrap/templates/views/views-mini-pager.html.twig
 delete mode 100644 themes/bootstrap/templates/views/views-view-table.html.twig
 delete mode 100644 themes/bootstrap/templates/views/views-view.html.twig

diff --git a/modules/contrib/config_update/LICENSE.txt b/modules/contrib/config_update/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/contrib/config_update/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/contrib/config_update/README.txt b/modules/contrib/config_update/README.txt
deleted file mode 100644
index c493d6b..0000000
--- a/modules/contrib/config_update/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Configuration Update Manager project
-------------------------------------
-
-The Configuration Update Manager project consists of two modules:
-
-Configuration Update Base: A base module providing functionality related to
-  updating and computing differences between configuration versions. No
-  user interface; used by other modules such as Features.
-
-Configuration Update Reports (in the config_update_ui sub-directory of this
-  project): Adds an updates report and revert functionality to configuration
-  management.  Depends on Configuration Update Base. For more information, see
-  the README.txt file in the subdirectory.
diff --git a/modules/contrib/config_update/config_update.info.yml b/modules/contrib/config_update/config_update.info.yml
deleted file mode 100644
index a26c33f..0000000
--- a/modules/contrib/config_update/config_update.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Configuration Update Base
-type: module
-description: 'Provides basic revert and update functionality for other modules'
-# core: 8.x
-dependencies:
-  - drupal:config
-
-# Information added by Drupal.org packaging script on 2017-12-05
-version: '8.x-1.5'
-core: '8.x'
-project: 'config_update'
-datestamp: 1512514387
diff --git a/modules/contrib/config_update/config_update.module b/modules/contrib/config_update/config_update.module
deleted file mode 100644
index df775d3..0000000
--- a/modules/contrib/config_update/config_update.module
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * @file
- * Configuration Update Base module.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Implements hook_help().
- */
-function config_update_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    case 'help.page.config_update':
-      $output = '';
-      $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Configuration Update Base module provides functionality that other modules can use, related to updating and computing differences between configuration versions. This module does not provide any end-user functionality itself.') . '</p>';
-      return $output;
-  }
-}
diff --git a/modules/contrib/config_update/config_update.services.yml b/modules/contrib/config_update/config_update.services.yml
deleted file mode 100644
index 2a25860..0000000
--- a/modules/contrib/config_update/config_update.services.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-services:
-  config_update.config_diff:
-    class: Drupal\config_update\ConfigDiffer
-    arguments: ['@string_translation']
-
-  config_update.config_list:
-    class: Drupal\config_update\ConfigListerWithProviders
-    arguments: ['@entity.manager', '@config.storage', '@config_update.extension_storage', '@config_update.extension_optional_storage', '@module_handler', '@theme_handler']
-
-  config_update.config_update:
-    class: Drupal\config_update\ConfigReverter
-    arguments: ['@entity.manager', '@config.storage', '@config_update.extension_storage', '@config_update.extension_optional_storage', '@config.factory', '@event_dispatcher']
-
-  config_update.extension_storage:
-    class: Drupal\Core\Config\ExtensionInstallStorage
-    arguments: ['@config.storage']
-
-  config_update.extension_optional_storage:
-    class: Drupal\Core\Config\ExtensionInstallStorage
-    arguments: ['@config.storage', 'config/optional']
diff --git a/modules/contrib/config_update/config_update_ui/README.txt b/modules/contrib/config_update/config_update_ui/README.txt
deleted file mode 100644
index 5773062..0000000
--- a/modules/contrib/config_update/config_update_ui/README.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-Configuration Update Reports module
------------------------------------
-
-CONTENTS OF THIS README FILE
-- Introduction
-- Installation
-- Generating reports in the user interface
-- Generating reports using Drush commands
-- Important notes  *** Be sure to read this section ***
-
-
-INTRODUCTION
-
-This module provides a report that allows you to see the differences between the
-default configuration items provided by the current versions of your installed
-modules, themes, and install profile, and the active configuration of your
-site. From this report, you can also import new configuration provided by
-updates, and revert your site configuration to the provided values.
-
-The main use case is: You update a module, and it has either changed default
-configuration that it provides, or added new default configuration items that
-you didn't get when you first installed the module. You want to be able to
-import the new items, view the differences between the active site configuration
-and the changed configuration, and possibly "revert" (or it may be an update) to
-the newly-provided default configuration.
-
-
-INSTALLATION
-
-Install the module in the normal way for Drupal modules. The only dependencies
-are the Configuration Manager module (Drupal core), and the Configuration Update
-Base module (part of this same project download).
-
-
-GENERATING REPORTS IN THE USER INTERFACE
-
-You can generate configuration reports at Administration >> Configuration >>
-Development >> Configuration management >> Update report (path:
-admin/config/development/configuration/report ).
-
-You can generate a report for a particular type of configuration object, such as
-Actions, Tours, Views, etc. Or, you can generate a report for an installed
-module, theme, or install profile. Finally, you can generate a report that
-contains all configuration in one report.
-
-The report has three sections, depending on what type you choose:
-
-1. Missing configuration items: Configuration items that are provided as
-   defaults by your currently-installed modules, themes, and install profile
-   that are missing from your active site configuration.
-
-   Any items listed here can be imported into your site.
-
-2. Added configuration items: Configuration items that you added to the site
-   (not provided by a currently-installed module, theme, or install
-   profile). This section is only shown when you are running the report based on
-   a configuration type.
-
-   Items listed here can be exported, which is useful for developers or if you
-   want to keep your site configuration in a version control system.
-
-3. Changed configuration items: Configuration items that are in your active site
-   configuration that differ from the same item currently being provided by an
-   installed module, theme, or install profile.
-
-   You can export these items, see the differences between what is on your site
-   and what the module/theme/profile is currently providing, or "revert" to the
-   version currently being provided by the module/theme/profile in its default
-   configuration.
-
-   Note that the differences may be a bit hard to read, but hopefully they'll
-   give you the general idea of what has changed.
-
-
-GENERATING REPORTS USING DRUSH COMMANDS
-
-The reports detailed in the previous section can also be generated, in pieces,
-using Drush commands (https://drupal.org/project/drush):
-
-drush config-list-types (clt)
-  Lists all the config types on your system. Reports can be run for
-  'system.simple' (simple configuration), and 'system.all' (all types), in
-  addition to the types listed by this command.
-
-drush config-added-report (cra)
-drush config-missing-report (crm)
-drush config-different-report (crd)
-drush config-inactive-report (cri)
-  Run config reports (see below).
-
-drush config-diff (cfd)
-  Show config differences for one item between active and imported (see below).
-
-The report commands run reports that tell what config has been added, is
-missing, is inactive, or is different between your active site configuration and
-the imported default configuration from config/install directories of your
-installed profile, modules, and themes.
-
-For each report except "added", the first argument is one of:
-- type: Runs the report for a configuration type; use drush config-list-types to
-  list them.
-- module: Runs the report for an installed module.
-- theme: Runs the report for an installed theme.
-- profile: Runs the report for the install profile.
-
-The second argument for reports is the machine name of the configuration type,
-module, theme, or install profile you want to run the report for. For the
-"added" report, this is the only argument, as the added report is always by
-configuration type.
-
-These are the same as the reports you get in the UI, which is described above;
-the difference is that in Drush the report is separated into pieces, and the
-UI report sections have more columns giving information about each config item.
-
-Once you have found a configuration item with differences, you can view the
-differences using the config-diff command. This is a normalized/formatted diff
-like in the UI of this module, so see above for details.
-
-Drush examples:
-
-drush clt
-drush crm module node
-drush cra block
-drush crd theme bartik
-drush crd type system.all
-drush crd type system.simple
-drush crd profile standard
-drush cfd block.block.bartik_search
-
-Once you have figured out which configuration items are added, missing, or
-different, you can:
-
-- Export them - see drush config-export.
-
-- Import missing configuration or revert to provided default values. There are
-Drush commands to do this:
-
-drush config-revert (cfr)
-  Revert a config item found in a "different" report to the current version in
-  the module, theme, or install profile that provides it.
-
-drush config-revert-multiple (cfrm)
-  Revert all config items of one type or from one module, theme, or install
-  profile to the provided versions.
-
-drush config-import-missing (cfi)
-  Import a config item found in a "missing" or "inactive" report from the
-  current version in the module, theme, or install profile that provides it.
-
-You can also to use the drush config-import command to import/update multiple
-configuration items. But this requires that you locate the files containing the
-configuration you want to import, and copy them to your configuration staging
-directory.
-
-
-IMPORTANT NOTES
-
-Here are some notes about how this module functions:
-
-* This module is always looking at the base configuration items, without
-  overrides (from settings.php, for example) or translations.
-
-* It is possible for an install profile on a site to provide configuration that
-  overrides configuration from a module or theme. The install profile version
-  always takes precedence. As an example, consider the case where module Foo
-  provides a configuration item called foo.settings, and install profile Bar
-  overrides this with its own file. Any reports that include foo.settings will
-  be based on the differences between your site's active configuration and the
-  version in the install profile. This is not usually a problem, but it can be
-  confusing if you're looking at the Foo module report. The foo.settings item
-  will be present, but the differences reported will be between the install
-  profile's version and your site's active configuration, not the differences
-  between the Foo module version and your site's active configuration.
diff --git a/modules/contrib/config_update/config_update_ui/config_update_ui.drush.inc b/modules/contrib/config_update/config_update_ui/config_update_ui.drush.inc
deleted file mode 100644
index fd8cfb2..0000000
--- a/modules/contrib/config_update/config_update_ui/config_update_ui.drush.inc
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-
-/**
- * @file
- * Drush commands for the Configuration Update Reports module.
- */
-
-use Drupal\Component\Diff\DiffFormatter;
-
-/**
- * Implements hook_drush_command().
- */
-function config_update_ui_drush_command() {
-
-  $items = [];
-
-  $items['config-list-types'] = [
-    'description' => 'List config types',
-    'aliases' => ['clt'],
-    'core' => ['8+'],
-    'outputformat' => [
-      'default' => 'list',
-    ],
-  ];
-
-  $items['config-added-report'] = [
-    'description' => 'Display a list of config items that did not come from your installed modules, themes, or install profile',
-    'arguments' => [
-      'name' => 'The type of config to report on. See config-list-types to list them. You can also use system.all for all types, or system.simple for simple config.',
-    ],
-    'required-arguments' => 1,
-    'examples' => [
-      'drush config-added-report action' => 'Displays the added config report for action config.',
-    ],
-    'aliases' => ['cra'],
-    'core' => ['8+'],
-    'outputformat' => [
-      'default' => 'list',
-    ],
-  ];
-
-  $items['config-missing-report'] = [
-    'description' => 'Display a list of config items from your installed modules, themes, or install profile that are not currently in your active config',
-    'arguments' => [
-      'type' => 'Run the report for: module, theme, profile, or "type" for config entity type.',
-      'name' => 'The machine name of the module, theme, etc. to report on. See config-list-types to list types for config entities; you can also use system.all for all types, or system.simple for simple config.',
-    ],
-    'required-arguments' => 2,
-    'examples' => [
-      'drush config-missing-report type action' => 'Displays the missing config report for action config.',
-    ],
-    'aliases' => ['crm'],
-    'core' => ['8+'],
-    'outputformat' => [
-      'default' => 'list',
-    ],
-  ];
-
-  $items['config-inactive-report'] = [
-    'description' => 'Display a list of optional config items from your installed modules, themes, or install profile that are not currently in your active config',
-    'arguments' => [
-      'type' => 'Run the report for: module, theme, profile, or "type" for config entity type.',
-      'name' => 'The machine name of the module, theme, etc. to report on. See config-list-types to list types for config entities; you can also use system.all for all types, or system.simple for simple config.',
-    ],
-    'required-arguments' => 2,
-    'examples' => [
-      'drush config-inactive-report type action' => 'Displays the inactive config report for action config.',
-    ],
-    'aliases' => ['cri'],
-    'core' => ['8+'],
-    'outputformat' => [
-      'default' => 'list',
-    ],
-  ];
-
-  $items['config-different-report'] = [
-    'description' => 'Display a list of config items that differ from the versions provided by your installed modules, themes, or install profile. See config-diff to show what the differences are.',
-    'arguments' => [
-      'type' => 'Run the report for: module, theme, profile, or "type" for config entity type.',
-      'name' => 'The machine name of the module, theme, etc. to report on. See config-list-types to list types for config entities; you can also use system.all for all types, or system.simple for simple config.',
-    ],
-    'required-arguments' => 2,
-    'examples' => [
-      'drush config-different-report type action' => 'Displays the differing config report for action config.',
-    ],
-    'aliases' => ['crd'],
-    'core' => ['8+'],
-    'outputformat' => [
-      'default' => 'list',
-    ],
-  ];
-
-  $items['config-diff'] = [
-    'description' => 'Display line-by-line differences for one config item between your active config and the version currently being provided by an installed module, theme, or install profile',
-    'arguments' => [
-      'name' => 'The config item to diff. See config-different-report to list config items that are different.',
-    ],
-    'required-arguments' => 1,
-    'examples' => [
-      'drush config-diff block.block.bartik_search' => 'Displays the config differences for the search block in the Bartik theme.',
-    ],
-    'aliases' => ['cfd'],
-    'core' => ['8+'],
-  ];
-
-  $items['config-revert'] = [
-    'description' => 'Revert one config item in active storage to the version provided by an installed module, theme, or install profile.',
-    'arguments' => [
-      'name' => 'The config item to revert. See config-different-report to list config items that are different.',
-    ],
-    'required-arguments' => 1,
-    'examples' => [
-      'drush config-revert block.block.bartik_search' => 'Revert the config for the search block in the Bartik theme to the version provided by the install profile.',
-    ],
-    'aliases' => ['cfr'],
-    'core' => ['8+'],
-  ];
-
-  $items['config-import-missing'] = [
-    'description' => 'Import a missing or inactive config item provided by an installed module, theme, or install profile. Be sure that requirements are met.',
-    'arguments' => [
-      'name' => 'The name of the config item to import (usually the ID you would see in the user interface). See config-missing-report to list config items that are missing, and config-inactive-report to list config items that are inactive.',
-    ],
-    'required-arguments' => 1,
-    'examples' => [
-      'drush config-import-missing block.block.bartik_search' => 'Import the config for the search block in the Bartik theme from the version provided by the install profile.',
-    ],
-    'aliases' => ['cfi'],
-    'core' => ['8+'],
-  ];
-
-  $items['config-revert-multiple'] = [
-    'description' => 'Revert a set of config items to the versions provided by installed modules, themes, or install profiles. A set is all differing items from one extension, or one type of configuration.',
-    'arguments' => [
-      'type' => 'Type of set to revert: "module" for all items from a module, "theme" for all items from a theme, "profile" for all items from the install profile, or "type" for all items of one config entity type. See config-different-report to list config items that are different.',
-      'name' => 'The machine name of the module, theme, etc. to revert items of. All items in the corresponding config-different-report will be reverted.',
-    ],
-    'required-arguments' => 2,
-    'examples' => [
-      'drush config-revert-multiple type action' => 'Revert all differing config items of type action.',
-    ],
-    'aliases' => ['cfrm'],
-    'core' => ['8+'],
-  ];
-
-  return $items;
-}
-
-/**
- * Lists available config types.
- */
-function drush_config_update_ui_config_list_types() {
-  $list = [];
-
-  $definitions = \Drupal::service('config_update.config_list')->listTypes();
-  return array_keys($definitions);
-}
-
-/**
- * Runs the config added report.
- *
- * @param string $name
- *   Type of config to report on.
- */
-function drush_config_update_ui_config_added_report($name) {
-  list($active_list, $install_list, $optional_list) = \Drupal::service('config_update.config_list')->listConfig('type', $name);
-
-  $added = array_diff($active_list, $install_list, $optional_list);
-
-  if (!count($added)) {
-    drush_print(dt('No added config'), 0, STDERR);
-  }
-
-  sort($added);
-  return $added;
-}
-
-/**
- * Runs the config missing report.
- *
- * @param string $type
- *   Type of report to run: 'type', 'module', 'theme', or 'profile'.
- * @param string $name
- *   Machine name of item to report on.
- */
-function drush_config_update_ui_config_missing_report($type, $name) {
-  list($active_list, $install_list, $optional_list) = \Drupal::service('config_update.config_list')->listConfig($type, $name);
-
-  $missing = array_diff($install_list, $active_list);
-  if (!count($missing)) {
-    drush_print(dt('No missing config'), 0, STDERR);
-  }
-
-  sort($missing);
-  return $missing;
-}
-
-/**
- * Runs the config inactive report.
- *
- * @param string $type
- *   Type of report to run: 'type', 'module', 'theme', or 'profile'.
- * @param string $name
- *   Machine name of item to report on.
- */
-function drush_config_update_ui_config_inactive_report($type, $name) {
-  list($active_list, $install_list, $optional_list) = \Drupal::service('config_update.config_list')->listConfig($type, $name);
-
-  $missing = array_diff($optional_list, $active_list);
-  if (!count($missing)) {
-    drush_print(dt('No inactive config'), 0, STDERR);
-  }
-
-  sort($missing);
-  return $missing;
-}
-
-/**
- * Runs the config different report.
- *
- * @param string $type
- *   Type of report to run: 'type', 'module', 'theme', or 'profile'.
- * @param string $name
- *   Machine name of item to report on.
- */
-function drush_config_update_ui_config_different_report($type, $name) {
-  list($active_list, $install_list, $optional_list) = \Drupal::service('config_update.config_list')->listConfig($type, $name);
-
-  $reverter = \Drupal::service('config_update.config_update');
-  $differ = \Drupal::service('config_update.config_diff');
-
-  $added = array_diff($active_list, $install_list, $optional_list);
-  $both = array_diff($active_list, $added);
-  $different = [];
-  foreach ($both as $name) {
-    $active = $reverter->getFromActive('', $name);
-    $extension = $reverter->getFromExtension('', $name);
-    if (!$differ->same($active, $extension)) {
-      $different[] = $name;
-    }
-  }
-
-  if (!count($different)) {
-    drush_print(dt('No different config'), 0, STDERR);
-  }
-
-  sort($different);
-  return $different;
-}
-
-/**
- * Runs the drush config-diff command.
- *
- * @param string $name
- *   Config item to diff.
- */
-function drush_config_update_ui_config_diff($name) {
-  $reverter = \Drupal::service('config_update.config_update');
-  $differ = \Drupal::service('config_update.config_diff');
-  $formatter = new DiffFormatter();
-
-  $extension = $reverter->getFromExtension('', $name);
-  $active = $reverter->getFromActive('', $name);
-  if ($extension && $active) {
-    $diff = $differ->diff($extension, $active);
-    $output = $formatter->format($diff);
-    return $output;
-  }
-  else {
-    drush_print(dt('Config is missing, cannot diff'), 0, STDERR);
-    return '';
-  }
-}
-
-/**
- * Runs the drush config-revert command.
- *
- * @param string $name
- *   Config item to revert.
- */
-function drush_config_update_ui_config_revert($name) {
-  $lister = \Drupal::service('config_update.config_list');
-  $reverter = \Drupal::service('config_update.config_update');
-  $manager = \Drupal::service('entity.manager');
-
-  // The revert command needs the type and the unprefixed name.
-  $type = $lister->getTypeNameByConfigName($name);
-  $shortname = $name;
-  if ($type && $type != 'system.simple') {
-    $definition = $manager->getDefinition($type);
-    $prefix = $definition->getConfigPrefix() . '.';
-    if (strpos($name, $prefix) === 0) {
-      $shortname = substr($name, strlen($prefix));
-    }
-  }
-
-  if ($reverter->revert($type, $shortname)) {
-    drush_print(dt('The configuration item @name was reverted to its source.', ['@name' => $name]));
-  }
-  else {
-    drush_print(dt('There was an error and the configuration item @name was not reverted.', ['@name' => $name]), 0, STDERR);
-  }
-}
-
-/**
- * Runs the drush config-import-missing command.
- *
- * @param string $name
- *   Name of config item to import, without prefix.
- */
-function drush_config_update_ui_config_import_missing($name) {
-  $lister = \Drupal::service('config_update.config_list');
-  $reverter = \Drupal::service('config_update.config_update');
-  $manager = \Drupal::service('entity.manager');
-
-  // The import command needs the type and the unprefixed name.
-  $type = $lister->getTypeNameByConfigName($name);
-  $shortname = $name;
-  if ($type && $type != 'system.simple') {
-    $definition = $manager->getDefinition($type);
-    $prefix = $definition->getConfigPrefix() . '.';
-    if (strpos($name, $prefix) === 0) {
-      $shortname = substr($name, strlen($prefix));
-    }
-  }
-
-  if ($reverter->import($type, $shortname)) {
-    drush_print(dt('The configuration item @name was imported from its source.', ['@name' => $name]));
-  }
-  else {
-    drush_print(dt('There was an error and the configuration item @name was not imported.', ['@name' => $name]), 0, STDERR);
-    drush_print(dt('The configuration was imported from its source.'));
-  }
-}
-
-/**
- * Runs the drush config-revert-multiple command.
- *
- * @param string $type
- *   Type of config to revert: 'type', 'module', 'theme', or 'profile'.
- * @param string $name
- *   Machine name of type to revert.
- */
-function drush_config_update_ui_config_revert_multiple($type, $name) {
-  // This command will print an error if there are no items to revert.
-  $different = drush_config_update_ui_config_different_report($type, $name);
-  foreach ($different as $name) {
-    // This command will print a message if it succeeds or fails for each item.
-    drush_config_update_ui_config_revert($name);
-  }
-}
diff --git a/modules/contrib/config_update/config_update_ui/config_update_ui.drush_testing.inc b/modules/contrib/config_update/config_update_ui/config_update_ui.drush_testing.inc
deleted file mode 100644
index 2c11acd..0000000
--- a/modules/contrib/config_update/config_update_ui/config_update_ui.drush_testing.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * @file
- * Defines stubs for Drush functions and constants so tests can run.
- *
- * @see \Drupal\config_update_ui\Tests\ConfigUpdateTest
- */
-
-if (!function_exists('drush_print')) {
-
-  /**
-   * Stub for drush_print() function for testing.
-   */
-  function drush_print() {
-  }
-
-}
-
-if (!function_exists('dt')) {
-
-  /**
-   * Stub for dt() function for testing.
-   */
-  function dt($text) {
-    return $text;
-  }
-
-}
-
-defined('STDERR') or define('STDERR', 25);
diff --git a/modules/contrib/config_update/config_update_ui/config_update_ui.info.yml b/modules/contrib/config_update/config_update_ui/config_update_ui.info.yml
deleted file mode 100644
index a65420a..0000000
--- a/modules/contrib/config_update/config_update_ui/config_update_ui.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Configuration Update Reports
-type: module
-description: 'Adds an updates report and revert functionality to configuration management'
-# core: 8.x
-configure: config_update.report
-dependencies:
-  - config_update:config_update
-  - drupal:config
-
-# Information added by Drupal.org packaging script on 2017-12-05
-version: '8.x-1.5'
-core: '8.x'
-project: 'config_update'
-datestamp: 1512514387
diff --git a/modules/contrib/config_update/config_update_ui/config_update_ui.libraries.yml b/modules/contrib/config_update/config_update_ui/config_update_ui.libraries.yml
deleted file mode 100644
index 33d6e9c..0000000
--- a/modules/contrib/config_update/config_update_ui/config_update_ui.libraries.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-report_css:
-  version: 1.x
-  css:
-    theme:
-      css/config_update_ui.report.css: {}
diff --git a/modules/contrib/config_update/config_update_ui/config_update_ui.links.task.yml b/modules/contrib/config_update/config_update_ui/config_update_ui.links.task.yml
deleted file mode 100644
index e37e7e7..0000000
--- a/modules/contrib/config_update/config_update_ui/config_update_ui.links.task.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-config_update_ui.report:
-  route_name: config_update_ui.report
-  title: 'Updates report'
-  base_route: config.sync
-  weight: 1000
diff --git a/modules/contrib/config_update/config_update_ui/config_update_ui.module b/modules/contrib/config_update/config_update_ui/config_update_ui.module
deleted file mode 100644
index 9e1ac6f..0000000
--- a/modules/contrib/config_update/config_update_ui/config_update_ui.module
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file
- * Configuration Update Reports module.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-
-/**
- * Implements hook_help().
- */
-function config_update_ui_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    case 'help.page.config_update_ui':
-      $output = '';
-      $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Configuration Update Reports module provides a report that allows you to see the differences between the default configuration provided by the current versions of your installed modules, themes, and install profile, and the active configuration of your site. From this report, you can also import new configuration provided by updates, and revert your active configuration to the provided default values.') . '</p>';
-      $output .= '<h3>' . t('Uses') . '</h3>';
-      $output .= '<dl>';
-      $output .= '<dt>' . t('Checking for configuration differences') . '</dd>';
-      $output .= '<dd>' . t('The <a href=":report">Updates report</a> shows you configuration that differs between your site\'s active configuration and the installed modules, themes, and install profile. Choose a particular configuration type (or All), or run the report for a particular module, theme, or your install profile.', [':report' => Url::fromRoute('config_update_ui.report')->toString()]) . '</dd>';
-      $output .= '</dl>';
-      return $output;
-
-    case 'config_update_ui.report':
-      $output = '';
-      $output .= '<p>' . t('This report shows which default configuration items provided by the current versions of your installed modules, themes, and install profile differ from the active configuration of your site. You can generate the report for all configuration of a certain type; for a particular installed module, theme, or your install profile (only modules, themes, and install profiles that actually provide configuration are listed); or for all configuration.') . '</p>';
-      $output .= '<p>' . t('Some configuration provided by modules has dependencies, and is only added to your system when all the dependencies are satisfied. This is known as <em>optional</em> configuration.') . '</p>';
-      $output .= '<p>' . t('Differences, including missing and added configuration, can be due to either an updated module or theme providing different configuration from when you installed it, or to changes made by site administrators. This report does not differentiate between these two sources for differences, and note that an install profile can also silently override module/theme configuration. Overrides (such as those in your settings.php file) and translations are not considered when looking at differences.') . '</p>';
-      return $output;
-
-    case 'config_update_ui.diff':
-      return '<p>' . t('Most configuration is organized into a hierarchy of settings; at a minimum, it is a one-level hierarchy where each setting has a name and a value, and the hierarchy comes in when some of the settings have multiple components.') . '</p><p>' . t('Configuration items are normalized and formatted before computing differences. The normalization step alphabetizes the components at each level of the hierarchy, and removes a few components whose differences should be ignored, such as the UUID. The formatting step shows the full hierarchy of each configuration value with :: separators for the hierarchy levels, and a : separator between the lowest-level setting name and the value, so that in a line-by-line diff you can always see which values are actually different. Green lines with + signs have been added, and yellow lines with - signs have been removed.') . '</p><p>' . t('Note that differences are considering the base configuration, without overrides from your settings.php file, or translations.') . '</p>';
-  }
-}
diff --git a/modules/contrib/config_update/config_update_ui/config_update_ui.permissions.yml b/modules/contrib/config_update/config_update_ui/config_update_ui.permissions.yml
deleted file mode 100644
index bedd4a9..0000000
--- a/modules/contrib/config_update/config_update_ui/config_update_ui.permissions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-view config updates report:
-  title: 'View configuration updates report'
-revert configuration:
-  title: 'Revert any configuration'
-  restrict access: true
-delete configuration:
-  title: 'Delete any configuration'
-  restrict access: true
diff --git a/modules/contrib/config_update/config_update_ui/config_update_ui.routing.yml b/modules/contrib/config_update/config_update_ui/config_update_ui.routing.yml
deleted file mode 100644
index 9f2f355..0000000
--- a/modules/contrib/config_update/config_update_ui/config_update_ui.routing.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-config_update_ui.report:
-  path: '/admin/config/development/configuration/report/{report_type}/{name}'
-  defaults:
-    _controller: '\Drupal\config_update_ui\Controller\ConfigUpdateController::report'
-    _title: 'Updates report'
-    report_type: NULL
-    name: NULL
-  requirements:
-    _permission: 'view config updates report'
-
-config_update_ui.import:
-  path: '/admin/config/development/configuration/report/import/{config_type}/{config_name}'
-  defaults:
-    _title: 'Import'
-    _form: '\Drupal\config_update_ui\Form\ConfigImportConfirmForm'
-  requirements:
-    _permission: 'import configuration'
-
-config_update_ui.diff:
-  path: '/admin/config/development/configuration/report/diff/{config_type}/{config_name}'
-  defaults:
-    _title: 'Differences'
-    _controller: '\Drupal\config_update_ui\Controller\ConfigUpdateController::diff'
-    config_type: NULL
-    config_name: NULL
-  requirements:
-    _permission: 'view config updates report'
-
-config_update_ui.revert:
-  path: '/admin/config/development/configuration/report/revert/{config_type}/{config_name}'
-  defaults:
-    _title: 'Revert'
-    _form: '\Drupal\config_update_ui\Form\ConfigRevertConfirmForm'
-  requirements:
-    _permission: 'revert configuration'
-
-config_update_ui.delete:
-  path: '/admin/config/development/configuration/report/delete/{config_type}/{config_name}'
-  defaults:
-    _title: 'Delete'
-    _form: '\Drupal\config_update_ui\Form\ConfigDeleteConfirmForm'
-  requirements:
-    _permission: 'delete configuration'
diff --git a/modules/contrib/config_update/config_update_ui/css/config_update_ui.report.css b/modules/contrib/config_update/config_update_ui/css/config_update_ui.report.css
deleted file mode 100644
index 77b8d10..0000000
--- a/modules/contrib/config_update/config_update_ui/css/config_update_ui.report.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @file
- * Styling for the Config Updates report.
- */
-
-table.config-update-report {
-  margin-top: 2em;
-}
-
-table.config-update-report caption {
-  font-weight: bold;
-  font-size: 1.1em;
-}
diff --git a/modules/contrib/config_update/config_update_ui/src/Controller/ConfigUpdateController.php b/modules/contrib/config_update/config_update_ui/src/Controller/ConfigUpdateController.php
deleted file mode 100644
index 31ed06d..0000000
--- a/modules/contrib/config_update/config_update_ui/src/Controller/ConfigUpdateController.php
+++ /dev/null
@@ -1,656 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Diff\DiffFormatter;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Extension\ThemeHandlerInterface;
-use Drupal\Core\Site\Settings;
-use Drupal\Core\Url;
-use Drupal\config_update\ConfigDiffInterface;
-use Drupal\config_update\ConfigListByProviderInterface;
-use Drupal\config_update\ConfigRevertInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Returns responses for Configuration Revert module operations.
- */
-class ConfigUpdateController extends ControllerBase {
-
-  /**
-   * The config differ.
-   *
-   * @var \Drupal\config_update\ConfigDiffInterface
-   */
-  protected $configDiff;
-
-  /**
-   * The config lister.
-   *
-   * @var \Drupal\config_update\ConfigListByProviderInterface
-   */
-  protected $configList;
-
-  /**
-   * The config reverter.
-   *
-   * @var \Drupal\config_update\ConfigRevertInterface
-   */
-  protected $configRevert;
-
-  /**
-   * The diff formatter.
-   *
-   * @var \Drupal\Core\Diff\DiffFormatter
-   */
-  protected $diffFormatter;
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The theme handler.
-   *
-   * @var \Drupal\Core\Extension\ThemeHandlerInterface
-   */
-  protected $themeHandler;
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * Constructs a ConfigUpdateController object.
-   *
-   * @param \Drupal\config_update\ConfigDiffInterface $config_diff
-   *   The config differ.
-   * @param \Drupal\config_update\ConfigListByProviderInterface $config_list
-   *   The config lister.
-   * @param \Drupal\config_update\ConfigRevertInterface $config_update
-   *   The config reverter.
-   * @param \Drupal\Core\Diff\DiffFormatter $diff_formatter
-   *   The diff formatter to use.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
-   *   The theme handler.
-   * @param \drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   */
-  public function __construct(ConfigDiffInterface $config_diff, ConfigListByProviderInterface $config_list, ConfigRevertInterface $config_update, DiffFormatter $diff_formatter, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, ConfigFactoryInterface $config_factory) {
-    $this->configDiff = $config_diff;
-    $this->configList = $config_list;
-    $this->configRevert = $config_update;
-    $this->diffFormatter = $diff_formatter;
-    $this->diffFormatter->show_header = FALSE;
-    $this->moduleHandler = $module_handler;
-    $this->themeHandler = $theme_handler;
-    $this->configFactory = $config_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config_update.config_diff'),
-      $container->get('config_update.config_list'),
-      $container->get('config_update.config_update'),
-      $container->get('diff.formatter'),
-      $container->get('module_handler'),
-      $container->get('theme_handler'),
-      $container->get('config.factory')
-    );
-  }
-
-  /**
-   * Shows the diff between active and provided configuration.
-   *
-   * @param string $config_type
-   *   The type of configuration.
-   * @param string $config_name
-   *   The name of the config item, without the prefix.
-   *
-   * @return array
-   *   Render array for page showing differences between them.
-   */
-  public function diff($config_type, $config_name) {
-    $diff = $this->configDiff->diff(
-      $this->configRevert->getFromExtension($config_type, $config_name),
-      $this->configRevert->getFromActive($config_type, $config_name)
-    );
-
-    $build = [];
-    $definition = $this->configList->getType($config_type);
-    $config_type_label = ($definition) ? $definition->getLabel() : $this->t('Simple configuration');
-    $build['#title'] = $this->t('Config difference for @type @name', ['@type' => $config_type_label, '@name' => $config_name]);
-    $build['#attached']['library'][] = 'system/diff';
-
-    $build['diff'] = [
-      '#type' => 'table',
-      '#header' => [
-        ['data' => $this->t('Source config'), 'colspan' => '2'],
-        ['data' => $this->t('Site config'), 'colspan' => '2'],
-      ],
-      '#rows' => $this->diffFormatter->format($diff),
-      '#attributes' => ['class' => ['diff']],
-    ];
-
-    $url = new Url('config_update_ui.report');
-
-    $build['back'] = [
-      '#type' => 'link',
-      '#attributes' => [
-        'class' => [
-          'dialog-cancel',
-        ],
-      ],
-      '#title' => $this->t("Back to 'Updates report' page."),
-      '#url' => $url,
-    ];
-
-    return $build;
-  }
-
-  /**
-   * Generates the config updates report.
-   *
-   * @param string $report_type
-   *   (optional) Type of report to run:
-   *   - type: Configuration entity type.
-   *   - module: Module.
-   *   - theme: Theme.
-   *   - profile: Install profile.
-   * @param string $name
-   *   (optional) Name of specific item to run report for (config entity type
-   *   ID, module machine name, etc.). Ignored for profile.
-   *
-   * @return array
-   *   Render array for report, with section at the top for selecting another
-   *   report to run. If either $report_type or $name is missing, the report
-   *   itself is not generated.
-   */
-  public function report($report_type = NULL, $name = NULL) {
-    $links = $this->generateReportLinks();
-
-    $report = $this->generateReport($report_type, $name);
-    if (!$report) {
-      return $links;
-    }
-
-    // If there is a report, extract the title, put table of links in a
-    // details element, and add report to build.
-    $build = [];
-    $build['#title'] = $report['#title'];
-    unset($report['#title']);
-
-    $build['links_wrapper'] = [
-      '#type' => 'details',
-      '#title' => $this->t('Generate new report'),
-      '#children' => $links,
-    ];
-
-    $build['report'] = $report;
-
-    $build['#attached']['library'][] = 'config_update/report_css';
-
-    return $build;
-  }
-
-  /**
-   * Generates the operations links for running individual reports.
-   *
-   * @return array
-   *   Render array for the operations links for running reports.
-   */
-  protected function generateReportLinks() {
-
-    // These links are put into an 'operations' render array element. They do
-    // not look good outside of tables. Also note that the array index in
-    // operations links is used as a class on the LI element. Some classes are
-    // special in the Seven CSS, such as "contextual", so avoid hitting these
-    // accidentally by prefixing.
-    $build = [];
-
-    $build['links'] = [
-      '#type' => 'table',
-      '#header' => [
-        $this->t('Report type'),
-        $this->t('Report on'),
-      ],
-      '#rows' => [],
-    ];
-
-    // Full report of all configuration.
-    $links['report_full'] = [
-      'title' => $this->t('Everything'),
-      'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'type', 'name' => 'system.all']),
-    ];
-    $build['links']['#rows'][] = [
-      $this->t('Full report'),
-      [
-        'data' => [
-          '#type' => 'operations',
-          '#links' => $links,
-        ],
-      ],
-    ];
-
-    // Reports by configuration type.
-    $definitions = $this->configList->listTypes();
-    $links = [];
-    foreach ($definitions as $entity_type => $definition) {
-      $links['report_type_' . $entity_type] = [
-        'title' => $definition->getLabel(),
-        'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'type', 'name' => $entity_type]),
-      ];
-    }
-
-    uasort($links, [$this, 'sortLinks']);
-
-    $links = [
-      'report_type_system.simple' => [
-        'title' => $this->t('Simple configuration'),
-        'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'type', 'name' => 'system.simple']),
-      ],
-    ] + $links;
-
-    $build['links']['#rows'][] = [
-      $this->t('Single configuration type'),
-      [
-        'data' => [
-          '#type' => 'operations',
-          '#links' => $links,
-        ],
-      ],
-    ];
-
-    // Make a list of installed modules.
-    $profile = $this->getProfileName();
-    $modules = $this->moduleHandler->getModuleList();
-    $links = [];
-    foreach ($modules as $machine_name => $module) {
-      if ($machine_name != $profile && $this->configList->providerHasConfig('module', $machine_name)) {
-        $links['report_module_' . $machine_name] = [
-          'title' => $this->moduleHandler->getName($machine_name),
-          'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'module', 'name' => $machine_name]),
-        ];
-      }
-    }
-    uasort($links, [$this, 'sortLinks']);
-
-    $build['links']['#rows'][] = [
-      $this->t('Single module'),
-      [
-        'data' => [
-          '#type' => 'operations',
-          '#links' => $links,
-        ],
-      ],
-    ];
-
-    // Make a list of installed themes.
-    $themes = $this->themeHandler->listInfo();
-    $links = [];
-    foreach ($themes as $machine_name => $theme) {
-      if ($this->configList->providerHasConfig('theme', $machine_name)) {
-        $links['report_theme_' . $machine_name] = [
-          'title' => $this->themeHandler->getName($machine_name),
-          'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'theme', 'name' => $machine_name]),
-        ];
-      }
-    }
-    uasort($links, [$this, 'sortLinks']);
-
-    $build['links']['#rows'][] = [
-      $this->t('Single theme'),
-      [
-        'data' => [
-          '#type' => 'operations',
-          '#links' => $links,
-        ],
-      ],
-    ];
-
-    $links = [];
-
-    // Profile is just one option.
-    if ($this->configList->providerHasConfig('profile', $profile)) {
-      $links['report_profile_' . $profile] = [
-        'title' => $this->moduleHandler->getName($profile),
-        'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'profile']),
-      ];
-      $build['links']['#rows'][] = [
-        $this->t('Installation profile'),
-        [
-          'data' => [
-            '#type' => 'operations',
-            '#links' => $links,
-          ],
-        ],
-      ];
-    }
-
-    return $build;
-  }
-
-  /**
-   * Generates a report about config updates.
-   *
-   * @param string $report_type
-   *   Type of report to generate: 'type', 'module', 'theme', or 'profile'.
-   * @param string $value
-   *   Machine name of a configuration type, module, or theme to generate the
-   *   report for. Ignored for profile, since that uses the active profile.
-   *
-   * @return array
-   *   Render array for the updates report. Empty if invalid or missing
-   *   report type or value.
-   */
-  protected function generateReport($report_type, $value) {
-    // Figure out what to name the report, and incidentally, validate that
-    // $value exists for this type of report.
-    switch ($report_type) {
-      case 'type':
-        if ($value == 'system.all') {
-          $label = $this->t('All configuration');
-        }
-        elseif ($value == 'system.simple') {
-          $label = $this->t('Simple configuration');
-        }
-        else {
-          $definition = $this->configList->getType($value);
-          if (!$definition) {
-            return NULL;
-          }
-
-          $label = $this->t('@name configuration', ['@name' => $definition->getLabel()]);
-        }
-
-        break;
-
-      case 'module':
-        $list = $this->moduleHandler->getModuleList();
-        if (!isset($list[$value])) {
-          return NULL;
-        }
-
-        $label = $this->t('@name module', ['@name' => $this->moduleHandler->getName($value)]);
-        break;
-
-      case 'theme':
-        $list = $this->themeHandler->listInfo();
-        if (!isset($list[$value])) {
-          return NULL;
-        }
-
-        $label = $this->t('@name theme', ['@name' => $this->themeHandler->getName($value)]);
-        break;
-
-      case 'profile':
-        $profile = $this->getProfileName();
-        $label = $this->t('@name profile', ['@name' => $this->moduleHandler->getName($profile)]);
-        break;
-
-      default:
-        return NULL;
-    }
-
-    // List the active and extension-provided config.
-    list($active_list, $install_list, $optional_list) = $this->configList->listConfig($report_type, $value);
-
-    // Build the report.
-    $build = [];
-
-    $build['#title'] = $this->t('Configuration updates report for @label', ['@label' => $label]);
-    $build['report_header'] = ['#markup' => '<h3>' . $this->t('Updates report') . '</h3>'];
-
-    // List items missing from site.
-    $removed = array_diff($install_list, $active_list);
-    $build['removed'] = [
-      '#caption' => $this->t('Missing configuration items'),
-      '#empty' => $this->t('None: all provided configuration items are in your active configuration.'),
-    ] + $this->makeReportTable($removed, 'extension', ['import']);
-
-    // List optional items that are not installed.
-    $inactive = array_diff($optional_list, $active_list);
-    $build['inactive'] = [
-      '#caption' => $this->t('Inactive optional items'),
-      '#empty' => $this->t('None: all optional configuration items are in your active configuration.'),
-    ] + $this->makeReportTable($inactive, 'extension', ['import']);
-
-    // List items added to site, which only makes sense in the report for a
-    // config type.
-    $added = array_diff($active_list, $install_list, $optional_list);
-    if ($report_type == 'type') {
-      $build['added'] = [
-        '#caption' => $this->t('Added configuration items'),
-        '#empty' => $this->t('None: all active configuration items of this type were provided by modules, themes, or install profile.'),
-      ] + $this->makeReportTable($added, 'active', ['export', 'delete']);
-    }
-
-    // For differences, we need to go through the array of config in both
-    // and see if each config item is the same or not.
-    $both = array_diff($active_list, $added);
-    $different = [];
-    foreach ($both as $name) {
-      if (!$this->configDiff->same(
-        $this->configRevert->getFromExtension('', $name),
-        $this->configRevert->getFromActive('', $name)
-      )) {
-        $different[] = $name;
-      }
-    }
-    $build['different'] = [
-      '#caption' => $this->t('Changed configuration items'),
-      '#empty' => $this->t('None: no active configuration items differ from their current provided versions.'),
-    ] + $this->makeReportTable($different, 'active',
-      ['diff', 'export', 'revert']);
-
-    return $build;
-  }
-
-  /**
-   * Builds a table for the report.
-   *
-   * @param string[] $names
-   *   List of machine names of config items for the table.
-   * @param string $storage
-   *   Config storage the items can be loaded from, either 'active' or
-   *   'extension'.
-   * @param string[] $actions
-   *   Action links to include, one or more of:
-   *   - diff
-   *   - revert
-   *   - export
-   *   - import
-   *   - delete.
-   *
-   * @return array
-   *   Render array for the table, not including the #empty and #prefix
-   *   properties.
-   */
-  protected function makeReportTable(array $names, $storage, array $actions) {
-    $build = [];
-
-    $build['#type'] = 'table';
-
-    $build['#attributes'] = ['class' => ['config-update-report']];
-
-    $build['#header'] = [
-      'name' => [
-        'data' => $this->t('Machine name'),
-      ],
-      'label' => [
-        'data' => $this->t('Label (if any)'),
-        'class' => [RESPONSIVE_PRIORITY_LOW],
-      ],
-      'type' => [
-        'data' => $this->t('Type'),
-        'class' => [RESPONSIVE_PRIORITY_MEDIUM],
-      ],
-      'provider' => [
-        'data' => $this->t('Provider'),
-        'class' => [RESPONSIVE_PRIORITY_LOW],
-      ],
-      'operations' => [
-        'data' => $this->t('Operations'),
-      ],
-    ];
-
-    $build['#rows'] = [];
-
-    foreach ($names as $name) {
-      $row = [];
-      if ($storage == 'active') {
-        $config = $this->configRevert->getFromActive('', $name);
-      }
-      else {
-        $config = $this->configRevert->getFromExtension('', $name);
-      }
-
-      // Figure out what type of config it is, and get the ID.
-      $entity_type = $this->configList->getTypeNameByConfigName($name);
-
-      if (!$entity_type) {
-        // This is simple config.
-        $id = $name;
-        $label = '';
-        $type_label = $this->t('Simple configuration');
-        $entity_type = 'system.simple';
-      }
-      else {
-        $definition = $this->configList->getType($entity_type);
-        $id_key = $definition->getKey('id');
-        $id = $config[$id_key];
-        // The label key is not required.
-        if ($label_key = $definition->getKey('label')) {
-          $label = $config[$label_key];
-        }
-        else {
-          $label = '';
-        }
-
-        $type_label = $definition->getLabel();
-      }
-
-      $row[] = $name;
-      $row[] = $label;
-      $row[] = $type_label;
-      $provider = $this->configList->getConfigProvider($name);
-      $provider_name = '';
-      if (!empty($provider)) {
-        switch ($provider[0]) {
-          case 'profile':
-            $provider_name = $this->moduleHandler->getName($provider[1]);
-            if ($provider_name) {
-              $provider_name = $this->t('@name profile', ['@name' => $provider_name]);
-            }
-            else {
-              $provider_name = '';
-            }
-            break;
-
-          case 'module':
-            $provider_name = $this->moduleHandler->getName($provider[1]);
-            if ($provider_name) {
-              $provider_name = $this->t('@name module', ['@name' => $provider_name]);
-            }
-            else {
-              $provider_name = '';
-            }
-            break;
-
-          case 'theme':
-            $provider_name = $this->themeHandler->getName($provider[1]);
-            if ($provider_name) {
-              $provider_name = $this->t('@name theme', ['@name' => $provider_name]);
-            }
-            else {
-              $provider_name = '';
-            }
-            break;
-        }
-      }
-      $row[] = $provider_name;
-
-      $links = [];
-      $routes = [
-        'export' => 'config.export_single',
-        'import' => 'config_update_ui.import',
-        'diff' => 'config_update_ui.diff',
-        'revert' => 'config_update_ui.revert',
-        'delete' => 'config_update_ui.delete',
-      ];
-      $titles = [
-        'export' => $this->t('Export'),
-        'import' => $this->t('Import from source'),
-        'diff' => $this->t('Show differences'),
-        'revert' => $this->t('Revert to source'),
-        'delete' => $this->t('Delete'),
-      ];
-
-      foreach ($actions as $action) {
-        $links[$action] = [
-          'url' => Url::fromRoute($routes[$action], ['config_type' => $entity_type, 'config_name' => $id]),
-          'title' => $titles[$action],
-        ];
-      }
-
-      $row[] = [
-        'data' => [
-          '#type' => 'operations',
-          '#links' => $links,
-        ],
-      ];
-
-      $build['#rows'][] = $row;
-    }
-
-    return $build;
-  }
-
-  /**
-   * Compares links for uasort(), to sort by displayed link title.
-   */
-  protected static function sortLinks($link1, $link2) {
-    $title1 = $link1['title'];
-    $title2 = $link2['title'];
-    if ($title1 == $title2) {
-      return 0;
-    }
-    return ($title1 < $title2) ? -1 : 1;
-  }
-
-  /**
-   * Returns the name of the install profile.
-   *
-   * For backwards compatibility with pre/post 8.3.x, tries to get it from
-   * either configuration or settings.
-   *
-   * @return string
-   *   The name of the install profile.
-   */
-  protected function getProfileName() {
-    // Code adapted from DrupalKernel::getInstalProfile() in Core.
-    // In Core 8.3.x or later, read from config.
-    $profile = $this->configFactory->get('core.extension')->get('profile');
-    if (!empty($profile)) {
-      return $profile;
-    }
-    else {
-      // If system_update_8300() has not yet run, use settings.
-      return Settings::get('install_profile');
-    }
-  }
-
-}
diff --git a/modules/contrib/config_update/config_update_ui/src/Form/ConfigDeleteConfirmForm.php b/modules/contrib/config_update/config_update_ui/src/Form/ConfigDeleteConfirmForm.php
deleted file mode 100644
index e8206b5..0000000
--- a/modules/contrib/config_update/config_update_ui/src/Form/ConfigDeleteConfirmForm.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\config_update\ConfigListInterface;
-use Drupal\config_update\ConfigRevertInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Defines a confirmation form for deleting configuration.
- */
-class ConfigDeleteConfirmForm extends ConfirmFormBase {
-
-  /**
-   * The type of config being deleted.
-   *
-   * @var string
-   */
-  protected $type;
-
-  /**
-   * The name of the config item being deleted, without the prefix.
-   *
-   * @var string
-   */
-  protected $name;
-
-  /**
-   * The config lister.
-   *
-   * @var \Drupal\config_update\ConfigListInterface
-   */
-  protected $configList;
-
-  /**
-   * The config reverter.
-   *
-   * @var \Drupal\config_update\ConfigRevertInterface
-   */
-  protected $configRevert;
-
-  /**
-   * Constructs a ConfigDeleteConfirmForm object.
-   *
-   * @param \Drupal\config_update\ConfigListInterface $config_list
-   *   The config lister.
-   * @param \Drupal\config_update\ConfigRevertInterface $config_update
-   *   The config reverter.
-   */
-  public function __construct(ConfigListInterface $config_list, ConfigRevertInterface $config_update) {
-    $this->configList = $config_list;
-    $this->configRevert = $config_update;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config_update.config_list'),
-      $container->get('config_update.config_update')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'config_delete_confirm';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    if ($this->type == 'system.simple') {
-      $type_label = $this->t('Simple configuration');
-    }
-    else {
-      $definition = $this->configList->getType($this->type);
-      if (!$definition) {
-        // Make a 404 error if the type doesn't exist.
-        throw new NotFoundHttpException();
-      }
-      $type_label = $definition->get('label');
-    }
-
-    // To delete, the configuration item must exist in active storage. Check
-    // that and make a 404 error if not.
-    $active = $this->configRevert->getFromActive($this->type, $this->name);
-    if (!$active) {
-      throw new NotFoundHttpException();
-    }
-
-    return $this->t('Are you sure you want to delete the %type config %item?', ['%type' => $type_label, '%item' => $this->name]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('config_update_ui.report');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return $this->t('This action cannot be undone. Manually deleting configuration from this page can cause problems on your site due to missing dependencies, and should only be done if there is no other way to delete a problematic piece of configuration.');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $config_type = NULL, $config_name = NULL) {
-    $this->type = $config_type;
-    $this->name = $config_name;
-
-    $form = parent::buildForm($form, $form_state);
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->configRevert->delete($this->type, $this->name);
-
-    drupal_set_message($this->t('The configuration was deleted.'));
-    $form_state->setRedirectUrl($this->getCancelUrl());
-  }
-
-}
diff --git a/modules/contrib/config_update/config_update_ui/src/Form/ConfigImportConfirmForm.php b/modules/contrib/config_update/config_update_ui/src/Form/ConfigImportConfirmForm.php
deleted file mode 100644
index 20790ed..0000000
--- a/modules/contrib/config_update/config_update_ui/src/Form/ConfigImportConfirmForm.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\config_update\ConfigListInterface;
-use Drupal\config_update\ConfigRevertInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Defines a confirmation form for importing configuration.
- */
-class ConfigImportConfirmForm extends ConfirmFormBase {
-
-  /**
-   * The type of config being imported.
-   *
-   * @var string
-   */
-  protected $type;
-
-  /**
-   * The name of the config item being imported, without the prefix.
-   *
-   * @var string
-   */
-  protected $name;
-
-  /**
-   * The config lister.
-   *
-   * @var \Drupal\config_update\ConfigListInterface
-   */
-  protected $configList;
-
-  /**
-   * The config reverter.
-   *
-   * @var \Drupal\config_update\ConfigRevertInterface
-   */
-  protected $configRevert;
-
-  /**
-   * Constructs a ConfigImportConfirmForm object.
-   *
-   * @param \Drupal\config_update\ConfigListInterface $config_list
-   *   The config lister.
-   * @param \Drupal\config_update\ConfigRevertInterface $config_update
-   *   The config reverter.
-   */
-  public function __construct(ConfigListInterface $config_list, ConfigRevertInterface $config_update) {
-    $this->configList = $config_list;
-    $this->configRevert = $config_update;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config_update.config_list'),
-      $container->get('config_update.config_update')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'config_import_confirm';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    if ($this->type == 'system.simple') {
-      $type_label = $this->t('Simple configuration');
-    }
-    else {
-      $definition = $this->configList->getType($this->type);
-      if (!$definition) {
-        // Make a 404 error if the type doesn't exist.
-        throw new NotFoundHttpException();
-      }
-      $type_label = $definition->get('label');
-    }
-
-    // To import (as opposed to revert), the configuration item must exist in
-    // extension storage but not active storage, so check that, and make a 404
-    // error if not.
-    $extension = $this->configRevert->getFromExtension($this->type, $this->name);
-    $active = $this->configRevert->getFromActive($this->type, $this->name);
-    if (!$extension || $active) {
-      throw new NotFoundHttpException();
-    }
-
-    return $this->t('Are you sure you want to import the %type config %item from its source configuration?', ['%type' => $type_label, '%item' => $this->name]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('config_update_ui.report');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return $this->t('Configuration will be added to your site. This action cannot be undone.');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Import');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $config_type = NULL, $config_name = NULL) {
-    $this->type = $config_type;
-    $this->name = $config_name;
-
-    $form = parent::buildForm($form, $form_state);
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->configRevert->import($this->type, $this->name);
-
-    drupal_set_message($this->t('The configuration was imported from its source.'));
-    $form_state->setRedirectUrl($this->getCancelUrl());
-  }
-
-}
diff --git a/modules/contrib/config_update/config_update_ui/src/Form/ConfigRevertConfirmForm.php b/modules/contrib/config_update/config_update_ui/src/Form/ConfigRevertConfirmForm.php
deleted file mode 100644
index 9699ba3..0000000
--- a/modules/contrib/config_update/config_update_ui/src/Form/ConfigRevertConfirmForm.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\config_update\ConfigListInterface;
-use Drupal\config_update\ConfigRevertInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Defines a confirmation form for reverting configuration.
- */
-class ConfigRevertConfirmForm extends ConfirmFormBase {
-
-  /**
-   * The type of config being reverted.
-   *
-   * @var string
-   */
-  protected $type;
-
-  /**
-   * The name of the config item being reverted, without the prefix.
-   *
-   * @var string
-   */
-  protected $name;
-
-  /**
-   * The config lister.
-   *
-   * @var \Drupal\config_update\ConfigListInterface
-   */
-  protected $configList;
-
-  /**
-   * The config reverter.
-   *
-   * @var \Drupal\config_update\ConfigRevertInterface
-   */
-  protected $configRevert;
-
-  /**
-   * Constructs a ConfigRevertConfirmForm object.
-   *
-   * @param \Drupal\config_update\ConfigListInterface $config_list
-   *   The config lister.
-   * @param \Drupal\config_update\ConfigRevertInterface $config_update
-   *   The config reverter.
-   */
-  public function __construct(ConfigListInterface $config_list, ConfigRevertInterface $config_update) {
-    $this->configList = $config_list;
-    $this->configRevert = $config_update;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config_update.config_list'),
-      $container->get('config_update.config_update')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'config_update_confirm';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    if ($this->type == 'system.simple') {
-      $type_label = $this->t('Simple configuration');
-    }
-    else {
-      $definition = $this->configList->getType($this->type);
-      if (!$definition) {
-        // Make a 404 error if the type doesn't exist.
-        throw new NotFoundHttpException();
-      }
-      $type_label = $definition->get('label');
-    }
-
-    // To revert (as opposed to import), the configuration item must exist in
-    // both active storage and extension storage, so check that and make a 404
-    // error if not.
-    $extension = $this->configRevert->getFromExtension($this->type, $this->name);
-    $active = $this->configRevert->getFromActive($this->type, $this->name);
-    if (!$extension || !$active) {
-      throw new NotFoundHttpException();
-    }
-
-    return $this->t('Are you sure you want to revert the %type config %item to its source configuration?', ['%type' => $type_label, '%item' => $this->name]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('config_update_ui.report');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return $this->t('Customizations will be lost. This action cannot be undone.');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Revert');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $config_type = NULL, $config_name = NULL) {
-    $this->type = $config_type;
-    $this->name = $config_name;
-
-    $form = parent::buildForm($form, $form_state);
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->configRevert->revert($this->type, $this->name);
-
-    drupal_set_message($this->t('The configuration was reverted to its source.'));
-    $form_state->setRedirectUrl($this->getCancelUrl());
-  }
-
-}
diff --git a/modules/contrib/config_update/config_update_ui/src/Tests/ConfigProfileOverridesTest.php b/modules/contrib/config_update/config_update_ui/src/Tests/ConfigProfileOverridesTest.php
deleted file mode 100644
index 299ae9c..0000000
--- a/modules/contrib/config_update/config_update_ui/src/Tests/ConfigProfileOverridesTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Verify config reports, reverts, and diffs with profile overrides.
- *
- * @group config
- */
-class ConfigProfileOverridesTest extends WebTestBase {
-
-  /**
-   * Use the Standard profile, so that there are profile config overrides.
-   *
-   * @var string
-   */
-  protected $profile = 'standard';
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'config',
-    'config_update',
-    'config_update_ui',
-  ];
-
-  /**
-   * The admin user that will be created.
-   *
-   * @var object
-   */
-  protected $adminUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Create user and log in.
-    $this->adminUser = $this->drupalCreateUser([
-      'access administration pages',
-      'administer themes',
-      'view config updates report',
-      'synchronize configuration',
-      'export configuration',
-      'import configuration',
-      'revert configuration',
-      'delete configuration',
-    ]);
-    $this->drupalLogin($this->adminUser);
-  }
-
-  /**
-   * Tests that config overrides work as expected.
-   */
-  public function testConfigOverrides() {
-
-    // The Standard install profile contains a system.theme.yml file that
-    // sets up bartik/seven as the default/admin theme. The default config
-    // from the System module has no admin theme and stark as the default
-    // theme. So first, run the report on simple configuration and verify
-    // that system.theme is not shown (it should not be missing, or added,
-    // or overridden).
-    $this->drupalGet('admin/config/development/configuration/report/type/system.simple');
-    $this->assertNoRaw('system.theme');
-
-    // Go to the Appearance page and change the theme to whatever is currently
-    // disabled. Return to the report and verify that system.theme is there,
-    // since it is now overridden.
-    $this->drupalGet('admin/appearance');
-    $this->clickLink('Install and set as default');
-    $this->drupalGet('admin/config/development/configuration/report/type/system.simple');
-    $this->assertText('system.theme');
-
-    // Look at the differences for system.theme and verify it's against
-    // the standard profile version, not default version. The line for
-    // default should show bartik as the source; if it's against the system
-    // version, the word bartik would not be there.
-    $this->drupalGet('admin/config/development/configuration/report/diff/system.simple/system.theme');
-    $this->assertText('bartik');
-
-    // Revert and verify that it reverted to the profile version, not the
-    // system module version.
-    $this->drupalGet('admin/config/development/configuration/report/revert/system.simple/system.theme');
-    $this->drupalPostForm(NULL, [], 'Revert');
-    $this->drupalGet('admin/config/development/configuration/single/export/system.simple/system.theme');
-    $this->assertText('admin: seven');
-    $this->assertText('default: bartik');
-  }
-
-}
diff --git a/modules/contrib/config_update/config_update_ui/src/Tests/ConfigUpdateTest.php b/modules/contrib/config_update/config_update_ui/src/Tests/ConfigUpdateTest.php
deleted file mode 100644
index 1ac7aef..0000000
--- a/modules/contrib/config_update/config_update_ui/src/Tests/ConfigUpdateTest.php
+++ /dev/null
@@ -1,521 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Verify the config revert report and its links.
- *
- * @group config
- */
-class ConfigUpdateTest extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * Use the Search module because it has two included config items in its
-   * config/install, assuming node and user are also enabled.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'config',
-    'config_update',
-    'config_update_ui',
-    'search',
-    'node',
-    'user',
-    'block',
-    'text',
-    'field',
-    'filter',
-  ];
-
-  /**
-   * The admin user that will be created.
-   *
-   * @var object
-   */
-  protected $adminUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Create user and log in.
-    $this->adminUser = $this->drupalCreateUser([
-      'access administration pages',
-      'administer search',
-      'view config updates report',
-      'synchronize configuration',
-      'export configuration',
-      'import configuration',
-      'revert configuration',
-      'delete configuration',
-      'administer filters',
-    ]);
-    $this->drupalLogin($this->adminUser);
-
-    // Make sure local tasks and page title are showing.
-    $this->drupalPlaceBlock('local_tasks_block');
-    $this->drupalPlaceBlock('page_title_block');
-
-    // Load the Drush include file so that its functions can be tested, plus
-    // the Drush testing include file.
-    module_load_include('inc', 'config_update_ui', 'config_update_ui.drush_testing');
-    module_load_include('inc', 'config_update_ui', 'config_update_ui.drush');
-  }
-
-  /**
-   * Tests the config report and its linked pages.
-   */
-  public function testConfigReport() {
-    // Test links to report page.
-    $this->drupalGet('admin/config/development/configuration');
-    $this->clickLink('Updates report');
-    $this->assertNoReport();
-
-    // Verify the Drush list types command.
-    $output = implode("\n", drush_config_update_ui_config_list_types());
-    $this->assertTrue(strpos($output, 'search_page') !== FALSE);
-    $this->assertTrue(strpos($output, 'node_type') !== FALSE);
-    $this->assertTrue(strpos($output, 'user_role') !== FALSE);
-    $this->assertTrue(strpos($output, 'block') !== FALSE);
-
-    // Verify some empty reports.
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], [], []);
-    $this->assertDrushReports('type', 'search_page', [], [], [], []);
-
-    // Module, theme, and profile reports have no 'added' section.
-    $this->drupalGet('admin/config/development/configuration/report/module/search');
-    $this->assertReport('Search module', [], [], [], [], ['added']);
-    $this->assertDrushReports('module', 'search', [], [], [], []);
-    $this->drupalGet('admin/config/development/configuration/report/theme/classy');
-    $this->assertReport('Classy theme', [], [], [], [], ['added']);
-    $this->assertDrushReports('theme', 'classy', [], [], [], []);
-
-    $inactive = ['locale.settings' => 'Simple configuration'];
-    $this->drupalGet('admin/config/development/configuration/report/profile');
-    $this->assertReport('Testing profile', [], [], [], $inactive, ['added']);
-    // The locale.settings line should show that the Testing profile is the
-    // provider.
-    $this->assertText('Testing profile');
-    $this->assertDrushReports('profile', '', [], [], [], array_keys($inactive));
-
-    // Verify that the user search page cannot be imported (because it already
-    // exists).
-    $this->drupalGet('admin/config/development/configuration/report/import/search_page/user_search');
-    $this->assertResponse(404);
-
-    // Delete the user search page from the search UI and verify report for
-    // both the search page config type and user module.
-    $this->drupalGet('admin/config/search/pages');
-    $this->clickLink('Delete');
-    $this->drupalPostForm(NULL, [], 'Delete');
-    $inactive = ['search.page.user_search' => 'Users'];
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], [], $inactive);
-    // The search.page.user_search line should show that the User module is the
-    // provider.
-    $this->assertText('User module');
-    $this->assertDrushReports('type', 'search_page', [], [], [], array_keys($inactive));
-
-    $this->drupalGet('admin/config/development/configuration/report/module/user');
-    $this->assertReport('User module', [], [], [], $inactive, ['added', 'changed']);
-    $this->assertDrushReports('module', 'user', [], [], [],
-      [
-        'rdf.mapping.user.user',
-        'search.page.user_search',
-        'views.view.user_admin_people',
-        'views.view.who_s_new',
-        'views.view.who_s_online',
-      ], ['changed']);
-
-    // Verify that the user search page cannot be reverted (because it does
-    // not already exist).
-    $this->drupalGet('admin/config/development/configuration/report/revert/search_page/user_search');
-    $this->assertResponse(404);
-    // Verify that the delete URL doesn't work either.
-    $this->drupalGet('admin/config/development/configuration/report/delete/search_page/user_search');
-    $this->assertResponse(404);
-
-    // Use the import link to get it back. Do this from the search page
-    // report to make sure we are importing the right config.
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->clickLink('Import from source');
-    $this->drupalPostForm(NULL, [], 'Import');
-    $this->assertText('The configuration was imported');
-    $this->assertNoReport();
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], [], []);
-    $this->assertDrushReports('type', 'search_page', [], [], [], []);
-
-    // Verify that after import, there is no config hash generated.
-    $this->drupalGet('admin/config/development/configuration/single/export/search_page/user_search');
-    $this->assertText('id: user_search');
-    $this->assertNoText('default_config_hash:');
-
-    // Test importing again, this time using the Drush import command.
-    $this->drupalGet('admin/config/search/pages');
-    $this->clickLink('Delete');
-    $this->drupalPostForm(NULL, [], 'Delete');
-    $inactive = ['search.page.user_search' => 'Users'];
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], [], $inactive);
-    drush_config_update_ui_config_import_missing('search.page.user_search');
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], [], []);
-
-    // Edit the node search page from the search UI and verify report.
-    $this->drupalGet('admin/config/search/pages');
-    $this->clickLink('Edit');
-    $this->drupalPostForm(NULL, [
-      'label' => 'New label',
-      'path'  => 'new_path',
-    ], 'Save search page');
-    $changed = ['search.page.node_search' => 'New label'];
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], $changed, []);
-    $this->assertDrushReports('type', 'search_page', [], [], array_keys($changed), []);
-
-    // Test the show differences link.
-    $this->clickLink('Show differences');
-    $this->assertText('Content');
-    $this->assertText('New label');
-    $this->assertText('node');
-    $this->assertText('new_path');
-
-    // Test the show differences Drush command.
-    $output = drush_config_update_ui_config_diff('search.page.node_search');
-    $this->assertTrue(strpos($output, 'Content') !== FALSE);
-    $this->assertTrue(strpos($output, 'New label') !== FALSE);
-    $this->assertTrue(strpos($output, 'node') !== FALSE);
-    $this->assertTrue(strpos($output, 'new_path') !== FALSE);
-
-    // Test the Back link.
-    $this->clickLink("Back to 'Updates report' page.");
-    $this->assertNoReport();
-
-    // Test the export link.
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->clickLink('Export');
-    $this->assertText('Here is your configuration:');
-    $this->assertText('id: node_search');
-    $this->assertText('New label');
-    $this->assertText('path: new_path');
-    $this->assertText('search.page.node_search.yml');
-
-    // Grab the uuid and hash lines for the next test.
-    $text = $this->getTextContent();
-    $matches = [];
-    preg_match('|^.*uuid:.*$|m', $text, $matches);
-    $uuid_line = $matches[0];
-    preg_match('|^.*default_config_hash:.*$|m', $text, $matches);
-    $hash_line = $matches[0];
-
-    // Test reverting.
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->clickLink('Revert to source');
-    $this->assertText('Are you sure you want to revert');
-    $this->assertText('Search page');
-    $this->assertText('node_search');
-    $this->assertText('Customizations will be lost. This action cannot be undone');
-    $this->drupalPostForm(NULL, [], 'Revert');
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], [], []);
-
-    // Verify that the uuid and hash keys were retained in the revert.
-    $this->drupalGet('admin/config/development/configuration/single/export/search_page/node_search');
-    $this->assertText('id: node_search');
-    $this->assertText($uuid_line);
-    $this->assertText($hash_line);
-
-    // Test reverting again, this time using Drush single revert command.
-    $this->drupalGet('admin/config/search/pages');
-    $this->clickLink('Edit');
-    $this->drupalPostForm(NULL, [
-      'label' => 'New label',
-      'path'  => 'new_path',
-    ], 'Save search page');
-    $changed = ['search.page.node_search' => 'New label'];
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], $changed, []);
-    drush_config_update_ui_config_revert('search.page.node_search');
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], [], []);
-
-    // Test reverting again, this time using Drush multiple revert command.
-    $this->drupalGet('admin/config/search/pages');
-    $this->clickLink('Edit');
-    $this->drupalPostForm(NULL, [
-      'label' => 'New label',
-      'path'  => 'new_path',
-    ], 'Save search page');
-    $changed = ['search.page.node_search' => 'New label'];
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], $changed, []);
-    drush_config_update_ui_config_revert_multiple('type', 'search_page');
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], [], []);
-
-    // Add a new search page from the search UI and verify report.
-    $this->drupalPostForm('admin/config/search/pages', [
-      'search_type' => 'node_search',
-    ], 'Add search page');
-    $this->drupalPostForm(NULL, [
-      'label' => 'test',
-      'id'    => 'test',
-      'path'  => 'test',
-    ], 'Save');
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $added = ['search.page.test' => 'test'];
-    $this->assertReport('Search page', [], $added, [], []);
-    $this->assertDrushReports('type', 'search_page', [], array_keys($added), [], []);
-
-    // Test the export link.
-    $this->clickLink('Export');
-    $this->assertText('Here is your configuration:');
-    $this->assertText('id: test');
-    $this->assertText('label: test');
-    $this->assertText('path: test');
-    $this->assertText('search.page.test.yml');
-
-    // Test the delete link.
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->clickLink('Delete');
-    $this->assertText('Are you sure');
-    $this->assertText('cannot be undone');
-    $this->drupalPostForm(NULL, [], 'Delete');
-    $this->assertText('The configuration was deleted');
-
-    // And verify the report again.
-    $this->drupalGet('admin/config/development/configuration/report/type/search_page');
-    $this->assertReport('Search page', [], [], [], []);
-
-    // Change the search module config and verify the actions work for
-    // simple config.
-    $this->drupalPostForm('admin/config/search/pages', [
-      'minimum_word_size' => 4,
-    ], 'Save configuration');
-    $changed = ['search.settings' => 'search.settings'];
-    $this->drupalGet('admin/config/development/configuration/report/module/search');
-    $this->assertReport('Search module', [], [], $changed, [], ['added']);
-
-    $this->clickLink('Show differences');
-    $this->assertText('Config difference for Simple configuration search.settings');
-    $this->assertText('index::minimum_word_size');
-    $this->assertText('4');
-
-    $this->drupalGet('admin/config/development/configuration/report/module/search');
-    $this->clickLink('Export');
-    $this->assertText('minimum_word_size: 4');
-    // Grab the hash line for the next test.
-    $text = $this->getTextContent();
-    $matches = [];
-    preg_match('|^.*default_config_hash:.*$|m', $text, $matches);
-    $hash_line = $matches[0];
-
-    $this->drupalGet('admin/config/development/configuration/report/module/search');
-    $this->clickLink('Revert to source');
-    $this->drupalPostForm(NULL, [], 'Revert');
-
-    // Verify that the hash was retained in the revert.
-    $this->drupalGet('admin/config/development/configuration/single/export/system.simple/search.settings');
-    $this->assertText($hash_line);
-
-    $this->drupalGet('admin/config/development/configuration/report/module/search');
-    $this->assertReport('Search module', [], [], [], [], ['added']);
-
-    // Edit the plain_text filter from the filter UI and verify report.
-    // The filter_format config type uses a label key other than 'label'.
-    $this->drupalPostForm('admin/config/content/formats/manage/plain_text', [
-      'name' => 'New label',
-    ], 'Save configuration');
-    $changed = ['filter.format.plain_text' => 'New label'];
-    $this->drupalGet('admin/config/development/configuration/report/type/filter_format');
-    $this->assertReport('Text format', [], [], $changed, []);
-  }
-
-  /**
-   * Asserts that the report page has the correct content.
-   *
-   * Assumes you are already on the report page.
-   *
-   * @param string $title
-   *   Report title to check for.
-   * @param string[] $missing
-   *   Array of items that should be listed as missing, name => label.
-   * @param string[] $added
-   *   Array of items that should be listed as added, name => label.
-   * @param string[] $changed
-   *   Array of items that should be listed as changed, name => label.
-   * @param string[] $inactive
-   *   Array of items that should be listed as inactive, name => label.
-   * @param string[] $skip
-   *   Array of report sections to skip checking.
-   */
-  protected function assertReport($title, array $missing, array $added, array $changed, array $inactive, array $skip = []) {
-    $this->assertText('Configuration updates report for ' . $title);
-    $this->assertText('Generate new report');
-
-    if (!in_array('missing', $skip)) {
-      $this->assertText('Missing configuration items');
-      if (count($missing)) {
-        foreach ($missing as $name => $label) {
-          $this->assertText($name);
-          $this->assertText($label);
-        }
-        $this->assertNoText('None: all provided configuration items are in your active configuration.');
-      }
-      else {
-        $this->assertText('None: all provided configuration items are in your active configuration.');
-      }
-    }
-
-    if (!in_array('inactive', $skip)) {
-      $this->assertText('Inactive optional items');
-      if (count($inactive)) {
-        foreach ($inactive as $name => $label) {
-          $this->assertText($name);
-          $this->assertText($label);
-        }
-        $this->assertNoText('None: all optional configuration items are in your active configuration.');
-      }
-      else {
-        $this->assertText('None: all optional configuration items are in your active configuration.');
-      }
-    }
-
-    if (!in_array('added', $skip)) {
-      $this->assertText('Added configuration items');
-      if (count($added)) {
-        foreach ($added as $name => $label) {
-          $this->assertText($name);
-          $this->assertText($label);
-        }
-        $this->assertNoText('None: all active configuration items of this type were provided by modules, themes, or install profile.');
-      }
-      else {
-        $this->assertText('None: all active configuration items of this type were provided by modules, themes, or install profile.');
-      }
-    }
-
-    if (!in_array('changed', $skip)) {
-      $this->assertText('Changed configuration items');
-      if (count($changed)) {
-        foreach ($changed as $name => $label) {
-          $this->assertText($name);
-          $this->assertText($label);
-        }
-        $this->assertNoText('None: no active configuration items differ from their current provided versions.');
-      }
-      else {
-        $this->assertText('None: no active configuration items differ from their current provided versions.');
-      }
-    }
-  }
-
-  /**
-   * Asserts that the Drush reports have the correct content.
-   *
-   * @param string $type
-   *   Type of report to run (type, module, theme, etc.).
-   * @param string $name
-   *   Name of that type to run (e.g., module machine name).
-   * @param string[] $missing
-   *   Array of config items that should be listed as missing.
-   * @param string[] $added
-   *   Array of config items that should be listed as added.
-   * @param string[] $changed
-   *   Array of config items that should be listed as changed.
-   * @param string[] $inactive
-   *   Array of config items that should be listed as inactive.
-   * @param string[] $skip
-   *   Array of report sections to skip checking.
-   */
-  protected function assertDrushReports($type, $name, array $missing, array $added, array $changed, array $inactive, array $skip = []) {
-    if (!in_array('missing', $skip)) {
-      $output = drush_config_update_ui_config_missing_report($type, $name);
-      $this->assertEqual(count($output), count($missing), 'Drush missing report has correct number of items');
-      if (count($missing)) {
-        foreach ($missing as $item) {
-          $this->assertTrue(in_array($item, $output), "Item $item is in the Drush missing report");
-        }
-      }
-    }
-
-    if (!in_array('added', $skip) && $type == 'type') {
-      $output = drush_config_update_ui_config_added_report($name);
-      $this->assertEqual(count($output), count($added), 'Drush added report has correct number of items');
-      if (count($added)) {
-        foreach ($added as $item) {
-          $this->assertTrue(in_array($item, $output), "Item $item is in the Drush added report");
-        }
-      }
-    }
-
-    if (!in_array('changed', $skip)) {
-      $output = drush_config_update_ui_config_different_report($type, $name);
-      $this->assertEqual(count($output), count($changed), 'Drush changed report has correct number of items');
-      if (count($changed)) {
-        foreach ($changed as $item) {
-          $this->assertTrue(in_array($item, $output), "Item $item is in the Drush changed report");
-        }
-      }
-    }
-
-    if (!in_array('inactive', $skip)) {
-      $output = drush_config_update_ui_config_inactive_report($type, $name);
-      $this->assertEqual(count($output), count($inactive), 'Drush inactive report has correct number of items');
-      if (count($inactive)) {
-        foreach ($inactive as $item) {
-          $this->assertTrue(in_array($item, $output), "Item $item is in the Drush inactive report");
-        }
-      }
-    }
-  }
-
-  /**
-   * Asserts that the report is not shown.
-   *
-   * Assumes you are already on the report form page.
-   */
-  protected function assertNoReport() {
-    $this->assertText('Report type');
-    $this->assertText('Full report');
-    $this->assertText('Single configuration type');
-    $this->assertText('Single module');
-    $this->assertText('Single theme');
-    $this->assertText('Installation profile');
-    $this->assertText('Updates report');
-    $this->assertNoText('Missing configuration items');
-    $this->assertNoText('Added configuration items');
-    $this->assertNoText('Changed configuration items');
-    $this->assertNoText('Unchanged configuration items');
-
-    // Verify that certain report links are shown or not shown. For extensions,
-    // only extensions that have configuration should be shown.
-    // Modules.
-    $this->assertLink('Search');
-    $this->assertLink('Field');
-    $this->assertNoLink('Configuration Update Base');
-    $this->assertNoLink('Configuration Update Reports');
-
-    // Themes.
-    $this->assertNoLink('Stark');
-    $this->assertNoLink('Classy');
-
-    // Profiles.
-    $this->assertLink('Testing');
-
-    // Configuration types.
-    $this->assertLink('Everything');
-    $this->assertLink('Simple configuration');
-    $this->assertLink('Search page');
-  }
-
-}
diff --git a/modules/contrib/config_update/src/ConfigDeleteInterface.php b/modules/contrib/config_update/src/ConfigDeleteInterface.php
deleted file mode 100644
index 6708850..0000000
--- a/modules/contrib/config_update/src/ConfigDeleteInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-/**
- * Defines an interface for deleting config items.
- */
-interface ConfigDeleteInterface {
-
-  /**
-   * Name of the event triggered on configuration delete.
-   *
-   * @see \Drupal\config_update\ConfigRevertEvent
-   * @see \Drupal\config_update\ConfigDeleteInterface::delete()
-   */
-  const DELETE = 'config_update.delete';
-
-  /**
-   * Deletes a configuration item.
-   *
-   * This action triggers a ConfigDeleteInterface::DELETE event.
-   *
-   * @param string $type
-   *   The type of configuration.
-   * @param string $name
-   *   The name of the config item, without the prefix.
-   *
-   * @return bool
-   *   TRUE if the operation succeeded; FALSE if the base configuration could
-   *   not be found to delete. May also throw exceptions if there is a
-   *   problem during deleting the configuration.
-   *
-   * @see \Drupal\config_update\ConfigDeleteInterface::DELETE
-   */
-  public function delete($type, $name);
-
-}
diff --git a/modules/contrib/config_update/src/ConfigDiffInterface.php b/modules/contrib/config_update/src/ConfigDiffInterface.php
deleted file mode 100644
index ec90f2a..0000000
--- a/modules/contrib/config_update/src/ConfigDiffInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-/**
- * Defines an interface for config differences.
- */
-interface ConfigDiffInterface {
-
-  /**
-   * Decides if two configuration arrays are considered to be the same.
-   *
-   * The two arrays are considered to be the same if, after "normalizing", they
-   * have the same keys and values. It is up to the particular implementing
-   * class to decide what normalizing means.
-   *
-   * @param array|null $source
-   *   Source config.
-   * @param array|null $target
-   *   Target config.
-   *
-   * @return bool
-   *   TRUE if the source and target are the same, and FALSE if they are
-   *   different.
-   */
-  public function same($source, $target);
-
-  /**
-   * Calculates differences between config.
-   *
-   * The two arrays are "normalized" and split into lines to compare
-   * differences. It is up to the particular implementing class to decide what
-   * normalizing means.
-   *
-   * @param array|null $source
-   *   Source config.
-   * @param array|null $target
-   *   Target config.
-   *
-   * @return \Drupal\Component\Diff\Diff
-   *   Diff object for displaying line-by-line differences between source and
-   *   target config.
-   */
-  public function diff($source, $target);
-
-}
diff --git a/modules/contrib/config_update/src/ConfigDiffer.php b/modules/contrib/config_update/src/ConfigDiffer.php
deleted file mode 100644
index dbda8df..0000000
--- a/modules/contrib/config_update/src/ConfigDiffer.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-use Drupal\Component\Diff\Diff;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-
-/**
- * Provides methods related to config differences.
- */
-class ConfigDiffer implements ConfigDiffInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * List of elements to ignore when comparing config.
-   *
-   * @var string[]
-   *
-   * @see ConfigDiffer::format().
-   */
-  protected $ignore;
-
-  /**
-   * Prefix to use to indicate config hierarchy.
-   *
-   * @var string
-   *
-   * @see ConfigDiffer::format().
-   */
-  protected $hierarchyPrefix;
-
-  /**
-   * Prefix to use to indicate config values.
-   *
-   * @var string
-   *
-   * @see ConfigDiffer::format().
-   */
-  protected $valuePrefix;
-
-  /**
-   * Constructs a ConfigDiffer.
-   *
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $translation
-   *   String translation service.
-   * @param string[] $ignore
-   *   Config components to ignore.
-   * @param string $hierarchy_prefix
-   *   Prefix to use in diffs for array hierarchy.
-   * @param string $value_prefix
-   *   Prefix to use in diffs for array value.
-   */
-  public function __construct(TranslationInterface $translation, array $ignore = ['uuid', '_core'], $hierarchy_prefix = '::', $value_prefix = ' : ') {
-    $this->stringTranslation = $translation;
-    $this->hierarchyPrefix = $hierarchy_prefix;
-    $this->valuePrefix = $value_prefix;
-    $this->ignore = $ignore;
-  }
-
-  /**
-   * Normalizes config for comparison.
-   *
-   * Recursively removes elements in the ignore list from configuration,
-   * as well as empty array values, and sorts at each level by array key, so
-   * that config from different storage can be compared meaningfully.
-   *
-   * @param array|null $config
-   *   Configuration array to normalize.
-   *
-   * @return array
-   *   Normalized configuration array.
-   *
-   * @see ConfigDiffer::format()
-   * @see ConfigDiffer::$ignore
-   */
-  protected function normalize($config) {
-    if (empty($config)) {
-      return [];
-    }
-
-    // Remove "ignore" elements.
-    foreach ($this->ignore as $element) {
-      unset($config[$element]);
-    }
-
-    // Recursively normalize remaining elements, if they are arrays.
-    foreach ($config as $key => $value) {
-      if (is_array($value)) {
-        $new = $this->normalize($value);
-        if (count($new)) {
-          $config[$key] = $new;
-        }
-        else {
-          unset($config[$key]);
-        }
-      }
-    }
-
-    // Sort and return.
-    ksort($config);
-    return $config;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function same($source, $target) {
-    $source = $this->normalize($source);
-    $target = $this->normalize($target);
-    return $source === $target;
-  }
-
-  /**
-   * Formats config for showing differences.
-   *
-   * To compute differences, we need to separate the config into lines and use
-   * line-by-line differencer. The obvious way to split into lines is:
-   * @code
-   * explode("\n", Yaml::encode($config))
-   * @endcode
-   * But this would highlight meaningless differences due to the often different
-   * order of config files, and also loses the indentation and context of the
-   * config hierarchy when differences are computed, making the difference
-   * difficult to interpret.
-   *
-   * So, what we do instead is to take the YAML hierarchy and format it so that
-   * the hierarchy is shown on each line. So, if you're in element
-   * $config['foo']['bar'] and the value is 'value', you will see
-   * 'foo::bar : value'.
-   *
-   * @param array $config
-   *   Config array to format. Normalize it first if you want to do diffs.
-   * @param string $prefix
-   *   (optional) When called recursively, the prefix to put on each line. Omit
-   *   when initially calling this function.
-   *
-   * @return string[]
-   *   Array of config lines formatted so that a line-by-line diff will show the
-   *   context in each line, and meaningful differences will be computed.
-   *
-   * @see ConfigDiffer::normalize()
-   * @see ConfigDiffer::$hierarchyPrefix
-   * @see ConfigDiffer::$valuePrefix
-   */
-  protected function format(array $config, $prefix = '') {
-    $lines = [];
-
-    foreach ($config as $key => $value) {
-      $section_prefix = ($prefix) ? $prefix . $this->hierarchyPrefix . $key : $key;
-
-      if (is_array($value)) {
-        $lines[] = $section_prefix;
-        $newlines = $this->format($value, $section_prefix);
-        foreach ($newlines as $line) {
-          $lines[] = $line;
-        }
-      }
-      elseif (is_null($value)) {
-        $lines[] = $section_prefix . $this->valuePrefix . $this->t('(NULL)');
-      }
-      else {
-        $lines[] = $section_prefix . $this->valuePrefix . $value;
-      }
-    }
-
-    return $lines;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function diff($source, $target) {
-    $source = $this->normalize($source);
-    $target = $this->normalize($target);
-
-    $source_lines = $this->format($source);
-    $target_lines = $this->format($target);
-
-    return new Diff($source_lines, $target_lines);
-  }
-
-}
diff --git a/modules/contrib/config_update/src/ConfigListByProviderInterface.php b/modules/contrib/config_update/src/ConfigListByProviderInterface.php
deleted file mode 100644
index 42ff515..0000000
--- a/modules/contrib/config_update/src/ConfigListByProviderInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-/**
- * Defines an extended interface for listing configuration.
- */
-interface ConfigListByProviderInterface extends ConfigListInterface {
-
-  /**
-   * Returns the provider of a given config object.
-   *
-   * @param string $name
-   *   Name of the config object.
-   *
-   * @return string[]
-   *   Array containing the type of extension providing this config object as
-   *   its first element (module, theme, profile), and the name of the provider
-   *   as its second element. NULL if unknown.
-   */
-  public function getConfigProvider($name);
-
-  /**
-   * Lists the providers of a given type that actually have configuration.
-   *
-   * @param string $type
-   *   Type of extension (module, theme, profile).
-   * @param string $name
-   *   Machine name of extension.
-   *
-   * @return bool
-   *   TRUE if the extension has either install or optional config, and FALSE
-   *   if it does not.
-   */
-  public function providerHasConfig($type, $name);
-
-}
diff --git a/modules/contrib/config_update/src/ConfigListInterface.php b/modules/contrib/config_update/src/ConfigListInterface.php
deleted file mode 100644
index a65b34c..0000000
--- a/modules/contrib/config_update/src/ConfigListInterface.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-/**
- * Defines an interface for config listings.
- */
-interface ConfigListInterface {
-
-  /**
-   * Lists the types of configuration available on the system.
-   *
-   * @return \Drupal\Core\Entity\EntityTypeInterface[]
-   *   Array of entity type definitions, keyed by machine name of the type.
-   */
-  public function listTypes();
-
-  /**
-   * Returns the entity type object for a given config type name.
-   *
-   * @param string $name
-   *   Config entity type machine name.
-   *
-   * @return \Drupal\Core\Entity\EntityTypeInterface
-   *   Entity type object with machine name $name.
-   */
-  public function getType($name);
-
-  /**
-   * Returns the entity type object for a given config prefix.
-   *
-   * @param string $prefix
-   *   Config prefix.
-   *
-   * @return \Drupal\Core\Entity\EntityTypeInterface
-   *   Entity type object corresponding to $prefix.
-   */
-  public function getTypeByPrefix($prefix);
-
-  /**
-   * Returns the config type name for a given config object.
-   *
-   * @param string $name
-   *   Name of the config object.
-   *
-   * @return string
-   *   Name of the config type that this is an instance of, determined by
-   *   prefix. NULL for simple configuration.
-   */
-  public function getTypeNameByConfigName($name);
-
-  /**
-   * Lists the config objects in active and extension storage.
-   *
-   * @param string $list_type
-   *   Type of list to make: 'type', 'module', 'theme', or 'profile'.
-   * @param string $name
-   *   Machine name of a configuration type, module, or theme to generate the
-   *   list for. Ignored for profile, since that uses the active profile. Use
-   *   type 'system.simple' for simple config, and 'system.all' to list all
-   *   config items.
-   *
-   * @return array
-   *   Array whose first element is the list of config objects in active
-   *   storage, second is the list of config objects in extension storage,
-   *   and third is the list of optional config objects in extension storage
-   *   (the ones with dependencies from config/optional directories).
-   *   Note that for everything except 'type' lists, the active storage list
-   *   includes all configuration items in the system, not limited to ones from
-   *   this module, theme, or profile.
-   */
-  public function listConfig($list_type, $name);
-
-}
diff --git a/modules/contrib/config_update/src/ConfigLister.php b/modules/contrib/config_update/src/ConfigLister.php
deleted file mode 100644
index 4c0bf9a..0000000
--- a/modules/contrib/config_update/src/ConfigLister.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-use Drupal\Core\Config\ExtensionInstallStorage;
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Site\Settings;
-use Drupal\Core\Extension\Extension;
-
-/**
- * Provides methods related to config listing.
- */
-class ConfigLister implements ConfigListInterface {
-
-  /**
-   * List of current config entity types, keyed by prefix.
-   *
-   * This is not set up until ConfigLister::listTypes() has been called.
-   *
-   * @var string[]
-   */
-  protected $typesByPrefix = [];
-
-  /**
-   * List of current config entity type definitions, keyed by entity type.
-   *
-   * This is not set up until ConfigLister::listTypes() has been called.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeInterface[]
-   */
-  protected $definitions = [];
-
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * The active config storage.
-   *
-   * @var \Drupal\Core\Config\StorageInterface
-   */
-  protected $activeConfigStorage;
-
-  /**
-   * The extension config storage.
-   *
-   * @var \Drupal\Core\Config\ExtensionInstallStorage
-   */
-  protected $extensionConfigStorage;
-
-  /**
-   * The extension config storage for optional config.
-   *
-   * @var \Drupal\Core\Config\ExtensionInstallStorage
-   */
-  protected $extensionOptionalConfigStorage;
-
-  /**
-   * Constructs a ConfigLister.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
-   *   The entity manager.
-   * @param \Drupal\Core\Config\StorageInterface $active_config_storage
-   *   The active config storage.
-   * @param \Drupal\Core\Config\ExtensionInstallStorage $extension_config_storage
-   *   The extension config storage.
-   * @param \Drupal\Core\Config\ExtensionInstallStorage $extension_optional_config_storage
-   *   The extension config storage for optional config items.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_manager, StorageInterface $active_config_storage, ExtensionInstallStorage $extension_config_storage, ExtensionInstallStorage $extension_optional_config_storage) {
-    $this->entityManager = $entity_manager;
-    $this->activeConfigStorage = $active_config_storage;
-    $this->extensionConfigStorage = $extension_config_storage;
-    $this->extensionOptionalConfigStorage = $extension_optional_config_storage;
-  }
-
-  /**
-   * Sets up and returns the entity definitions list.
-   */
-  public function listTypes() {
-    // Return list if it has already been calculated.
-    if (count($this->definitions)) {
-      return $this->definitions;
-    }
-
-    // Calculate and return the list.
-    foreach ($this->entityManager->getDefinitions() as $entity_type => $definition) {
-      if ($definition->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
-        $this->definitions[$entity_type] = $definition;
-        $prefix = $definition->getConfigPrefix();
-        $this->typesByPrefix[$prefix] = $entity_type;
-      }
-    }
-
-    ksort($this->definitions);
-
-    return $this->definitions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getType($name) {
-    $definitions = $this->listTypes();
-    return isset($definitions[$name]) ? $definitions[$name] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTypeByPrefix($prefix) {
-    $definitions = $this->listTypes();
-    return isset($this->typesByPrefix[$prefix]) ? $definitions[$this->typesByPrefix[$prefix]] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTypeNameByConfigName($name) {
-    $definitions = $this->listTypes();
-    foreach ($this->typesByPrefix as $prefix => $entity_type) {
-      if (strpos($name, $prefix . '.') === 0) {
-        return $entity_type;
-      }
-    }
-
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function listConfig($list_type, $name) {
-    $active_list = [];
-    $install_list = [];
-    $optional_list = [];
-    $definitions = $this->listTypes();
-
-    switch ($list_type) {
-      case 'type':
-        if ($name == 'system.all') {
-          $active_list = $this->activeConfigStorage->listAll();
-          $install_list = $this->extensionConfigStorage->listAll();
-          $optional_list = $this->extensionOptionalConfigStorage->listAll();
-        }
-        elseif ($name == 'system.simple') {
-          // Listing is done by prefixes, and simple config doesn't have one.
-          // So list all and filter out all known prefixes.
-          $active_list = $this->omitKnownPrefixes($this->activeConfigStorage->listAll());
-          $install_list = $this->omitKnownPrefixes($this->extensionConfigStorage->listAll());
-          $optional_list = $this->omitKnownPrefixes($this->extensionOptionalConfigStorage->listAll());
-        }
-        elseif (isset($this->definitions[$name])) {
-          $definition = $this->definitions[$name];
-          $prefix = $definition->getConfigPrefix();
-          $active_list = $this->activeConfigStorage->listAll($prefix);
-          $install_list = $this->extensionConfigStorage->listAll($prefix);
-          $optional_list = $this->extensionOptionalConfigStorage->listAll($prefix);
-        }
-        break;
-
-      case 'profile':
-        $name = $this->getProfileName();
-        // Intentional fall-through here to the 'module' or 'theme' case.
-      case 'module':
-      case 'theme':
-        $active_list = $this->activeConfigStorage->listAll();
-        $install_list = $this->listProvidedItems($list_type, $name);
-        $optional_list = $this->listProvidedItems($list_type, $name, TRUE);
-        break;
-    }
-
-    // This only seems to be a problem in unit tests, where a mock object
-    // is returning NULL instead of an empy array for some reason.
-    if (!is_array($optional_list)) {
-      $optional_list = [];
-    }
-
-    return [$active_list, $install_list, $optional_list];
-  }
-
-  /**
-   * Returns a list of the install storage items for an extension.
-   *
-   * @param string $type
-   *   Type of extension ('module', etc.).
-   * @param string $name
-   *   Machine name of extension.
-   * @param bool $do_optional
-   *   FALSE (default) to list config/install items, TRUE to list
-   *   config/optional items.
-   *
-   * @return string[]
-   *   List of config items provided by this extension.
-   */
-  protected function listProvidedItems($type, $name, $do_optional = FALSE) {
-    $pathname = drupal_get_filename($type, $name);
-    $component = new Extension(\Drupal::root(), $type, $pathname);
-    if ($do_optional) {
-      $names = $this->extensionOptionalConfigStorage->getComponentNames([$component]);
-    }
-    else {
-      $names = $this->extensionConfigStorage->getComponentNames([$component]);
-    }
-    return array_keys($names);
-  }
-
-  /**
-   * Omits config with known prefixes from a list of config names.
-   */
-  protected function omitKnownPrefixes($list) {
-    $prefixes = array_keys($this->typesByPrefix);
-    $list = array_combine($list, $list);
-    foreach ($list as $name) {
-      foreach ($prefixes as $prefix) {
-        if (strpos($name, $prefix . '.') === 0) {
-          unset($list[$name]);
-        }
-      }
-    }
-
-    return array_values($list);
-  }
-
-  /**
-   * Returns the name of the install profile.
-   *
-   * For backwards compatibility with pre/post 8.3.x, tries to get it from
-   * either configuration or settings.
-   *
-   * @return string
-   *   The name of the install profile.
-   */
-  protected function getProfileName() {
-    // Code adapted from DrupalKernel::getInstalProfile() in Core.
-    // In Core 8.3.x or later, read from config.
-    $config = $this->activeConfigStorage->read('core.extension');
-    if (!empty($config['profile'])) {
-      return $config['profile'];
-    }
-    else {
-      // If system_update_8300() has not yet run, use settings.
-      return Settings::get('install_profile');
-    }
-  }
-
-}
diff --git a/modules/contrib/config_update/src/ConfigListerWithProviders.php b/modules/contrib/config_update/src/ConfigListerWithProviders.php
deleted file mode 100644
index 5c50c98..0000000
--- a/modules/contrib/config_update/src/ConfigListerWithProviders.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-use Drupal\Core\Config\ExtensionInstallStorage;
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Extension\ThemeHandlerInterface;
-
-/**
- * Provides methods related to config listing, including provider calculation.
- */
-class ConfigListerWithProviders extends ConfigLister implements ConfigListByProviderInterface {
-
-  /**
-   * List of providers of config, keyed by config item name.
-   *
-   * The array elements are each arrays, with the type of extension providing
-   * the config object as the first element (module, theme, profile), and the
-   * name of the provider as the second element.
-   *
-   * This is not set up until ConfigListerWithProviders::listProviders() has
-   * been called.
-   *
-   * @var array
-   */
-  protected $providers = [];
-
-  /**
-   * List of extensions that provide configuration, keyed by type.
-   *
-   * This is not set up until ConfigListerWithProviders::listProviders() has
-   * been called.
-   *
-   * @var array
-   */
-  protected $extensionsWithConfig = [];
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The theme handler.
-   *
-   * @var \Drupal\Core\Extension\ThemeHandlerInterface
-   */
-  protected $themeHandler;
-
-  /**
-   * Constructs a ConfigListerWithProviders.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
-   *   The entity manager.
-   * @param \Drupal\Core\Config\StorageInterface $active_config_storage
-   *   The active config storage.
-   * @param \Drupal\Core\Config\ExtensionInstallStorage $extension_config_storage
-   *   The extension config storage.
-   * @param \Drupal\Core\Config\ExtensionInstallStorage $extension_optional_config_storage
-   *   The extension config storage for optional config items.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
-   *   The theme handler.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_manager, StorageInterface $active_config_storage, ExtensionInstallStorage $extension_config_storage, ExtensionInstallStorage $extension_optional_config_storage, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler) {
-    $this->entityManager = $entity_manager;
-    $this->activeConfigStorage = $active_config_storage;
-    $this->extensionConfigStorage = $extension_config_storage;
-    $this->extensionOptionalConfigStorage = $extension_optional_config_storage;
-    $this->moduleHandler = $module_handler;
-    $this->themeHandler = $theme_handler;
-  }
-
-  /**
-   * Sets up and returns the config providers list.
-   */
-  public function listProviders() {
-    // Return the list if it has already been set up.
-    if (count($this->providers)) {
-      return $this->providers;
-    }
-
-    // Calculate if it hasn't been set up yet.
-    // List all of the profile, modules, and themes.
-    $extensionsToDo = [];
-    $profile = $this->getProfileName();
-    $extensionsToDo[] = ['profile', $profile];
-    $modules = $this->moduleHandler->getModuleList();
-    foreach ($modules as $machine_name => $module) {
-      if ($machine_name != $profile) {
-        $extensionsToDo[] = ['module', $machine_name];
-      }
-    }
-
-    $themes = $this->themeHandler->listInfo();
-    foreach ($themes as $machine_name => $theme) {
-      $extensionsToDo[] = ['theme', $machine_name];
-    }
-
-    // For each extension, figure out if it has config, and make an index of
-    // config item => provider.
-    $this->extensionsWithConfig = [
-      'profile' => [],
-      'module' => [],
-      'theme' => [],
-    ];
-
-    foreach ($extensionsToDo as $item) {
-      $type = $item[0];
-      $name = $item[1];
-      $configs = array_merge($this->listProvidedItems($type, $name),
-        $this->listProvidedItems($type, $name, TRUE));
-      if (!empty($configs)) {
-        $this->extensionsWithConfig[$type][$name] = $name;
-        foreach ($configs as $config) {
-          $this->providers[$config] = [$type, $name];
-        }
-      }
-    }
-
-    return $this->providers;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfigProvider($name) {
-    $providers = $this->listProviders();
-
-    return (isset($providers[$name])) ? $providers[$name] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function providerHasConfig($type, $name) {
-    // Make sure the list of extensions with configuration has been generated.
-    $this->listProviders();
-
-    return isset($this->extensionsWithConfig[$type][$name]);
-  }
-
-}
diff --git a/modules/contrib/config_update/src/ConfigRevertEvent.php b/modules/contrib/config_update/src/ConfigRevertEvent.php
deleted file mode 100644
index 90944a1..0000000
--- a/modules/contrib/config_update/src/ConfigRevertEvent.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * Event context class for configuration revert/import events.
- *
- * This class is passed in as the event when the
- * \Drupal\config_update\ConfigRevertInterface::IMPORT,
- * \Drupal\config_update\ConfigDeleteInterface::DELETE, and
- * \Drupal\config_update\ConfigRevertInterface::REVERT events are triggered.
- */
-class ConfigRevertEvent extends Event {
-
-  /**
-   * The type of configuration that is being imported or reverted.
-   *
-   * @var string
-   */
-  protected $type;
-
-  /**
-   * The name of the config item being imported or reverted, without prefix.
-   *
-   * @var string
-   */
-  protected $name;
-
-  /**
-   * Constructs a new ConfigRevertEvent.
-   *
-   * @param string $type
-   *   The type of configuration being imported or reverted.
-   * @param string $name
-   *   The name of the config item being imported/reverted, without prefix.
-   */
-  public function __construct($type, $name) {
-    $this->type = $type;
-    $this->name = $name;
-  }
-
-  /**
-   * Returns the type of configuration being imported or reverted.
-   *
-   * @return string
-   *   The type of configuration, either 'system.simple' or a config entity
-   *   type machine name.
-   */
-  public function getType() {
-    return $this->type;
-  }
-
-  /**
-   * Returns the name of the config item, without prefix.
-   *
-   * @return string
-   *   The name of the config item being imported/reverted/deleted, with the
-   *   prefix.
-   */
-  public function getName() {
-    return $this->name;
-  }
-
-}
diff --git a/modules/contrib/config_update/src/ConfigRevertInterface.php b/modules/contrib/config_update/src/ConfigRevertInterface.php
deleted file mode 100644
index 18e03fa..0000000
--- a/modules/contrib/config_update/src/ConfigRevertInterface.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-/**
- * Defines an interface for config import and revert operations.
- */
-interface ConfigRevertInterface {
-
-  /**
-   * Name of the event triggered on configuration import.
-   *
-   * @see \Drupal\config_update\ConfigRevertEvent
-   * @see \Drupal\config_update\ConfigRevertInterface::import()
-   */
-  const IMPORT = 'config_update.import';
-
-  /**
-   * Name of the event triggered on configuration revert.
-   *
-   * @see \Drupal\config_update\ConfigRevertEvent
-   * @see \Drupal\config_update\ConfigRevertInterface::revert()
-   */
-  const REVERT = 'config_update.revert';
-
-  /**
-   * Imports configuration from extension storage to active storage.
-   *
-   * This action triggers a ConfigRevertInterface::IMPORT event if the
-   * configuration could be imported.
-   *
-   * @param string $type
-   *   The type of configuration.
-   * @param string $name
-   *   The name of the config item, without the prefix.
-   *
-   * @return bool
-   *   TRUE if the operation succeeded; FALSE if the configuration could not
-   *   be found to import. May also throw exceptions if there is a problem
-   *   during saving the configuration.
-   *
-   * @see \Drupal\config_update\ConfigRevertInterface::IMPORT
-   */
-  public function import($type, $name);
-
-  /**
-   * Reverts configuration to the value from extension storage.
-   *
-   * This action triggers a ConfigRevertInterface::REVERT event.
-   *
-   * @param string $type
-   *   The type of configuration.
-   * @param string $name
-   *   The name of the config item, without the prefix.
-   *
-   * @return bool
-   *   TRUE if the operation succeeded; FALSE if the base configuration could
-   *   not be found to revert to. May also throw exceptions if there is a
-   *   problem during saving the configuration.
-   *
-   * @see \Drupal\config_update\ConfigRevertInterface::REVERT
-   */
-  public function revert($type, $name);
-
-  /**
-   * Gets the current active value of configuration.
-   *
-   * @param string $type
-   *   The type of configuration. Or pass '' to indicate that $name is the full
-   *   name.
-   * @param string $name
-   *   The name of the config item, without the prefix.
-   *
-   * @return array
-   *   The configuration value.
-   */
-  public function getFromActive($type, $name);
-
-  /**
-   * Gets the extension storage value of configuration.
-   *
-   * This is the value from a file in the config/install or config/optional
-   * directory of a module, theme, or install profile.
-   *
-   * @param string $type
-   *   The type of configuration. Or pass '' to indicate that $name is the full
-   *   name.
-   * @param string $name
-   *   The name of the config item, without the prefix.
-   *
-   * @return array|false
-   *   The configuration value, or FALSE if it could not be located.
-   */
-  public function getFromExtension($type, $name);
-
-}
diff --git a/modules/contrib/config_update/src/ConfigReverter.php b/modules/contrib/config_update/src/ConfigReverter.php
deleted file mode 100644
index 51e255a..0000000
--- a/modules/contrib/config_update/src/ConfigReverter.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * Provides methods related to config reverting, deleting, and importing.
- *
- * In this class, when any import or revert operation is requested, the
- * configuration that is being reverted or imported is searched for in both the
- * config/install repository and config/optional. This happens automatically.
- */
-class ConfigReverter implements ConfigRevertInterface, ConfigDeleteInterface {
-
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * The active config storage.
-   *
-   * @var \Drupal\Core\Config\StorageInterface
-   */
-  protected $activeConfigStorage;
-
-  /**
-   * The extension config storage for config/install config items.
-   *
-   * @var \Drupal\Core\Config\StorageInterface
-   */
-  protected $extensionConfigStorage;
-
-  /**
-   * The extension config storage for config/optional config items.
-   *
-   * @var \Drupal\Core\Config\ExtensionInstallStorage
-   */
-  protected $extensionOptionalConfigStorage;
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The event dispatcher.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-   */
-  protected $dispatcher;
-
-  /**
-   * Constructs a ConfigReverter.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
-   *   The entity manager.
-   * @param \Drupal\Core\Config\StorageInterface $active_config_storage
-   *   The active config storage.
-   * @param \Drupal\Core\Config\StorageInterface $extension_config_storage
-   *   The extension config storage.
-   * @param \Drupal\Core\Config\StorageInterface $extension_optional_config_storage
-   *   The extension config storage for optional config items.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
-   *   The event dispatcher.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_manager, StorageInterface $active_config_storage, StorageInterface $extension_config_storage, StorageInterface $extension_optional_config_storage, ConfigFactoryInterface $config_factory, EventDispatcherInterface $dispatcher) {
-    $this->entityManager = $entity_manager;
-    $this->activeConfigStorage = $active_config_storage;
-    $this->extensionConfigStorage = $extension_config_storage;
-    $this->extensionOptionalConfigStorage = $extension_optional_config_storage;
-    $this->configFactory = $config_factory;
-    $this->dispatcher = $dispatcher;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function import($type, $name) {
-    // Read the config from the file.
-    $full_name = $this->getFullName($type, $name);
-    $value = $this->extensionConfigStorage->read($full_name);
-    if (!$value) {
-      $value = $this->extensionOptionalConfigStorage->read($full_name);
-    }
-    if (!$value) {
-      return FALSE;
-    }
-
-    // Save it as a new config entity or simple config.
-    if ($type == 'system.simple') {
-      $this->configFactory->getEditable($full_name)->setData($value)->save();
-    }
-    else {
-      $entity_storage = $this->entityManager->getStorage($type);
-      $entity = $entity_storage->createFromStorageRecord($value);
-      $entity->save();
-    }
-
-    // Trigger an event notifying of this change.
-    $event = new ConfigRevertEvent($type, $name);
-    $this->dispatcher->dispatch(ConfigRevertInterface::IMPORT, $event);
-
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function revert($type, $name) {
-    // Read the config from the file.
-    $full_name = $this->getFullName($type, $name);
-    $value = $this->extensionConfigStorage->read($full_name);
-    if (!$value) {
-      $value = $this->extensionOptionalConfigStorage->read($full_name);
-    }
-    if (!$value) {
-      return FALSE;
-    }
-
-    if ($type == 'system.simple') {
-      // Load the current config and replace the value, retaining the config
-      // hash (which is part of the _core config key's value).
-      $config = $this->configFactory->getEditable($full_name);
-      $core = $config->get('_core');
-      $config->setData($value);
-      $config->set('_core', $core);
-      $config->save();
-    }
-    else {
-      // Load the current config entity and replace the value. Note that
-      // the uuid and _core/hash values are retained for entity-based config,
-      // since updateFromStorageRecord() only updates values that are part of
-      // the passed-in array, and doesn't remove or alter other values.
-      $definition = $this->entityManager->getDefinition($type);
-      $id_key = $definition->getKey('id');
-      $id = $value[$id_key];
-      $entity_storage = $this->entityManager->getStorage($type);
-      $entity = $entity_storage->load($id);
-      $entity = $entity_storage->updateFromStorageRecord($entity, $value);
-      $entity->save();
-    }
-
-    // Trigger an event notifying of this change.
-    $event = new ConfigRevertEvent($type, $name);
-    $this->dispatcher->dispatch(ConfigRevertInterface::REVERT, $event);
-
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function delete($type, $name) {
-    $full_name = $this->getFullName($type, $name);
-    if (!$full_name) {
-      return FALSE;
-    }
-    $config = $this->configFactory->getEditable($full_name);
-    if (!$config) {
-      return FALSE;
-    }
-    $config->delete();
-
-    // Trigger an event notifying of this change.
-    $event = new ConfigRevertEvent($type, $name);
-    $this->dispatcher->dispatch(ConfigDeleteInterface::DELETE, $event);
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFromActive($type, $name) {
-    $full_name = $this->getFullName($type, $name);
-    return $this->activeConfigStorage->read($full_name);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFromExtension($type, $name) {
-    $full_name = $this->getFullName($type, $name);
-    $value = $this->extensionConfigStorage->read($full_name);
-    if (!$value) {
-      $value = $this->extensionOptionalConfigStorage->read($full_name);
-    }
-    return $value;
-  }
-
-  /**
-   * Returns the full name of a config item.
-   *
-   * @param string $type
-   *   The config type, or '' to indicate $name is already prefixed.
-   * @param string $name
-   *   The config name, without prefix.
-   *
-   * @return string
-   *   The config item's full name.
-   */
-  protected function getFullName($type, $name) {
-    if ($type == 'system.simple' || !$type) {
-      return $name;
-    }
-
-    $definition = $this->entityManager->getDefinition($type);
-    $prefix = $definition->getConfigPrefix() . '.';
-    return $prefix . $name;
-  }
-
-}
diff --git a/modules/contrib/config_update/tests/src/Unit/ConfigDifferTest.php b/modules/contrib/config_update/tests/src/Unit/ConfigDifferTest.php
deleted file mode 100644
index 9b2ad57..0000000
--- a/modules/contrib/config_update/tests/src/Unit/ConfigDifferTest.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-
-namespace Drupal\Tests\config_update\Unit;
-
-use Drupal\config_update\ConfigDiffer;
-use Drupal\Tests\UnitTestCase;
-
-/**
- * Tests the \Drupal\config_update\ConfigDiffer class.
- *
- * @group config_update
- *
- * @coversDefaultClass \Drupal\config_update\ConfigDiffer
- */
-class ConfigDifferTest extends UnitTestCase {
-
-  /**
-   * The mock translation object.
-   *
-   * @var \Drupal\Core\StringTranslation\TranslationInterface
-   */
-  protected $stringTranslation;
-
-  /**
-   * The config differ to test.
-   *
-   * @var \Drupal\config_update\ConfigDiffer
-   */
-  protected $configDiffer;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    $this->stringTranslation = $this->getMockBuilder('Drupal\Core\StringTranslation\TranslationInterface')->getMock();
-    $this->stringTranslation
-      ->method('t')
-      ->will($this->returnArgument(0));
-
-    $this->configDiffer = new ConfigDiffer($this->stringTranslation);
-  }
-
-  /**
-   * @covers \Drupal\config_update\ConfigDiffer::same
-   * @dataProvider sameProvider
-   */
-  public function testSame($a, $b, $expected) {
-    $this->assertEquals($expected, $this->configDiffer->same($a, $b));
-  }
-
-  /**
-   * Data provider for self:testSame().
-   */
-  public function sameProvider() {
-    $base = [
-      'uuid' => 'bar',
-      'a' => 'a',
-      'b' => 0,
-      'c' => [
-        'd' => TRUE,
-        'e' => FALSE,
-      ],
-    ];
-
-    return [
-      [$base, $base, TRUE],
-
-      // Add _core, omit uuid. Should match.
-      [
-        $base,
-        [
-          '_core' => 'foo',
-          'a' => 'a',
-          'b' => 0,
-          'c' => [
-            'd' => TRUE,
-            'e' => FALSE,
-          ],
-        ],
-        TRUE,
-      ],
-
-      // Change order. Should match.
-      [
-        $base,
-        [
-          'a' => 'a',
-          'uuid' => 'bar',
-          'b' => 0,
-          'c' => [
-            'd' => TRUE,
-            'e' => FALSE,
-          ],
-        ],
-        TRUE,
-      ],
-
-      // Change order and add _core in deeper level. Should match.
-      [
-        $base,
-        [
-          'uuid' => 'bar',
-          'a' => 'a',
-          'b' => 0,
-          'c' => [
-            'e' => FALSE,
-            '_core' => 'foo',
-            'd' => TRUE,
-          ],
-        ],
-        TRUE,
-      ],
-
-      // Omit a component. Should not match.
-      [
-        $base,
-        [
-          'uuid' => 'bar',
-          'a' => 'a',
-          'c' => [
-            'd' => TRUE,
-            'e' => FALSE,
-          ],
-        ],
-        FALSE,
-      ],
-
-      // Add a component. Should not match.
-      [
-        $base,
-        [
-          'uuid' => 'bar',
-          'a' => 'a',
-          'b' => 0,
-          'c' => [
-            'd' => TRUE,
-            'e' => FALSE,
-          ],
-          'f' => 'f',
-        ],
-        FALSE,
-      ],
-
-      // 0 should not match a string.
-      [
-        $base,
-        [
-          '_core' => 'foo',
-          'uuid' => 'bar',
-          'a' => 'a',
-          'b' => 'b',
-          'c' => [
-            'd' => TRUE,
-            'e' => FALSE,
-          ],
-        ],
-        FALSE,
-      ],
-
-      // FALSE should not match a string.
-      [
-        $base,
-        [
-          '_core' => 'foo',
-          'uuid' => 'bar',
-          'a' => 'a',
-          'b' => 0,
-          'c' => [
-            'd' => TRUE,
-            'e' => 'e',
-          ],
-        ],
-        FALSE,
-      ],
-
-      // TRUE should not match a string.
-      [
-        $base,
-        [
-          '_core' => 'foo',
-          'uuid' => 'bar',
-          'a' => 'a',
-          'b' => 0,
-          'c' => [
-            'd' => 'd',
-            'e' => FALSE,
-          ],
-        ],
-        FALSE,
-      ],
-    ];
-  }
-
-  /**
-   * @covers \Drupal\config_update\ConfigDiffer::diff
-   */
-  public function testDiff() {
-    $configOne = [
-      'uuid' => '1234-5678-90',
-      'id' => 'test.config.id',
-      'id_to_remove' => 'test.remove.id',
-      'type' => 'old_type',
-      'true_value' => TRUE,
-      'nested_array' => [
-        'flat_array' => [
-          'value2',
-          'value1',
-          'value3',
-        ],
-        'custom_key' => 'value',
-      ],
-    ];
-
-    $configTwo = [
-      'uuid' => '09-8765-4321',
-      'id' => 'test.config.id',
-      'type' => 'new_type',
-      'true_value' => FALSE,
-      'nested_array' => [
-        'flat_array' => [
-          'value2',
-          'value3',
-        ],
-        'custom_key' => 'value',
-        'custom_key_2' => 'value2',
-      ],
-    ];
-
-    $edits = $this->configDiffer->diff($configOne, $configTwo)->getEdits();
-
-    $expectedEdits = [
-      [
-        'copy' => [
-          'orig' => [
-            'id : test.config.id',
-          ],
-          'closing' => [
-            'id : test.config.id',
-          ],
-        ],
-      ],
-      [
-        'delete' => [
-          'orig' => [
-            'id_to_remove : test.remove.id',
-          ],
-          'closing' => FALSE,
-        ],
-      ],
-      [
-        'copy' => [
-          'orig' => [
-            'nested_array',
-            'nested_array::custom_key : value',
-          ],
-          'closing' => [
-            'nested_array',
-            'nested_array::custom_key : value',
-          ],
-        ],
-      ],
-      [
-        'add' => [
-          'orig' => FALSE,
-          'closing' => [
-            'nested_array::custom_key_2 : value2',
-          ],
-        ],
-      ],
-      [
-        'copy' => [
-          'orig' => [
-            'nested_array::flat_array',
-            'nested_array::flat_array::0 : value2',
-          ],
-          'closing' => [
-            'nested_array::flat_array',
-            'nested_array::flat_array::0 : value2',
-          ],
-        ],
-      ],
-      [
-        'change' => [
-          'orig' => [
-            'nested_array::flat_array::1 : value1',
-            'nested_array::flat_array::2 : value3',
-            'true_value : 1',
-            'type : old_type',
-          ],
-          'closing' => [
-            'nested_array::flat_array::1 : value3',
-            'true_value : ',
-            'type : new_type',
-          ],
-        ],
-      ],
-    ];
-
-    $this->assertEquals(count($expectedEdits), count($edits));
-
-    /** @var \Drupal\Component\Diff\Engine\DiffOp $diffOp */
-    foreach ($edits as $index => $diffOp) {
-      $this->assertEquals($expectedEdits[$index][$diffOp->type]['orig'], $diffOp->orig);
-      $this->assertEquals($expectedEdits[$index][$diffOp->type]['closing'], $diffOp->closing);
-    }
-  }
-
-}
diff --git a/modules/contrib/config_update/tests/src/Unit/ConfigListerTest.php b/modules/contrib/config_update/tests/src/Unit/ConfigListerTest.php
deleted file mode 100644
index b2a7493..0000000
--- a/modules/contrib/config_update/tests/src/Unit/ConfigListerTest.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-
-namespace Drupal\Tests\config_update\Unit;
-
-use Drupal\config_update\ConfigLister;
-use Drupal\Tests\UnitTestCase;
-
-/**
- * Tests the \Drupal\config_update\ConfigLister class.
- *
- * @group config_update
- *
- * @coversDefaultClass \Drupal\config_update\ConfigLister
- */
-class ConfigListerTest extends UnitTestCase {
-
-  /**
-   * The config lister to test.
-   *
-   * @var \Drupal\config_update\ConfigLister
-   */
-  protected $configLister;
-
-  /**
-   * The mocked entity definition information.
-   *
-   * @var string[]
-   */
-  protected $entityDefinitionInformation;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    $this->configLister = new ConfigLister($this->getEntityManagerMock(), $this->getConfigStorageMock('active'), $this->getConfigStorageMock('extension'), $this->getConfigStorageMock('optional'));
-  }
-
-  /**
-   * Creates a mock entity manager for the test.
-   */
-  protected function getEntityManagerMock() {
-    // Make a list of fake entity definitions. Make sure they are not sorted,
-    // to test that the methods sort them. Also make sure there are a couple
-    // with prefixes that are subsets of each other.
-    $this->entityDefinitionInformation = [
-      ['prefix' => 'foo.bar', 'type' => 'foo'],
-      ['prefix' => 'foo.barbaz', 'type' => 'bar'],
-      ['prefix' => 'baz.foo', 'type' => 'baz'],
-    ];
-
-    $definitions = [];
-    foreach ($this->entityDefinitionInformation as $info) {
-      $def = $this->getMockBuilder('Drupal\Core\Config\Entity\ConfigEntityTypeInterface')->getMock();
-      $def
-        ->expects($this->any())
-        ->method('getConfigPrefix')
-        ->willReturn($info['prefix']);
-      $def
-        ->expects($this->any())
-        ->method('isSubclassOf')
-        ->willReturn(TRUE);
-
-      $def->getConfigPrefix();
-
-      $definitions[$info['type']] = $def;
-    }
-
-    $manager = $this->getMockBuilder('Drupal\Core\Entity\EntityTypeManagerInterface')->getMock();
-    $manager
-      ->method('getDefinitions')
-      ->willReturn($definitions);
-
-    return($manager);
-  }
-
-  /**
-   * Creates a mock config storage object for the test.
-   *
-   * @param string $type
-   *   Type of storage object to return: 'active', 'extension', or 'optional'.
-   */
-  protected function getConfigStorageMock($type) {
-    if ($type == 'active') {
-      $storage = $this->getMockBuilder('Drupal\Core\Config\StorageInterface')->getMock();
-
-      // The only use of the read() method on active storage is
-      // with the core.extension config, to get the profile name.
-      $storage
-        ->method('read')
-        ->willReturn(['profile' => 'standard']);
-
-      $map = [
-        ['foo.bar', ['foo.bar.one', 'foo.bar.two', 'foo.bar.three']],
-        ['foo.barbaz', ['foo.barbaz.four', 'foo.barbaz.five', 'foo.barbaz.six']],
-        ['baz.foo'], [],
-        ['',
-          [
-            'foo.bar.one',
-            'foo.bar.two',
-            'foo.bar.three',
-            'foo.barbaz.four',
-            'foo.barbaz.five',
-            'foo.barbaz.six',
-            'something.else',
-            'another.one',
-          ],
-        ],
-      ];
-
-      $storage
-        ->method('listAll')
-        ->will($this->returnValueMap($map));
-    }
-    elseif ($type == 'extension') {
-      $storage = $this->getMockBuilder('Drupal\Core\Config\ExtensionInstallStorage')->disableOriginalConstructor()->getMock();
-      $storage
-        ->method('getComponentNames')
-        ->willReturn([
-          'foo.bar.one' => 'ignored',
-          'foo.bar.two' => 'ignored',
-          'foo.bar.seven' => 'ignored',
-          'foo.barnot.three' => 'ignored',
-          'something.else' => 'ignored',
-        ]);
-
-      $map = [
-        ['foo.bar', ['foo.bar.one', 'foo.bar.two', 'foo.bar.seven']],
-        ['baz.foo'], [],
-        ['',
-          [
-            'foo.bar.one',
-            'foo.bar.two',
-            'foo.bar.seven',
-            'foo.barbaz.four',
-            'foo.barnot.three',
-            'something.else',
-          ],
-        ],
-      ];
-
-      $storage
-        ->method('listAll')
-        ->will($this->returnValueMap($map));
-    }
-    else {
-      $storage = $this->getMockBuilder('Drupal\Core\Config\ExtensionInstallStorage')->disableOriginalConstructor()->getMock();
-      $storage
-        ->method('getComponentNames')
-        ->willReturn([
-          'foo.barbaz.four' => 'ignored',
-        ]);
-
-      $map = [
-        ['foo.bar'], [],
-        ['foo.barbaz', ['foo.barbaz.four']],
-        ['', ['foo.barbaz.four']],
-      ];
-      $storage
-        ->method('listAll')
-        ->will($this->returnValueMap($map));
-    }
-    return $storage;
-
-  }
-
-  /**
-   * @covers \Drupal\config_update\ConfigLister::listConfig
-   * @dataProvider listConfigProvider
-   */
-  public function testListConfig($a, $b, $expected) {
-    $this->assertEquals($expected, $this->configLister->listConfig($a, $b));
-  }
-
-  /**
-   * Data provider for self:testListConfig().
-   */
-  public function listConfigProvider() {
-    return [
-      // Arguments are $list_type, $name.
-      // We cannot really test the extension types here, because they rely
-      // on the going out to the file system to find out what config objects
-      // are there. This is too complex to mock. It is tested in the tests for
-      // the report output in the config_update_ui module tests. Anyway, we
-      // can test the other types.
-      ['type', 'system.all',
-        [
-          [
-            'foo.bar.one',
-            'foo.bar.two',
-            'foo.bar.three',
-            'foo.barbaz.four',
-            'foo.barbaz.five',
-            'foo.barbaz.six',
-            'something.else',
-            'another.one',
-          ],
-          [
-            'foo.bar.one',
-            'foo.bar.two',
-            'foo.bar.seven',
-            'foo.barbaz.four',
-            'foo.barnot.three',
-            'something.else',
-          ],
-          ['foo.barbaz.four'],
-        ],
-      ],
-      ['type', 'system.simple',
-        [
-          ['something.else', 'another.one'],
-          ['foo.barnot.three', 'something.else'],
-          [],
-        ],
-      ],
-      ['type', 'foo',
-        [
-          ['foo.bar.one', 'foo.bar.two', 'foo.bar.three'],
-          ['foo.bar.one', 'foo.bar.two', 'foo.bar.seven'],
-          [],
-        ],
-      ],
-      ['type', 'unknown.type', [[], [], []]],
-    ];
-  }
-
-  /**
-   * @covers \Drupal\config_update\ConfigLister::getType
-   */
-  public function testGetType() {
-    $return = $this->configLister->getType('not_in_list');
-    $this->assertNull($return);
-
-    foreach ($this->entityDefinitionInformation as $info) {
-      $return = $this->configLister->getType($info['type']);
-      $this->assertEquals($return->getConfigPrefix(), $info['prefix']);
-    }
-  }
-
-  /**
-   * @covers \Drupal\config_update\ConfigLister::getTypeByPrefix
-   */
-  public function testGetTypeByPrefix() {
-    $return = $this->configLister->getTypeByPrefix('not_in_list');
-    $this->assertNull($return);
-
-    foreach ($this->entityDefinitionInformation as $info) {
-      $return = $this->configLister->getTypeByPrefix($info['prefix']);
-      $this->assertEquals($return->getConfigPrefix(), $info['prefix']);
-    }
-  }
-
-  /**
-   * @covers \Drupal\config_update\ConfigLister::getTypeNameByConfigName
-   */
-  public function testGetTypeNameByConfigName() {
-    $return = $this->configLister->getTypeNameByConfigName('not_in_list');
-    $this->assertNull($return);
-
-    foreach ($this->entityDefinitionInformation as $info) {
-      $return = $this->configLister->getTypeNameByConfigName($info['prefix'] . '.something');
-      $this->assertEquals($return, $info['type']);
-    }
-  }
-
-}
diff --git a/modules/contrib/features/LICENSE.txt b/modules/contrib/features/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/contrib/features/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/contrib/features/composer.json b/modules/contrib/features/composer.json
deleted file mode 100644
index 9de2a5c..0000000
--- a/modules/contrib/features/composer.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "drupal/features",
-  "description": "Enables administrators to package configuration into modules.",
-  "type": "drupal-module",
-  "license": "GPL-2.0+",
-  "minimum-stability": "dev",
-  "require": { }
-}
diff --git a/modules/contrib/features/config/install/features.bundle.default.yml b/modules/contrib/features/config/install/features.bundle.default.yml
deleted file mode 100644
index ea4bb88..0000000
--- a/modules/contrib/features/config/install/features.bundle.default.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-name: Default
-machine_name: default
-description: ''
-assignments:
-  alter:
-    core: true
-    uuid: true
-    user_permissions: true
-    enabled: true
-    weight: 0
-  base:
-    types:
-      config:
-        comment_type: comment_type
-        node_type: node_type
-      content:
-        user: user
-    enabled: true
-    weight: -2
-  core:
-    types:
-      config:
-        date_format: date_format
-        field_storage_config: field_storage_config
-        entity_form_mode: entity_form_mode
-        image_style: image_style
-        menu: menu
-        responsive_image_style: responsive_image_style
-        user_role: user_role
-        entity_view_mode: entity_view_mode
-    enabled: true
-    weight: 5
-  dependency:
-    enabled: true
-    weight: 15
-  exclude:
-    types:
-      config:
-        features_bundle: features_bundle
-    curated: true
-    module:
-      installed: true
-      profile: true
-      namespace: true
-      namespace_any: false
-    enabled: true
-    weight: -5
-  existing:
-    enabled: true
-    weight: 12
-  forward_dependency:
-    enabled: true
-    weight: 4
-  namespace:
-    enabled: true
-    weight: 0
-  optional:
-    types:
-      config: {}
-    enabled: true
-    weight: 0
-  packages:
-    enabled: true
-    weight: -20
-  profile:
-    curated: true
-    standard:
-      files: true
-      dependencies: true
-    types:
-      config:
-        block: block
-        language_content_settings: language_content_settings
-        configurable_language: configurable_language
-        migration: migration
-        shortcut_set: shortcut_set
-        tour: tour
-    enabled: true
-    weight: 10
-  site:
-    types:
-      config:
-        action: action
-        contact_form: contact_form
-        block_content_type: block_content_type
-        rdf_mapping: rdf_mapping
-        search_page: search_page
-        taxonomy_vocabulary: taxonomy_vocabulary
-        editor: editor
-        filter_format: filter_format
-    enabled: true
-    weight: 7
-profile_name: ''
-is_profile: false
-
diff --git a/modules/contrib/features/config/install/features.settings.yml b/modules/contrib/features/config/install/features.settings.yml
deleted file mode 100644
index ed8b37a..0000000
--- a/modules/contrib/features/config/install/features.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-export:
-  folder: 'custom'
-langcode: en
diff --git a/modules/contrib/features/config/schema/features.schema.yml b/modules/contrib/features/config/schema/features.schema.yml
deleted file mode 100644
index 7d515d1..0000000
--- a/modules/contrib/features/config/schema/features.schema.yml
+++ /dev/null
@@ -1,207 +0,0 @@
-features.settings:
-  type: config_entity
-  label: 'Features settings'
-  mapping:
-    export:
-      type: mapping
-      label: "Export settings"
-      mapping:
-        folder:
-          type: string
-          label: "Folder"
-    langcode:
-      type: string
-      label: "Language Code"
-
-features.bundle.*:
-  type: config_entity
-  label: 'Features bundle'
-  mapping:
-    machine_name:
-      type: string
-      label: "Machine name"
-    name:
-      type: string
-      label: "Name"
-    description:
-      type: string
-      label: "Description"
-    assignments:
-      type: sequence
-      label: "Assignment"
-      sequence:
-        type: features.assignment.[%key]
-    profile_name:
-      type: string
-      label: "Profile name"
-    is_profile:
-      type: boolean
-      label: "Is install profile"
-
-features.assignment.*:
-  type: mapping
-  label: "Assignment settings"
-  mapping:
-    enabled:
-      type: boolean
-      label: "Enabled"
-    weight:
-      type: integer
-      label: "Weight"
-
-features.assignment.base:
-  type: mapping
-  label: "Base type"
-  mapping:
-    enabled:
-      type: boolean
-      label: "Enabled"
-    weight:
-      type: integer
-      label: "Weight"
-    types:
-      type: mapping
-      label: "Types"
-      mapping:
-        config:
-          type: sequence
-          label: "Configuration Types"
-          sequence:
-            type: string
-        content:
-          type: sequence
-          label: "Content entity types"
-          sequence:
-            type: string
-
-features.assignment.core:
-  type: mapping
-  label: "Core type"
-  mapping:
-    enabled:
-      type: boolean
-      label: "Enabled"
-    weight:
-      type: integer
-      label: "Weight"
-    types:
-      type: mapping
-      label: "Types"
-      mapping:
-        config:
-          type: sequence
-          label: "Configuration Types"
-          sequence:
-            type: string
-
-features.assignment.exclude:
-  type: mapping
-  label: "Exclude"
-  mapping:
-    enabled:
-      type: boolean
-      label: "Enabled"
-    weight:
-      type: integer
-      label: "Weight"
-    types:
-      type: mapping
-      label: "Types"
-      mapping:
-        config:
-          type: sequence
-          label: "Configuration Types"
-          sequence:
-            type: string
-    curated:
-      type: boolean
-      label: "Exclude designated site-specific configuration"
-    module:
-      type: mapping
-      label: "Module"
-      mapping:
-        installed:
-          type: boolean
-          label: "Exclude installed module-provided entity configuration"
-        profile:
-          type: boolean
-          label: "Don't exclude install profile's configuration"
-        namespace:
-          type: boolean
-          label: "Don't exclude non-installed configuration by namespace"
-        namespace_any:
-          type: boolean
-          label: "Don't exclude ANY configuration by namespace"
-
-features.assignment.optional:
-  type: mapping
-  label: "Optional"
-  mapping:
-    enabled:
-      type: boolean
-      label: "Enabled"
-    weight:
-      type: integer
-      label: "Weight"
-    types:
-      type: mapping
-      label: "Types"
-      mapping:
-        config:
-          type: sequence
-          label: "Configuration Types"
-          sequence:
-            type: string
-
-features.assignment.profile:
-  type: mapping
-  label: "Profile"
-  mapping:
-    enabled:
-      type: boolean
-      label: "Enabled"
-    weight:
-      type: integer
-      label: "Weight"
-    curated:
-      type: boolean
-      label: "Add commonly-needed configuration"
-    standard:
-      type: mapping
-      label: "Standard"
-      mapping:
-        files:
-          type: boolean
-          label: "Add configuration and files from Standard profile"
-        dependencies:
-          type: boolean
-          label: "Add module and theme dependencies from Standard profile"
-    types:
-      type: mapping
-      label: "Types"
-      mapping:
-        config:
-          type: sequence
-          label: "Configuration Types"
-          sequence:
-            type: string
-
-features.assignment.site:
-  type: mapping
-  label: "Site"
-  mapping:
-    enabled:
-      type: boolean
-      label: "Enabled"
-    weight:
-      type: integer
-      label: "Weight"
-    types:
-      type: mapping
-      label: "Types"
-      mapping:
-        config:
-          type: sequence
-          label: "Configuration Types"
-          sequence:
-            type: string
diff --git a/modules/contrib/features/drush/features.drush.inc b/modules/contrib/features/drush/features.drush.inc
deleted file mode 100644
index b4abe91..0000000
--- a/modules/contrib/features/drush/features.drush.inc
+++ /dev/null
@@ -1,911 +0,0 @@
-<?php
-
-/**
- * @file
- * Features module drush integration.
- */
-
-use Drupal\features\ConfigurationItem;
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\Plugin\FeaturesGeneration\FeaturesGenerationWrite;
-use Drupal\Component\Diff\DiffFormatter;
-
-/**
- * Implements hook_drush_command().
- */
-function features_drush_command() {
-  $items = array();
-
-  $items['features-status'] = array(
-    'description' => 'Display current Features settings.',
-    'aliases' => array('fs'),
-  );
-
-  $items['features-list-packages'] = array(
-    'description' => 'Display a list of all existing features and packages available to be generated.  If a package name is provided as an argument, then all of the configuration objects assigned to that package will be listed.',
-    'examples' => array(
-      "drush features-list-packages" => 'Display a list of all existing featurea and packages available to be generated.',
-      "drush features-list-packages 'example_article'" => "Display a list of all configuration objects assigned to the 'example_article' package.",
-    ),
-    'arguments' => array(
-      'package' => 'The package to list. Optional; if specified, lists all configuration objects assigned to that package. If no package is specified, lists all of the features.',
-    ),
-    'outputformat' => array(
-      'default' => 'table',
-      'pipe-format' => 'list',
-      'field-labels' => array(
-        'name' => 'Name',
-        'machine_name' => 'Machine name',
-        'status' => 'Status',
-        'version' => 'Version',
-        'state' => 'State',
-        'object' => 'Configuration object',
-      ),
-      'output-data-type' => 'format-table',
-    ),
-    'aliases' => array('fl'),
-  );
-
-  $items['features-import-all'] = array(
-    'description' => 'Import module config from all installed features.',
-    'examples' => array(
-      "drush features-import-all" => 'Import module config from all installed features.',
-    ),
-    'aliases' => array('fra', 'fia', 'fim-all'),
-  );
-
-  $items['features-export'] = array(
-    'description' => "Export the configuration on your site into a custom module.",
-    'arguments' => array(
-      'package' => 'A space delimited list of features to export.',
-    ),
-    'options' => array(
-      'add-profile' => 'Package features into an install profile.',
-    ),
-    'examples' => array(
-      "drush features-export" => 'Export all available packages.',
-      "drush features-export example_article example_page" => "Export the example_article and example_page packages.",
-      "drush features-export --add-profile" => "Export all available packages and add them to an install profile.",
-    ),
-    // Add previous "fu" alias for compatibility.
-    'aliases' => array('fex', 'fu', 'fua', 'fu-all'),
-  );
-
-  $items['features-add'] = array(
-    'description' => "Add a config item to a feature package.",
-    'arguments' => array(
-      'feature' => 'Feature package to export and add config to.',
-      'components' => 'Patterns of config to add, see features-components for the format of patterns.',
-    ),
-    'aliases' => array('fa', 'fe'),
-  );
-
-  $items['features-components'] = array(
-    'description' => 'List features components.',
-    'arguments' => array(
-      'patterns' => 'The features components type to list. Omit this argument to list all components.',
-    ),
-    'options' => array(
-      'exported' => array(
-        'description' => 'Show only components that have been exported.',
-      ),
-      'not-exported' => array(
-        'description' => 'Show only components that have not been exported.',
-      ),
-    ),
-    'aliases' => array('fc'),
-  );
-
-  $items['features-diff'] = array(
-    'description' => "Show the difference between the active config and the default config stored in a feature package.",
-    'arguments' => array(
-      'feature' => 'The feature in question.',
-    ),
-    'options' => array(
-      'ctypes' => 'Comma separated list of component types to limit the output to. Defaults to all types.',
-      'lines' => 'Generate diffs with <n> lines of context instead of the usual two.',
-    ),
-    'aliases' => array('fd'),
-  );
-
-  $items['features-import'] = array(
-    'description' => "Import a module config into your site.",
-    'arguments' => array(
-      'feature' => 'A space delimited list of features or feature:component pairs to import.',
-    ),
-    'options' => array(
-      'force' => "Force import even if config is not overridden.",
-    ),
-    'examples' => array(
-      'drush features-import foo:node.type.page foo:taxonomy.vocabulary.tags bar' => 'Import node and taxonomy config of feature "foo". Import all config of feature "bar".',
-    ),
-    'aliases' => array('fim', 'fr'),
-  );
-
-  foreach ($items as $name => &$item) {
-    $item['options']['bundle'] = array(
-      'description' => 'Use a specific bundle namespace.',
-    );
-  }
-
-  return $items;
-}
-
-/**
- * Applies global options for Features drush commands.
- *
- * The option --name="bundle_name" sets the bundle namespace.
- *
- * @return \Drupal\features\FeaturesAssignerInterface
-*/
-function _drush_features_options() {
-  /** @var \Drupal\features\FeaturesAssignerInterface $assigner */
-  $assigner = \Drupal::service('features_assigner');
-  $bundle_name = drush_get_option('bundle');
-  if (!empty($bundle_name)) {
-    $bundle = $assigner->applyBundle($bundle_name);
-    if ($bundle->getMachineName() != $bundle_name) {
-      drush_log(dt('Bundle @name not found. Using default.', array('@name' => $bundle_name)), 'warning');
-    }
-  }
-  else {
-    $assigner->assignConfigPackages();
-  }
-  return $assigner;
-}
-
-/**
- * Provides Drush command callback for features-status.
- */
-function drush_features_status() {
-  $args = func_get_args();
-  $assigner = _drush_features_options();
-
-
-  /** @var \Drupal\features\FeaturesManagerInterface $manager */
-  $manager = \Drupal::service('features.manager');
-  $current_bundle = $assigner->getBundle();
-  $export_settings = $manager->getExportSettings();
-  $methods = $assigner->getEnabledAssigners();
-  if ($current_bundle->isDefault()) {
-    drush_print(dt('Current bundle: none'));
-  }
-  else {
-    drush_print(dt('Current bundle: @name (@machine_name)',
-      array(
-        '@name' => $current_bundle->getName(),
-        '@machine_name' => $current_bundle->getMachineName(),
-      )));
-  }
-  drush_print(dt('Export folder: @folder', array('@folder' => $export_settings['folder'])));
-  $dt_args = array('@methods' => implode(', ', array_keys($methods)));
-  drush_print(dt('The following assignment methods are enabled:'));
-  drush_print(dt('  @methods', $dt_args));
-
-  if (!empty($args)) {
-    $config = $manager->getConfigCollection();
-    if (count($args) > 1) {
-      print_r(array_keys($config));
-    }
-    else {
-      print_r($config[$args[0]]);
-    }
-  }
-}
-
-/**
- * Drush command callback for features-list-packages.
- *
- * @param string $package_name
- *   (optional) The package name.
- *
- * @return array|bool
- */
-function drush_features_list_packages($package_name = '') {
-  $assigner = _drush_features_options();
-  $current_bundle = $assigner->getBundle();
-  $namespace = $current_bundle->isDefault() ? '' : $current_bundle->getMachineName();
-
-  /** @var \Drupal\features\FeaturesManagerInterface $manager */
-  $manager = \Drupal::service('features.manager');
-  $packages = $manager->getPackages();
-
-  $packages = $manager->filterPackages($packages, $namespace);
-  $result = array();
-
-  // If no package was specified, list all packages.
-  if (empty($package_name)) {
-    drush_hide_output_fields(array('object'));
-    foreach ($packages as $package) {
-      $overrides = $manager->detectOverrides($package);
-      $state = $package->getState();
-      if (!empty($overrides) && ($package->getStatus() != FeaturesManagerInterface::STATUS_NO_EXPORT)) {
-        $state = FeaturesManagerInterface::STATE_OVERRIDDEN;
-      }
-
-      $result[$package->getMachineName()] = array(
-        'name' => $package->getName(),
-        'machine_name' => $package->getMachineName(),
-        'status' => $manager->statusLabel($package->getStatus()),
-        'version' => $package->getVersion(),
-        'state' => ($state != FeaturesManagerInterface::STATE_DEFAULT)
-          ? $manager->stateLabel($state)
-          : '',
-      );
-    }
-    return $result;
-  }
-  // If a valid package was listed, list its configuration.
-  else {
-    foreach ($packages as $package) {
-      if ($package->getMachineName() == $package_name) {
-        drush_hide_output_fields(array(
-          'machine_name',
-          'name',
-          'status',
-          'version',
-          'state',
-        ));
-        foreach ($package->getConfig() as $item_name) {
-          $result[$item_name] = array(
-            'object' => $item_name,
-          );
-        }
-        return $result;
-      }
-    }
-
-  }
-
-  // If no matching package found, return an error.
-  drush_log(dt('Package "@package" not found.', array('@package' => $package_name)), 'warning');
-  return FALSE;
-}
-
-/**
- * Drush command callback for features-import-all.
- *
- */
-function drush_features_import_all() {
-  $assigner = _drush_features_options();
-  $current_bundle = $assigner->getBundle();
-  $namespace = $current_bundle->isDefault() ? '' : $current_bundle->getMachineName();
-
-  /** @var \Drupal\features\FeaturesManagerInterface $manager */
-  $manager = \Drupal::service('features.manager');
-  $packages = $manager->getPackages();
-  $packages = $manager->filterPackages($packages, $namespace);
-  $overridden = array();
-
-  foreach ($packages as $package) {
-    $overrides = $manager->detectOverrides($package);
-    $missing = $manager->detectMissing($package);
-    if ((!empty($missing) || !empty($overrides)) && ($package->getStatus() == FeaturesManagerInterface::STATUS_INSTALLED)) {
-      $overridden[] = $package->getMachineName();
-    }
-  }
-
-  if (!empty($overridden)) {
-    call_user_func_array('drush_features_import', $overridden);
-  }
-  else {
-    drush_log(dt('Current state already matches active config, aborting.'), 'ok');
-  }
-}
-
-/**
- * Provides Drush command callback for features-export.
- */
-function drush_features_export($packages = NULL) {
-  $packages = func_get_args();
-  $assigner = _drush_features_options();
-
-  /** @var \Drupal\features\FeaturesManagerInterface $manager */
-  $manager = \Drupal::service('features.manager');
-  /** @var \Drupal\features\FeaturesGeneratorInterface $generator */
-  $generator = \Drupal::service('features_generator');
-
-  $current_bundle = $assigner->getBundle();
-
-  if (drush_get_option('add-profile')) {
-    if ($current_bundle->isDefault) {
-      return drush_set_error('', dt("Must specify a profile name with --name"));
-    }
-    $current_bundle->setIsProfile(TRUE);
-  }
-
-  $all_packages = $manager->getPackages();
-  foreach ($packages as $name) {
-    if (!isset($all_packages[$name])) {
-      return drush_set_error('', dt("The package @name does not exist.", array('@name' => $name)));
-    }
-  }
-
-  if (empty($packages)) {
-    $packages = $all_packages;
-    $dt_args = array('@modules' => implode(', ', array_keys($packages)));
-    drush_print(dt('The following extensions will be exported: @modules', $dt_args));
-    if (!drush_confirm(dt('Do you really want to continue?'))) {
-      return drush_user_abort('Aborting.');
-    }
-  }
-
-  // If any packages exist, confirm before overwriting.
-  if ($existing_packages = $manager->listPackageDirectories($packages, $current_bundle)) {
-    foreach ($existing_packages as $name => $directory) {
-      drush_print(dt("The extension @name already exists at @directory.", array('@name' => $name, '@directory' => $directory)));
-    }
-    // Apparently, format_plural is not always available.
-    if (count($existing_packages) == 1) {
-      $message = dt('Would you like to overwrite it?');
-    }
-    else {
-      $message = dt('Would you like to overwrite them?');
-    }
-    if (!drush_confirm($message)) {
-      return drush_user_abort();
-    }
-  }
-
-  // Use the write generation method.
-  $method_id = FeaturesGenerationWrite::METHOD_ID;
-  $result = $generator->generatePackages($method_id, $current_bundle, $packages);
-
-  foreach ($result as $message) {
-    $type = $message['success'] ? 'success' : 'error';
-    drush_log($message['message'], $message['variables'], $type);
-  }
-}
-
-/**
- * Adds a component to a features module.
- *
- * @param
- *   The selected components.
- */
-function drush_features_add() {
-  if ($args = func_get_args()) {
-    $assigner = _drush_features_options();
-
-    /** @var \Drupal\features\FeaturesManagerInterface $manager */
-    $manager = \Drupal::service('features.manager');
-    /** @var \Drupal\features\FeaturesGeneratorInterface $generator */
-    $generator = \Drupal::service('features_generator');
-
-    $current_bundle = $assigner->getBundle();
-
-    $module = array_shift($args);
-    if (empty($args)) {
-      return drush_set_error('', 'No components supplied.');
-    }
-    $components = _drush_features_component_list();
-    $options = array(
-      'exported' => FALSE,
-    );
-
-    $filtered_components = _drush_features_component_filter($components, $args, $options);
-    $items = $filtered_components['components'];
-
-    if (empty($items)) {
-      return drush_set_error('', 'No components to add.');
-    }
-
-    $packages = array($module);
-    // If any packages exist, confirm before overwriting.
-    if ($existing_packages = $manager->listPackageDirectories($packages)) {
-      foreach ($existing_packages as $name => $directory) {
-        drush_print(dt("The extension @name already exists at @directory.", array('@name' => $name, '@directory' => $directory)));
-      }
-      // Apparently, format_plural is not always available.
-      if (count($existing_packages) == 1) {
-        $message = dt('Would you like to overwrite it?');
-      }
-      else {
-        $message = dt('Would you like to overwrite them?');
-      }
-      if (!drush_confirm($message)) {
-        return drush_user_abort();
-      }
-    }
-    else {
-      $package = $manager->initPackage($module, NULL, '', 'module', $current_bundle);
-      list($full_name, $path) = $manager->getExportInfo($package, $current_bundle);
-      drush_print(dt('Will create a new extension @name in @directory', array('@name' => $full_name, '@directory' => $path)));
-      if (!drush_confirm(dt('Do you really want to continue?'))) {
-        drush_die('Aborting.');
-      }
-    }
-
-    $config = _drush_features_build_config($items);
-
-    $manager->assignConfigPackage($module, $config);
-
-    // Use the write generation method.
-    $method_id = FeaturesGenerationWrite::METHOD_ID;
-    $result = $generator->generatePackages($method_id, $current_bundle, $packages);
-
-    foreach ($result as $message) {
-      $type = $message['success'] ? 'success' : 'error';
-      drush_log($message['message'], $message['variables'], $type);
-    }
-  }
-  else {
-    return drush_set_error('', 'No feature name given.');
-  }
-}
-
-/**
- * Lists components, with pattern matching.
- */
-function drush_features_components() {
-  $args = func_get_args();
-  _drush_features_options();
-
-  $components = _drush_features_component_list();
-  ksort($components);
-  // If no args supplied, prompt with a list.
-  if (empty($args)) {
-    $types = array_keys($components);
-    array_unshift($types, 'all');
-    $choice = drush_choice($types, 'Enter a number to choose which component type to list.');
-    if ($choice === FALSE) {
-      return;
-    }
-
-    $args = ($choice == 0) ? array('*') : array($types[$choice]);
-  }
-  $options = array(
-    'provided by' => TRUE,
-  );
-  if (drush_get_option(array('exported', 'e'), NULL)) {
-    $options['not exported'] = FALSE;
-  }
-  elseif (drush_get_option(array('not-exported', 'o'), NULL)) {
-    $options['exported'] = FALSE;
-  }
-
-  $filtered_components = _drush_features_component_filter($components, $args, $options);
-  if ($filtered_components) {
-    _drush_features_component_print($filtered_components);
-  }
-}
-
-/**
- * Lists the differences in the package config vs the active store.
- *
- * @param string $package
- *   The machine name of a package.
- */
-function drush_features_diff() {
-  if (!$args = func_get_args()) {
-    drush_print_table(drush_features_list_packages());
-    return;
-  }
-
-  /** @var \Drupal\features\FeaturesManagerInterface $manager */
-  $manager = \Drupal::service('features.manager');
-  /** @var \Drupal\features\FeaturesAssignerInterface $assigner */
-  $assigner = \Drupal::service('features_assigner');
-  $assigner->assignConfigPackages();
-
-  $module = $args[0];
-  $filter_ctypes = drush_get_option("ctypes");
-  if ($filter_ctypes) {
-    $filter_ctypes = explode(',', $filter_ctypes);
-  }
-
-  $feature = $manager->loadPackage($module, TRUE);
-  if (empty($feature)) {
-    drush_log(dt('No such feature is available: @module', array('@module' => $module)), 'error');
-    return;
-  }
-
-  $lines = drush_get_option('lines');
-  $lines = isset($lines) ? $lines : 2;
-
-  $formatter = new DiffFormatter();
-  $formatter->leading_context_lines = $lines;
-  $formatter->trailing_context_lines = $lines;
-  $formatter->show_header = FALSE;
-
-  if (drush_get_context('DRUSH_NOCOLOR')) {
-    $red = $green = "%s";
-  }
-  else {
-    $red = "\033[31;40m\033[1m%s\033[0m";
-    $green = "\033[0;32;40m\033[1m%s\033[0m";
-  }
-
-  $overrides = $manager->detectOverrides($feature);
-  $missing = $manager->reorderMissing($manager->detectMissing($feature));
-  $overrides = array_merge($overrides, $missing);
-
-  if (empty($overrides)) {
-    drush_print(dt('Active config matches stored config for @module.', array('@module' => $module)));
-  }
-  else {
-    /** @var \Drupal\config_update\ConfigDiffInterface $config_diff */
-    $config_diff = \Drupal::service('config_update.config_diff');
-    /** @var \Drupal\Core\Config\StorageInterface $active_storage */
-    $active_storage = \Drupal::service('config.storage');
-
-    // Print key for colors.
-    drush_print(dt('Legend: '));
-    drush_print(sprintf($red, dt('Code:    drush features-import will replace the active config with the displayed code.')));
-    drush_print(sprintf($green, dt('Active:  drush features-export will update the exported feature with the displayed active config')));
-
-    foreach ($overrides as $name) {
-      $message = '';
-      if (in_array($name, $missing)) {
-        $message = sprintf($red, t('(missing from active)'));
-        $extension = array();
-      }
-      else {
-        $active = $manager->getActiveStorage()->read($name);
-        $extension = $manager->getExtensionStorages()->read($name);
-        if (empty($extension)) {
-          $extension = array();
-          $message = sprintf($green, t('(not exported)'));
-        }
-        $diff = $config_diff->diff($extension, $active);
-        $rows = explode("\n", $formatter->format($diff));
-      }
-      drush_print();
-      drush_print(dt("Config @name @message", array('@name' => $name, '@message' => $message)));
-      if (!empty($extension)) {
-        foreach ($rows as $row) {
-          if (strpos($row, '>') === 0) {
-            drush_print(sprintf($green, $row));
-          }
-          elseif (strpos($row, '<') === 0) {
-            drush_print(sprintf($red, $row));
-          }
-          else {
-            drush_print($row);
-          }
-        }
-      }
-    }
-  }
-}
-
-/**
- * Imports module config into the active store.
- *
- * Same as the old "revert" functionality.
- */
-function drush_features_import() {
-  if ($args = func_get_args()) {
-    _drush_features_options();
-
-    // Determine if revert should be forced.
-    $force = drush_get_option('force');
-    // Determine if -y was supplied. If so, we can filter out needless output
-    // from this command.
-    $skip_confirmation = drush_get_context('DRUSH_AFFIRMATIVE');
-
-    /** @var \Drupal\features\FeaturesManagerInterface $manager */
-    $manager = \Drupal::service('features.manager');
-
-    // Parse list of arguments.
-    $modules = array();
-    foreach ($args as $arg) {
-      $arg = explode(':', $arg);
-      $module = array_shift($arg);
-      $component = array_shift($arg);
-
-      if (isset($module)) {
-        if (empty($component)) {
-          // If we received just a feature name, this means that we need all of
-          // its components.
-          $modules[$module] = TRUE;
-        }
-        elseif ($modules[$module] !== TRUE) {
-          if (!isset($modules[$module])) {
-            $modules[$module] = array();
-          }
-          $modules[$module][] = $component;
-        }
-      }
-    }
-
-    // Process modules.
-    foreach ($modules as $module => $components_needed) {
-
-      $dt_args['@module'] = $module;
-      /** @var \Drupal\features\Package $feature */
-      $feature = $manager->loadPackage($module, TRUE);
-      if (empty($feature)) {
-        drush_log(dt('No such feature is available: @module', $dt_args), 'error');
-        return;
-      }
-
-      if ($feature->getStatus() != FeaturesManagerInterface::STATUS_INSTALLED) {
-        drush_log(dt('No such feature is installed: @module', $dt_args), 'error');
-        return;
-      }
-
-      // Forcefully revert all components of a feature.
-      if ($force) {
-        $components = $feature->getConfigOrig();
-      }
-      // Only revert components that are detected to be Overridden.
-      else {
-        $components = $manager->detectOverrides($feature);
-        $missing = $manager->reorderMissing($manager->detectMissing($feature));
-        // Be sure to import missing components first.
-        $components = array_merge($missing, $components);
-      }
-
-      if (!empty($components_needed) && is_array($components_needed)) {
-        $components = array_intersect($components, $components_needed);
-      }
-
-      if (empty($components)) {
-        drush_log(dt('Current state already matches active config, aborting.'), 'ok');
-      }
-      else {
-        // Determine which config the user wants to import/revert.
-        $config_to_create = [];
-        foreach ($components as $component) {
-          $dt_args['@component'] = $component;
-          $confirmation_message = 'Do you really want to import @module : @component?';
-          if ($skip_confirmation || drush_confirm(dt($confirmation_message, $dt_args))) {
-            $config_to_create[$component] = '';
-          }
-        }
-
-        // Perform the import/revert.
-        $config_imported = $manager->createConfiguration($config_to_create);
-
-        // List the results.
-        foreach ($components as $component) {
-          $dt_args['@component'] = $component;
-          if (isset($config_imported['new'][$component])) {
-            drush_log(dt('Imported @module : @component.', $dt_args), 'ok');
-          }
-          elseif (isset($config_imported['updated'][$component])) {
-            drush_log(dt('Reverted @module : @component.', $dt_args), 'ok');
-          }
-          elseif (!isset($config_to_create[$component])) {
-            drush_log(dt('Skipping @module : @component.', $dt_args), 'ok');
-          }
-          else {
-            drush_log(dt('Error importing @module : @component.', $dt_args), 'error');
-          }
-        }
-      }
-    }
-  }
-  else {
-    drush_print_table(drush_features_list_packages());
-    return;
-  }
-}
-
-/**
- * Returns an array of full config names given a array[$type][$component].
- *
- * @param array $items
- *   The items to return data for.
- */
-function _drush_features_build_config(array $items) {
-  /** @var \Drupal\features\FeaturesManagerInterface $manager */
-  $manager = \Drupal::service('features.manager');
-  $result = array();
-  foreach ($items as $config_type => $item) {
-    foreach ($item as $item_name => $title) {
-      $result[] = $manager->getFullName($config_type, $item_name);
-    }
-  }
-  return $result;
-}
-
-/**
- * Returns a listing of all known components, indexed by source.
- */
-function _drush_features_component_list() {
-  $result = array();
-  /** @var \Drupal\features\FeaturesManagerInterface $manager */
-  $manager = \Drupal::service('features.manager');
-  $config = $manager->getConfigCollection();
-  foreach ($config as $item_name => $item) {
-    $result[$item->getType()][$item->getShortName()] = $item->getLabel();
-  }
-  return $result;
-}
-
-/**
- * Filters components by patterns.
- */
-function _drush_features_component_filter($all_components, $patterns = array(), $options = array()) {
-  $options += array(
-    'exported' => TRUE,
-    'not exported' => TRUE,
-    'provided by' => FALSE,
-  );
-  $pool = array();
-  // Maps exported components to feature modules.
-  $components_map = _drush_features_get_component_map();
-  // First filter on exported state.
-  foreach ($all_components as $source => $components) {
-    foreach ($components as $name => $title) {
-      $exported = count($components_map[$source][$name]) > 0;
-      if ($exported) {
-        if ($options['exported']) {
-          $pool[$source][$name] = $title;
-        }
-      }
-      else {
-        if ($options['not exported']) {
-          $pool[$source][$name] = $title;
-        }
-      }
-    }
-  }
-
-  $state_string = '';
-
-  if (!$options['exported']) {
-    $state_string = 'unexported';
-  }
-  elseif (!$options['not exported']) {
-    $state_string = 'exported';
-  }
-
-  $selected = array();
-  foreach ($patterns as $pattern) {
-    // Rewrite * to %. Let users use both as wildcard.
-    $pattern = strtr($pattern, array('*' => '%'));
-    $sources = array();
-    list($source_pattern, $component_pattern) = explode(':', $pattern, 2);
-    // If source is empty, use a pattern.
-    if ($source_pattern == '') {
-      $source_pattern = '%';
-    }
-    if ($component_pattern == '') {
-      $component_pattern = '%';
-    }
-
-    $preg_source_pattern = strtr(preg_quote($source_pattern, '/'), array('%' => '.*'));
-    $preg_component_pattern = strtr(preg_quote($component_pattern, '/'), array('%' => '.*'));
-    // If it isn't a pattern, but a simple string, we don't anchor the
-    // pattern. This allows for abbreviating. Otherwise, we do, as this seems
-    // more natural for patterns.
-    if (strpos($source_pattern, '%') !== FALSE) {
-      $preg_source_pattern = '^' . $preg_source_pattern . '$';
-    }
-    if (strpos($component_pattern, '%') !== FALSE) {
-      $preg_component_pattern = '^' . $preg_component_pattern . '$';
-    }
-    $matches = array();
-
-    // Find the sources.
-    $all_sources = array_keys($pool);
-    $matches = preg_grep('/' . $preg_source_pattern . '/', $all_sources);
-    if (count($matches) > 0) {
-      // If we have multiple matches and the source string wasn't a
-      // pattern, check if one of the matches is equal to the pattern, and
-      // use that, or error out.
-      if (count($matches) > 1 and $preg_source_pattern[0] != '^') {
-        if (in_array($source_pattern, $matches)) {
-          $matches = array($source_pattern);
-        }
-        else {
-          return drush_set_error('', dt('Ambiguous source "@source", matches @matches', array(
-            '@source' => $source_pattern,
-            '@matches' => implode(', ', $matches),
-          )));
-        }
-      }
-      // Loose the indexes preg_grep preserved.
-      $sources = array_values($matches);
-    }
-    else {
-      return drush_set_error('', dt('No @state sources match "@source"', array('@state' => $state_string, '@source' => $source_pattern)));
-    }
-
-    // Now find the components.
-    foreach ($sources as $source) {
-      // Find the components.
-      $all_components = array_keys($pool[$source]);
-      // See if there's any matches.
-      $matches = preg_grep('/' . $preg_component_pattern . '/', $all_components);
-      if (count($matches) > 0) {
-        // If we have multiple matches and the components string wasn't a
-        // pattern, check if one of the matches is equal to the pattern, and
-        // use that, or error out.
-        if (count($matches) > 1 and $preg_component_pattern[0] != '^') {
-          if (in_array($component_pattern, $matches)) {
-            $matches = array($component_pattern);
-          }
-          else {
-            return drush_set_error('', dt('Ambiguous component "@component", matches @matches', array(
-              '@component' => $component_pattern,
-              '@matches' => implode(', ', $matches),
-            )));
-          }
-        }
-        if (!is_array($selected[$source])) {
-          $selected[$source] = array();
-        }
-        $selected[$source] += array_intersect_key($pool[$source], array_flip($matches));
-      }
-      else {
-        // No matches. If the source was a pattern, just carry on, else
-        // error out. Allows for patterns like :*field*
-        if ($preg_source_pattern[0] != '^') {
-          return drush_set_error('', dt('No @state @source components match "@component"', array(
-            '@state' => $state_string,
-            '@component' => $component_pattern,
-            '@source' => $source,
-          )));
-        }
-      }
-    }
-  }
-
-  // Lastly, provide feature module information on the selected components, if
-  // requested.
-  $provided_by = array();
-  if ($options['provided by'] && $options['exported']) {
-    foreach ($selected as $source => $components) {
-      foreach ($components as $name => $title) {
-        $exported = count($components_map[$source][$name]) > 0;
-        if ($exported) {
-          $provided_by[$source . ':' . $name] = implode(', ', $components_map[$source][$name]);
-        }
-      }
-    }
-  }
-
-  return array(
-    'components' => $selected,
-    'sources' => $provided_by,
-  );
-}
-
-/**
- * Provides a component to feature map (port of features_get_component_map).
- */
-function _drush_features_get_component_map() {
-  $result = array();
-  /** @var \Drupal\features\FeaturesManagerInterface $manager */
-  $manager = \Drupal::service('features.manager');
-  // Recalc full config list without running assignments.
-  $config = $manager->getConfigCollection();
-  $packages = $manager->getPackages();
-
-  foreach ($config as $item_name => $item) {
-    $type = $item->getType();
-    $short_name = $item->getShortName();
-    $name = $item->getName();
-    if (!isset($result[$type][$short_name])) {
-      $result[$type][$short_name] = array();
-    }
-    if (!empty($item->getPackage())) {
-      $package = $packages[$item->getPackage()];
-      $result[$type][$short_name][] = $package->getMachineName();
-    }
-  }
-
-  return $result;
-}
-
-/**
- * Prints a list of filtered components.
- */
-function _drush_features_component_print($filtered_components) {
-  $rows = array(array(dt('Available sources')));
-  foreach ($filtered_components['components'] as $source => $components) {
-    foreach ($components as $name => $value) {
-      $row = array($source . ':' . $name);
-      if (isset($filtered_components['sources'][$source . ':' . $name])) {
-        $row[] = dt('Provided by') . ': ' . $filtered_components['sources'][$source . ':' . $name];
-      }
-      $rows[] = $row;
-    }
-  }
-
-  drush_print_table($rows, TRUE);
-}
diff --git a/modules/contrib/features/features.info.yml b/modules/contrib/features/features.info.yml
deleted file mode 100644
index ed60a6e..0000000
--- a/modules/contrib/features/features.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: 'Features'
-type: module
-description: 'Enables administrators to package configuration into modules.'
-package: Development
-# core: 8.x
-dependencies:
-  - config
-  - config_update
-
-# Information added by Drupal.org packaging script on 2017-03-07
-version: '8.x-3.5'
-core: '8.x'
-project: 'features'
-datestamp: 1488908587
diff --git a/modules/contrib/features/features.install b/modules/contrib/features/features.install
deleted file mode 100644
index 5bb46f0..0000000
--- a/modules/contrib/features/features.install
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains install and update functions for Features.
- */
-
-/**
- * Rebuild the container to add a parameter to the features.manager service.
- */
-function features_update_8300() {
-  // Empty update to cause a cache rebuild so that the container is rebuilt.
-}
-
-/**
- * Update existing feature bundles with new alter plugin configuration.
- */
-function features_update_8301() {
-  foreach (\Drupal::service('entity_type.manager')->getStorage('features_bundle')->loadMultiple() as $bundle) {
-    $bundle = \Drupal::configFactory()->getEditable('features.bundle.' . $bundle->id());
-    $assignments = $bundle->get('assignments');
-    $assignments['alter'] = [
-      'core' => TRUE,
-      'uuid' => TRUE,
-      'user_permissions' => TRUE,
-      'enabled' => TRUE,
-      'weight' => 0,
-    ];
-    $bundle->set('assignments', $assignments)->save();
-  }
-}
diff --git a/modules/contrib/features/features.module b/modules/contrib/features/features.module
deleted file mode 100644
index 3fccc79..0000000
--- a/modules/contrib/features/features.module
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * @file
- * Main hooks for Features module.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Implements hook_help().
- */
-function features_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    case 'help.page.features':
-      $output = '';
-      $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Features module provides a user interface for exporting bundles of configuration into modules. For more information, see the online documentation for <a href=":url">Features module</a>', array(
-        ':url' => 'http://drupal.org/node/2404427',
-      )) . '</p>';
-      return $output;
-  }
-}
-
-/**
- * Implements hook_file_download().
- */
-function features_file_download($uri) {
-  $scheme = file_uri_scheme($uri);
-  $target = file_uri_target($uri);
-
-  if ($scheme == 'temporary' && $target) {
-    $request = \Drupal::request();
-    $route = $request->attributes->get('_route');
-    // Check if we were called by Features download route.
-    // No additional access checking needed here: route requires
-    // "export configuration" permission, token is validated by the controller.
-    // @see \Drupal\features\Controller\FeaturesController::downloadExport()
-    if ($route == 'features.export_download') {
-      return array(
-        'Content-disposition' => 'attachment; filename="' . $target . '"',
-      );
-    }
-  }
-}
-
-/**
- * Implements hook_modules_installed().
- */
-function features_modules_installed($modules) {
-  if (!in_array('features', $modules)) {
-    /** @var \Drupal\features\FeaturesAssignerInterface $assigner */
-    $assigner = \Drupal::service('features_assigner');
-    $assigner->purgeConfiguration();
-  }
-}
diff --git a/modules/contrib/features/features.routing.yml b/modules/contrib/features/features.routing.yml
deleted file mode 100644
index 3b6c25b..0000000
--- a/modules/contrib/features/features.routing.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-features.export_download:
-  path: '/admin/config/development/features/download/{uri}'
-  defaults:
-    _controller: 'Drupal\features\Controller\FeaturesController::downloadExport'
-  requirements:
-    _permission: 'export configuration'
diff --git a/modules/contrib/features/features.services.yml b/modules/contrib/features/features.services.yml
deleted file mode 100644
index 6122f53..0000000
--- a/modules/contrib/features/features.services.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-services:
-  plugin.manager.features_assignment_method:
-    class: Drupal\features\FeaturesAssignmentMethodManager
-    arguments: ['@container.namespaces', '@cache.discovery', '@module_handler']
-  plugin.manager.features_generation_method:
-    class: Drupal\features\FeaturesGenerationMethodManager
-    arguments: ['@container.namespaces', '@cache.discovery', '@module_handler']
-  features_assigner:
-    class: Drupal\features\FeaturesAssigner
-    arguments: ['@features.manager', '@plugin.manager.features_assignment_method', '@entity.manager', '@config.factory', '@config.storage']
-    calls:
-      - [initFeaturesManager]
-  features_generator:
-    class: Drupal\features\FeaturesGenerator
-    arguments: ['@features.manager', '@plugin.manager.features_generation_method', '@features_assigner']
-    calls:
-      - [initFeaturesManager]
-  features.manager:
-    class: Drupal\features\FeaturesManager
-    arguments: ['@app.root', '@entity.manager', '@config.factory', '@config.storage', '@config.manager', '@module_handler', '@features.config_update']
-
-  features.config_update:
-    class: Drupal\config_update\ConfigReverter
-    arguments: ['@entity.manager', '@config.storage', '@features.extension_storage', '@features.extension_optional_storage', '@config.factory', '@event_dispatcher']
-
-  features.extension_storage:
-    class: Drupal\features\FeaturesInstallStorage
-    arguments: ['@config.storage']
-
-  features.extension_optional_storage:
-    class: Drupal\features\FeaturesInstallStorage
-    arguments: ['@config.storage', 'config/optional']
-
-  features.config.installer:
-    class: Drupal\features\FeaturesConfigInstaller
-    decorates: config.installer
-    decoration_priority: 9
-    arguments: ['@features.config.installer.inner', '@features.manager', '@config.factory', '@config.storage', '@config.typed', '@config.manager', '@event_dispatcher']
diff --git a/modules/contrib/features/modules/features_ui/css/features_ui.admin.css b/modules/contrib/features/modules/features_ui/css/features_ui.admin.css
deleted file mode 100644
index 529a7aa..0000000
--- a/modules/contrib/features/modules/features_ui/css/features_ui.admin.css
+++ /dev/null
@@ -1,286 +0,0 @@
-span.features-item-list span {
-  background: #eee;
-  border-radius: 5px;
-  margin-right: 5px;
-  padding: 2px 5px;
-  white-space: nowrap;
-  line-height: 1.7em;
-}
-
-.features-listing span.features-override,
-.features-listing a.features-override {
-  background: #FFCE6F;
-  border-radius: 5px;
-  margin-right: 5px;
-  padding: 2px 5px;
-  white-space: nowrap;
-}
-
-.features-listing span.features-detected,
-.features-listing a.features-detected {
-  color:#68a;
-  background:#def;
-  border-radius: 5px;
-  margin-right: 5px;
-  padding: 2px 5px;
-  white-space: nowrap;
-}
-
-.features-listing span.features-conflict,
-.features-listing a.features-conflict {
-  color: #fff;
-  background-color: #c30 !important;
-  border-radius: 5px;
-  margin-right: 5px;
-  padding: 2px 5px;
-  white-space: nowrap;
-}
-
-.features-listing span.features-moved,
-.features-listing a.features-moved {
-  color: #fff;
-  background-color: #215900 !important;
-  border-radius: 5px;
-  margin-right: 5px;
-  padding: 2px 5px;
-  white-space: nowrap;
-}
-
-.features-listing span.features-missing,
-.features-listing a.features-missing {
-  color: #fff;
-  background-color: #0E5EA9 !important;
-  border-radius: 5px;
-  margin-right: 5px;
-  padding: 2px 5px;
-  white-space: nowrap;
-}
-
-table.features-listing .column-nowrap {
-  white-space: nowrap;
-}
-
-tr.features-export-header-row td {
-  border-top: 30px solid white;
-  background: #eee;
-  padding-top: 10px;
-}
-
-#features-assignment-methods tr.draggable > td:nth-child(1) {
-  white-space: nowrap;
-}
-
-/** Styles for Features Export/Listing page **/
-.features-listing td {
-  vertical-align: top;
-}
-
-.features-listing td.feature-name {
-  font-size: 14px;
-  white-space: nowrap;
-}
-
-.features-listing td details {
-  border: 0;
-  margin: 0;
-  height: 20px;
-}
-
-.features-listing details[open] {
-  height: auto;
-  overflow: visible;
-  white-space: normal;
-}
-
-.features-listing td summary {
-  padding: 0;
-  text-transform: none;
-  font-weight: normal;
-}
-
-.features-listing td .features-item-label {
-  font-weight: bold;
-}
-
-.features-header > div,
-.features-header > input {
-  display: inline-block;
-}
-
-/** Styles for Features Edit page **/
-
-.fieldset-legend {
-  font-size: 14px;
-}
-
-#features-export-info {
-  width: 49%;
-  float: left;
-  position: relative;
-}
-#features-export-wrapper {
-  width: 49%;
-  float: right;
-  clear: both;
-  position: relative;
-}
-
-.form-type-checkbox.form-item-conflicts {
-  clear: left;
-}
-
-div.features-export-list  {
-  font-weight: normal;
-  font-size: 12px;
-  border: 1px solid #CCC;
-  border-top-width: 0;
-  overflow: hidden;
-  padding: 0 10px 0 30px;
-}
-
-span.features-component-list span {
-  white-space:nowrap;
-  margin-right:5px;
-  padding:2px 5px;
-  background:#eee;
-  -moz-border-radius:5px;
-  -webkit-border-radius:5px;
-}
-
-div.features-export-empty {
-  display: none;
-}
-
-span.features-component-list span.features-conflict {
-  background-color: #c30 !important;
-  color: #fff;
-}
-
-span.features-component-list .features-detected {
-  color:#68a;
-  background:#def;
-}
-
-span.features-component-list .features-dependency {
-  color:#999;
-  background:#f8f8f8;
-}
-
-#features-legend .fieldset-wrapper span {
-  font-style: normal;
-  color: black;
-  display: inline-block;
-  background: transparent;
-  border: 1px solid #DDD;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  white-space: nowrap;
-  padding: 0 8px;
-  margin: 0 10px 0 0;
-}
-#features-export-wrapper .config-name {
-  color: #777;
-}
-#features-export-wrapper .component-detected .form-type-checkbox,
-#features-legend .fieldset-wrapper .component-detected {
-  font-style: italic;
-  color:#68a;
-  background:#def;
-  border-width: 0;
-}
-#features-export-wrapper .component-added .form-type-checkbox,
-#features-legend .fieldset-wrapper .component-added {
-  font-weight: bold;
-  background: #EEE;
-  border-width: 0;
-}
-#features-export-wrapper .component-conflict.form-type-checkbox,
-#features-legend .fieldset-wrapper .component-conflict {
-  color: #c30 !important;
-  font-weight: bold !important;
-}
-
-#features-export-wrapper .component-conflict.form-type-checkbox label,
-#features-export-wrapper .component-added .form-type-checkbox label {
-  font-weight: bold !important;
-}
-
-#features-filter input[size="60"].form-text {
-  width: 200px;
-}
-#features-filter .fieldset-content,
-#features-filter .fieldset-wrapper,
-#features-filter fieldset {
-  border: 0;
-  padding: 0;
-  margin: 0;
-}
-#features-filter fieldset legend {
-  display: none;
-}
-#features-filter label,
-#features-filter input {
-  display: inline;
-  width: auto;
-}
-#features-filter .form-item {
-  float: left;
-  margin: 5px 0;
-  padding: 0;
-}
-#features-filter .form-item.form-type-checkbox {
-  margin: 5px 0;
-}
-#features-filter span {
-  float: left;
-  white-space: normal;
-  margin: 5px 5px;
-  padding: 0 5px;
-  background: transparent;
-  background: #EEE;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  cursor: pointer;
-}
-#features-filter span:hover {
-  background:#def;
-}
-
-#features-export-wrapper div.features-export-parent {
-  clear: both;
-  margin: 0 0 10px;
-}
-
-details.features-export-component  {
-  background: #F3F8FB;
-  margin: 0;
-  padding: 0 5px;
-}
-details.features-export-component summary {
-  white-space: nowrap;
-  text-transform: none;
-  font-weight: normal;
-  font-size: 14px;
-}
-details.features-export-component summary .component-count {
-  font-size: 11px;
-}
-details.features-export-component .details-wrapper {
-  padding-left: 25px;
-  padding-top: 0;
-}
-
-/** Styles for Bundle assignment config form **/
-#edit-bundles-wrapper .form-item-bundle-bundle-select {
-  display: inline-block;
-}
-
-#edit-bundles-wrapper #edit-bundle-remove {
-  display: inline-block;
-  font-size: 10px;
-}
-
-/** Styles for plugin config forms **/
-.features-assignment-settings-form .fieldset-wrapper {
-  padding-left: 16px;
-}
diff --git a/modules/contrib/features/modules/features_ui/features_ui.admin.inc b/modules/contrib/features/modules/features_ui/features_ui.admin.inc
deleted file mode 100644
index 408410a..0000000
--- a/modules/contrib/features/modules/features_ui/features_ui.admin.inc
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-/**
- * @file
- * Administration functions for features.module.
- */
-
-use Drupal\Core\Render\Element;
-Use \Drupal\Component\Render\FormattableMarkup;
-use Drupal\Component\Utility\Html;
-
-/**
- * Returns HTML for the features listing form.
- *
- * @param array $variables
- *   An associative array containing:
- *   - form: A render element representing the form.
- *
- * @ingroup themeable
- */
-function theme_features_listing(array $variables) {
-  $form = $variables['form'];
-  $renderer = \Drupal::service('renderer');
-
-  // Individual table headers.
-  $rows = array();
-  // Iterate through all the features, which are children of this element.
-  foreach (Element::children($form) as $key) {
-    // Stick the key into $module for easier access.
-    $element = $form[$key];
-    // Create the row for the table.
-    $row = array();
-    // Add the checkbox into the first cell.
-    unset($element['enable']['#title']);
-
-    $row[] = array('class' => array('checkbox'), 'data' => $renderer->render($element['enable']));
-
-    // Add the module label and expand/collapse functionalty.
-    $id = Html::getUniqueId('feature-' . $key);
-    $col2 = new FormattableMarkup('<label id="@id" for="@for" class="module-name table-filter-text-source">@name</label>',
-      array(
-        '@id' => $id,
-        '@for' => $element['enable']['#id'],
-        '@name' => $renderer->render($element['name']),
-      )
-    );
-    $row[] = array('class' => array('module'), 'data' => $col2);
-
-    $row[] = array('class' => array('machine_name'), 'data' => $renderer->render($element['machine_name']));
-
-    $description = t('@details', array('@details' => $renderer->render($element['details'])));
-    $details = array(
-      '#type' => 'details',
-      '#title' => new FormattableMarkup('<span class="text">@desc</span>', array( '@desc' => $renderer->render($element['description']))),
-      '#attributes' => array('id' => $element['enable']['#id'] . '-description'),
-      '#description' => $description,
-    );
-    $row[] = array(
-      'class' => array('description', 'expand'),
-      'data' => $renderer->render($details),
-    );
-    $row[] = array(
-      'class' => array('feature-version'),
-      'data' => $renderer->render($element['version']),
-    );
-    $row[] = array(
-      'class' => array('feature-state'),
-      'data' => $renderer->render($element['state']),
-    );
-
-    $rows[] = array('data' => $row);
-  }
-
-  $table = array(
-    '#type' => 'tableselect',
-    '#header' => $form['#header'],
-    '#options' => $rows,
-    '#empty' => t('No Features packages available.'),
-  );
-  return $renderer->render($table);
-}
-
-/**
- * Prepares variables for package assignment configuration form.
- *
- * @param array $variables
- *   An associative array containing:
- *   - form: A render element representing the form.
- */
-function template_preprocess_features_assignment_configure_form(&$variables) {
-  $form =& $variables['form'];
-
-  $header = array(
-    t('Assignment method'),
-    t('Description'),
-    t('Enabled'),
-    t('Weight'),
-  );
-
-  // If there is at least one operation enabled, show the operation column.
-  if ($form['#show_operations']) {
-    $header[] = t('Operations');
-  }
-
-  $table = array(
-    '#type' => 'table',
-    '#weight' => 5,
-    '#header' => $header,
-    '#attributes' => array('id' => 'features-assignment-methods'),
-    '#tabledrag' => array(
-      array(
-        'action' => 'order',
-        'relationship' => 'sibling',
-        'group' => 'assignment-method-weight',
-      ),
-    ),
-  );
-
-  foreach ($form['title'] as $id => $element) {
-    // Do not take form control structures.
-    if (is_array($element) && Element::child($id)) {
-      $table[$id]['#attributes']['class'][] = 'draggable';
-      $table[$id]['#weight'] = $element['#weight'];
-
-      $table[$id]['title'] = array(
-        '#prefix' => '<strong>',
-        $form['title'][$id],
-        '#suffix' => '</strong>',
-      );
-      $table[$id]['description'] = $form['description'][$id];
-      $table[$id]['enabled'] = $form['enabled'][$id];
-      $table[$id]['weight'] = $form['weight'][$id];
-      if ($form['#show_operations']) {
-        $table[$id]['operation'] = $form['operation'][$id];
-      }
-      // Unset to prevent rendering along with children.
-      unset($form['title'][$id]);
-      unset($form['description'][$id]);
-      unset($form['enabled'][$id]);
-      unset($form['weight'][$id]);
-      unset($form['operation'][$id]);
-    }
-  }
-
-  // For some reason, the #weight is not being handled by drupal_render.
-  // So we remove the actions and then put them back into the form after the
-  // table.
-  $actions = $form['actions'];
-  unset($form['actions']);
-  $form['table'] = $table;
-  $form['actions'] = $actions;
-}
-
-/**
- * Themes individual items in an item list.
- */
-function theme_features_items(array $variables) {
-  $items = $variables['items'];
-
-  $list = array();
-  foreach ($items as $item) {
-    $class = !empty($item['class']) ? $item['class'] : '';
-    $list[] = '<span class="features-item ' . $class . '" title="' . $item['name'] . '">' . $item['label'] . '</span>';
-  }
-
-  return '<span class="features-item-list">' . implode(' ', $list) . '</span>';
-}
-
-/**
- * Themes the assignment form.
- */
-function theme_assignment_form(array $variables) {
-  $renderer = \Drupal::service('renderer');
-  return $renderer->render($variables['form']);
-}
diff --git a/modules/contrib/features/modules/features_ui/features_ui.info.yml b/modules/contrib/features/modules/features_ui/features_ui.info.yml
deleted file mode 100644
index deec8ef..0000000
--- a/modules/contrib/features/modules/features_ui/features_ui.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Features UI
-type: module
-description: 'Provides the user interface for Features.'
-package: Development
-# core: 8.x
-configure: features.assignment
-dependencies:
-  - features
-
-# Information added by Drupal.org packaging script on 2017-03-07
-version: '8.x-3.5'
-core: '8.x'
-project: 'features'
-datestamp: 1488908587
diff --git a/modules/contrib/features/modules/features_ui/features_ui.libraries.yml b/modules/contrib/features/modules/features_ui/features_ui.libraries.yml
deleted file mode 100644
index 07a4d49..0000000
--- a/modules/contrib/features/modules/features_ui/features_ui.libraries.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-drupal.features_ui.admin:
-  version: VERSION
-  css:
-    theme:
-      css/features_ui.admin.css: {}
-  js:
-    js/features_ui.admin.js: {}
-  dependencies:
-    - core/jquery
-    - core/drupal
-    - core/drupalSettings
diff --git a/modules/contrib/features/modules/features_ui/features_ui.links.action.yml b/modules/contrib/features/modules/features_ui/features_ui.links.action.yml
deleted file mode 100644
index 93a37b4..0000000
--- a/modules/contrib/features/modules/features_ui/features_ui.links.action.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-features_ui.feature_add:
-  route_name: features.edit
-  title: 'Create new feature'
-  appears_on:
-    - features.export
diff --git a/modules/contrib/features/modules/features_ui/features_ui.links.menu.yml b/modules/contrib/features/modules/features_ui/features_ui.links.menu.yml
deleted file mode 100644
index 379a3e4..0000000
--- a/modules/contrib/features/modules/features_ui/features_ui.links.menu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-features.export:
-  title: 'Features'
-  description: 'Package your configuration into feature modules.'
-  route_name: features.export
-  parent: system.admin_config_development
diff --git a/modules/contrib/features/modules/features_ui/features_ui.links.task.yml b/modules/contrib/features/modules/features_ui/features_ui.links.task.yml
deleted file mode 100644
index fb8d636..0000000
--- a/modules/contrib/features/modules/features_ui/features_ui.links.task.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-features.export:
-  route_name: features.export
-  title: 'Features'
-  base_route: features.export
-
-features.assignment:
-  route_name: features.assignment
-  title: 'Configure Bundles'
-  base_route: features.export
-
-features.diff:
-  route_name: features.diff
-  title: 'Differences'
-  base_route: features.export
diff --git a/modules/contrib/features/modules/features_ui/features_ui.module b/modules/contrib/features/modules/features_ui/features_ui.module
deleted file mode 100644
index 0eae3ee..0000000
--- a/modules/contrib/features/modules/features_ui/features_ui.module
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * @file
- * Allows site administrators to modify configuration.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Implements hook_help().
- */
-function features_ui_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    case 'features.assignment':
-      $output = '';
-      $output .= '<p>' . t('Bundles are used to collect together groups of features. A bundle provides a shared <a href=":namespace">namespace</a> for all features included in it, which prevents conflicts and helps distinguish your features from those produced for other purposes. Common uses of bundles include:', array(':namespace' => 'http://en.wikipedia.org/wiki/Namespace'));
-      $output .= '<ul>';
-      $output .= '<li>' . t('Custom features for use on a particular site.') . '</li>';
-      $output .= '<li>' . t('The features of a given <a href=":distributions">distribution</a>.', array(':distributions' => 'https://www.drupal.org/documentation/build/distributions')) . '</li>';
-      $output .= '</ul></p>';
-      $output .= '<p>' . t('Use the form below to manage bundles. Each bundle comes with a set of assignment methods. By configuring and ordering the assignment methods, you can set the defaults for what does and doesn\'t get packaged into features for your bundle. Use the <em>Bundle</em> select to choose which bundle to edit, or chose <em>--New--</em> to create a new bundle. The <em>Default</em> bundle does not include a namespace and cannot be deleted.') . '</p>';
-      return $output;
-
-    case 'features.export':
-      $output = '';
-      $output .= '<p>' . t('Export packages of configuration into modules.') . '</p>';
-      return $output;
-  }
-}
-
-/**
- * Implements hook_theme().
- */
-function features_ui_theme() {
-  return array(
-    'features_listing' => array(
-      'render element' => 'form',
-      'file' => 'features_ui.admin.inc',
-      'function' => 'theme_features_listing',
-    ),
-    'features_assignment_configure_form' => array(
-      'render element' => 'form',
-      'file' => 'features_ui.admin.inc',
-      'function' => 'theme_assignment_form',
-    ),
-    'features_items' => array(
-      'variables' => array(
-        'items' => array(),
-      ),
-      'file' => 'features_ui.admin.inc',
-      'function' => 'theme_features_items',
-    ),
-  );
-}
diff --git a/modules/contrib/features/modules/features_ui/features_ui.routing.yml b/modules/contrib/features/modules/features_ui/features_ui.routing.yml
deleted file mode 100644
index 9343aee..0000000
--- a/modules/contrib/features/modules/features_ui/features_ui.routing.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-features.export:
-  path: '/admin/config/development/features'
-  defaults:
-    _form: '\Drupal\features_ui\Form\FeaturesExportForm'
-    _title: 'Features'
-  requirements:
-    _permission: 'export configuration'
-
-features.assignment:
-  path: '/admin/config/development/features/bundle/{bundle_name}'
-  defaults:
-    _form: '\Drupal\features_ui\Form\AssignmentConfigureForm'
-    _title: 'Bundle assignment'
-    bundle_name: NULL
-  requirements:
-    _permission: 'administer site configuration'
-
-features.assignment_alter:
-  path: '/admin/config/development/features/bundle/_alter/{bundle_name}'
-  defaults:
-    _form: '\Drupal\features_ui\Form\AssignmentAlterForm'
-    _title: 'Configure package configuration altering'
-    bundle_name: NULL
-  requirements:
-    _permission: 'administer site configuration'
-
-features.assignment_base:
-  path: '/admin/config/development/features/bundle/_base/{bundle_name}'
-  defaults:
-    _form: '\Drupal\features_ui\Form\AssignmentBaseForm'
-    _title: 'Configure base package assignment'
-    bundle_name: NULL
-  requirements:
-    _permission: 'administer site configuration'
-
-features.assignment_core:
-  path: '/admin/config/development/features/bundle/_core/{bundle_name}'
-  defaults:
-    _form: '\Drupal\features_ui\Form\AssignmentCoreForm'
-    _title: 'Configure core package assignment'
-    bundle_name: NULL
-  requirements:
-    _permission: 'administer site configuration'
-
-features.assignment_exclude:
-  path: '/admin/config/development/features/bundle/_exclude/{bundle_name}'
-  defaults:
-    _form: '\Drupal\features_ui\Form\AssignmentExcludeForm'
-    _title: 'Configure package exclusion'
-    bundle_name: NULL
-  requirements:
-    _permission: 'administer site configuration'
-
-features.assignment_optional:
-  path: '/admin/config/development/features/bundle/_optional/{bundle_name}'
-  defaults:
-    _form: '\Drupal\features_ui\Form\AssignmentOptionalForm'
-    _title: 'Configure optional package assignment'
-    bundle_name: NULL
-  requirements:
-    _permission: 'administer site configuration'
-
-features.assignment_profile:
-  path: '/admin/config/development/features/bundle/_profile/{bundle_name}'
-  defaults:
-    _form: '\Drupal\features_ui\Form\AssignmentProfileForm'
-    _title: 'Configure profile package assignment'
-    bundle_name: NULL
-  requirements:
-    _permission: 'administer site configuration'
-
-features.assignment_site:
-  path: '/admin/config/development/features/bundle/_site/{bundle_name}'
-  defaults:
-    _form: '\Drupal\features_ui\Form\AssignmentSiteForm'
-    _title: 'Configure site package assignment'
-    bundle_name: NULL
-  requirements:
-    _permission: 'administer site configuration'
-
-features.edit:
-  path: '/admin/config/development/features/edit/{featurename}'
-  defaults:
-    _form: '\Drupal\features_ui\Form\FeaturesEditForm'
-    _title: 'Edit'
-    featurename: ''
-  requirements:
-    _permission: 'administer site configuration'
-
-features.diff:
-  path: '/admin/config/development/features/diff/{featurename}'
-  defaults:
-    _form: '\Drupal\features_ui\Form\FeaturesDiffForm'
-    _title: 'Differences'
-    featurename: ''
-  requirements:
-    _permission: 'administer site configuration'
-
-features.detect:
-  path: '/features/api/detect/{name}'
-  defaults:
-    _controller: '\Drupal\features_ui\Controller\FeaturesUIController::detect'
-  requirements:
-    _permission: 'administer site configuration'
diff --git a/modules/contrib/features/modules/features_ui/js/features_ui.admin.js b/modules/contrib/features/modules/features_ui/js/features_ui.admin.js
deleted file mode 100644
index d401968..0000000
--- a/modules/contrib/features/modules/features_ui/js/features_ui.admin.js
+++ /dev/null
@@ -1,401 +0,0 @@
-/**
- * jQuery.fn.sortElements
- * --------------
- * @param Function comparator:
- *   Exactly the same behaviour as [1,2,3].sort(comparator)
- *
- * @param Function getSortable
- *   A function that should return the element that is
- *   to be sorted. The comparator will run on the
- *   current collection, but you may want the actual
- *   resulting sort to occur on a parent or another
- *   associated element.
- *
- *   E.g. $('td').sortElements(comparator, function(){
- *      return this.parentNode;
- *   })
- *
- *   The <td>'s parent (<tr>) will be sorted instead
- *   of the <td> itself.
- *
- * Credit: http://james.padolsey.com/javascript/sorting-elements-with-jquery/
- *
- */
-jQuery.fn.sortElements = (function () {
-
-  "use strict";
-
-  var sort = [].sort;
-
-  return function (comparator, getSortable) {
-
-    getSortable = getSortable || function () {return this;};
-
-    var placements = this.map(function () {
-
-      var sortElement = getSortable.call(this);
-      var parentNode = sortElement.parentNode;
-
-      // Since the element itself will change position, we have
-      // to have some way of storing its original position in
-      // the DOM. The easiest way is to have a 'flag' node:
-      var nextSibling = parentNode.insertBefore(
-          document.createTextNode(''),
-          sortElement.nextSibling
-        );
-
-      return function () {
-
-        if (parentNode === this) {
-          throw new Error(
-            "You can't sort elements if any one is a descendant of another."
-          );
-        }
-
-        // Insert before flag:
-        parentNode.insertBefore(this, nextSibling);
-        // Remove flag:
-        parentNode.removeChild(nextSibling);
-
-      };
-
-    });
-
-    return sort.call(this, comparator).each(function (i) {
-      placements[i].call(getSortable.call(this));
-    });
-
-  };
-
-})();
-
-(function ($) {
-
-  "use strict";
-
-  Drupal.behaviors.features = {
-    attach: function (context) {
-
-      // mark any conflicts with a class
-      if ((typeof drupalSettings.features !== 'undefined') && (typeof drupalSettings.features.conflicts !== 'undefined')) {
-      //  for (var configType in drupalSettings.features.conflicts) {
-          if (drupalSettings.features.conflicts) {
-            var configConflicts = drupalSettings.features.conflicts;
-            $('#features-export-wrapper input[type=checkbox]', context).each(function () {
-              if (!$(this).hasClass('features-checkall')) {
-                var key = $(this).attr('name');
-                var matches = key.match(/^([^\[]+)(\[.+\])?\[(.+)\]\[(.+)\]$/);
-                var component = matches[1];
-                var item = matches[4];
-                if ((component in configConflicts) && (item in configConflicts[component])) {
-                  $(this).parent().addClass('component-conflict');
-                }
-              }
-            });
-          }
-        //}
-      }
-
-      function _checkAll(value) {
-        if (value) {
-          $('#features-export-wrapper .component-select input[type=checkbox]:visible', context).each(function () {
-            var move_id = $(this).attr('id');
-            $(this).click();
-            $('#'+ move_id).prop('checked', true);
-          });
-        }
-        else {
-          $('#features-export-wrapper .component-added input[type=checkbox]:visible', context).each(function () {
-            var move_id = $(this).attr('id');
-            $(this).click();
-            $('#'+ move_id).prop('checked', false);
-          });
-        }
-      }
-
-      function updateComponentCountInfo(item, section) {
-        var parent;
-
-        switch (section) {
-          case 'select':
-            parent = $(item).closest('.features-export-list').siblings('.features-export-component');
-            $('.component-count', parent).text(function (index, text) {
-                return +text + 1;
-              }
-            );
-            break;
-          case 'added':
-          case 'detected':
-            parent = $(item).closest('.features-export-component');
-            $('.component-count', parent).text(function (index, text) {
-              return text - 1;
-            });
-        }
-      }
-
-      function moveCheckbox(item, section, value) {
-        updateComponentCountInfo(item, section);
-        var curParent = item;
-        if ($(item).hasClass('form-type-checkbox')) {
-          item = $(item).children('input[type=checkbox]');
-        }
-        else {
-          curParent = $(item).parents('.form-type-checkbox');
-        }
-        var newParent = $(curParent).parents('.features-export-parent').find('.component-'+section+' .form-checkboxes');
-        $(curParent).detach();
-        $(curParent).appendTo(newParent);
-        var list = ['select', 'added', 'detected', 'included'];
-        for (var i in list) {
-          if (list[i]) {
-            $(curParent).removeClass('component-' + list[i]);
-            $(item).removeClass('component-' + list[i]);
-          }
-        }
-        $(curParent).addClass('component-'+section);
-        $(item).addClass('component-'+section);
-        if (value) {
-          $(item).attr('checked', 'checked');
-        }
-        else {
-          $(item).removeAttr('checked');
-        }
-        $(newParent).parents('.component-list').removeClass('features-export-empty');
-
-        // re-sort new list of checkboxes based on labels
-        $(newParent).find('label').sortElements(
-          function (a, b) {
-            return $(a).text() > $(b).text() ? 1 : -1;
-          },
-          function () {
-            return this.parentNode;
-          }
-        );
-      }
-
-      // provide timer for auto-refresh trigger
-      var timeoutID = 0;
-      var inTimeout = 0;
-      function _triggerTimeout() {
-        timeoutID = 0;
-        _updateDetected();
-      }
-      function _resetTimeout() {
-        inTimeout++;
-        // if timeout is already active, reset it
-        if (timeoutID !== 0) {
-          window.clearTimeout(timeoutID);
-          if (inTimeout > 0) { inTimeout--; }
-        }
-        timeoutID = window.setTimeout(_triggerTimeout, 500);
-      }
-
-      function _updateDetected() {
-        if (!drupalSettings.features.autodetect) { return; }
-        // query the server for a list of components/items in the feature and update
-        // the auto-detected items
-        var items = [];  // will contain a list of selected items exported to feature
-        var components = {};  // contains object of component names that have checked items
-        $('#features-export-wrapper input[type=checkbox]:checked', context).each(function () {
-          if (!$(this).hasClass('features-checkall')) {
-            var key = $(this).attr('name');
-            var matches = key.match(/^([^\[]+)(\[.+\])?\[(.+)\]\[(.+)\]$/);
-            components[matches[1]] = matches[1];
-            if (!$(this).hasClass('component-detected')) {
-              items.push(key);
-            }
-          }
-        });
-        var featureName = $('#edit-machine-name').val();
-        if (featureName === '') {
-          featureName = '*';
-        }
-
-        var url = Drupal.url('features/api/detect/' + featureName);
-        var excluded = drupalSettings.features.excluded;
-        var required = drupalSettings.features.required;
-        var postData = {'items': items, 'excluded': excluded, 'required': required};
-        jQuery.post(url, postData, function (data) {
-          if (inTimeout > 0) { inTimeout--; }
-          // if we have triggered another timeout then don't update with old results
-          if (inTimeout === 0) {
-            // data is an object keyed by component listing the exports of the feature
-            for (var component in data) {
-              if (data[component]) {
-                var itemList = data[component];
-                $('#features-export-wrapper .component-' + component + ' input[type=checkbox]', context).each(function () {
-                  var key = $(this).attr('value');
-                  // first remove any auto-detected items that are no longer in component
-                  if ($(this).hasClass('component-detected')) {
-                    if (!(key in itemList)) {
-                      moveCheckbox(this, 'select', false);
-                    }
-                  }
-                  // next, add any new auto-detected items
-                  else if ($(this).hasClass('component-select')) {
-                    if (key in itemList) {
-                      moveCheckbox(this, 'detected', itemList[key]);
-                      $(this).prop('checked', true);
-                      $(this).parent().show(); // make sure it's not hidden from filter
-                    }
-                  }
-                });
-              }
-            }
-            // loop over all selected components and check for any that have been completely removed
-            for (var selectedComponent in components) {
-              if ((data == null) || !(selectedComponent in data)) {
-                $('#features-export-wrapper .component-' + selectedComponent + ' input[type=checkbox].component-detected', context).each(moveCheckbox(this, 'select', false));
-              }
-            }
-          }
-        }, "json");
-      }
-
-      // Handle component selection UI
-      $('#features-export-wrapper input[type=checkbox]', context).click(function () {
-        _resetTimeout();
-        if ($(this).hasClass('component-select')) {
-          moveCheckbox(this, 'added', true);
-        }
-        else if ($(this).hasClass('component-included')) {
-          moveCheckbox(this, 'added', false);
-        }
-        else if ($(this).hasClass('component-added')) {
-          if ($(this).is(':checked')) {
-            moveCheckbox(this, 'included', true);
-          }
-          else {
-            moveCheckbox(this, 'select', false);
-          }
-        }
-      });
-
-      // Handle select/unselect all
-      $('#features-filter .features-checkall.form-checkbox', context).click(function () {
-        if ($(this).prop('checked')) {
-          _checkAll(true);
-          $(this).next().html(Drupal.t('Deselect all'));
-        }
-        else {
-          _checkAll(false);
-          $(this).next().html(Drupal.t('Select all'));
-        }
-        _resetTimeout();
-      });
-
-      // Handle filtering
-
-      // provide timer for auto-refresh trigger
-      var filterTimeoutID = 0;
-      function _triggerFilterTimeout() {
-        filterTimeoutID = 0;
-        _updateFilter();
-      }
-      function _resetFilterTimeout() {
-        // if timeout is already active, reset it
-        if (filterTimeoutID !== 0) {
-          window.clearTimeout(filterTimeoutID);
-          filterTimeoutID = null;
-        }
-        filterTimeoutID = window.setTimeout(_triggerFilterTimeout, 200);
-      }
-      function _updateFilter() {
-        var filter = $('#features-filter input').val();
-        var regex = new RegExp(filter, 'i');
-        // collapse fieldsets
-        var newState = {};
-        var currentState = {};
-        $('#features-export-wrapper details.features-export-component', context).each(function () {
-          // expand parent fieldset
-          var section = $(this).attr('id');
-          var details = $(this);
-
-          currentState[section] = details.prop('open');
-          if (!(section in newState)) {
-            newState[section] = false;
-          }
-
-          details.find('.form-checkboxes label').each(function () {
-            if (filter === '') {
-              // collapse the section, but make checkbox visible
-              if (currentState[section]) {
-                details.prop('open', false);
-                currentState[section] = false;
-              }
-              $(this).parent().show();
-            }
-            else if ($(this).text().match(regex)) {
-              $(this).parent().show();
-              newState[section] = true;
-            }
-            else {
-              $(this).parent().hide();
-            }
-          });
-        });
-        for (var section in newState) {
-          if (currentState[section] !== newState[section]) {
-            if (newState[section]) {
-              $('#'+section).prop('open', true);
-            }
-            else {
-              $('#'+section).prop('open', false);
-            }
-          }
-        }
-      }
-      $('#features-filter input', context).bind("input", function () {
-        _resetFilterTimeout();
-      });
-      $('#features-filter .features-filter-clear', context).click(function () {
-        $('#features-filter input').val('');
-        _updateFilter();
-      });
-
-      // show the filter bar
-      $('#features-filter', context).removeClass('element-invisible');
-
-      // handle Package selection checkboxes in the Differences page
-      $('.features-diff-listing .features-diff-header input.form-checkbox', context).click(function () {
-        var value = $(this).prop('checked');
-        $('.features-diff-listing .diff-'+$(this).prop('value')+' input.form-checkbox', context).each(function () {
-          $(this).prop('checked', value);
-          if (value) {
-            $(this).parents('tr').addClass('selected');
-          }
-          else {
-            $(this).parents('tr').removeClass('selected');
-          }
-        });
-      });
-
-      // handle special theming of headers in tableselect
-      $('td.features-export-header-row', context).each(function () {
-        var row = $(this).parent('tr');
-        row.addClass('features-export-header-row');
-        var checkbox = row.find('td input:checkbox');
-        if (checkbox.length) {
-          checkbox.hide();
-        }
-      });
-
-      // handle clicking anywhere in row on Differences page
-      $('.features-diff-listing tr td:nth-child(2)', context).click(function () {
-        var checkbox = $(this).parent().find('td input:checkbox');
-        checkbox.prop('checked', !checkbox.prop('checked')).triggerHandler('click');
-        if (checkbox.prop('checked')) {
-          $(this).parents('tr').addClass('selected');
-        }
-        else {
-          $(this).parents('tr').removeClass('selected');
-        }
-      });
-      $('.features-diff-listing thead th:nth-child(2)', context).click(function () {
-        var checkbox = $(this).parent().find('th input:checkbox');
-        checkbox.click();
-      });
-    }
-  };
-
-})(jQuery);
diff --git a/modules/contrib/features/modules/features_ui/src/Controller/FeaturesUIController.php b/modules/contrib/features/modules/features_ui/src/Controller/FeaturesUIController.php
deleted file mode 100644
index 1462b49..0000000
--- a/modules/contrib/features/modules/features_ui/src/Controller/FeaturesUIController.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Controller;
-
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\FeaturesAssignerInterface;
-
-/**
- * Returns ajax responses for the Features UI.
- */
-class FeaturesUIController implements ContainerInjectionInterface {
-
-  /**
-   * The features manager.
-   *
-   * @var \Drupal\features\FeaturesManagerInterface
-   */
-  protected $featuresManager;
-
-  /**
-   * The package assigner.
-   *
-   * @var array
-   */
-  protected $assigner;
-
-  /**
-   * Constructs a new FeaturesUIController object.
-   *
-   * @param \Drupal\features\FeaturesManagerInterface $features_manager
-   *    The features manager.
-   */
-  public function __construct(FeaturesManagerInterface $features_manager, FeaturesAssignerInterface $assigner) {
-    $this->featuresManager = $features_manager;
-    $this->assigner = $assigner;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('features.manager'),
-      $container->get('features_assigner')
-    );
-  }
-
-  /**
-   * Returns a list of auto-detected config items for a feature.
-   *
-   * @param string $name
-   *   Short machine name of feature to process.
-   *
-   * @return array
-   *   List of auto-detected config items, keyed by type and short name.
-   */
-  public function detect($name) {
-    $detected = array();
-    $this->assigner->assignConfigPackages();
-    $config_collection = $this->featuresManager->getConfigCollection();
-
-    $items = $_POST['items'];
-    if (!empty($items)) {
-      $excluded = (!empty($_POST['excluded'])) ? $_POST['excluded'] : array();
-      $selected = array();
-      foreach ($items as $key) {
-        preg_match('/^([^\[]+)(\[.+\])?\[(.+)\]\[(.+)\]$/', $key, $matches);
-        if (!empty($matches[1]) && !empty($matches[4])) {
-          $component = $matches[1];
-          $item = $this->domDecode($matches[4]);
-          if (!isset($excluded[$component][$item])) {
-            $selected[] = $this->featuresManager->getFullName($component, $item);
-          }
-        }
-      }
-      $detected = !empty($selected) ? $this->getConfigDependents($selected, $name) : array();
-      $detected = array_merge($detected, $selected);
-    }
-
-    $result = [];
-    foreach ($detected as $config_name) {
-      $item = $config_collection[$config_name];
-      $result[$item->getType()][$item->getShortName()] = $item->getName();
-    }
-    return new JsonResponse($result);
-  }
-
-  /**
-   * Returns the configuration dependent on given items.
-   *
-   * @param array $item_names
-   *   An array of item names.
-   * @param string $package_name
-   *   Short machine name of feature to process.
-   *
-   * @return array
-   *   An array of config items.
-   */
-  protected function getConfigDependents(array $item_names, $package_name) {
-    $result = [];
-    $config_collection = $this->featuresManager->getConfigCollection();
-    $packages = $this->featuresManager->getPackages();
-    $settings = $this->featuresManager->getSettings();
-    $allow_conflicts = $settings->get('conflicts');
-
-    if (empty($item_names)) {
-      $item_names = array_keys($config_collection);
-    }
-
-    // Add any existing auto-detected items already in the package config
-    $this->package = $packages[$package_name];
-    $package_config = isset($this->package) ? $this->package->getConfig() : array();
-    $package_config = !empty($package_config) ? array_unique(array_merge($package_config, $item_names)) : $item_names;
-    foreach ($package_config as $config_name) {
-      if (!$config_collection[$config_name]->getPackageExcluded()) {
-        $result[] = $config_name;
-      }
-    }
-
-    // Now add dependents of the items selected
-    foreach ($item_names as $item_name) {
-      if ($config_collection[$item_name]->getPackage()) {
-        foreach ($config_collection[$item_name]->getDependents() as $dependent_item_name) {
-          if (isset($config_collection[$dependent_item_name])) {
-            $allow = TRUE;
-            if (!$allow_conflicts && $config_collection[$dependent_item_name]->getPackage()) {
-              if ($packages[$config_collection[$dependent_item_name]->getPackage()]) {
-                $allow = ($packages[$config_collection[$dependent_item_name]->getPackage()]->getStatus() == FeaturesManagerInterface::STATUS_NO_EXPORT)
-                  || ($config_collection[$item_name]->getPackage() == $config_collection[$dependent_item_name]->getPackage());
-              }
-            }
-            if ($allow) {
-              $result[] = $dependent_item_name;
-            }
-          }
-        }
-      }
-    }
-    return $result;
-  }
-
-  /**
-   * Encodes a given key.
-   *
-   * @param string $key
-   *   The key to encode.
-   *
-   * @return string
-   *   The encoded key.
-   */
-  protected function domEncode($key) {
-    $replacements = $this->domEncodeMap();
-    return strtr($key, $replacements);
-  }
-
-  /**
-   * Decodes a given key.
-   *
-   * @param string $key
-   *   The key to decode.
-   *
-   * @return string
-   *   The decoded key.
-   */
-  protected function domDecode($key) {
-    $replacements = array_flip($this->domEncodeMap());
-    return strtr($key, $replacements);
-  }
-
-  /**
-   * Returns encoding map for decode and encode options.
-   *
-   * @return array
-   *   An encoding map.
-   */
-  protected function domEncodeMap() {
-    return array(
-      ':' => '__' . ord(':') . '__',
-      '/' => '__' . ord('/') . '__',
-      ',' => '__' . ord(',') . '__',
-      '.' => '__' . ord('.') . '__',
-      '<' => '__' . ord('<') . '__',
-      '>' => '__' . ord('>') . '__',
-      '%' => '__' . ord('%') . '__',
-      ')' => '__' . ord(')') . '__',
-      '(' => '__' . ord('(') . '__',
-    );
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/AssignmentAlterForm.php b/modules/contrib/features/modules/features_ui/src/Form/AssignmentAlterForm.php
deleted file mode 100644
index a299633..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/AssignmentAlterForm.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Configures the selected configuration assignment method for this site.
- */
-class AssignmentAlterForm extends AssignmentFormBase {
-
-  const METHOD_ID = 'alter';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'features_assignment_alter_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $bundle_name = NULL) {
-    $this->currentBundle = $this->assigner->loadBundle($bundle_name);
-
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-    $core_setting = $settings['core'];
-    $uuid_setting = $settings['uuid'];
-    $user_permissions_setting = $settings['user_permissions'];
-
-    $form['core'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Strip out <em>_core</em> property.'),
-      '#default_value' => $core_setting,
-      '#description' => $this->t('Select this option to remove the <em>_core</em> configuration property on export. This property is added by Drupal core when configuration is installed.'),
-    );
-
-    $form['uuid'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Strip out <em>uuid</em> property.'),
-      '#default_value' => $uuid_setting,
-      '#description' => $this->t('Select this option to remove the <em>uuid</em> configuration property on export. This property is added by Drupal core when configuration is installed.'),
-    );
-
-    $form['user_permissions'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Strip out user permissions.'),
-      '#default_value' => $user_permissions_setting,
-      '#description' => $this->t('Select this option to remove permissions from user roles on export.'),
-    );
-
-    $this->setActions($form, self::METHOD_ID);
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Merge in selections.
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-    $settings = array_merge($settings, [
-      'core' => $form_state->getValue('core'),
-      'uuid' => $form_state->getValue('uuid'),
-      'user_permissions' => $form_state->getValue('user_permissions'),
-    ]);
-
-    $this->currentBundle->setAssignmentSettings(self::METHOD_ID, $settings)->save();
-
-    $this->setRedirect($form_state);
-    drupal_set_message($this->t('Package assignment configuration saved.'));
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/AssignmentBaseForm.php b/modules/contrib/features/modules/features_ui/src/Form/AssignmentBaseForm.php
deleted file mode 100644
index 44f8022..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/AssignmentBaseForm.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Configures the selected configuration assignment method for this site.
- */
-class AssignmentBaseForm extends AssignmentFormBase {
-
-  const METHOD_ID = 'base';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'features_assignment_base_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $bundle_name = NULL) {
-    $this->currentBundle = $this->assigner->loadBundle($bundle_name);
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-
-    // Pass the last argument to limit the select to config entity types that
-    // provide bundles for other entity types.
-    $this->setConfigTypeSelect($form, $settings['types']['config'], $this->t('base'), TRUE);
-    // Pass the last argument to limit the select to content entity types do
-    // not have config entity provided bundles, thus avoiding duplication with
-    // the config type select options.
-    $this->setContentTypeSelect($form, $settings['types']['content'], $this->t('base'), TRUE);
-
-    $this->setActions($form, self::METHOD_ID);
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setValue('types', array_map('array_filter', $form_state->getValue('types')));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Merge in types selections.
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-    $settings['types'] = $form_state->getValue('types');
-    $this->currentBundle->setAssignmentSettings(self::METHOD_ID, $settings)->save();
-    $this->setRedirect($form_state);
-
-    drupal_set_message($this->t('Package assignment configuration saved.'));
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/AssignmentConfigureForm.php b/modules/contrib/features/modules/features_ui/src/Form/AssignmentConfigureForm.php
deleted file mode 100644
index e46862d..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/AssignmentConfigureForm.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Unicode;
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\FeaturesAssignerInterface;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Configures the configuration assignment methods for this site.
- */
-class AssignmentConfigureForm extends FormBase {
-
-  /**
-   * Bundle select value that should trigger a new bundle to be created.
-   */
-  const NEW_BUNDLE_SELECT_VALUE = 'new';
-
-  /**
-   * The features manager.
-   *
-   * @var \Drupal\features\FeaturesManagerInterface
-   */
-  protected $featuresManager;
-
-  /**
-   * The package assigner.
-   *
-   * @var \Drupal\features\FeaturesAssignerInterface
-   */
-  protected $assigner;
-
-  /**
-   * Constructs a AssignmentConfigureForm object.
-   *
-   * @param \Drupal\features\FeaturesManagerInterface $features_manager
-   *   The features manager.
-   * @param \Drupal\features\FeaturesAssignerInterface $assigner
-   *   The configuration assignment methods manager.
-   */
-  public function __construct(FeaturesManagerInterface $features_manager, FeaturesAssignerInterface $assigner) {
-    $this->featuresManager = $features_manager;
-    $this->assigner = $assigner;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('features.manager'),
-      $container->get('features_assigner')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'features_assignment_configure_form';
-  }
-
-  /**
-   * Load the values from the bundle into the user input.
-   * Used during Ajax callback since updating #default_values is ignored.
-   * @param $bundle_name
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   */
-  protected function loadBundleValues($bundle_name, FormStateInterface &$form_state, $current_bundle, $enabled_methods, $methods_weight) {
-    $input = $form_state->getUserInput();
-    if ($bundle_name == self::NEW_BUNDLE_SELECT_VALUE) {
-      $input['bundle']['name'] = '';
-      $input['bundle']['machine_name'] = '';
-      $input['bundle']['description'] = '';
-      $input['bundle']['is_profile'] = NULL;
-      $input['bundle']['profile_name'] = '';
-    }
-    else {
-      $input['bundle']['name'] = $current_bundle->getName();
-      $input['bundle']['machine_name'] = $current_bundle->getMachineName();
-      $input['bundle']['description'] = $current_bundle->getDescription();
-      $input['bundle']['is_profile'] = $current_bundle->isProfile() ? 1 : null;
-      $input['bundle']['profile_name'] = $current_bundle->isProfile() ? $current_bundle->getProfileName() : '';
-    }
-
-    foreach ($methods_weight as $method_id => $weight) {
-      $enabled = isset($enabled_methods[$method_id]);
-      $input['weight'][$method_id] = $weight;
-      $input['enabled'][$method_id] = $enabled ? 1 : null;
-    }
-
-    $form_state->setUserInput($input);
-  }
-
-  /**
-   * Detects if an element triggered the form submission via Ajax.
-   * TODO: SHOULDN'T NEED THIS!  BUT DRUPAL IS CALLING buildForm AFTER THE
-   * BUNDLE AJAX IS SELECTED AND DOESN'T HAVE getTriggeringElement() SET YET.
-   */
-  protected function elementTriggeredScriptedSubmission(FormStateInterface &$form_state) {
-    $input = $form_state->getUserInput();
-    if (!empty($input['_triggering_element_name'])) {
-      return $input['_triggering_element_name'];
-    }
-    return '';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $bundle_name = NULL) {
-    $load_values = FALSE;
-    $trigger = $form_state->getTriggeringElement();
-    // TODO: See if there is a Drupal Core issue for this.
-    // Sometimes the first ajax call on the page causes buildForm to be called
-    // twice!  First time form_state->getTriggeringElement is NOT SET, but
-    // the form_state['input'] shows the _triggering_element_name.  Then the
-    // SECOND time it is called the getTriggeringElement is fine.
-    $real_trigger = $this->elementTriggeredScriptedSubmission($form_state);
-    if (!isset($trigger) && ($real_trigger == 'bundle[bundle_select]')) {
-      $input = $form_state->getUserInput();
-      $bundle_name = $input['bundle']['bundle_select'];
-      if ($bundle_name != self::NEW_BUNDLE_SELECT_VALUE) {
-        $this->assigner->setCurrent($this->assigner->getBundle($bundle_name));
-      }
-      $load_values = TRUE;
-    }
-    elseif ($trigger['#name'] == 'bundle[bundle_select]') {
-      $bundle_name = $form_state->getValue(array('bundle', 'bundle_select'));
-      if ($bundle_name != self::NEW_BUNDLE_SELECT_VALUE) {
-        $this->assigner->setCurrent($this->assigner->getBundle($bundle_name));
-      }
-      $load_values = TRUE;
-    }
-    elseif ($trigger['#name'] == 'removebundle') {
-      $current_bundle = $this->assigner->loadBundle($bundle_name);
-      $bundle_name = $current_bundle->getMachineName();
-      $this->assigner->removeBundle($bundle_name);
-      return $this->redirect('features.assignment', array(''));
-    }
-    if (!isset($current_bundle)) {
-      switch ($bundle_name) {
-        // If no bundle is selected, use the current one.
-        case NULL:
-          $current_bundle = $this->assigner->loadBundle();
-          $bundle_name = $current_bundle->getMachineName();
-          break;
-        case self::NEW_BUNDLE_SELECT_VALUE:
-          $current_bundle = $this->assigner->loadBundle(FeaturesBundleInterface::DEFAULT_BUNDLE);
-          break;
-        default:
-          $current_bundle = $this->assigner->loadBundle($bundle_name);
-          break;
-      }
-    }
-
-    $enabled_methods = $current_bundle->getEnabledAssignments();
-    $methods_weight = $current_bundle->getAssignmentWeights();
-
-    // Add missing data to the methods lists.
-    $assignment_info = $this->assigner->getAssignmentMethods();
-    foreach ($assignment_info as $method_id => $method) {
-      if (!isset($methods_weight[$method_id])) {
-        $methods_weight[$method_id] = isset($method['weight']) ? $method['weight'] : 0;
-      }
-    }
-    // Order methods list by weight.
-    asort($methods_weight);
-
-    if ($load_values) {
-      $this->loadBundleValues($bundle_name, $form_state, $current_bundle, $enabled_methods, $methods_weight);
-    }
-
-    $form = array(
-      '#attached' => array(
-        'library' => array(
-          // Provides the copyFieldValue behavior invoked below.
-          'system/drupal.system',
-          'features_ui/drupal.features_ui.admin',
-        ),
-      ),
-      // '#attributes' => array('class' => 'edit-bundles-wrapper'),
-      '#tree' => TRUE,
-      '#show_operations' => FALSE,
-      'weight' => array('#tree' => TRUE),
-      '#prefix' => '<div id="edit-bundles-wrapper">',
-      '#suffix' => '</div>',
-    );
-
-    $form['bundle'] = array(
-      '#type' => 'fieldset',
-      '#title' => $this->t('Bundle'),
-      '#tree' => TRUE,
-      '#weight' => -9,
-    );
-
-    if ($bundle_name == self::NEW_BUNDLE_SELECT_VALUE) {
-      $default_values = [
-        'bundle_select' => self::NEW_BUNDLE_SELECT_VALUE,
-        'name' => '',
-        'machine_name' => '',
-        'description' => '',
-        'is_profile' => FALSE,
-        'profile_name' => '',
-      ];
-    }
-    else {
-      $default_values = [
-        'bundle_select' => $current_bundle->getMachineName(),
-        'name' => $current_bundle->getName(),
-        'machine_name' => $current_bundle->getMachineName(),
-        'description' => $current_bundle->getDescription(),
-        'is_profile' => $current_bundle->isProfile(),
-        'profile_name' => $current_bundle->getProfileName(),
-      ];
-    }
-    $form['bundle']['bundle_select'] = array(
-      '#title' => $this->t('Bundle'),
-      '#title_display' => 'invisible',
-      '#type' => 'select',
-      '#options' => [self::NEW_BUNDLE_SELECT_VALUE => $this->t('--New--')] + $this->assigner->getBundleOptions(),
-      '#default_value' => $default_values['bundle_select'],
-      '#ajax' => array(
-        'callback' => '::updateForm',
-        'wrapper' => 'edit-bundles-wrapper',
-      ),
-    );
-
-    // Don't show the remove button for the default bundle or when adding a new
-    // bundle.
-    if ($bundle_name != self::NEW_BUNDLE_SELECT_VALUE && !$current_bundle->isDefault()) {
-      $form['bundle']['remove'] = array(
-        '#type' => 'button',
-        '#name' => 'removebundle',
-        '#value' => $this->t('Remove bundle'),
-      );
-    }
-
-    $form['bundle']['name'] = array(
-      '#title' => $this->t('Bundle name'),
-      '#type' => 'textfield',
-      '#description' => $this->t('A unique human-readable name of this bundle.'),
-      '#default_value' => $default_values['name'],
-      '#required' => TRUE,
-      '#disabled' => $bundle_name == FeaturesBundleInterface::DEFAULT_BUNDLE,
-    );
-
-    // Don't allow changing the default bundle machine name.
-    if ($bundle_name == FeaturesBundleInterface::DEFAULT_BUNDLE) {
-      $form['bundle']['machine_name'] = array(
-        '#type' => 'value',
-        '#value' => $default_values['machine_name'],
-      );
-    }
-    else {
-      $form['bundle']['machine_name'] = array(
-        '#title' => $this->t('Machine name'),
-        '#type' => 'machine_name',
-        '#required' => TRUE,
-        '#default_value' => $default_values['machine_name'],
-        '#description' => $this->t('A unique machine-readable name of this bundle.  Used to prefix exported packages. It must only contain lowercase letters, numbers, and underscores.'),
-        '#machine_name' => array(
-          'source' => array('bundle', 'name'),
-          'exists' => array($this, 'bundleExists'),
-        ),
-      );
-    }
-
-    $form['bundle']['description'] = array(
-      '#title' => $this->t('Distribution description'),
-      '#type' => 'textfield',
-      '#default_value' => $default_values['description'],
-      '#description' => $this->t('A description of the bundle.'),
-      '#size' => 80,
-    );
-
-    $form['bundle']['is_profile'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Include install profile'),
-      '#default_value' => $default_values['is_profile'],
-      '#description' => $this->t('Select this option to have your features packaged into an install profile.'),
-      '#attributes' => array(
-        'data-add-profile' => 'status',
-      ),
-    );
-
-    $show_and_require_if_profile_checked = array(
-      'visible' => array(
-        ':input[data-add-profile="status"]' => array('checked' => TRUE),
-      ),
-      'required' => array(
-        ':input[data-add-profile="status"]' => array('checked' => TRUE),
-      ),
-    );
-
-    $form['bundle']['profile_name'] = array(
-      '#title' => $this->t('Profile name'),
-      '#type' => 'textfield',
-      '#default_value' => $default_values['profile_name'],
-      '#description' => $this->t('The machine name (directory name) of your profile.'),
-      '#size' => 30,
-      // Show and require only if the profile.add option is selected.
-      '#states' => $show_and_require_if_profile_checked,
-    );
-
-    // Attach the copyFieldValue behavior to the profile_name field. In
-    // practice this only works if a user tabs through the bundle machine name
-    // field or manually edits it.
-    $form['#attached']['drupalSettings']['copyFieldValue']['edit-bundle-machine-name'] = ['edit-bundle-profile-name'];
-
-    foreach ($methods_weight as $method_id => $weight) {
-
-      // A packaging method might no longer be available if the defining module
-      // has been uninstalled after the last configuration saving.
-      if (!isset($assignment_info[$method_id])) {
-        continue;
-      }
-
-      $enabled = isset($enabled_methods[$method_id]);
-      $method = $assignment_info[$method_id];
-
-      $method_name = Html::escape($method['name']);
-
-      $form['weight'][$method_id] = array(
-        '#type' => 'weight',
-        '#title' => $this->t('Weight for @title package assignment method', array('@title' => Unicode::strtolower($method_name))),
-        '#title_display' => 'invisible',
-        '#default_value' => $weight,
-        '#attributes' => array('class' => array('assignment-method-weight')),
-        '#delta' => 20,
-      );
-
-      $form['title'][$method_id] = array('#markup' => $method_name);
-
-      $form['enabled'][$method_id] = array(
-        '#type' => 'checkbox',
-        '#title' => $this->t('Enable @title package assignment method', array('@title' => Unicode::strtolower($method_name))),
-        '#title_display' => 'invisible',
-        '#default_value' => $enabled,
-      );
-
-      $form['description'][$method_id] = array('#markup' => $method['description']);
-
-      $config_op = array();
-      if (isset($method['config_route_name'])) {
-        $config_op['configure'] = array(
-          'title' => $this->t('Configure'),
-          'url' => Url::fromRoute($method['config_route_name'], array('bundle_name' => $current_bundle->getMachineName())),
-        );
-        // If there is at least one operation enabled, show the operation
-        // column.
-        $form['#show_operations'] = TRUE;
-      }
-      $form['operation'][$method_id] = array(
-        '#type' => 'operations',
-        '#links' => $config_op,
-      );
-    }
-
-    $form['actions'] = array('#type' => 'actions', '#weight' => 9);
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#button_type' => 'primary',
-      '#value' => $this->t('Save settings'),
-    );
-
-    return $form;
-  }
-
-  /**
-   * Ajax callback for handling switching the bundle selector.
-   */
-  public function updateForm($form, FormStateInterface $form_state) {
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    if ($form_state->getValue(array('bundle', 'is_profile')) && empty($form_state->getValue(array('bundle', 'profile_name')))) {
-      $form_state->setErrorByName('bundle][profile_name', $this->t('To create a profile, please enter a profile name.'));
-    }
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-
-    $enabled_methods = array_filter($form_state->getValue('enabled'));
-    ksort($enabled_methods);
-    $method_weights = $form_state->getValue('weight');
-    ksort($method_weights);
-
-    $machine_name = $form_state->getValue(array('bundle', 'machine_name'));
-
-    // If this is a new bundle, create it.
-    if ($form_state->getValue(array('bundle', 'bundle_select')) == self::NEW_BUNDLE_SELECT_VALUE) {
-      $bundle = $this->assigner->createBundleFromDefault($machine_name);
-    }
-    // Otherwise, load the current bundle and rename if needed.
-    else {
-      $bundle = $this->assigner->loadBundle();
-      $old_name = $bundle->getMachineName();
-      $new_name = $form_state->getValue(array('bundle', 'machine_name'));
-      if ($old_name != $new_name) {
-        $bundle = $this->assigner->renameBundle($old_name, $new_name);
-      }
-    }
-
-    $bundle->setName($form_state->getValue(array('bundle', 'name')));
-    $bundle->setDescription($form_state->getValue(array('bundle', 'description')));
-    $bundle->setEnabledAssignments(array_keys($enabled_methods));
-    $bundle->setAssignmentWeights($method_weights);
-    $bundle->setIsProfile($form_state->getValue(array('bundle', 'is_profile')));
-    $bundle->setProfileName($form_state->getValue(array('bundle', 'profile_name')));
-    $bundle->save();
-    $this->assigner->setBundle($bundle);
-    $this->assigner->setCurrent($bundle);
-
-    $form_state->setRedirect('features.assignment');
-    drupal_set_message($this->t('Package assignment configuration saved.'));
-  }
-
-  /**
-   * Callback for machine_name exists()
-   * @param $value
-   * @param $element
-   * @param $form_state
-   * @return bool
-   */
-  public function bundleExists($value, $element, $form_state) {
-    $bundle = $this->assigner->getBundle($value);
-    return isset($bundle);
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/AssignmentCoreForm.php b/modules/contrib/features/modules/features_ui/src/Form/AssignmentCoreForm.php
deleted file mode 100644
index 0e186b8..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/AssignmentCoreForm.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Configures the selected configuration assignment method for this site.
- */
-class AssignmentCoreForm extends AssignmentFormBase {
-
-  const METHOD_ID = 'core';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'features_assignment_core_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $bundle_name = NULL) {
-    $this->currentBundle = $this->assigner->loadBundle($bundle_name);
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-
-    $this->setConfigTypeSelect($form, $settings['types']['config'], $this->t('core'));
-    $this->setActions($form, self::METHOD_ID);
-
-    return $form;
-  }
-
- /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setValue('types', array_map('array_filter', $form_state->getValue('types')));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Merge in types selections.
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-    $settings['types'] = $form_state->getValue('types');
-    $this->currentBundle->setAssignmentSettings(self::METHOD_ID, $settings)->save();
-    $this->setRedirect($form_state);
-
-    drupal_set_message($this->t('Package assignment configuration saved.'));
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/AssignmentExcludeForm.php b/modules/contrib/features/modules/features_ui/src/Form/AssignmentExcludeForm.php
deleted file mode 100644
index 741be59..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/AssignmentExcludeForm.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Configures the selected configuration assignment method for this site.
- */
-class AssignmentExcludeForm extends AssignmentFormBase {
-
-  const METHOD_ID = 'exclude';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'features_assignment_exclude_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $bundle_name = NULL) {
-    $this->currentBundle = $this->assigner->loadBundle($bundle_name);
-
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-    $module_settings = $settings['module'];
-    $curated_settings = $settings['curated'];
-
-    $this->setConfigTypeSelect($form, $settings['types']['config'], $this->t('exclude'), FALSE,
-      $this->t("Select types of configuration that should be excluded from packaging."));
-
-    $form['curated'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Exclude designated site-specific configuration'),
-      '#default_value' => $curated_settings,
-      '#description' => $this->t('Select this option to exclude a curated list of site-specific configuration from packaging.'),
-    );
-
-    $form['module'] = array(
-      '#type' => 'fieldset',
-      '#tree' => TRUE,
-      '#title' => $this->t('Exclude configuration provided by modules'),
-    );
-
-    $form['module']['installed'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Exclude installed module-provided entity configuration'),
-      '#default_value' => $module_settings['installed'],
-      '#description' => $this->t('Select this option to exclude configuration provided by INSTALLED modules from reassignment.'),
-      '#attributes' => array(
-        'data-module-installed' => 'status',
-      ),
-    );
-
-    $show_if_module_installed_checked = array(
-      'visible' => array(
-        ':input[data-module-installed="status"]' => array('checked' => TRUE),
-      ),
-    );
-
-    $info = system_get_info('module', drupal_get_profile());
-    $form['module']['profile'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t("Don't exclude install profile's configuration"),
-      '#default_value' => $module_settings['profile'],
-      '#description' => $this->t("Select this option to allow configuration provided by the site's install profile (%profile) to be reassigned.", array('%profile' => $info['name'])),
-      '#states' => $show_if_module_installed_checked,
-    );
-
-    $bundle_name = $this->currentBundle->getMachineName();
-    $bundle_name = !empty($bundle_name) ? $bundle_name : $this->t('none');
-    $form['module']['namespace'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t("Don't exclude non-installed configuration by namespace"),
-      '#default_value' => $module_settings['namespace'],
-      '#description' => $this->t("Select this option to allow configuration provided by uninstalled modules with the bundle namespace (%namespace_*) to be reassigned.", array('%namespace' => $bundle_name)),
-      '#states' => $show_if_module_installed_checked,
-      '#attributes' => array(
-        'data-namespace' => 'status',
-      ),
-    );
-
-    $show_if_namespace_checked = array(
-      'visible' => array(
-        ':input[data-namespace="status"]' => array('checked' => TRUE),
-        ':input[data-module-installed="status"]' => array('checked' => TRUE),
-      ),
-    );
-
-    $form['module']['namespace_any'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t("Don't exclude ANY configuration by namespace"),
-      '#default_value' => $module_settings['namespace_any'],
-      '#description' => $this->t("Select this option to allow configuration provided by ANY modules with the bundle namespace (%namespace_*) to be reassigned.
-        Warning: Can cause installed configuration to be reassigned to different packages.", array('%namespace' => $bundle_name)),
-      '#states' => $show_if_namespace_checked,
-    );
-
-    $this->setActions($form, self::METHOD_ID);
-
-    return $form;
-  }
-
- /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setValue('types', array_map('array_filter', $form_state->getValue('types')));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Merge in selections.
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-    $settings = array_merge($settings, [
-      'types' => $form_state->getValue('types'),
-      'curated' => $form_state->getValue('curated'),
-      'module' => $form_state->getValue('module'),
-    ]);
-
-    $this->currentBundle->setAssignmentSettings(self::METHOD_ID, $settings)->save();
-
-    $this->setRedirect($form_state);
-    drupal_set_message($this->t('Package assignment configuration saved.'));
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/AssignmentFormBase.php b/modules/contrib/features/modules/features_ui/src/Form/AssignmentFormBase.php
deleted file mode 100644
index 9756c3c..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/AssignmentFormBase.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\FeaturesAssignerInterface;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Configures the selected configuration assignment method for this site.
- */
-abstract class AssignmentFormBase extends FormBase {
-
-  /**
-   * The features manager.
-   *
-   * @var \Drupal\features\FeaturesManagerInterface
-   */
-  protected $featuresManager;
-
-  /**
-   * The package assigner.
-   *
-   * @var \Drupal\features\FeaturesAssignerInterface
-   */
-  protected $assigner;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The current bundle.
-   *
-   * @var \Drupal\features\FeaturesBundleInterface
-   */
-  protected $currentBundle;
-
-  /**
-   * Constructs a AssignmentBaseForm object.
-   *
-   * @param \Drupal\features\FeaturesManagerInterface $features_manager
-   *   The features manager.
-   * @param \Drupal\features\FeaturesAssignerInterface $assigner
-   *   The assigner.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   */
-  public function __construct(FeaturesManagerInterface $features_manager, FeaturesAssignerInterface $assigner, EntityTypeManagerInterface $entity_type_manager) {
-    $this->featuresManager = $features_manager;
-    $this->assigner = $assigner;
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('features.manager'),
-      $container->get('features_assigner'),
-      $container->get('entity_type.manager')
-    );
-  }
-
-  /**
-   * Adds configuration types checkboxes.
-   */
-  protected function setConfigTypeSelect(&$form, $defaults, $type, $bundles_only = FALSE, $description = '') {
-    $options = $this->featuresManager->listConfigTypes($bundles_only);
-
-    if (!isset($form['types'])) {
-      $form['types'] = array(
-        '#type' => 'container',
-        '#tree' => TRUE,
-      );
-    }
-
-    $form['types']['config'] = array(
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Configuration types'),
-      '#description' => !empty($description) ? $description : $this->t('Select types of configuration that should be considered @type types.', array('@type' => $type)),
-      '#options' => $options,
-      '#default_value' => $defaults,
-    );
-  }
-
-  /**
-   * Adds content entity types checkboxes.
-   */
-  protected function setContentTypeSelect(&$form, $defaults, $type, $exclude_has_config_bundles = TRUE) {
-    $entity_types = $this->entityTypeManager->getDefinitions();
-
-    $has_config_bundle = array();
-    foreach ($entity_types as $definition) {
-      if ($entity_type_id = $definition->getBundleOf()) {
-        $has_config_bundle[] = $entity_type_id;
-      }
-    }
-    $options = array();
-
-    foreach ($entity_types as $entity_type_id => $entity_type) {
-      if (!$entity_type instanceof ContentEntityTypeInterface) {
-        continue;
-      }
-      if ($exclude_has_config_bundles && in_array($entity_type_id, $has_config_bundle)) {
-        continue;
-      }
-      $options[$entity_type_id] = $entity_type->getLabel() ?: $entity_type_id;
-    }
-
-    // Sort the entity types by label.
-    uasort($options, 'strnatcasecmp');
-
-    if (!isset($form['types'])) {
-      $form['types'] = array(
-        '#type' => 'container',
-        '#tree' => TRUE,
-      );
-    }
-
-    $form['types']['content'] = array(
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Content entity types'),
-      '#description' => $this->t('Select content entity types that should be considered @type types.', array('@type' => $type)),
-      '#options' => $options,
-      '#default_value' => $defaults,
-    );
-  }
-
-  /**
-   * Adds a "Save settings" submit action.
-   */
-  protected function setActions(&$form, $method_id = NULL) {
-    $assignment_info = $this->assigner->getAssignmentMethods();
-    if (isset($method_id) && isset($assignment_info[$method_id])) {
-      $method = $assignment_info[$method_id];
-      $form['help_text'] = array(
-        '#markup' => $method['description'],
-        '#prefix' => '<p class="messages messages--status">',
-        '#suffix' => '</p>',
-        '#weight' => -99,
-      );
-    }
-
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#button_type' => 'primary',
-      '#value' => $this->t('Save settings'),
-    );
-    $form['#attributes']['class'][] = 'features-assignment-settings-form';
-    $form['#attached'] = array(
-      'library' => array(
-        'features_ui/drupal.features_ui.admin',
-    ));
-  }
-
-  /**
-   * Redirects back to the Bundle config form.
-   *
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The form state.
-   */
-  protected function setRedirect(FormStateInterface $form_state) {
-    $form_state->setRedirect('features.assignment', array('bundle_name' => $this->currentBundle->getMachineName()));
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/AssignmentOptionalForm.php b/modules/contrib/features/modules/features_ui/src/Form/AssignmentOptionalForm.php
deleted file mode 100644
index 756fb54..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/AssignmentOptionalForm.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Configures the selected configuration assignment method for this site.
- */
-class AssignmentOptionalForm extends AssignmentFormBase {
-
-  const METHOD_ID = 'optional';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'features_assignment_optional_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $bundle_name = NULL) {
-    $this->currentBundle = $this->assigner->loadBundle($bundle_name);
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-
-    $this->setConfigTypeSelect($form, $settings['types']['config'], $this->t('optional'));
-    $this->setActions($form, self::METHOD_ID);
-
-    return $form;
-  }
-
- /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setValue('types', array_map('array_filter', $form_state->getValue('types')));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Merge in types selections.
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-    $settings['types'] = $form_state->getValue('types');
-    $this->currentBundle->setAssignmentSettings(self::METHOD_ID, $settings)->save();
-    $this->setRedirect($form_state);
-
-    drupal_set_message($this->t('Package assignment configuration saved.'));
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/AssignmentProfileForm.php b/modules/contrib/features/modules/features_ui/src/Form/AssignmentProfileForm.php
deleted file mode 100644
index 2a4b177..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/AssignmentProfileForm.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Configures the selected configuration assignment method for this profile.
- */
-class AssignmentProfileForm extends AssignmentFormBase {
-
-  const METHOD_ID = 'profile';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'features_assignment_profile_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $bundle_name = NULL) {
-    $this->currentBundle = $this->assigner->loadBundle($bundle_name);
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-
-    $this->setConfigTypeSelect($form, $settings['types']['config'], $this->t('profile'));
-
-    $form['curated'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Add commonly-needed configuration'),
-      '#default_value' => $settings['curated'],
-      '#description' => $this->t('Select this option to add a curated list of commonly-needed configuration including cron- and theme-related settings to the install profile.'),
-    );
-
-    $standard_settings = $settings['standard'];
-
-    $form['standard'] = array(
-      '#type' => 'fieldset',
-      '#title' => $this->t('Crib from the Standard profile'),
-      '#tree' => TRUE,
-    );
-    $form['standard']['files'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Crib code'),
-      '#default_value' => $standard_settings['files'],
-      '#description' => $this->t('Select this option to add configuration and other files to the optional install profile from the Drupal core Standard install profile. Without these additions, a generated install profile will be missing some important initial setup.'),
-    );
-    $form['standard']['dependencies'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Crib dependencies'),
-      '#default_value' => $standard_settings['dependencies'],
-      '#description' => $this->t('Select this option to add module and theme dependencies from the Standard install profile.'),
-    );
-
-    $this->setActions($form, self::METHOD_ID);
-
-    return $form;
-  }
-
- /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setValue('types', array_map('array_filter', $form_state->getValue('types')));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Merge in selections.
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-
-    $settings = array_merge($settings, [
-      'curated' => $form_state->getValue('curated'),
-      'standard' => $form_state->getValue('standard'),
-      'types' => $form_state->getValue('types'),
-    ]);
-
-    $this->currentBundle->setAssignmentSettings(self::METHOD_ID, $settings)->save();
-    $this->setRedirect($form_state);
-
-    drupal_set_message($this->t('Package assignment configuration saved.'));
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/AssignmentSiteForm.php b/modules/contrib/features/modules/features_ui/src/Form/AssignmentSiteForm.php
deleted file mode 100644
index 443d1f9..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/AssignmentSiteForm.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Configures the selected configuration assignment method for this site.
- */
-class AssignmentSiteForm extends AssignmentFormBase {
-
-  const METHOD_ID = 'site';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'features_assignment_site_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $bundle_name = NULL) {
-    $this->currentBundle = $this->assigner->loadBundle($bundle_name);
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-
-    $this->setConfigTypeSelect($form, $settings['types']['config'], $this->t('site'));
-    $this->setActions($form, self::METHOD_ID);
-
-    return $form;
-  }
-
- /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setValue('types', array_map('array_filter', $form_state->getValue('types')));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Merge in types selections.
-    $settings = $this->currentBundle->getAssignmentSettings(self::METHOD_ID);
-    $settings['types'] = $form_state->getValue('types');
-    $this->currentBundle->setAssignmentSettings(self::METHOD_ID, $settings)->save();
-    $this->setRedirect($form_state);
-
-    drupal_set_message($this->t('Package assignment configuration saved.'));
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/FeaturesDiffForm.php b/modules/contrib/features/modules/features_ui/src/Form/FeaturesDiffForm.php
deleted file mode 100644
index 68cc0e9..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/FeaturesDiffForm.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\Component\Utility\Html;
-use Drupal\features\ConfigurationItem;
-use Drupal\features\FeaturesAssignerInterface;
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\features\Package;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Component\Diff\DiffFormatter;
-use Drupal\config_update\ConfigRevertInterface;
-use Drupal\config_update\ConfigDiffInterface;
-
-/**
- * Defines the features differences form.
- */
-class FeaturesDiffForm extends FormBase {
-
-  /**
-   * The features manager.
-   *
-   * @var array
-   */
-  protected $featuresManager;
-
-  /**
-   * The package assigner.
-   *
-   * @var array
-   */
-  protected $assigner;
-
-  /**
-   * The config differ.
-   *
-   * @var \Drupal\config_update\ConfigDiffInterface
-   */
-  protected $configDiff;
-
-  /**
-   * The diff formatter.
-   *
-   * @var \Drupal\Core\Diff\DiffFormatter
-   */
-  protected $diffFormatter;
-
-  /**
-   * The config reverter.
-   *
-   * @var \Drupal\config_update\ConfigRevertInterface
-   */
-  protected $configRevert;
-
-  /**
-   * Constructs a FeaturesDiffForm object.
-   *
-   * @param \Drupal\features\FeaturesManagerInterface $features_manager
-   *   The features manager.
-   */
-  public function __construct(FeaturesManagerInterface $features_manager, FeaturesAssignerInterface $assigner,
-                              ConfigDiffInterface $config_diff, DiffFormatter $diff_formatter,
-                              ConfigRevertInterface $config_revert) {
-    $this->featuresManager = $features_manager;
-    $this->assigner = $assigner;
-    $this->configDiff = $config_diff;
-    $this->diffFormatter = $diff_formatter;
-    $this->configRevert = $config_revert;
-    $this->diffFormatter->show_header = FALSE;
-    $this->diffFormatter->leading_context_lines = 0;
-    $this->diffFormatter->trailing_context_lines = 0;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('features.manager'),
-      $container->get('features_assigner'),
-      $container->get('config_update.config_diff'),
-      $container->get('diff.formatter'),
-      $container->get('features.config_update')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'features_diff_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $featurename = '') {
-    $current_bundle = $this->assigner->applyBundle();
-    $packages = $this->featuresManager->getPackages();
-    $form = array();
-
-    $machine_name = '';
-    if (!empty($featurename) && empty($packages[$featurename])) {
-      drupal_set_message($this->t('Feature @name does not exist.', array('@name' => $featurename)), 'error');
-      return array();
-    }
-    elseif (!empty($featurename)) {
-      $machine_name = $packages[$featurename]->getMachineName();
-      $packages = array($packages[$featurename]);
-    }
-    else {
-      $packages = $this->featuresManager->filterPackages($packages, $current_bundle->getMachineName());
-    }
-
-    $header = array(
-      'row' => array(
-        'data' => !empty($machine_name)
-        ? $this->t('Differences in @name', array('@name' => $machine_name))
-        : ($current_bundle->isDefault() ? $this->t('All differences') : $this->t('All differences in bundle: @bundle', array('@bundle' => $current_bundle->getName()))),
-      ),
-    );
-
-    $options = array();
-    foreach ($packages as $package) {
-      if ($package->getStatus() != FeaturesManagerInterface::STATUS_NO_EXPORT) {
-        $missing = $this->featuresManager->reorderMissing($this->featuresManager->detectMissing($package));
-        $overrides = $this->featuresManager->detectOverrides($package, TRUE);
-        if (!empty($overrides) || !empty($missing)) {
-          $options += array(
-            $package->getMachineName() => array(
-              'row' => array(
-                'data' => array(
-                  '#type' => 'html_tag',
-                  '#tag' => 'h2',
-                  '#value' => Html::escape($package->getName()),
-                ),
-              ),
-              '#attributes' => array(
-                'class' => 'features-diff-header',
-              ),
-            ),
-          );
-          $options += $this->diffOutput($package, $overrides, $missing);
-        }
-      }
-    }
-
-    $form['diff'] = array(
-      '#type' => 'tableselect',
-      '#header' => $header,
-      '#options' => $options,
-      '#attributes' => array('class' => array('features-diff-listing')),
-      '#empty' => $this->t('No differences exist in exported features.'),
-    );
-
-    $form['actions'] = array('#type' => 'actions', '#tree' => TRUE);
-    $form['actions']['revert'] = array(
-      '#type' => 'submit',
-      '#value' => $this->t('Import changes'),
-    );
-    $form['actions']['help'] = array(
-      '#markup' => $this->t('Import the selected changes above into the active configuration.'),
-    );
-
-    $form['#attached']['library'][] = 'system/diff';
-    $form['#attached']['library'][] = 'features_ui/drupal.features_ui.admin';
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->assigner->assignConfigPackages();
-    $config = $this->featuresManager->getConfigCollection();
-    $items = array_filter($form_state->getValue('diff'));
-    if (empty($items)) {
-      drupal_set_message($this->t('No configuration was selected for import.'), 'warning');
-      return;
-    }
-    foreach ($items as $config_name) {
-      if (isset($config[$config_name])) {
-        $item = $config[$config_name];
-        $type = ConfigurationItem::fromConfigStringToConfigType($item->getType());
-        $this->configRevert->revert($type, $item->getShortName());
-      }
-      else {
-        $item = $this->featuresManager->getConfigType($config_name);
-        $type = ConfigurationItem::fromConfigStringToConfigType($item['type']);
-        $this->configRevert->import($type, $item['name_short']);
-      }
-      drupal_set_message($this->t('Imported @name', array('@name' => $config_name)));
-    }
-  }
-
-  /**
-   * Returns a form element for the given overrides.
-   *
-   * @param \Drupal\features\Package $package
-   *   A package.
-   * @param array $overrides
-   *   An array of overrides.
-   * @param array $missing
-   *   An array of missing config.
-   *
-   * @return array
-   *   A form element.
-   */
-  protected function diffOutput(Package $package, $overrides, $missing = array()) {
-    $element = array();
-    $config = $this->featuresManager->getConfigCollection();
-    $components = array_merge($missing, $overrides);
-
-    $header = array(
-      array('data' => '', 'class' => 'diff-marker'),
-      array('data' => $this->t('Active site config'), 'class' => 'diff-context'),
-      array('data' => '', 'class' => 'diff-marker'),
-      array('data' => $this->t('Feature code config'), 'class' => 'diff-context'),
-    );
-
-    foreach ($components as $name) {
-      $rows[] = array(array('data' => $name, 'colspan' => 4, 'header' => TRUE));
-
-      if (!isset($config[$name])) {
-        $details = array(
-          '#markup' => $this->t('Component in feature missing from active config.'),
-        );
-      }
-      else {
-        $active = $this->featuresManager->getActiveStorage()->read($name);
-        $extension = $this->featuresManager->getExtensionStorages()->read($name);
-        if (empty($extension)) {
-          $details = array(
-            '#markup' => $this->t('Dependency detected in active config but not exported to the feature.'),
-          );
-        }
-        else {
-          $diff = $this->configDiff->diff($active, $extension);
-          $details = array(
-            '#type' => 'table',
-            '#header' => $header,
-            '#rows' => $this->diffFormatter->format($diff),
-            '#attributes' => array('class' => array('diff', 'features-diff')),
-          );
-        }
-      }
-      $element[$name] = array(
-        'row' => array(
-          'data' => array(
-            '#type' => 'details',
-            '#title' => Html::escape($name),
-            '#open' => TRUE,
-            '#description' => array(
-              'data' => $details,
-            ),
-          ),
-        ),
-        '#attributes' => array(
-          'class' => 'diff-' . $package->getMachineName(),
-        ),
-      );
-    }
-
-    return $element;
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/FeaturesEditForm.php b/modules/contrib/features/modules/features_ui/src/Form/FeaturesEditForm.php
deleted file mode 100644
index c4b6c33..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/FeaturesEditForm.php
+++ /dev/null
@@ -1,1092 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Xss;
-use Drupal\features\FeaturesAssignerInterface;
-use Drupal\features\FeaturesGeneratorInterface;
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\ConfigurationItem;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-Use Drupal\Component\Render\FormattableMarkup;
-use Drupal\config_update\ConfigRevertInterface;
-
-/**
- * Defines the features settings form.
- */
-class FeaturesEditForm extends FormBase {
-
-  /**
-   * The features manager.
-   *
-   * @var array
-   */
-  protected $featuresManager;
-
-  /**
-   * The package assigner.
-   *
-   * @var array
-   */
-  protected $assigner;
-
-  /**
-   * The package generator.
-   *
-   * @var array
-   */
-  protected $generator;
-
-  /**
-   * Current package being edited.
-   *
-   * @var \Drupal\features\Package
-   */
-  protected $package;
-
-  /**
-   * Current bundle machine name.
-   *
-   * NOTE: D8 cannot serialize objects within forms so you can't directly
-   * store the entire Bundle object here.
-   *
-   * @var string
-   */
-  protected $bundle;
-
-  /**
-   * Previous bundle name for ajax processing.
-   *
-   * @var string
-   */
-  protected $oldBundle;
-
-  /**
-   * Config to be specifically excluded.
-   *
-   * @var array
-   */
-  protected $excluded;
-
-  /**
-   * Config to be specifically required.
-   *
-   * @var array
-   */
-  protected $required;
-
-  /**
-   * Config referenced by other packages.
-   *
-   * @var array
-   */
-  protected $conflicts;
-
-  /**
-   * Determine if conflicts are allowed to be added.
-   *
-   * @var bool
-   */
-  protected $allowConflicts;
-
-  /**
-   * Config missing from active site.
-   *
-   * @var array
-   */
-  protected $missing;
-
-  /**
-   * The config reverter.
-   *
-   * @var \Drupal\config_update\ConfigRevertInterface
-   */
-  protected $configRevert;
-
-  /**
-   * Constructs a FeaturesEditForm object.
-   *
-   * @param \Drupal\features\FeaturesManagerInterface $features_manager
-   *   The features manager.
-   */
-  public function __construct(FeaturesManagerInterface $features_manager, FeaturesAssignerInterface $assigner, FeaturesGeneratorInterface $generator, ConfigRevertInterface $config_revert) {
-    $this->featuresManager = $features_manager;
-    $this->assigner = $assigner;
-    $this->generator = $generator;
-    $this->configRevert = $config_revert;
-    $this->excluded = [];
-    $this->required = [];
-    $this->conflicts = [];
-    $this->missing = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('features.manager'),
-      $container->get('features_assigner'),
-      $container->get('features_generator'),
-      $container->get('features.config_update')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'features_edit_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $featurename = '') {
-    $session = $this->getRequest()->getSession();
-    $trigger = $form_state->getTriggeringElement();
-    if ($trigger['#name'] == 'package') {
-      // Save current bundle name for later ajax callback.
-      $this->oldBundle = $this->bundle;
-    }
-    elseif ($trigger['#name'] == 'conflicts') {
-      if (isset($session)) {
-        $session->set('features_allow_conflicts', $form_state->getValue('conflicts'));
-      }
-    }
-    if (!$form_state->isValueEmpty('package')) {
-      $bundle_name = $form_state->getValue('package');
-      $bundle = $this->assigner->getBundle($bundle_name);
-    }
-    else {
-      $bundle = $this->assigner->loadBundle();
-    }
-    // Only store bundle name, not full object.
-    $this->bundle = $bundle->getMachineName();
-
-    $this->allowConflicts = FALSE;
-    if (isset($session)) {
-      $this->allowConflicts = $session->get('features_allow_conflicts', FALSE);
-    }
-
-    // Pass the $force argument as TRUE because we want to include any excluded
-    // configuration items. These should show up as automatically assigned, but
-    // not selected, thus allowing the admin to reselect if desired.
-    // @see FeaturesManagerInterface::assignConfigPackage()
-    $this->assigner->assignConfigPackages(TRUE);
-
-    $packages = $this->featuresManager->getPackages();
-    if (empty($packages[$featurename])) {
-      $featurename = str_replace(array('-', ' '), '_', $featurename);
-      $this->package = $this->featuresManager->initPackage($featurename, NULL, '', 'module', $bundle);
-    }
-    else {
-      $this->package = $packages[$featurename];
-    }
-
-    if (!empty($packages[$featurename]) && $this->package->getBundle() !== $this->bundle && $form_state->isValueEmpty('package')) {
-      // Make sure the current bundle matches what is stored in the package.
-      // But only do this if the Package value hasn't been manually changed.
-      $bundle = $this->assigner->getBundle($this->package->getBundle());
-      if (empty($bundle)) {
-        // Create bundle if it doesn't exist yet
-        $bundle = $this->assigner->createBundleFromDefault($this->package->getBundle());
-      }
-      $this->bundle = $bundle->getMachineName();
-      $this->assigner->reset();
-      $this->assigner->assignConfigPackages(TRUE);
-      $packages = $this->featuresManager->getPackages();
-      $this->package = $packages[$featurename];
-    }
-
-    $form = array(
-      '#show_operations' => FALSE,
-      '#prefix' => '<div id="features-edit-wrapper">',
-      '#suffix' => '</div>',
-    );
-
-    $form['info'] = array(
-      '#type' => 'fieldset',
-      '#title' => $this->t('General Information'),
-      '#tree' => FALSE,
-      '#weight' => 2,
-      '#prefix' => "<div id='features-export-info'>",
-      '#suffix' => '</div>',
-    );
-
-    $form['info']['name'] = array(
-      '#title' => $this->t('Name'),
-      '#description' => $this->t('Example: Image gallery') . ' (' . $this->t('Do not begin name with numbers.') . ')',
-      '#type' => 'textfield',
-      '#default_value' => $this->package->getName(),
-    );
-    if (!$bundle->isDefault()) {
-      $form['info']['name']['#description'] .= '<br/>' .
-        $this->t('The namespace "@name_" will be prepended to the machine name', array('@name' => $bundle->getMachineName()));
-    }
-
-    $form['info']['machine_name'] = array(
-      '#type' => 'machine_name',
-      '#title' => $this->t('Machine-readable name'),
-      '#description' => $this->t('Example: image_gallery') . ' ' . $this->t('May only contain lowercase letters, numbers and underscores.'),
-      '#required' => TRUE,
-      '#default_value' => $bundle->getShortName($this->package->getMachineName()),
-      '#machine_name' => array(
-        'source' => array('info', 'name'),
-        'exists' => array($this, 'featureExists'),
-      ),
-    );
-    if (!$bundle->isDefault()) {
-      $form['info']['machine_name']['#description'] .= '<br/>' .
-        $this->t('NOTE: Do NOT include the namespace prefix "@name_"; it will be added automatically.', array('@name' => $bundle->getMachineName()));
-    }
-
-    $form['info']['description'] = array(
-      '#title' => $this->t('Description'),
-      '#description' => $this->t('Provide a short description of what users should expect when they install your feature.'),
-      '#type' => 'textarea',
-      '#rows' => 3,
-      '#default_value' => $this->package->getDescription(),
-    );
-
-    $form['info']['package'] = array(
-      '#title' => $this->t('Bundle'),
-      '#type' => 'select',
-      '#options' => $this->assigner->getBundleOptions(),
-      '#default_value' => $bundle->getMachineName(),
-      '#ajax' => array(
-        'callback' => '::updateBundle',
-        'wrapper' => 'features-export-info',
-      ),
-    );
-
-    $form['info']['version'] = array(
-      '#title' => $this->t('Version'),
-      '#description' => $this->t('Examples: 8.x-1.0, 8.x-1.0-beta1'),
-      '#type' => 'textfield',
-      '#required' => FALSE,
-      '#default_value' => $this->package->getVersion(),
-      '#size' => 30,
-    );
-
-    list($full_name, $path) = $this->featuresManager->getExportInfo($this->package, $bundle);
-    $form['info']['directory'] = array(
-      '#title' => $this->t('Path'),
-      '#description' => $this->t('Path to export package using Write action, relative to root directory.'),
-      '#type' => 'textfield',
-      '#required' => FALSE,
-      '#default_value' => $path,
-      '#size' => 30,
-    );
-
-    $require_all = $this->package->getRequiredAll();
-    $form['info']['require_all'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Mark all config as required'),
-      '#default_value' => $this->package->getRequiredAll(),
-      '#description' => $this->t('Required config will be assigned to this feature regardless of other assignment plugins.'),
-    );
-
-    $form['conflicts'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Allow conflicts'),
-      '#default_value' => $this->allowConflicts,
-      '#description' => $this->t('Allow configuration to be exported to more than one feature.'),
-      '#weight' => 8,
-      '#ajax' => array(
-        'callback' => '::updateForm',
-        'wrapper' => 'features-edit-wrapper',
-      ),
-    );
-
-    $generation_info = array();
-    if (\Drupal::currentUser()->hasPermission('export configuration')) {
-      // Offer available generation methods.
-      $generation_info = $this->generator->getGenerationMethods();
-      // Sort generation methods by weight.
-      uasort($generation_info, '\Drupal\Component\Utility\SortArray::sortByWeightElement');
-    }
-
-    $form['actions'] = array('#type' => 'actions', '#tree' => TRUE);
-    foreach ($generation_info as $method_id => $method) {
-      $form['actions'][$method_id] = array(
-        '#type' => 'submit',
-        '#name' => $method_id,
-        '#value' => $this->t('@name', array('@name' => $method['name'])),
-        '#attributes' => array(
-          'title' => Html::escape($method['description']),
-        ),
-      );
-    }
-
-    // Build the Component Listing panel on the right.
-    $form['export'] = $this->buildComponentList($form_state);
-
-    if (!empty($this->missing)) {
-      if ($this->allowConflicts) {
-        $form['actions']['#prefix'] = '<strong>' .
-          $this->t('WARNING: Package contains configuration missing from site.') . '<br>' .
-          $this->t('This configuration will be removed if you export it.') .
-          '</strong>';
-      }
-      else {
-        foreach ($generation_info as $method_id => $method) {
-          unset($form['actions'][$method_id]);
-        }
-        $form['actions']['#prefix'] = '<strong>' .
-          $this->t('Package contains configuration missing from site.') . '<br>' .
-          $this->t('Import the feature to create the missing config before you can export it.') . '<br>' .
-          $this->t('Or, enable the Allow Conflicts option above.') .
-          '</strong>';
-      }
-      $form['actions']['import_missing'] = array(
-        '#type' => 'submit',
-        '#name' => 'import_missing',
-        '#value' => $this->t('Import Missing'),
-        '#attributes' => array(
-          'title' => $this->t('Import only the missing configuration items.'),
-        ),
-      );
-    }
-
-    $form['#attached'] = array(
-      'library' => array(
-        'features_ui/drupal.features_ui.admin',
-      ),
-      'drupalSettings' => array(
-        'features' => array(
-          'excluded' => $this->excluded,
-          'required' => $this->required,
-          'conflicts' => $this->conflicts,
-          'autodetect' => TRUE,
-        ),
-      ),
-    );
-
-    return $form;
-  }
-
-  /**
-   * Provides an ajax callback for handling conflict checkbox.
-   */
-  public function updateForm($form, FormStateInterface $form_state) {
-    return $form;
-  }
-
-  /**
-   * Provides an ajax callback for handling switching the bundle selector.
-   */
-  public function updateBundle($form, FormStateInterface $form_state) {
-    $old_bundle = $this->assigner->getBundle($this->oldBundle);
-    $bundle_name = $form_state->getValue('package');
-    $bundle = $this->assigner->getBundle($bundle_name);
-    if (isset($bundle) && isset($old_bundle)) {
-      $short_name = $old_bundle->getShortName($this->package->getMachineName());
-      if ($bundle->isDefault()) {
-        $short_name = $old_bundle->getFullName($short_name);
-      }
-      $this->package->setMachineName($bundle->getFullName($short_name));
-      $form['info']['machine_name']['#value'] = $bundle->getShortName($this->package->getMachineName());
-    }
-    return $form['info'];
-  }
-
-  /**
-   * Callback for machine_name exists()
-   * @param $value
-   * @param $element
-   * @param $form_state
-   * @return bool
-   */
-  public function featureExists($value, $element, $form_state) {
-    $bundle = $this->assigner->getBundle($this->bundle);
-    $value = $bundle->getFullName($value);
-    $packages = $this->featuresManager->getPackages();
-    // A package may conflict only if it's been exported.
-    return (isset($packages[$value]) && ($packages[$value]->getState() !== FeaturesManagerInterface::STATUS_NO_EXPORT)) || \Drupal::moduleHandler()->moduleExists($value);
-  }
-
-  /**
-   * Returns the render array elements for the Components selection on the Edit
-   * form.
-   */
-  protected function buildComponentList(FormStateInterface $form_state) {
-    $element = array(
-      '#type' => 'fieldset',
-      '#title' => $this->t('Components'),
-      '#description' => $this->t('Expand each component section and select which items should be included in this feature export.'),
-      '#tree' => FALSE,
-      '#prefix' => "<div id='features-export-wrapper'>",
-      '#suffix' => '</div>',
-      '#weight' => 1,
-    );
-
-    // Filter field used in javascript, so javascript will unhide it.
-    $element['features_filter_wrapper'] = array(
-      '#type' => 'fieldset',
-      '#title' => $this->t('Filters'),
-      '#tree' => FALSE,
-      '#prefix' => "<div id='features-filter' class='element-invisible'>",
-      '#suffix' => '</div>',
-      '#weight' => -10,
-    );
-    $element['features_filter_wrapper']['features_filter'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Search'),
-      '#hidden' => TRUE,
-      '#default_value' => '',
-      '#suffix' => "<span class='features-filter-clear'>" . $this->t('Clear') . "</span>",
-    );
-    $element['features_filter_wrapper']['checkall'] = array(
-      '#type' => 'checkbox',
-      '#default_value' => FALSE,
-      '#hidden' => TRUE,
-      '#title' => $this->t('Select all'),
-      '#attributes' => array(
-        'class' => array('features-checkall'),
-      ),
-    );
-
-    $sections = array('included', 'detected', 'added');
-    $config_types = $this->featuresManager->listConfigTypes();
-
-    // Generate the export array for the current feature and user selections.
-    $export = $this->getComponentList($form_state);
-
-    foreach ($export['components'] as $component => $component_info) {
-
-      $component_items_count = count($component_info['_features_options']['sources']);
-      $label = new FormattableMarkup('@component (<span class="component-count">@count</span>)',
-        array(
-          '@component' => $config_types[$component],
-          '@count' => $component_items_count,
-        )
-      );
-
-      $count = 0;
-      foreach ($sections as $section) {
-        $count += count($component_info['_features_options'][$section]);
-      }
-      $extra_class = ($count == 0) ? 'features-export-empty' : '';
-      $component_name = str_replace('_', '-', Html::escape($component));
-
-      if ($count + $component_items_count > 0) {
-        $element[$component] = array(
-          '#markup' => '',
-          '#tree' => TRUE,
-        );
-
-        $element[$component]['sources'] = array(
-          '#type' => 'details',
-          '#title' => $label,
-          '#tree' => TRUE,
-          '#open' => FALSE,
-          '#attributes' => array('class' => array('features-export-component')),
-          '#prefix' => "<div class='features-export-parent component-$component'>",
-        );
-        $element[$component]['sources']['selected'] = array(
-          '#type' => 'checkboxes',
-          '#id' => "edit-sources-$component_name",
-          '#options' => $this->domDecodeOptions($component_info['_features_options']['sources']),
-          '#default_value' => $this->domDecodeOptions($component_info['_features_selected']['sources'], FALSE),
-          '#attributes' => array('class' => array('component-select')),
-          '#prefix' => "<span class='component-select'>",
-          '#suffix' => '</span>',
-        );
-
-        $element[$component]['before-list'] = array(
-          '#markup' => "<div class='component-list features-export-list $extra_class'>",
-        );
-
-        foreach ($sections as $section) {
-          $element[$component][$section] = array(
-            '#type' => 'checkboxes',
-            '#options' => !empty($component_info['_features_options'][$section]) ?
-              $this->domDecodeOptions($component_info['_features_options'][$section]) : array(),
-            '#default_value' => !empty($component_info['_features_selected'][$section]) ?
-              $this->domDecodeOptions($component_info['_features_selected'][$section], FALSE) : array(),
-            '#attributes' => array('class' => array('component-' . $section)),
-            '#prefix' => "<span class='component-$section'>",
-            '#suffix' => '</span>',
-          );
-        }
-
-        // Close both the before-list as well as the sources div.
-        $element[$component]['after-list'] = array(
-          '#markup' => "</div></div>",
-        );
-      }
-    }
-
-    $element['features_missing'] = array(
-      '#theme' => 'item_list',
-      '#items' => $export['missing'],
-      '#title' => $this->t('Configuration missing from active site:'),
-      '#suffix' => '<div class="description">' .
-        $this->t('Import the feature to create the missing config listed above.') .
-        '</div>',
-    );
-
-    $element['features_legend'] = array(
-      '#type' => 'fieldset',
-      '#title' => $this->t('Legend'),
-      '#tree' => FALSE,
-      '#prefix' => "<div id='features-legend'>",
-      '#suffix' => '</div>',
-    );
-    $element['features_legend']['legend'] = array(
-      '#markup' =>
-        "<span class='component-included'>" . $this->t('Normal') . "</span> " .
-        "<span class='component-added'>" . $this->t('Added') . "</span> " .
-        "<span class='component-detected'>" . $this->t('Auto detected') . "</span> " .
-        "<span class='component-conflict'>" . $this->t('Conflict') . "</span> ",
-    );
-
-    return $element;
-  }
-
-  /**
-   * Returns the full feature export array based upon user selections in
-   * form_state.
-   *
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   Optional form_state information for user selections. Can be updated to
-   *   reflect new selection status.
-   *
-   * @return \Drupal\features\Package
-   *   New export array to be exported
-   *   array['components'][$component_name] = $component_info
-   *     $component_info['_features_options'][$section] is list of available options
-   *     $component_info['_features_selected'][$section] is option state TRUE/FALSE
-   *   $section = array('sources', included', 'detected', 'added')
-   *     sources - options that are available to be added to the feature
-   *     included - options that have been previously exported to the feature
-   *     detected - options that have been auto-detected
-   *     added - newly added options to the feature
-   *
-   * NOTE: This routine gets a bit complex to handle all of the different
-   * possible user checkbox selections and de-selections.
-   * Cases to test:
-   *   1a) uncheck Included item -> mark as Added but unchecked
-   *   1b) re-check unchecked Added item -> return it to Included check item
-   *   2a) check Sources item -> mark as Added and checked
-   *   2b) uncheck Added item -> return it to Sources as unchecked
-   *   3a) uncheck Included item that still exists as auto-detect -> mark as
-   *       Detected but unchecked
-   *   3b) re-check Detected item -> return it to Included and checked
-   *   4a) check Sources item should also add any auto-detect items as Detected
-   *       and checked
-   *   4b) uncheck Sources item with auto-detect and auto-detect items should
-   *       return to Sources and unchecked
-   *   5a) uncheck a Detected item -> refreshing page should keep it as
-   *       unchecked Detected
-   *   6)  when nothing changes, refresh should not change any state
-   *   7)  should never see an unchecked Included item
-   */
-  protected function getComponentList(FormStateInterface $form_state) {
-    $config = $this->featuresManager->getConfigCollection();
-
-    $package_name = $this->package->getMachineName();
-    // Auto-detect dependencies for included config.
-    $package_config = $this->package->getConfig();
-    if (!empty($this->package->getConfigOrig())) {
-      $package_config = array_unique(array_merge($package_config, $this->package->getConfigOrig()));
-    }
-    if (!empty($package_config)) {
-      $this->featuresManager->assignConfigDependents($package_config, $package_name);
-    }
-
-    $packages = $this->featuresManager->getPackages();
-    // Re-fetch the package in case config was updated with Dependents above.
-    $this->package = $packages[$package_name];
-
-    // Make a map of all config data.
-    $components = array();
-    $this->conflicts = array();
-    foreach ($config as $item_name => $item) {
-      if (($item->getPackage() != $package_name) &&
-        !empty($packages[$item->getPackage()]) && ($packages[$item->getPackage()]->getStatus() != FeaturesManagerInterface::STATUS_NO_EXPORT)) {
-        $this->conflicts[$item->getType()][$item->getShortName()] = $item->getLabel();
-      }
-      if ($this->allowConflicts
-        || !isset($this->conflicts[$item->getType()][$item->getShortName()])
-        || ($this->package->getConfigOrig() && in_array($item_name, $this->package->getConfigOrig()))) {
-        $components[$item->getType()][$item->getShortName()] = $item->getLabel();
-      }
-    }
-
-    // Make a map of the config data already exported to the Feature.
-    $this->missing = array();
-    $exported_features_info = array();
-    foreach ($this->package->getConfigOrig() as $item_name) {
-      // Make sure the extension provided item exists in the active
-      // configuration storage.
-      if (isset($config[$item_name])) {
-        $item = $config[$item_name];
-      // Remove any conflicts if those are not being allowed.
-          // if ($this->allowConflicts || !isset($this->conflicts[$item['type']][$item['name_short']])) {
-        $exported_features_info[$item->getType()][$item->getShortName()] = $item->getLabel();
-        // }
-      }
-      else {
-        $this->missing[] = $item_name;
-      }
-    }
-    $exported_features_info['dependencies'] = $this->package->getDependencyInfo();
-
-    // Make a map of any config specifically excluded and/or required.
-    foreach (array('excluded', 'required') as $constraint) {
-      $this->{$constraint} = array();
-      $info = !empty($this->package->{'get' . $constraint}()) ? $this->package->{'get' . $constraint}() : array();
-      if (($constraint == 'required') && (empty($info) || !is_array($info))) {
-        // If required is True or empty array, add all config as required
-        $info = $this->package->getConfigOrig();
-      }
-      foreach ($info as $item_name) {
-        if (!isset($config[$item_name])) {
-          continue;
-        }
-        $item = $config[$item_name];
-        $this->{$constraint}[$item->getType()][$item->getShortName()] = $item->getLabel();
-      }
-    }
-
-    // Make a map of the config data to be exported within the Feature.
-    $new_features_info = array();
-    foreach ($this->package->getConfig() as $item_name) {
-      $item = $config[$item_name];
-      $new_features_info[$item->getType()][$item->getShortName()] = $item->getLabel();
-    }
-    $new_features_info['dependencies'] = $this->package->getDependencies();
-
-    // Assemble the combined component list.
-    $config_new = array();
-    $sections = array('sources', 'included', 'detected', 'added');
-
-    // Generate list of config to be exported.
-    $config_count = array();
-    foreach ($components as $component => $component_info) {
-      // User-selected components take precedence.
-      $config_new[$component] = array();
-      $config_count[$component] = 0;
-      // Add selected items from Sources checkboxes.
-      if (!$form_state->isValueEmpty(array($component, 'sources', 'selected'))) {
-        $config_new[$component] = array_merge($config_new[$component], $this->domDecodeOptions(array_filter($form_state->getValue(array(
-          $component,
-          'sources',
-          'selected',
-        )))));
-        $config_count[$component]++;
-      }
-      // Add selected items from already Included, newly Added, auto-detected
-      // checkboxes.
-      foreach (array('included', 'added', 'detected') as $section) {
-        if (!$form_state->isValueEmpty(array($component, $section))) {
-          $config_new[$component] = array_merge($config_new[$component], $this->domDecodeOptions(array_filter($form_state->getValue(array($component, $section)))));
-          $config_count[$component]++;
-        }
-      }
-      // Only fallback to an existing feature's values if there are no export
-      // options for the component.
-      if ($component == 'dependencies') {
-        if (($config_count[$component] == 0) && !empty($exported_features_info['dependencies'])) {
-          $config_new[$component] = array_combine($exported_features_info['dependencies'], $exported_features_info['dependencies']);
-        }
-      }
-      elseif (($config_count[$component] == 0) && !empty($exported_features_info[$component])) {
-        $config_names = array_keys($exported_features_info[$component]);
-        $config_new[$component] = array_combine($config_names, $config_names);
-      }
-    }
-
-    // Generate new populated feature.
-    $export['package'] = $this->package;
-    $export['config_new'] = $config_new;
-
-    // Now fill the $export with categorized sections of component options
-    // based upon user selections and de-selections.
-    foreach ($components as $component => $component_info) {
-      $component_export = $component_info;
-      foreach ($sections as $section) {
-        $component_export['_features_options'][$section] = array();
-        $component_export['_features_selected'][$section] = array();
-      }
-      if (!empty($component_info)) {
-        $exported_components = !empty($exported_features_info[$component]) ? $exported_features_info[$component] : array();
-        $new_components = !empty($new_features_info[$component]) ? $new_features_info[$component] : array();
-
-        foreach ($component_info as $key => $label) {
-          $config_name = $this->featuresManager->getFullName($component, $key);
-          // If checkbox in Sources is checked, move it to Added section.
-          if (!$form_state->isValueEmpty(array($component, 'sources', 'selected', $key))) {
-            $form_state->setValue(array($component, 'sources', 'selected', $key), FALSE);
-            $form_state->setValue(array($component, 'added', $key), 1);
-            $component_export['_features_options']['added'][$key] = $this->configLabel($component, $key, $label);
-            $component_export['_features_selected']['added'][$key] = $key;
-            // If this was previously excluded, we don't need to set it as
-            // required because it was automatically assigned.
-            if (isset($this->excluded[$component][$key])) {
-              unset($this->excluded[$component][$key]);
-            }
-            else {
-              $this->required[$component][$key] = $key;
-            }
-          }
-          elseif (isset($new_components[$key]) || isset($config_new[$component][$key])) {
-            // Option is in the New exported array.
-            if (isset($exported_components[$key])) {
-              // Option was already previously exported so it's part of the
-              // Included checkboxes.
-              $section = 'included';
-              $default_value = $key;
-              // If Included item was un-selected (removed from export
-              // $config_new) but was re-detected in the $new_components
-              // means it was an auto-detect that was previously part of the
-              // export and is now de-selected in UI.
-              if ($form_state->isSubmitted() &&
-                  ($form_state->hasValue(array($component, 'included', $key)) ||
-                  ($form_state->isValueEmpty(array($component, 'detected', $key)))) &&
-                  empty($config_new[$component][$key])) {
-                $section = 'detected';
-                $default_value = FALSE;
-              }
-              // Unless it's unchecked in the form, then move it to Newly
-              // disabled item.
-              elseif ($form_state->isSubmitted() &&
-                  $form_state->isValueEmpty(array($component, 'added', $key)) &&
-                  $form_state->isValueEmpty(array($component, 'detected', $key)) &&
-                  $form_state->isValueEmpty(array($component, 'included', $key))) {
-                $section = 'added';
-                $default_value = FALSE;
-              }
-            }
-            else {
-              // Option was in New exported array, but NOT in already exported
-              // so it's a user-selected or an auto-detect item.
-              $section = 'detected';
-              $default_value = NULL;
-              // Check for item explicitly excluded.
-              if (isset($this->excluded[$component][$key]) && !$form_state->isSubmitted()) {
-                $default_value = FALSE;
-              }
-              else {
-                $default_value = $key;
-              }
-              // If it's already checked in Added or Sources, leave it in Added
-              // as checked.
-              if ($form_state->isSubmitted() &&
-                  (!$form_state->isValueEmpty(array($component, 'added', $key)) ||
-                   !$form_state->isValueEmpty(array($component, 'sources', 'selected', $key)))) {
-                $section = 'added';
-                $default_value = $key;
-              }
-              // If it's already been unchecked, leave it unchecked.
-              elseif ($form_state->isSubmitted() &&
-                  $form_state->isValueEmpty(array($component, 'sources', 'selected', $key)) &&
-                  $form_state->isValueEmpty(array($component, 'detected', $key)) &&
-                  !$form_state->hasValue(array($component, 'added', $key))) {
-                $section = 'detected';
-                $default_value = FALSE;
-              }
-            }
-            $component_export['_features_options'][$section][$key] = $this->configLabel($component, $key, $label);
-            $component_export['_features_selected'][$section][$key] = $default_value;
-            // Save which dependencies are specifically excluded from
-            // auto-detection.
-            if (($section == 'detected') && ($default_value === FALSE)) {
-              // If this was previously required, we don't need to set it as
-              // excluded because it wasn't automatically assigned.
-              if (!isset($this->required[$component][$key]) || ($this->package->getRequired() === TRUE)) {
-                $this->excluded[$component][$key] = $key;
-              }
-              unset($this->required[$component][$key]);
-              // Remove excluded item from export.
-              if ($component == 'dependencies') {
-                $export['package']->removeDependency($key);
-              }
-              else {
-                $export['package']->removeConfig($config_name);
-              }
-            }
-            else {
-              unset($this->excluded[$component][$key]);
-            }
-            // Remove the 'input' and set the 'values' so Drupal stops looking
-            // at 'input'.
-            if ($form_state->isSubmitted()) {
-              if (!$default_value) {
-                $form_state->setValue(array($component, $section, $key), FALSE);
-              }
-              else {
-                $form_state->setValue(array($component, $section, $key), 1);
-              }
-            }
-          }
-          elseif (!$form_state->isSubmitted() && isset($exported_components[$key])) {
-            // Component is not part of new export, but was in original export.
-            // Mark component as Added when creating initial form.
-            $component_export['_features_options']['added'][$key] = $this->configLabel($component, $key, $label);
-            $component_export['_features_selected']['added'][$key] = $key;
-          }
-          else {
-            // Option was not part of the new export.
-            $added = FALSE;
-            foreach (array('included', 'added') as $section) {
-              // Restore any user-selected checkboxes.
-              if (!$form_state->isValueEmpty(array($component, $section, $key))) {
-                $component_export['_features_options'][$section][$key] = $this->configLabel($component, $key, $label);
-                $component_export['_features_selected'][$section][$key] = $key;
-                $added = TRUE;
-              }
-            }
-            if (!$added) {
-              // If not Included or Added, then put it back in the unchecked
-              // Sources checkboxes.
-              $component_export['_features_options']['sources'][$key] = $this->configLabel($component, $key, $label);
-              $component_export['_features_selected']['sources'][$key] = FALSE;
-            }
-          }
-        }
-      }
-      $export['components'][$component] = $component_export;
-    }
-    $export['features_exclude'] = $this->excluded;
-    $export['features_require'] = $this->required;
-    $export['conflicts'] = $this->conflicts;
-    $export['missing'] = $this->missing;
-
-    return $export;
-  }
-
-  /**
-   * Returns a formatted and sanitized label for a config item.
-   *
-   * @param string $type
-   *   The config type.
-   * @param string $key
-   *   The short machine name of the item.
-   * @param string $label
-   *   The human label for the item.
-   */
-  protected function configLabel($type, $key, $label) {
-    $value = Html::escape($label);
-    if ($key != $label) {
-      $value .= '  <span class="config-name">(' . Html::escape($key) . ')</span>';
-    }
-    if (isset($this->conflicts[$type][$key])) {
-      // Show what package the conflict is stored in.
-      $config = $this->featuresManager->getConfigCollection();
-      $config_name = $this->featuresManager->getFullName($type, $key);
-      $package_name = isset($config[$config_name]) ? $config[$config_name]->getPackage() : '';
-      // Get the full machine name instead of the short name.
-      $packages = $this->featuresManager->getPackages();
-      if (isset($packages[$package_name])) {
-        $package_name = $packages[$package_name]->getMachineName();
-      }
-      $value .= '  <span class="config-name">[' . $this->t('in') . ' ' . Html::escape($package_name) . ']</span>';
-    }
-    return Xss::filterAdmin($value);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $bundle = $this->assigner->getBundle($this->bundle);
-    $this->assigner->assignConfigPackages();
-
-    $this->package->setName($form_state->getValue('name'));
-    $this->package->setMachineName($form_state->getValue('machine_name'));
-    $this->package->setDescription($form_state->getValue('description'));
-    $this->package->setVersion($form_state->getValue('version'));
-    $this->package->setDirectory($form_state->getValue('directory'));
-    $this->package->setBundle($bundle->getMachineName());
-    // Save it first just to create it in case it's a new package.
-    $this->featuresManager->setPackage($this->package);
-
-    $config = $this->updatePackageConfig($form_state);
-    $this->featuresManager->assignConfigPackage($this->package->getMachineName(), $config, TRUE);
-    $this->package->setExcluded($this->updateExcluded());
-    if ($form_state->getValue('require_all')) {
-      $this->package->setRequired(TRUE);
-    }
-    else {
-      $required = $this->updateRequired();
-      $this->package->setRequired($required);
-    }
-    // Now save it with the selected config data.
-    $this->featuresManager->setPackage($this->package);
-
-    $method_id = NULL;
-    $trigger = $form_state->getTriggeringElement();
-    $op = $form_state->getValue('op');
-    if (!empty($trigger) && empty($op)) {
-      $method_id = $trigger['#name'];
-    }
-
-    // Set default redirect, but allow generators to change it later.
-    $form_state->setRedirect('features.edit', array('featurename' => $this->package->getMachineName()));
-    if ($method_id == 'import_missing') {
-      $this->importMissing();
-    }
-    elseif (!empty($method_id)) {
-      $packages = array($this->package->getMachineName());
-      $this->generator->generatePackages($method_id, $bundle, $packages);
-      $this->generator->applyExportFormSubmit($method_id, $form, $form_state);
-    }
-
-    $this->assigner->setCurrent($bundle);
-  }
-
-  /**
-   * Updates the config stored in the package from the current edit form.
-   *
-   * @return array
-   *   Config array to be exported.
-   */
-  protected function updatePackageConfig(FormStateInterface $form_state) {
-    $config = array();
-    $components = $this->getComponentList($form_state);
-    foreach ($components['config_new'] as $config_type => $items) {
-      foreach ($items as $name) {
-        $config[] = $this->featuresManager->getFullName($config_type, $name);
-      }
-    }
-    return $config;
-  }
-
-  /**
-   * Imports the configuration missing from the active store
-   */
-  protected function importMissing() {
-    $config = $this->featuresManager->getConfigCollection();
-    $missing = $this->featuresManager->reorderMissing($this->missing);
-    foreach ($missing as $config_name) {
-      if (!isset($config[$config_name])) {
-        $item = $this->featuresManager->getConfigType($config_name);
-        $type = ConfigurationItem::fromConfigStringToConfigType($item['type']);
-        try {
-          $this->configRevert->import($type, $item['name_short']);
-          drupal_set_message($this->t('Imported @name', array('@name' => $config_name)));
-        } catch (\Exception $e) {
-          drupal_set_message($this->t('Error importing @name : @message',
-            array('@name' => $config_name, '@message' => $e->getMessage())), 'error');
-        }
-      }
-    }
-  }
-
-  /**
-   * Updates the list of excluded config.
-   *
-   * @return array
-   *   The list of excluded config in a simple array of full config names
-   *   suitable for storing in the info.yml file.
-   */
-  protected function updateExcluded() {
-    return $this->updateConstrained('excluded');
-  }
-
-  /**
-   * Updates the list of required config.
-   *
-   * @return array
-   *   The list of required config in a simple array of full config names
-   *   suitable for storing in the info.yml file.
-   */
-  protected function updateRequired() {
-    return $this->updateConstrained('required');
-  }
-
-  /**
-   * Returns a list of constrained (excluded or required) configuration.
-   *
-   * @param string $constraint
-   *   The constraint (excluded or required).
-   * @return array
-   *   The list of constrained config in a simple array of full config names
-   *   suitable for storing in the info.yml file.
-   */
-  protected function updateConstrained($constraint) {
-    $constrained = array();
-    foreach ($this->{$constraint} as $type => $item) {
-      foreach ($item as $name => $value) {
-        $constrained[] = $this->featuresManager->getFullName($type, $name);
-      }
-    }
-    return $constrained;
-  }
-
-  /**
-   * Encodes a given key.
-   *
-   * @param string $key
-   *   The key to encode.
-   *
-   * @return string
-   *   The encoded key.
-   */
-  protected function domEncode($key) {
-    $replacements = $this->domEncodeMap();
-    return strtr($key, $replacements);
-  }
-
-  /**
-   * Decodes a given key.
-   *
-   * @param string $key
-   *   The key to decode.
-   *
-   * @return string
-   *   The decoded key.
-   */
-  protected function domDecode($key) {
-    $replacements = array_flip($this->domEncodeMap());
-    return strtr($key, $replacements);
-  }
-
-  /**
-   * Decodes an array of option values that have been encoded by
-   * features_dom_encode_options().
-   *
-   * @param array $options
-   *   The key to encode.
-   * @param bool $keys_only
-   *   Whether to decode only the keys.
-   *
-   * @return array
-   *   An array of encoded options.
-   */
-  protected function domDecodeOptions(array $options, $keys_only = FALSE) {
-    $replacements = array_flip($this->domEncodeMap());
-    $encoded = array();
-    foreach ($options as $key => $value) {
-      $encoded[strtr($key, $replacements)] = $keys_only ? $value : strtr($value, $replacements);
-    }
-    return $encoded;
-  }
-
-  /**
-   * Returns encoding map for decode and encode options.
-   *
-   * @return array
-   *   An encoding map.
-   */
-  protected function domEncodeMap() {
-    return array(
-      ':' => '__' . ord(':') . '__',
-      '/' => '__' . ord('/') . '__',
-      ',' => '__' . ord(',') . '__',
-      '.' => '__' . ord('.') . '__',
-      '<' => '__' . ord('<') . '__',
-      '>' => '__' . ord('>') . '__',
-      '%' => '__' . ord('%') . '__',
-      ')' => '__' . ord(')') . '__',
-      '(' => '__' . ord('(') . '__',
-    );
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Form/FeaturesExportForm.php b/modules/contrib/features/modules/features_ui/src/Form/FeaturesExportForm.php
deleted file mode 100644
index 45a555e..0000000
--- a/modules/contrib/features/modules/features_ui/src/Form/FeaturesExportForm.php
+++ /dev/null
@@ -1,564 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Form;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Xss;
-use Drupal\features\FeaturesAssignerInterface;
-use Drupal\features\FeaturesGeneratorInterface;
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element;
-use Drupal\features\Package;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Url;
-
-/**
- * Defines the configuration export form.
- */
-class FeaturesExportForm extends FormBase {
-
-  /**
-   * The features manager.
-   *
-   * @var array
-   */
-  protected $featuresManager;
-
-  /**
-   * The package assigner.
-   *
-   * @var array
-   */
-  protected $assigner;
-
-  /**
-   * The package generator.
-   *
-   * @var array
-   */
-  protected $generator;
-
-  /**
-   * The module handler service.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * Constructs a FeaturesExportForm object.
-   *
-   * @param \Drupal\features\FeaturesManagerInterface $features_manager
-   *    The features manager.
-   * @param \Drupal\features\FeaturesAssignerInterface $features_assigner
-   *    The features assigner.
-   * @param \Drupal\features\FeaturesGeneratorInterface $features_generator
-   *    The features generator.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *    The features generator.
-   */
-  public function __construct(FeaturesManagerInterface $features_manager, FeaturesAssignerInterface $assigner, FeaturesGeneratorInterface $generator, ModuleHandlerInterface $module_handler) {
-    $this->featuresManager = $features_manager;
-    $this->assigner = $assigner;
-    $this->generator = $generator;
-    $this->moduleHandler = $module_handler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('features.manager'),
-      $container->get('features_assigner'),
-      $container->get('features_generator'),
-      $container->get('module_handler')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'features_export_form';
-  }
-
-  /**
-   * Detects if an element triggered the form submission via Ajax.
-   * TODO: SHOULDN'T NEED THIS!  BUT DRUPAL IS CALLING buildForm AFTER THE
-   * BUNDLE AJAX IS SELECTED AND DOESN'T HAVE getTriggeringElement() SET YET.
-   */
-  protected function elementTriggeredScriptedSubmission(FormStateInterface &$form_state) {
-    $input = $form_state->getUserInput();
-    if (!empty($input['_triggering_element_name'])) {
-      return $input['_triggering_element_name'];
-    }
-    return '';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-
-    $trigger = $form_state->getTriggeringElement();
-    // TODO: See if there is a Drupal Core issue for this.
-    // Sometimes the first ajax call on the page causes buildForm to be called
-    // twice!  First time form_state->getTriggeringElement is NOT SET, but
-    // the form_state['input'] shows the _triggering_element_name.  Then the
-    // SECOND time it is called the getTriggeringElement is fine.
-    $real_trigger = $this->elementTriggeredScriptedSubmission($form_state);
-    if (!isset($trigger) && ($real_trigger == 'bundle')) {
-      $input = $form_state->getUserInput();
-      $bundle_name = $input['bundle'];
-      $this->assigner->setCurrent($this->assigner->getBundle($bundle_name));
-    }
-    elseif ($trigger['#name'] == 'bundle') {
-      $bundle_name = $form_state->getValue('bundle', '');
-      $this->assigner->setCurrent($this->assigner->getBundle($bundle_name));
-    }
-    else {
-      $this->assigner->loadBundle();
-    }
-    $current_bundle = $this->assigner->getBundle();
-    $this->assigner->assignConfigPackages();
-
-    $packages = $this->featuresManager->getPackages();
-    $config_collection = $this->featuresManager->getConfigCollection();
-
-    // Add in un-packaged configuration items.
-    $this->addUnpackaged($packages, $config_collection);
-
-    // Filter packages on bundle if selected.
-    if (!$current_bundle->isDefault()) {
-      $packages = $this->featuresManager->filterPackages($packages, $current_bundle->getMachineName(), TRUE);
-    }
-
-    // Pass the packages and bundle data for use in the form pre_render
-    // callback.
-    $form['#packages'] = $packages;
-    $form['#profile_package'] = $current_bundle->getProfileName();
-    $form['header'] = array(
-      '#type' => 'container',
-      '#attributes' => array('class' => 'features-header'),
-    );
-
-    $bundle_options = $this->assigner->getBundleOptions();
-
-    // If there are no custom bundles, provide message.
-    if (count($bundle_options) < 2) {
-      drupal_set_message($this->t('You have not yet created any bundles. Before generating features, you may wish to <a href=":create">create a bundle</a> to group your features within.', [':create' => Url::fromRoute('features.assignment')->toString()]));
-    }
-
-    $form['#prefix'] = '<div id="edit-features-wrapper">';
-    $form['#suffix'] = '</div>';
-    $form['header']['bundle'] = array(
-      '#title' => $this->t('Bundle'),
-      '#type' => 'select',
-      '#options' => $bundle_options,
-      '#default_value' => $current_bundle->getMachineName(),
-      '#prefix' => '<div id="edit-package-set-wrapper">',
-      '#suffix' => '</div>',
-      '#ajax' => array(
-        'callback' => '::updatePreview',
-        'wrapper' => 'edit-features-preview-wrapper',
-      ),
-      '#attributes' => array(
-        'data-new-package-set' => 'status',
-      ),
-    );
-
-    $form['preview'] = $this->buildListing($packages, $current_bundle);
-
-    $form['#attached'] = array(
-      'library' => array(
-        'features_ui/drupal.features_ui.admin',
-      ),
-    );
-
-    if (\Drupal::currentUser()->hasPermission('export configuration')) {
-      // Offer available generation methods.
-      $generation_info = $this->generator->getGenerationMethods();
-      // Sort generation methods by weight.
-      uasort($generation_info, '\Drupal\Component\Utility\SortArray::sortByWeightElement');
-
-      $form['description'] = array(
-        '#markup' => '<p>' . $this->t('Use an export method button below to generate the selected features.') . '</p>',
-      );
-
-      $form['actions'] = array('#type' => 'actions', '#tree' => TRUE);
-      foreach ($generation_info as $method_id => $method) {
-        $form['actions'][$method_id] = array(
-          '#type' => 'submit',
-          '#name' => $method_id,
-          '#value' => $this->t('@name', array('@name' => $method['name'])),
-          '#attributes' => array(
-            'title' => Html::escape($method['description']),
-          ),
-        );
-      }
-    }
-
-    $form['#pre_render'][] = array(get_class($this), 'preRenderRemoveInvalidCheckboxes');
-
-    return $form;
-  }
-
-  /**
-   * Handles switching the configuration type selector.
-   */
-  public function updatePreview($form, FormStateInterface $form_state) {
-    // We should really be able to add this pre_render callback to the
-    // 'preview' element. However, since doing so leads to an error (no rows
-    // are displayed), we need to instead explicitly invoke it here for the
-    // processing to apply to the Ajax-rendered form element.
-    $form = $this->preRenderRemoveInvalidCheckboxes($form);
-    return $form['preview'];
-  }
-
-  /**
-   * Builds the portion of the form showing a listing of features.
-   *
-   * @param \Drupal\features\Package[] $packages
-   *   The packages.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   The current bundle
-   *
-   * @return array
-   *   A render array of a form element.
-   */
-  protected function buildListing(array $packages, FeaturesBundleInterface $bundle) {
-
-    $header = array(
-      'name' => array('data' => $this->t('Feature')),
-      'machine_name' => array('data' => $this->t('')),
-      'details' => array('data' => $this->t('Description'), 'class' => array(RESPONSIVE_PRIORITY_LOW)),
-      'version' => array('data' => $this->t('Version'), 'class' => array(RESPONSIVE_PRIORITY_LOW)),
-      'status' => array('data' => $this->t('Status'), 'class' => array(RESPONSIVE_PRIORITY_LOW)),
-      'state' => array('data' => $this->t('State'), 'class' => array(RESPONSIVE_PRIORITY_LOW)),
-    );
-
-    $options = array();
-    $first = TRUE;
-    foreach ($packages as $package) {
-      if ($first && $package->getStatus() == FeaturesManagerInterface::STATUS_NO_EXPORT) {
-        // Don't offer new non-profile packages that are empty.
-        if ($package->getStatus() === FeaturesManagerInterface::STATUS_NO_EXPORT &&
-          !$bundle->isProfilePackage($package->getMachineName()) &&
-          empty($package->getConfig())) {
-          continue;
-        }
-        $first = FALSE;
-        $options[] = array(
-          'name' => array(
-            'data' => $this->t('The following packages are not exported.'),
-            'class' => 'features-export-header-row',
-            'colspan' => 6,
-          ),
-        );
-      }
-      $options[$package->getMachineName()] = $this->buildPackageDetail($package, $bundle);
-    }
-
-    $element = array(
-      '#type' => 'tableselect',
-      '#header' => $header,
-      '#options' => $options,
-      '#attributes' => array('class' => array('features-listing')),
-      '#prefix' => '<div id="edit-features-preview-wrapper">',
-      '#suffix' => '</div>',
-    );
-
-    return $element;
-  }
-
-  /**
-   * Builds the details of a package.
-   *
-   * @param \Drupal\features\Package $package
-   *   The package.
-   * @param \Drupal\features\FeaturesBundleInterface
-   *   The current bundle.
-   *
-   * @return array
-   *   A render array of a form element.
-   */
-  protected function buildPackageDetail(Package $package, FeaturesBundleInterface $bundle) {
-    $config_collection = $this->featuresManager->getConfigCollection();
-
-    $url = Url::fromRoute('features.edit', array('featurename' => $package->getMachineName()));
-
-    $element['name'] = array(
-      'data' => \Drupal::l($package->getName(), $url),
-      'class' => array('feature-name'),
-    );
-    $machine_name = $package->getMachineName();
-    // Except for the 'unpackaged' pseudo-package, display the full name, since
-    // that's what will be generated.
-    if ($machine_name !== 'unpackaged') {
-      $machine_name = $bundle->getFullName($machine_name);
-    }
-    $element['machine_name'] = $machine_name;
-    $element['status'] = array(
-      'data' => $this->featuresManager->statusLabel($package->getStatus()),
-      'class' => array('column-nowrap'),
-    );
-    // Use 'data' instead of plain string value so a blank version doesn't
-    // remove column from table.
-    $element['version'] = array(
-      'data' => Html::escape($package->getVersion()),
-      'class' => array('column-nowrap'),
-    );
-    $overrides = $this->featuresManager->detectOverrides($package);
-    $new_config = $this->featuresManager->detectNew($package);
-    $conflicts = array();
-    $missing = array();
-    $moved = array();
-
-    if ($package->getStatus() == FeaturesManagerInterface::STATUS_NO_EXPORT) {
-      $overrides = array();
-      $new_config = array();
-    }
-    // Bundle package configuration by type.
-    $package_config = array();
-    foreach ($package->getConfig() as $item_name) {
-      if (isset($config_collection[$item_name])) {
-        $item = $config_collection[$item_name];
-        $package_config[$item->getType()][] = array(
-          'name' => Html::escape($item_name),
-          'label' => Html::escape($item->getLabel()),
-          'class' => in_array($item_name, $overrides) ? 'features-override' :
-            (in_array($item_name, $new_config) ? 'features-detected' : ''),
-        );
-      }
-    }
-    // Conflict config from other modules.
-    foreach ($package->getConfigOrig() as $item_name) {
-      if (!isset($config_collection[$item_name])) {
-        $missing[] = $item_name;
-        $package_config['missing'][] = array(
-          'name' => Html::escape($item_name),
-          'label' => Html::escape($item_name),
-          'class' => 'features-missing',
-        );
-      }
-      elseif (!in_array($item_name, $package->getConfig())) {
-        $item = $config_collection[$item_name];
-        if (empty($item->getProvider())) {
-          $conflicts[] = $item_name;
-          $package_name = !empty($item->getPackage()) ? $item->getPackage() : $this->t('PACKAGE NOT ASSIGNED');
-          $package_config[$item->getType()][] = array(
-            'name' => Html::escape($package_name),
-            'label' => Html::escape($item->getLabel()),
-            'class' => 'features-conflict',
-          );
-        }
-        else {
-          $moved[] = $item_name;
-          $package_name = !empty($item->getPackage()) ? $item->getPackage() : $this->t('PACKAGE NOT ASSIGNED');
-          $package_config[$item->getType()][] = array(
-            'name' => $this->t('Moved to @package', array('@package' => $package_name)),
-            'label' => Html::escape($item->getLabel()),
-            'class' => 'features-moved',
-          );
-        }
-      }
-    }
-    // Add dependencies.
-    $package_config['dependencies'] = array();
-    foreach ($package->getDependencies() as $dependency) {
-      $package_config['dependencies'][] = array(
-        'name' => $dependency,
-        'label' => $this->moduleHandler->getName($dependency),
-        'class' => '',
-      );
-    }
-
-    $class = '';
-    $state_links = [];
-    if (!empty($conflicts)) {
-      $state_links[] = array(
-        '#type' => 'link',
-        '#title' => $this->t('Conflicts'),
-        '#url' => Url::fromRoute('features.edit', array('featurename' => $package->getMachineName())),
-        '#attributes' => array('class' => array('features-conflict')),
-      );
-    }
-    if (!empty($overrides)) {
-      $state_links[] = array(
-        '#type' => 'link',
-        '#title' => $this->featuresManager->stateLabel(FeaturesManagerInterface::STATE_OVERRIDDEN),
-        '#url' => Url::fromRoute('features.diff', array('featurename' => $package->getMachineName())),
-        '#attributes' => array('class' => array('features-override')),
-      );
-    }
-    if (!empty($new_config)) {
-      $state_links[] = array(
-        '#type' => 'link',
-        '#title' => $this->t('New detected'),
-        '#url' => Url::fromRoute('features.diff', array('featurename' => $package->getMachineName())),
-        '#attributes' => array('class' => array('features-detected')),
-      );
-    }
-    if (!empty($missing) && ($package->getStatus() == FeaturesManagerInterface::STATUS_INSTALLED)) {
-      $state_links[] = array(
-        '#type' => 'link',
-        '#title' => $this->t('Missing'),
-        '#url' => Url::fromRoute('features.edit', array('featurename' => $package->getMachineName())),
-        '#attributes' => array('class' => array('features-missing')),
-      );
-    }
-    if (!empty($moved)) {
-      $state_links[] = array(
-        '#type' => 'link',
-        '#title' => $this->t('Moved'),
-        '#url' => Url::fromRoute('features.edit', array('featurename' => $package->getMachineName())),
-        '#attributes' => array('class' => array('features-moved')),
-      );
-    }
-    if (!empty($state_links)) {
-      $element['state'] = array(
-        'data' => $state_links,
-        'class' => array('column-nowrap'),
-      );
-    }
-    else {
-      $element['state'] = '';
-    }
-
-    $config_types = $this->featuresManager->listConfigTypes();
-    // Add dependencies.
-    $config_types['dependencies'] = $this->t('Dependencies');
-    $config_types['missing'] = $this->t('Missing');
-    uasort($config_types, 'strnatcasecmp');
-
-    $rows = array();
-    // Use sorted array for order.
-    foreach ($config_types as $type => $label) {
-      // For each component type, offer alternating rows.
-      $row = array();
-      if (isset($package_config[$type])) {
-        $row[] = array(
-          'data' => array(
-            '#type' => 'html_tag',
-            '#tag' => 'span',
-            '#value' => Html::escape($label),
-            '#attributes' => array(
-              'title' => Html::escape($type),
-              'class' => 'features-item-label',
-            ),
-          ),
-        );
-        $row[] = array(
-          'data' => array(
-            '#theme' => 'features_items',
-            '#items' => $package_config[$type],
-            '#value' => Html::escape($label),
-            '#title' => Html::escape($type),
-          ),
-          'class' => 'item',
-        );
-        $rows[] = $row;
-      }
-    }
-    $element['table'] = array(
-      '#type' => 'table',
-      '#rows' => $rows,
-    );
-
-    $details = array();
-    $details['description'] = array(
-      '#markup' => Xss::filterAdmin($package->getDescription()),
-    );
-    $details['table'] = array(
-      '#type' => 'details',
-      '#title' => array('#markup' => $this->t('Included configuration')),
-      '#description' => array('data' => $element['table']),
-    );
-    $element['details'] = array(
-      'class' => array('description', 'expand'),
-      'data' => $details,
-    );
-
-    return $element;
-  }
-
-  /**
-   * Adds a pseudo-package to display unpackaged configuration.
-   *
-   * @param array $packages
-   *   An array of package names.
-   * @param \Drupal\features\ConfigurationItem[] $config_collection
-   *   A collection of configuration.
-   */
-  protected function addUnpackaged(array &$packages, array $config_collection) {
-    $packages['unpackaged'] = new Package('unpackaged', [
-      'name' => $this->t('Unpackaged'),
-      'description' => $this->t('Configuration that has not been added to any package.'),
-      'config' => [],
-      'status' => FeaturesManagerInterface::STATUS_NO_EXPORT,
-      'version' => '',
-    ]);
-    foreach ($config_collection as $item_name => $item) {
-      if (!$item->getPackage() && !$item->isExcluded() && !$item->isProviderExcluded()) {
-        $packages['unpackaged']->appendConfig($item_name);
-      }
-    }
-  }
-
-  /**
-   * Denies access to the checkboxes for uninstalled or empty packages and the
-   * "unpackaged" pseudo-package.
-   *
-   * @param array $form
-   *   The form build array to alter.
-   *
-   * @return array
-   *   The form build array.
-   */
-  public static function preRenderRemoveInvalidCheckboxes(array $form) {
-    /** @var \Drupal\features\Package $package */
-    foreach ($form['#packages'] as $package) {
-      // Remove checkboxes for packages that:
-      // - have no configuration assigned and are not the profile, or
-      // - are the "unpackaged" pseudo-package.
-      if ((empty($package->getConfig()) && !($package->getMachineName() == $form['#profile_package'])) ||
-        $package->getMachineName() == 'unpackaged') {
-        $form['preview'][$package->getMachineName()]['#access'] = FALSE;
-      }
-    }
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $current_bundle = $this->assigner->loadBundle();
-    $this->assigner->assignConfigPackages();
-
-    $package_names = array_filter($form_state->getValue('preview'));
-
-    if (empty($package_names)) {
-      drupal_set_message($this->t('Please select one or more packages to export.'), 'warning');
-      return;
-    }
-
-    $method_id = NULL;
-    $trigger = $form_state->getTriggeringElement();
-    $op = $form_state->getValue('op');
-    if (!empty($trigger) && empty($op)) {
-      $method_id = $trigger['#name'];
-    }
-
-    if (!empty($method_id)) {
-      $this->generator->generatePackages($method_id, $current_bundle, $package_names);
-      $this->generator->applyExportFormSubmit($method_id, $form, $form_state);
-    }
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Tests/FeaturesBundleUITest.php b/modules/contrib/features/modules/features_ui/src/Tests/FeaturesBundleUITest.php
deleted file mode 100644
index bdbcf08..0000000
--- a/modules/contrib/features/modules/features_ui/src/Tests/FeaturesBundleUITest.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Tests;
-
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\simpletest\WebTestBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-
-/**
- * Tests configuring bundles.
- *
- * @group features_ui
- */
-class FeaturesBundleUITest extends WebTestBase {
-  use StringTranslationTrait;
-
-  /**
-   * @todo Remove the disabled strict config schema checking.
-   */
-  protected $strictConfigSchema = FALSE;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['block', 'features', 'features_ui'];
-
-  /**
-   * The features bundle storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface $bundleStorage
-   */
-  protected $bundleStorage;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->bundleStorage = \Drupal::entityTypeManager()->getStorage('features_bundle');
-
-    $admin_user = $this->createUser(['administer site configuration', 'export configuration', 'administer modules']);
-    $this->drupalLogin($admin_user);
-    $this->drupalPlaceBlock('local_actions_block');
-  }
-
-  /**
-   * Get the default features bundle.
-   *
-   * @return \Drupal\features\FeaturesBundleInterface
-   *   The features bundle.
-   */
-  protected function defaultBundle() {
-    return $this->bundleStorage->load('default');
-  }
-
-  /**
-   * Completely remove a features assignment method from the bundle.
-   *
-   * @param string $method_id
-   *   The assignment method ID.
-   */
-  protected function removeAssignment($method_id) {
-    $bundle = $this->defaultBundle();
-    $assignments = $bundle->get('assignments');
-    unset($assignments[$method_id]);
-    $bundle->set('assignments', $assignments);
-    $bundle->save();
-  }
-
-  /**
-   * Tests configuring an assignment.
-   */
-  public function testAssignmentConfigure() {
-    // Check initial values.
-    $settings = $this->defaultBundle()->getAssignmentSettings('exclude');
-    $this->assertTrue(isset($settings['types']['config']['features_bundle']), 'Excluding features_bundle');
-    $this->assertFalse(isset($settings['types']['config']['system_simple']), 'Not excluding system_simple');
-    $this->assertFalse(isset($settings['types']['config']['user_role']), 'Not excluding user_role');
-    $this->assertTrue($settings['curated'], 'Excluding curated items');
-    $this->assertTrue($settings['module']['namespace'], 'Excluding by namespace');
-
-    // Check initial form.
-    $this->drupalGet('admin/config/development/features/bundle/_exclude/default');
-    $this->assertFieldChecked('edit-types-config-features-bundle', 'features_bundle is checked');
-    $this->assertNoFieldChecked('edit-types-config-system-simple', 'system_simple is not checked');
-    $this->assertNoFieldChecked('edit-types-config-user-role', 'user_role is not checked');
-    $this->assertFieldChecked('edit-curated', 'curated is checked');
-    $this->assertFieldChecked('edit-module-namespace', 'namespace is checked');
-
-    // Configure the form.
-    $this->drupalPostForm(NULL, [
-      'types[config][system_simple]' => TRUE,
-      'types[config][user_role]' => FALSE,
-      'curated' => TRUE,
-      'module[namespace]' => FALSE,
-    ], $this->t('Save settings'));
-
-    // Check form results.
-    $this->drupalGet('admin/config/development/features/bundle/_exclude/default');
-    $this->assertFieldChecked('edit-types-config-features-bundle', 'Saved, features_bundle is checked');
-    $this->assertFieldChecked('edit-types-config-system-simple', 'Saved, system_simple is checked');
-    $this->assertNoFieldChecked('edit-types-config-user-role', 'Saved, user_role is not checked');
-    $this->assertFieldChecked('edit-curated', 'Saved, curated is checked');
-    $this->assertNoFieldChecked('edit-module-namespace', 'Saved, namespace is not checked');
-
-    // Check final values.
-    $settings = $this->defaultBundle()->getAssignmentSettings('exclude');
-    $this->assertTrue(isset($settings['types']['config']['features_bundle']), 'Saved, excluding features_bundle');
-    $this->assertTrue(isset($settings['types']['config']['system_simple']), 'Saved, excluding system_simple');
-    $this->assertFalse(isset($settings['types']['config']['user_role']), 'Saved, not excluding user_role');
-    $this->assertTrue($settings['curated'], 'Saved, excluding curated items');
-    $this->assertFalse($settings['module']['namespace'], 'Saved, not excluding by namespace');
-  }
-
-  /**
-   * Tests configuring an assignment that didn't exist before.
-   */
-  public function testNewAssignmentConfigure() {
-    $this->removeAssignment('exclude');
-
-    // Is it really removed?
-    $all_settings = $this->defaultBundle()->getAssignmentSettings();
-    $this->assertFalse(isset($all_settings['exclude']), 'Exclude plugin is unknown');
-
-    // Can still get settings.
-    $settings = $this->defaultBundle()->getAssignmentSettings('exclude');
-    $this->assertFalse($settings['enabled'], 'Disabled exclude plugin');
-    $this->assertFalse(isset($settings['types']['config']['features_bundle']), 'Not excluding features_bundle');
-    $this->assertFalse(isset($settings['types']['config']['system_simple']), 'Not excluding system_simple');
-    $this->assertFalse(isset($settings['types']['config']['user_role']), 'Not excluding user_role');
-    $this->assertFalse($settings['curated'], 'Not excluding curated items');
-    $this->assertFalse($settings['module']['namespace'], 'Not excluding by namespace');
-
-    // Can we visit the config page with no settings?
-    $this->drupalGet('admin/config/development/features/bundle/_exclude/default');
-    $this->assertNoFieldChecked('edit-types-config-features-bundle', 'features_bundle is not checked');
-    $this->assertNoFieldChecked('edit-types-config-system-simple', 'system_simple is not checked');
-    $this->assertNoFieldChecked('edit-types-config-user-role', 'user_role is not checked');
-    $this->assertNoFieldChecked('edit-curated', 'curated is not checked');
-    $this->assertNoFieldChecked('edit-module-namespace', 'namespace is not checked');
-
-    // Can we enable the method?
-    $this->drupalGet('admin/config/development/features/bundle');
-    $this->assertNoFieldChecked('edit-enabled-exclude', 'Exclude disabled');
-    $this->drupalPostForm(NULL, [
-      'enabled[exclude]' => TRUE,
-    ], $this->t('Save settings'));
-    $this->assertFieldChecked('edit-enabled-exclude', 'Exclude enabled');
-
-    // Check new settings.
-    $settings = $this->defaultBundle()->getAssignmentSettings('exclude');
-    $this->assertTrue($settings['enabled'], 'Enabled exclude plugin');
-    $this->assertFalse(isset($settings['types']['config']['features_bundle']), 'Not excluding features_bundle');
-    $this->assertFalse(isset($settings['types']['config']['system_simple']), 'Not excluding system_simple');
-    $this->assertFalse(isset($settings['types']['config']['user_role']), 'Not excluding user_role');
-    $this->assertFalse($settings['curated'], 'Not excluding curated items');
-    $this->assertFalse($settings['module']['namespace'], 'Not excluding by namespace');
-
-    // Can we run assignment with no settings?
-    $this->drupalGet('admin/config/development/features');
-
-    // Can we configure the method?
-    $this->drupalPostForm('admin/config/development/features/bundle/_exclude/default', [
-      'types[config][system_simple]' => TRUE,
-      'types[config][user_role]' => FALSE,
-      'curated' => TRUE,
-      'module[namespace]' => FALSE,
-    ], $this->t('Save settings'));
-
-    // Check form results.
-    $this->drupalGet('admin/config/development/features/bundle/_exclude/default');
-    $this->assertNoFieldChecked('edit-types-config-features-bundle', 'Saved, features_bundle is not checked');
-    $this->assertFieldChecked('edit-types-config-system-simple', 'Saved, system_simple is checked');
-    $this->assertNoFieldChecked('edit-types-config-user-role', 'Saved, user_role is not checked');
-    $this->assertFieldChecked('edit-curated', 'Saved, curated is checked');
-    $this->assertNoFieldChecked('edit-module-namespace', 'Saved, namespace is not checked');
-
-    // Check final values.
-    $settings = $this->defaultBundle()->getAssignmentSettings('exclude');
-    $this->assertFalse(isset($settings['types']['config']['features_bundle']), 'Saved, not excluding features_bundle');
-    $this->assertTrue(isset($settings['types']['config']['system_simple']), 'Saved, excluding system_simple');
-    $this->assertFalse(isset($settings['types']['config']['user_role']), 'Saved, not excluding user_role');
-    $this->assertTrue($settings['curated'], 'Saved, excluding curated items');
-    $this->assertFalse($settings['module']['namespace'], 'Saved, not excluding by namespace');
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Tests/FeaturesCreateUITest.php b/modules/contrib/features/modules/features_ui/src/Tests/FeaturesCreateUITest.php
deleted file mode 100644
index 70c1da4..0000000
--- a/modules/contrib/features/modules/features_ui/src/Tests/FeaturesCreateUITest.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Tests;
-
-use Drupal\Component\Serialization\Yaml;
-use Drupal\Core\Archiver\ArchiveTar;
-use Drupal\simpletest\WebTestBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-
-/**
- * Tests the creation of a feature.
- *
- * @group features_ui
- */
-class FeaturesCreateUITest extends WebTestBase {
-  use StringTranslationTrait;
-
-  /**
-   * @todo Remove the disabled strict config schema checking.
-   */
-  protected $strictConfigSchema = FALSE;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['block', 'features', 'features_ui'];
-
-  /**
-   * Tests creating a feature via UI and download it.
-   */
-  public function testCreateFeaturesUI() {
-    list($major, $minor, ) = explode('.', \Drupal::VERSION);
-    // In D8.3 the module category was removed from the module name field.
-    $name_prefix = (intval($major) == 8 && intval($minor) > 2) ? 'modules[' : 'modules[Other][';
-
-    $feature_name = 'test_feature2';
-    $admin_user = $this->createUser(['administer site configuration', 'export configuration', 'administer modules']);
-    $this->drupalLogin($admin_user);
-    $this->drupalPlaceBlock('local_actions_block');
-    $this->drupalGet('admin/config/development/features');
-    $this->clickLink('Create new feature');
-    $this->assertResponse(200);
-
-    $edit = [
-      'name' => 'Test feature',
-      'machine_name' => $feature_name,
-      'description' => 'Test description: <strong>giraffe</strong>',
-      'version' => '8.x-1.0',
-      'system_simple[sources][selected][system.theme]' => TRUE,
-      'system_simple[sources][selected][user.settings]' => TRUE,
-    ];
-    $this->drupalPostForm(NULL, $edit, $this->t('Download Archive'));
-
-    $this->assertResponse(200);
-    $archive = $this->getRawContent();
-    $filename = tempnam($this->tempFilesDirectory, 'feature');
-    file_put_contents($filename, $archive);
-
-    $archive = new ArchiveTar($filename);
-    $files = $archive->listContent();
-
-    $this->assertEqual(4, count($files));
-    $this->assertEqual($feature_name . '/' . $feature_name . '.info.yml', $files[0]['filename']);
-    $this->assertEqual($feature_name . '/' . $feature_name . '.features.yml', $files[1]['filename']);
-    $this->assertEqual($feature_name . '/config/install/system.theme.yml', $files[2]['filename']);
-    $this->assertEqual($feature_name . '/config/install/user.settings.yml', $files[3]['filename']);
-
-    // Ensure that the archive contains the expected values.
-    $info_filename = tempnam($this->tempFilesDirectory, 'feature');
-    file_put_contents($info_filename, $archive->extractInString($feature_name . '/' . $feature_name . '.info.yml'));
-    $features_info_filename = tempnam($this->tempFilesDirectory, 'feature');
-    file_put_contents($features_info_filename, $archive->extractInString($feature_name . '/' . $feature_name . '.features.yml'));
-    /** @var \Drupal\Core\Extension\InfoParser $info_parser */
-    $info_parser = \Drupal::service('info_parser');
-    $parsed_info = $info_parser->parse($info_filename);
-    $this->assertEqual('Test feature', $parsed_info['name']);
-    $parsed_features_info = Yaml::decode(file_get_contents($features_info_filename));
-    $this->assertEqual([
-      'required' => ['system.theme', 'user.settings'],
-    ], $parsed_features_info);
-
-    $archive->extract(\Drupal::service('kernel')->getSitePath() . '/modules');
-    $module_path = \Drupal::service('kernel')->getSitePath() . '/modules/' . $feature_name;
-
-    // Ensure that the features listing renders the right content.
-    $this->drupalGet('admin/config/development/features');
-    $tr = $this->xpath('//table[contains(@class, "features-listing")]/tbody/tr[td[3] = "' . $feature_name . '"]')[0];
-    $this->assertLink('Test feature');
-    $this->assertEqual($feature_name, (string) $tr->children()[2]);
-    $description_column = (string) $tr->children()[3]->asXml();
-    $this->assertTrue(strpos($description_column, 'system.theme') !== FALSE);
-    $this->assertTrue(strpos($description_column, 'user.settings') !== FALSE);
-    $this->assertRaw('Test description: <strong>giraffe</strong>');
-    $this->assertEqual('Uninstalled', (string) $tr->children()[5]);
-    $this->assertEqual('', (string) $tr->children()[6]);
-
-    // Remove one and add new configuration.
-    $this->clickLink('Test feature');
-    $edit = [
-      'system_simple[included][system.theme]' => FALSE,
-      'user_role[sources][selected][authenticated]' => TRUE,
-    ];
-    $this->drupalPostForm(NULL, $edit, $this->t('Write'));
-    $info_filename = $module_path . '/' . $feature_name . '.info.yml';
-
-    $parsed_info = $info_parser->parse($info_filename);
-    $this->assertEqual('Test feature', $parsed_info['name']);
-
-    $features_info_filename = $module_path . '/' . $feature_name . '.features.yml';
-    $parsed_features_info = Yaml::decode(file_get_contents($features_info_filename));
-    $this->assertEqual([
-      'excluded' => ['system.theme'],
-      'required' => true,
-    ], $parsed_features_info);
-
-    $this->drupalGet('admin/modules');
-    $edit = [
-      $name_prefix . $feature_name . '][enable]' => TRUE,
-    ];
-    $this->drupalPostForm(NULL, $edit, $this->t('Install'));
-
-    // Check that the feature is listed as installed.
-    $this->drupalGet('admin/config/development/features');
-
-    $tr = $this->xpath('//table[contains(@class, "features-listing")]/tbody/tr[td[3] = "' . $feature_name . '"]')[0];
-    $this->assertEqual('Installed', (string) $tr->children()[5]);
-
-    // Check that a config change results in a feature marked as changed.
-    \Drupal::configFactory()->getEditable('user.settings')
-      ->set('anonymous', 'Anonymous giraffe')
-      ->save();
-
-    $this->drupalGet('admin/config/development/features');
-
-    $tr = $this->xpath('//table[contains(@class, "features-listing")]/tbody/tr[td[3] = "' . $feature_name . '"]')[0];
-    $this->assertTrue(strpos($tr->children()[6]->asXml(), 'Changed') !== FALSE);
-
-    // Uninstall module.
-    $this->drupalPostForm('admin/modules/uninstall', [
-      'uninstall[' . $feature_name . ']' => TRUE,
-    ], $this->t('Uninstall'));
-    $this->drupalPostForm(NULL, [], $this->t('Uninstall'));
-
-    $this->drupalGet('admin/config/development/features');
-
-    $tr = $this->xpath('//table[contains(@class, "features-listing")]/tbody/tr[td[3] = "' . $feature_name . '"]')[0];
-    $this->assertTrue(strpos($tr->children()[6]->asXml(), 'Changed') !== FALSE);
-
-    $this->clickLink($this->t('Changed'));
-    $this->drupalGet('admin/config/development/features/diff/' . $feature_name);
-    $this->assertRaw('<td class="diff-context diff-deletedline">anonymous : Anonymous <span class="diffchange">giraffe</span></td>');
-    $this->assertRaw('<td class="diff-context diff-addedline">anonymous : Anonymous</td>');
-
-    $this->drupalGet('admin/modules');
-    $edit = [
-      $name_prefix . $feature_name . '][enable]' => TRUE,
-    ];
-    $this->drupalPostForm(NULL, $edit, $this->t('Install'));
-    $this->drupalGet('admin/config/development/features');
-    $tr = $this->xpath('//table[contains(@class, "features-listing")]/tbody/tr[td[3] = "' . $feature_name . '"]')[0];
-    $this->assertEqual('Installed', (string) $tr->children()[5]);
-
-    // Ensure that the changed config got overridden.
-    $this->assertEqual('Anonymous', \Drupal::config('user.settings')->get('anonymous'));
-
-    // Change the value, export and ensure that its not shown as changed.
-    \Drupal::configFactory()->getEditable('user.settings')
-      ->set('anonymous', 'Anonymous giraffe')
-      ->save();
-
-    // Ensure that exporting this change will result in an unchanged feature.
-    $this->drupalGet('admin/config/development/features');
-    $tr = $this->xpath('//table[contains(@class, "features-listing")]/tbody/tr[td[3] = "' . $feature_name . '"]')[0];
-    $this->assertTrue(strpos($tr->children()[6]->asXml(), 'Changed') !== FALSE);
-
-    $this->clickLink('Test feature');
-    $this->drupalPostForm(NULL, [], $this->t('Write'));
-
-    $this->drupalGet('admin/config/development/features');
-    $tr = $this->xpath('//table[contains(@class, "features-listing")]/tbody/tr[td[3] = "' . $feature_name . '"]')[0];
-    $this->assertEqual('Installed', (string) $tr->children()[5]);
-  }
-
-}
diff --git a/modules/contrib/features/modules/features_ui/src/Tests/FeaturesUITest.php b/modules/contrib/features/modules/features_ui/src/Tests/FeaturesUITest.php
deleted file mode 100644
index 51c4abb..0000000
--- a/modules/contrib/features/modules/features_ui/src/Tests/FeaturesUITest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Drupal\features_ui\Tests;
-
-use Drupal\simpletest\WebTestBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-
-/**
- * Tests the creation of a feature.
- *
- * @group features_ui
- */
-class FeaturesUITest extends WebTestBase {
-  use StringTranslationTrait;
-
-  /**
-   * @todo Remove the disabled strict config schema checking.
-   */
-  protected $strictConfigSchema = FALSE;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['features', 'features_ui'];
-
-  /**
-   * Tests creating a feature via UI and download it.
-   */
-  public function testFeaturesUI() {
-    $admin_user = $this->drupalCreateUser(['administer site configuration', 'export configuration', 'administer modules']);
-    $this->drupalLogin($admin_user);
-    $this->drupalGet('admin/config/development/features');
-    // Check the message is displaying if there are no custom bundles.
-    $this->assertText($this->t('You have not yet created any bundles. Before generating features, you may wish to create a bundle to group your features within.'));
-    // Creating custom bundle.
-    $this->drupalGet('admin/config/development/features/bundle');
-    $this->drupalPostAjaxForm(NULL, array('bundle[bundle_select]' => 'new'), 'bundle[bundle_select]');
-    $edit = [
-      'bundle[name]' => 'foo',
-      'bundle[machine_name]' => 'foo',
-      'bundle[description]' => $this->randomString(),
-    ];
-    $this->drupalPostForm(NULL, $edit, $this->t('Save settings'));
-    $this->drupalGet('admin/config/development/features');
-    // Check the message is not displaying if there are custom bundles.
-    $this->assertNoText($this->t('You have not yet created any bundles. Before generating features, you may wish to create a bundle to group your features within.'));
-  }
-
-}
diff --git a/modules/contrib/features/src/ConfigurationItem.php b/modules/contrib/features/src/ConfigurationItem.php
deleted file mode 100644
index 52e3958..0000000
--- a/modules/contrib/features/src/ConfigurationItem.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-/**
- * Contains some configuration together with metadata like the name + package.
- *
- * @todo Should the object be immutable?
- * @todo Should this object have an interface?
- */
-class ConfigurationItem {
-
-  /**
-   * Prefixed configuration item name.
-   *
-   * @var string
-   */
-  protected $name;
-
-  /**
-   * Configuration item name without prefix.
-   *
-   * @var string
-   */
-  protected $shortName;
-
-  /**
-   * Human readable name of configuration item.
-   *
-   * @var string
-   */
-  protected $label;
-
-  /**
-   * Type of configuration.
-   *
-   * @var string
-   */
-  protected $type;
-
-  /**
-   * The contents of the configuration item in exported format.
-   *
-   * @var array
-   */
-  protected $data;
-
-  /**
-   * Array of names of dependent configuration items.
-   *
-   * @var string[]
-   */
-  protected $dependents = [];
-
-  /**
-   * Feature subdirectory to export item to.
-   *
-   * @var string
-   */
-  protected $subdirectory;
-
-  /**
-   * Machine name of a package the configuration is assigned to.
-   *
-   * @var string
-   */
-  protected $package;
-
-  /**
-   * Whether the configuration is marked as excluded.
-   *
-   * @var bool
-   */
-  protected $excluded = FALSE;
-
-  /**
-   * Whether the configuration provider is excluded.
-   *
-   * @var bool
-   */
-  protected $providerExcluded = FALSE;
-
-  /**
-   * The provider of the config item.
-   *
-   * @var string
-   */
-  protected $provider;
-
-  /**
-   * Array of package names that this item should be excluded from.
-   *
-   * @var string[]
-   */
-  protected $packageExcluded = [];
-
-  /**
-   * Creates a new ConfigurationItem instance.
-   *
-   * @param string $name
-   *   The config name.
-   * @param array $data
-   *   The config data.
-   * @param array $additional_properties
-   *   (optional) Additional properties set on the object.
-   */
-  public function __construct($name, array $data, array $additional_properties = []) {
-    $this->name = $name;
-    $this->data = $data;
-
-    $properties = get_object_vars($this);
-    foreach ($additional_properties as $property => $value) {
-      if (!array_key_exists($property, $properties)) {
-        throw new \InvalidArgumentException('Invalid property: ' . $property);
-      }
-      $this->{$property} = $value;
-    }
-  }
-
-  /**
-   * Calculates the config type usable in configuration.
-   *
-   * By default Drupal uses system.simple as config type, which cannot be used
-   * inside configuration itself. Therefore convert it to system_simple.
-   *
-   * @param string $type
-   *   The config type provided by core.
-   *
-   * @return string
-   *   The config type as string without dots.
-   */
-  public static function fromConfigTypeToConfigString($type) {
-    return $type == 'system.simple' ? FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG : $type;
-  }
-
-  /**
-   * Converts a config type string in configuration back to the config type.
-   *
-   * @param string $type
-   *   The config type as string without dots.
-   *
-   * @return string
-   *   The config type provided by core.
-   */
-  public static function fromConfigStringToConfigType($type) {
-    return $type == FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG ? 'system.simple' : $type;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getName() {
-    return $this->name;
-  }
-
-  /**
-   * @param mixed $name
-   *
-   * @return ConfigurationItem
-   */
-  public function setName($name) {
-    $this->name = $name;
-    return $this;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getShortName() {
-    return $this->shortName;
-  }
-
-  /**
-   * @param mixed $shortName
-   *
-   * @return ConfigurationItem
-   */
-  public function setShortName($shortName) {
-    $this->shortName = $shortName;
-    return $this;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getLabel() {
-    return $this->label;
-  }
-
-  /**
-   * @param mixed $label
-   *
-   * @return ConfigurationItem
-   */
-  public function setLabel($label) {
-    $this->label = $label;
-    return $this;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getType() {
-    return $this->type;
-  }
-
-  /**
-   * @param mixed $type
-   *
-   * @return ConfigurationItem
-   */
-  public function setType($type) {
-    $this->type = $type;
-    return $this;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getData() {
-    return $this->data;
-  }
-
-  /**
-   * @param mixed array
-   *
-   * @return ConfigurationItem
-   */
-  public function setData(array $data) {
-    $this->data = $data;
-    return $this;
-  }
-
-  /**
-   * @return string[]
-   */
-  public function getDependents() {
-    return $this->dependents;
-  }
-
-  /**
-   * @param array $dependents
-   *
-   * @return ConfigurationItem
-   */
-  public function setDependents($dependents) {
-    $this->dependents = $dependents;
-    return $this;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getSubdirectory() {
-    return $this->subdirectory;
-  }
-
-  /**
-   * @param mixed $subdirectory
-   *
-   * @return ConfigurationItem
-   */
-  public function setSubdirectory($subdirectory) {
-    $this->subdirectory = $subdirectory;
-    return $this;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getPackage() {
-    return $this->package;
-  }
-
-  /**
-   * @param mixed $package
-   *
-   * @return ConfigurationItem
-   */
-  public function setPackage($package) {
-    $this->package = $package;
-    return $this;
-  }
-
-  /**
-   * @return boolean
-   */
-  public function isExcluded() {
-    return $this->excluded;
-  }
-
-  /**
-   * @param boolean $excluded
-   *
-   * @return ConfigurationItem
-   */
-  public function setExcluded($excluded) {
-    $this->excluded = $excluded;
-    return $this;
-  }
-
-  /**
-   * @return boolean
-   */
-  public function isProviderExcluded() {
-    return $this->providerExcluded;
-  }
-
-  /**
-   * @param boolean $providerExcluded
-   *
-   * @return ConfigurationItem
-   */
-  public function setProviderExcluded($providerExcluded) {
-    $this->providerExcluded = $providerExcluded;
-    return $this;
-  }
-
-  /**
-   * @return string
-   */
-  public function getProvider() {
-    return $this->provider;
-  }
-
-  /**
-   * @param string $provider
-   */
-  public function setProvider($provider) {
-    $this->provider = $provider;
-    return $this;
-  }
-
-  /**
-   * @return string[]
-   */
-  public function getPackageExcluded() {
-    return $this->packageExcluded;
-  }
-
-  /**
-   * @param array $packageExcluded
-   *
-   * @return ConfigurationItem
-   */
-  public function setPackageExcluded($packageExcluded) {
-    $this->packageExcluded = $packageExcluded;
-    return $this;
-  }
-
-}
diff --git a/modules/contrib/features/src/Controller/FeaturesController.php b/modules/contrib/features/src/Controller/FeaturesController.php
deleted file mode 100644
index 701895a..0000000
--- a/modules/contrib/features/src/Controller/FeaturesController.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\features\Controller;
-
-use Drupal\Core\Access\CsrfTokenGenerator;
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\system\FileDownloadController;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-
-/**
- * Returns responses for config module routes.
- */
-class FeaturesController implements ContainerInjectionInterface {
-
-  /**
-   * The file download controller.
-   *
-   * @var \Drupal\system\FileDownloadController
-   */
-  protected $fileDownloadController;
-
-  /**
-   * The CSRF token generator.
-   *
-   * @var \Drupal\Core\Access\CsrfTokenGenerator
-   */
-  protected $csrfToken;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      new FileDownloadController(),
-      $container->get('csrf_token')
-    );
-  }
-
-  /**
-   * Constructs a FeaturesController object.
-   *
-   * @param \Drupal\system\FileDownloadController $file_download_controller
-   *   The file download controller.
-   * @param \Drupal\Core\Access\CsrfTokenGenerator $csrf_token
-   *   The CSRF token generator.
-   */
-  public function __construct(FileDownloadController $file_download_controller, CsrfTokenGenerator $csrf_token) {
-    $this->fileDownloadController = $file_download_controller;
-    $this->csrfToken = $csrf_token;
-  }
-
-  /**
-   * Downloads a tarball of the site configuration.
-   *
-   * @param string $uri
-   *   The URI to download.
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request.
-   *
-   * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
-   *   The downloaded file.
-   */
-  public function downloadExport($uri, Request $request) {
-    if ($uri) {
-      // @todo Simplify once https://www.drupal.org/node/2630920 is solved.
-      if (!$this->csrfToken->validate($request->query->get('token'), $uri)) {
-        throw new AccessDeniedHttpException();
-      }
-
-      $request = new Request(array('file' => $uri));
-      return $this->fileDownloadController->download($request, 'temporary');
-    }
-  }
-
-}
diff --git a/modules/contrib/features/src/Entity/FeaturesBundle.php b/modules/contrib/features/src/Entity/FeaturesBundle.php
deleted file mode 100644
index 5901433..0000000
--- a/modules/contrib/features/src/Entity/FeaturesBundle.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-
-namespace Drupal\features\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\Core\Site\Settings;
-
-/**
- * Defines a features bundle.
- * @todo Better description
- *
- * @ConfigEntityType(
- *   id = "features_bundle",
- *   label = @Translation("Features bundle"),
- *   handlers = {
- *   },
- *   admin_permission = "administer site configuration",
- *   config_prefix = "bundle",
- *   entity_keys = {
- *     "id" = "machine_name",
- *     "label" = "name"
- *   },
- *   links = {
- *   },
- *   config_export = {
- *     "name",
- *     "machine_name",
- *     "description",
- *     "assignments",
- *     "profile_name",
- *     "is_profile",
- *   }
- * )
- */
-class FeaturesBundle extends ConfigEntityBase implements FeaturesBundleInterface {
-
-  /**
-   * @var string
-   */
-  protected $name;
-
-  /**
-   * @var
-   */
-  protected $machine_name;
-
-  /**
-   * @var string
-   */
-  protected $description;
-
-  /**
-   * @var string[]
-   */
-  protected $assignments = [];
-
-  /**
-   * @var string
-   */
-  protected $profile_name;
-
-  /**
-   * @var bool
-   */
-  protected $is_profile = FALSE;
-
-  public function id() {
-    // @todo Convert it to $this->id in the long run.
-    return $this->getMachineName();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isDefault() {
-    return $this->machine_name == static::DEFAULT_BUNDLE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMachineName() {
-    return $this->machine_name;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setMachineName($machine_name) {
-    $this->machine_name = $machine_name;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return $this->name;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setName($name) {
-    $this->name = $name;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFullName($short_name) {
-    if ($this->isDefault() ||
-      // If it's already prefixed, don't repeat the prefix.
-      $this->inBundle($short_name) ||
-      // If we are a profile, don't duplicate the bundle if same as profile.
-      $this->isProfilePackage($short_name)) {
-      return $short_name;
-    }
-    else {
-      return $this->machine_name . '_' . $short_name;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getShortName($machine_name) {
-    if (!$this->isProfilePackage($machine_name) && $this->inBundle($machine_name)) {
-      return substr($machine_name, strlen($this->getMachineName()) + 1, strlen($machine_name) - strlen($this->getMachineName()) - 1);
-    }
-    return $machine_name;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function inBundle($machine_name) {
-    return ($this->isProfilePackage($machine_name) || strpos($machine_name, $this->machine_name . '_') === 0);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isProfilePackage($machine_name) {
-    return ($this->isProfile() && $machine_name == $this->getProfileName());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return $this->description;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setDescription($description) {
-    $this->description = $description;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isProfile() {
-    return $this->is_profile;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setIsProfile($value) {
-    $this->is_profile = $value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getProfileName() {
-    $name = $this->isProfile() ? $this->profile_name : '';
-    // Use Settings::get to fetch current profile name so we can easily test.
-    return !empty($name) ? $name : Settings::get('install_profile');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setProfileName($machine_name) {
-    $this->profile_name = $machine_name;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEnabledAssignments() {
-    $list = array();
-    foreach ($this->assignments as $method_id => $method) {
-      if ($method['enabled']) {
-        $list[$method_id] = $method_id;
-      }
-    }
-    return $list;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setEnabledAssignments(array $assignments) {
-    // Add any new assignments that we don't yet know about.
-    $new_assignments = array_diff($assignments, array_keys($this->assignments));
-    foreach ($new_assignments as $method_id) {
-      $this->assignments[$method_id] = $this->getAssignmentSettings($method_id);
-    }
-
-    foreach ($this->assignments as $method_id => &$method) {
-      $method['enabled'] = in_array($method_id, $assignments);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAssignmentWeights() {
-    $list = array();
-    foreach ($this->assignments as $method_id => $method) {
-      $list[$method_id] = $method['weight'];
-    }
-    return $list;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setAssignmentWeights(array $assignments) {
-    foreach ($this->assignments as $method_id => &$method) {
-      if (isset($assignments[$method_id])) {
-        $method['weight'] = $assignments[$method_id];
-      }
-    }
-  }
-
-  /**
-   * Return array of default settings for the given plugin method
-   *
-   * @param $method_id
-   * @return array
-   */
-  protected function getDefaultSettings($method_id) {
-    $settings = ['enabled' => FALSE, 'weight' => 0];
-
-    $manager = \Drupal::service('plugin.manager.features_assignment_method');
-    $definition = $manager->getDefinition($method_id);
-
-    if (isset($definition['weight'])) {
-      $settings['weight'] = $definition['weight'];
-    }
-    if (isset($definition['default_settings'])) {
-      $settings += $definition['default_settings'];
-    }
-
-    return $settings;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAssignmentSettings($method_id = NULL) {
-    if (isset($method_id)) {
-      if (isset($this->assignments[$method_id])) {
-        return $this->assignments[$method_id];
-      }
-      else {
-        // Use defaults.
-        return $this->getDefaultSettings($method_id);
-      }
-    }
-    else {
-      $list = array();
-      foreach (array_keys($this->assignments) as $method_id) {
-        $list[$method_id] = $this->getAssignmentSettings($method_id);
-      }
-      return $list;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setAssignmentSettings($method_id, array $settings) {
-    if (isset($method_id)) {
-      $this->assignments[$method_id] = $settings;
-    }
-    else {
-      foreach ($settings as $method_id => $method_settings) {
-        if (!empty($method_settings)) {
-          $this->setAssignmentSettings($method_id, $method_settings);
-        }
-      }
-    }
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function remove() {
-    $this->delete();
-  }
-
-}
diff --git a/modules/contrib/features/src/FeaturesAssigner.php b/modules/contrib/features/src/FeaturesAssigner.php
deleted file mode 100644
index 47db7f4..0000000
--- a/modules/contrib/features/src/FeaturesAssigner.php
+++ /dev/null
@@ -1,447 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Config\ExtensionInstallStorage;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\features\Entity\FeaturesBundle;
-
-/**
- * Class responsible for performing package assignment.
- */
-class FeaturesAssigner implements FeaturesAssignerInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The package assignment method plugin manager.
-   *
-   * @var \Drupal\Component\Plugin\PluginManagerInterface
-   */
-  protected $assignerManager;
-
-  /**
-   * The features manager.
-   *
-   * @var \Drupal\features\FeaturesManagerInterface
-   */
-  protected $featuresManager;
-
-  /**
-   * The configuration factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The configuration storage.
-   *
-   * @var \Drupal\Core\Config\StorageInterface
-   */
-  protected $configStorage;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Local cache for package assignment method instances.
-   *
-   * @var array
-   */
-  protected $methods;
-
-  /**
-   * Bundles.
-   *
-   * @var array of \Drupal\features\FeaturesBundleInterface
-   */
-  protected $bundles;
-
-  /**
-   * Currently active bundle.
-   *
-   * @var \Drupal\features\FeaturesBundleInterface
-   */
-  protected $currentBundle;
-
-  /**
-   * Constructs a new FeaturesAssigner object.
-   *
-   * @param \Drupal\features\FeaturesManagerInterface $features_manager
-   *    The features manager.
-   * @param \Drupal\Component\Plugin\PluginManagerInterface $assigner_manager
-   *   The package assignment methods plugin manager.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The configuration factory.
-   * @param \Drupal\Core\Config\StorageInterface $config_storage
-   *   The configuration factory.
-   */
-  public function __construct(FeaturesManagerInterface $features_manager, PluginManagerInterface $assigner_manager, EntityTypeManagerInterface $entity_type_manager, ConfigFactoryInterface $config_factory, StorageInterface $config_storage) {
-    $this->featuresManager = $features_manager;
-    $this->assignerManager = $assigner_manager;
-    $this->entityTypeManager = $entity_type_manager;
-    $this->configFactory = $config_factory;
-    $this->configStorage = $config_storage;
-    $this->bundles = $this->getBundleList();
-    $this->currentBundle = $this->getBundle(FeaturesBundleInterface::DEFAULT_BUNDLE);
-    // Ensure bundle information is fresh.
-    $this->createBundlesFromPackages();
-  }
-
-  /**
-   * Initializes the injected features manager with the assigner.
-   *
-   * This should be called right after instantiating the assigner to make it
-   * available to the features manager without introducing a circular
-   * dependency.
-   */
-  public function initFeaturesManager() {
-    $this->featuresManager->setAssigner($this);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function reset() {
-    $this->methods = array();
-    $this->featuresManager->reset();
-  }
-
-  /**
-   * Gets enabled assignment methods.
-   *
-   * @return array
-   *   An array of enabled assignment methods, sorted by weight.
-   */
-  public function getEnabledAssigners() {
-    $enabled = $this->currentBundle->getEnabledAssignments();
-    $weights = $this->currentBundle->getAssignmentWeights();
-    foreach ($enabled as $key => $value) {
-      $enabled[$key] = $weights[$key];
-    }
-    asort($enabled);
-    return $enabled;
-  }
-
-  /**
-   * Clean up the package list after all config has been assigned
-   */
-  protected function cleanup() {
-    $packages = $this->featuresManager->getPackages();
-    foreach ($packages as $index => $package) {
-      if ($package->getStatus() === FeaturesManagerInterface::STATUS_NO_EXPORT && empty($package->getConfig()) && empty($package->getConfigOrig())) {
-        unset($packages[$index]);
-      }
-    }
-    $this->featuresManager->setPackages($packages);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assignConfigPackages($force = FALSE) {
-    foreach ($this->getEnabledAssigners() as $method_id => $info) {
-      $this->applyAssignmentMethod($method_id, $force);
-    }
-    $this->cleanup();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applyAssignmentMethod($method_id, $force = FALSE) {
-    $this->getAssignmentMethodInstance($method_id)->assignPackages($force);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAssignmentMethods() {
-    return $this->assignerManager->getDefinitions();
-  }
-
-  /**
-   * Returns an instance of the specified package assignment method.
-   *
-   * @param string $method_id
-   *   The string identifier of the package assignment method to use to package
-   *   configuration.
-   *
-   * @return \Drupal\features\FeaturesAssignmentMethodInterface
-   */
-  protected function getAssignmentMethodInstance($method_id) {
-    if (!isset($this->methods[$method_id])) {
-      $instance = $this->assignerManager->createInstance($method_id, array());
-      $instance->setFeaturesManager($this->featuresManager);
-      $instance->setAssigner($this);
-      $instance->setEntityTypeManager($this->entityTypeManager);
-      $instance->setConfigFactory($this->configFactory);
-      $this->methods[$method_id] = $instance;
-    }
-    return $this->methods[$method_id];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function purgeConfiguration() {
-    // Ensure that we are getting the defined package assignment information.
-    // An invocation of \Drupal\Core\Extension\ModuleHandler::install() or
-    // \Drupal\Core\Extension\ModuleHandler::uninstall() could invalidate the
-    // cached information.
-    $this->assignerManager->clearCachedDefinitions();
-    $this->featuresManager->reset();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getBundle($name = NULL) {
-    if (empty($name)) {
-      return $this->currentBundle;
-    }
-    elseif (isset($this->bundles[$name])) {
-      return $this->bundles[$name];
-    }
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setBundle(FeaturesBundleInterface $bundle, $current = TRUE) {
-    $this->bundles[$bundle->getMachineName()] = $bundle;
-    if (isset($this->currentBundle) && ($current || ($bundle->getMachineName() == $this->currentBundle->getMachineName()))) {
-      $this->currentBundle = $bundle;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function findBundle(array $info, $features_info = NULL) {
-    $bundle = NULL;
-    if (!empty($features_info['bundle'])) {
-      $bundle = $this->getBundle($features_info['bundle']);
-    }
-    elseif (!empty($info['package'])) {
-      $bundle = $this->findBundleByName($info['package']);
-    }
-    if (!isset($bundle)) {
-      // Return the default bundle.
-      return $this->getBundle(FeaturesBundleInterface::DEFAULT_BUNDLE);
-    }
-    return $bundle;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setCurrent(FeaturesBundleInterface $bundle) {
-    $this->currentBundle = $bundle;
-    $session = \Drupal::request()->getSession();
-    if (isset($session)) {
-      $session->set('features_current_bundle', $bundle->getMachineName());
-    }
-    return $bundle;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getBundleList() {
-    if (empty($this->bundles)) {
-      $this->bundles = array();
-      foreach ($this->entityTypeManager->getStorage('features_bundle')->loadMultiple() as $machine_name => $bundle) {
-        $this->bundles[$machine_name] = $bundle;
-      }
-    }
-    return $this->bundles;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function findBundleByName($name, $create = FALSE) {
-    $bundles = $this->getBundleList();
-    foreach ($bundles as $machine_name => $bundle) {
-      if ($name == $bundle->getName()) {
-        return $bundle;
-      }
-    }
-    $machine_name = strtolower(str_replace(array(' ', '-'), '_', $name));
-    if (isset($bundles[$machine_name])) {
-      return $bundles[$machine_name];
-    }
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createBundleFromDefault($machine_name, $name = NULL, $description = NULL, $is_profile = FALSE, $profile_name = NULL) {
-    // Duplicate the default bundle to get its default configuration.
-    $default = $this->getBundle(FeaturesBundleInterface::DEFAULT_BUNDLE);
-    if (!$default) {
-      // If we don't have the default installed, generate it from the install
-      // config file.
-      $ext_storage = new ExtensionInstallStorage($this->configStorage);
-      $record = $ext_storage->read('features.bundle.default');
-      $bundle_storage = $this->entityTypeManager->getStorage('features_bundle');
-      $default = $bundle_storage->createFromStorageRecord($record);
-    }
-
-    /** @var \Drupal\features\Entity\FeaturesBundle $bundle */
-    $bundle = $default->createDuplicate();
-
-    $bundle->setMachineName($machine_name);
-    $name = !empty($name) ? $name : $machine_name;
-    $bundle->setName($name);
-    if (isset($description)) {
-      $bundle->setDescription($description);
-    }
-    else {
-      $bundle->setDescription(t('Auto-generated bundle from package @name', array('@name' => $name)));
-    }
-    $bundle->setIsProfile($is_profile);
-    if (isset($profile_name)) {
-      $bundle->setProfileName($profile_name);
-    }
-    $bundle->save();
-    $this->setBundle($bundle);
-
-    return $bundle;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createBundlesFromPackages() {
-    $existing_bundles = $this->getBundleList();
-    $new_bundles = [];
-    // Only parse from installed features.
-    $modules = $this->featuresManager->getFeaturesModules(NULL, TRUE);
-
-    foreach ($modules as $module) {
-      $info = $this->featuresManager->getExtensionInfo($module);
-      // @todo This entire function could be simplified a lot using packages.
-      $features_info = $this->featuresManager->getFeaturesInfo($module);
-      // Create a new bundle if:
-      // - the feature specifies a bundle and
-      // - that bundle doesn't yet exist locally.
-      // Allow profiles to override previous values.
-      if (!empty($features_info['bundle']) &&
-        !isset($existing_bundles[$features_info['bundle']]) &&
-        (!in_array($features_info['bundle'], $new_bundles) || $info['type'] == 'profile')) {
-        if ($info['type'] == 'profile') {
-          $new_bundle = [
-            'name' => $info['name'],
-            'description' => $info['description'],
-            'is_profile' => TRUE,
-            'profile_name' => $module->getName(),
-          ];
-        }
-        else {
-          $new_bundle = [
-            'name' => isset($info['package']) ? $info['package'] : ucwords(str_replace('_', ' ', $features_info['bundle'])),
-            'description' => NULL,
-            'is_profile' => FALSE,
-            'profile_name' => NULL,
-          ];
-        }
-        $new_bundle['machine_name'] = $features_info['bundle'];
-        $new_bundles[$new_bundle['machine_name']] = $new_bundle;
-      }
-    }
-    foreach ($new_bundles as $new_bundle) {
-      $new_bundle = $this->createBundleFromDefault($new_bundle['machine_name'], $new_bundle['name'], $new_bundle['description'], $new_bundle['is_profile']);
-      drupal_set_message($this->t('Features bundle @name automatically created.', ['@name' => $new_bundle->getName()]));
-    }
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getBundleOptions() {
-    $list = $this->getBundleList();
-    $result = array();
-    foreach ($list as $machine_name => $bundle) {
-      $result[$machine_name] = $bundle->getName();
-    }
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applyBundle($machine_name = NULL) {
-    $this->reset();
-    $bundle = $this->loadBundle($machine_name);
-    if (isset($bundle)) {
-      $this->assignConfigPackages();
-      return $this->currentBundle;
-    }
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function renameBundle($old_machine, $new_machine) {
-    $is_current = (isset($this->currentBundle) && ($old_machine == $this->currentBundle->getMachineName()));
-    $bundle = $this->getBundle($old_machine);
-    if ($bundle->getMachineName() != '') {
-      // Remove old bundle from the list if it's not the Default bundle.
-      unset($this->bundles[$old_machine]);
-    }
-    $bundle->setMachineName($new_machine);
-    $this->setBundle($bundle);
-    // Put the bundle into the list with the correct name.
-    $this->bundles[$bundle->getMachineName()] = $bundle;
-    if ($is_current) {
-      $this->setCurrent($bundle);
-    }
-    return $bundle;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function loadBundle($machine_name = NULL) {
-    if (!isset($machine_name)) {
-      $session = \Drupal::request()->getSession();
-      if (isset($session)) {
-        $machine_name = isset($session) ? $session->get('features_current_bundle', FeaturesBundleInterface::DEFAULT_BUNDLE) : FeaturesBundleInterface::DEFAULT_BUNDLE;
-      }
-    }
-    $bundle = $this->getBundle($machine_name);
-    if (!isset($bundle)) {
-      // If bundle no longer exists then return default.
-      $bundle = $this->bundles[FeaturesBundleInterface::DEFAULT_BUNDLE];
-    }
-    return $this->setCurrent($bundle);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function removeBundle($machine_name) {
-    $bundle = $this->getBundle($machine_name);
-    if (isset($bundle) && !$bundle->isDefault()) {
-      unset($this->bundles[$machine_name]);
-      $bundle->remove();
-    }
-  }
-
-}
diff --git a/modules/contrib/features/src/FeaturesAssignerInterface.php b/modules/contrib/features/src/FeaturesAssignerInterface.php
deleted file mode 100644
index 946c6ec..0000000
--- a/modules/contrib/features/src/FeaturesAssignerInterface.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-/**
- * Common interface for features assignment services.
- *
- * The feature API is based on two major concepts:
- * - Packages: modules into which configuration is packaged.
- * - Package assignment methods: responsible for `determining
- *   which package to assign a given piece of configuration to.
- * Assignment methods are customizable.
- *
- * Features defines several package assignment methods, which are simple plugin
- * classes that implement a particular logic to assign pieces of configuration
- * to a given package (module).
- *
- * Modules can define additional package assignment methods by simply providing
- * the related plugins, and alter existing methods through
- * hook_features_assignment_method_info_alter(). Here is an example
- * snippet:
- * @code
- * function mymodule_features_assignment_method_info_alter(&$assignment_info) {
- *   // Replace the original plugin with our own implementation.
- *   $method_id = \Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentBaseType::METHOD_ID;
- *   $assignment_info[$method_id]['class'] = 'Drupal\my_module\Plugin\FeaturesAssignment\MyFeaturesAssignmentBaseType';
- * }
- *
- * class MyFeaturesAssignmentBaseType extends FeaturesAssignmentBaseType {
- *   public function assignPackages($force = FALSE) {
- *     // Insert customization here.
- *   }
- * }
- * ?>
- * @endcode
- *
- * For more information, see
- * @link http://drupal.org/node/2404473 Developing for Features 3.x @endlink
- */
-interface FeaturesAssignerInterface {
-
-  /**
-   * The package assignment method id for the package assigner itself.
-   */
-  const METHOD_ID = 'assigner-default';
-
-  /**
-   * Resets the assigned packages and the method instances.
-   */
-  public function reset();
-
-  /**
-   * Apply all enabled package assignment methods.
-   *
-   * @param bool $force
-   *   (optional) If TRUE, assign config regardless of restrictions such as it
-   *   being already assigned to a package.
-   */
-  public function assignConfigPackages($force = FALSE);
-
-  /**
-   * Applies a given package assignment method.
-   *
-   * @param string $method_id
-   *   The string identifier of the package assignment method to use to package
-   *   configuration.
-   * @param bool $force
-   *   (optional) If TRUE, assign config regardless of restrictions such as it
-   *   being already assigned to a package.
-   */
-  public function applyAssignmentMethod($method_id, $force = FALSE);
-
-  /**
-   * Returns the enabled package assignment methods.
-   *
-   * @return array
-   *   An array of package assignment method IDs.
-   */
-  public function getAssignmentMethods();
-
-  /**
-   * Resaves the configuration to purge missing assignment methods.
-   */
-  public function purgeConfiguration();
-
-  /**
-   * Returns a FeaturesBundle object.
-   *
-   * @param string $name
-   *   machine name of package set. If omitted, returns the current bundle.
-   *
-   * @return \Drupal\features\FeaturesBundleInterface
-   *   A features bundle object.
-   */
-  public function getBundle($name = NULL);
-
-  /**
-   * Stores a features bundle.
-   *
-   * Added to list if machine_name is new.
-   *
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   A features bundle.
-   * @param bool $current
-   *   Determine if the current bundle is set to $bundle.
-   *   If False, the current bundle is only updated if it already has the same
-   *   machine name as the $bundle.
-   */
-  public function setBundle(FeaturesBundleInterface $bundle, $current = TRUE);
-
-  /**
-   * Searches for a bundle that matches the $info.yml or $features.yml export.
-   *
-   * Creates a new bundle as needed.
-   *
-   * @param array $info
-   *   The bundle info.
-   * @param mixed $features_info
-   *   The features info.
-   *
-   * @return \Drupal\features\FeaturesBundleInterface
-   *   A bundle.
-   */
-  public function findBundle(array $info, $features_info = NULL);
-
-  /**
-   * Sets the currently active bundle.
-   *
-   * Updates value in current SESSION.
-   *
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   A features bundle object.
-   */
-  public function setCurrent(FeaturesBundleInterface $bundle);
-
-  /**
-   * Returns an array of all existing features bundles.
-   *
-   * @return \Drupal\features\FeaturesBundleInterface[]
-   *   Keyed by machine_name with value of
-   *   \Drupal\features\FeaturesBundleInterface.
-   */
-  public function getBundleList();
-
-  /**
-   * Returns a named bundle.
-   *
-   * First searches by Human name, then by machine_name.
-   *
-   * @param string $name
-   *   The bundle name to search by.
-   *
-   * @return \Drupal\features\FeaturesBundleInterface
-   *   A features bundle object.
-   */
-  public function findBundleByName($name);
-
-  /**
-   * Creates a new bundle by duplicating the default bundle and customizing.
-   *
-   * @param string $machine_name
-   *   Machine name.
-   * @param string $name
-   *   (optional) Human readable name of the bundle.
-   * @param string $description
-   *   (optional) Description of the bundle.
-   * @param bool $is_profile
-   *   (optional) TRUE if a profile is used with this bundle.
-   * @param string $profile_name
-   *   (optional) The machine name of the profile.
-   *
-   * @return \Drupal\features\FeaturesBundleInterface
-   *   A features bundle object.
-   */
-  public function createBundleFromDefault($name, $machine_name = '', $description = '', $is_profile = FALSE, $profile_name = NULL);
-
-  /**
-   * Creates bundles by parsing information from installed packages.
-   */
-  public function createBundlesFromPackages();
-
-  /**
-   * Returns an array of bundle names suitable for a select option list.
-   *
-   * @return array
-   *   An array of bundles, keyed by machine_name, with values being human
-   *   readable names.
-   */
-  public function getBundleOptions();
-
-  /**
-   * Makes the named bundle the current bundle.
-   *
-   * @param string $machine_name
-   *   The name of a features bundle. If omitted, gets the last bundle from the
-   *   Session.
-   *
-   * @return \Drupal\features\FeaturesBundleInterface
-   *   A features bundle object.
-   */
-  public function applyBundle($machine_name = NULL);
-
-  /**
-   * Renames a bundle.
-   *
-   * @param string $old_machine
-   *   The old machine name of a bundle.
-   * @param string $new_machine
-   *   The new machine name of a bundle.
-   *
-   * @return \Drupal\features\FeaturesBundleInterface
-   *   A features bundle object.
-   */
-  public function renameBundle($old_machine, $new_machine);
-
-  /**
-   * Loads a named bundle.
-   *
-   * @param string $machine_name
-   *   (optional) The name of a features bundle.
-   *   Defaults to NULL, gets the last bundle from the session.
-   *
-   * @return \Drupal\features\FeaturesBundleInterface
-   *   A features bundle object.
-   */
-  public function loadBundle($machine_name = NULL);
-
-}
diff --git a/modules/contrib/features/src/FeaturesAssignmentMethodBase.php b/modules/contrib/features/src/FeaturesAssignmentMethodBase.php
deleted file mode 100644
index 2b74657..0000000
--- a/modules/contrib/features/src/FeaturesAssignmentMethodBase.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\PluginBase;
-
-/**
- * Base class for package assignment methods.
- */
-abstract class FeaturesAssignmentMethodBase extends PluginBase implements FeaturesAssignmentMethodInterface {
-  /**
-   * The features manager.
-   *
-   * @var \Drupal\features\FeaturesManagerInterface
-   */
-  protected $featuresManager;
-
-  /**
-   * The features assigner.
-   *
-   * @var \Drupal\features\FeaturesAssignerInterface
-   */
-  protected $assigner;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The configuration factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setfeaturesManager(FeaturesManagerInterface $features_manager) {
-    $this->featuresManager = $features_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setAssigner(FeaturesAssignerInterface $assigner) {
-    $this->assigner = $assigner;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setEntityTypeManager(EntityTypeManagerInterface $entity_type_manager) {
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConfigFactory(ConfigFactoryInterface $config_factory) {
-    $this->configFactory = $config_factory;
-  }
-
-  /**
-   * Assigns configuration of the types specified in a setting to a package.
-   *
-   * @param string $machine_name
-   *   Machine name of the package.
-   * @param bool $force
-   *   (optional) If TRUE, assign config regardless of restrictions such as it
-   *   being already assigned to a package.
-   */
-  protected function assignPackageByConfigTypes($machine_name, $force = FALSE) {
-    $current_bundle = $this->assigner->getBundle();
-    $settings = $current_bundle->getAssignmentSettings($this->getPluginId());
-    $types = $settings['types']['config'];
-
-    $config_collection = $this->featuresManager->getConfigCollection();
-
-    foreach ($config_collection as $item_name => $item) {
-      // Don't assign configuration that's provided by an extension.
-      if (in_array($item->getType(), $types) && !($item->isProviderExcluded())) {
-        try {
-          $this->featuresManager->assignConfigPackage($machine_name, [$item_name]);
-        }
-        catch (\Exception $exception) {
-          \Drupal::logger('features')->error($exception->getMessage());
-        }
-      }
-    }
-  }
-
-  /**
-   * Assigns a given subdirectory to configuration of specified types.
-   *
-   * @param string $subdirectory
-   *   The subdirectory that designated configuration should be exported to.
-   */
-  protected function assignSubdirectoryByConfigTypes($subdirectory) {
-    $current_bundle = $this->assigner->getBundle();
-    $settings = $current_bundle->getAssignmentSettings($this->getPluginId());
-    $types = $settings['types']['config'];
-
-    if (!empty($types)) {
-      $config_collection = $this->featuresManager->getConfigCollection();
-
-      foreach ($config_collection as &$item) {
-        if (in_array($item->getType(), $types)) {
-          $item->setSubdirectory($subdirectory);
-        }
-      }
-      // Clean up the $item pass by reference.
-      unset($item);
-
-      $this->featuresManager->setConfigCollection($config_collection);
-    }
-  }
-
-}
diff --git a/modules/contrib/features/src/FeaturesAssignmentMethodInterface.php b/modules/contrib/features/src/FeaturesAssignmentMethodInterface.php
deleted file mode 100644
index abb29f1..0000000
--- a/modules/contrib/features/src/FeaturesAssignmentMethodInterface.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-
-/**
- * Interface for package assignment classes.
- */
-interface FeaturesAssignmentMethodInterface extends PluginInspectionInterface {
-
-  /**
-   * Injects the features manager.
-   *
-   * @param \Drupal\features\FeaturesManagerInterface $features_manager
-   *   The features manager to be used to retrieve the configuration list and
-   *   the already assigned packages.
-   */
-  public function setFeaturesManager(FeaturesManagerInterface $features_manager);
-
-  /**
-   * Injects the features assigner.
-   *
-   * @param \Drupal\features\FeaturesAssignerInterface $assigner
-   *   The features assigner to be used to retrieve the bundle configuration.
-   */
-  public function setAssigner(FeaturesAssignerInterface $assigner);
-
-  /**
-   * Injects the entity manager.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager to be used to retrieve entity information.
-   */
-  public function setEntityTypeManager(EntityTypeManagerInterface $entity_type_manager);
-
-  /**
-   * Injects the configuration factory.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The configuration factory to be used to retrieve configuration values.
-   */
-  public function setConfigFactory(ConfigFactoryInterface $config_factory);
-
-  /**
-   * Performs package assignment.
-   *
-   * @param bool $force
-   *   (optional) If TRUE, assign config regardless of restrictions such as it
-   *   being already assigned to a package.
-   */
-  public function assignPackages($force = FALSE);
-
-}
diff --git a/modules/contrib/features/src/FeaturesAssignmentMethodManager.php b/modules/contrib/features/src/FeaturesAssignmentMethodManager.php
deleted file mode 100644
index 40b4a58..0000000
--- a/modules/contrib/features/src/FeaturesAssignmentMethodManager.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-
-/**
- * Manages configuration packaging methods.
- */
-class FeaturesAssignmentMethodManager extends DefaultPluginManager {
-
-  /**
-   * Constructs a new FeaturesAssignmentMethodManager object.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   An object that implements CacheBackendInterface.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   An object that implements ModuleHandlerInterface.
-   */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    parent::__construct('Plugin/FeaturesAssignment', $namespaces, $module_handler,
-      'Drupal\features\FeaturesAssignmentMethodInterface');
-    $this->alterInfo('features_assignment_info');
-    $this->setCacheBackend($cache_backend, 'features_assignment_methods');
-  }
-
-}
diff --git a/modules/contrib/features/src/FeaturesBundleInterface.php b/modules/contrib/features/src/FeaturesBundleInterface.php
deleted file mode 100644
index 83dfbf5..0000000
--- a/modules/contrib/features/src/FeaturesBundleInterface.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-/**
- * Provides an interface for the FeaturesBundle object.
- */
-interface FeaturesBundleInterface {
-
-  const DEFAULT_BUNDLE = 'default';
-
-  /**
-   * Determines whether the current bundle is the default one.
-   *
-   * @return bool
-   *   Returns TRUE if this is the default bundle.
-   */
-  public function isDefault();
-
-  /**
-   * Returns the machine name of a bundle.
-   *
-   * @return string
-   *   The machine name of a bundle.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::setMachineName()
-   */
-  public function getMachineName();
-
-  /**
-   * Sets the machine name of a bundle.
-   *
-   * @param string $machine_name
-   *   The machine name of a bundle.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::getMachineName()
-   */
-  public function setMachineName($machine_name);
-
-  /**
-   * Gets the human readable name of a bundle.
-   *
-   * @return string
-   *   The human readable name of a bundle.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::setName()
-   */
-  public function getName();
-
-  /**
-   * Sets the human readable name of a bundle.
-   *
-   * @param string $name
-   *   The human readable name of a bundle.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::getName()
-   */
-  public function setName($name);
-
-  /**
-   * Returns a full machine name prefixed with the bundle name.
-   *
-   * @param string $short_name
-   *   The short machine_name of a bundle.
-   *
-   * @return string
-   *   The full machine_name of a bundle.
-   */
-  public function getFullName($short_name);
-
-  /**
-   * Returns a short machine name not prefixed with the bundle name.
-   *
-   * @param string $machine_name
-   *   The full machine_name of a bundle.
-   *
-   * @return string
-   *   The short machine_name of a bundle.
-   */
-  public function getShortName($machine_name);
-
-  /**
-   * Determines if the $machine_name is prefixed by the bundle machine name.
-   *
-   * @param string $machine_name
-   *   The machine name of a package.
-   *
-   * @return bool
-   *   TRUE if the machine name is prefixed by the bundle machine name.
-   */
-  public function inBundle($machine_name);
-
-  /**
-   * Determines if the package with $machine_name is the bundle profile.
-   *
-   * @param string $machine_name
-   *   The machine name of a package.
-   *
-   * @return bool
-   *   TRUE if the package with $machine_name is the bundle profile.
-   */
-  public function isProfilePackage($machine_name);
-
-  /**
-   * Gets the description of a bundle.
-   *
-   * @return string
-   *   The description of a bundle.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::setDescription()
-   */
-  public function getDescription();
-
-  /**
-   * Sets the description of a bundle.
-   *
-   * @param string $description
-   *   The description of a bundle.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::getDescription()
-   */
-  public function setDescription($description);
-
-  /**
-   * Gets option for using a profile with this bundle.
-   *
-   * @return bool
-   *   TRUE if a profile is used with this profile.
-   */
-  public function isProfile();
-
-  /**
-   * Sets option for using a profile with this bundle.
-   *
-   * @param bool $value
-   *   TRUE if a profile is used with this bundle.
-   */
-  public function setIsProfile($value);
-
-  /**
-   * Returns the machine name of the profile.
-   *
-   * If the bundle doesn't use a profile, return the current site profile.
-   *
-   * @return string
-   *   THe machie name of a profile.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::setProfileName()
-   */
-  public function getProfileName();
-
-  /**
-   * Sets the name of the profile associated with this bundle.
-   *
-   * @param string $machine_name
-   *   The machine name of a profile.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::getProfileName()
-   */
-  public function setProfileName($machine_name);
-
-  /**
-   * Gets the list of enabled assignment methods.
-   *
-   * @return array
-   *   An array of method IDs keyed by assignment method IDs.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::setEnabledAssignments()
-   */
-  public function getEnabledAssignments();
-
-  /**
-   * Sets the list of enabled assignment methods.
-   *
-   * @param array $assignments
-   *   An array of values keyed by assignment method IDs. Non-empty value is
-   *   enabled.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::getEnabledAssignments()
-   */
-  public function setEnabledAssignments(array $assignments);
-
-  /**
-   * Gets the weights of the assignment methods.
-   *
-   * @return array
-   *   An array keyed by assignment method_id with a numeric weight.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::setAssignmentWeights()
-   */
-  public function getAssignmentWeights();
-
-  /**
-   * Sets the weights of the assignment methods.
-   *
-   * @param array $assignments
-   *   An array keyed by assignment method_id with a numeric weight value.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::getAssignmentWeights()
-   */
-  public function setAssignmentWeights(array $assignments);
-
-  /**
-   * Gets settings specific to an assignment method.
-   *
-   * @param string $method_id
-   *   The ID of an assignment method. If NULL, return all assignment settings
-   *   keyed by method_id.
-   *
-   * @return array
-   *   An array of settings. Format specific to assignment method.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::setAssignmentSettings()
-   */
-  public function getAssignmentSettings($method_id = NULL);
-
-  /**
-   * Sets settings specific to an assignment method.
-   *
-   * @param string $method_id
-   *   The ID of an assignment method. If NULL, all $settings are given keyed
-   *   by method_ID.
-   * @param array $settings
-   *   An array of setting values.
-   *
-   * @see \Drupal\features\FeaturesBundleInterface::getAssignmentSettings()
-   */
-  public function setAssignmentSettings($method_id, array $settings);
-
-  /**
-   * Saves the bundle to the active config.
-   */
-  public function save();
-
-  /**
-   * Removes the bundle from the active config.
-   */
-  public function remove();
-
-}
diff --git a/modules/contrib/features/src/FeaturesConfigDependencyManager.php b/modules/contrib/features/src/FeaturesConfigDependencyManager.php
deleted file mode 100644
index cca3507..0000000
--- a/modules/contrib/features/src/FeaturesConfigDependencyManager.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Core\Config\Entity\ConfigDependencyManager;
-use Drupal\Core\Config\Entity\ConfigEntityDependency;
-
-/**
- * Class FeaturesConfigDependencyManager
- * @package Drupal\features
- */
-class FeaturesConfigDependencyManager extends ConfigDependencyManager{
-
-  protected $sorted_graph;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDependentEntities($type, $name) {
-    $dependent_entities = array();
-
-    $entities_to_check = array();
-    if ($type == 'config') {
-      $entities_to_check[] = $name;
-    }
-    else {
-      if ($type == 'module' || $type == 'theme' || $type == 'content') {
-        $dependent_entities = array_filter($this->data, function (ConfigEntityDependency $entity) use ($type, $name) {
-          return $entity->hasDependency($type, $name);
-        });
-      }
-      // If checking content, module, or theme dependencies, discover which
-      // entities are dependent on the entities that have a direct dependency.
-      foreach ($dependent_entities as $entity) {
-        $entities_to_check[] = $entity->getConfigDependencyName();
-      }
-    }
-    $dependencies = array_merge($this->createGraphConfigEntityDependencies($entities_to_check), $dependent_entities);
-    if (!$this->sorted_graph) {
-      // Sort dependencies in the reverse order of the graph. So the least
-      // dependent is at the top. For example, this ensures that fields are
-      // always after field storages. This is because field storages need to be
-      // created before a field.
-      $this->sorted_graph = $this->getGraph();
-      uasort($this->sorted_graph, array($this, 'sortGraph'));
-    }
-    return array_replace(array_intersect_key($this->sorted_graph, $dependencies), $dependencies);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setData(array $data) {
-    parent::setData($data);
-    $this->sorted_graph = NULL;
-    return $this;
-  }
-
-}
diff --git a/modules/contrib/features/src/FeaturesConfigInstaller.php b/modules/contrib/features/src/FeaturesConfigInstaller.php
deleted file mode 100644
index 17fa7c5..0000000
--- a/modules/contrib/features/src/FeaturesConfigInstaller.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Core\Config\ConfigInstaller;
-use Drupal\Core\Config\ConfigInstallerInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Config\TypedConfigManagerInterface;
-use Drupal\Core\Config\ConfigManagerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * Class for customizing the test for pre existing configuration.
- *
- * Decorates the ConfigInstaller with findPreExistingConfiguration() modified
- * to allow Feature modules to be installed.
- */
-class FeaturesConfigInstaller extends ConfigInstaller {
-
-  /**
-   * The configuration installer.
-   *
-   * @var \Drupal\Core\Config\ConfigInstallerInterface
-   */
-  protected $configInstaller;
-
-  /**
-   * The features manager.
-   *
-   * @var \Drupal\features\FeaturesManagerInterface
-   */
-  protected $featuresManager;
-
-  /**
-   * Constructs the configuration installer.
-   *
-   * @param \Drupal\Core\Config\ConfigInstallerInterface $config_installer
-   *    The configuration installer.
-   * @param \Drupal\features\FeaturesManagerInterface $features_manager
-   *    The features manager.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The configuration factory.
-   * @param \Drupal\Core\Config\StorageInterface $active_storage
-   *   The active configuration storage.
-   * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config
-   *   The typed configuration manager.
-   * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager
-   *   The configuration manager.
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
-   *   The event dispatcher.
-   */
-  public function __construct(ConfigInstallerInterface $config_installer, FeaturesManagerInterface $features_manager, ConfigFactoryInterface $config_factory, StorageInterface $active_storage, TypedConfigManagerInterface $typed_config, ConfigManagerInterface $config_manager, EventDispatcherInterface $event_dispatcher) {
-    $this->configInstaller = $config_installer;
-    $this->featuresManager = $features_manager;
-
-    list($major, $minor, ) = explode('.', \Drupal::VERSION);
-    if ($major == 8 && $minor > 2) {
-      // D8.3 added the %install_profile% argument.
-      $install_profile = drupal_get_profile();
-      parent::__construct($config_factory, $active_storage, $typed_config, $config_manager, $event_dispatcher, $install_profile);
-    }
-    else {
-      parent::__construct($config_factory, $active_storage, $typed_config, $config_manager, $event_dispatcher);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function findPreExistingConfiguration(StorageInterface $storage) {
-    // Override
-    // Drupal\Core\Config\ConfigInstaller::findPreExistingConfiguration().
-    // Allow config that already exists coming from Features.
-    $features_config = array_keys($this->featuresManager->listExistingConfig());
-    // Map array so we can use isset instead of in_array for faster access.
-    $features_config = array_combine($features_config, $features_config);
-    $existing_configuration = array();
-    // Gather information about all the supported collections.
-    $collection_info = $this->configManager->getConfigCollectionInfo();
-
-    foreach ($collection_info->getCollectionNames() as $collection) {
-      $config_to_create = array_keys($this->getConfigToCreate($storage, $collection));
-      $active_storage = $this->getActiveStorages($collection);
-      foreach ($config_to_create as $config_name) {
-        if ($active_storage->exists($config_name)) {
-          // Test if config is part of a Feature package.
-          if (!isset($features_config[$config_name])) {
-            $existing_configuration[$collection][] = $config_name;
-          }
-        }
-      }
-    }
-    return $existing_configuration;
-  }
-
-  /**
-   * Creates configuration in a collection based on the provided list.
-   *
-   * @param string $collection
-   *   The configuration collection.
-   * @param array $config_to_create
-   *   An array of configuration data to create, keyed by name.
-   */
-  public function createConfiguration($collection, array $config_to_create) {
-    return parent::createConfiguration($collection, $config_to_create);
-  }
-
-}
diff --git a/modules/contrib/features/src/FeaturesExtensionStorages.php b/modules/contrib/features/src/FeaturesExtensionStorages.php
deleted file mode 100644
index 67dce96..0000000
--- a/modules/contrib/features/src/FeaturesExtensionStorages.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Extension\Extension;
-
-/**
- * Wraps FeaturesInstallStorage to support multiple configuration
- * directories.
- */
-class FeaturesExtensionStorages implements FeaturesExtensionStoragesInterface {
-
-  /**
-   * The target storage.
-   *
-   * @var \Drupal\Core\Config\StorageInterface
-   */
-  protected $configStorage;
-
-  /**
-   * The extension storages.
-   *
-   * @var \Drupal\Core\Config\StorageInterface[]
-   */
-  protected $extensionStorages;
-
-  /**
-   * Configuration provided by extension storages.
-   *
-   * @var array
-   */
-  protected $configurationLists;
-
-  /**
-   * Constructs a new FeaturesExtensionStorages object.
-   *
-   * @param \Drupal\Core\Config\StorageInterface $config_storage
-   *   The configuration storage.
-   */
-  public function __construct(StorageInterface $config_storage) {
-    $this->configStorage = $config_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getExtensionStorages() {
-    return $this->extensionStorages;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addStorage($directory = InstallStorage::CONFIG_INSTALL_DIRECTORY) {
-    $this->extensionStorages[$directory] = new FeaturesInstallStorage($this->configStorage, $directory);
-    $this->reset();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function read($name) {
-    $list = $this->listAllByDirectory('');
-    if (isset($list[$name])) {
-      $directory = $list[$name];
-      return $this->extensionStorages[$directory]->read($name);
-    }
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function listAll($prefix = '') {
-    return array_keys($this->listAllByDirectory($prefix));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function listExtensionConfig(Extension $extension) {
-    $extension_config = [];
-    foreach ($this->extensionStorages as $directory => $extension_storage) {
-      $extension_config = array_merge($extension_config, array_keys($extension_storage->getComponentNames([
-        $extension->getName() => $extension,
-      ])));
-    }
-    return $extension_config;
-  }
-
-  /**
-   * Resets packages and configuration assignment.
-   */
-  protected function reset() {
-    $this->configurationLists = [];
-  }
-
-  /**
-   * Returns a list of all configuration available from extensions.
-   *
-   * @param string $prefix
-   *   (optional) The prefix to search for. If omitted, all configuration object
-   *   names that exist are returned.
-   *
-   * @return array
-   *   An array with configuration item names as keys and configuration
-   *   directories as values.
-   */
-  protected function listAllByDirectory($prefix = '') {
-    if (!isset($this->configurationLists[$prefix])) {
-      $this->configurationLists[$prefix] = [];
-      foreach ($this->extensionStorages as $directory => $extension_storage) {
-        $this->configurationLists[$prefix] += array_fill_keys($extension_storage->listAll($prefix), $directory);
-      }
-    }
-    return $this->configurationLists[$prefix];
-  }
-
-}
diff --git a/modules/contrib/features/src/FeaturesExtensionStoragesInterface.php b/modules/contrib/features/src/FeaturesExtensionStoragesInterface.php
deleted file mode 100644
index a48ebd0..0000000
--- a/modules/contrib/features/src/FeaturesExtensionStoragesInterface.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\Extension\Extension;
-
-/**
- * The FeaturesExtensionStorages provides a collection of extension storages,
- * one for each supported configuration directory.
- *
- * Typically this will include the install and optional directories defined by
- * Drupal core, but may also include any extension configuration directories
- * added by contributed modules.
- *
- * This class serves as a partial wrapper to
- * Drupal\Core\Config\StorageInterface, providing a subset of methods that can
- * be called to apply to all available extension storages. For example,
- * FeaturesExtensionStoragesInterface::read() will read an extension-provided
- * configuration item regardless of which extension storage directory it is
- * provided in.
- */
-interface FeaturesExtensionStoragesInterface {
-
-  /**
-   * Returns all registered extension storages.
-   *
-   * @return FeaturesInstallStorage[]
-   *   Array of install storages keyed by configuration directory.
-   */
-  public function getExtensionStorages();
-
-  /**
-   * Adds a storage.
-   *
-   * @param string $directory
-   *   (optional) The configuration directory. If omitted,
-   *   InstallStorage::CONFIG_INSTALL_DIRECTORY will be used.
-   */
-  public function addStorage($directory = InstallStorage::CONFIG_INSTALL_DIRECTORY);
-
-  /**
-   * Reads configuration data from the storages.
-   *
-   * @param string $name
-   *   The name of a configuration object to load.
-   *
-   * @return array|bool
-   *   The configuration data stored for the configuration object name. If no
-   *   configuration data exists for the given name, FALSE is returned.
-   */
-  public function read($name);
-
-  /**
-   * Gets configuration object names starting with a given prefix.
-   *
-   * Given the following configuration objects:
-   * - node.type.article
-   * - node.type.page
-   *
-   * Passing the prefix 'node.type.' will return an array containing the above
-   * names.
-   *
-   * @param string $prefix
-   *   (optional) The prefix to search for. If omitted, all configuration object
-   *   names that exist are returned.
-   *
-   * @return array
-   *   An array containing matching configuration object names.
-   */
-  public function listAll($prefix = '');
-
-  /**
-   * Lists names of configuration objects provided by a given extension.
-   *
-   * If a $name and/or $namespace is specified, only matching modules will be
-   * returned. Otherwise, all install are returned.
-   *
-   * @param mixed $extension
-   *   A string name of an extension or a full Extension object.
-   *
-   * @return array
-   *   An array of configuration object names.
-   */
-  public function listExtensionConfig(Extension $extension);
-
-}
diff --git a/modules/contrib/features/src/FeaturesGenerationMethodBase.php b/modules/contrib/features/src/FeaturesGenerationMethodBase.php
deleted file mode 100644
index 485fa09..0000000
--- a/modules/contrib/features/src/FeaturesGenerationMethodBase.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Component\Serialization\Yaml;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-
-/**
- * Base class for package assignment methods.
- */
-abstract class FeaturesGenerationMethodBase implements FeaturesGenerationMethodInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The features manager.
-   *
-   * @var \Drupal\features\FeaturesManagerInterface
-   */
-  protected $featuresManager;
-
-  /**
-   * The features assigner.
-   *
-   * @var \Drupal\features\FeaturesAssignerInterface
-   */
-  protected $assigner;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setFeaturesManager(FeaturesManagerInterface $features_manager) {
-    $this->featuresManager = $features_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setAssigner(FeaturesAssignerInterface $assigner) {
-    $this->assigner = $assigner;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function exportFormSubmit(array &$form, FormStateInterface $form_state) {
-
-  }
-
-  /**
-   * Merges an info file into a package's info file.
-   *
-   * @param string $package_info
-   *   The Yaml encoded package info.
-   * @param string $info_file_uri
-   *   The info file's URI.
-   */
-  protected function mergeInfoFile($package_info, $info_file_uri) {
-    $package_info = Yaml::decode($package_info);
-    /** @var \Drupal\Core\Extension\InfoParserInterface $existing_info */
-    $existing_info = \Drupal::service('info_parser')->parse($info_file_uri);
-    return Yaml::encode($this->featuresManager->mergeInfoArray($existing_info, $package_info));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function prepare(array &$packages = array(), FeaturesBundleInterface $bundle = NULL) {
-    // If no packages were specified, get all packages.
-    if (empty($packages)) {
-      $packages = $this->featuresManager->getPackages();
-    }
-
-    // If any packages exist, read in their files.
-    $existing_packages = $this->featuresManager->listPackageDirectories(array_keys($packages), $bundle);
-
-    foreach ($packages as &$package) {
-      list($full_name, $path) = $this->featuresManager->getExportInfo($package, $bundle);
-      if (empty($package->getDirectory())) {
-        $package->setDirectory($path);
-      }
-
-      // If this is the profile, its directory is already assigned.
-      if (!isset($bundle) || !$bundle->isProfilePackage($package->getMachineName())) {
-        $current_path = $package->getDirectory();
-        if (strpos($current_path, $full_name) < strlen($current_path) - strlen($full_name)) {
-          // Only append package name if it isn't already there.
-          $package->setDirectory($package->getDirectory() . '/' . $full_name);
-        }
-      }
-
-      $this->preparePackage($package, $existing_packages, $bundle);
-    }
-    // Clean up the $package pass by reference.
-    unset($package);
-  }
-
-  /**
-   * Performs any required changes on a package prior to generation.
-   *
-   * @param \Drupal\features\Package $package
-   *   The package to be prepared.
-   * @param array $existing_packages
-   *   An array of existing packages with machine names as keys and paths as
-   *   values.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   Optional bundle used for export
-   */
-  abstract protected function preparePackage(Package $package, array $existing_packages, FeaturesBundleInterface $bundle = NULL);
-
-}
diff --git a/modules/contrib/features/src/FeaturesGenerationMethodInterface.php b/modules/contrib/features/src/FeaturesGenerationMethodInterface.php
deleted file mode 100644
index b3191f2..0000000
--- a/modules/contrib/features/src/FeaturesGenerationMethodInterface.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Interface for package assignment classes.
- */
-interface FeaturesGenerationMethodInterface {
-
-  /**
-   * Injects the features manager.
-   *
-   * @param \Drupal\features\FeaturesManagerInterface $features_manager
-   *   The features manager to be used to retrieve the configuration
-   *   list and the assigned packages.
-   */
-  public function setFeaturesManager(FeaturesManagerInterface $features_manager);
-
-  /**
-   * Injects the features assigner.
-   *
-   * @param \Drupal\features\FeaturesAssignerInterface $assigner
-   *   The features assigner to be used to retrieve the bundle configuration.
-   */
-  public function setAssigner(FeaturesAssignerInterface $assigner);
-
-  /**
-   * Prepares packages for generation.
-   *
-   * @param array $packages
-   *   Array of package data.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   The optional bundle used for the generation.  Used to generate profiles.
-   *
-   * @return array
-   *   An array of packages data.
-   */
-  public function prepare(array &$packages = array(), FeaturesBundleInterface $bundle = NULL);
-
-  /**
-   * Performs package generation.
-   *
-   * @param array $packages
-   *   Array of package data.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   The optional bundle used for the generation.  Used to generate profiles.
-   *
-   * @return array
-   *   Array of results for profile and/or packages, each result including the
-   *   following keys:
-   *   - 'success': boolean TRUE or FALSE for successful writing.
-   *   - 'display': boolean TRUE if the message should be displayed to the
-   *     user, otherwise FALSE.
-   *   - 'message': a message about the result of the operation.
-   *   - 'variables': an array of substitutions to be used in the message.
-   */
-  public function generate(array $packages = array(), FeaturesBundleInterface $bundle = NULL);
-
-  /**
-   * Responds to the submission of
-   * \Drupal\features_ui\Form\FeaturesExportForm.
-   */
-  public function exportFormSubmit(array &$form, FormStateInterface $form_state);
-
-}
diff --git a/modules/contrib/features/src/FeaturesGenerationMethodManager.php b/modules/contrib/features/src/FeaturesGenerationMethodManager.php
deleted file mode 100644
index 9ede58e..0000000
--- a/modules/contrib/features/src/FeaturesGenerationMethodManager.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-
-/**
- * Manages configuration packaging methods.
- */
-class FeaturesGenerationMethodManager extends DefaultPluginManager {
-
-  /**
-   * Constructs a new FeaturesGenerationMethodManager object.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   An object that implements CacheBackendInterface.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   An object that implements ModuleHandlerInterface.
-   */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    parent::__construct('Plugin/FeaturesGeneration', $namespaces, $module_handler, 'Drupal\features\FeaturesGenerationMethodInterface');
-    $this->cacheBackend = $cache_backend;
-    $this->cacheKeyPrefix = 'features_generation_methods';
-    $this->cacheKey = 'features_generation_methods';
-    $this->alterInfo('features_generation_info');
-  }
-
-}
diff --git a/modules/contrib/features/src/FeaturesGenerator.php b/modules/contrib/features/src/FeaturesGenerator.php
deleted file mode 100644
index ce461cb..0000000
--- a/modules/contrib/features/src/FeaturesGenerator.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-
-/**
- * Class responsible for performing package generation.
- */
-class FeaturesGenerator implements FeaturesGeneratorInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The package generation method plugin manager.
-   *
-   * @var \Drupal\Component\Plugin\PluginManagerInterface
-   */
-  protected $generatorManager;
-
-  /**
-   * The features manager.
-   *
-   * @var \Drupal\features\FeaturesManagerInterface
-   */
-  protected $featuresManager;
-
-  /**
-   * The features assigner.
-   *
-   * @var \Drupal\features\FeaturesAssignerInterface
-   */
-  protected $assigner;
-
-  /**
-   * Local cache for package generation method instances.
-   *
-   * @var array
-   */
-  protected $methods;
-
-  /**
-   * Constructs a new FeaturesGenerator object.
-   *
-   * @param \Drupal\features\FeaturesManagerInterface $features_manager
-   *    The features manager.
-   * @param \Drupal\Component\Plugin\PluginManagerInterface $generator_manager
-   *   The package generation methods plugin manager.
-   */
-  public function __construct(FeaturesManagerInterface $features_manager, PluginManagerInterface $generator_manager, FeaturesAssignerInterface $assigner) {
-    $this->featuresManager = $features_manager;
-    $this->generatorManager = $generator_manager;
-    $this->assigner = $assigner;
-  }
-
-  /**
-   * Initializes the injected features manager with the generator.
-   *
-   * This should be called right after instantiating the generator to make it
-   * available to the features manager without introducing a circular
-   * dependency.
-   */
-  public function initFeaturesManager() {
-    $this->featuresManager->setGenerator($this);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function reset() {
-    $this->methods = array();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applyGenerationMethod($method_id, array $packages = array(), FeaturesBundleInterface $bundle = NULL) {
-    $method = $this->getGenerationMethodInstance($method_id);
-    $method->prepare($packages, $bundle);
-    return $method->generate($packages, $bundle);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applyExportFormSubmit($method_id, &$form, FormStateInterface $form_state) {
-    $method = $this->getGenerationMethodInstance($method_id);
-    $method->exportFormSubmit($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getGenerationMethods() {
-    return $this->generatorManager->getDefinitions();
-  }
-
-  /**
-   * Returns an instance of the specified package generation method.
-   *
-   * @param string $method_id
-   *   The string identifier of the package generation method to use to package
-   *   configuration.
-   *
-   * @return \Drupal\features\FeaturesGenerationMethodInterface
-   */
-  protected function getGenerationMethodInstance($method_id) {
-    if (!isset($this->methods[$method_id])) {
-      $instance = $this->generatorManager->createInstance($method_id, array());
-      $instance->setFeaturesManager($this->featuresManager);
-      $instance->setAssigner($this->assigner);
-      $this->methods[$method_id] = $instance;
-    }
-    return $this->methods[$method_id];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function generatePackages($method_id, FeaturesBundleInterface $bundle, array $package_names = array()) {
-    $this->featuresManager->setPackageBundleNames($bundle, $package_names);
-    return $this->generate($method_id, $bundle, $package_names);
-  }
-
-  /**
-   * Generates a file representation of configuration packages and, optionally,
-   * an install profile.
-   *
-   * @param string $method_id
-   *   The ID of the generation method to use.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   The bundle used for the generation.
-   * @param string[] $package_names
-   *   Names of packages to be generated. If none are specified, all
-   *   available packages will be added.
-   *
-   * @return array
-   *   Array of results for profile and/or packages, each result including the
-   *   following keys:
-   *   - 'success': boolean TRUE or FALSE for successful writing.
-   *   - 'display': boolean TRUE if the message should be displayed to the
-   *     user, otherwise FALSE.
-   *   - 'message': a message about the result of the operation.
-   *   - 'variables': an array of substitutions to be used in the message.
-   */
-  protected function generate($method_id, FeaturesBundleInterface $bundle, array $package_names = array()) {
-    $packages = $this->featuresManager->getPackages();
-
-    // Filter out the packages that weren't requested.
-    if (!empty($package_names)) {
-      $packages = array_intersect_key($packages, array_fill_keys($package_names, NULL));
-    }
-
-    $this->featuresManager->assignInterPackageDependencies($bundle, $packages);
-
-    // Prepare the files.
-    $this->featuresManager->prepareFiles($packages);
-
-    $return = $this->applyGenerationMethod($method_id, $packages, $bundle);
-
-    foreach ($return as $message) {
-      if ($message['display']) {
-        $type = $message['success'] ? 'status' : 'error';
-        drupal_set_message($this->t($message['message'], $message['variables']), $type);
-      }
-      $type = $message['success'] ? 'notice' : 'error';
-      \Drupal::logger('features')->{$type}($message['message'], $message['variables']);
-    }
-    return $return;
-  }
-
-}
diff --git a/modules/contrib/features/src/FeaturesGeneratorInterface.php b/modules/contrib/features/src/FeaturesGeneratorInterface.php
deleted file mode 100644
index 485e71b..0000000
--- a/modules/contrib/features/src/FeaturesGeneratorInterface.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Common interface for features generation services.
- *
- * The configuration packaging API is based on two major concepts:
- * - Packages: modules into which configuration is packaged.
- * - Package generation methods: responsible for `determining
- *   which package to assign a given piece of configuration to.
- * Generation methods are customizable.
- *
- * Features defines two package generation methods, which are simple plugin
- * classes that implement a particular logic to assign pieces of configuration
- * to a given package (module).
- *
- * Modules can define additional package generation methods by simply providing
- * the related plugins, and alter existing methods through
- * hook_features_generation_method_info_alter(). Here is an example
- * snippet:
- * @code
- * function mymodule_features_generation_method_info_alter(&$generation_info) {
- *   // Replace the original plugin with our own implementation.
- *   $method_id = \Drupal\features\Plugin\FeaturesGeneration\FeaturesGenerationArchive::METHOD_ID;
- *   $generation_info[$method_id]['class'] = 'Drupal\my_module\Plugin\FeaturesGeneration\MyFeaturesGenerationArchive';
- * }
- *
- * class MyFeaturesGenerationArchive extends FeaturesGenerationArchive {
- *   public function generate(array $packages = array(), FeaturesBundleInterface $bundle = NULL) {
- *     // Insert customization here.
- *   }
- * }
- * ?>
- * @endcode
- *
- * For more information, see
- * @link http://drupal.org/node/2404473 Developing for Features 3.x @endlink
- */
-interface FeaturesGeneratorInterface {
-
-  /**
-   * The package generation method id for the package generator itself.
-   */
-  const METHOD_ID = 'generator-default';
-
-  /**
-   * Resets the assigned packages and the method instances.
-   */
-  public function reset();
-
-  /**
-   * Apply a given package generation method.
-   *
-   * @param string $method_id
-   *   The string identifier of the package generation method to use to package
-   *   configuration.
-   * @param array $packages
-   *   Array of package data.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   The optional bundle used for the generation.  Used to generate profiles.
-   *
-   * @return array
-   *   Array of results for profile and/or packages, each result including the
-   *   following keys:
-   *   - 'success': boolean TRUE or FALSE for successful writing.
-   *   - 'display': boolean TRUE if the message should be displayed to the
-   *     user, otherwise FALSE.
-   *   - 'message': a message about the result of the operation.
-   *   - 'variables': an array of substitutions to be used in the message.
-   */
-  public function applyGenerationMethod($method_id, array $packages = array(), FeaturesBundleInterface $bundle = NULL);
-
-  /**
-   * Responds to the submission of
-   * \Drupal\features_ui\Form\FeaturesExportForm.
-   */
-  public function applyExportFormSubmit($method_id, &$form, FormStateInterface $form_state);
-
-  /**
-   * Returns the enabled package generation methods.
-   *
-   * @return array
-   *   An array of package generation method definitions keyed by method id.
-   */
-  public function getGenerationMethods();
-
-  /**
-   * Generates file representations of configuration packages.
-   *
-   * @param string $method_id
-   *   The ID of the generation method to use.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   The bundle used for the generation.
-   * @param array $package_names
-   *   Array of names of packages to be generated. If none are specified, all
-   *   available packages will be added.
-   */
-  public function generatePackages($method_id, FeaturesBundleInterface $bundle, array $package_names = array());
-
-}
diff --git a/modules/contrib/features/src/FeaturesInstallStorage.php b/modules/contrib/features/src/FeaturesInstallStorage.php
deleted file mode 100644
index 55f54bd..0000000
--- a/modules/contrib/features/src/FeaturesInstallStorage.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Core\Site\Settings;
-use Drupal\Core\Config\ExtensionInstallStorage;
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Extension\ExtensionDiscovery;
-
-/**
- * Storage to access configuration and schema in installed extensions.
- *
- * Overrides the normal ExtensionInstallStorage to prevent profile from
- * overriding.
- *
- * Also supports modules that are not installed yet.
- *
- * @see \Drupal\Core\Config\ExtensionInstallStorage
- */
-class FeaturesInstallStorage extends ExtensionInstallStorage {
-
-  /**
-   * Overrides \Drupal\Core\Config\ExtensionInstallStorage::__construct().
-   *
-   * Sets includeProfile to FALSE.
-   *
-   * @param \Drupal\Core\Config\StorageInterface $config_storage
-   *   The active configuration store where the list of installed modules and
-   *   themes is stored.
-   * @param string $directory
-   *   The directory to scan in each extension to scan for files. Defaults to
-   *   'config/install'.
-   * @param string $collection
-   *   (optional) The collection to store configuration in. Defaults to the
-   *   default collection.
-   */
-  public function __construct(StorageInterface $config_storage, $directory = self::CONFIG_INSTALL_DIRECTORY, $collection = StorageInterface::DEFAULT_COLLECTION) {
-    parent::__construct($config_storage, $directory, $collection, FALSE);
-  }
-
-  /**
-   * Returns a map of all config object names and their folders.
-   *
-   * The list is based on installed modules and themes. The active
-   * configuration storage is used rather than
-   * \Drupal\Core\Extension\ModuleHandler and
-   * \Drupal\Core\Extension\ThemeHandler in order to resolve circular
-   * dependencies between these services and
-   * \Drupal\Core\Config\ConfigInstaller and
-   * \Drupal\Core\Config\TypedConfigManager.
-   *
-   * NOTE: This code is copied from ExtensionInstallStorage::getAllFolders() with
-   * the following changes (Notes in CHANGED below)
-   *   - Load all modules whether installed or not
-   *
-   * @return array
-   *   An array mapping config object names with directories.
-   */
-  public function getAllFolders() {
-    if (!isset($this->folders)) {
-      $this->folders = array();
-      $this->folders += $this->getCoreNames();
-
-      $install_profile = Settings::get('install_profile');
-      $profile = drupal_get_profile();
-      $extensions = $this->configStorage->read('core.extension');
-      // @todo Remove this scan as part of https://www.drupal.org/node/2186491
-      $listing = new ExtensionDiscovery(\Drupal::root());
-
-      // CHANGED START: Add profile directories for any bundles that use a profile.
-      $listing->setProfileDirectoriesFromSettings();
-      $profile_directories = $listing->getProfileDirectories();
-      if ($this->includeProfile) {
-        // Add any profiles used in bundles.
-        /** @var \Drupal\features\FeaturesAssignerInterface $assigner */
-        $assigner = \Drupal::service('features_assigner');
-        $bundles = $assigner->getBundleList();
-        foreach ($bundles as $bundle_name => $bundle) {
-          if ($bundle->isProfile()) {
-            // Register the profile directory.
-            $profile_directory = 'profiles/' . $bundle->getProfileName();
-            if (is_dir($profile_directory)) {
-              $profile_directories[] = $profile_directory;
-            }
-          }
-        }
-      }
-      $listing->setProfileDirectories($profile_directories);
-      // CHANGED END
-
-      if (!empty($extensions['module'])) {
-
-        // CHANGED START: Find ANY modules, not just installed ones.
-        //$modules = $extensions['module'];
-        $module_list_scan = $listing->scan('module');
-        $modules = $module_list_scan;
-        // CHANGED END
-
-        // Remove the install profile as this is handled later.
-        unset($modules[$install_profile]);
-        $profile_list = $listing->scan('profile');
-        if ($profile && isset($profile_list[$profile])) {
-          // Prime the drupal_get_filename() static cache with the profile info
-          // file location so we can use drupal_get_path() on the active profile
-          // during the module scan.
-          // @todo Remove as part of https://www.drupal.org/node/2186491
-          drupal_get_filename('profile', $profile, $profile_list[$profile]->getPathname());
-        }
-        // CHANGED START: Put Features modules first in list returned.
-        // to allow features to override config provided by other extensions.
-        $featuresManager = \Drupal::service('features.manager');
-        $features_list = array();
-        $module_list = array();
-        foreach (array_keys($module_list_scan) as $module) {
-          if ($featuresManager->isFeatureModule($module_list_scan[$module])) {
-            $features_list[$module] = $module_list_scan[$module];
-          }
-          else {
-            $module_list[$module] = $module_list_scan[$module];
-          }
-        }
-        $this->folders += $this->getComponentNames($features_list);
-        $this->folders += $this->getComponentNames($module_list);
-        // CHANGED END
-      }
-      if (!empty($extensions['theme'])) {
-        $theme_list_scan = $listing->scan('theme');
-        foreach (array_keys($extensions['theme']) as $theme) {
-          if (isset($theme_list_scan[$theme])) {
-            $theme_list[$theme] = $theme_list_scan[$theme];
-          }
-        }
-        $this->folders += $this->getComponentNames($theme_list);
-      }
-
-      if ($this->includeProfile) {
-        // The install profile can override module default configuration. We do
-        // this by replacing the config file path from the module/theme with the
-        // install profile version if there are any duplicates.
-        if (isset($profile)) {
-          if (!isset($profile_list)) {
-            $profile_list = $listing->scan('profile');
-          }
-          if (isset($profile_list[$profile])) {
-            $profile_folders = $this->getComponentNames(array($profile_list[$profile]));
-            $this->folders = $profile_folders + $this->folders;
-          }
-        }
-      }
-    }
-
-    return $this->folders;
-  }
-
-}
diff --git a/modules/contrib/features/src/FeaturesManager.php b/modules/contrib/features/src/FeaturesManager.php
deleted file mode 100644
index 252ef58..0000000
--- a/modules/contrib/features/src/FeaturesManager.php
+++ /dev/null
@@ -1,1382 +0,0 @@
-<?php
-
-namespace Drupal\features;
-use Drupal;
-use Drupal\Component\Serialization\Yaml;
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Config\ConfigManagerInterface;
-use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Extension\Extension;
-use Drupal\Core\Extension\ExtensionDiscovery;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\config_update\ConfigRevertInterface;
-
-/**
- * The FeaturesManager provides helper functions for building packages.
- */
-class FeaturesManager implements FeaturesManagerInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The target storage.
-   *
-   * @var \Drupal\Core\Config\StorageInterface
-   */
-  protected $configStorage;
-
-  /**
-   * The extension storages.
-   *
-   * @var \Drupal\features\FeaturesExtensionStoragesInterface
-   */
-  protected $extensionStorages;
-
-  /**
-   * The configuration manager.
-   *
-   * @var \Drupal\Core\Config\ConfigManagerInterface
-   */
-  protected $configManager;
-
-  /**
-   * The configuration factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The config reverter.
-   *
-   * @var \Drupal\config_update\ConfigRevertInterface
-   */
-  protected $configReverter;
-
-  /**
-   * The Features settings.
-   *
-   * @var array
-   */
-  protected $settings;
-
-  /**
-   * The app root.
-   *
-   * @var string
-   */
-  protected $root;
-
-  /**
-   * The configuration present on the site.
-   *
-   * @var \Drupal\features\ConfigurationItem[]
-   */
-  private $configCollection;
-
-  /**
-   * The packages to be generated.
-   *
-   * @var \Drupal\features\Package[]
-   */
-  protected $packages;
-
-  /**
-   * Whether the packages have been assigned a bundle prefix.
-   *
-   * @var boolean
-   */
-  protected $packagesPrefixed;
-
-  /**
-   * The package assigner.
-   *
-   * @var \Drupal\features\FeaturesAssigner
-   */
-  protected $assigner;
-
-  /**
-   * Cache module.features.yml data keyed by module name.
-   *
-   * @var array
-   */
-  protected $featureInfoCache;
-
-  /**
-   * Constructs a FeaturesManager object.
-   *
-   * @param string $root
-   *   The app root.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The configuration factory.
-   * @param \Drupal\Core\Config\StorageInterface $config_storage
-   *   The target storage.
-   * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager
-   *   The configuration manager.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   * @param \Drupal\config_update\ConfigRevertInterface $config_reverter
-   */
-  public function __construct($root, EntityTypeManagerInterface $entity_type_manager, ConfigFactoryInterface $config_factory,
-                              StorageInterface $config_storage, ConfigManagerInterface $config_manager,
-                              ModuleHandlerInterface $module_handler, ConfigRevertInterface $config_reverter) {
-    $this->root = $root;
-    $this->entityTypeManager = $entity_type_manager;
-    $this->configStorage = $config_storage;
-    $this->configManager = $config_manager;
-    $this->moduleHandler = $module_handler;
-    $this->configFactory = $config_factory;
-    $this->configReverter = $config_reverter;
-    $this->settings = $config_factory->getEditable('features.settings');
-    $this->extensionStorages = new FeaturesExtensionStorages($this->configStorage);
-    $this->extensionStorages->addStorage(InstallStorage::CONFIG_INSTALL_DIRECTORY);
-    $this->extensionStorages->addStorage(InstallStorage::CONFIG_OPTIONAL_DIRECTORY);
-    $this->packages = [];
-    $this->packagesPrefixed = FALSE;
-    $this->configCollection = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setRoot($root) {
-    $this->root = $root;
-    // Clear cache.
-    $this->featureInfoCache = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getActiveStorage() {
-    return $this->configStorage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getExtensionStorages() {
-    return $this->extensionStorages;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFullName($type, $name) {
-    if ($type == FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG || !$type) {
-      return $name;
-    }
-
-    $definition = $this->entityTypeManager->getDefinition($type);
-    $prefix = $definition->getConfigPrefix() . '.';
-    return $prefix . $name;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfigType($fullname) {
-    $result = array(
-      'type' => '',
-      'name_short' => '',
-    );
-    $prefix = FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG . '.';
-    if (strpos($fullname, $prefix) !== FALSE) {
-      $result['type'] = FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG;
-      $result['name_short'] = substr($fullname, strlen($prefix));
-    }
-    else {
-      foreach ($this->entityTypeManager->getDefinitions() as $entity_type => $definition) {
-        if ($definition->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
-          $prefix = $definition->getConfigPrefix() . '.';
-          if (strpos($fullname, $prefix) === 0) {
-            $result['type'] = $entity_type;
-            $result['name_short'] = substr($fullname, strlen($prefix));
-          }
-        }
-      }
-    }
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function reset() {
-    $this->packages = [];
-    // Don't use getConfigCollection because reset() may be called in
-    // cases where we don't need to load config.
-    foreach ($this->configCollection as $config) {
-      $config->setPackage(NULL);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfigCollection($reset = FALSE) {
-    $this->initConfigCollection($reset);
-    return $this->configCollection;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConfigCollection(array $config_collection) {
-    $this->configCollection = $config_collection;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPackages() {
-    return $this->packages;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setPackages(array $packages) {
-    $this->packages = $packages;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPackage($machine_name) {
-    if (isset($this->packages[$machine_name])) {
-      return $this->packages[$machine_name];
-    }
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function findPackage($machine_name) {
-    $result = $this->getPackage($machine_name);
-    if (!isset($result)) {
-      // Didn't find direct match, but now go through and look for matching
-      // full name (bundle_machinename)
-      foreach ($this->packages as $name => $package) {
-        if ($package->getFullName() == $machine_name) {
-          return $this->packages[$name];
-        }
-      }
-    }
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setPackage(Package $package) {
-    if ($package->getMachineName()) {
-      $this->packages[$package->getMachineName()] = $package;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function loadPackage($module_name, $any = FALSE) {
-    $package = $this->getPackage($module_name);
-    // Load directly from module if packages are not loaded or
-    // if we want to include ANY module regardless of its a feature.
-    if ((empty($this->packages) || $any) && !isset($package)) {
-      $module_list = $this->moduleHandler->getModuleList();
-      if (!empty($module_list[$module_name])) {
-        $extension = $module_list[$module_name];
-        $package = $this->initPackageFromExtension($extension);
-        $config = $this->listExtensionConfig($extension);
-        $package->setConfigOrig($config);
-        $package->setStatus(FeaturesManagerInterface::STATUS_INSTALLED);
-      }
-    }
-    return $package;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function filterPackages(array $packages, $namespace = '', $only_exported = FALSE) {
-    $result = array();
-    /** @var \Drupal\features\Package $package */
-    foreach ($packages as $key => $package) {
-      // A package matches the namespace if:
-      // - it's prefixed with the namespace, or
-      // - it's assigned to a bundle named for the namespace, or
-      // - we're looking only for exported packages and it's not exported.
-      if (empty($namespace) || (strpos($package->getMachineName(), $namespace . '_') === 0) ||
-        ($package->getBundle() && $package->getBundle() === $namespace) ||
-        ($only_exported && $package->getStatus() === FeaturesManagerInterface::STATUS_NO_EXPORT)) {
-        $result[$key] = $package;
-      }
-    }
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAssigner() {
-    if (empty($this->assigner)) {
-      $this->setAssigner(\Drupal::service('features_assigner'));
-    }
-    return $this->assigner;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setAssigner(FeaturesAssignerInterface $assigner) {
-    $this->assigner = $assigner;
-    $this->reset();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getGenerator() {
-    return $this->generator;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setGenerator(FeaturesGeneratorInterface $generator) {
-    $this->generator = $generator;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getExportSettings() {
-    return $this->settings->get('export');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSettings() {
-    return $this->settings;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getExtensionInfo(Extension $extension) {
-    return \Drupal::service('info_parser')->parse($this->root . '/' . $extension->getPathname());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isFeatureModule(Extension $module, FeaturesBundleInterface $bundle = NULL) {
-    if ($features_info = $this->getFeaturesInfo($module)) {
-      // If no bundle was requested, it's enough that this is a feature.
-      if (is_null($bundle)) {
-        return TRUE;
-      }
-      // If the default bundle was requested, look for features where
-      // the bundle is not set.
-      elseif ($bundle->isDefault()) {
-        return !isset($features_info['bundle']);
-      }
-      // If we have a bundle name, look for it.
-      else {
-        return (isset($features_info['bundle']) && ($features_info['bundle'] == $bundle->getMachineName()));
-      }
-    }
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function listPackageDirectories(array $machine_names = array(), FeaturesBundleInterface $bundle = NULL) {
-    if (empty($machine_names)) {
-      $machine_names = array_keys($this->getPackages());
-    }
-
-    // If the bundle is a profile, then add the profile's machine name.
-    if (isset($bundle) && $bundle->isProfile() && !in_array($bundle->getProfileName(), $machine_names)) {
-      $machine_names[] = $bundle->getProfileName();
-    }
-
-    // If we are checking the default bundle, return all features.
-    if (isset($bundle) && $bundle->isDefault()) {
-      $bundle = NULL;
-    }
-
-    $modules = $this->getFeaturesModules($bundle);
-    // Filter to include only the requested packages.
-    $modules = array_filter($modules, function ($module) use ($bundle, $machine_names) {
-      return in_array($module->getName(), $machine_names);
-    });
-
-    $directories = array();
-    foreach ($modules as $module) {
-      $directories[$module->getName()] = $module->getPath();
-    }
-
-    return $directories;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAllModules() {
-    static $modules;
-
-    if (!isset($modules)) {
-      // ModuleHandler::getModuleDirectories() returns data only for installed
-      // modules. system_rebuild_module_data() includes only the site's install
-      // profile directory, while we may need to include a custom profile.
-      // @see _system_rebuild_module_data().
-      $listing = new ExtensionDiscovery($this->root);
-
-      $profile_directories = $listing->setProfileDirectoriesFromSettings()->getProfileDirectories();
-      $installed_profile = $this->drupalGetProfile();
-      if (isset($bundle) && $bundle->isProfile()) {
-        $profile_directory = 'profiles/' . $bundle->getProfileName();
-        if (($bundle->getProfileName() != $installed_profile) && is_dir($profile_directory)) {
-          $profile_directories[] = $profile_directory;
-        }
-      }
-      $listing->setProfileDirectories($profile_directories);
-
-      // Find modules.
-      $modules = $listing->scan('module');
-
-      // Find installation profiles.
-      $profiles = $listing->scan('profile');
-
-      foreach ($profiles as $key => $profile) {
-        $modules[$key] = $profile;
-      }
-    }
-
-    return $modules;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFeaturesModules(FeaturesBundleInterface $bundle = NULL, $installed = FALSE) {
-    $modules = $this->getAllModules();
-
-    // Filter by bundle.
-    $features_manager = $this;
-    $modules = array_filter($modules, function ($module) use ($features_manager, $bundle) {
-      return $features_manager->isFeatureModule($module, $bundle);
-    });
-
-    // Filtered by installed status.
-    if ($installed) {
-      $features_manager = $this;
-      $modules = array_filter($modules, function ($extension) use ($features_manager) {
-        return $features_manager->extensionEnabled($extension);
-      });
-    }
-
-    return $modules;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function extensionEnabled(Extension $extension) {
-    return $this->moduleHandler->moduleExists($extension->getName());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function initPackage($machine_name, $name = NULL, $description = '', $type = 'module', FeaturesBundleInterface $bundle = NULL, Extension $extension = NULL) {
-    if (isset($this->packages[$machine_name])) {
-      return $this->packages[$machine_name];
-    }
-    // Also look for existing package within the bundle
-    elseif (isset($bundle) && isset($this->packages[$bundle->getFullName($machine_name)])) {
-      return $this->packages[$bundle->getFullName($machine_name)];
-    }
-    return $this->packages[$machine_name] = $this->getPackageObject($machine_name, $name, $description, $type, $bundle, $extension);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function initPackageFromExtension(Extension $extension) {
-    $info = $this->getExtensionInfo($extension);
-    $features_info = $this->getFeaturesInfo($extension);
-    $bundle = $this->getAssigner()->findBundle($info, $features_info);
-    // Use the full extension name as the short_name.  Important to allow
-    // multiple modules with different namespaces such as oa_media, test_media.
-    $short_name = $extension->getName();
-    return $this->initPackage($short_name, $info['name'], !empty($info['description']) ? $info['description'] : '', $info['type'], $bundle, $extension);
-  }
-
-  /**
-   * Helper function to update dependencies array for a specific config item
-   * @param \Drupal\features\ConfigurationItem $config a config item
-   * @param array $module_list
-   * @return array $dependencies
-   */
-  protected function getConfigDependency(ConfigurationItem $config, $module_list = array()) {
-    $dependencies = [];
-    $type = $config->getType();
-    if ($type != FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG) {
-      $provider = $this->entityTypeManager->getDefinition($type)->getProvider();
-      // Ensure the provider is an installed module and not, for example, 'core'
-      if (isset($module_list[$provider])) {
-        $dependencies[] = $provider;
-      }
-
-      // For configuration in the InstallStorage::CONFIG_INSTALL_DIRECTORY
-      // directory, set any module dependencies of the configuration item
-      // as package dependencies.
-      // As its name implies, the core-provided
-      // InstallStorage::CONFIG_OPTIONAL_DIRECTORY should not create
-      // dependencies.
-      if ($config->getSubdirectory() === InstallStorage::CONFIG_INSTALL_DIRECTORY &&
-        isset($config->getData()['dependencies']['module'])
-      ) {
-        $dependencies = array_merge($dependencies, $config->getData()['dependencies']['module']);
-      }
-    }
-    return $dependencies;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assignConfigPackage($package_name, array $item_names, $force = FALSE) {
-    $config_collection = $this->getConfigCollection();
-    $module_list = $this->moduleHandler->getModuleList();
-
-    $packages =& $this->packages;
-    if (isset($packages[$package_name])) {
-      $package =& $packages[$package_name];
-    }
-    else {
-      throw new \Exception($this->t('Failed to package @package_name. Package not found.', ['@package_name' => $package_name]));
-    }
-
-    foreach ($item_names as $item_name) {
-      if (isset($config_collection[$item_name])) {
-        // Add to the package if:
-        // - force is set or
-        //   - the item hasn't already been assigned elsewhere, and
-        //   - the package hasn't been excluded.
-        // - and the item isn't already in the package.
-
-        $item = &$config_collection[$item_name];
-        $already_assigned = !empty($item->getPackage());
-        // If this is the profile package, we can reassign extension-provided configuration.
-        $package_bundle = $this->getAssigner()->getBundle($package->getBundle());
-        $is_profile_package = isset($package_bundle) ? $package_bundle->isProfilePackage($package_name) : FALSE;
-        // An item is assignable if:
-        // - it is not provider excluded or this is the profile package, and
-        // - it is not flagged as excluded.
-        $assignable = (!$item->isProviderExcluded() || $is_profile_package) && !$item->isExcluded();
-        // An item is assignable if it was provided by the current package
-        $assignable = $assignable || ($item->getProvider() == $package->getMachineName());
-        $excluded_from_package = in_array($package_name, $item->getPackageExcluded());
-        $already_in_package = in_array($item_name, $package->getConfig());
-        if (($force || (!$already_assigned && $assignable && !$excluded_from_package)) && !$already_in_package) {
-          // Add the item to the package's config array.
-          $package->appendConfig($item_name);
-          // Mark the item as already assigned.
-          $item->setPackage($package_name);
-
-          $module_dependencies = $this->getConfigDependency($item, $module_list);
-          $package->setDependencies($this->mergeUniqueItems($package->getDependencies(), $module_dependencies));
-        }
-        // Return memory
-        unset($item);
-      }
-    }
-
-    $this->setConfigCollection($config_collection);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assignConfigByPattern(array $patterns) {
-    // Regular expressions for items that are likely to generate false
-    // positives when assigned by pattern.
-    $false_positives = [
-      // Blocks with the page title should not be assigned to a 'page' package.
-      '/block\.block\..*_page_title/',
-    ];
-    $config_collection = $this->getConfigCollection();
-    // Sort by key so that specific package will claim items before general
-    // package. E.g., event_registration and registration_event will claim
-    // before event.
-    uksort($patterns, function($a, $b) {
-      // Count underscores to determine specificity of the package.
-      return (int) (substr_count($a, '_') <= substr_count($b, '_'));
-    });
-    foreach ($patterns as $pattern => $machine_name) {
-      if (isset($this->packages[$machine_name])) {
-        foreach ($config_collection as $item_name => $item) {
-          // Test for and skip false positives.
-          foreach ($false_positives as $false_positive) {
-            if (preg_match($false_positive, $item_name)) {
-              continue 2;
-            }
-          }
-
-          if (!$item->getPackage() && preg_match('/(\.|-|_|^)' . $pattern . '(\.|-|_|$)/', $item->getShortName())) {
-            try {
-              $this->assignConfigPackage($machine_name, [$item_name]);
-            }
-            catch (\Exception $exception) {
-              \Drupal::logger('features')->error($exception->getMessage());
-            }
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assignConfigDependents(array $item_names = NULL, $package = NULL) {
-    $config_collection = $this->getConfigCollection();
-    if (empty($item_names)) {
-      $item_names = array_keys($config_collection);
-    }
-    foreach ($item_names as $item_name) {
-      // Make sure the extension provided item exists in the active
-      // configuration storage.
-      if (isset($config_collection[$item_name]) && $config_collection[$item_name]->getPackage()) {
-        foreach ($config_collection[$item_name]->getDependents() as $dependent_item_name) {
-          if (isset($config_collection[$dependent_item_name]) && (!empty($package) || empty($config_collection[$dependent_item_name]->getPackage()))) {
-            try {
-              $package_name = !empty($package) ? $package : $config_collection[$item_name]->getPackage();
-              $this->assignConfigPackage($package_name, [$dependent_item_name]);
-            }
-            catch (\Exception $exception) {
-              \Drupal::logger('features')->error($exception->getMessage());
-            }
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setPackageBundleNames(FeaturesBundleInterface $bundle, array &$package_names = []) {
-    $this->packagesPrefixed = TRUE;
-    if (!$bundle->isDefault()) {
-      $new_package_names = [];
-      // Assign the selected bundle to the exports.
-      $packages = $this->getPackages();
-      if (empty($package_names)) {
-        $package_names = array_keys($packages);
-      }
-      foreach ($package_names as $package_name) {
-        // Rename package to use bundle prefix.
-        $package = $packages[$package_name];
-
-        // The install profile doesn't need renaming.
-        if ($package->getType() != 'profile') {
-          unset($packages[$package_name]);
-          $package->setMachineName($bundle->getFullName($package->getMachineName()));
-          $packages[$package->getMachineName()] = $package;
-        }
-
-        // Set the bundle machine name.
-        $packages[$package->getMachineName()]->setBundle($bundle->getMachineName());
-        $new_package_names[] = $package->getMachineName();
-      }
-      $this->setPackages($packages);
-      $package_names = $new_package_names;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackageDependencies(Package $package = NULL) {
-    if (is_null($package)) {
-      $packages = $this->getPackages();
-    }
-    else {
-      $packages = array($package);
-    }
-    $module_list = $this->moduleHandler->getModuleList();
-    $config_collection = $this->getConfigCollection();
-
-    foreach ($packages as $package) {
-      $module_dependencies = [];
-      foreach ($package->getConfig() as $item_name) {
-        if (isset($config_collection[$item_name])) {
-          $dependencies = $this->getConfigDependency($config_collection[$item_name], $module_list);
-          $module_dependencies = array_merge($module_dependencies, $dependencies);
-        }
-      }
-      $package->setDependencies($this->mergeUniqueItems($package->getDependencies(), $module_dependencies));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assignInterPackageDependencies(FeaturesBundleInterface $bundle, array &$packages) {
-    if (!$this->packagesPrefixed) {
-      throw new \Exception($this->t('The packages have not yet been prefixed with a bundle name.'));
-    }
-
-    $config_collection = $this->getConfigCollection();
-
-    /** @var \Drupal\features\Package[] $packages */
-    foreach ($packages as $package) {
-      foreach ($package->getConfig() as $item_name) {
-        if (!empty($config_collection[$item_name]->getData()['dependencies']['config'])) {
-          foreach ($config_collection[$item_name]->getData()['dependencies']['config'] as $dependency_name) {
-            if (isset($config_collection[$dependency_name])) {
-              // If the required item is assigned to one of the packages, add
-              // a dependency on that package.
-              $dependency_set = FALSE;
-              if ($dependency_package = $config_collection[$dependency_name]->getPackage()) {
-                $package_name = $bundle->getFullName($dependency_package);
-                // Package shouldn't be dependent on itself.
-                if ($package_name && array_key_exists($package_name, $packages) && $package_name != $package->getMachineName()) {
-                  $package->setDependencies($this->mergeUniqueItems($package->getDependencies(), [$package_name]));
-                  $dependency_set = TRUE;
-                }
-              }
-              // Otherwise, if the dependency is provided by an existing
-              // feature, add a dependency on that feature.
-              if (!$dependency_set && $extension_name = $config_collection[$dependency_name]->getProvider()) {
-                // No extension should depend on the install profile.
-                $package_name = $bundle->getFullName($package->getMachineName());
-                if ($extension_name != $package_name && $extension_name != $this->drupalGetProfile()) {
-                  $package->setDependencies($this->mergeUniqueItems($package->getDependencies(), [$extension_name]));
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    // Unset the $package pass by reference.
-    unset($package);
-  }
-
- /**
-  * Gets the name of the currently active installation profile.
-  *
-  * @return string|null $profile
-  *   The name of the installation profile or NULL if no installation profile is
-  *   currently active. This is the case for example during the first steps of
-  *   the installer or during unit tests.
-  */
-  protected function drupalGetProfile() {
-    return drupal_get_profile();
-  }
-
-  /**
-   * Merges a set of new item into an array and sorts the result.
-   *
-   * Only unique values are retained.
-   *
-   * @param array $items
-   *   An array of items.
-   * @param array $new_items
-   *   An array of new items to be merged in.
-   *
-   * @return array
-   *   The merged, sorted and unique items.
-   */
-  protected function mergeUniqueItems($items, $new_items) {
-    $items = array_unique(array_merge($items, $new_items));
-    sort($items);
-    return $items;
-  }
-
-  /**
-   * Initializes and returns a package or profile array.
-   *
-   * @param string $machine_name
-   *   Machine name of the package.
-   * @param string $name
-   *   (optional) Human readable name of the package.
-   * @param string $description
-   *   (optional) Description of the package.
-   * @param string $type
-   *   (optional) Type of project.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   (optional) Bundle to use to add profile directories to the scan.
-   * @param \Drupal\Core\Extension\Extension $extension
-   *   (optional) An Extension object.
-   *
-   * @return \Drupal\features\Package
-   *   An array of package properties; see
-   *   FeaturesManagerInterface::getPackages().
-   */
-  protected function getPackageObject($machine_name, $name = NULL, $description = '', $type = 'module', FeaturesBundleInterface $bundle = NULL, Extension $extension = NULL) {
-    if (!isset($bundle)) {
-      $bundle = $this->getAssigner()->getBundle();
-    }
-    $package = new Package($machine_name, [
-      'name' => isset($name) ? $name : ucwords(str_replace(['_', '-'], ' ', $machine_name)),
-      'description' => $description,
-      'type' => $type,
-      'core' => Drupal::CORE_COMPATIBILITY,
-      'dependencies' => [],
-      'themes' => [],
-      'config' => [],
-      'status' => FeaturesManagerInterface::STATUS_DEFAULT,
-      'version' => '',
-      'state' => FeaturesManagerInterface::STATE_DEFAULT,
-      'files' => [],
-      'bundle' => $bundle->isDefault() ? '' : $bundle->getMachineName(),
-      'extension' => NULL,
-      'info' => [],
-      'configOrig' => [],
-    ]);
-
-    // If no extension was passed in, look for a match.
-    if (!isset($extension)) {
-      $module_list = $this->getFeaturesModules($bundle);
-      $module_name = $package->getMachineName();
-      if (isset($module_list[$module_name])) {
-        $extension = $module_list[$module_name];
-      }
-    }
-
-    // If there is an extension, set extension-specific properties.
-    if (isset($extension)) {
-      $info = $this->getExtensionInfo($extension);
-      $features_info = $this->getFeaturesInfo($extension);
-      $package->setExtension($extension);
-      $package->setInfo($info);
-      $package->setFeaturesInfo($features_info);
-      $package->setConfigOrig($this->listExtensionConfig($extension));
-      $package->setStatus($this->extensionEnabled($extension)
-        ? FeaturesManagerInterface::STATUS_INSTALLED
-        : FeaturesManagerInterface::STATUS_UNINSTALLED);
-      $package->setVersion(isset($info['version']) ? $info['version'] : '');
-    }
-
-    return $package;
-  }
-
-  /**
-   * Generates and adds .info.yml files to a package.
-   *
-   * @param \Drupal\features\Package $package
-   *   The package.
-   */
-  protected function addInfoFile(Package $package) {
-    $info = [
-      'name' => $package->getName(),
-      'description' => $package->getDescription(),
-      'type' => $package->getType(),
-      'core' => $package->getCore(),
-      'dependencies' => $package->getDependencies(),
-      'themes' => $package->getThemes(),
-      'version' => $package->getVersion(),
-    ];
-
-    $features_info = [];
-
-    // Assign to a "package" named for the profile.
-    if ($package->getBundle()) {
-      $bundle = $this->getAssigner()->getBundle($package->getBundle());
-    }
-    // Save the current bundle in the info file so the package
-    // can be reloaded later by the AssignmentPackages plugin.
-    if (isset($bundle) && !$bundle->isDefault()) {
-      $info['package'] = $bundle->getName();
-      $features_info['bundle'] = $bundle->getMachineName();
-    }
-    else {
-      unset($features_info['bundle']);
-    }
-
-    if ($package->getConfig()) {
-      foreach (array('excluded', 'required') as $constraint) {
-        if (!empty($package->{'get' . $constraint}())) {
-          $features_info[$constraint] = $package->{'get' . $constraint}();
-        }
-        else {
-          unset($features_info[$constraint]);
-        }
-      }
-
-      if (empty($features_info)) {
-        $features_info = TRUE;
-      }
-    }
-
-    // The name and description need to be cast as strings from the
-    // TranslatableMarkup objects returned by t() to avoid raising an
-    // InvalidDataTypeException on Yaml serialization.
-    foreach (array('name', 'description') as $key) {
-      $info[$key] = (string) $info[$key];
-    }
-
-    // Add profile-specific info data.
-    if ($info['type'] == 'profile') {
-      // Set the distribution name.
-      $info['distribution'] = [
-        'name' => $info['name']
-      ];
-    }
-
-    $package->appendFile([
-      'filename' => $package->getMachineName() . '.info.yml',
-      'subdirectory' => NULL,
-      // Filter to remove any empty keys, e.g., an empty themes array.
-      'string' => Yaml::encode(array_filter($info))
-    ], 'info');
-
-    $package->appendFile([
-      'filename' => $package->getMachineName() . '.features.yml',
-      'subdirectory' => NULL,
-      'string' => Yaml::encode($features_info)
-    ], 'features');
-  }
-
-  /**
-   * Generates and adds files to a given package or profile.
-   */
-  protected function addPackageFiles(Package $package) {
-    $config_collection = $this->getConfigCollection();
-    // Always add .info.yml and .features.yml files.
-    $this->addInfoFile($package);
-    // Only add files if there is at least one piece of configuration present.
-    if ($package->getConfig()) {
-      // Add configuration files.
-      foreach ($package->getConfig() as $name) {
-        $config = $config_collection[$name];
-
-        $package->appendFile([
-          'filename' => $config->getName() . '.yml',
-          'subdirectory' => $config->getSubdirectory(),
-          'string' => Yaml::encode($config->getData())
-        ], $name);
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function mergeInfoArray(array $info1, array $info2, array $keys = array()) {
-    // If keys were specified, use only those.
-    if (!empty($keys)) {
-      $info2 = array_intersect_key($info2, array_fill_keys($keys, NULL));
-    }
-
-    $info = NestedArray::mergeDeep($info1, $info2);
-
-    // Process the dependencies and themes keys.
-    $keys = ['dependencies', 'themes'];
-    foreach ($keys as $key) {
-      if (isset($info[$key]) && is_array($info[$key])) {
-        // NestedArray::mergeDeep() may produce duplicate values.
-        $info[$key] = array_unique($info[$key]);
-        sort($info[$key]);
-      }
-    }
-    return $info;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function listConfigTypes($bundles_only = FALSE) {
-    $definitions = [];
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type => $definition) {
-      if ($definition->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
-        if (!$bundles_only || $definition->getBundleOf()) {
-          $definitions[$entity_type] = $definition;
-        }
-      }
-    }
-    $entity_types = array_map(function (EntityTypeInterface $definition) {
-      return $definition->getLabel();
-    }, $definitions);
-    // Sort the entity types by label, then add the simple config to the top.
-    uasort($entity_types, 'strnatcasecmp');
-    return $bundles_only ? $entity_types : [
-      FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG => $this->t('Simple configuration'),
-    ] + $entity_types;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function listExtensionConfig(Extension $extension) {
-    return $this->extensionStorages->listExtensionConfig($extension);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function listExistingConfig($installed = FALSE, FeaturesBundleInterface $bundle = NULL) {
-    $config = array();
-    $existing = $this->getFeaturesModules($bundle, $installed);
-    foreach ($existing as $extension) {
-      // Keys are configuration item names and values are providing extension
-      // name.
-      $new_config = array_fill_keys($this->listExtensionConfig($extension), $extension->getName());
-      $config = array_merge($config, $new_config);
-    }
-    return $config;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function listConfigByType($config_type) {
-    // For a given entity type, load all entities.
-    if ($config_type && $config_type !== FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG) {
-      $entity_storage = $this->entityTypeManager->getStorage($config_type);
-      $names = [];
-      foreach ($entity_storage->loadMultiple() as $entity) {
-        $entity_id = $entity->id();
-        $label = $entity->label() ?: $entity_id;
-        $names[$entity_id] = $label;
-      }
-    }
-    // Handle simple configuration.
-    else {
-      $definitions = [];
-      foreach ($this->entityTypeManager->getDefinitions() as $entity_type => $definition) {
-        if ($definition->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
-          $definitions[$entity_type] = $definition;
-        }
-      }
-      // Gather the config entity prefixes.
-      $config_prefixes = array_map(function (EntityTypeInterface $definition) {
-        return $definition->getConfigPrefix() . '.';
-      }, $definitions);
-
-      // Find all config, and then filter our anything matching a config prefix.
-      $names = $this->configStorage->listAll();
-      $names = array_combine($names, $names);
-      foreach ($names as $item_name) {
-        foreach ($config_prefixes as $config_prefix) {
-          if (strpos($item_name, $config_prefix) === 0) {
-            unset($names[$item_name]);
-          }
-        }
-      }
-    }
-    return $names;
-  }
-
-  /**
-   * Creates a high performant version of the ConfigDependencyManager.
-   *
-   * @return \Drupal\features\FeaturesConfigDependencyManager
-   *   A high performant version of the ConfigDependencyManager.
-   *
-   * @see \Drupal\Core\Config\Entity\ConfigDependencyManager
-   */
-  protected function getFeaturesConfigDependencyManager() {
-    $dependency_manager = new FeaturesConfigDependencyManager();
-    // Read all configuration using the factory. This ensures that multiple
-    // deletes during the same request benefit from the static cache. Using the
-    // factory also ensures configuration entity dependency discovery has no
-    // dependencies on the config entity classes. Assume data with UUID is a
-    // config entity. Only configuration entities can be depended on so we can
-    // ignore everything else.
-    $data = array_map(function(Drupal\Core\Config\ImmutableConfig $config) {
-      $data = $config->get();
-      if (isset($data['uuid'])) {
-        return $data;
-      }
-      return FALSE;
-    }, $this->configFactory->loadMultiple($this->configStorage->listAll()));
-    $dependency_manager->setData(array_filter($data));
-    return $dependency_manager;
-  }
-
-  /**
-   * Loads configuration from storage into a property.
-   */
-  protected function initConfigCollection($reset = FALSE) {
-    if ($reset || empty($this->configCollection)) {
-      $config_collection = [];
-      $config_types = $this->listConfigTypes();
-      $dependency_manager = $this->getFeaturesConfigDependencyManager();
-      // List configuration provided by installed features.
-      $existing_config = $this->listExistingConfig(NULL);
-      foreach (array_keys($config_types) as $config_type) {
-        $config = $this->listConfigByType($config_type);
-        foreach ($config as $item_name => $label) {
-          $name = $this->getFullName($config_type, $item_name);
-          $data = $this->configStorage->read($name);
-
-          $config_collection[$name] = (new ConfigurationItem($name, $data, [
-            'shortName' => $item_name,
-            'label' => $label,
-            'type' => $config_type,
-            'dependents' => array_keys($dependency_manager->getDependentEntities('config', $name)),
-            // Default to the install directory.
-            'subdirectory' => InstallStorage::CONFIG_INSTALL_DIRECTORY,
-            'package' => '',
-            'providerExcluded' => NULL,
-            'provider' => isset($existing_config[$name]) ? $existing_config[$name] : NULL,
-            'packageExcluded' => [],
-          ]));
-        }
-      }
-      $this->setConfigCollection($config_collection);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function prepareFiles(array $packages) {
-    foreach ($packages as $package) {
-      $this->addPackageFiles($package);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getExportInfo(Package $package, FeaturesBundleInterface $bundle = NULL) {
-    $full_name = isset($bundle) ? $bundle->getFullName($package->getMachineName()) : $package->getMachineName();
-
-    $path = '';
-
-    // Adjust export directory to be in profile.
-    if (isset($bundle) && $bundle->isProfile()) {
-      $path .= 'profiles/' . $bundle->getProfileName();
-    }
-
-    // If this is not the profile package, nest the directory.
-    if (!isset($bundle) || !$bundle->isProfilePackage($package->getMachineName())) {
-      $path .= empty($path) ? 'modules' : '/modules';
-      $export_settings = $this->getExportSettings();
-      if (!empty($export_settings['folder'])) {
-        $path .= '/' . $export_settings['folder'];
-      }
-    }
-
-    // Use the same path of a package to override it.
-    if ($extension = $package->getExtension()) {
-      $extension_path = $extension->getPath();
-      $path = dirname($extension_path);
-    }
-
-    return array($full_name, $path);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function detectOverrides(Package $feature, $include_new = FALSE) {
-    /** @var \Drupal\config_update\ConfigDiffInterface $config_diff */
-    $config_diff = \Drupal::service('config_update.config_diff');
-
-    $different = array();
-    foreach ($feature->getConfig() as $name) {
-      $active = $this->configStorage->read($name);
-      $extension = $this->extensionStorages->read($name);
-      $extension = !empty($extension) ? $extension : array();
-      if (($include_new || !empty($extension)) && !$config_diff->same($extension, $active)) {
-        $different[] = $name;
-      }
-    }
-
-    if (!empty($different)) {
-      $feature->setState(FeaturesManagerInterface::STATE_OVERRIDDEN);
-    }
-    return $different;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function detectNew(Package $feature) {
-    $result = array();
-    foreach ($feature->getConfig() as $name) {
-      $extension = $this->extensionStorages->read($name);
-      if (empty($extension)) {
-        $result[] = $name;
-      }
-    }
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function detectMissing(Package $feature) {
-    $config = $this->getConfigCollection();
-    $result = array();
-    foreach ($feature->getConfigOrig() as $name) {
-      if (!isset($config[$name])) {
-        $result[] = $name;
-      }
-    }
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function reorderMissing(array $missing) {
-    $list = array();
-    $result = array();
-    foreach ($missing as $full_name) {
-      $this->addConfigList($full_name, $list);
-    }
-    foreach ($list as $full_name) {
-      if (in_array($full_name, $missing)) {
-        $result[] = $full_name;
-      }
-    }
-    return $result;
-  }
-
-  protected function addConfigList($full_name, &$list) {
-    $index = array_search($full_name, $list);
-    if ($index !== FALSE) {
-      unset($list[$index]);
-    }
-    array_unshift($list, $full_name);
-    $value = $this->extensionStorages->read($full_name);
-    if (isset($value['dependencies']['config'])) {
-      foreach ($value['dependencies']['config'] as $config_name) {
-        $this->addConfigList($config_name, $list);
-      }
-    }
-  }
-
-    /**
-   * {@inheritdoc}
-   */
-  public function statusLabel($status) {
-    switch ($status) {
-      case FeaturesManagerInterface::STATUS_NO_EXPORT:
-        return $this->t('Not exported');
-
-      case FeaturesManagerInterface::STATUS_UNINSTALLED:
-        return $this->t('Uninstalled');
-
-      case FeaturesManagerInterface::STATUS_INSTALLED:
-        return $this->t('Installed');
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function stateLabel($state) {
-    switch ($state) {
-      case FeaturesManagerInterface::STATE_DEFAULT:
-        return $this->t('Default');
-
-      case FeaturesManagerInterface::STATE_OVERRIDDEN:
-        return $this->t('Changed');
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFeaturesInfo(Extension $extension) {
-    $module_name = $extension->getName();
-    if (isset($this->featureInfoCache[$module_name])) {
-      return $this->featureInfoCache[$module_name];
-    }
-    $features_info = NULL;
-    $filename = $this->root . '/' . $extension->getPath() . '/' . $module_name . '.features.yml';
-    if (file_exists($filename)) {
-      $features_info = Yaml::decode(file_get_contents($filename));
-    }
-    $this->featureInfoCache[$module_name] = $features_info;
-    return $features_info;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createConfiguration(array $config_to_create) {
-    $existing_config = $this->getConfigCollection();
-
-    // If config data is not specified, load it from the extension storage.
-    foreach ($config_to_create as $name => $item) {
-      if (empty($item)) {
-        $config = $this->configReverter->getFromExtension('', $name);
-        // For testing purposes, if it couldn't load from a module, get config
-        // from the cached Config Collection
-        if (empty($config) && isset($existing_config[$name])) {
-          $config = $existing_config[$name]->getData();
-        }
-        $config_to_create[$name] = $config;
-      }
-    }
-
-    // Determine which config is new vs existing.
-    $existing = array_intersect_key($config_to_create, $existing_config);
-    $new = array_diff_key($config_to_create, $existing);
-
-    // The FeaturesConfigInstaller exposes the normally protected createConfiguration
-    // function from Core ConfigInstaller than handles the creation of new
-    // config or the changing of existing config.
-    /** @var \Drupal\features\FeaturesConfigInstaller $config_installer */
-    $config_installer = \Drupal::service('features.config.installer');
-    $config_installer->createConfiguration(StorageInterface::DEFAULT_COLLECTION, $config_to_create);
-
-    // Collect results for new and updated config.
-    $new_config = $this->getConfigCollection(TRUE);
-    $result['updated'] = array_intersect_key($new_config, $existing);
-    $result['new'] = array_intersect_key($new_config, $new);
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function import($modules, $any = FALSE) {
-    $result = [];
-    foreach ($modules as $module_name) {
-      $package = $this->loadPackage($module_name, $any);
-      $components = isset($package) ? $package->getConfigOrig() : [];
-      if (empty($components)) {
-        continue;
-      }
-      $result[$module_name] = $this->createConfiguration(array_fill_keys($components, []));
-    }
-    return $result;
-  }
-
-}
diff --git a/modules/contrib/features/src/FeaturesManagerInterface.php b/modules/contrib/features/src/FeaturesManagerInterface.php
deleted file mode 100644
index 6416a64..0000000
--- a/modules/contrib/features/src/FeaturesManagerInterface.php
+++ /dev/null
@@ -1,647 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-use Drupal\Core\Extension\Extension;
-
-/**
- * Provides an interface for the FeaturesManager.
- */
-interface FeaturesManagerInterface {
-
-  /**
-   * Simple configuration.
-   *
-   * Core uses system.simple, but since we're using this key in configuration
-   * arrays we can't include a period.
-   *
-   * @see https://www.drupal.org/node/2297311
-   */
-  const SYSTEM_SIMPLE_CONFIG = 'system_simple';
-
-  /**
-   * Constants for package/module status.
-   */
-  const STATUS_NO_EXPORT = 0;
-  const STATUS_UNINSTALLED = 1;
-  const STATUS_INSTALLED = 2;
-  const STATUS_DEFAULT = self::STATUS_NO_EXPORT;
-
-  /**
-   * Constants for package/module state.
-   */
-  const STATE_DEFAULT = 0;
-  const STATE_OVERRIDDEN = 1;
-
-  /**
-   * Set the app.root.
-   *
-   * Should only be used by tests.
-   * @param string $root
-   */
-  public function setRoot($root);
-
-  /**
-   * Returns the active config store.
-   *
-   * @return \Drupal\Core\Config\StorageInterface
-   */
-  public function getActiveStorage();
-
-  /**
-   * Returns a set of config storages.
-   *
-   * This method is used for support of multiple extension configuration
-   * directories, including the core-provided install and optional directories.
-   *
-   * @return \Drupal\Core\Config\StorageInterface[]
-   */
-  public function getExtensionStorages();
-
-  /**
-   * Resets packages and configuration assignment.
-   */
-  public function reset();
-
-  /**
-   * Gets an array of site configuration.
-   *
-   * @param bool $reset
-   *   If TRUE, recalculate the configuration (undo all assignment methods).
-   *
-   * @return \Drupal\features\ConfigurationItem[]
-   *   An array of items, each with the following keys:
-   *   - 'name': prefixed configuration item name.
-   *   - 'name_short': configuration item name without prefix.
-   *   - 'label': human readable name of configuration item.
-   *   - 'type': type of configuration.
-   *   - 'data': the contents of the configuration item in exported format.
-   *   - 'dependents': array of names of dependent configuration items.
-   *   - 'subdirectory': feature subdirectory to export item to.
-   *   - 'package': machine name of a package the configuration is assigned to.
-   *   - 'extension_provided': whether the configuration is provided by an
-   *     extension.
-   *   - 'package_excluded': array of package names that this item should be
-   *     excluded from.
-   */
-  public function getConfigCollection($reset = FALSE);
-
-  /**
-   * Sets an array of site configuration.
-   *
-   * @param \Drupal\features\ConfigurationItem[] $config_collection
-   *   An array of items.
-   */
-  public function setConfigCollection(array $config_collection);
-
-  /**
-   * Gets an array of packages.
-   *
-   * @return \Drupal\features\Package[]
-   *   An array of items, each with the following keys:
-   *   - 'machine_name': machine name of the package such as 'example_article'.
-   *     'article'.
-   *   - 'name': human readable name of the package such as 'Example Article'.
-   *   - 'description': description of the package.
-   *   - 'type': type of Drupal project ('module').
-   *   - 'core': Drupal core compatibility ('8.x').
-   *   - 'dependencies': array of module dependencies.
-   *   - 'themes': array of names of themes to install.
-   *   - 'config': array of names of configuration items.
-   *   - 'status': status of the package. Valid values are:
-   *      - FeaturesManagerInterface::STATUS_NO_EXPORT
-   *      - FeaturesManagerInterface::STATUS_INSTALLED
-   *      - FeaturesManagerInterface::STATUS_UNINSTALLED
-   *   - 'version': version of the extension.
-   *   - 'state': state of the extension. Valid values are:
-   *      - FeaturesManagerInterface::STATE_DEFAULT
-   *      - FeaturesManagerInterface::STATE_OVERRIDDEN
-   *   - 'directory': the extension's directory.
-   *   - 'files' array of files, each having the following keys:
-   *      - 'filename': the name of the file.
-   *      - 'subdirectory': any subdirectory of the file within the extension
-   *         directory.
-   *      - 'string': the contents of the file.
-   *   - 'bundle': name of the features bundle this package belongs to.
-   *   - 'extension': \Drupal\Core\Extension\Extension object.
-   *   - 'info': the original info array from an existing package.
-   *   - 'config_info': the original config of the module.
-   *
-   * @see \Drupal\features\FeaturesManagerInterface::setPackages()
-   */
-  public function getPackages();
-
-  /**
-   * Sets an array of packages.
-   *
-   * @param \Drupal\features\Package[] $packages
-   *   An array of packages.
-   */
-  public function setPackages(array $packages);
-
-  /**
-   * Gets a specific package.
-   *
-   * @param string $machine_name
-   *   Full machine name of package.
-   *
-   * @return \Drupal\features\Package
-   *   Package data.
-   *
-   * @see \Drupal\features\FeaturesManagerInterface::getPackages()
-   */
-  public function getPackage($machine_name);
-
-  /**
-   * Gets a specific package.
-   * Similar to getPackage but will also match package FullName
-   *
-   * @param string $machine_name
-   *   Full machine name of package.
-   *
-   * @return \Drupal\features\Package
-   *   Package data.
-   *
-   * @see \Drupal\features\FeaturesManagerInterface::getPackages()
-   */
-  public function findPackage($machine_name);
-
-  /**
-   * Updates a package definition in the package list.
-   *
-   * NOTE: This does not "export" the package; it simply updates the internal
-   * data.
-   *
-   * @param \Drupal\features\Package $package
-   *   The package.
-   */
-  public function setPackage(Package $package);
-
-  /**
-   * Load a specific package.
-   *
-   * Similar to getPackage but can also load modules that are not Features.
-   *
-   * @param string $module_name
-   *   Full machine name of module.
-   * @param bool $any
-   *   If TRUE then check for any module, not just a Features module.
-   *
-   * @return \Drupal\features\Package
-   *   Package data.
-   */
-  public function loadPackage($module_name, $any = FALSE);
-
-  /**
-   * Filters the supplied package list by the given namespace.
-   *
-   * @param \Drupal\features\Package[] $packages
-   *   An array of packages.
-   * @param string $namespace
-   *   The namespace to use.
-   * @param bool $only_exported
-   *   If true, only filter out packages that are exported
-   *
-   * @return \Drupal\features\Package[]
-   *   An array of packages.
-   */
-  public function filterPackages(array $packages, $namespace = '', $only_exported = FALSE);
-
-  /**
-   * Gets a reference to a package assigner.
-   *
-   * @return \Drupal\features\FeaturesAssignerInterface
-   *   The package assigner.
-   */
-  public function getAssigner();
-
-  /**
-   * Injects the package assigner.
-   *
-   * @param \Drupal\features\FeaturesAssignerInterface $assigner
-   *   The package assigner.
-   */
-  public function setAssigner(FeaturesAssignerInterface $assigner);
-
-  /**
-   * Gets a reference to a package generator.
-   *
-   * @return \Drupal\features\FeaturesGeneratorInterface
-   *   The package generator.
-   */
-  public function getGenerator();
-
-  /**
-   * Injects the package generator.
-   *
-   * @param \Drupal\features\FeaturesGeneratorInterface $generator
-   *   The package generator.
-   */
-  public function setGenerator(FeaturesGeneratorInterface $generator);
-
-  /**
-   * Returns the current export settings.
-   *
-   * @return array
-   *   An array with the following keys:
-   *   - 'folder' - subdirectory to export packages to.
-   *   - 'namespace' - module namespace being exported.
-   */
-  public function getExportSettings();
-
-  /**
-   * Returns the current general features settings.
-   *
-   * @return \Drupal\Core\Config\Config
-   *   A config object containing settings.
-   */
-  public function getSettings();
-
-  /**
-   * Returns the contents of an extensions info.yml file.
-   *
-   * @param \Drupal\Core\Extension\Extension $extension
-   *   An Extension object.
-   *
-   * @return array
-   *   An array representing data in an info.yml file.
-   */
-  public function getExtensionInfo(Extension $extension);
-
-  /**
-   * Determine if extension is enabled
-   *
-   * @param \Drupal\Core\Extension\Extension $extension
-   * @return bool
-   */
-  public function extensionEnabled(Extension $extension);
-
-  /**
-   * Initializes a configuration package.
-   *
-   * @param string $machine_name
-   *   Machine name of the package.
-   * @param string $name
-   *   (optional) Human readable name of the package.
-   * @param string $description
-   *   (optional) Description of the package.
-   * @param string $type
-   *   (optional) Type of project.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   (optional) Bundle to use to add profile directories to the scan.
-   * @param \Drupal\Core\Extension\Extension $extension
-   *   (optional) An Extension object.
-   * @return \Drupal\features\Package
-   *   The created package array.
-   */
-  public function initPackage($machine_name, $name = NULL, $description = '', $type = 'module', FeaturesBundleInterface $bundle = NULL, Extension $extension = NULL);
-
-  /**
-   * Initializes a configuration package using module info data.
-   *
-   * @param \Drupal\Core\Extension\Extension $extension
-   *   An Extension object.
-   *
-   * @return \Drupal\features\Package
-   *   The created package array.
-   */
-  public function initPackageFromExtension(Extension $extension);
-
-  /**
-   * Lists directories in which packages are present.
-   *
-   * This method scans to find package modules whether or not they are
-   * currently active (installed). As well as the directories that are
-   * usually scanned for modules and profiles, a profile directory for the
-   * current profile is scanned if it exists. For example, if the value
-   * for $bundle->getProfileName() is 'example', a
-   * directory profiles/example will be scanned if it exists. Therefore, when
-   * regenerating package modules, existing ones from a prior export will be
-   * recognized.
-   *
-   * @param string[] $machine_names
-   *   Package machine names to return directories for. If omitted, return all
-   *   directories.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   Optional bundle to use to add profile directories to the scan.
-   *
-   * @return array
-   *   Array of package directories keyed by package machine name.
-   */
-  public function listPackageDirectories(array $machine_names = array(), FeaturesBundleInterface $bundle = NULL);
-
-  /**
-   * Assigns a set of configuration items to a given package or profile.
-   *
-   * @param string $package_name
-   *   Machine name of a package or the profile.
-   * @param string[] $item_names
-   *   Configuration item names.
-   * @param bool $force
-   *   (optional) If TRUE, assign config regardless of restrictions such as it
-   *   being already assigned to a package.
-   *
-   * @throws Exception
-   */
-  public function assignConfigPackage($package_name, array $item_names, $force = FALSE);
-
-  /**
-   * Assigns configuration items with names matching given strings to given
-   * packages.
-   *
-   * @param array $patterns
-   *   Array with string patterns as keys and package machine names as values.
-   */
-  public function assignConfigByPattern(array $patterns);
-
-  /**
-   * For given configuration items, assigns any dependent configuration to the
-   * same package.
-   *
-   * @param string[] $item_names
-   *   Configuration item names.
-   * @param string $package
-   *   Short machine name of package to assign dependent config to. If NULL,
-   *   use the current package of the parent config items.
-   */
-  public function assignConfigDependents(array $item_names = NULL, $package = NULL);
-
-  /**
-   * Adds the optional bundle prefix to package machine names.
-   *
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   The bundle used for the generation.
-   * @param string[] &$package_names
-   *   (optional) Array of package names, passed by reference.
-   */
-  public function setPackageBundleNames(FeaturesBundleInterface $bundle, array &$package_names = []);
-
-  /**
-   * Assigns dependencies from config items into the package.
-   *
-   * @param \Drupal\features\Package[] $packages
-   *   An array of packages. NULL for all packages
-   */
-  public function assignPackageDependencies(Package $package = NULL);
-
-  /**
-   * Assigns dependencies between packages based on configuration dependencies.
-   *
-   * \Drupal\features\FeaturesBundleInterface::setPackageBundleNames() must be
-   * called prior to calling this method.
-   *
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   A features bundle.
-   * @param \Drupal\features\Package[] $packages
-   *   An array of packages.
-   */
-  public function assignInterPackageDependencies(FeaturesBundleInterface $bundle, array &$packages);
-
-  /**
-   * Merges two info arrays and processes the resulting array.
-   *
-   * Ensures values are unique and sorted.
-   *
-   * @param array $info1
-   *   The first array.
-   * @param array $info2
-   *   The second array.
-   * @param string[] $keys
-   *   Keys to merge. If not specified, all keys present will be merged.
-   *
-   * @return array
-   *   An array with the merged and processed results.
-   *
-   * @fixme Should this be moved to the package object or a related helper?
-   */
-  public function mergeInfoArray(array $info1, array $info2, array $keys = array());
-
-  /**
-   * Lists the types of configuration available on the site.
-   *
-   * @param boolean $bundles_only
-   *   Whether to list only configuration types that provide bundles.
-   *
-   * @return array
-   *   An array with machine name keys and human readable values.
-   */
-  public function listConfigTypes($bundles_only = FALSE);
-
-  /**
-   * Lists stored configuration for a given configuration type.
-   *
-   * @param string $config_type
-   *   The type of configuration.
-   */
-  public function listConfigByType($config_type);
-
-  /**
-   * Returns a list of all modules present on the site's file system.
-   *
-   * @return Drupal\Core\Extension\Extension[]
-   *   An array of extension objects.
-   */
-  public function getAllModules();
-
-  /**
-   * Returns a list of Features modules regardless of if they are installed.
-   *
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   Optional bundle to filter module list.
-   *   If given, only modules matching the bundle namespace will be returned.
-   *   If the bundle uses a profile, only modules in the profile will be
-   *   returned.
-   * @param bool $installed
-   *   List only installed modules.
-   *
-   * @return Drupal\Core\Extension\Extension[]
-   *   An array of extension objects.
-   */
-  public function getFeaturesModules(FeaturesBundleInterface $bundle = NULL, $installed = FALSE);
-
-  /**
-   * Lists names of configuration objects provided by a given extension.
-   *
-   * @param \Drupal\Core\Extension\Extension $extension
-   *   An Extension object.
-   *
-   * @return array
-   *   An array of configuration object names.
-   */
-  public function listExtensionConfig(Extension $extension);
-
-  /**
-   * Lists names of configuration items provided by existing Features modules.
-   *
-   * @param bool $installed
-   *   List only installed Features.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   (optional) Bundle to find existing configuration for.
-   *
-   * @return array
-   *   An array with config names as keys and providing module names as values.
-   */
-  public function listExistingConfig($installed = FALSE, FeaturesBundleInterface $bundle = NULL);
-
-  /**
-   * Iterates through packages and prepares file names and contents.
-   *
-   * @param array $packages
-   *   An array of packages.
-   */
-  public function prepareFiles(array $packages);
-
-  /**
-   * Returns the full name of a config item.
-   *
-   * @param string $type
-   *   The config type, or '' to indicate $name is already prefixed.
-   * @param string $name
-   *   The config name, without prefix.
-   *
-   * @return string
-   *   The config item's full name.
-   */
-  public function getFullName($type, $name);
-
-  /**
-   * Returns the short name and type of a full config name.
-   *
-   * @param string $fullname
-   *   The full configuration name
-   * @return array
-   *   'type' => string the config type
-   *   'name_short' => string the short config name, without prefix.
-   */
-  public function getConfigType($fullname);
-
-  /**
-   * Returns the full machine name and directory for exporting a package.
-   *
-   * @param \Drupal\features\Package $package
-   *   The package.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   Optional bundle being used for export.
-   *
-   * @return array
-   *   An array with the full name as the first item and directory as second
-   *   item.
-   */
-  public function getExportInfo(Package $package, FeaturesBundleInterface $bundle = NULL);
-
-  /**
-   * Determines if the module is a Features package, optionally testing by
-   * bundle.
-   *
-   * @param \Drupal\Core\Extension\Extension $module
-   *   An extension object.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   (optional) Bundle to filter by.
-   *
-   * @return bool
-   *   TRUE if the given module is a Features package of the given bundle (if any).
-   */
-  public function isFeatureModule(Extension $module, FeaturesBundleInterface $bundle);
-
-  /**
-   * Determines which config is overridden in a package.
-   *
-   * @param \Drupal\features\Package $feature
-   *   The package array.
-   *   The 'state' property is updated if overrides are detected.
-   * @param bool $include_new
-   *   If set, include newly detected config not yet exported.
-   *
-   * @result array $different
-   *   The array of config items that are overridden.
-   *
-   * @see \Drupal\features\FeaturesManagerInterface::detectNew()
-   */
-  public function detectOverrides(Package $feature, $include_new = FALSE);
-
-  /**
-   * Determines which config has not been exported to the feature.
-   *
-   * Typically added as an auto-detected dependency.
-   *
-   * @param \Drupal\features\Package $feature
-   *   The package array.
-   *
-   * @return array
-   *   The array of config items that are overridden.
-   */
-  public function detectNew(Package $feature);
-
-  /**
-   * Determines which config is exported in the feature but not in the active.
-   *
-   * @param \Drupal\features\Package $feature
-   *   The package array.
-   *
-   * @return array
-   *   The array of config items that are missing from active store.
-   */
-  public function detectMissing(Package $feature);
-
-  /**
-   * Sort the Missing config into order by dependencies.
-   * @param array $missing config items
-   * @return array of config items in dependency order
-   */
-  public function reorderMissing(array $missing);
-
-  /**
-   * Helper function that returns a translatable label for the different status
-   * constants.
-   *
-   * @param int $status
-   *   A status constant.
-   *
-   * @return string
-   *   A translatable label.
-   */
-  public function statusLabel($status);
-
-  /**
-   * Helper function that returns a translatable label for the different state
-   * constants.
-   *
-   * @param int $state
-   *   A state constant.
-   *
-   * @return string
-   *   A translatable label.
-   */
-  public function stateLabel($state);
-
-  /**
-   * @param \Drupal\Core\Extension\Extension $extension
-   *
-   * @return array
-   */
-  public function getFeaturesInfo(Extension $extension);
-
-  /**
-   * Creates configuration in a collection based on the provided list.
-   *
-   * @param array $config_to_create
-   *   An array of configuration data to create, keyed by name.
-   * @return array of config imported
-   *   'new': list of new config created keyed by name.
-   *   'updated': list of updated config keyed by name.
-   */
-  public function createConfiguration(array $config_to_create);
-
-  /**
-   * @param array $modules
-   *   An array of module names to import (revert)
-   * @param bool $any
-   *   Set to TRUE to import config from non-Features modules
-   * @return array of config imported
-   *   keyed by name of module, then:
-   *     'new': list of new config created keyed by name.
-   *     'updated': list of updated config keyed by name.
-   */
-  public function import($modules, $any = FALSE);
-
-}
diff --git a/modules/contrib/features/src/Package.php b/modules/contrib/features/src/Package.php
deleted file mode 100644
index 4ceec11..0000000
--- a/modules/contrib/features/src/Package.php
+++ /dev/null
@@ -1,554 +0,0 @@
-<?php
-
-namespace Drupal\features;
-
-/**
- * Defines a value object for storing package related data.
- *
- * A package contains of a name, version number, containing config etc.
- */
-class Package {
-
-  /**
-   * @var string
-   */
-  protected $machineName = '';
-
-  /**
-   * @var string
-   */
-  protected $name = '';
-
-  /**
-   * @var string
-   */
-  protected $description = '';
-
-  /**
-   * @todo This could be fetched from the extension object.
-   *
-   * @var string
-   */
-  protected $version = '';
-
-  /**
-   * @var string
-   */
-  protected $core = '8.x';
-
-  /**
-   * @todo This could be fetched from the extension object.
-   *
-   * @var string
-   */
-  protected $type = 'module';
-
-  /**
-   * @var string[]
-   */
-  protected $themes = [];
-
-  /**
-   * @var string
-   */
-  protected $bundle;
-
-  /**
-   * @var string[]
-   */
-  protected $excluded = [];
-
-  /**
-   * @var string[]|bool
-   */
-  protected $required = false;
-
-  /**
-   * @var array
-   */
-  protected $info = [];
-
-  /**
-   * @var string[]
-   */
-  protected $dependencies = [];
-
-  /**
-   * @todo This could be fetched from the extension object.
-   *
-   * @var int
-   */
-  protected $status;
-
-  /**
-   * @var int
-   */
-  protected $state;
-
-  /**
-   * @todo This could be fetched from the extension object.
-   *
-   * @var string
-   */
-  protected $directory;
-
-  /**
-   * @var string[]
-   */
-  protected $files;
-
-  /**
-   * @var \Drupal\Core\Extension\Extension
-   */
-  protected $extension;
-
-  /**
-   * @var string[]
-   */
-  protected $config = [];
-
-  /**
-   * @var string[]
-   */
-  protected $configOrig = [];
-
-  /**
-   * Creates a new Package instance.
-   *
-   * @param string $machine_name
-   *   The machine name.
-   * @param array $additional_properties
-   *   (optional) Additional properties of the object.
-   */
-  public function __construct($machine_name, array $additional_properties = []) {
-    $this->machineName = $machine_name;
-
-    $properties = get_object_vars($this);
-    foreach ($additional_properties as $property => $value) {
-      if (!array_key_exists($property, $properties)) {
-        throw new \InvalidArgumentException('Invalid property: ' . $property);
-      }
-      $this->{$property} = $value;
-    }
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getMachineName() {
-    return $this->machineName;
-  }
-
-  /**
-   * Return TRUE if the machine_name already has the bundle prefix.
-   *
-   * @param string $machine_name
-   * @param string $bundle_name
-   * @return bool
-   */
-  protected function inBundle($machine_name, $bundle_name) {
-    return strpos($machine_name, $bundle_name . '_') === 0;
-  }
-
-  /**
-   * Return the full name of the package by prefixing it with bundle as needed
-   *
-   * NOTE: When possible, use the Bundle::getFullName method since it can
-   * better handle cases where a bundle is a profile.
-   *
-   * @return string
-   */
-  public function getFullName() {
-    if (empty($this->bundle) || $this->inBundle($this->machineName, $this->bundle)) {
-      return $this->machineName;
-    }
-    else {
-      return $this->bundle . '_' . $this->machineName;
-    }
-  }
-
-  /**
-   * @return string
-   */
-  public function getName() {
-    return $this->name;
-  }
-
-  /**
-   * @return string
-   */
-  public function getDescription() {
-    return $this->description;
-  }
-
-  /**
-   * @return string
-   */
-  public function getVersion() {
-    return $this->version;
-  }
-
-  /**
-   * @return int
-   */
-  public function getStatus() {
-    return $this->status;
-  }
-
-  /**
-   * @return string[]
-   */
-  public function getConfig() {
-    return $this->config;
-  }
-
-  /**
-   * Append a new filename.
-   *
-   * @param string $config
-   *
-   * @return $this
-   */
-  public function appendConfig($config) {
-    $this->config[] = $config;
-    $this->config = array_unique($this->config);
-    return $this;
-  }
-
-  public function removeConfig($name) {
-    $this->config = array_diff($this->config, [$name]);
-    return $this;
-  }
-
-  /**
-   * @return string
-   */
-  public function getBundle() {
-    return $this->bundle;
-  }
-
-  /**
-   * @return string[]
-   */
-  public function getExcluded() {
-    return $this->excluded;
-  }
-
-  /**
-   * @return string[]
-   */
-  public function getRequired() {
-    return $this->required;
-  }
-
-  /**
-   * @return bool
-   */
-  public function getRequiredAll() {
-    $config_orig = $this->getConfigOrig();
-    $info = is_array($this->required) ? $this->required : array();
-    $diff = array_diff($config_orig, $info);
-    // Mark all as required if required:true, or required is empty, or
-    // if required contains all the exported config
-    return empty($diff) || empty($info);
-  }
-
-  /**
-   * @return string[]
-   */
-  public function getConfigOrig() {
-    return $this->configOrig;
-  }
-
-  /**
-   * @return string
-   */
-  public function getCore() {
-    return $this->core;
-  }
-
-  /**
-   * @return string
-   */
-  public function getType() {
-    return $this->type;
-  }
-
-  /**
-   * @return \string[]
-   */
-  public function getThemes() {
-    return $this->themes;
-  }
-
-  /**
-   * @return array
-   */
-  public function getInfo() {
-    return $this->info;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getState() {
-    return $this->state;
-  }
-
-  /**
-   * @return string
-   */
-  public function getDirectory() {
-    return $this->directory;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getFiles() {
-    return $this->files;
-  }
-
-  /**
-   * @return \Drupal\Core\Extension\Extension
-   */
-  public function getExtension() {
-    return $this->extension;
-  }
-
-  public function getDependencies() {
-    return $this->dependencies;
-  }
-
-  public function removeDependency($name) {
-    $this->dependencies = array_diff($this->dependencies, [$name]);
-    return $this;
-  }
-
-  public function getDependencyInfo() {
-    return isset($this->info['dependencies']) ? $this->info['dependencies'] : [];
-  }
-
-  /**
-   * Returns the features info.
-   *
-   * @return array
-   */
-  public function getFeaturesInfo() {
-    $info = [];
-    if (!empty($this->bundle)) {
-      $info['bundle'] = $this->bundle;
-    }
-    if (!empty($this->excluded)) {
-      $info['excluded'] = $this->excluded;
-    }
-    if ($this->required !== FALSE) {
-      $info['required'] = $this->required;
-    }
-    return $info;
-  }
-
-  /**
-   * Sets a new machine name.
-   *
-   * @param string $machine_name
-   *   The machine name
-   *
-   * @return $this
-   */
-  public function setMachineName($machine_name) {
-    $this->machineName = $machine_name;
-    return $this;
-  }
-
-  /**
-   * @param string $name
-   *
-   * @return $this
-   */
-  public function setName($name) {
-    $this->name = $name;
-    return $this;
-  }
-
-  /**
-   * @param string $description
-   *
-   * @return $this
-   */
-  public function setDescription($description) {
-    $this->description = $description;
-    return $this;
-  }
-
-  /**
-   * @param string $version
-   *
-   * @return $this
-   */
-  public function setVersion($version) {
-    $this->version = $version;
-    return $this;
-  }
-
-  /**
-   * @param string $bundle
-   *
-   * @return $this
-   */
-  public function setBundle($bundle) {
-    $this->bundle = $bundle;
-    return $this;
-  }
-
-  /**
-   * @param array $info
-   *
-   * @return $this
-   */
-  public function setInfo($info) {
-    $this->info = $info;
-    return $this;
-  }
-
-  /**
-   * @param \string[] $features_info
-   *
-   * @return $this
-   */
-  public function setFeaturesInfo($features_info) {
-    if (isset($features_info['bundle'])) {
-      $this->setBundle($features_info['bundle']);
-    }
-    $this->setRequired(isset($features_info['required']) ? $features_info['required'] : false);
-    $this->setExcluded(isset($features_info['excluded']) ? $features_info['excluded'] : array());
-
-    return $this;
-  }
-
-  /**
-   * @param \string[] $dependencies
-   *
-   * @return $this
-   */
-  public function setDependencies($dependencies) {
-    $this->dependencies = $dependencies;
-    return $this;
-  }
-
-  /**
-   * @param string $dependency
-   *
-   * return $this
-   */
-  public function appendDependency($dependency) {
-    $this->dependencies[] = $dependency;
-    return $this;
-  }
-
-  /**
-   * @param int $status
-   *
-   * @return $this
-   */
-  public function setStatus($status) {
-    $this->status = $status;
-    return $this;
-  }
-
-  /**
-   * @param \string[] $config
-   *
-   * @return $this
-   */
-  public function setConfig($config) {
-    $this->config = $config;
-    return $this;
-  }
-
-  /**
-   * @param bool $excluded
-   */
-  public function setExcluded($excluded) {
-    $this->excluded = $excluded;
-  }
-
-  /**
-   * @param bool $required
-   */
-  public function setRequired($required) {
-    $this->required = $required;
-  }
-
-  /**
-   * @param string $core
-   */
-  public function setCore($core) {
-    $this->core = $core;
-  }
-
-  /**
-   * @param string $type
-   */
-  public function setType($type) {
-    $this->type = $type;
-  }
-
-  /**
-   * @param \string[] $themes
-   */
-  public function setThemes($themes) {
-    $this->themes = $themes;
-  }
-
-  /**
-   * @param int $state
-   */
-  public function setState($state) {
-    $this->state = $state;
-  }
-
-  /**
-   * @param string $directory
-   */
-  public function setDirectory($directory) {
-    $this->directory = $directory;
-  }
-
-  /**
-   * @param \string[] $files
-   */
-  public function setFiles($files) {
-    $this->files = $files;
-  }
-
-  /**
-   * @param array $file_array
-   *
-   * @return $this
-   */
-  public function appendFile(array $file_array, $key = NULL) {
-    if (!isset($key)) {
-      $this->files[] = $file_array;
-    }
-    else {
-      $this->files[$key] = $file_array;
-    }
-    return $this;
-  }
-
-  /**
-   * @param \Drupal\Core\Extension\Extension $extension
-   */
-  public function setExtension($extension) {
-    $this->extension = $extension;
-  }
-
-  /**
-   * @param \string[] $configOrig
-   */
-  public function setConfigOrig($configOrig) {
-    $this->configOrig = $configOrig;
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentAlter.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentAlter.php
deleted file mode 100644
index 91cbf12..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentAlter.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\features\FeaturesAssignmentMethodBase;
-use Drupal\features\FeaturesManagerInterface;
-
-/**
- * Class for excluding configuration from packages.
- *
- * @Plugin(
- *   id = "alter",
- *   weight = 0,
- *   name = @Translation("Alter"),
- *   description = @Translation("Alter configuration items before they are exported. Altering includes options such as removing permissions from roles."),
- *   config_route_name = "features.assignment_alter",
- *   default_settings = {
- *     "core" = TRUE,
- *     "uuid" = TRUE,
- *     "user_permissions" = TRUE,
- *   }
- * )
- */
-class FeaturesAssignmentAlter extends FeaturesAssignmentMethodBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $current_bundle = $this->assigner->getBundle();
-    $settings = $current_bundle->getAssignmentSettings($this->getPluginId());
-
-    // Alter configuration items.
-    if ($settings['core'] || $settings['uuid'] || $settings['user_permissions']) {
-      $config_collection = $this->featuresManager->getConfigCollection();
-      foreach ($config_collection as &$config) {
-        $data = $config->getData();
-        if ($settings['core']) {
-          unset($data['_core']);
-        }
-        // Unset UUID for configuration entities.
-        if ($settings['uuid'] && $config->getType() !== FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG) {
-          unset($data['uuid']);
-        }
-        // Unset permissions for user roles. Doing so facilitates packaging
-        // roles that may have permissions that relate to multiple packages.
-        if ($settings['user_permissions'] && $config->getType() == 'user_role') {
-          // Unset and not empty permissions data to prevent loss of configured
-          // role permissions in the event of a feature revert.
-          unset($data['permissions']);
-        }
-        $config->setData($data);
-      }
-      // Clean up the $config pass by reference.
-      unset($config);
-
-      // Register the updated data.
-      $this->featuresManager->setConfigCollection($config_collection);
-    }
-
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentBaseType.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentBaseType.php
deleted file mode 100644
index 40fcbca..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentBaseType.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\component\Utility\Unicode;
-use Drupal\features\FeaturesAssignmentMethodBase;
-
-/**
- * Class for assigning configuration to packages based on entity types.
- *
- * @Plugin(
- *   id = "base",
- *   weight = -2,
- *   name = @Translation("Base type"),
- *   description = @Translation("Use designated types of configuration as the base for configuration package modules. For example, if content types are selected as a base type, a package will be generated for each content type and will include all configuration dependent on that content type."),
- *   config_route_name = "features.assignment_base",
- *   default_settings = {
- *     "types" = {
- *       "config" = {},
- *       "content" = {}
- *     }
- *   }
- * )
- */
-class FeaturesAssignmentBaseType extends FeaturesAssignmentMethodBase {
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $current_bundle = $this->assigner->getBundle();
-    $settings = $current_bundle->getAssignmentSettings($this->getPluginId());
-    $config_base_types = $settings['types']['config'];
-
-    $config_types = $this->featuresManager->listConfigTypes();
-    $config_collection = $this->featuresManager->getConfigCollection();
-
-    foreach ($config_collection as $item_name => $item) {
-      if (in_array($item->getType(), $config_base_types)) {
-        if (is_null($this->featuresManager->findPackage($item->getShortName())) && !$item->getPackage()) {
-          $description = $this->t('Provides @label @type and related configuration.', array('@label' => $item->getLabel(), '@type' => Unicode::strtolower($config_types[$item->getType()])));
-          if (isset($item->getData()['description'])) {
-            $description .= ' ' . $item->getData()['description'];
-          }
-          $this->featuresManager->initPackage($item->getShortName(), $item->getLabel(), $description, 'module', $current_bundle);
-          // Update list with the package we just added.
-          try {
-            $this->featuresManager->assignConfigPackage($item->getShortName(), [$item_name]);
-          }
-          catch (\Exception $exception) {
-            \Drupal::logger('features')->error($exception->getMessage());
-          }
-        }
-      }
-    }
-
-    $entity_types = $this->entityTypeManager->getDefinitions();
-
-    $content_base_types = $settings['types']['content'];
-    foreach ($content_base_types as $entity_type_id) {
-      if (!isset($packages[$entity_type_id]) && isset($entity_types[$entity_type_id])) {
-        $label = $entity_types[$entity_type_id]->getLabel();
-        $description = $this->t('Provide @label related configuration.', array('@label' => $label));
-        $this->featuresManager->initPackage($entity_type_id, $label, $description, 'module', $current_bundle);
-      }
-    }
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentCoreType.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentCoreType.php
deleted file mode 100644
index d221b31..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentCoreType.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\features\FeaturesAssignmentMethodBase;
-
-/**
- * Class for assigning configuration to a core package based on entity types.
- *
- * @Plugin(
- *   id = "core",
- *   weight = 5,
- *   name = @Translation("Core type"),
- *   description = @Translation("Assign designated types of configuration to a core configuration package module. For example, if image styles are selected as a core type, a core package will be generated and image styles will be assigned to it."),
- *   config_route_name = "features.assignment_core",
- *   default_settings = {
- *     "types" = {
- *       "config" = {},
- *     }
- *   }
- * )
- */
-class FeaturesAssignmentCoreType extends FeaturesAssignmentMethodBase {
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $current_bundle = $this->assigner->getBundle();
-    $machine_name = 'core';
-    $name = $this->t('Core');
-    $description = $this->t('Provides core components required by other features.');
-    $package = $this->featuresManager->initPackage($machine_name, $name, $description, 'module', $current_bundle);
-    $this->assignPackageByConfigTypes($package->getMachineName(), $force);
-  }
-
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentDependency.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentDependency.php
deleted file mode 100644
index e8b596e..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentDependency.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\features\FeaturesAssignmentMethodBase;
-
-/**
- * Class for assigning configuration to packages based on configuration
- * dependencies.
- *
- * @Plugin(
- *   id = "dependency",
- *   weight = 15,
- *   name = @Translation("Dependency"),
- *   description = @Translation("Add to packages configuration dependent on items already in that package."),
- * )
- */
-class FeaturesAssignmentDependency extends FeaturesAssignmentMethodBase {
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $this->featuresManager->assignConfigDependents();
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentExclude.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentExclude.php
deleted file mode 100644
index 75fecb9..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentExclude.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\features\FeaturesAssignmentMethodBase;
-
-/**
- * Class for excluding configuration from packages.
- *
- * @Plugin(
- *   id = "exclude",
- *   weight = -5,
- *   name = @Translation("Exclude"),
- *   description = @Translation("Exclude configuration items from packaging by various methods including by configuration type. When configuration is excluded, it won't be automatically reassigned to other packages."),
- *   config_route_name = "features.assignment_exclude",
- *   default_settings = {
- *     "curated" = FALSE,
- *     "module" = {
- *       "installed" = FALSE,
- *       "profile" = FALSE,
- *       "namespace" = FALSE,
- *       "namespace_any" = FALSE,
- *     },
- *     "types" = { "config" = {} }
- *   }
- * )
- */
-class FeaturesAssignmentExclude extends FeaturesAssignmentMethodBase {
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $current_bundle = $this->assigner->getBundle();
-    $settings = $current_bundle->getAssignmentSettings($this->getPluginId());
-
-    $config_collection = $this->featuresManager->getConfigCollection();
-
-    // Exclude by configuration type.
-    $exclude_types = $settings['types']['config'];
-    if (!empty($exclude_types)) {
-      foreach ($config_collection as $item_name => $item) {
-        // Don't exclude already-assigned items.
-        if (empty($item->getPackage()) && in_array($item->getType(), $exclude_types)) {
-          $item->setExcluded(TRUE);
-        }
-      }
-    }
-
-    // Exclude configuration already provided by modules.
-    $exclude_module = $settings['module'];
-    if (!empty($exclude_module['installed'])) {
-      $install_list = $this->featuresManager->getExtensionStorages()->listAll();
-
-      // There are two settings that can limit what's included.
-      // First, we can skip configuration provided by the install profile.
-      $module_profile = !empty($exclude_module['profile']);
-      // Second, we can skip configuration provided by namespaced modules.
-      $module_namespace = !empty($exclude_module['namespace']);
-      if ($module_profile || $module_namespace) {
-        $profile_list = [];
-        $extension_list = [];
-        // Load the names of any configuration objects provided by the install
-        // profile.
-        if ($module_profile) {
-          $all_modules = $this->featuresManager->getAllModules();
-          // FeaturesBundleInterface::getProfileName() would return the profile
-          // for the current bundle, if any. We want the profile that was
-          // installed.
-          $profile_name = drupal_get_profile();
-          if (isset($all_modules[$profile_name])) {
-            $profile_list = $this->featuresManager->listExtensionConfig($all_modules[$profile_name]);
-            // If the configuration has been assigned to a feature that's
-            // present on the file system, don't make an exception for it.
-            foreach ($all_modules as $name => $extension) {
-              if ($name != $profile_name && $this->featuresManager->isFeatureModule($extension)) {
-                $profile_list = array_diff($profile_list, $this->featuresManager->listExtensionConfig($extension));
-              }
-            }
-          }
-        }
-        // Load the names of any configuration objects provided by modules
-        // having the namespace of the current package set.
-        if ($module_namespace) {
-          $modules = $this->featuresManager->getFeaturesModules($current_bundle);
-          foreach ($modules as $extension) {
-            // Only make exception for uninstalled modules or
-            // if namespace_any is set
-            if (!empty($exclude_module['namespace_any']) || !$this->featuresManager->extensionEnabled($extension)) {
-              $extension_list = array_merge($extension_list, $this->featuresManager->listExtensionConfig($extension));
-            }
-          }
-        }
-        // If any configuration was found, remove it from the list.
-        $install_list = array_diff($install_list, $profile_list, $extension_list);
-      }
-      foreach ($install_list as $item_name) {
-        if (isset($config_collection[$item_name])) {
-          // Flag extension-provided configuration, which should not be added
-          // to regular features but can be added to an install profile.
-          $config_collection[$item_name]->setProviderExcluded(TRUE);
-        }
-      }
-    }
-
-    // Exclude configuration items on a curated list of site-specific
-    // configuration.
-    if ($settings['curated']) {
-      $item_names = [
-        'core.extension',
-        'field.settings',
-        'field_ui.settings',
-        'filter.settings',
-        'forum.settings',
-        'image.settings',
-        'node.settings',
-        'system.authorize',
-        'system.date',
-        'system.file',
-        'system.diff',
-        'system.logging',
-        'system.maintenance',
-        'system.performance',
-        'system.site',
-        'update.settings',
-      ];
-      foreach ($item_names as $item_name) {
-        unset($config_collection[$item_name]);
-      }
-      // Unset role-related actions that are automatically created by the
-      // User module.
-      // @see user_user_role_insert()
-      $prefixes = [
-        'system.action.user_add_role_action.',
-        'system.action.user_remove_role_action.',
-      ];
-      foreach (array_keys($config_collection) as $item_name) {
-        foreach ($prefixes as $prefix) {
-          if (strpos($item_name, $prefix) === 0) {
-            unset($config_collection[$item_name]);
-          }
-        }
-      }
-    }
-
-    // Register the updated data.
-    $this->featuresManager->setConfigCollection($config_collection);
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentExisting.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentExisting.php
deleted file mode 100644
index 6d78628..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentExisting.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\features\FeaturesAssignmentMethodBase;
-use Drupal\features\FeaturesManagerInterface;
-
-/**
- * Class for assigning existing modules to packages.
- *
- * @Plugin(
- *   id = "existing",
- *   weight = 12,
- *   name = @Translation("Existing"),
- *   description = @Translation("Add exported config to existing packages."),
- * )
- */
-class FeaturesAssignmentExisting extends FeaturesAssignmentMethodBase {
-  /**
-   * Calls assignConfigPackage without allowing exceptions to abort us.
-   *
-   * @param string $machine_name
-   *   Machine name of package.
-   * @param \Drupal\Core\Extension\Extension $extension
-   *   An Extension object.
-   */
-  protected function safeAssignConfig($machine_name, $extension) {
-    $config = $this->featuresManager->listExtensionConfig($extension);
-    try {
-      $this->featuresManager->assignConfigPackage($machine_name, $config);
-    }
-    catch (\Exception $exception) {
-      \Drupal::logger('features')->error($exception->getMessage());
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $packages = $this->featuresManager->getPackages();
-
-    // Assign config to installed modules first.
-    foreach ($packages as $name => $package) {
-      // @todo Introduce $package->isInstalled() and / or $package->isUninstalled().
-      if ($package->getStatus() === FeaturesManagerInterface::STATUS_INSTALLED) {
-        $this->safeAssignConfig($package->getMachineName(), $package->getExtension());
-      }
-    }
-    // Now assign to uninstalled modules.
-    foreach ($packages as $name => $package) {
-      if ($package->getStatus() === FeaturesManagerInterface::STATUS_UNINSTALLED) {
-        $this->safeAssignConfig($package->getMachineName(), $package->getExtension());
-      }
-    }
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentForwardDependency.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentForwardDependency.php
deleted file mode 100644
index c0c5801..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentForwardDependency.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\Component\Graph\Graph;
-use Drupal\features\FeaturesAssignmentMethodBase;
-
-/**
- * Class for assigning configuration to packages based on forward dependencies.
- *
- * @Plugin(
- *   id = "forward_dependency",
- *   weight = 20,
- *   name = @Translation("Forward dependency"),
- *   description = @Translation("Add to packages configuration on which items in the package depend."),
- * )
- */
-class FeaturesAssignmentForwardDependency extends FeaturesAssignmentMethodBase {
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $config_collection = $this->featuresManager->getConfigCollection();
-    $ordered = $this->dependencyOrder($config_collection);
-
-    foreach ($ordered as $name) {
-      $item = $config_collection[$name];
-      if ($item->getPackage()) {
-        // Already has a package, not our business.
-        continue;
-      }
-
-      // Find packages of dependent items.
-      $dependent_packages = [];
-      foreach ($item->getDependents() as $dependent) {
-        if (isset($config_collection[$dependent])) {
-          if ($package = $config_collection[$dependent]->getPackage()) {
-            $dependent_packages[$package] = $package;
-          }
-        }
-      }
-
-      // If zero or multiple packages, we don't know what to do.
-      if (count($dependent_packages) == 1) {
-        $package = key($dependent_packages);
-        $this->featuresManager->assignConfigPackage($package, [$name]);
-      }
-    }
-  }
-
-  /**
-   * Get config items such that each item comes before anything it depends on.
-   *
-   * @param \Drupal\features\ConfigurationItem[] $config_collection
-   *   A collection of configuration items.
-   *
-   * @return string[]
-   *   The names of configuration items, in dependency order.
-   */
-  protected function dependencyOrder($config_collection) {
-    // Populate a graph.
-    $graph = [];
-    foreach ($config_collection as $config) {
-      $graph[$config->getName()] = [];
-      foreach ($config->getDependents() as $dependent) {
-        $graph[$config->getName()]['edges'][$dependent] = 1;
-      }
-    }
-    $graph_object = new Graph($graph);
-    $graph = $graph_object->searchAndSort();
-
-    // Order by inverse weight.
-    $weights = array_column($graph, 'weight');
-    array_multisort($weights, SORT_DESC, $graph);
-    return array_keys($graph);
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentNamespace.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentNamespace.php
deleted file mode 100644
index bc2b6d0..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentNamespace.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\features\FeaturesAssignmentMethodBase;
-
-/**
- * Class for assigning configuration to packages based on namespaces.
- *
- * @Plugin(
- *   id = "namespace",
- *   weight = 0,
- *   name = @Translation("Namespace"),
- *   description = @Translation("Add config to packages that contain that package's machine name."),
- * )
- */
-class FeaturesAssignmentNamespace extends FeaturesAssignmentMethodBase {
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $packages = $this->featuresManager->getPackages();
-    $current_bundle = $this->assigner->getBundle();
-
-    // Build an array of patterns.
-    // Keys are short names while values are full machine names.
-    // We need full names because existing packages may receive machine names
-    // prefixed with a bundle name.
-    $patterns = [];
-    foreach ($packages as $package) {
-      $machine_name = $package->getMachineName();
-      $pattern = $current_bundle->getShortName($machine_name);
-      $patterns[$pattern] = $machine_name;
-    }
-    $this->featuresManager->assignConfigByPattern($patterns);
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentOptionalType.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentOptionalType.php
deleted file mode 100644
index d768357..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentOptionalType.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\Core\Config\InstallStorage;
-use Drupal\features\FeaturesAssignmentMethodBase;
-
-/**
- * Class for assigning configuration to the
- * InstallStorage::CONFIG_OPTIONAL_DIRECTORY based on entity types.
- *
- * @Plugin(
- *   id = "optional",
- *   weight = 0,
- *   name = @Translation("Optional type"),
- *   description = @Translation("Assign designated types of configuration to the 'config/optional' install directory. For example, if views are selected as optional, views assigned to any feature will be exported to the 'config/optional' directory and will not create a dependency on the Views module."),
- *   config_route_name = "features.assignment_optional",
- *   default_settings = {
- *     "types" = {
- *       "config" = {},
- *     }
- *   }
- * )
- */
-class FeaturesAssignmentOptionalType extends FeaturesAssignmentMethodBase {
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $this->assignSubdirectoryByConfigTypes(InstallStorage::CONFIG_OPTIONAL_DIRECTORY);
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentPackages.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentPackages.php
deleted file mode 100644
index f5de0d6..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentPackages.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\features\FeaturesAssignmentMethodBase;
-
-/**
- * Class for assigning existing modules to packages.
- *
- * @Plugin(
- *   id = "packages",
- *   weight = -20,
- *   name = @Translation("Packages"),
- *   description = @Translation("Detect and add existing package modules."),
- * )
- */
-class FeaturesAssignmentPackages extends FeaturesAssignmentMethodBase {
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $bundle = $this->assigner->getBundle();
-    $existing = $this->featuresManager->getFeaturesModules();
-    foreach ($existing as $extension) {
-      $package = $this->featuresManager->initPackageFromExtension($extension);
-      $short_name = $package->getMachineName();
-
-      // Copy over package excluded settings, if any.
-      if (!$package->getExcluded()) {
-        $config_collection = $this->featuresManager->getConfigCollection();
-        foreach ($package->getExcluded() as $config_name) {
-          if (isset($config_collection[$config_name])) {
-            $package_excluded = $config_collection[$config_name]->getPackageExcluded();
-            $package_excluded[] = $short_name;
-            $config_collection[$config_name]->setPackageExcluded($package_excluded);
-          }
-        }
-        $this->featuresManager->setConfigCollection($config_collection);
-      }
-
-      // Assign required components, if any.
-      if ($package->getRequired() !== FALSE) {
-        $config = $package->getRequired();
-        if (empty($config) || !is_array($config)) {
-          // if required is "true" or empty, add all config as required
-          $config = $this->featuresManager->listExtensionConfig($extension);
-        }
-        $this->featuresManager->assignConfigPackage($short_name, $config);
-      }
-    }
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentProfile.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentProfile.php
deleted file mode 100644
index 0783d4d..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentProfile.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\features\FeaturesAssignmentMethodBase;
-use Drupal\Core\Config\InstallStorage;
-
-/**
- * Class for adding configuration for the optional install profile.
- *
- * @Plugin(
- *   id = "profile",
- *   weight = 10,
- *   name = @Translation("Profile"),
- *   description = @Translation("Add configuration and other files to the optional install profile from the Drupal core Standard install profile. Without these additions, a generated install profile will be missing some important initial setup."),
- *   config_route_name = "features.assignment_profile",
- *   default_settings = {
- *     "curated" = FALSE,
- *     "standard" = {
- *       "files" = FALSE,
- *       "dependencies" = FALSE,
- *     },
- *     "types" = { "config" = {} }
- *   }
- * )
- */
-class FeaturesAssignmentProfile extends FeaturesAssignmentMethodBase {
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $current_bundle = $this->assigner->getBundle();
-
-    if ($current_bundle->isProfile()) {
-      $settings = $current_bundle->getAssignmentSettings($this->getPluginId());
-
-      // Ensure the profile package exists.
-      $profile_name = $current_bundle->getProfileName();
-
-      $profile_package = $this->featuresManager->getPackage($profile_name);
-      if (empty($profile_package)) {
-        $profile_package = $this->featuresManager->initPackage($profile_name, $current_bundle->getName(), $current_bundle->getDescription(), 'profile', $current_bundle);
-      }
-
-      // Assign configuration by type.
-      $this->assignPackageByConfigTypes($profile_name, $force);
-
-      // Include a curated list of configuration.
-      if ($settings['curated']) {
-        $config_collection = $this->featuresManager->getConfigCollection();
-        $item_names = [
-          'automated_cron.settings',
-          'system.cron',
-          'system.theme',
-        ];
-        $theme_settings = $this->configFactory->get('system.theme');
-        foreach (['default', 'admin'] as $key) {
-          $item_names[] = $theme_settings->get($key) . '.settings';
-        }
-        foreach ($item_names as $item_name) {
-          if (isset($config_collection[$item_name])) {
-            try {
-              $this->featuresManager->assignConfigPackage($profile_name, [$item_name]);
-            }
-            catch (\Exception $exception) {
-              \Drupal::logger('features')->error($exception->getMessage());
-            }
-          }
-        }
-      }
-
-      // Only read in from the Standard profile if this profile doesn't already
-      // exist.
-      $package_directories = $this->featuresManager->listPackageDirectories(array(), $current_bundle);
-      if (!isset($package_directories[$profile_name])) {
-        $standard_directory = 'core/profiles/standard';
-        // Conditionally add files from the 'standard' install profile.
-        if ($settings['standard']['files']) {
-          // Add configuration from the Standard profile.
-          $config_collection = $this->featuresManager->getConfigCollection();
-          $subdirectory = InstallStorage::CONFIG_INSTALL_DIRECTORY;
-          $item_names = $this->listRequiredStandardConfig();
-          foreach ($item_names as $item_name) {
-            // If the configuration is present on the site, assign it.
-            if (isset($config_collection[$item_name])) {
-              // Only assign it if it's not already assigned to a package.
-              // @todo: if it's provided by a module, add a dependency.
-              if (!$config_collection[$item_name]->getPackage()) {
-                $this->featuresManager->assignConfigPackage($profile_name, [$item_name], $force);
-                // Reload the profile to refresh the config array after the addition.
-                $profile_package = $this->featuresManager->getPackage($profile_name);
-              }
-              // If it's already assigned to a package in the current bundle,
-              // add a dependency.
-              else {
-                $machine_name = $current_bundle->getFullName($config_collection[$item_name]->getPackage());
-                if (!in_array($machine_name, $profile_package->getDependencies())) {
-                  $profile_package->appendDependency($machine_name);
-                }
-              }
-            }
-            // Otherwise, copy it over from Standard.
-            else {
-              $filename = $item_name . '.yml';
-              $profile_package->appendFile([
-                'filename' => $filename,
-                'subdirectory' => $subdirectory,
-                'string' => file_get_contents($standard_directory . '/' . $subdirectory . '/' . $filename)
-              ]);
-            }
-          }
-
-          // Add .profile and .install files from Standard.
-          $files = [
-            'install',
-            'profile',
-          ];
-          // Iterate through the files.
-          foreach ($files as $extension) {
-            $filename = $standard_directory . '/standard.' . $extension;
-            if (file_exists($filename)) {
-              // Read the file contents.
-              $string = file_get_contents($filename);
-              // Substitute the profile's machine name and name for the Standard
-              // profile's equivalents.
-              $string = str_replace(
-                ['standard', 'Standard'],
-                [$profile_name, $current_bundle->getName()],
-                $string
-              );
-              // Add the files to those to be output.
-              $profile_package->appendFile([
-                'filename' => $profile_name . '.' . $extension,
-                'subdirectory' => NULL,
-                'string' => $string
-              ], $extension);
-            }
-          }
-        }
-        // Conditionally merge in module and theme dependencies from the
-        // 'standard' install profile.
-        if ($settings['standard']['dependencies']) {
-          $info_file_uri = $standard_directory . '/standard.info.yml';
-          if (file_exists($info_file_uri)) {
-            $profile_info = \Drupal::service('info_parser')->parse($info_file_uri);
-            $info = [
-              'dependencies' => $profile_package->getDependencies(),
-              'themes' => $profile_package->getThemes(),
-            ];
-            $info = $this->featuresManager->mergeInfoArray($info, $profile_info);
-            $profile_package->setDependencies($info['dependencies']);
-            $profile_package->setThemes($info['themes']);
-          }
-        }
-        $this->featuresManager->setPackage($profile_package);
-      }
-    }
-  }
-
-  /**
-   * Returns the list of configuration items required by the Standard install
-   * profile.
-   *
-   * If install code is adapted from the Standard profile, these configuration
-   * items will be required.
-   *
-   * @return array
-   *   An array of configuration item names.
-   */
-  protected function listRequiredStandardConfig() {
-    return [
-      'contact.form.feedback',
-      'user.role.administrator'
-    ];
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentSiteType.php b/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentSiteType.php
deleted file mode 100644
index 0269658..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesAssignment/FeaturesAssignmentSiteType.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesAssignment;
-
-use Drupal\features\FeaturesAssignmentMethodBase;
-
-/**
- * Class for assigning configuration to a site package based on entity types.
- *
- * @Plugin(
- *   id = "site",
- *   weight = 7,
- *   name = @Translation("Site type"),
- *   description = @Translation("Assign designated types of configuration to a site configuration package module. For example, if image styles are selected as a site type, a site package will be generated and image styles will be assigned to it."),
- *   config_route_name = "features.assignment_site",
- *   default_settings = {
- *     "types" = {
- *       "config" = {},
- *     }
- *   }
- * )
- */
-class FeaturesAssignmentSiteType extends FeaturesAssignmentMethodBase {
-  /**
-   * {@inheritdoc}
-   */
-  public function assignPackages($force = FALSE) {
-    $current_bundle = $this->assigner->getBundle();
-    $machine_name = 'site';
-    $name = $this->t('Site');
-    $description = $this->t('Provides site components.');
-    $package = $this->featuresManager->initPackage($machine_name, $name, $description, 'module', $current_bundle);
-    $this->assignPackageByConfigTypes($package->getMachineName(), $force);
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesGeneration/FeaturesGenerationArchive.php b/modules/contrib/features/src/Plugin/FeaturesGeneration/FeaturesGenerationArchive.php
deleted file mode 100644
index 2565685..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesGeneration/FeaturesGenerationArchive.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesGeneration;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\features\FeaturesGenerationMethodBase;
-use Drupal\Core\Archiver\ArchiveTar;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\features\Package;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Class for generating a compressed archive of packages.
- *
- * @Plugin(
- *   id = \Drupal\features\Plugin\FeaturesGeneration\FeaturesGenerationArchive::METHOD_ID,
- *   weight = -2,
- *   name = @Translation("Download Archive"),
- *   description = @Translation("Generate packages and optional profile as a compressed archive for download."),
- * )
- */
-class FeaturesGenerationArchive extends FeaturesGenerationMethodBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The app root.
-   *
-   * @var string
-   */
-  protected $root;
-
-  /**
-   * The CSRF token generator.
-   *
-   * @var \Drupal\Core\Access\CsrfTokenGenerator
-   */
-  protected $csrfToken;
-
-  /**
-   * Creates a new FeaturesGenerationArchive instance.
-   *
-   * @param string $root
-   *   The app root.
-   * @param \Drupal\Core\Access\CsrfTokenGenerator $csrf_token
-   *   The CSRF token generator.
-   */
-  public function __construct($root, \Drupal\Core\Access\CsrfTokenGenerator $csrf_token) {
-    $this->root = $root;
-    $this->csrfToken = $csrf_token;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $container->get('app.root'),
-      $container->get('csrf_token')
-    );
-  }
-
-  /**
-   * The package generation method id.
-   */
-  const METHOD_ID = 'archive';
-
-  /**
-   * The filename being written.
-   *
-   * @var string
-   */
-  protected $archiveName;
-
-  /**
-   * Reads and merges in existing files for a given package or profile.
-   */
-  protected function preparePackage(Package $package, array $existing_packages, FeaturesBundleInterface $bundle = NULL) {
-    if (isset($existing_packages[$package->getMachineName()])) {
-      $existing_directory = $existing_packages[$package->getMachineName()];
-    }
-    else {
-      $existing_directory = $package->getDirectory();
-    }
-    $existing_directory = $this->root . '/' . $existing_directory;
-
-    if (is_dir($existing_directory)) {
-      // Scan for all files.
-      $files = file_scan_directory($existing_directory, '/.*/');
-      // Skip any existing .features.yml as it will be replaced.
-      $exclude_files = [
-        $package->getMachineName() . '.features',
-      ];
-      foreach ($files as $file) {
-        // Skip files in the any existing configuration directory, as these
-        // will be replaced.
-        foreach (array_keys($this->featuresManager->getExtensionStorages()->getExtensionStorages()) as $directory) {
-          if (strpos($file->uri, $directory) !== FALSE) {
-            continue 2;
-          }
-        }
-        // Merge in the info file.
-        if ($file->name == $package->getMachineName() . '.info') {
-          $files = $package->getFiles();
-          $files['info']['string'] = $this->mergeInfoFile($package->getFiles()['info']['string'], $file->uri);
-          $package->setFiles($files);
-        }
-        // Read in remaining files.
-        elseif (!in_array($file->name, $exclude_files)) {
-          // Determine if the file is within a subdirectory of the
-          // extension's directory.
-          $file_directory = dirname($file->uri);
-          if ($file_directory !== $existing_directory) {
-            $subdirectory = substr($file_directory, strlen($existing_directory) + 1);
-          }
-          else {
-            $subdirectory = NULL;
-          }
-          $package->appendFile([
-            'filename' => $file->filename,
-            'subdirectory' => $subdirectory,
-            'string' => file_get_contents($file->uri)
-          ]);
-        }
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function generate(array $packages = array(), FeaturesBundleInterface $bundle = NULL) {
-
-    // If no packages were specified, get all packages.
-    if (empty($packages)) {
-      $packages = $this->featuresManager->getPackages();
-    }
-
-    // Determine the best name for the tar archive.
-    // Single package export, so name by package name.
-    if (count($packages) == 1) {
-      $filename = current($packages)->getMachineName();
-    }
-    // Profile export, so name by profile.
-    elseif (isset($bundle) && $bundle->isProfile()) {
-      $filename = $bundle->getProfileName();
-    }
-    // Non-default bundle, so name by bundle.
-    elseif (isset($bundle) && !$bundle->isDefault()) {
-      $filename = $bundle->getMachineName();
-    }
-    // Set a fallback name.
-    else {
-      $filename = 'generated_features';
-    }
-
-    $return = [];
-
-    $this->archiveName = $filename . '.tar.gz';
-    $archive_name = file_directory_temp() . '/' . $this->archiveName;
-    if (file_exists($archive_name)) {
-      file_unmanaged_delete($archive_name);
-    }
-
-    $archiver = new ArchiveTar($archive_name);
-
-    // Add package files.
-    foreach ($packages as $package) {
-      if (count($packages) == 1) {
-        // Single module export, so don't generate entire modules dir structure.
-        $package->setDirectory($package->getMachineName());
-      }
-      $this->generatePackage($return, $package, $archiver);
-    }
-
-    return $return;
-  }
-
-  /**
-   * Writes a package or profile's files to an archive.
-   *
-   * @param array &$return
-   *   The return value, passed by reference.
-   * @param \Drupal\features\Package $package
-   *   The package or profile.
-   * @param ArchiveTar $archiver
-   *   The archiver.
-   */
-  protected function generatePackage(array &$return, Package $package, ArchiveTar $archiver) {
-    $success = TRUE;
-    foreach ($package->getFiles() as $file) {
-      try {
-        $this->generateFile($package->getDirectory(), $file, $archiver);
-      }
-      catch (\Exception $exception) {
-        $this->failure($return, $package, $exception);
-        $success = FALSE;
-        break;
-      }
-    }
-    if ($success) {
-      $this->success($return, $package);
-    }
-  }
-
-  /**
-   * Registers a successful package or profile archive operation.
-   *
-   * @param array &$return
-   *   The return value, passed by reference.
-   * @param \Drupal\features\Package $package
-   *   The package or profile.
-   */
-  protected function success(array &$return, Package $package) {
-    $type = $package->getType() == 'module' ? $this->t('Package') : $this->t('Profile');
-    $return[] = [
-      'success' => TRUE,
-      // Archive writing doesn't merit a message, and if done through the UI
-      // would appear on the subsequent page load.
-      'display' => FALSE,
-      'message' => '@type @package written to archive.',
-      'variables' => [
-        '@type' => $type,
-        '@package' => $package->getName(),
-      ],
-    ];
-  }
-
-  /**
-   * Registers a failed package or profile archive operation.
-   *
-   * @param array &$return
-   *   The return value, passed by reference.
-   * @param \Drupal\features\Package $package
-   *   The package or profile.
-   * @param \Exception $exception
-   *   The exception object.
-   * @param string $message
-   *   Error message when there isn't an Exception object.
-   */
-  protected function failure(array &$return, Package $package, \Exception $exception = NULL, $message = '') {
-    $type = $package->getType() == 'module' ? $this->t('Package') : $this->t('Profile');
-    $return[] = [
-      'success' => FALSE,
-      // Archive writing doesn't merit a message, and if done through the UI
-      // would appear on the subsequent page load.
-      'display' => FALSE,
-      'message' => '@type @package not written to archive. Error: @error.',
-      'variables' => [
-        '@type' => $type,
-        '@package' => $package->getName(),
-        '@error' => isset($exception) ? $exception->getMessage() : $message,
-      ],
-    ];
-  }
-
-  /**
-   * Writes a file to the file system, creating its directory as needed.
-   *
-   * @param string $directory
-   *   The extension's directory.
-   * @param array $file
-   *   Array with the following keys:
-   *   - 'filename': the name of the file.
-   *   - 'subdirectory': any subdirectory of the file within the extension
-   *      directory.
-   *   - 'string': the contents of the file.
-   * @param ArchiveTar $archiver
-   *   The archiver.
-   *
-   * @throws Exception
-   */
-  protected function generateFile($directory, array $file, ArchiveTar $archiver) {
-    $filename = $directory;
-    if (!empty($file['subdirectory'])) {
-      $filename .= '/' . $file['subdirectory'];
-    }
-    $filename .= '/' . $file['filename'];
-    // Set the mode to 0644 rather than the default of 0600.
-    if ($archiver->addString($filename, $file['string'], FALSE, ['mode' => 0644]) === FALSE) {
-      throw new \Exception($this->t('Failed to archive file @filename.', ['@filename' => $file['filename']]));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function exportFormSubmit(array &$form, FormStateInterface $form_state) {
-    // Redirect to the archive file download.
-    $form_state->setRedirect('features.export_download', ['uri' => $this->archiveName, 'token' => $this->csrfToken->get($this->archiveName)]);
-  }
-
-}
diff --git a/modules/contrib/features/src/Plugin/FeaturesGeneration/FeaturesGenerationWrite.php b/modules/contrib/features/src/Plugin/FeaturesGeneration/FeaturesGenerationWrite.php
deleted file mode 100644
index 118108c..0000000
--- a/modules/contrib/features/src/Plugin/FeaturesGeneration/FeaturesGenerationWrite.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-
-namespace Drupal\features\Plugin\FeaturesGeneration;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\File\FileSystemInterface;
-use Drupal\features\FeaturesGenerationMethodBase;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\features\Package;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Class for writing packages to the local file system.
- *
- * @Plugin(
- *   id = \Drupal\features\Plugin\FeaturesGeneration\FeaturesGenerationWrite::METHOD_ID,
- *   weight = 2,
- *   name = @Translation("Write"),
- *   description = @Translation("Write packages and optional profile to the file system."),
- * )
- */
-class FeaturesGenerationWrite extends FeaturesGenerationMethodBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The package generation method id.
-   */
-  const METHOD_ID = 'write';
-
-  /**
-   * The app root.
-   *
-   * @var string
-   */
-  protected $root;
-
-  /**
-   * The file_system service.
-   * @var \Drupal\Core\File\FileSystemInterface
-   */
-  protected $fileSystem;
-
-  /**
-   * Creates a new FeaturesGenerationWrite instance.
-   *
-   * @param string $root
-   *   The app root.
-   */
-  public function __construct($root, FileSystemInterface $fileSystem) {
-    $this->root = $root;
-    $this->fileSystem = $fileSystem;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $container->get('app.root'),
-      $container->get('file_system')
-    );
-  }
-
-  /**
-   * Reads and merges in existing files for a given package or profile.
-   *
-   * @param \Drupal\features\Package &$package
-   *   The package.
-   * @param array $existing_packages
-   *   An array of existing packages.
-   * @param \Drupal\features\FeaturesBundleInterface $bundle
-   *   The bundle the package belongs to.
-   */
-  protected function preparePackage(Package $package, array $existing_packages, FeaturesBundleInterface $bundle = NULL) {
-    // If this package is already present, prepare files.
-    if (isset($existing_packages[$package->getMachineName()])) {
-      $existing_directory = $existing_packages[$package->getMachineName()];
-      $package->setDirectory($existing_directory);
-    }
-    else {
-      $existing_directory = $package->getDirectory();
-    }
-
-    // Merge in the info file.
-    $info_file_uri = $this->root . '/' . $existing_directory . '/' . $package->getMachineName() . '.info.yml';
-    if (file_exists($info_file_uri)) {
-      $files = $package->getFiles();
-      $files['info']['string'] = $this->mergeInfoFile($package->getFiles()['info']['string'], $info_file_uri);
-      $package->setFiles($files);
-
-      // Remove the config directories, as they will be replaced.
-      foreach (array_keys($this->featuresManager->getExtensionStorages()
-        ->getExtensionStorages()) as $directory) {
-        $config_directory = $this->root . '/' . $existing_directory . '/' . $directory;
-        if (is_dir($config_directory)) {
-          file_unmanaged_delete_recursive($config_directory);
-        }
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function generate(array $packages = array(), FeaturesBundleInterface $bundle = NULL) {
-    // If no packages were specified, get all packages.
-    if (empty($packages)) {
-      $packages = $this->featuresManager->getPackages();
-    }
-
-    $return = [];
-
-    // Add package files.
-    // We need to update the system.module.files state because it's cached.
-    // Cannot just call system_rebuild_module_data() because $listing->scan() has
-    // it's own internal static cache that we cannot clear at this point.
-    $files = \Drupal::state()->get('system.module.files');
-    foreach ($packages as $package) {
-      $this->generatePackage($return, $package);
-      if (!isset($files[$package->getMachineName()]) && isset($package->getFiles()['info'])) {
-        $files[$package->getMachineName()] = $package->getDirectory() . '/' . $package->getFiles()['info']['filename'];
-      }
-    }
-
-    // Rebuild system module cache
-    \Drupal::state()->set('system.module.files', $files);
-
-    return $return;
-  }
-
-  /**
-   * Writes a package or profile's files to the file system.
-   *
-   * @param array &$return
-   *   The return value, passed by reference.
-   * @param \Drupal\features\Package $package
-   *   The package or profile.
-   */
-  protected function generatePackage(array &$return, Package $package) {
-    if (!$package->getFiles()) {
-      $this->failure($return, $package, NULL, $this->t('No configuration was selected to be exported.'));
-      return;
-    }
-    $success = TRUE;
-    foreach ($package->getFiles() as $file) {
-      try {
-        $this->generateFile($package->getDirectory(), $file);
-      }
-      catch (\Exception $exception) {
-        $this->failure($return, $package, $exception);
-        $success = FALSE;
-        break;
-      }
-    }
-    if ($success) {
-      $this->success($return, $package);
-    }
-  }
-
-  /**
-   * Registers a successful package or profile write operation.
-   *
-   * @param array &$return
-   *   The return value, passed by reference.
-   * @param \Drupal\features\Package $package
-   *   The package or profile.
-   */
-  protected function success(array &$return, Package $package) {
-    $type = $package->getType() == 'module' ? $this->t('Package') : $this->t('Profile');
-    $return[] = [
-      'success' => TRUE,
-      'display' => TRUE,
-      'message' => '@type @package written to @directory.',
-      'variables' => [
-        '@type' => $type,
-        '@package' => $package->getName(),
-        '@directory' => $package->getDirectory(),
-      ],
-    ];
-  }
-
-  /**
-   * Registers a failed package or profile write operation.
-   *
-   * @param array &$return
-   *   The return value, passed by reference.
-   * @param \Drupal\features\Package $package
-   *   The package or profile.
-   * @param \Exception $exception
-   *   The exception object.
-   * @param string $message
-   *   Error message when there isn't an Exception object.
-   */
-  protected function failure(array &$return, Package $package, \Exception $exception = NULL, $message = '') {
-    $type = $package->getType() == 'module' ? $this->t('Package') : $this->t('Profile');
-    $return[] = [
-      'success' => FALSE,
-      'display' => TRUE,
-      'message' => '@type @package not written to @directory. Error: @error.',
-      'variables' => [
-        '@type' => $type,
-        '@package' => $package->getName(),
-        '@directory' => $package->getDirectory(),
-        '@error' => isset($exception) ? $exception->getMessage() : $message,
-      ],
-    ];
-  }
-
-  /**
-   * Writes a file to the file system, creating its directory as needed.
-   *
-   * @param string $directory
-   *   The extension's directory.
-   * @param array $file
-   *   Array with the following keys:
-   *   - 'filename': the name of the file.
-   *   - 'subdirectory': any subdirectory of the file within the extension
-   *      directory.
-   *   - 'string': the contents of the file.
-   *
-   * @throws Exception
-   */
-  protected function generateFile($directory, array $file) {
-    if (!empty($file['subdirectory'])) {
-      $directory .= '/' . $file['subdirectory'];
-    }
-    $directory = $this->root . '/' . $directory;
-    if (!is_dir($directory)) {
-      if ($this->fileSystem->mkdir($directory, NULL, TRUE) === FALSE) {
-        throw new \Exception($this->t('Failed to create directory @directory.', ['@directory' => $directory]));
-      }
-    }
-    if (file_put_contents($directory . '/' . $file['filename'], $file['string']) === FALSE) {
-      throw new \Exception($this->t('Failed to write file @filename.', ['@filename' => $file['filename']]));
-    }
-  }
-
-}
diff --git a/modules/contrib/features/tests/modules/test_feature/config/install/core.date_format.short.yml b/modules/contrib/features/tests/modules/test_feature/config/install/core.date_format.short.yml
deleted file mode 100644
index f7fbe19..0000000
--- a/modules/contrib/features/tests/modules/test_feature/config/install/core.date_format.short.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: short
-label: 'Default short date'
-locked: false
-pattern: 'm/d/Y - H:i'
diff --git a/modules/contrib/features/tests/modules/test_feature/config/install/system.cron.yml b/modules/contrib/features/tests/modules/test_feature/config/install/system.cron.yml
deleted file mode 100644
index e6f30d3..0000000
--- a/modules/contrib/features/tests/modules/test_feature/config/install/system.cron.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-threshold:
-  requirements_warning: 172800
-  requirements_error: 1209600
diff --git a/modules/contrib/features/tests/modules/test_feature/test_feature.features.yml b/modules/contrib/features/tests/modules/test_feature/test_feature.features.yml
deleted file mode 100644
index cbe4b9e..0000000
--- a/modules/contrib/features/tests/modules/test_feature/test_feature.features.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-bundle: test
-excluded:
-  - system.theme
diff --git a/modules/contrib/features/tests/modules/test_feature/test_feature.info.yml b/modules/contrib/features/tests/modules/test_feature/test_feature.info.yml
deleted file mode 100644
index b6dffcd..0000000
--- a/modules/contrib/features/tests/modules/test_feature/test_feature.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: feature
-type: module
-# core: 8.x
-package: Test
-# Force this to install after features.
-dependencies:
-  - features
-
-# Information added by Drupal.org packaging script on 2017-03-07
-version: '8.x-3.5'
-core: '8.x'
-project: 'features'
-datestamp: 1488908587
diff --git a/modules/contrib/features/tests/modules/test_mybundle_core/config/install/core.date_format.long.yml b/modules/contrib/features/tests/modules/test_mybundle_core/config/install/core.date_format.long.yml
deleted file mode 100644
index 9e385f1..0000000
--- a/modules/contrib/features/tests/modules/test_mybundle_core/config/install/core.date_format.long.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: long
-label: 'Default long date'
-locked: false
-pattern: 'l, F j, Y - H:i'
diff --git a/modules/contrib/features/tests/modules/test_mybundle_core/test_mybundle_core.features.yml b/modules/contrib/features/tests/modules/test_mybundle_core/test_mybundle_core.features.yml
deleted file mode 100644
index 808e321..0000000
--- a/modules/contrib/features/tests/modules/test_mybundle_core/test_mybundle_core.features.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-bundle: test_mybundle
-excluded:
-  - system.theme
diff --git a/modules/contrib/features/tests/modules/test_mybundle_core/test_mybundle_core.info.yml b/modules/contrib/features/tests/modules/test_mybundle_core/test_mybundle_core.info.yml
deleted file mode 100644
index 6478cab..0000000
--- a/modules/contrib/features/tests/modules/test_mybundle_core/test_mybundle_core.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Test Core
-type: module
-# core: 8.x
-package: Test
-# Ensure features is enabled first
-dependencies:
-  - features
-
-# Information added by Drupal.org packaging script on 2017-03-07
-version: '8.x-3.5'
-core: '8.x'
-project: 'features'
-datestamp: 1488908587
diff --git a/modules/contrib/features/tests/src/Kernel/Entity/FeaturesBundleIntegrationTest.php b/modules/contrib/features/tests/src/Kernel/Entity/FeaturesBundleIntegrationTest.php
deleted file mode 100644
index aaf62bc..0000000
--- a/modules/contrib/features/tests/src/Kernel/Entity/FeaturesBundleIntegrationTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Drupal\Tests\features\Kernel\Entity;
-
-use Drupal\features\Entity\FeaturesBundle;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * @coversDefaultClass \Drupal\features\Entity\FeaturesBundle
- * @group features
- */
-class FeaturesBundleIntegrationTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules  = ['features'];
-
-  public function testCrud() {
-    $bundle = FeaturesBundle::create([
-      'machine_name' => 'test',
-      'name' => 'Test',
-    ]);
-    $bundle->save();
-
-    /** @var \Drupal\features\Entity\FeaturesBundle $bundle */
-    $bundle = FeaturesBundle::load('test');
-    $this->assertEquals('Test', $bundle->getName());
-  }
-
-  /**
-   * @covers ::isDefault
-   */
-  public function testIsDefaultWithDefaultBundle() {
-    $bundle = FeaturesBundle::create([
-      'machine_name' => FeaturesBundleInterface::DEFAULT_BUNDLE,
-    ]);
-
-    $this->assertTrue($bundle->isDefault());
-  }
-
-  /**
-   * @covers ::isDefault
-   */
-  public function testIsDefaultWithNonDefaultBundle() {
-    $bundle = FeaturesBundle::create([
-      'machine_name' => 'other',
-    ]);
-
-    $this->assertFalse($bundle->isDefault());
-  }
-
-  /**
-   * @covers ::getFullName
-   */
-  public function testGetFullName() {
-  }
-
-  /**
-   * @covers ::getShortName
-   */
-  public function testGetShortName() {
-  }
-
-  /**
-   * @covers ::getProfileName
-   * @covers ::setProfileName
-   */
-  public function testGetProfile() {
-    $bundle = FeaturesBundle::create([
-      'machine_name' => 'other',
-      'profile_name' => 'example',
-      'is_profile' => TRUE,
-    ]);
-    $this->assertEquals('example', $bundle->getProfileName());
-
-    $bundle->setProfileName('example2');
-    $this->assertEquals('example2', $bundle->getProfileName());
-  }
-
-}
diff --git a/modules/contrib/features/tests/src/Kernel/FeaturesAssignTest.php b/modules/contrib/features/tests/src/Kernel/FeaturesAssignTest.php
deleted file mode 100644
index a57338d..0000000
--- a/modules/contrib/features/tests/src/Kernel/FeaturesAssignTest.php
+++ /dev/null
@@ -1,834 +0,0 @@
-<?php
-
-namespace Drupal\Tests\features\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\features\ConfigurationItem;
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\Core\Config\InstallStorage;
-
-/**
- * @group features
- */
-class FeaturesAssignTest extends KernelTestBase {
-
-  const PACKAGE_NAME = 'my_test_package';
-  // Installed test feature package
-  const TEST_INSTALLED_PACKAGE = 'test_mybundle_core';
-  // Uninstalled test feature package
-  const TEST_UNINSTALLED_PACKAGE = 'test_feature';
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['features', 'node', 'system', 'user', self::TEST_INSTALLED_PACKAGE];
-
-  /**
-   * @var \Drupal\features\FeaturesManager
-   */
-  protected $featuresManager;
-
-  /**
-   * @var \Drupal\features\FeaturesAssigner
-   */
-  protected $assigner;
-
-  /**
-   * @var \Drupal\features\FeaturesBundleInterface
-   */
-  protected $bundle;
-
-  /**
-   * @todo Remove the disabled strict config schema checking.
-   */
-  protected $strictConfigSchema = FALSE;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig('features');
-    $this->installConfig('system');
-
-    $this->featuresManager = \Drupal::service('features.manager');
-    $this->assigner = \Drupal::service('features_assigner');
-    $this->bundle = $this->assigner->getBundle();
-
-    // Turn off all assignment plugins.
-    $this->bundle->setEnabledAssignments([]);
-
-    // Start with an empty configuration collection.
-    $this->featuresManager->setConfigCollection([]);
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentAlter
-   */
-  public function testAssignAlter() {
-    $method_id = 'alter';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-
-    // Add some configuration.
-    $this->addConfigurationItem('example.settings', [
-      '_core' => ['something'],
-      'uuid' => 'something',
-    ],
-    [
-      'type' => FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG,
-    ]);
-    $this->addConfigurationItem('node.type.article', [
-      '_core' => ['something'],
-      'uuid' => 'something',
-      'permissions' => [
-        'first',
-        'second',
-      ],
-    ],
-    [
-      'type' => 'node_type',
-    ]);
-    $this->addConfigurationItem('user.role.test', [
-      '_core' => ['something'],
-      'uuid' => 'something',
-      'permissions' => [
-        'first',
-        'second',
-      ],
-    ],
-    [
-      'type' => 'user_role',
-    ]);
-
-    // Set all settings to FALSE.
-    $settings = [
-      'core' => FALSE,
-      'uuid' => FALSE,
-      'user_permissions' => FALSE,
-    ];
-    $this->bundle->setAssignmentSettings($method_id, $settings);
-
-    $this->assigner->applyAssignmentMethod($method_id);
-
-    $config = $this->featuresManager->getConfigCollection();
-    $this->assertNotEmpty($config['example.settings'], 'Expected config not created.');
-    $this->assertNotEmpty($config['node.type.article'], 'Expected config not created.');
-    $this->assertNotEmpty($config['user.role.test'], 'Expected config not created.');
-
-    $example_settings_data = $config['example.settings']->getData();
-    $this->assertEquals($example_settings_data['_core'], ['something'], 'Expected _core value missing.');
-    $this->assertEquals($example_settings_data['uuid'], 'something', 'Expected uuid value missing.');
-
-    $node_type_data = $config['node.type.article']->getData();
-    $this->assertEquals($node_type_data['_core'], ['something'], 'Expected _core value missing.');
-    $this->assertEquals($node_type_data['uuid'], 'something', 'Expected uuid value missing.');
-    $this->assertEquals($node_type_data['permissions'], [
-      'first',
-      'second',
-    ], 'Expected permissions value missing.');
-
-    $user_role_data = $config['user.role.test']->getData();
-    $this->assertEquals($user_role_data['_core'], ['something'], 'Expected _core value missing.');
-    $this->assertEquals($user_role_data['uuid'], 'something', 'Expected uuid value missing.');
-    $this->assertEquals($user_role_data['permissions'], [
-      'first',
-      'second',
-    ], 'Expected permissions value missing.');
-
-    // Set all settings to TRUE.
-    $settings = [
-      'core' => TRUE,
-      'uuid' => TRUE,
-      'user_permissions' => TRUE,
-    ];
-    $this->bundle->setAssignmentSettings($method_id, $settings);
-
-    $this->assigner->applyAssignmentMethod($method_id);
-
-    $config = $this->featuresManager->getConfigCollection();
-    $this->assertNotEmpty($config['example.settings'], 'Expected config not created.');
-    $this->assertNotEmpty($config['node.type.article'], 'Expected config not created.');
-    $this->assertNotEmpty($config['user.role.test'], 'Expected config not created.');
-
-    $example_settings_data = $config['example.settings']->getData();
-    $this->assertFalse(isset($example_settings_data['_core']), 'Unexpected _core value present.');
-    // uuid should be retained for simple configuration.
-    $this->assertEquals($example_settings_data['uuid'], 'something', 'Expected uuid value missing.');
-
-    $node_type_data = $config['node.type.article']->getData();
-    $this->assertFalse(isset($node_type_data['_core']), 'Unexpected _core value present.');
-    $this->assertFalse(isset($node_type_data['uuid']), 'Unexpected uuid value present.');
-    // permissions should be stripped only for user_role configuration.
-    $this->assertEquals($node_type_data['permissions'], [
-      'first',
-      'second',
-    ], 'Expected permissions value missing.');
-
-    $user_role_data = $config['user.role.test']->getData();
-    $this->assertFalse(isset($user_role_data['_core']), 'Unexpected _core value present.');
-    $this->assertFalse(isset($user_role_data['uuid']), 'Unexpected uuid value present.');
-    $this->assertFalse(isset($user_role_data['permissions']), 'Unexpected permissions value present.');
-
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentBaseType
-   */
-  public function testAssignBase() {
-    $method_id = 'base';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-
-    // Test the default options for the base assignment method.
-
-    // Test node type assignments.
-    // Declare the node_type entity 'article'.
-    $this->addConfigurationItem('node.type.article', [], [
-      'shortName' => 'article',
-      'label' => 'Article',
-      'type' => 'node_type',
-      'dependents' => ['field.field.node.article.body'],
-    ]);
-
-    // Add a piece of dependent configuration.
-    $this->addConfigurationItem('field.field.node.article.body', [], [
-      'shortName' => 'node.article.body',
-      'label' => 'Body',
-      'type' => 'field_config',
-      'dependents' => [],
-    ]);
-
-    $this->assigner->applyAssignmentMethod($method_id);
-
-    $packages = $this->featuresManager->getPackages();
-
-    $expected_package_names = ['article', 'user'];
-
-    $this->assertEquals($expected_package_names, array_keys($packages), 'Expected packages not created.');
-
-    // Dependents like field.field.node.article.body should not be assigned.
-    $expected_config_items = [
-      'node.type.article',
-    ];
-
-    $this->assertEquals($expected_config_items, $packages['article']->getConfig(), 'Expected configuration items not present in article package.');
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentCoreType
-   */
-  public function testAssignCore() {
-    $method_id = 'core';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-
-    // Test the default options for the core assignment method.
-
-    // Add a piece of configuration of a core type.
-    $this->addConfigurationItem('field.storage.node.body', [], [
-      'shortName' => 'node.body',
-      'label' => 'node.body',
-      'type' => 'field_storage_config',
-      'dependents' => ['field.field.node.article.body'],
-    ]);
-
-    // Add a piece of configuration of a non-core type.
-    $this->addConfigurationItem('field.field.node.article.body', [], [
-      'shortName' => 'node.article.body',
-      'label' => 'Body',
-      'type' => 'field_config',
-      'dependents' => [],
-    ]);
-
-    $this->assigner->applyAssignmentMethod($method_id);
-
-    $packages = $this->featuresManager->getPackages();
-
-    $expected_package_names = ['core'];
-
-    $this->assertEquals($expected_package_names, array_keys($packages), 'Expected packages not created.');
-
-    $this->assertTrue(in_array('field.storage.node.body', $packages['core']->getConfig(), 'Expected configuration item not present in core package.'));
-    $this->assertFalse(in_array('field.field.node.article.body', $packages['core']->getConfig(), 'Unexpected configuration item present in core package.'));
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentDependency
-   */
-  public function testAssignDependency() {
-    $method_id = 'dependency';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-
-    // Test the default options for the base assignment method.
-
-    // Test node type assignments.
-    // Declare the node_type entity 'article'.
-    $this->addConfigurationItem('node.type.article', [], [
-      'shortName' => 'article',
-      'label' => 'Article',
-      'type' => 'node_type',
-      'dependents' => ['field.field.node.article.body'],
-    ]);
-
-    // Add a piece of dependent configuration.
-    $this->addConfigurationItem('field.field.node.article.body', [], [
-      'shortName' => 'node.article.body',
-      'label' => 'Body',
-      'type' => 'field_config',
-      'dependents' => [],
-    ]);
-
-    $this->featuresManager->initPackage(self::PACKAGE_NAME, 'My test package');
-    $this->featuresManager->assignConfigPackage(self::PACKAGE_NAME, ['node.type.article']);
-
-    $this->assigner->applyAssignmentMethod($method_id);
-
-    $packages = $this->featuresManager->getPackages();
-
-    $expected_package_names = [self::PACKAGE_NAME];
-
-    $this->assertEquals($expected_package_names, array_keys($packages), 'Expected packages not created.');
-
-    $expected_config_items = [
-      'node.type.article',
-      'field.field.node.article.body',
-    ];
-
-    $this->assertEquals($expected_config_items, $packages[self::PACKAGE_NAME]->getConfig(), 'Expected configuration items not present in article package.');
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentExclude
-   */
-  public function testAssignExclude() {
-    $method_id = 'exclude';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-    // Also enable Packages and Core plugins.
-    $this->enableAssignmentMethod('packages', FALSE);
-    $this->enableAssignmentMethod('core', FALSE);
-
-    // Apply the bundle
-    $this->bundle = $this->assigner->loadBundle('test_mybundle');
-
-    $this->assigner->applyAssignmentMethod('packages');
-    $packages = $this->featuresManager->getPackages();
-    $this->assertNotEmpty($packages[self::TEST_INSTALLED_PACKAGE], 'Expected package not created.');
-
-    // 1. When Required is set to True, config should stay with the module
-    // First, test with "Required" set to True.
-    $packages[self::TEST_INSTALLED_PACKAGE]->setRequired(true);
-    $this->featuresManager->setPackages($packages);
-
-    $this->assigner->applyAssignmentMethod('exclude');
-    $this->assigner->applyAssignmentMethod('core');
-    $this->assigner->applyAssignmentMethod('existing');
-    $packages = $this->featuresManager->getPackages();
-
-    $expected_config_items = [
-      'core.date_format.long',
-    ];
-
-    $this->assertEquals($expected_config_items, $packages[self::TEST_INSTALLED_PACKAGE]->getConfig(), 'Expected configuration items not present in existing test_core package.');
-
-    // 2. When Required is set to False, config still stays with module
-    // Because the module is installed.
-    $this->reset();
-    $this->bundle = $this->assigner->loadBundle('test_mybundle');
-
-    $this->assigner->applyAssignmentMethod('packages');
-    $packages = $this->featuresManager->getPackages();
-    $this->assertNotEmpty($packages[self::TEST_INSTALLED_PACKAGE], 'Expected test_mybundle_core package not created.');
-
-    // Set "Required" set to False
-    $packages[self::TEST_INSTALLED_PACKAGE]->setRequired(false);
-    $this->featuresManager->setPackages($packages);
-
-    $this->assigner->applyAssignmentMethod('exclude');
-    $this->assigner->applyAssignmentMethod('core');
-    $this->assigner->applyAssignmentMethod('existing');
-    $packages = $this->featuresManager->getPackages();
-    $this->assertFalse(array_key_exists('core', $packages), 'Core package should not be created.');
-
-    $expected_config_items = [
-      'core.date_format.long',
-    ];
-    $this->assertEquals($expected_config_items, $packages[self::TEST_INSTALLED_PACKAGE]->getConfig(), 'Expected configuration items not present in existing test_core package.');
-
-    // 3. When Required is set to False and module is NOT installed,
-    // Config stays with module if it doesn't match the current namespace
-    $this->reset();
-    // Load a bundle different from TEST_UNINSTALLED_PACKAGE
-    $this->bundle = $this->assigner->loadBundle('test_mybundle');
-
-    $this->assigner->applyAssignmentMethod('packages');
-    $packages = $this->featuresManager->getPackages();
-    $this->assertNotEmpty($packages[self::TEST_UNINSTALLED_PACKAGE], 'Expected test_feature package not created.');
-    $this->assertNotEmpty($packages[self::TEST_INSTALLED_PACKAGE], 'Expected test_mybundle_core package not created.');
-
-    // Mark package as uninstalled, set "Required" set to False
-    $packages[self::TEST_UNINSTALLED_PACKAGE]->setRequired(false);
-    $this->featuresManager->setPackages($packages);
-
-    $this->assigner->applyAssignmentMethod('exclude');
-    $this->assigner->applyAssignmentMethod('core');
-    $this->assigner->applyAssignmentMethod('existing');
-    $packages = $this->featuresManager->getPackages();
-    $this->assertFalse(array_key_exists('core', $packages), 'Core package should not be created.');
-
-    $expected_config_items = [
-      'core.date_format.short',
-      'system.cron',
-    ];
-    $this->assertEquals($expected_config_items, $packages[self::TEST_UNINSTALLED_PACKAGE]->getConfig(), 'Expected configuration items not present in existing test_feature package.');
-
-    // 4. When Required is set to False and module is NOT installed,
-    // Config is reassigned within modules that match the namespace.
-    $this->reset();
-    // Load the bundle used in TEST_UNINSTALLED_PACKAGE
-    $this->bundle = $this->assigner->loadBundle('test');
-    if (empty($this->bundle) || $this->bundle->isDefault()) {
-      // Since we uninstalled the test_feature, we probably need to create
-      // an empty "test" bundle
-      $this->bundle = $this->assigner->createBundleFromDefault('test');
-    }
-
-    $this->assigner->applyAssignmentMethod('packages');
-    $packages = $this->featuresManager->getPackages();
-    $this->assertNotEmpty($packages[self::TEST_UNINSTALLED_PACKAGE], 'Expected test_feature package not created.');
-
-    // Set "Required" set to False
-    $packages[self::TEST_UNINSTALLED_PACKAGE]->setRequired(false);
-    $this->featuresManager->setPackages($packages);
-
-    $this->assigner->applyAssignmentMethod('exclude');
-    $this->assigner->applyAssignmentMethod('core');
-    $this->assigner->applyAssignmentMethod('existing');
-    $packages = $this->featuresManager->getPackages();
-    $this->assertNotEmpty($packages['core'], 'Expected Core package not created.');
-
-    // Ensure "core" package is not confused with "test_core" module
-    // Since we are in a bundle
-    $this->assertEmpty($packages['core']->getExtension(), 'Autogenerated core package should not have an extension');
-
-    // Core config should be reassigned from TEST_UNINSTALLED_PACKAGE into Core
-    $expected_config_items = [
-      'system.cron',
-    ];
-    $this->assertEquals($expected_config_items, $packages[self::TEST_UNINSTALLED_PACKAGE]->getConfig(), 'Expected configuration items not present in existing test_feature package.');
-    $expected_config_items = [
-      'core.date_format.short',
-    ];
-    $this->assertEquals($expected_config_items, $packages['core']->getConfig(), 'Expected configuration items not present in core package.');
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentExclude
-   */
-  public function testAssignExisting() {
-    $method_id = 'existing';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-    // Also enable Packages plugin.
-    $this->enableAssignmentMethod('packages', FALSE);
-
-    // First create the existing packages.
-    $this->assigner->applyAssignmentMethod('packages');
-    // Now move config into those existing packages.
-    $this->assigner->applyAssignmentMethod($method_id);
-
-    $packages = $this->featuresManager->getPackages();
-    $this->assertNotEmpty($packages[self::TEST_INSTALLED_PACKAGE], 'Expected package not created.');
-    $this->assertNotEmpty($packages[self::TEST_UNINSTALLED_PACKAGE], 'Expected package not created.');
-
-    // Turn off any "required" option in package to let config get reassigned
-    $package = $packages[self::TEST_INSTALLED_PACKAGE];
-    $package->setRequired(true);
-
-    $expected_config_items = [
-      'core.date_format.long',
-    ];
-    $this->assertEquals($expected_config_items, $packages[self::TEST_INSTALLED_PACKAGE]->getConfig(), 'Expected configuration items not present in existing package.');
-
-    $expected_config_items = [
-      'core.date_format.short',
-      'system.cron',
-    ];
-    $this->assertEquals($expected_config_items, $packages[self::TEST_UNINSTALLED_PACKAGE]->getConfig(), 'Expected configuration items not present in existing package.');
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentForwardDependency
-   */
-  public function testAssignForwardDependency() {
-    $method_id = 'forward_dependency';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-
-    // Add some configuration.
-    // Two parent items.
-    $this->addConfigurationItem('parent1', [], [
-      'type' => 'node_type',
-      'dependents' => ['grandparent'],
-    ]);
-    $this->addConfigurationItem('parent2', [], [
-      'type' => 'node_type',
-      'dependents' => [],
-    ]);
-    // Something that belongs to just one parent.
-    $this->addConfigurationItem('child1', [], [
-      'type' => 'node_type',
-      'dependents' => ['parent1'],
-    ]);
-    // Something that belongs to both parents.
-    $this->addConfigurationItem('child2', [], [
-      'type' => 'node_type',
-      'dependents' => ['parent1', 'parent2'],
-    ]);
-    // Something that indirectly belongs to parent1.
-    $this->addConfigurationItem('grandchild', [], [
-      'type' => 'node_type',
-      'dependents' => ['child1'],
-    ]);
-    // A dependent, not a dependency.
-    $this->addConfigurationItem('grandparent', [], [
-      'type' => 'node_type',
-      'dependents' => [],
-    ]);
-    // Something completely unrelated.
-    $this->addConfigurationItem('stranger', [], [
-      'type' => 'node_type',
-      'dependents' => [],
-    ]);
-
-    $this->featuresManager->initPackage(self::PACKAGE_NAME, 'My test package');
-    $this->featuresManager->assignConfigPackage(self::PACKAGE_NAME, ['parent1']);
-
-    $other_package_name = 'other_package';
-    $this->featuresManager->initPackage($other_package_name, 'Other package');
-    $this->featuresManager->assignConfigPackage($other_package_name, ['parent2']);
-
-    $this->assigner->applyAssignmentMethod($method_id);
-
-    $packages = $this->featuresManager->getPackages();
-    $expected_package_names = [self::PACKAGE_NAME, $other_package_name];
-    sort($expected_package_names);
-    $actual_package_names = array_keys($packages);
-    sort($actual_package_names);
-    $this->assertEquals($expected_package_names, $actual_package_names, 'Expected packages not created.');
-
-    $expected_config_items = [
-      'parent1',
-      'child1',
-      'grandchild',
-    ];
-    sort($expected_config_items);
-    $actual_config_items = $packages[self::PACKAGE_NAME]->getConfig();
-    sort($actual_config_items);
-
-    $this->assertEquals($expected_config_items, $actual_config_items, 'Expected configuration items not present in article package.');
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentNamespace
-   */
-  public function testAssignNamespace() {
-    $method_id = 'namespace';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-
-    // Apply the bundle
-    $this->bundle = $this->assigner->loadBundle('test_mybundle');
-
-    $package_data = [
-      'article' => [
-        // Items that should be assigned to 'article'.
-        'article',
-        'article-after',
-        'before.article',
-        'something_article',
-        'something-article',
-        'something.article',
-        'article_something',
-        'article-something',
-        'article.something',
-        'something_article_something',
-        'something-article-something',
-        'something.article.something',
-        'something.article_something',
-      ],
-      'article_after' => [
-        // Items that should be assigned to 'article_after'.
-        'article_after',
-        'something_article_after',
-        'something-article_after',
-        'something.article_after',
-        'article_after_something',
-        'article_after-something',
-        'article_after.something',
-        'something_article_after_something',
-        'something-article_after-something',
-        'something.article_after.something',
-        'something.article_after_something',
-      ],
-      'before_article' => [
-        // Items that should be assigned to 'before_article'.
-        'before_article',
-        'something_before_article',
-        'something-before_article',
-        'something.before_article',
-        'before_article_something',
-        'before_article-something',
-        'before_article.something',
-        'something_before_article_something',
-        'something-before_article-something',
-        'something.before_article.something',
-        'something.before_article_something',
-      ],
-      // Emulate an existing feature, which has a machine name prefixed by
-      // the bundle name.
-      'test_mybundle_page' => [
-        // Items that should be assigned to 'test_mybundle_page'.
-        // Items should match the short name, 'page'.
-        'page',
-        'page-after',
-        'before.page',
-        'something_page',
-        'something-page',
-        'something.page',
-        'page_something',
-        'page-something',
-        'page.something',
-        'something_page_something',
-        'something-page-something',
-        'something.page.something',
-        'something.page_something',
-      ],
-    ];
-
-    foreach ($package_data as $machine_name => $config_short_names) {
-      $this->featuresManager->initPackage($machine_name, 'My test package ' . $machine_name);
-      foreach ($config_short_names as $short_name) {
-        $this->addConfigurationItem('node.type.' . $short_name, [], [
-          'type' => 'node_type',
-          'shortName' => $short_name,
-        ]);
-      }
-    }
-
-    // Add some config that should not be matched.
-    $config_short_names = [
-     'example',
-     'example_something',
-     'article~',
-     'myarticle',
-    ];
-    foreach ($config_short_names as $short_name) {
-      $this->addConfigurationItem('node.type.' . $short_name, [], [
-        'type' => 'node_type',
-        'shortName' => $short_name,
-      ]);
-    }
-
-    $this->assigner->applyAssignmentMethod($method_id);
-    $packages = $this->featuresManager->getPackages();
-
-    foreach ($package_data as $machine_name => $config_short_names) {
-      $this->assertNotEmpty($packages[$machine_name], 'Expected package ' . $machine_name . ' not created.');
-      array_walk($config_short_names, function(&$value) {
-        $value = 'node.type.' . $value;
-      });
-      sort($config_short_names);
-      $package_config = $packages[$machine_name]->getConfig();
-      sort($package_config);
-      $this->assertEquals($config_short_names, $package_config, 'Expected configuration items not present in ' . $machine_name . ' package.');
-    }
-
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentOptionalType
-   */
-  public function testAssignOptionalType() {
-    $method_id = 'optional';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-
-    $settings = [
-      'types' => [
-        'config' => ['image_style'],
-      ],
-    ];
-    $this->bundle->setAssignmentSettings($method_id, $settings);
-
-    // Add some configuration.
-    $this->addConfigurationItem('node.type.article', [], [
-      'type' => 'node_type',
-    ]);
-    $this->addConfigurationItem('image.style.test', [], [
-      'type' => 'image_style',
-    ]);
-    $this->featuresManager->initPackage(self::PACKAGE_NAME, 'My test package');
-    $this->assigner->applyAssignmentMethod($method_id);
-
-    $packages = $this->featuresManager->getPackages();
-    $this->assertNotEmpty($packages[self::PACKAGE_NAME], 'Expected package not created.');
-
-    $config = $this->featuresManager->getConfigCollection();
-    $this->assertNotEmpty($config['node.type.article'], 'Expected config not created.');
-    $this->assertNotEmpty($config['image.style.test'], 'Expected config not created.');
-
-    $this->assertNull($config['node.type.article']->getSubdirectory(), 'Expected package subdirectory not set to default.');
-    $this->assertEquals($config['image.style.test']->getSubdirectory(), InstallStorage::CONFIG_OPTIONAL_DIRECTORY, 'Expected package subdirectory not set to optional.');
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentPackages
-   */
-  public function testAssignPackages() {
-    $method_id = 'packages';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-
-    $this->assigner->applyAssignmentMethod($method_id);
-
-    $packages = $this->featuresManager->getPackages();
-
-    $this->assertNotEmpty($packages[self::TEST_INSTALLED_PACKAGE], 'Expected package not created.');
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentProfile
-   */
-  public function testAssignProfile() {
-    $method_id = 'profile';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-
-    // Add some configuration.
-    $this->addConfigurationItem('shortcut.myshortcut', [], [
-      'type' => 'shortcut_set',
-    ]);
-    $this->addConfigurationItem('node.type.article', [], [
-      'type' => 'node_type',
-    ]);
-    $this->addConfigurationItem('image.style.test', [], [
-      'type' => 'image_style',
-    ]);
-    $this->addConfigurationItem('system.cron', [], [
-      'type' => 'simple',
-    ]);
-    $this->bundle = $this->assigner->createBundleFromDefault('myprofile');
-    $this->bundle->setProfileName('myprofile');
-    $this->bundle->setIsProfile(TRUE);
-
-    $this->assigner->applyAssignmentMethod($method_id);
-
-    $packages = $this->featuresManager->getPackages();
-    $this->assertNotEmpty($packages['myprofile'], 'Expected package not created.');
-
-    $expected_config_items = [
-      'shortcut.myshortcut',
-      'system.cron',
-      'system.theme',
-    ];
-    $this->assertEquals($expected_config_items, $packages['myprofile']->getConfig(), 'Expected configuration items not present in package.');
-  }
-
-  /**
-   * @covers Drupal\features\Plugin\FeaturesAssignment\FeaturesAssignmentSiteType
-   */
-  public function testAssignSiteType() {
-    $method_id = 'site';
-
-    // Enable the method.
-    $this->enableAssignmentMethod($method_id);
-
-    // Test the default options for the site assignment method.
-
-    // Add a piece of configuration of a site type.
-    $this->addConfigurationItem('filter.format.plain_text', [], [
-      'shortName' => 'plain_text',
-      'label' => 'Plain text',
-      'type' => 'filter_format',
-    ]);
-
-    // Add a piece of configuration of a non-site type.
-    $this->addConfigurationItem('field.field.node.article.body', [], [
-      'shortName' => 'node.article.body',
-      'label' => 'Body',
-      'type' => 'field_config',
-      'dependents' => [],
-    ]);
-
-    $this->assigner->applyAssignmentMethod($method_id);
-
-    $packages = $this->featuresManager->getPackages();
-
-    $expected_package_names = ['site'];
-
-    $this->assertEquals($expected_package_names, array_keys($packages), 'Expected packages not created.');
-
-    $this->assertTrue(in_array('filter.format.plain_text', $packages['site']->getConfig(), 'Expected configuration item not present in site package.'));
-    $this->assertFalse(in_array('field.field.node.article.body', $packages['site']->getConfig(), 'Unexpected configuration item present in site package.'));
-  }
-
-  /**
-   * Enables a specified assignment method.
-   *
-   * @param string $method_id
-   *   The ID of an assignment method.
-   * @param bool $exclusive
-   *   (optional) Whether to set the method as the only enabled method.
-   *   Defaults to TRUE.
-   */
-  protected function enableAssignmentMethod($method_id, $exclusive = TRUE) {
-    if ($exclusive) {
-      $this->bundle->setEnabledAssignments([$method_id]);
-    }
-    else {
-      $enabled = array_keys($this->bundle->getEnabledAssignments());
-      $enabled[] = $method_id;
-      $this->bundle->setEnabledAssignments($enabled);
-    }
-  }
-
-  /**
-   * Adds a configuration item.
-   *
-   * @param string $name
-   *   The config name.
-   * @param array $data
-   *   The config data.
-   * @param array $properties
-   *   (optional) Additional properties set on the object.
-   */
-  protected function addConfigurationItem($name, array $data = [], array $properties = []) {
-    $config_collection = $this->featuresManager->getConfigCollection();
-    $config_collection[$name] = new ConfigurationItem($name, $data, $properties);
-    $this->featuresManager->setConfigCollection($config_collection);
-  }
-
-  /**
-   * Reset the config to reapply assignment plugins
-   */
-  protected function reset() {
-    $this->assigner->reset();
-    // Start with an empty configuration collection.
-    $this->featuresManager->setConfigCollection([]);
-  }
-}
diff --git a/modules/contrib/features/tests/src/Kernel/FeaturesAssignerTest.php b/modules/contrib/features/tests/src/Kernel/FeaturesAssignerTest.php
deleted file mode 100644
index 6bf9f03..0000000
--- a/modules/contrib/features/tests/src/Kernel/FeaturesAssignerTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Drupal\Tests\features\Kernel;
-
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * @group features
- */
-class FeaturesAssignerTest extends KernelTestBase {
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['system', 'config'];
-
-  protected $strictConfigSchema = FALSE;
-
-  /**
-   * Test bundle auto-creation during config import.
-   *
-   * We check the case where the import also causes features to be installed,
-   * so at the time auto-creation happens there's not yet a default bundle.
-   */
-  public function testBundleAutoCreationImport() {
-    // Install the feature.
-    $installer = $this->container->get('module_installer');
-    // Have to do these separately so features_modules_installed() doesn't
-    // just exit.
-    $installer->install(['features']);
-    $installer->install(['test_feature']);
-
-    // Save config.
-    $this->copyConfig(
-      $this->container->get('config.storage'),
-      $this->container->get('config.storage.sync')
-    );
-
-    // Uninstall modules.
-    $installer->uninstall(['features', 'test_feature']);
-
-    // Restore the config from after install..
-    $this->configImporter()->import();
-
-    // Find the auto-created bundle.
-    $bundle_storage = $this->container->get('entity_type.manager')
-      ->getStorage('features_bundle');
-    $bundle = $bundle_storage->load('test');
-    $this->assertNotNull($bundle, "Features bundle doesn't exist");
-    $this->assertContains(
-      'Auto-generated bundle',
-      $bundle->getDescription(),
-      "Features bundle not auto-created");
-  }
-
-}
diff --git a/modules/contrib/features/tests/src/Kernel/FeaturesGenerateTest.php b/modules/contrib/features/tests/src/Kernel/FeaturesGenerateTest.php
deleted file mode 100644
index d17c822..0000000
--- a/modules/contrib/features/tests/src/Kernel/FeaturesGenerateTest.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-namespace Drupal\Tests\features\Kernel;
-
-use Drupal\features\Entity\FeaturesBundle;
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\Component\Serialization\Yaml;
-use Drupal\Core\Archiver\ArchiveTar;
-use org\bovigo\vfs\vfsStream;
-
-/**
- * @group features
- */
-class FeaturesGenerateTest extends KernelTestBase {
-
-  const PACKAGE_NAME = 'my_test_package';
-  const BUNDLE_NAME = 'giraffe';
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['features', 'system'];
-
-  /**
-   * @var \Drupal\features\FeaturesManagerInterface
-   */
-  protected $featuresManager;
-
-  /**
-   * @var \Drupal\features\FeaturesGeneratorInterface
-   */
-  protected $generator;
-
-  protected $strictConfigSchema = FALSE;
-
-  /**
-   * @var \Drupal\features\FeaturesAssignerInterface
-   */
-  protected $assigner;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig('features');
-    $this->installConfig('system');
-
-    $this->featuresManager = \Drupal::service('features.manager');
-    $this->generator = \Drupal::service('features_generator');
-    $this->assigner = \Drupal::service('features_assigner');
-
-    $this->featuresManager->initPackage(self::PACKAGE_NAME, 'My test package');
-    $package = $this->featuresManager->getPackage(self::PACKAGE_NAME);
-    $package->appendConfig('system.site');
-    $this->featuresManager->setPackage($package);
-  }
-
-  /**
-   * @covers \Drupal\features\Plugin\FeaturesGeneration\FeaturesGenerationArchive
-   */
-  public function testExportArchive() {
-    $filename = file_directory_temp() . '/' . self::PACKAGE_NAME . '.tar.gz';
-    if (file_exists($filename)) {
-      unlink($filename);
-    }
-    $this->assertFalse(file_exists($filename), 'Archive file already exists.');
-
-    $this->generator->generatePackages('archive', $this->assigner->getBundle(), [self::PACKAGE_NAME]);
-    $this->assertTrue(file_exists($filename), 'Archive file was not generated.');
-
-    $archive = new ArchiveTar($filename);
-    $files = $archive->listContent();
-
-    $this->assertEquals(3, count($files));
-    $this->assertEquals(self::PACKAGE_NAME . '/' . self::PACKAGE_NAME . '.info.yml', $files[0]['filename']);
-    $this->assertEquals(self::PACKAGE_NAME . '/' . self::PACKAGE_NAME . '.features.yml', $files[1]['filename']);
-    $this->assertEquals(self::PACKAGE_NAME . '/config/install/system.site.yml', $files[2]['filename']);
-
-    $expected_info = [
-      "name" => "My test package",
-      "type" => "module",
-      "core" => "8.x",
-    ];
-    $info = Yaml::decode($archive->extractInString(self::PACKAGE_NAME . '/' . self::PACKAGE_NAME . '.info.yml'));
-    $this->assertEquals($expected_info, $info, 'Incorrect info file generated');
-  }
-
-  public function testGeneratorWithBundle() {
-    $filename = file_directory_temp() . '/' . self::BUNDLE_NAME . '_' . self::PACKAGE_NAME . '.tar.gz';
-    if (file_exists($filename)) {
-      unlink($filename);
-    }
-    $this->assertFalse(file_exists($filename), 'Archive file already exists.');
-
-    $bundle = FeaturesBundle::create([
-      'machine_name' =>  self::BUNDLE_NAME
-    ]);
-
-    $this->generator->generatePackages('archive', $bundle, [self::PACKAGE_NAME]);
-
-    $package = $this->featuresManager->getPackage(self::PACKAGE_NAME);
-    $this->assertNull($package);
-
-    $package = $this->featuresManager->getPackage( self::BUNDLE_NAME . '_' . self::PACKAGE_NAME);
-    $this->assertEquals(self::BUNDLE_NAME . '_' . self::PACKAGE_NAME, $package->getMachineName());
-    $this->assertEquals(self::BUNDLE_NAME, $package->getBundle());
-
-    $this->assertTrue(file_exists($filename), 'Archive file was not generated.');
-  }
-
-  /**
-   * @covers \Drupal\features\Plugin\FeaturesGeneration\FeaturesGenerationWrite
-   */
-  public function testExportWrite() {
-    // Set a fake drupal root, so the testbot can also write into it.
-    vfsStream::setup('drupal');
-    \Drupal::getContainer()->set('app.root', 'vfs://drupal');
-    $this->featuresManager->setRoot('vfs://drupal');
-
-    $package = $this->featuresManager->getPackage(self::PACKAGE_NAME);
-    // Find out where package will be exported
-    list($full_name, $path) = $this->featuresManager->getExportInfo($package, $this->assigner->getBundle());
-    $path = 'vfs://drupal/' . $path . '/' . $full_name;
-    if (file_exists($path)) {
-      file_unmanaged_delete_recursive($path);
-    }
-    $this->assertFalse(file_exists($path), 'Package directory already exists.');
-
-    $this->generator->generatePackages('write', $this->assigner->getBundle(), [self::PACKAGE_NAME]);
-    $info_file_uri = $path . '/' . self::PACKAGE_NAME . '.info.yml';
-    $this->assertTrue(file_exists($path), 'Package directory was not generated.');
-    $this->assertTrue(file_exists($info_file_uri), 'Package info.yml not generated.');
-    $this->assertTrue(file_exists($path . '/config/install'), 'Package config/install not generated.');
-    $this->assertTrue(file_exists($path . '/config/install/system.site.yml'), 'Config.yml not exported.');
-
-    $expected_info = [
-      "name" => "My test package",
-      "type" => "module",
-      "core" => "8.x",
-    ];
-    $info = Yaml::decode(file_get_contents($info_file_uri));
-    $this->assertEquals($expected_info, $info, 'Incorrect info file generated');
-
-    // Now, add stuff to the feature and re-export to ensure it is preserved
-    // Add a dependency to the package itself to see that it gets exported.
-    $package->setDependencies(['user']);
-    $this->featuresManager->setPackage($package);
-    // Add dependency and custom key to the info file to simulate manual edit.
-    $info['dependencies'] = ['node'];
-    $info['mykey'] = "test value";
-    $info_contents = Yaml::encode($info);
-    file_put_contents($info_file_uri, $info_contents);
-
-    // Add an extra file that should be retained.
-    $css_file = $path . '/' . self::PACKAGE_NAME . '.css';
-    $file_contents = "This is a dummy file";
-    file_put_contents($css_file, $file_contents);
-
-    // Add a config file that should be removed since it's not part of the
-    // feature.
-    $config_file = $path . '/config/install/node.type.mytype.yml';
-    file_put_contents($config_file, $file_contents);
-
-    $this->generator->generatePackages('write', $this->assigner->getBundle(), [self::PACKAGE_NAME]);
-    $this->assertTrue(file_exists($info_file_uri), 'Package info.yml not generated.');
-    $expected_info = [
-      "name" => "My test package",
-      "type" => "module",
-      "core" => "8.x",
-      "dependencies" => ["node", "user"],
-      "mykey" => "test value",
-    ];
-    $info = Yaml::decode(file_get_contents($info_file_uri));
-    $this->assertEquals($expected_info, $info, 'Incorrect info file generated');
-    $this->assertTrue(file_exists($css_file), 'Extra file was not retained.');
-    $this->assertFalse(file_exists($config_file), 'Config directory was not cleaned.');
-    $this->assertEquals($file_contents, file_get_contents($css_file), 'Extra file contents not retained');
-
-    // Next, test that generating an Archive picks up the extra files.
-    $filename = file_directory_temp() . '/' . self::PACKAGE_NAME . '.tar.gz';
-    if (file_exists($filename)) {
-      unlink($filename);
-    }
-    $this->assertFalse(file_exists($filename), 'Archive file already exists.');
-    $this->generator->generatePackages('archive', $this->assigner->getBundle(), [self::PACKAGE_NAME]);
-    $this->assertTrue(file_exists($filename), 'Archive file was not generated.');
-
-    $archive = new ArchiveTar($filename);
-    $files = $archive->listContent();
-
-    $this->assertEquals(4, count($files));
-    $this->assertEquals(self::PACKAGE_NAME . '/' . self::PACKAGE_NAME . '.info.yml', $files[0]['filename']);
-    $this->assertEquals(self::PACKAGE_NAME . '/' . self::PACKAGE_NAME . '.features.yml', $files[1]['filename']);
-    $this->assertEquals(self::PACKAGE_NAME . '/config/install/system.site.yml', $files[2]['filename']);
-    $this->assertEquals(self::PACKAGE_NAME . '/' . self::PACKAGE_NAME . '.css', $files[3]['filename']);
-
-    $expected_info = [
-      "name" => "My test package",
-      "type" => "module",
-      "core" => "8.x",
-      "dependencies" => ["node", "user"],
-      "mykey" => "test value",
-    ];
-    $info = Yaml::decode($archive->extractInString(self::PACKAGE_NAME . '/' . self::PACKAGE_NAME . '.info.yml'));
-    $this->assertEquals($expected_info, $info, 'Incorrect info file generated');
-    $this->assertEquals($file_contents, $archive->extractInString(self::PACKAGE_NAME . '/' . self::PACKAGE_NAME . '.css'), 'Extra file contents not retained');
-  }
-}
diff --git a/modules/contrib/features/tests/src/Kernel/FeaturesManagerKernelTest.php b/modules/contrib/features/tests/src/Kernel/FeaturesManagerKernelTest.php
deleted file mode 100644
index 2ee7948..0000000
--- a/modules/contrib/features/tests/src/Kernel/FeaturesManagerKernelTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\Tests\features\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\features\ConfigurationItem;
-use Drupal\features\Package;
-
-/**
- * @group features
- */
-class FeaturesManagerKernelTest extends KernelTestBase {
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['system', 'config', 'features'];
-
-  protected $strictConfigSchema = FALSE;
-
-  /**
-   * @var \Drupal\features\FeaturesManagerInterface
-   */
-  protected $featuresManager;
-
-  /**
-   * @var \Drupal\Core\Config\ConfigFactory
-   */
-  protected $configFactory;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig('features');
-    $this->installConfig('system');
-
-    $this->featuresManager = $this->container->get('features.manager');
-    $this->configFactory = $this->container->get('config.factory');
-  }
-
-  /**
-   * @covers \Drupal\features\FeaturesManager::createConfiguration
-   */
-  public function testCreateConfiguration() {
-    $config_name = 'system_simple.testcreate';
-    $config = [
-      'string_value' => 'example',
-      'array_value' => [
-        'item1' => 'value1',
-        'item2' => 'value2',
-      ],
-    ];
-    $this->featuresManager->createConfiguration([$config_name => $config]);
-    $config_item = $this->configFactory->get($config_name);
-    $this->assertEquals($config['string_value'], $config_item->get('string_value'), 'Test config string saved');
-    $this->assertEquals($config['array_value'], $config_item->get('array_value'), 'Test config array saved');
-  }
-
-  /**
-   * @covers \Drupal\features\FeaturesManager::import
-   */
-  public function testImport() {
-    $packages = [
-      'package' => new Package('package', [
-        'configOrig' => ['system_simple.example' => 'system_simple.example'],
-        'dependencies' => [],
-        'bundle' => '',
-      ]),
-      'package2' => new Package('package2', [
-        'configOrig' => ['system_simple.example2' => 'system_simple.example2'],
-        'dependencies' => [],
-        'bundle' => '',
-      ]),
-      'package3' => new Package('package3', [
-        'configOrig' => ['system_simple.example3' => 'system_simple.example3'],
-        'dependencies' => [],
-        'bundle' => '',
-      ]),
-    ];
-    $this->featuresManager->setPackages($packages);
-
-    // Create all three configuration items.
-    $config_item = new ConfigurationItem('system_simple.example', ['value' => 'example'], ['package' => 'package']);
-    $config_item2 = new ConfigurationItem('system_simple.example2', ['value' => 'example2'], ['package' => 'package2']);
-    $config_item3 = new ConfigurationItem('system_simple.example3', ['value' => 'example3'], ['package' => 'package3']);
-    // Only save example and example3 as currently active config (so example2 will be new).
-    $this->featuresManager->setConfigCollection(['system_simple.example' => $config_item, 'system_simple.example3' => $config_item3]);
-
-    // Only import example and example2, so example3 is unchanged.
-    $result = $this->featuresManager->import(['package', 'package2']);
-    $this->assertEquals(['system_simple.example'], array_keys($result['package']['updated']), 'Expected config updated');
-    $this->assertEquals(['system_simple.example2'], array_keys($result['package2']['new']), 'Expected config created');
-
-    // Test if config was actually saved to the Factory.
-    // Cannot test for example2 because we didn't save the original config data
-    // and Package2 isn't a real module so config can't be loaded from module.
-    $example = $this->configFactory->get('system_simple.example')->get('value');
-    $this->assertEquals('example', $example, 'Example config saved');
-  }
-
-}
diff --git a/modules/contrib/features/tests/src/Unit/ConfigurationItemTest.php b/modules/contrib/features/tests/src/Unit/ConfigurationItemTest.php
deleted file mode 100644
index 255ee83..0000000
--- a/modules/contrib/features/tests/src/Unit/ConfigurationItemTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Drupal\Tests\features\Unit;
-use Drupal\features\ConfigurationItem;
-use Drupal\features\FeaturesManagerInterface;
-
-/**
- * @coversDefaultClass \Drupal\features\ConfigurationItem
- * @group features
- */
-class ConfigurationItemTest extends \PHPUnit_Framework_TestCase {
-
-  /**
-   * @covers ::fromConfigStringToConfigType
-   */
-  public function testFromConfigStringToConfigType() {
-    $this->assertEquals('system.simple', ConfigurationItem::fromConfigStringToConfigType(FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG));
-    $this->assertEquals('node', ConfigurationItem::fromConfigStringToConfigType('node'));
-  }
-
-}
diff --git a/modules/contrib/features/tests/src/Unit/FeaturesBundleTest.php b/modules/contrib/features/tests/src/Unit/FeaturesBundleTest.php
deleted file mode 100644
index 726df5e..0000000
--- a/modules/contrib/features/tests/src/Unit/FeaturesBundleTest.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-namespace Drupal\Tests\features\Unit;
-
-use Drupal\features\Entity\FeaturesBundle;
-use Drupal\Tests\UnitTestCase;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Site\Settings;
-
-/**
- * @coversDefaultClass Drupal\features\Entity\FeaturesBundle
- * @group features
- */
-class FeaturesBundleTest extends UnitTestCase {
-
-  public function setUp() {
-    parent::setUp();
-
-    // Mock an assigner.
-    $manager = new DummyPluginManager();
-
-    // Mock the container.
-    $container = $this->prophesize('\Symfony\Component\DependencyInjection\ContainerInterface');
-    $container->get('plugin.manager.features_assignment_method')
-      ->willReturn($manager);
-    \Drupal::setContainer($container->reveal());
-  }
-
-  /**
-   * @covers ::getEnabledAssignments
-   * @covers ::getAssignmentWeights
-   * @covers ::getAssignmentSettings
-   * @covers ::setAssignmentSettings
-   * @covers ::setAssignmentWeights
-   * @covers ::setEnabledAssignments
-   */
-  public function testAssignmentSetting() {
-    // Create an entity.
-    $settings = [
-      'foo' => [
-        'enabled' => TRUE,
-        'weight' => 0,
-        'my_setting' => 42,
-      ],
-      'bar' => [
-        'enabled' => FALSE,
-        'weight' => 1,
-        'another_setting' => 'value',
-      ],
-    ];
-    $bundle = new FeaturesBundle([
-      'assignments' => $settings,
-    ], 'features_bundle');
-
-    // Get assignments and attributes.
-    $this->assertArrayEquals(
-      $bundle->getEnabledAssignments(),
-      ['foo' => 'foo'],
-      'Can get enabled assignments'
-    );
-    $this->assertArrayEquals(
-      $bundle->getAssignmentWeights(),
-      ['foo' => 0, 'bar' => 1],
-      'Can get assignment weights'
-    );
-    $this->assertArrayEquals(
-      $bundle->getAssignmentSettings('foo'),
-      $settings['foo'],
-      'Can get assignment settings'
-    );
-    $this->assertArrayEquals(
-      $bundle->getAssignmentSettings(),
-      $settings,
-      'Can get all assignment settings'
-    );
-
-    // Change settings.
-    $settings['foo']['my_setting'] = 97;
-    $bundle->setAssignmentSettings('foo', $settings['foo']);
-    $this->assertArrayEquals(
-      $bundle->getAssignmentSettings('foo'),
-      $settings['foo'],
-      'Can change assignment settings'
-    );
-
-    // Change weights.
-    $settings['foo']['weight'] = 1;
-    $settings['bar']['weight'] = 0;
-    $bundle->setAssignmentWeights(['foo' => 1, 'bar' => 0]);
-    $this->assertArrayEquals(
-      $bundle->getAssignmentWeights(),
-      ['foo' => 1, 'bar' => 0],
-      'Can change assignment weights'
-    );
-    $this->assertArrayEquals(
-      $bundle->getAssignmentSettings(),
-      $settings,
-      'Weight changes are reflected in settings'
-    );
-
-    // Enable existing assignment.
-    $settings['bar']['enabled'] = TRUE;
-    $bundle->setEnabledAssignments(['foo', 'bar']);
-    $this->assertArrayEquals(
-      $bundle->getEnabledAssignments(),
-      ['foo' => 'foo', 'bar' => 'bar'],
-      'Can enable assignment'
-    );
-    $this->assertArrayEquals(
-      $bundle->getAssignmentSettings(),
-      $settings,
-      'Enabled assignment status is reflected in settings'
-    );
-
-    // Disable existing assignments.
-    $settings['foo']['enabled'] = FALSE;
-    $settings['bar']['enabled'] = FALSE;
-    $bundle->setEnabledAssignments([]);
-    $this->assertArrayEquals(
-      $bundle->getEnabledAssignments(),
-      [],
-      'Can disable assignments'
-    );
-    $this->assertArrayEquals(
-      $bundle->getAssignmentSettings(),
-      $settings,
-      'Disabled assignment status is reflected in settings'
-    );
-
-    // Enable a new assignment.
-    $settings['foo']['enabled'] = TRUE;
-    $settings['iggy'] = ['enabled' => TRUE, 'weight' => 0, 'new_setting' => 3];
-    $bundle->setEnabledAssignments(['foo', 'iggy']);
-    $this->assertArrayEquals(
-      $bundle->getEnabledAssignments(),
-      ['foo' => 'foo', 'iggy' => 'iggy'],
-      'Can enable new assignment'
-    );
-    $bundle->setAssignmentSettings('iggy', $settings['iggy']);
-    $this->assertArrayEquals(
-      $bundle->getAssignmentSettings(),
-      $settings,
-      'New enabled assignment status is reflected in settings'
-    );
-
-  }
-
-  /**
-   * @covers ::getFullName
-   * @covers ::getShortName
-   * @covers ::SetIsProfile
-   * @covers ::isProfile
-   * @covers ::getProfileName
-   * @covers ::isProfilePackage
-   * @covers ::inBundle
-   */
-  public function testFullname() {
-    $bundle = new FeaturesBundle([
-      'machine_name' => 'mybundle',
-      'profile_name' => 'mybundle'
-    ], 'mybundle');
-    $this->assertFalse($bundle->isProfile());
-    // Settings:get('profile_name') isn't defined in test, so this returns NULL.
-    $this->assertNull($bundle->getProfileName());
-    $this->assertFalse($bundle->isProfilePackage('mybundle'));
-    $this->assertEquals('mybundle_test', $bundle->getFullName('test'));
-    $this->assertEquals('mybundle_test', $bundle->getFullName('mybundle_test'));
-    $this->assertEquals('mybundle_mybundle', $bundle->getFullName('mybundle'));
-    $this->assertEquals('test', $bundle->getShortName('test'));
-    $this->assertEquals('test', $bundle->getShortName('mybundle_test'));
-    $this->assertEquals('mybundle', $bundle->getShortName('mybundle_mybundle'));
-    $this->assertEquals('mybundle', $bundle->getShortName('mybundle'));
-    $this->assertFalse($bundle->inBundle('test'));
-    $this->assertTrue($bundle->inBundle('mybundle_test'));
-    $this->assertFalse($bundle->inBundle('mybundle'));
-
-    // Now test it as a profile bundle.
-    $bundle->setIsProfile(TRUE);
-    $this->assertTrue($bundle->isProfile());
-    $this->assertTrue($bundle->isProfilePackage('mybundle'));
-    $this->assertFalse($bundle->isProfilePackage('standard'));
-    $this->assertEquals('mybundle', $bundle->getProfileName());
-    $this->assertEquals('mybundle', $bundle->getFullName('mybundle'));
-    $this->assertFalse($bundle->inBundle('test'));
-    $this->assertTrue($bundle->inBundle('mybundle_test'));
-    $this->assertTrue($bundle->inBundle('mybundle'));
-  }
-
-}
-
-/**
- * A dummy plugin manager, to help testing.
- */
-class DummyPluginManager {
-  public function getDefinition($method_id) {
-    $definition = [
-      'enabled' => TRUE,
-      'weight' => 0,
-      'default_settings' => [
-        'my_setting' => 42,
-      ],
-    ];
-    return $definition;
-  }
-
-}
diff --git a/modules/contrib/features/tests/src/Unit/FeaturesManagerTest.php b/modules/contrib/features/tests/src/Unit/FeaturesManagerTest.php
deleted file mode 100644
index d018b04..0000000
--- a/modules/contrib/features/tests/src/Unit/FeaturesManagerTest.php
+++ /dev/null
@@ -1,798 +0,0 @@
-<?php
-
-namespace Drupal\Tests\features\Unit;
-
-use Drupal\Component\Serialization\Yaml;
-use Drupal\config_update\ConfigDiffInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Config\ConfigManagerInterface;
-use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Extension\Extension;
-use Drupal\Core\Extension\InfoParser;
-use Drupal\Core\Extension\InfoParserInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\config_update\ConfigRevertInterface;
-use Drupal\features\Entity\FeaturesBundle;
-use Drupal\features\FeaturesAssignerInterface;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\features\ConfigurationItem;
-use Drupal\features\FeaturesExtensionStoragesInterface;
-use Drupal\features\FeaturesManager;
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\Package;
-use Drupal\Tests\UnitTestCase;
-use org\bovigo\vfs\vfsStream;
-use Prophecy\Argument;
-
-/**
- * @coversDefaultClass Drupal\features\FeaturesManager
- * @group features
- */
-class FeaturesManagerTest extends UnitTestCase {
-  /**
-   * @var string
-   *   The name of the install profile.
-   */
-  const PROFILE_NAME = 'my_profile';
-
-  /**
-   * @var \Drupal\features\FeaturesManagerInterface
-   */
-  protected $featuresManager;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $entityTypeManager;
-
-  /**
-   * @var \Drupal\Core\Config\StorageInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $configStorage;
-
-  /**
-   * @var \Drupal\Core\Config\ConfigFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $configFactory;
-
-  /**
-   * @var \Drupal\Core\Config\ConfigManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $configManager;
-
-  /**
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $moduleHandler;
-
-  /**
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $configReverter;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $container = new ContainerBuilder();
-    $container->set('string_translation', $this->getStringTranslationStub());
-    $container->set('app.root', $this->root);
-    // Since in Drupal 8.3 the "\Drupal::installProfile()" was introduced
-    // then we have to spoof a value for the "install_profile" parameter
-    // because it will be used by "ExtensionInstallStorage" class, which
-    // extends the "FeaturesInstallStorage".
-    // @see \Drupal\features\FeaturesConfigInstaller::__construct()
-    $container->setParameter('install_profile', '');
-    \Drupal::setContainer($container);
-
-    $entity_type = $this->getMock('\Drupal\Core\Config\Entity\ConfigEntityTypeInterface');
-    $entity_type->expects($this->any())
-      ->method('getConfigPrefix')
-      ->willReturn('custom');
-    $entity_type->expects($this->any())
-      ->method('getProvider')
-      ->willReturn('my_module');
-    $this->entityTypeManager = $this->getMock('\Drupal\Core\Entity\EntityTypeManagerInterface');
-    $this->entityTypeManager->expects($this->any())
-      ->method('getDefinition')
-      ->willReturn($entity_type);
-    $this->configFactory = $this->getMock(ConfigFactoryInterface::class);
-    $this->configStorage = $this->getMock(StorageInterface::class);
-    $this->configManager = $this->getMock(ConfigManagerInterface::class);
-    $this->moduleHandler = $this->getMock(ModuleHandlerInterface::class);
-    // getModuleList should return an array of extension objects.
-    // but we just need ::getConfigDependency isset($module_list[$provider]).
-    $this->moduleHandler->expects($this->any())
-      ->method('getModuleList')
-      ->willReturn(['my_module' => true]);
-    $this->configReverter = $this->getMock(ConfigRevertInterface::class);
-    $this->configReverter->expects($this->any())
-      ->method('import')
-      ->willReturn(true);
-    $this->configReverter->expects($this->any())
-      ->method('revert')
-      ->willReturn(true);
-    $this->featuresManager = new FeaturesManager($this->root, $this->entityTypeManager, $this->configFactory, $this->configStorage, $this->configManager, $this->moduleHandler, $this->configReverter);
-  }
-
-  /**
-   * @covers ::getActiveStorage
-   */
-  public function testGetActiveStorage() {
-    $this->assertInstanceOf('\Drupal\Core\Config\StorageInterface', $this->featuresManager->getActiveStorage());
-  }
-
-  /**
-   * @covers ::getExtensionStorages
-   */
-  public function testGetExtensionStorages() {
-    $this->assertInstanceOf('\Drupal\features\FeaturesExtensionStoragesInterface', $this->featuresManager->getExtensionStorages());
-  }
-
-  /**
-   * @covers ::getFullName
-   * @dataProvider providerTestGetFullName
-   */
-  public function testGetFullName($type, $name, $expected) {
-    $this->assertEquals($this->featuresManager->getFullName($type, $name), $expected);
-  }
-
-  /**
-   * Data provider for ::testGetFullName().
-   */
-  public function providerTestGetFullName() {
-    return [
-      [NULL, 'name', 'name'],
-      [FeaturesManagerInterface::SYSTEM_SIMPLE_CONFIG, 'name', 'name'],
-      ['custom', 'name', 'custom.name'],
-    ];
-  }
-
-  /**
-   * @covers ::getPackage
-   * @covers ::getPackages
-   * @covers ::reset
-   * @covers ::setPackages
-   */
-  public function testPackages() {
-    $packages = ['foo' => 'bar'];
-    $this->featuresManager->setPackages($packages);
-    $this->assertEquals($packages, $this->featuresManager->getPackages());
-    $this->assertEquals('bar', $this->featuresManager->getPackage('foo'));
-    $this->featuresManager->reset();
-    $this->assertArrayEquals([], $this->featuresManager->getPackages());
-    $this->assertNull($this->featuresManager->getPackage('foo'));
-  }
-
-  /**
-   * @covers ::setConfigCollection
-   * @covers ::getConfigCollection
-   */
-  public function testConfigCollection() {
-    $config = ['config' => new ConfigurationItem('', [])];
-    $this->featuresManager->setConfigCollection($config);
-    $this->assertArrayEquals($config, $this->featuresManager->getConfigCollection());
-  }
-
-  /**
-   * @covers ::setPackage
-   * @covers ::getPackage
-   */
-  public function testSetPackage() {
-    $package = new Package('foo');
-    $this->featuresManager->setPackage($package);
-    $this->assertEquals($package, $this->featuresManager->getPackage('foo'));
-  }
-
-  protected function getAssignInterPackageDependenciesConfigCollection() {
-    $config_collection = [];
-    $config_collection['example.config'] = (new ConfigurationItem('example.config', [
-      'dependencies' => [
-        'config' => [
-          'example.config2',
-          'example.config3',
-          'example.config4',
-        ],
-      ],
-    ]))->setPackage('package');
-
-    $config_collection['example.config2'] =  (new ConfigurationItem('example.config2', [
-      'dependencies' => [],
-    ]))
-      ->setPackage('package2')
-      ->setProvider('my_feature');
-    $config_collection['example.config3'] = (new ConfigurationItem('example.config3', [
-      'dependencies' => [],
-    ]))
-      ->setProvider('my_other_feature');
-    $config_collection['example.config4'] = (new ConfigurationItem('example.config3', [
-      'dependencies' => [],
-    ]))
-      ->setProvider(static::PROFILE_NAME);
-    return $config_collection;
-  }
-
-  /**
-   * @covers ::assignInterPackageDependencies
-   */
-  public function testAssignInterPackageDependenciesWithoutBundle() {
-    $assigner = $this->prophesize(FeaturesAssignerInterface::class);
-    $bundle = $this->prophesize(FeaturesBundleInterface::class);
-    // Provide a bundle without any prefix.
-    $bundle->getFullName('package')->willReturn('package');
-    $bundle->getFullName('package2')->willReturn('package2');
-    $bundle->isDefault()->willReturn(TRUE);
-    $assigner->getBundle('')->willReturn($bundle->reveal());
-    // Use the wrapper because we need ::drupalGetProfile().
-    $features_manager = new TestFeaturesManager($this->root, $this->entityTypeManager, $this->configFactory, $this->configStorage, $this->configManager, $this->moduleHandler, $this->configReverter);
-    $features_manager->setAssigner($assigner->reveal());
-
-    $features_manager->setConfigCollection($this->getAssignInterPackageDependenciesConfigCollection());
-
-    $packages = [
-      'package' => new Package('package', [
-        'config' => ['example.config', 'example.config3'],
-        'dependencies' => [],
-        'bundle' => '',
-      ]),
-      'package2' => new Package('package2', [
-        'config' => ['example.config2'],
-        'dependencies' => [],
-        'bundle' => '',
-      ]),
-    ];
-
-    $features_manager->setPackages($packages);
-    // Dependencies require the full package names.
-    $package_names = array_keys($packages);
-    $features_manager->setPackageBundleNames($bundle->reveal(), $package_names);
-    $packages = $features_manager->getPackages();
-    $features_manager->assignInterPackageDependencies($bundle->reveal(), $packages);
-    // example.config3 has a providing_feature but no assigned package.
-    // my_package2 provides configuration required by configuration in
-    // my_package.
-    // Because package assignments take precedence over providing_feature ones,
-    // package2 should have been assigned rather than my_feature.
-    $this->assertEquals(['my_other_feature', 'package2'], $packages['package']->getDependencies());
-    $this->assertEquals([], $packages['package2']->getDependencies());
-  }
-
-  /**
-   * @covers ::assignInterPackageDependencies
-   */
-  public function testAssignInterPackageDependenciesWithBundle() {
-    $assigner = $this->prophesize(FeaturesAssignerInterface::class);
-    $bundle = $this->prophesize(FeaturesBundleInterface::class);
-    // Provide a bundle without any prefix.
-    $bundle->getFullName('package')->willReturn('giraffe_package');
-    $bundle->getFullName('package2')->willReturn('giraffe_package2');
-    $bundle->getFullName('giraffe_package')->willReturn('giraffe_package');
-    $bundle->getFullName('giraffe_package2')->willReturn('giraffe_package2');
-    $bundle->isDefault()->willReturn(FALSE);
-    $bundle->getMachineName()->willReturn('giraffe');
-    $assigner->getBundle('giraffe')->willReturn($bundle->reveal());
-    // Use the wrapper because we need ::drupalGetProfile().
-    $features_manager = new TestFeaturesManager($this->root, $this->entityTypeManager, $this->configFactory, $this->configStorage, $this->configManager, $this->moduleHandler, $this->configReverter);
-    $features_manager->setAssigner($assigner->reveal());
-    $features_manager->setConfigCollection($this->getAssignInterPackageDependenciesConfigCollection());
-
-    $packages = [
-      'package' => new Package('package', [
-        'config' => ['example.config'],
-        'dependencies' => [],
-        'bundle' => 'giraffe',
-      ]),
-      'package2' => new Package('package2', [
-        'config' => ['example.config2'],
-        'dependencies' => [],
-        'bundle' => 'giraffe',
-      ]),
-    ];
-
-    $features_manager->setPackages($packages);
-    // Dependencies require the full package names.
-    $package_names = array_keys($packages);
-    $features_manager->setPackageBundleNames($bundle->reveal(), $package_names);
-    $packages = $features_manager->getPackages();
-    $features_manager->assignInterPackageDependencies($bundle->reveal(), $packages);
-    // example.config3 has a providing_feature but no assigned package.
-    // my_package2 provides configuration required by configuration in
-    // my_package.
-    // Because package assignments take precedence over providing_feature ones,
-    // package2 should have been assigned rather than my_feature.
-    $expected = ['giraffe_package2', 'my_other_feature'];
-    $this->assertEquals($expected, $packages['giraffe_package']->getDependencies());
-  }
-
-  /**
-   * @covers ::assignInterPackageDependencies
-   * @expectedException \Exception
-   * @expectedExceptionMessage The packages have not yet been prefixed with a bundle name
-   */
-  public function testAssignInterPackageDependenciesPrematureCall() {
-    $bundle = $this->prophesize(FeaturesBundleInterface::class);
-    $packages = [
-      'package' => new Package('package', [
-        'config' => ['example.config', 'example.config3'],
-        'dependencies' => [],
-        'bundle' => 'giraffe',
-      ]),
-    ];
-
-    $this->featuresManager->assignInterPackageDependencies($bundle->reveal(), $packages);
-  }
-
-  /**
-   * @covers ::reset
-   */
-  public function testReset() {
-    $packages = [
-      'package' => [
-        'machine_name' => 'package',
-        'config' => ['example.config', 'example.config3'],
-        'dependencies' => [],
-        'bundle' => 'giraffe',
-      ],
-      'package2' => [
-        'machine_name' => 'package2',
-        'config' => ['example.config2'],
-        'dependencies' => [],
-        'bundle' => 'giraffe',
-      ],
-    ];
-    $this->featuresManager->setPackages($packages);
-
-    $config_item = new ConfigurationItem('example', [], ['package' => 'package']);
-    $config_item2 = new ConfigurationItem('example2', [], ['package' => 'package2']);
-    $this->featuresManager->setConfigCollection([$config_item, $config_item2]);
-
-    $this->featuresManager->reset();
-    $this->assertEmpty($this->featuresManager->getPackages());
-    $config_collection = $this->featuresManager->getConfigCollection();
-    $this->assertEquals('', $config_collection[0]->getPackage());
-    $this->assertEquals('', $config_collection[1]->getPackage());
-  }
-
-
-  /**
-   * @covers ::detectMissing
-   */
-  public function testDetectMissing() {
-    $package = new Package('test-package', [
-      'configOrig' => ['test_config', 'test_config_non_existing'],
-    ]);
-
-    $config_collection = [];
-    $config_collection['test_config'] = new ConfigurationItem('test_config', []);
-    $this->featuresManager->setConfigCollection($config_collection);
-
-    $this->assertEquals(['test_config_non_existing'], $this->featuresManager->detectMissing($package));
-  }
-
-  /**
-   * @covers ::detectOverrides
-   */
-  public function testDetectOverrides() {
-    $config_diff = $this->prophesize(ConfigDiffInterface::class);
-    $config_diff->same(Argument::cetera())->will(function($args) {
-      return $args[0] == $args[1];
-    });
-    \Drupal::getContainer()->set('config_update.config_diff', $config_diff->reveal());
-
-    $package = new Package('test-package', [
-      'config' => ['test_config', 'test_overridden'],
-    ]);
-
-    $config_storage = $this->prophesize(StorageInterface::class);
-    $config_storage->read('test_config')->willReturn([
-      'key' => 'value',
-    ]);
-    $config_storage->read('test_overridden')->willReturn([
-      'key2' => 'value2',
-    ]);
-
-    $extension_storage = $this->prophesize(FeaturesExtensionStoragesInterface::class);
-    $extension_storage->read('test_config')->willReturn([
-      'key' => 'value',
-    ]);
-    $extension_storage->read('test_overridden')->willReturn([
-      'key2' => 'value0',
-    ]);
-
-
-    $features_manager = new TestFeaturesManager($this->root, $this->entityTypeManager, $this->configFactory, $config_storage->reveal(), $this->configManager, $this->moduleHandler, $this->configReverter);
-    $features_manager->setExtensionStorages($extension_storage->reveal());
-
-    $this->assertEquals(['test_overridden'], $features_manager->detectOverrides($package));
-  }
-
-  /**
-   * @covers ::assignConfigPackage
-   */
-  public function testAssignConfigPackageWithNonProviderExcludedConfig() {
-    $assigner = $this->prophesize(FeaturesAssignerInterface::class);
-    $bundle = $this->prophesize(FeaturesBundleInterface::class);
-    $bundle->isProfilePackage('test_package')->willReturn(FALSE);
-    $assigner->getBundle(NULL)->willReturn($bundle->reveal());
-    $this->featuresManager->setAssigner($assigner->reveal());
-
-    $config_collection = [
-      'test_config' => new ConfigurationItem('test_config', []),
-      'test_config2' => new ConfigurationItem('test_config2', [
-        'dependencies' => [
-          'module' => ['example'],
-        ]
-      ], [
-        'subdirectory' => InstallStorage::CONFIG_INSTALL_DIRECTORY,
-      ]),
-    ];
-    $this->featuresManager->setConfigCollection($config_collection);
-
-    $package = new Package('test_package');
-    $this->featuresManager->setPackage($package);
-
-    $this->featuresManager->assignConfigPackage('test_package', ['test_config', 'test_config2']);
-
-    $this->assertEquals(['test_config', 'test_config2'], $this->featuresManager->getPackage('test_package')->getConfig());
-    $this->assertEquals(['example', 'my_module'], $this->featuresManager->getPackage('test_package')->getDependencies());
-  }
-
-  /**
-   * @covers ::assignConfigPackage
-   */
-  public function testAssignConfigPackageWithProviderExcludedConfig() {
-    $config_collection = [
-      'test_config' => new ConfigurationItem('test_config', []),
-      'test_config2' => new ConfigurationItem('test_config2', [], ['providerExcluded' => TRUE]),
-    ];
-    $this->featuresManager->setConfigCollection($config_collection);
-
-    $feature_assigner = $this->prophesize(FeaturesAssignerInterface::class);
-    $feature_assigner->getBundle(NULL)->willReturn(new FeaturesBundle(['machine_name' => 'default'], 'features_bundle'));
-    $this->featuresManager->setAssigner($feature_assigner->reveal());
-
-    $package = new Package('test_package');
-    $original_package = clone $package;
-
-    $this->featuresManager->setPackage($package);
-    $this->featuresManager->assignConfigPackage('test_package', ['test_config', 'test_config2']);
-    $this->assertEquals(['test_config'], $this->featuresManager->getPackage('test_package')->getConfig(), 'just assign new packages');
-
-    $this->featuresManager->setPackage($original_package);
-    $this->featuresManager->assignConfigPackage('test_package', ['test_config', 'test_config2'], TRUE);
-    $this->assertEquals(['test_config', 'test_config2'], $this->featuresManager->getPackage('test_package')->getConfig(), 'just assign new packages');
-  }
-
-  /**
-   * @covers ::initPackageFromExtension
-   * @covers ::getPackageObject
-   */
-  public function testInitPackageFromNonInstalledExtension() {
-    $extension = new Extension($this->root, 'module', 'modules/test_module/test_module.info.yml');
-
-    $info_parser = $this->prophesize(InfoParserInterface::class);
-    $info_parser->parse($this->root . '/modules/test_module/test_module.info.yml')->willReturn([
-      'name' => 'Test module',
-      'description' => 'test description',
-      'type' => 'module',
-    ]);
-    \Drupal::getContainer()->set('info_parser', $info_parser->reveal());
-
-    $bundle = $this->prophesize(FeaturesBundle::class);
-    $bundle->getFullName('test_module')->willReturn('test_module');
-    $bundle->isDefault()->willReturn(TRUE);
-
-    $assigner = $this->prophesize(FeaturesAssignerInterface::class);
-    $assigner->findBundle(Argument::cetera())->willReturn($bundle->reveal());
-    $this->featuresManager->setAssigner($assigner->reveal());
-
-    $result = $this->featuresManager->initPackageFromExtension($extension);
-    $this->assertInstanceOf(Package::class, $result);
-    // Ensure that that calling the function twice works.
-    $result = $this->featuresManager->initPackageFromExtension($extension);
-    $this->assertInstanceOf(Package::class, $result);
-
-    $this->assertEquals('test_module', $result->getMachineName());
-    $this->assertEquals('Test module', $result->getName());
-    $this->assertEquals('test description', $result->getDescription());
-    $this->assertEquals('module', $result->getType());
-
-    $this->assertEquals(FeaturesManagerInterface::STATUS_UNINSTALLED, $result->getStatus());
-  }
-
-  /**
-   * @covers ::initPackageFromExtension
-   * @covers ::getPackageObject
-   */
-  public function testInitPackageFromInstalledExtension() {
-    $extension = new Extension($this->root, 'module', 'modules/test_module/test_module.info.yml');
-
-    $info_parser = $this->prophesize(InfoParserInterface::class);
-    $info_parser->parse($this->root . '/modules/test_module/test_module.info.yml')->willReturn([
-      'name' => 'Test module',
-      'description' => 'test description',
-      'type' => 'module',
-    ]);
-    \Drupal::getContainer()->set('info_parser', $info_parser->reveal());
-
-    $bundle = $this->prophesize(FeaturesBundle::class);
-    $bundle->getFullName('test_module')->willReturn('test_module');
-    $bundle->isDefault()->willReturn(TRUE);
-
-    $assigner = $this->prophesize(FeaturesAssignerInterface::class);
-    $assigner->findBundle(Argument::cetera())->willReturn($bundle->reveal());
-    $this->featuresManager->setAssigner($assigner->reveal());
-
-    $this->moduleHandler->expects($this->any())
-      ->method('moduleExists')
-      ->with('test_module')
-      ->willReturn(TRUE);
-
-    $result = $this->featuresManager->initPackageFromExtension($extension);
-    $this->assertEquals(FeaturesManagerInterface::STATUS_INSTALLED, $result->getStatus());
-  }
-
-  public function testDetectNewWithNoConfig() {
-    $package = new Package('test_feature');
-
-    $this->assertEmpty($this->featuresManager->detectNew($package));
-  }
-
-  public function testDetectNewWithNoNewConfig() {
-    $package = new Package('test_feature', ['config' => ['test_config']]);
-
-    $extension_storage = $this->prophesize(FeaturesExtensionStoragesInterface::class);
-    $extension_storage->read('test_config')->willReturn([
-      'key' => 'value',
-    ]);
-
-    $features_manager = new TestFeaturesManager($this->root, $this->entityTypeManager, $this->configFactory, $this->configStorage, $this->configManager, $this->moduleHandler, $this->configReverter);
-    $features_manager->setExtensionStorages($extension_storage->reveal());
-
-    $this->assertEmpty($features_manager->detectNew($package));
-  }
-
-  public function testDetectNewWithNewConfig() {
-    $package = new Package('test_feature', ['config' => ['test_config']]);
-
-    $extension_storage = $this->prophesize(FeaturesExtensionStoragesInterface::class);
-    $extension_storage->read('test_config')->willReturn(FALSE);
-
-    $features_manager = new TestFeaturesManager($this->root, $this->entityTypeManager, $this->configFactory, $this->configStorage, $this->configManager, $this->moduleHandler, $this->configReverter);
-    $features_manager->setExtensionStorages($extension_storage->reveal());
-
-    $this->assertEquals(['test_config'], $features_manager->detectNew($package));
-  }
-
-  /**
-   * @todo This could have of course much more test coverage.
-   *
-   * @covers ::mergeInfoArray
-   *
-   * @dataProvider providerTestMergeInfoArray
-   */
-  public function testMergeInfoArray($expected, $info1, $info2, $keys = []) {
-    $this->assertSame($expected, $this->featuresManager->mergeInfoArray($info1, $info2, $keys));
-  }
-
-  public function providerTestMergeInfoArray() {
-    $data = [];
-    $data['empty-info'] = [[], [], []];
-    $data['override-info'] = [
-      ['name' => 'New name', 'core' => '8.x'],
-      ['name' => 'Old name', 'core' => '8.x'],
-      ['name' => 'New name']
-    ];
-    $data['dependency-merging'] = [
-      ['dependencies' => ['a', 'b', 'c', 'd', 'e']],
-      ['dependencies' => ['b', 'd', 'c']],
-      ['dependencies' => ['a', 'b', 'e']],
-      [],
-    ];
-
-    return $data;
-  }
-
-  /**
-   * @covers ::initPackage
-   **/
-  public function testInitPackageWithNewPackage() {
-    $bundle = new FeaturesBundle(['machine_name' => 'test'], 'features_bundle');
-
-    $features_manager = new TestFeaturesManager($this->root, $this->entityTypeManager, $this->configFactory, $this->configStorage, $this->configManager, $this->moduleHandler, $this->configReverter);
-    $features_manager->setAllModules([]);
-
-    $package = $features_manager->initPackage('test_feature', 'test name', 'test description', 'module', $bundle);
-
-    $this->assertInstanceOf(Package::class, $package);
-    $this->assertEquals('test_feature', $package->getMachineName());
-    $this->assertEquals('test name', $package->getName());
-    $this->assertEquals('test description', $package->getDescription());
-    $this->assertEquals('module', $package->getType());
-    $this->assertEquals(['bundle' => 'test'], $package->getFeaturesInfo());
-    $this->assertEquals('test', $package->getBundle());
-    $this->assertEquals(FALSE, $package->getRequired());
-    $this->assertEquals([], $package->getExcluded());
-  }
-
-  /**
-   * @covers ::getFeaturesInfo
-   * @covers ::getFeaturesModules
-   **/
-  public function testInitPackageWithExistingPackage() {
-    $bundle = new FeaturesBundle(['machine_name' => 'test'], 'features_bundle');
-
-    $features_manager = new TestFeaturesManager('vfs://drupal', $this->entityTypeManager, $this->configFactory, $this->configStorage, $this->configManager, $this->moduleHandler, $this->configReverter);
-
-    vfsStream::setup('drupal');
-    \Drupal::getContainer()->set('app.root', 'vfs://drupal');
-    vfsStream::create([
-      'modules' => [
-        'test_feature' => [
-          'test_feature.info.yml' => <<<EOT
-name: Test feature 2
-type: module
-core: 8.x
-description: test description 2
-EOT
-      ,
-          'test_feature.features.yml' => <<<EOT
-bundle: test
-excluded:
-  - system.theme
-required: true
-EOT
-          ,
-        ],
-      ],
-    ]);
-    $extension = new Extension('vfs://drupal', 'module', 'modules/test_feature/test_feature.info.yml');
-    $features_manager->setAllModules(['test_feature' => $extension]);
-
-    $this->moduleHandler->expects($this->any())
-      ->method('exists')
-      ->with('test_feature')
-      ->willReturn(TRUE);
-
-    $info_parser = new InfoParser();
-    \Drupal::getContainer()->set('info_parser', $info_parser);
-
-    $package = $features_manager->initPackage('test_feature', 'test name', 'test description', 'module', $bundle);
-
-    $this->assertEquals([
-      'bundle' => 'test',
-      'excluded' => [
-        0 => 'system.theme',
-      ],
-      'required' => TRUE,
-    ], $features_manager->getFeaturesInfo($extension));
-    $this->assertEquals(['test_feature' => $extension], $features_manager->getFeaturesModules($bundle));
-
-    $this->assertInstanceOf(Package::class, $package);
-    $this->assertEquals([
-      'bundle' => 'test',
-      'excluded' => [
-        0 => 'system.theme',
-      ],
-      'required' => TRUE,
-    ], $package->getFeaturesInfo());
-    $this->assertEquals('test', $package->getBundle());
-    $this->assertEquals(TRUE, $package->getRequired());
-    $this->assertEquals(['system.theme'], $package->getExcluded());
-  }
-
-  /**
-   * @covers ::prepareFiles
-   */
-  public function testPrepareFiles() {
-    $packages = [];
-    $packages['test_feature'] = new Package('test_feature', [
-      'config' => ['test_config'],
-      'name' => 'Test feature',
-    ]);
-
-    $config_collection = [];
-    $config_collection['test_config'] = new ConfigurationItem('test_config', ['foo' => 'bar']);
-
-    $this->featuresManager->setConfigCollection($config_collection);
-    $this->featuresManager->prepareFiles($packages);
-
-    $files = $packages['test_feature']->getFiles();
-    $this->assertCount(3, $files);
-    $this->assertEquals('test_feature.info.yml', $files['info']['filename']);
-    $this->assertEquals(Yaml::encode([
-      'name' => 'Test feature',
-      'type' => 'module',
-      'core' => '8.x',
-    ]), $files['info']['string']);
-    $this->assertEquals(Yaml::encode(TRUE), $files['features']['string']);
-
-    $this->assertEquals('test_config.yml', $files['test_config']['filename']);
-    $this->assertEquals(Yaml::encode([
-      'foo' => 'bar'
-    ]), $files['test_config']['string']);
-
-    $this->assertEquals('test_feature.features.yml', $files['features']['filename']);
-    $this->assertEquals(Yaml::encode(TRUE), $files['features']['string']);
-  }
-
-  /**
-   * @covers ::getExportInfo
-   */
-  public function testGetExportInfoWithoutBundle() {
-    $config_factory = $this->getConfigFactoryStub([
-      'features.settings' => [
-        'export' => [
-          'folder' => 'custom',
-        ],
-      ],
-    ]);
-    $this->featuresManager = new FeaturesManager($this->root, $this->entityTypeManager, $config_factory, $this->configStorage, $this->configManager, $this->moduleHandler, $this->configReverter);
-
-    $package = new Package('test_feature');
-    $result = $this->featuresManager->getExportInfo($package);
-
-    $this->assertEquals(['test_feature', 'modules/custom'], $result);
-  }
-
-  /**
-   * @covers ::getExportInfo
-   */
-  public function testGetExportInfoWithBundle() {
-    $config_factory = $this->getConfigFactoryStub([
-      'features.settings' => [
-        'export' => [
-          'folder' => 'custom',
-        ],
-      ],
-    ]);
-    $this->featuresManager = new FeaturesManager($this->root, $this->entityTypeManager, $config_factory, $this->configStorage, $this->configManager, $this->moduleHandler, $this->configReverter);
-
-    $package = new Package('test_feature');
-    $bundle = new FeaturesBundle(['machine_name' => 'test_bundle'], 'features_bundle');
-
-    $result = $this->featuresManager->getExportInfo($package, $bundle);
-
-    $this->assertEquals(['test_bundle_test_feature', 'modules/custom'], $result);
-  }
-
-}
-
-class TestFeaturesManager extends FeaturesManager {
-
-  protected $allModules;
-
-  /**
-   * @param \Drupal\features\FeaturesExtensionStoragesInterface $extensionStorages
-   */
-  public function setExtensionStorages($extensionStorages) {
-    $this->extensionStorages = $extensionStorages;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAllModules() {
-    if (isset($this->allModules)) {
-      return $this->allModules;
-    }
-    return parent::getAllModules();
-  }
-
-  /**
-   * @param mixed $all_modules
-   */
-  public function setAllModules($all_modules) {
-    $this->allModules = $all_modules;
-    return $this;
-  }
-
-  protected function drupalGetProfile() {
-    return FeaturesManagerTest::PROFILE_NAME;
-  }
-
-}
diff --git a/modules/contrib/features/tests/src/Unit/PackageTest.php b/modules/contrib/features/tests/src/Unit/PackageTest.php
deleted file mode 100644
index f1b3222..0000000
--- a/modules/contrib/features/tests/src/Unit/PackageTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\Tests\features\Unit;
-
-use Drupal\features\Package;
-
-/**
- * @coversDefaultClass \Drupal\features\Package
- * @group features
- */
-class PackageTest extends \PHPUnit_Framework_TestCase {
-
-  /**
-   * @covers ::setFeaturesInfo
-   */
-  public function testSetFeaturesInfo() {
-    $package = new Package('test_feature', []);
-
-    $this->assertEquals([], $package->getFeaturesInfo());
-    $package->setFeaturesInfo(['bundle' => 'test_bundle']);
-    $this->assertEquals(['bundle' => 'test_bundle'], $package->getFeaturesInfo());
-    $this->assertEquals('test_bundle', $package->getBundle());
-  }
-
-  public function testGetConfig() {
-    $package = new Package('test_feature', ['config' => ['test_config_a', 'test_config_b']]);
-    $this->assertEquals(['test_config_a', 'test_config_b'], $package->getConfig());
-    return $package;
-  }
-
-  /**
-   * @depends testGetConfig
-   * @covers ::appendConfig
-   */
-  public function testAppendConfig(Package $package) {
-    $package->appendConfig('test_config_a');
-    $package->appendConfig('test_config_c');
-
-    $this->assertEquals(['test_config_a', 'test_config_b', 'test_config_c'], array_values($package->getConfig()));
-    return $package;
-  }
-
-  /**
-   * @depends testAppendConfig
-   * @covers ::removeConfig
-   */
-  public function testRemoveConfig(Package $package) {
-    $package->removeConfig('test_config_a');
-
-    $this->assertEquals(['test_config_b', 'test_config_c'], array_values($package->getConfig()));
-  }
-
-}
diff --git a/modules/ctools/LICENSE.txt b/modules/ctools/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/ctools/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/ctools/composer.json b/modules/ctools/composer.json
deleted file mode 100644
index 62fe080..0000000
--- a/modules/ctools/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "name": "drupal/ctools",
-  "description": "Provides a number of utility and helper APIs for Drupal developers and site builders.",
-  "type": "drupal-module",
-  "license": "GPL-2.0+",
-  "minimum-stability": "dev",
-  "homepage": "https://www.drupal.org/project/ctools",
-  "authors": [
-    {
-      "name": "Kris Vanderwater (EclipseGc)",
-      "homepage": "https://www.drupal.org/u/eclipsegc",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Jakob Perry (japerry)",
-      "homepage": "https://www.drupal.org/u/japerry",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Tim Plunkett (tim.plunkett)",
-      "homepage": "https://www.drupal.org/u/timplunkett",
-      "role": "Maintainer"
-    },
-    {
-      "name": "James Gilliland (neclimdul)",
-      "homepage": "https://www.drupal.org/u/neclimdul",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Daniel Wehner (dawehner)",
-      "homepage": "https://www.drupal.org/u/dawehner",
-      "role": "Maintainer"
-    }
-  ],
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/ctools",
-    "source": "http://cgit.drupalcode.org/ctools"
-  },
-  "require": {}
-}
diff --git a/modules/ctools/config/schema/ctools.schema.yml b/modules/ctools/config/schema/ctools.schema.yml
deleted file mode 100644
index 596c3fd..0000000
--- a/modules/ctools/config/schema/ctools.schema.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-ctools.context:
-  type: mapping
-  label: Context
-  mapping:
-    label:
-      type: label
-      label: 'Label of the context'
-    type:
-      type: string
-      label: 'Context type'
-    description:
-      type: string
-      label: 'Description of the context'
-    value:
-      type: string
-      label: 'Context value'
-
-ctools.relationship:
-  type: mapping
-  label: 'Relationship'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-
-condition.plugin.entity_bundle:*:
-  type: condition.plugin
-  mapping:
-    bundles:
-      type: sequence
-      sequence:
-        type: string
-
-ctools.block_plugin.*:
-  type: block.settings.[id]
-  mapping:
-    region:
-      type: string
-      label: 'Region'
-    weight:
-      type: integer
-      label: 'Weight'
-    uuid:
-      type: string
-      label: 'UUID'
-    context_mapping:
-      type: sequence
-      label: 'Context assignments'
-      sequence:
-        - type: string
-
-ctools.block_display_variant:
-  type: display_variant.plugin
-  label: 'Block display variant'
-  mapping:
-    blocks:
-      type: sequence
-      label: 'Blocks'
-      sequence:
-        - type: ctools.block_plugin.[id]
diff --git a/modules/ctools/ctools.info.yml b/modules/ctools/ctools.info.yml
deleted file mode 100644
index 3b54b6a..0000000
--- a/modules/ctools/ctools.info.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Chaos tools
-type: module
-description: 'Provides a number of utility and helper APIs for Drupal developers and site builders.'
-package: Chaos tool suite
-# core: 8.x
-
-# Information added by Drupal.org packaging script on 2017-04-28
-version: '8.x-3.0'
-core: '8.x'
-project: 'ctools'
-datestamp: 1493401747
diff --git a/modules/ctools/ctools.module b/modules/ctools/ctools.module
deleted file mode 100644
index ec4daba..0000000
--- a/modules/ctools/ctools.module
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Implements hook_theme().
- */
-function ctools_theme($existing, $type, $theme, $path) {
-  return [
-    'ctools_wizard_trail' => [
-      'variables' => [
-        'wizard' => NULL,
-        'cached_values' => [],
-        'trail' => [],
-        'divider' => ' » ',
-        'step' => NULL,
-      ],
-    ],
-    'ctools_wizard_trail_links' => [
-      'variables' => [
-        'wizard' => NULL,
-        'cached_values' => [],
-        'trail' => [],
-        'divider' => ' » ',
-        'step' => NULL,
-      ],
-    ],
-  ];
-}
-
-function template_preprocess_ctools_wizard_trail(&$variables) {
-  /** @var $wizard \Drupal\ctools\Wizard\FormWizardInterface|\Drupal\ctools\Wizard\EntityFormWizardInterface */
-  $wizard = $variables['wizard'];
-  $cached_values = $variables['cached_values'];
-  $trail = $variables['trail'];
-  $variables['step'] = $wizard->getStep($cached_values);
-  foreach ($wizard->getOperations($cached_values) as $step => $operation) {
-    $trail[$step] = !empty($operation['title']) ? $operation['title'] : '';
-  }
-  $variables['trail'] = $trail;
-}
-
-function template_preprocess_ctools_wizard_trail_links(&$variables) {
-  /** @var $wizard \Drupal\ctools\Wizard\FormWizardInterface|\Drupal\ctools\Wizard\EntityFormWizardInterface */
-  $wizard = $variables['wizard'];
-  $cached_values = $variables['cached_values'];
-  $trail = $variables['trail'];
-  $variables['step'] = $wizard->getStep($cached_values);
-  foreach ($wizard->getOperations($cached_values) as $step => $operation) {
-    $parameters = $wizard->getNextParameters($cached_values);
-    // Override step to be the step we want.
-    $parameters['step'] = $step;
-    $trail[$step] = [
-      'title' => !empty($operation['title']) ? $operation['title'] : '',
-      'url' => new \Drupal\Core\Url($wizard->getRouteName(), $parameters),
-    ];
-  }
-  $variables['trail'] = $trail;
-}
-
-function ctools_condition_info_alter(&$definitions) {
-  // If the node_type's class is unaltered, use a custom ctools implementation.
-  if (isset($definitions['node_type']) && $definitions['node_type']['class'] == 'Drupal\node\Plugin\Condition\NodeType') {
-    $definitions['node_type']['class'] = 'Drupal\ctools\Plugin\Condition\NodeType';
-  }
-}
diff --git a/modules/ctools/ctools.services.yml b/modules/ctools/ctools.services.yml
deleted file mode 100644
index eaa38b8..0000000
--- a/modules/ctools/ctools.services.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-services:
-  ctools.wizard.form:
-    class: Drupal\ctools\Controller\WizardFormController
-    arguments: ['@controller_resolver', '@form_builder', '@ctools.wizard.factory']
-  ctools.wizard.entity.form:
-    class: Drupal\ctools\Controller\WizardEntityFormController
-    arguments: ['@controller_resolver', '@form_builder', '@ctools.wizard.factory', '@entity.manager']
-  ctools.wizard_enhancer:
-    class: Drupal\ctools\Routing\Enhancer\WizardEnhancer
-    tags:
-      - { name: route_enhancer }
-  ctools.wizard.factory:
-    class: Drupal\ctools\Wizard\WizardFactory
-    arguments: ['@form_builder', '@event_dispatcher']
-  ctools.paramconverter.tempstore:
-    class: Drupal\ctools\ParamConverter\TempstoreConverter
-    arguments: ['@user.shared_tempstore', '@entity_type.manager']
-    tags:
-      - { name: paramconverter }
-  ctools.typed_data.resolver:
-    class: Drupal\ctools\TypedDataResolver
-    arguments: ['@typed_data_manager', '@string_translation']
-  ctools.access:
-    class: Drupal\ctools\Access\TempstoreAccess
-    arguments: ['@user.shared_tempstore']
-    tags:
-      - { name: access_check, applies_to: _ctools_access }
-  plugin.manager.ctools.relationship:
-    class: Drupal\ctools\Plugin\RelationshipManager
-    parent: default_plugin_manager
-  ctools.context_mapper:
-    class: Drupal\ctools\ContextMapper
-    arguments: ['@entity.repository']
-  ctools.serializable.tempstore.factory:
-    class: Drupal\ctools\SerializableTempstoreFactory
-    arguments: ['@keyvalue.expirable', '@lock', '@request_stack', '%user.tempstore.expire%']
-    tags:
-      - { name: backend_overridable }
diff --git a/modules/ctools/modules/ctools_block/config/schema/ctools_block.schema.yml b/modules/ctools/modules/ctools_block/config/schema/ctools_block.schema.yml
deleted file mode 100644
index 6b1520a..0000000
--- a/modules/ctools/modules/ctools_block/config/schema/ctools_block.schema.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-block.settings.entity_field:*:*:
-  type: block_settings
-  label: 'Entity field block'
-  mapping:
-    formatter:
-      type: mapping
-      label: 'Field formatter'
-      mapping:
-        type:
-          type: string
-          label: 'Format type machine name'
-        weight:
-          type: integer
-          label: 'Weight'
-        region:
-          type: string
-          label: 'Region'
-        label:
-          type: string
-          label: 'Label setting machine name'
-        settings:
-          type: field.formatter.settings.[%parent.type]
-          label: 'Settings'
-        third_party_settings:
-          type: sequence
-          label: 'Third party settings'
-          sequence:
-            type: field.formatter.third_party.[%key]
diff --git a/modules/ctools/modules/ctools_block/ctools_block.info.yml b/modules/ctools/modules/ctools_block/ctools_block.info.yml
deleted file mode 100644
index e9fdf7c..0000000
--- a/modules/ctools/modules/ctools_block/ctools_block.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Chaos tools blocks
-type: module
-description: 'Provides improvements to blocks that will one day be added to Drupal core.'
-package: Chaos tool suite (Experimental)
-# version: 3.x
-# core: 8.x
-dependencies:
-  - ctools
-
-# Information added by Drupal.org packaging script on 2017-04-28
-version: '8.x-3.0'
-core: '8.x'
-project: 'ctools'
-datestamp: 1493401747
diff --git a/modules/ctools/modules/ctools_block/src/Plugin/Block/EntityField.php b/modules/ctools/modules/ctools_block/src/Plugin/Block/EntityField.php
deleted file mode 100644
index 14cf6ac..0000000
--- a/modules/ctools/modules/ctools_block/src/Plugin/Block/EntityField.php
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-
-namespace Drupal\ctools_block\Plugin\Block;
-
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Block\BlockBase;
-use Drupal\Core\Cache\CacheableMetadata;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Field\FieldTypePluginManagerInterface;
-use Drupal\Core\Field\FormatterPluginManager;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Plugin\ContextAwarePluginInterface;
-use Drupal\Core\Render\Element;
-use Drupal\Core\Session\AccountInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a block to a field on an entity.
- *
- * @Block(
- *   id = "entity_field",
- *   deriver = "Drupal\ctools_block\Plugin\Deriver\EntityFieldDeriver",
- * )
- */
-class EntityField extends BlockBase implements ContextAwarePluginInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The entity field manager.
-   *
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
-   */
-  protected $entityFieldManager;
-
-  /**
-   * The field type manager.
-   *
-   * @var \Drupal\Core\Field\FieldTypePluginManagerInterface
-   */
-  protected $fieldTypeManager;
-
-  /**
-   * The formatter manager.
-   *
-   * @var \Drupal\Core\Field\FormatterPluginManager
-   */
-  protected $formatterManager;
-
-  /**
-   * The entity type id.
-   *
-   * @var string
-   */
-  protected $entityTypeId;
-
-  /**
-   * The field name.
-   *
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * The field definition.
-   *
-   * @var \Drupal\Core\Field\FieldDefinitionInterface
-   */
-  protected $fieldDefinition;
-
-  /**
-   * The field storage definition.
-   *
-   * @var \Drupal\Core\Field\FieldStorageDefinitionInterface
-   */
-  protected $fieldStorageDefinition;
-
-  /**
-   * Constructs a new EntityField.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
-   *   The entity field manager.
-   * @param \Drupal\Core\Field\FormatterPluginManager $formatter_manager
-   *   The formatter manager.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, FieldTypePluginManagerInterface $field_type_manager, FormatterPluginManager $formatter_manager) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->entityFieldManager = $entity_field_manager;
-    $this->fieldTypeManager = $field_type_manager;
-    $this->formatterManager = $formatter_manager;
-
-    // Get the entity type and field name from the plugin id.
-    list (, $entity_type_id, $field_name) = explode(':', $plugin_id);
-    $this->entityTypeId = $entity_type_id;
-    $this->fieldName = $field_name;
-
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity_type.manager'),
-      $container->get('entity_field.manager'),
-      $container->get('plugin.manager.field.field_type'),
-      $container->get('plugin.manager.field.formatter')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build() {
-    /** @var \Drupal\Core\Entity\FieldableEntityInterface $entity */
-    $entity = $this->getContextValue('entity');
-    $build = [];
-    /** @var \Drupal\Core\Field\FieldItemListInterface $field */
-    $field = $entity->{$this->fieldName};
-    $display_settings = $this->getConfiguration()['formatter'];
-    $build['field'] = $field->view($display_settings);
-
-    // Set the cache data appropriately.
-    $build['#cache']['contexts'] = $this->getCacheContexts();
-    $build['#cache']['tags'] = $this->getCacheTags();
-    $build['#cache']['max-age'] = $this->getCacheMaxAge();
-
-    return $build;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function blockAccess(AccountInterface $account) {
-    /** @var \Drupal\Core\Entity\EntityInterface $entity */
-    $entity = $this->getContextValue('entity');
-    // Make sure we have access to the entity.
-    $access = $entity->access('view', $account, TRUE);
-    if ($access->isAllowed()) {
-      // Check that the entity in question has this field.
-      if ($entity instanceof FieldableEntityInterface && $entity->hasField($this->fieldName)) {
-        // Check field access.
-        $field_access = $this->entityTypeManager
-          ->getAccessControlHandler($this->entityTypeId)
-          ->fieldAccess('view', $this->getFieldDefinition(), $account);
-
-        if ($field_access) {
-          // Build a renderable array for the field.
-          $build = $entity->get($this->fieldName)->view($this->configuration['formatter']);
-          // If there are actual renderable children, grant access.
-          if (Element::children($build)) {
-            return AccessResult::allowed();
-          }
-        }
-      }
-      // Entity doesn't have this field, so access is denied.
-      return AccessResult::forbidden();
-    }
-    // If we don't have access to the entity, return the forbidden result.
-    return $access;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    $field_type_definition = $this->getFieldTypeDefinition();
-    return [
-      'formatter' => [
-        'label' => 'above',
-        'type' => $field_type_definition['default_formatter'] ?: '',
-        'settings' => [],
-        'third_party_settings' => [],
-        'weight' => 0,
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function blockForm($form, FormStateInterface $form_state) {
-    $config = $this->getConfiguration();
-
-    $form['formatter_label'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Label'),
-      '#options' => [
-        'above' => $this->t('Above'),
-        'inline' => $this->t('Inline'),
-        'hidden' => '- ' . $this->t('Hidden') . ' -',
-        'visually_hidden' => '- ' . $this->t('Visually Hidden') . ' -',
-      ],
-      '#default_value' => $config['formatter']['label'],
-    ];
-
-    $form['formatter_type'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Formatter'),
-      '#options' => $this->getFormatterOptions(),
-      '#default_value' => $config['formatter']['type'],
-      '#ajax' => [
-        'callback' => [static::class, 'formatterSettingsAjaxCallback'],
-        'wrapper' => 'formatter-settings-wrapper',
-        'effect' => 'fade',
-      ],
-    ];
-
-    // Add the formatter settings to the form via AJAX.
-    $form['#process'][] = [$this, 'formatterSettingsProcessCallback'];
-    $form['formatter_settings_wrapper'] = [
-      '#prefix' => '<div id="formatter-settings-wrapper">',
-      '#suffix' => '</div>',
-    ];
-    $form['formatter_settings_wrapper']['formatter_settings'] = [
-      '#tree' => TRUE,
-      // The settings from the formatter plugin will be added in the
-      // ::formatterSettingsProcessCallback method.
-    ];
-
-    return $form;
-  }
-
-  /**
-   * Render API callback: builds the formatter settings elements.
-   */
-  public function formatterSettingsProcessCallback(array &$element, FormStateInterface $form_state, array &$complete_form) {
-    $config = $this->getConfiguration();
-    $parents_base = $element['#parents'];
-    $formatter_parent = array_merge($parents_base, ['formatter_type']);
-    $formatter_settings_parent = array_merge($parents_base, ['formatter_settings']);
-
-    $settings_element = &$element['formatter_settings_wrapper']['formatter_settings'];
-
-    // Set the #parents on the formatter_settings so they end up as a peer to
-    // formatter_type.
-    $settings_element['#parents'] = $formatter_settings_parent;
-
-    // Get the formatter name in a way that works regardless of whether we're
-    // getting the value via AJAX or not.
-    $formatter_name = NestedArray::getValue($form_state->getUserInput(), $formatter_parent) ?: $element['formatter_type']['#default_value'];
-
-    // Place the formatter settings on the form if a formatter is selected.
-    $formatter = $this->getFormatter($formatter_name, $form_state->getValue('formatter_label'), $form_state->getValue($formatter_settings_parent, $config['formatter']['settings']), $config['formatter']['third_party_settings']);
-    $settings_element = array_merge($formatter->settingsForm($settings_element, $form_state), $settings_element);
-
-    // Store the array parents for our element so that we can use it to pull out
-    // the formatter settings in our AJAX callback.
-    $complete_form['#formatter_array_parents'] = $element['#array_parents'];
-
-    return $element;
-  }
-
-  /**
-   * Render API callback: gets the layout settings elements.
-   */
-  public static function formatterSettingsAjaxCallback(array $form, FormStateInterface $form_state) {
-    $formatter_array_parents = $form['#formatter_array_parents'];
-    return NestedArray::getValue($form, array_merge($formatter_array_parents, ['formatter_settings_wrapper']));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function blockSubmit($form, FormStateInterface $form_state) {
-    $this->configuration['formatter']['label'] = $form_state->getValue('formatter_label');
-    $this->configuration['formatter']['type'] = $form_state->getValue('formatter_type');
-    // @todo Remove this manual cast after https://www.drupal.org/node/2635236
-    //   is resolved.
-    $this->configuration['formatter']['settings'] = (array) $form_state->getValue('formatter_settings');
-  }
-
-  /**
-   * Gets the field definition.
-   *
-   * @return \Drupal\Core\Field\FieldDefinitionInterface
-   */
-  protected function getFieldDefinition() {
-    if (empty($this->fieldDefinition)) {
-      $field_map = $this->entityFieldManager->getFieldMap();
-      $bundle = reset($field_map[$this->entityTypeId][$this->fieldName]['bundles']);
-      $field_definitions = $this->entityFieldManager->getFieldDefinitions($this->entityTypeId, $bundle);
-      $this->fieldDefinition = $field_definitions[$this->fieldName];
-    }
-    return $this->fieldDefinition;
-  }
-
-  /**
-   * Gets the field storage definition.
-   *
-   * @return \Drupal\Core\Field\FieldStorageDefinitionInterface
-   */
-  protected function getFieldStorageDefinition() {
-    if (empty($this->fieldStorageDefinition)) {
-      $field_definitions = $this->entityFieldManager->getFieldStorageDefinitions($this->entityTypeId);
-      $this->fieldStorageDefinition = $field_definitions[$this->fieldName];
-    }
-    return $this->fieldStorageDefinition;
-  }
-
-  /**
-   * Gets field type definition.
-   *
-   * @return array
-   *   The field type definition.
-   */
-  protected function getFieldTypeDefinition() {
-    return $this->fieldTypeManager->getDefinition($this->getFieldStorageDefinition()->getType());
-  }
-
-  /**
-   * Gets the formatter options for this field type.
-   *
-   * @return array
-   *   The formatter options.
-   */
-  protected function getFormatterOptions() {
-    return $this->formatterManager->getOptions($this->getFieldStorageDefinition()->getType());
-  }
-
-  /**
-   * Gets the formatter object.
-   *
-   * @param string $type
-   *   The formatter name.
-   * @param string $label
-   *   The label option for the formatter.
-   * @param array $settings
-   *   The formatter settings.
-   * @param array $third_party_settings
-   *   The formatter third party settings.
-   *
-   * @return \Drupal\Core\Field\FormatterInterface
-   *   The formatter object.
-   */
-  protected function getFormatter($type, $label, array $settings, array $third_party_settings) {
-     return $this->formatterManager->createInstance($type, [
-      'field_definition' => $this->getFieldDefinition(),
-      'view_mode' => 'default',
-      'prepare' => TRUE,
-      'label' => $label,
-      'settings' => $settings,
-      'third_party_settings' => $third_party_settings,
-    ]);
-  }
-
-  public function __wakeup() {
-    parent::__wakeup();
-    // @todo figure out why this happens.
-    // prevent $fieldStorageDefinition being erroneously set to $this.
-    $this->fieldStorageDefinition = NULL;
-  }
-
-
-}
diff --git a/modules/ctools/modules/ctools_block/src/Plugin/Deriver/EntityFieldDeriver.php b/modules/ctools/modules/ctools_block/src/Plugin/Deriver/EntityFieldDeriver.php
deleted file mode 100644
index ac5b5d1..0000000
--- a/modules/ctools/modules/ctools_block/src/Plugin/Deriver/EntityFieldDeriver.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Drupal\ctools_block\Plugin\Deriver;
-
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\ctools\Plugin\Deriver\EntityDeriverBase;
-
-/**
- * Provides entity field block definitions for every field.
- */
-class EntityFieldDeriver extends EntityDeriverBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    $entity_type_labels = $this->entityManager->getEntityTypeLabels();
-    foreach ($this->entityManager->getFieldMap() as $entity_type_id => $entity_field_map) {
-      foreach ($this->entityManager->getFieldStorageDefinitions($entity_type_id) as $field_storage_definition) {
-        $field_name = $field_storage_definition->getName();
-
-        // The blocks are based on fields. However, we are looping through field
-        // storages for which no fields may exist. If that is the case, skip
-        // this field storage.
-        if (!isset($entity_field_map[$field_name])) {
-          continue;
-        }
-
-        $field_info = $entity_field_map[$field_name];
-        $derivative_id = $entity_type_id . ":" . $field_name;
-
-        // Get the admin label for both base and configurable fields.
-        if ($field_storage_definition->isBaseField()) {
-          $admin_label = $field_storage_definition->getLabel();
-        }
-        else {
-          // We take the field label used on the first bundle.
-          $first_bundle = reset($field_info['bundles']);
-          $bundle_field_definitions = $this->entityManager->getFieldDefinitions($entity_type_id, $first_bundle);
-
-          // The field storage config may exist, but it's possible that no
-          // fields are actually using it. If that's the case, skip to the next
-          // field.
-          if (empty($bundle_field_definitions[$field_name])) {
-            continue;
-          }
-          $admin_label = $bundle_field_definitions[$field_name]->getLabel();
-        }
-
-        // Set plugin definition for derivative.
-        $derivative = $base_plugin_definition;
-        $derivative['category'] = $this->t('@entity', ['@entity' => $entity_type_labels[$entity_type_id]]);
-        $derivative['admin_label'] = $admin_label;
-        $derivative['context'] = [
-          'entity' => new ContextDefinition('entity:' . $entity_type_id, $entity_type_labels[$entity_type_id], TRUE),
-        ];
-
-        $this->derivatives[$derivative_id] = $derivative;
-
-      }
-    }
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml b/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml
deleted file mode 100644
index 6b1a610..0000000
--- a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.base_field_override.node.ctools_block_field_test.promote.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.ctools_block_field_test
-_core:
-  default_config_hash: hoRuk0InNhhRVGnhQ9hzifTXVz432i9hvPe-tVstUbc
-id: node.ctools_block_field_test.promote
-field_name: promote
-entity_type: node
-bundle: ctools_block_field_test
-label: 'Promoted to front page'
-description: ''
-required: false
-translatable: true
-default_value:
-  -
-    value: 0
-default_value_callback: ''
-settings:
-  on_label: 'On'
-  off_label: 'Off'
-field_type: boolean
diff --git a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml b/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml
deleted file mode 100644
index acfaaef..0000000
--- a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_form_display.node.ctools_block_field_test.default.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.ctools_block_field_test.body
-    - node.type.ctools_block_field_test
-  module:
-    - path
-    - text
-_core:
-  default_config_hash: xpDeWNLzjX4dDB9YyBlO9y9FR4vHwMv0GKsuqDYy0Bc
-id: node.ctools_block_field_test.default
-targetEntityType: node
-bundle: ctools_block_field_test
-mode: default
-content:
-  body:
-    type: text_textarea_with_summary
-    weight: 31
-    settings:
-      rows: 9
-      summary_rows: 3
-      placeholder: ''
-    third_party_settings: {  }
-  created:
-    type: datetime_timestamp
-    weight: 10
-    settings: {  }
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    settings: {  }
-    third_party_settings: {  }
-  promote:
-    type: boolean_checkbox
-    settings:
-      display_label: true
-    weight: 15
-    third_party_settings: {  }
-  sticky:
-    type: boolean_checkbox
-    settings:
-      display_label: true
-    weight: 16
-    third_party_settings: {  }
-  title:
-    type: string_textfield
-    weight: -5
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 5
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden: {  }
diff --git a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml b/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml
deleted file mode 100644
index 3844350..0000000
--- a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.default.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.ctools_block_field_test.body
-    - node.type.ctools_block_field_test
-  module:
-    - user
-_core:
-  default_config_hash: clNnyw6fhh5SwIme5I_3zjbLv-PMfpY-JXofVAC3CV8
-id: node.ctools_block_field_test.default
-targetEntityType: node
-bundle: ctools_block_field_test
-mode: default
-content: {  }
-hidden:
-  body: true
-  links: true
diff --git a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml b/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml
deleted file mode 100644
index 8b55c0b..0000000
--- a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/core.entity_view_display.node.ctools_block_field_test.teaser.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-    - field.field.node.ctools_block_field_test.body
-    - node.type.ctools_block_field_test
-  module:
-    - text
-    - user
-_core:
-  default_config_hash: gQV5baI7pCIOBUtLkbJ1c2WJwM8CdlKiKOtLLIWnfy0
-id: node.ctools_block_field_test.teaser
-targetEntityType: node
-bundle: ctools_block_field_test
-mode: teaser
-content:
-  body:
-    label: hidden
-    type: text_summary_or_trimmed
-    weight: 101
-    settings:
-      trim_length: 600
-    third_party_settings: {  }
-  links:
-    weight: 100
-hidden: {  }
diff --git a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml b/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml
deleted file mode 100644
index 42853da..0000000
--- a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.body.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.body
-    - node.type.ctools_block_field_test
-  module:
-    - text
-_core:
-  default_config_hash: fzUnwtwftRsgKExjpF6XdMqbUzP16ytkjQniBZl1Hqg
-id: node.ctools_block_field_test.body
-field_name: body
-entity_type: node
-bundle: ctools_block_field_test
-label: Body
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  display_summary: true
-field_type: text_with_summary
diff --git a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.field_image.yml b/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.field_image.yml
deleted file mode 100644
index 0696ece..0000000
--- a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.field.node.ctools_block_field_test.field_image.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_image
-    - node.type.ctools_block_field_test
-  module:
-    - image
-id: node.ctools_block_field_test.field_image
-field_name: field_image
-entity_type: node
-bundle: ctools_block_field_test
-label: Image
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: true
-  title_field: false
-  alt_field_required: true
-  title_field_required: false
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-  handler: 'default:file'
-  handler_settings: {  }
-field_type: image
diff --git a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.storage.node.field_image.yml b/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.storage.node.field_image.yml
deleted file mode 100644
index e4da708..0000000
--- a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/field.storage.node.field_image.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - image
-    - node
-id: node.field_image
-field_name: field_image
-entity_type: node
-type: image
-settings:
-  uri_scheme: public
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-  target_type: file
-  display_field: false
-  display_default: false
-module: image
-locked: false
-cardinality: 1
-translatable: true
-indexes:
-  target_id:
-    - target_id
-persist_with_no_fields: false
-custom_storage: false
diff --git a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml b/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml
deleted file mode 100644
index caf9cff..0000000
--- a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/config/install/node.type.ctools_block_field_test.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - menu_ui
-third_party_settings:
-  menu_ui:
-    available_menus: {  }
-    parent: ''
-_core:
-  default_config_hash: hjC271ZF6B5XYgF6-F5Ak73sJiZWJRmSLsgk8S7Vo-8
-name: 'CTools block field test'
-type: ctools_block_field_test
-description: 'A content type used for the ctools_block field tests.'
-help: ''
-new_revision: false
-preview_mode: 0
-display_submitted: false
diff --git a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml b/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml
deleted file mode 100644
index 17bf6d5..0000000
--- a/modules/ctools/modules/ctools_block/tests/modules/ctools_block_field_test/ctools_block_field_test.info.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: 'Chaos tools blocks test'
-type: module
-description: 'Support module for Chaos tools blocks tests.'
-# core: 8.x
-package: Testing
-# version: 8.0.1
-dependencies:
-  - image
-  - menu_ui
-  - node
-  - path
-  - text
-  - user
-features: true
-
-# Information added by Drupal.org packaging script on 2017-04-28
-version: '8.x-3.0'
-core: '8.x'
-project: 'ctools'
-datestamp: 1493401747
diff --git a/modules/ctools/modules/ctools_block/tests/src/Functional/EntityFieldBlockTest.php b/modules/ctools/modules/ctools_block/tests/src/Functional/EntityFieldBlockTest.php
deleted file mode 100644
index 4fa77c5..0000000
--- a/modules/ctools/modules/ctools_block/tests/src/Functional/EntityFieldBlockTest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools_block\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests the entity field block.
- *
- * @group ctools_block
- */
-class EntityFieldBlockTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['block', 'ctools_block', 'ctools_block_field_test'];
-
-  /**
-   * Tests using the node body field in a block.
-   */
-  public function testBodyField() {
-    $block = $this->drupalPlaceBlock('entity_field:node:body', [
-      'formatter' => [
-        'type' => 'text_default',
-      ],
-      'context_mapping' => [
-        'entity' => '@node.node_route_context:node',
-      ],
-    ]);
-    $node = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
-    $this->drupalGet('node/' . $node->id());
-    $assert = $this->assertSession();
-    $assert->pageTextContains($block->label());
-    $assert->pageTextContains($node->body->value);
-
-    $node->set('body', NULL)->save();
-    $this->getSession()->reload();
-    // The block should not appear if there is no value in the field.
-    $assert->pageTextNotContains($block->label());
-  }
-
-  /**
-   * Tests that empty image fields will still render their default value.
-   */
-  public function testEmptyImageField() {
-    $source = \Drupal::moduleHandler()->getModule('image')->getPath() . '/sample.png';
-    file_unmanaged_copy($source, 'public://sample.png');
-
-    /** @var \Drupal\file\FileInterface $file */
-    $file = \Drupal::entityTypeManager()
-      ->getStorage('file')
-      ->create([
-        'uri' => 'public://sample.png',
-      ]);
-    $file->save();
-
-    /** @var \Drupal\field\FieldConfigInterface $field */
-    $field = \Drupal::entityTypeManager()
-      ->getStorage('field_config')
-      ->load('node.ctools_block_field_test.field_image');
-    $settings = $field->getSettings();
-    $settings['default_image']['uuid'] = $file->uuid();
-    $field->set('settings', $settings)->save();
-
-    $this->drupalPlaceBlock('entity_field:node:field_image', [
-      'formatter' => [
-        'type' => 'image_image',
-      ],
-      'context_mapping' => [
-        'entity' => '@node.node_route_context:node',
-      ],
-    ]);
-
-    $node = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
-    $this->drupalGet('node/' . $node->id());
-
-    $url = $file->getFileUri();
-    $url = file_create_url($url);
-    $url = file_url_transform_relative($url);
-    $this->assertSession()->responseContains('src="' . $url . '"');
-  }
-
-  /**
-   * Tests using the node uid base field in a block.
-   */
-  public function testNodeBaseFields() {
-    $block = $this->drupalPlaceBlock('entity_field:node:title', [
-      'formatter' => [
-        'type' => 'string',
-      ],
-      'context_mapping' => [
-        'entity' => '@node.node_route_context:node',
-      ],
-    ]);
-    $node = $this->drupalCreateNode(['type' => 'ctools_block_field_test', 'uid' => 1]);
-    $this->drupalGet('node/' . $node->id());
-    $assert = $this->assertSession();
-    $assert->pageTextContains($block->label());
-    $assert->pageTextContains($node->getTitle());
-  }
-
-  /**
-   * Tests that we are setting the render cache metadata correctly.
-   */
-  public function testRenderCache() {
-    $this->drupalPlaceBlock('entity_field:node:body', [
-      'formatter' => [
-        'type' => 'text_default',
-      ],
-      'context_mapping' => [
-        'entity' => '@node.node_route_context:node',
-      ],
-    ]);
-    $a = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
-    $b = $this->drupalCreateNode(['type' => 'ctools_block_field_test']);
-
-    $assert = $this->assertSession();
-    $this->drupalGet('node/' . $a->id());
-    $assert->pageTextContains($a->body->value);
-    $this->drupalGet('node/' . $b->id());
-    $assert->pageTextNotContains($a->body->value);
-    $assert->pageTextContains($b->body->value);
-
-    $text = 'This is my text. Are you not entertained?';
-    $a->body->value = $text;
-    $a->save();
-    $this->drupalGet('node/' . $a->id());
-    $assert->pageTextContains($text);
-  }
-
-}
diff --git a/modules/ctools/modules/ctools_views/ctools_views.info.yml b/modules/ctools/modules/ctools_views/ctools_views.info.yml
deleted file mode 100644
index 2d66b5b..0000000
--- a/modules/ctools/modules/ctools_views/ctools_views.info.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Chaos tools Views
-type: module
-description: 'A set of improvements to the core Views code that allows for greater control over Blocks.'
-package: Chaos tool suite (Experimental)
-# version: 3.x
-# core: 8.x
-dependencies:
-    - block
-    - views
-
-# Information added by Drupal.org packaging script on 2017-04-28
-version: '8.x-3.0'
-core: '8.x'
-project: 'ctools'
-datestamp: 1493401747
diff --git a/modules/ctools/modules/ctools_views/ctools_views.module b/modules/ctools/modules/ctools_views/ctools_views.module
deleted file mode 100644
index 845feb6..0000000
--- a/modules/ctools/modules/ctools_views/ctools_views.module
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-use Drupal\views\Plugin\views\display\Block as CoreBlock;
-use Drupal\ctools_views\Plugin\Display\Block;
-
-/**
- * Implements hook_views_plugins_display_alter().
- */
-function ctools_views_views_plugins_display_alter(&$displays) {
-  if (!empty($displays['block']['class']) && $displays['block']['class'] == CoreBlock::class) {
-    $displays['block']['class'] = Block::class;
-  }
-}
-
-/**
- * Implements hook_config_schema_info_alter().
- */
-function ctools_views_config_schema_info_alter(&$definitions) {
-  // Add to the views block plugin schema.
-  $definitions['views_block']['mapping']['pager'] = [
-    'type' => 'string',
-    'label' => 'Pager type'
-  ];
-  $definitions['views_block']['mapping']['fields'] = [
-    'type' => 'sequence',
-    'label' => 'Fields settings',
-    'sequence' => [
-      [
-        'type' => 'mapping',
-        'label' => 'Field settings',
-        'mapping' => [
-          'hide' => [
-            'type' => 'boolean',
-            'label' => 'Hide field',
-          ],
-          'weight' => [
-            'type' => 'integer',
-            'label' => 'Field weight',
-          ],
-        ],
-      ],
-    ],
-  ];
-  $definitions['views_block']['mapping']['filter'] = [
-    'type' => 'sequence',
-    'label' => 'Filters settings',
-    'sequence' => [
-      [
-        'type' => 'mapping',
-        'label' => 'Filter settings',
-        'mapping' => [
-          'type' => [
-            'type' => 'string',
-            'label' => 'Plugin id',
-          ],
-          'disable' => [
-            'type' => 'boolean',
-            'label' => 'Disable filter',
-          ],
-        ],
-      ],
-    ],
-  ];
-  $definitions['views_block']['mapping']['sort'] = [
-    'type' => 'sequence',
-    'label' => 'Sort settings',
-    'sequence' => [
-      [
-        'type' => 'string',
-        'label' => 'Sort order value',
-      ],
-    ],
-  ];
-  $definitions['views_block']['mapping']['pager_offset'] = [
-    'type' => 'integer',
-    'label' => 'Pager offset'
-  ];
-
-  // Add to the views block display plugin schema.
-  $definitions['views.display.block']['mapping']['allow']['mapping']['offset'] = [
-    'type' => 'string',
-    'label' => 'Pager offset',
-  ];
-  $definitions['views.display.block']['mapping']['allow']['mapping']['pager'] = [
-    'type' => 'string',
-    'label' => 'Pager type',
-  ];
-  $definitions['views.display.block']['mapping']['allow']['mapping']['hide_fields'] = [
-    'type' => 'string',
-    'label' => 'Hide fields',
-  ];
-  $definitions['views.display.block']['mapping']['allow']['mapping']['sort_fields'] = [
-    'type' => 'string',
-    'label' => 'Sort fields',
-  ];
-  $definitions['views.display.block']['mapping']['allow']['mapping']['disable_filters'] = [
-    'type' => 'string',
-    'label' => 'Disable filters',
-  ];
-  $definitions['views.display.block']['mapping']['allow']['mapping']['configure_sorts'] = [
-    'type' => 'string',
-    'label' => 'Configure sorts',
-  ];
-}
diff --git a/modules/ctools/modules/ctools_views/src/Plugin/Display/Block.php b/modules/ctools/modules/ctools_views/src/Plugin/Display/Block.php
deleted file mode 100644
index e2d2a7c..0000000
--- a/modules/ctools/modules/ctools_views/src/Plugin/Display/Block.php
+++ /dev/null
@@ -1,438 +0,0 @@
-<?php
-
-namespace Drupal\ctools_views\Plugin\Display;
-
-use Drupal\Core\Form\FormState;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\Plugin\Block\ViewsBlock;
-use Drupal\views\Plugin\views\display\Block as CoreBlock;
-use Drupal\views\Plugin\views\filter\InOperator;
-
-/**
- * Provides a Block display plugin that allows for greater control over Views
- * block settings.
- */
-class Block extends CoreBlock {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function optionsSummary(&$categories, &$options) {
-    parent::optionsSummary($categories, $options);
-    $filtered_allow = array_filter($this->getOption('allow'));
-    $filter_options = [
-      'items_per_page' => $this->t('Items per page'),
-      'offset' => $this->t('Pager offset'),
-      'pager' => $this->t('Pager type'),
-      'hide_fields' => $this->t('Hide fields'),
-      'sort_fields' => $this->t('Reorder fields'),
-      'disable_filters' => $this->t('Disable filters'),
-      'configure_sorts' => $this->t('Configure sorts')
-    ];
-    $filter_intersect = array_intersect_key($filter_options, $filtered_allow);
-
-    $options['allow'] = array(
-      'category' => 'block',
-      'title' => $this->t('Allow settings'),
-      'value' => empty($filtered_allow) ? $this->t('None') : implode(', ', $filter_intersect),
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    parent::buildOptionsForm($form, $form_state);
-    $options = $form['allow']['#options'];
-    $options['offset'] = $this->t('Pager offset');
-    $options['pager'] = $this->t('Pager type');
-    $options['hide_fields'] = $this->t('Hide fields');
-    $options['sort_fields'] = $this->t('Reorder fields');
-    $options['disable_filters'] = $this->t('Disable filters');
-    $options['configure_sorts'] = $this->t('Configure sorts');
-    $form['allow']['#options'] = $options;
-    // Update the items_per_page if set.
-    $defaults = array_filter($form['allow']['#default_value']);
-    if (isset($defaults['items_per_page'])) {
-      $defaults['items_per_page'] = 'items_per_page';
-    }
-    $form['allow']['#default_value'] = $defaults;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function blockForm(ViewsBlock $block, array &$form, FormStateInterface $form_state) {
-    $form = parent::blockForm($block, $form, $form_state);
-
-    $allow_settings = array_filter($this->getOption('allow'));
-    $block_configuration = $block->getConfiguration();
-
-    // Modify "Items per page" block settings form.
-    if (!empty($allow_settings['items_per_page'])) {
-      // Items per page
-      $form['override']['items_per_page']['#type'] = 'number';
-      unset($form['override']['items_per_page']['#options']);
-    }
-
-    // Provide "Pager offset" block settings form.
-    if (!empty($allow_settings['offset'])) {
-      $form['override']['pager_offset'] = [
-        '#type' => 'number',
-        '#title' => $this->t('Pager offset'),
-        '#default_value' => isset($block_configuration['pager_offset']) ? $block_configuration['pager_offset'] : 0,
-        '#description' => $this->t('For example, set this to 3 and the first 3 items will not be displayed.'),
-      ];
-    }
-
-    // Provide "Pager type" block settings form.
-    if (!empty($allow_settings['pager'])) {
-      $pager_options = [
-        'view' => $this->t('Inherit from view'),
-        'some' => $this->t('Display a specified number of items'),
-        'none' => $this->t('Display all items')
-      ];
-      $form['override']['pager'] = [
-        '#type' => 'radios',
-        '#title' => $this->t('Pager'),
-        '#options' => $pager_options,
-        '#default_value' => isset($block_configuration['pager']) ? $block_configuration['pager'] : 'view'
-      ];
-    }
-
-    // Provide "Hide fields" / "Reorder fields" block settings form.
-    if (!empty($allow_settings['hide_fields']) || !empty($allow_settings['sort_fields'])) {
-      // Set up the configuration table for hiding / sorting fields.
-      $fields = $this->getHandlers('field');
-      $header = [];
-      if (!empty($allow_settings['hide_fields'])) {
-        $header['hide'] = $this->t('Hide');
-      }
-      $header['label'] = $this->t('Label');
-      if (!empty($allow_settings['sort_fields'])) {
-        $header['weight'] = $this->t('Weight');
-      }
-      $form['override']['order_fields'] = [
-        '#type' => 'table',
-        '#header' => $header,
-        '#rows' => array(),
-      ];
-      if (!empty($allow_settings['sort_fields'])) {
-        $form['override']['order_fields']['#tabledrag'] = [
-          [
-            'action' => 'order',
-            'relationship' => 'sibling',
-            'group' => 'field-weight',
-          ]
-        ];
-        $form['override']['order_fields']['#attributes'] = ['id' => 'order-fields'];
-      }
-
-      // Sort available field plugins by their currently configured weight.
-      $sorted_fields = [];
-      if (!empty($allow_settings['sort_fields']) && isset($block_configuration['fields'])) {
-        uasort($block_configuration['fields'], '\Drupal\ctools_views\Plugin\Display\Block::sortFieldsByWeight');
-        foreach (array_keys($block_configuration['fields']) as $field_name) {
-          if (!empty($fields[$field_name])) {
-            $sorted_fields[$field_name] = $fields[$field_name];
-            unset($fields[$field_name]);
-          }
-        }
-        if (!empty($fields)) {
-          foreach ($fields as $field_name => $field_info) {
-            $sorted_fields[$field_name] = $field_info;
-          }
-        }
-      }
-      else {
-        $sorted_fields = $fields;
-      }
-
-      // Add each field to the configuration table.
-      foreach ($sorted_fields as $field_name => $plugin) {
-        $field_label = $plugin->adminLabel();
-        if (!empty($plugin->options['label'])) {
-          $field_label .= ' (' . $plugin->options['label'] . ')';
-        }
-       if (!empty($allow_settings['sort_fields'])) {
-          $form['override']['order_fields'][$field_name]['#attributes']['class'][] = 'draggable';
-        }
-        $form['override']['order_fields'][$field_name]['#weight'] = !empty($block_configuration['fields'][$field_name]['weight']) ? $block_configuration['fields'][$field_name]['weight'] : '';
-        if (!empty($allow_settings['hide_fields'])) {
-          $form['override']['order_fields'][$field_name]['hide'] = [
-            '#type' => 'checkbox',
-            '#default_value' => !empty($block_configuration['fields'][$field_name]['hide']) ? $block_configuration['fields'][$field_name]['hide'] : 0,
-          ];
-        }
-        $form['override']['order_fields'][$field_name]['label'] = [
-          '#markup' => $field_label,
-        ];
-        if (!empty($allow_settings['sort_fields'])) {
-          $form['override']['order_fields'][$field_name]['weight'] = [
-            '#type' => 'weight',
-            '#title' => $this->t('Weight for @title', ['@title' => $field_label]),
-            '#title_display' => 'invisible',
-            '#delta' => 50,
-            '#default_value' => !empty($block_configuration['fields'][$field_name]['weight']) ? $block_configuration['fields'][$field_name]['weight'] : 0,
-            '#attributes' => ['class' => ['field-weight']],
-          ];
-        }
-      }
-    }
-
-    // Provide "Configure filters" / "Disable filters" block settings form.
-    if (!empty($allow_settings['disable_filters'])) {
-      $items = [];
-      foreach ((array) $this->getOption('filters') as $filter_name => $item) {
-        $item['value'] = isset($block_configuration["filter"][$filter_name]['value']) ? $block_configuration["filter"][$filter_name]['value'] : '';
-        $items[$filter_name] = $item;
-      }
-      $this->setOption('filters', $items);
-      $filters = $this->getHandlers('filter');
-
-      // Add a settings form for each exposed filter to configure or hide it.
-      foreach ($filters as $filter_name => $plugin) {
-        if ($plugin->isExposed() && $exposed_info = $plugin->exposedInfo()) {
-          $form['override']['filters'][$filter_name] = [
-            '#type' => 'details',
-            '#title' => $exposed_info['label'],
-          ];
-          $form['override']['filters'][$filter_name]['plugin'] = [
-            '#type' => 'value',
-            '#value' => $plugin,
-          ];
-          // Render "Disable filters" settings form.
-          if (!empty($allow_settings['disable_filters'])) {
-            $form['override']['filters'][$filter_name]['disable'] = [
-              '#type' => 'checkbox',
-              '#title' => $this->t('Disable'),
-              '#default_value' => !empty($block_configuration['filter'][$filter_name]['disable']) ? $block_configuration['filter'][$filter_name]['disable'] : 0,
-            ];
-          }
-        }
-      }
-    }
-
-    // Provide "Configure sorts" block settings form.
-    if (!empty($allow_settings['configure_sorts'])) {
-      $sorts = $this->getHandlers('sort');
-      $options = array(
-        'ASC' => $this->t('Sort ascending'),
-        'DESC' => $this->t('Sort descending'),
-      );
-      foreach ($sorts as $sort_name => $plugin) {
-        $form['override']['sort'][$sort_name] = [
-          '#type' => 'details',
-          '#title' => $plugin->adminLabel(),
-        ];
-        $form['override']['sort'][$sort_name]['plugin'] = [
-          '#type' => 'value',
-          '#value' => $plugin,
-        ];
-        $form['override']['sort'][$sort_name]['order'] = array(
-          '#title' => $this->t('Order'),
-          '#type' => 'radios',
-          '#options' => $options,
-          '#default_value' => $plugin->options['order']
-        );
-
-        // Set default values for sorts for this block.
-        if (!empty($block_configuration["sort"][$sort_name])) {
-          $form['override']['sort'][$sort_name]['order']['#default_value'] = $block_configuration["sort"][$sort_name];
-        }
-      }
-    }
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function blockSubmit(ViewsBlock $block, $form, FormStateInterface $form_state) {
-    // Set default value for items_per_page if left blank.
-    if (empty($form_state->getValue(array('override', 'items_per_page')))) {
-      $form_state->setValue(array('override', 'items_per_page'), "none");
-    }
-
-    parent::blockSubmit($block, $form, $form_state);
-    $configuration = $block->getConfiguration();
-    $allow_settings = array_filter($this->getOption('allow'));
-
-    // Save "Pager type" settings to block configuration.
-    if (!empty($allow_settings['pager'])) {
-      if ($pager = $form_state->getValue(['override', 'pager'])) {
-        $configuration['pager'] = $pager;
-      }
-    }
-
-    // Save "Pager offset" settings to block configuration.
-    if (!empty($allow_settings['offset'])) {
-      $configuration['pager_offset'] = $form_state->getValue(['override', 'pager_offset']);
-    }
-
-    // Save "Hide fields" / "Reorder fields" settings to block configuration.
-    if (!empty($allow_settings['hide_fields']) || !empty($allow_settings['sort_fields'])) {
-      if ($fields = array_filter($form_state->getValue(['override', 'order_fields']))) {
-        uasort($fields, '\Drupal\ctools_views\Plugin\Display\Block::sortFieldsByWeight');
-        $configuration['fields'] = $fields;
-      }
-    }
-
-    // Save "Configure filters" / "Disable filters" settings to block
-    // configuration.
-    unset($configuration['filter']);
-    if (!empty($allow_settings['disable_filters'])) {
-      if ($filters = $form_state->getValue(['override', 'filters'])) {
-        foreach ($filters as $filter_name => $filter) {
-          /** @var \Drupal\views\Plugin\views\filter\FilterPluginBase $plugin */
-          $plugin = $form_state->getValue(['override', 'filters', $filter_name, 'plugin']);
-          $configuration["filter"][$filter_name]['type'] = $plugin->getPluginId();
-
-          // Check if we want to disable this filter.
-          if (!empty($allow_settings['disable_filters'])) {
-            $disable = $form_state->getValue(['override', 'filters', $filter_name, 'disable']);
-            // If marked disabled, we don't really care about other stuff.
-            if ($disable) {
-              $configuration["filter"][$filter_name]['disable'] = $disable;
-              continue;
-            }
-          }
-        }
-      }
-    }
-
-    // Save "Configure sorts" settings to block configuration.
-    if (!empty($allow_settings['configure_sorts'])) {
-      $sorts = $form_state->getValue(['override', 'sort']);
-      foreach ($sorts as $sort_name => $sort) {
-        $plugin = $sort['plugin'];
-        // Check if we want to override the default sort order
-        if ($plugin->options['order'] != $sort['order']) {
-          $configuration['sort'][$sort_name] = $sort['order'];
-        }
-      }
-    }
-
-    $block->setConfiguration($configuration);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preBlockBuild(ViewsBlock $block) {
-    parent::preBlockBuild($block);
-
-    $allow_settings = array_filter($this->getOption('allow'));
-    $config = $block->getConfiguration();
-    list(, $display_id) = explode('-', $block->getDerivativeId(), 2);
-
-    // Change pager offset settings based on block configuration.
-    if (!empty($allow_settings['offset'])) {
-      $this->view->setOffset($config['pager_offset']);
-    }
-
-    // Change pager style settings based on block configuration.
-    if (!empty($allow_settings['pager'])) {
-      $pager = $this->view->display_handler->getOption('pager');
-      if (!empty($config['pager']) && $config['pager'] != 'view') {
-        $pager['type'] = $config['pager'];
-      }
-      $this->view->display_handler->setOption('pager', $pager);
-    }
-
-    // Change fields output based on block configuration.
-    if (!empty($allow_settings['hide_fields']) || !empty($allow_settings['sort_fields'])) {
-      if (!empty($config['fields']) && $this->view->getStyle()->usesFields()) {
-        $fields = $this->view->getHandlers('field');
-        uasort($config['fields'], '\Drupal\ctools_views\Plugin\Display\Block::sortFieldsByWeight');
-        $iterate_fields = !empty($allow_settings['sort_fields']) ? $config['fields'] : $fields;
-        foreach (array_keys($iterate_fields) as $field_name) {
-          // Remove each field in sequence and re-add them to sort
-          // appropriately or hide if disabled.
-          $this->view->removeHandler($display_id, 'field', $field_name);
-          if (empty($allow_settings['hide_fields']) || (!empty($allow_settings['hide_fields']) && empty($config['fields'][$field_name]['hide']))) {
-            $this->view->addHandler($display_id, 'field', $fields[$field_name]['table'], $fields[$field_name]['field'], $fields[$field_name], $field_name);
-          }
-        }
-      }
-    }
-
-    // Change filters output based on block configuration.
-    if (!empty($allow_settings['disable_filters'])) {
-      $filters = $this->view->getHandlers('filter', $display_id);
-      foreach ($filters as $filter_name => $filter) {
-        // If we allow disabled filters and this filter is disabled, disable it
-        // and continue.
-        if (!empty($allow_settings['disable_filters']) && !empty($config["filter"][$filter_name]['disable'])) {
-          $this->view->removeHandler($display_id, 'filter', $filter_name);
-          continue;
-        }
-      }
-    }
-
-    // Change sorts based on block configuration.
-    if (!empty($allow_settings['configure_sorts'])) {
-      $sorts = $this->view->getHandlers('sort', $display_id);
-      foreach ($sorts as $sort_name => $sort) {
-        if (!empty($config["sort"][$sort_name])) {
-          $sort['order'] = $config["sort"][$sort_name];
-          $this->view->setHandler($display_id, 'sort', $sort_name, $sort);
-        }
-      }
-    }
-  }
-
-  protected function getFilterOptionsValue(array $filter, array $config) {
-    $plugin_definition = \Drupal::service('plugin.manager.views.filter')->getDefinition($config['type']);
-    if (is_subclass_of($plugin_definition['class'], '\Drupal\views\Plugin\views\filter\InOperator')) {
-      return array_values($config['value']);
-    }
-    return $config['value'][$filter['expose']['identifier']];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function usesExposed() {
-    $filters = $this->getHandlers('filter');
-    foreach ($filters as $filter_name => $filter) {
-      if ($filter->isExposed() && !empty($filter->exposedInfo())) {
-        return TRUE;
-      }
-    }
-    return FALSE;
-  }
-
-  /**
-   * Exposed widgets typically only work with ajax in Drupal core, however
-   * #2605218 totally breaks the rest of the functionality in this display and
-   * in Core's Block display as well, so we allow non-ajax block views to use
-   * exposed filters and manually set the #action to the current request uri.
-   */
-  public function elementPreRender(array $element) {
-    /** @var \Drupal\views\ViewExecutable $view */
-    $view = $element['#view'];
-    if (!empty($view->exposed_widgets['#action']) && !$view->ajaxEnabled()) {
-      $view->exposed_widgets['#action'] = \Drupal::request()->getRequestUri();
-    }
-    return parent::elementPreRender($element);
-  }
-
-  /**
-   * Sort field config array by weight.
-   *
-   * @param $a
-   * @param $b
-   * @return int
-   */
-  public static function sortFieldsByWeight($a, $b) {
-    $a_weight = isset($a['weight']) ? $a['weight'] : 0;
-    $b_weight = isset($b['weight']) ? $b['weight'] : 0;
-    if ($a_weight == $b_weight) {
-      return 0;
-    }
-    return ($a_weight < $b_weight) ? -1 : 1;
-  }
-
-}
diff --git a/modules/ctools/modules/ctools_views/src/Tests/CToolsViewsBasicViewBlockTest.php b/modules/ctools/modules/ctools_views/src/Tests/CToolsViewsBasicViewBlockTest.php
deleted file mode 100644
index 8520104..0000000
--- a/modules/ctools/modules/ctools_views/src/Tests/CToolsViewsBasicViewBlockTest.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-
-namespace Drupal\ctools_views\Tests;
-
-use Drupal\views_ui\Tests\UITestBase;
-use Drupal\views\Tests\ViewTestData;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-
-/**
- * Tests the ctools_views block display plugin
- * overriding settings from a basic View.
- *
- * @group ctools_views
- * @see \Drupal\ctools_views\Plugin\Display\Block
- */
-class CToolsViewsBasicViewBlockTest extends UITestBase {
-
-  use StringTranslationTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('ctools_views', 'ctools_views_test_views');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('ctools_views_test_view');
-
-  /**
-   * The block storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * @inheritdoc
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    ViewTestData::createTestViews(get_class($this), array('ctools_views_test_views'));
-    $this->storage = $this->container->get('entity.manager')->getStorage('block');
-  }
-
-  /**
-   * Test ctools_views "items_per_page" configuration.
-   */
-  public function testItemsPerPage() {
-    $default_theme = $this->config('system.theme')->get('default');
-
-    // Get the "Configure block" form for our Views block.
-    $this->drupalGet('admin/structure/block/add/views_block:ctools_views_test_view-block_pager/' . $default_theme);
-    $this->assertFieldByXPath('//input[@type="number" and @name="settings[override][items_per_page]"]', NULL, 'items_per_page setting is a number field');
-    // Add block to sidebar_first region with default settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $edit['settings[override][items_per_page]'] = 0;
-    $this->drupalPostForm('admin/structure/block/add/views_block:ctools_views_test_view-block_pager/' . $default_theme, $edit, $this->t('Save block'));
-
-    // Assert items per page default settings.
-    $this->drupalGet('<front>');
-    $result = $this->xpath('//div[contains(@class, "region-sidebar-first")]/div[contains(@class, "block-views")]/h2');
-    $this->assertEqual((string) $result[0], 'CTools Views Pager Block');
-    $this->assertRaw('Showing 3 records on page 1');
-    $this->assertEqual(3, count($this->xpath('//div[contains(@class, "view-display-id-block_pager")]//table/tbody/tr')));
-
-    // Override items per page settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $edit['settings[override][items_per_page]'] = 2;
-    $this->drupalPostForm('admin/structure/block/manage/views_block__ctools_views_test_view_block_pager', $edit, $this->t('Save block'));
-
-    $block = $this->storage->load('views_block__ctools_views_test_view_block_pager');
-    $config = $block->getPlugin()->getConfiguration();
-    $this->assertEqual(2, $config['items_per_page'], "'Items per page' is properly saved.");
-
-    // Assert items per page overridden settings.
-    $this->drupalGet('<front>');
-    $result = $this->xpath('//div[contains(@class, "region-sidebar-first")]/div[contains(@class, "block-views")]/h2');
-    $this->assertEqual((string) $result[0], 'CTools Views Pager Block');
-    $this->assertRaw('Showing 2 records on page 1');
-    $this->assertEqual(2, count($this->xpath('//div[contains(@class, "view-display-id-block_pager")]//table/tbody/tr')));
-    $this->assertEqual([1, 2], $this->xpath('//div[contains(@class, "view-display-id-block_pager")]//table//tr//td[contains(@class, "views-field-id")]'));
-  }
-
-  /**
-   * Test ctools_views "offset" configuration.
-   */
-  public function testOffset() {
-    $default_theme = $this->config('system.theme')->get('default');
-
-    // Get the "Configure block" form for our Views block.
-    $this->drupalGet('admin/structure/block/add/views_block:ctools_views_test_view-block_pager/' . $default_theme);
-    $this->assertFieldByXPath('//input[@type="number" and @name="settings[override][pager_offset]"]', NULL, 'items_per_page setting is a number field');
-    // Add block to sidebar_first region with default settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $edit['settings[override][items_per_page]'] = 0;
-    $this->drupalPostForm('admin/structure/block/add/views_block:ctools_views_test_view-block_pager/' . $default_theme, $edit, $this->t('Save block'));
-
-    // Assert pager offset default settings.
-    $this->drupalGet('<front>');
-    $this->assertEqual([1, 2, 3], $this->xpath('//div[contains(@class, "view-display-id-block_pager")]//table//tr//td[contains(@class, "views-field-id")]'));
-
-    // Override pager offset settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $edit['settings[override][items_per_page]'] = 0;
-    $edit['settings[override][pager_offset]'] = 1;
-    $this->drupalPostForm('admin/structure/block/manage/views_block__ctools_views_test_view_block_pager', $edit, $this->t('Save block'));
-
-    $block = $this->storage->load('views_block__ctools_views_test_view_block_pager');
-    $config = $block->getPlugin()->getConfiguration();
-    $this->assertEqual(1, $config['pager_offset'], "'Pager offset' is properly saved.");
-
-    // Assert pager offset overridden settings.
-    $this->drupalGet('<front>');
-    $this->assertEqual([2, 3, 4], $this->xpath('//div[contains(@class, "view-display-id-block_pager")]//table//tr//td[contains(@class, "views-field-id")]'));
-  }
-
-  /**
-   * Test ctools_views "pager" configuration.
-   */
-  public function testPager() {
-    $default_theme = $this->config('system.theme')->get('default');
-
-    // Get the "Configure block" form for our Views block.
-    $this->drupalGet('admin/structure/block/add/views_block:ctools_views_test_view-block_pager/' . $default_theme);
-    $this->assertFieldById('edit-settings-override-pager-view', 'view');
-    $this->assertFieldById('edit-settings-override-pager-some');
-    $this->assertFieldById('edit-settings-override-pager-none');
-
-    // Add block to sidebar_first region with default settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $edit['settings[override][items_per_page]'] = 0;
-    $this->drupalPostForm('admin/structure/block/add/views_block:ctools_views_test_view-block_pager/' . $default_theme, $edit, $this->t('Save block'));
-
-    // Assert pager default settings.
-    $this->drupalGet('<front>');
-    $this->assertText('Page 1');
-    $this->assertText('Next ›');
-
-    // Override pager settings to 'some'.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $edit['settings[override][items_per_page]'] = 0;
-    $edit['settings[override][pager]'] = 'some';
-    $this->drupalPostForm('admin/structure/block/manage/views_block__ctools_views_test_view_block_pager', $edit, $this->t('Save block'));
-
-    $block = $this->storage->load('views_block__ctools_views_test_view_block_pager');
-    $config = $block->getPlugin()->getConfiguration();
-    $this->assertEqual('some', $config['pager'], "'Pager' setting is properly saved.");
-
-    // Assert pager overridden settings to 'some', showing no pager.
-    $this->drupalGet('<front>');
-    $this->assertEqual(3, count($this->xpath('//div[contains(@class, "view-display-id-block_pager")]//table/tbody/tr')));
-    $this->assertNoText('Page 1');
-    $this->assertNoText('Next ›');
-
-    // Override pager settings to 'none'.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $edit['settings[override][items_per_page]'] = 0;
-    $edit['settings[override][pager]'] = 'none';
-    $this->drupalPostForm('admin/structure/block/manage/views_block__ctools_views_test_view_block_pager', $edit, $this->t('Save block'));
-
-    $block = $this->storage->load('views_block__ctools_views_test_view_block_pager');
-    $config = $block->getPlugin()->getConfiguration();
-    $this->assertEqual('none', $config['pager'], "'Pager' setting is properly saved.");
-
-    // Assert pager overridden settings to 'some', showing no pager.
-    $this->drupalGet('<front>');
-    $this->assertEqual(5, count($this->xpath('//div[contains(@class, "view-display-id-block_pager")]//table/tbody/tr')));
-    $this->assertNoText('Page 1');
-    $this->assertNoText('Next ›');
-  }
-
-  /**
-   * Test ctools_views 'hide_fields' configuration.
-   */
-  public function testHideFields() {
-    $default_theme = $this->config('system.theme')->get('default');
-
-    // Get the "Configure block" form for our Views block.
-    $this->drupalGet('admin/structure/block/add/views_block:ctools_views_test_view-block_fields/' . $default_theme);
-    $this->assertFieldById('edit-settings-override-order-fields-id-hide');
-
-    // Add block to sidebar_first region with default settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $this->drupalPostForm('admin/structure/block/add/views_block:ctools_views_test_view-block_fields/' . $default_theme, $edit, $this->t('Save block'));
-
-    // Assert hide_fields default settings.
-    $this->drupalGet('<front>');
-    $this->assertEqual(5, count($this->xpath('//div[contains(@class, "view-display-id-block_fields")]//table//td[contains(@class, "views-field-id")]')));
-
-    // Override hide_fields settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $edit['settings[override][order_fields][id][hide]'] = 1;
-    $this->drupalPostForm('admin/structure/block/manage/views_block__ctools_views_test_view_block_fields', $edit, $this->t('Save block'));
-
-    $block = $this->storage->load('views_block__ctools_views_test_view_block_fields');
-    $config = $block->getPlugin()->getConfiguration();
-    $this->assertEqual(1, $config['fields']['id']['hide'], "'hide_fields' setting is properly saved.");
-    $this->assertEqual(0, $config['fields']['name']['hide'], "'hide_fields' setting is properly saved.");
-
-    // Assert hide_fields overridden settings.
-    $this->drupalGet('<front>');
-    $this->assertEqual(0, count($this->xpath('//div[contains(@class, "view-display-id-block_fields")]//table//td[contains(@class, "views-field-id")]')));
-  }
-
-  /**
-   * Test ctools_views 'sort_fields' configuration.
-   */
-  public function testOrderFields() {
-    $default_theme = $this->config('system.theme')->get('default');
-
-    // Get the "Configure block" form for our Views block.
-    $this->drupalGet('admin/structure/block/add/views_block:ctools_views_test_view-block_fields/' . $default_theme);
-    $this->assertFieldById('edit-settings-override-order-fields-id-weight', 0);
-
-    // Add block to sidebar_first region with default settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $this->drupalPostForm('admin/structure/block/add/views_block:ctools_views_test_view-block_fields/' . $default_theme, $edit, $this->t('Save block'));
-
-    // Assert sort_fields default settings.
-    $this->drupalGet('<front>');
-    // Check that the td with class "views-field-id" is the first td in the first tr element.
-    $this->assertEqual(0, count($this->xpath('count(//div[contains(@class, "view-display-id-block_fields")]//table//tr[1]//td[contains(@class, "views-field-id")]/preceding-sibling::td)')));
-
-    // Override sort_fields settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $edit['settings[override][order_fields][name][weight]'] = -50;
-    $edit['settings[override][order_fields][age][weight]'] = -49;
-    $edit['settings[override][order_fields][job][weight]'] = -48;
-    $edit['settings[override][order_fields][created][weight]'] = -47;
-    $edit['settings[override][order_fields][id][weight]'] = -46;
-    $edit['settings[override][order_fields][name_1][weight]'] = -45;
-    $this->drupalPostForm('admin/structure/block/manage/views_block__ctools_views_test_view_block_fields', $edit, $this->t('Save block'));
-
-    $block = $this->storage->load('views_block__ctools_views_test_view_block_fields');
-    $config = $block->getPlugin()->getConfiguration();
-    $this->assertEqual(-46, $config['fields']['id']['weight'], "'sort_fields' setting is properly saved.");
-    $this->assertEqual(-50, $config['fields']['name']['weight'], "'sort_fields' setting is properly saved.");
-
-    // Assert sort_fields overridden settings.
-    $this->drupalGet('<front>');
-
-    // Check that the td with class "views-field-id" is the 5th td in the first tr element.
-    $this->assertEqual(4, count($this->xpath('//div[contains(@class, "view-display-id-block_fields")]//table//tr[1]//td[contains(@class, "views-field-id")]/preceding-sibling::td')));
-
-    // Check that duplicate fields in the View produce expected outpu
-    $name1_element = $this->xpath('//div[contains(@class, "view-display-id-block_fields")]//table//tr[1]/td[contains(@class, "views-field-name")]/text()');
-    $name1 = (string) $name1_element[0];
-    $this->assertEqual("John", trim($name1));
-    $name2_element = $this->xpath('//div[contains(@class, "view-display-id-block_fields")]//table//tr[1]/td[contains(@class, "views-field-name-1")]/text()');
-    $name2 = (string) $name2_element[0];
-    $this->assertEqual("John", trim($name2));
-  }
-
-  /**
-   * Test ctools_views 'disable_filters' configuration.
-   */
-  public function testDisableFilters() {
-    $default_theme = $this->config('system.theme')->get('default');
-
-    // Get the "Configure block" form for our Views block.
-    $this->drupalGet('admin/structure/block/add/views_block:ctools_views_test_view-block_filter/' . $default_theme);
-    $this->assertFieldById('edit-settings-override-filters-status-disable');
-    $this->assertFieldById('edit-settings-override-filters-job-disable');
-
-    // Add block to sidebar_first region with default settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $this->drupalPostForm('admin/structure/block/add/views_block:ctools_views_test_view-block_filter/' . $default_theme, $edit, $this->t('Save block'));
-
-    // Assert disable_filters default settings.
-    $this->drupalGet('<front>');
-    // Check that the default settings show both filters
-    $this->assertFieldByXPath('//select[@name="status"]');
-    $this->assertFieldByXPath('//input[@name="job"]');
-
-    // Override disable_filters settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $edit['settings[override][filters][status][disable]'] = 1;
-    $edit['settings[override][filters][job][disable]'] = 1;
-    $this->drupalPostForm('admin/structure/block/manage/views_block__ctools_views_test_view_block_filter', $edit, $this->t('Save block'));
-
-    $block = $this->storage->load('views_block__ctools_views_test_view_block_filter');
-    $config = $block->getPlugin()->getConfiguration();
-    $this->assertEqual(1, $config['filter']['status']['disable'], "'disable_filters' setting is properly saved.");
-    $this->assertEqual(1, $config['filter']['job']['disable'], "'disable_filters' setting is properly saved.");
-
-    // Assert disable_filters overridden settings.
-    $this->drupalGet('<front>');
-    $this->assertNoFieldByXPath('//select[@name="status"]');
-    $this->assertNoFieldByXPath('//input[@name="job"]');
-  }
-
-  /**
-   * Test ctools_views 'configure_sorts' configuration.
-   */
-  public function testConfigureSorts() {
-    $default_theme = $this->config('system.theme')->get('default');
-
-    // Get the "Configure block" form for our Views block.
-    $this->drupalGet('admin/structure/block/add/views_block:ctools_views_test_view-block_sort/' . $default_theme);
-    $this->assertFieldByXPath('//input[@name="settings[override][sort][id][order]"]');
-
-    // Add block to sidebar_first region with default settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $this->drupalPostForm('admin/structure/block/add/views_block:ctools_views_test_view-block_sort/' . $default_theme, $edit, $this->t('Save block'));
-
-    // Assert configure_sorts default settings.
-    $this->drupalGet('<front>');
-    // Check that the results are sorted ASC
-    $element = $this->xpath('//div[contains(@class, "view-display-id-block_sort")]//table//tr[1]/td[1]/text()');
-    $value = (string) $element[0];
-    $this->assertEqual("1", trim($value));
-
-    // Override configure_sorts settings.
-    $edit = array();
-    $edit['region'] = 'sidebar_first';
-    $edit['settings[override][sort][id][order]'] = "DESC";
-    $this->drupalPostForm('admin/structure/block/manage/views_block__ctools_views_test_view_block_sort', $edit, $this->t('Save block'));
-
-    $block = $this->storage->load('views_block__ctools_views_test_view_block_sort');
-    $config = $block->getPlugin()->getConfiguration();
-    $this->assertEqual("DESC", $config['sort']['id'], "'configure_sorts' setting is properly saved.");
-
-    // Assert configure_sorts overridden settings.
-    // Check that the results are sorted DESC
-    $this->drupalGet('<front>');
-    $element = $this->xpath('//div[contains(@class, "view-display-id-block_sort")]//table//tr[1]/td[1]/text()');
-    $value = (string) $element[0];
-    $this->assertEqual("5", trim($value));
-  }
-}
diff --git a/modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/ctools_views_test_views.info.yml b/modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/ctools_views_test_views.info.yml
deleted file mode 100644
index 092f98c..0000000
--- a/modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/ctools_views_test_views.info.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: 'CTools Views test views'
-type: module
-description: 'Provides default views for CTools Views tests.'
-package: Testing
-# core: 8.x
-dependencies:
-    - views
-    - block
-    - entity_test
-    - ctools_views
-    - text
-    - user
-    - node
-    - taxonomy
-
-# Information added by Drupal.org packaging script on 2017-04-28
-version: '8.x-3.0'
-core: '8.x'
-project: 'ctools'
-datestamp: 1493401747
diff --git a/modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/test_views/views.view.ctools_views_entity_test.yml b/modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/test_views/views.view.ctools_views_entity_test.yml
deleted file mode 100644
index c2ece3c..0000000
--- a/modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/test_views/views.view.ctools_views_entity_test.yml
+++ /dev/null
@@ -1,543 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.ctools_views
-    - taxonomy.vocabulary.tags
-  module:
-    - datetime
-    - node
-    - options
-    - taxonomy
-    - user
-id: ctools_views_entity_test
-label: 'CTools Views Entity Test View'
-module: views
-description: ''
-tag: ''
-base_table: node_field_data
-base_field: nid
-core: 8.x
-display:
-  default:
-    display_plugin: default
-    id: default
-    display_title: Master
-    position: 0
-    display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: none
-        options:
-          offset: 0
-      style:
-        type: table
-      row:
-        type: fields
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          entity_type: node
-          entity_field: title
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            trim: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            html: false
-          hide_empty: false
-          empty_zero: false
-          settings:
-            link_to_entity: true
-          plugin_id: field
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Title
-          exclude: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        status:
-          value: true
-          table: node_field_data
-          field: status
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
-          id: status
-          expose:
-            operator: ''
-          group: 1
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          value:
-            ctools_views: ctools_views
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-      sorts:
-        created:
-          id: created
-          table: node_field_data
-          field: created
-          order: DESC
-          entity_type: node
-          entity_field: created
-          plugin_id: date
-          relationship: none
-          group_type: group
-          admin_label: ''
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-      title: 'CTools Views Entity Test View'
-      header: {  }
-      footer: {  }
-      empty: {  }
-      relationships: {  }
-      arguments: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  block_filter_date:
-    display_plugin: block
-    id: block_filter_date
-    display_title: 'Date filter'
-    position: 4
-    display_options:
-      display_extenders: {  }
-      display_description: ''
-      title: 'Date filter'
-      defaults:
-        title: false
-        filters: false
-        filter_groups: false
-      filters:
-        status:
-          value: true
-          table: node_field_data
-          field: status
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
-          id: status
-          expose:
-            operator: ''
-          group: 1
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          value:
-            ctools_views: ctools_views
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-          group: 1
-        field_ctools_views_date_value:
-          id: field_ctools_views_date_value
-          table: node__field_ctools_views_date
-          field: field_ctools_views_date_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: between
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_ctools_views_date_value_op
-            label: 'CTools Views Date (field_ctools_views_date)'
-            description: ''
-            use_operator: false
-            operator: field_ctools_views_date_value_op
-            identifier: field_ctools_views_date_value
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator1: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          plugin_id: datetime
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      allow:
-        items_per_page: false
-        offset: '0'
-        pager: '0'
-        hide_fields: '0'
-        sort_fields: '0'
-        disable_filters: '0'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  block_filter_list:
-    display_plugin: block
-    id: block_filter_list
-    display_title: 'List filter'
-    position: 3
-    display_options:
-      display_extenders: {  }
-      display_description: ''
-      title: 'List filter'
-      defaults:
-        title: false
-        filters: false
-        filter_groups: false
-      filters:
-        status:
-          value: true
-          table: node_field_data
-          field: status
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
-          id: status
-          expose:
-            operator: ''
-          group: 1
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          value:
-            ctools_views: ctools_views
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-        field_ctools_views_list_value:
-          id: field_ctools_views_list_value
-          table: node__field_ctools_views_list
-          field: field_ctools_views_list_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_ctools_views_list_value_op
-            label: 'Ctools Views List (field_ctools_views_list)'
-            description: ''
-            use_operator: false
-            operator: field_ctools_views_list_value_op
-            identifier: field_ctools_views_list_value
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator1: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          plugin_id: list_field
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      allow:
-        items_per_page: false
-        offset: '0'
-        pager: '0'
-        hide_fields: '0'
-        sort_fields: '0'
-        disable_filters: '0'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  block_filter_tax:
-    display_plugin: block
-    id: block_filter_tax
-    display_title: 'Taxonomy filter'
-    position: 2
-    display_options:
-      display_extenders: {  }
-      display_description: ''
-      title: 'Taxonomy filter'
-      defaults:
-        title: false
-        filters: false
-        filter_groups: false
-      filters:
-        status:
-          value: true
-          table: node_field_data
-          field: status
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
-          id: status
-          expose:
-            operator: ''
-          group: 1
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          value:
-            ctools_views: ctools_views
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-          group: 1
-        field_ctools_views_tags_target_id:
-          id: field_ctools_views_tags_target_id
-          table: node__field_ctools_views_tags
-          field: field_ctools_views_tags_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_ctools_views_tags_target_id_op
-            label: 'Tags (field_ctools_views_tags)'
-            description: ''
-            use_operator: false
-            operator: field_ctools_views_tags_target_id_op
-            identifier: field_ctools_views_tags_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator1: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          type: select
-          limit: true
-          vid: tags
-          hierarchy: false
-          error_message: true
-          plugin_id: taxonomy_index_tid
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      allow:
-        items_per_page: false
-        offset: '0'
-        pager: '0'
-        hide_fields: '0'
-        sort_fields: '0'
-        disable_filters: '0'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  block_filter_text:
-    display_plugin: block
-    id: block_filter_text
-    display_title: 'Textfield filter'
-    position: 1
-    display_options:
-      display_extenders: {  }
-      display_description: ''
-      title: 'Textfield filter'
-      defaults:
-        title: false
-        filters: false
-        filter_groups: false
-      filters:
-        status:
-          value: true
-          table: node_field_data
-          field: status
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
-          id: status
-          expose:
-            operator: ''
-          group: 1
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          value:
-            ctools_views: ctools_views
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-        field_ctools_views_text_value:
-          id: field_ctools_views_text_value
-          table: node__field_ctools_views_text
-          field: field_ctools_views_text_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: '='
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_ctools_views_text_value_op
-            label: 'Text (field_ctools_views_text)'
-            description: ''
-            use_operator: false
-            operator: field_ctools_views_text_value_op
-            identifier: field_ctools_views_text_value
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator1: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          plugin_id: string
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      allow:
-        items_per_page: false
-        offset: '0'
-        pager: '0'
-        hide_fields: '0'
-        sort_fields: '0'
-        disable_filters: '0'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/test_views/views.view.ctools_views_test_view.yml b/modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/test_views/views.view.ctools_views_test_view.yml
deleted file mode 100644
index 7187b56..0000000
--- a/modules/ctools/modules/ctools_views/tests/modules/ctools_views_test_views/test_views/views.view.ctools_views_test_view.yml
+++ /dev/null
@@ -1,949 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: ctools_views_test_view
-label: 'CTools Views Test View'
-module: views
-description: ''
-tag: ''
-base_table: views_test_data
-base_field: id
-core: 8.x
-display:
-  default:
-    display_plugin: default
-    id: default
-    display_title: Master
-    position: 0
-    display_options:
-      access:
-        type: none
-        options: {  }
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: none
-        options:
-          offset: 0
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            id: id
-            age: age
-            created: created
-            id_1: id_1
-            job: job
-            name: name
-          info:
-            id:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            age:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            created:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            id_1:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            job:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: false
-      row:
-        type: fields
-      fields:
-        id:
-          id: id
-          table: views_test_data
-          field: id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ID
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          set_precision: false
-          precision: 0
-          decimal: .
-          separator: ''
-          format_plural: false
-          format_plural_string: "1\x03@count"
-          prefix: ''
-          suffix: ''
-          entity_type: null
-          entity_field: null
-          plugin_id: numeric
-        name:
-          id: name
-          table: views_test_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          plugin_id: standard
-        age:
-          id: age
-          table: views_test_data
-          field: age
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Age
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          set_precision: false
-          precision: 0
-          decimal: .
-          separator: ''
-          format_plural: false
-          format_plural_string: "1\x03@count"
-          prefix: ''
-          suffix: ''
-          plugin_id: numeric
-        job:
-          id: job
-          table: views_test_data
-          field: job
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Job
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          plugin_id: standard
-        created:
-          id: created
-          table: views_test_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Created
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          date_format: fallback
-          custom_date_format: ''
-          timezone: ''
-          plugin_id: date
-      filters: {  }
-      sorts:
-        id:
-          id: id
-          table: views_test_data
-          field: id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: ASC
-          exposed: false
-          expose:
-            label: ''
-          plugin_id: standard
-      title: 'CTools Views Test View'
-      header: {  }
-      footer: {  }
-      empty: {  }
-      relationships: {  }
-      arguments: {  }
-      display_extenders: {  }
-      use_ajax: false
-      filter_groups:
-        operator: AND
-        groups: {  }
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_interface'
-      tags: {  }
-  block_fields:
-    display_plugin: block
-    id: block_fields
-    display_title: 'CTools Views Fields Block'
-    position: 2
-    display_options:
-      display_extenders: {  }
-      block_category: 'CTools Views'
-      allow:
-        hide_fields: hide_fields
-        sort_fields: sort_fields
-        items_per_page: false
-        offset: '0'
-        pager: '0'
-        disable_filters: '0'
-      block_description: 'CTools Views Fields Block'
-      display_description: ''
-      pager:
-        type: none
-        options:
-          offset: 0
-      defaults:
-        pager: false
-        title: false
-        fields: false
-      title: 'CTools Views Fields Block'
-      fields:
-        id:
-          id: id
-          table: views_test_data
-          field: id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ID
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          set_precision: false
-          precision: 0
-          decimal: .
-          separator: ''
-          format_plural: false
-          format_plural_string: "1\x03@count"
-          prefix: ''
-          suffix: ''
-          entity_type: null
-          entity_field: null
-          plugin_id: numeric
-        name:
-          id: name
-          table: views_test_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          plugin_id: standard
-        age:
-          id: age
-          table: views_test_data
-          field: age
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Age
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          set_precision: false
-          precision: 0
-          decimal: .
-          separator: ''
-          format_plural: false
-          format_plural_string: "1\x03@count"
-          prefix: ''
-          suffix: ''
-          plugin_id: numeric
-        job:
-          id: job
-          table: views_test_data
-          field: job
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Job
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          plugin_id: standard
-        created:
-          id: created
-          table: views_test_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Created
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          date_format: fallback
-          custom_date_format: ''
-          timezone: ''
-          plugin_id: date
-        name_1:
-          id: name_1
-          table: views_test_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: '2nd name field'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          plugin_id: standard
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_interface'
-      tags: {  }
-  block_filter:
-    display_plugin: block
-    id: block_filter
-    display_title: 'CTools Views Filter Block'
-    position: 3
-    display_options:
-      display_extenders: {  }
-      display_description: ''
-      block_category: 'CTools Views'
-      block_description: 'CTools Views Filter Block'
-      allow:
-        disable_filters: disable_filters
-        items_per_page: false
-        offset: '0'
-        pager: '0'
-        hide_fields: '0'
-        sort_fields: '0'
-      filters:
-        status:
-          id: status
-          table: views_test_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: '='
-          value: true
-          group: 1
-          exposed: true
-          expose:
-            operator_id: ''
-            label: Status
-            description: ''
-            use_operator: false
-            operator: status_op
-            identifier: status
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator1: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          plugin_id: boolean
-        job:
-          id: job
-          table: views_test_data
-          field: job
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: '='
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: job_op
-            label: Job
-            description: ''
-            use_operator: false
-            operator: job_op
-            identifier: job
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator1: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          plugin_id: string
-      defaults:
-        filters: false
-        filter_groups: false
-        title: false
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      title: 'CTools Views Filter Block'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_interface'
-        - url
-      tags: {  }
-  block_pager:
-    display_plugin: block
-    id: block_pager
-    display_title: 'CTools Views Pager Block'
-    position: 1
-    display_options:
-      display_extenders: {  }
-      block_description: 'CTools Views Pager Block'
-      block_category: 'CTools Views'
-      allow:
-        items_per_page: true
-        offset: offset
-        pager: pager
-        hide_fields: '0'
-        sort_fields: '0'
-        disable_filters: '0'
-      display_description: ''
-      header:
-        result:
-          id: result
-          table: views
-          field: result
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: false
-          content: "Displaying @start - @end of @total\nShowing @current_record_count records on page @current_page"
-          plugin_id: result
-      defaults:
-        header: false
-        pager: false
-        title: false
-      pager:
-        type: mini
-        options:
-          items_per_page: 3
-          offset: 0
-          id: 0
-          total_pages: null
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      title: 'CTools Views Pager Block'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_interface'
-        - url.query_args
-      tags: {  }
-  block_sort:
-    display_plugin: block
-    id: block_sort
-    display_title: 'CTools Views Sort Block'
-    position: 4
-    display_options:
-      display_extenders: {  }
-      display_description: ''
-      title: 'CTools Views Sort Block'
-      defaults:
-        title: false
-      block_description: 'CTools Views Sort Block'
-      block_category: 'CTools Views'
-      allow:
-        configure_sorts: configure_sorts
-        items_per_page: false
-        offset: '0'
-        pager: '0'
-        hide_fields: '0'
-        sort_fields: '0'
-        disable_filters: '0'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_interface'
-      tags: {  }
diff --git a/modules/ctools/src/Access/AccessInterface.php b/modules/ctools/src/Access/AccessInterface.php
deleted file mode 100644
index 1e12fd2..0000000
--- a/modules/ctools/src/Access/AccessInterface.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Access;
-
-use Drupal\Core\Session\AccountInterface;
-
-interface AccessInterface {
-  public function access(AccountInterface $account);
-}
diff --git a/modules/ctools/src/Access/TempstoreAccess.php b/modules/ctools/src/Access/TempstoreAccess.php
deleted file mode 100644
index 506ade6..0000000
--- a/modules/ctools/src/Access/TempstoreAccess.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Access;
-
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Routing\Access\AccessInterface as CoreAccessInterface;
-use Drupal\Core\Routing\RouteMatch;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\ctools\Access\AccessInterface as CToolsAccessInterface;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\Routing\Route;
-
-class TempstoreAccess implements CoreAccessInterface {
-
-  /**
-   * The shared tempstore factory.
-   *
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  public function __construct(SharedTempStoreFactory $tempstore) {
-    $this->tempstore = $tempstore;
-  }
-
-  protected function getTempstore() {
-    return $this->tempstore;
-  }
-
-  public function access(Route $route, RouteMatch $match, AccountInterface $account) {
-    $tempstore_id = $match->getParameter('tempstore_id') ? $match->getParameter('tempstore_id') : $route->getDefault('tempstore_id');
-    $id = $match->getParameter($route->getRequirement('_ctools_access'));
-    if ($tempstore_id && $id) {
-      $cached_values = $this->getTempstore()->get($tempstore_id)->get($id);
-      if (!empty($cached_values['access']) && ($cached_values['access'] instanceof CToolsAccessInterface)) {
-        $access = $cached_values['access']->access($account);
-      }
-      else {
-        $access = AccessResult::allowed();
-      }
-    }
-    else {
-      $access = AccessResult::forbidden();
-    }
-    // The different wizards will have different tempstore ids and adding this
-    // cache context allows us to nuance the access per wizard.
-    $access->addCacheContexts(['url.query_args:tempstore_id']);
-    return $access;
-  }
-}
\ No newline at end of file
diff --git a/modules/ctools/src/Ajax/OpenModalWizardCommand.php b/modules/ctools/src/Ajax/OpenModalWizardCommand.php
deleted file mode 100644
index fc1642c..0000000
--- a/modules/ctools/src/Ajax/OpenModalWizardCommand.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Ajax;
-
-use Drupal\Core\Ajax\OpenModalDialogCommand;
-
-class OpenModalWizardCommand extends OpenModalDialogCommand {
-
-  public function __construct($object, $tempstore_id, array $parameters = array(), array $dialog_options = array(), $settings = NULL) {
-    // Instantiate the wizard class properly.
-    $parameters += [
-      'tempstore_id' => $tempstore_id,
-      'machine_name' => NULL,
-      'step' => NULL,
-    ];
-    $form = \Drupal::service('ctools.wizard.factory')->getWizardForm($object, $parameters, TRUE);
-    $title = isset($form['#title']) ? $form['#title'] : '';
-    $content = $form;
-
-    parent::__construct($title, $content, $dialog_options, $settings);
-  }
-
-}
diff --git a/modules/ctools/src/Annotation/Relationship.php b/modules/ctools/src/Annotation/Relationship.php
deleted file mode 100644
index 452f699..0000000
--- a/modules/ctools/src/Annotation/Relationship.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a Relationship item annotation object.
- *
- * @see \Drupal\ctools\Plugin\RelationshipManager
- * @see plugin_api
- *
- * @Annotation
- */
-class Relationship extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The label of the plugin.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   *
-   * @ingroup plugin_translatable
-   */
-  public $label;
-
-  /**
-   * The returned data type of this relationship
-   *
-   * @var string
-   */
-  public $data_type;
-
-  /**
-   * The name of the property from which this relationship is derived.
-   *
-   * @var string
-   */
-  public $property_name;
-
-  /**
-   * The array of contexts requires or optional for this plugin.
-   *
-   * @var \Drupal\Core\Plugin\Context\ContextInterface[]
-   */
-  public $context;
-
-}
diff --git a/modules/ctools/src/ConstraintConditionInterface.php b/modules/ctools/src/ConstraintConditionInterface.php
deleted file mode 100644
index 236593a..0000000
--- a/modules/ctools/src/ConstraintConditionInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\ctools;
-
-
-interface ConstraintConditionInterface {
-
-  /**
-   * Applies relevant constraints for this condition to the injected contexts.
-   *
-   * @param \Drupal\Core\Plugin\Context\ContextInterface[] $contexts
-   *
-   * @return NULL
-   */
-  public function applyConstraints(array $contexts = array());
-
-  /**
-   * Removes constraints for this condition from the injected contexts.
-   *
-   * @param \Drupal\Core\Plugin\Context\ContextInterface[] $contexts
-   *
-   * @return NULL
-   */
-  public function removeConstraints(array $contexts = array());
-
-}
diff --git a/modules/ctools/src/Context/AutomaticContext.php b/modules/ctools/src/Context/AutomaticContext.php
deleted file mode 100644
index 2202229..0000000
--- a/modules/ctools/src/Context/AutomaticContext.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Context;
-
-use Drupal\Core\Plugin\Context\Context;
-
-/**
- * Provides a class to indicate that this context is always present.
- *
- * @internal
- *
- * @todo Move into core.
- */
-class AutomaticContext extends Context {
-
-  /**
-   * Returns TRUE if this context is automatic and always available.
-   *
-   * @return bool
-   */
-  public function isAutomatic() {
-    return TRUE;
-  }
-
-}
diff --git a/modules/ctools/src/Context/EntityLazyLoadContext.php b/modules/ctools/src/Context/EntityLazyLoadContext.php
deleted file mode 100644
index c4dacce..0000000
--- a/modules/ctools/src/Context/EntityLazyLoadContext.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Context;
-
-use Drupal\Core\Entity\EntityRepositoryInterface;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinitionInterface;
-
-/**
- * @todo.
- */
-class EntityLazyLoadContext extends Context {
-
-  /**
-   * The entity UUID.
-   *
-   * @var string
-   */
-  protected $uuid;
-
-  /**
-   * The entity repository.
-   *
-   * @var \Drupal\Core\Entity\EntityRepositoryInterface
-   */
-  protected $entityRepository;
-
-  /**
-   * Construct an EntityLazyLoadContext object.
-   *
-   * @param \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context_definition
-   *   The context definition.
-   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
-   *   The entity repository.
-   * @param string $uuid
-   *   The UUID of the entity.
-   */
-  public function __construct(ContextDefinitionInterface $context_definition, EntityRepositoryInterface $entity_repository, $uuid) {
-    parent::__construct($context_definition);
-    $this->entityRepository = $entity_repository;
-    $this->uuid = $uuid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getContextValue() {
-    if (!$this->contextData) {
-      $entity_type_id = substr($this->contextDefinition->getDataType(), 7);
-      $this->setContextValue($this->entityRepository->loadEntityByUuid($entity_type_id, $this->uuid));
-    }
-    return parent::getContextValue();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasContextValue() {
-    // Ensure that the entity is loaded before checking if it exists.
-    if (!$this->contextData) {
-      $this->getContextValue();
-    }
-    return parent::hasContextValue();
-  }
-
-}
diff --git a/modules/ctools/src/ContextMapper.php b/modules/ctools/src/ContextMapper.php
deleted file mode 100644
index 284dcf0..0000000
--- a/modules/ctools/src/ContextMapper.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Drupal\ctools;
-
-use Drupal\Core\Entity\EntityRepositoryInterface;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\ctools\Context\EntityLazyLoadContext;
-
-/**
- * Maps context configurations to context objects.
- */
-class ContextMapper implements ContextMapperInterface {
-
-  /**
-   * The entity repository.
-   *
-   * @var \Drupal\Core\Entity\EntityRepositoryInterface
-   */
-  protected $entityRepository;
-
-  /**
-   * Constructs a new ContextMapper.
-   *
-   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
-   *   The entity repository.
-   */
-  public function __construct(EntityRepositoryInterface $entity_repository) {
-    $this->entityRepository = $entity_repository;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getContextValues(array $context_configurations) {
-    $contexts = [];
-    foreach ($context_configurations as $name => $context_configuration) {
-      $context_definition = new ContextDefinition($context_configuration['type'], $context_configuration['label'], TRUE, FALSE, $context_configuration['description']);
-      if (strpos($context_configuration['type'], 'entity:') === 0) {
-        $context = new EntityLazyLoadContext($context_definition, $this->entityRepository, $context_configuration['value']);
-      }
-      else {
-        $context = new Context($context_definition, $context_configuration['value']);
-      }
-      $contexts[$name] = $context;
-    }
-    return $contexts;
-  }
-
-}
diff --git a/modules/ctools/src/ContextMapperInterface.php b/modules/ctools/src/ContextMapperInterface.php
deleted file mode 100644
index b583817..0000000
--- a/modules/ctools/src/ContextMapperInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Drupal\ctools;
-
-/**
- * Provides an interface for mapping context configurations to context objects.
- */
-interface ContextMapperInterface {
-
-  /**
-   * Gathers the static context values.
-   *
-   * @param array[] $static_context_configurations
-   *   An array of static context configurations.
-   *
-   * @return \Drupal\Component\Plugin\Context\ContextInterface[]
-   *   An array of set context values, keyed by context name.
-   */
-  public function getContextValues(array $static_context_configurations);
-
-}
diff --git a/modules/ctools/src/ContextNotFoundException.php b/modules/ctools/src/ContextNotFoundException.php
deleted file mode 100644
index b9cf15c..0000000
--- a/modules/ctools/src/ContextNotFoundException.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-namespace Drupal\ctools;
-
-
-class ContextNotFoundException extends \Exception {}
diff --git a/modules/ctools/src/Controller/WizardEntityFormController.php b/modules/ctools/src/Controller/WizardEntityFormController.php
deleted file mode 100644
index 4525764..0000000
--- a/modules/ctools/src/Controller/WizardEntityFormController.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Controller;
-
-use Drupal\Core\Controller\ControllerResolverInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\ctools\Wizard\WizardFactoryInterface;
-
-/**
- * Wrapping controller for wizard forms that serve as the main page body.
- */
-class WizardEntityFormController extends WizardFormController {
-
-  /**
-   * The entity manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * @param \Drupal\Core\Controller\ControllerResolverInterface $controller_resolver
-   *   The controller resolver.
-   * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
-   *   The form builder.
-   * @param \Drupal\ctools\Wizard\WizardFactoryInterface $wizard_factory
-   *   The wizard factory.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $manager
-   *   The entity manager.
-   */
-  public function __construct(ControllerResolverInterface $controller_resolver, FormBuilderInterface $form_builder, WizardFactoryInterface $wizard_factory, EntityManagerInterface $manager) {
-    parent::__construct($controller_resolver, $form_builder, $wizard_factory);
-    $this->entityManager = $manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getFormArgument(RouteMatchInterface $route_match) {
-    $form_arg = $route_match->getRouteObject()->getDefault('_entity_wizard');
-    list($entity_type_id, $operation) = explode('.', $form_arg);
-    $definition = $this->entityManager->getDefinition($entity_type_id);
-    $handlers = $definition->getHandlerClasses();
-    if (empty($handlers['wizard'][$operation])) {
-      throw new \Exception(sprintf('Unsupported wizard operation %s', $operation));
-    }
-    return $handlers['wizard'][$operation];
-  }
-
-}
diff --git a/modules/ctools/src/Controller/WizardFormController.php b/modules/ctools/src/Controller/WizardFormController.php
deleted file mode 100644
index e4492a4..0000000
--- a/modules/ctools/src/Controller/WizardFormController.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Controller;
-
-use Drupal\Core\Controller\ControllerResolverInterface;
-use Drupal\Core\Controller\FormController;
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\ctools\Wizard\FormWizardInterface;
-use Drupal\ctools\Wizard\WizardFactoryInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Wrapping controller for wizard forms that serve as the main page body.
- */
-class WizardFormController extends FormController {
-
-  /**
-   * The class resolver.
-   *
-   * @var \Drupal\Core\DependencyInjection\ClassResolverInterface;
-   */
-  protected $classResolver;
-
-  /**
-   * Tempstore Factory for keeping track of values in each step of the wizard.
-   *
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * The event dispatcher.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-   */
-  protected $dispatcher;
-
-  /**
-   * @param \Drupal\Core\Controller\ControllerResolverInterface $controller_resolver
-   *   The controller resolver.
-   * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
-   *   The form builder.
-   * @param \Drupal\ctools\Wizard\WizardFactoryInterface $wizard_factory
-   *   The wizard factory.
-   */
-  public function __construct(ControllerResolverInterface $controller_resolver, FormBuilderInterface $form_builder, WizardFactoryInterface $wizard_factory) {
-    parent::__construct($controller_resolver, $form_builder);
-    $this->wizardFactory = $wizard_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getFormArgument(RouteMatchInterface $route_match) {
-    return $route_match->getRouteObject()->getDefault('_wizard');
-  }
-
-  /**
-   * Wizards are not instantiated as simply as forms, so this method is unused.
-   */
-  protected function getFormObject(RouteMatchInterface $route_match, $form_arg) {
-    if (!is_subclass_of($form_arg, '\Drupal\ctools\Wizard\FormWizardInterface')) {
-      throw new \Exception("The _wizard default must reference a class instance of \\Drupal\\ctools\\Wizard\\FormWizardInterface.");
-    }
-    $parameters = $route_match->getParameters()->all();
-    $parameters += $form_arg::getParameters();
-    $parameters['route_match'] = $route_match;
-    return $this->wizardFactory->createWizard($form_arg, $parameters);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getContentResult(Request $request, RouteMatchInterface $route_match) {
-    $wizard = $this->getFormObject($route_match, $this->getFormArgument($route_match));
-    $ajax = $request->attributes->get('js') == 'ajax' ? TRUE : FALSE;
-
-    return $this->wizardFactory->getWizardForm($wizard, $request->attributes->all(), $ajax);
-  }
-
-}
diff --git a/modules/ctools/src/Event/WizardEvent.php b/modules/ctools/src/Event/WizardEvent.php
deleted file mode 100644
index 7123297..0000000
--- a/modules/ctools/src/Event/WizardEvent.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Event;
-
-use Drupal\ctools\Wizard\FormWizardInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * An event for altering form wizard values.
- */
-class WizardEvent extends Event {
-
-  /**
-   * @var \Drupal\ctools\Wizard\FormWizardInterface
-   */
-  protected $wizard;
-
-  /**
-   * @var mixed
-   */
-  protected $values;
-
-  function __construct(FormWizardInterface $wizard, $values) {
-    $this->wizard = $wizard;
-    $this->values = $values;
-  }
-
-  public function getWizard() {
-    return $this->wizard;
-  }
-
-  public function getValues() {
-    return $this->values;
-  }
-
-  public function setValues($values) {
-    $this->values = $values;
-    return $this;
-  }
-
-}
diff --git a/modules/ctools/src/Form/AjaxFormTrait.php b/modules/ctools/src/Form/AjaxFormTrait.php
deleted file mode 100644
index b30250b..0000000
--- a/modules/ctools/src/Form/AjaxFormTrait.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\NestedArray;
-
-/**
- * Provides helper methods for using an AJAX modal.
- */
-trait AjaxFormTrait {
-
-  /**
-   * Gets attributes for use with an AJAX modal.
-   *
-   * @return array
-   */
-   public static function getAjaxAttributes() {
-    return [
-      'class' => ['use-ajax'],
-      'data-dialog-type' => 'modal',
-      'data-dialog-options' => Json::encode([
-        'width' => 'auto',
-      ]),
-    ];
-  }
-
-  /**
-   * Gets attributes for use with an add button AJAX modal.
-   *
-   * @return array
-   */
-   public static function getAjaxButtonAttributes() {
-    return NestedArray::mergeDeep(AjaxFormTrait::getAjaxAttributes(), [
-      'class' => [
-        'button',
-        'button--small',
-        'button-action',
-      ],
-    ]);
-  }
-
-}
diff --git a/modules/ctools/src/Form/ConditionConfigure.php b/modules/ctools/src/Form/ConditionConfigure.php
deleted file mode 100644
index fd2608e..0000000
--- a/modules/ctools/src/Form/ConditionConfigure.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Component\Uuid\Uuid;
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\CloseModalDialogCommand;
-use Drupal\Core\Ajax\RedirectCommand;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContextAwarePluginInterface;
-use Drupal\ctools\ConstraintConditionInterface;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Base class for condition configur operations.
- */
-abstract class ConditionConfigure extends FormBase {
-
-  /**
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * @var \Drupal\Core\Condition\ConditionManager
-   */
-  protected $manager;
-
-  /**
-   * @var string
-   */
-  protected $tempstore_id;
-
-  /**
-   * @var string;
-   */
-  protected $machine_name;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('user.shared_tempstore'), $container->get('plugin.manager.condition'));
-  }
-
-  function __construct(SharedTempStoreFactory $tempstore, PluginManagerInterface $manager) {
-    $this->tempstore = $tempstore;
-    $this->manager = $manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_condition_configure';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $condition = NULL, $tempstore_id = NULL, $machine_name = NULL) {
-    $this->tempstore_id = $tempstore_id;
-    $this->machine_name = $machine_name;
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    if (is_numeric($condition) || Uuid::isValid($condition)) {
-      $id = $condition;
-      $condition = $this->getConditions($cached_values)[$id];
-      $instance = $this->manager->createInstance($condition['id'], $condition);
-    }
-    else {
-      $instance = $this->manager->createInstance($condition, []);
-    }
-    $form_state->setTemporaryValue('gathered_contexts', $this->getContexts($cached_values));
-    /** @var $instance \Drupal\Core\Condition\ConditionInterface */
-    $form = $instance->buildConfigurationForm($form, $form_state);
-    if (isset($id)) {
-      // Conditionally set this form element so that we can update or add.
-      $form['id'] = [
-        '#type' => 'value',
-        '#value' => $id
-      ];
-    }
-    $form['instance'] = [
-      '#type' => 'value',
-      '#value' => $instance
-    ];
-    $form['submit'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-      '#ajax' => [
-        'callback' => [$this, 'ajaxSave'],
-      ]
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    /** @var $instance \Drupal\Core\Condition\ConditionInterface */
-    $instance = $form_state->getValue('instance');
-    $instance->submitConfigurationForm($form, $form_state);
-    $conditions = $this->getConditions($cached_values);
-    if ($instance instanceof ContextAwarePluginInterface) {
-      /** @var  $instance \Drupal\Core\Plugin\ContextAwarePluginInterface */
-      $context_mapping = $form_state->hasValue('context_mapping')? $form_state->getValue('context_mapping') : [];
-      $instance->setContextMapping($context_mapping);
-    }
-    if ($instance instanceof ConstraintConditionInterface) {
-      /** @var  $instance \Drupal\ctools\ConstraintConditionInterface */
-      $instance->applyConstraints($this->getContexts($cached_values));
-    }
-    if ($form_state->hasValue('id')) {
-      $conditions[$form_state->getValue('id')] = $instance->getConfiguration();
-    }
-    else {
-      $conditions[] = $instance->getConfiguration();
-    }
-    $cached_values = $this->setConditions($cached_values, $conditions);
-    $this->tempstore->get($this->tempstore_id)->set($this->machine_name, $cached_values);
-    list($route_name, $route_parameters) = $this->getParentRouteInfo($cached_values);
-    $form_state->setRedirect($route_name, $route_parameters);
-  }
-
-  public function ajaxSave(array &$form, FormStateInterface $form_state) {
-    $response = new AjaxResponse();
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    list($route_name, $route_parameters) = $this->getParentRouteInfo($cached_values);
-    $response->addCommand(new RedirectCommand($this->url($route_name, $route_parameters)));
-    $response->addCommand(new CloseModalDialogCommand());
-    return $response;
-  }
-
-  /**
-   * Document the route name and parameters for redirect after submission.
-   *
-   * @param $cached_values
-   *
-   * @return array
-   *   In the format of
-   *   return ['route.name', ['machine_name' => $this->machine_name, 'step' => 'step_name']];
-   */
-  abstract protected function getParentRouteInfo($cached_values);
-
-  /**
-   * Custom logic for retrieving the conditions array from cached_values.
-   *
-   * @param $cached_values
-   *
-   * @return array
-   */
-  abstract protected function getConditions($cached_values);
-
-  /**
-   * Custom logic for setting the conditions array in cached_values.
-   *
-   * @param $cached_values
-   *
-   * @param $conditions
-   *   The conditions to set within the cached values.
-   *
-   * @return mixed
-   *   Return the $cached_values
-   */
-  abstract protected function setConditions($cached_values, $conditions);
-
-  /**
-   * Custom logic for retrieving the contexts array from cached_values.
-   *
-   * @param $cached_values
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
-   */
-  abstract protected function getContexts($cached_values);
-
-}
diff --git a/modules/ctools/src/Form/ConditionDelete.php b/modules/ctools/src/Form/ConditionDelete.php
deleted file mode 100644
index d2303bc..0000000
--- a/modules/ctools/src/Form/ConditionDelete.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\ConfirmFormHelper;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\ctools\ConstraintConditionInterface;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-abstract class ConditionDelete extends ConfirmFormBase {
-
-  /**
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * @var \Drupal\Core\Condition\ConditionManager
-   */
-  protected $manager;
-
-  /**
-   * @var string
-   */
-  protected $tempstore_id;
-
-  /**
-   * @var string;
-   */
-  protected $machine_name;
-
-  /**
-   * @var int;
-   */
-  protected $id;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('user.shared_tempstore'), $container->get('plugin.manager.condition'));
-  }
-
-  function __construct(SharedTempStoreFactory $tempstore, PluginManagerInterface $manager) {
-    $this->tempstore = $tempstore;
-    $this->manager = $manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_condition_delete';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $id = NULL, $tempstore_id = NULL, $machine_name = NULL) {
-    $this->tempstore_id = $tempstore_id;
-    $this->machine_name = $machine_name;
-    $this->id = $id;
-
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    $form ['#title'] = $this->getQuestion($id, $cached_values);
-
-    $form ['#attributes']['class'][] = 'confirmation';
-    $form ['description'] = array('#markup' => $this->getDescription());
-    $form [$this->getFormName()] = array('#type' => 'hidden', '#value' => 1);
-
-    // By default, render the form using theme_confirm_form().
-    if (!isset($form ['#theme'])) {
-      $form ['#theme'] = 'confirm_form';
-    }
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions'] += $this->actions($form, $form_state);
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    $conditions = $this->getConditions($cached_values);
-    /** @var  $instance \Drupal\ctools\ConstraintConditionInterface */
-    $instance = $this->manager->createInstance($conditions[$this->id]['id'], $conditions[$this->id]);
-    if ($instance instanceof ConstraintConditionInterface) {
-      $instance->removeConstraints($this->getContexts($cached_values));
-    }
-    unset($conditions[$this->id]);
-    $cached_values = $this->setConditions($cached_values, $conditions);
-    $this->tempstore->get($this->tempstore_id)->set($this->machine_name, $cached_values);
-    list($route_name, $route_parameters) = $this->getParentRouteInfo($cached_values);
-    $form_state->setRedirect($route_name, $route_parameters);
-  }
-
-  public function getQuestion($id = NULL, $cached_values = NULL) {
-    $condition = $this->getConditions($cached_values)[$id];
-    return $this->t('Are you sure you want to delete the @label condition?', array(
-      '@label' => $condition['id'],
-    ));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return $this->t('This action cannot be undone.');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormName() {
-    return 'confirm';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    return array(
-      'submit' => array(
-        '#type' => 'submit',
-        '#value' => $this->getConfirmText(),
-        '#validate' => array(
-          array($this, 'validateForm'),
-        ),
-        '#submit' => array(
-          array($this, 'submitForm'),
-        ),
-      ),
-      'cancel' => ConfirmFormHelper::buildCancelLink($this, $this->getRequest()),
-    );
-  }
-
-  /**
-   * Returns the route to go to if the user cancels the action.
-   *
-   * @return \Drupal\Core\Url
-   *   A URL object.
-   */
-  public function getCancelUrl() {
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    list($route_name, $route_parameters) = $this->getParentRouteInfo($cached_values);
-    return new Url($route_name, $route_parameters);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelText() {
-    return $this->t('Cancel');
-  }
-
-  /**
-   * Document the route name and parameters for redirect after submission.
-   *
-   * @param $cached_values
-   *
-   * @return array
-   *   In the format of
-   *   return ['route.name', ['machine_name' => $this->machine_name, 'step' => 'step_name]];
-   */
-  abstract protected function getParentRouteInfo($cached_values);
-
-  /**
-   * Custom logic for retrieving the conditions array from cached_values.
-   *
-   * @param $cached_values
-   *
-   * @return array
-   */
-  abstract protected function getConditions($cached_values);
-
-  /**
-   * Custom logic for setting the conditions array in cached_values.
-   *
-   * @param $cached_values
-   *
-   * @param $conditions
-   *   The conditions to set within the cached values.
-   *
-   * @return mixed
-   *   Return the $cached_values
-   */
-  abstract protected function setConditions($cached_values, $conditions);
-
-  /**
-   * Custom logic for retrieving the contexts array from cached_values.
-   *
-   * @param $cached_values
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
-   */
-  abstract protected function getContexts($cached_values);
-
-}
diff --git a/modules/ctools/src/Form/ContextConfigure.php b/modules/ctools/src/Form/ContextConfigure.php
deleted file mode 100644
index 142f18a..0000000
--- a/modules/ctools/src/Form/ContextConfigure.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\CloseModalDialogCommand;
-use Drupal\Core\Ajax\RedirectCommand;
-use Drupal\Core\Entity\Entity;
-use Drupal\Core\Entity\Plugin\DataType\EntityAdapter;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\Core\Plugin\Context\ContextInterface;
-use Drupal\Core\Url;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-abstract class ContextConfigure extends FormBase {
-
-  /**
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * @var string
-   */
-  protected $tempstore_id;
-
-  /**
-   * @var string;
-   */
-  protected $machine_name;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('user.shared_tempstore'));
-  }
-
-  function __construct(SharedTempStoreFactory $tempstore) {
-    $this->tempstore = $tempstore;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_context_configure';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $context_id = NULL, $tempstore_id = NULL, $machine_name = NULL) {
-    $this->tempstore_id = $tempstore_id;
-    $this->machine_name = $machine_name;
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    $contexts = $this->getContexts($cached_values);
-    $edit = FALSE;
-    if (!empty($contexts[$context_id])) {
-      $context = $contexts[$context_id];
-      $machine_name = $context_id;
-      $edit = TRUE;
-    }
-    else {
-      $context_definition = new ContextDefinition($context_id);
-      $context = new Context($context_definition);
-      $machine_name = '';
-    }
-    $label = $context->getContextDefinition()->getLabel();
-    $description = $context->getContextDefinition()->getDescription();
-    $data_type = $context->getContextDefinition()->getDataType();
-    $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
-    $form['context_id'] = [
-      '#type' => 'value',
-      '#value' => $context_id
-    ];
-    $form['label'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Label'),
-      '#default_value' => $label,
-      '#required' => TRUE,
-    ];
-    $form['machine_name'] = [
-      '#type' => 'machine_name',
-      '#title' => $this->t('Machine Name'),
-      '#default_value' => $machine_name,
-      '#required' => TRUE,
-      '#maxlength' => 128,
-      '#machine_name' => [
-        'source' => ['label'],
-        'exists' => [$this, 'contextExists'],
-      ],
-      '#disabled' => $this->disableMachineName($cached_values, $machine_name),
-    ];
-    $form['description'] = [
-      '#type' => 'textarea',
-      '#title' => $this->t('Description'),
-      '#default_value' => $description,
-    ];
-    if (strpos($data_type, 'entity:') === 0) {
-      list(, $entity_type) = explode(':', $data_type);
-      /** @var EntityAdapter $entity */
-      $entity = $edit ? $context->getContextValue() : NULL;
-      $form['context_value'] = [
-        '#type' => 'entity_autocomplete',
-        '#required' => TRUE,
-        '#target_type' => $entity_type,
-        '#default_value' => $entity,
-        '#title' => $this->t('Select entity'),
-      ];
-    }
-    else {
-      $value = $context->getContextData()->getValue();
-      $form['context_value'] = [
-        '#title' => $this->t('Set a context value'),
-        '#type' => 'textfield',
-        '#required' => TRUE,
-        '#default_value' => $value,
-      ];
-    }
-    $form['submit'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-      '#ajax' => [
-        'callback' => [$this, 'ajaxSave'],
-      ]
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    // If these are not equal, then we're adding a new context and should not override an existing context.
-    if ($form_state->getValue('machine_name') != $form_state->getValue('context_id')) {
-      $machine_name = $form_state->getValue('machine_name');
-      $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-      if (!empty($this->getContexts($cached_values)[$machine_name])) {
-        $form_state->setError($form['machine_name'], $this->t('That machine name is in use by another context definition.'));
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    $contexts = $this->getContexts($cached_values);
-    if ($form_state->getValue('machine_name') != $form_state->getValue('context_id')) {
-      $data_type = $form_state->getValue('context_id');
-      $context_definition = new ContextDefinition($data_type, $form_state->getValue('label'), TRUE, FALSE, $form_state->getValue('description'));
-    }
-    else {
-      $context = $contexts[$form_state->getValue('machine_name')];
-      $context_definition = $context->getContextDefinition();
-      $context_definition->setLabel($form_state->getValue('label'));
-      $context_definition->setDescription($form_state->getValue('description'));
-    }
-    // We're dealing with an entity and should make sure it's loaded.
-    if (strpos($context_definition->getDataType(), 'entity:') === 0) {
-      list(, $entity_type) = explode(':', $context_definition->getDataType());
-      if (is_numeric($form_state->getValue('context_value'))) {
-        $value = \Drupal::entityTypeManager()->getStorage($entity_type)->load($form_state->getValue('context_value'));
-      }
-    }
-    // No loading required for non-entity values.
-    else {
-      $value = $form_state->getValue('context_value');
-    }
-    $context = new Context($context_definition, $value);
-
-    $cached_values = $this->addContext($cached_values, $form_state->getValue('machine_name'), $context);
-    $this->tempstore->get($this->tempstore_id)->set($this->machine_name, $cached_values);
-    list($route_name, $route_parameters) = $this->getParentRouteInfo($cached_values);
-    $form_state->setRedirect($route_name, $route_parameters);
-  }
-
-  public function ajaxSave(array &$form, FormStateInterface $form_state) {
-    $response = new AjaxResponse();
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    list($route_name, $route_parameters) = $this->getParentRouteInfo($cached_values);
-    $url = new Url($route_name, $route_parameters);
-    $response->addCommand(new RedirectCommand($url->toString()));
-    $response->addCommand(new CloseModalDialogCommand());
-    return $response;
-  }
-
-  /**
-   * Document the route name and parameters for redirect after submission.
-   *
-   * @param $cached_values
-   *
-   * @return array
-   *   In the format of
-   *   return ['route.name', ['machine_name' => $this->machine_name, 'step' => 'step_name]];
-   */
-  abstract protected function getParentRouteInfo($cached_values);
-
-  /**
-   * Custom logic for retrieving the contexts array from cached_values.
-   *
-   * @param $cached_values
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
-   */
-  abstract protected function getContexts($cached_values);
-
-  /**
-   * Custom logic for adding a context to the cached_values contexts array.
-   *
-   * @param array $cached_values
-   *   The cached_values currently in use.
-   * @param string $context_id
-   *   The context identifier.
-   * @param \Drupal\Core\Plugin\Context\ContextInterface $context
-   *   The context to add or update within the cached values.
-   *
-   * @return mixed
-   *   Return the $cached_values
-   */
-  abstract protected function addContext($cached_values, $context_id, ContextInterface $context);
-
-  /**
-   * Custom "exists" logic for the context to be created.
-   *
-   * @param string $value
-   *   The name of the context.
-   * @param $element
-   *   The machine_name element
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The form state.
-   *
-   * @return bool
-   *   Return true if a context of this name exists.
-   */
-  abstract public function contextExists($value, $element, $form_state);
-
-  /**
-   * Determines if the machine_name should be disabled.
-   *
-   * @param $cached_values
-   *
-   * @return bool
-   */
-  abstract protected function disableMachineName($cached_values, $machine_name);
-
-}
diff --git a/modules/ctools/src/Form/ContextDelete.php b/modules/ctools/src/Form/ContextDelete.php
deleted file mode 100644
index 06e0794..0000000
--- a/modules/ctools/src/Form/ContextDelete.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a form for deleting an contexts and relationships.
- */
-abstract class ContextDelete extends ConfirmFormBase {
-
-  /**
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * @var string
-   */
-  protected $tempstore_id;
-
-  /**
-   * @var string
-   */
-  protected $machine_name;
-
-  /**
-   * The static context's machine name.
-   *
-   * @var array
-   */
-  protected $context_id;
-
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('user.shared_tempstore'));
-  }
-
-  public function __construct(SharedTempStoreFactory $tempstore) {
-    $this->tempstore = $tempstore;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_context_delete_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $tempstore_id = NULL, $machine_name = NULL, $context_id = NULL) {
-    $this->tempstore_id = $tempstore_id;
-    $this->machine_name = $machine_name;
-    $this->context_id = $context_id;
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setRedirectUrl($this->getCancelUrl());
-  }
-
-  protected function getTempstore() {
-    return $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-  }
-
-  protected function setTempstore($cached_values) {
-    $this->tempstore->get($this->tempstore_id)->set($this->machine_name, $cached_values);
-  }
-
-}
diff --git a/modules/ctools/src/Form/ManageConditions.php b/modules/ctools/src/Form/ManageConditions.php
deleted file mode 100644
index ee506a8..0000000
--- a/modules/ctools/src/Form/ManageConditions.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Component\Serialization\Json;
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\OpenModalDialogCommand;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-abstract class ManageConditions extends FormBase {
-
-  /**
-   * @var \Drupal\Core\Condition\ConditionManager
-   */
-  protected $manager;
-
-  /**
-   * @var string
-   */
-  protected $machine_name;
-
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('plugin.manager.condition'));
-  }
-
-  function __construct(PluginManagerInterface $manager) {
-    $this->manager = $manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_manage_conditions_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    $this->machine_name = $cached_values['id'];
-    $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
-    $options = [];
-    $contexts = $this->getContexts($cached_values);
-    foreach ($this->manager->getDefinitionsForContexts($contexts) as $plugin_id => $definition) {
-      $options[$plugin_id] = (string) $definition['label'];
-    }
-    $form['items'] = array(
-      '#type' => 'markup',
-      '#prefix' => '<div id="configured-conditions">',
-      '#suffix' => '</div>',
-      '#theme' => 'table',
-      '#header' => array($this->t('Plugin Id'), $this->t('Summary'), $this->t('Operations')),
-      '#rows' => $this->renderRows($cached_values),
-      '#empty' => $this->t('No required conditions have been configured.')
-    );
-    $form['conditions'] = [
-      '#type' => 'select',
-      '#options' => $options,
-    ];
-    $form['add'] = [
-      '#type' => 'submit',
-      '#name' => 'add',
-      '#value' => $this->t('Add Condition'),
-      '#ajax' => [
-        'callback' => [$this, 'add'],
-        'event' => 'click',
-      ],
-      '#submit' => [
-        'callback' => [$this, 'submitForm'],
-      ]
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    list(, $route_parameters) = $this->getOperationsRouteInfo($cached_values, $this->machine_name, $form_state->getValue('conditions'));
-    $form_state->setRedirect($this->getAddRoute($cached_values), $route_parameters);
-  }
-
-  public function add(array &$form, FormStateInterface $form_state) {
-    $condition = $form_state->getValue('conditions');
-    $content = \Drupal::formBuilder()->getForm($this->getConditionClass(), $condition, $this->getTempstoreId(), $this->machine_name);
-    $content['#attached']['library'][] = 'core/drupal.dialog.ajax';
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    list(, $route_parameters) = $this->getOperationsRouteInfo($cached_values, $this->machine_name, $form_state->getValue('conditions'));
-    $content['submit']['#attached']['drupalSettings']['ajax'][$content['submit']['#id']]['url'] = $this->url($this->getAddRoute($cached_values), $route_parameters, ['query' => [FormBuilderInterface::AJAX_FORM_REQUEST => TRUE]]);
-    $response = new AjaxResponse();
-    $response->addCommand(new OpenModalDialogCommand($this->t('Configure Required Context'), $content, array('width' => '700')));
-    return $response;
-  }
-
-  /**
-   * @param $cached_values
-   *
-   * @return array
-   */
-  public function renderRows($cached_values) {
-    $configured_conditions = array();
-    foreach ($this->getConditions($cached_values) as $row => $condition) {
-      /** @var $instance \Drupal\Core\Condition\ConditionInterface */
-      $instance = $this->manager->createInstance($condition['id'], $condition);
-      list($route_name, $route_parameters) = $this->getOperationsRouteInfo($cached_values, $cached_values['id'], $row);
-      $build = array(
-        '#type' => 'operations',
-        '#links' => $this->getOperations($route_name, $route_parameters),
-      );
-      $configured_conditions[] = array(
-        $instance->getPluginId(),
-        $instance->summary(),
-        'operations' => [
-          'data' => $build,
-        ],
-      );
-    }
-    return $configured_conditions;
-  }
-
-  protected function getOperations($route_name_base, array $route_parameters = array()) {
-    $operations['edit'] = array(
-      'title' => $this->t('Edit'),
-      'url' => new Url($route_name_base . '.edit', $route_parameters),
-      'weight' => 10,
-      'attributes' => array(
-        'class' => ['use-ajax'],
-        'data-dialog-type' => 'modal',
-        'data-dialog-options' => Json::encode([
-          'width' => 700,
-        ]),
-      ),
-    );
-    $route_parameters['id'] = $route_parameters['condition'];
-    $operations['delete'] = array(
-      'title' => $this->t('Delete'),
-      'url' => new Url($route_name_base . '.delete', $route_parameters),
-      'weight' => 100,
-      'attributes' => array(
-        'class' => array('use-ajax'),
-        'data-dialog-type' => 'modal',
-        'data-dialog-options' => Json::encode([
-          'width' => 700,
-        ]),
-      ),
-    );
-    return $operations;
-  }
-
-  /**
-   * Return a subclass of '\Drupal\ctools\Form\ConditionConfigure'.
-   *
-   * The ConditionConfigure class is designed to be subclassed with custom
-   * route information to control the modal/redirect needs of your use case.
-   *
-   * @return string
-   */
-  abstract protected function getConditionClass();
-
-  /**
-   * The route to which condition 'add' actions should submit.
-   *
-   * @param mixed $cached_values
-   *
-   * @return string
-   */
-  abstract protected function getAddRoute($cached_values);
-
-  /**
-   * Provide the tempstore id for your specified use case.
-   *
-   * @return string
-   */
-  abstract protected function getTempstoreId();
-
-  /**
-   * Document the route name and parameters for edit/delete context operations.
-   *
-   * The route name returned from this method is used as a "base" to which
-   * ".edit" and ".delete" are appeneded in the getOperations() method.
-   * Subclassing '\Drupal\ctools\Form\ConditionConfigure' and
-   * '\Drupal\ctools\Form\ConditionDelete' should set you up for using this
-   * approach quite seamlessly.
-   *
-   * @param mixed $cached_values
-   *
-   * @param string $machine_name
-   *
-   * @param string $row
-   *
-   * @return array
-   *   In the format of
-   *   return ['route.base.name', ['machine_name' => $machine_name, 'context' => $row]];
-   */
-  abstract protected function getOperationsRouteInfo($cached_values, $machine_name, $row);
-
-  /**
-   * Custom logic for retrieving the conditions array from cached_values.
-   *
-   * @param $cached_values
-   *
-   * @return array
-   */
-  abstract protected function getConditions($cached_values);
-
-  /**
-   * Custom logic for retrieving the contexts array from cached_values.
-   *
-   * @param $cached_values
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
-   */
-  abstract protected function getContexts($cached_values);
-
-}
diff --git a/modules/ctools/src/Form/ManageContext.php b/modules/ctools/src/Form/ManageContext.php
deleted file mode 100644
index 4ac3b84..0000000
--- a/modules/ctools/src/Form/ManageContext.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\OpenModalDialogCommand;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\TypedData\TypedDataManagerInterface;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-abstract class ManageContext extends FormBase {
-
-  /**
-   * The machine name of the wizard we're working with.
-   *
-   * @var string
-   */
-  protected $machine_name;
-
-  /**
-   * The typed data manager.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManagerInterface
-   */
-  protected $typedDataManager;
-
-  /**
-   * The form builder.
-   *
-   * @var \Drupal\Core\Form\FormBuilderInterface
-   */
-  protected $formBuilder;
-
-  /**
-   * An array of property types that are eligible as relationships.
-   *
-   * @var array
-   */
-  protected $property_types = [];
-
-  /**
-   * A property for controlling usage of relationships in an implementation.
-   *
-   * @var bool
-   */
-  protected $relationships = TRUE;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('typed_data_manager'), $container->get('form_builder'));
-  }
-
-  /**
-   * ManageContext constructor.
-   *
-   * @param \Drupal\Core\TypedData\TypedDataManagerInterface $typed_data_manager
-   *   The typed data manager.
-   * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
-   *   The form builder.
-   */
-  public function __construct(TypedDataManagerInterface $typed_data_manager, FormBuilderInterface $form_builder) {
-    $this->typedDataManager = $typed_data_manager;
-    $this->formBuilder = $form_builder;
-  }
-
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_manage_context_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    $this->machine_name = $cached_values['id'];
-    $form['items'] = array(
-      '#type' => 'markup',
-      '#prefix' => '<div id="configured-contexts">',
-      '#suffix' => '</div>',
-      '#theme' => 'table',
-      '#header' => array($this->t('Context ID'), $this->t('Label'), $this->t('Data Type'), $this->t('Options')),
-      '#rows' => $this->renderRows($cached_values),
-      '#empty' =>  $this->t('No contexts or relationships have been added.')
-    );
-    foreach ($this->typedDataManager->getDefinitions() as $type => $definition) {
-      $types[$type] = $definition['label'];
-    }
-    if (isset($types['entity'])) {
-      unset($types['entity']);
-    }
-    asort($types);
-    $form['context'] = [
-      '#type' => 'select',
-      '#options' => $types,
-    ];
-    $form['add'] = [
-      '#type' => 'submit',
-      '#name' => 'add',
-      '#value' => $this->t('Add new context'),
-      '#ajax' => [
-        'callback' => [$this, 'addContext'],
-        'event' => 'click',
-      ],
-      '#submit' => [
-        'callback' => [$this, 'submitForm'],
-      ]
-    ];
-
-    $form['relationships'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Add a relationship'),
-      '#options' => $this->getAvailableRelationships($cached_values),
-      '#access' => $this->relationships,
-    ];
-    $form['add_relationship'] = [
-      '#type' => 'submit',
-      '#name' => 'add_relationship',
-      '#value' =>  $this->t('Add Relationship'),
-      '#ajax' => [
-        'callback' => [$this, 'addRelationship'],
-        'event' => 'click',
-      ],
-      '#submit' => [
-        'callback' => [$this, 'submitForm'],
-      ],
-      '#access' => $this->relationships,
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    if ($form_state->getTriggeringElement()['#name'] == 'add') {
-      $cached_values = $form_state->getTemporaryValue('wizard');
-      list(, $route_parameters) = $this->getContextOperationsRouteInfo($cached_values, $this->machine_name, $form_state->getValue('context'));
-      $form_state->setRedirect($this->getContextAddRoute($cached_values), $route_parameters);
-    }
-    if ($form_state->getTriggeringElement()['#name'] == 'add_relationship') {
-      $cached_values = $form_state->getTemporaryValue('wizard');
-      list(, $route_parameters) = $this->getRelationshipOperationsRouteInfo($cached_values, $this->machine_name, $form_state->getValue('relationships'));
-      $form_state->setRedirect($this->getRelationshipAddRoute($cached_values), $route_parameters);
-    }
-  }
-
-  public function addContext(array &$form, FormStateInterface $form_state) {
-    $context = $form_state->getValue('context');
-    $content = $this->formBuilder->getForm($this->getContextClass(), $context, $this->getTempstoreId(), $this->machine_name);
-    $content['#attached']['library'][] = 'core/drupal.dialog.ajax';
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    list(, $route_parameters) = $this->getContextOperationsRouteInfo($cached_values, $this->machine_name, $context);
-    $content['submit']['#attached']['drupalSettings']['ajax'][$content['submit']['#id']]['url'] = $this->url($this->getContextAddRoute($cached_values), $route_parameters, ['query' => [FormBuilderInterface::AJAX_FORM_REQUEST => TRUE]]);
-    $response = new AjaxResponse();
-    $response->addCommand(new OpenModalDialogCommand($this->t('Add new context'), $content, array('width' => '700')));
-    return $response;
-  }
-
-  public function addRelationship(array &$form, FormStateInterface $form_state) {
-    $relationship = $form_state->getValue('relationships');
-    $content = $this->formBuilder->getForm($this->getRelationshipClass(), $relationship, $this->getTempstoreId(), $this->machine_name);
-    $content['#attached']['library'][] = 'core/drupal.dialog.ajax';
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    list(, $route_parameters) = $this->getRelationshipOperationsRouteInfo($cached_values, $this->machine_name, $relationship);
-    $content['submit']['#attached']['drupalSettings']['ajax'][$content['submit']['#id']]['url'] = $this->url($this->getRelationshipAddRoute($cached_values), $route_parameters, ['query' => [FormBuilderInterface::AJAX_FORM_REQUEST => TRUE]]);
-    $response = new AjaxResponse();
-    $response->addCommand(new OpenModalDialogCommand($this->t('Configure Relationship'), $content, array('width' => '700')));
-    return $response;
-  }
-
-  protected function getAvailableRelationships($cached_values) {
-    /** @var \Drupal\ctools\TypedDataResolver $resolver */
-    $resolver = \Drupal::service('ctools.typed_data.resolver');
-    return $resolver->getTokensForContexts($this->getContexts($cached_values));
-  }
-
-  /**
-   * @param $cached_values
-   *
-   * @return array
-   */
-  protected function renderRows($cached_values) {
-    $contexts = array();
-    foreach ($this->getContexts($cached_values) as $row => $context) {
-      list($route_name, $route_parameters) = $this->getContextOperationsRouteInfo($cached_values, $this->machine_name, $row);
-      $build = array(
-        '#type' => 'operations',
-        '#links' => $this->getOperations($cached_values, $row, $route_name, $route_parameters),
-      );
-      $contexts[$row] = array(
-        $row,
-        $context->getContextDefinition()->getLabel(),
-        $context->getContextDefinition()->getDataType(),
-        'operations' => [
-          'data' => $build,
-        ],
-      );
-    }
-    return $contexts;
-  }
-
-  /**
-   * @param array $cached_values
-   * @param string $row
-   * @param string $route_name_base
-   * @param array $route_parameters
-   *
-   * @return mixed
-   */
-  protected function getOperations($cached_values, $row, $route_name_base, array $route_parameters = array()) {
-    $operations = [];
-    if ($this->isEditableContext($cached_values, $row)) {
-      $operations['edit'] = array(
-        'title' =>  $this->t('Edit'),
-        'url' => new Url($route_name_base . '.edit', $route_parameters),
-        'weight' => 10,
-        'attributes' => array(
-          'class' => ['use-ajax'],
-          'data-dialog-type' => 'modal',
-          'data-dialog-options' => Json::encode([
-            'width' => 700,
-          ]),
-        ),
-      );
-      $operations['delete'] = array(
-        'title' =>  $this->t('Delete'),
-        'url' => new Url($route_name_base . '.delete', $route_parameters),
-        'weight' => 100,
-        'attributes' => array(
-          'class' => array('use-ajax'),
-          'data-dialog-type' => 'modal',
-          'data-dialog-options' => Json::encode([
-            'width' => 700,
-          ]),
-        ),
-      );
-    }
-    return $operations;
-  }
-
-  /**
-   * Return a subclass of '\Drupal\ctools\Form\ContextConfigure'.
-   *
-   * The ContextConfigure class is designed to be subclassed with custom
-   * route information to control the modal/redirect needs of your use case.
-   *
-   * @return string
-   */
-  abstract protected function getContextClass($cached_values);
-
-  /**
-   * Return a subclass of '\Drupal\ctools\Form\RelationshipConfigure'.
-   *
-   * The RelationshipConfigure class is designed to be subclassed with custom
-   * route information to control the modal/redirect needs of your use case.
-   *
-   * @return string
-   */
-  abstract protected function getRelationshipClass($cached_values);
-
-  /**
-   * The route to which context 'add' actions should submit.
-   *
-   * @return string
-   */
-  abstract protected function getContextAddRoute($cached_values);
-
-  /**
-   * The route to which relationship 'add' actions should submit.
-   *
-   * @return string
-   */
-  abstract protected function getRelationshipAddRoute($cached_values);
-
-  /**
-   * Provide the tempstore id for your specified use case.
-   *
-   * @return string
-   */
-  abstract protected function getTempstoreId();
-
-  /**
-   * Returns the contexts already available in the wizard.
-   *
-   * @param mixed $cached_values
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
-   */
-  abstract protected function getContexts($cached_values);
-
-  /**
-   * @param mixed $cached_values
-   * @param string $machine_name
-   * @param string $row
-   *
-   * @return array
-   */
-  abstract protected function getContextOperationsRouteInfo($cached_values, $machine_name, $row);
-
-  /**
-   * @param mixed $cached_values
-   * @param string $machine_name
-   * @param string $row
-   *
-   * @return array
-   */
-  abstract protected function getRelationshipOperationsRouteInfo($cached_values, $machine_name, $row);
-
-  /**
-   * @param mixed $cached_values
-   * @param string $row
-   *
-   * @return bool
-   */
-  abstract protected function isEditableContext($cached_values, $row);
-
-}
diff --git a/modules/ctools/src/Form/ManageResolverRelationships.php b/modules/ctools/src/Form/ManageResolverRelationships.php
deleted file mode 100644
index 7dfff59..0000000
--- a/modules/ctools/src/Form/ManageResolverRelationships.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\OpenModalDialogCommand;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-abstract class ManageResolverRelationships extends FormBase {
-
-  /**
-   * @var string
-   */
-  protected $machine_name;
-
-  /**
-   * An array of property types that are eligible as relationships.
-   *
-   * @var array
-   */
-  protected $property_types = [];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_manage_resolver_relationships_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    $this->machine_name = $cached_values['id'];
-    $form['items'] = array(
-      '#type' => 'markup',
-      '#prefix' => '<div id="configured-relationships">',
-      '#suffix' => '</div>',
-      '#theme' => 'table',
-      '#header' => array($this->t('Context ID'), $this->t('Label'), $this->t('Data Type'), $this->t('Options')),
-      '#rows' => $this->renderRows($cached_values),
-      '#empty' => $this->t('No relationships have been added.')
-    );
-
-    $form['relationships'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Add a relationship'),
-      '#options' => $this->getAvailableRelationships($cached_values),
-    ];
-    $form['add_relationship'] = [
-      '#type' => 'submit',
-      '#name' => 'add',
-      '#value' => $this->t('Add Relationship'),
-      '#ajax' => [
-        'callback' => [$this, 'addRelationship'],
-        'event' => 'click',
-      ],
-      '#submit' => [
-        'callback' => [$this, 'submitForm'],
-      ]
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    if ($form_state->getTriggeringElement()['#name'] == 'add') {
-      $cached_values = $form_state->getTemporaryValue('wizard');
-      list(, $route_parameters) = $this->getRelationshipOperationsRouteInfo($cached_values, $this->machine_name, $form_state->getValue('relationships'));
-      $form_state->setRedirect($this->getAddRoute($cached_values), $route_parameters);
-    }
-  }
-
-  public function addRelationship(array &$form, FormStateInterface $form_state) {
-    $relationship = $form_state->getValue('relationships');
-    $content = \Drupal::formBuilder()->getForm($this->getContextClass(), $relationship, $this->getTempstoreId(), $this->machine_name);
-    $content['#attached']['library'][] = 'core/drupal.dialog.ajax';
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    list(, $route_parameters) = $this->getRelationshipOperationsRouteInfo($cached_values, $this->machine_name, $relationship);
-    $content['submit']['#attached']['drupalSettings']['ajax'][$content['submit']['#id']]['url'] = $this->url($this->getAddRoute($cached_values), $route_parameters, ['query' => [FormBuilderInterface::AJAX_FORM_REQUEST => TRUE]]);
-    $response = new AjaxResponse();
-    $response->addCommand(new OpenModalDialogCommand($this->t('Configure Relationship'), $content, array('width' => '700')));
-    return $response;
-  }
-
-  protected function getAvailableRelationships($cached_values) {
-    /** @var \Drupal\ctools\TypedDataResolver $resolver */
-    $resolver = \Drupal::service('ctools.typed_data.resolver');
-    return $resolver->getTokensForContexts($this->getContexts($cached_values));
-  }
-
-  /**
-   * @param $cached_values
-   *
-   * @return array
-   */
-  protected function renderRows($cached_values) {
-    $contexts = array();
-    foreach ($this->getContexts($cached_values) as $row => $context) {
-      list($route_name, $route_parameters) = $this->getRelationshipOperationsRouteInfo($cached_values, $this->machine_name, $row);
-      $build = array(
-        '#type' => 'operations',
-        '#links' => $this->getOperations($cached_values, $row, $route_name, $route_parameters),
-      );
-      $contexts[$row] = array(
-        $row,
-        $context->getContextDefinition()->getLabel(),
-        $context->getContextDefinition()->getDataType(),
-        'operations' => [
-          'data' => $build,
-        ],
-      );
-    }
-    return $contexts;
-  }
-
-  /**
-   * @param array $cached_values
-   * @param string $row
-   * @param string $route_name_base
-   * @param array $route_parameters
-   *
-   * @return mixed
-   */
-  protected function getOperations($cached_values, $row, $route_name_base, array $route_parameters = array()) {
-    // Base contexts will not be a : separated and generated relationships should have 3 parts.
-    if (count(explode(':', $row)) < 2) {
-      return [];
-    }
-    $operations['edit'] = array(
-      'title' => $this->t('Edit'),
-      'url' => new Url($route_name_base . '.edit', $route_parameters),
-      'weight' => 10,
-      'attributes' => array(
-        'class' => ['use-ajax'],
-        'data-dialog-type' => 'modal',
-        'data-dialog-options' => Json::encode([
-          'width' => 700,
-        ]),
-      ),
-    );
-    $route_parameters['id'] = $route_parameters['context'];
-    $operations['delete'] = array(
-      'title' => $this->t('Delete'),
-      'url' => new Url($route_name_base . '.delete', $route_parameters),
-      'weight' => 100,
-      'attributes' => array(
-        'class' => array('use-ajax'),
-        'data-dialog-type' => 'modal',
-        'data-dialog-options' => Json::encode([
-          'width' => 700,
-        ]),
-      ),
-    );
-    return $operations;
-  }
-
-  /**
-   * Return a subclass of '\Drupal\ctools\Form\ResolverRelationshipConfigure'.
-   *
-   * The ConditionConfigure class is designed to be subclassed with custom
-   * route information to control the modal/redirect needs of your use case.
-   *
-   * @return string
-   */
-  abstract protected function getContextClass($cached_values);
-
-  /**
-   * The route to which relationship 'add' actions should submit.
-   *
-   * @return string
-   */
-  abstract protected function getAddRoute($cached_values);
-
-  /**
-   * Provide the tempstore id for your specified use case.
-   *
-   * @return string
-   */
-  abstract protected function getTempstoreId();
-
-  /**
-   * @param $cached_values
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
-   */
-  abstract protected function getContexts($cached_values);
-
-  /**
-   * @param string $cached_values
-   * @param string $machine_name
-   * @param string $row
-   *
-   * @return array
-   */
-  abstract protected function getRelationshipOperationsRouteInfo($cached_values, $machine_name, $row);
-
-}
diff --git a/modules/ctools/src/Form/RelationshipConfigure.php b/modules/ctools/src/Form/RelationshipConfigure.php
deleted file mode 100644
index 4f13f46..0000000
--- a/modules/ctools/src/Form/RelationshipConfigure.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\CloseModalDialogCommand;
-use Drupal\Core\Ajax\RedirectCommand;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\ctools\TypedDataResolver;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-abstract class RelationshipConfigure extends FormBase {
-
-  /**
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * @var \Drupal\ctools\TypedDataResolver
-   */
-  protected $resolver;
-
-  /**
-   * @var string
-   */
-  protected $tempstore_id;
-
-  /**
-   * @var string;
-   */
-  protected $machine_name;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('user.shared_tempstore'), $container->get('ctools.typed_data.resolver'));
-  }
-
-  public function __construct(SharedTempStoreFactory $tempstore, TypedDataResolver $resolver) {
-    $this->tempstore = $tempstore;
-    $this->resolver = $resolver;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_relationship_configure';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $context_id = NULL, $tempstore_id = NULL, $machine_name = NULL) {
-    $this->tempstore_id = $tempstore_id;
-    $this->machine_name = $machine_name;
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-
-    /** @var \Drupal\Core\Plugin\Context\ContextInterface[] $contexts */
-    $contexts = $this->getContexts($cached_values);
-    $context_object = $this->resolver->convertTokenToContext($context_id, $contexts);
-    $form['id'] = [
-      '#type' => 'value',
-      '#value' => $context_id
-    ];
-    $form['context_object'] = [
-      '#type' => 'value',
-      '#value' => $context_object,
-    ];
-    $form['label'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Context label'),
-      '#default_value' => !empty($contexts[$context_id]) ? $contexts[$context_id]->getContextDefinition()->getLabel() : $this->resolver->getLabelByToken($context_id, $contexts),
-      '#required' => TRUE,
-    ];
-    $form['context_data'] = [
-      '#type' => 'item',
-      '#title' => $this->t('Data type'),
-      '#markup' => $context_object->getContextDefinition()->getDataType(),
-    ];
-    $form['submit'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-      '#ajax' => [
-        'callback' => [$this, 'ajaxSave'],
-      ]
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    list($route_name, $route_options) = $this->getParentRouteInfo($cached_values);
-    $form_state->setRedirect($route_name, $route_options);
-  }
-
-  /**
-   * @param array $form
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *
-   * @return \Drupal\Core\Ajax\AjaxResponse
-   */
-  public function ajaxSave(array &$form, FormStateInterface $form_state) {
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    list($route_name, $route_parameters) = $this->getParentRouteInfo($cached_values);
-    $response = new AjaxResponse();
-    $response->addCommand(new RedirectCommand($this->url($route_name, $route_parameters)));
-    $response->addCommand(new CloseModalDialogCommand());
-    return $response;
-  }
-
-  /**
-   * Document the route name and parameters for redirect after submission.
-   *
-   * @param array $cached_values
-   *
-   * @return array In the format of
-   * In the format of
-   * return ['route.name', ['machine_name' => $this->machine_name, 'step' => 'step_name']];
-   */
-  abstract protected function getParentRouteInfo($cached_values);
-
-  /**
-   * Custom logic for setting the conditions array in cached_values.
-   *
-   * @param $cached_values
-   *
-   * @param $contexts
-   *   The conditions to set within the cached values.
-   *
-   * @return mixed
-   *   Return the $cached_values
-   */
-  abstract protected function setContexts($cached_values, $contexts);
-
-  /**
-   * Custom logic for retrieving the contexts array from cached_values.
-   *
-   * @param $cached_values
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
-   */
-  abstract protected function getContexts($cached_values);
-
-}
diff --git a/modules/ctools/src/Form/RequiredContext.php b/modules/ctools/src/Form/RequiredContext.php
deleted file mode 100644
index 76b5ec2..0000000
--- a/modules/ctools/src/Form/RequiredContext.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\OpenModalDialogCommand;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-abstract class RequiredContext extends FormBase {
-
-  /**
-   * @var \Drupal\Core\TypedData\TypedDataManager
-   */
-  protected $typedDataManager;
-
-  /**
-   * @var string
-   */
-  protected $machine_name;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('typed_data_manager'));
-  }
-
-  public function __construct(PluginManagerInterface $typed_data_manager) {
-    $this->typedDataManager = $typed_data_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_required_context_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    $this->machine_name = $cached_values['id'];
-    $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
-    $options = [];
-    foreach ($this->typedDataManager->getDefinitions() as $plugin_id => $definition) {
-      $options[$plugin_id] = (string) $definition['label'];
-    }
-    $form['items'] = array(
-      '#type' => 'markup',
-      '#prefix' => '<div id="configured-contexts">',
-      '#suffix' => '</div>',
-      '#theme' => 'table',
-      '#header' => array($this->t('Information'), $this->t('Description'), $this->t('Operations')),
-      '#rows' => $this->renderContexts($cached_values),
-      '#empty' => $this->t('No required contexts have been configured.')
-    );
-    $form['contexts'] = [
-      '#type' => 'select',
-      '#options' => $options,
-    ];
-    $form['add'] = [
-      '#type' => 'submit',
-      '#name' => 'add',
-      '#value' => $this->t('Add required context'),
-      '#ajax' => [
-        'callback' => [$this, 'add'],
-        'event' => 'click',
-      ],
-      '#submit' => [
-        'callback' => [$this, 'submitform'],
-      ]
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    list($route_name, $route_parameters) = $this->getOperationsRouteInfo($cached_values, $this->machine_name, $form_state->getValue('contexts'));
-    $form_state->setRedirect($route_name . '.edit', $route_parameters);
-  }
-
-  /**
-   * Custom ajax form submission handler.
-   *
-   * @param array $form
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *
-   * @return \Drupal\Core\Ajax\AjaxResponse
-   */
-  public function add(array &$form, FormStateInterface $form_state) {
-    $context = $form_state->getValue('contexts');
-    $content = \Drupal::formBuilder()->getForm($this->getContextClass(), $context, $this->getTempstoreId(), $this->machine_name);
-    $content['#attached']['library'][] = 'core/drupal.dialog.ajax';
-    $response = new AjaxResponse();
-    $response->addCommand(new OpenModalDialogCommand($this->t('Configure Required Context'), $content, array('width' => '700')));
-    return $response;
-  }
-
-  /**
-   * @param $cached_values
-   *
-   * @return array
-   */
-  public function renderContexts($cached_values) {
-    $configured_contexts = array();
-    foreach ($this->getContexts($cached_values) as $row => $context) {
-      list($plugin_id, $label, $machine_name, $description) = array_values($context);
-      list($route_name, $route_parameters) = $this->getOperationsRouteInfo($cached_values, $cached_values['id'], $row);
-      $build = array(
-        '#type' => 'operations',
-        '#links' => $this->getOperations($route_name, $route_parameters),
-      );
-      $configured_contexts[] = array(
-        $this->t('<strong>Label:</strong> @label<br /> <strong>Type:</strong> @type', ['@label' => $label, '@type' => $plugin_id]),
-        $this->t('@description', ['@description' => $description]),
-        'operations' => [
-          'data' => $build,
-        ],
-      );
-    }
-    return $configured_contexts;
-  }
-
-  protected function getOperations($route_name_base, array $route_parameters = array()) {
-    $operations['edit'] = array(
-      'title' => $this->t('Edit'),
-      'url' => new Url($route_name_base . '.edit', $route_parameters),
-      'weight' => 10,
-      'attributes' => array(
-        'class' => array('use-ajax'),
-        'data-accepts' => 'application/vnd.drupal-modal',
-        'data-dialog-options' => json_encode(array(
-          'width' => 700,
-        )),
-      ),
-      'ajax' => [
-        ''
-      ],
-    );
-    $route_parameters['id'] = $route_parameters['context'];
-    $operations['delete'] = array(
-      'title' => $this->t('Delete'),
-      'url' => new Url($route_name_base . '.delete', $route_parameters),
-      'weight' => 100,
-      'attributes' => array(
-        'class' => array('use-ajax'),
-        'data-accepts' => 'application/vnd.drupal-modal',
-        'data-dialog-options' => json_encode(array(
-          'width' => 700,
-        )),
-      ),
-    );
-    return $operations;
-  }
-
-  /**
-   * Return a subclass of '\Drupal\ctools\Form\ContextConfigure'.
-   *
-   * The ContextConfigure class is designed to be subclassed with custom route
-   * information to control the modal/redirect needs of your use case.
-   *
-   * @return string
-   */
-  abstract protected function getContextClass();
-
-  /**
-   * Provide the tempstore id for your specified use case.
-   *
-   * @return string
-   */
-  abstract protected function getTempstoreId();
-
-  /**
-   * Document the route name and parameters for edit/delete context operations.
-   *
-   * The route name returned from this method is used as a "base" to which
-   * ".edit" and ".delete" are appeneded in the getOperations() method.
-   * Subclassing '\Drupal\ctools\Form\ContextConfigure' and
-   * '\Drupal\ctools\Form\RequiredContextDelete' should set you up for using
-   * this approach quite seamlessly.
-   *
-   * @param mixed $cached_values
-   *
-   * @param string $machine_name
-   *
-   * @param string $row
-   *
-   * @return array
-   *   In the format of
-   *   return ['route.base.name', ['machine_name' => $machine_name, 'context' => $row]];
-   */
-  abstract protected function getOperationsRouteInfo($cached_values, $machine_name, $row);
-
-  /**
-   * Custom logic for retrieving the contexts array from cached_values.
-   *
-   * @param $cached_values
-   *
-   * @return array
-   */
-  abstract protected function getContexts($cached_values);
-
-}
diff --git a/modules/ctools/src/Form/RequiredContextDelete.php b/modules/ctools/src/Form/RequiredContextDelete.php
deleted file mode 100644
index e04429a..0000000
--- a/modules/ctools/src/Form/RequiredContextDelete.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\ConfirmFormHelper;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Base class for adding a required contexts step to your wizard.
- */
-abstract class RequiredContextDelete extends ConfirmFormBase {
-
-  /**
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * @var string
-   */
-  protected $tempstore_id;
-
-  /**
-   * @var string;
-   */
-  protected $machine_name;
-
-  /**
-   * @var int;
-   */
-  protected $id;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('user.shared_tempstore'));
-  }
-
-  /**
-   * @param \Drupal\user\SharedTempStoreFactory $tempstore
-   */
-  function __construct(SharedTempStoreFactory $tempstore) {
-    $this->tempstore = $tempstore;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_required_context_delete';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $id = NULL, $tempstore_id = NULL, $machine_name = NULL) {
-    $this->tempstore_id = $tempstore_id;
-    $this->machine_name = $machine_name;
-    $this->id = $id;
-
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    $form ['#title'] = $this->getQuestion($id, $cached_values);
-
-    $form ['#attributes']['class'][] = 'confirmation';
-    $form ['description'] = array('#markup' => $this->getDescription());
-    $form [$this->getFormName()] = array('#type' => 'hidden', '#value' => 1);
-
-    // By default, render the form using theme_confirm_form().
-    if (!isset($form ['#theme'])) {
-      $form ['#theme'] = 'confirm_form';
-    }
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions'] += $this->actions($form, $form_state);
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    $contexts = $this->getContexts($cached_values);
-    unset($contexts[$this->id]);
-    $cached_values = $this->setContexts($cached_values, $contexts);
-    $this->tempstore->get($this->tempstore_id)->set($this->machine_name, $cached_values);
-    list($route_name, $route_parameters) = $this->getParentRouteInfo($cached_values);
-    $form_state->setRedirect($route_name, $route_parameters);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion($id = NULL, $cached_values = NULL) {
-    $context = $this->getContexts($cached_values)[$id];
-    return $this->t('Are you sure you want to delete the @label context?', array(
-      '@label' => $context['label'],
-    ));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return $this->t('This action cannot be undone.');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormName() {
-    return 'confirm';
-  }
-
-  /**
-   * Provides the action buttons for submitting this form.
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    return array(
-      'submit' => array(
-        '#type' => 'submit',
-        '#value' => $this->getConfirmText(),
-        '#validate' => array(
-          array($this, 'validate'),
-        ),
-        '#submit' => array(
-          array($this, 'submitForm'),
-        ),
-      ),
-      'cancel' => ConfirmFormHelper::buildCancelLink($this, $this->getRequest()),
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    list($route_name, $route_parameters) = $this->getParentRouteInfo($cached_values);
-    return new Url($route_name, $route_parameters);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelText() {
-    return $this->t('Cancel');
-  }
-
-  /**
-   * Document the route name and parameters for redirect after submission.
-   *
-   * @param $cached_values
-   *
-   * @return array
-   *   In the format of
-   *   return ['route.name', ['machine_name' => $this->machine_name, 'step' => 'step_name]];
-   */
-  abstract protected function getParentRouteInfo($cached_values);
-
-  /**
-   * Custom logic for retrieving the contexts array from cached_values.
-   *
-   * @param $cached_values
-   *
-   * @return array
-   */
-  abstract protected function getContexts($cached_values);
-
-  /**
-   * Custom logic for setting the contexts array in cached_values.
-   *
-   * @param $cached_values
-   *
-   * @param $contexts
-   *   The contexts to set within the cached values.
-   *
-   * @return mixed
-   *   Return the $cached_values
-   */
-  abstract protected function setContexts($cached_values, $contexts);
-
-}
diff --git a/modules/ctools/src/Form/ResolverRelationshipConfigure.php b/modules/ctools/src/Form/ResolverRelationshipConfigure.php
deleted file mode 100644
index 00234cd..0000000
--- a/modules/ctools/src/Form/ResolverRelationshipConfigure.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\CloseModalDialogCommand;
-use Drupal\Core\Ajax\RedirectCommand;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-abstract class ResolverRelationshipConfigure extends FormBase {
-
-  /**
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * @var string
-   */
-  protected $tempstore_id;
-
-  /**
-   * @var string;
-   */
-  protected $machine_name;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('user.shared_tempstore'));
-  }
-
-  function __construct(SharedTempStoreFactory $tempstore) {
-    $this->tempstore = $tempstore;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_context_configure';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $context = NULL, $tempstore_id = NULL, $machine_name = NULL) {
-    $this->tempstore_id = $tempstore_id;
-    $this->machine_name = $machine_name;
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    if (is_numeric($context)) {
-      $id = $context;
-      $contexts = $this->getContexts($cached_values);
-      $context = $contexts[$id]['context'];
-      $label = $contexts[$id]['label'];
-      $machine_name = $contexts[$id]['machine_name'];
-      $description = $contexts[$id]['description'];
-      // Conditionally set this form element so that we can update or add.
-      $form['id'] = [
-        '#type' => 'value',
-        '#value' => $id
-      ];
-    }
-    else {
-      $label = '';
-      $machine_name = '';
-      $description = '';
-    }
-    $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
-    $form['context'] = [
-      '#type' => 'value',
-      '#value' => $context
-    ];
-    $form['label'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Label'),
-      '#default_value' => $label,
-      '#required' => TRUE,
-    ];
-    $form['machine_name'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Machine Name'),
-      '#default_value' => $machine_name,
-      '#required' => TRUE,
-    ];
-    $form['description'] = [
-      '#type' => 'textarea',
-      '#title' => $this->t('Description'),
-      '#default_value' => $description,
-    ];
-    $form['submit'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-      '#ajax' => [
-        'callback' => [$this, 'ajaxSave'],
-      ]
-    ];
-    return $form;
-  }
-
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $machine_name = $form_state->getValue('machine_name');
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    foreach ($this->getContexts($cached_values) as $id => $context) {
-      if ($context['machine_name'] == $machine_name) {
-        $form_state->setError($form['machine_name'], $this->t('That machine name is in use by another context definition.'));
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    $contexts = $this->getContexts($cached_values);
-    $context = [
-      'context' => $form_state->getValue('context'),
-      'label' => $form_state->getValue('label'),
-      'machine_name' => $form_state->getValue('machine_name'),
-      'description' => $form_state->getValue('description'),
-    ];
-    if ($form_state->hasValue('id')) {
-      $contexts[$form_state->getValue('id')] = $context;
-    }
-    else {
-      $contexts[] = $context;
-    }
-    $cached_values = $this->setContexts($cached_values, $contexts);
-    $this->tempstore->get($this->tempstore_id)->set($this->machine_name, $cached_values);
-    list($route_name, $route_parameters) = $this->getParentRouteInfo($cached_values);
-    $form_state->setRedirect($route_name, $route_parameters);
-  }
-
-  public function ajaxSave(array &$form, FormStateInterface $form_state) {
-    $response = new AjaxResponse();
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    list($route_name, $route_parameters) = $this->getParentRouteInfo($cached_values);
-    $response->addCommand(new RedirectCommand($this->url($route_name, $route_parameters)));
-    $response->addCommand(new CloseModalDialogCommand());
-    return $response;
-  }
-
-  /**
-   * Document the route name and parameters for redirect after submission.
-   *
-   * @param $cached_values
-   *
-   * @return array
-   *   In the format of
-   *   return ['route.name', ['machine_name' => $this->machine_name, 'step' => 'step_name]];
-   */
-  abstract protected function getParentRouteInfo($cached_values);
-
-  /**
-   * Custom logic for retrieving the contexts array from cached_values.
-   *
-   * @param $cached_values
-   *
-   * @return array
-   */
-  abstract protected function getContexts($cached_values);
-
-  /**
-   * Custom logic for setting the contexts array in cached_values.
-   *
-   * @param $cached_values
-   *
-   * @param $contexts
-   *   The contexts to set within the cached values.
-   *
-   * @return mixed
-   *   Return the $cached_values
-   */
-  abstract protected function setContexts($cached_values, $contexts);
-
-}
diff --git a/modules/ctools/src/Form/ResolverRelationshipDelete.php b/modules/ctools/src/Form/ResolverRelationshipDelete.php
deleted file mode 100644
index 4dfde28..0000000
--- a/modules/ctools/src/Form/ResolverRelationshipDelete.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Form;
-
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\ConfirmFormHelper;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\ctools\TypedDataResolver;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-abstract class ResolverRelationshipDelete extends ConfirmFormBase {
-
-  /**
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * @var \Drupal\ctools\TypedDataResolver
-   */
-  protected $resolver;
-
-  /**
-   * @var string
-   */
-  protected $tempstore_id;
-
-  /**
-   * @var string;
-   */
-  protected $machine_name;
-
-  /**
-   * @var string;
-   */
-  protected $id;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('user.shared_tempstore'), $container->get('ctools.typed_data.resolver'));
-  }
-
-  /**
-   * @param \Drupal\user\SharedTempStoreFactory $tempstore
-   *   The shared tempstore.
-   * @param \Drupal\ctools\TypedDataResolver $resolver
-   *   The the typed data resolver.
-   */
-  public function __construct(SharedTempStoreFactory $tempstore, TypedDataResolver $resolver) {
-    $this->tempstore = $tempstore;
-    $this->resolver = $resolver;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_resolver_relationship_delete';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion($id = NULL, $cached_values = []) {
-    $context = $this->getContexts($cached_values)[$id];
-    return $this->t('Are you sure you want to delete the @label relationship?', [
-      '@label' => $context->getContextDefinition()->getLabel(),
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  abstract public function getCancelUrl($cached_values = []);
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $id = NULL, $tempstore_id = NULL, $machine_name = NULL) {
-    $this->tempstore_id = $tempstore_id;
-    $this->machine_name = $machine_name;
-    $this->id = $id;
-
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    $form ['#title'] = $this->getQuestion($id, $cached_values);
-
-    $form ['#attributes']['class'][] = 'confirmation';
-    $form ['description'] = array('#markup' => $this->getDescription());
-    $form [$this->getFormName()] = array('#type' => 'hidden', '#value' => 1);
-
-    // By default, render the form using theme_confirm_form().
-    if (!isset($form ['#theme'])) {
-      $form ['#theme'] = 'confirm_form';
-    }
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions'] += $this->actions($form, $form_state, $cached_values);
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $this->tempstore->get($this->tempstore_id)->get($this->machine_name);
-    $form_state->setRedirectUrl($this->getCancelUrl($cached_values));
-  }
-
-  /**
-   * A custom form actions method.
-   *
-   * @param array $form
-   *   The form array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current form state.
-   * @param $cached_values
-   *   The current wizard cached values.
-   *
-   * @return array
-   */
-  protected function actions(array $form, FormStateInterface $form_state, $cached_values) {
-    return array(
-      'submit' => array(
-        '#type' => 'submit',
-        '#value' => $this->getConfirmText(),
-        '#validate' => array(
-          array($this, 'validate'),
-        ),
-        '#submit' => array(
-          array($this, 'submitForm'),
-        ),
-      ),
-      'cancel' => ConfirmFormHelper::buildCancelLink($this, $this->getRequest()),
-    );
-  }
-
-  /**
-   * Extract contexts from the cached values.
-   *
-   * @param array $cached_values
-   *   The cached values.
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
-   */
-  abstract public function getContexts($cached_values);
-
-}
diff --git a/modules/ctools/src/ParamConverter/TempstoreConverter.php b/modules/ctools/src/ParamConverter/TempstoreConverter.php
deleted file mode 100644
index 6458d90..0000000
--- a/modules/ctools/src/ParamConverter/TempstoreConverter.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-namespace Drupal\ctools\ParamConverter;
-
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\ParamConverter\ParamConverterInterface;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\Routing\Route;
-
-/**
- * Parameter converter for pulling entities out of the tempstore.
- *
- * This is particularly useful when building non-wizard forms (like dialogs)
- * that operate on data in the wizard and getting the route access correct.
- *
- * There are four different ways to use this!
- *
- * In the most basic way, you specify the 'tempstore_id' in the defaults (so
- * that the form/controller has access to it as well) and in the parameter type
- * we simply give 'tempstore'. This assumes the entity is the full value
- * returned from the tempstore.
- *
- * @code
- * example.route:
- *   path: foo/{example}
- *   defaults:
- *     tempstore_id: example.foo
- *   options:
- *     parameters:
- *       example:
- *         type: tempstore
- * @endcode
- *
- * If the value returned from the tempstore is an array, and the entity is
- * one of the keys, then we specify that after 'tempstore:', for example:
- *
- * @code
- * example.route:
- *   path: foo/{example}
- *   defaults:
- *     tempstore_id: example.foo
- *   options:
- *     parameters:
- *       example:
- *         # Get the 'foo' key from the array returned by the tempstore.
- *         type: tempstore:foo
- * @endcode
- *
- * You can also specify the 'tempstore_id' under the parameter rather than in
- * the defaults, for example:
- *
- * @code
- * example.route:
- *   path: foo/{example}
- *   options:
- *     parameters:
- *       example:
- *         type: tempstore:foo
- *         tempstore_id: example.foo
- * @endcode
- *
- * Or, if you have two parameters which are represented by two keys on the same
- * array from the tempstore, put the slug which represents the id for the
- * tempstore in the 2nd key. For example:
- *
- * @code
- * example.route:
- *   path: foo/{example}/{other}
- *   defaults:
- *     tempstore_id: example.foo
- *   options:
- *     parameters:
- *       example:
- *         type: tempstore:foo
- *       other:
- *         type: tempstore:{example}:other
- * @endcode
- */
-class TempstoreConverter implements ParamConverterInterface {
-
-  /**
-   * The tempstore factory.
-   *
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Constructs a TempstoreConverter.
-   *
-   * @param \Drupal\user\SharedTempStoreFactory $tempstore
-   */
-  public function __construct(SharedTempStoreFactory $tempstore, EntityTypeManagerInterface $entity_type_manager) {
-    $this->tempstore = $tempstore;
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function convert($value, $definition, $name, array $defaults) {
-    $tempstore_id = !empty($definition['tempstore_id']) ? $definition['tempstore_id'] : $defaults['tempstore_id'];
-    $machine_name = $this->convertVariable($value, $defaults);
-
-    list(, $parts) = explode(':', $definition['type'], 2);
-    $parts = explode(':', $parts);
-    foreach ($parts as $key => $part) {
-      $parts[$key] = $this->convertVariable($part, $defaults);
-    }
-    $cached_values = $this->tempstore->get($tempstore_id)->get($machine_name);
-    // Entity type upcasting is most common, so we just assume that here.
-    // @todo see if there's a better way to do this.
-    if (!$cached_values && $this->entityTypeManager->hasDefinition($name)) {
-      $value = $this->entityTypeManager->getStorage($name)->load($machine_name);
-      return $value;
-    }
-    elseif (!$cached_values) {
-      return NULL;
-    }
-    else {
-      $value = NestedArray::getValue($cached_values, $parts, $key_exists);
-      return $key_exists ? $value : NULL;
-    }
-  }
-
-  /**
-   * A helper function for converting string variable names from the defaults.
-   *
-   * @param mixed $name
-   *   If name is a string in the format of {var} it will parse the defaults
-   *   for a 'var' default. If $name isn't a string or isn't a slug, it will
-   *   return the raw $name value. If no default is found, it will return NULL
-   * @param array $defaults
-   *   The route defaults array.
-   *
-   * @return mixed
-   *   The value of a variable in defaults.
-   */
-  protected function convertVariable($name, $defaults) {
-    if (is_string($name) && strpos($name, '{') === 0) {
-      $length = strlen($name);
-      $name = substr($name, 1, $length -2);
-      return isset($defaults[$name]) ? $defaults[$name] : NULL;
-    }
-    return $name;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies($definition, $name, Route $route) {
-    if (!empty($definition['type']) && ($definition['type'] == 'tempstore' || strpos($definition['type'], 'tempstore:') === 0)) {
-      if (!empty($definition['tempstore_id']) || $route->hasDefault('tempstore_id')) {
-        return TRUE;
-      }
-    }
-    return FALSE;
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/Block/EntityView.php b/modules/ctools/src/Plugin/Block/EntityView.php
deleted file mode 100644
index 51342d0..0000000
--- a/modules/ctools/src/Plugin/Block/EntityView.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Block;
-
-use Drupal\Core\Block\BlockBase;
-use Drupal\Core\Cache\CacheableMetadata;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Plugin\ContextAwarePluginInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a block to view a specific entity.
- *
- * @Block(
- *   id = "entity_view",
- *   deriver = "Drupal\ctools\Plugin\Deriver\EntityViewDeriver",
- * )
- */
-class EntityView extends BlockBase implements ContextAwarePluginInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * Constructs a new EntityView.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->entityManager = $entity_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity.manager')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return [
-      'view_mode' => 'default',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function blockForm($form, FormStateInterface $form_state) {
-    $form['view_mode'] = [
-      '#type' => 'select',
-      '#options' => $this->entityManager->getViewModeOptions($this->getDerivativeId()),
-      '#title' => $this->t('View mode'),
-      '#default_value' => $this->configuration['view_mode'],
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function blockSubmit($form, FormStateInterface $form_state) {
-    $this->configuration['view_mode'] = $form_state->getValue('view_mode');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build() {
-    /** @var $entity \Drupal\Core\Entity\EntityInterface */
-    $entity = $this->getContextValue('entity');
-
-    $view_builder = $this->entityManager->getViewBuilder($entity->getEntityTypeId());
-    $build = $view_builder->view($entity, $this->configuration['view_mode']);
-
-    CacheableMetadata::createFromObject($this->getContext('entity'))
-      ->applyTo($build);
-
-    return $build;
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/BlockPluginCollection.php b/modules/ctools/src/Plugin/BlockPluginCollection.php
deleted file mode 100644
index 56d51b7..0000000
--- a/modules/ctools/src/Plugin/BlockPluginCollection.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin;
-
-use Drupal\Core\Block\BlockPluginInterface;
-use Drupal\Core\Plugin\DefaultLazyPluginCollection;
-
-/**
- * Provides a collection of block plugins.
- */
-class BlockPluginCollection extends DefaultLazyPluginCollection {
-
-  /**
-   * {@inheritdoc}
-   *
-   * @return \Drupal\Core\Block\BlockPluginInterface
-   */
-  public function &get($instance_id) {
-    return parent::get($instance_id);
-  }
-
-  /**
-   * Returns all blocks keyed by their region.
-   *
-   * @return array
-   *   An associative array keyed by region, containing an associative array of
-   *   block plugins.
-   */
-  public function getAllByRegion() {
-    $region_assignments = [];
-    foreach ($this as $block_id => $block) {
-      $configuration = $block->getConfiguration();
-      $region = isset($configuration['region']) ? $configuration['region'] : NULL;
-      $region_assignments[$region][$block_id] = $block;
-    }
-    foreach ($region_assignments as $region => $region_assignment) {
-      // @todo Determine the reason this needs error suppression.
-      @uasort($region_assignment, function (BlockPluginInterface $a, BlockPluginInterface $b) {
-        $a_config = $a->getConfiguration();
-        $a_weight = isset($a_config['weight']) ? $a_config['weight'] : 0;
-        $b_config = $b->getConfiguration();
-        $b_weight = isset($b_config['weight']) ? $b_config['weight'] : 0;
-        if ($a_weight == $b_weight) {
-          return strcmp($a->label(), $b->label());
-        }
-        return $a_weight > $b_weight ? 1 : -1;
-      });
-      $region_assignments[$region] = $region_assignment;
-    }
-    return $region_assignments;
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/BlockVariantInterface.php b/modules/ctools/src/Plugin/BlockVariantInterface.php
deleted file mode 100644
index aa2709a..0000000
--- a/modules/ctools/src/Plugin/BlockVariantInterface.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin;
-
-use Drupal\Core\Display\VariantInterface;
-
-/**
- * Provides an interface for variant plugins that use block plugins.
- */
-interface BlockVariantInterface extends VariantInterface {
-
-  /**
-   * Returns the human-readable list of regions keyed by machine name.
-   *
-   * @return array
-   *   An array of human-readable region names keyed by machine name.
-   */
-  public function getRegionNames();
-
-  /**
-   * Returns the human-readable name of a specific region.
-   *
-   * @param string $region
-   *   The machine name of a region.
-   *
-   * @return string
-   *   The human-readable name of a region.
-   */
-  public function getRegionName($region);
-
-  /**
-   * Adds a block to this display variant.
-   *
-   * @param array $configuration
-   *   An array of block configuration.
-   *
-   * @return string
-   *   The block ID.
-   */
-  public function addBlock(array $configuration);
-
-  /**
-   * Returns the region a specific block is assigned to.
-   *
-   * @param string $block_id
-   *   The block ID.
-   *
-   * @return string
-   *   The machine name of the region this block is assigned to.
-   */
-  public function getRegionAssignment($block_id);
-
-  /**
-   * Returns an array of regions and their block plugins.
-   *
-   * @return array
-   *   The array is first keyed by region machine name, with the values
-   *   containing an array keyed by block ID, with block plugin instances as the
-   *   values.
-   */
-  public function getRegionAssignments();
-
-  /**
-   * Returns a specific block plugin.
-   *
-   * @param string $block_id
-   *   The block ID.
-   *
-   * @return \Drupal\Core\Block\BlockPluginInterface
-   *   The block plugin.
-   */
-  public function getBlock($block_id);
-
-  /**
-   * Updates the configuration of a specific block plugin.
-   *
-   * @param string $block_id
-   *   The block ID.
-   * @param array $configuration
-   *   The array of configuration to set.
-   *
-   * @return $this
-   */
-  public function updateBlock($block_id, array $configuration);
-
-  /**
-   * Removes a specific block from this display variant.
-   *
-   * @param string $block_id
-   *   The block ID.
-   *
-   * @return $this
-   */
-  public function removeBlock($block_id);
-
-}
diff --git a/modules/ctools/src/Plugin/BlockVariantTrait.php b/modules/ctools/src/Plugin/BlockVariantTrait.php
deleted file mode 100644
index fa01870..0000000
--- a/modules/ctools/src/Plugin/BlockVariantTrait.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin;
-
-/**
- * Provides methods for \Drupal\ctools\Plugin\BlockVariantInterface.
- */
-trait BlockVariantTrait {
-
-  /**
-   * The block manager.
-   *
-   * @var \Drupal\Core\Block\BlockManager
-   */
-  protected $blockManager;
-
-  /**
-   * The plugin collection that holds the block plugins.
-   *
-   * @var \Drupal\ctools\Plugin\BlockPluginCollection
-   */
-  protected $blockPluginCollection;
-
-  /**
-   * @see \Drupal\ctools\Plugin\BlockVariantInterface::getRegionNames()
-   */
-  abstract public function getRegionNames();
-
-  /**
-   * @see \Drupal\ctools\Plugin\BlockVariantInterface::getBlock()
-   */
-  public function getBlock($block_id) {
-    return $this->getBlockCollection()->get($block_id);
-  }
-
-  /**
-   * @see \Drupal\ctools\Plugin\BlockVariantInterface::addBlock()
-   */
-  public function addBlock(array $configuration) {
-    $configuration['uuid'] = $this->uuidGenerator()->generate();
-    $this->getBlockCollection()->addInstanceId($configuration['uuid'], $configuration);
-    return $configuration['uuid'];
-  }
-
-  /**
-   * @see \Drupal\ctools\Plugin\BlockVariantInterface::removeBlock()
-   */
-  public function removeBlock($block_id) {
-    $this->getBlockCollection()->removeInstanceId($block_id);
-    return $this;
-  }
-
-  /**
-   * @see \Drupal\ctools\Plugin\BlockVariantInterface::updateBlock()
-   */
-  public function updateBlock($block_id, array $configuration) {
-    $existing_configuration = $this->getBlock($block_id)->getConfiguration();
-    $this->getBlockCollection()->setInstanceConfiguration($block_id, $configuration + $existing_configuration);
-    return $this;
-  }
-
-  /**
-   * @see \Drupal\ctools\Plugin\BlockVariantInterface::getRegionAssignment()
-   */
-  public function getRegionAssignment($block_id) {
-    $configuration = $this->getBlock($block_id)->getConfiguration();
-    return isset($configuration['region']) ? $configuration['region'] : NULL;
-  }
-
-  /**
-   * @see \Drupal\ctools\Plugin\BlockVariantInterface::getRegionAssignments()
-   */
-  public function getRegionAssignments() {
-    // Build an array of the region names in the right order.
-    $empty = array_fill_keys(array_keys($this->getRegionNames()), []);
-    $full = $this->getBlockCollection()->getAllByRegion();
-    // Merge it with the actual values to maintain the ordering.
-    return array_intersect_key(array_merge($empty, $full), $empty);
-  }
-
-  /**
-   * @see \Drupal\ctools\Plugin\BlockVariantInterface::getRegionName()
-   */
-  public function getRegionName($region) {
-    $regions = $this->getRegionNames();
-    return isset($regions[$region]) ? $regions[$region] : '';
-  }
-
-  /**
-   * Gets the block plugin manager.
-   *
-   * @return \Drupal\Core\Block\BlockManager
-   *   The block plugin manager.
-   */
-  protected function getBlockManager() {
-    if (!$this->blockManager) {
-      $this->blockManager = \Drupal::service('plugin.manager.block');
-    }
-    return $this->blockManager;
-  }
-
-  /**
-   * Returns the block plugins used for this display variant.
-   *
-   * @return \Drupal\Core\Block\BlockPluginInterface[]|\Drupal\ctools\Plugin\BlockPluginCollection
-   *   An array or collection of configured block plugins.
-   */
-  protected function getBlockCollection() {
-    if (!$this->blockPluginCollection) {
-      $this->blockPluginCollection = new BlockPluginCollection($this->getBlockManager(), $this->getBlockConfig());
-    }
-    return $this->blockPluginCollection;
-  }
-
-  /**
-   * Returns the UUID generator.
-   *
-   * @return \Drupal\Component\Uuid\UuidInterface
-   */
-  abstract protected function uuidGenerator();
-
-  /**
-   * Returns the configuration for stored blocks.
-   *
-   * @return array
-   *   An array of block configuration, keyed by the unique block ID.
-   */
-  abstract protected function getBlockConfig();
-
-}
diff --git a/modules/ctools/src/Plugin/Condition/EntityBundle.php b/modules/ctools/src/Plugin/Condition/EntityBundle.php
deleted file mode 100644
index 57547f3..0000000
--- a/modules/ctools/src/Plugin/Condition/EntityBundle.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Condition;
-
-use Drupal\Core\Condition\ConditionPluginBase;
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\ctools\ConstraintConditionInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a 'Entity Bundle' condition.
- *
- * @Condition(
- *   id = "entity_bundle",
- *   deriver = "\Drupal\ctools\Plugin\Deriver\EntityBundle"
- * )
- *
- */
-class EntityBundle extends ConditionPluginBase implements ConstraintConditionInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * The entity type bundle info service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
-   */
-  protected $entityTypeBundleInfo;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityTypeInterface|null
-   */
-  protected $bundleOf;
-
-  /**
-   * Creates a new EntityBundle instance.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
-   *   The entity type bundle info service.
-   * @param array $configuration
-   *   The plugin configuration, i.e. an array with configuration values keyed
-   *   by configuration option name. The special key 'context' may be used to
-   *   initialize the defined contexts by setting it to an array of context
-   *   values keyed by context names.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, array $configuration, $plugin_id, $plugin_definition) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->entityTypeBundleInfo = $entity_type_bundle_info;
-    $this->bundleOf = $entity_type_manager->getDefinition($this->getDerivativeId());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $container->get('entity_type.manager'),
-      $container->get('entity_type.bundle.info'),
-      $configuration,
-      $plugin_id,
-      $plugin_definition
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $options = array();
-    $bundles = $this->entityTypeBundleInfo->getBundleInfo($this->bundleOf->id());
-    foreach ($bundles as $id => $info) {
-      $options[$id] = $info['label'];
-    }
-    $form['bundles'] = array(
-      '#title' => $this->pluginDefinition['label'],
-      '#type' => 'checkboxes',
-      '#options' => $options,
-      '#default_value' => $this->configuration['bundles'],
-    );
-    return parent::buildConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['bundles'] = array_filter($form_state->getValue('bundles'));
-    parent::submitConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function evaluate() {
-    if (empty($this->configuration['bundles']) && !$this->isNegated()) {
-      return TRUE;
-    }
-    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
-    $entity = $this->getContextValue($this->bundleOf->id());
-    return !empty($this->configuration['bundles'][$entity->bundle()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function summary() {
-    if (count($this->configuration['bundles']) > 1) {
-      $bundles = $this->configuration['bundles'];
-      $last = array_pop($bundles);
-      $bundles = implode(', ', $bundles);
-      return $this->t('@bundle_type is @bundles or @last', array('@bundle_type' => $this->bundleOf->getBundleLabel(), '@bundles' => $bundles, '@last' => $last));
-    }
-    $bundle = reset($this->configuration['bundles']);
-    return $this->t('@bundle_type is @bundle', array('@bundle_type' => $this->bundleOf->getBundleLabel(), '@bundle' => $bundle));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return array('bundles' => array()) + parent::defaultConfiguration();
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @param \Drupal\Core\Plugin\Context\ContextInterface[] $contexts
-   */
-  public function applyConstraints(array $contexts = array()) {
-    // Nullify any bundle constraints on contexts we care about.
-    $this->removeConstraints($contexts);
-    $bundle = array_values($this->configuration['bundles']);
-    // There's only one expected context for this plugint type.
-    foreach ($this->getContextMapping() as $definition_id => $context_id) {
-      $contexts[$context_id]->getContextDefinition()->addConstraint('Bundle', ['value' => $bundle]);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @param \Drupal\Core\Plugin\Context\ContextInterface[] $contexts
-   */
-  public function removeConstraints(array $contexts = array()) {
-    // Reset the bundle constraint for any context we've mapped.
-    foreach ($this->getContextMapping() as $definition_id => $context_id) {
-      $constraints = $contexts[$context_id]->getContextDefinition()->getConstraints();
-      unset($constraints['Bundle']);
-      $contexts[$context_id]->getContextDefinition()->setConstraints($constraints);
-    }
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/Condition/NodeType.php b/modules/ctools/src/Plugin/Condition/NodeType.php
deleted file mode 100644
index 3cf9600..0000000
--- a/modules/ctools/src/Plugin/Condition/NodeType.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Condition;
-
-use Drupal\node\Plugin\Condition\NodeType as CoreNodeType;
-use Drupal\ctools\ConstraintConditionInterface;
-
-class NodeType extends CoreNodeType implements ConstraintConditionInterface {
-
-  /**
-   * {@inheritdoc}
-   *
-   * @param \Drupal\Core\Plugin\Context\ContextInterface[] $contexts
-   */
-  public function applyConstraints(array $contexts = array()) {
-    // Nullify any bundle constraints on contexts we care about.
-    $this->removeConstraints($contexts);
-    // If a single bundle is configured, we can set a proper constraint.
-    if (count($this->configuration['bundles']) == 1) {
-      $bundle = array_values($this->configuration['bundles']);
-      foreach ($this->getContextMapping() as $definition_id => $context_id) {
-        $contexts[$context_id]->getContextDefinition()->addConstraint('Bundle', ['value' => $bundle[0]]);
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @param \Drupal\Core\Plugin\Context\ContextInterface[] $contexts
-   */
-  public function removeConstraints(array $contexts = array()) {
-    // Reset the bundle constraint for any context we've mapped.
-    foreach ($this->getContextMapping() as $definition_id => $context_id) {
-      $constraints = $contexts[$context_id]->getContextDefinition()->getConstraints();
-      unset($constraints['Bundle']);
-      $contexts[$context_id]->getContextDefinition()->setConstraints($constraints);
-    }
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/Deriver/EntityBundle.php b/modules/ctools/src/Plugin/Deriver/EntityBundle.php
deleted file mode 100644
index 073ab4a..0000000
--- a/modules/ctools/src/Plugin/Deriver/EntityBundle.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Deriver;
-
-use Drupal\Core\Plugin\Context\ContextDefinition;
-
-/**
- * Deriver that creates a condition for each entity type with bundles.
- */
-class EntityBundle extends EntityDeriverBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
-      if ($entity_type->hasKey('bundle')) {
-        $this->derivatives[$entity_type_id] = $base_plugin_definition;
-        $this->derivatives[$entity_type_id]['label'] = $this->getEntityBundleLabel($entity_type);
-        $this->derivatives[$entity_type_id]['context'] = [
-          "$entity_type_id" => new ContextDefinition('entity:' . $entity_type_id),
-        ];
-      }
-    }
-    return $this->derivatives;
-  }
-
-  /**
-   * Provides the bundle label with a fallback when not defined.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type we are looking the bundle label for.
-   *
-   * @return \Drupal\Core\StringTranslation\TranslatableMarkup
-   *   The entity bundle label or a fallback label.
-   */
-  protected function getEntityBundleLabel($entity_type) {
-
-    if ($label = $entity_type->getBundleLabel()) {
-      return $this->t('@label', ['@label' => $label]);
-    }
-
-    $fallback = $entity_type->getLabel();
-    if ($bundle_entity_type = $entity_type->getBundleEntityType()) {
-      // This is a better fallback.
-      $fallback =  $this->entityManager->getDefinition($bundle_entity_type)->getLabel();
-    }
-
-    return $this->t('@label bundle', ['@label' => $fallback]);
-
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/Deriver/EntityDeriverBase.php b/modules/ctools/src/Plugin/Deriver/EntityDeriverBase.php
deleted file mode 100644
index 1adec99..0000000
--- a/modules/ctools/src/Plugin/Deriver/EntityDeriverBase.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Deriver;
-
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * An abstract base class that sets up the needs of entity specific derivers.
- */
-abstract class EntityDeriverBase extends DeriverBase implements ContainerDeriverInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * Constructs new EntityViewDeriver.
-   *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   */
-  public function __construct(EntityManagerInterface $entity_manager, TranslationInterface $string_translation) {
-    $this->entityManager = $entity_manager;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static(
-      $container->get('entity.manager'),
-      $container->get('string_translation')
-    );
-  }
-
-}
-
diff --git a/modules/ctools/src/Plugin/Deriver/EntityViewDeriver.php b/modules/ctools/src/Plugin/Deriver/EntityViewDeriver.php
deleted file mode 100644
index f8f189c..0000000
--- a/modules/ctools/src/Plugin/Deriver/EntityViewDeriver.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Deriver;
-
-use Drupal\Core\Plugin\Context\ContextDefinition;
-
-/**
- * Provides entity view block definitions for each entity type.
- */
-class EntityViewDeriver extends EntityDeriverBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
-      if ($entity_type->hasViewBuilderClass()) {
-        $this->derivatives[$entity_type_id] = $base_plugin_definition;
-        $this->derivatives[$entity_type_id]['admin_label'] = $this->t('Entity view (@label)', ['@label' => $entity_type->getLabel()]);
-        $this->derivatives[$entity_type_id]['context'] = [
-          'entity' => new ContextDefinition('entity:' . $entity_type_id),
-        ];
-      }
-    }
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/Deriver/TypedDataEntityRelationshipDeriver.php b/modules/ctools/src/Plugin/Deriver/TypedDataEntityRelationshipDeriver.php
deleted file mode 100644
index cd2d83f..0000000
--- a/modules/ctools/src/Plugin/Deriver/TypedDataEntityRelationshipDeriver.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Deriver;
-
-
-use Drupal\Core\TypedData\DataDefinitionInterface;
-
-class TypedDataEntityRelationshipDeriver extends TypedDataRelationshipDeriver {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $label = '@property Entity from @base';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function generateDerivativeDefinition($base_plugin_definition, $data_type_id, $data_type_definition, DataDefinitionInterface $base_definition, $property_name, DataDefinitionInterface $property_definition) {
-    if (method_exists($property_definition, 'getType') && $property_definition->getType() == 'entity_reference') {
-      parent::generateDerivativeDefinition($base_plugin_definition, $data_type_id, $data_type_definition, $base_definition, $property_name, $property_definition);
-    }
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/Deriver/TypedDataLanguageRelationshipDeriver.php b/modules/ctools/src/Plugin/Deriver/TypedDataLanguageRelationshipDeriver.php
deleted file mode 100644
index d662d29..0000000
--- a/modules/ctools/src/Plugin/Deriver/TypedDataLanguageRelationshipDeriver.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Deriver;
-
-
-use Drupal\Core\TypedData\DataDefinitionInterface;
-
-class TypedDataLanguageRelationshipDeriver extends TypedDataRelationshipDeriver {
-
-  /**
-   * {@inheritdoc}
-   *
-   * @todo this results in awful labels like "Language Language from Content"
-   * Fix it.
-   */
-  protected $label = '@property Language from @base';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function generateDerivativeDefinition($base_plugin_definition, $data_type_id, $data_type_definition, DataDefinitionInterface $base_definition, $property_name, DataDefinitionInterface $property_definition) {
-    if (method_exists($property_definition, 'getType') && $property_definition->getType() == 'language') {
-      parent::generateDerivativeDefinition($base_plugin_definition, $data_type_id, $data_type_definition, $base_definition, $property_name, $property_definition);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    parent::getDerivativeDefinitions($base_plugin_definition);
-    // The data types will all be set to string since language extends string
-    // and the parent class finds the related primitive.
-    foreach ($this->derivatives as $plugin_id => $derivative) {
-      $this->derivatives[$plugin_id]['data_type'] = 'language';
-    }
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/Deriver/TypedDataPropertyDeriverBase.php b/modules/ctools/src/Plugin/Deriver/TypedDataPropertyDeriverBase.php
deleted file mode 100644
index ae8bbc2..0000000
--- a/modules/ctools/src/Plugin/Deriver/TypedDataPropertyDeriverBase.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Deriver;
-
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\Core\TypedData\ComplexDataInterface;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\DataReferenceDefinitionInterface;
-use Drupal\Core\TypedData\ListDataDefinitionInterface;
-use Drupal\Core\TypedData\TypedDataManagerInterface;
-use Drupal\field\Entity\FieldConfig;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-abstract class TypedDataPropertyDeriverBase extends DeriverBase implements ContainerDeriverInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * @var \Drupal\Core\TypedData\TypedDataManagerInterface
-   */
-  protected $typedDataManager;
-
-  /**
-   * The label string for use with derivative labels.
-   *
-   * @var string
-   */
-  protected $label = '@property from @base';
-
-  /**
-   * TypedDataPropertyDeriverBase constructor.
-   *
-   * @param \Drupal\Core\TypedData\TypedDataManagerInterface $typed_data_manager
-   *   The typed data manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   */
-  public function __construct(TypedDataManagerInterface $typed_data_manager, TranslationInterface $string_translation) {
-    $this->typedDataManager = $typed_data_manager;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static(
-      $container->get('typed_data_manager'),
-      $container->get('string_translation')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->typedDataManager->getDefinitions() as $data_type_id => $data_type_definition) {
-      if (is_subclass_of($data_type_definition['class'], ComplexDataInterface::class, TRUE)) {
-        /** @var \Drupal\Core\TypedData\ComplexDataDefinitionInterface $base_definition */
-        $base_definition = $this->typedDataManager->createDataDefinition($data_type_id);
-        foreach ($base_definition->getPropertyDefinitions() as $property_name => $property_definition) {
-          if ($property_definition instanceof BaseFieldDefinition || $property_definition instanceof FieldConfig) {
-            $this->generateDerivativeDefinition($base_plugin_definition, $data_type_id, $data_type_definition, $base_definition, $property_name, $property_definition);
-          }
-        }
-      }
-    }
-    return $this->derivatives;
-  }
-
-  /**
-   * @param $property_definition
-   *
-   * @return mixed
-   */
-  protected function getDataType($property_definition) {
-    if ($property_definition instanceof DataReferenceDefinitionInterface) {
-      return $property_definition->getTargetDefinition()->getDataType();
-    }
-    if ($property_definition instanceof ListDataDefinitionInterface) {
-      return $property_definition->getItemDefinition()->getDataType();
-    }
-    return $property_definition->getDataType();
-  }
-
-  /**
-   * Generates and maintains a derivative definition.
-   *
-   * This method should directly manipulate $this->derivatives and not return
-   * values. This allows implementations control over the derivative names.
-   *
-   * @param $base_plugin_definition
-   *   The base plugin definition.
-   * @param string $data_type_id
-   *   The plugin id of the data type.
-   * @param mixed $data_type_definition
-   *   The plugin definition of the data type.
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $base_definition
-   *   The data type definition of a complex data object.
-   * @param string $property_name
-   *   The name of the property
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $property_definition
-   *   The property definition.
-   *
-   */
-  abstract protected function generateDerivativeDefinition($base_plugin_definition, $data_type_id, $data_type_definition, DataDefinitionInterface $base_definition, $property_name, DataDefinitionInterface $property_definition);
-
-}
diff --git a/modules/ctools/src/Plugin/Deriver/TypedDataRelationshipDeriver.php b/modules/ctools/src/Plugin/Deriver/TypedDataRelationshipDeriver.php
deleted file mode 100644
index e0f8dbb..0000000
--- a/modules/ctools/src/Plugin/Deriver/TypedDataRelationshipDeriver.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Deriver;
-
-
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\field\FieldConfigInterface;
-
-class TypedDataRelationshipDeriver extends TypedDataPropertyDeriverBase implements ContainerDeriverInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function generateDerivativeDefinition($base_plugin_definition, $data_type_id, $data_type_definition, DataDefinitionInterface $base_definition, $property_name, DataDefinitionInterface $property_definition) {
-    $bundle_info = $base_definition->getConstraint('Bundle');
-    // Identify base definitions that appear on bundle-able entities.
-    if ($bundle_info && array_filter($bundle_info) && $base_definition->getConstraint('EntityType')) {
-      $base_data_type =  'entity:' . $base_definition->getConstraint('EntityType');
-    }
-    // Otherwise, just use the raw data type identifier.
-    else {
-      $base_data_type = $data_type_id;
-    }
-    // If we've not processed this thing before.
-    if (!isset($this->derivatives[$base_data_type . ':' . $property_name])) {
-      $derivative = $base_plugin_definition;
-
-      $derivative['label'] = $this->t($this->label, [
-        '@property' => $property_definition->getLabel(),
-        '@base' => $data_type_definition['label'],
-      ]);
-      $derivative['data_type'] = $property_definition->getFieldStorageDefinition()->getPropertyDefinition($property_definition->getFieldStorageDefinition()->getMainPropertyName())->getDataType();
-      $derivative['property_name'] = $property_name;
-      $context_definition = new ContextDefinition($base_data_type, $this->typedDataManager->createDataDefinition($base_data_type));
-      // Add the constraints of the base definition to the context definition.
-      if ($base_definition->getConstraint('Bundle')) {
-        $context_definition->addConstraint('Bundle', $base_definition->getConstraint('Bundle'));
-      }
-      $derivative['context'] = [
-        'base' => $context_definition,
-      ];
-      $derivative['property_name'] = $property_name;
-
-      $this->derivatives[$base_data_type . ':' . $property_name] = $derivative;
-    }
-    // Individual fields can be on multiple bundles.
-    elseif ($property_definition instanceof FieldConfigInterface) {
-      // We should only end up in here on entity bundles.
-      $derivative = $this->derivatives[$base_data_type . ':' . $property_name];
-      // Update label
-      /** @var \Drupal\Core\StringTranslation\TranslatableMarkup $label */
-      $label = $derivative['label'];
-      list(,, $argument_name) = explode(':', $data_type_id);
-      $arguments = $label->getArguments();
-      $arguments['@'. $argument_name] = $data_type_definition['label'];
-      $string_args = $arguments;
-      array_shift($string_args);
-      $last = array_slice($string_args, -1);
-      // The slice doesn't remove, so do that now.
-      array_pop($string_args);
-      $string = count($string_args) >= 2 ? '@property from '. implode(', ', array_keys($string_args)) .' and '. array_keys($last)[0] : '@property from @base and '. array_keys($last)[0];
-      $this->derivatives[$base_data_type . ':' . $property_name]['label'] = $this->t($string, $arguments);
-      if ($base_definition->getConstraint('Bundle')) {
-        // Add bundle constraints
-        $context_definition = $derivative['context']['base'];
-        $bundles = $context_definition->getConstraint('Bundle') ?: [];
-        $bundles = array_merge($bundles, $base_definition->getConstraint('Bundle'));
-        $context_definition->addConstraint('Bundle', $bundles);
-      }
-    }
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/DisplayVariant/BlockDisplayVariant.php b/modules/ctools/src/Plugin/DisplayVariant/BlockDisplayVariant.php
deleted file mode 100644
index 32c6e86..0000000
--- a/modules/ctools/src/Plugin/DisplayVariant/BlockDisplayVariant.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\DisplayVariant;
-
-use Drupal\Component\Uuid\UuidInterface;
-use Drupal\Core\Block\BlockManager;
-use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
-use Drupal\Core\Condition\ConditionManager;
-use Drupal\Core\Display\VariantBase;
-use Drupal\Core\Display\ContextAwareVariantInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Plugin\Context\ContextHandlerInterface;
-use Drupal\Core\Render\Element;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Utility\Token;
-use Drupal\ctools\Form\AjaxFormTrait;
-use Drupal\ctools\Plugin\BlockVariantInterface;
-use Drupal\ctools\Plugin\BlockVariantTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a base class for a display variant that simply contains blocks.
- */
-abstract class BlockDisplayVariant extends VariantBase implements ContextAwareVariantInterface, ContainerFactoryPluginInterface, BlockVariantInterface, RefinableCacheableDependencyInterface {
-
-  use AjaxFormTrait;
-  use BlockVariantTrait;
-
-  /**
-   * The context handler.
-   *
-   * @var \Drupal\Core\Plugin\Context\ContextHandlerInterface
-   */
-  protected $contextHandler;
-
-  /**
-   * The UUID generator.
-   *
-   * @var \Drupal\Component\Uuid\UuidInterface
-   */
-  protected $uuidGenerator;
-
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $account;
-
-  /**
-   * The token service.
-   *
-   * @var \Drupal\Core\Utility\Token
-   */
-  protected $token;
-
-  /**
-   * An array of collected contexts.
-   *
-   * This is only used on runtime, and is not stored.
-   *
-   * @var \Drupal\Component\Plugin\Context\ContextInterface[]
-   */
-  protected $contexts = [];
-
-  /**
-   * Constructs a new BlockDisplayVariant.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Plugin\Context\ContextHandlerInterface $context_handler
-   *   The context handler.
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   The current user.
-   * @param \Drupal\Component\Uuid\UuidInterface $uuid_generator
-   *   The UUID generator.
-   * @param \Drupal\Core\Utility\Token $token
-   *   The token service.
-   * @param \Drupal\Core\Block\BlockManager $block_manager
-   *   The block manager.
-   * @param \Drupal\Core\Condition\ConditionManager $condition_manager
-   *   The condition manager.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ContextHandlerInterface $context_handler, AccountInterface $account, UuidInterface $uuid_generator, Token $token, BlockManager $block_manager, ConditionManager $condition_manager) {
-    // Inject dependencies as early as possible, so they can be used in
-    // configuration.
-    $this->contextHandler = $context_handler;
-    $this->account = $account;
-    $this->uuidGenerator = $uuid_generator;
-    $this->token = $token;
-    $this->blockManager = $block_manager;
-    $this->conditionManager = $condition_manager;
-
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('context.handler'),
-      $container->get('current_user'),
-      $container->get('uuid'),
-      $container->get('token'),
-      $container->get('plugin.manager.block'),
-      $container->get('plugin.manager.condition')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return parent::defaultConfiguration() + [
-      'blocks' => []
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    foreach ($this->getBlockCollection() as $instance) {
-      $this->calculatePluginDependencies($instance);
-    }
-    return $this->dependencies;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfiguration() {
-    return [
-      'blocks' => $this->getBlockCollection()->getConfiguration(),
-    ] + parent::getConfiguration();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConfiguration(array $configuration) {
-    // preserve the uuid.
-    if ($this->configuration && !empty($this->configuration['uuid'])) {
-      $configuration['uuid'] = $this->configuration['uuid'];
-    }
-    parent::setConfiguration($configuration);
-    $this->getBlockCollection()->setConfiguration($this->configuration['blocks']);
-    return $this;
-  }
-
-  /**
-   * Gets the contexts.
-   *
-   * @return \Drupal\Component\Plugin\Context\ContextInterface[]
-   *   An array of set contexts, keyed by context name.
-   */
-  public function getContexts() {
-    return $this->contexts;
-  }
-
-  /**
-   * Sets the contexts.
-   *
-   * @param \Drupal\Component\Plugin\Context\ContextInterface[] $contexts
-   *   An array of contexts, keyed by context name.
-   *
-   * @return $this
-   */
-  public function setContexts(array $contexts) {
-    $this->contexts = $contexts;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function contextHandler() {
-    return $this->contextHandler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getBlockConfig() {
-    return $this->configuration['blocks'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function uuidGenerator() {
-    return $this->uuidGenerator;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __sleep() {
-    $vars = parent::__sleep();
-
-    // Gathered contexts objects should not be serialized.
-    if (($key = array_search('contexts', $vars)) !== FALSE) {
-      unset($vars[$key]);
-    }
-
-    // The block plugin collection should also not be serialized, ensure that
-    // configuration is synced back.
-    if (($key = array_search('blockPluginCollection', $vars)) !== FALSE) {
-      if ($this->blockPluginCollection) {
-        $this->configuration['blocks'] = $this->blockPluginCollection->getConfiguration();
-      }
-      unset($vars[$key]);
-    }
-
-    return $vars;
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/PluginWizardInterface.php b/modules/ctools/src/Plugin/PluginWizardInterface.php
deleted file mode 100644
index cbb5e77..0000000
--- a/modules/ctools/src/Plugin/PluginWizardInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin;
-
-/**
- * Provides an interface for configuring a plugin via wizard steps.
- */
-interface PluginWizardInterface {
-
-  /**
-   * Retrieve a list of FormInterface classes by their step key in the wizard.
-   *
-   * @param mixed $cached_values
-   *   The cached values used in the wizard. The plugin we're editing will
-   *    always be assigned to the 'plugin' key.
-   *
-   * @return array
-   *   An associative array keyed on the step name with an array value with the
-   *   following keys:
-   *   - title (string): Human-readable title of the step.
-   *   - form (string): Fully-qualified class name of the form for this step.
-   */
-  public function getWizardOperations($cached_values);
-
-}
diff --git a/modules/ctools/src/Plugin/Relationship/TypedDataEntityRelationship.php b/modules/ctools/src/Plugin/Relationship/TypedDataEntityRelationship.php
deleted file mode 100644
index ce96841..0000000
--- a/modules/ctools/src/Plugin/Relationship/TypedDataEntityRelationship.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Relationship;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-
-/**
- * @Relationship(
- *   id = "typed_data_entity_relationship",
- *   deriver = "\Drupal\ctools\Plugin\Deriver\TypedDataEntityRelationshipDeriver"
- * )
- */
-class TypedDataEntityRelationship extends TypedDataRelationship {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRelationship() {
-    $plugin_definition = $this->getPluginDefinition();
-
-    $entity_type = $this->getData($this->getContext('base'))->getDataDefinition()->getSetting('target_type');
-    $context_definition = new ContextDefinition("entity:$entity_type", $plugin_definition['label']);
-    $context_value = NULL;
-
-    // If the 'base' context has a value, then get the property value to put on
-    // the context (otherwise, mapping hasn't occurred yet and we just want to
-    // return the context with the right definition and no value).
-    if ($this->getContext('base')->hasContextValue()) {
-      $context_value = $this->getData($this->getContext('base'))->entity;
-    }
-
-    $context_definition->setDefaultValue($context_value);
-    return new Context($context_definition, $context_value);
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/Relationship/TypedDataLanguageRelationship.php b/modules/ctools/src/Plugin/Relationship/TypedDataLanguageRelationship.php
deleted file mode 100644
index c198231..0000000
--- a/modules/ctools/src/Plugin/Relationship/TypedDataLanguageRelationship.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Relationship;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-
-/**
- * @Relationship(
- *   id = "typed_data_language_relationship",
- *   deriver = "\Drupal\ctools\Plugin\Deriver\TypedDataLanguageRelationshipDeriver"
- * )
- */
-class TypedDataLanguageRelationship extends TypedDataRelationship {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRelationship() {
-    $plugin_definition = $this->getPluginDefinition();
-
-    $context_definition = new ContextDefinition("language", $plugin_definition['label']);
-    $context_value = NULL;
-
-    // If the 'base' context has a value, then get the property value to put on
-    // the context (otherwise, mapping hasn't occurred yet and we just want to
-    // return the context with the right definition and no value).
-    if ($this->getContext('base')->hasContextValue()) {
-      $context_value = $this->getData($this->getContext('base'))->language;
-    }
-
-    $context_definition->setDefaultValue($context_value);
-    return new Context($context_definition, $context_value);
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/Relationship/TypedDataRelationship.php b/modules/ctools/src/Plugin/Relationship/TypedDataRelationship.php
deleted file mode 100644
index d795f28..0000000
--- a/modules/ctools/src/Plugin/Relationship/TypedDataRelationship.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin\Relationship;
-
-
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\Core\Field\TypedData\FieldItemDataDefinition;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\Core\Plugin\Context\ContextInterface;
-use Drupal\Core\TypedData\DataReferenceInterface;
-use Drupal\Core\TypedData\ListInterface;
-use Drupal\ctools\Annotation\Relationship;
-use Drupal\ctools\Plugin\RelationshipBase;
-
-/**
- * @Relationship(
- *   id = "typed_data_relationship",
- *   deriver = "\Drupal\ctools\Plugin\Deriver\TypedDataRelationshipDeriver"
- * )
- */
-class TypedDataRelationship extends RelationshipBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRelationship() {
-    $plugin_definition = $this->getPluginDefinition();
-
-    $data_type = $plugin_definition['data_type'];
-    $context_definition = new ContextDefinition($data_type, $plugin_definition['label']);
-    $context_value = NULL;
-
-    // If the 'base' context has a value, then get the property value to put on
-    // the context (otherwise, mapping hasn't occurred yet and we just want to
-    // return the context with the right definition and no value).
-    if ($this->getContext('base')->hasContextValue()) {
-      $data = $this->getData($this->getContext('base'));
-      $property = $this->getMainPropertyName($data);
-      $context_value = $data->get($property)->getValue();
-    }
-
-    $context_definition->setDefaultValue($context_value);
-    return new Context($context_definition, $context_value);
-  }
-
-  public function getName() {
-    return $this->getPluginDefinition()['property_name'];
-  }
-
-  protected function getData(ContextInterface $context) {
-    /** @var \Drupal\Core\TypedData\ComplexDataInterface $base */
-    $base = $context->getContextValue();
-    $name = $this->getPluginDefinition()['property_name'];
-    $data = $base->get($name);
-    // @todo add configuration to get N instead of first.
-    if ($data instanceof ListInterface) {
-      $data = $data->first();
-    }
-    if ($data instanceof DataReferenceInterface) {
-      $data = $data->getTarget();
-    }
-    return $data;
-  }
-
-  protected function getMainPropertyName(FieldItemInterface $data) {
-    return $data->getFieldDefinition()->getFieldStorageDefinition()->getMainPropertyName();
-  }
-
-  public function getRelationshipValue() {
-    $property = $this->getMainPropertyName();
-    /** @var \Drupal\Core\TypedData\ComplexDataInterface $data */
-    $data = $this->getRelationship()->getContextData();
-    $data->get($property)->getValue();
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/RelationshipBase.php b/modules/ctools/src/Plugin/RelationshipBase.php
deleted file mode 100644
index 9f1e1cf..0000000
--- a/modules/ctools/src/Plugin/RelationshipBase.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin;
-
-use Drupal\Core\Plugin\ContextAwarePluginBase;
-
-/**
- * Base class for Relationship plugins.
- */
-abstract class RelationshipBase extends ContextAwarePluginBase implements RelationshipInterface {}
diff --git a/modules/ctools/src/Plugin/RelationshipInterface.php b/modules/ctools/src/Plugin/RelationshipInterface.php
deleted file mode 100644
index 0372a0e..0000000
--- a/modules/ctools/src/Plugin/RelationshipInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin;
-
-use Drupal\Component\Plugin\DerivativeInspectionInterface;
-use Drupal\Core\Plugin\ContextAwarePluginInterface;
-
-/**
- * Defines an interface for Relationship plugins.
- */
-interface RelationshipInterface extends ContextAwarePluginInterface, DerivativeInspectionInterface {
-
-  /**
-   * Generates a context based on this plugin's configuration.
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface
-   */
-  public function getRelationship();
-
-  /**
-   * The name of the property used to get this relationship.
-   *
-   * @return string
-   */
-  public function getName();
-
-}
diff --git a/modules/ctools/src/Plugin/RelationshipManager.php b/modules/ctools/src/Plugin/RelationshipManager.php
deleted file mode 100644
index b60462f..0000000
--- a/modules/ctools/src/Plugin/RelationshipManager.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin;
-
-use Drupal\Core\Plugin\Context\ContextAwarePluginManagerTrait;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-
-/**
- * Provides the Relationship plugin manager.
- */
-class RelationshipManager extends DefaultPluginManager implements RelationshipManagerInterface {
-
-  use ContextAwarePluginManagerTrait;
-
-  /**
-   * Constructor for RelationshipManager objects.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   Cache backend instance to use.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler to invoke the alter hook with.
-   */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    parent::__construct('Plugin/Relationship', $namespaces, $module_handler, 'Drupal\ctools\Plugin\RelationshipInterface', 'Drupal\ctools\Annotation\Relationship');
-
-    $this->alterInfo('ctools_relationship_info');
-    $this->setCacheBackend($cache_backend, 'ctools_relationship_plugins');
-  }
-
-}
diff --git a/modules/ctools/src/Plugin/RelationshipManagerInterface.php b/modules/ctools/src/Plugin/RelationshipManagerInterface.php
deleted file mode 100644
index a97fa1f..0000000
--- a/modules/ctools/src/Plugin/RelationshipManagerInterface.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin;
-use Drupal\Component\Plugin\Discovery\CachedDiscoveryInterface;
-use Drupal\Core\Plugin\Context\ContextAwarePluginManagerInterface;
-
-/**
- * Provides the Relationship plugin manager.
- */
-interface RelationshipManagerInterface extends ContextAwarePluginManagerInterface, CachedDiscoveryInterface {}
diff --git a/modules/ctools/src/Plugin/VariantCollectionInterface.php b/modules/ctools/src/Plugin/VariantCollectionInterface.php
deleted file mode 100644
index 5865e99..0000000
--- a/modules/ctools/src/Plugin/VariantCollectionInterface.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin;
-
-/**
- * Provides an interface for objects that have variants e.g. Pages.
- */
-interface VariantCollectionInterface {
-
-  /**
-   * Adds a new variant to the entity.
-   *
-   * @param array $configuration
-   *   An array of configuration for the new variant.
-   *
-   * @return string
-   *   The variant ID.
-   */
-  public function addVariant(array $configuration);
-
-  /**
-   * Retrieves a specific variant.
-   *
-   * @param string $variant_id
-   *   The variant ID.
-   *
-   * @return \Drupal\Core\Display\VariantInterface
-   *   The variant object.
-   */
-  public function getVariant($variant_id);
-
-  /**
-   * Removes a specific variant.
-   *
-   * @param string $variant_id
-   *   The variant ID.
-   *
-   * @return $this
-   */
-  public function removeVariant($variant_id);
-
-  /**
-   * Returns the variants available for the entity.
-   *
-   * @return \Drupal\Core\Display\VariantInterface[]
-   *   An array of the variants.
-   */
-  public function getVariants();
-
-}
diff --git a/modules/ctools/src/Plugin/VariantCollectionTrait.php b/modules/ctools/src/Plugin/VariantCollectionTrait.php
deleted file mode 100644
index 98a6f9a..0000000
--- a/modules/ctools/src/Plugin/VariantCollectionTrait.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin;
-
-/**
- * Provides methods for VariantCollectionInterface.
- */
-trait VariantCollectionTrait {
-
-  /**
-   * The plugin collection that holds the variants.
-   *
-   * @var \Drupal\ctools\Plugin\VariantPluginCollection
-   */
-  protected $variantCollection;
-
-  /**
-   * @see \Drupal\ctools\Plugin\VariantCollectionInterface::addVariant()
-   */
-  public function addVariant(array $configuration) {
-    $configuration['uuid'] = $this->uuidGenerator()->generate();
-    $this->getVariants()->addInstanceId($configuration['uuid'], $configuration);
-    return $configuration['uuid'];
-  }
-
-  /**
-   * @see \Drupal\ctools\Plugin\VariantCollectionInterface::getVariant()
-   */
-  public function getVariant($variant_id) {
-    return $this->getVariants()->get($variant_id);
-  }
-
-  /**
-   * @see \Drupal\ctools\Plugin\VariantCollectionInterface::removeVariant()
-   */
-  public function removeVariant($variant_id) {
-    $this->getVariants()->removeInstanceId($variant_id);
-    return $this;
-  }
-
-  /**
-   * @see \Drupal\ctools\Plugin\VariantCollectionInterface::getVariants()
-   */
-  public function getVariants() {
-    if (!$this->variantCollection) {
-      $this->variantCollection = new VariantPluginCollection(\Drupal::service('plugin.manager.display_variant'), $this->getVariantConfig());
-      $this->variantCollection->sort();
-    }
-    return $this->variantCollection;
-  }
-
-  /**
-   * Returns the configuration for stored variants.
-   *
-   * @return array
-   *   An array of variant configuration, keyed by the unique variant ID.
-   */
-  abstract protected function getVariantConfig();
-
-  /**
-   * Returns the UUID generator.
-   *
-   * @return \Drupal\Component\Uuid\UuidInterface
-   */
-  abstract protected function uuidGenerator();
-
-}
diff --git a/modules/ctools/src/Plugin/VariantPluginCollection.php b/modules/ctools/src/Plugin/VariantPluginCollection.php
deleted file mode 100644
index 77914cd..0000000
--- a/modules/ctools/src/Plugin/VariantPluginCollection.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Plugin;
-
-use Drupal\Core\Plugin\DefaultLazyPluginCollection;
-
-/**
- * Provides a collection of variants plugins.
- */
-class VariantPluginCollection extends DefaultLazyPluginCollection {
-
-  /**
-   * {@inheritdoc}
-   *
-   * @return \Drupal\Core\Display\VariantInterface
-   */
-  public function &get($instance_id) {
-    return parent::get($instance_id);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function sort() {
-    // @todo Determine the reason this needs error suppression.
-    @uasort($this->instanceIDs, [$this, 'sortHelper']);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function sortHelper($aID, $bID) {
-    $a_weight = $this->get($aID)->getWeight();
-    $b_weight = $this->get($bID)->getWeight();
-    if ($a_weight == $b_weight) {
-      return strcmp($aID, $bID);
-    }
-
-    return ($a_weight < $b_weight) ? -1 : 1;
-  }
-
-}
diff --git a/modules/ctools/src/Routing/Enhancer/WizardEnhancer.php b/modules/ctools/src/Routing/Enhancer/WizardEnhancer.php
deleted file mode 100644
index 3e125eb..0000000
--- a/modules/ctools/src/Routing/Enhancer/WizardEnhancer.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Routing\Enhancer;
-
-use Drupal\Core\Routing\Enhancer\RouteEnhancerInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Route;
-
-/**
- * Sets the request format onto the request object.
- */
-class WizardEnhancer implements RouteEnhancerInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies(Route $route) {
-    return !$route->hasDefault('_controller') && ($route->hasDefault('_wizard') || $route->hasDefault('_entity_wizard'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function enhance(array $defaults, Request $request) {
-    if (!empty($defaults['_wizard'])) {
-      $defaults['_controller'] = 'ctools.wizard.form:getContentResult';
-    }
-    if (!empty($defaults['_entity_wizard'])) {
-      $defaults['_controller'] = 'ctools.wizard.entity.form:getContentResult';
-    }
-    return $defaults;
-  }
-
-}
diff --git a/modules/ctools/src/SerializableTempstore.php b/modules/ctools/src/SerializableTempstore.php
deleted file mode 100644
index 65567ed..0000000
--- a/modules/ctools/src/SerializableTempstore.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Drupal\ctools;
-
-use Drupal\Core\DependencyInjection\DependencySerializationTrait;
-use Drupal\user\SharedTempStore;
-
-/**
- * An extension of the SharedTempStore system for serialized data.
- */
-class SerializableTempstore extends SharedTempStore {
-  use DependencySerializationTrait;
-}
diff --git a/modules/ctools/src/SerializableTempstoreFactory.php b/modules/ctools/src/SerializableTempstoreFactory.php
deleted file mode 100644
index 51cf02b..0000000
--- a/modules/ctools/src/SerializableTempstoreFactory.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Drupal\ctools;
-
-use Drupal\user\SharedTempStoreFactory;
-
-/**
- * A factory for creating SerializableTempStore objects.
- */
-class SerializableTempstoreFactory extends SharedTempStoreFactory {
-
-  /**
-   * {@inheritdoc}
-   */
-  function get($collection, $owner = NULL) {
-    // Use the currently authenticated user ID or the active user ID unless the
-    // owner is overridden.
-    if (!isset($owner)) {
-      $owner = \Drupal::currentUser()->id() ?: session_id();
-    }
-
-    // Store the data for this collection in the database.
-    $storage = $this->storageFactory->get("user.shared_tempstore.$collection");
-    return new SerializableTempstore($storage, $this->lockBackend, $owner, $this->requestStack, $this->expire);
-  }
-
-}
diff --git a/modules/ctools/src/Testing/EntityCreationTrait.php b/modules/ctools/src/Testing/EntityCreationTrait.php
deleted file mode 100644
index 358f8a1..0000000
--- a/modules/ctools/src/Testing/EntityCreationTrait.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Testing;
-
-
-use Drupal\Component\Render\FormattableMarkup;
-
-trait EntityCreationTrait {
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Creates a custom content type based on default settings.
-   *
-   * @param string $entity_type
-   *   The type of entity to create.
-   * @param array $values
-   *   An array of settings to change from the defaults.
-   *   Example: 'type' => 'foo'.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface
-   *   Created entity.
-   */
-  protected function createEntity($entity_type, array $values = array()) {
-    $storage = $this->getEntityTypeManager()->getStorage($entity_type);
-    $entity = $storage->create($values);
-    $status = $entity->save();
-    \Drupal::service('router.builder')->rebuild();
-
-    if ($this instanceof \PHPUnit_Framework_TestCase) {
-      $this->assertSame($status, SAVED_NEW, (new FormattableMarkup('Created entity %id of type %type.', ['%id' => $entity->id(), '%type' => $entity_type]))->__toString());
-    }
-    else {
-      $this->assertEqual($status, SAVED_NEW, (new FormattableMarkup('Created entity %id of type %type.', ['%id' => $entity->id(), '%type' => $entity_type]))->__toString());
-    }
-
-    return $entity;
-  }
-
-  /**
-   * @return \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected function getEntityTypeManager() {
-    if (!isset($this->entityTypeManager)) {
-      $this->entityTypeManager = $this->container->get('entity_type.manager');
-    }
-    return $this->entityTypeManager;
-  }
-
-}
diff --git a/modules/ctools/src/Tests/Wizard/CToolsWizardTest.php b/modules/ctools/src/Tests/Wizard/CToolsWizardTest.php
deleted file mode 100644
index c9b91ea..0000000
--- a/modules/ctools/src/Tests/Wizard/CToolsWizardTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Tests\Wizard;
-
-
-use Drupal\simpletest\WebTestBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-
-
-/**
- * Tests basic wizard functionality.
- *
- * @group ctools
- */
-class CToolsWizardTest extends WebTestBase {
-
-  use StringTranslationTrait;
-  public static $modules = array('ctools', 'ctools_wizard_test');
-
-  function testWizardSteps() {
-    $this->drupalGet('ctools/wizard');
-    $this->assertText('Form One');
-    $this->dumpHeaders = TRUE;
-    // Check that $operations['one']['values'] worked.
-    $this->assertText('Xylophone');
-    // Submit first step in the wizard.
-    $edit = [
-      'one' => 'test',
-    ];
-    $this->drupalPostForm('ctools/wizard', $edit, $this->t('Next'));
-    // Redirected to the second step.
-    $this->assertText('Form Two');
-    $this->assertText('Dynamic value submitted: Xylophone');
-    // Check that $operations['two']['values'] worked.
-    $this->assertText('Zebra');
-    // Hit previous to make sure our form value are preserved.
-    $this->drupalPostForm(NULL, [], $this->t('Previous'));
-    // Check the known form values.
-    $this->assertFieldByName('one', 'test');
-    $this->assertText('Xylophone');
-    // Goto next step again and finish this wizard.
-    $this->drupalPostForm(NULL, [], $this->t('Next'));
-    $edit = [
-      'two' => 'Second test',
-    ];
-    $this->drupalPostForm(NULL, $edit, $this->t('Finish'));
-    // Check that the wizard finished properly.
-    $this->assertText('Value One: test');
-    $this->assertText('Value Two: Second test');
-  }
-
-  function testStepValidateAndSubmit() {
-    $this->drupalGet('ctools/wizard');
-    $this->assertText('Form One');
-    // Submit first step in the wizard.
-    $edit = [
-      'one' => 'wrong',
-    ];
-    $this->drupalPostForm('ctools/wizard', $edit, $this->t('Next'));
-    // We're still on the first form and the error is present.
-    $this->assertText('Form One');
-    $this->assertText('Cannot set the value to "wrong".');
-    // Try again with the magic value.
-    $edit = [
-      'one' => 'magic',
-    ];
-    $this->drupalPostForm('ctools/wizard', $edit, $this->t('Next'));
-    // Redirected to the second step.
-    $this->assertText('Form Two');
-    $edit = [
-      'two' => 'Second test',
-    ];
-    $this->drupalPostForm(NULL, $edit, $this->t('Finish'));
-    // Check that the magic value triggered our submit callback.
-    $this->assertText('Value One: Abraham');
-    $this->assertText('Value Two: Second test');
-  }
-
-  function testEntityWizard() {
-    $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
-
-    // Start adding a new config entity.
-    $this->drupalGet('admin/structure/ctools_wizard_test_config_entity/add');
-    $this->assertText('Example entity');
-    $this->assertNoText('Existing entity');
-
-    // Submit the general step.
-    $edit = [
-      'id' => 'test123',
-      'label' => 'Test Config Entity 123',
-    ];
-    $this->drupalPostForm(NULL, $edit, $this->t('Next'));
-
-    // Submit the first step.
-    $edit = [
-      'one' => 'The first bit',
-    ];
-    $this->drupalPostForm(NULL, $edit, $this->t('Next'));
-
-    // Submit the second step.
-    $edit = [
-      'two' => 'The second bit',
-    ];
-    $this->drupalPostForm(NULL, $edit, $this->t('Finish'));
-
-    // Now we should be looking at the list of entities.
-    $this->assertUrl('admin/structure/ctools_wizard_test_config_entity');
-    $this->assertText('Test Config Entity 123');
-
-    // Edit the entity again and make sure the values are what we expect.
-    $this->clickLink(t('Edit'));
-    $this->assertText('Existing entity');
-    $this->assertFieldByName('label', 'Test Config Entity 123');
-    $this->clickLink(t('Form One'));
-    $this->assertFieldByName('one', 'The first bit');
-    $previous = $this->getUrl();
-    $this->clickLink(t('Show on dialog'));
-    $this->assertRaw('Value from one: The first bit');
-    $this->drupalGet($previous);
-    // Change the value for 'one'.
-    $this->drupalPostForm(NULL, ['one' => 'New value'], $this->t('Next'));
-    $this->assertFieldByName('two', 'The second bit');
-    $this->drupalPostForm(NULL, [], $this->t('Next'));
-    // Make sure we get the additional step because the entity exists.
-    $this->assertText('This step only shows if the entity is already existing!');
-    $this->drupalPostForm(NULL, [], $this->t('Finish'));
-
-    // Edit the entity again and make sure the change stuck.
-    $this->assertUrl('admin/structure/ctools_wizard_test_config_entity');
-    $this->clickLink(t('Edit'));
-    $this->drupalPostForm(NULL, [], $this->t('Next'));
-    $this->assertFieldByName('one', 'New value');
-  }
-
-}
-
diff --git a/modules/ctools/src/TypedDataResolver.php b/modules/ctools/src/TypedDataResolver.php
deleted file mode 100644
index 737ab3c..0000000
--- a/modules/ctools/src/TypedDataResolver.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-
-namespace Drupal\ctools;
-
-
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\Core\Plugin\Context\ContextDefinitionInterface;
-use Drupal\Core\Plugin\Context\ContextInterface;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\Core\TypedData\ComplexDataDefinitionInterface;
-use Drupal\Core\TypedData\DataReferenceDefinitionInterface;
-use Drupal\Core\TypedData\DataReferenceInterface;
-use Drupal\Core\TypedData\ListDataDefinitionInterface;
-use Drupal\Core\TypedData\ListInterface;
-use Drupal\Core\TypedData\TypedDataManagerInterface;
-
-class TypedDataResolver {
-
-  /**
-   * The typed data manager.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManagerInterface
-   */
-  protected $manager;
-
-  /**
-   * The string translation service.
-   *
-   * @var \Drupal\Core\StringTranslation\TranslationInterface
-   */
-  protected $translation;
-
-  /**
-   * @param \Drupal\Core\TypedData\TypedDataManagerInterface $manager
-   *   The typed data manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $translation
-   *   The string translation service.
-   */
-  public function __construct(TypedDataManagerInterface $manager, TranslationInterface $translation) {
-    $this->manager = $manager;
-    $this->translation = $translation;
-  }
-
-  /**
-   * Convert a property to a context.
-   *
-   * This method will respect the value of contexts as well, so if a context
-   * object is pass that contains a value, the appropriate value will be
-   * extracted and injected into the resulting context object if available.
-   *
-   * @param string $property_path
-   *   The name of the property.
-   * @param \Drupal\Core\Plugin\Context\ContextInterface $context
-   *   The context from which we will extract values if available.
-   *
-   * @return \Drupal\Core\Plugin\Context\Context
-   *   A context object that represents the definition & value of the property.
-   * @throws \Exception
-   */
-  public function getContextFromProperty($property_path, ContextInterface $context) {
-    $value = NULL;
-    $data_definition = NULL;
-    if ($context->hasContextValue()) {
-      /** @var \Drupal\Core\TypedData\ComplexDataInterface $data */
-      $data = $context->getContextData();
-      foreach (explode(':', $property_path) as $name) {
-
-        if ($data instanceof ListInterface) {
-          if (!is_numeric($name)) {
-            // Implicitly default to delta 0 for lists when not specified.
-            $data = $data->first();
-          }
-          else {
-            // If we have a delta, fetch it and continue with the next part.
-            $data = $data->get($name);
-            continue;
-          }
-        }
-
-        // Forward to the target value if this is a data reference.
-        if ($data instanceof DataReferenceInterface) {
-          $data = $data->getTarget();
-        }
-
-        if (!$data->getDataDefinition()->getPropertyDefinition($name)) {
-          throw new \Exception("Unknown property $name in property path $property_path");
-        }
-        $data = $data->get($name);
-      }
-
-      $value = $data->getValue();
-      $data_definition = $data instanceof DataReferenceInterface ? $data->getDataDefinition()->getTargetDefinition() : $data->getDataDefinition();
-    }
-    else {
-      /** @var \Drupal\Core\TypedData\ComplexDataDefinitionInterface $data_definition */
-      $data_definition = $context->getContextDefinition()->getDataDefinition();
-      foreach (explode(':', $property_path) as $name) {
-
-        if ($data_definition instanceof ListDataDefinitionInterface) {
-          $data_definition = $data_definition->getItemDefinition();
-
-          // If the delta was specified explicitly, continue with the next part.
-          if (is_numeric($name)) {
-            continue;
-          }
-        }
-
-        // Forward to the target definition if this is a data reference
-        // definition.
-        if ($data_definition instanceof DataReferenceDefinitionInterface) {
-          $data_definition = $data_definition->getTargetDefinition();
-        }
-
-        if (!$data_definition->getPropertyDefinition($name)) {
-          throw new \Exception("Unknown property $name in property path $property_path");
-        }
-        $data_definition = $data_definition->getPropertyDefinition($name);
-      }
-
-      // Forward to the target definition if this is a data reference
-      // definition.
-      if ($data_definition instanceof DataReferenceDefinitionInterface) {
-        $data_definition = $data_definition->getTargetDefinition();
-      }
-    }
-    $context_definition = new ContextDefinition($data_definition->getDataType(), $data_definition->getLabel(), $data_definition->isRequired(), FALSE, $data_definition->getDescription());
-    return new Context($context_definition, $value);
-  }
-
-  /**
-   * Extracts a context from an array of contexts by a tokenized pattern.
-   *
-   * This is more than simple isset/empty checks on the contexts array. The
-   * pattern could be node:uid:name which will iterate over all provided
-   * contexts in the array for one named 'node', it will then load the data
-   * definition of 'node' and check for a property named 'uid'. This will then
-   * set a new (temporary) context on the array and recursively call itself to
-   * navigate through related properties all the way down until the request
-   * property is located. At that point the property is passed to a
-   * TypedDataResolver which will convert it to an appropriate ContextInterface
-   * object.
-   *
-   * @param $token
-   *   A ":" delimited set of tokens representing
-   * @param \Drupal\Core\Plugin\Context\ContextInterface[] $contexts
-   *   The array of available contexts.
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface
-   *   The requested token as a full Context object.
-   *
-   * @throws \Drupal\ctools\ContextNotFoundException
-   */
-  public function convertTokenToContext($token, $contexts) {
-    // If the requested token is already a context, just return it.
-    if (isset($contexts[$token])) {
-      return $contexts[$token];
-    }
-    else {
-      list($base, $property_path) = explode(':', $token, 2);
-      // A base must always be set. This method recursively calls itself
-      // setting bases for this reason.
-      if (!empty($contexts[$base])) {
-        return $this->getContextFromProperty($property_path,  $contexts[$base]);
-      }
-      // @todo improve this exception message.
-      throw new ContextNotFoundException("The requested context was not found in the supplied array of contexts.");
-    }
-  }
-
-  /**
-   * Provides an administrative label for a tokenized relationship.
-   *
-   * @param string $token
-   *   The token related to a context in the contexts array.
-   * @param \Drupal\Core\Plugin\Context\ContextInterface[] $contexts
-   *  An array of contexts from which to extract our token's label.
-   *
-   * @return \Drupal\Core\StringTranslation\TranslatableMarkup
-   *   The administrative label of $token.
-   */
-  public function getLabelByToken($token, $contexts) {
-    // @todo Optimize this by allowing to limit the desired token?
-    $tokens = $this->getTokensForContexts($contexts);
-    if (isset($tokens[$token])) {
-      return $tokens[$token];
-    }
-  }
-
-  /**
-   * Extracts an array of tokens and labels.
-   *
-   * @param \Drupal\Core\Plugin\Context\ContextInterface[] $contexts
-   *   The array of contexts with which we are currently dealing.
-   *
-   * @return array
-   *   An array of token keys and corresponding labels.
-   */
-  public function getTokensForContexts($contexts) {
-    $tokens = [];
-    foreach ($contexts as $context_id => $context) {
-      $data_definition = $context->getContextDefinition()->getDataDefinition();
-      if ($data_definition instanceof ComplexDataDefinitionInterface) {
-        foreach ($this->getTokensFromComplexData($data_definition) as $token => $label) {
-          $tokens["$context_id:$token"] = $data_definition->getLabel() . ': ' . $label;
-        }
-      }
-    }
-    return $tokens;
-  }
-
-  /**
-   * Returns tokens for a complex data definition.
-   *
-   * @param \Drupal\Core\TypedData\ComplexDataDefinitionInterface $complex_data_definition
-   *
-   * @return array
-   *   An array of token keys and corresponding labels.
-   */
-  protected function getTokensFromComplexData(ComplexDataDefinitionInterface $complex_data_definition) {
-    $tokens = [];
-    // Loop over all properties.
-    foreach ($complex_data_definition->getPropertyDefinitions() as $property_name => $property_definition) {
-
-      // Item definitions do not always have a label. Use the list definition
-      // label if the item does not have one.
-      $property_label = $property_definition->getLabel();
-      if ($property_definition instanceof ListDataDefinitionInterface) {
-        $property_definition = $property_definition->getItemDefinition();
-        $property_label = $property_definition->getLabel() ?: $property_label;
-      }
-
-      // If the property is complex too, recurse to find child properties.
-      if ($property_definition instanceof ComplexDataDefinitionInterface) {
-        $property_tokens = $this->getTokensFromComplexData($property_definition);
-        foreach ($property_tokens as $token => $label) {
-          $tokens[$property_name . ':' . $token] = count($property_tokens) > 1 ? ($property_label . ': ' . $label) : $property_label;
-        }
-      }
-
-      // Only expose references as tokens.
-      // @todo Consider to expose primitive and non-reference typed data
-      //   definitions too, like strings, integers and dates. The current UI
-      //   will not scale to that.
-      if ($property_definition instanceof DataReferenceDefinitionInterface) {
-        $tokens[$property_name] = $property_definition->getLabel();
-      }
-    }
-    return $tokens;
-  }
-
-}
diff --git a/modules/ctools/src/Wizard/EntityFormWizardBase.php b/modules/ctools/src/Wizard/EntityFormWizardBase.php
deleted file mode 100644
index 1647f73..0000000
--- a/modules/ctools/src/Wizard/EntityFormWizardBase.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Wizard;
-
-
-use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\ctools\Event\WizardEvent;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * The base class for all entity form wizards.
- */
-abstract class EntityFormWizardBase extends FormWizardBase implements EntityFormWizardInterface {
-
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * @param \Drupal\user\SharedTempStoreFactory $tempstore
-   *   Tempstore Factory for keeping track of values in each step of the
-   *   wizard.
-   * @param \Drupal\Core\Form\FormBuilderInterface $builder
-   *   The Form Builder.
-   * @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
-   *   The class resolver.
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
-   *   The event dispatcher.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
-   * @param $tempstore_id
-   *   The shared temp store factory collection name.
-   * @param null $machine_name
-   *   The SharedTempStore key for our current wizard values.
-   * @param null $step
-   *   The current active step of the wizard.
-   */
-  public function __construct(SharedTempStoreFactory $tempstore, FormBuilderInterface $builder, ClassResolverInterface $class_resolver, EventDispatcherInterface $event_dispatcher, EntityManagerInterface $entity_manager, RouteMatchInterface $route_match, $tempstore_id, $machine_name = NULL, $step = NULL) {
-    $this->entityManager = $entity_manager;
-    parent::__construct($tempstore, $builder, $class_resolver, $event_dispatcher, $route_match, $tempstore_id, $machine_name, $step);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getParameters() {
-    return [
-      'tempstore' => \Drupal::service('user.shared_tempstore'),
-      'builder' => \Drupal::service('form_builder'),
-      'class_resolver' => \Drupal::service('class_resolver'),
-      'event_dispatcher' => \Drupal::service('event_dispatcher'),
-      'entity_manager' => \Drupal::service('entity.manager'),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function initValues() {
-    $storage = $this->entityManager->getStorage($this->getEntityType());
-    if ($this->getMachineName()) {
-      $values = $this->getTempstore()->get($this->getMachineName());
-      if (!$values) {
-        $entity = $storage->load($this->getMachineName());
-        $values[$this->getEntityType()] = $entity;
-        $values['id'] = $entity->id();
-        $values['label'] = $entity->label();
-      }
-    }
-    else {
-      $entity = $storage->create([]);
-      $values[$this->getEntityType()] = $entity;
-    }
-    $event = new WizardEvent($this, $values);
-    $this->dispatcher->dispatch(FormWizardInterface::LOAD_VALUES, $event);
-    return $event->getValues();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function finish(array &$form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    /** @var $entity \Drupal\Core\Entity\EntityInterface */
-    $entity = $cached_values[$this->getEntityType()];
-    $entity->set('id', $cached_values['id']);
-    $entity->set('label', $cached_values['label']);
-    $status = $entity->save();
-    $definition = $this->entityManager->getDefinition($this->getEntityType());
-    if ($status) {
-      drupal_set_message($this->t('Saved the %label @entity_type.', array(
-        '%label' => $entity->label(),
-        '@entity_type' => $definition->getLabel(),
-      )));
-    }
-    else {
-      drupal_set_message($this->t('The %label @entity_type was not saved.', array(
-        '%label' => $entity->label(),
-        '@entity_type' => $definition->getLabel(),
-      )));
-    }
-    $form_state->setRedirectUrl($entity->toUrl('collection'));
-    parent::finish($form, $form_state);
-  }
-
-  /**
-   * Helper function for generating label and id form elements.
-   *
-   * @param array $form
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *
-   * @return array
-   */
-  protected function customizeForm(array $form, FormStateInterface $form_state) {
-    $form = parent::customizeForm($form, $form_state);
-    if ($this->machine_name) {
-      $entity = $this->entityManager->getStorage($this->getEntityType())
-        ->load($this->machine_name);
-    }
-    else {
-      $entity = NULL;
-    }
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    // If the entity already exists, allow for non-linear step interaction.
-    if ($entity) {
-      // Setup the step rendering theme element.
-      $prefix = [
-        '#theme' => ['ctools_wizard_trail_links'],
-        '#wizard' => $this,
-        '#cached_values' => $cached_values,
-      ];
-      $form['#prefix'] = \Drupal::service('renderer')->render($prefix);
-    }
-    // Get the current form operation.
-    $operation = $this->getOperation($cached_values);
-    $operations = $this->getOperations($cached_values);
-    $default_operation = reset($operations);
-    if ($operation['form'] == $default_operation['form']) {
-      // Get the plugin definition of this entity.
-      $definition = $this->entityManager->getDefinition($this->getEntityType());
-      // Create id and label form elements.
-      $form['name'] = array(
-        '#type' => 'fieldset',
-        '#attributes' => array('class' => array('fieldset-no-legend')),
-        '#title' => $this->getWizardLabel(),
-      );
-      $form['name']['label'] = array(
-        '#type' => 'textfield',
-        '#title' => $this->getMachineLabel(),
-        '#required' => TRUE,
-        '#size' => 32,
-        '#default_value' => !empty($cached_values['label']) ? $cached_values['label'] : '',
-        '#maxlength' => 255,
-        '#disabled' => !empty($cached_values['label']),
-      );
-      $form['name']['id'] = array(
-        '#type' => 'machine_name',
-        '#maxlength' => 128,
-        '#machine_name' => array(
-          'source' => array('name', 'label'),
-          'exists' => $this->exists(),
-        ),
-        '#description' => $this->t('A unique machine-readable name for this @entity_type. It must only contain lowercase letters, numbers, and underscores.', ['@entity_type' => $definition->getLabel()]),
-        '#default_value' => !empty($cached_values['id']) ? $cached_values['id'] : '',
-        '#disabled' => !empty($cached_values['id']),
-      );
-    }
-
-    return $form;
-  }
-
-}
diff --git a/modules/ctools/src/Wizard/EntityFormWizardInterface.php b/modules/ctools/src/Wizard/EntityFormWizardInterface.php
deleted file mode 100644
index 92f5579..0000000
--- a/modules/ctools/src/Wizard/EntityFormWizardInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Wizard;
-
-/**
- * Form wizard interface for use with entities.
- */
-interface EntityFormWizardInterface extends FormWizardInterface {
-
-  /**
-   * The fieldset #title for your label & machine name elements.
-   *
-   * @return string
-   */
-  public function getWizardLabel();
-
-  /**
-   * The form element #title for your unique identifier label.
-   *
-   * @return string
-   */
-  public function getMachineLabel();
-
-  /**
-   * The machine name of the entity type.
-   *
-   * @return string
-   */
-  public function getEntityType();
-
-  /**
-   * A method for determining if this entity already exists.
-   *
-   * @return callable
-   *   The callable to pass the id to via typical machine_name form element.
-   */
-  public function exists();
-
-}
diff --git a/modules/ctools/src/Wizard/FormWizardBase.php b/modules/ctools/src/Wizard/FormWizardBase.php
deleted file mode 100644
index e537ef8..0000000
--- a/modules/ctools/src/Wizard/FormWizardBase.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Wizard;
-
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\CloseModalDialogCommand;
-use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Form\FormInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-use Drupal\ctools\Ajax\OpenModalWizardCommand;
-use Drupal\ctools\Event\WizardEvent;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * The base class for all form wizard.
- */
-abstract class FormWizardBase extends FormBase implements FormWizardInterface {
-
-  /**
-   * Tempstore Factory for keeping track of values in each step of the wizard.
-   *
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * The Form Builder.
-   *
-   * @var \Drupal\Core\Form\FormBuilderInterface
-   */
-  protected $builder;
-
-  /**
-   * The class resolver.
-   *
-   * @var \Drupal\Core\DependencyInjection\ClassResolverInterface;
-   */
-  protected $classResolver;
-
-  /**
-   * The event dispatcher.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-   */
-  protected $dispatcher;
-
-  /**
-   * The shared temp store factory collection name.
-   *
-   * @var string
-   */
-  protected $tempstore_id;
-
-  /**
-   * The SharedTempStore key for our current wizard values.
-   *
-   * @var string|NULL
-   */
-  protected $machine_name;
-
-  /**
-   * The current active step of the wizard.
-   *
-   * @var string|NULL
-   */
-  protected $step;
-
-  /**
-   * @param \Drupal\user\SharedTempStoreFactory $tempstore
-   *   Tempstore Factory for keeping track of values in each step of the
-   *   wizard.
-   * @param \Drupal\Core\Form\FormBuilderInterface $builder
-   *   The Form Builder.
-   * @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
-   *   The class resolver.
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
-   *   The event dispatcher.
-   * @param $tempstore_id
-   *   The shared temp store factory collection name.
-   * @param null $machine_name
-   *   The SharedTempStore key for our current wizard values.
-   * @param null $step
-   *   The current active step of the wizard.
-   */
-  public function __construct(SharedTempStoreFactory $tempstore, FormBuilderInterface $builder, ClassResolverInterface $class_resolver, EventDispatcherInterface $event_dispatcher, RouteMatchInterface $route_match, $tempstore_id, $machine_name = NULL, $step = NULL) {
-    $this->tempstore = $tempstore;
-    $this->builder = $builder;
-    $this->classResolver = $class_resolver;
-    $this->dispatcher = $event_dispatcher;
-    $this->routeMatch = $route_match;
-    $this->tempstore_id = $tempstore_id;
-    $this->machine_name = $machine_name;
-    $this->step = $step;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getParameters() {
-    return [
-      'tempstore' => \Drupal::service('user.shared_tempstore'),
-      'builder' => \Drupal::service('form_builder'),
-      'class_resolver' => \Drupal::service('class_resolver'),
-      'event_dispatcher' => \Drupal::service('event_dispatcher'),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function initValues() {
-    $values = [];
-    $event = new WizardEvent($this, $values);
-    $this->dispatcher->dispatch(FormWizardInterface::LOAD_VALUES, $event);
-    return $event->getValues();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTempstoreId() {
-    return $this->tempstore_id;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTempstore() {
-    return $this->tempstore->get($this->getTempstoreId());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMachineName() {
-    return $this->machine_name;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getStep($cached_values) {
-    if (!$this->step) {
-      $operations = $this->getOperations($cached_values);
-      $steps = array_keys($operations);
-      $this->step = reset($steps);
-    }
-    return $this->step;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOperation($cached_values) {
-    $operations = $this->getOperations($cached_values);
-    $step = $this->getStep($cached_values);
-    if (!empty($operations[$step])) {
-      return $operations[$step];
-    }
-    $operation = reset($operations);
-    return $operation;
-  }
-
-  /**
-   * The translated text of the "Next" button's text.
-   *
-   * @return string
-   */
-  public function getNextOp() {
-    return $this->t('Next');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getNextParameters($cached_values) {
-    // Get the steps by key.
-    $operations = $this->getOperations($cached_values);
-    $steps = array_keys($operations);
-    // Get the steps after the current step.
-    $after = array_slice($operations, array_search($this->getStep($cached_values), $steps) + 1);
-    // Get the steps after the current step by key.
-    $after_keys = array_keys($after);
-    $step = reset($after_keys);
-    if (!$step) {
-      $keys = array_keys($operations);
-      $step = end($keys);
-    }
-    return [
-      'machine_name' => $this->getMachineName(),
-      'step' => $step,
-      'js' => 'nojs',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPreviousParameters($cached_values) {
-    $operations = $this->getOperations($cached_values);
-    $step = $this->getStep($cached_values);
-
-    // Get the steps by key.
-    $steps = array_keys($operations);
-    // Get the steps before the current step.
-    $before = array_slice($operations, 0, array_search($step, $steps));
-    // Get the steps before the current step by key.
-    $before = array_keys($before);
-    // Reverse the steps for easy access to the next step.
-    $before_steps = array_reverse($before);
-    $step = reset($before_steps);
-    return [
-      'machine_name' => $this->getMachineName(),
-      'step' => $step,
-      'js' => 'nojs',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    if (!$this->getMachineName() || !$this->getTempstore()->get($this->getMachineName())) {
-      $cached_values = $this->initValues();
-    }
-    else {
-      $cached_values = $this->getTempstore()->get($this->getMachineName());
-    }
-    $operation = $this->getOperation($cached_values);
-    /* @var $operation \Drupal\Core\Form\FormInterface */
-    $operation = $this->classResolver->getInstanceFromDefinition($operation['form']);
-    return $operation->getFormId();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    // Get the current form operation.
-    $operation = $this->getOperation($cached_values);
-    $form = $this->customizeForm($form, $form_state);
-    /* @var $formClass \Drupal\Core\Form\FormInterface */
-    $formClass = $this->classResolver->getInstanceFromDefinition($operation['form']);
-    // Pass include any custom values for this operation.
-    if (!empty($operation['values'])) {
-      $cached_values = array_merge($cached_values, $operation['values']);
-      $form_state->setTemporaryValue('wizard', $cached_values);
-    }
-    // Build the form.
-    $form = $formClass->buildForm($form, $form_state);
-    if (isset($operation['title'])) {
-      $form['#title'] = $operation['title'];
-    }
-    $form['actions'] = $this->actions($formClass, $form_state);
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {}
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Only perform this logic if we're moving to the next page. This prevents
-    // the loss of cached values on ajax submissions.
-    if ((string)$form_state->getValue('op') == (string)$this->getNextOp()) {
-      $cached_values = $form_state->getTemporaryValue('wizard');
-      if ($form_state->hasValue('label')) {
-        $cached_values['label'] = $form_state->getValue('label');
-      }
-      if ($form_state->hasValue('id')) {
-        $cached_values['id'] = $form_state->getValue('id');
-      }
-      if (is_null($this->machine_name) && !empty($cached_values['id'])) {
-        $this->machine_name = $cached_values['id'];
-      }
-      $this->getTempstore()->set($this->getMachineName(), $cached_values);
-      if (!$form_state->get('ajax')) {
-        $form_state->setRedirect($this->getRouteName(), $this->getNextParameters($cached_values));
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function populateCachedValues(array &$form, FormStateInterface $form_state) {
-    $cached_values = $this->getTempstore()->get($this->getMachineName());
-    if (!$cached_values) {
-      $cached_values = $form_state->getTemporaryValue('wizard');
-      if (!$cached_values) {
-        $cached_values = $this->initValues();
-        $form_state->setTemporaryValue('wizard', $cached_values);
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function previous(array &$form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    $form_state->setRedirect($this->getRouteName(), $this->getPreviousParameters($cached_values));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function finish(array &$form, FormStateInterface $form_state) {
-    $this->getTempstore()->delete($this->getMachineName());
-  }
-
-  /**
-   * Helper function for generating default form elements.
-   *
-   * @param array $form
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *
-   * @return array
-   */
-  protected function customizeForm(array $form, FormStateInterface $form_state) {
-    // Setup the step rendering theme element.
-    $prefix = [
-      '#theme' => ['ctools_wizard_trail'],
-      '#wizard' => $this,
-      '#cached_values' => $form_state->getTemporaryValue('wizard'),
-    ];
-    // @todo properly inject the renderer.
-    $form['#prefix'] = \Drupal::service('renderer')->render($prefix);
-    return $form;
-  }
-
-  /**
-   * Generates action elements for navigating between the operation steps.
-   *
-   * @param \Drupal\Core\Form\FormInterface $form_object
-   *   The current operation form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current form state.
-   *
-   * @return array
-   */
-  protected function actions(FormInterface $form_object, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    $operations = $this->getOperations($cached_values);
-    $step = $this->getStep($cached_values);
-    $operation = $operations[$step];
-
-    $steps = array_keys($operations);
-    // Slice to find the operations that occur before the current operation.
-    $before = array_slice($operations, 0, array_search($step, $steps));
-    // Slice to find the operations that occur after the current operation.
-    $after = array_slice($operations, array_search($step, $steps) + 1);
-
-    $actions = [
-      'submit' => [
-        '#type' => 'submit',
-        '#value' => $this->t('Next'),
-        '#button_type' => 'primary',
-        '#validate' => [
-          '::populateCachedValues',
-          [$form_object, 'validateForm'],
-        ],
-        '#submit' => [
-          [$form_object, 'submitForm'],
-        ],
-      ],
-    ];
-
-    // Add any submit or validate functions for the step and the global ones.
-    if (isset($operation['validate'])) {
-      $actions['submit']['#validate'] = array_merge($actions['submit']['#validate'], $operation['validate']);
-    }
-    $actions['submit']['#validate'][] = '::validateForm';
-    if (isset($operation['submit'])) {
-      $actions['submit']['#submit'] = array_merge($actions['submit']['#submit'], $operation['submit']);
-    }
-    $actions['submit']['#submit'][] = '::submitForm';
-
-    if ($form_state->get('ajax')) {
-      // Ajax submissions need to submit to the current step, not "next".
-      $parameters = $this->getNextParameters($cached_values);
-      $parameters['step'] = $this->getStep($cached_values);
-      $actions['submit']['#ajax'] = [
-        'callback' => '::ajaxSubmit',
-        'url' => Url::fromRoute($this->getRouteName(), $parameters),
-        'options' => ['query' => \Drupal::request()->query->all() + [FormBuilderInterface::AJAX_FORM_REQUEST => TRUE]],
-      ];
-    }
-
-    // If there are steps before this one, label the button "previous"
-    // otherwise do not display a button.
-    if ($before) {
-      $actions['previous'] = array(
-        '#type' => 'submit',
-        '#value' => $this->t('Previous'),
-        '#validate' => array(
-          array($this, 'populateCachedValues'),
-        ),
-        '#submit' => array(
-          array($this, 'previous'),
-        ),
-        '#limit_validation_errors' => array(),
-        '#weight' => -10,
-      );
-      if ($form_state->get('ajax')) {
-        // Ajax submissions need to submit to the current step, not "previous".
-        $parameters = $this->getPreviousParameters($cached_values);
-        $parameters['step'] = $this->getStep($cached_values);
-        $actions['previous']['#ajax'] = [
-          'callback' => '::ajaxPrevious',
-          'url' => Url::fromRoute($this->getRouteName(), $parameters),
-          'options' => ['query' => \Drupal::request()->query->all() + [FormBuilderInterface::AJAX_FORM_REQUEST => TRUE]],
-        ];
-      }
-    }
-
-    // If there are not steps after this one, label the button "Finish".
-    if (!$after) {
-      $actions['submit']['#value'] = $this->t('Finish');
-      $actions['submit']['#submit'][] = array($this, 'finish');
-      if ($form_state->get('ajax')) {
-        $actions['submit']['#ajax']['callback'] = [$this, 'ajaxFinish'];
-      }
-    }
-
-    return $actions;
-  }
-
-  public function ajaxSubmit(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    $response = new AjaxResponse();
-    $parameters = $this->getNextParameters($cached_values);
-    $response->addCommand(new OpenModalWizardCommand($this, $this->getTempstoreId(), $parameters));
-    return $response;
-  }
-
-  public function ajaxPrevious(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    $response = new AjaxResponse();
-    $parameters = $this->getPreviousParameters($cached_values);
-    $response->addCommand(new OpenModalWizardCommand($this, $this->getTempstoreId(), $parameters));
-    return $response;
-  }
-
-  public function ajaxFinish(array $form, FormStateInterface $form_state) {
-    $response = new AjaxResponse();
-    $response->addCommand(new CloseModalDialogCommand());
-    return $response;
-  }
-
-  public function getRouteName() {
-    return $this->routeMatch->getRouteName();
-  }
-
-}
diff --git a/modules/ctools/src/Wizard/FormWizardInterface.php b/modules/ctools/src/Wizard/FormWizardInterface.php
deleted file mode 100644
index 54043c3..0000000
--- a/modules/ctools/src/Wizard/FormWizardInterface.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Wizard;
-
-use Drupal\Core\Form\FormInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Form wizard interface.
- */
-interface FormWizardInterface extends FormInterface {
-
-  /**
-   * Constant value for wizard load event.
-   */
-  const LOAD_VALUES = 'wizard.load';
-
-  /**
-   * Return an array of parameters required to construct this wizard.
-   *
-   * @return array
-   */
-  public static function getParameters();
-
-  /**
-   * Initialize wizard values.
-   *
-   * return mixed.
-   */
-  public function initValues();
-
-  /**
-   * The shared temp store factory collection name.
-   *
-   * @return string
-   */
-  public function getTempstoreId();
-
-  /**
-   * The active SharedTempStore for this wizard.
-   *
-   * @return \Drupal\user\SharedTempStore
-   */
-  public function getTempstore();
-
-  /**
-   * The SharedTempStore key for our current wizard values.
-   *
-   * @return null|string
-   */
-  public function getMachineName();
-
-  /**
-   * Retrieve the current active step of the wizard.
-   *
-   * This will return the first step of the wizard if no step has been set.
-   *
-   * @param mixed $cached_values
-   *   The values returned by $this->getTempstore()->get($this->getMachineName());
-   *
-   * @return string
-   */
-  public function getStep($cached_values);
-
-  /**
-   * Retrieve a list of FormInterface classes by their step key in the wizard.
-   *
-   * @param mixed $cached_values
-   *   The values returned by $this->getTempstore()->get($this->getMachineName());   *
-   *
-   * @return array
-   *   An associative array keyed on the step name with an array value with the
-   *   following keys:
-   *   - title (string): Human-readable title of the step.
-   *   - form (string): Fully-qualified class name of the form for this step.
-   *   - values (array): Optional array of cached values to override when on
-   *     this step.
-   *   - validate (array): Optional array of callables to be called when this
-   *     step is validated.
-   *   - submit (array): Optional array of callables to be called when this
-   *     step is submitted.
-   */
-  public function getOperations($cached_values);
-
-  /**
-   * Retrieve the current Operation.
-   *
-   * @param mixed $cached_values
-   *   The values returned by $this->getTempstore()->get($this->getMachineName());
-   *
-   * @return string
-   *   The class name to instantiate.
-   */
-  public function getOperation($cached_values);
-
-  /**
-   * The name of the route to which forward or backwards steps redirect.
-   *
-   * @return string
-   */
-  public function getRouteName();
-
-  /**
-   * The Route parameters for a 'next' step.
-   *
-   * If your route requires more than machine_name and step keys, override and
-   * extend this method as needed.
-   *
-   * @param mixed $cached_values
-   *   The values returned by $this->getTempstore()->get($this->getMachineName());
-   *
-   * @return array
-   *   An array keyed by:
-   *     machine_name
-   *     step
-   */
-  public function getNextParameters($cached_values);
-
-  /**
-   * The Route parameters for a 'previous' step.
-   *
-   * If your route requires more than machine_name and step keys, override and
-   * extend this method as needed.
-   *
-   * @param mixed $cached_values
-   *   The values returned by $this->getTempstore()->get($this->getMachineName());
-   *
-   * @return array
-   *   An array keyed by:
-   *     machine_name
-   *     step
-   */
-  public function getPreviousParameters($cached_values);
-
-  /**
-   * Form validation handler that populates the cached values from tempstore.
-   *
-   * Temporary values are only available for a single page load so form
-   * submission will lose all the values. This was we reload and provide them
-   * to the validate and submit process.
-   *
-   * @param array $form
-   *   Drupal form array
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The initial form state before validation or submission of the steps.
-   */
-  public function populateCachedValues(array &$form, FormStateInterface $form_state);
-
-  /**
-   * Form submit handler to step backwards in the wizard.
-   *
-   * "Next" steps are handled by \Drupal\Core\Form\FormInterface::submitForm().
-   *
-   * @param array $form
-   *   Drupal form array
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current form state of the wizard. This will not contain values from
-   *   the current step since the previous button does not actually submit
-   *   those values.
-   */
-  public function previous(array &$form, FormStateInterface $form_state);
-
-  /**
-   * Form submit handler for finalizing the wizard values.
-   *
-   * If you need to generate an entity or save config or raw table data
-   * subsequent to your form wizard, this is the responsible method.
-   *
-   * @param array $form
-   *   Drupal form array
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The final form state of the wizard.
-   */
-  public function finish(array &$form, FormStateInterface $form_state);
-
-  public function ajaxSubmit(array $form, FormStateInterface $form_state);
-
-  public function ajaxPrevious(array $form, FormStateInterface $form_state);
-
-  public function ajaxFinish(array $form, FormStateInterface $form_state);
-
-}
diff --git a/modules/ctools/src/Wizard/WizardFactory.php b/modules/ctools/src/Wizard/WizardFactory.php
deleted file mode 100644
index 27522d0..0000000
--- a/modules/ctools/src/Wizard/WizardFactory.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-namespace Drupal\ctools\Wizard;
-
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Form\FormState;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-class WizardFactory implements WizardFactoryInterface {
-
-  /**
-   * The Form Builder.
-   *
-   * @var \Drupal\Core\Form\FormBuilderInterface
-   */
-  protected $builder;
-
-  /**
-   * The event dispatcher.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-   */
-  protected $dispatcher;
-
-  /**
-   * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
-   *   The form builder.
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
-   *   The event dispatcher.
-   */
-  public function __construct(FormBuilderInterface $form_builder, EventDispatcherInterface $event_dispatcher) {
-    $this->builder = $form_builder;
-    $this->dispatcher = $event_dispatcher;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWizardForm(FormWizardInterface $wizard, array $parameters = [], $ajax = FALSE) {
-    $form_state = $this->getFormState($wizard, $parameters, $ajax);
-    $form = $this->builder->buildForm($wizard, $form_state);
-
-    if ($ajax) {
-      $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
-      $status_messages = array('#type' => 'status_messages');
-      // @todo properly inject the renderer. Core should really be doing this work.
-      if ($messages = \Drupal::service('renderer')->renderRoot($status_messages)) {
-        if (!empty($form['#prefix'])) {
-          // Form prefix is expected to be a string. Prepend the messages to
-          // that string.
-          $form['#prefix'] = '<div class="wizard-messages">' . $messages . '</div>' . $form['#prefix'];
-        }
-      }
-    }
-    return $form;
-  }
-
-  /**
-   * @param string $class
-   *   A class name implementing FormWizardInterface.
-   * @param array $parameters
-   *   The array of parameters specific to this wizard.
-   *
-   * @return \Drupal\ctools\Wizard\FormWizardInterface
-   */
-  public function createWizard($class, array $parameters) {
-    $arguments = [];
-    $reflection = new \ReflectionClass($class);
-    $constructor = $reflection->getMethod('__construct');
-    foreach ($constructor->getParameters() as $parameter) {
-      if (array_key_exists($parameter->name, $parameters)) {
-        $arguments[] = $parameters[$parameter->name];
-      }
-      elseif ($parameter->isDefaultValueAvailable()) {
-        $arguments[] = $parameter->getDefaultValue();
-      }
-    }
-    /** @var $wizard \Drupal\ctools\Wizard\FormWizardInterface */
-    $wizard = $reflection->newInstanceArgs($arguments);
-    return $wizard;
-  }
-
-  /**
-   * Get the wizard form state.
-   *
-   * @param \Drupal\ctools\Wizard\FormWizardInterface $wizard
-   *   The form wizard.
-   * @param array $parameters
-   *   The array of parameters specific to this wizard.
-   * @param bool $ajax
-   *
-   * @return \Drupal\Core\Form\FormState
-   */
-  public function getFormState(FormWizardInterface $wizard, array $parameters, $ajax = FALSE) {
-    $form_state = new FormState();
-    // If a wizard has no values, initialize them.
-    if (!$wizard->getMachineName() || !$wizard->getTempstore()->get($wizard->getMachineName())) {
-      $cached_values = $wizard->initValues();
-      // Save the cached values that were initialized.
-      if ($wizard->getMachineName()) {
-        $wizard->getTempstore()->set($wizard->getMachineName(), $cached_values);
-      }
-    }
-    else {
-      $cached_values = $wizard->getTempstore()->get($wizard->getMachineName());
-    }
-    $form_state->setTemporaryValue('wizard', $cached_values);
-    $form_state->set('ajax', $ajax);
-
-    $parameters['form'] = [];
-    $parameters['form_state'] = $form_state;
-    $method = new \ReflectionMethod($wizard, 'buildForm');
-    $arguments = [];
-    foreach ($method->getParameters() as $parameter) {
-      if (array_key_exists($parameter->name, $parameters)) {
-        $arguments[] = $parameters[$parameter->name];
-      }
-      elseif ($parameter->isDefaultValueAvailable()) {
-        $arguments[] = $parameter->getDefaultValue();
-      }
-    }
-    unset($parameters['form'], $parameters['form_state']);
-    // Remove $form and $form_state from the arguments, and re-index them.
-    unset($arguments[0], $arguments[1]);
-    $form_state->addBuildInfo('args', array_values($arguments));
-    return $form_state;
-  }
-
-}
diff --git a/modules/ctools/src/Wizard/WizardFactoryInterface.php b/modules/ctools/src/Wizard/WizardFactoryInterface.php
deleted file mode 100644
index 34b00a8..0000000
--- a/modules/ctools/src/Wizard/WizardFactoryInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-namespace Drupal\ctools\Wizard;
-
-interface WizardFactoryInterface {
-  /**
-   * Get the wizard form.
-   *
-   * @param FormWizardInterface $wizard
-   *   The form wizard
-   * @param array $parameters
-   *   The array of default parameters specific to this wizard.
-   * @param bool $ajax
-   *   Whether or not this wizard is displayed via ajax modals.
-   *
-   * @return array
-   */
-  public function getWizardForm(FormWizardInterface $wizard, array $parameters = [], $ajax = FALSE);
-
-  /**
-   * @param string $class
-   *   A class name implementing FormWizardInterface.
-   * @param array $parameters
-   *   The array of parameters specific to this wizard.
-   *
-   * @return \Drupal\ctools\Wizard\FormWizardInterface
-   */
-  public function createWizard($class, array $parameters);
-
-  /**
-   * Get the wizard form state.
-   *
-   * @param \Drupal\ctools\Wizard\FormWizardInterface $wizard
-   *   The form wizard.
-   * @param array $parameters
-   *   The array of parameters specific to this wizard.
-   * @param bool $ajax
-   *
-   * @return \Drupal\Core\Form\FormState
-   */
-  public function getFormState(FormWizardInterface $wizard, array $parameters, $ajax = FALSE);
-
-}
diff --git a/modules/ctools/templates/ctools-wizard-trail-links.html.twig b/modules/ctools/templates/ctools-wizard-trail-links.html.twig
deleted file mode 100644
index bd845c3..0000000
--- a/modules/ctools/templates/ctools-wizard-trail-links.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% if trail %}
-<div class="wizard-trail">
-    {% for key, value in trail %}
-        {% if key is same as(step) %}
-            <strong>{{ link(value.title, value.url) }}</strong>
-        {% else %}
-            {{ link(value.title, value.url) }}
-        {% endif %}
-        {% if value is not same as(trail|last) %}
-            {{ divider }}
-        {% endif %}
-    {% endfor %}
-</div>
-{% endif %}
diff --git a/modules/ctools/templates/ctools-wizard-trail.html.twig b/modules/ctools/templates/ctools-wizard-trail.html.twig
deleted file mode 100644
index 3083307..0000000
--- a/modules/ctools/templates/ctools-wizard-trail.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% if trail %}
-<div class="wizard-trail">
-    {% for key, value in trail %}
-        {% if key is same as(step) %}
-            <strong>{{ value }}</strong>
-        {% else %}
-            {{ value }}
-        {% endif %}
-        {% if value is not same as(trail|last) %}
-            {{ divider }}
-        {% endif %}
-    {% endfor %}
-</div>
-{% endif %}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/config/schema/ctools_wizard_test_config_entity.schema.yml b/modules/ctools/tests/modules/ctools_wizard_test/config/schema/ctools_wizard_test_config_entity.schema.yml
deleted file mode 100644
index f8e8c14..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/config/schema/ctools_wizard_test_config_entity.schema.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-ctools_wizard_test.ctools_wizard_test_config_entity.*:
-  type: config_entity
-  label: 'Example config entity'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-    uuid:
-      type: string
-    one:
-      type: string
-      label: 'The first piece of information'
-    two:
-      type: string
-      label: 'The second piece of information'
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.info.yml b/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.info.yml
deleted file mode 100644
index 76302ba..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Chaos Wizard Test
-type: module
-description: 'Provides testing for ctools wizard'
-package: Testing
-# version: 3.x
-# core: 8.x
-
-# Information added by Drupal.org packaging script on 2017-04-28
-version: '8.x-3.0'
-core: '8.x'
-project: 'ctools'
-datestamp: 1493401747
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.links.action.yml b/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.links.action.yml
deleted file mode 100644
index 2b2c7e7..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.links.action.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-entity.ctools_wizard_test_config_entity.add_form:
-  route_name: 'entity.ctools_wizard_test_config_entity.add_form'
-  title: 'Add Example config entity'
-  appears_on:
-    - entity.ctools_wizard_test_config_entity.collection
-
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.links.menu.yml b/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.links.menu.yml
deleted file mode 100644
index 2d7bd04..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.links.menu.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Example config entity menu items definition
-entity.ctools_wizard_test_config_entity.collection:
-  title: 'Example config entity'
-  route_name: entity.ctools_wizard_test_config_entity.collection
-  description: 'List Example config entity'
-  parent: system.admin_structure
-
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.routing.yml b/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.routing.yml
deleted file mode 100644
index 141afb3..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/ctools_wizard_test.routing.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-ctools.wizard.test:
-  path: '/ctools/wizard'
-  defaults:
-    _wizard: '\Drupal\ctools_wizard_test\Wizard\WizardTest'
-    _title: 'Wizard Test'
-    tempstore_id: 'ctools.wizard.test'
-    machine_name: 'WizardTest'
-  requirements:
-    _access: 'TRUE'
-ctools.wizard.test.step:
-  path: '/ctools/wizard/{step}'
-  defaults:
-    _wizard: '\Drupal\ctools_wizard_test\Wizard\WizardTest'
-    _title: 'Wizard Test'
-    tempstore_id: 'ctools.wizard.test'
-    machine_name: 'WizardTest'
-  requirements:
-    _access: 'TRUE'
-
-# ExampleConfigEntity routing definition
-entity.ctools_wizard_test_config_entity.collection:
-  path: '/admin/structure/ctools_wizard_test_config_entity'
-  defaults:
-    _entity_list: 'ctools_wizard_test_config_entity'
-    _title: 'Example config entity'
-  requirements:
-    _permission: 'administer site configuration'
-  options:
-    _admin_route: TRUE
-
-entity.ctools_wizard_test_config_entity.add_form:
-  path: '/admin/structure/ctools_wizard_test_config_entity/add'
-  defaults:
-    _entity_wizard: 'ctools_wizard_test_config_entity.add'
-    _title: 'Add Example config entity'
-    tempstore_id: 'ctools_wizard_test.config_entity'
-  requirements:
-    _permission: 'administer site configuration'
-  options:
-    _admin_route: TRUE
-
-entity.ctools_wizard_test_config_entity.add_step_form:
-  path: '/admin/structure/ctools_wizard_test_config_entity/add/{machine_name}/{step}'
-  defaults:
-    _entity_wizard: 'ctools_wizard_test_config_entity.add'
-    _title: 'Add Example config entity'
-    tempstore_id: 'ctools_wizard_test.config_entity'
-  requirements:
-    _permission: 'administer site configuration'
-  options:
-    _admin_route: TRUE
-
-entity.ctools_wizard_test_config_entity.edit_form:
-  path: '/admin/structure/ctools_wizard_test_config_entity/{machine_name}/{step}'
-  defaults:
-    _entity_wizard: 'ctools_wizard_test_config_entity.edit'
-    _title: 'Edit Example config entity'
-    tempstore_id: 'ctools_wizard_test.config_entity'
-  requirements:
-    _permission: 'administer site configuration'
-  options:
-    _admin_route: TRUE
-
-entity.ctools_wizard_test_config_entity.external_form:
-  path: '/admin/structure/ctools_wizard_test_config_entity/{machine_name}/external'
-  defaults:
-    _title: 'Edit Example config entity'
-    _form: '\Drupal\ctools_wizard_test\Form\ExampleConfigEntityExternalForm'
-  requirements:
-    _permission: 'administer site configuration'
-  options:
-    _admin_route: TRUE
-
-entity.ctools_wizard_test_config_entity.delete_form:
-  path: '/admin/structure/ctools_wizard_test_config_entity/{ctools_wizard_test_config_entity}/delete'
-  defaults:
-    _entity_form: 'ctools_wizard_test_config_entity.delete'
-    _title: 'Delete Example config entity'
-  requirements:
-    _permission: 'administer site configuration'
-  options:
-    _admin_route: TRUE
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Entity/ExampleConfigEntity.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Entity/ExampleConfigEntity.php
deleted file mode 100644
index b8dd1f5..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Entity/ExampleConfigEntity.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\ctools_wizard_test\ExampleConfigEntityInterface;
-
-/**
- * Defines the Example config entity entity.
- *
- * @ConfigEntityType(
- *   id = "ctools_wizard_test_config_entity",
- *   label = @Translation("Example config entity"),
- *   handlers = {
- *     "list_builder" = "Drupal\ctools_wizard_test\ExampleConfigEntityListBuilder",
- *     "form" = {
- *       "delete" = "Drupal\ctools_wizard_test\Form\ExampleConfigEntityDeleteForm"
- *     },
- *     "wizard" = {
- *       "add" = "Drupal\ctools_wizard_test\Wizard\EntityAddWizardTest",
- *       "edit" = "Drupal\ctools_wizard_test\Wizard\EntityEditWizardTest"
- *     }
- *   },
- *   config_prefix = "ctools_wizard_test_config_entity",
- *   admin_permission = "administer site configuration",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *     "uuid" = "uuid"
- *   },
- *   links = {
- *     "canonical" = "/admin/structure/ctools_wizard_test_config_entity/{ctools_wizard_test_config_entity}",
- *     "edit-form" = "/admin/structure/ctools_wizard_test_config_entity/{machine_name}/{step}",
- *     "delete-form" = "/admin/structure/ctools_wizard_test_config_entity/{ctools_wizard_test_config_entity}/delete",
- *     "collection" = "/admin/structure/ctools_wizard_test_config_entity"
- *   }
- * )
- */
-class ExampleConfigEntity extends ConfigEntityBase implements ExampleConfigEntityInterface {
-
-  /**
-   * The Example config entity ID.
-   *
-   * @var string
-   */
-  protected $id;
-
-  /**
-   * The Example config entity label.
-   *
-   * @var string
-   */
-  protected $label;
-
-  /**
-   * The first piece of information.
-   *
-   * @var string
-   */
-  protected $one;
-
-  /**
-   * The second piece of information.
-   *
-   * @var string
-   */
-  protected $two;
-
-  /**
-   * @inheritDoc
-   */
-  public function getOne() {
-    return $this->one;
-  }
-
-  /**
-   * @inheritDoc
-   */
-  public function getTwo() {
-    return $this->two;
-  }
-
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/ExampleConfigEntityInterface.php b/modules/ctools/tests/modules/ctools_wizard_test/src/ExampleConfigEntityInterface.php
deleted file mode 100644
index a4519e4..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/ExampleConfigEntityInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test;
-
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-
-/**
- * Provides an interface for defining Example config entity entities.
- */
-interface ExampleConfigEntityInterface extends ConfigEntityInterface {
-
-  /**
-   * Get first piece of information.
-   *
-   * @return string
-   */
-  public function getOne();
-
-  /**
-   * Get second piece of information;
-   *
-   * @return string
-   */
-  public function getTwo();
-
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/ExampleConfigEntityListBuilder.php b/modules/ctools/tests/modules/ctools_wizard_test/src/ExampleConfigEntityListBuilder.php
deleted file mode 100644
index 47d3ecf..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/ExampleConfigEntityListBuilder.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test;
-
-use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
-use Drupal\Core\Entity\EntityInterface;
-
-/**
- * Provides a listing of Example config entity entities.
- */
-class ExampleConfigEntityListBuilder extends ConfigEntityListBuilder {
-  /**
-   * {@inheritdoc}
-   */
-  public function buildHeader() {
-    $header['label'] = $this->t('Example config entity');
-    $header['id'] = $this->t('Machine name');
-    return $header + parent::buildHeader();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    $row['label'] = $this->getLabel($entity);
-    $row['id'] = $entity->id();
-    // You probably want a few more properties here...
-    return $row + parent::buildRow($entity);
-  }
-
-  /**
-   * @inheritDoc
-   */
-  public function getOperations(EntityInterface $entity) {
-    $operations = parent::getOperations($entity);
-
-    if (!empty($operations['edit'])) {
-      /** @var \Drupal\Core\Url $edit */
-      $edit = $operations['edit']['url'];
-      $edit->setRouteParameters([
-        'machine_name' => $entity->id(),
-        'step' => 'general',
-      ]);
-    }
-
-    return $operations;
-  }
-
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityDeleteForm.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityDeleteForm.php
deleted file mode 100644
index 487751d..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityDeleteForm.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Form;
-
-use Drupal\Core\Entity\EntityConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Builds the form to delete Example config entity entities.
- */
-class ExampleConfigEntityDeleteForm extends EntityConfirmFormBase {
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return $this->t('Are you sure you want to delete %name?', array('%name' => $this->entity->label()));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('entity.ctools_wizard_test_config_entity.collection');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->entity->delete();
-
-    drupal_set_message(
-      $this->t('content @type: deleted @label.',
-        [
-          '@type' => $this->entity->bundle(),
-          '@label' => $this->entity->label()
-        ]
-        )
-    );
-
-    $form_state->setRedirectUrl($this->getCancelUrl());
-  }
-
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityExistingForm.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityExistingForm.php
deleted file mode 100644
index 0ffca3d..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityExistingForm.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Form;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Simple wizard step form.
- */
-class ExampleConfigEntityExistingForm extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_wizard_test_config_entity_existing_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['existing'] = array(
-      '#markup' => '<p>This step only shows if the entity is already existing!</p>',
-    );
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Do nothing!
-  }
-
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityExternalForm.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityExternalForm.php
deleted file mode 100644
index 2ba871c..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityExternalForm.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Form;
-
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\user\SharedTempStoreFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-class ExampleConfigEntityExternalForm extends FormBase {
-
-  /**
-   * Tempstore factory.
-   *
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempstore;
-
-  /**
-   * Constructs a new ExampleConfigEntityExternalForm.
-   *
-   * @param \Drupal\ctools_wizard_test\Form\SharedTempStoreFactory $tempstore
-   */
-  function __construct(SharedTempStoreFactory $tempstore) {
-    $this->tempstore = $tempstore;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('user.shared_tempstore'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_wizard_test_example_config_entity_external_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $machine_name = '') {
-    $cached_values = $this->tempstore->get('ctools_wizard_test.config_entity')->get($machine_name);
-    /** @var $page \Drupal\ctools_wizard_test\Entity\ExampleConfigEntity */
-    $config_entity = $cached_values['ctools_wizard_test_config_entity'];
-
-    $form['blah'] = [
-      '#markup' => 'Value from one: ' . $config_entity->getOne(),
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Don't do anything.
-  }
-
-}
-
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityGeneralForm.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityGeneralForm.php
deleted file mode 100644
index 6120342..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityGeneralForm.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Form;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Class ExampleConfigEntityForm.
- */
-class ExampleConfigEntityGeneralForm extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_wizard_test_config_entity_general_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    /** @var $page \Drupal\ctools_wizard_test\Entity\ExampleConfigEntity */
-    $config_entity = $cached_values['ctools_wizard_test_config_entity'];
-
-    // The label and id will be added by the EntityFormWizardBase.
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    /** @var $page \Drupal\ctools_wizard_test\Entity\ExampleConfigEntity */
-    $config_entity = $cached_values['ctools_wizard_test_config_entity'];
-
-    $config_entity->set('id', $form_state->getValue('id'));
-    $config_entity->set('label', $form_state->getValue('label'));
-  }
-
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityOneForm.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityOneForm.php
deleted file mode 100644
index 6d1cf6d..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityOneForm.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Form;
-
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Simple wizard step form.
- */
-class ExampleConfigEntityOneForm extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_wizard_test_config_entity_one_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    /** @var $page \Drupal\ctools_wizard_test\Entity\ExampleConfigEntity */
-    $config_entity = $cached_values['ctools_wizard_test_config_entity'];
-
-    $form['one'] = [
-      '#title' => $this->t('One'),
-      '#type' => 'textfield',
-      '#default_value' => $config_entity->getOne() ?: '',
-    ];
-
-    $form['external'] = [
-      '#type' => 'link',
-      '#title' => $this->t('Show on dialog'),
-      '#url' => new Url('entity.ctools_wizard_test_config_entity.external_form', [
-        'machine_name' => $config_entity->id(),
-      ]),
-      '#attributes' => [
-        'class' => 'use-ajax',
-        'data-dialog-type' => 'modal',
-      ],
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    /** @var $page \Drupal\ctools_wizard_test\Entity\ExampleConfigEntity */
-    $config_entity = $cached_values['ctools_wizard_test_config_entity'];
-
-    $config_entity->set('one', $form_state->getValue('one'));
-  }
-
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityTwoForm.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityTwoForm.php
deleted file mode 100644
index 6ea2f40..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/ExampleConfigEntityTwoForm.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Form;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Simple wizard step form.
- */
-class ExampleConfigEntityTwoForm extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ctools_wizard_test_config_entity_two_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    /** @var $page \Drupal\ctools_wizard_test\Entity\ExampleConfigEntity */
-    $config_entity = $cached_values['ctools_wizard_test_config_entity'];
-
-    $form['two'] = array(
-      '#title' => $this->t('Two'),
-      '#type' => 'textfield',
-      '#default_value' => $config_entity->getTwo() ?: '',
-    );
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    /** @var $page \Drupal\ctools_wizard_test\Entity\ExampleConfigEntity */
-    $config_entity = $cached_values['ctools_wizard_test_config_entity'];
-
-    $config_entity->set('two', $form_state->getValue('two'));
-  }
-
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/OneForm.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Form/OneForm.php
deleted file mode 100644
index 0375056..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/OneForm.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Form;
-
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Simple wizard step form.
- */
-class OneForm extends FormBase {
-
-  /**
-   * Returns a unique string identifying the form.
-   *
-   * @return string
-   *   The unique string identifying the form.
-   */
-  public function getFormId() {
-    return 'ctools_wizard_test_one_form';
-  }
-
-  /**
-   * Form constructor.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return array
-   *   The form structure.
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    $form['one'] = [
-      '#title' => $this->t('One'),
-      '#type' => 'textfield',
-      '#default_value' => !empty($cached_values['one']) ? $cached_values['one'] : '',
-    ];
-    $form['dynamic'] = [
-      '#title' => $this->t('Dynamic value'),
-      '#type' => 'item',
-      '#markup' => !empty($cached_values['dynamic']) ? $cached_values['dynamic'] : '',
-    ];
-    return $form;
-  }
-
-  /**
-   * Form submission handler.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $keys = array(
-      'one',
-    );
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    foreach ($keys as $key) {
-      $cached_values[$key] = $form_state->getValue($key);
-    }
-    $form_state->setTemporaryValue('wizard', $cached_values);
-
-    drupal_set_message($this->t('Dynamic value submitted: @value', ['@value' => $cached_values['dynamic']]));;
-  }
-
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/TwoForm.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Form/TwoForm.php
deleted file mode 100644
index 01ae10a..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Form/TwoForm.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Form;
-
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Simple wizard step form.
- */
-class TwoForm extends FormBase {
-
-  /**
-   * Returns a unique string identifying the form.
-   *
-   * @return string
-   *   The unique string identifying the form.
-   */
-  public function getFormId() {
-    return 'ctools_wizard_test_two_form';
-  }
-
-  /**
-   * Form constructor.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return array
-   *   The form structure.
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    $form['two'] = [
-      '#title' => $this->t('Two'),
-      '#type' => 'textfield',
-      '#default_value' => !empty($cached_values['two']) ? $cached_values['two'] : '',
-    ];
-    $form['dynamic'] = [
-      '#title' => $this->t('Dynamic value'),
-      '#type' => 'item',
-      '#markup' => !empty($cached_values['dynamic']) ? $cached_values['dynamic'] : '',
-    ];
-    return $form;
-  }
-
-  /**
-   * Form submission handler.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $keys = array(
-      'two',
-    );
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    foreach ($keys as $key) {
-      $cached_values[$key] = $form_state->getValue($key);
-    }
-    $form_state->setTemporaryValue('wizard', $cached_values);
-  }
-
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/EntityAddWizardTest.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/EntityAddWizardTest.php
deleted file mode 100644
index 77ab5d5..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/EntityAddWizardTest.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Wizard;
-
-
-class EntityAddWizardTest extends EntityEditWizardTest {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRouteName() {
-    return 'entity.ctools_wizard_test_config_entity.add_step_form';
-  }
-
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/EntityEditWizardTest.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/EntityEditWizardTest.php
deleted file mode 100644
index b272dfc..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/EntityEditWizardTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Wizard;
-
-use Drupal\ctools\Wizard\EntityFormWizardBase;
-
-class EntityEditWizardTest extends EntityFormWizardBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWizardLabel() {
-    return $this->t('Example entity');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMachineLabel() {
-    return $this->t('Label');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntityType() {
-    return 'ctools_wizard_test_config_entity';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function exists() {
-    return '\Drupal\ctools_wizard_test\Entity\ExampleConfigEntity::load';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOperations($cached_values) {
-    /** @var $page \Drupal\ctools_wizard_test\Entity\ExampleConfigEntity */
-    $config_entity = $cached_values['ctools_wizard_test_config_entity'];
-
-    $steps = [
-      'general' => [
-        'form' => 'Drupal\ctools_wizard_test\Form\ExampleConfigEntityGeneralForm',
-        'title' => $this->t('General'),
-      ],
-      'one' => [
-        'form' => 'Drupal\ctools_wizard_test\Form\ExampleConfigEntityOneForm',
-        'title' => $this->t('Form One'),
-      ],
-      'two' => [
-        'form' => 'Drupal\ctools_wizard_test\Form\ExampleConfigEntityTwoForm',
-        'title' => $this->t('Form Two'),
-      ],
-    ];
-
-    // To test that we can get the config entity and add/remove steps
-    // based on it's values, we'll add a special step only when the entity
-    // is pre-existing.
-    if (!empty($config_entity) && !$config_entity->isNew()) {
-      $steps['existing'] = [
-        'form' => 'Drupal\ctools_wizard_test\Form\ExampleConfigEntityExistingForm',
-        'title' => $this->t('Existing entity'),
-      ];
-    }
-
-    return $steps;
-  }
-}
diff --git a/modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/WizardTest.php b/modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/WizardTest.php
deleted file mode 100644
index 539df33..0000000
--- a/modules/ctools/tests/modules/ctools_wizard_test/src/Wizard/WizardTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Drupal\ctools_wizard_test\Wizard;
-
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\ctools\Wizard\FormWizardBase;
-
-class WizardTest extends FormWizardBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWizardLabel() {
-    return $this->t('Wizard Information');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMachineLabel() {
-    return $this->t('Wizard Test Name');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOperations($cached_values) {
-    return array(
-      'one' => [
-        'form' => 'Drupal\ctools_wizard_test\Form\OneForm',
-        'title' => $this->t('Form One'),
-        'values' => ['dynamic' => 'Xylophone'],
-        'validate' => ['::stepOneValidate'],
-        'submit' => ['::stepOneSubmit'],
-      ],
-      'two' => [
-        'form' => 'Drupal\ctools_wizard_test\Form\TwoForm',
-        'title' => $this->t('Form Two'),
-        'values' => ['dynamic' => 'Zebra'],
-      ],
-    );
-  }
-
-  /**
-   * Validation callback for the first step.
-   */
-  public function stepOneValidate($form, FormStateInterface $form_state) {
-    if ($form_state->getValue('one') == 'wrong') {
-      $form_state->setErrorByName('one', $this->t('Cannot set the value to "wrong".'));
-    }
-  }
-
-  /**
-   * Submission callback for the first step.
-   */
-  public function stepOneSubmit($form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    if ($form_state->getValue('one') == 'magic') {
-      $cached_values['one'] = 'Abraham';
-    }
-    $form_state->setTemporaryValue('wizard', $cached_values);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRouteName() {
-    return 'ctools.wizard.test.step';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function finish(array &$form, FormStateInterface $form_state) {
-    $cached_values = $form_state->getTemporaryValue('wizard');
-    drupal_set_message($this->t('Value One: @one', ['@one' => $cached_values['one']]));
-    drupal_set_message($this->t('Value Two: @two', ['@two' => $cached_values['two']]));
-    parent::finish($form, $form_state);
-  }
-
-}
diff --git a/modules/ctools/tests/src/Kernel/RelationshipManagerTest.php b/modules/ctools/tests/src/Kernel/RelationshipManagerTest.php
deleted file mode 100644
index 94ca6d9..0000000
--- a/modules/ctools/tests/src/Kernel/RelationshipManagerTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Kernel;
-
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-
-/**
- * @coversDefaultClass \Drupal\ctools\Plugin\RelationshipManagerInterface
- * @group CTools
- */
-class RelationshipManagerTest extends RelationshipsTestBase {
-
-  /**
-   * @covers ::getDefinitions
-   */
-  public function testRelationshipConstraints() {
-    $definitions = $this->relationshipManager->getDefinitions();
-    $expected = [
-      'Bundle' => [
-        0 => "page",
-        1 => "foo"
-      ]
-    ];
-    $this->assertSame($expected, $definitions['typed_data_relationship:entity:node:body']['context']['base']->getConstraints());
-
-    // Check that typed data primitive labels are formatted properly.
-    $this->assertSame('Body from Page and Foo', (string) $definitions['typed_data_relationship:entity:node:body']['label']);
-
-    // Check that entity relationship labels are formatted properly.
-    $this->assertSame('Authored by Entity from Content', (string) $definitions['typed_data_entity_relationship:entity:node:uid']['label']);
-
-    // Check that language relationship labels are formatted properly.
-    $this->assertSame('Language Language from Content', (string) $definitions['typed_data_language_relationship:entity:node:langcode']['label']);
-  }
-
-  /**
-   * @covers ::getDefinitionsForContexts
-   */
-  public function testRelationshipPluginAvailability() {
-    $context_definition = new ContextDefinition('entity:node');
-    $contexts = [
-      'node' => new Context($context_definition, $this->entities['node1']),
-    ];
-    $definitions = $this->relationshipManager->getDefinitionsForContexts($contexts);
-    //$this->assertTrue(isset($definitions['typed_data_relationship:entity:node:body']));
-
-    $context_definition = new ContextDefinition('entity:node');
-    $contexts = [
-      'node' => new Context($context_definition, $this->entities['node2']),
-    ];
-    $definitions = $this->relationshipManager->getDefinitionsForContexts($contexts);
-    $this->assertFalse(isset($definitions['typed_data_relationship:entity:node:body']));
-
-    $context_definition = new ContextDefinition('entity:node');
-    $contexts = [
-      'node' => new Context($context_definition, $this->entities['node3']),
-    ];
-    $definitions = $this->relationshipManager->getDefinitionsForContexts($contexts);
-    //$this->assertTrue(isset($definitions['typed_data_relationship:entity:node:body']));
-  }
-
-}
diff --git a/modules/ctools/tests/src/Kernel/RelationshipsTestBase.php b/modules/ctools/tests/src/Kernel/RelationshipsTestBase.php
deleted file mode 100644
index cd58379..0000000
--- a/modules/ctools/tests/src/Kernel/RelationshipsTestBase.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Kernel;
-
-
-use Drupal\ctools\Testing\EntityCreationTrait;
-use Drupal\KernelTests\KernelTestBase;
-
-abstract class RelationshipsTestBase extends KernelTestBase {
-  use EntityCreationTrait;
-
-  /**
-   * @var \Drupal\ctools\Plugin\RelationshipManagerInterface
-   */
-  protected $relationshipManager;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityInterface[]
-   */
-  protected $entities = [];
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'user',
-    'system',
-    'node',
-    'field',
-    'text',
-    'filter',
-    'ctools'
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', ['sequences', 'router']);
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node_type');
-    $this->installEntitySchema('node');
-    $this->installConfig('node');
-    $page = $this->createEntity('node_type', [
-      'type' => 'page',
-      'name' => 'Page'
-    ]);
-    node_add_body_field($page);
-    $article = $this->createEntity('node_type', [
-      'type' => 'article',
-      'name' => 'Article'
-    ]);
-    // Not adding the body field the articles so that we can perform a test.
-    $foo = $this->createEntity('node_type', [
-      'type' => 'foo',
-      'name' => 'Foo'
-    ]);
-    node_add_body_field($foo);
-    $this->relationshipManager = $this->container->get('plugin.manager.ctools.relationship');
-
-    $user = $this->createEntity('user', [
-      'name' => 'test_user',
-      'password' => 'password',
-      'mail' => 'mail@test.com',
-      'status' => 1,
-    ]);
-    $node1 = $this->createEntity('node', [
-      'title' => 'Node 1',
-      'type' => 'page',
-      'uid' => $user->id(),
-      'body' => 'This is a test',
-    ]);
-    $node2 = $this->createEntity('node', [
-      'title' => 'Node 2',
-      'type' => 'article',
-      'uid' => $user->id()
-    ]);
-    $node3 = $this->createEntity('node', [
-      'title' => 'Node 3',
-      'type' => 'foo',
-      'uid' => $user->id()
-    ]);
-
-    $this->entities = [
-      'user' => $user,
-      'node1' => $node1,
-      'node2' => $node2,
-      'node3' => $node3,
-    ];
-  }
-
-}
diff --git a/modules/ctools/tests/src/Kernel/SerializableTempstoreTest.php b/modules/ctools/tests/src/Kernel/SerializableTempstoreTest.php
deleted file mode 100644
index 16e0704..0000000
--- a/modules/ctools/tests/src/Kernel/SerializableTempstoreTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Kernel;
-
-use Drupal\ctools\SerializableTempstore;
-use Drupal\KernelTests\KernelTestBase;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Tests the serializable tempstore service.
- *
- * @group ctools
- */
-class SerializableTempstoreTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['ctools', 'system', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', ['key_value_expire']);
-  }
-
-  /**
-   * Tests serializing a serializable temp store object.
-   */
-  public function testSerializableTempStore() {
-    $store = $this->container
-      ->get('ctools.serializable.tempstore.factory')
-      ->get('foobar');
-
-    // Add an unserializable request to the request stack. If the tempstore
-    // didn't use DependencySerializationTrait, the exception would be thrown
-    // when we try to serialize the tempstore.
-    $request = $this->prophesize(Request::class);
-    $request->willImplement('\Serializable');
-    $request->serialize()->willThrow(new \LogicException('Not cool, bruh!'));
-    $this->container->get('request_stack')->push($request->reveal());
-
-    $this->assertInstanceOf(SerializableTempstore::class, $store);
-    /** @var SerializableTempstore $store */
-
-    $store = serialize($store);
-    $this->assertInternalType('string', $store);
-    $this->assertNotEmpty($store, 'The tempstore was serialized.');
-
-    $store = unserialize($store);
-    $this->assertInstanceOf(SerializableTempstore::class, $store, 'The tempstore was unserialized.');
-
-    $request_stack = $this->getObjectAttribute($store, 'requestStack');
-    $this->assertSame(
-      $this->container->get('request_stack'),
-      $request_stack,
-      'The request stack was pulled from the container during unserialization.'
-    );
-    $this->assertSame($request->reveal(), $request_stack->pop());
-  }
-
-}
diff --git a/modules/ctools/tests/src/Kernel/TypedDataEntityRelationshipPluginTest.php b/modules/ctools/tests/src/Kernel/TypedDataEntityRelationshipPluginTest.php
deleted file mode 100644
index 042eb7b..0000000
--- a/modules/ctools/tests/src/Kernel/TypedDataEntityRelationshipPluginTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Kernel;
-
-use Drupal\node\Entity\NodeType;
-use Drupal\user\Entity\User;
-
-/**
- * @coversDefaultClass \Drupal\ctools\Plugin\Relationship\TypedDataEntityRelationship
- * @group CTools
- */
-class TypedDataEntityRelationshipPluginTest extends RelationshipsTestBase {
-
-    /**
-   * @covers ::getName
-   */
-  public function testRelationshipName() {
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $nid_plugin */
-    $type_plugin = $this->relationshipManager->createInstance('typed_data_entity_relationship:entity:node:type');
-    $this->assertSame('type', $type_plugin->getName());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $uuid_plugin */
-    $uid_plugin = $this->relationshipManager->createInstance('typed_data_entity_relationship:entity:node:uid');
-    $this->assertSame('uid', $uid_plugin->getName());
-  }
-
-  /**
-   * @covers ::getRelationship
-   */
-  public function testRelationship() {
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $type_plugin */
-    $type_plugin = $this->relationshipManager->createInstance('typed_data_entity_relationship:entity:node:type');
-    $type_plugin->setContextValue('base', $this->entities['node1']);
-    $relationship = $type_plugin->getRelationship();
-    $this->assertTrue($relationship->getContextValue() instanceof NodeType);
-    $this->assertSame('entity:node_type', $relationship->getContextDefinition()->getDataType());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $uid_plugin */
-    $uid_plugin = $this->relationshipManager->createInstance('typed_data_entity_relationship:entity:node:uid');
-    $uid_plugin->setContextValue('base', $this->entities['node3']);
-    $relationship = $uid_plugin->getRelationship();
-    $this->assertTrue($relationship->getContextValue() instanceof User);
-    $this->assertSame('entity:user', $relationship->getContextDefinition()->getDataType());
-  }
-
-}
diff --git a/modules/ctools/tests/src/Kernel/TypedDataLanguageRelationshipPluginTest.php b/modules/ctools/tests/src/Kernel/TypedDataLanguageRelationshipPluginTest.php
deleted file mode 100644
index 3e94531..0000000
--- a/modules/ctools/tests/src/Kernel/TypedDataLanguageRelationshipPluginTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Kernel;
-
-use Drupal\Core\Language\LanguageInterface;
-
-/**
- * @coversDefaultClass \Drupal\ctools\Plugin\Relationship\TypedDataEntityRelationship
- * @group CTools
- */
-class TypedDataLanguageRelationshipPluginTest extends RelationshipsTestBase {
-
-  /**
-   * @covers ::getName
-   */
-  public function testRelationshipName() {
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $langcode_plugin */
-    $langcode_plugin = $this->relationshipManager->createInstance('typed_data_language_relationship:entity:node:langcode');
-    $this->assertSame('langcode', $langcode_plugin->getName());
-  }
-
-  /**
-   * @covers ::getRelationship
-   *
-   * @todo expand to include a new language.
-   */
-  public function testRelationship() {
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $langcode_plugin */
-    $langcode_plugin = $this->relationshipManager->createInstance('typed_data_language_relationship:entity:node:langcode');
-    $langcode_plugin->setContextValue('base', $this->entities['node1']);
-    $relationship = $langcode_plugin->getRelationship();
-    $this->assertTrue($relationship->getContextValue() instanceof LanguageInterface);
-    $this->assertSame('en', $relationship->getContextValue()->getId());
-  }
-
-}
diff --git a/modules/ctools/tests/src/Kernel/TypedDataRelationshipPluginTest.php b/modules/ctools/tests/src/Kernel/TypedDataRelationshipPluginTest.php
deleted file mode 100644
index f9a07cf..0000000
--- a/modules/ctools/tests/src/Kernel/TypedDataRelationshipPluginTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Kernel;
-
-use Drupal\Core\Plugin\Context\ContextInterface;
-
-/**
- * @coversDefaultClass \Drupal\ctools\Plugin\Relationship\TypedDataRelationship
- * @group CTools
- */
-class TypedDataRelationshipPluginTest extends RelationshipsTestBase {
-
-
-
-  /**
-   * @covers ::getName
-   */
-  public function testRelationshipName() {
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $nid_plugin */
-    $nid_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:node:nid');
-    $this->assertSame('nid', $nid_plugin->getName());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $uuid_plugin */
-    $uuid_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:node:uuid');
-    $this->assertSame('uuid', $uuid_plugin->getName());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $title_plugin */
-    $title_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:node:title');
-    $this->assertSame('title', $title_plugin->getName());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $body_plugin */
-    $body_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:node:body');
-    $this->assertSame('body', $body_plugin->getName());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $uid_plugin */
-    $uid_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:node:uid');
-    $this->assertSame('uid', $uid_plugin->getName());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $mail_plugin */
-    $mail_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:user:mail');
-    $this->assertSame('mail', $mail_plugin->getName());
-  }
-
-  /**
-   * @covers ::getRelationship
-   */
-  public function testRelationship() {
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $nid_plugin */
-    $nid_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:node:nid');
-    $nid_plugin->setContextValue('base', $this->entities['node1']);
-    $relationship = $nid_plugin->getRelationship();
-    $this->assertTrue($relationship instanceof ContextInterface);
-    $this->assertTrue($relationship->getContextDefinition()->getDataType() == 'integer');
-    $this->assertTrue($relationship->hasContextValue());
-    $this->assertTrue($relationship->getContextValue() == $this->entities['node1']->id());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $uuid_plugin */
-    $uuid_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:node:uuid');
-    $uuid_plugin->setContextValue('base', $this->entities['node1']);
-    $relationship = $uuid_plugin->getRelationship();
-    $this->assertTrue($relationship instanceof ContextInterface);
-    $this->assertTrue($relationship->getContextDefinition()->getDataType() == 'string');
-    $this->assertTrue($relationship->hasContextValue());
-    $this->assertTrue($relationship->getContextValue() == $this->entities['node1']->uuid());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $title_plugin */
-    $title_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:node:title');
-    $title_plugin->setContextValue('base', $this->entities['node1']);
-    $relationship = $title_plugin->getRelationship();
-    $this->assertTrue($relationship instanceof ContextInterface);
-    $this->assertTrue($relationship->getContextDefinition()->getDataType() == 'string');
-    $this->assertTrue($relationship->hasContextValue());
-    $this->assertTrue($relationship->getContextValue() == $this->entities['node1']->label());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $body_plugin */
-    $body_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:node:body');
-    $body_plugin->setContextValue('base', $this->entities['node1']);
-    $relationship = $body_plugin->getRelationship();
-    $this->assertTrue($relationship instanceof ContextInterface);
-    $this->assertTrue($relationship->getContextDefinition()->getDataType() == 'string');
-    $this->assertTrue($relationship->hasContextValue());
-    $this->assertTrue($relationship->getContextValue() == $this->entities['node1']->get('body')->first()->get('value')->getValue());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $uid_plugin */
-    $uid_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:node:uid');
-    $uid_plugin->setContextValue('base', $this->entities['node3']);
-    $relationship = $uid_plugin->getRelationship();
-    $this->assertTrue($relationship instanceof ContextInterface);
-    $this->assertTrue($relationship->getContextDefinition()->getDataType() == 'integer');
-    $this->assertTrue($relationship->hasContextValue());
-    $this->assertTrue($relationship->getContextValue() == $this->entities['node3']->getOwnerId());
-
-    /** @var \Drupal\ctools\Plugin\RelationshipInterface $mail_plugin */
-    $mail_plugin = $this->relationshipManager->createInstance('typed_data_relationship:entity:user:mail');
-    $mail_plugin->setContextValue('base', $this->entities['user']);
-    $relationship = $mail_plugin->getRelationship();
-    $this->assertTrue($relationship instanceof ContextInterface);
-    $this->assertTrue($relationship->getContextDefinition()->getDataType() == 'email');
-    $this->assertTrue($relationship->hasContextValue());
-    $this->assertTrue($relationship->getContextValue() == $this->entities['user']->getEmail());
-  }
-
-}
diff --git a/modules/ctools/tests/src/Kernel/TypedDataResolverTest.php b/modules/ctools/tests/src/Kernel/TypedDataResolverTest.php
deleted file mode 100644
index c53c9c1..0000000
--- a/modules/ctools/tests/src/Kernel/TypedDataResolverTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Kernel;
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\user\Entity\User;
-
-/**
- * @coversDefaultClass \Drupal\ctools\TypedDataResolver
- *
- * @group CTools
- */
-class TypedDataResolverTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['user', 'system', 'entity_test', 'ctools'];
-
-  /**
-   * @var \Drupal\ctools\TypedDataResolver
-   */
-  protected $typedDataResolver;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', 'sequences');
-    $this->installEntitySchema('user');
-
-    $this->typedDataResolver = \Drupal::service('ctools.typed_data.resolver');
-  }
-
-  /**
-   * Tests context extraction from properties.
-   */
-  public function testGetContextFromProperty() {
-    // Create a user and test entity to extract context from.
-    $user = User::create(['uid' => 2, 'name' => 'username', 'mail' => 'mail@example.org']);
-    $user->enforceIsNew(TRUE);
-    $user->save();
-    $entity_test = EntityTest::create(['user_id' => $user->id(), 'name' => 'Test name']);
-
-    // Test the language property.
-    $property_context = $this->assertPropertyPath($entity_test, 'langcode:language', 'language');
-    $this->assertEquals('en', $property_context->getContextValue()->getId());
-
-    // Test the reference to the user.
-    $property_context = $this->assertPropertyPath($entity_test, 'user_id:entity', 'entity:user');
-    $this->assertEquals($user->id(), $property_context->getContextValue()->id());
-
-    // Test the reference to the name.
-    $property_context = $this->assertPropertyPath($entity_test, 'name:value', 'string');
-    $this->assertEquals('Test name', $property_context->getContextValue());
-
-    // Test explicitly specifying the delta.
-    $property_context = $this->assertPropertyPath($entity_test, 'name:0:value', 'string');
-    $this->assertEquals('Test name', $property_context->getContextValue());
-
-    // Test following the reference.
-    $property_context = $this->assertPropertyPath($entity_test, 'user_id:entity:mail:value', 'email');
-    $this->assertEquals('mail@example.org', $property_context->getContextValue());
-  }
-
-  /**
-   * Asserts that a context for the given property path can be derived.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity to test with.
-   * @param $property_path
-   *   The property path to look for.
-   * @param $expected_data_type
-   *   The expected data type.
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface
-   *   The context with a value.
-   */
-  protected function assertPropertyPath(ContentEntityInterface $entity, $property_path, $expected_data_type)  {
-    $typed_data_entity = $entity->getTypedData();
-    $context_definition = new ContextDefinition($typed_data_entity->getDataDefinition()->getDataType());
-    $context_with_value = new Context($context_definition, $typed_data_entity);
-    $context_without_value = new Context($context_definition);
-
-    // Test the context without value.
-    $property_context = $this->typedDataResolver->getContextFromProperty($property_path, $context_without_value);
-    $this->assertEquals($expected_data_type, $property_context->getContextDefinition()->getDataType());
-
-    // Test the context with value.
-    $property_context = $this->typedDataResolver->getContextFromProperty($property_path, $context_with_value);
-    $this->assertEquals($expected_data_type, $property_context->getContextDefinition()->getDataType());
-
-    // Return the context with value so it can be asserted.
-    return $property_context;
-  }
-
-}
diff --git a/modules/ctools/tests/src/Unit/BlockDisplayVariantTest.php b/modules/ctools/tests/src/Unit/BlockDisplayVariantTest.php
deleted file mode 100644
index ed04f3d..0000000
--- a/modules/ctools/tests/src/Unit/BlockDisplayVariantTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Unit;
-
-use Drupal\Component\Uuid\UuidInterface;
-use Drupal\Core\Block\BlockManager;
-use Drupal\Core\Condition\ConditionManager;
-use Drupal\Core\Plugin\Context\ContextHandlerInterface;
-use Drupal\Core\Form\FormState;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Utility\Token;
-use Drupal\ctools\Plugin\DisplayVariant\BlockDisplayVariant;
-use Drupal\Tests\UnitTestCase;
-
-/**
- * Tests the block display variant plugin.
- *
- * @coversDefaultClass \Drupal\ctools\Plugin\DisplayVariant\BlockDisplayVariant
- *
- * @group CTools
- */
-class BlockDisplayVariantTest extends UnitTestCase {
-
-  /**
-   * Tests the submitConfigurationForm() method.
-   *
-   * @covers ::submitConfigurationForm
-   *
-   * @dataProvider providerTestSubmitConfigurationForm
-   */
-  public function testSubmitConfigurationForm($values) {
-    $account = $this->prophesize(AccountInterface::class);
-    $context_handler = $this->prophesize(ContextHandlerInterface::class);
-    $uuid_generator = $this->prophesize(UuidInterface::class);
-    $token = $this->prophesize(Token::class);
-    $block_manager = $this->prophesize(BlockManager::class);
-    $condition_manager = $this->prophesize(ConditionManager::class);
-
-    $display_variant = new TestBlockDisplayVariant([], '', [], $context_handler->reveal(), $account->reveal(), $uuid_generator->reveal(), $token->reveal(), $block_manager->reveal(), $condition_manager->reveal());
-
-    $form = [];
-    $form_state = (new FormState())->setValues($values);
-    $display_variant->submitConfigurationForm($form, $form_state);
-    $this->assertSame($values['label'], $display_variant->label());
-  }
-
-  /**
-   * Provides data for testSubmitConfigurationForm().
-   */
-  public function providerTestSubmitConfigurationForm() {
-    $data = [];
-    $data[] = [
-      [
-        'label' => 'test_label1',
-      ],
-    ];
-    $data[] = [
-      [
-        'label' => 'test_label2',
-        'blocks' => ['foo1' => []],
-      ],
-    ];
-    $data[] = [
-      [
-        'label' => 'test_label3',
-        'blocks' => ['foo1' => [], 'foo2' => []],
-      ],
-    ];
-    return $data;
-  }
-
-}
-
-class TestBlockDisplayVariant extends BlockDisplayVariant {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build() {
-    return [];
-  }
-
-  public function getRegionNames() {
-    return [
-      'top' => 'Top',
-      'bottom' => 'Bottom',
-    ];
-  }
-
-}
diff --git a/modules/ctools/tests/src/Unit/BlockPluginCollectionTest.php b/modules/ctools/tests/src/Unit/BlockPluginCollectionTest.php
deleted file mode 100644
index c928107..0000000
--- a/modules/ctools/tests/src/Unit/BlockPluginCollectionTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Unit;
-
-use Drupal\Core\Block\BlockManagerInterface;
-use Drupal\Core\Block\BlockPluginInterface;
-use Drupal\ctools\Plugin\BlockPluginCollection;
-use Drupal\Tests\UnitTestCase;
-use Prophecy\Argument;
-
-/**
- * Tests the block plugin collection.
- *
- * @coversDefaultClass \Drupal\ctools\Plugin\BlockPluginCollection
- *
- * @group CTools
- */
-class BlockPluginCollectionTest extends UnitTestCase {
-
-  /**
-   * Tests the getAllByRegion() method.
-   *
-   * @covers ::getAllByRegion
-   */
-  public function testGetAllByRegion() {
-    $blocks = [
-      'foo' => [
-        'id' => 'foo',
-        'label' => 'Foo',
-        'plugin' => 'system_powered_by_block',
-        'region' => 'bottom',
-      ],
-      'bar' => [
-        'id' => 'bar',
-        'label' => 'Bar',
-        'plugin' => 'system_powered_by_block',
-        'region' => 'top',
-      ],
-      'bing' => [
-        'id' => 'bing',
-        'label' => 'Bing',
-        'plugin' => 'system_powered_by_block',
-        'region' => 'bottom',
-        'weight' => -10,
-      ],
-      'baz' => [
-        'id' => 'baz',
-        'label' => 'Baz',
-        'plugin' => 'system_powered_by_block',
-        'region' => 'bottom',
-      ],
-    ];
-    $block_manager = $this->prophesize(BlockManagerInterface::class);
-    $plugins = [];
-    foreach ($blocks as $block_id => $block) {
-      $plugin = $this->prophesize(BlockPluginInterface::class);
-      $plugin->label()->willReturn($block['label']);
-      $plugin->getConfiguration()->willReturn($block);
-      $plugins[$block_id] = $plugin->reveal();
-
-      $block_manager->createInstance($block_id, $block)
-        ->willReturn($plugin->reveal())
-        ->shouldBeCalled();
-    }
-
-
-    $block_plugin_collection = new BlockPluginCollection($block_manager->reveal(), $blocks);
-    $expected = [
-      'bottom' => [
-        'bing' => $plugins['bing'],
-        'baz' => $plugins['baz'],
-        'foo' => $plugins['foo'],
-      ],
-      'top' => [
-        'bar' => $plugins['bar'],
-      ],
-    ];
-    $this->assertSame($expected, $block_plugin_collection->getAllByRegion());
-  }
-
-}
diff --git a/modules/ctools/tests/src/Unit/BlockVariantTraitTest.php b/modules/ctools/tests/src/Unit/BlockVariantTraitTest.php
deleted file mode 100644
index 8926879..0000000
--- a/modules/ctools/tests/src/Unit/BlockVariantTraitTest.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Unit;
-
-use Drupal\Component\Uuid\UuidInterface;
-use Drupal\ctools\Plugin\BlockPluginCollection;
-use Drupal\ctools\Plugin\BlockVariantTrait;
-use Drupal\Tests\UnitTestCase;
-
-/**
- * Tests the methods of a block-based variant.
- *
- * @coversDefaultClass \Drupal\ctools\Plugin\BlockVariantTrait
- *
- * @group CTools
- */
-class BlockVariantTraitTest extends UnitTestCase {
-
-  /**
-   * Tests the getRegionAssignments() method.
-   *
-   * @covers ::getRegionAssignments
-   *
-   * @dataProvider providerTestGetRegionAssignments
-   */
-  public function testGetRegionAssignments($expected, $blocks = []) {
-    $block_collection = $this->prophesize(BlockPluginCollection::class);
-    $block_collection->getAllByRegion()
-      ->willReturn($blocks)
-      ->shouldBeCalled();
-
-    $display_variant = new TestBlockVariantTrait();
-    $display_variant->setBlockPluginCollection($block_collection->reveal());
-
-    $this->assertSame($expected, $display_variant->getRegionAssignments());
-  }
-
-  public function providerTestGetRegionAssignments() {
-    return [
-      [
-        [
-          'top' => [],
-          'bottom' => [],
-        ],
-      ],
-      [
-        [
-          'top' => ['foo'],
-          'bottom' => [],
-        ],
-        [
-          'top' => ['foo'],
-        ],
-      ],
-      [
-        [
-          'top' => [],
-          'bottom' => [],
-        ],
-        [
-          'invalid' => ['foo'],
-        ],
-      ],
-      [
-        [
-          'top' => [],
-          'bottom' => ['foo'],
-        ],
-        [
-          'bottom' => ['foo'],
-          'invalid' => ['bar'],
-        ],
-      ],
-    ];
-  }
-
-}
-
-class TestBlockVariantTrait {
-  use BlockVariantTrait;
-
-  /**
-   * @var array
-   */
-  protected $blockConfig = [];
-
-  /**
-   * @var \Drupal\Component\Uuid\UuidInterface
-   */
-  protected $uuidGenerator;
-
-  /**
-   * @param BlockPluginCollection $block_plugin_collection
-   *
-   * @return $this
-   */
-  public function setBlockPluginCollection(BlockPluginCollection $block_plugin_collection) {
-    $this->blockPluginCollection = $block_plugin_collection;
-    return $this;
-  }
-
-  /**
-   * @param \Drupal\Component\Uuid\UuidInterface $uuid_generator
-   *
-   * @return $this
-   */
-  public function setUuidGenerator(UuidInterface $uuid_generator) {
-    $this->uuidGenerator = $uuid_generator;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function uuidGenerator() {
-    return $this->uuidGenerator;
-  }
-
-  /**
-   * Sets the block configuration.
-   *
-   * @param array $config
-   *   The block configuration.
-   *
-   * @return $this
-   */
-  public function setBlockConfig(array $config) {
-    $this->blockConfig = $config;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getBlockConfig() {
-    return $this->blockConfig;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRegionNames() {
-    return [
-      'top' => 'Top',
-      'bottom' => 'Bottom',
-    ];
-  }
-
-}
diff --git a/modules/ctools/tests/src/Unit/ContextMapperTest.php b/modules/ctools/tests/src/Unit/ContextMapperTest.php
deleted file mode 100644
index 24a85f2..0000000
--- a/modules/ctools/tests/src/Unit/ContextMapperTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Unit;
-
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Entity\EntityRepositoryInterface;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\Core\TypedData\Plugin\DataType\IntegerData;
-use Drupal\Core\TypedData\TypedDataManager;
-use Drupal\ctools\Context\EntityLazyLoadContext;
-use Drupal\ctools\ContextMapper;
-use Drupal\Tests\UnitTestCase;
-
-/**
- * @coversDefaultClass \Drupal\ctools\ContextMapper
- *
- * @group CTools
- */
-class ContextMapperTest extends UnitTestCase {
-
-  /**
-   * The typed data manager.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManager|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $typedDataManager;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityRepositoryInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $entityRepository;
-
-  /**
-   * @var \Drupal\page_manager\ContextMapper
-   */
-  protected $staticContext;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->typedDataManager = $this->prophesize(TypedDataManager::class);
-    $this->entityRepository = $this->prophesize(EntityRepositoryInterface::class);
-    $this->staticContext = new ContextMapper($this->entityRepository->reveal());
-
-    $container = new ContainerBuilder();
-    $container->set('typed_data_manager', $this->typedDataManager->reveal());
-    \Drupal::setContainer($container);
-  }
-
-  /**
-   * @covers ::getContextValues
-   */
-  public function testGetContextValues() {
-    $input = [];
-    $actual = $this->staticContext->getContextValues($input);
-    $this->assertEquals([], $actual);
-  }
-
-  /**
-   * @covers ::getContextValues
-   */
-  public function testGetContextValuesContext() {
-    $data_definition = DataDefinition::createFromDataType('integer');
-    $typed_data = IntegerData::createInstance($data_definition);
-    $this->typedDataManager->createDataDefinition('integer')->willReturn($data_definition);
-    $this->typedDataManager->getDefaultConstraints($data_definition)->willReturn([]);
-    $this->typedDataManager->create($data_definition, 5)->willReturn($typed_data);
-
-    $input = [
-      'foo' => [
-        'label' => 'Foo',
-        'description' => NULL,
-        'type' => 'integer',
-        'value' => 5,
-      ],
-    ];
-    $expected = new Context(new ContextDefinition('integer', 'Foo'), 5);
-    $actual = $this->staticContext->getContextValues($input)['foo'];
-    $this->assertEquals($expected, $actual);
-  }
-
-  /**
-   * @covers ::getContextValues
-   */
-  public function testGetContextValuesEntityContext() {
-    $input = [
-      'foo' => [
-        'label' => 'Foo',
-        'description' => NULL,
-        'type' => 'entity:node',
-        'value' => 'the_node_uuid',
-      ],
-    ];
-    $expected = new EntityLazyLoadContext(new ContextDefinition('entity:node', 'Foo'), $this->entityRepository->reveal(), 'the_node_uuid');
-    $actual = $this->staticContext->getContextValues($input)['foo'];
-    $this->assertEquals($expected, $actual);
-  }
-
-}
diff --git a/modules/ctools/tests/src/Unit/VariantCollectionTraitTest.php b/modules/ctools/tests/src/Unit/VariantCollectionTraitTest.php
deleted file mode 100644
index 4e93ea0..0000000
--- a/modules/ctools/tests/src/Unit/VariantCollectionTraitTest.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ctools\Unit;
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Component\Uuid\UuidInterface;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Display\VariantInterface;
-use Drupal\ctools\Plugin\VariantCollectionTrait;
-use Drupal\ctools\Plugin\VariantPluginCollection;
-use Drupal\Tests\UnitTestCase;
-use Prophecy\Argument;
-
-/**
- * Tests the methods of a variant-aware class.
- *
- * @coversDefaultClass \Drupal\ctools\Plugin\VariantCollectionTrait
- *
- * @group Ctools
- */
-class VariantCollectionTraitTest extends UnitTestCase {
-
-  /**
-   * @var \Drupal\Component\Plugin\PluginManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $manager;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $container = new ContainerBuilder();
-    $this->manager = $this->prophesize(PluginManagerInterface::class);
-    $container->set('plugin.manager.display_variant', $this->manager->reveal());
-    \Drupal::setContainer($container);
-  }
-
-  /**
-   * @covers ::getVariants
-   */
-  public function testGetVariantsEmpty() {
-    $trait_object = new TestVariantCollectionTrait();
-    $this->manager->createInstance()->shouldNotBeCalled();
-
-    $variants = $trait_object->getVariants();
-    $this->assertInstanceOf(VariantPluginCollection::class, $variants);
-    $this->assertSame(0, count($variants));
-  }
-
-  /**
-   * @covers ::getVariants
-   */
-  public function testGetVariants() {
-    $trait_object = new TestVariantCollectionTrait();
-    $config = [
-      'foo' => ['id' => 'foo_plugin'],
-      'bar' => ['id' => 'bar_plugin'],
-    ];
-    foreach ($config as $value) {
-      $plugin = $this->prophesize(VariantInterface::class);
-      $this->manager->createInstance($value['id'], $value)->willReturn($plugin->reveal());
-    }
-    $trait_object->setVariantConfig($config);
-
-    $variants = $trait_object->getVariants();
-    $this->assertInstanceOf(VariantPluginCollection::class, $variants);
-    $this->assertSame(2, count($variants));
-    return $variants;
-  }
-
-  /**
-   * @covers ::getVariants
-   *
-   * @depends testGetVariants
-   */
-  public function testGetVariantsSort(VariantPluginCollection $variants) {
-    $this->assertSame(['bar' => 'bar', 'foo' => 'foo'], $variants->getInstanceIds());
-  }
-
-  /**
-   * @covers ::addVariant
-   */
-  public function testAddVariant() {
-    $config = ['id' => 'foo'];
-    $uuid = 'test-uuid';
-    $expected_config = $config + ['uuid' => $uuid];
-
-    $uuid_generator = $this->prophesize(UuidInterface::class);
-    $uuid_generator->generate()
-      ->willReturn($uuid)
-      ->shouldBeCalledTimes(1);
-    $trait_object = new TestVariantCollectionTrait();
-    $trait_object->setUuidGenerator($uuid_generator->reveal());
-
-    $plugin_prophecy = $this->prophesize(VariantInterface::class);
-    $plugin_prophecy->getConfiguration()
-      ->willReturn($expected_config)
-      ->shouldBeCalled();
-    $plugin_prophecy->setConfiguration($expected_config)
-      ->willReturn($expected_config)
-      ->shouldBeCalled();
-
-    $this->manager->createInstance('foo', $expected_config)
-      ->willReturn($plugin_prophecy->reveal());
-
-    $resulting_uuid = $trait_object->addVariant($config);
-    $this->assertSame($uuid, $resulting_uuid);
-
-    $variants = $trait_object->getVariants();
-    $this->assertSame([$uuid => $uuid], $variants->getInstanceIds());
-    $this->assertSame([$uuid => $expected_config], $variants->getConfiguration());
-    $this->assertSame($plugin_prophecy->reveal(), $variants->get($uuid));
-    return [$trait_object, $uuid, $plugin_prophecy->reveal()];
-  }
-
-  /**
-   * @covers ::getVariant
-   *
-   * @depends testAddVariant
-   */
-  public function testGetVariant($data) {
-    list($trait_object, $uuid, $plugin) = $data;
-    $this->manager->createInstance()->shouldNotBeCalled();
-
-    $this->assertSame($plugin, $trait_object->getVariant($uuid));
-    return [$trait_object, $uuid];
-  }
-
-  /**
-   * @covers ::removeVariant
-   *
-   * @depends testGetVariant
-   */
-  public function testRemoveVariant($data) {
-    list($trait_object, $uuid) = $data;
-
-    $this->assertSame($trait_object, $trait_object->removeVariant($uuid));
-    $this->assertFalse($trait_object->getVariants()->has($uuid));
-    return [$trait_object, $uuid];
-  }
-
-  /**
-   * @covers ::getVariant
-   *
-   * @depends testRemoveVariant
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginNotFoundException
-   * @expectedExceptionMessage Plugin ID 'test-uuid' was not found.
-   */
-  public function testGetVariantException($data) {
-    list($trait_object, $uuid) = $data;
-    // Attempt to retrieve a variant that has been removed.
-    $this->assertNull($trait_object->getVariant($uuid));
-  }
-
-}
-
-class TestVariantCollectionTrait {
-  use VariantCollectionTrait;
-
-  /**
-   * @var array
-   */
-  protected $variantConfig = [];
-
-  /**
-   * @var \Drupal\Component\Uuid\UuidInterface
-   */
-  protected $uuidGenerator;
-
-  /**
-   * @param \Drupal\Component\Uuid\UuidInterface $uuid_generator
-   *
-   * @return $this
-   */
-  public function setUuidGenerator(UuidInterface $uuid_generator) {
-    $this->uuidGenerator = $uuid_generator;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function uuidGenerator() {
-    return $this->uuidGenerator;
-  }
-
-  /**
-   * Sets the variant configuration.
-   *
-   * @param array $config
-   *   The variant configuration.
-   *
-   * @return $this
-   */
-  public function setVariantConfig(array $config) {
-    $this->variantConfig = $config;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getVariantConfig() {
-    return $this->variantConfig;
-  }
-
-}
diff --git a/modules/devel/LICENSE.txt b/modules/devel/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/devel/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/devel/README.txt b/modules/devel/README.txt
deleted file mode 100644
index 9ac4acf..0000000
--- a/modules/devel/README.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Devel
-==========
-Devel module contains helper functions and pages for Drupal developers and inquisitive admins:
-
- - A block for running custom PHP on a page
- - A block for quickly accessing devel pages
- - A block for masquerading as other users (useful for testing)
- - A mail-system class which redirects outbound email to files
- - Drush commands such as fn-hook, fn-event, ...
- - Docs at https://api.drupal.org/api/devel
- - more
-
-This module is safe to use on a production site. Just be sure to only grant
-'access development information' permission to developers.
-
-Devel Kint
-===================
-Provides a dpr() function, which pretty prints variables.
-Useful during development. Also see similar helpers like dpm(), dvm().
-
-Webprofiler
-==============
-Adds a debug bar at bottom of all pages with tons of useful information like a query list,
-cache hit/miss data, memory profiling, page speed, php info, session info, etc.
-
-Devel Generate
-=================
-Bulk creates nodes, users, comment, terms for development. Has Drush integration.
-
-Devel Generate Extensions
-=========================
-Devel Images Provider [http://drupal.org/project/devel_image_provider] allows to configure external providers for images.
-
-Drush Unit Testing
-==================
-See develDrushTest.php for an example of unit testing of the Drush integration.
-This uses Drush's own test framework, based on PHPUnit. To run the tests, use
-run-tests-drush.sh. You may pass in any arguments that are valid for `phpunit`.
-
-Author/Maintainers
-======================
-- Moshe Weitzman <weitzman at tejasa DOT com> http://www.acquia.com
-- Hans Salvisberg <drupal at salvisberg DOT com>
-- Pedro Cambra https://drupal.org/user/122101/contact http://www.ymbra.com/
-- Juan Pablo Novillo https://www.drupal.org/u/juampynr
-- lussoluca https://www.drupal.org/u/lussoluca
-- willzyx https://www.drupal.org/u/willzyx
diff --git a/modules/devel/composer.json b/modules/devel/composer.json
deleted file mode 100644
index 6faff22..0000000
--- a/modules/devel/composer.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "name": "drupal/devel",
-  "description": "Various blocks, pages, and functions for developers.",
-  "type": "drupal-module",
-  "homepage": "http://drupal.org/project/devel",
-  "authors": [
-    {
-      "name": "Moshe Weitzman",
-      "email": "weitzman@tejasa.com",
-      "homepage": "https://github.com/weitzman",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Hans Salvisberg",
-      "email": "drupal@salvisberg.com",
-      "homepage": "https://www.drupal.org/u/salvis",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Luca Lusso",
-      "homepage": "https://www.drupal.org/u/lussoluca",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Marco (willzyx)",
-      "homepage": "https://www.drupal.org/u/willzyx",
-      "role": "Maintainer"
-    },
-    {
-      "name": "See contributors",
-      "homepage": "https://www.drupal.org/node/3236/committers"
-    }
-  ],
-  "support": {
-    "issues": "http://drupal.org/project/devel",
-    "irc": "irc://irc.freenode.org/drupal-contribute",
-    "source": "http://cgit.drupalcode.org/devel"
-  },
-  "license": "GPL-2.0+",
-  "minimum-stability": "dev",
-  "require": {},
-  "suggest": {
-    "symfony/var-dumper": "Pretty print complex values better with var-dumper available"
-  }
-}
diff --git a/modules/devel/config/install/devel.settings.yml b/modules/devel/config/install/devel.settings.yml
deleted file mode 100644
index 66501f0..0000000
--- a/modules/devel/config/install/devel.settings.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-page_alter: FALSE
-raw_names: FALSE
-error_handlers:
-  1: 1
-rebuild_theme: FALSE
-debug_mail_file_format: '%to-%subject-%datetime.mail.txt'
-debug_mail_directory: 'temporary://devel-mails'
-devel_dumper: 'default'
diff --git a/modules/devel/config/install/devel.toolbar.settings.yml b/modules/devel/config/install/devel.toolbar.settings.yml
deleted file mode 100644
index a9a4037..0000000
--- a/modules/devel/config/install/devel.toolbar.settings.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-toolbar_items:
-  - 'devel.admin_settings_link'
-  - 'devel.cache_clear'
-  - 'devel.container_info.service'
-  - 'devel.execute_php'
-  - 'devel.menu_rebuild'
-  - 'devel.reinstall'
-  - 'devel.route_info'
-  - 'devel.run_cron'
diff --git a/modules/devel/config/install/system.menu.devel.yml b/modules/devel/config/install/system.menu.devel.yml
deleted file mode 100644
index 21fb002..0000000
--- a/modules/devel/config/install/system.menu.devel.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-id: devel
-label: 'Development'
-description: 'Links related to Devel module.'
-langcode: en
-locked: true
-dependencies:
-  enforced:
-    module:
-      - devel
diff --git a/modules/devel/config/schema/devel.schema.yml b/modules/devel/config/schema/devel.schema.yml
deleted file mode 100644
index d4d0c03..0000000
--- a/modules/devel/config/schema/devel.schema.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Schema for the configuration files of the Devel module.
-
-devel.settings:
-  type: config_object
-  label: 'Devel settings'
-  mapping:
-    page_alter:
-      type: boolean
-      label: 'Page alter'
-    raw_names:
-      type: boolean
-      label: 'Raw names'
-    error_handlers:
-      label: 'Error handlers'
-      type: sequence
-      sequence:
-        type: integer
-    rebuild_theme:
-      type: boolean
-      label: 'Rebuild theme information'
-    debug_mail_file_format:
-      type: string
-      label: 'Mail debug file format'
-    debug_mail_directory:
-      type: string
-      label: 'Mail debug directory'
-    devel_dumper:
-      type: string
-      label: 'Devel variable dumper'
-
-devel.toolbar.settings:
-  type: config_object
-  label: 'Devel Toolbar settings'
-  mapping:
-    toolbar_items:
-      type: sequence
-      label: 'Toolbar items'
-      sequence:
-        type: string
-
-block.settings.devel_switch_user:
-  type: block_settings
-  label: 'Switch user block'
-  mapping:
-    list_size:
-      type: integer
-      label: 'List size'
-    include_anon:
-      type: boolean
-      label: 'Include Anonymous user'
-    show_form:
-      type: boolean
-      label: 'Show search form'
diff --git a/modules/devel/css/devel-rtl.css b/modules/devel/css/devel-rtl.css
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/devel/css/devel.css b/modules/devel/css/devel.css
deleted file mode 100644
index 0abe966..0000000
--- a/modules/devel/css/devel.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Dumpers
- */
-.devel-dumper .details-wrapper{
-  max-height: 450px;
-  margin-right: 3px;
-  overflow: auto;
-}
-
-/**
- * Switch User block
- */
-#content .block-devel-switch-user ul.links,
-#footer .block-devel-switch-user ul.links {
-  margin-left: 0;
-  padding-left: 0;
-}
-
-#content .block-devel-switch-user ul.links li,
-#footer .block-devel-switch-user ul.links li {
-  display: inline-block;
-  margin-left: 0;
-  margin-right: 1.5em;
-  padding-right: 0;
-}
-
-#footer .block-devel-switch-user ul.links li a {
-  margin: 0;
-  padding: 0;
-  border: none;
-}
-
-#content #devel-switch-user-form .form-item-username,
-#footer #devel-switch-user-form .form-item-username {
-  float: left;
-  margin-right: 2em;
-}
-
-#content #devel-switch-user-form .button-primary,
-#footer #devel-switch-user-form .button-primary {
-  margin-top: 1em;
-}
diff --git a/modules/devel/css/devel.toolbar.css b/modules/devel/css/devel.toolbar.css
deleted file mode 100644
index c9871bb..0000000
--- a/modules/devel/css/devel.toolbar.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @file
- * Styling for devel toolbar module.
- */
-
-.toolbar .toolbar-tray-vertical .edit-devel-toolbar {
-    text-align: right; /* LTR */
-    padding: 1em;
-}
-[dir="rtl"] .toolbar .toolbar-tray-vertical .edit-devel-toolbar {
-    text-align: left;
-}
-
-.toolbar .toolbar-tray-horizontal .edit-devel-toolbar {
-    float: right; /* LTR */
-}
-[dir="rtl"] .toolbar .toolbar-tray-horizontal .edit-devel-toolbar {
-    float: left;
-}
-
-.toolbar .toolbar-tray-horizontal .toolbar-menu {
-    float: left; /* LTR */
-}
-[dir="rtl"] .toolbar .toolbar-tray-horizontal .toolbar-menu {
-    float: right;
-}
-
-.toolbar .toolbar-bar .toolbar-icon-devel:before{
-    background-image: url(../icons/bebebe/cog.svg);
-}
-.toolbar-bar .toolbar-icon-devel:active:before,
-.toolbar-bar .toolbar-icon-devel.is-active:before {
-    background-image: url(../icons/ffffff/cog.svg);
-}
-
-.toolbar-horizontal .toolbar-horizontal-item-hidden {
-    display: none;
-}
diff --git a/modules/devel/devel.api.php b/modules/devel/devel.api.php
deleted file mode 100644
index 4a413db..0000000
--- a/modules/devel/devel.api.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Hooks for the devel module.
- */
-
-/**
- * @addtogroup hooks
- * @{
- */
-
-/**
- * Alter devel dumper information declared by other modules.
- *
- * @param $info
- *   Devel dumper information to alter.
- */
-function hook_devel_dumper_info_alter(&$info) {
-  $info['default']['label'] = 'Altered label';
-}
-
-/**
- * @} End of "addtogroup hooks".
- */
diff --git a/modules/devel/devel.info.yml b/modules/devel/devel.info.yml
deleted file mode 100644
index fa7fbf8..0000000
--- a/modules/devel/devel.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-type: module
-name: Devel
-description: 'Various blocks, pages, and functions for developers.'
-package: Development
-# core: 8.x
-configure: devel.admin_settings
-tags:
- - developer
-
-# Information added by Drupal.org packaging script on 2017-10-05
-version: '8.x-1.2'
-core: '8.x'
-project: 'devel'
-datestamp: 1507197848
diff --git a/modules/devel/devel.install b/modules/devel/devel.install
deleted file mode 100644
index b27e9b9..0000000
--- a/modules/devel/devel.install
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, update and uninstall functions for the devel module.
- */
-
-/**
- * Implements hook_requirements().
- */
-function devel_requirements($phase) {
-  $requirements = [];
-
-  if ($phase == 'runtime') {
-    // To understand the reasons why this message is marked as info see
-    // https://www.drupal.org/node/2834400.
-    $requirements['devel'] = [
-      'title' => t('Devel module enabled'),
-      'description' => t('The Devel module provides access to internal debugging information; therefore it\'s recommended to disable this module on sites in production.'),
-      'severity' => REQUIREMENT_INFO,
-    ];
-  }
-
-  return $requirements;
-}
-
-/**
- * Set the default devel dumper plugin.
- */
-function devel_update_8001() {
-  $kint_enabled = \Drupal::moduleHandler()->moduleExists('kint');
-
-  $default_dumper = $kint_enabled ? 'kint' : 'default';
-
-  // Set the default dumper plugin to kint if kint module is available.
-  \Drupal::configFactory()->getEditable('devel.settings')
-    ->set('devel_dumper', $default_dumper)
-    ->save(TRUE);
-}
-
-/**
- * Add enforced dependencies to system.menu.devel
- */
-function devel_update_8002() {
-  $config = \Drupal::configFactory()->getEditable('system.menu.devel');
-  $dependencies = $config->get('dependencies');
-  $dependencies['enforced']['module'][] = 'devel';
-  $config->set('dependencies', $dependencies)->save(TRUE);
-}
diff --git a/modules/devel/devel.libraries.yml b/modules/devel/devel.libraries.yml
deleted file mode 100644
index 6d935ce..0000000
--- a/modules/devel/devel.libraries.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-devel:
-  version: 0
-  css:
-    theme:
-      css/devel.css: {}
-
-devel-toolbar:
-  version: VERSION
-  css:
-    component:
-      css/devel.toolbar.css: {}
diff --git a/modules/devel/devel.links.menu.yml b/modules/devel/devel.links.menu.yml
deleted file mode 100644
index 2a90f86..0000000
--- a/modules/devel/devel.links.menu.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-devel.admin_settings:
-  title: 'Devel settings'
-  description: 'Helper functions, pages, and blocks to assist Drupal developers. The devel blocks can be managed via the block administration page.'
-  route_name: devel.admin_settings
-  parent: 'system.admin_config_development'
-devel.admin_settings_link:
-  title: 'Devel settings'
-  description: 'Helper functions, pages, and blocks to assist Drupal developers. The devel blocks can be managed via the block administration page.'
-  route_name: devel.admin_settings
-  menu_name: devel
-devel.configs_list:
-  title: 'Config editor'
-  description: 'Edit configuration.'
-  route_name: devel.configs_list
-  menu_name: devel
-devel.reinstall:
-  title: 'Reinstall Modules'
-  route_name: devel.reinstall
-  menu_name: devel
-  class: \Drupal\devel\Plugin\Menu\DestinationMenuLink
-devel.menu_rebuild:
-  title: 'Rebuild Menu'
-  route_name: devel.menu_rebuild
-  menu_name: devel
-  class: \Drupal\devel\Plugin\Menu\DestinationMenuLink
-devel.state_system_page:
-  title: 'State editor'
-  description: 'Edit state system values.'
-  route_name: devel.state_system_page
-  menu_name: devel
-devel.theme_registry:
-  title: 'Theme registry'
-  route_name: devel.theme_registry
-  menu_name: devel
-devel.entity_info_page:
-  title: 'Entity Info'
-  route_name: devel.entity_info_page
-#  parent: 'system.admin_config_development'
-  menu_name: devel
-devel.field_info_page:
-  title: 'Field Info'
-  route_name: devel.field_info_page
-#  parent: 'system.admin_config_development'
-  menu_name: devel
-devel.phpinfo:
-  title: 'PHPinfo()'
-  route_name: system.php
-  menu_name: devel
-devel.execute_php:
-  title: 'Execute PHP'
-  route_name: devel.execute_php
-  menu_name: devel
-devel.session:
-  title: 'View Session'
-  route_name: devel.session
-  menu_name: devel
-devel.elements_page:
-  title: 'Element Info'
-  route_name: devel.elements_page
-  menu_name: devel
-devel.cache_clear:
-  title: 'Cache clear'
-  route_name: devel.cache_clear
-  menu_name: devel
-  class: \Drupal\devel\Plugin\Menu\DestinationMenuLink
-devel.run_cron:
-  title: 'Run cron'
-  route_name: devel.run_cron
-  menu_name: devel
-  class: \Drupal\devel\Plugin\Menu\DestinationMenuLink
-
-# Container info
-devel.container_info.service:
-  title: 'Container Info'
-  route_name: devel.container_info.service
-  menu_name: devel
-
-# Routes info
-devel.route_info:
-  title: 'Routes Info'
-  route_name: devel.route_info
-  menu_name: devel
-devel.route_info.item:
-  title: 'Current route info'
-  route_name: devel.route_info.item
-  menu_name: devel
-  class: \Drupal\devel\Plugin\Menu\RouteDetailMenuLink
-
-# Event info
-devel.event_info:
-  title: 'Events Info'
-  route_name: devel.event_info
-  menu_name: devel
diff --git a/modules/devel/devel.links.task.yml b/modules/devel/devel.links.task.yml
deleted file mode 100644
index 9c7d349..0000000
--- a/modules/devel/devel.links.task.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-devel.entities:
-  class: \Drupal\Core\Menu\LocalTaskDefault
-  deriver: \Drupal\devel\Plugin\Derivative\DevelLocalTask
-devel.admin_settings:
-  title: 'Settings'
-  route_name: devel.admin_settings
-  base_route: devel.admin_settings
-  weight: 0
-
-# Container info
-devel.container_info.service:
-  title: 'Services'
-  route_name: devel.container_info.service
-  base_route: devel.container_info.service
-devel.container_info.parameter:
-  title: 'Parameters'
-  route_name: devel.container_info.parameter
-  base_route: devel.container_info.service
diff --git a/modules/devel/devel.module b/modules/devel/devel.module
deleted file mode 100644
index 08b93e2..0000000
--- a/modules/devel/devel.module
+++ /dev/null
@@ -1,616 +0,0 @@
-<?php
-
-/**
- * @file
- * This module holds functions useful for Drupal development.
- * Please contribute!
- */
-
-define('DEVEL_ERROR_HANDLER_NONE', 0);
-define('DEVEL_ERROR_HANDLER_STANDARD', 1);
-define('DEVEL_ERROR_HANDLER_BACKTRACE_KINT', 2);
-define('DEVEL_ERROR_HANDLER_BACKTRACE_DPM', 4);
-
-define('DEVEL_MIN_TEXTAREA', 50);
-
-use Drupal\comment\CommentInterface;
-use Drupal\Core\Database\Database;
-use Drupal\Core\Database\Query\AlterableInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Logger\RfcLogLevel;
-use Drupal\Core\Menu\LocalTaskDefault;
-use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-use Drupal\Core\Utility\Error;
-use Drupal\devel\EntityTypeInfo;
-use Drupal\devel\ToolbarHandler;
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-
-/**
- * Implements hook_help().
- */
-function devel_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    case 'help.page.devel':
-      $output = '';
-      $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Devel module provides a suite of modules containing fun for module developers and themers. For more information, see the <a href=":url">online documentation for the Devel module</a>.', [':url' => 'https://www.drupal.org/docs/8/modules/devel']) . '</p>';
-      $output .= '<h3>' . t('Uses') . '</h3>';
-      $output .= '<dl>';
-      $output .= '<dt>' . t('Inspecting Service Container') . '</dt>';
-      $output .= '<dd>' . t('The module allows you to inspect Services and Parameters registered in the Service Container. You can see those informations on <a href=":url">Container info</a> page.', [':url' => Url::fromRoute('devel.container_info.service')->toString()]) . '</dd>';
-      $output .= '<dt>' . t('Inspecting Routes') . '</dt>';
-      $output .= '<dd>' . t('The module allows you to inspect routes information, gathering all routing data from <em>.routing.yml</em> files and from classes which subscribe to the route build/alter events. You can see those informations on <a href=":url">Routes info</a> page.', [':url' => Url::fromRoute('devel.route_info')->toString()]) . '</dd>';
-      $output .= '<dt>' . t('Inspecting Events') . '</dt>';
-      $output .= '<dd>' . t('The module allow you to inspect listeners registered in the event dispatcher. You can see those informations on <a href=":url">Events info</a> page.', [':url' => Url::fromRoute('devel.event_info')->toString()]) . '</dd>';
-      $output .= '</dl>';
-      return $output;
-
-    case 'devel.container_info.service':
-    case 'devel.container_info.parameter':
-      $output = '';
-      $output .= '<p>' . t('Displays Services and Parameters registered in the Service Container. For more informations on the Service Container, see the <a href=":url">Symfony online documentation</a>.', [':url' => 'http://symfony.com/doc/current/service_container.html']) . '</p>';
-      return $output;
-
-    case 'devel.route_info':
-      $output = '';
-      $output .= '<p>' . t('Displays registered routes for the site. For a complete overview of the routing system, see the <a href=":url">online documentation</a>.', [':url' => 'https://www.drupal.org/docs/8/api/routing-system']) . '</p>';
-      return $output;
-
-    case 'devel.event_info':
-      $output = '';
-      $output .= '<p>' . t('Displays events and listeners registered in the event dispatcher. For a complete overview of the event system, see the <a href=":url">Symfony online documentation</a>.', [':url' => 'http://symfony.com/doc/current/components/event_dispatcher.html']) . '</p>';
-      return $output;
-
-    case 'devel.reinstall':
-      $output = '<p>' . t('<strong>Warning</strong> - will delete your module tables and configuration.') . '</p>';
-      $output .= '<p>' . t('Uninstall and then install the selected modules. <code>hook_uninstall()</code> and <code>hook_install()</code> will be executed and the schema version number will be set to the most recent update number.') . '</p>';
-      return $output;
-
-    case 'devel/session':
-      return '<p>' . t('Here are the contents of your <code>$_SESSION</code> variable.') . '</p>';
-
-    case 'devel.state_system_page':
-      return '<p>' . t('This is a list of state variables and their values. For more information read online documentation of <a href=":documentation">State API in Drupal 8</a>.', array(':documentation' => "https://www.drupal.org/developing/api/8/state")) . '</p>';
-
-    case 'devel.layout_info':
-      $output = '';
-      $output .= '<p>' . t('Displays layouts available to the site. For a complete overview of the layout system, see the <a href=":url">Layout API documentation</a>.', [':url' => 'https://www.drupal.org/docs/8/api/layout-api']) . '</p>';
-      return $output;
-
-  }
-}
-
-/**
- * Implements hook_entity_type_alter().
- */
-function devel_entity_type_alter(array &$entity_types) {
-  return \Drupal::service('class_resolver')
-    ->getInstanceFromDefinition(EntityTypeInfo::class)
-    ->entityTypeAlter($entity_types);
-}
-
-/**
- * Implements hook_entity_operation().
- */
-function devel_entity_operation(EntityInterface $entity) {
-  return \Drupal::service('class_resolver')
-    ->getInstanceFromDefinition(EntityTypeInfo::class)
-    ->entityOperation($entity);
-}
-
-/**
- * Implements hook_toolbar().
- */
-function devel_toolbar() {
-  return \Drupal::service('class_resolver')
-    ->getInstanceFromDefinition(ToolbarHandler::class)
-    ->toolbar();
-}
-
-/**
- * Implements hook_menu_links_discovered_alter().
- */
-function devel_menu_links_discovered_alter(&$links) {
-  // Conditionally add the Layouts info menu link.
-  if (\Drupal::moduleHandler()->moduleExists('layout_discovery')) {
-    $links['devel.layout_info'] = [
-      'title' => new TranslatableMarkup('Layouts Info'),
-      'route_name' => 'devel.layout_info',
-      'description' => new TranslatableMarkup('Overview of layouts available to the site.'),
-      'menu_name' => 'devel',
-    ];
-  }
-}
-
-/**
- * Implements hook_local_tasks_alter().
- */
-function devel_local_tasks_alter(&$local_tasks) {
-  if (\Drupal::moduleHandler()->moduleExists('toolbar')) {
-    $local_tasks['devel.toolbar.settings_form'] = [
-      'title' => 'Toolbar Settings',
-      'base_route' => 'devel.admin_settings',
-      'route_name' => 'devel.toolbar.settings_form',
-      'class' => LocalTaskDefault::class,
-      'options' => [],
-    ];
-  }
-}
-
-/**
- * Sets message.
- */
-function devel_set_message($msg, $type = NULL) {
-  if (function_exists('drush_log')) {
-    drush_log($msg, $type);
-  }
-  else {
-    drupal_set_message($msg, $type, TRUE);
-  }
-}
-
-/**
- * Gets error handlers.
- */
-function devel_get_handlers() {
-  $error_handlers = \Drupal::config('devel.settings')->get('error_handlers');
-  if (!empty($error_handlers)) {
-    unset($error_handlers[DEVEL_ERROR_HANDLER_NONE]);
-  }
-  return $error_handlers;
-}
-
-/**
- * Sets a new error handler or restores the prior one.
- */
-function devel_set_handler($handlers) {
-  if (empty($handlers)) {
-    restore_error_handler();
-  }
-  elseif (count($handlers) == 1 && isset($handlers[DEVEL_ERROR_HANDLER_STANDARD])) {
-    // Do nothing.
-  }
-  else {
-    set_error_handler('backtrace_error_handler');
-  }
-}
-
-/**
- * Displays backtrace showing the route of calls to the current error.
- *
- * @param int $error_level
- *   The level of the error raised.
- * @param string $message
- *   The error message.
- * @param string $filename
- *   The filename that the error was raised in.
- * @param int $line
- *   The line number the error was raised at.
- * @param array $context
- *   An array that points to the active symbol table at the point the error
- *   occurred.
- */
-function backtrace_error_handler($error_level, $message, $filename, $line, $context) {
-  // Hide stack trace and parameters from unqualified users.
-  if (!\Drupal::currentUser()->hasPermission('access devel information')) {
-    // Do what core does in bootstrap.inc and errors.inc.
-    // (We need to duplicate the core code here rather than calling it
-    // to avoid having the backtrace_error_handler() on top of the call stack.)
-    if ($error_level & error_reporting()) {
-      $types = drupal_error_levels();
-      list($severity_msg, $severity_level) = $types[$error_level];
-      $backtrace = debug_backtrace();
-      $caller = Error::getLastCaller($backtrace);
-
-      // We treat recoverable errors as fatal.
-      _drupal_log_error(array(
-        '%type' => isset($types[$error_level]) ? $severity_msg : 'Unknown error',
-        '@message' => $message,
-        '%function' => $caller['function'],
-        '%file' => $caller['file'],
-        '%line' => $caller['line'],
-        'severity_level' => $severity_level,
-        'backtrace' => $backtrace,
-      ), $error_level == E_RECOVERABLE_ERROR);
-    }
-
-    return;
-  }
-
-  // Don't respond to the error if it was suppressed with a '@'
-  if (error_reporting() == 0) {
-    return;
-  }
-
-  // Don't respond to warning caused by ourselves.
-  if (preg_match('#Cannot modify header information - headers already sent by \\([^\\)]*[/\\\\]devel[/\\\\]#', $message)) {
-    return;
-  }
-
-  if ($error_level & error_reporting()) {
-    // Only write each distinct NOTICE message once, as repeats do not give any
-    // further information and can choke the page output.
-    if ($error_level == E_NOTICE) {
-      static $written = array();
-      if (!empty($written[$line][$filename][$message])) {
-        return;
-      }
-      $written[$line][$filename][$message] = TRUE;
-    }
-
-    $types = drupal_error_levels();
-    list($severity_msg, $severity_level) = $types[$error_level];
-
-    $backtrace = debug_backtrace();
-    $caller = Error::getLastCaller($backtrace);
-    $variables = array(
-      '%type' => isset($types[$error_level]) ? $severity_msg : 'Unknown error',
-      '@message' => $message,
-      '%function' => $caller['function'],
-      '%file' => $caller['file'],
-      '%line' => $caller['line'],
-    );
-    $msg = t('%type: @message in %function (line %line of %file).', $variables);
-
-    // Show message if error_level is ERROR_REPORTING_DISPLAY_SOME or higher.
-    // (This is Drupal's error_level, which is different from $error_level,
-    // and we purposely ignore the difference between _SOME and _ALL,
-    // see #970688!)
-    if (\Drupal::config('system.logging')->get('error_level') != 'hide') {
-      $error_handlers = devel_get_handlers();
-      if (!empty($error_handlers[DEVEL_ERROR_HANDLER_STANDARD])) {
-        drupal_set_message($msg, ($severity_level <= RfcLogLevel::NOTICE ? 'error' : 'warning'), TRUE);
-      }
-      if (!empty($error_handlers[DEVEL_ERROR_HANDLER_BACKTRACE_KINT])) {
-        print kpr(ddebug_backtrace(TRUE, 1), TRUE, $msg);
-      }
-      if (!empty($error_handlers[DEVEL_ERROR_HANDLER_BACKTRACE_DPM])) {
-        dpm(ddebug_backtrace(TRUE, 1), $msg, 'warning');
-      }
-    }
-
-    \Drupal::logger('php')->log($severity_level, $msg);
-  }
-}
-
-/**
- * Implements hook_page_attachments_alter().
- */
-function devel_page_attachments_alter(&$page) {
-  if (\Drupal::currentUser()->hasPermission('access devel information') && \Drupal::config('devel.settings')->get('page_alter')) {
-    dpm($page, 'page');
-  }
-}
-
-/**
- * Wrapper for DevelDumperManager::dump().
- *
- * Calls the http://www.firephp.org/ fb() function if it is found.
- *
- * @see \Drupal\devel\DevelDumperManager::dump()
- */
-function dfb() {
-  $args = func_get_args();
-  \Drupal::service('devel.dumper')->dump($args, NULL, 'firephp');
-}
-
-/**
- * Wrapper for DevelDumperManager::dump().
- *
- * Calls dfb() to output a backtrace.
- *
- * @see \Drupal\devel\DevelDumperManager::dump()
- */
-function dfbt($label) {
-  \Drupal::service('devel.dumper')->dump(FirePHP::TRACE, $label, 'firephp');
-}
-
-/**
- * Wrapper for DevelDumperManager::dump().
- *
- * Wrapper for ChromePHP Class log method.
- *
- * @see \Drupal\devel\DevelDumperManager::dump()
- */
-function dcp() {
-  $args = func_get_args();
-  \Drupal::service('devel.dumper')->dump($args, NULL, 'chromephp');
-}
-
-if (!function_exists('dd')) {
-  /**
-   * Wrapper for DevelDumperManager::debug().
-   *
-   * @see \Drupal\devel\DevelDumperManager::debug()
-   */
-  function dd($data, $label = NULL) {
-    return \Drupal::service('devel.dumper')->debug($data, $label, 'default');
-  }
-}
-
-/**
- * Wrapper for DevelDumperManager::message().
- *
- * Prints a variable to the 'message' area of the page.
- *
- * Uses drupal_set_message().
- *
- * @param $input
- *   An arbitrary value to output.
- * @param string $name
- *   Optional name for identifying the output.
- * @param string $type
- *   Optional message type for drupal_set_message(), defaults to 'status'.
- *
- * @return input
- *   The unaltered input value.
- *
- * @see \Drupal\devel\DevelDumperManager::message()
- */
-function dpm($input, $name = NULL, $type = 'status') {
-  \Drupal::service('devel.dumper')->message($input, $name, $type);
-  return $input;
-}
-
-/**
- * Wrapper for DevelDumperManager::message().
- *
- * Displays a Variable::export() variable to the 'message' area of the page.
- *
- * Uses drupal_set_message().
- *
- * @param $input
- *   An arbitrary value to output.
- * @param string $name
- *   Optional name for identifying the output.
- *
- * @return input
- *   The unaltered input value.
- *
- * @see \Drupal\devel\DevelDumperManager::message()
- */
-function dvm($input, $name = NULL) {
-  \Drupal::service('devel.dumper')->message($input, $name, 'status', 'drupal_variable');
-  return $input;
-}
-
-/**
- * An alias for dpm(), for historic reasons.
- */
-function dsm($input, $name = NULL) {
-  return dpm($input, $name);
-}
-
-/**
- * Wrapper for DevelDumperManager::dumpOrExport().
- *
- * An alias for the devel.dumper service. Saves carpal tunnel syndrome.
- *
- * @see \Drupal\devel\DevelDumperManager::dumpOrExport()
- */
-function dpr($input, $export = FALSE, $name = NULL) {
-  return \Drupal::service('devel.dumper')->dumpOrExport($input, $name, $export, 'default');
-}
-
-/**
- * Wrapper for DevelDumperManager::dumpOrExport().
- *
- * An alias for devel_dump(). Saves carpal tunnel syndrome.
- *
- * @see \Drupal\devel\DevelDumperManager::dumpOrExport()
- */
-function kpr($input, $export = FALSE, $name = NULL) {
-  return \Drupal::service('devel.dumper')->dumpOrExport($input, $name, $export);
-}
-
-/**
- * Wrapper for DevelDumperManager::dumpOrExport().
- *
- * Like dpr(), but uses Variable::export() instead.
- *
- * @see \Drupal\devel\DevelDumperManager::dumpOrExport()
- */
-function dvr($input, $export = FALSE, $name = NULL) {
-  return \Drupal::service('devel.dumper')->dumpOrExport($input, $name, $export, 'drupal_variable');
-}
-
-/**
- * Prints the arguments passed into the current function.
- */
-function dargs($always = TRUE) {
-  static $printed;
-  if ($always || !$printed) {
-    $bt = debug_backtrace();
-    print kpr($bt[1]['args'], TRUE);
-    $printed = TRUE;
-  }
-}
-
-/**
- * Prints a SQL string from a DBTNG Select object. Includes quoted arguments.
- *
- * @param object $query
- *   An object that implements the SelectInterface interface.
- * @param boolean $return
- *   Whether to return the string. Default is FALSE, meaning to print it
- *   and return $query instead.
- * @param string $name
- *   Optional name for identifying the output.
- *
- * @return object|string
- *   The $query object, or the query string if $return was TRUE.
- */
-function dpq($query, $return = FALSE, $name = NULL) {
-  if (\Drupal::currentUser()->hasPermission('access devel information')) {
-    if (method_exists($query, 'preExecute')) {
-      $query->preExecute();
-    }
-    $sql = (string) $query;
-    $quoted = array();
-    $connection = Database::getConnection();
-    foreach ((array) $query->arguments() as $key => $val) {
-      $quoted[$key] = is_null($val) ? 'NULL' : $connection->quote($val);
-    }
-    $sql = strtr($sql, $quoted);
-    if ($return) {
-      return $sql;
-    }
-    dpm($sql, $name);
-  }
-  return ($return ? NULL : $query);
-}
-
-/**
- * Prints a renderable array element to the screen using kprint_r().
- *
- * #pre_render and/or #post_render pass-through callback for kprint_r().
- *
- * @todo Investigate appending to #suffix.
- * @todo Investigate label derived from #id, #title, #name, and #theme.
- */
-function devel_render() {
-  $args = func_get_args();
-  // #pre_render and #post_render pass the rendered $element as last argument.
-  kpr(end($args));
-  // #pre_render and #post_render expect the first argument to be returned.
-  return reset($args);
-}
-
-/**
- * Prints the function call stack.
- *
- * @param $return
- *   Pass TRUE to return the formatted backtrace rather than displaying it in
- *   the browser via kprint_r().
- * @param $pop
- *   How many items to pop from the top of the stack; useful when calling from
- *   an error handler.
- * @param $options
- *   Options to pass on to PHP's debug_backtrace().
- *
- * @return string|NULL
- *   The formatted backtrace, if requested, or NULL.
- *
- * @see http://php.net/manual/en/function.debug-backtrace.php
- */
-function ddebug_backtrace($return = FALSE, $pop = 0, $options = DEBUG_BACKTRACE_PROVIDE_OBJECT) {
-  if (\Drupal::currentUser()->hasPermission('access devel information')) {
-    $backtrace = debug_backtrace($options);
-    while ($pop-- > 0) {
-      array_shift($backtrace);
-    }
-    $counter = count($backtrace);
-    $path = $backtrace[$counter - 1]['file'];
-    $path = substr($path, 0, strlen($path) - 10);
-    $paths[$path] = strlen($path) + 1;
-    $paths[DRUPAL_ROOT] = strlen(DRUPAL_ROOT) + 1;
-    $nbsp = "\xC2\xA0";
-
-    // Show message if error_level is ERROR_REPORTING_DISPLAY_SOME or higher.
-    // (This is Drupal's error_level, which is different from $error_level,
-    // and we purposely ignore the difference between _SOME and _ALL,
-    // see #970688!)
-    if (\Drupal::config('system.logging')->get('error_level') != 'hide') {
-      while (!empty($backtrace)) {
-        $call = array();
-        if (isset($backtrace[0]['file'])) {
-          $call['file'] = $backtrace[0]['file'];
-          foreach ($paths as $path => $len) {
-            if (strpos($backtrace[0]['file'], $path) === 0) {
-              $call['file'] = substr($backtrace[0]['file'], $len);
-            }
-          }
-          $call['file'] .= ':' . $backtrace[0]['line'];
-        }
-        if (isset($backtrace[1])) {
-          if (isset($backtrace[1]['class'])) {
-            $function = $backtrace[1]['class'] . $backtrace[1]['type'] . $backtrace[1]['function'] . '()';
-          }
-          else {
-            $function = $backtrace[1]['function'] . '()';
-          }
-          $backtrace[1] += array('args' => array());
-          foreach ($backtrace[1]['args'] as $key => $value) {
-            $call['args'][$key] = $value;
-          }
-        }
-        else {
-          $function = 'main()';
-          $call['args'] = $_GET;
-        }
-        $nicetrace[($counter <= 10 ? $nbsp : '') . --$counter . ': ' . $function] = $call;
-        array_shift($backtrace);
-      }
-      if ($return) {
-        return $nicetrace;
-      }
-      kpr($nicetrace);
-    }
-  }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * Adds mouse-over hints on the Permissions page to display
- * language-independent machine names and module base names.
- *
- * @see \Drupal\user\Form\UserPermissionsForm::buildForm()
- */
-function devel_form_user_admin_permissions_alter(&$form, FormStateInterface $form_state) {
-  if (\Drupal::currentUser()->hasPermission('access devel information') && \Drupal::config('devel.settings')->get('raw_names')) {
-    foreach (Element::children($form['permissions']) as $key) {
-      if (isset($form['permissions'][$key][0])) {
-        $form['permissions'][$key][0]['#wrapper_attributes']['title'] = $key;
-      }
-      elseif(isset($form['permissions'][$key]['description'])) {
-        $form['permissions'][$key]['description']['#wrapper_attributes']['title']  = $key;
-      }
-    }
-  }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * Adds mouse-over hints on the Modules page to display module base names.
- *
- * @see \Drupal\system\Form\ModulesListForm::buildForm()
- * @see theme_system_modules_details()
- */
-function devel_form_system_modules_alter(&$form, FormStateInterface $form_state) {
-  if (\Drupal::currentUser()->hasPermission('access devel information') && \Drupal::config('devel.settings')->get('raw_names', FALSE) && isset($form['modules']) && is_array($form['modules'])) {
-    foreach (Element::children($form['modules']) as $group) {
-      if (is_array($form['modules'][$group])) {
-        foreach (Element::children($form['modules'][$group]) as $key) {
-          if (isset($form['modules'][$group][$key]['name']['#markup'])) {
-            $form['modules'][$group][$key]['name']['#markup'] = '<span title="' . $key . '">' . $form['modules'][$group][$key]['name']['#markup'] . '</span>';
-          }
-        }
-      }
-    }
-  }
-}
-
-/**
- * Implements hook_query_TAG_alter().
- *
- * Makes debugging entity query much easier.
- *
- * Example usage:
- * @code
- * $query = \Drupal::entityQuery('node');
- * $query->condition('status', NODE_PUBLISHED);
- * $query->addTag('debug');
- * $query->execute();
- * @endcode
- */
-function devel_query_debug_alter(AlterableInterface $query) {
-  if (!$query->hasTag('debug-semaphore')) {
-    $query->addTag('debug-semaphore');
-    dpq($query);
-  }
-}
diff --git a/modules/devel/devel.permissions.yml b/modules/devel/devel.permissions.yml
deleted file mode 100644
index 256919d..0000000
--- a/modules/devel/devel.permissions.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-access devel information:
-  description: 'View developer output like variable printouts, query log, etc.'
-  title: 'Access developer information'
-  restrict access: TRUE
-
-execute php code:
-  title: 'Execute PHP code'
-  description: 'Run arbitrary PHP from a block.'
-  restrict access: TRUE
-
-switch users:
-  title: 'Switch users'
-  description: 'Become any user on the site with just a click.'
-  restrict access: TRUE
diff --git a/modules/devel/devel.routing.yml b/modules/devel/devel.routing.yml
deleted file mode 100644
index 8d20e90..0000000
--- a/modules/devel/devel.routing.yml
+++ /dev/null
@@ -1,278 +0,0 @@
-devel.admin_settings:
-  path: '/admin/config/development/devel'
-  defaults:
-    _form: '\Drupal\devel\Form\SettingsForm'
-    _title: 'Devel settings'
-  requirements:
-    _permission: 'administer site configuration'
-
-devel.toolbar.settings_form:
-  path: '/admin/config/development/devel/toolbar'
-  defaults:
-    _form: '\Drupal\devel\Form\ToolbarSettingsForm'
-    _title: 'Devel Toolbar Settings'
-  requirements:
-    _permission: 'administer site configuration'
-    _module_dependencies: 'toolbar'
-
-devel.reinstall:
-  path: '/devel/reinstall'
-  defaults:
-    _form: '\Drupal\devel\Form\DevelReinstall'
-    _title: 'Reinstall modules'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'administer site configuration'
-
-devel.menu_rebuild:
-  path: '/devel/menu/reset'
-  defaults:
-    _form: '\Drupal\devel\Form\RouterRebuildConfirmForm'
-    _title: 'Rebuild router'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'administer site configuration'
-
-devel.configs_list:
-  path: '/devel/config/{filter}'
-  options:
-    _admin_route: TRUE
-  defaults:
-    _form: '\Drupal\devel\Form\ConfigsList'
-    _title: 'Config editor'
-    filter: ''
-  requirements:
-    _permission: 'administer site configuration'
-
-devel.config_edit:
-  path: '/devel/config/edit/{config_name}'
-  defaults:
-    _form: '\Drupal\devel\Form\ConfigEditor'
-    _title: 'Edit configuration object: @config_name'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'administer site configuration'
-
-devel.state_system_page:
-  path: '/devel/state'
-  defaults:
-    _controller: '\Drupal\devel\Controller\DevelController::stateSystemPage'
-    _title: 'State editor'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-devel.system_state_edit:
-  path: '/devel/state/edit/{state_name}'
-  defaults:
-    _form: '\Drupal\devel\Form\SystemStateEdit'
-    _title: 'Edit state variable: @state_name'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'administer site configuration'
-
-devel.theme_registry:
-  path: '/devel/theme/registry'
-  defaults:
-    _controller: '\Drupal\devel\Controller\DevelController::themeRegistry'
-    _title: 'Theme registry'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-devel.field_info_page:
-  path: '/devel/field/info'
-  defaults:
-    _controller: '\Drupal\devel\Controller\DevelController::fieldInfoPage'
-    _title: 'Field info'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-devel.execute_php:
-  path: '/devel/php'
-  defaults:
-    _form: '\Drupal\devel\Form\ExecutePHP'
-    _title: 'Execute PHP code'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'execute php code'
-
-devel.session:
-  path: '/devel/session'
-  defaults:
-    _controller: '\Drupal\devel\Controller\DevelController::session'
-    _title: 'Session viewer'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-devel.switch:
-  path: '/devel/switch/{name}'
-  defaults:
-    _controller: '\Drupal\devel\Controller\SwitchUserController::switchUser'
-    _title: 'Switch user'
-    name: ''
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'switch users'
-    _csrf_token: 'TRUE'
-
-devel.cache_clear:
-  path: '/devel/cache/clear'
-  defaults:
-    _controller: '\Drupal\devel\Controller\DevelController::cacheClear'
-    _title: 'Clear cache'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-    _csrf_token: 'TRUE'
-
-devel.run_cron:
-  path: '/devel/run-cron'
-  defaults:
-    _controller: '\Drupal\system\CronController::runManually'
-    _title: 'Run cron'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'administer site configuration'
-    _csrf_token: 'TRUE'
-
-# Container info
-devel.container_info.service:
-  path: '/devel/container/service'
-  defaults:
-    _controller: '\Drupal\devel\Controller\ContainerInfoController::serviceList'
-    _title: 'Container services'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-devel.container_info.service.detail:
-  path: '/devel/container/service/{service_id}'
-  defaults:
-    _controller: '\Drupal\devel\Controller\ContainerInfoController::serviceDetail'
-    _title: 'Service @service_id detail'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-devel.container_info.parameter:
-  path: '/devel/container/parameter'
-  defaults:
-    _controller: '\Drupal\devel\Controller\ContainerInfoController::parameterList'
-    _title: 'Container parameters'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-devel.container_info.parameter.detail:
-  path: '/devel/container/parameter/{parameter_name}'
-  defaults:
-    _controller: '\Drupal\devel\Controller\ContainerInfoController::parameterDetail'
-    _title: 'Parameter @parameter_name value'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-# Route info
-devel.route_info:
-  path: '/devel/routes'
-  defaults:
-    _controller: '\Drupal\devel\Controller\RouteInfoController::routeList'
-    _title: 'Routes'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-devel.route_info.item:
-  path: '/devel/routes/item'
-  defaults:
-    _controller: '\Drupal\devel\Controller\RouteInfoController::routeDetail'
-    _title: 'Route detail'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-# Event info
-devel.event_info:
-  path: '/devel/events'
-  defaults:
-    _controller: '\Drupal\devel\Controller\EventInfoController::eventList'
-    _title: 'Events'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-# Layouts info
-devel.layout_info:
-  path: '/devel/layouts'
-  defaults:
-    _controller: '\Drupal\devel\Controller\LayoutInfoController::layoutInfoPage'
-    _title: 'Layouts'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-    _module_dependencies: 'layout_discovery'
-
-# Element info
-devel.elements_page:
-  path: '/devel/elements'
-  defaults:
-    _controller: '\Drupal\devel\Controller\ElementInfoController::elementList'
-    _title: 'Element Info'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-devel.elements_page.detail:
-  path: '/devel/elements/{element_name}'
-  defaults:
-    _controller: '\Drupal\devel\Controller\ElementInfoController::elementDetail'
-    _title: 'Element @element_name'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-# Entity type info
-devel.entity_info_page:
-  path: '/devel/entity/info'
-  defaults:
-    _controller: '\Drupal\devel\Controller\EntityTypeInfoController::entityTypeList'
-    _title: 'Entity info'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
-
-devel.entity_info_page.detail:
-  path: '/devel/entity/info/{entity_type_id}'
-  defaults:
-    _controller: '\Drupal\devel\Controller\EntityTypeInfoController::entityTypeDetail'
-    _title: 'Entity type @entity_type_id'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _permission: 'access devel information'
diff --git a/modules/devel/devel.services.yml b/modules/devel/devel.services.yml
deleted file mode 100644
index 2e74e1a..0000000
--- a/modules/devel/devel.services.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-services:
-  devel.error_subscriber:
-    class: Drupal\devel\EventSubscriber\ErrorHandlerSubscriber
-    arguments: ['@current_user']
-    tags:
-      - { name: event_subscriber }
-
-  devel.theme_rebuild_subscriber:
-    class: Drupal\devel\EventSubscriber\ThemeInfoRebuildSubscriber
-    arguments: ['@config.factory', '@current_user', '@theme_handler']
-    tags:
-      - { name: event_subscriber }
-
-  devel.route_subscriber:
-    class: Drupal\devel\Routing\RouteSubscriber
-    arguments: ['@entity_type.manager']
-    tags:
-      - { name: event_subscriber }
-
-  plugin.manager.devel_dumper:
-    class: Drupal\devel\DevelDumperPluginManager
-    parent: default_plugin_manager
-
-  devel.dumper:
-    class: Drupal\devel\DevelDumperManager
-    arguments: ['@config.factory', '@current_user', '@plugin.manager.devel_dumper']
-
-  devel.twig.debug_extension:
-    class: Drupal\devel\Twig\Extension\Debug
-    arguments: ['@devel.dumper']
-    tags:
-      - { name: twig.extension }
diff --git a/modules/devel/devel_generate/README.txt b/modules/devel/devel_generate/README.txt
deleted file mode 100644
index 2d73ba9..0000000
--- a/modules/devel/devel_generate/README.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-This module creates the "DevelGenerate" plugin type.
-
-All you need to do to provide a new instance for "DevelGenerate" plugin type
-is to create your class extending "DevelGenerateBase" and following the next steps.
-
-1 - Declaring your plugin with annotations:
-
-/**
- * Provides a ExampleDevelGenerate plugin.
- *
- * @DevelGenerate(
- *   id = "example",
- *   label = @Translation("example"),
- *   description = @Translation("Generate a given number of example elements. Optionally delete current example elements."),
- *   url = "example",
- *   permission = "administer example",
- *   settings = {
- *     "num" = 50,
- *     "kill" = FALSE,
- *     "another_property" = "default_value"
- *   }
- * )
- */
-
-2 - Implement "settingsForm" method to create a form using the properties from annotations.
-
-3 - Implement "handleDrushParams" method. It should return an array of values.
-
-4 - Implement "generateElements" method. You can write here your business logic
-using the array of values.
-
-Notes:
-
-You can alter existing properties for every plugin implementing hook_devel_generate_info_alter.
-
-DevelGenerateBaseInterface details base wrapping methods that most DevelGenerate implementations
-will want to directly inherit from Drupal\devel_generate\DevelGenerateBase.
-
-To give support for a new field type the field type base class should properly
-implements \Drupal\Core\Field\FieldItemInterface::generateSampleValue().
-Devel generate automatically use the values returned by this method during the
-generate process for generate placeholder field values. For more information
-see:
-https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Field%21FieldItemInterface.php/function/FieldItemInterface::generateSampleValue
diff --git a/modules/devel/devel_generate/devel_generate.batch.inc b/modules/devel/devel_generate/devel_generate.batch.inc
deleted file mode 100644
index 2bfa690..0000000
--- a/modules/devel/devel_generate/devel_generate.batch.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Wrapping function for invoking the right
- * method responsible for handle a given batch operation.
- * Available for every DevelGeneratePlugin.
- */
-function devel_generate_operation(Drupal\devel_generate\DevelGenerateBaseInterface $class, $method, $vars, &$context) {
-  return $class->$method($vars, $context);
-}
-
-/**
- * Common finish batch function available for
- * every DevelGeneratePlugin.
- */
-function devel_generate_batch_finished($success, $results, $operations) {
-
-  if ($success) {
-    $message = t('Finished @num elements created successfully.', array('@num' => $results['num']));
-  }
-  else {
-    $message = t('Finished with an error.');
-  }
-  drupal_set_message($message);
-}
diff --git a/modules/devel/devel_generate/devel_generate.info.yml b/modules/devel/devel_generate/devel_generate.info.yml
deleted file mode 100644
index 890261d..0000000
--- a/modules/devel/devel_generate/devel_generate.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-type: module
-name: 'Devel generate'
-description: 'Generate dummy users, nodes, menus, taxonomy terms...'
-package: Development
-# core: 8.x
-tags:
- - developer
-
-# Information added by Drupal.org packaging script on 2017-10-05
-version: '8.x-1.2'
-core: '8.x'
-project: 'devel'
-datestamp: 1507197848
diff --git a/modules/devel/devel_generate/devel_generate.module b/modules/devel/devel_generate/devel_generate.module
deleted file mode 100644
index 530a4fb..0000000
--- a/modules/devel/devel_generate/devel_generate.module
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
-use Drupal\Component\Utility\Random;
-use Drupal\devel_generate\DevelGenerateBase;
-use Drupal\node\NodeInterface;
-
-/**
- * Implements hook_menu_links_discovered_alter().
- */
-function devel_generate_menu_links_discovered_alter(&$links) {
-  $devel_generate_plugins = $devel_generate_manager = \Drupal::service('plugin.manager.develgenerate')->getDefinitions();
-  foreach ($devel_generate_plugins as $id => $plugin) {
-    $label = $plugin['label'];
-    $links["devel_generate.$id"] = array(
-      'title' => "Generate $label",
-      'parent' => 'system.admin_config_development',
-      'description' => $plugin['description'],
-      'route_name' => "devel_generate.$id",
-    );
-  }
-}
-
-/**
- * Implements hook_entity_insert().
- *
- * Inserts nodes properly based on generation options.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- *  The base node created on submit. Inspects $node->devel_generate.
- */
-function devel_generate_entity_insert(EntityInterface $entity) {
-  if ($entity->getEntityTypeId() != 'node' || !isset($entity->devel_generate)) {
-    return;
-  }
-  /** @var \Drupal\node\NodeInterface $entity */
-  $results = $entity->devel_generate;
-
-  if (!empty($results['max_comments'])) {
-    foreach ($entity->getFieldDefinitions() as $field_name => $field_definition) {
-      if ($field_definition->getType() == 'comment' && $entity->get($field_name)->status == CommentItemInterface::OPEN) {
-        // Add comments for each comment field on entity.
-        devel_generate_add_comments($entity, $field_definition, $results['users'], $results['max_comments'], $results['title_length']);
-      }
-    }
-  }
-
-  // Add an url alias. Cannot happen before save because we don't know the nid.
-  if (!empty($results['add_alias'])) {
-    $path = array(
-      'source' => '/node/' . $entity->id(),
-      'alias' => '/node-' . $entity->id() . '-' . $entity->bundle(),
-    );
-    \Drupal::service('path.alias_storage')->save($path['source'], $path['alias']);
-  }
-
-  // Add node statistics.
-  if (!empty($results['add_statistics']) && \Drupal::moduleHandler()->moduleExists('statistics')) {
-    devel_generate_add_statistics($entity);
-  }
-}
-
-/**
- * Create comments and add them to a node.
- *
- * @param \Drupal\node\NodeInterface $node
- *   Node to add comments to.
- * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
- *   The field storage definition.
- * @param array $users
- *   Array of users to assign comment authors.
- * @param int $max_comments
- *   Max number of comments to generate per node.
- * @param int $title_length
- *   Max length of the title of the comments.
- */
-function devel_generate_add_comments(NodeInterface $node, FieldDefinitionInterface $field_definition, $users, $max_comments, $title_length = 8) {
-  $parents = array();
-  $field_name = $field_definition->getName();
-  $num_comments = mt_rand(1, $max_comments);
-  for ($i = 1; $i <= $num_comments; $i++) {
-    switch ($i % 3) {
-      case 0:
-        // No parent.
-      case 1:
-        // Top level parent.
-        $parents = \Drupal::entityQuery('comment')
-          ->condition('pid', 0)
-          ->condition('entity_id', $node->id())
-          ->condition('entity_type', 'node')
-          ->condition('field_name', $field_name)
-          ->range(0, 1)
-          ->execute();
-        break;
-      case 2:
-        // Non top level parent.
-        $parents = \Drupal::entityQuery('comment')
-          ->condition('pid', 0, '>')
-          ->condition('entity_id', $node->id())
-          ->condition('entity_type', 'node')
-          ->condition('field_name', $field_name)
-          ->range(0, 1)
-          ->execute();
-        break;
-    }
-    $random = new Random();
-    $stub = array(
-      'entity_type' => $node->getEntityTypeId(),
-      'entity_id' => $node->id(),
-      'field_name' => $field_name,
-      'name' => 'devel generate',
-      'mail' => 'devel_generate@example.com',
-      'timestamp' => mt_rand($node->getCreatedTime(), REQUEST_TIME),
-      'subject' => substr($random->sentences(mt_rand(2, $title_length), TRUE), 0, 63),
-      'uid' => $users[array_rand($users)],
-      'langcode' => $node->language()->getId(),
-    );
-    if ($parents) {
-      $stub['pid'] = current($parents);
-    }
-    $comment = entity_create('comment', $stub);
-
-    //Populate all core fields on behalf of field.module
-    DevelGenerateBase::populateFields($comment);
-    $comment->save();
-  }
-}
-
-/**
- * Generate statistics information for a node.
- *
- * @param \Drupal\node\NodeInterface $node
- *   A node object.
- */
-function devel_generate_add_statistics(NodeInterface $node) {
-  $statistic = array(
-    'nid' => $node->id(),
-    'totalcount' => mt_rand(0, 500),
-    'timestamp' => REQUEST_TIME - mt_rand(0, $node->getCreatedTime()),
-  );
-  $statistic['daycount'] = mt_rand(0, $statistic['totalcount']);
-  db_insert('node_counter')->fields($statistic)->execute();
-}
diff --git a/modules/devel/devel_generate/devel_generate.permissions.yml b/modules/devel/devel_generate/devel_generate.permissions.yml
deleted file mode 100644
index 10f9479..0000000
--- a/modules/devel/devel_generate/devel_generate.permissions.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-administer devel_generate:
-  title: 'Administer devel_generate'
-
-permission_callbacks:
-  - \Drupal\devel_generate\DevelGeneratePermissions::permissions
diff --git a/modules/devel/devel_generate/devel_generate.routing.yml b/modules/devel/devel_generate/devel_generate.routing.yml
deleted file mode 100644
index eeea668..0000000
--- a/modules/devel/devel_generate/devel_generate.routing.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-route_callbacks:
-  - '\Drupal\devel_generate\Routing\DevelGenerateRoutes::routes'
\ No newline at end of file
diff --git a/modules/devel/devel_generate/devel_generate.services.yml b/modules/devel/devel_generate/devel_generate.services.yml
deleted file mode 100644
index 16025e1..0000000
--- a/modules/devel/devel_generate/devel_generate.services.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
-  plugin.manager.develgenerate:
-    class: Drupal\devel_generate\DevelGeneratePluginManager
-    parent: default_plugin_manager
diff --git a/modules/devel/devel_generate/drush.services.yml b/modules/devel/devel_generate/drush.services.yml
deleted file mode 100644
index e008b6c..0000000
--- a/modules/devel/devel_generate/drush.services.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-services:
-  develgenerate.command:
-    class: Drupal\devel_generate\Commands\DevelGenerateCommands
-    arguments: ['@plugin.manager.develgenerate']
-    tags:
-      -  { name: drush.command }
-
diff --git a/modules/devel/devel_generate/drush/devel_generate.drush8.inc b/modules/devel/devel_generate/drush/devel_generate.drush8.inc
deleted file mode 100644
index e28226d..0000000
--- a/modules/devel/devel_generate/drush/devel_generate.drush8.inc
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-/**
- * @file
- *  Integration with Drush8. Drush9 commands are in src/Commands.
- */
-use Drupal\devel_generate\DevelGenerateBaseInterface;
-use Drupal\devel_generate\DevelGeneratePluginManager;
-
-/**
- * Implementation of hook_drush_command().
- */
-function devel_generate_drush_command() {
-  $items['generate-users'] = array(
-    'callback' => 'drush_devel_generate',
-    'callback arguments' => array(
-      'plugin_id' => 'user',
-    ),
-    'description' => 'Create users.',
-    'arguments' => array(
-      'num' => 'Number of users to generate.',
-    ),
-    'options' => array(
-      'kill' => 'Delete all users before generating new ones.',
-      'roles' => 'A comma delimited list of role IDs which should be granted to the new users. No need to specify authenticated user role.',
-      'pass' => 'Specify a password to be set for all generated users.',
-    ),
-    'aliases' => array('genu'),
-  );
-  $items['generate-terms'] = array(
-    'callback' => 'drush_devel_generate',
-    'callback arguments' => array(
-      'plugin_id' => 'term',
-    ),
-    'description' => 'Create terms in specified vocabulary.',
-    'arguments' => array(
-      'machine_name' => 'Vocabulary machine name into which new terms will be inserted.',
-      'num' => 'Number of terms to insert. Defaults to 10.',
-    ),
-    'options' => array(
-      'kill' => 'Delete all terms in specified vocabulary before generating.',
-      'feedback' => 'An integer representing interval for insertion rate logging. Defaults to 1000',
-      'pipe' => 'Returns the list of generated terms, one per line.',
-    ),
-    'aliases' => array('gent'),
-
-  );
-  $items['generate-vocabs'] = array(
-    'callback' => 'drush_devel_generate',
-    'callback arguments' => array(
-      'plugin_id' => 'vocabulary',
-    ),
-    'description' => 'Create vocabularies.',
-    'arguments' => array(
-      'num' => 'Number of vocabularies to create. Defaults to 1.',
-    ),
-    'options' => array(
-      'kill' => 'Delete all vocabularies before generating.',
-      'pipe' => 'Returns the list of generated vocabularies, one per line.',
-    ),
-    'aliases' => array('genv'),
-  );
-  $items['generate-content'] = array(
-    'callback' => 'drush_devel_generate',
-    'callback arguments' => array(
-      'plugin_id' => 'content',
-    ),
-    'description' => 'Create content.',
-    'drupal dependencies' => array('devel_generate'),
-    'arguments' => array(
-      'num' => 'Number of nodes to generate.',
-      'max_comments' => 'Maximum number of comments to generate.',
-    ),
-    'options' => array(
-      'kill' => 'Delete all content before generating new content.',
-      'types' => 'A comma delimited list of content types to create. Defaults to page,article.',
-      'feedback' => 'An integer representing interval for insertion rate logging. Defaults to 1000',
-      'skip-fields' => 'A comma delimited list of fields to omit when generating random values',
-      'languages' => 'A comma-separated list of language codes',
-    ),
-    'aliases' => array('genc'),
-  );
-  $items['generate-menus'] = array(
-    'callback' => 'drush_devel_generate',
-    'callback arguments' => array(
-      'plugin_id' => 'menu',
-    ),
-    'description' => 'Create menus and menu items.',
-    'drupal dependencies' => array('devel_generate'), // Remove these once devel.module is moved down a directory. http://drupal.org/node/925246
-    'arguments' => array(
-      'number_menus' => 'Number of menus to generate. Defaults to 2.',
-      'number_links' => 'Number of links to generate. Defaults to 50.',
-      'max_depth' => 'Max link depth. Defaults to 3',
-      'max_width' => 'Max width of first level of links. Defaults to 8.',
-    ),
-    'options' => array(
-      'kill' => 'Delete all previously generated menus and links before generating new menus and links.',
-      'pipe' => 'Returns the list of generated menus, one per line.',
-    ),
-    'aliases' => array('genm'),
-  );
-  return $items;
-}
-
-/**
- * Implements drush_hook_COMMAND_validate().
- */
-function drush_devel_generate_generate_users_validate() {
-
-  //Array of "Callback arguments" and "command line args".
-  $params = func_get_args();
-  _drush_plugin_validate($params);
-}
-
-/**
- * Implements drush_hook_COMMAND_validate().
- */
-function drush_devel_generate_generate_terms_validate() {
-
-  //Array of "Callback arguments" and "command line args".
-  $params = func_get_args();
-  _drush_plugin_validate($params);
-}
-
-/**
- * Implements drush_hook_COMMAND_validate().
- */
-function drush_devel_generate_generate_vocabs_validate() {
-
-  //Array of "Callback arguments" and "command line args".
-  $params = func_get_args();
-  _drush_plugin_validate($params);
-}
-
-/**
- * Implements drush_hook_COMMAND_validate().
- */
-function drush_devel_generate_generate_content_validate() {
-
-  //Array of "Callback arguments" and "command line args".
-  $params = func_get_args();
-  _drush_plugin_validate($params);
-}
-
-/**
- * Implements drush_hook_COMMAND_validate().
- */
-function drush_devel_generate_generate_menus_validate() {
-
-  //Array of "Callback arguments" and "command line args".
-  $params = func_get_args();
-  _drush_plugin_validate($params);
-}
-
-/**
- * Helper function which returns an array with a plugin instance
- * for a given id and the validated values ready to be used by
- * the generate() function of the plugin.
- */
-function _drush_plugin_validate($params) {
-
-  $instance_and_values = &drupal_static('drush_devel_generate_generate_validate');
-  //Getting plugin_id and leaving the command line args
-  $plugin_id = array_shift($params);
-
-  if (!isset($instance_and_values[$plugin_id])) {
-
-    /** @var DevelGeneratePluginManager $manager */
-    $manager = \Drupal::service('plugin.manager.develgenerate');
-
-    /** @var DevelGenerateBaseInterface $instance */
-    $instance = $manager->createInstance($plugin_id, array());
-
-    //Plugin instance suit params in order to fit for generateElements
-    $values = $instance->validateDrushParams($params);
-    $instance_and_values[$plugin_id]['instance'] = $instance;
-    $instance_and_values[$plugin_id]['values'] = $values;
-  }
-
-  return $instance_and_values[$plugin_id];
-}
-
-/**
- * Command callback. Generate a number of elements.
- */
-function drush_devel_generate() {
-  $params = func_get_args();
-  $plugin_id = array_shift($params);
-  $instance_and_values = drupal_static('drush_devel_generate_generate_validate');
-
-  /** @var DevelGenerateBaseInterface $instance */
-  $instance = $instance_and_values[$plugin_id]['instance'];
-  $values = $instance_and_values[$plugin_id]['values'];
-  $instance->generate($values);
-
-}
diff --git a/modules/devel/devel_generate/src/Annotation/DevelGenerate.php b/modules/devel/devel_generate/src/Annotation/DevelGenerate.php
deleted file mode 100644
index 9a0ce25..0000000
--- a/modules/devel/devel_generate/src/Annotation/DevelGenerate.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a DevelGenerate annotation object.
- *
- * DevelGenerate handle the bulk creation of entites.
- *
- * Additional annotation keys for DevelGenerate can be defined in
- * hook_devel_generate_info_alter().
- *
- * @Annotation
- *
- * @see \Drupal\devel_generate\DevelGeneratePluginManager
- * @see \Drupal\devel_generate\DevelGenerateBaseInterface
- */
-class DevelGenerate extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the DevelGenerate type.
-   *
-   * @ingroup plugin_translatable
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $label;
-
-  /**
-   * A short description of the DevelGenerate type.
-   *
-   * @ingroup plugin_translatable
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $description;
-
-  /**
-   * A url to access the plugin settings form.
-   *
-   * @var string
-   */
-  public $url;
-
-  /**
-   * The permission required to access the plugin settings form.
-   *
-   * @var string
-   */
-  public $permission;
-
-  /**
-   * The name of the DevelGenerate class.
-   *
-   * This is not provided manually, it will be added by the discovery mechanism.
-   *
-   * @var string
-   */
-  public $class;
-
-  /**
-   * An array whose keys are the names of the settings available to the
-   * DevelGenerate settingsForm, and whose values are the default values for those settings.
-   *
-   * @var array
-   */
-  public $settings = array();
-
-  /**
-   * An array whose keys are the settings available to the
-   * DevelGenerate drush command: "suffix", "alias", "options" and "args".
-   *
-   * @var array
-   */
-  public $drushSettings = array();
-
-}
diff --git a/modules/devel/devel_generate/src/Commands/DevelGenerateCommands.php b/modules/devel/devel_generate/src/Commands/DevelGenerateCommands.php
deleted file mode 100644
index 493023f..0000000
--- a/modules/devel/devel_generate/src/Commands/DevelGenerateCommands.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-namespace Drupal\devel_generate\Commands;
-
-use Consolidation\AnnotatedCommand\CommandData;
-use Drupal\devel_generate\DevelGenerateBaseInterface;
-use Drush\Commands\DrushCommands;
-
-/**
- * For commands that are parts of modules, Drush expects to find commandfiles in
- * __MODULE__/src/Commands, and the namespace is Drupal/__MODULE__/Commands.
- *
- * In addition to a commandfile like this one, you need to add a drush.services.yml
- * in root of your module like this module does.
- */
-class DevelGenerateCommands extends DrushCommands {
-
-  /**
-   * @var DevelGenerateBaseInterface $manager
-   */
-  protected $manager;
-
-  /**
-   * The plugin instance.
-   *
-   * @var DevelGenerateBaseInterface $instance
-   */
-  protected $pluginInstance;
-
-  /**
-   * The Generate plugin parameters.
-   *
-   * @var array $parameters
-   */
-  protected $parameters;
-
-  /**
-   * DevelGenerateCommands constructor.
-   * @param $manager
-   */
-  public function __construct($manager) {
-    parent::__construct();
-    $this->setManager($manager);
-  }
-
-  /**
-   * @return \Drupal\devel_generate\DevelGenerateBaseInterface
-   */
-  public function getManager() {
-    return $this->manager;
-  }
-
-  /**
-   * @param \Drupal\devel_generate\DevelGenerateBaseInterface $manager
-   */
-  public function setManager($manager) {
-    $this->manager = $manager;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getPluginInstance() {
-    return $this->pluginInstance;
-  }
-
-  /**
-   * @param mixed $pluginInstance
-   */
-  public function setPluginInstance($pluginInstance) {
-    $this->pluginInstance = $pluginInstance;
-  }
-
-  /**
-   * @return array
-   */
-  public function getParameters() {
-    return $this->parameters;
-  }
-
-  /**
-   * @param array $parameters
-   */
-  public function setParameters($parameters) {
-    $this->parameters = $parameters;
-  }
-
-  /**
-   * Create users.
-   *
-   * @command devel-generate-users
-   * @pluginId user
-   * @param $num Number of users to generate.
-   * @option kill Delete all users before generating new ones.
-   * @option roles A comma delimited list of role IDs for new users. Don't specify 'authenticated'.
-   * @option pass Specify a password to be set for all generated users.
-   * @aliases genu
-   */
-  public function users($num = 50, $options = ['kill' => FALSE, 'roles' => '']) {
-    // @todo pass $options to the plugins.
-    $this->generate();
-  }
-
-  /**
-   * Create terms in specified vocabulary.
-   *
-   * @command devel-generate-terms
-   * @pluginId term
-   * @param $machine_name Vocabulary machine name into which new terms will be inserted.
-   * @param $num Number of terms to generate.
-   * @option kill Delete all terms before generating new ones.
-   * @option feedback An integer representing interval for insertion rate logging.
-   * @validate-entity-load taxonomy_vocabulary machine_name
-   * @aliases gent
-   */
-  public function terms($machine_name, $num = 50, $options = ['feedback' => 1000]) {
-    $this->generate();
-  }
-
-  /**
-   * Create vocabularies.
-   *
-   * @command devel-generate-vocabs
-   * @pluginId vocabulary
-   * @param $num Number of vocabularies to generate.
-   * @option kill Delete all vocabs before generating new ones.
-   * @aliases genv
-   * @validate-module-enabled taxonomy
-   */
-  public function vocabs($num = 1, $options = ['kill' => FALSE]) {
-    $this->generate();
-  }
-
-  /**
-   * Create menus.
-   *
-   * @command devel-generate-menus
-   * @pluginId menu
-   * @param $number_menus Number of menus to generate.
-   * @param $number_links Number of links to generate.
-   * @param $max_depth Max link depth.
-   * @param $max_width Max width of first level of links.
-   * @option kill Delete all content before generating new content.
-   * @aliases genm
-   * @validate-module-enabled menu_link_content
-   */
-  public function menus($number_menus = 2, $number_links = 50, $max_depth = 3, $max_width = 8, $options = ['kill' => FALSE]) {
-    $this->generate();
-  }
-
-  /**
-   * Create content.
-   *
-   * @command devel-generate-content
-   * @pluginId content
-   * @param $num Number of nodes to generate.
-   * @param $max_comments Maximum number of comments to generate.
-   * @option kill Delete all content before generating new content.
-   * @option types A comma delimited list of content types to create. Defaults to page,article.
-   * @option feedback An integer representing interval for insertion rate logging.
-   * @option skip-fields A comma delimited list of fields to omit when generating random values
-   * @option languages A comma-separated list of language codes
-   * @aliases genc
-   * @validate-module-enabled node
-   */
-  public function content($num = 50, $max_comments = 0, $options = ['kill' => FALSE, 'types' => 'page,article', 'feedback' => 1000]) {
-    $this->generate();
-    drush_backend_batch_process();
-  }
-
-
-  /**
-   * @hook validate
-   * @param \Consolidation\AnnotatedCommand\CommandData $commandData
-   * @return \Consolidation\AnnotatedCommand\CommandError|null
-   */
-  public function validate(CommandData $commandData) {
-    $manager = $this->getManager();
-    $args = $commandData->input()->getArguments();
-    $commandName = array_shift($args);
-    /** @var DevelGenerateBaseInterface $instance */
-    $instance = $manager->createInstance($commandData->annotationData()->get('pluginId'), array());
-    $this->setPluginInstance($instance);
-    $parameters = $instance->validateDrushParams($args, $commandData->input()->getOptions());
-    $this->setParameters($parameters);
-  }
-
-  public function generate() {
-    $instance = $this->getPluginInstance();
-    $instance->generate($this->getParameters());
-  }
-}
diff --git a/modules/devel/devel_generate/src/DevelGenerateBase.php b/modules/devel/devel_generate/src/DevelGenerateBase.php
deleted file mode 100644
index 1d38a35..0000000
--- a/modules/devel/devel_generate/src/DevelGenerateBase.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate;
-
-use Drupal\Component\Utility\Random;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\PluginBase;
-
-/**
- * Provides a base DevelGenerate plugin implementation.
- */
-abstract class DevelGenerateBase extends PluginBase implements DevelGenerateBaseInterface {
-
-  /**
-   * The plugin settings.
-   *
-   * @var array
-   */
-  protected $settings = array();
-
-  /**
-   * The random data generator.
-   *
-   * @var \Drupal\Component\Utility\Random
-   */
-  protected $random;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSetting($key) {
-    // Merge defaults if we have no value for the key.
-    if (!array_key_exists($key, $this->settings)) {
-      $this->settings = $this->getDefaultSettings();
-    }
-    return isset($this->settings[$key]) ? $this->settings[$key] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefaultSettings() {
-    $definition = $this->getPluginDefinition();
-    return $definition['settings'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSettings() {
-    return $this->settings;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsForm(array $form, FormStateInterface $form_state) {
-    return array();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  function settingsFormValidate(array $form, FormStateInterface $form_state) {
-    // Validation is optional.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function generate(array $values) {
-    $this->generateElements($values);
-    $this->setMessage('Generate process complete.');
-  }
-
-  /**
-   * Business logic relating with each DevelGenerate plugin
-   *
-   * @param array $values
-   *   The input values from the settings form.
-   */
-  protected function generateElements(array $values) {
-
-  }
-
-  /**
-   * Populate the fields on a given entity with sample values.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to be enriched with sample field values.
-   */
-  public static function populateFields(EntityInterface $entity) {
-    /** @var \Drupal\field\FieldConfigInterface[] $instances */
-    $instances = entity_load_multiple_by_properties('field_config', array('entity_type' => $entity->getEntityType()->id(), 'bundle' => $entity->bundle()));
-
-    if ($skips = function_exists('drush_get_option') ? drush_get_option('skip-fields', '') : @$_REQUEST['skip-fields']) {
-      foreach (explode(',', $skips) as $skip) {
-        unset($instances[$skip]);
-      }
-    }
-
-    foreach ($instances as $instance) {
-      $field_storage = $instance->getFieldStorageDefinition();
-      $max = $cardinality = $field_storage->getCardinality();
-      if ($cardinality == FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED) {
-        // Just an arbitrary number for 'unlimited'
-        $max = rand(1, 3);
-      }
-      $field_name = $field_storage->getName();
-      $entity->$field_name->generateSampleItems($max);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function handleDrushParams($args) {
-
-  }
-
-  /**
-   * Set a message for either drush or the web interface.
-   *
-   * @param string $msg
-   *   The message to display.
-   * @param string $type
-   *   (optional) The message type, as defined by drupal_set_message(). Defaults
-   *   to 'status'
-   */
-  protected function setMessage($msg, $type = 'status') {
-    $function = 'drupal_set_message';
-    if (function_exists('drush_log')) {
-      $function = 'drush_log';
-      $msg = strip_tags($msg);
-    }
-    $function($msg, $type);
-  }
-
-  /**
-   * Check if a given param is a number.
-   *
-   * @param mixed $number
-   *   The parameter to check.
-   *
-   * @return bool
-   *   TRUE if the parameter is a number, FALSE otherwise.
-   */
-  public static function isNumber($number) {
-    if ($number == NULL) return FALSE;
-    if (!is_numeric($number)) return FALSE;
-    return TRUE;
-  }
-
-  /**
-   * Returns the random data generator.
-   *
-   * @return \Drupal\Component\Utility\Random
-   *   The random data generator.
-   */
-  protected function getRandom() {
-    if (!$this->random) {
-      $this->random = new Random();
-    }
-    return $this->random;
-  }
-
-  protected function isDrush8() {
-    return function_exists('drush_drupal_load_autoloader');
-  }
-}
diff --git a/modules/devel/devel_generate/src/DevelGenerateBaseInterface.php b/modules/devel/devel_generate/src/DevelGenerateBaseInterface.php
deleted file mode 100644
index c2b814a..0000000
--- a/modules/devel/devel_generate/src/DevelGenerateBaseInterface.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate;
-
-use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Base interface definition for "DevelGenerate" plugins.
- *
- * This interface details base wrapping methods that most DevelGenerate implementations
- * will want to directly inherit from Drupal\devel_generate\DevelGenerateBase.
- *
- * DevelGenerate impementationa plugins should developing settingsForm() and generateElements()
- * to achieve its own behaviour.
- *
- */
-interface DevelGenerateBaseInterface extends PluginInspectionInterface {
-
-  /**
-   * Returns the array of settings, including defaults for missing settings.
-   *
-   * @return array
-   *   The array of settings.
-   */
-  function getSetting($key);
-
-  /**
-   * Returns the default settings for the plugin.
-   *
-   * @return array
-   *   The array of default setting values, keyed by setting names.
-   */
-  function getDefaultSettings();
-
-  /**
-   * Returns the current settings for the plugin.
-   *
-   * @return array
-   *   The array of current setting values, keyed by setting names.
-   */
-  function getSettings();
-
-  /**
-   * Returns the form for the plugin.
-   *
-   * @return array
-   *   The array of default setting values, keyed by setting names.
-   */
-  function settingsForm(array $form, FormStateInterface $form_state);
-
-  /**
-   * Form validation handler.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  function settingsFormValidate(array $form, FormStateInterface $form_state);
-
-  /**
-   * Execute the instructions in common for all DevelGenerate plugin
-   *
-   * @param array $values
-   *   The input values from the settings form.
-   */
-  function generate(array $values);
-
-  /**
-   * Responsible for validating Drush params.
-   *
-   * @Return an array of values ready to be used for generateElements()
-   */
-  function validateDrushParams($args);
-
-}
diff --git a/modules/devel/devel_generate/src/DevelGenerateException.php b/modules/devel/devel_generate/src/DevelGenerateException.php
deleted file mode 100644
index c3f71b8..0000000
--- a/modules/devel/devel_generate/src/DevelGenerateException.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate;
-
-use Drupal\Component\Plugin\Exception;
-
-/**
- * DevelGenerateException extending Generic Plugin exception class.
- */
-class DevelGenerateException extends \Exception {
-
-}
diff --git a/modules/devel/devel_generate/src/DevelGeneratePermissions.php b/modules/devel/devel_generate/src/DevelGeneratePermissions.php
deleted file mode 100644
index 80a9daf..0000000
--- a/modules/devel/devel_generate/src/DevelGeneratePermissions.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate;
-
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides dynamic permissions of the filter module.
- */
-class DevelGeneratePermissions implements ContainerInjectionInterface {
-
-  /**
-   * The plugin manager.
-   *
-   * @var \Drupal\devel_generate\DevelGeneratePluginManager;
-   */
-  protected $develGeneratePluginManager;
-
-  /**
-   * Constructs a new DevelGeneratePermissions instance.
-   *
-   * @param \Drupal\devel_generate\DevelGeneratePluginManager $develGeneratePluginManager
-   *   The plugin manager.
-   */
-  public function __construct(DevelGeneratePluginManager $develGeneratePluginManager) {
-    $this->develGeneratePluginManager = $develGeneratePluginManager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('plugin.manager.develgenerate'));
-  }
-
-  /*
-   * A permissions callback.
-   *
-   * @see devel_generate.permissions.yml.
-   *
-   * @return array
-   */
-  function permissions() {
-    $devel_generate_plugins = $this->develGeneratePluginManager->getDefinitions();
-    foreach ($devel_generate_plugins as $plugin) {
-
-      $permission = $plugin['permission'];
-      $permissions[$permission] = array(
-        'title' => t($permission),
-      );
-    }
-
-//    $permissions = array(
-//      'administer devel_generate' => array(
-//        'title' => t('Administer devel generate'),
-//      ),
-//    );
-    return $permissions;
-  }
-
-}
diff --git a/modules/devel/devel_generate/src/DevelGeneratePluginManager.php b/modules/devel/devel_generate/src/DevelGeneratePluginManager.php
deleted file mode 100644
index 626e6dc..0000000
--- a/modules/devel/devel_generate/src/DevelGeneratePluginManager.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate;
-
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-
-/**
- * Plugin type manager for DevelGenerate plugins.
- */
-Class DevelGeneratePluginManager extends DefaultPluginManager {
-
-  /**
-   * Constructs a DevelGeneratePluginManager object.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   Cache backend instance to use.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler to invoke the alter hook with.
-   */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    parent::__construct('Plugin/DevelGenerate', $namespaces, $module_handler, NULL, 'Drupal\devel_generate\Annotation\DevelGenerate');
-    $this->alterInfo('devel_generate_info');
-    $this->setCacheBackend($cache_backend, 'devel_generate_plugins');
-  }
-
-}
diff --git a/modules/devel/devel_generate/src/Form/DevelGenerateForm.php b/modules/devel/devel_generate/src/Form/DevelGenerateForm.php
deleted file mode 100644
index 63c708b..0000000
--- a/modules/devel/devel_generate/src/Form/DevelGenerateForm.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate\Form;
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\devel_generate\DevelGenerateException;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Defines a form that allows privileged users to generate entities.
- */
-class DevelGenerateForm extends FormBase {
-
-  /**
-   * The manager to be used for instantiating plugins.
-   *
-   * @var \Drupal\Component\Plugin\PluginManagerInterface
-   */
-  protected $develGenerateManager;
-
-  /**
-   * Constructs a new DevelGenerateForm object.
-   *
-   * @param \Drupal\Component\Plugin\PluginManagerInterface $devel_generate_manager
-   *   The manager to be used for instantiating plugins.
-   */
-  public function __construct(PluginManagerInterface $devel_generate_manager) {
-    $this->develGenerateManager = $devel_generate_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.develgenerate')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'devel_generate_form_' . $this->getPluginIdFromRequest();
-  }
-
-  /**
-   * Returns the value of the param _plugin_id for the current request.
-   *
-   * @see \Drupal\devel_generate\Routing\DevelGenerateRouteSubscriber
-   */
-  protected function getPluginIdFromRequest() {
-    $request = $this->getRequest();
-    return $request->get('_plugin_id');
-  }
-
-  /**
-   * Returns a DevelGenerate plugin instance for a given plugin id.
-   *
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   *
-   * @return \Drupal\devel_generate\DevelGenerateBaseInterface
-   *   A DevelGenerate plugin instance.
-   */
-  public function getPluginInstance($plugin_id) {
-    $instance = $this->develGenerateManager->createInstance($plugin_id, array());
-    return $instance;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $plugin_id = $this->getPluginIdFromRequest();
-    $instance = $this->getPluginInstance($plugin_id);
-    $form = $instance->settingsForm($form, $form_state);
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => $this->t('Generate'),
-      '#button_type' => 'primary',
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $plugin_id = $this->getPluginIdFromRequest();
-    $instance = $this->getPluginInstance($plugin_id);
-    $instance->settingsFormValidate($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    try {
-      $plugin_id = $this->getPluginIdFromRequest();
-      $instance = $this->getPluginInstance($plugin_id);
-      $instance->generate($form_state->getValues());
-    }
-    catch (DevelGenerateException $e) {
-      $this->logger('DevelGenerate', $this->t('Failed to generate elements due to "%error".', array('%error' => $e->getMessage())));
-      drupal_set_message($this->t('Failed to generate elements due to "%error".', array('%error' => $e->getMessage())));
-    }
-  }
-
-}
diff --git a/modules/devel/devel_generate/src/Plugin/DevelGenerate/ContentDevelGenerate.php b/modules/devel/devel_generate/src/Plugin/DevelGenerate/ContentDevelGenerate.php
deleted file mode 100644
index 34e3e71..0000000
--- a/modules/devel/devel_generate/src/Plugin/DevelGenerate/ContentDevelGenerate.php
+++ /dev/null
@@ -1,506 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate\Plugin\DevelGenerate;
-
-use Drupal\comment\CommentManagerInterface;
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Core\Datetime\DateFormatterInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Routing\UrlGeneratorInterface;
-use Drupal\devel_generate\DevelGenerateBase;
-use Drupal\field\Entity\FieldConfig;
-use Drush\Utils\StringUtils;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a ContentDevelGenerate plugin.
- *
- * @DevelGenerate(
- *   id = "content",
- *   label = @Translation("content"),
- *   description = @Translation("Generate a given number of content. Optionally delete current content."),
- *   url = "content",
- *   permission = "administer devel_generate",
- *   settings = {
- *     "num" = 50,
- *     "kill" = FALSE,
- *     "max_comments" = 0,
- *     "title_length" = 4
- *   }
- * )
- */
-class ContentDevelGenerate extends DevelGenerateBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The node storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $nodeStorage;
-
-  /**
-   * The node type storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $nodeTypeStorage;
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The comment manager service.
-   *
-   * @var \Drupal\comment\CommentManagerInterface
-   */
-  protected $commentManager;
-
-  /**
-   * The language manager.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
-   * The url generator service.
-   *
-   * @var \Drupal\Core\Routing\UrlGeneratorInterface
-   */
-  protected $urlGenerator;
-
-  /**
-   * The date formatter service.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatterInterface
-   */
-  protected $dateFormatter;
-
-  /**
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param array $plugin_definition
-   * @param \Drupal\Core\Entity\EntityStorageInterface $node_storage
-   *   The node storage.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $node_type_storage
-   *   The node type storage.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   * @param \Drupal\comment\CommentManagerInterface $comment_manager
-   *   The comment manager service.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The language manager.
-   * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
-   *   The url generator service.
-   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
-   *   The date formatter service.
-   */
-  public function __construct(array $configuration, $plugin_id, array $plugin_definition, EntityStorageInterface $node_storage, EntityStorageInterface $node_type_storage, ModuleHandlerInterface $module_handler, CommentManagerInterface $comment_manager = NULL, LanguageManagerInterface $language_manager, UrlGeneratorInterface $url_generator, DateFormatterInterface $date_formatter) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->moduleHandler = $module_handler;
-    $this->nodeStorage = $node_storage;
-    $this->nodeTypeStorage = $node_type_storage;
-    $this->commentManager = $comment_manager;
-    $this->languageManager = $language_manager;
-    $this->urlGenerator = $url_generator;
-    $this->dateFormatter = $date_formatter;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    $entity_manager = $container->get('entity.manager');
-    return new static(
-      $configuration, $plugin_id, $plugin_definition,
-      $entity_manager->getStorage('node'),
-      $entity_manager->getStorage('node_type'),
-      $container->get('module_handler'),
-      $container->has('comment.manager') ? $container->get('comment.manager') : NULL,
-      $container->get('language_manager'),
-      $container->get('url_generator'),
-      $container->get('date.formatter')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsForm(array $form, FormStateInterface $form_state) {
-    $types = $this->nodeTypeStorage->loadMultiple();
-
-    if (empty($types)) {
-      $create_url = $this->urlGenerator->generateFromRoute('node.type_add');
-      $this->setMessage($this->t('You do not have any content types that can be generated. <a href=":create-type">Go create a new content type</a>', array(':create-type' => $create_url)), 'error', FALSE);
-      return;
-    }
-
-    $options = array();
-
-    foreach ($types as $type) {
-      $options[$type->id()] = array(
-        'type' => array('#markup' => $type->label()),
-      );
-      if ($this->commentManager) {
-        $comment_fields = $this->commentManager->getFields('node');
-        $map = array($this->t('Hidden'), $this->t('Closed'), $this->t('Open'));
-
-        $fields = array();
-        foreach ($comment_fields as $field_name => $info) {
-          // Find all comment fields for the bundle.
-          if (in_array($type->id(), $info['bundles'])) {
-            $instance = FieldConfig::loadByName('node', $type->id(), $field_name);
-            $default_value = $instance->getDefaultValueLiteral();
-            $default_mode = reset($default_value);
-            $fields[] = new FormattableMarkup('@field: @state', array(
-              '@field' => $instance->label(),
-              '@state' => $map[$default_mode['status']],
-            ));
-          }
-        }
-        // @todo Refactor display of comment fields.
-        if (!empty($fields)) {
-          $options[$type->id()]['comments'] = array(
-            'data' => array(
-              '#theme' => 'item_list',
-              '#items' => $fields,
-            ),
-          );
-        }
-        else {
-          $options[$type->id()]['comments'] = $this->t('No comment fields');
-        }
-      }
-    }
-
-    $header = array(
-      'type' => $this->t('Content type'),
-    );
-    if ($this->commentManager) {
-      $header['comments'] = array(
-        'data' => $this->t('Comments'),
-        'class' => array(RESPONSIVE_PRIORITY_MEDIUM),
-      );
-    }
-
-    $form['node_types'] = array(
-      '#type' => 'tableselect',
-      '#header' => $header,
-      '#options' => $options,
-    );
-
-    $form['kill'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('<strong>Delete all content</strong> in these content types before generating new content.'),
-      '#default_value' => $this->getSetting('kill'),
-    );
-    $form['num'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('How many nodes would you like to generate?'),
-      '#default_value' => $this->getSetting('num'),
-      '#required' => TRUE,
-      '#min' => 0,
-    );
-
-    $options = array(1 => $this->t('Now'));
-    foreach (array(3600, 86400, 604800, 2592000, 31536000) as $interval) {
-      $options[$interval] = $this->dateFormatter->formatInterval($interval, 1) . ' ' . $this->t('ago');
-    }
-    $form['time_range'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('How far back in time should the nodes be dated?'),
-      '#description' => $this->t('Node creation dates will be distributed randomly from the current time, back to the selected time.'),
-      '#options' => $options,
-      '#default_value' => 604800,
-    );
-
-    $form['max_comments'] = array(
-      '#type' => $this->moduleHandler->moduleExists('comment') ? 'number' : 'value',
-      '#title' => $this->t('Maximum number of comments per node.'),
-      '#description' => $this->t('You must also enable comments for the content types you are generating. Note that some nodes will randomly receive zero comments. Some will receive the max.'),
-      '#default_value' => $this->getSetting('max_comments'),
-      '#min' => 0,
-      '#access' => $this->moduleHandler->moduleExists('comment'),
-    );
-    $form['title_length'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('Maximum number of words in titles'),
-      '#default_value' => $this->getSetting('title_length'),
-      '#required' => TRUE,
-      '#min' => 1,
-      '#max' => 255,
-    );
-    $form['add_alias'] = array(
-      '#type' => 'checkbox',
-      '#disabled' => !$this->moduleHandler->moduleExists('path'),
-      '#description' => $this->t('Requires path.module'),
-      '#title' => $this->t('Add an url alias for each node.'),
-      '#default_value' => FALSE,
-    );
-    $form['add_statistics'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Add statistics for each node (node_counter table).'),
-      '#default_value' => TRUE,
-      '#access' => $this->moduleHandler->moduleExists('statistics'),
-    );
-
-    $options = array();
-    // We always need a language.
-    $languages = $this->languageManager->getLanguages(LanguageInterface::STATE_ALL);
-    foreach ($languages as $langcode => $language) {
-      $options[$langcode] = $language->getName();
-    }
-
-    $form['add_language'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Set language on nodes'),
-      '#multiple' => TRUE,
-      '#description' => $this->t('Requires locale.module'),
-      '#options' => $options,
-      '#default_value' => array(
-        $this->languageManager->getDefaultLanguage()->getId(),
-      ),
-    );
-
-    $form['#redirect'] = FALSE;
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  function settingsFormValidate(array $form, FormStateInterface $form_state) {
-    if (!array_filter($form_state->getValue('node_types'))) {
-      $form_state->setErrorByName('node_types', $this->t('Please select at least one content type'));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function generateElements(array $values) {
-    if ($values['num'] <= 50 && $values['max_comments'] <= 10) {
-      $this->generateContent($values);
-    }
-    else {
-      $this->generateBatchContent($values);
-    }
-  }
-
-  /**
-   * Method responsible for creating content when
-   * the number of elements is less than 50.
-   */
-  private function generateContent($values) {
-    $values['node_types'] = array_filter($values['node_types']);
-    if (!empty($values['kill']) && $values['node_types']) {
-      $this->contentKill($values);
-    }
-
-    if (!empty($values['node_types'])) {
-      // Generate nodes.
-      $this->develGenerateContentPreNode($values);
-      $start = time();
-      for ($i = 1; $i <= $values['num']; $i++) {
-        $this->develGenerateContentAddNode($values);
-        if ($this->isDrush8() && function_exists('drush_log') && $i % drush_get_option('feedback', 1000) == 0) {
-          $now = time();
-          drush_log(dt('Completed @feedback nodes (@rate nodes/min)', array('@feedback' => drush_get_option('feedback', 1000), '@rate' => (drush_get_option('feedback', 1000) * 60) / ($now - $start))), 'ok');
-          $start = $now;
-        }
-      }
-    }
-    $this->setMessage($this->formatPlural($values['num'], '1 node created.', 'Finished creating @count nodes'));
-  }
-
-  /**
-   * Method responsible for creating content when
-   * the number of elements is greater than 50.
-   */
-  private function generateBatchContent($values) {
-    // Setup the batch operations and save the variables.
-    $operations[] = array('devel_generate_operation', array($this, 'batchContentPreNode', $values));
-
-    // Add the kill operation.
-    if ($values['kill']) {
-      $operations[] = array('devel_generate_operation', array($this, 'batchContentKill', $values));
-    }
-
-    // Add the operations to create the nodes.
-    for ($num = 0; $num < $values['num']; $num ++) {
-      $operations[] = array('devel_generate_operation', array($this, 'batchContentAddNode', $values));
-    }
-
-    // Set the batch.
-    $batch = array(
-      'title' => $this->t('Generating Content'),
-      'operations' => $operations,
-      'finished' => 'devel_generate_batch_finished',
-      'file' => drupal_get_path('module', 'devel_generate') . '/devel_generate.batch.inc',
-    );
-    batch_set($batch);
-  }
-
-  public function batchContentPreNode($vars, &$context) {
-    $context['results'] = $vars;
-    $context['results']['num'] = 0;
-    $this->develGenerateContentPreNode($context['results']);
-  }
-
-  public function batchContentAddNode($vars, &$context) {
-    $this->develGenerateContentAddNode($context['results']);
-    $context['results']['num']++;
-  }
-
-  public function batchContentKill($vars, &$context) {
-    $this->contentKill($context['results']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateDrushParams($args, $options = []) {
-    $add_language = $this->isDrush8() ? drush_get_option('languages') : $options['languages'];
-    if (!empty($add_language)) {
-      $add_language = explode(',', str_replace(' ', '', $add_language));
-      // Intersect with the enabled languages to make sure the language args
-      // passed are actually enabled.
-      $values['values']['add_language'] = array_intersect($add_language, array_keys($this->languageManager->getLanguages(LanguageInterface::STATE_ALL)));
-    }
-
-    $values['kill'] = $this->isDrush8() ? drush_get_option('kill') : $options['kill'];
-    $values['title_length'] = 6;
-    $values['num'] = array_shift($args);
-    $values['max_comments'] = array_shift($args);
-    $all_types = array_keys(node_type_get_names());
-    $default_types = array_intersect(array('page', 'article'), $all_types);
-    if ($this->isDrush8()) {
-      $selected_types = _convert_csv_to_array(drush_get_option('types', $default_types));
-    }
-    else {
-      $selected_types = StringUtils::csvToArray($options['types'] ?: $default_types);
-    }
-
-    if (empty($selected_types)) {
-      throw new \Exception(dt('No content types available'));
-    }
-
-    $values['node_types'] = array_combine($selected_types, $selected_types);
-    $node_types = array_filter($values['node_types']);
-
-    if (!empty($values['kill']) && empty($node_types)) {
-      throw new \Exception(dt('Please provide content type (--types) in which you want to delete the content.'));
-    }
-
-    // Checks for any missing content types before generating nodes.
-    if (array_diff($node_types, $all_types)) {
-      throw new \Exception(dt('One or more content types have been entered that don\'t exist on this site'));
-    }
-
-    return $values;
-  }
-
-  /**
-   * Deletes all nodes of given node types.
-   *
-   * @param array $values
-   *   The input values from the settings form.
-   */
-  protected function contentKill($values) {
-    $nids = $this->nodeStorage->getQuery()
-      ->condition('type', $values['node_types'], 'IN')
-      ->execute();
-
-    if (!empty($nids)) {
-      $nodes = $this->nodeStorage->loadMultiple($nids);
-      $this->nodeStorage->delete($nodes);
-      $this->setMessage($this->t('Deleted %count nodes.', array('%count' => count($nids))));
-    }
-  }
-
-  /**
-   * Return the same array passed as parameter
-   * but with an array of uids for the key 'users'.
-   */
-  protected function develGenerateContentPreNode(&$results) {
-    // Get user id.
-    $users = $this->getUsers();
-    $results['users'] = $users;
-  }
-
-  /**
-   * Create one node. Used by both batch and non-batch code branches.
-   */
-  protected function develGenerateContentAddNode(&$results) {
-    if (!isset($results['time_range'])) {
-      $results['time_range'] = 0;
-    }
-    $users = $results['users'];
-
-    $node_type = array_rand(array_filter($results['node_types']));
-    $uid = $users[array_rand($users)];
-
-    $node = $this->nodeStorage->create(array(
-      'nid' => NULL,
-      'type' => $node_type,
-      'title' => $this->getRandom()->sentences(mt_rand(1, $results['title_length']), TRUE),
-      'uid' => $uid,
-      'revision' => mt_rand(0, 1),
-      'status' => TRUE,
-      'promote' => mt_rand(0, 1),
-      'created' => REQUEST_TIME - mt_rand(0, $results['time_range']),
-      'langcode' => $this->getLangcode($results),
-    ));
-
-    // A flag to let hook_node_insert() implementations know that this is a
-    // generated node.
-    $node->devel_generate = $results;
-
-    // Populate all fields with sample values.
-    $this->populateFields($node);
-
-    // See devel_generate_node_insert() for actions that happen before and after
-    // this save.
-    $node->save();
-  }
-
-  /**
-   * Determine language based on $results.
-   */
-  protected function getLangcode($results) {
-    if (isset($results['add_language'])) {
-      $langcodes = $results['add_language'];
-      $langcode = $langcodes[array_rand($langcodes)];
-    }
-    else {
-      $langcode = $this->languageManager->getDefaultLanguage()->getId();
-    }
-    return $langcode;
-  }
-
-  /**
-   * Retrieve 50 uids from the database.
-   */
-  protected function getUsers() {
-    $users = array();
-    $result = db_query_range("SELECT uid FROM {users}", 0, 50);
-    foreach ($result as $record) {
-      $users[] = $record->uid;
-    }
-    return $users;
-  }
-
-}
diff --git a/modules/devel/devel_generate/src/Plugin/DevelGenerate/MenuDevelGenerate.php b/modules/devel/devel_generate/src/Plugin/DevelGenerate/MenuDevelGenerate.php
deleted file mode 100644
index 6ccacc2..0000000
--- a/modules/devel/devel_generate/src/Plugin/DevelGenerate/MenuDevelGenerate.php
+++ /dev/null
@@ -1,405 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate\Plugin\DevelGenerate;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Menu\MenuLinkTreeInterface;
-use Drupal\Core\Menu\MenuTreeParameters;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\devel_generate\DevelGenerateBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a MenuDevelGenerate plugin.
- *
- * @DevelGenerate(
- *   id = "menu",
- *   label = @Translation("menus"),
- *   description = @Translation("Generate a given number of menus and menu links. Optionally delete current menus."),
- *   url = "menu",
- *   permission = "administer devel_generate",
- *   settings = {
- *     "num_menus" = 2,
- *     "num_links" = 50,
- *     "title_length" = 12,
- *     "max_width" = 6,
- *     "kill" = FALSE,
- *   }
- * )
- */
-class MenuDevelGenerate extends DevelGenerateBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The menu tree service.
-   *
-   * @var \Drupal\Core\Menu\MenuLinkTreeInterface
-   */
-  protected $menuLinkTree;
-
-  /**
-   * The menu storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $menuStorage;
-
-  /**
-   * The menu link storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $menuLinkContentStorage;
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * Constructs a MenuDevelGenerate object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Menu\MenuLinkTreeInterface $menu_tree
-   *   The menu tree service.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $menu_storage
-   *   The menu storage.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $menu_link_storage
-   *   The menu storage.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MenuLinkTreeInterface $menu_tree, EntityStorageInterface $menu_storage, EntityStorageInterface $menu_link_storage, ModuleHandlerInterface $module_handler) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->menuLinkTree = $menu_tree;
-    $this->menuStorage = $menu_storage;
-    $this->menuLinkContentStorage = $menu_link_storage;
-    $this->moduleHandler = $module_handler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    $entity_manager = $container->get('entity.manager');
-    return new static(
-      $configuration, $plugin_id, $plugin_definition,
-      $container->get('menu.link_tree'),
-      $entity_manager->getStorage('menu'),
-      $entity_manager->getStorage('menu_link_content'),
-      $container->get('module_handler')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsForm(array $form, FormStateInterface $form_state) {
-    $menu_enabled = $this->moduleHandler->moduleExists('menu_ui');
-    if ($menu_enabled) {
-      $menus = array('__new-menu__' => $this->t('Create new menu(s)')) + menu_ui_get_menus();
-    }
-    else {
-      $menus = menu_list_system_menus();
-    }
-    $form['existing_menus'] = array(
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Generate links for these menus'),
-      '#options' => $menus,
-      '#default_value' => array('__new-menu__'),
-      '#required' => TRUE,
-    );
-    if ($menu_enabled) {
-      $form['num_menus'] = array(
-        '#type' => 'number',
-        '#title' => $this->t('Number of new menus to create'),
-        '#default_value' => $this->getSetting('num_menus'),
-        '#min' => 0,
-        '#states' => array(
-          'visible' => array(
-            ':input[name="existing_menus[__new-menu__]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-    }
-    $form['num_links'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('Number of links to generate'),
-      '#default_value' => $this->getSetting('num_links'),
-      '#required' => TRUE,
-      '#min' => 0,
-    );
-    $form['title_length'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('Maximum number of characters in menu and menu link names'),
-      '#description' => $this->t('The minimum length is 2.'),
-      '#default_value' => $this->getSetting('title_length'),
-      '#required' => TRUE,
-      '#min' => 2,
-      '#max' => 128,
-    );
-    $form['link_types'] = array(
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Types of links to generate'),
-      '#options' => array(
-        'node' => $this->t('Nodes'),
-        'front' => $this->t('Front page'),
-        'external' => $this->t('External'),
-      ),
-      '#default_value' => array('node', 'front', 'external'),
-      '#required' => TRUE,
-    );
-    $form['max_depth'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Maximum link depth'),
-      '#options' => range(0, $this->menuLinkTree->maxDepth()),
-      '#default_value' => floor($this->menuLinkTree->maxDepth() / 2),
-      '#required' => TRUE,
-    );
-    unset($form['max_depth']['#options'][0]);
-    $form['max_width'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('Maximum menu width'),
-      '#default_value' => $this->getSetting('max_width'),
-      '#description' => $this->t('Limit the width of the generated menu\'s first level of links to a certain number of items.'),
-      '#required' => TRUE,
-      '#min' => 0,
-    );
-    $form['kill'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Delete existing custom generated menus and menu links before generating new ones.'),
-      '#default_value' => $this->getSetting('kill'),
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function generateElements(array $values) {
-    // If the create new menus checkbox is off, set the number of new menus to 0.
-    if (!isset($values['existing_menus']['__new-menu__']) || !$values['existing_menus']['__new-menu__']) {
-      $values['num_menus'] = 0;
-    }
-    else {
-      // Unset the aux menu to avoid attach menu new items.
-      unset($values['existing_menus']['__new-menu__']);
-    }
-
-    // Delete custom menus.
-    if ($values['kill']) {
-      $this->deleteMenus();
-      $this->setMessage($this->t('Deleted existing menus and links.'));
-    }
-
-    // Generate new menus.
-    $new_menus = $this->generateMenus($values['num_menus'], $values['title_length']);
-    if (!empty($new_menus)) {
-      $this->setMessage($this->t('Created the following new menus: @menus', array('@menus' => implode(', ', $new_menus))));
-    }
-
-    // Generate new menu links.
-    $menus = $new_menus;
-    if (isset($values['existing_menus'])) {
-      $menus = $menus + $values['existing_menus'];
-    }
-    $new_links = $this->generateLinks($values['num_links'], $menus, $values['title_length'], $values['link_types'], $values['max_depth'], $values['max_width']);
-    $this->setMessage($this->t('Created @count new menu links.', array('@count' => count($new_links))));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateDrushParams($args, $options = []) {
-
-    $link_types = array('node', 'front', 'external');
-    $values = array(
-      'num_menus' => array_shift($args),
-      'num_links' => array_shift($args),
-      'kill' => $this->isDrush8() ? drush_get_option('kill') : $options['kill'],
-      'pipe' => $this->isDrush8() ? drush_get_option('pipe') : $options['pipe'],
-      'link_types' => array_combine($link_types, $link_types),
-    );
-
-    $max_depth = array_shift($args);
-    $max_width = array_shift($args);
-    $values['max_depth'] = $max_depth ? $max_depth : 3;
-    $values['max_width'] = $max_width ? $max_width : 8;
-    $values['title_length'] = $this->getSetting('title_length');
-    $values['existing_menus']['__new-menu__'] = TRUE;
-
-    if ($this->isNumber($values['num_menus']) == FALSE) {
-      throw new \Exception(dt('Invalid number of menus'));
-    }
-    if ($this->isNumber($values['num_links']) == FALSE) {
-      throw new \Exception(dt('Invalid number of links'));
-    }
-    if ($this->isNumber($values['max_depth']) == FALSE || $values['max_depth'] > 9 || $values['max_depth'] < 1) {
-      throw new \Exception(dt('Invalid maximum link depth. Use a value between 1 and 9'));
-    }
-    if ($this->isNumber($values['max_width']) == FALSE || $values['max_width'] < 1) {
-      throw new \Exception(dt('Invalid maximum menu width. Use a positive numeric value.'));
-    }
-
-    return $values;
-  }
-
-  /**
-   * Deletes custom generated menus.
-   */
-  protected function deleteMenus() {
-    if ($this->moduleHandler->moduleExists('menu_ui')) {
-      $menu_ids = array();
-      foreach (menu_ui_get_menus(FALSE) as $menu => $menu_title) {
-        if (strpos($menu, 'devel-') === 0) {
-          $menu_ids[] = $menu;
-        }
-      }
-
-      if ($menu_ids) {
-        $menus = $this->menuStorage->loadMultiple($menu_ids);
-        $this->menuStorage->delete($menus);
-      }
-    }
-
-    // Delete menu links generated by devel.
-    $link_ids = $this->menuLinkContentStorage->getQuery()
-      ->condition('menu_name', 'devel', '<>')
-      ->condition('link__options', '%' . db_like('s:5:"devel";b:1') . '%', 'LIKE')
-      ->execute();
-
-    if ($link_ids) {
-      $links = $this->menuLinkContentStorage->loadMultiple($link_ids);
-      $this->menuLinkContentStorage->delete($links);
-    }
-
-  }
-
-  /**
-   * Generates new menus.
-   *
-   * @param int $num_menus
-   *   Number of menus to create.
-   * @param int $title_length
-   *   (optional) Maximum length per menu name.
-   *
-   * @return array
-   *   Array containing the generated vocabularies id.
-   */
-  protected function generateMenus($num_menus, $title_length = 12) {
-    $menus = array();
-
-    for ($i = 1; $i <= $num_menus; $i++) {
-      $name = $this->getRandom()->word(mt_rand(2, max(2, $title_length)));
-
-      $menu = $this->menuStorage->create(array(
-        'label' => $name,
-        'id' => 'devel-' . Unicode::strtolower($name),
-        'description' => $this->t('Description of @name', array('@name' => $name)),
-      ));
-
-      $menu->save();
-      $menus[$menu->id()] = $menu->label();
-    }
-
-    return $menus;
-  }
-
-  /**
-   * Generates menu links in a tree structure.
-   */
-  protected function generateLinks($num_links, $menus, $title_length, $link_types, $max_depth, $max_width) {
-    $links = array();
-    $menus = array_keys(array_filter($menus));
-    $link_types = array_keys(array_filter($link_types));
-
-    $nids = array();
-    for ($i = 1; $i <= $num_links; $i++) {
-      // Pick a random menu.
-      $menu_name = $menus[array_rand($menus)];
-      // Build up our link.
-      $link_title = $this->getRandom()->word(mt_rand(2, max(2, $title_length)));
-      $link = $this->menuLinkContentStorage->create(array(
-        'menu_name' => $menu_name,
-        'weight' => mt_rand(-50, 50),
-        'title' => $link_title,
-        'bundle' => 'menu_link_content',
-        'description' => $this->t('Description of @title.', array('@title' => $link_title)),
-      ));
-      $link->link->options = array('devel' => TRUE);
-
-      // For the first $max_width items, make first level links.
-      if ($i <= $max_width) {
-        $depth = 0;
-      }
-      else {
-        // Otherwise, get a random parent menu depth.
-        $depth = mt_rand(1, max(1, $max_depth - 1));
-      }
-      // Get a random parent link from the proper depth.
-      do {
-        $parameters = new MenuTreeParameters();
-        $parameters->setMinDepth($depth);
-        $parameters->setMaxDepth($depth);
-        $tree = $this->menuLinkTree->load($menu_name, $parameters);
-
-        if ($tree) {
-          $link->parent = array_rand($tree);
-        }
-        $depth--;
-      } while (!$link->parent && $depth > 0);
-
-      $link_type = array_rand($link_types);
-      switch ($link_types[$link_type]) {
-        case 'node':
-          // Grab a random node ID.
-          $select = db_select('node_field_data', 'n')
-            ->fields('n', array('nid', 'title'))
-            ->condition('n.status', 1)
-            ->range(0, 1)
-            ->orderRandom();
-          // Don't put a node into the menu twice.
-          if (!empty($nids[$menu_name])) {
-            $select->condition('n.nid', $nids[$menu_name], 'NOT IN');
-          }
-          $node = $select->execute()->fetchAssoc();
-          if (isset($node['nid'])) {
-            $nids[$menu_name][] = $node['nid'];
-            $link->link->uri = 'entity:node/' . $node['nid'];
-            $link->title = $node['title'];
-            break;
-          }
-
-        case 'external':
-          $link->link->uri = 'http://www.example.com/';
-          break;
-
-        case 'front':
-          $link->link->uri = 'internal:/<front>';
-          break;
-
-        default:
-          $link->devel_link_type = $link_type;
-          break;
-      }
-
-      $link->save();
-
-      $links[$link->id()] = $link->link_title;
-    }
-
-    return $links;
-  }
-
-}
diff --git a/modules/devel/devel_generate/src/Plugin/DevelGenerate/TermDevelGenerate.php b/modules/devel/devel_generate/src/Plugin/DevelGenerate/TermDevelGenerate.php
deleted file mode 100644
index 61e6dd4..0000000
--- a/modules/devel/devel_generate/src/Plugin/DevelGenerate/TermDevelGenerate.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate\Plugin\DevelGenerate;
-
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Language\Language;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\devel_generate\DevelGenerateBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a TermDevelGenerate plugin.
- *
- * @DevelGenerate(
- *   id = "term",
- *   label = @Translation("terms"),
- *   description = @Translation("Generate a given number of terms. Optionally delete current terms."),
- *   url = "term",
- *   permission = "administer devel_generate",
- *   settings = {
- *     "num" = 10,
- *     "title_length" = 12,
- *     "kill" = FALSE,
- *   }
- * )
- */
-class TermDevelGenerate extends DevelGenerateBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The vocabulary storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $vocabularyStorage;
-
-  /**
-   * The term storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $termStorage;
-
-  /**
-   * Constructs a new TermDevelGenerate object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $vocabulary_storage
-   *   The vocabulary storage.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $term_storage
-   *   The term storage.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityStorageInterface $vocabulary_storage, EntityStorageInterface $term_storage) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->vocabularyStorage = $vocabulary_storage;
-    $this->termStorage = $term_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    $entity_manager = $container->get('entity.manager');
-    return new static(
-      $configuration, $plugin_id, $plugin_definition,
-      $entity_manager->getStorage('taxonomy_vocabulary'),
-      $entity_manager->getStorage('taxonomy_term')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsForm(array $form, FormStateInterface $form_state) {
-    $options = array();
-    foreach ($this->vocabularyStorage->loadMultiple() as $vocabulary) {
-      $options[$vocabulary->id()] = $vocabulary->label();
-    }
-    $form['vids'] = array(
-      '#type' => 'select',
-      '#multiple' => TRUE,
-      '#title' => $this->t('Vocabularies'),
-      '#required' => TRUE,
-      '#default_value' => 'tags',
-      '#options' => $options,
-      '#description' => $this->t('Restrict terms to these vocabularies.'),
-    );
-    $form['num'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('Number of terms?'),
-      '#default_value' => $this->getSetting('num'),
-      '#required' => TRUE,
-      '#min' => 0,
-    );
-    $form['title_length'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('Maximum number of characters in term names'),
-      '#default_value' => $this->getSetting('title_length'),
-      '#required' => TRUE,
-      '#min' => 2,
-      '#max' => 255,
-    );
-    $form['kill'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Delete existing terms in specified vocabularies before generating new terms.'),
-      '#default_value' => $this->getSetting('kill'),
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function generateElements(array $values) {
-    if ($values['kill']) {
-      $this->deleteVocabularyTerms($values['vids']);
-      $this->setMessage($this->t('Deleted existing terms.'));
-    }
-
-    $vocabs = $this->vocabularyStorage->loadMultiple($values['vids']);
-    $new_terms = $this->generateTerms($values['num'], $vocabs, $values['title_length']);
-    if (!empty($new_terms)) {
-      $this->setMessage($this->t('Created the following new terms: @terms', array('@terms' => implode(', ', $new_terms))));
-    }
-  }
-
-  /**
-   * Deletes all terms of given vocabularies.
-   *
-   * @param array $vids
-   *   Array of vocabulary vid.
-   */
-  protected function deleteVocabularyTerms($vids) {
-    $tids = $this->vocabularyStorage->getToplevelTids($vids);
-    $terms = $this->termStorage->loadMultiple($tids);
-    $this->termStorage->delete($terms);
-  }
-
-  /**
-   * Generates taxonomy terms for a list of given vocabularies.
-   *
-   * @param int $records
-   *   Number of terms to create in total.
-   * @param \Drupal\taxonomy\TermInterface[] $vocabs
-   *   List of vocabularies to populate.
-   * @param int $maxlength
-   *   (optional) Maximum length per term.
-   *
-   * @return array
-   *   The list of names of the created terms.
-   */
-  protected function generateTerms($records, $vocabs, $maxlength = 12) {
-    $terms = array();
-
-    // Insert new data:
-    $max = db_query('SELECT MAX(tid) FROM {taxonomy_term_data}')->fetchField();
-    $start = time();
-    for ($i = 1; $i <= $records; $i++) {
-      $name = $this->getRandom()->word(mt_rand(2, $maxlength));
-
-      $values = array(
-        'name' => $name,
-        'description' => 'description of ' . $name,
-        'format' => filter_fallback_format(),
-        'weight' => mt_rand(0, 10),
-        'langcode' => Language::LANGCODE_NOT_SPECIFIED,
-      );
-
-      switch ($i % 2) {
-        case 1:
-          $vocab = $vocabs[array_rand($vocabs)];
-          $values['vid'] = $vocab->id();
-          $values['parent'] = array(0);
-          break;
-
-        default:
-          while (TRUE) {
-            // Keep trying to find a random parent.
-            $candidate = mt_rand(1, $max);
-            $query = db_select('taxonomy_term_data', 't');
-            $parent = $query
-              ->fields('t', array('tid', 'vid'))
-              ->condition('t.vid', array_keys($vocabs), 'IN')
-              ->condition('t.tid', $candidate, '>=')
-              ->range(0, 1)
-              ->execute()
-              ->fetchAssoc();
-            if ($parent['tid']) {
-              break;
-            }
-          }
-          $values['parent'] = array($parent['tid']);
-          // Slight speedup due to this property being set.
-          $values['vid'] = $parent['vid'];
-          break;
-      }
-
-      $term = $this->termStorage->create($values);
-
-      // Populate all fields with sample values.
-      $this->populateFields($term);
-      $term->save();
-
-      $max++;
-
-      // Limit memory usage. Only report first 20 created terms.
-      if ($i < 20) {
-        $terms[] = $term->label();
-      }
-
-      unset($term);
-    }
-
-    return $terms;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateDrushParams($args, $options = []) {
-    $vocabulary_name = array_shift($args);
-    $number = array_shift($args);
-
-    if ($number === NULL) {
-      $number = 10;
-    }
-
-    if (!$vocabulary_name) {
-      throw new \Exception(dt('Please provide a vocabulary machine name.'));
-    }
-
-    if (!$this->isNumber($number)) {
-      throw new \Exception(dt('Invalid number of terms: @num', array('@num' => $number)));
-    }
-
-    // Try to convert machine name to a vocabulary id.
-    if (!$vocabulary = $this->vocabularyStorage->load($vocabulary_name)) {
-      throw new \Exception(dt('Invalid vocabulary name: @name', array('@name' => $vocabulary_name)));
-    }
-
-    $values = [
-      'num' => $number,
-      'kill' => $this->isDrush8() ? drush_get_option('kill') : $options['kill'],
-      'title_length' => 12,
-      'vids' => [$vocabulary->id()],
-    ];
-
-    return $values;
-  }
-
-}
diff --git a/modules/devel/devel_generate/src/Plugin/DevelGenerate/UserDevelGenerate.php b/modules/devel/devel_generate/src/Plugin/DevelGenerate/UserDevelGenerate.php
deleted file mode 100644
index 4e7344b..0000000
--- a/modules/devel/devel_generate/src/Plugin/DevelGenerate/UserDevelGenerate.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate\Plugin\DevelGenerate;
-
-use Drupal\Core\Datetime\DateFormatterInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\devel_generate\DevelGenerateBase;
-use Drush\Utils\StringUtils;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a UserDevelGenerate plugin.
- *
- * @DevelGenerate(
- *   id = "user",
- *   label = @Translation("users"),
- *   description = @Translation("Generate a given number of users. Optionally delete current users."),
- *   url = "user",
- *   permission = "administer devel_generate",
- *   settings = {
- *     "num" = 50,
- *     "kill" = FALSE,
- *     "pass" = ""
- *   }
- * )
- */
-class UserDevelGenerate extends DevelGenerateBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The user storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $userStorage;
-
-  /**
-   * The date formatter service.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatterInterface
-   */
-  protected $dateFormatter;
-
-  /**
-   * Constructs a new UserDevelGenerate object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $entity_storage
-   *   The user storage.
-   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
-   *   The date formatter service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityStorageInterface $entity_storage, DateFormatterInterface $date_formatter) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->userStorage = $entity_storage;
-    $this->dateFormatter = $date_formatter;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration, $plugin_id, $plugin_definition,
-      $container->get('entity.manager')->getStorage('user'),
-      $container->get('date.formatter')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsForm(array $form, FormStateInterface $form_state) {
-    $form['num'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('How many users would you like to generate?'),
-      '#default_value' => $this->getSetting('num'),
-      '#required' => TRUE,
-      '#min' => 0,
-    );
-
-    $form['kill'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Delete all users (except user id 1) before generating new users.'),
-      '#default_value' => $this->getSetting('kill'),
-    );
-
-    $options = user_role_names(TRUE);
-    unset($options[DRUPAL_AUTHENTICATED_RID]);
-    $form['roles'] = array(
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Which roles should the users receive?'),
-      '#description' => $this->t('Users always receive the <em>authenticated user</em> role.'),
-      '#options' => $options,
-    );
-
-    $form['pass'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Password to be set'),
-      '#default_value' => $this->getSetting('pass'),
-      '#size' => 32,
-      '#description' => $this->t('Leave this field empty if you do not need to set a password'),
-    );
-
-    $options = array(1 => $this->t('Now'));
-    foreach (array(3600, 86400, 604800, 2592000, 31536000) as $interval) {
-      $options[$interval] = $this->dateFormatter->formatInterval($interval, 1) . ' ' . $this->t('ago');
-    }
-    $form['time_range'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('How old should user accounts be?'),
-      '#description' => $this->t('User ages will be distributed randomly from the current time, back to the selected time.'),
-      '#options' => $options,
-      '#default_value' => 604800,
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function generateElements(array $values) {
-    $num = $values['num'];
-    $kill = $values['kill'];
-    $pass = $values['pass'];
-    $age = $values['time_range'];
-    $roles = array_filter($values['roles']);
-
-    if ($kill) {
-      $uids = $this->userStorage->getQuery()
-        ->condition('uid', 1, '>')
-        ->execute();
-      $users = $this->userStorage->loadMultiple($uids);
-      $this->userStorage->delete($users);
-
-      $this->setMessage($this->formatPlural(count($uids), '1 user deleted', '@count users deleted.'));
-    }
-
-    if ($num > 0) {
-      $names = array();
-      while (count($names) < $num) {
-        $name = $this->getRandom()->word(mt_rand(6, 12));
-        $names[$name] = '';
-      }
-
-      if (empty($roles)) {
-        $roles = array(DRUPAL_AUTHENTICATED_RID);
-      }
-      foreach ($names as $name => $value) {
-        $account = $this->userStorage->create(array(
-          'uid' => NULL,
-          'name' => $name,
-          'pass' => $pass,
-          'mail' => $name . '@example.com',
-          'status' => 1,
-          'created' => REQUEST_TIME - mt_rand(0, $age),
-          'roles' => array_values($roles),
-          // A flag to let hook_user_* know that this is a generated user.
-          'devel_generate' => TRUE,
-        ));
-
-        // Populate all fields with sample values.
-        $this->populateFields($account);
-        $account->save();
-      }
-    }
-    $this->setMessage($this->t('@num_users created.', array('@num_users' => $this->formatPlural($num, '1 user', '@count users'))));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateDrushParams($args, $options = []) {
-    $values = array(
-      'num' => array_shift($args),
-      'time_range' => 0,
-    );
-
-    if ($this->isDrush8()) {
-      $values += [
-        'roles' => explode(',', drush_get_option('roles', '')),
-        'kill' => drush_get_option('kill'),
-        'pass' => drush_get_option('pass', NULL),
-      ];
-    }
-    else {
-      $values += [
-        'roles' => StringUtils::csvToArray($options['roles']),
-        'kill' => $options['kill'],
-        'pass' => $options['pass'],
-      ];
-    }
-    return $values;
-  }
-
-}
diff --git a/modules/devel/devel_generate/src/Plugin/DevelGenerate/VocabularyDevelGenerate.php b/modules/devel/devel_generate/src/Plugin/DevelGenerate/VocabularyDevelGenerate.php
deleted file mode 100644
index 1a03746..0000000
--- a/modules/devel/devel_generate/src/Plugin/DevelGenerate/VocabularyDevelGenerate.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate\Plugin\DevelGenerate;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Language\Language;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\devel_generate\DevelGenerateBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a VocabularyDevelGenerate plugin.
- *
- * @DevelGenerate(
- *   id = "vocabulary",
- *   label = @Translation("vocabularies"),
- *   description = @Translation("Generate a given number of vocabularies. Optionally delete current vocabularies."),
- *   url = "vocabs",
- *   permission = "administer devel_generate",
- *   settings = {
- *     "num" = 1,
- *     "title_length" = 12,
- *     "kill" = FALSE
- *   }
- * )
- */
-class VocabularyDevelGenerate extends DevelGenerateBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The vocabulary storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $vocabularyStorage;
-
-  /**
-   * Constructs a new VocabularyDevelGenerate object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $entity_storage
-   *   The vocabulary storage.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityStorageInterface $entity_storage) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->vocabularyStorage = $entity_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration, $plugin_id, $plugin_definition,
-      $container->get('entity.manager')->getStorage('taxonomy_vocabulary')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsForm(array $form, FormStateInterface $form_state) {
-    $form['num'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('Number of vocabularies?'),
-      '#default_value' => $this->getSetting('num'),
-      '#required' => TRUE,
-      '#min' => 0,
-    );
-    $form['title_length'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('Maximum number of characters in vocabulary names'),
-      '#default_value' => $this->getSetting('title_length'),
-      '#required' => TRUE,
-      '#min' => 2,
-      '#max' => 255,
-    );
-    $form['kill'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Delete existing vocabularies before generating new ones.'),
-      '#default_value' => $this->getSetting('kill'),
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function generateElements(array $values) {
-    if ($values['kill']) {
-      $this->deleteVocabularies();
-      $this->setMessage($this->t('Deleted existing vocabularies.'));
-    }
-
-    $new_vocs = $this->generateVocabularies($values['num'], $values['title_length']);
-    if (!empty($new_vocs)) {
-      $this->setMessage($this->t('Created the following new vocabularies: @vocs', array('@vocs' => implode(', ', $new_vocs))));
-    }
-  }
-
-  /**
-   * Deletes all vocabularies.
-   */
-  protected function deleteVocabularies() {
-    $vocabularies = $this->vocabularyStorage->loadMultiple();
-    $this->vocabularyStorage->delete($vocabularies);
-  }
-
-  /**
-   * Generates vocabularies.
-   *
-   * @param int $records
-   *   Number of vocabularies to create.
-   * @param int $maxlength
-   *   (optional) Maximum length for vocabulary name.
-   *
-   * @return array
-   *   Array containing the generated vocabularies id.
-   */
-  protected function generateVocabularies($records, $maxlength = 12) {
-    $vocabularies = array();
-
-    // Insert new data:
-    for ($i = 1; $i <= $records; $i++) {
-      $name = $this->getRandom()->word(mt_rand(2, $maxlength));
-
-      $vocabulary = $this->vocabularyStorage->create(array(
-        'name' => $name,
-        'vid' => Unicode::strtolower($name),
-        'langcode' => Language::LANGCODE_NOT_SPECIFIED,
-        'description' => "Description of $name",
-        'hierarchy' => 1,
-        'weight' => mt_rand(0, 10),
-        'multiple' => 1,
-        'required' => 0,
-        'relations' => 1,
-      ));
-
-      // Populate all fields with sample values.
-      $this->populateFields($vocabulary);
-      $vocabulary->save();
-
-      $vocabularies[] = $vocabulary->id();
-      unset($vocabulary);
-    }
-
-    return $vocabularies;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateDrushParams($args, $options = []) {
-    $values = array(
-      'num' => array_shift($args),
-      'kill' => $this->isDrush8() ? drush_get_option('kill') : $options['kill'],
-      'title_length' => 12,
-    );
-
-    if ($this->isNumber($values['num']) == FALSE) {
-      throw new \Exception(dt('Invalid number of vocabularies: @num.', array('@num' => $values['num'])));
-    }
-
-    return $values;
-  }
-
-}
diff --git a/modules/devel/devel_generate/src/Routing/DevelGenerateRoutes.php b/modules/devel/devel_generate/src/Routing/DevelGenerateRoutes.php
deleted file mode 100644
index 6cf98d9..0000000
--- a/modules/devel/devel_generate/src/Routing/DevelGenerateRoutes.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate\Routing;
-
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Component\Plugin\PluginManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Routing\Route;
-
-/**
- * Provides dynamic routes for devel_generate.
- */
-class DevelGenerateRoutes implements ContainerInjectionInterface {
-
-  /**
-   * Constructs a new devel_generate route subscriber.
-   *
-   * @param \Drupal\Component\Plugin\PluginManagerInterface $devel_generate_manager
-   *   The DevelGeneratePluginManager.
-   */
-  public function __construct(PluginManagerInterface $devel_generate_manager) {
-    $this->DevelGenerateManager = $devel_generate_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.develgenerate')
-    );
-  }
-
-  public function routes() {
-    $devel_generate_plugins = $this->DevelGenerateManager->getDefinitions();
-
-    $routes = array();
-    foreach ($devel_generate_plugins as $id => $plugin) {
-      $label = $plugin['label'];
-      $type_url_str = str_replace('_', '-', $plugin['url']);
-      $routes["devel_generate.$id"] = new Route(
-        "admin/config/development/generate/$type_url_str",
-        array(
-          '_form' => '\Drupal\devel_generate\Form\DevelGenerateForm',
-          '_title' => "Generate $label",
-          '_plugin_id' => $id,
-        ),
-        array(
-          '_permission' => $plugin['permission'],
-        )
-      );
-    }
-
-    return $routes;
-  }
-
-}
diff --git a/modules/devel/devel_generate/src/Tests/DevelGenerateTest.php b/modules/devel/devel_generate/src/Tests/DevelGenerateTest.php
deleted file mode 100644
index 4782d6f..0000000
--- a/modules/devel/devel_generate/src/Tests/DevelGenerateTest.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate\Tests;
-
-use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Language\Language;
-use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
-use Drupal\node\Entity\Node;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests the logic to generate data.
- *
- * @group devel_generate
- */
-class DevelGenerateTest extends WebTestBase {
-
-  use CommentTestTrait;
-  use EntityReferenceTestTrait;
-
-  /**
-   * Vocabulary for testing.
-   *
-   * @var \Drupal\taxonomy\VocabularyInterface
-   */
-  protected $vocabulary;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('menu_ui', 'node', 'comment', 'taxonomy', 'path', 'devel_generate');
-
-  /**
-   * Prepares the testing environment
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Create Basic page and Article node types.
-    if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic Page'));
-      $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
-      $this->addDefaultCommentField('node', 'article');
-    }
-
-    // Creating a vocabulary to associate taxonomy terms generated.
-    $this->vocabulary = entity_create('taxonomy_vocabulary', array(
-      'name' => $this->randomMachineName(),
-      'description' => $this->randomMachineName(),
-      'vid' => Unicode::strtolower($this->randomMachineName()),
-      'langcode' => Language::LANGCODE_NOT_SPECIFIED,
-      'weight' => mt_rand(0, 10),
-    ));
-    $this->vocabulary->save();
-
-    // Creates a field of an entity reference field storage on article.
-    $field_name = 'taxonomy_' . $this->vocabulary->id();
-
-    $handler_settings = array(
-      'target_bundles' => array(
-        $this->vocabulary->id() => $this->vocabulary->id(),
-      ),
-      'auto_create' => TRUE,
-    );
-    $this->createEntityReferenceField('node', 'article', $field_name, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
-
-    entity_get_form_display('node', 'article', 'default')
-      ->setComponent($field_name, array(
-        'type' => 'options_select',
-      ))
-      ->save();
-
-    entity_get_display('node', 'article', 'default')
-      ->setComponent($field_name, array(
-        'type' => 'entity_reference_label',
-      ))
-      ->save();
-
-    $admin_user = $this->drupalCreateUser(array('administer devel_generate'));
-    $this->drupalLogin($admin_user);
-  }
-
-  /**
-   * Tests generate commands
-   */
-  public function testDevelGenerate() {
-    // Creating users.
-    $edit = array(
-      'num' => 4,
-    );
-    $this->drupalPostForm('admin/config/development/generate/user', $edit, t('Generate'));
-    $this->assertText(t('4 users created.'));
-    $this->assertText(t('Generate process complete.'));
-
-    // Tests that if no content types are selected an error message is shown.
-    $edit = array(
-      'num' => 4,
-      'title_length' => 4,
-    );
-    $this->drupalPostForm('admin/config/development/generate/content', $edit, t('Generate'));
-    $this->assertText(t('Please select at least one content type'));
-
-    // Creating content.
-    // First we create a node in order to test the Delete content checkbox.
-    $this->drupalCreateNode(array('type' => 'article'));
-
-    $edit = array(
-      'num' => 4,
-      'kill' => TRUE,
-      'node_types[article]' => TRUE,
-      'time_range' => 604800,
-      'max_comments' => 3,
-      'title_length' => 4,
-      'add_alias' => 1,
-    );
-    $this->drupalPostForm('admin/config/development/generate/content', $edit, t('Generate'));
-    $this->assertText(t('Deleted 1 nodes.'));
-    $this->assertText(t('Finished creating 4 nodes'));
-    $this->assertText(t('Generate process complete.'));
-
-    // Tests that nodes have been created in the generation process.
-    $nodes = Node::loadMultiple();
-    $this->assert(count($nodes) == 4, 'Nodes generated successfully.');
-
-    // Tests url alias for the generated nodes.
-    foreach ($nodes as $node) {
-      $alias = 'node-' . $node->id() . '-' . $node->bundle();
-      $this->drupalGet($alias);
-      $this->assertResponse('200');
-      $this->assertText($node->getTitle(), 'Generated url alias for the node works.');
-    }
-
-    // Creating terms.
-    $edit = array(
-      'vids[]' => $this->vocabulary->id(),
-      'num' => 5,
-      'title_length' => 12,
-    );
-    $this->drupalPostForm('admin/config/development/generate/term', $edit, t('Generate'));
-    $this->assertText(t('Created the following new terms: '));
-    $this->assertText(t('Generate process complete.'));
-
-    // Creating vocabularies.
-    $edit = array(
-      'num' => 5,
-      'title_length' => 12,
-      'kill' => TRUE,
-    );
-    $this->drupalPostForm('admin/config/development/generate/vocabs', $edit, t('Generate'));
-    $this->assertText(t('Created the following new vocabularies: '));
-    $this->assertText(t('Generate process complete.'));
-
-    // Creating menus.
-    $edit = array(
-      'num_menus' => 5,
-      'num_links' => 7,
-      'title_length' => 12,
-      'link_types[node]' => 1,
-      'link_types[front]' => 1,
-      'link_types[external]' => 1,
-      'max_depth' => 4,
-      'max_width' => 6,
-      'kill' => 1,
-    );
-    $this->drupalPostForm('admin/config/development/generate/menu', $edit, t('Generate'));
-    $this->assertText(t('Created the following new menus: '));
-    $this->assertText(t('Created 7 new menu links'));
-    $this->assertText(t('Generate process complete.'));
-  }
-
-}
diff --git a/modules/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.info.yml b/modules/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.info.yml
deleted file mode 100644
index b4acf0a..0000000
--- a/modules/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: 'Devel generate Example'
-type: module
-description: 'Create an example of DevelGenerate plugin type for testing purposing.'
-package: Development
-# core: 8.x
-configure: admin/config/development/generate
-tags:
- - developer
-
-# Information added by Drupal.org packaging script on 2017-10-05
-version: '8.x-1.2'
-core: '8.x'
-project: 'devel'
-datestamp: 1507197848
diff --git a/modules/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.module b/modules/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.module
deleted file mode 100644
index b3d9bbc..0000000
--- a/modules/devel/devel_generate/tests/modules/devel_generate_example/devel_generate_example.module
+++ /dev/null
@@ -1 +0,0 @@
-<?php
diff --git a/modules/devel/devel_generate/tests/modules/devel_generate_example/src/Plugin/DevelGenerate/ExampleDevelGenerate.php b/modules/devel/devel_generate/tests/modules/devel_generate_example/src/Plugin/DevelGenerate/ExampleDevelGenerate.php
deleted file mode 100644
index c80817a..0000000
--- a/modules/devel/devel_generate/tests/modules/devel_generate_example/src/Plugin/DevelGenerate/ExampleDevelGenerate.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Drupal\devel_generate_example\Plugin\DevelGenerate;
-
-use Drupal\devel_generate\DevelGenerateBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Provides a ExampleDevelGenerate plugin.
- *
- * @DevelGenerate(
- *   id = "devel_generate_example",
- *   label = "Example",
- *   description = "Generate a given number of examples. Optionally delete current examples.",
- *   url = "devel_generate_example",
- *   permission = "administer devel_generate",
- *   settings = {
- *     "num" = 50,
- *     "kill" = FALSE
- *   }
- * )
- */
-class ExampleDevelGenerate extends DevelGenerateBase {
-
-  public function settingsForm(array $form, FormStateInterface $form_state) {
-
-    $form['num'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('How many examples would you like to generate?'),
-      '#default_value' => $this->getSetting('num'),
-      '#size' => 10,
-    );
-
-    $form['kill'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Delete all examples before generating new examples.'),
-      '#default_value' => $this->getSetting('kill'),
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function generateElements(array $values) {
-    $num = $values['num'];
-    $kill = $values['kill'];
-
-    if ($kill) {
-        $this->setMessage($this->t('Old examples have been deleted.'));
-    }
-
-    //Creating user in order to demonstrate
-    // how to override default business login generation.
-    $edit = array(
-      'uid'     => NULL,
-      'name'    => 'example_devel_generate',
-      'pass'    => '',
-      'mail'    => 'example_devel_generate@example.com',
-      'status'  => 1,
-      'created' => REQUEST_TIME,
-      'roles' => '',
-      'devel_generate' => TRUE // A flag to let hook_user_* know that this is a generated user.
-    );
-
-    $account = user_load_by_name('example_devel_generate');
-    if (!$account) {
-      $account = entity_create('user', $edit);
-    }
-
-    // Populate all fields with sample values.
-    $this->populateFields($node);
-
-    $account->save();
-
-    $this->setMessage($this->t('@num_examples created.', array('@num_examples' => $this->formatPlural($num, '1 example', '@count examples'))));
-  }
-
-  public function validateDrushParams($args) {
-    $values = array(
-      'num' => array_shift($args),
-      'kill' => drush_get_option('kill'),
-    );
-    return $values;
-  }
-
-}
diff --git a/modules/devel/devel_generate/tests/src/DevelGenerateManagerTest.php b/modules/devel/devel_generate/tests/src/DevelGenerateManagerTest.php
deleted file mode 100644
index 28e66e4..0000000
--- a/modules/devel/devel_generate/tests/src/DevelGenerateManagerTest.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel_generate;
-
-use Drupal\Component\Plugin\Discovery\DiscoveryInterface;
-use Drupal\devel_generate\DevelGeneratePluginManager;
-use Drupal\Tests\UnitTestCase;
-use Drupal\Core\Language\Language;
-
-if (!defined('DRUPAL_ROOT')) {
-  //Looping to find drupal root folder.
-  $current_dir = dirname(__DIR__);
-  while (!file_exists("$current_dir/index.php")) {
-    $current_dir = dirname($current_dir);
-  }
-  define('DRUPAL_ROOT', $current_dir);
-}
-
-/**
- * @coversDefaultClass \Drupal\devel_generate\DevelGeneratePluginManager
- * @group devel_generate
- */
-class DevelGenerateManagerTest extends UnitTestCase {
-
-  /**
-   * The plugin discovery.
-   *
-   * @var \Drupal\Component\Plugin\Discovery\DiscoveryInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $discovery;
-
-  /**
-   * A list of devel generate plugin definitions.
-   *
-   * @var array
-   */
-  protected $definitions = array(
-    'devel_generate_example' => array(
-      'id' => 'devel_generate_example',
-      'class' => 'Drupal\devel_generate_example\Plugin\DevelGenerate\ExampleDevelGenerate',
-      'url' => 'devel_generate_example',
-    ),
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    // Mock a Discovery object to replace AnnotationClassDiscovery.
-    $this->discovery = $this->getMock('Drupal\Component\Plugin\Discovery\DiscoveryInterface');
-    $this->discovery->expects($this->any())
-      ->method('getDefinitions')
-      ->will($this->returnValue($this->definitions));
-
-  }
-
-  /**
-   * Test creating an instance of the DevelGenerateManager.
-   */
-  public function testCreateInstance() {
-    $namespaces = new \ArrayObject(array('Drupal\devel_generate_example' => realpath(dirname(__FILE__) . '/../../../modules/devel_generate_example/lib')));
-    $cache_backend = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
-
-    $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
-    $manager = new TestDevelGeneratePluginManager($namespaces, $cache_backend, $module_handler);
-    $manager->setDiscovery($this->discovery);
-
-    $example_instance = $manager->createInstance('devel_generate_example');
-    $plugin_def = $example_instance->getPluginDefinition();
-
-    $this->assertInstanceOf('Drupal\devel_generate_example\Plugin\DevelGenerate\ExampleDevelGenerate', $example_instance);
-    $this->assertArrayHasKey('url', $plugin_def);
-    $this->assertTrue($plugin_def['url'] == 'devel_generate_example');
-  }
-
-}
-
-/**
- * Provides a testing version of DevelGeneratePluginManager with an empty
- * constructor.
- */
-class TestDevelGeneratePluginManager extends DevelGeneratePluginManager {
-  /**
-   * Sets the discovery for the manager.
-   *
-   * @param \Drupal\Component\Plugin\Discovery\DiscoveryInterface $discovery
-   *   The discovery object.
-   */
-  public function setDiscovery(DiscoveryInterface $discovery) {
-    $this->discovery = $discovery;
-  }
-}
diff --git a/modules/devel/drush.services.yml b/modules/devel/drush.services.yml
deleted file mode 100644
index 1c8ea0b..0000000
--- a/modules/devel/drush.services.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  devel.command:
-    class: Drupal\devel\Commands\DevelCommands
-    arguments: ['@token', '@service_container', '@event_dispatcher', '@module_handler']
-    tags:
-      -  { name: drush.command }
diff --git a/modules/devel/drush/devel.drush8.inc b/modules/devel/drush/devel.drush8.inc
deleted file mode 100644
index 651578d..0000000
--- a/modules/devel/drush/devel.drush8.inc
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-
-/**
- * @file
- * This file is only used by Drush8. Drush9 discovers its commands via tagged
- * service(s) in devel.services.yml. Also see classes in src/Commands.
- */
-
-use Drupal\Component\Uuid\Php;
-
-/**
- * Implements hook_drush_command().
- */
-function devel_drush_command() {
-  $items['devel-reinstall'] = array(
-    'description' => dt('Uninstall, and Install a list of projects.'),
-    'drush dependencies' => array('pm'),
-    'arguments' => array(
-      'projects' => dt('A space-separated list of project names.'),
-    ),
-    'allow-additional-options' => array('pm-uninstall', 'pm-enable'),
-    'required-arguments' => 1,
-    'aliases' => array('dre'),
-  );
-  $items['fn-hook'] = array(
-    'description' => 'List implementations of a given hook and explore the source of the selected one.',
-    'arguments' => array(
-      'hook' => 'The name of the hook to explore (e.g. "menu" for hook_menu()).'
-    ),
-    'examples' => array(
-      'fn-hook cron' => 'List implementations of hook_cron().',
-    ),
-    'allow-additional-options' => array('fn-view'),
-    'required-arguments' => 1,
-    'aliases' => array('fnh', 'hook'),
-  );
-  $items['fn-event'] = array(
-    'description' => 'List implementations of a given event and explore source of specified one.',
-    'arguments' => array(
-      'event' => 'The name of the event to explore. If omitted, a list of events is shown.'
-    ),
-    'examples' => array(
-      'fn-event' => 'Pick a Kernel event, then pick an implementation, and then view its source code.',
-      'fn-event kernel.terminate' => 'Pick a terminate subscribers and view its source code.',
-    ),
-    'allow-additional-options' => array('fn-view'),
-    'aliases' => array('fne', 'event'),
-  );
-  $items['fn-view'] = array(
-    'description' => 'Show the source of specified function or method.',
-    'arguments' => array(
-      'function' => 'The name of the function or method to view.',
-    ),
-    'options' => array(
-      'pipe' => 'Output just the filename of the function or method',
-      'format' => 'Specify how the filename should be printed. Available placeholders are @startline, @endline and @file',
-    ),
-    'examples' => array(
-      'fn-view drupal_set_breadcrumb' => 'View the source code for function "drupal_set_breadcrumb"',
-      'vi `drush --pipe fn-view user_access --format=\'+@startline @file\'`' => 'Edit the file that contains the function "user_access"',
-      'fn-view NodeController::load' => 'View the source code for method load in the class NodeController'
-    ),
-    'aliases' => array('fnv'),
-    'required-arguments' => 1,
-  );
-  $items['devel-token'] = array(
-    'description' => dt('List available tokens'),
-    'aliases' => array('token'),
-    //@todo support --format option for json, csv, etc.
-  );
-
-  $items['devel-container-services'] = array(
-    'description' => 'Get a list of available container services.',
-    'bootstrap' => DRUSH_BOOTSTRAP_DRUPAL_FULL,
-    'core' => array('8+'),
-    'aliases' => array('dcs'),
-    'options' => array(
-      'format' => 'Format to output. Allowed values are: json, export, html.',
-    ),
-    'arguments' => array(
-      'prefix' => 'A prefix to filter the service list by.',
-    ),
-    'examples' => array(
-      'drush container-services' => 'Gets a list of all available container services',
-      'drush container-services plugin.manager' => 'Get all services containing "plugin.manager"',
-    ),
-    'outputformat' => array(
-      'default' => 'list',
-      'pipe-format' => 'export',
-    ),
-  );
-
-  $items['devel-generate-uuid'] = array(
-    'description' => 'Generate a UUID.',
-    'core' => array('8+'),
-    'examples' => array(
-      "drush devel-generate-uuid" => "Outputs a Universally Unique IDentifier.",
-    ),
-    'aliases' => array('uuid'),
-    'outputformat' => array(
-      'default' => 'string',
-    ),
-  );
-
-  return $items;
-}
-
-/**
- * A command callback. This is faster than 3 separate bootstraps.
- */
-function drush_devel_reinstall() {
-  $projects = func_get_args();
-
-  $args = array_merge(array('pm-uninstall'), $projects);
-  call_user_func_array('drush_invoke', $args);
-
-  $args = array_merge(array('pm-enable'), $projects);
-  call_user_func_array('drush_invoke', $args);
-}
-
-/**
- * Command handler. Show hook implementations.
- */
-function drush_devel_fn_hook($hook) {
-  // Get implementations in the .install files as well.
-  include_once './core/includes/install.inc';
-  drupal_load_updates();
-
-  if ($hook_implementations = \Drupal::moduleHandler()->getImplementations($hook)) {
-    if ($choice = drush_choice(array_combine($hook_implementations, $hook_implementations), 'Enter the number of the hook implementation you wish to view.')) {
-      return drush_devel_fn_view($choice . "_$hook");
-    }
-  }
-  else {
-    drush_log(dt('No implementations.'), 'ok');
-  }
-}
-
-/**
- * Command handler. Show hook implementations.
- */
-function drush_devel_fn_event($event = NULL) {
-  $dispatcher = Drupal::service('event_dispatcher');
-  if (empty($event)) {
-    $events = array('kernel.controller', 'kernel.exception', 'kernel.request', 'kernel.response', 'kernel.terminate', 'kernel.view');
-    $events = array_combine($events, $events);
-    if (!$event = drush_choice($events, 'Enter the event you wish to explore.')) {
-      return drush_user_abort();
-    }
-  }
-  if ($implementations = $dispatcher->getListeners($event)) {
-    foreach ($implementations as $implementation) {
-      $callable = get_class($implementation[0]) . '::' . $implementation[1];
-      $choices[$callable] = $callable;
-    }
-    if ($choice = drush_choice($choices, 'Enter the number of the implementation you wish to view.')) {
-      return drush_devel_fn_view($choice);
-    }
-  }
-  else {
-    drush_log(dt('No implementations.'), 'ok');
-  }
-}
-
-/**
- * Command handler.  Show source code of specified function or method.
- */
-function drush_devel_fn_view($function_name) {
-  // Get implementations in the .install files as well.
-  include_once './core/includes/install.inc';
-  drupal_load_updates();
-
-  if (strpos($function_name, '::') === FALSE) {
-    if (!function_exists($function_name)) {
-      return drush_set_error(dt('Function not found'));
-    }
-    $reflect = new ReflectionFunction($function_name);
-  }
-  else {
-    list($class, $method) = explode('::', $function_name);
-    if (!method_exists($class, $method)) {
-      return drush_set_error(dt('Method not found'));
-    }
-    $reflect = new ReflectionMethod($class, $method);
-  }
-  $func_info = array('@file' => $reflect->getFileName(), '@startline' => $reflect->getStartLine(), '@endline' => $reflect->getEndLine());
-  $format = drush_get_option('format', '@file');
-  drush_print_pipe(dt($format, $func_info));
-  drush_print(dt("// file: @file, lines @startline-@endline", $func_info));
-
-  _drush_devel_print_function($reflect->getFileName(), $reflect->getStartLine(), $reflect->getEndLine());
-}
-
-/**
- * Command callback. List available tokens.
- */
-function drush_devel_token() {
-  $rows[] = array(dt('Group'), dt('Token'), dt('Name'));
-  $all = \Drupal::token()->getInfo();
-  foreach ($all['tokens'] as $group => $tokens) {
-    foreach ($tokens as $key => $token) {
-      $rows[] = array($group, $key, $token['name']);
-    }
-  }
-  drush_print_table($rows, TRUE);
-}
-
-/**
- * Command callback. Outputs a UUID.
- *
- * @return string
- *   A freshly generated UUID.
- */
-function drush_devel_generate_uuid() {
-  $uuid = new Php();
-  return $uuid->generate();
-}
-
-/**
- * Print the specified function, including any
- * doxygen-style comments that come before it.
- */
-function _drush_devel_print_function($file, $start_line, $end_line) {
-  $line_num = 0;
-  $doxygen = NULL;
-  $fp = fopen( $file, 'r' );
-
-  while (!feof($fp) && ($line_num < ($start_line - 1))) {
-    $line = fgets($fp);
-    ++$line_num;
-
-    if (substr($line,0,3) == '/**') {
-      $doxygen = $line;
-    }
-    elseif (isset($doxygen)) {
-      $doxygen .= $line;
-      if ($line_num + 1 == $start_line) {
-        drush_print(rtrim($doxygen));
-      }
-      if (strstr($line, '*/') !== FALSE) {
-        $doxygen = NULL;
-      }
-    }
-  }
-  while (!feof($fp) && ($line_num < $end_line)) {
-    $line = fgets($fp);
-    ++$line_num;
-    drush_print(rtrim($line));
-  }
-}
-
-/**
- * Command callback to list available container services.
- */
-function drush_devel_container_services($prefix = NULL) {
-  $container = Drupal::getContainer();
-
-  if (empty($container)) {
-    return drush_set_error(dt('No container was found.'));
-  }
-
-  // Get a list of all available service IDs.
-  $services = $container->getServiceIds();
-
-  // If there is a prefix, try to find matches.
-  if (isset($prefix)) {
-    $services = preg_grep("/$prefix/", $services);
-  }
-
-  if (empty($services)) {
-    return drush_log(dt('No container services found.'), 'ok');
-  }
-
-  sort($services);
-  return $services;
-}
diff --git a/modules/devel/drush/develDrushTest.php b/modules/devel/drush/develDrushTest.php
deleted file mode 100644
index 54a5cf9..0000000
--- a/modules/devel/drush/develDrushTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Unish;
-
-if (class_exists('Unish\CommandUnishTestCase')) {
-
-  /**
-   * PHPUnit Tests for devel. This uses Drush's own test framework, based on PHPUnit.
-   * To run the tests, use run-tests-drush.sh from the devel directory.
-   */
-  class develCase extends CommandUnishTestCase {
-
-    public function testFnCommands() {
-      // Specify '8' just in case user has not set UNISH_DRUPAL_MAJOR_VERSION env variable.
-      $sites = $this->setUpDrupal(1, TRUE, '8');
-
-      // Symlink this module into the Site Under test so it can be enabled.
-      $target = dirname(__DIR__);
-      \symlink($target, $this->webroot() . '/modules/devel');
-      $options = array(
-        'root' => $this->webroot(),
-        'uri' => key($sites),
-      );
-      $this->drush('pm-enable', array('devel'), $options + array('skip' => NULL, 'yes' => NULL));
-
-      $this->drush('fn-view', array('drush_main'), $options);
-      $output = $this->getOutput();
-      $this->assertContains('@return', $output, 'Output contain @return Doxygen.');
-      $this->assertContains('function drush_main() {', $output, 'Output contains function drush_main() declaration');
-
-  //    $this->drush('fn-hook', array('cron'), $options);
-  //    $output = $this->getOutputAsList();
-  //    $expected = array('dblog', 'file', 'field', 'system', 'update');
-  //    $this->assertSame($expected, $output);
-    }
-  }
-
-}
diff --git a/modules/devel/icons/bebebe/cog.svg b/modules/devel/icons/bebebe/cog.svg
deleted file mode 100644
index 5f57a39..0000000
--- a/modules/devel/icons/bebebe/cog.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#bebebe" d="M15.176 9.041c.045-.327.076-.658.076-.998 0-.36-.035-.71-.086-1.056l-2.275-.293c-.115-.426-.283-.827-.498-1.201l1.396-1.808c-.416-.551-.906-1.039-1.459-1.452l-1.807 1.391c-.373-.215-.774-.383-1.2-.499l-.292-2.252c-.338-.048-.677-.081-1.029-.081s-.694.033-1.032.082l-.291 2.251c-.426.116-.826.284-1.2.499l-1.805-1.391c-.552.413-1.044.901-1.459 1.452l1.395 1.808c-.215.374-.383.774-.499 1.2l-2.276.294c-.05.346-.085.696-.085 1.056 0 .34.031.671.077.998l2.285.295c.115.426.284.826.499 1.2l-1.417 1.836c.411.55.896 1.038 1.443 1.452l1.842-1.42c.374.215.774.383 1.2.498l.298 2.311c.337.047.677.08 1.025.08s.688-.033 1.021-.08l.299-2.311c.426-.115.826-.283 1.201-.498l1.842 1.42c.547-.414 1.031-.902 1.443-1.452l-1.416-1.837c.215-.373.383-.773.498-1.199l2.286-.295zm-7.174 1.514c-1.406 0-2.543-1.137-2.543-2.541 0-1.402 1.137-2.541 2.543-2.541 1.402 0 2.541 1.138 2.541 2.541 0 1.404-1.139 2.541-2.541 2.541z"/></svg>
\ No newline at end of file
diff --git a/modules/devel/icons/ffffff/cog.svg b/modules/devel/icons/ffffff/cog.svg
deleted file mode 100644
index 63b300e..0000000
--- a/modules/devel/icons/ffffff/cog.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M15.176 9.041c.045-.327.076-.658.076-.998 0-.36-.035-.71-.086-1.056l-2.275-.293c-.115-.426-.283-.827-.498-1.201l1.396-1.808c-.416-.551-.906-1.039-1.459-1.452l-1.807 1.391c-.373-.215-.774-.383-1.2-.499l-.292-2.252c-.338-.048-.677-.081-1.029-.081s-.694.033-1.032.082l-.291 2.251c-.426.116-.826.284-1.2.499l-1.805-1.391c-.552.413-1.044.901-1.459 1.452l1.395 1.808c-.215.374-.383.774-.499 1.2l-2.276.294c-.05.346-.085.696-.085 1.056 0 .34.031.671.077.998l2.285.295c.115.426.284.826.499 1.2l-1.417 1.836c.411.55.896 1.038 1.443 1.452l1.842-1.42c.374.215.774.383 1.2.498l.298 2.311c.337.047.677.08 1.025.08s.688-.033 1.021-.08l.299-2.311c.426-.115.826-.283 1.201-.498l1.842 1.42c.547-.414 1.031-.902 1.443-1.452l-1.416-1.837c.215-.373.383-.773.498-1.199l2.286-.295zm-7.174 1.514c-1.406 0-2.543-1.137-2.543-2.541 0-1.402 1.137-2.541 2.543-2.541 1.402 0 2.541 1.138 2.541 2.541 0 1.404-1.139 2.541-2.541 2.541z"/></svg>
\ No newline at end of file
diff --git a/modules/devel/kint/README.txt b/modules/devel/kint/README.txt
deleted file mode 100644
index 75b68b9..0000000
--- a/modules/devel/kint/README.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-WHAT IS IT?
------------
-Kint for PHP is a tool designed to present your debugging data in the absolutely
-best way possible.
-
-In other words, it's var_dump() and debug_backtrace() on steroids. Easy to use,
-but powerful and customizable. An essential addition to your development
-toolbox.
-
-USAGE
------
-This module allows to use these aliases:
-    kint($data1, $data2, $data3, ...);
-    ksm($data1, $data2, $data3, ...)
-    kint_trace();
-
-But to get the most out of Kint, you will want to use directly the Kint class:
-    kint_require();
-    Kint::dump($data);
-
-Learn more about Kint: http://raveren.github.io/kint/
-
-
-The Kint class function dd() will not work as expected, because this alias
-is already defined in devel.module for other purposes.
-
-CONTACTS
---------
-Module author:
-    Alexander Danilenko
-    danilenko.dn@gmail.com
-    https://drupal.org/user/1072104
-
-Kint author:
-    Rokas Šleinius a.k.a. Raveren
-    raveren@gmail.com
-    https://github.com/raveren
\ No newline at end of file
diff --git a/modules/devel/kint/kint.info.yml b/modules/devel/kint/kint.info.yml
deleted file mode 100644
index 0b20df6..0000000
--- a/modules/devel/kint/kint.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: 'Devel Kint'
-type: module
-description: 'Wrapper for Kint debugging tool'
-package: Development
-# core: 8.x
-tags:
- - developer
-
-# Information added by Drupal.org packaging script on 2017-10-05
-version: '8.x-1.2'
-core: '8.x'
-project: 'devel'
-datestamp: 1507197848
diff --git a/modules/devel/kint/kint.module b/modules/devel/kint/kint.module
deleted file mode 100644
index c8bef22..0000000
--- a/modules/devel/kint/kint.module
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-use Drupal\Core\Render\Markup;
-
-/**
- * Alias of Kint::dump().
- *
- * Prints passed argument(s) using Kint debug tool.
- */
-function kint() {
-  kint_require();
-  if (\Drupal::currentUser()->hasPermission('access kint')) {
-    $args = func_get_args();
-    if (PHP_SAPI === 'cli') {
-      s($args);
-    }
-    else {
-      \Kint::dump($args);
-    }
-  }
-}
-
-/**
- * Alias of Kint::trace().
- *
- * Prints backtrace in Kint debug tool.
- */
-function kint_trace() {
-  kint_require();
-  if (\Drupal::currentUser()->hasPermission('access kint')) {
-    call_user_func_array(array('Kint', 'trace'), array());
-  }
-}
-
-/**
- * Alias of Kint::kintLite().
- *
- * Prints with lightweight formatting, using whitespace for formatting instead
- * of HTML.
- */
-function kint_lite() {
-  if (\Drupal::currentUser()->hasPermission('access kint')) {
-    $args = func_get_args();
-    call_user_func_array('kintLite', $args);
-  }
-}
-
-/**
- * Prints passed argument(s) to the 'message' area of the page.
- */
-function ksm() {
-  kint_require();
-  if (\Drupal::currentUser()->hasPermission('access kint')) {
-    $args = func_get_args();
-    $msg = @Kint::dump($args);
-    drupal_set_message(Markup::create($msg));
-  }
-}
-
-/**
- * Load the Kint class.
- */
-function kint_require() {
-  return require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'kint') . '/kint/Kint.class.php';
-}
diff --git a/modules/devel/kint/kint.permissions.yml b/modules/devel/kint/kint.permissions.yml
deleted file mode 100644
index fe28b85..0000000
--- a/modules/devel/kint/kint.permissions.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-access kint:
-  description: 'View developer debug output.'
-  title: 'Access kint information'
-  restrict access: TRUE
diff --git a/modules/devel/kint/kint.services.yml b/modules/devel/kint/kint.services.yml
deleted file mode 100644
index 5ae75ae..0000000
--- a/modules/devel/kint/kint.services.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-services:
-  kint.twig.kint_extension:
-    class: Drupal\kint\Twig\KintExtension
-    tags:
-      - { name: twig.extension }
diff --git a/modules/devel/kint/kint/.gitignore b/modules/devel/kint/kint/.gitignore
deleted file mode 100644
index 21a6284..0000000
--- a/modules/devel/kint/kint/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/config.php
-/.idea
\ No newline at end of file
diff --git a/modules/devel/kint/kint/Kint.class.php b/modules/devel/kint/kint/Kint.class.php
deleted file mode 100644
index c15e3f4..0000000
--- a/modules/devel/kint/kint/Kint.class.php
+++ /dev/null
@@ -1,836 +0,0 @@
-<?php
-/**
- * Kint is a zero-setup debugging tool to output information about variables and stack traces prettily and comfortably.
- *
- * https://github.com/raveren/kint
- */
-
-
-if ( defined( 'KINT_DIR' ) ) return;
-
-
-define( 'KINT_DIR', dirname( __FILE__ ) . '/' );
-define( 'KINT_PHP53', version_compare( PHP_VERSION, '5.3.0' ) >= 0 );
-
-require KINT_DIR . 'config.default.php';
-require KINT_DIR . 'inc/kintVariableData.class.php';
-require KINT_DIR . 'inc/kintParser.class.php';
-require KINT_DIR . 'inc/kintObject.class.php';
-require KINT_DIR . 'decorators/rich.php';
-require KINT_DIR . 'decorators/plain.php';
-
-if ( is_readable( KINT_DIR . 'config.php' ) ) {
-	require KINT_DIR . 'config.php';
-}
-
-# init settings
-if ( !empty( $GLOBALS['_kint_settings'] ) ) {
-	Kint::enabled( $GLOBALS['_kint_settings']['enabled'] );
-
-	foreach ( $GLOBALS['_kint_settings'] as $key => $val ) {
-		property_exists( 'Kint', $key ) and Kint::$$key = $val;
-	}
-
-	unset( $GLOBALS['_kint_settings'], $key, $val );
-}
-
-class Kint
-{
-	// these are all public and 1:1 config array keys so you can switch them easily
-	private static $_enabledMode; # stores mode and active statuses
-
-	public static $returnOutput;
-	public static $fileLinkFormat;
-	public static $displayCalledFrom;
-	public static $charEncodings;
-	public static $maxStrLength;
-	public static $appRootDirs;
-	public static $maxLevels;
-	public static $theme;
-	public static $expandedByDefault;
-
-	public static $cliDetection;
-	public static $cliColors;
-
-	const MODE_RICH       = 'r';
-	const MODE_WHITESPACE = 'w';
-	const MODE_CLI        = 'c';
-	const MODE_PLAIN      = 'p';
-
-
-	public static $aliases = array(
-		'methods'   => array(
-			array( 'kint', 'dump' ),
-			array( 'kint', 'trace' ),
-		),
-		'functions' => array(
-			'd',
-			'dd',
-			'ddd',
-			's',
-			'sd',
-		)
-	);
-
-	private static $_firstRun = true;
-
-	/**
-	 * Enables or disables Kint, can globally enforce the rendering mode. If called without parameters, returns the
-	 * current mode.
-	 *
-	 * @param mixed $forceMode
-	 *      null or void - return current mode
-	 *      false        - disable (no output)
-	 *      true         - enable and detect cli automatically
-	 *      Kint::MODE_* - enable and force selected mode disregarding detection and function
-	 *                     shorthand (s()/d()), note that you can still override this
-	 *                     with the "~" modifier
-	 *
-	 * @return mixed        previously set value if a new one is passed
-	 */
-	public static function enabled( $forceMode = null )
-	{
-		# act both as a setter...
-		if ( isset( $forceMode ) ) {
-			$before             = self::$_enabledMode;
-			self::$_enabledMode = $forceMode;
-
-			return $before;
-		}
-
-		# ...and a getter
-		return self::$_enabledMode;
-	}
-
-	/**
-	 * Prints a debug backtrace, same as Kint::dump(1)
-	 *
-	 * @param array $trace [OPTIONAL] you can pass your own trace, otherwise, `debug_backtrace` will be called
-	 *
-	 * @return mixed
-	 */
-	public static function trace( $trace = null )
-	{
-		if ( !self::enabled() ) return '';
-
-		return self::dump( isset( $trace ) ? $trace : debug_backtrace( true ) );
-	}
-
-
-	/**
-	 * Dump information about variables, accepts any number of parameters, supports modifiers:
-	 *
-	 *  clean up any output before kint and place the dump at the top of page:
-	 *   - Kint::dump()
-	 *  *****
-	 *  expand all nodes on display:
-	 *   ! Kint::dump()
-	 *  *****
-	 *  dump variables disregarding their depth:
-	 *   + Kint::dump()
-	 *  *****
-	 *  return output instead of displaying it:
-	 *   @ Kint::dump()
-	 *  *****
-	 *  force output as plain text
-	 *   ~ Kint::dump()
-	 *
-	 * Modifiers are supported by all dump wrapper functions, including Kint::trace(). Space is optional.
-	 *
-	 *
-	 * You can also use the following shorthand to display debug_backtrace():
-	 *   Kint::dump( 1 );
-	 *
-	 * Passing the result from debug_backtrace() to kint::dump() as a single parameter will display it as trace too:
-	 *   $trace = debug_backtrace( true );
-	 *   Kint::dump( $trace );
-	 *  Or simply:
-	 *   Kint::dump( debug_backtrace() );
-	 *
-	 *
-	 * @param mixed $data
-	 *
-	 * @return void|string
-	 */
-	public static function dump( $data = null )
-	{
-		if ( !self::enabled() ) return '';
-
-		list( $names, $modifiers, $callee, $previousCaller, $miniTrace ) = self::_getCalleeInfo(
-			defined( 'DEBUG_BACKTRACE_IGNORE_ARGS' )
-				? debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS )
-				: debug_backtrace()
-		);
-		$modeOldValue     = self::enabled();
-		$firstRunOldValue = self::$_firstRun;
-
-		# process modifiers: @, +, !, ~ and -
-		if ( strpos( $modifiers, '-' ) !== false ) {
-			self::$_firstRun = true;
-			while ( ob_get_level() ) {
-				ob_end_clean();
-			}
-		}
-		if ( strpos( $modifiers, '!' ) !== false ) {
-			$expandedByDefaultOldValue = self::$expandedByDefault;
-			self::$expandedByDefault   = true;
-		}
-		if ( strpos( $modifiers, '+' ) !== false ) {
-			$maxLevelsOldValue = self::$maxLevels;
-			self::$maxLevels   = false;
-		}
-		if ( strpos( $modifiers, '@' ) !== false ) {
-			$returnOldValue     = self::$returnOutput;
-			self::$returnOutput = true;
-			self::$_firstRun    = true;
-		}
-		if ( strpos( $modifiers, '~' ) !== false ) {
-			self::enabled( self::MODE_WHITESPACE );
-		}
-
-		# set mode for current run
-		$mode = self::enabled();
-		if ( $mode === true ) {
-			$mode = PHP_SAPI === 'cli'
-				? self::MODE_CLI
-				: self::MODE_RICH;
-		}
-		self::enabled( $mode );
-
-		$decorator = self::enabled() === self::MODE_RICH
-			? 'Kint_Decorators_Rich'
-			: 'Kint_Decorators_Plain';
-
-		$output = '';
-		if ( self::$_firstRun ) {
-			$output .= call_user_func( array( $decorator, 'init' ) );
-		}
-
-
-		$trace = false;
-		if ( $names === array( null ) && func_num_args() === 1 && $data === 1 ) { # Kint::dump(1) shorthand
-			$trace = KINT_PHP53 ? debug_backtrace( true ) : debug_backtrace();
-		} elseif ( func_num_args() === 1 && is_array( $data ) ) {
-			$trace = $data; # test if the single parameter is result of debug_backtrace()
-		}
-		$trace and $trace = self::_parseTrace( $trace );
-
-
-		$output .= call_user_func( array( $decorator, 'wrapStart' ) );
-		if ( $trace ) {
-			$output .= call_user_func( array( $decorator, 'decorateTrace' ), $trace );
-		} else {
-			$data = func_num_args() === 0
-				? array( "[[no arguments passed]]" )
-				: func_get_args();
-
-			foreach ( $data as $k => $argument ) {
-				kintParser::reset();
-				# when the dump arguments take long to generate output, user might have changed the file and
-				# Kint might not parse the arguments correctly, so check if names are set and while the
-				# displayed names might be wrong, at least don't throw an error
-				$output .= call_user_func(
-					array( $decorator, 'decorate' ),
-					kintParser::factory( $argument, isset( $names[ $k ] ) ? $names[ $k ] : '' )
-				);
-			}
-		}
-
-		$output .= call_user_func( array( $decorator, 'wrapEnd' ), $callee, $miniTrace, $previousCaller );
-
-		self::enabled( $modeOldValue );
-
-		self::$_firstRun = false;
-		if ( strpos( $modifiers, '~' ) !== false ) {
-			self::$_firstRun = $firstRunOldValue;
-		} else {
-			self::enabled( $modeOldValue );
-		}
-		if ( strpos( $modifiers, '!' ) !== false ) {
-			self::$expandedByDefault = $expandedByDefaultOldValue;
-		}
-		if ( strpos( $modifiers, '+' ) !== false ) {
-			self::$maxLevels = $maxLevelsOldValue;
-		}
-		if ( strpos( $modifiers, '@' ) !== false ) {
-			self::$returnOutput = $returnOldValue;
-			self::$_firstRun    = $firstRunOldValue;
-			return $output;
-		}
-
-		if ( self::$returnOutput ) return $output;
-
-		echo $output;
-		return '';
-	}
-
-
-	/**
-	 * generic path display callback, can be configured in the settings; purpose is to show relevant path info and hide
-	 * as much of the path as possible.
-	 *
-	 * @param string $file
-	 *
-	 * @return string
-	 */
-	public static function shortenPath( $file )
-	{
-		$file          = str_replace( '\\', '/', $file );
-		$shortenedName = $file;
-		$replaced      = false;
-		if ( is_array( self::$appRootDirs ) ) foreach ( self::$appRootDirs as $path => $replaceString ) {
-			if ( empty( $path ) ) continue;
-
-			$path = str_replace( '\\', '/', $path );
-
-			if ( strpos( $file, $path ) === 0 ) {
-				$shortenedName = $replaceString . substr( $file, strlen( $path ) );
-				$replaced      = true;
-				break;
-			}
-		}
-
-		# fallback to find common path with Kint dir
-		if ( !$replaced ) {
-			$pathParts = explode( '/', str_replace( '\\', '/', KINT_DIR ) );
-			$fileParts = explode( '/', $file );
-			$i         = 0;
-			foreach ( $fileParts as $i => $filePart ) {
-				if ( !isset( $pathParts[ $i ] ) || $pathParts[ $i ] !== $filePart ) break;
-			}
-
-			$shortenedName = ( $i ? '.../' : '' ) . implode( '/', array_slice( $fileParts, $i ) );
-		}
-
-		return $shortenedName;
-	}
-
-	public static function getIdeLink( $file, $line )
-	{
-		return str_replace( array( '%f', '%l' ), array( $file, $line ), self::$fileLinkFormat );
-	}
-
-	/**
-	 * trace helper, shows the place in code inline
-	 *
-	 * @param string $file full path to file
-	 * @param int    $lineNumber the line to display
-	 * @param int    $padding surrounding lines to show besides the main one
-	 *
-	 * @return bool|string
-	 */
-	private static function _showSource( $file, $lineNumber, $padding = 7 )
-	{
-		if ( !$file OR !is_readable( $file ) ) {
-			# continuing will cause errors
-			return false;
-		}
-
-		# open the file and set the line position
-		$file = fopen( $file, 'r' );
-		$line = 0;
-
-		# Set the reading range
-		$range = array(
-			'start' => $lineNumber - $padding,
-			'end'   => $lineNumber + $padding
-		);
-
-		# set the zero-padding amount for line numbers
-		$format = '% ' . strlen( $range['end'] ) . 'd';
-
-		$source = '';
-		while ( ( $row = fgets( $file ) ) !== false ) {
-			# increment the line number
-			if ( ++$line > $range['end'] ) {
-				break;
-			}
-
-			if ( $line >= $range['start'] ) {
-				# make the row safe for output
-				$row = htmlspecialchars( $row, ENT_NOQUOTES, 'UTF-8' );
-
-				# trim whitespace and sanitize the row
-				$row = '<span>' . sprintf( $format, $line ) . '</span> ' . $row;
-
-				if ( $line === $lineNumber ) {
-					# apply highlighting to this row
-					$row = '<div class="kint-highlight">' . $row . '</div>';
-				} else {
-					$row = '<div>' . $row . '</div>';
-				}
-
-				# add to the captured source
-				$source .= $row;
-			}
-		}
-
-		# close the file
-		fclose( $file );
-
-		return $source;
-	}
-
-
-	/**
-	 * returns parameter names that the function was passed, as well as any predefined symbols before function
-	 * call (modifiers)
-	 *
-	 * @param array $trace
-	 *
-	 * @return array( $parameters, $modifier, $callee, $previousCaller )
-	 */
-	private static function _getCalleeInfo( $trace )
-	{
-		$previousCaller = array();
-		$miniTrace      = array();
-		$prevStep       = array();
-
-		# go from back of trace to find first occurrence of call to Kint or its wrappers
-		while ( $step = array_pop( $trace ) ) {
-
-			if ( self::_stepIsInternal( $step ) ) {
-				$previousCaller = $prevStep;
-				break;
-			} elseif ( isset( $step['file'], $step['line'] ) ) {
-				unset( $step['object'], $step['args'] );
-				array_unshift( $miniTrace, $step );
-			}
-
-			$prevStep = $step;
-		}
-		$callee = $step;
-
-		if ( !isset( $callee['file'] ) || !is_readable( $callee['file'] ) ) return false;
-
-
-		# open the file and read it up to the position where the function call expression ended
-		$file   = fopen( $callee['file'], 'r' );
-		$line   = 0;
-		$source = '';
-		while ( ( $row = fgets( $file ) ) !== false ) {
-			if ( ++$line > $callee['line'] ) break;
-			$source .= $row;
-		}
-		fclose( $file );
-		$source = self::_removeAllButCode( $source );
-
-
-		if ( empty( $callee['class'] ) ) {
-			$codePattern = $callee['function'];
-		} else {
-			if ( $callee['type'] === '::' ) {
-				$codePattern = $callee['class'] . "\x07*" . $callee['type'] . "\x07*" . $callee['function'];;
-			} else /*if ( $callee['type'] === '->' )*/ {
-				$codePattern = ".*\x07*" . $callee['type'] . "\x07*" . $callee['function'];;
-			}
-		}
-
-		// todo if more than one call in one line - not possible to determine variable names
-		// todo does not recognize string concat
-		# get the position of the last call to the function
-		preg_match_all( "
-            [
-            # beginning of statement
-            [\x07{(]
-
-            # search for modifiers (group 1)
-            ([-+!@~]*)?
-
-            # spaces
-            \x07*
-
-            # check if output is assigned to a variable (group 2) todo: does not detect concat
-            (
-                \\$[a-z0-9_]+ # variable
-                \x07*\\.?=\x07*  # assignment
-            )?
-
-            # possibly a namespace symbol
-            \\\\?
-
-			# spaces again
-            \x07*
-
-            # main call to Kint
-            {$codePattern}
-
-			# spaces everywhere
-            \x07*
-
-            # find the character where kint's opening bracket resides (group 3)
-            (\\()
-
-            ]ix",
-			$source,
-			$matches,
-			PREG_OFFSET_CAPTURE
-		);
-
-		$modifiers  = end( $matches[1] );
-		$assignment = end( $matches[2] );
-		$bracket    = end( $matches[3] );
-
-		$modifiers = $modifiers[0];
-		if ( $assignment[1] !== -1 ) {
-			$modifiers .= '@';
-		}
-
-		$paramsString = preg_replace( "[\x07+]", ' ', substr( $source, $bracket[1] + 1 ) );
-		# we now have a string like this:
-		# <parameters passed>); <the rest of the last read line>
-
-		# remove everything in brackets and quotes, we don't need nested statements nor literal strings which would
-		# only complicate separating individual arguments
-		$c              = strlen( $paramsString );
-		$inString       = $escaped = $openedBracket = $closingBracket = false;
-		$i              = 0;
-		$inBrackets     = 0;
-		$openedBrackets = array();
-
-		while ( $i < $c ) {
-			$letter = $paramsString[ $i ];
-
-			if ( !$inString ) {
-				if ( $letter === '\'' || $letter === '"' ) {
-					$inString = $letter;
-				} elseif ( $letter === '(' || $letter === '[' ) {
-					$inBrackets++;
-					$openedBrackets[] = $openedBracket = $letter;
-					$closingBracket   = $openedBracket === '(' ? ')' : ']';
-				} elseif ( $inBrackets && $letter === $closingBracket ) {
-					$inBrackets--;
-					array_pop( $openedBrackets );
-					$openedBracket  = end( $openedBrackets );
-					$closingBracket = $openedBracket === '(' ? ')' : ']';
-				} elseif ( !$inBrackets && $letter === ')' ) {
-					$paramsString = substr( $paramsString, 0, $i );
-					break;
-				}
-			} elseif ( $letter === $inString && !$escaped ) {
-				$inString = false;
-			}
-
-			# replace whatever was inside quotes or brackets with untypeable characters, we don't
-			# need that info. We'll later replace the whole string with '...'
-			if ( $inBrackets > 0 ) {
-				if ( $inBrackets > 1 || $letter !== $openedBracket ) {
-					$paramsString[ $i ] = "\x07";
-				}
-			}
-			if ( $inString ) {
-				if ( $letter !== $inString || $escaped ) {
-					$paramsString[ $i ] = "\x07";
-				}
-			}
-
-			$escaped = !$escaped && ( $letter === '\\' );
-			$i++;
-		}
-
-		# by now we have an un-nested arguments list, lets make it to an array for processing further
-		$arguments = explode( ',', preg_replace( "[\x07+]", '...', $paramsString ) );
-
-		# test each argument whether it was passed literary or was it an expression or a variable name
-		$parameters = array();
-		$blacklist  = array( 'null', 'true', 'false', 'array(...)', 'array()', '"..."', '[...]', 'b"..."', );
-		foreach ( $arguments as $argument ) {
-			$argument = trim( $argument );
-
-			if ( is_numeric( $argument )
-				|| in_array( str_replace( "'", '"', strtolower( $argument ) ), $blacklist, true )
-			) {
-				$parameters[] = null;
-			} else {
-				$parameters[] = $argument;
-			}
-		}
-
-		return array( $parameters, $modifiers, $callee, $previousCaller, $miniTrace );
-	}
-
-	/**
-	 * removes comments and zaps whitespace & <?php tags from php code, makes for easier further parsing
-	 *
-	 * @param string $source
-	 *
-	 * @return string
-	 */
-	private static function _removeAllButCode( $source )
-	{
-		$commentTokens    = array(
-			T_COMMENT => true, T_INLINE_HTML => true, T_DOC_COMMENT => true
-		);
-		$whiteSpaceTokens = array(
-			T_WHITESPACE => true, T_CLOSE_TAG => true,
-			T_OPEN_TAG   => true, T_OPEN_TAG_WITH_ECHO => true,
-		);
-
-		$cleanedSource = '';
-		foreach ( token_get_all( $source ) as $token ) {
-			if ( is_array( $token ) ) {
-				if ( isset( $commentTokens[ $token[0] ] ) ) continue;
-
-				if ( isset( $whiteSpaceTokens[ $token[0] ] ) ) {
-					$token = "\x07";
-				} else {
-					$token = $token[1];
-				}
-			} elseif ( $token === ';' ) {
-				$token = "\x07";
-			}
-
-			$cleanedSource .= $token;
-		}
-		return $cleanedSource;
-	}
-
-	/**
-	 * returns whether current trace step belongs to Kint or its wrappers
-	 *
-	 * @param $step
-	 *
-	 * @return array
-	 */
-	private static function _stepIsInternal( $step )
-	{
-		if ( isset( $step['class'] ) ) {
-			foreach ( self::$aliases['methods'] as $alias ) {
-				if ( $alias[0] === strtolower( $step['class'] ) && $alias[1] === strtolower( $step['function'] ) ) {
-					return true;
-				}
-			}
-			return false;
-		} else {
-			return in_array( strtolower( $step['function'] ), self::$aliases['functions'], true );
-		}
-	}
-
-	private static function _parseTrace( array $data )
-	{
-		$trace       = array();
-		$traceFields = array( 'file', 'line', 'args', 'class' );
-		$fileFound   = false; # file element must exist in one of the steps
-
-		# validate whether a trace was indeed passed
-		while ( $step = array_pop( $data ) ) {
-			if ( !is_array( $step ) || !isset( $step['function'] ) ) return false;
-			if ( !$fileFound && isset( $step['file'] ) && file_exists( $step['file'] ) ) {
-				$fileFound = true;
-			}
-
-			$valid = false;
-			foreach ( $traceFields as $element ) {
-				if ( isset( $step[ $element ] ) ) {
-					$valid = true;
-					break;
-				}
-			}
-			if ( !$valid ) return false;
-
-			if ( self::_stepIsInternal( $step ) ) {
-				$step = array(
-					'file'     => $step['file'],
-					'line'     => $step['line'],
-					'function' => '',
-				);
-				array_unshift( $trace, $step );
-				break;
-			}
-			if ( $step['function'] !== 'spl_autoload_call' ) { # meaningless
-				array_unshift( $trace, $step );
-			}
-		}
-		if ( !$fileFound ) return false;
-
-		$output = array();
-		foreach ( $trace as $step ) {
-			if ( isset( $step['file'] ) ) {
-				$file = $step['file'];
-
-				if ( isset( $step['line'] ) ) {
-					$line = $step['line'];
-					# include the source of this step
-					if ( self::enabled() === self::MODE_RICH ) {
-						$source = self::_showSource( $file, $line );
-					}
-				}
-			}
-
-			$function = $step['function'];
-
-			if ( in_array( $function, array( 'include', 'include_once', 'require', 'require_once' ) ) ) {
-				if ( empty( $step['args'] ) ) {
-					# no arguments
-					$args = array();
-				} else {
-					# sanitize the included file path
-					$args = array( 'file' => self::shortenPath( $step['args'][0] ) );
-				}
-			} elseif ( isset( $step['args'] ) ) {
-				if ( empty( $step['class'] ) && !function_exists( $function ) ) {
-					# introspection on closures or language constructs in a stack trace is impossible before PHP 5.3
-					$params = null;
-				} else {
-					try {
-						if ( isset( $step['class'] ) ) {
-							if ( method_exists( $step['class'], $function ) ) {
-								$reflection = new ReflectionMethod( $step['class'], $function );
-							} else if ( isset( $step['type'] ) && $step['type'] == '::' ) {
-								$reflection = new ReflectionMethod( $step['class'], '__callStatic' );
-							} else {
-								$reflection = new ReflectionMethod( $step['class'], '__call' );
-							}
-						} else {
-							$reflection = new ReflectionFunction( $function );
-						}
-
-						# get the function parameters
-						$params = $reflection->getParameters();
-					} catch ( Exception $e ) { # avoid various PHP version incompatibilities
-						$params = null;
-					}
-				}
-
-				$args = array();
-				foreach ( $step['args'] as $i => $arg ) {
-					if ( isset( $params[ $i ] ) ) {
-						# assign the argument by the parameter name
-						$args[ $params[ $i ]->name ] = $arg;
-					} else {
-						# assign the argument by number
-						$args[ '#' . ( $i + 1 ) ] = $arg;
-					}
-				}
-			}
-
-			if ( isset( $step['class'] ) ) {
-				# Class->method() or Class::method()
-				$function = $step['class'] . $step['type'] . $function;
-			}
-
-			// todo it's possible to parse the object name out from the source!
-			$output[] = array(
-				'function' => $function,
-				'args'     => isset( $args ) ? $args : null,
-				'file'     => isset( $file ) ? $file : null,
-				'line'     => isset( $line ) ? $line : null,
-				'source'   => isset( $source ) ? $source : null,
-				'object'   => isset( $step['object'] ) ? $step['object'] : null,
-			);
-
-			unset( $function, $args, $file, $line, $source );
-		}
-
-		return $output;
-	}
-}
-
-
-if ( !function_exists( 'd' ) ) {
-	/**
-	 * Alias of Kint::dump()
-	 *
-	 * @return string
-	 */
-	function d()
-	{
-		if ( !Kint::enabled() ) return '';
-		$_ = func_get_args();
-		return call_user_func_array( array( 'Kint', 'dump' ), $_ );
-	}
-}
-
-if ( !function_exists( 'dd' ) ) {
-	/**
-	 * Alias of Kint::dump()
-	 * [!!!] IMPORTANT: execution will halt after call to this function
-	 *
-	 * @return string
-	 * @deprecated
-	 */
-	function dd()
-	{
-		if ( !Kint::enabled() ) return '';
-
-		echo "<pre>Kint: dd() is being deprecated, please use ddd() instead</pre>\n";
-		$_ = func_get_args();
-		call_user_func_array( array( 'Kint', 'dump' ), $_ );
-		die;
-	}
-}
-
-if ( !function_exists( 'ddd' ) ) {
-	/**
-	 * Alias of Kint::dump()
-	 * [!!!] IMPORTANT: execution will halt after call to this function
-	 *
-	 * @return string
-	 */
-	function ddd()
-	{
-		if ( !Kint::enabled() ) return '';
-		$_ = func_get_args();
-		call_user_func_array( array( 'Kint', 'dump' ), $_ );
-		die;
-	}
-}
-
-if ( !function_exists( 's' ) ) {
-	/**
-	 * Alias of Kint::dump(), however the output is in plain htmlescaped text and some minor visibility enhancements
-	 * added. If run in CLI mode, output is pure whitespace.
-	 *
-	 * To force rendering mode without autodetecting anything:
-	 *
-	 *  Kint::enabled( Kint::MODE_PLAIN );
-	 *  Kint::dump( $variable );
-	 *
-	 * [!!!] IMPORTANT: execution will halt after call to this function
-	 *
-	 * @return string
-	 */
-	function s()
-	{
-		$enabled = Kint::enabled();
-		if ( !$enabled ) return '';
-
-		if ( $enabled === Kint::MODE_WHITESPACE ) { # if already in whitespace, don't elevate to plain
-			$restoreMode = Kint::MODE_WHITESPACE;
-		} else {
-			$restoreMode = Kint::enabled( # remove cli colors in cli mode; remove rich interface in HTML mode
-				PHP_SAPI === 'cli' ? Kint::MODE_WHITESPACE : Kint::MODE_PLAIN
-			);
-		}
-
-		$params = func_get_args();
-		$dump   = call_user_func_array( array( 'Kint', 'dump' ), $params );
-		Kint::enabled( $restoreMode );
-		return $dump;
-	}
-}
-
-if ( !function_exists( 'sd' ) ) {
-	/**
-	 * @see s()
-	 *
-	 * [!!!] IMPORTANT: execution will halt after call to this function
-	 *
-	 * @return string
-	 */
-	function sd()
-	{
-		$enabled = Kint::enabled();
-		if ( !$enabled ) return '';
-
-		if ( $enabled !== Kint::MODE_WHITESPACE ) {
-			Kint::enabled(
-				PHP_SAPI === 'cli' ? Kint::MODE_WHITESPACE : Kint::MODE_PLAIN
-			);
-		}
-
-		$params = func_get_args();
-		call_user_func_array( array( 'Kint', 'dump' ), $params );
-		die;
-	}
-}
diff --git a/modules/devel/kint/kint/LICENCE b/modules/devel/kint/kint/LICENCE
deleted file mode 100644
index 936fe1f..0000000
--- a/modules/devel/kint/kint/LICENCE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Rokas Šleinius (raveren@gmail.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/modules/devel/kint/kint/README.md b/modules/devel/kint/kint/README.md
deleted file mode 100644
index 74edcba..0000000
--- a/modules/devel/kint/kint/README.md
+++ /dev/null
@@ -1,141 +0,0 @@
-# Kint - debugging helper for PHP developers
-
-[![Total Downloads](https://poser.pugx.org/raveren/kint/downloads.png)](https://packagist.org/packages/raveren/kint)
-
-> **New version** v1.0.0 is released with more than two years of active development - changes are too numerous to list, but there's CLI output and literally hundreds of improvements and additions.
-
-![Screenshot](http://raveren.github.com/kint/img/preview.png)
-
-## What am I looking at?
-
-At first glance Kint is just a pretty replacement for **[var_dump()](http://php.net/manual/en/function.var-dump.php)**, **[print_r()](http://php.net/manual/en/function.print-r.php)** and **[debug_backtrace()](http://php.net/manual/en/function.debug-backtrace.php)**. 
-
-However, it's much, *much* more than that. Even the excellent `xdebug` var_dump improvements don't come close - you will eventually wonder how you developed without it. 
-
-Just to list some of the most useful features:
-
- * The **variable name and place in code** where Kint was called from is displayed;
- * You can **disable all Kint output easily and on the fly** - so you can even debug live systems without anyone knowing (even though you know you shouldn't be doing that!:). 
- * **CLI is detected** and formatted for automatically (but everything can be overridden on the fly) - if your setup supports it, the output is colored too:
-  ![Kint CLI output](http://i.imgur.com/6B9MCLw.png)
- * **Debug backtraces** are finally fully readable, actually informative and a pleasure to the eye.
- * Kint has been **in active development for more than six years** and is shipped with [Drupal 8](https://www.drupal.org/) by default as part of its devel suite. You can trust it not being abandoned or getting left behind in features.
- * Variable content is **displayed in the most informative way** - and you *never, ever* miss anything! Kint guarantees you see every piece of physically available information about everything you are dumping*; 
-   * <sup>in some cases, the content is truncated where it would otherwise be too large to view anyway - but the user is always made aware of that;</sup>
- * Some variable content types have an alternative display - for example you will be able see `JSON` in its raw form - but also as an associative array:
-  ![Kint displays data intelligently](http://i.imgur.com/9P57Ror.png)
-  There are more than ten custom variable type displays inbuilt and more are added periodically.
-
-
-## Installation and Usage
-
-One of the main goals of Kint is to be **zero setup**. 
-
-[Download the archive](https://github.com/raveren/kint/releases/download/1.0.2/kint.zip) and simply
-```php
-<?php
-require '/kint/Kint.class.php';
-```
-
-**Or, if you use Composer:**
-
-```json
-"require": {
-   "raveren/kint": "^1.0"
-}
-```
-
-Or just run `composer require raveren/kint`
-
-**That's it, you can now use Kint to debug your code:**
-
-```php
-########## DUMP VARIABLE ###########################
-Kint::dump($GLOBALS, $_SERVER); // pass any number of parameters
-
-// or simply use d() as a shorthand:
-d($_SERVER);
-
-
-########## DEBUG BACKTRACE #########################
-Kint::trace();
-// or via shorthand:
-d(1);
-
-
-############# BASIC OUTPUT #########################
-# this will show a basic javascript-free display
-s($GLOBALS);
-
-
-######### WHITESPACE FORMATTED OUTPUT ##############
-# this will be garbled if viewed in browser as it is whitespace-formatted only
-~d($GLOBALS); // just prepend with the tilde
-
-
-########## MISCELLANEOUS ###########################
-# this will disable kint completely
-Kint::enabled(false);
-
-ddd('Get off my lawn!'); // no effect
-
-Kint::enabled(true);
-ddd( 'this line will stop the execution flow because Kint was just re-enabled above!' );
-
-
-```
-
-Note, that Kint *does* have configuration (like themes and IDE integration!), but it's in need of being rewritten, so I'm not documenting it yet.
-
-## Tips & Tricks
-
-  * Kint is enabled by default, call `Kint::enabled(false);` to turn its funcionality completely off. The *best practice* is to enable Kint in DEVELOPMENT environment only (or for example `Kint::enabled($_SERVER['REMOTE_ADDR'] === '<your IP>');`) - so even if you accidentally leave a dump in production, no one will know.
-  * `sd()` and `ddd()` are shorthands for `s();die;` and `d();die;` respectively. 
-    * **Important:** The older shorthand `dd()` is deprecated due to compatibility issues and will eventually be removed. Use the analogous `ddd()` instead.
-  * When looking at Kint output, press <kbd>D</kbd> on the keyboard and you will be able to traverse the tree with arrows and tab keys - and expand/collapse nodes with space or enter.
-  * Double clicking the `[+]` sign in the output will expand/collapse ALL nodes; triple clicking big blocks of text will select it all.
-  * Clicking the tiny arrows on the right of the output open it in a separate window where you can keep it for comparison.
-  * To catch output from Kint just assign it to a variable<sup>beta</sup>
-```php
-$o = Kint::dump($GLOBALS); 
-// yes, the assignment is automatically detected, and $o 
-// now holds whatever was going to be printed otherwise.
-
-// it also supports modifiers (read on) for the variable:
-~$o = Kint::dump($GLOBALS); // this output will be in whitespace
-```
-  * There are a couple of real-time modifiers you can use:
-    * `~d($var)` this call will output in plain text format.
-    * `+d($var)` will disregard depth level limits and output everything (careful, this can hang your browser on huge objects)
-    * `!d($var)` will show expanded rich output.
-    * `-d($var)` will attempt to `ob_clean` the previous output so if you're dumping something inside a HTML page, you will still see Kint output.
-  You can combine modifiers too: `~+d($var)`
-  * To force a specific dump output type just pass it to the `Kint::enabled()` method. Available options are: `Kint::MODE_RICH` (default), `Kint::MODE_PLAIN`, `Kint::MODE_WHITESPACE` and `Kint::MODE_CLI`:
-```php
-Kint::enabled(Kint::MODE_WHITESPACE);
-$kintOutput = Kint::dump($GLOBALS); 
-// now $kintOutput can be written to a text log file and 
-// be perfectly readable from there
-```
-  * To change display theme, use `Kint::$theme = '<theme name>';` where available options are: `'original'` (default), `'solarized'`, `'solarized-dark'` and `'aante-light'`. Here's an (outdated) preview:
-  ![Kint themes](http://raveren.github.io/kint/img/theme-preview.png)
-  * Kint also includes a naïve profiler you may find handy. It's for determining relatively which code blocks take longer than others:
-```php
-Kint::dump( microtime() ); // just pass microtime()
-sleep( 1 );
-Kint::dump( microtime(), 'after sleep(1)' );
-sleep( 2 );
-ddd( microtime(), 'final call, after sleep(2)' );
-```
-  ![Kint profiling feature](http://i.imgur.com/tmHUMW4.png)
-----
-
-[Visit the project page](http://raveren.github.com/kint/) for documentation, configuration, and more advanced usage examples.
-
-### Author
-
-**Rokas Šleinius** (Raveren)
-
-### License
-
-Licensed under the MIT License
diff --git a/modules/devel/kint/kint/composer.json b/modules/devel/kint/kint/composer.json
deleted file mode 100644
index 78eb1b6..0000000
--- a/modules/devel/kint/kint/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "raveren/kint",
-    "description": "Kint - debugging helper for PHP developers",
-    "keywords": ["kint", "php", "debug"],
-    "type": "library",
-    "homepage": "https://github.com/raveren/kint",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Rokas Šleinius",
-            "homepage": "https://github.com/raveren"
-        },
-        {
-            "name": "Contributors",
-            "homepage": "https://github.com/raveren/kint/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.1.0"
-    },
-    "autoload": {
-        "files": ["Kint.class.php"]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/config.default.php b/modules/devel/kint/kint/config.default.php
deleted file mode 100644
index 72f0a69..0000000
--- a/modules/devel/kint/kint/config.default.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-isset( $GLOBALS['_kint_settings'] ) or $GLOBALS['_kint_settings'] = array();
-$_kintSettings = &$GLOBALS['_kint_settings'];
-
-
-/** @var bool if set to false, kint will become silent, same as Kint::enabled(false) or Kint::$enabled = false */
-$_kintSettings['enabled'] = true;
-
-
-/**
- * @var bool whether to display where kint was called from
- */
-$_kintSettings['displayCalledFrom'] = true;
-
-
-/**
- * @var string format of the link to the source file in trace entries. Use %f for file path, %l for line number.
- * Defaults to xdebug.file_link_format if not set.
- *
- * [!] EXAMPLE (works with for phpStorm and RemoteCall Plugin):
- *
- * $_kintSettings['fileLinkFormat'] = 'http://localhost:8091/?message=%f:%l';
- *
- */
-$_kintSettings['fileLinkFormat'] = ini_get( 'xdebug.file_link_format' );
-
-
-/**
- * @var array base directories of your application that will be displayed instead of the full path. Keys are paths,
- * values are replacement strings
- *
- * Defaults to array( $_SERVER['DOCUMENT_ROOT'] => '&lt;ROOT&gt;' )
- *
- * [!] EXAMPLE (for Kohana framework):
- *
- * $_kintSettings['appRootDirs'] = array(
- *      APPPATH => 'APPPATH', // make sure the constants are already defined at the time of including this config file
- *      SYSPATH => 'SYSPATH',
- *      MODPATH => 'MODPATH',
- *      DOCROOT => 'DOCROOT',
- * );
- *
- * [!] EXAMPLE #2 (for a semi-universal approach)
- *
- * $_kintSettings['appRootDirs'] = array(
- *      realpath( __DIR__ . '/../../..' ) => 'ROOT', // go up as many levels as needed in the realpath() param
- * );
- *
- * $_kintSettings['fileLinkFormat'] = 'http://localhost:8091/?message=%f:%l';
- *
- */
-$_kintSettings['appRootDirs'] = isset( $_SERVER['DOCUMENT_ROOT'] )
-	? array( $_SERVER['DOCUMENT_ROOT'] => '&lt;ROOT&gt;' )
-	: array();
-
-
-/** @var int max length of string before it is truncated and displayed separately in full. Zero or false to disable */
-$_kintSettings['maxStrLength'] = 80;
-
-/** @var array possible alternative char encodings in order of probability, eg. array('windows-1251') */
-$_kintSettings['charEncodings'] = array(
-	'UTF-8',
-	'Windows-1252', # Western; includes iso-8859-1, replace this with windows-1251 if you have Russian code
-	'euc-jp',       # Japanese
-
-	# all other charsets cannot be differentiated by PHP and/or are not supported by mb_* functions,
-	# I need a better means of detecting the codeset, no idea how though :(
-
-	//		'iso-8859-13',  # Baltic
-	//		'windows-1251', # Cyrillic
-	//		'windows-1250', # Central European
-	//		'shift_jis',    # Japanese
-	//		'iso-2022-jp',  # Japanese
-);
-
-
-/** @var int max array/object levels to go deep, if zero no limits are applied */
-$_kintSettings['maxLevels'] = 7;
-
-
-/** @var string name of theme for rich view */
-$_kintSettings['theme'] = 'original';
-
-
-/** @var bool enable detection when Kint is command line. Formats output with whitespace only; does not HTML-escape it */
-$_kintSettings['cliDetection'] = true;
-
-/** @var bool in addition to above setting, enable detection when Kint is run in *UNIX* command line.
- * Attempts to add coloring, but if seen as plain text, the color information is visible as gibberish
- */
-$_kintSettings['cliColors'] = true;
-
-
-unset( $_kintSettings );
\ No newline at end of file
diff --git a/modules/devel/kint/kint/decorators/plain.php b/modules/devel/kint/kint/decorators/plain.php
deleted file mode 100644
index 22ebd2a..0000000
--- a/modules/devel/kint/kint/decorators/plain.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-
-class Kint_Decorators_Plain
-{
-	private static $_enableColors;
-
-	private static $_cliEffects      = array(
-		# effects
-		'bold'             => '1', 'dark' => '2',
-		'italic'           => '3', 'underline' => '4',
-		'blink'            => '5', 'reverse' => '7',
-		'concealed'        => '8', 'default' => '39',
-
-		# colors
-		'black'            => '30', 'red' => '31',
-		'green'            => '32', 'yellow' => '33',
-		'blue'             => '34', 'magenta' => '35',
-		'cyan'             => '36', 'light_gray' => '37',
-		'dark_gray'        => '90', 'light_red' => '91',
-		'light_green'      => '92', 'light_yellow' => '93',
-		'light_blue'       => '94', 'light_magenta' => '95',
-		'light_cyan'       => '96', 'white' => '97',
-
-		# backgrounds
-		'bg_default'       => '49', 'bg_black' => '40',
-		'bg_red'           => '41', 'bg_green' => '42',
-		'bg_yellow'        => '43', 'bg_blue' => '44',
-		'bg_magenta'       => '45', 'bg_cyan' => '46',
-		'bg_light_gray'    => '47', 'bg_dark_gray' => '100',
-		'bg_light_red'     => '101', 'bg_light_green' => '102',
-		'bg_light_yellow'  => '103', 'bg_light_blue' => '104',
-		'bg_light_magenta' => '105', 'bg_light_cyan' => '106',
-		'bg_white'         => '107',
-	);
-	private static $_utfSymbols      = array(
-		'┌', '═', '┐',
-		'│',
-		'└', '─', '┘',
-	);
-	private static $_winShellSymbols = array(
-		"\xda", "\xdc", "\xbf",
-		"\xb3",
-		"\xc0", "\xc4", "\xd9",
-	);
-	private static $_htmlSymbols     = array(
-		"&#9484;", "&#9604;", "&#9488;",
-		"&#9474;",
-		"&#9492;", "&#9472;", "&#9496;",
-	);
-
-	public static function decorate( kintVariableData $kintVar, $level = 0 )
-	{
-		$output = '';
-		if ( $level === 0 ) {
-			$name          = $kintVar->name ? $kintVar->name : 'literal';
-			$kintVar->name = null;
-
-			$output .= self::_title( $name );
-		}
-
-
-		$space = str_repeat( $s = '    ', $level );
-		$output .= $space . self::_drawHeader( $kintVar );
-
-
-		if ( $kintVar->extendedValue !== null ) {
-			$output .= ' ' . ( $kintVar->type === 'array' ? '[' : '(' ) . PHP_EOL;
-
-
-			if ( is_array( $kintVar->extendedValue ) ) {
-				foreach ( $kintVar->extendedValue as $v ) {
-					$output .= self::decorate( $v, $level + 1 );
-				}
-			} elseif ( is_string( $kintVar->extendedValue ) ) {
-				$output .= $space . $s . $kintVar->extendedValue . PHP_EOL; # depth too great or similar
-			} else {
-				$output .= self::decorate( $kintVar->extendedValue, $level + 1 ); //it's kintVariableData
-			}
-			$output .= $space . ( $kintVar->type === 'array' ? ']' : ')' ) . PHP_EOL;
-		} else {
-			$output .= PHP_EOL;
-		}
-
-		return $output;
-	}
-
-	public static function decorateTrace( $traceData )
-	{
-		$output   = self::_title( 'TRACE' );
-		$lastStep = count( $traceData );
-		foreach ( $traceData as $stepNo => $step ) {
-			$title = str_pad( ++$stepNo . ': ', 4, ' ' );
-
-			$title .= self::_colorize(
-				( isset( $step['file'] ) ? self::_buildCalleeString( $step ) : 'PHP internal call' ),
-				'title'
-			);
-
-			if ( !empty( $step['function'] ) ) {
-				$title .= '    ' . $step['function'];
-				if ( isset( $step['args'] ) ) {
-					$title .= '(';
-					if ( empty( $step['args'] ) ) {
-						$title .= ')';
-					} else {
-					}
-					$title .= PHP_EOL;
-				}
-			}
-
-			$output .= $title;
-
-			if ( !empty( $step['args'] ) ) {
-				$appendDollar = $step['function'] === '{closure}' ? '' : '$';
-
-				$i = 0;
-				foreach ( $step['args'] as $name => $argument ) {
-					$argument           = kintParser::factory(
-						$argument,
-						$name ? $appendDollar . $name : '#' . ++$i
-					);
-					$argument->operator = $name ? ' =' : ':';
-					$maxLevels          = Kint::$maxLevels;
-					if ( $maxLevels ) {
-						Kint::$maxLevels = $maxLevels + 2;
-					}
-					$output .= self::decorate( $argument, 2 );
-					if ( $maxLevels ) {
-						Kint::$maxLevels = $maxLevels;
-					}
-				}
-				$output .= '    )' . PHP_EOL;
-			}
-
-			if ( !empty( $step['object'] ) ) {
-				$output .= self::_colorize(
-					'    ' . self::_char( '─', 27 ) . ' Callee object ' . self::_char( '─', 34 ),
-					'title'
-				);
-
-				$maxLevels = Kint::$maxLevels;
-				if ( $maxLevels ) {
-					# in cli the terminal window is filled too quickly to display huge objects
-					Kint::$maxLevels = Kint::enabled() === Kint::MODE_CLI
-						? 1
-						: $maxLevels + 1;
-				}
-				$output .= self::decorate( kintParser::factory( $step['object'] ), 1 );
-				if ( $maxLevels ) {
-					Kint::$maxLevels = $maxLevels;
-				}
-			}
-
-			if ( $stepNo !== $lastStep ) {
-				$output .= self::_colorize( self::_char( '─', 80 ), 'title' );
-			}
-		}
-
-		return $output;
-	}
-
-
-	private static function _colorize( $text, $type, $nlAfter = true )
-	{
-		$nlAfter = $nlAfter ? PHP_EOL : '';
-
-		switch ( Kint::enabled() ) {
-			case Kint::MODE_PLAIN:
-				if ( !self::$_enableColors ) return $text . $nlAfter;
-
-				switch ( $type ) {
-					case 'value':
-						$text = "<i>{$text}</i>";
-						break;
-					case 'type':
-						$text = "<b>{$text}</b>";
-						break;
-					case 'title':
-						$text = "<u>{$text}</u>";
-						break;
-				}
-
-				return $text . $nlAfter;
-				break;
-			case Kint::MODE_CLI:
-				if ( !self::$_enableColors ) return $text . $nlAfter;
-
-				$optionsMap = array(
-					'title' => "\x1b[36m", # cyan
-					'type'  => "\x1b[35;1m", # magenta bold
-					'value' => "\x1b[32m", # green
-				);
-
-				return $optionsMap[ $type ] . $text . "\x1b[0m" . $nlAfter;
-				break;
-			case Kint::MODE_WHITESPACE:
-			default:
-				return $text . $nlAfter;
-				break;
-		}
-	}
-
-
-	private static function _char( $char, $repeat = null )
-	{
-		switch ( Kint::enabled() ) {
-			case Kint::MODE_PLAIN:
-				$char = self::$_htmlSymbols[ array_search( $char, self::$_utfSymbols, true ) ];
-				break;
-			case Kint::MODE_CLI:
-				$inWindowsShell = PHP_SAPI === 'cli' && DIRECTORY_SEPARATOR !== '/';
-				if ( $inWindowsShell ) {
-					$char = self::$_winShellSymbols[ array_search( $char, self::$_utfSymbols, true ) ];
-				}
-				break;
-			case Kint::MODE_WHITESPACE:
-			default:
-				break;
-		}
-
-		return $repeat ? str_repeat( $char, $repeat ) : $char;
-	}
-
-	private static function _title( $text )
-	{
-		$escaped          = kintParser::escape( $text );
-		$lengthDifference = strlen( $escaped ) - strlen( $text );
-		return
-			self::_colorize(
-				self::_char( '┌' ) . self::_char( '─', 78 ) . self::_char( '┐' ) . PHP_EOL
-				. self::_char( '│' ),
-				'title',
-				false
-			)
-
-			. self::_colorize( str_pad( $escaped, 78 + $lengthDifference, ' ', STR_PAD_BOTH ), 'title', false )
-
-			. self::_colorize( self::_char( '│' ) . PHP_EOL
-				. self::_char( '└' ) . self::_char( '─', 78 ) . self::_char( '┘' ),
-				'title'
-			);
-	}
-
-	public static function wrapStart()
-	{
-		if ( Kint::enabled() === Kint::MODE_PLAIN ) {
-			return '<pre class="-kint">';
-		}
-		return '';
-	}
-
-	public static function wrapEnd( $callee, $miniTrace, $prevCaller )
-	{
-		$lastLine = self::_colorize( self::_char( "═", 80 ), 'title' );
-		$lastChar = Kint::enabled() === Kint::MODE_PLAIN ? '</pre>' : '';
-
-
-		if ( !Kint::$displayCalledFrom ) return $lastLine . $lastChar;
-
-
-		return $lastLine . self::_colorize( 'Called from ' . self::_buildCalleeString( $callee ), 'title' ) . $lastChar;
-	}
-
-
-	private static function _drawHeader( kintVariableData $kintVar )
-	{
-		$output = '';
-
-		if ( $kintVar->access ) {
-			$output .= ' ' . $kintVar->access;
-		}
-
-		if ( $kintVar->name !== null && $kintVar->name !== '' ) {
-			$output .= ' ' . kintParser::escape( $kintVar->name );
-		}
-
-		if ( $kintVar->operator ) {
-			$output .= ' ' . $kintVar->operator;
-		}
-
-		$output .= ' ' . self::_colorize( $kintVar->type, 'type', false );
-
-		if ( $kintVar->size !== null ) {
-			$output .= ' (' . $kintVar->size . ')';
-		}
-
-
-		if ( $kintVar->value !== null && $kintVar->value !== '' ) {
-			$output .= ' ' . self::_colorize(
-					$kintVar->value, # escape shell
-					'value',
-					false
-				);
-		}
-
-		return ltrim( $output );
-	}
-
-	private static function _buildCalleeString( $callee )
-	{
-		if ( Kint::enabled() === Kint::MODE_CLI ) { // todo win/nix
-			return "+{$callee['line']} {$callee['file']}";
-		}
-
-		$url           = Kint::getIdeLink( $callee['file'], $callee['line'] );
-		$shortenedName = Kint::shortenPath( $callee['file'] ) . ':' . $callee['line'];
-
-		if ( Kint::enabled() === Kint::MODE_PLAIN ) {
-			if ( strpos( $url, 'http://' ) === 0 ) {
-				$calleeInfo = "<a href=\"#\"onclick=\""
-					. "X=new XMLHttpRequest;"
-					. "X.open('GET','{$url}');"
-					. "X.send();"
-					. "return!1\">{$shortenedName}</a>";
-			} else {
-				$calleeInfo = "<a href=\"{$url}\">{$shortenedName}</a>";
-			}
-		} else {
-			$calleeInfo = $shortenedName;
-		}
-
-		return $calleeInfo;
-	}
-
-	public static function init()
-	{
-		self::$_enableColors =
-			Kint::$cliColors
-			&& ( DIRECTORY_SEPARATOR === '/' || getenv( 'ANSICON' ) !== false || getenv( 'ConEmuANSI' ) === 'ON' );
-
-		return Kint::enabled() === Kint::MODE_PLAIN
-			? '<style>.-kint i{color:#d00;font-style:normal}.-kint u{color:#030;text-decoration:none;font-weight:bold}</style>'
-			: '';
-	}
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/decorators/rich.php b/modules/devel/kint/kint/decorators/rich.php
deleted file mode 100644
index bb6c978..0000000
--- a/modules/devel/kint/kint/decorators/rich.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-
-class Kint_Decorators_Rich
-{
-	# make calls to Kint::dump() from different places in source coloured differently.
-	private static $_usedColors = array();
-
-	public static function decorate( kintVariableData $kintVar )
-	{
-		$output = '<dl>';
-
-		$extendedPresent = $kintVar->extendedValue !== null || $kintVar->_alternatives !== null;
-
-		if ( $extendedPresent ) {
-			$class = 'kint-parent';
-			if ( Kint::$expandedByDefault ) {
-				$class .= ' kint-show';
-			}
-			$output .= '<dt class="' . $class . '">';
-		} else {
-			$output .= '<dt>';
-		}
-
-		if ( $extendedPresent ) {
-			$output .= '<span class="kint-popup-trigger" title="Open in new window">&rarr;</span><nav></nav>';
-		}
-
-		$output .= self::_drawHeader( $kintVar ) . $kintVar->value . '</dt>';
-
-
-		if ( $extendedPresent ) {
-			$output .= '<dd>';
-		}
-
-		if ( isset( $kintVar->extendedValue ) ) {
-
-			if ( is_array( $kintVar->extendedValue ) ) {
-				foreach ( $kintVar->extendedValue as $v ) {
-					$output .= self::decorate( $v );
-				}
-			} elseif ( is_string( $kintVar->extendedValue ) ) {
-				$output .= '<pre>' . $kintVar->extendedValue . '</pre>';
-			} else {
-				$output .= self::decorate( $kintVar->extendedValue ); //it's kint's container
-			}
-
-		} elseif ( isset( $kintVar->_alternatives ) ) {
-			$output .= "<ul class=\"kint-tabs\">";
-
-			foreach ( $kintVar->_alternatives as $k => $var ) {
-				$active = $k === 0 ? ' class="kint-active-tab"' : '';
-				$output .= "<li{$active}>" . self::_drawHeader( $var, false ) . '</li>';
-			}
-
-			$output .= "</ul><ul>";
-
-			foreach ( $kintVar->_alternatives as $var ) {
-				$output .= "<li>";
-
-				$var = $var->value;
-
-				if ( is_array( $var ) ) {
-					foreach ( $var as $v ) {
-						$output .= is_string( $v )
-							? '<pre>' . $v . '</pre>'
-							: self::decorate( $v );
-					}
-				} elseif ( is_string( $var ) ) {
-					$output .= '<pre>' . $var . '</pre>';
-				} elseif ( isset( $var ) ) {
-					throw new Exception(
-						'Kint has encountered an error, '
-						. 'please paste this report to https://github.com/raveren/kint/issues<br>'
-						. 'Error encountered at ' . basename( __FILE__ ) . ':' . __LINE__ . '<br>'
-						. ' variables: '
-						. htmlspecialchars( var_export( $kintVar->_alternatives, true ), ENT_QUOTES )
-					);
-				}
-
-				$output .= "</li>";
-			}
-
-			$output .= "</ul>";
-		}
-		if ( $extendedPresent ) {
-			$output .= '</dd>';
-		}
-
-		$output .= '</dl>';
-
-		return $output;
-	}
-
-	public static function decorateTrace( $traceData )
-	{
-		$output = '<dl class="kint-trace">';
-
-		foreach ( $traceData as $i => $step ) {
-			$class = 'kint-parent';
-			if ( Kint::$expandedByDefault ) {
-				$class .= ' kint-show';
-			}
-
-			$output .= '<dt class="' . $class . '">'
-				. '<b>' . ( $i + 1 ) . '</b> '
-				. '<nav></nav>'
-				. '<var>';
-
-			if ( isset( $step['file'] ) ) {
-				$output .= self::_ideLink( $step['file'], $step['line'] );
-			} else {
-				$output .= 'PHP internal call';
-			}
-
-			$output .= '</var>';
-
-			$output .= $step['function'];
-
-			if ( isset( $step['args'] ) ) {
-				$output .= '(' . implode( ', ', array_keys( $step['args'] ) ) . ')';
-			}
-			$output .= '</dt><dd>';
-			$firstTab = ' class="kint-active-tab"';
-			$output .= '<ul class="kint-tabs">';
-
-			if ( !empty( $step['source'] ) ) {
-				$output .= "<li{$firstTab}>Source</li>";
-				$firstTab = '';
-			}
-
-			if ( !empty( $step['args'] ) ) {
-				$output .= "<li{$firstTab}>Arguments</li>";
-				$firstTab = '';
-			}
-
-			if ( !empty( $step['object'] ) ) {
-				kintParser::reset();
-				$calleeDump = kintParser::factory( $step['object'] );
-
-				$output .= "<li{$firstTab}>Callee object [{$calleeDump->type}]</li>";
-			}
-
-
-			$output .= '</ul><ul>';
-
-
-			if ( !empty( $step['source'] ) ) {
-				$output .= "<li><pre class=\"kint-source\">{$step['source']}</pre></li>";
-			}
-
-			if ( !empty( $step['args'] ) ) {
-				$output .= "<li>";
-				foreach ( $step['args'] as $k => $arg ) {
-					kintParser::reset();
-					$output .= self::decorate( kintParser::factory( $arg, $k ) );
-				}
-				$output .= "</li>";
-			}
-			if ( !empty( $step['object'] ) ) {
-				$output .= "<li>" . self::decorate( $calleeDump ) . "</li>";
-			}
-
-			$output .= '</ul></dd>';
-		}
-		$output .= '</dl>';
-
-		return $output;
-	}
-
-
-	/**
-	 * called for each dump, opens the html tag
-	 *
-	 * @param array $callee caller information taken from debug backtrace
-	 *
-	 * @return string
-	 */
-	public static function wrapStart()
-	{
-		return "<div class=\"kint\">";
-	}
-
-
-	/**
-	 * closes Kint::_wrapStart() started html tags and displays callee information
-	 *
-	 * @param array $callee caller information taken from debug backtrace
-	 * @param array $miniTrace full path to kint call
-	 * @param array $prevCaller previous caller information taken from debug backtrace
-	 *
-	 * @return string
-	 */
-	public static function wrapEnd( $callee, $miniTrace, $prevCaller )
-	{
-		if ( !Kint::$displayCalledFrom ) {
-			return '</div>';
-		}
-
-		$callingFunction = '';
-		$calleeInfo      = '';
-		$traceDisplay    = '';
-		if ( isset( $prevCaller['class'] ) ) {
-			$callingFunction = $prevCaller['class'];
-		}
-		if ( isset( $prevCaller['type'] ) ) {
-			$callingFunction .= $prevCaller['type'];
-		}
-		if ( isset( $prevCaller['function'] )
-			&& !in_array( $prevCaller['function'], array( 'include', 'include_once', 'require', 'require_once' ) )
-		) {
-			$callingFunction .= $prevCaller['function'] . '()';
-		}
-		$callingFunction and $callingFunction = " [{$callingFunction}]";
-
-
-		if ( isset( $callee['file'] ) ) {
-			$calleeInfo .= 'Called from ' . self::_ideLink( $callee['file'], $callee['line'] );
-		}
-
-		if ( !empty( $miniTrace ) ) {
-			$traceDisplay = '<ol>';
-			foreach ( $miniTrace as $step ) {
-				$traceDisplay .= '<li>' . self::_ideLink( $step['file'], $step['line'] ); // closing tag not required
-				if ( isset( $step['function'] )
-					&& !in_array( $step['function'], array( 'include', 'include_once', 'require', 'require_once' ) )
-				) {
-					$classString = ' [';
-					if ( isset( $step['class'] ) ) {
-						$classString .= $step['class'];
-					}
-					if ( isset( $step['type'] ) ) {
-						$classString .= $step['type'];
-					}
-					$classString .= $step['function'] . '()]';
-					$traceDisplay .= $classString;
-				}
-			}
-			$traceDisplay .= '</ol>';
-
-			$calleeInfo = '<nav></nav>' . $calleeInfo;
-		}
-
-
-		return "<footer>"
-		. '<span class="kint-popup-trigger" title="Open in new window">&rarr;</span> '
-		. "{$calleeInfo}{$callingFunction}{$traceDisplay}"
-		. "</footer></div>";
-	}
-
-
-	private static function _drawHeader( kintVariableData $kintVar, $verbose = true )
-	{
-		$output = '';
-		if ( $verbose ) {
-			if ( $kintVar->access !== null ) {
-				$output .= "<var>" . $kintVar->access . "</var> ";
-			}
-
-			if ( $kintVar->name !== null && $kintVar->name !== '' ) {
-				$output .= "<dfn>" . kintParser::escape( $kintVar->name ) . "</dfn> ";
-			}
-
-			if ( $kintVar->operator !== null ) {
-				$output .= $kintVar->operator . " ";
-			}
-		}
-
-		if ( $kintVar->type !== null ) {
-			if ( $verbose ) {
-				$output .= "<var>";
-			}
-
-			$output .= $kintVar->type;
-
-			if ( $verbose ) {
-				$output .= "</var>";
-			} else {
-				$output .= " ";
-			}
-		}
-
-
-		if ( $kintVar->size !== null ) {
-			$output .= "(" . $kintVar->size . ") ";
-		}
-
-		return $output;
-	}
-
-	private static function _ideLink( $file, $line )
-	{
-		$shortenedPath = Kint::shortenPath( $file );
-		if ( !Kint::$fileLinkFormat ) return $shortenedPath . ':' . $line;
-
-		$ideLink = Kint::getIdeLink( $file, $line );
-		$class   = ( strpos( $ideLink, 'http://' ) === 0 ) ? 'class="kint-ide-link" ' : '';
-		return "<a {$class}href=\"{$ideLink}\">{$shortenedPath}:{$line}</a>";
-	}
-
-
-	/**
-	 * produces css and js required for display. May be called multiple times, will only produce output once per
-	 * pageload or until `-` or `@` modifier is used
-	 *
-	 * @return string
-	 */
-	public static function init()
-	{
-		$baseDir = KINT_DIR . 'view/compiled/';
-
-		if ( !is_readable( $cssFile = $baseDir . Kint::$theme . '.css' ) ) {
-			$cssFile = $baseDir . 'original.css';
-		}
-
-		return
-			'<script class="-kint-js">' . file_get_contents( $baseDir . 'kint.js' ) . '</script>'
-			. '<style class="-kint-css">' . file_get_contents( $cssFile ) . "</style>\n";
-	}
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/examples/overview.php b/modules/devel/kint/kint/examples/overview.php
deleted file mode 100644
index 70f5be9..0000000
--- a/modules/devel/kint/kint/examples/overview.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-require( '../Kint.class.php' );
-
-$selectedTheme = isset( $_GET['theme'] ) ? $_GET['theme'] : 'original';
-$allowedThemes = array();
-$dh            = opendir( '../view/compiled' );
-while ( ( $filename = readdir( $dh ) ) !== false ) {
-	if ( strpos( $filename, '.css' ) !== false ) {
-		$allowedThemes[] = str_replace( '.css', '', $filename );
-	}
-}
-
-sort( $allowedThemes );
-
-if ( in_array( $selectedTheme, $allowedThemes ) ) {
-	Kint::$theme = $selectedTheme;
-}
-
-class BaseUser
-{
-	/**
-	 * @return string
-	 */
-	public function getFullName() { }
-}
-
-class User extends BaseUser
-{
-	CONST DEFAULT_PATH    = 'some/default/path';
-	CONST ROLE_DISALLOWED = 1;
-	CONST ROLE_ALLOWED    = 2;
-	CONST ROLE_FORBIDDEN  = 3;
-
-	public  $additionalData;
-	private $username = 'demo_username';
-	private $password = 'demo_password';
-	private $createdDate;
-
-	public function __construct() { }
-
-	/**
-	 * Check is user is equal to another user
-	 */
-	public function isEqualTo( BaseUser $user ) { }
-
-	/**
-	 * Get data from this demo class
-	 *
-	 * @param string $username
-	 *
-	 * @return array
-	 */
-	public function setUsername( $username ) { }
-
-	/**
-	 * Set additional data
-	 *
-	 * @array $data
-	 */
-	public function setAdditionalData( array $data ) { $this->additionalData = $data; }
-
-	/**
-	 * @return \DateTime date object
-	 */
-	public function getCreatedDate() { }
-
-	/**
-	 * @param \DateTime $date
-	 */
-	public function setCreatedDate( DateTime $date ) { $this->createdDate = $date; }
-
-	/**
-	 * Dummy method that triggers trace
-	 */
-	public function ensure() { Kint::trace(); }
-}
-
-class UserManager
-{
-	private $user;
-
-	/**
-	 * Get user from manager
-	 */
-	public function getUser() { return $this->user; }
-
-	/**
-	 * Debug specific user
-	 *
-	 * @param \User $user
-	 */
-	public function debugUser( $user )
-	{
-		$this->user = $user;
-		d( $this->getUser() );
-	}
-
-	/**
-	 * Ensure user (triggers ensure() method on \User object that trace)
-	 *
-	 * @void
-	 */
-	public function ensureUser() { $this->user->ensure(); }
-}
-
-$user = new User;
-$user->setAdditionalData( array(
-		'last_login'             => new DateTime(),
-		'current_unix_timestamp' => time(),
-		'random_rgb_color_code'  => '#FF9900',
-		'impressions'            => 60,
-		'nickname'               => 'Someuser',
-	)
-);
-$user->setCreatedDate( new DateTime( '2013-10-10' ) );
-$userManager = new UserManager();
-
-for ( $i = 1; $i < 6; $i++ ) {
-	$tabularData[] = array(
-		'date'        => "2013-01-0{$i}",
-		'allowed'     => $i % 3 == 0,
-		'action'      => "action {$i}",
-		'clicks'      => rand( 100, 50000 ),
-		'impressions' => rand( 10000, 500000 ),
-	);
-
-	if ( $i % 2 == 0 ) {
-		unset( $tabularData[ $i - 1 ]['clicks'] );
-	}
-}
-
-$nestedArray = array();
-
-for ( $i = 1; $i < 6; $i++ ) {
-	$nestedArray["user group {$i}"] = array(
-		"user {$i}" => array(
-			'name'    => "Name {$i}",
-			'surname' => "Surname {$i}"
-		),
-
-		'data'      => array(
-			'conversions' => rand( 100, 5000 ),
-			'spent'       => array( 'currency' => 'EUR', 'amount' => rand( 10000, 500000 ) )
-		),
-	);
-}
-?>
-<html>
-<head>
-	<title>Kint PHP debugging tool - overview</title>
-</head>
-<body>
-<div>
-	<label style="float: right">Switch theme:
-		<select onchange="window.location = '?theme=' + this.value">
-			<?php $chosen = isset( $_GET['theme'] ) ? $_GET['theme'] : 'original' ?>
-			<?php foreach ( $allowedThemes as $theme ) : ?>
-				<option value="<?php echo $theme ?>"<?php echo $theme === $chosen ? ' selected' : '' ?>>
-					<?php echo ucfirst( str_replace( '-', ' ', $theme ) ) ?>
-				</option>
-			<?php endforeach ?>
-		</select>
-	</label>
-
-	<h2>Kint PHP debugging tool - overview</h2>
-</div>
-<h3>Debug variables</h3>
-<?php
-$userManager->debugUser( $user );
-d( $userManager, $tabularData );
-d( $nestedArray );
-?>
-<h3>Trace</h3>
-<?php $userManager->ensureUser(); ?>
-</body>
-</html>
\ No newline at end of file
diff --git a/modules/devel/kint/kint/inc/kintObject.class.php b/modules/devel/kint/kint/inc/kintObject.class.php
deleted file mode 100644
index 6365123..0000000
--- a/modules/devel/kint/kint/inc/kintObject.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-abstract class KintObject
-{
-	/** @var string type of variable, can be set in inherited object or in static::parse() method */
-	public $name = 'NOT SET';
-
-	/** @var string quick variable value displayed inline */
-	public $value;
-
-	/**
-	 * returns false or associative array - each key represents a tab in default view, values may be anything
-	 *
-	 * @param $variable
-	 *
-	 * @return mixed
-	 */
-	abstract public function parse( & $variable );
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/inc/kintParser.class.php b/modules/devel/kint/kint/inc/kintParser.class.php
deleted file mode 100644
index 48153dc..0000000
--- a/modules/devel/kint/kint/inc/kintParser.class.php
+++ /dev/null
@@ -1,608 +0,0 @@
-<?php
-
-abstract class kintParser extends kintVariableData
-{
-	private static $_level = 0;
-	private static $_customDataTypes;
-	private static $_objectParsers;
-	private static $_objects;
-	private static $_marker;
-
-	private static $_skipAlternatives = false;
-
-	private static $_placeFullStringInValue = false;
-
-
-	private static function _init()
-	{
-		$fh = opendir( KINT_DIR . 'parsers/custom/' );
-		while ( $fileName = readdir( $fh ) ) {
-			if ( substr( $fileName, -4 ) !== '.php' ) continue;
-
-			require KINT_DIR . 'parsers/custom/' . $fileName;
-			self::$_customDataTypes[] = substr( $fileName, 0, -4 );
-		}
-		$fh = opendir( KINT_DIR . 'parsers/objects/' );
-		while ( $fileName = readdir( $fh ) ) {
-			if ( substr( $fileName, -4 ) !== '.php' ) continue;
-
-			require KINT_DIR . 'parsers/objects/' . $fileName;
-			self::$_objectParsers[] = substr( $fileName, 0, -4 );
-		}
-	}
-
-	public static function reset()
-	{
-		self::$_level   = 0;
-		self::$_objects = self::$_marker = null;
-	}
-
-	/**
-	 * main and usually single method a custom parser must implement
-	 *
-	 * @param mixed $variable
-	 *
-	 * @return mixed [!!!] false is returned if the variable is not of current type
-	 */
-	abstract protected function _parse( & $variable );
-
-
-	/**
-	 * the only public entry point to return a parsed representation of a variable
-	 *
-	 * @static
-	 *
-	 * @param      $variable
-	 * @param null $name
-	 *
-	 * @throws Exception
-	 * @return \kintParser
-	 */
-	public final static function factory( & $variable, $name = null )
-	{
-		isset( self::$_customDataTypes ) or self::_init();
-
-		# save internal data to revert after dumping to properly handle recursions etc
-		$revert = array(
-			'level'   => self::$_level,
-			'objects' => self::$_objects,
-		);
-
-		self::$_level++;
-
-		$varData       = new kintVariableData;
-		$varData->name = $name;
-
-		# first parse the variable based on its type
-		$varType = gettype( $variable );
-		$varType === 'unknown type' and $varType = 'unknown'; # PHP 5.4 inconsistency
-		$methodName = '_parse_' . $varType;
-
-		# objects can be presented in a different way altogether, INSTEAD, not ALONGSIDE the generic parser
-		if ( $varType === 'object' ) {
-			foreach ( self::$_objectParsers as $parserClass ) {
-				$className = 'Kint_Objects_' . $parserClass;
-
-				/** @var $object KintObject */
-				$object = new $className;
-				if ( ( $alternativeTabs = $object->parse( $variable ) ) !== false ) {
-					self::$_skipAlternatives   = true;
-					$alternativeDisplay        = new kintVariableData;
-					$alternativeDisplay->type  = $object->name;
-					$alternativeDisplay->value = $object->value;
-					$alternativeDisplay->name  = $name;
-
-					foreach ( $alternativeTabs as $name => $values ) {
-						$alternative       = kintParser::factory( $values );
-						$alternative->type = $name;
-						if ( Kint::enabled() === Kint::MODE_RICH ) {
-							empty( $alternative->value ) and $alternative->value = $alternative->extendedValue;
-							$alternativeDisplay->_alternatives[] = $alternative;
-						} else {
-							$alternativeDisplay->extendedValue[] = $alternative;
-						}
-					}
-
-					self::$_skipAlternatives = false;
-					self::$_level   = $revert['level'];
-					self::$_objects = $revert['objects'];
-					return $alternativeDisplay;
-				}
-			}
-		}
-
-		# base type parser returning false means "stop processing further": e.g. recursion
-		if ( self::$methodName( $variable, $varData ) === false ) {
-			self::$_level--;
-			return $varData;
-		}
-
-		if ( Kint::enabled() === Kint::MODE_RICH && !self::$_skipAlternatives ) {
-			# if an alternative returns something that can be represented in an alternative way, don't :)
-			self::$_skipAlternatives = true;
-
-			# now check whether the variable can be represented in a different way
-			foreach ( self::$_customDataTypes as $parserClass ) {
-				$className = 'Kint_Parsers_' . $parserClass;
-
-				/** @var $parser kintParser */
-				$parser       = new $className;
-				$parser->name = $name; # the parser may overwrite the name value, so set it first
-
-				if ( $parser->_parse( $variable ) !== false ) {
-					$varData->_alternatives[] = $parser;
-				}
-			}
-
-
-			# if alternatives exist, push extendedValue to their front and display it as one of alternatives
-			if ( !empty( $varData->_alternatives ) && isset( $varData->extendedValue ) ) {
-				$_ = new kintVariableData;
-
-				$_->value = $varData->extendedValue;
-				$_->type  = 'contents';
-				$_->size  = null;
-
-				array_unshift( $varData->_alternatives, $_ );
-				$varData->extendedValue = null;
-			}
-
-			self::$_skipAlternatives = false;
-		}
-
-		self::$_level   = $revert['level'];
-		self::$_objects = $revert['objects'];
-
-		if ( strlen( $varData->name ) > 80 ) {
-			$varData->name =
-				self::_substr( $varData->name, 0, 37 )
-				. '...'
-				. self::_substr( $varData->name, -38, null );
-		}
-		return $varData;
-	}
-
-	private static function _checkDepth()
-	{
-		return Kint::$maxLevels != 0 && self::$_level >= Kint::$maxLevels;
-	}
-
-	private static function _isArrayTabular( array $variable )
-	{
-		if ( Kint::enabled() !== Kint::MODE_RICH ) return false;
-
-		$arrayKeys   = array();
-		$keys        = null;
-		$closeEnough = false;
-		foreach ( $variable as $row ) {
-			if ( !is_array( $row ) || empty( $row ) ) return false;
-
-			foreach ( $row as $col ) {
-				if ( !empty( $col ) && !is_scalar( $col ) ) return false; // todo add tabular "tolerance"
-			}
-
-			if ( isset( $keys ) && !$closeEnough ) {
-				# let's just see if the first two rows have same keys, that's faster and has the
-				# positive side effect of easily spotting missing keys in later rows
-				if ( $keys !== array_keys( $row ) ) return false;
-
-				$closeEnough = true;
-			} else {
-				$keys = array_keys( $row );
-			}
-
-			$arrayKeys = array_unique( array_merge( $arrayKeys, $keys ) );
-		}
-
-		return $arrayKeys;
-	}
-
-	private static function _decorateCell( kintVariableData $kintVar )
-	{
-		if ( $kintVar->extendedValue !== null || !empty( $kintVar->_alternatives ) ) {
-			return '<td>' . Kint_Decorators_Rich::decorate( $kintVar ) . '</td>';
-		}
-
-		$output = '<td';
-
-		if ( $kintVar->value !== null ) {
-			$output .= ' title="' . $kintVar->type;
-
-			if ( $kintVar->size !== null ) {
-				$output .= " (" . $kintVar->size . ")";
-			}
-
-			$output .= '">' . $kintVar->value;
-		} else {
-			$output .= '>';
-
-			if ( $kintVar->type !== 'NULL' ) {
-				$output .= '<u>' . $kintVar->type;
-
-				if ( $kintVar->size !== null ) {
-					$output .= "(" . $kintVar->size . ")";
-				}
-
-				$output .= '</u>';
-			} else {
-				$output .= '<u>NULL</u>';
-			}
-		}
-
-
-		return $output . '</td>';
-	}
-
-
-	public static function escape( $value, $encoding = null )
-	{
-		if ( empty( $value ) ) return $value;
-
-		if ( Kint::enabled() === Kint::MODE_CLI ) {
-			$value = str_replace( "\x1b", "\\x1b", $value );
-		}
-
-		if ( Kint::enabled() === Kint::MODE_CLI || Kint::enabled() === Kint::MODE_WHITESPACE ) return $value;
-
-		$encoding or $encoding = self::_detectEncoding( $value );
-		$value = htmlspecialchars( $value, ENT_NOQUOTES, $encoding === 'ASCII' ? 'UTF-8' : $encoding );
-
-
-		if ( $encoding === 'UTF-8' ) {
-			// todo we could make the symbols hover-title show the code for the invisible symbol
-			# when possible force invisible characters to have some sort of display (experimental)
-			$value = preg_replace( '/[\x00-\x08\x0B\x0C\x0E-\x1F\x80-\x9F]/u', '?', $value );
-		}
-
-		# this call converts all non-ASCII characters into html chars of format
-		if ( function_exists( 'mb_encode_numericentity' ) ) {
-			$value = mb_encode_numericentity(
-				$value,
-				array( 0x80, 0xffff, 0, 0xffff, ),
-				$encoding
-			);
-		}
-
-		return $value;
-	}
-
-
-	private static $_dealingWithGlobals = false;
-
-	private static function _parse_array( &$variable, kintVariableData $variableData )
-	{
-		isset( self::$_marker ) or self::$_marker = "\x00" . uniqid();
-
-		# naturally, $GLOBALS variable is an intertwined recursion nightmare, use black magic
-		$globalsDetector = false;
-		if ( array_key_exists( 'GLOBALS', $variable ) && is_array( $variable['GLOBALS'] ) ) {
-			$globalsDetector = "\x01" . uniqid();
-
-			$variable['GLOBALS'][ $globalsDetector ] = true;
-			if ( isset( $variable[ $globalsDetector ] ) ) {
-				unset( $variable[ $globalsDetector ] );
-				self::$_dealingWithGlobals = true;
-			} else {
-				unset( $variable['GLOBALS'][ $globalsDetector ] );
-				$globalsDetector = false;
-			}
-		}
-
-		$variableData->type = 'array';
-		$variableData->size = count( $variable );
-
-		if ( $variableData->size === 0 ) {
-			return;
-		}
-		if ( isset( $variable[ self::$_marker ] ) ) { # recursion; todo mayhaps show from where
-			if ( self::$_dealingWithGlobals ) {
-				$variableData->value = '*RECURSION*';
-			} else {
-				unset( $variable[ self::$_marker ] );
-				$variableData->value = self::$_marker;
-			}
-			return false;
-		}
-		if ( self::_checkDepth() ) {
-			$variableData->extendedValue = "*DEPTH TOO GREAT*";
-			return false;
-		}
-
-		$isSequential = self::_isSequential( $variable );
-
-		if ( $variableData->size > 1 && ( $arrayKeys = self::_isArrayTabular( $variable ) ) !== false ) {
-			$variable[ self::$_marker ] = true; # this must be AFTER _isArrayTabular
-			$firstRow                   = true;
-			$extendedValue              = '<table class="kint-report"><thead>';
-
-			foreach ( $variable as $rowIndex => & $row ) {
-				# display strings in their full length
-				self::$_placeFullStringInValue = true;
-
-				if ( $rowIndex === self::$_marker ) continue;
-
-				if ( isset( $row[ self::$_marker ] ) ) {
-					$variableData->value = "*RECURSION*";
-					return false;
-				}
-
-
-				$extendedValue .= '<tr>';
-				if ( $isSequential ) {
-					$output = '<td>' . '#' . ( $rowIndex + 1 )  . '</td>';
-				} else {
-					$output = self::_decorateCell( kintParser::factory( $rowIndex ) );
-				}
-				if ( $firstRow ) {
-					$extendedValue .= '<th>&nbsp;</th>';
-				}
-
-				# we iterate the known full set of keys from all rows in case some appeared at later rows,
-				# as we only check the first two to assume
-				foreach ( $arrayKeys as $key ) {
-					if ( $firstRow ) {
-						$extendedValue .= '<th>' . self::escape( $key ) . '</th>';
-					}
-
-					if ( !array_key_exists( $key, $row ) ) {
-						$output .= '<td class="kint-empty"></td>';
-						continue;
-					}
-
-					$var = kintParser::factory( $row[ $key ] );
-
-					if ( $var->value === self::$_marker ) {
-						$variableData->value = '*RECURSION*';
-						return false;
-					} elseif ( $var->value === '*RECURSION*' ) {
-						$output .= '<td class="kint-empty"><u>*RECURSION*</u></td>';
-					} else {
-						$output .= self::_decorateCell( $var );
-					}
-					unset( $var );
-				}
-
-				if ( $firstRow ) {
-					$extendedValue .= '</tr></thead><tr>';
-					$firstRow = false;
-				}
-
-				$extendedValue .= $output . '</tr>';
-			}
-			self::$_placeFullStringInValue = false;
-
-			$variableData->extendedValue = $extendedValue . '</table>';
-
-		} else {
-			$variable[ self::$_marker ] = true;
-			$extendedValue              = array();
-
-			foreach ( $variable as $key => & $val ) {
-				if ( $key === self::$_marker ) continue;
-
-				$output = kintParser::factory( $val );
-				if ( $output->value === self::$_marker ) {
-					$variableData->value = "*RECURSION*"; // recursion occurred on a higher level, thus $this is recursion
-					return false;
-				}
-				if ( !$isSequential ) {
-					$output->operator = '=>';
-				}
-				$output->name    = $isSequential ? null : "'" . $key . "'";
-				$extendedValue[] = $output;
-			}
-			$variableData->extendedValue = $extendedValue;
-		}
-
-		if ( $globalsDetector ) {
-			self::$_dealingWithGlobals = false;
-		}
-
-		unset( $variable[ self::$_marker ] );
-	}
-
-
-	private static function _parse_object( &$variable, kintVariableData $variableData )
-	{
-		if ( function_exists( 'spl_object_hash' ) ) {
-			$hash = spl_object_hash( $variable );
-		} else {
-			ob_start();
-			var_dump( $variable );
-			preg_match( '[#(\d+)]', ob_get_clean(), $match );
-			$hash = $match[1];
-		}
-
-		$castedArray        = (array) $variable;
-		$variableData->type = get_class( $variable );
-		$variableData->size = count( $castedArray );
-
-		if ( isset( self::$_objects[ $hash ] ) ) {
-			$variableData->value = '*RECURSION*';
-			return false;
-		}
-		if ( self::_checkDepth() ) {
-			$variableData->extendedValue = "*DEPTH TOO GREAT*";
-			return false;
-		}
-
-
-		# ArrayObject (and maybe ArrayIterator, did not try yet) unsurprisingly consist of mainly dark magic.
-		# What bothers me most, var_dump sees no problem with it, and ArrayObject also uses a custom,
-		# undocumented serialize function, so you can see the properties in internal functions, but
-		# can never iterate some of them if the flags are not STD_PROP_LIST. Fun stuff.
-		if ( $variableData->type === 'ArrayObject' || is_subclass_of( $variable, 'ArrayObject' ) ) {
-			$arrayObjectFlags = $variable->getFlags();
-			$variable->setFlags( ArrayObject::STD_PROP_LIST );
-		}
-
-		self::$_objects[ $hash ] = true; // todo store reflectorObject here for alternatives cache
-		$reflector               = new ReflectionObject( $variable );
-
-		# add link to definition of userland objects
-		if ( Kint::enabled() === Kint::MODE_RICH && Kint::$fileLinkFormat && $reflector->isUserDefined() ) {
-			$url = Kint::getIdeLink( $reflector->getFileName(), $reflector->getStartLine() );
-
-			$class              = ( strpos( $url, 'http://' ) === 0 ) ? 'class="kint-ide-link" ' : '';
-			$variableData->type = "<a {$class}href=\"{$url}\">{$variableData->type}</a>";
-		}
-		$variableData->size = 0;
-
-		$extendedValue = array();
-		$encountered   = array();
-
-		# copy the object as an array as it provides more info than Reflection (depends)
-		foreach ( $castedArray as $key => $value ) {
-			/* casting object to array:
-			 * integer properties are inaccessible;
-			 * private variables have the class name prepended to the variable name;
-			 * protected variables have a '*' prepended to the variable name.
-			 * These prepended values have null bytes on either side.
-			 * http://www.php.net/manual/en/language.types.array.php#language.types.array.casting
-			 */
-			if ( $key{0} === "\x00" ) {
-
-				$access = $key{1} === "*" ? "protected" : "private";
-
-				// Remove the access level from the variable name
-				$key = substr( $key, strrpos( $key, "\x00" ) + 1 );
-			} else {
-				$access = "public";
-			}
-
-			$encountered[ $key ] = true;
-
-			$output           = kintParser::factory( $value, self::escape( $key ) );
-			$output->access   = $access;
-			$output->operator = '->';
-			$extendedValue[]  = $output;
-			$variableData->size++;
-		}
-
-		foreach ( $reflector->getProperties() as $property ) {
-			$name = $property->name;
-			if ( $property->isStatic() || isset( $encountered[ $name ] ) ) continue;
-
-			if ( $property->isProtected() ) {
-				$property->setAccessible( true );
-				$access = "protected";
-			} elseif ( $property->isPrivate() ) {
-				$property->setAccessible( true );
-				$access = "private";
-			} else {
-				$access = "public";
-			}
-
-			$value = $property->getValue( $variable );
-
-			$output           = kintParser::factory( $value, self::escape( $name ) );
-			$output->access   = $access;
-			$output->operator = '->';
-			$extendedValue[]  = $output;
-			$variableData->size++;
-		}
-
-		if ( isset( $arrayObjectFlags ) ) {
-			$variable->setFlags( $arrayObjectFlags );
-		}
-
-		if ( $variableData->size ) {
-			$variableData->extendedValue = $extendedValue;
-		}
-	}
-
-
-	private static function _parse_boolean( &$variable, kintVariableData $variableData )
-	{
-		$variableData->type  = 'bool';
-		$variableData->value = $variable ? 'TRUE' : 'FALSE';
-	}
-
-	private static function _parse_double( &$variable, kintVariableData $variableData )
-	{
-		$variableData->type  = 'float';
-		$variableData->value = $variable;
-	}
-
-	private static function _parse_integer( &$variable, kintVariableData $variableData )
-	{
-		$variableData->type  = 'integer';
-		$variableData->value = $variable;
-	}
-
-	private static function _parse_null( &$variable, kintVariableData $variableData )
-	{
-		$variableData->type = 'NULL';
-	}
-
-	private static function _parse_resource( &$variable, kintVariableData $variableData )
-	{
-		$resourceType       = get_resource_type( $variable );
-		$variableData->type = "resource ({$resourceType})";
-
-		if ( $resourceType === 'stream' && $meta = stream_get_meta_data( $variable ) ) {
-
-			if ( isset( $meta['uri'] ) ) {
-				$file = $meta['uri'];
-
-				if ( function_exists( 'stream_is_local' ) ) {
-					// Only exists on PHP >= 5.2.4
-					if ( stream_is_local( $file ) ) {
-						$file = Kint::shortenPath( $file );
-					}
-				}
-
-				$variableData->value = $file;
-			}
-		}
-	}
-
-	private static function _parse_string( &$variable, kintVariableData $variableData )
-	{
-		$variableData->type = 'string';
-
-		$encoding = self::_detectEncoding( $variable );
-		if ( $encoding !== 'ASCII' ) {
-			$variableData->type .= ' ' . $encoding;
-		}
-
-
-		$variableData->size = self::_strlen( $variable, $encoding );
-		if ( Kint::enabled() !== Kint::MODE_RICH ) {
-			$variableData->value = '"' . self::escape( $variable, $encoding ) . '"';
-			return;
-		}
-
-
-		if ( !self::$_placeFullStringInValue ) {
-
-			$strippedString = preg_replace( '[\s+]', ' ', $variable );
-			if ( Kint::$maxStrLength && $variableData->size > Kint::$maxStrLength ) {
-
-				// encode and truncate
-				$variableData->value         = '"'
-					. self::escape( self::_substr( $strippedString, 0, Kint::$maxStrLength, $encoding ), $encoding )
-					. '&hellip;"';
-				$variableData->extendedValue = self::escape( $variable, $encoding );
-
-				return;
-			} elseif ( $variable !== $strippedString ) { // omit no data from display
-
-				$variableData->value         = '"' . self::escape( $variable, $encoding ) . '"';
-				$variableData->extendedValue = self::escape( $variable, $encoding );
-
-				return;
-			}
-		}
-
-		$variableData->value = '"' . self::escape( $variable, $encoding ) . '"';
-	}
-
-	private static function _parse_unknown( &$variable, kintVariableData $variableData )
-	{
-		$type                = gettype( $variable );
-		$variableData->type  = "UNKNOWN" . ( !empty( $type ) ? " ({$type})" : '' );
-		$variableData->value = var_export( $variable, true );
-	}
-
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/inc/kintVariableData.class.php b/modules/devel/kint/kint/inc/kintVariableData.class.php
deleted file mode 100644
index 3ac567e..0000000
--- a/modules/devel/kint/kint/inc/kintVariableData.class.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-class kintVariableData
-{
-	/** @var string */
-	public $type;
-	/** @var string */
-	public $access;
-	/** @var string */
-	public $name;
-	/** @var string */
-	public $operator;
-	/** @var int */
-	public $size;
-	/**
-	 * @var kintVariableData[] array of kintVariableData objects or strings; displayed collapsed, each element from
-	 * the array is a separate possible representation of the dumped var
-	 */
-	public $extendedValue;
-	/** @var string inline value */
-	public $value;
-
-	/** @var kintVariableData[] array of alternative representations for same variable, don't use in custom parsers */
-	public $_alternatives;
-
-	/* *******************************************
-	 * HELPERS
-	 */
-
-	private static $_supportedCharsets = array(
-		'UTF-8',
-		'Windows-1252', # Western; includes iso-8859-1
-		'euc-jp',       # Japanese
-
-		# all other charsets cannot be differentiated by PHP and/or are not supported by mb_* functions,
-		# I need a better means of detecting the codeset, no idea how though :(
-
-		//		'iso-8859-13',  # Baltic
-		//		'windows-1251', # Cyrillic
-		//		'windows-1250', # Central European
-		//		'shift_jis',    # Japanese
-		//		'iso-2022-jp',  # Japanese
-	);
-
-	protected static function _detectEncoding( $value )
-	{
-		$ret = null;
-		if ( function_exists( 'mb_detect_encoding' ) ) {
-			$mbDetected = mb_detect_encoding( $value );
-			if ( $mbDetected === 'ASCII' ) return 'ASCII';
-		}
-
-
-		if ( !function_exists( 'iconv' ) ) {
-			return !empty( $mbDetected ) ? $mbDetected : 'UTF-8';
-		}
-
-		$md5 = md5( $value );
-		foreach ( Kint::$charEncodings as $encoding ) {
-			# fuck knows why, //IGNORE and //TRANSLIT still throw notice
-			if ( md5( @iconv( $encoding, $encoding, $value ) ) === $md5 ) {
-				return $encoding;
-			}
-		}
-
-		return 'ASCII';
-	}
-
-	/**
-	 * returns whether the array:
-	 *  1) is numeric and
-	 *  2) in sequence starting from zero
-	 *
-	 * @param array $array
-	 *
-	 * @return bool
-	 */
-	protected static function _isSequential( array $array )
-	{
-		return array_keys( $array ) === range( 0, count( $array ) - 1 );
-	}
-
-	protected static function _strlen( $string, $encoding = null )
-	{
-		if ( function_exists( 'mb_strlen' ) ) {
-			$encoding or $encoding = self::_detectEncoding( $string );
-			return mb_strlen( $string, $encoding );
-		} else {
-			return strlen( $string );
-		}
-	}
-
-	protected static function _substr( $string, $start, $end, $encoding = null )
-	{
-		if ( function_exists( 'mb_substr' ) ) {
-			$encoding or $encoding = self::_detectEncoding( $string );
-			return mb_substr( $string, $start, $end, $encoding );
-		} else {
-			return substr( $string, $start, $end );
-		}
-	}
-}
diff --git a/modules/devel/kint/kint/parsers/custom/classmethods.php b/modules/devel/kint/kint/parsers/custom/classmethods.php
deleted file mode 100644
index 953318d..0000000
--- a/modules/devel/kint/kint/parsers/custom/classmethods.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-class Kint_Parsers_ClassMethods extends kintParser
-{
-	private static $cache = array();
-
-	protected function _parse( &$variable )
-	{
-		if ( !KINT_PHP53 || !is_object( $variable ) ) return false;
-
-		$className = get_class( $variable );
-
-		# assuming class definition will not change inside one request
-		if ( !isset( self::$cache[ $className ] ) ) {
-			$reflection = new ReflectionClass( $variable );
-
-			$public = $private = $protected = array();
-
-			// Class methods
-			foreach ( $reflection->getMethods() as $method ) {
-				$params = array();
-
-				// Access type
-				$access = implode( ' ', Reflection::getModifierNames( $method->getModifiers() ) );
-
-				// Method parameters
-				foreach ( $method->getParameters() as $param ) {
-					$paramString = '';
-
-					if ( $param->isArray() ) {
-						$paramString .= 'array ';
-					} else {
-						try {
-							if ( $paramClassName = $param->getClass() ) {
-								$paramString .= $paramClassName->name . ' ';
-							}
-						} catch ( ReflectionException $e ) {
-							preg_match( '/\[\s\<\w+?>\s([\w]+)/s', $param->__toString(), $matches );
-							$paramClassName = isset( $matches[1] ) ? $matches[1] : '';
-
-							$paramString .= ' UNDEFINED CLASS (' . $paramClassName . ') ';
-						}
-					}
-
-					$paramString .= ( $param->isPassedByReference() ? '&' : '' ) . '$' . $param->getName();
-
-					if ( $param->isDefaultValueAvailable() ) {
-						if ( is_array( $param->getDefaultValue() ) ) {
-							$arrayValues = array();
-							foreach ( $param->getDefaultValue() as $key => $value ) {
-								$arrayValues[] = $key . ' => ' . $value;
-							}
-
-							$defaultValue = 'array(' . implode( ', ', $arrayValues ) . ')';
-						} elseif ( $param->getDefaultValue() === null ) {
-							$defaultValue = 'NULL';
-						} elseif ( $param->getDefaultValue() === false ) {
-							$defaultValue = 'false';
-						} elseif ( $param->getDefaultValue() === true ) {
-							$defaultValue = 'true';
-						} elseif ( $param->getDefaultValue() === '' ) {
-							$defaultValue = '""';
-						} else {
-							$defaultValue = $param->getDefaultValue();
-						}
-
-						$paramString .= ' = ' . $defaultValue;
-					}
-
-					$params[] = $paramString;
-				}
-
-				$output = new kintVariableData;
-
-				// Simple DocBlock parser, look for @return
-				if ( ( $docBlock = $method->getDocComment() ) ) {
-					$matches = array();
-					if ( preg_match_all( '/@(\w+)\s+(.*)\r?\n/m', $docBlock, $matches ) ) {
-						$lines = array_combine( $matches[1], $matches[2] );
-						if ( isset( $lines['return'] ) ) {
-							$output->operator = '->';
-							# since we're outputting code, assumption that the string is utf8 is most likely correct
-							# and saves resources
-							$output->type = self::escape( $lines['return'], 'UTF-8' );
-						}
-					}
-				}
-
-				$output->name   = ( $method->returnsReference() ? '&' : '' ) . $method->getName() . '('
-					. implode( ', ', $params ) . ')';
-				$output->access = $access;
-
-				if ( is_string( $docBlock ) ) {
-					$lines = array();
-					foreach ( explode( "\n", $docBlock ) as $line ) {
-						$line = trim( $line );
-
-						if ( in_array( $line, array( '/**', '/*', '*/' ) ) ) {
-							continue;
-						} elseif ( strpos( $line, '*' ) === 0 ) {
-							$line = substr( $line, 1 );
-						}
-
-						$lines[] = self::escape( trim( $line ), 'UTF-8' );
-					}
-
-					$output->extendedValue = implode( "\n", $lines ) . "\n\n";
-				}
-
-				$declaringClass     = $method->getDeclaringClass();
-				$declaringClassName = $declaringClass->getName();
-
-				if ( $declaringClassName !== $className ) {
-					$output->extendedValue .= "<small>Inherited from <i>{$declaringClassName}</i></small>\n";
-				}
-
-				$fileName = Kint::shortenPath( $method->getFileName() ) . ':' . $method->getStartLine();
-				$output->extendedValue .= "<small>Defined in {$fileName}</small>";
-
-				$sortName = $access . $method->getName();
-
-				if ( $method->isPrivate() ) {
-					$private[ $sortName ] = $output;
-				} elseif ( $method->isProtected() ) {
-					$protected[ $sortName ] = $output;
-				} else {
-					$public[ $sortName ] = $output;
-				}
-			}
-
-			if ( !$private && !$protected && !$public ) {
-				self::$cache[ $className ] = false;
-			}
-
-			ksort( $public );
-			ksort( $protected );
-			ksort( $private );
-
-			self::$cache[ $className ] = $public + $protected + $private;
-		}
-
-		if ( count( self::$cache[ $className ] ) === 0 ) {
-			return false;
-		}
-
-		$this->value = self::$cache[ $className ];
-		$this->type  = 'Available methods';
-		$this->size  = count( self::$cache[ $className ] );
-	}
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/parsers/custom/classstatics.php b/modules/devel/kint/kint/parsers/custom/classstatics.php
deleted file mode 100644
index cde23c6..0000000
--- a/modules/devel/kint/kint/parsers/custom/classstatics.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-class Kint_Parsers_ClassStatics extends kintParser
-{
-	protected function _parse( & $variable )
-	{
-		if ( !KINT_PHP53 || !is_object( $variable ) ) return false;
-
-		$extendedValue = array();
-
-		$reflection = new ReflectionClass( $variable );
-		// first show static values
-		foreach ( $reflection->getProperties( ReflectionProperty::IS_STATIC ) as $property ) {
-			if ( $property->isPrivate() ) {
-				if ( !method_exists( $property, 'setAccessible' ) ) {
-					break;
-				}
-				$property->setAccessible( true );
-				$access = "private";
-			} elseif ( $property->isProtected() ) {
-				$property->setAccessible( true );
-				$access = "protected";
-			} else {
-				$access = 'public';
-			}
-
-			$_      = $property->getValue();
-			$output = kintParser::factory( $_, '$' . $property->getName() );
-
-			$output->access   = $access;
-			$output->operator = '::';
-			$extendedValue[]  = $output;
-		}
-
-		foreach ( $reflection->getConstants() as $constant => $val ) {
-			$output = kintParser::factory( $val, $constant );
-
-			$output->access   = 'constant';
-			$output->operator = '::';
-			$extendedValue[]  = $output;
-		}
-
-		if ( empty( $extendedValue ) ) return false;
-
-		$this->value = $extendedValue;
-		$this->type  = 'Static class properties';
-		$this->size  = count( $extendedValue );
-	}
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/parsers/custom/color.php b/modules/devel/kint/kint/parsers/custom/color.php
deleted file mode 100644
index 5ca44d8..0000000
--- a/modules/devel/kint/kint/parsers/custom/color.php
+++ /dev/null
@@ -1,400 +0,0 @@
-<?php
-class Kint_Parsers_Color extends kintParser
-{
-	private static $_css3Named = array(
-		'aliceblue'=>'#f0f8ff','antiquewhite'=>'#faebd7','aqua'=>'#00ffff','aquamarine'=>'#7fffd4','azure'=>'#f0ffff',
-		'beige'=>'#f5f5dc','bisque'=>'#ffe4c4','black'=>'#000000','blanchedalmond'=>'#ffebcd','blue'=>'#0000ff',
-		'blueviolet'=>'#8a2be2','brown'=>'#a52a2a','burlywood'=>'#deb887','cadetblue'=>'#5f9ea0','chartreuse'=>'#7fff00',
-		'chocolate'=>'#d2691e','coral'=>'#ff7f50','cornflowerblue'=>'#6495ed','cornsilk'=>'#fff8dc','crimson'=>'#dc143c',
-		'cyan'=>'#00ffff','darkblue'=>'#00008b','darkcyan'=>'#008b8b','darkgoldenrod'=>'#b8860b','darkgray'=>'#a9a9a9',
-		'darkgrey'=>'#a9a9a9','darkgreen'=>'#006400','darkkhaki'=>'#bdb76b','darkmagenta'=>'#8b008b',
-		'darkolivegreen'=>'#556b2f','darkorange'=>'#ff8c00','darkorchid'=>'#9932cc','darkred'=>'#8b0000',
-		'darksalmon'=>'#e9967a','darkseagreen'=>'#8fbc8f','darkslateblue'=>'#483d8b','darkslategray'=>'#2f4f4f',
-		'darkslategrey'=>'#2f4f4f','darkturquoise'=>'#00ced1','darkviolet'=>'#9400d3','deeppink'=>'#ff1493',
-		'deepskyblue'=>'#00bfff','dimgray'=>'#696969','dimgrey'=>'#696969','dodgerblue'=>'#1e90ff',
-		'firebrick'=>'#b22222','floralwhite'=>'#fffaf0','forestgreen'=>'#228b22','fuchsia'=>'#ff00ff',
-		'gainsboro'=>'#dcdcdc','ghostwhite'=>'#f8f8ff','gold'=>'#ffd700','goldenrod'=>'#daa520','gray'=>'#808080',
-		'grey'=>'#808080','green'=>'#008000','greenyellow'=>'#adff2f','honeydew'=>'#f0fff0','hotpink'=>'#ff69b4',
-		'indianred'=>'#cd5c5c','indigo'=>'#4b0082','ivory'=>'#fffff0','khaki'=>'#f0e68c','lavender'=>'#e6e6fa',
-		'lavenderblush'=>'#fff0f5','lawngreen'=>'#7cfc00','lemonchiffon'=>'#fffacd','lightblue'=>'#add8e6',
-		'lightcoral'=>'#f08080','lightcyan'=>'#e0ffff','lightgoldenrodyellow'=>'#fafad2','lightgray'=>'#d3d3d3',
-		'lightgrey'=>'#d3d3d3','lightgreen'=>'#90ee90','lightpink'=>'#ffb6c1','lightsalmon'=>'#ffa07a',
-		'lightseagreen'=>'#20b2aa','lightskyblue'=>'#87cefa','lightslategray'=>'#778899','lightslategrey'=>'#778899',
-		'lightsteelblue'=>'#b0c4de','lightyellow'=>'#ffffe0','lime'=>'#00ff00','limegreen'=>'#32cd32','linen'=>'#faf0e6',
-		'magenta'=>'#ff00ff','maroon'=>'#800000','mediumaquamarine'=>'#66cdaa','mediumblue'=>'#0000cd',
-		'mediumorchid'=>'#ba55d3','mediumpurple'=>'#9370d8','mediumseagreen'=>'#3cb371','mediumslateblue'=>'#7b68ee',
-		'mediumspringgreen'=>'#00fa9a','mediumturquoise'=>'#48d1cc','mediumvioletred'=>'#c71585',
-		'midnightblue'=>'#191970','mintcream'=>'#f5fffa','mistyrose'=>'#ffe4e1','moccasin'=>'#ffe4b5',
-		'navajowhite'=>'#ffdead','navy'=>'#000080','oldlace'=>'#fdf5e6','olive'=>'#808000','olivedrab'=>'#6b8e23',
-		'orange'=>'#ffa500','orangered'=>'#ff4500','orchid'=>'#da70d6','palegoldenrod'=>'#eee8aa','palegreen'=>'#98fb98',
-		'paleturquoise'=>'#afeeee','palevioletred'=>'#d87093','papayawhip'=>'#ffefd5','peachpuff'=>'#ffdab9',
-		'peru'=>'#cd853f','pink'=>'#ffc0cb','plum'=>'#dda0dd','powderblue'=>'#b0e0e6','purple'=>'#800080',
-		'red'=>'#ff0000','rosybrown'=>'#bc8f8f','royalblue'=>'#4169e1','saddlebrown'=>'#8b4513','salmon'=>'#fa8072',
-		'sandybrown'=>'#f4a460','seagreen'=>'#2e8b57','seashell'=>'#fff5ee','sienna'=>'#a0522d','silver'=>'#c0c0c0',
-		'skyblue'=>'#87ceeb','slateblue'=>'#6a5acd','slategray'=>'#708090','slategrey'=>'#708090','snow'=>'#fffafa',
-		'springgreen'=>'#00ff7f','steelblue'=>'#4682b4','tan'=>'#d2b48c','teal'=>'#008080','thistle'=>'#d8bfd8',
-		'tomato'=>'#ff6347','turquoise'=>'#40e0d0','violet'=>'#ee82ee','wheat'=>'#f5deb3','white'=>'#ffffff',
-		'whitesmoke'=>'#f5f5f5','yellow'=>'#ffff00','yellowgreen'=>'#9acd32'
-	);
-
-
-	protected function _parse( & $variable )
-	{
-		if ( !self::_fits( $variable ) ) return false;
-
-		$this->type  = 'CSS color';
-		$variants    = self::_convert( $variable );
-		$this->value =
-			"<div style=\"background:{$variable}\" class=\"kint-color-preview\">{$variable}</div>"
-			. "<strong>hex :</strong> {$variants['hex']}\n"
-			. "<strong>rgb :</strong> {$variants['rgb']}\n"
-			. ( isset( $variants['name'] ) ? "<strong>name:</strong> {$variants['name']}\n" : '' )
-			. "<strong>hsl :</strong> {$variants['hsl']}";
-	}
-
-
-	private static function _fits( $variable )
-	{
-		if ( !is_string( $variable ) ) return false;
-
-		$var = strtolower( trim( $variable ) );
-
-		return isset( self::$_css3Named[$var] )
-			|| preg_match(
-				'/^(?:#[0-9A-Fa-f]{3}|#[0-9A-Fa-f]{6}|(?:rgb|hsl)a?\s*\((?:\s*[0-9.%]+\s*,?){3,4}\))$/',
-				$var
-			);
-	}
-
-	private static function _convert( $color )
-	{
-		$color         = strtolower( $color );
-		$decimalColors = array();
-		$variants      = array(
-			'hex'  => null,
-			'rgb'  => null,
-			'name' => null,
-			'hsl'  => null,
-		);
-
-		if ( isset( self::$_css3Named[ $color ] ) ) {
-			$variants['name'] = $color;
-			$color            = self::$_css3Named[ $color ];
-		}
-
-		if ( $color{0} === '#' ) {
-			$variants['hex'] = $color;
-			$color           = substr( $color, 1 );
-			if ( strlen( $color ) === 6 ) {
-				$colors = str_split( $color, 2 );
-			} else {
-				$colors = array(
-					$color{0} . $color{0},
-					$color{1} . $color{1},
-					$color{2} . $color{2},
-				);
-			}
-
-			$decimalColors = array_map( 'hexdec', $colors );
-		} elseif ( substr( $color, 0, 3 ) === 'rgb' ) {
-			$variants['rgb'] = $color;
-			preg_match_all( '#([0-9.%]+)#', $color, $matches );
-			$decimalColors = $matches[1];
-			foreach ( $decimalColors as &$color ) {
-				if ( strpos( $color, '%' ) !== false ) {
-					$color = str_replace( '%', '', $color ) * 2.55;
-				}
-			}
-
-
-		} elseif ( substr( $color, 0, 3 ) === 'hsl' ) {
-			$variants['hsl'] = $color;
-			preg_match_all( '#([0-9.%]+)#', $color, $matches );
-
-			$colors = $matches[1];
-			$colors[0] /= 360;
-			$colors[1] = str_replace( '%', '', $colors[1] ) / 100;
-			$colors[2] = str_replace( '%', '', $colors[2] ) / 100;
-
-			$decimalColors = self::_HSLtoRGB( $colors );
-			if ( isset( $colors[3] ) ) {
-				$decimalColors[] = $colors[3];
-			}
-		}
-
-		if ( isset( $decimalColors[3] ) ) {
-			$alpha = $decimalColors[3];
-			unset( $decimalColors[3] );
-		} else {
-			$alpha = null;
-		}
-		foreach ( $variants as $type => &$variant ) {
-			if ( isset( $variant ) ) continue;
-
-			switch ( $type ) {
-				case 'hex':
-					$variant = '#';
-					foreach ( $decimalColors as &$color ) {
-						$variant .= str_pad( dechex( $color ), 2, "0", STR_PAD_LEFT );
-					}
-					$variant .= isset( $alpha ) ? ' (alpha omitted)' : '';
-					break;
-				case 'rgb':
-					$rgb = $decimalColors;
-					if ( isset( $alpha ) ) {
-						$rgb[] = $alpha;
-						$a     = 'a';
-					} else {
-						$a = '';
-					}
-					$variant = "rgb{$a}( " . implode( ', ', $rgb ) . " )";
-					break;
-				case 'hsl':
-					$rgb = self::_RGBtoHSL( $decimalColors );
-					if ( $rgb === null ) {
-						unset( $variants[ $type ] );
-						break;
-					}
-					if ( isset( $alpha ) ) {
-						$rgb[] = $alpha;
-						$a     = 'a';
-					} else {
-						$a = '';
-					}
-
-					$variant = "hsl{$a}( " . implode( ', ', $rgb ) . " )";
-					break;
-				case 'name':
-					// [!] name in initial variants array must go after hex
-					if ( ( $key = array_search( $variants['hex'], self::$_css3Named, true ) ) !== false ) {
-						$variant = $key;
-					} else {
-						unset( $variants[ $type ] );
-					}
-					break;
-			}
-
-		}
-
-		return $variants;
-	}
-
-
-	private static function _HSLtoRGB( array $hsl )
-	{
-		list( $h, $s, $l ) = $hsl;
-		$m2 = ( $l <= 0.5 ) ? $l * ( $s + 1 ) : $l + $s - $l * $s;
-		$m1 = $l * 2 - $m2;
-		return array(
-			round( self::_hue2rgb( $m1, $m2, $h + 0.33333 ) * 255 ),
-			round( self::_hue2rgb( $m1, $m2, $h ) * 255 ),
-			round( self::_hue2rgb( $m1, $m2, $h - 0.33333 ) * 255 ),
-		);
-	}
-
-
-	/**
-	 * Helper function for _color_hsl2rgb().
-	 */
-	private static function _hue2rgb( $m1, $m2, $h )
-	{
-		$h = ( $h < 0 ) ? $h + 1 : ( ( $h > 1 ) ? $h - 1 : $h );
-		if ( $h * 6 < 1 ) return $m1 + ( $m2 - $m1 ) * $h * 6;
-		if ( $h * 2 < 1 ) return $m2;
-		if ( $h * 3 < 2 ) return $m1 + ( $m2 - $m1 ) * ( 0.66666 - $h ) * 6;
-		return $m1;
-	}
-
-
-	private static function _RGBtoHSL( array $rgb )
-	{
-		list( $clrR, $clrG, $clrB ) = $rgb;
-
-		$clrMin   = min( $clrR, $clrG, $clrB );
-		$clrMax   = max( $clrR, $clrG, $clrB );
-		$deltaMax = $clrMax - $clrMin;
-
-		$L = ( $clrMax + $clrMin ) / 510;
-
-		if ( 0 == $deltaMax ) {
-			$H = 0;
-			$S = 0;
-		} else {
-			if ( 0.5 > $L ) {
-				$S = $deltaMax / ( $clrMax + $clrMin );
-			} else {
-				$S = $deltaMax / ( 510 - $clrMax - $clrMin );
-			}
-
-			if ( $clrMax == $clrR ) {
-				$H = ( $clrG - $clrB ) / ( 6.0 * $deltaMax );
-			} else if ( $clrMax == $clrG ) {
-				$H = 1 / 3 + ( $clrB - $clrR ) / ( 6.0 * $deltaMax );
-			} else {
-				$H = 2 / 3 + ( $clrR - $clrG ) / ( 6.0 * $deltaMax );
-			}
-
-			if ( 0 > $H ) $H += 1;
-			if ( 1 < $H ) $H -= 1;
-		}
-		return array(
-			round( $H * 360 ),
-			round( $S * 100 ) . '%',
-			round( $L * 100 ) . '%'
-		);
-
-	}
-}
-
-/* *************
- * TEST DATA
- *
-dd(array(
-'hsl(0,  100%,50%)',
-'hsl(30, 100%,50%)',
-'hsl(60, 100%,50%)',
-'hsl(90, 100%,50%)',
-'hsl(120,100%,50%)',
-'hsl(150,100%,50%)',
-'hsl(180,100%,50%)',
-'hsl(210,100%,50%)',
-'hsl(240,100%,50%)',
-'hsl(270,100%,50%)',
-'hsl(300,100%,50%)',
-'hsl(330,100%,50%)',
-'hsl(360,100%,50%)',
-'hsl(120,100%,25%)',
-'hsl(120,100%,50%)',
-'hsl(120,100%,75%)',
-'hsl(120,100%,50%)',
-'hsl(120, 67%,50%)',
-'hsl(120, 33%,50%)',
-'hsl(120,  0%,50%)',
-'hsl(120, 60%,70%)',
-'#f03',
-'#F03',
-'#ff0033',
-'#FF0033',
-'rgb(255,0,51)',
-'rgb(255, 0, 51)',
-'rgb(100%,0%,20%)',
-'rgb(100%, 0%, 20%)',
-'hsla(240,100%,50%,0.05)',
-'hsla(240,100%,50%, 0.4)',
-'hsla(240,100%,50%, 0.7)',
-'hsla(240,100%,50%,   1)',
-'rgba(255,0,0,0.1)',
-'rgba(255,0,0,0.4)',
-'rgba(255,0,0,0.7)',
-'rgba(255,0,0,  1)',
-'black',
-'silver',
-'gray',
-'white',
-'maroon',
-'red',
-'purple',
-'fuchsia',
-'green',
-'lime',
-'olive',
-'yellow',
-'navy',
-'blue',
-'teal',
-'aqua',
-'orange',
-'aliceblue',
-'antiquewhite',
-'aquamarine',
-'azure',
-'beige',
-'bisque',
-'blanchedalmond',
-'blueviolet',
-'brown',
-'burlywood',
-'cadetblue',
-'chartreuse',
-'chocolate',
-'coral',
-'cornflowerblue',
-'cornsilk',
-'crimson',
-'darkblue',
-'darkcyan',
-'darkgoldenrod',
-'darkgray',
-'darkgreen',
-'darkgrey',
-'darkkhaki',
-'darkmagenta',
-'darkolivegreen',
-'darkorange',
-'darkorchid',
-'darkred',
-'darksalmon',
-'darkseagreen',
-'darkslateblue',
-'darkslategray',
-'darkslategrey',
-'darkturquoise',
-'darkviolet',
-'deeppink',
-'deepskyblue',
-'dimgray',
-'dimgrey',
-'dodgerblue',
-'firebrick',
-'floralwhite',
-'forestgreen',
-'gainsboro',
-'ghostwhite',
-'gold',
-'goldenrod',
-'greenyellow',
-'grey',
-'honeydew',
-'hotpink',
-'indianred',
-'indigo',
-'ivory',
-'khaki',
-'lavender',
-'lavenderblush',
-'lawngreen',
-'lemonchiffon',
-'lightblue',
-'lightcoral',
-'lightcyan',
-'lightgoldenrodyellow',
-'lightgray',
-'lightgreen',
-'lightgrey',
-'lightpink',
-'lightsalmon',
-'lightseagreen',
-'lightskyblue',
-'lightslategray',
-'lightslategrey',
-'lightsteelblue',
-'lightyellow',
-'limegreen',
-'linen',
-'mediumaquamarine',
-'mediumblue',
-'mediumorchid',
-'mediumpurple',
-'mediumseagreen',
-'mediumslateblue',
-'mediumspringgreen',
-'mediumturquoise',
-'mediumvioletred',
-'midnightblue',
-'mintcream',
-'mistyrose',
-'moccasin',
-'navajowhite',
-'oldlace',
-'olivedrab',
-));*/
\ No newline at end of file
diff --git a/modules/devel/kint/kint/parsers/custom/fspath.php b/modules/devel/kint/kint/parsers/custom/fspath.php
deleted file mode 100644
index 0610391..0000000
--- a/modules/devel/kint/kint/parsers/custom/fspath.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-class Kint_Parsers_FsPath extends kintParser
-{
-	protected function _parse( & $variable )
-	{
-		if ( !KINT_PHP53
-			|| !is_string( $variable )
-			|| strlen( $variable ) > 2048
-			|| preg_match( '[[:?<>"*|]]', $variable )
-			|| !@is_readable( $variable ) # f@#! PHP and its random warnings
-		) return false;
-
-		try {
-			$fileInfo = new SplFileInfo( $variable );
-			$flags    = array();
-			$perms    = $fileInfo->getPerms();
-
-			if ( ( $perms & 0xC000 ) === 0xC000 ) {
-				$type    = 'File socket';
-				$flags[] = 's';
-			} elseif ( ( $perms & 0xA000 ) === 0xA000 ) {
-				$type    = 'File symlink';
-				$flags[] = 'l';
-			} elseif ( ( $perms & 0x8000 ) === 0x8000 ) {
-				$type    = 'File';
-				$flags[] = '-';
-			} elseif ( ( $perms & 0x6000 ) === 0x6000 ) {
-				$type    = 'Block special file';
-				$flags[] = 'b';
-			} elseif ( ( $perms & 0x4000 ) === 0x4000 ) {
-				$type    = 'Directory';
-				$flags[] = 'd';
-			} elseif ( ( $perms & 0x2000 ) === 0x2000 ) {
-				$type    = 'Character special file';
-				$flags[] = 'c';
-			} elseif ( ( $perms & 0x1000 ) === 0x1000 ) {
-				$type    = 'FIFO pipe file';
-				$flags[] = 'p';
-			} else {
-				$type    = 'Unknown file';
-				$flags[] = 'u';
-			}
-
-			// owner
-			$flags[] = ( ( $perms & 0x0100 ) ? 'r' : '-' );
-			$flags[] = ( ( $perms & 0x0080 ) ? 'w' : '-' );
-			$flags[] = ( ( $perms & 0x0040 ) ? ( ( $perms & 0x0800 ) ? 's' : 'x' ) : ( ( $perms & 0x0800 ) ? 'S' : '-' ) );
-
-			// group
-			$flags[] = ( ( $perms & 0x0020 ) ? 'r' : '-' );
-			$flags[] = ( ( $perms & 0x0010 ) ? 'w' : '-' );
-			$flags[] = ( ( $perms & 0x0008 ) ? ( ( $perms & 0x0400 ) ? 's' : 'x' ) : ( ( $perms & 0x0400 ) ? 'S' : '-' ) );
-
-			// world
-			$flags[] = ( ( $perms & 0x0004 ) ? 'r' : '-' );
-			$flags[] = ( ( $perms & 0x0002 ) ? 'w' : '-' );
-			$flags[] = ( ( $perms & 0x0001 ) ? ( ( $perms & 0x0200 ) ? 't' : 'x' ) : ( ( $perms & 0x0200 ) ? 'T' : '-' ) );
-
-			$this->type  = $type;
-			$this->size  = sprintf( '%.2fK', $fileInfo->getSize() / 1024 );
-			$this->value = implode( $flags );
-
-		} catch ( Exception $e ) {
-			return false;
-		}
-
-	}
-}
diff --git a/modules/devel/kint/kint/parsers/custom/json.php b/modules/devel/kint/kint/parsers/custom/json.php
deleted file mode 100644
index f752a21..0000000
--- a/modules/devel/kint/kint/parsers/custom/json.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-class Kint_Parsers_Json extends kintParser
-{
-	protected function _parse( & $variable )
-	{
-		if ( !KINT_PHP53
-			|| !is_string( $variable )
-			|| !isset( $variable{0} ) || ( $variable{0} !== '{' && $variable{0} !== '[' )
-			|| ( $json = json_decode( $variable, true ) ) === null
-		) return false;
-
-		$val = (array) $json;
-		if ( empty( $val ) ) return false;
-
-		$this->value = kintParser::factory( $val )->extendedValue;
-		$this->type  = 'JSON';
-	}
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/parsers/custom/microtime.php b/modules/devel/kint/kint/parsers/custom/microtime.php
deleted file mode 100644
index 2c5fe68..0000000
--- a/modules/devel/kint/kint/parsers/custom/microtime.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-class Kint_Parsers_Microtime extends kintParser
-{
-	private static $_times = array();
-	private static $_laps  = array();
-
-	protected function _parse( & $variable )
-	{
-		if ( !is_string( $variable ) || !preg_match( '[0\.[0-9]{8} [0-9]{10}]', $variable ) ) {
-			return false;
-		}
-
-		list( $usec, $sec ) = explode( " ", $variable );
-
-		$time = (float) $usec + (float) $sec;
-		if ( KINT_PHP53 ) {
-			$size = memory_get_usage( true );
-		}
-
-		# '@' is used to prevent the dreaded timezone not set error
-		$this->value = @date( 'Y-m-d H:i:s', $sec ) . '.' . substr( $usec, 2, 4 );
-
-		$numberOfCalls = count( self::$_times );
-		if ( $numberOfCalls > 0 ) { # meh, faster than count($times) > 1
-			$lap           = $time - end( self::$_times );
-			self::$_laps[] = $lap;
-
-			$this->value .= "\n<b>SINCE LAST CALL:</b> <b class=\"kint-microtime\">" . round( $lap, 4 ) . '</b>s.';
-			if ( $numberOfCalls > 1 ) {
-				$this->value .= "\n<b>SINCE START:</b> " . round( $time - self::$_times[0], 4 ) . 's.';
-				$this->value .= "\n<b>AVERAGE DURATION:</b> "
-					. round( array_sum( self::$_laps ) / $numberOfCalls, 4 ) . 's.';
-			}
-		}
-
-		$unit = array( 'B', 'KB', 'MB', 'GB', 'TB' );
-		if ( KINT_PHP53 ) {
-			$this->value .= "\n<b>MEMORY USAGE:</b> " . $size . " bytes ("
-				. round( $size / pow( 1024, ( $i = floor( log( $size, 1024 ) ) ) ), 3 ) . ' ' . $unit[ $i ] . ")";
-		}
-
-		self::$_times[] = $time;
-		$this->type     = 'Stats';
-	}
-
-	/*
-	function test() {
-		d( 'start', microtime() );
-		for ( $i = 0; $i < 10; $i++ ) {
-			d(
-				$duration = mt_rand( 0, 200000 ), // the reported duration will be larger because of Kint overhead
-				usleep( $duration ),
-				microtime()
-	        );
-		}
-		dd(  );
-	}
-	 */
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/parsers/custom/objectiterateable.php b/modules/devel/kint/kint/parsers/custom/objectiterateable.php
deleted file mode 100644
index bbc0de0..0000000
--- a/modules/devel/kint/kint/parsers/custom/objectiterateable.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class Kint_Parsers_objectIterateable extends kintParser
-{
-	protected function _parse( & $variable )
-	{
-		if ( !KINT_PHP53
-			|| !is_object( $variable )
-			|| !$variable instanceof Traversable
-			|| stripos( get_class( $variable ), 'zend' ) !== false // zf2 PDO wrapper does not play nice
-		) return false;
-
-
-		$arrayCopy = iterator_to_array( $variable, true );
-
-		if ( $arrayCopy === false ) return false;
-
-		$this->value = kintParser::factory( $arrayCopy )->extendedValue;
-		$this->type  = 'Iterator contents';
-		$this->size  = count( $arrayCopy );
-	}
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/parsers/custom/splobjectstorage.php b/modules/devel/kint/kint/parsers/custom/splobjectstorage.php
deleted file mode 100644
index 69da91f..0000000
--- a/modules/devel/kint/kint/parsers/custom/splobjectstorage.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-class Kint_Parsers_SplObjectStorage extends kintParser
-{
-	protected function _parse( & $variable )
-	{
-		if ( !is_object( $variable ) || !$variable instanceof SplObjectStorage ) return false;
-
-		/** @var $variable SplObjectStorage */
-
-		$count = $variable->count();
-		if ( $count === 0 ) return false;
-
-		$variable->rewind();
-		while ( $variable->valid() ) {
-			$current       = $variable->current();
-			$this->value[] = kintParser::factory( $current );
-			$variable->next();
-		}
-
-		$this->type = 'Storage contents';
-		$this->size = $count;
-	}
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/parsers/custom/timestamp.php b/modules/devel/kint/kint/parsers/custom/timestamp.php
deleted file mode 100644
index d1a3ce3..0000000
--- a/modules/devel/kint/kint/parsers/custom/timestamp.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-class Kint_Parsers_Timestamp extends kintParser
-{
-	private static function _fits( $variable )
-	{
-		if ( !is_string( $variable ) && !is_int( $variable ) ) return false;
-
-		$len = strlen( (int) $variable );
-		return
-			(
-				$len === 9 || $len === 10 # a little naive
-				|| ( $len === 13 && substr( $variable, -3 ) === '000' ) # also handles javascript micro timestamps
-			)
-			&& ( (string) (int) $variable == $variable );
-	}
-
-
-	protected function _parse( & $variable )
-	{
-		if ( !self::_fits( $variable ) ) return false;
-
-		$var = strlen( $variable ) === 13 ? substr( $variable, 0, -3 ) : $variable;
-
-		$this->type = 'timestamp';
-		# avoid dreaded "Timezone must be set" error
-		$this->value = @date( 'Y-m-d H:i:s', $var );
-	}
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/parsers/custom/xml.php b/modules/devel/kint/kint/parsers/custom/xml.php
deleted file mode 100644
index 63283a0..0000000
--- a/modules/devel/kint/kint/parsers/custom/xml.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-class Kint_Parsers_Xml extends kintParser
-{
-	protected function _parse( & $variable )
-	{
-		try {
-			if ( is_string( $variable ) && substr( $variable, 0, 5 ) === '<?xml' ) {
-				$e   = libxml_use_internal_errors( true );
-				$xml = simplexml_load_string( $variable );
-				libxml_use_internal_errors( $e );
-				if ( empty( $xml ) ) {
-					return false;
-				}
-			} else {
-				return false;
-			}
-		} catch ( Exception $e ) {
-			return false;
-		}
-
-		$this->value = kintParser::factory( $xml )->extendedValue;
-		$this->type  = 'XML';
-	}
-}
diff --git a/modules/devel/kint/kint/parsers/objects/closure.php b/modules/devel/kint/kint/parsers/objects/closure.php
deleted file mode 100644
index b050d3a..0000000
--- a/modules/devel/kint/kint/parsers/objects/closure.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-class Kint_Objects_Closure extends KintObject
-{
-	public function parse( & $variable )
-	{
-		if ( !$variable instanceof Closure ) return false;
-
-		$this->name = 'Closure';
-		$reflection = new ReflectionFunction( $variable );
-		$ret        = array(
-			'Parameters' => array()
-		);
-		if ( $val = $reflection->getParameters() ) {
-			foreach ( $val as $parameter ) {
-				// todo http://php.net/manual/en/class.reflectionparameter.php
-				$ret['Parameters'][] = $parameter->name;
-			}
-
-		}
-		if ( $val = $reflection->getStaticVariables() ) {
-			$ret['Uses'] = $val;
-		}
-		if ( method_exists($reflection, 'getClousureThis') && $val = $reflection->getClosureThis() ) {
-			$ret['Uses']['$this'] = $val;
-		}
-		if ( $val = $reflection->getFileName() ) {
-			$this->value = Kint::shortenPath( $val ) . ':' . $reflection->getStartLine();
-		}
-
-		return $ret;
-	}
-
-
-	public function isDefaultValueAvailable()
-	{
-		if ( PHP_VERSION_ID === 50316 ) { // PHP bug #62988
-			try {
-				$this->getDefaultValue();
-				return true;
-			} catch ( \ReflectionException $e ) {
-				return false;
-			}
-		}
-		return parent::isDefaultValueAvailable();
-	}
-}
diff --git a/modules/devel/kint/kint/parsers/objects/smarty.php b/modules/devel/kint/kint/parsers/objects/smarty.php
deleted file mode 100644
index 52b0750..0000000
--- a/modules/devel/kint/kint/parsers/objects/smarty.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-class Kint_Objects_Smarty extends KintObject
-{
-	public function parse( & $variable )
-	{
-		if ( !$variable instanceof Smarty
-			|| !defined( 'Smarty::SMARTY_VERSION' ) # lower than 3.x
-		) return false;
-
-
-		$this->name = 'object Smarty (v' . substr( Smarty::SMARTY_VERSION, 7 ) . ')'; # trim 'Smarty-'
-
-		$assigned = $globalAssigns = array();
-		foreach ( $variable->tpl_vars as $name => $var ) {
-			$assigned[ $name ] = $var->value;
-		}
-		foreach ( Smarty::$global_tpl_vars as $name => $var ) {
-			if ( $name === 'SCRIPT_NAME' ) continue;
-
-			$globalAssigns[ $name ] = $var->value;
-		}
-
-		return array(
-			'Assigned'          => $assigned,
-			'Assigned globally' => $globalAssigns,
-			'Configuration'     => array(
-				'Compiled files stored in' => isset($variable->compile_dir)
-					? $variable->compile_dir
-					: $variable->getCompileDir(),
-			)
-		);
-
-	}
-}
diff --git a/modules/devel/kint/kint/parsers/objects/splfileinfo.php b/modules/devel/kint/kint/parsers/objects/splfileinfo.php
deleted file mode 100644
index 964dd61..0000000
--- a/modules/devel/kint/kint/parsers/objects/splfileinfo.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-class Kint_Objects_SplFileInfo extends KintObject
-{
-	public function parse( & $variable )
-	{
-		if ( !KINT_PHP53 || !is_object( $variable ) || !$variable instanceof SplFileInfo ) return false;
-
-		$this->name  = 'SplFileInfo';
-		$this->value = $variable->getBasename();
-
-
-		$flags = array();
-		$perms = $variable->getPerms();
-
-		if ( ( $perms & 0xC000 ) === 0xC000 ) {
-			$type    = 'File socket';
-			$flags[] = 's';
-		} elseif ( ( $perms & 0xA000 ) === 0xA000 ) {
-			$type    = 'File symlink';
-			$flags[] = 'l';
-		} elseif ( ( $perms & 0x8000 ) === 0x8000 ) {
-			$type    = 'File';
-			$flags[] = '-';
-		} elseif ( ( $perms & 0x6000 ) === 0x6000 ) {
-			$type    = 'Block special file';
-			$flags[] = 'b';
-		} elseif ( ( $perms & 0x4000 ) === 0x4000 ) {
-			$type    = 'Directory';
-			$flags[] = 'd';
-		} elseif ( ( $perms & 0x2000 ) === 0x2000 ) {
-			$type    = 'Character special file';
-			$flags[] = 'c';
-		} elseif ( ( $perms & 0x1000 ) === 0x1000 ) {
-			$type    = 'FIFO pipe file';
-			$flags[] = 'p';
-		} else {
-			$type    = 'Unknown file';
-			$flags[] = 'u';
-		}
-
-		// owner
-		$flags[] = ( ( $perms & 0x0100 ) ? 'r' : '-' );
-		$flags[] = ( ( $perms & 0x0080 ) ? 'w' : '-' );
-		$flags[] = ( ( $perms & 0x0040 ) ? ( ( $perms & 0x0800 ) ? 's' : 'x' ) : ( ( $perms & 0x0800 ) ? 'S' : '-' ) );
-
-		// group
-		$flags[] = ( ( $perms & 0x0020 ) ? 'r' : '-' );
-		$flags[] = ( ( $perms & 0x0010 ) ? 'w' : '-' );
-		$flags[] = ( ( $perms & 0x0008 ) ? ( ( $perms & 0x0400 ) ? 's' : 'x' ) : ( ( $perms & 0x0400 ) ? 'S' : '-' ) );
-
-		// world
-		$flags[] = ( ( $perms & 0x0004 ) ? 'r' : '-' );
-		$flags[] = ( ( $perms & 0x0002 ) ? 'w' : '-' );
-		$flags[] = ( ( $perms & 0x0001 ) ? ( ( $perms & 0x0200 ) ? 't' : 'x' ) : ( ( $perms & 0x0200 ) ? 'T' : '-' ) );
-
-		$size  = sprintf( '%.2fK', $variable->getSize() / 1024 );
-		$flags = implode( $flags );
-		$path  = $variable->getRealPath();
-
-		return array(
-			'File information' => array(
-				'Full path' => $path,
-				'Type'      => $type,
-				'Size'      => $size,
-				'Flags'     => $flags
-			)
-		);
-	}
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/view/base.js b/modules/devel/kint/kint/view/base.js
deleted file mode 100644
index 45de721..0000000
--- a/modules/devel/kint/kint/view/base.js
+++ /dev/null
@@ -1,437 +0,0 @@
-/**
- java -jar compiler.jar --js $FileName$ --js_output_file ../inc/kint.js --compilation_level ADVANCED_OPTIMIZATIONS --output_wrapper "(function(){%output%})()"
- */
-
-if ( typeof kintInitialized === 'undefined' ) {
-	kintInitialized = 1;
-	var kint = {
-		visiblePluses : [], // all visible toggle carets
-		currentPlus   : -1, // currently selected caret
-
-		selectText : function( element ) {
-			var selection = window.getSelection(),
-			    range = document.createRange();
-
-			range.selectNodeContents(element);
-			selection.removeAllRanges();
-			selection.addRange(range);
-		},
-
-		each : function( selector, callback ) {
-			Array.prototype.slice.call(document.querySelectorAll(selector), 0).forEach(callback)
-		},
-
-		hasClass : function( target, className ) {
-			if ( !target.classList ) return false;
-
-			if ( typeof className === 'undefined' ) {
-				className = 'kint-show';
-			}
-			return target.classList.contains(className);
-		},
-
-		addClass : function( target, className ) {
-			if ( typeof className === 'undefined' ) {
-				className = 'kint-show';
-			}
-			target.classList.add(className);
-		},
-
-		removeClass : function( target, className ) {
-			if ( typeof className === 'undefined' ) {
-				className = 'kint-show';
-			}
-			target.classList.remove(className);
-			return target;
-		},
-
-		next : function( element ) {
-			do {
-				element = element.nextElementSibling;
-			} while ( element.nodeName.toLowerCase() !== 'dd' );
-
-			return element;
-		},
-
-		toggle : function( element, hide ) {
-			var parent = kint.next(element);
-
-			if ( typeof hide === 'undefined' ) {
-				hide = kint.hasClass(element);
-			}
-
-			if ( hide ) {
-				kint.removeClass(element);
-			} else {
-				kint.addClass(element);
-			}
-
-			if ( parent.childNodes.length === 1 ) {
-				parent = parent.childNodes[0].childNodes[0]; // reuse variable cause I can
-
-				// parent is checked in case of empty <pre> when array("\n") is dumped
-				if ( parent && kint.hasClass(parent, 'kint-parent') ) {
-					kint.toggle(parent, hide)
-				}
-			}
-		},
-
-		toggleChildren : function( element, hide ) {
-			var parent = kint.next(element)
-				, nodes = parent.getElementsByClassName('kint-parent')
-				, i = nodes.length;
-
-			if ( typeof hide === 'undefined' ) {
-				hide = kint.hasClass(element);
-			}
-
-			while ( i-- ) {
-				kint.toggle(nodes[i], hide);
-			}
-			kint.toggle(element, hide);
-		},
-
-		toggleAll : function( caret ) {
-			var elements = document.getElementsByClassName('kint-parent')
-				, i = elements.length
-				, visible = kint.hasClass(caret.parentNode);
-
-			while ( i-- ) {
-				kint.toggle(elements[i], visible);
-			}
-		},
-
-		switchTab : function( target ) {
-			var lis, el = target, index = 0;
-
-			target.parentNode.getElementsByClassName('kint-active-tab')[0].className = '';
-			target.className = 'kint-active-tab';
-
-			// take the index of clicked title tab and make the same n-th content tab visible
-			while ( el = el.previousSibling ) el.nodeType === 1 && index++;
-			lis = target.parentNode.nextSibling.childNodes;
-			for ( var i = 0; i < lis.length; i++ ) {
-				if ( i === index ) {
-					lis[i].style.display = 'block';
-
-					if ( lis[i].childNodes.length === 1 ) {
-						el = lis[i].childNodes[0].childNodes[0];
-
-						if ( kint.hasClass(el, 'kint-parent') ) {
-							kint.toggle(el, false)
-						}
-					}
-				} else {
-					lis[i].style.display = 'none';
-				}
-			}
-		},
-
-		isSibling : function( el ) {
-			for ( ; ; ) {
-				el = el.parentNode;
-				if ( !el || kint.hasClass(el, 'kint') ) break;
-			}
-
-			return !!el;
-		},
-
-		fetchVisiblePluses : function() {
-			kint.visiblePluses = [];
-			kint.each('.kint nav, .kint-tabs>li:not(.kint-active-tab)', function( el ) {
-				if ( el.offsetWidth !== 0 || el.offsetHeight !== 0 ) {
-					kint.visiblePluses.push(el)
-				}
-			});
-		},
-
-		openInNewWindow : function( kintContainer ) {
-			var newWindow;
-
-			if ( newWindow = window.open() ) {
-				newWindow.document.open();
-				newWindow.document.write(
-					'<html>'
-					+ '<head>'
-					+ '<title>Kint (' + new Date().toISOString() + ')</title>'
-					+ '<meta charset="utf-8">'
-					+ document.getElementsByClassName('-kint-js')[0].outerHTML
-					+ document.getElementsByClassName('-kint-css')[0].outerHTML
-					+ '</head>'
-					+ '<body>'
-					+ '<input style="width: 100%" placeholder="Take some notes!">'
-					+ '<div class="kint">'
-					+ kintContainer.parentNode.outerHTML
-					+ '</div></body>'
-				);
-				newWindow.document.close();
-			}
-		},
-
-		sortTable : function( table, column ) {
-			var tbody = table.tBodies[0];
-
-			var format = function( s ) {
-				var n = column === 1 ? s.replace(/^#/, '') : s;
-				if ( isNaN(n) ) {
-					return s.trim().toLocaleLowerCase();
-				} else {
-					n = parseFloat(n);
-					return isNaN(n) ? s.trim() : n;
-				}
-			};
-
-
-			[].slice.call(table.tBodies[0].rows)
-				.sort(function( a, b ) {
-					a = format(a.cells[column].textContent);
-					b = format(b.cells[column].textContent);
-					if ( a < b ) return -1;
-					if ( a > b ) return 1;
-
-					return 0;
-				})
-				.forEach(function( el ) {
-					tbody.appendChild(el);
-				});
-		},
-
-		keyCallBacks : {
-			cleanup : function( i ) {
-				var focusedClass = 'kint-focused';
-				var prevElement = document.querySelector('.' + focusedClass);
-				prevElement && kint.removeClass(prevElement, focusedClass);
-
-				if ( i !== -1 ) {
-					var el = kint.visiblePluses[i];
-					kint.addClass(el, focusedClass);
-
-
-					var offsetTop = function( el ) {
-						return el.offsetTop + ( el.offsetParent ? offsetTop(el.offsetParent) : 0 );
-					};
-
-					var top = offsetTop(el) - (window.innerHeight / 2 );
-					window.scrollTo(0, top);
-				}
-
-				kint.currentPlus = i;
-			},
-
-			moveCursor : function( up, i ) {
-				// todo make the first VISIBLE plus active
-				if ( up ) {
-					if ( --i < 0 ) {
-						i = kint.visiblePluses.length - 1;
-					}
-				} else {
-					if ( ++i >= kint.visiblePluses.length ) {
-						i = 0;
-					}
-				}
-
-				kint.keyCallBacks.cleanup(i);
-				return false;
-			}
-		}
-	};
-
-	window.addEventListener("click", function( e ) {
-		var target = e.target
-			, nodeName = target.nodeName.toLowerCase();
-
-		if ( !kint.isSibling(target) ) return;
-
-		// auto-select name of variable
-		if ( nodeName === 'dfn' ) {
-			kint.selectText(target);
-			target = target.parentNode;
-		} else if ( nodeName === 'var' ) { // stupid workaround for misc elements
-			target = target.parentNode;    // to not stop event from further propagating
-			nodeName = target.nodeName.toLowerCase()
-		} else if ( nodeName === 'th' ) {
-			if ( !e.ctrlKey ) {
-				kint.sortTable(target.parentNode.parentNode.parentNode, target.cellIndex)
-			}
-			return false;
-		}
-
-		// switch tabs
-		if ( nodeName === 'li' && target.parentNode.className === 'kint-tabs' ) {
-			if ( target.className !== 'kint-active-tab' ) {
-				kint.switchTab(target);
-				if ( kint.currentPlus !== -1 ) kint.fetchVisiblePluses();
-			}
-			return false;
-		}
-
-		// handle clicks on the navigation caret
-		if ( nodeName === 'nav' ) {
-			// special case for nav in footer
-			if ( target.parentNode.nodeName.toLowerCase() === 'footer' ) {
-				target = target.parentNode;
-				if ( kint.hasClass(target) ) {
-					kint.removeClass(target)
-				} else {
-					kint.addClass(target)
-				}
-			} else {
-				// ensure doubleclick has different behaviour, see below
-				setTimeout(function() {
-					var timer = parseInt(target.kintTimer, 10);
-					if ( timer > 0 ) {
-						target.kintTimer--;
-					} else {
-						kint.toggleChildren(target.parentNode); // <dt>
-						if ( kint.currentPlus !== -1 ) kint.fetchVisiblePluses();
-					}
-				}, 300);
-			}
-
-			e.stopPropagation();
-			return false;
-		} else if ( kint.hasClass(target, 'kint-parent') ) {
-			kint.toggle(target);
-			if ( kint.currentPlus !== -1 ) kint.fetchVisiblePluses();
-			return false;
-		} else if ( kint.hasClass(target, 'kint-ide-link') ) {
-			e.preventDefault();
-			var ajax = new XMLHttpRequest(); // add ajax call to contact editor but prevent link default action
-			ajax.open('GET', target.href);
-			ajax.send(null);
-			return false;
-		} else if ( kint.hasClass(target, 'kint-popup-trigger') ) {
-			var kintContainer = target.parentNode;
-			if ( kintContainer.nodeName.toLowerCase() === 'footer' ) {
-				kintContainer = kintContainer.previousSibling;
-			} else {
-				while ( kintContainer && !kint.hasClass(kintContainer, 'kint-parent') ) {
-					kintContainer = kintContainer.parentNode;
-				}
-			}
-
-			kint.openInNewWindow(kintContainer);
-		} else if ( nodeName === 'pre' && e.detail === 3 ) { // triple click pre to select it all
-			kint.selectText(target);
-		}
-	}, false);
-
-	window.addEventListener("dblclick", function( e ) {
-		var target = e.target;
-		if ( !kint.isSibling(target) ) return;
-
-		if ( target.nodeName.toLowerCase() === 'nav' ) {
-			target.kintTimer = 2;
-			kint.toggleAll(target);
-			if ( kint.currentPlus !== -1 ) kint.fetchVisiblePluses();
-			e.stopPropagation();
-		}
-	}, false);
-
-	// keyboard navigation
-	window.onkeydown = function( e ) { // direct assignment is used to have priority over ex FAYT
-
-		// do nothing if alt/ctrl key is pressed or if we're actually typing somewhere
-		if ( e.target !== document.body || e.altKey || e.ctrlKey ) return;
-
-		var keyCode = e.keyCode
-			, shiftKey = e.shiftKey
-			, i = kint.currentPlus;
-
-
-		if ( keyCode === 68 ) { // 'd' : toggles navigation on/off
-			if ( i === -1 ) {
-				kint.fetchVisiblePluses();
-				return kint.keyCallBacks.moveCursor(false, i);
-			} else {
-				kint.keyCallBacks.cleanup(-1);
-				return false;
-			}
-		} else {
-			if ( i === -1 ) return;
-
-			if ( keyCode === 9 ) { // TAB : moves up/down depending on shift key
-				return kint.keyCallBacks.moveCursor(shiftKey, i);
-			} else if ( keyCode === 38 ) { // ARROW UP : moves up
-				return kint.keyCallBacks.moveCursor(true, i);
-			} else if ( keyCode === 40 ) { // ARROW DOWN : down
-				return kint.keyCallBacks.moveCursor(false, i);
-			}
-		}
-
-
-		var kintNode = kint.visiblePluses[i];
-		if ( kintNode.nodeName.toLowerCase() === 'li' ) { // we're on a trace tab
-			if ( keyCode === 32 || keyCode === 13 ) { // SPACE/ENTER
-				kint.switchTab(kintNode);
-				kint.fetchVisiblePluses();
-				return kint.keyCallBacks.moveCursor(true, i);
-			} else if ( keyCode === 39 ) { // arrows
-				return kint.keyCallBacks.moveCursor(false, i);
-			} else if ( keyCode === 37 ) {
-				return kint.keyCallBacks.moveCursor(true, i);
-			}
-		}
-
-		kintNode = kintNode.parentNode; // simple dump
-		if ( keyCode === 32 || keyCode === 13 ) { // SPACE/ENTER : toggles
-			kint.toggle(kintNode);
-			kint.fetchVisiblePluses();
-			return false;
-		} else if ( keyCode === 39 || keyCode === 37 ) { // ARROW LEFT/RIGHT : respectively hides/shows and traverses
-			var visible = kint.hasClass(kintNode);
-			var hide = keyCode === 37;
-
-			if ( visible ) {
-				kint.toggleChildren(kintNode, hide); // expand/collapse all children if immediate ones are showing
-			} else {
-				if ( hide ) { // LEFT
-					// traverse to parent and THEN hide
-					do {kintNode = kintNode.parentNode} while ( kintNode && kintNode.nodeName.toLowerCase() !== 'dd' );
-
-					if ( kintNode ) {
-						kintNode = kintNode.previousElementSibling;
-
-						i = -1;
-						var parentPlus = kintNode.querySelector('nav');
-						while ( parentPlus !== kint.visiblePluses[++i] ) {}
-						kint.keyCallBacks.cleanup(i)
-					} else { // we are at root
-						kintNode = kint.visiblePluses[i].parentNode;
-					}
-				}
-				kint.toggle(kintNode, hide);
-			}
-			kint.fetchVisiblePluses();
-			return false;
-		}
-	};
-
-	window.addEventListener("load", function( e ) { // colorize microtime results relative to others
-		var elements = Array.prototype.slice.call(document.querySelectorAll('.kint-microtime'), 0);
-		elements.forEach(function( el ) {
-			var value = parseFloat(el.innerHTML)
-				, min = Infinity
-				, max = -Infinity
-				, ratio;
-
-			elements.forEach(function( el ) {
-				var val = parseFloat(el.innerHTML);
-
-				if ( min > val ) min = val;
-				if ( max < val ) max = val;
-			});
-
-			ratio = 1 - (value - min) / (max - min);
-
-			el.style.background = 'hsl(' + Math.round(ratio * 120) + ',60%,70%)';
-		});
-	});
-}
-
-// debug purposes only, removed in minified source
-function clg( i ) {
-	if ( !window.console )return;
-	var l = arguments.length, o = 0;
-	while ( o < l )console.log(arguments[o++])
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/view/base.less b/modules/devel/kint/kint/view/base.less
deleted file mode 100644
index 24c68f7..0000000
--- a/modules/devel/kint/kint/view/base.less
+++ /dev/null
@@ -1,413 +0,0 @@
-//
-// VARIABLES FOR THEMES TO OVERRIDE
-// --------------------------------------------------
-
-@spacing : 4;
-
-// caret taken from solarized
-@caret-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAA8CAMAAACO5hB7AAAA7VBMVEVYbnWToaH///9YbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnWToaGToaGToaGToaGToaGToaGToaGToaGToaFYbnWToaFYbnVYbnWToaGToaFYbnWToaFYbnWToaFYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnWToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaFYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnWToaGToaGToaGToaGToaGToaGToaGToaGToaFYbnWToaEeRtj1AAAATXRSTlMAAACLab0B7iP2R7CL9iPuaUewAb36F0/QnPoX0JxPYQaurepi6QV8FhV7MzFhM6586RYFMa3qYnsVBpNQ+ZGOGJ3PkM9QkZAY+Y6TnV7gnYsAAAEcSURBVHhebdHVbgMxEEBRu8sUZmqapBBoSuGUmWb+/3NayxtrLOe+Hck745XZgd6/eb3CVcKt7HmR+gKxlCGOETG5vFbOoahR6NxI5zHt6nuq+2dqnqfzzH3mfcz70vb8H6MJt5u6a96hS30E4PjEFgAEp2fKNojKUfVEOoS044ex7u3YPE/nmfvM+5j3pe17T9oe/77O41w+n4vnrbrwZxbTshVhvtx5Kb8vliRLRWmeSQSTjJq/El5x5fUXYmNN9hcQC5y4g/hGvVksNtT8451rns2IScb7mn567ll2GNpWr9YWfvQgzWsKs8HOA/m960g6rjTzA8HAV/NHwiOmPLwDKA/J/gggYsRVgFvqbr/fpWYv90zzZKKs9Qfx00Jx65oxLAAAAABJRU5ErkJggg==");
-
-//
-// SET UP HELPER VARIABLES
-// --------------------------------------------------
-
-@border: 1px solid @border-color;
-
-.selection() {
-  background : @border-color-hover;
-  color      : @text-color;
-}
-
-//
-// BASE STYLES
-// --------------------------------------------------
-
-.kint::selection { .selection() }
-
-.kint::-moz-selection { .selection() }
-
-.kint::-webkit-selection { .selection() }
-
-.kint,
-.kint::before,
-.kint::after,
-.kint *,
-.kint *::before,
-.kint *::after {
-  box-sizing    : border-box;
-  border-radius : 0;
-  color         : @text-color;
-  float         : none !important;
-  font-family   : Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;
-  line-height   : 15px;
-  margin        : 0;
-  padding       : 0;
-  text-align    : left;
-}
-
-.kint {
-  font-size   : 13px;
-  margin      : @spacing * 2px 0;
-  overflow-x  : auto;
-  white-space : nowrap;
-
-  dt {
-    background  : @main-background;
-    border      : @border;
-    color       : @text-color;
-    display     : block;
-    font-weight : bold;
-    list-style  : none outside none;
-    overflow    : auto;
-    padding     : @spacing * 1px;
-
-    &:hover {
-      border-color : @border-color-hover;
-    }
-
-    > var {
-      margin-right : 5px;
-    }
-  }
-
-  > dl dl {
-    padding : 0 0 0 @spacing * 3px;
-  }
-
-  //
-  // DROPDOWN CARET
-  // --------------------------------------------------
-
-  nav {
-    background     : @caret-image no-repeat scroll 0 0 transparent;
-    cursor         : pointer;
-    display        : inline-block;
-    height         : 15px;
-    width          : 15px;
-    margin-right   : 3px;
-    vertical-align : middle;
-  }
-
-  dt.kint-parent:hover nav {
-    background-position : 0 -15px;
-  }
-
-  dt.kint-parent.kint-show:hover > nav {
-    background-position : 0 -45px;
-  }
-
-  dt.kint-show > nav {
-    background-position : 0 -30px;
-  }
-
-  dt.kint-parent + dd {
-    display     : none;
-    border-left : 1px dashed @border-color;
-  }
-
-  dt.kint-parent.kint-show + dd {
-    display : block;
-  }
-
-  //
-  // INDIVIDUAL ITEMS
-  // --------------------------------------------------
-
-  var,
-  var a {
-    color      : @variable-type-color;
-    font-style : normal;
-  }
-
-  dt:hover var,
-  dt:hover var a {
-    color : @variable-type-color-hover;
-  }
-
-  dfn {
-    font-style  : normal;
-    font-family : monospace;
-    color       : @variable-name-color;
-  }
-
-  pre {
-    color      : @text-color;
-    margin     : 0 0 0 @spacing * 3px;
-    padding    : 5px;
-    overflow-y : hidden;
-    border-top : 0;
-    border     : @border;
-    background : @main-background;
-    display    : block;
-    word-break : normal;
-  }
-
-  .kint-popup-trigger {
-    float  : right !important;
-    cursor : pointer;
-    color  : @border-color-hover;
-
-    &:hover {
-      color : @border-color;
-    }
-  }
-
-  dt.kint-parent > .kint-popup-trigger {
-    font-size : 13px;
-  }
-
-  footer {
-    padding   : 0 3px 3px;
-    font-size : 9px;
-
-    > .kint-popup-trigger {
-      font-size : 12px;
-    }
-
-    nav {
-      background-size : 10px;
-      height          : 10px;
-      width           : 10px;
-
-      &:hover {
-        background-position : 0 -10px;
-      }
-    }
-
-    > ol {
-      display     : none;
-      margin-left : 32px;
-    }
-
-    &.kint-show {
-      > ol {
-        display : block;
-      }
-
-      nav {
-        background-position : 0 -20px;
-
-        &:hover {
-          background-position : 0 -30px;
-        }
-      }
-    }
-  }
-
-  a {
-    color       : @text-color;
-    text-shadow : none;
-
-    &:hover {
-      color         : @variable-name-color;
-      border-bottom : 1px dotted @variable-name-color;
-    }
-  }
-
-  //
-  // TABS
-  // --------------------------------------------------
-
-  ul {
-    list-style   : none;
-    padding-left : @spacing * 3px;
-
-    &:not(.kint-tabs) {
-      li {
-        border-left : 1px dashed @border-color;
-
-        > dl {
-          border-left : none;
-        }
-      }
-    }
-
-    &.kint-tabs {
-      margin       : 0 0 0 @spacing * 3px;
-      padding-left : 0;
-      background   : @main-background;
-      border       : @border;
-      border-top   : 0;
-
-      li {
-        background     : @secondary-background;
-        border         : @border;
-        cursor         : pointer;
-        display        : inline-block;
-        height         : @spacing * 6px;
-        margin         : round(@spacing / 2) * 1px;
-        padding        : 0 2px + round(@spacing * 2.5px);
-        vertical-align : top;
-
-        &:hover,
-        &.kint-active-tab:hover {
-          border-color : @border-color-hover;
-          color        : @variable-type-color-hover;
-        }
-
-        &.kint-active-tab {
-          background  : @main-background;
-          border-top  : 0;
-          margin-top  : -1px;
-          height      : 27px;
-          line-height : 24px;
-        }
-
-        &:not(.kint-active-tab) {
-          line-height : @spacing * 5px;
-        }
-      }
-
-      li + li {
-        margin-left : 0
-      }
-    }
-
-    &:not(.kint-tabs) > li:not(:first-child) {
-      display : none;
-    }
-  }
-
-  dt:hover + dd > ul > li.kint-active-tab {
-    border-color : @border-color-hover;
-    color        : @variable-type-color-hover;
-  }
-}
-
-//
-// REPORT
-// --------------------------------------------------
-
-.kint-report {
-  border-collapse : collapse;
-  empty-cells     : show;
-  border-spacing  : 0;
-
-  * {
-    font-size : 12px;
-  }
-
-  dt {
-    background : none;
-    padding    : (@spacing/2) * 1px;
-
-    .kint-parent {
-      min-width     : 100%;
-      overflow      : hidden;
-      text-overflow : ellipsis;
-      white-space   : nowrap;
-    }
-  }
-
-  td,
-  th {
-    border         : @border;
-    padding        : (@spacing/2) * 1px;
-    vertical-align : center;
-  }
-
-  th {
-    cursor : alias;
-  }
-
-  td:first-child,
-  th {
-    font-weight : bold;
-    background  : @secondary-background;
-    color       : @variable-name-color;
-  }
-
-  td {
-    background  : @main-background;
-    white-space : pre;
-
-    > dl {
-      padding : 0;
-    }
-  }
-
-  pre {
-    border-top   : 0;
-    border-right : 0;
-  }
-
-  th:first-child {
-    background : none;
-    border     : 0;
-  }
-
-  td.kint-empty {
-    background : #d33682 !important;
-  }
-
-  tr:hover {
-    > td {
-      box-shadow : 0 0 1px 0 @border-color-hover inset;
-    }
-
-    var {
-      color : @variable-type-color-hover;
-    }
-  }
-  ul.kint-tabs li.kint-active-tab {
-    height      : 20px;
-    line-height : 17px;
-  }
-}
-
-//
-// TRACE
-// --------------------------------------------------
-.kint-trace {
-  .kint-source {
-    line-height : round(@spacing * 3.5) * 1px;
-
-    span {
-      padding-right : 1px;
-      border-right  : 3px inset @variable-type-color;
-    }
-
-    .kint-highlight {
-      background : @secondary-background;
-    }
-  }
-
-  .kint-parent {
-    > b {
-      min-width  : 18px;
-      display    : inline-block;
-      text-align : right;
-      color      : @variable-name-color;
-    }
-
-    > var {
-      > a {
-        color : @variable-type-color;
-      }
-    }
-  }
-}
-
-//
-// MISC
-// --------------------------------------------------
-
-// keyboard navigation caret
-.kint-focused {
-  .keyboard-caret
-}
-
-.kint-microtime,
-.kint-color-preview {
-  box-shadow  : 0 0 2px 0 #b6cedb;
-  height      : 16px;
-  text-align  : center;
-  text-shadow : -1px 0 #839496, 0 1px #839496, 1px 0 #839496, 0 -1px #839496;
-  width       : 230px;
-  color       : #fdf6e3;
-}
-
-// mini trace
-.kint footer li {
-  color : #ddd;
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/view/compiled/aante-light.css b/modules/devel/kint/kint/view/compiled/aante-light.css
deleted file mode 100644
index b22fadd..0000000
--- a/modules/devel/kint/kint/view/compiled/aante-light.css
+++ /dev/null
@@ -1,397 +0,0 @@
-/**
- * @author Ante Aljinovic https://github.com/aljinovic
- */
-.kint::selection {
-  background: #aaaaaa;
-  color: #1d1e1e;
-}
-.kint::-moz-selection {
-  background: #aaaaaa;
-  color: #1d1e1e;
-}
-.kint::-webkit-selection {
-  background: #aaaaaa;
-  color: #1d1e1e;
-}
-.kint,
-.kint::before,
-.kint::after,
-.kint *,
-.kint *::before,
-.kint *::after {
-  box-sizing: border-box;
-  border-radius: 0;
-  color: #1d1e1e;
-  float: none !important;
-  font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;
-  line-height: 15px;
-  margin: 0;
-  padding: 0;
-  text-align: left;
-}
-.kint {
-  font-size: 13px;
-  margin: 8px 0;
-  overflow-x: auto;
-  white-space: nowrap;
-}
-.kint dt {
-  background: #f8f8f8;
-  border: 1px solid #d7d7d7;
-  color: #1d1e1e;
-  display: block;
-  font-weight: bold;
-  list-style: none outside none;
-  overflow: auto;
-  padding: 4px;
-}
-.kint dt:hover {
-  border-color: #aaaaaa;
-}
-.kint dt > var {
-  margin-right: 5px;
-}
-.kint > dl dl {
-  padding: 0 0 0 12px;
-}
-.kint nav {
-  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAA8CAYAAAC5OOBJAAAAvklEQVR42mNgGMFAS0uLLSQk5HxoaOh/XDg4OLgdpwEBAQEGQAN+YtMIFH/i4ODAg9cFQNMbsWkOCgrKJMv5ID5Qipko/6M7PzAw0ImkAIQ5H0hvISv0gZpP+fn5qZAVfcBAkmEYBaNZcjRLjmbJUUCvqAIlDlAiASUWkjWDkiU0eTaSpBGUEZBy1E9QRiFWLzO2LEmU80GZHkcRhN/5oGIGVNzgKIbwOx9UwOErAIl2/igYzZKjWXI0S9IHAAASJijo0Ypj8AAAAABJRU5ErkJggg==") no-repeat scroll 0 0 transparent;
-  cursor: pointer;
-  display: inline-block;
-  height: 15px;
-  width: 15px;
-  margin-right: 3px;
-  vertical-align: middle;
-}
-.kint dt.kint-parent:hover nav {
-  background-position: 0 -15px;
-}
-.kint dt.kint-parent.kint-show:hover > nav {
-  background-position: 0 -45px;
-}
-.kint dt.kint-show > nav {
-  background-position: 0 -30px;
-}
-.kint dt.kint-parent + dd {
-  display: none;
-  border-left: 1px dashed #d7d7d7;
-}
-.kint dt.kint-parent.kint-show + dd {
-  display: block;
-}
-.kint var,
-.kint var a {
-  color: #0066ff;
-  font-style: normal;
-}
-.kint dt:hover var,
-.kint dt:hover var a {
-  color: #ff0000;
-}
-.kint dfn {
-  font-style: normal;
-  font-family: monospace;
-  color: #1d1e1e;
-}
-.kint pre {
-  color: #1d1e1e;
-  margin: 0 0 0 12px;
-  padding: 5px;
-  overflow-y: hidden;
-  border-top: 0;
-  border: 1px solid #d7d7d7;
-  background: #f8f8f8;
-  display: block;
-  word-break: normal;
-}
-.kint .kint-popup-trigger {
-  float: right !important;
-  cursor: pointer;
-  color: #aaaaaa;
-}
-.kint .kint-popup-trigger:hover {
-  color: #d7d7d7;
-}
-.kint dt.kint-parent > .kint-popup-trigger {
-  font-size: 13px;
-}
-.kint footer {
-  padding: 0 3px 3px;
-  font-size: 9px;
-}
-.kint footer > .kint-popup-trigger {
-  font-size: 12px;
-}
-.kint footer nav {
-  background-size: 10px;
-  height: 10px;
-  width: 10px;
-}
-.kint footer nav:hover {
-  background-position: 0 -10px;
-}
-.kint footer > ol {
-  display: none;
-  margin-left: 32px;
-}
-.kint footer.kint-show > ol {
-  display: block;
-}
-.kint footer.kint-show nav {
-  background-position: 0 -20px;
-}
-.kint footer.kint-show nav:hover {
-  background-position: 0 -30px;
-}
-.kint a {
-  color: #1d1e1e;
-  text-shadow: none;
-}
-.kint a:hover {
-  color: #1d1e1e;
-  border-bottom: 1px dotted #1d1e1e;
-}
-.kint ul {
-  list-style: none;
-  padding-left: 12px;
-}
-.kint ul:not(.kint-tabs) li {
-  border-left: 1px dashed #d7d7d7;
-}
-.kint ul:not(.kint-tabs) li > dl {
-  border-left: none;
-}
-.kint ul.kint-tabs {
-  margin: 0 0 0 12px;
-  padding-left: 0;
-  background: #f8f8f8;
-  border: 1px solid #d7d7d7;
-  border-top: 0;
-}
-.kint ul.kint-tabs li {
-  background: #f8f8f8;
-  border: 1px solid #d7d7d7;
-  cursor: pointer;
-  display: inline-block;
-  height: 24px;
-  margin: 2px;
-  padding: 0 12px;
-  vertical-align: top;
-}
-.kint ul.kint-tabs li:hover,
-.kint ul.kint-tabs li.kint-active-tab:hover {
-  border-color: #aaaaaa;
-  color: #ff0000;
-}
-.kint ul.kint-tabs li.kint-active-tab {
-  background: #f8f8f8;
-  border-top: 0;
-  margin-top: -1px;
-  height: 27px;
-  line-height: 24px;
-}
-.kint ul.kint-tabs li:not(.kint-active-tab) {
-  line-height: 20px;
-}
-.kint ul.kint-tabs li + li {
-  margin-left: 0;
-}
-.kint ul:not(.kint-tabs) > li:not(:first-child) {
-  display: none;
-}
-.kint dt:hover + dd > ul > li.kint-active-tab {
-  border-color: #aaaaaa;
-  color: #ff0000;
-}
-.kint-report {
-  border-collapse: collapse;
-  empty-cells: show;
-  border-spacing: 0;
-}
-.kint-report * {
-  font-size: 12px;
-}
-.kint-report dt {
-  background: none;
-  padding: 2px;
-}
-.kint-report dt .kint-parent {
-  min-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.kint-report td,
-.kint-report th {
-  border: 1px solid #d7d7d7;
-  padding: 2px;
-  vertical-align: center;
-}
-.kint-report th {
-  cursor: alias;
-}
-.kint-report td:first-child,
-.kint-report th {
-  font-weight: bold;
-  background: #f8f8f8;
-  color: #1d1e1e;
-}
-.kint-report td {
-  background: #f8f8f8;
-  white-space: pre;
-}
-.kint-report td > dl {
-  padding: 0;
-}
-.kint-report pre {
-  border-top: 0;
-  border-right: 0;
-}
-.kint-report th:first-child {
-  background: none;
-  border: 0;
-}
-.kint-report td.kint-empty {
-  background: #d33682 !important;
-}
-.kint-report tr:hover > td {
-  box-shadow: 0 0 1px 0 #aaaaaa inset;
-}
-.kint-report tr:hover var {
-  color: #ff0000;
-}
-.kint-report ul.kint-tabs li.kint-active-tab {
-  height: 20px;
-  line-height: 17px;
-}
-.kint-trace .kint-source {
-  line-height: 14px;
-}
-.kint-trace .kint-source span {
-  padding-right: 1px;
-  border-right: 3px inset #0066ff;
-}
-.kint-trace .kint-source .kint-highlight {
-  background: #f8f8f8;
-}
-.kint-trace .kint-parent > b {
-  min-width: 18px;
-  display: inline-block;
-  text-align: right;
-  color: #1d1e1e;
-}
-.kint-trace .kint-parent > var > a {
-  color: #0066ff;
-}
-.kint-focused {
-  box-shadow: 0 0 3px 2px #ff0000;
-}
-.kint-microtime,
-.kint-color-preview {
-  box-shadow: 0 0 2px 0 #b6cedb;
-  height: 16px;
-  text-align: center;
-  text-shadow: -1px 0 #839496, 0 1px #839496, 1px 0 #839496, 0 -1px #839496;
-  width: 230px;
-  color: #fdf6e3;
-}
-.kint footer li {
-  color: #ddd;
-}
-.kint dt {
-  font-weight: normal;
-}
-.kint dt.kint-parent {
-  margin-top: 4px;
-}
-.kint > dl {
-  background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0, #ffffff 15px);
-}
-.kint dl dl {
-  margin-top: 4px;
-  padding-left: 25px;
-  border-left: none;
-}
-.kint > dl > dt {
-  background: #f8f8f8;
-}
-.kint ul {
-  margin: 0;
-  padding-left: 0;
-}
-.kint ul:not(.kint-tabs) > li {
-  border-left: 0;
-}
-.kint ul.kint-tabs {
-  background: #f8f8f8;
-  border: 1px solid #d7d7d7;
-  border-width: 0 1px 1px 1px;
-  padding: 4px 0 0 12px;
-  margin-left: -1px;
-  margin-top: -1px;
-}
-.kint ul.kint-tabs li,
-.kint ul.kint-tabs li + li {
-  margin: 0 0 0 4px;
-}
-.kint ul.kint-tabs li {
-  border-bottom-width: 0;
-  height: 25px;
-}
-.kint ul.kint-tabs li:first-child {
-  margin-left: 0;
-}
-.kint ul.kint-tabs li.kint-active-tab {
-  border-top: 1px solid #d7d7d7;
-  background: #fff;
-  font-weight: bold;
-  padding-top: 0;
-  border-bottom: 1px solid #fff !important;
-  margin-bottom: -1px;
-}
-.kint ul.kint-tabs li.kint-active-tab:hover {
-  border-bottom: 1px solid #fff;
-}
-.kint ul > li > pre {
-  border: 1px solid #d7d7d7;
-}
-.kint dt:hover + dd > ul {
-  border-color: #aaaaaa;
-}
-.kint pre {
-  background: #fff;
-  margin-top: 4px;
-  margin-left: 25px;
-}
-.kint .kint-popup-trigger:hover {
-  color: #ff0000;
-}
-.kint .kint-source .kint-highlight {
-  background: #cfc;
-}
-.kint-report td {
-  background: #fff;
-}
-.kint-report td > dl {
-  padding: 0;
-  margin: 0;
-}
-.kint-report td > dl > dt.kint-parent {
-  margin: 0;
-}
-.kint-report td:first-child,
-.kint-report td,
-.kint-report th {
-  padding: 2px 4px;
-}
-.kint-report td.kint-empty {
-  background: #d7d7d7 !important;
-}
-.kint-report dd,
-.kint-report dt {
-  background: #fff;
-}
-.kint-report tr:hover > td {
-  box-shadow: none;
-  background: #cfc;
-}
diff --git a/modules/devel/kint/kint/view/compiled/kint.js b/modules/devel/kint/kint/view/compiled/kint.js
deleted file mode 100644
index 1195188..0000000
--- a/modules/devel/kint/kint/view/compiled/kint.js
+++ /dev/null
@@ -1,10 +0,0 @@
-(function(){if("undefined"===typeof kintInitialized){kintInitialized=1;var e=[],f=-1,g=function(a){var b=window.getSelection(),c=document.createRange();c.selectNodeContents(a);b.removeAllRanges();b.addRange(c)},h=function(a){Array.prototype.slice.call(document.querySelectorAll(".kint nav, .kint-tabs>li:not(.kint-active-tab)"),0).forEach(a)},k=function(a,b){if(!a.classList)return!1;"undefined"===typeof b&&(b="kint-show");return a.classList.contains(b)},l=function(a,b){"undefined"===typeof b&&(b="kint-show");a.classList.add(b)},
-m=function(a,b){"undefined"===typeof b&&(b="kint-show");a.classList.remove(b)},n=function(a){do a=a.nextElementSibling;while("dd"!==a.nodeName.toLowerCase());return a},q=function(a,b){var c=n(a);"undefined"===typeof b&&(b=k(a));b?m(a):l(a);1===c.childNodes.length&&(c=c.childNodes[0].childNodes[0])&&k(c,"kint-parent")&&q(c,b)},r=function(a,b){var c=n(a).getElementsByClassName("kint-parent"),d=c.length;for("undefined"===typeof b&&(b=k(a));d--;)q(c[d],b);q(a,b)},s=function(a){var b=a,c=0;a.parentNode.getElementsByClassName("kint-active-tab")[0].className=
-"";for(a.className="kint-active-tab";b=b.previousSibling;)1===b.nodeType&&c++;a=a.parentNode.nextSibling.childNodes;for(var d=0;d<a.length;d++)d===c?(a[d].style.display="block",1===a[d].childNodes.length&&(b=a[d].childNodes[0].childNodes[0],k(b,"kint-parent")&&q(b,!1))):a[d].style.display="none"},t=function(a){for(;a=a.parentNode,a&&!k(a,"kint"););return!!a},u=function(){e=[];h(function(a){0===a.offsetWidth&&0===a.offsetHeight||e.push(a)})},v=function(a){var b;if(b=window.open())b.document.open(),
-b.document.write("<html><head><title>Kint ("+(new Date).toISOString()+')</title><meta charset="utf-8">'+document.getElementsByClassName("-kint-js")[0].outerHTML+document.getElementsByClassName("-kint-css")[0].outerHTML+'</head><body><input style="width: 100%" placeholder="Take some notes!"><div class="kint">'+a.parentNode.outerHTML+"</div></body>"),b.document.close()},w=function(a,b){function c(a){var c=1===b?a.replace(/^#/,""):a;if(isNaN(c))return a.trim().toLocaleLowerCase();c=parseFloat(c);return isNaN(c)?
-a.trim():c}var d=a.tBodies[0];[].slice.call(a.tBodies[0].rows).sort(function(a,d){a=c(a.cells[b].textContent);d=c(d.cells[b].textContent);return a<d?-1:a>d?1:0}).forEach(function(a){d.appendChild(a)})},x=function(a){var b=document.querySelector(".kint-focused");b&&m(b,"kint-focused");if(-1!==a){b=e[a];l(b,"kint-focused");var c=function(a){return a.offsetTop+(a.offsetParent?c(a.offsetParent):0)};window.scrollTo(0,c(b)-window.innerHeight/2)}f=a},y=function(a,b){a?0>--b&&(b=e.length-1):++b>=e.length&&
-(b=0);x(b);return!1};window.addEventListener("click",function(a){var b=a.target,c=b.nodeName.toLowerCase();if(t(b)){if("dfn"===c)g(b),b=b.parentNode;else if("var"===c)b=b.parentNode,c=b.nodeName.toLowerCase();else if("th"===c)return a.ctrlKey||w(b.parentNode.parentNode.parentNode,b.cellIndex),!1;if("li"===c&&"kint-tabs"===b.parentNode.className)return"kint-active-tab"!==b.className&&(s(b),-1!==f&&u()),!1;if("nav"===c)return"footer"===b.parentNode.nodeName.toLowerCase()?(b=b.parentNode,k(b)?m(b):l(b)):
-setTimeout(function(){0<parseInt(b.a,10)?b.a--:(r(b.parentNode),-1!==f&&u())},300),a.stopPropagation(),!1;if(k(b,"kint-parent"))return q(b),-1!==f&&u(),!1;if(k(b,"kint-ide-link"))return a.preventDefault(),a=new XMLHttpRequest,a.open("GET",b.href),a.send(null),!1;if(k(b,"kint-popup-trigger")){a=b.parentNode;if("footer"===a.nodeName.toLowerCase())a=a.previousSibling;else for(;a&&!k(a,"kint-parent");)a=a.parentNode;v(a)}else"pre"===c&&3===a.detail&&g(b)}},!1);window.addEventListener("dblclick",function(a){var b=
-a.target;if(t(b)&&"nav"===b.nodeName.toLowerCase()){b.a=2;for(var c=document.getElementsByClassName("kint-parent"),d=c.length,b=k(b.parentNode);d--;)q(c[d],b);-1!==f&&u();a.stopPropagation()}},!1);window.onkeydown=function(a){if(a.target===document.body&&!a.altKey&&!a.ctrlKey){var b=a.keyCode,c=a.shiftKey;a=f;if(68===b){if(-1===a)return u(),y(!1,a);x(-1);return!1}if(-1!==a){if(9===b)return y(c,a);if(38===b)return y(!0,a);if(40===b)return y(!1,a);c=e[a];if("li"===c.nodeName.toLowerCase()){if(32===
-b||13===b)return s(c),u(),y(!0,a);if(39===b)return y(!1,a);if(37===b)return y(!0,a)}c=c.parentNode;if(32===b||13===b)return q(c),u(),!1;if(39===b||37===b){var d=k(c),b=37===b;if(d)r(c,b);else{if(b){do c=c.parentNode;while(c&&"dd"!==c.nodeName.toLowerCase());if(c){c=c.previousElementSibling;a=-1;for(d=c.querySelector("nav");d!==e[++a];);x(a)}else c=e[a].parentNode}q(c,b)}u();return!1}}}};window.addEventListener("load",function(){var a=Array.prototype.slice.call(document.querySelectorAll(".kint-microtime"),
-0);a.forEach(function(b){var c=parseFloat(b.innerHTML),d=Infinity,p=-Infinity;a.forEach(function(a){a=parseFloat(a.innerHTML);d>a&&(d=a);p<a&&(p=a)});b.style.background="hsl("+Math.round(120*(1-(c-d)/(p-d)))+",60%,70%)"})})};})()
diff --git a/modules/devel/kint/kint/view/compiled/original.css b/modules/devel/kint/kint/view/compiled/original.css
deleted file mode 100644
index c360469..0000000
--- a/modules/devel/kint/kint/view/compiled/original.css
+++ /dev/null
@@ -1 +0,0 @@
-.kint::selection{background:#0092db;color:#1d1e1e}.kint::-moz-selection{background:#0092db;color:#1d1e1e}.kint::-webkit-selection{background:#0092db;color:#1d1e1e}.kint,.kint::before,.kint::after,.kint *,.kint *::before,.kint *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif;line-height:15px;margin:0;padding:0;text-align:left}.kint{font-size:13px;margin:8px 0;overflow-x:auto;white-space:nowrap}.kint dt{background:#e0eaef;border:1px solid #b6cedb;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint dt:hover{border-color:#0092db}.kint dt>var{margin-right:5px}.kint>dl dl{padding:0 0 0 12px}.kint nav{background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAA8CAMAAACO5hB7AAAACVBMVEX///82b4tctzBls0NMAAAAQklEQVR42rWRIQ4AAAgCwf8/2qgER2BeuwJsgAqIzekMfMryPL9XQSkobE6vwKcsz/N7FfPvh09lnPf/b+7673+f0uHuAZ/EdkNQAAAAAElFTkSuQmCC") no-repeat scroll 0 0 transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint dt.kint-parent:hover nav{background-position:0 -15px}.kint dt.kint-parent.kint-show:hover>nav{background-position:0 -45px}.kint dt.kint-show>nav{background-position:0 -30px}.kint dt.kint-parent+dd{display:none;border-left:1px dashed #b6cedb}.kint dt.kint-parent.kint-show+dd{display:block}.kint var,.kint var a{color:#0092db;font-style:normal}.kint dt:hover var,.kint dt:hover var a{color:#5cb730}.kint dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #b6cedb;background:#e0eaef;display:block;word-break:normal}.kint .kint-popup-trigger{float:right !important;cursor:pointer;color:#0092db}.kint .kint-popup-trigger:hover{color:#b6cedb}.kint dt.kint-parent>.kint-popup-trigger{font-size:13px}.kint footer{padding:0 3px 3px;font-size:9px}.kint footer>.kint-popup-trigger{font-size:12px}.kint footer nav{background-size:10px;height:10px;width:10px}.kint footer nav:hover{background-position:0 -10px}.kint footer>ol{display:none;margin-left:32px}.kint footer.kint-show>ol{display:block}.kint footer.kint-show nav{background-position:0 -20px}.kint footer.kint-show nav:hover{background-position:0 -30px}.kint a{color:#1d1e1e;text-shadow:none}.kint a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint ul{list-style:none;padding-left:12px}.kint ul:not(.kint-tabs) li{border-left:1px dashed #b6cedb}.kint ul:not(.kint-tabs) li>dl{border-left:none}.kint ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#e0eaef;border:1px solid #b6cedb;border-top:0}.kint ul.kint-tabs li{background:#c1d4df;border:1px solid #b6cedb;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint ul.kint-tabs li:hover,.kint ul.kint-tabs li.kint-active-tab:hover{border-color:#0092db;color:#5cb730}.kint ul.kint-tabs li.kint-active-tab{background:#e0eaef;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint ul.kint-tabs li:not(.kint-active-tab){line-height:20px}.kint ul.kint-tabs li+li{margin-left:0}.kint ul:not(.kint-tabs)>li:not(:first-child){display:none}.kint dt:hover+dd>ul>li.kint-active-tab{border-color:#0092db;color:#5cb730}.kint-report{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-report *{font-size:12px}.kint-report dt{background:none;padding:2px}.kint-report dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-report td,.kint-report th{border:1px solid #b6cedb;padding:2px;vertical-align:center}.kint-report th{cursor:alias}.kint-report td:first-child,.kint-report th{font-weight:bold;background:#c1d4df;color:#1d1e1e}.kint-report td{background:#e0eaef;white-space:pre}.kint-report td>dl{padding:0}.kint-report pre{border-top:0;border-right:0}.kint-report th:first-child{background:none;border:0}.kint-report td.kint-empty{background:#d33682 !important}.kint-report tr:hover>td{box-shadow:0 0 1px 0 #0092db inset}.kint-report tr:hover var{color:#5cb730}.kint-report ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-trace .kint-source{line-height:14px}.kint-trace .kint-source span{padding-right:1px;border-right:3px inset #0092db}.kint-trace .kint-source .kint-highlight{background:#c1d4df}.kint-trace .kint-parent>b{min-width:18px;display:inline-block;text-align:right;color:#1d1e1e}.kint-trace .kint-parent>var>a{color:#0092db}.kint-focused{box-shadow:0 0 3px 2px #5cb730}.kint-microtime,.kint-color-preview{box-shadow:0 0 2px 0 #b6cedb;height:16px;text-align:center;text-shadow:-1px 0 #839496,0 1px #839496,1px 0 #839496,0 -1px #839496;width:230px;color:#fdf6e3}.kint footer li{color:#ddd}.kint>dl>dt{background:linear-gradient(to bottom, #e3ecf0 0, #c0d4df 100%)}.kint ul.kint-tabs{background:linear-gradient(to bottom, #9dbed0 0, #b2ccda 100%)}.kint>dl:not(.kint-trace)>dd>ul.kint-tabs li{background:#e0eaef}.kint>dl:not(.kint-trace)>dd>ul.kint-tabs li.kint-active-tab{background:#c1d4df}.kint>dl.kint-trace>dt{background:linear-gradient(to bottom, #c0d4df 0, #e3ecf0 100%)}.kint .kint-source .kint-highlight{background:#f0eb96}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/view/compiled/solarized-dark.css b/modules/devel/kint/kint/view/compiled/solarized-dark.css
deleted file mode 100644
index d7c68ab..0000000
--- a/modules/devel/kint/kint/view/compiled/solarized-dark.css
+++ /dev/null
@@ -1 +0,0 @@
-.kint::selection{background:#268bd2;color:#839496}.kint::-moz-selection{background:#268bd2;color:#839496}.kint::-webkit-selection{background:#268bd2;color:#839496}.kint,.kint::before,.kint::after,.kint *,.kint *::before,.kint *::after{box-sizing:border-box;border-radius:0;color:#839496;float:none !important;font-family:Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif;line-height:15px;margin:0;padding:0;text-align:left}.kint{font-size:13px;margin:10px 0;overflow-x:auto;white-space:nowrap}.kint dt{background:#002b36;border:1px solid #586e75;color:#839496;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint dt:hover{border-color:#268bd2}.kint dt>var{margin-right:5px}.kint>dl dl{padding:0 0 0 15px}.kint nav{background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAA8CAMAAACO5hB7AAAA7VBMVEVYbnWToaH///9YbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnWToaGToaGToaGToaGToaGToaGToaGToaGToaFYbnWToaFYbnVYbnWToaGToaFYbnWToaFYbnWToaFYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnWToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaFYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnWToaGToaGToaGToaGToaGToaGToaGToaGToaFYbnWToaEeRtj1AAAATXRSTlMAAACLab0B7iP2R7CL9iPuaUewAb36F0/QnPoX0JxPYQaurepi6QV8FhV7MzFhM6586RYFMa3qYnsVBpNQ+ZGOGJ3PkM9QkZAY+Y6TnV7gnYsAAAEcSURBVHhebdHVbgMxEEBRu8sUZmqapBBoSuGUmWb+/3NayxtrLOe+Hck745XZgd6/eb3CVcKt7HmR+gKxlCGOETG5vFbOoahR6NxI5zHt6nuq+2dqnqfzzH3mfcz70vb8H6MJt5u6a96hS30E4PjEFgAEp2fKNojKUfVEOoS044ex7u3YPE/nmfvM+5j3pe17T9oe/77O41w+n4vnrbrwZxbTshVhvtx5Kb8vliRLRWmeSQSTjJq/El5x5fUXYmNN9hcQC5y4g/hGvVksNtT8451rns2IScb7mn567ll2GNpWr9YWfvQgzWsKs8HOA/m960g6rjTzA8HAV/NHwiOmPLwDKA/J/gggYsRVgFvqbr/fpWYv90zzZKKs9Qfx00Jx65oxLAAAAABJRU5ErkJggg==") no-repeat scroll 0 0 transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint dt.kint-parent:hover nav{background-position:0 -15px}.kint dt.kint-parent.kint-show:hover>nav{background-position:0 -45px}.kint dt.kint-show>nav{background-position:0 -30px}.kint dt.kint-parent+dd{display:none;border-left:1px dashed #586e75}.kint dt.kint-parent.kint-show+dd{display:block}.kint var,.kint var a{color:#268bd2;font-style:normal}.kint dt:hover var,.kint dt:hover var a{color:#2aa198}.kint dfn{font-style:normal;font-family:monospace;color:#93a1a1}.kint pre{color:#839496;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #586e75;background:#002b36;display:block;word-break:normal}.kint .kint-popup-trigger{float:right !important;cursor:pointer;color:#268bd2}.kint .kint-popup-trigger:hover{color:#586e75}.kint dt.kint-parent>.kint-popup-trigger{font-size:13px}.kint footer{padding:0 3px 3px;font-size:9px}.kint footer>.kint-popup-trigger{font-size:12px}.kint footer nav{background-size:10px;height:10px;width:10px}.kint footer nav:hover{background-position:0 -10px}.kint footer>ol{display:none;margin-left:32px}.kint footer.kint-show>ol{display:block}.kint footer.kint-show nav{background-position:0 -20px}.kint footer.kint-show nav:hover{background-position:0 -30px}.kint a{color:#839496;text-shadow:none}.kint a:hover{color:#93a1a1;border-bottom:1px dotted #93a1a1}.kint ul{list-style:none;padding-left:15px}.kint ul:not(.kint-tabs) li{border-left:1px dashed #586e75}.kint ul:not(.kint-tabs) li>dl{border-left:none}.kint ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#002b36;border:1px solid #586e75;border-top:0}.kint ul.kint-tabs li{background:#073642;border:1px solid #586e75;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint ul.kint-tabs li:hover,.kint ul.kint-tabs li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint ul.kint-tabs li.kint-active-tab{background:#002b36;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint ul.kint-tabs li:not(.kint-active-tab){line-height:25px}.kint ul.kint-tabs li+li{margin-left:0}.kint ul:not(.kint-tabs)>li:not(:first-child){display:none}.kint dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-report{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-report *{font-size:12px}.kint-report dt{background:none;padding:2.5px}.kint-report dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-report td,.kint-report th{border:1px solid #586e75;padding:2.5px;vertical-align:top}.kint-report th{cursor:alias}.kint-report td{background:#002b36;white-space:pre}.kint-report td>dl{padding:0}.kint-report pre{border-top:0;border-right:0}.kint-report th:first-child{background:none;border:0}.kint-report td:first-child,.kint-report th{font-weight:bold;background:#073642;color:#93a1a1;padding:2.5px 0}.kint-report td.kint-empty{background:#d33682 !important}.kint-report tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-report tr:hover var{color:#2aa198}.kint-report ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-trace .kint-source{line-height:18px}.kint-trace .kint-source span{padding-right:1px;border-right:3px inset #268bd2}.kint-trace .kint-source .kint-highlight{background:#073642}.kint-trace .kint-parent>b{min-width:18px;display:inline-block;text-align:right;color:#93a1a1}.kint-trace .kint-parent>var>a{color:#268bd2}.kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-microtime,.kint-color-preview{box-shadow:0 0 2px 0 #b6cedb;height:16px;text-align:center;text-shadow:-1px 0 #839496,0 1px #839496,1px 0 #839496,0 -1px #839496;width:230px;color:#fdf6e3}.kint footer li{color:#ddd}body{background:#073642;color:#fff}.kint{background:#073642;box-shadow:0 0 5px 3px #073642}.kint>dl>dt,.kint ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/view/compiled/solarized.css b/modules/devel/kint/kint/view/compiled/solarized.css
deleted file mode 100644
index 118daf3..0000000
--- a/modules/devel/kint/kint/view/compiled/solarized.css
+++ /dev/null
@@ -1 +0,0 @@
-.kint::selection{background:#268bd2;color:#657b83}.kint::-moz-selection{background:#268bd2;color:#657b83}.kint::-webkit-selection{background:#268bd2;color:#657b83}.kint,.kint::before,.kint::after,.kint *,.kint *::before,.kint *::after{box-sizing:border-box;border-radius:0;color:#657b83;float:none !important;font-family:Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif;line-height:15px;margin:0;padding:0;text-align:left}.kint{font-size:13px;margin:10px 0;overflow-x:auto;white-space:nowrap}.kint dt{background:#fdf6e3;border:1px solid #93a1a1;color:#657b83;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint dt:hover{border-color:#268bd2}.kint dt>var{margin-right:5px}.kint>dl dl{padding:0 0 0 15px}.kint nav{background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAA8CAMAAACO5hB7AAAA7VBMVEVYbnWToaH///9YbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnWToaGToaGToaGToaGToaGToaGToaGToaGToaFYbnWToaFYbnVYbnWToaGToaFYbnWToaFYbnWToaFYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnWToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaGToaFYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnVYbnWToaGToaGToaGToaGToaGToaGToaGToaGToaFYbnWToaEeRtj1AAAATXRSTlMAAACLab0B7iP2R7CL9iPuaUewAb36F0/QnPoX0JxPYQaurepi6QV8FhV7MzFhM6586RYFMa3qYnsVBpNQ+ZGOGJ3PkM9QkZAY+Y6TnV7gnYsAAAEcSURBVHhebdHVbgMxEEBRu8sUZmqapBBoSuGUmWb+/3NayxtrLOe+Hck745XZgd6/eb3CVcKt7HmR+gKxlCGOETG5vFbOoahR6NxI5zHt6nuq+2dqnqfzzH3mfcz70vb8H6MJt5u6a96hS30E4PjEFgAEp2fKNojKUfVEOoS044ex7u3YPE/nmfvM+5j3pe17T9oe/77O41w+n4vnrbrwZxbTshVhvtx5Kb8vliRLRWmeSQSTjJq/El5x5fUXYmNN9hcQC5y4g/hGvVksNtT8451rns2IScb7mn567ll2GNpWr9YWfvQgzWsKs8HOA/m960g6rjTzA8HAV/NHwiOmPLwDKA/J/gggYsRVgFvqbr/fpWYv90zzZKKs9Qfx00Jx65oxLAAAAABJRU5ErkJggg==") no-repeat scroll 0 0 transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint dt.kint-parent:hover nav{background-position:0 -15px}.kint dt.kint-parent.kint-show:hover>nav{background-position:0 -45px}.kint dt.kint-show>nav{background-position:0 -30px}.kint dt.kint-parent+dd{display:none;border-left:1px dashed #93a1a1}.kint dt.kint-parent.kint-show+dd{display:block}.kint var,.kint var a{color:#268bd2;font-style:normal}.kint dt:hover var,.kint dt:hover var a{color:#2aa198}.kint dfn{font-style:normal;font-family:monospace;color:#586e75}.kint pre{color:#657b83;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #93a1a1;background:#fdf6e3;display:block;word-break:normal}.kint .kint-popup-trigger{float:right !important;cursor:pointer;color:#268bd2}.kint .kint-popup-trigger:hover{color:#93a1a1}.kint dt.kint-parent>.kint-popup-trigger{font-size:13px}.kint footer{padding:0 3px 3px;font-size:9px}.kint footer>.kint-popup-trigger{font-size:12px}.kint footer nav{background-size:10px;height:10px;width:10px}.kint footer nav:hover{background-position:0 -10px}.kint footer>ol{display:none;margin-left:32px}.kint footer.kint-show>ol{display:block}.kint footer.kint-show nav{background-position:0 -20px}.kint footer.kint-show nav:hover{background-position:0 -30px}.kint a{color:#657b83;text-shadow:none}.kint a:hover{color:#586e75;border-bottom:1px dotted #586e75}.kint ul{list-style:none;padding-left:15px}.kint ul:not(.kint-tabs) li{border-left:1px dashed #93a1a1}.kint ul:not(.kint-tabs) li>dl{border-left:none}.kint ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#fdf6e3;border:1px solid #93a1a1;border-top:0}.kint ul.kint-tabs li{background:#eee8d5;border:1px solid #93a1a1;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint ul.kint-tabs li:hover,.kint ul.kint-tabs li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint ul.kint-tabs li.kint-active-tab{background:#fdf6e3;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint ul.kint-tabs li:not(.kint-active-tab){line-height:25px}.kint ul.kint-tabs li+li{margin-left:0}.kint ul:not(.kint-tabs)>li:not(:first-child){display:none}.kint dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-report{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-report *{font-size:12px}.kint-report dt{background:none;padding:2.5px}.kint-report dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-report td,.kint-report th{border:1px solid #93a1a1;padding:2.5px;vertical-align:top}.kint-report th{cursor:alias}.kint-report td{background:#fdf6e3;white-space:pre}.kint-report td>dl{padding:0}.kint-report pre{border-top:0;border-right:0}.kint-report th:first-child{background:none;border:0}.kint-report td:first-child,.kint-report th{font-weight:bold;background:#eee8d5;color:#586e75;padding:2.5px 0}.kint-report td.kint-empty{background:#d33682 !important}.kint-report tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-report tr:hover var{color:#2aa198}.kint-report ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-trace .kint-source{line-height:18px}.kint-trace .kint-source span{padding-right:1px;border-right:3px inset #268bd2}.kint-trace .kint-source .kint-highlight{background:#eee8d5}.kint-trace .kint-parent>b{min-width:18px;display:inline-block;text-align:right;color:#586e75}.kint-trace .kint-parent>var>a{color:#268bd2}.kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-microtime,.kint-color-preview{box-shadow:0 0 2px 0 #b6cedb;height:16px;text-align:center;text-shadow:-1px 0 #839496,0 1px #839496,1px 0 #839496,0 -1px #839496;width:230px;color:#fdf6e3}.kint footer li{color:#ddd}.kint>dl>dt,.kint ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/view/themes/aante-light.less b/modules/devel/kint/kint/view/themes/aante-light.less
deleted file mode 100644
index f342d75..0000000
--- a/modules/devel/kint/kint/view/themes/aante-light.less
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * @author Ante Aljinovic https://github.com/aljinovic
- */
-@import "../base";
-
-@main-background: #f8f8f8;
-@secondary-background : #f8f8f8;
-
-@text-color: #1d1e1e;
-@variable-name-color: #1d1e1e;
-@variable-type-color: #06f;
-@variable-type-color-hover: #f00;
-
-@border-color: #d7d7d7;
-@border-color-hover: #aaa;
-
-@caret-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAA8CAYAAAC5OOBJAAAAvklEQVR42mNgGMFAS0uLLSQk5HxoaOh/XDg4OLgdpwEBAQEGQAN+YtMIFH/i4ODAg9cFQNMbsWkOCgrKJMv5ID5Qipko/6M7PzAw0ImkAIQ5H0hvISv0gZpP+fn5qZAVfcBAkmEYBaNZcjRLjmbJUUCvqAIlDlAiASUWkjWDkiU0eTaSpBGUEZBy1E9QRiFWLzO2LEmU80GZHkcRhN/5oGIGVNzgKIbwOx9UwOErAIl2/igYzZKjWXI0S9IHAAASJijo0Ypj8AAAAABJRU5ErkJggg==");
-
-.keyboard-caret() {
-  box-shadow : 0 0 3px 2px @variable-type-color-hover;
-}
-
-.kint {
-  dt {
-    font-weight : normal;
-
-    &.kint-parent {
-      margin-top : 4px;
-    }
-  }
-
-  > dl {
-    background : linear-gradient(90deg, rgba(255,255,255,0) 0, #fff 15px);
-  }
-
-  dl dl {
-    margin-top   : 4px;
-    padding-left : 25px;
-    border-left  : none;
-  }
-
-  > dl > dt {
-    background : @secondary-background;
-  }
-
-  //
-  // TABS
-  // --------------------------------------------------
-
-  ul {
-    margin       : 0;
-    padding-left : 0;
-
-    &:not(.kint-tabs) > li {
-      border-left : 0;
-    }
-
-    &.kint-tabs {
-      background   : @secondary-background;
-      border       : @border;
-      border-width : 0 1px 1px 1px;
-      padding      : 4px 0 0 12px;
-      margin-left  : -1px;
-      margin-top   : -1px;
-
-      li,
-      li + li {
-        margin : 0 0 0 4px;
-      }
-
-      li {
-        border-bottom-width : 0;
-        height              : @spacing * 6px + 1px;
-
-
-        &:first-child {
-          margin-left : 0;
-        }
-
-        &.kint-active-tab {
-          border-top    : @border;
-          background    : #fff;
-          font-weight   : bold;
-          padding-top   : 0;
-          border-bottom : 1px solid #fff !important;
-          margin-bottom : -1px;
-        }
-
-        &.kint-active-tab:hover {
-          border-bottom : 1px solid #fff;
-        }
-      }
-    }
-
-    > li > pre {
-      border : @border;
-    }
-  }
-
-  dt:hover + dd > ul {
-    border-color : @border-color-hover;
-  }
-
-  pre {
-    background  : #fff;
-    margin-top  : 4px;
-    margin-left : 25px;
-  }
-
-  .kint-popup-trigger:hover {
-    color : @variable-type-color-hover;
-  }
-
-  .kint-source .kint-highlight {
-    background : #cfc;
-  }
-}
-
-//
-// REPORT
-// --------------------------------------------------
-
-.kint-report {
-  td {
-    background : #fff;
-
-    > dl {
-      padding : 0;
-      margin  : 0;
-      > dt.kint-parent {
-        margin: 0;
-      }
-    }
-  }
-
-  td:first-child,
-  td,
-  th {
-    padding    : 2px 4px;
-  }
-
-  td.kint-empty {
-    background : @border-color !important;
-  }
-
-  dd, dt {
-    background: #fff;
-  }
-
-  tr:hover > td {
-    box-shadow : none;
-    background : #cfc;
-  }
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/view/themes/original.less b/modules/devel/kint/kint/view/themes/original.less
deleted file mode 100644
index 839a9de..0000000
--- a/modules/devel/kint/kint/view/themes/original.less
+++ /dev/null
@@ -1,43 +0,0 @@
-@import "../base";
-
-@main-background: #e0eaef;
-@secondary-background: #c1d4df;
-
-@text-color: #1d1e1e;
-@variable-name-color: #1d1e1e;
-@variable-type-color: #0092db;
-@variable-type-color-hover: #5cb730;
-
-@border-color: #b6cedb;
-@border-color-hover: #0092db;
-
-@caret-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAA8CAMAAACO5hB7AAAACVBMVEX///82b4tctzBls0NMAAAAQklEQVR42rWRIQ4AAAgCwf8/2qgER2BeuwJsgAqIzekMfMryPL9XQSkobE6vwKcsz/N7FfPvh09lnPf/b+7673+f0uHuAZ/EdkNQAAAAAElFTkSuQmCC");
-
-.keyboard-caret() {
-  box-shadow : 0 0 3px 2px #5cb730;
-}
-
-.kint {
-  > dl > dt {
-    background : linear-gradient(to bottom, #e3ecf0 0, #c0d4df 100%);
-  }
-
-  ul.kint-tabs {
-    background : linear-gradient(to bottom, #9dbed0 0px, #b2ccda 100%);
-  }
-
-  & > dl:not(.kint-trace) > dd > ul.kint-tabs li {
-    background : @main-background;
-    &.kint-active-tab {
-      background : @secondary-background;
-    }
-  }
-
-  & > dl.kint-trace > dt {
-    background : linear-gradient(to bottom, #c0d4df 0px, #e3ecf0 100%);
-  }
-
-  .kint-source .kint-highlight {
-    background : #f0eb96;
-  }
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/view/themes/solarized-dark.less b/modules/devel/kint/kint/view/themes/solarized-dark.less
deleted file mode 100644
index f8467e1..0000000
--- a/modules/devel/kint/kint/view/themes/solarized-dark.less
+++ /dev/null
@@ -1,39 +0,0 @@
-@import "../base";
-
-@spacing : 5;
-
-@main-background: #002b36; // base 03
-@secondary-background : #073642; // base 02
-
-@text-color: #839496; // base 0
-@variable-name-color: #93a1a1; // base 1
-@variable-type-color: #268bd2; // blue
-@variable-type-color-hover: #2aa198; // cyan
-
-@border-color: #586e75; // base 01
-@border-color-hover: #268bd2; // blue
-
-.keyboard-caret() {
-  box-shadow    : 0 0 3px 2px #859900 inset; // green
-  border-radius : 7px;
-}
-
-body {
-  background : @secondary-background;
-  color      : #fff; // for non-kint elements to remain at least semi-readable
-}
-
-.kint {
-  background : @secondary-background;
-  box-shadow : 0 0 5px 3px @secondary-background;
-
-  > dl > dt,
-  ul.kint-tabs {
-    box-shadow : 4px 0 2px -3px @variable-type-color inset;
-  }
-}
-
-.kint ul.kint-tabs li.kint-active-tab {
-  padding-top: 7px;
-  height: 34px;
-}
\ No newline at end of file
diff --git a/modules/devel/kint/kint/view/themes/solarized.less b/modules/devel/kint/kint/view/themes/solarized.less
deleted file mode 100644
index ded8748..0000000
--- a/modules/devel/kint/kint/view/themes/solarized.less
+++ /dev/null
@@ -1,29 +0,0 @@
-@import "../base";
-
-@spacing : 5;
-
-@main-background: #fdf6e3; // base 3
-@secondary-background : #eee8d5; // base 2
-
-@text-color: #657b83; // base 00
-@variable-name-color: #586e75; // base 01
-@variable-type-color: #268bd2; // blue
-@variable-type-color-hover: #2aa198; // cyan
-
-@border-color: #93a1a1; // base 1
-@border-color-hover: #268bd2; // blue
-
-.keyboard-caret() {
-  box-shadow    : 0 0 3px 2px #859900 inset; // green
-  border-radius : 7px;
-}
-
-.kint > dl > dt,
-.kint ul.kint-tabs {
-  box-shadow : 4px 0 2px -3px @variable-type-color inset;
-}
-
-.kint ul.kint-tabs li.kint-active-tab {
-  padding-top: 7px;
-  height: 34px;
-}
\ No newline at end of file
diff --git a/modules/devel/kint/src/Plugin/Devel/Dumper/Kint.php b/modules/devel/kint/src/Plugin/Devel/Dumper/Kint.php
deleted file mode 100644
index 75d3299..0000000
--- a/modules/devel/kint/src/Plugin/Devel/Dumper/Kint.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\kint\Plugin\Devel\Dumper;
-
-use Drupal\devel\DevelDumperBase;
-
-/**
- * Provides a Kint dumper plugin.
- *
- * @DevelDumper(
- *   id = "kint",
- *   label = @Translation("Kint"),
- *   description = @Translation("Wrapper for <a href='https://github.com/raveren/kint'>Kint</a> debugging tool."),
- * )
- */
-class Kint extends DevelDumperBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    // @TODO find another solution for kint class inclusion!
-    kint_require();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function export($input, $name = NULL) {
-    ob_start();
-    \Kint::dump($input);
-    $dump = ob_get_clean();
-
-    // Kint does't allow to assign a title to the dump. Workaround to use the
-    // passed in name as dump title.
-    if ($name) {
-      $dump = preg_replace('/\$input/', $name, $dump, 1);
-    }
-
-    return $this->setSafeMarkup($dump);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function checkRequirements() {
-    return kint_require();
-  }
-
-}
diff --git a/modules/devel/kint/src/Twig/KintExtension.php b/modules/devel/kint/src/Twig/KintExtension.php
deleted file mode 100644
index 4f177f9..0000000
--- a/modules/devel/kint/src/Twig/KintExtension.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-namespace Drupal\kint\Twig;
-
-/**
- * Provides the Kint debugging function within Twig templates.
- */
-class KintExtension extends \Twig_Extension {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'kint';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFunctions() {
-    return array(
-      new \Twig_SimpleFunction('kint', array($this, 'kint'), array(
-        'is_safe' => array('html'),
-        'needs_environment' => TRUE,
-        'needs_context' => TRUE,
-        'is_variadic' => TRUE,
-      )),
-    );
-  }
-
-  /**
-   * Provides Kint function to Twig templates.
-   *
-   * Handles 0, 1, or multiple arguments.
-   *
-   * Code derived from https://github.com/barelon/CgKintBundle.
-   *
-   * @param \Twig_Environment $env
-   *   The twig environment instance.
-   * @param array $context
-   *   An array of parameters passed to the template.
-   * @param array $args
-   *   An array of parameters passed the function.
-   *
-   * @return string
-   *   String representation of the input variables.
-   */
-  public function kint(\Twig_Environment $env, array $context, array $args = []) {
-    // Don't do anything unless twig_debug is enabled. This reads from the Twig
-    // environment, not Drupal Settings, so a container rebuild is necessary
-    // when toggling twig_debug on and off. We can consider injecting Settings.
-    if (!$env->isDebug()) {
-      return;
-    }
-    kint_require();
-    // Don't display where Kint was called from.
-    // @todo Can we add information about which template Kint was called from?
-    \Kint::$displayCalledFrom = FALSE;
-
-    // No arguments passed to kint(), display full Twig context.
-    if (empty($args)) {
-      $kint_variable = array();
-      foreach ($context as $key => $value) {
-        if (!$value instanceof \Twig_Template) {
-          $kint_variable[$key] = $value;
-        }
-      }
-
-      $result = @\Kint::dump($kint_variable);
-      $output = str_replace('$kint_variable', 'Twig context', $result);
-    }
-    else {
-      // Try to get the names of variables from the Twig template.
-      $parameters = $this->getTwigFunctionParameters();
-
-      // If there is only one argument, pass to Kint without too much hassle.
-      if (count($args) == 1) {
-        $kint_variable = reset($args);
-        $variable_name = reset($parameters);
-        $result = @\Kint::dump($kint_variable);
-        // Replace $kint_variable with the name of the variable in the Twig
-        // template.
-        $output = str_replace('$kint_variable', $variable_name, $result);
-      }
-      else {
-        $kint_args = [];
-        // Build an array of variable to pass to Kint.
-        // @todo Can we just call_user_func_array while still retaining the
-        //   variable names?
-        foreach ($args as $index => $arg) {
-          // Prepend a unique index to allow debugging the same variable more
-          // than once in the same Kint dump.
-          $name = !empty($parameters[$index]) ? $parameters[$index] : $index;
-          $kint_args['_index_' . $index . '_' . $name] = $arg;
-        }
-
-        $result = @\Kint::dump($kint_args);
-        // Display a comma separated list of the variables contained in this group.
-        $output = str_replace('$kint_args', implode(', ', $parameters), $result);
-        // Remove unique indexes from output.
-        $output = preg_replace('/_index_([0-9]+)_/', '', $output);
-      }
-    }
-
-    return $output;
-  }
-
-  /**
-   * Gets the twig function parameters for the current invocation.
-   *
-   * @return array
-   *   The detected twig function parameters.
-   */
-  protected function getTwigFunctionParameters() {
-    $callee = NULL;
-    $template = NULL;
-
-    $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
-
-    foreach ($backtrace as $index => $trace) {
-      if (isset($trace['object']) && $trace['object'] instanceof \Twig_Template && 'Twig_Template' !== get_class($trace['object'])) {
-        $template = $trace['object'];
-        $callee = $backtrace[$index - 1];
-        break;
-      }
-    }
-
-    $parameters = [];
-
-    /** @var \Twig_Template $template */
-    if (NULL !== $template && NULL !== $callee) {
-      $line_number = $callee['line'];
-      $debug_infos = $template->getDebugInfo();
-
-      if (isset($debug_infos[$line_number])) {
-        $source_line = $debug_infos[$line_number];
-        $source_file_name = $template->getTemplateName();
-
-        if (is_readable($source_file_name)) {
-          $source = file($source_file_name, FILE_IGNORE_NEW_LINES);
-          $line = $source[$source_line - 1];
-
-          preg_match('/kint\((.+)\)/', $line, $matches);
-          if (isset($matches[1])) {
-            $parameters = array_map('trim', explode(',', $matches[1]));
-          }
-        }
-      }
-    }
-
-    return $parameters;
-  }
-
-}
diff --git a/modules/devel/run-tests-drush.sh b/modules/devel/run-tests-drush.sh
deleted file mode 100644
index 4dcd4fb..0000000
--- a/modules/devel/run-tests-drush.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env sh
-
-# This script will run phpunit-based test classes using Drush's
-# test framework.  First, the Drush executable is located, and
-# then phpunit is invoked, pointing to Drush's phpunit.xml as
-# the configuration.
-#
-# Any parameters that may be passed to `phpunit` may also be used
-# with this script.
-
-DRUSH_PATH="`which drush`"
-DRUSH_DIRNAME="`dirname -- "$DRUSH_PATH"`"
-# The following line is needed is you use a `drush` that differs from `which drush`
-# export UNISH_DRUSH=$DRUSH_PATH
-
-if [ $# = 0 ] ; then
-   phpunit --configuration="$DRUSH_DIRNAME/tests" drush
-else
-   # Pass along any arguments.
-   phpunit --configuration="$DRUSH_DIRNAME/tests" $@
-fi
diff --git a/modules/devel/src/Annotation/DevelDumper.php b/modules/devel/src/Annotation/DevelDumper.php
deleted file mode 100644
index 582aace..0000000
--- a/modules/devel/src/Annotation/DevelDumper.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\devel\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a DevelDumper annotation object.
- *
- * @Annotation
- *
- * @see \Drupal\devel\DevelDumperPluginManager
- * @see \Drupal\devel\DevelDumperInterface
- * @see \Drupal\devel\DevelDumperBase
- * @see plugin_api
- */
-class DevelDumper extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the DevelDumper type.
-   *
-   * @ingroup plugin_translatable
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $label;
-
-  /**
-   * A short description of the DevelDumper type.
-   *
-   * @ingroup plugin_translatable
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $description;
-
-}
diff --git a/modules/devel/src/Commands/DevelCommands.php b/modules/devel/src/Commands/DevelCommands.php
deleted file mode 100644
index cda3e1a..0000000
--- a/modules/devel/src/Commands/DevelCommands.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-namespace Drupal\devel\Commands;
-use Consolidation\OutputFormatters\StructuredData\RowsOfFields;
-use Drupal\Component\Uuid\Php;
-use Drupal\Core\Utility\Token;
-use Drush\Commands\DrushCommands;
-use Drush\Exceptions\UserAbortException;
-use Drush\Utils\StringUtils;
-use Symfony\Component\Console\Input\Input;
-use Symfony\Component\Console\Output\Output;
-
-/**
- * For commands that are parts of modules, Drush expects to find commandfiles in
- * __MODULE__/src/Commands, and the namespace is Drupal/__MODULE__/Commands.
- *
- * In addition to a commandfile like this one, you need to add a drush.services.yml
- * in root of your module like this module does.
- */
-class DevelCommands extends DrushCommands {
-
-  protected $token;
-
-  protected $container;
-
-  protected $eventDispatcher;
-
-  protected $moduleHandler;
-
-  public function __construct(Token $token, $container, $eventDispatcher, $moduleHandler) {
-    parent::__construct();
-    $this->token = $token;
-    $this->container = $container;
-    $this->eventDispatcher = $eventDispatcher;
-    $this->moduleHandler = $moduleHandler;
-  }
-
-  /**
-   * @return \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  public function getModuleHandler() {
-    return $this->moduleHandler;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getEventDispatcher() {
-    return $this->eventDispatcher;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getContainer() {
-    return $this->container;
-  }
-
-  /**
-   * @return Token
-   */
-  public function getToken() {
-    return $this->token;
-  }
-
-  /**
-   * Uninstall, and Install modules.
-
-   * @command devel:reinstall
-   * @param $modules A comma-separated list of module names.
-   * @aliases dre,devel-reinstall
-   * @allow-additional-options pm-uninstall,pm-enable
-   */
-  public function reinstall($modules) {
-    $modules = StringUtils::csvToArray($modules);
-
-    $modules_str = implode(',', $modules);
-    drush_invoke_process('@self', 'pm:uninstall', [$modules_str], []);
-    drush_invoke_process('@self', 'pm:enable', [$modules_str], []);
-  }
-
-  /**
-   * List implementations of a given hook and optionally edit one.
-   *
-   * @command devel:hook
-   * @param $hook The name of the hook to explore.
-   * @param $implementation The name of the implementation to edit. Usually omitted.
-   * @usage devel-hook cron
-   *   List implementations of hook_cron().
-   * @aliases fnh,fn-hook,hook,devel-hook
-   * @optionset_get_editor
-   */
-  function hook($hook, $implementation) {
-    // Get implementations in the .install files as well.
-    include_once './core/includes/install.inc';
-    drupal_load_updates();
-    $info = $this->codeLocate($implementation . "_$hook");
-    $exec = drush_get_editor();
-    drush_shell_exec_interactive($exec, $info['file']);
-  }
-
-  /**
-   * @hook interact hook
-   */
-  public function hookInteract(Input $input, Output $output) {
-    if (!$input->getArgument('implementation')) {
-      if ($hook_implementations = $this->getModuleHandler()->getImplementations($input->getArgument('hook'))) {
-        if (!$choice = $this->io()->choice('Enter the number of the hook implementation you wish to view.', array_combine($hook_implementations, $hook_implementations))) {
-          throw new UserAbortException();
-        }
-        $input->setArgument('implementation', $choice);
-      }
-      else {
-        throw new \Exception(dt('No implementations'));
-      }
-    }
-  }
-
-  /**
-   * List implementations of a given event and optionally edit one.
-   *
-   * @command devel:event
-   * @param $event The name of the event to explore. If omitted, a list of events is shown.
-   * @param $implementation The name of the implementation to show. Usually omitted.
-   * @usage devel-event
-   *   Pick a Kernel event, then pick an implementation, and then view its source code.
-   * @usage devel-event kernel.terminate
-   *   Pick a terminate subscribers implementation and view its source code.
-   * @aliases fne,fn-event,event
-   */
-  function event($event, $implementation) {
-    $info= $this->codeLocate($implementation);
-    $exec = drush_get_editor();
-    drush_shell_exec_interactive($exec, $info['file']);
-  }
-
-  /**
-   * @hook interact devel:event
-   */
-  public function interactEvent(Input $input, Output $output) {
-    $dispatcher = $this->getEventDispatcher();
-    if (!$input->getArgument('event')) {
-      // @todo Expand this list.
-      $events = array('kernel.controller', 'kernel.exception', 'kernel.request', 'kernel.response', 'kernel.terminate', 'kernel.view');
-      $events = array_combine($events, $events);
-      if (!$event = $this->io()->choice('Enter the event you wish to explore.', $events)) {
-        throw new UserAbortException();
-      }
-      $input->setArgument('event', $event);
-    }
-    if ($implementations = $dispatcher->getListeners($event)) {
-      foreach ($implementations as $implementation) {
-        $callable = get_class($implementation[0]) . '::' . $implementation[1];
-        $choices[$callable] = $callable;
-      }
-      if (!$choice = $this->io()->choice('Enter the number of the implementation you wish to view.', $choices)) {
-        throw new UserAbortException();
-      }
-      $input->setArgument('implementation', $choice);
-    }
-    else {
-      throw new \Exception(dt('No implementations.'));
-    }
-  }
-
-  /**
-   * List available tokens.
-   *
-   * @command devel:token
-   * @aliases token,devel-token
-   * @field-labels
-   *   group: Group
-   *   token: Token
-   *   name: Name
-   * @default-fields group,token,name
-   *
-   * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
-   */
-  public function token($options = ['format' => 'table']) {
-    $all = $this->getToken()->getInfo();
-    foreach ($all['tokens'] as $group => $tokens) {
-      foreach ($tokens as $key => $token) {
-        $rows[] = [
-          'group' => $group,
-          'token' => $key,
-          'name' => $token['name'],
-        ];
-      }
-    }
-    return new RowsOfFields($rows);
-  }
-
-  /**
-   * Generate a UUID.
-   *
-   * @command devel:uuid
-   * @aliases uuid,devel-uuid
-   * @usage drush devel-uuid
-   *   Outputs a Universally Unique Identifier.
-   *
-   * @return string
-   */
-  public function uuid() {
-    $uuid = new Php();
-    return $uuid->generate();
-  }
-
-
-  /**
-   * Get source code line for specified function or method.
-   */
-  function codeLocate($function_name) {
-    // Get implementations in the .install files as well.
-    include_once './core/includes/install.inc';
-    drupal_load_updates();
-
-    if (strpos($function_name, '::') === FALSE) {
-      if (!function_exists($function_name)) {
-        throw new \Exception(dt('Function not found'));
-      }
-      $reflect = new \ReflectionFunction($function_name);
-    }
-    else {
-      list($class, $method) = explode('::', $function_name);
-      if (!method_exists($class, $method)) {
-        throw new \Exception(dt('Method not found'));
-      }
-      $reflect = new \ReflectionMethod($class, $method);
-    }
-    return array('file' => $reflect->getFileName(), 'startline' => $reflect->getStartLine(), 'endline' => $reflect->getEndLine());
-
-  }
-
-  /**
-   * Get a list of available container services.
-   *
-   * @command devel:services
-   * @param $prefix A prefix to filter the service list by.
-   * @aliases devel-container-services,dcs,devel-services
-   * @usage drush devel-services
-   *   Gets a list of all available container services
-   * @usage drush dcs plugin.manager
-   *   Get all services containing "plugin.manager"
-   *
-   * @return array
-   */
-  public function services($prefix = NULL, $options = ['format' => 'yaml']) {
-    $container = $this->getContainer();
-
-    // Get a list of all available service IDs.
-    $services = $container->getServiceIds();
-
-    // If there is a prefix, try to find matches.
-    if (isset($prefix)) {
-      $services = preg_grep("/$prefix/", $services);
-    }
-
-    if (empty($services)) {
-      throw new \Exception(dt('No container services found.'));
-    }
-
-    sort($services);
-    return $services;
-  }
-}
\ No newline at end of file
diff --git a/modules/devel/src/Controller/ContainerInfoController.php b/modules/devel/src/Controller/ContainerInfoController.php
deleted file mode 100644
index eba5e2c..0000000
--- a/modules/devel/src/Controller/ContainerInfoController.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-
-namespace Drupal\devel\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\DrupalKernelInterface;
-use Drupal\Core\Url;
-use Drupal\devel\DevelDumperManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Provides route responses for the container info pages.
- */
-class ContainerInfoController extends ControllerBase implements ContainerAwareInterface {
-
-  use ContainerAwareTrait;
-
-  /**
-   * The drupal kernel.
-   *
-   * @var \Drupal\Core\DrupalKernelInterface
-   */
-  protected $kernel;
-
-  /**
-   * The dumper manager service.
-   *
-   * @var \Drupal\devel\DevelDumperManagerInterface
-   */
-  protected $dumper;
-
-  /**
-   * ServiceInfoController constructor.
-   *
-   * @param \Drupal\Core\DrupalKernelInterface $drupalKernel
-   *   The drupal kernel.
-   * @param \Drupal\devel\DevelDumperManagerInterface $dumper
-   *   The dumper manager service.
-   */
-  public function __construct(DrupalKernelInterface $drupalKernel, DevelDumperManagerInterface $dumper) {
-    $this->kernel = $drupalKernel;
-    $this->dumper = $dumper;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('kernel'),
-      $container->get('devel.dumper')
-    );
-  }
-
-  /**
-   * Builds the services overview page.
-   *
-   * @return array
-   *   A render array as expected by the renderer.
-   */
-  public function serviceList() {
-    $headers = [
-      $this->t('ID'),
-      $this->t('Class'),
-      $this->t('Alias'),
-      $this->t('Operations'),
-    ];
-
-    $rows = [];
-
-    if ($container = $this->kernel->getCachedContainerDefinition()) {
-      foreach ($container['services'] as $service_id => $definition) {
-        $service = unserialize($definition);
-
-        $row['id'] = [
-          'data' => $service_id,
-          'class' => 'table-filter-text-source',
-        ];
-        $row['class'] = [
-          'data' => isset($service['class']) ? $service['class'] : '',
-          'class' => 'table-filter-text-source',
-        ];
-        $row['alias'] = [
-          'data' => array_search($service_id, $container['aliases']) ?: '',
-          'class' => 'table-filter-text-source',
-        ];
-        $row['operations']['data'] = [
-          '#type' => 'operations',
-          '#links' => [
-            'devel' => [
-              'title' => $this->t('Devel'),
-              'url' => Url::fromRoute('devel.container_info.service.detail', ['service_id' => $service_id]),
-            ],
-          ],
-        ];
-
-        $rows[$service_id] = $row;
-      }
-
-      ksort($rows);
-    }
-
-    $output['#attached']['library'][] = 'system/drupal.system.modules';
-
-    $output['filters'] = [
-      '#type' => 'container',
-      '#attributes' => [
-        'class' => ['table-filter', 'js-show'],
-      ],
-    ];
-    $output['filters']['text'] = [
-      '#type' => 'search',
-      '#title' => $this->t('Search'),
-      '#size' => 30,
-      '#placeholder' => $this->t('Enter service id, alias or class'),
-      '#attributes' => [
-        'class' => ['table-filter-text'],
-        'data-table' => '.devel-filter-text',
-        'autocomplete' => 'off',
-        'title' => $this->t('Enter a part of the service id, service alias or class to filter by.'),
-      ],
-    ];
-    $output['services'] = [
-      '#type' => 'table',
-      '#header' => $headers,
-      '#rows' => $rows,
-      '#empty' => $this->t('No services found.'),
-      '#sticky' => TRUE,
-      '#attributes' => [
-        'class' => ['devel-service-list', 'devel-filter-text'],
-      ],
-    ];
-
-    return $output;
-  }
-
-  /**
-   * Returns a render array representation of the service.
-   *
-   * @param string $service_id
-   *   The ID of the service to retrieve.
-   *
-   * @return array
-   *   A render array containing the service detail.
-   *
-   * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-   *   If the requested service is not defined.
-   */
-  public function serviceDetail($service_id) {
-    $instance = $this->container->get($service_id, ContainerInterface::NULL_ON_INVALID_REFERENCE);
-    if ($instance === NULL) {
-      throw new NotFoundHttpException();
-    }
-
-    $output = [];
-
-    if ($cached_definitions = $this->kernel->getCachedContainerDefinition()) {
-      // Tries to retrieve the service definition from the kernel's cached
-      // container definition.
-      if (isset($cached_definitions['services'][$service_id])) {
-        $definition = unserialize($cached_definitions['services'][$service_id]);
-
-        // If the service has an alias add it to the definition.
-        if ($alias = array_search($service_id, $cached_definitions['aliases'])) {
-          $definition['alias'] = $alias;
-        }
-
-        $output['definition'] = $this->dumper->exportAsRenderable($definition, $this->t('Computed Definition'));
-      }
-    }
-
-    $output['instance'] = $this->dumper->exportAsRenderable($instance, $this->t('Instance'));
-
-    return $output;
-  }
-
-  /**
-   * Builds the parameters overview page.
-   *
-   * @return array
-   *   A render array as expected by the renderer.
-   */
-  public function parameterList() {
-    $headers = [
-      $this->t('Name'),
-      $this->t('Operations'),
-    ];
-
-    $rows = [];
-
-    if ($container = $this->kernel->getCachedContainerDefinition()) {
-      foreach ($container['parameters'] as $parameter_name => $definition) {
-        $row['name'] = [
-          'data' => $parameter_name,
-          'class' => 'table-filter-text-source',
-        ];
-        $row['operations']['data'] = [
-          '#type' => 'operations',
-          '#links' => [
-            'devel' => [
-              'title' => $this->t('Devel'),
-              'url' => Url::fromRoute('devel.container_info.parameter.detail', ['parameter_name' => $parameter_name]),
-            ],
-          ],
-        ];
-
-        $rows[$parameter_name] = $row;
-      }
-
-      ksort($rows);
-    }
-
-    $output['#attached']['library'][] = 'system/drupal.system.modules';
-
-    $output['filters'] = [
-      '#type' => 'container',
-      '#attributes' => [
-        'class' => ['table-filter', 'js-show'],
-      ],
-    ];
-    $output['filters']['text'] = [
-      '#type' => 'search',
-      '#title' => $this->t('Search'),
-      '#size' => 30,
-      '#placeholder' => $this->t('Enter parameter name'),
-      '#attributes' => [
-        'class' => ['table-filter-text'],
-        'data-table' => '.devel-filter-text',
-        'autocomplete' => 'off',
-        'title' => $this->t('Enter a part of the parameter name to filter by.'),
-      ],
-    ];
-    $output['parameters'] = [
-      '#type' => 'table',
-      '#header' => $headers,
-      '#rows' => $rows,
-      '#empty' => $this->t('No parameters found.'),
-      '#sticky' => TRUE,
-      '#attributes' => [
-        'class' => ['devel-parameter-list', 'devel-filter-text'],
-      ],
-    ];
-
-    return $output;
-  }
-
-  /**
-   * Returns a render array representation of the parameter value.
-   *
-   * @param string $parameter_name
-   *   The name of the parameter to retrieve.
-   *
-   * @return array
-   *   A render array containing the parameter value.
-   *
-   * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-   *   If the requested parameter is not defined.
-   */
-  public function parameterDetail($parameter_name) {
-    try {
-      $parameter = $this->container->getParameter($parameter_name);
-    }
-    catch (ParameterNotFoundException $e) {
-      throw new NotFoundHttpException();
-    }
-
-    return $this->dumper->exportAsRenderable($parameter);
-  }
-
-}
diff --git a/modules/devel/src/Controller/DevelController.php b/modules/devel/src/Controller/DevelController.php
deleted file mode 100644
index 2c3a7b4..0000000
--- a/modules/devel/src/Controller/DevelController.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-namespace Drupal\devel\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Url;
-use Drupal\devel\DevelDumperManagerInterface;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Returns responses for devel module routes.
- */
-class DevelController extends ControllerBase {
-
-  /**
-   * The dumper service.
-   *
-   * @var \Drupal\devel\DevelDumperManagerInterface
-   */
-  protected $dumper;
-
-  /**
-   * EntityDebugController constructor.
-   *
-   * @param \Drupal\devel\DevelDumperManagerInterface $dumper
-   *   The dumper service.
-   */
-  public function __construct(DevelDumperManagerInterface $dumper) {
-    $this->dumper = $dumper;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('devel.dumper'));
-  }
-
-  /**
-   * Clears all caches, then redirects to the previous page.
-   */
-  public function cacheClear() {
-    drupal_flush_all_caches();
-    drupal_set_message('Cache cleared.');
-    return $this->redirect('<front>');
-  }
-
-  public function themeRegistry() {
-    $hooks = theme_get_registry();
-    ksort($hooks);
-    return $this->dumper->exportAsRenderable($hooks);
-  }
-
-  /**
-   * Builds the fields info overview page.
-   *
-   * @return array
-   *   Array of page elements to render.
-   */
-  public function fieldInfoPage() {
-    $fields = FieldStorageConfig::loadMultiple();
-    ksort($fields);
-    $output['fields'] = $this->dumper->exportAsRenderable($fields, $this->t('Fields'));
-
-    $field_instances = FieldConfig::loadMultiple();
-    ksort($field_instances);
-    $output['instances'] = $this->dumper->exportAsRenderable($field_instances, $this->t('Instances'));
-
-    $bundles = \Drupal::service('entity_type.bundle.info')->getAllBundleInfo();
-    ksort($bundles);
-    $output['bundles'] = $this->dumper->exportAsRenderable($bundles, $this->t('Bundles'));
-
-    $field_types = \Drupal::service('plugin.manager.field.field_type')->getUiDefinitions();
-    ksort($field_types);
-    $output['field_types'] = $this->dumper->exportAsRenderable($field_types, $this->t('Field types'));
-
-    $formatter_types = \Drupal::service('plugin.manager.field.formatter')->getDefinitions();
-    ksort($formatter_types);
-    $output['formatter_types'] = $this->dumper->exportAsRenderable($formatter_types, $this->t('Formatter types'));
-
-    $widget_types = \Drupal::service('plugin.manager.field.widget')->getDefinitions();
-    ksort($widget_types);
-    $output['widget_types'] = $this->dumper->exportAsRenderable($widget_types, $this->t('Widget types'));
-
-    return $output;
-  }
-
-  /**
-   * Builds the state variable overview page.
-   *
-   * @return array
-   *   Array of page elements to render.
-   */
-  public function stateSystemPage() {
-    $output['#attached']['library'][] = 'system/drupal.system.modules';
-
-    $output['filters'] = array(
-      '#type' => 'container',
-      '#attributes' => array(
-        'class' => array('table-filter', 'js-show'),
-      ),
-    );
-
-    $output['filters']['text'] = array(
-      '#type' => 'search',
-      '#title' => $this->t('Search'),
-      '#size' => 30,
-      '#placeholder' => $this->t('Enter state name'),
-      '#attributes' => array(
-        'class' => array('table-filter-text'),
-        'data-table' => '.devel-state-list',
-        'autocomplete' => 'off',
-        'title' => $this->t('Enter a part of the state name to filter by.'),
-      ),
-    );
-
-    $can_edit = $this->currentUser()->hasPermission('administer site configuration');
-
-    $header = array(
-      'name' => $this->t('Name'),
-      'value' => $this->t('Value'),
-    );
-
-    if ($can_edit) {
-      $header['edit'] = $this->t('Operations');
-    }
-
-    $rows = array();
-    // State class doesn't have getAll method so we get all states from the
-    // KeyValueStorage.
-    foreach ($this->keyValue('state')->getAll() as $state_name => $state) {
-      $rows[$state_name] = array(
-        'name' => array(
-          'data' => $state_name,
-          'class' => 'table-filter-text-source',
-        ),
-        'value' => array(
-          'data' => $this->dumper->export($state),
-        ),
-      );
-
-      if ($can_edit) {
-        $operations['edit'] = array(
-          'title' => $this->t('Edit'),
-          'url' => Url::fromRoute('devel.system_state_edit', array('state_name' => $state_name)),
-        );
-        $rows[$state_name]['edit'] = array(
-          'data' => array('#type' => 'operations', '#links' => $operations),
-        );
-      }
-    }
-
-    $output['states'] = array(
-      '#type' => 'table',
-      '#header' => $header,
-      '#rows' => $rows,
-      '#empty' => $this->t('No state variables found.'),
-      '#attributes' => array(
-        'class' => array('devel-state-list'),
-      ),
-    );
-
-    return $output;
-  }
-
-  /**
-   * Builds the session overview page.
-   *
-   * @return array
-   *   Array of page elements to render.
-   */
-  public function session() {
-    $output['description'] = array(
-      '#markup' => '<p>' . $this->t('Here are the contents of your $_SESSION variable.') . '</p>',
-    );
-    $output['session'] = array(
-      '#type' => 'table',
-      '#header' => array($this->t('Session name'), $this->t('Session ID')),
-      '#rows' => array(array(session_name(), session_id())),
-      '#empty' => $this->t('No session available.'),
-    );
-    $output['data'] = $this->dumper->exportAsRenderable($_SESSION);
-
-    return $output;
-  }
-
-}
diff --git a/modules/devel/src/Controller/ElementInfoController.php b/modules/devel/src/Controller/ElementInfoController.php
deleted file mode 100644
index a0440c3..0000000
--- a/modules/devel/src/Controller/ElementInfoController.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-namespace Drupal\devel\Controller;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Render\ElementInfoManagerInterface;
-use Drupal\Core\Url;
-use Drupal\devel\DevelDumperManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Provides route responses for the element info page.
- */
-class ElementInfoController extends ControllerBase {
-
-  /**
-   * Element info manager service.
-   *
-   * @var \Drupal\Core\Render\ElementInfoManagerInterface
-   */
-  protected $elementInfo;
-
-  /**
-   * The dumper service.
-   *
-   * @var \Drupal\devel\DevelDumperManagerInterface
-   */
-  protected $dumper;
-
-  /**
-   * EventInfoController constructor.
-   *
-   * @param \Drupal\Core\Render\ElementInfoManagerInterface $element_info
-   *   Element info manager service.
-   * @param \Drupal\devel\DevelDumperManagerInterface $dumper
-   *   The dumper service.
-   */
-  public function __construct(ElementInfoManagerInterface $element_info, DevelDumperManagerInterface $dumper) {
-    $this->elementInfo = $element_info;
-    $this->dumper = $dumper;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('element_info'),
-      $container->get('devel.dumper')
-    );
-  }
-
-  /**
-   * Builds the element overview page.
-   *
-   * @return array
-   *   A render array as expected by the renderer.
-   */
-  public function elementList() {
-    $headers = [
-      $this->t('Name'),
-      $this->t('Provider'),
-      $this->t('Class'),
-      $this->t('Operations'),
-    ];
-
-    $rows = [];
-
-    foreach ($this->elementInfo->getDefinitions() as $element_type => $definition) {
-      $row['name'] = [
-        'data' => $element_type,
-        'class' => 'table-filter-text-source',
-      ];
-      $row['provider'] = [
-        'data' => $definition['provider'],
-        'class' => 'table-filter-text-source',
-      ];
-      $row['class'] = [
-        'data' => $definition['class'],
-        'class' => 'table-filter-text-source',
-      ];
-      $row['operations']['data'] = [
-        '#type' => 'operations',
-        '#links' => [
-          'devel' => [
-            'title' => $this->t('Devel'),
-            'url' => Url::fromRoute('devel.elements_page.detail', ['element_name' => $element_type]),
-            'attributes' => [
-              'class' => ['use-ajax'],
-              'data-dialog-type' => 'modal',
-              'data-dialog-options' => Json::encode([
-                'width' => 700,
-                'minHeight' => 500,
-              ]),
-            ],
-          ],
-        ],
-      ];
-
-      $rows[$element_type] = $row;
-    }
-
-    ksort($rows);
-
-    $output['#attached']['library'][] = 'system/drupal.system.modules';
-
-    $output['filters'] = [
-      '#type' => 'container',
-      '#attributes' => [
-        'class' => ['table-filter', 'js-show'],
-      ],
-    ];
-    $output['filters']['text'] = [
-      '#type' => 'search',
-      '#title' => $this->t('Search'),
-      '#size' => 30,
-      '#placeholder' => $this->t('Enter element id, provider or class'),
-      '#attributes' => [
-        'class' => ['table-filter-text'],
-        'data-table' => '.devel-filter-text',
-        'autocomplete' => 'off',
-        'title' => $this->t('Enter a part of the element id, provider or class to filter by.'),
-      ],
-    ];
-    $output['elements'] = [
-      '#type' => 'table',
-      '#header' => $headers,
-      '#rows' => $rows,
-      '#empty' => $this->t('No elements found.'),
-      '#sticky' => TRUE,
-      '#attributes' => [
-        'class' => ['devel-element-list', 'devel-filter-text'],
-      ],
-    ];
-
-    return $output;
-  }
-
-  /**
-   * Returns a render array representation of the element.
-   *
-   * @param string $element_name
-   *   The name of the element to retrieve.
-   *
-   * @return array
-   *   A render array containing the element.
-   *
-   * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-   *   If the requested element is not defined.
-   */
-  public function elementDetail($element_name) {
-    if (!$element = $this->elementInfo->getDefinition($element_name, FALSE)) {
-      throw new NotFoundHttpException();
-    }
-
-    $element += $this->elementInfo->getInfo($element_name);
-    return $this->dumper->exportAsRenderable($element, $element_name);
-  }
-
-}
diff --git a/modules/devel/src/Controller/EntityDebugController.php b/modules/devel/src/Controller/EntityDebugController.php
deleted file mode 100644
index 515a9fc..0000000
--- a/modules/devel/src/Controller/EntityDebugController.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-namespace Drupal\devel\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\devel\DevelDumperManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Controller for devel entity debug.
- *
- * @see \Drupal\devel\Routing\RouteSubscriber
- * @see \Drupal\devel\Plugin\Derivative\DevelLocalTask
- */
-class EntityDebugController extends ControllerBase {
-
-  /**
-   * The dumper service.
-   *
-   * @var \Drupal\devel\DevelDumperManagerInterface
-   */
-  protected $dumper;
-
-  /**
-   * EntityDebugController constructor.
-   *
-   * @param \Drupal\devel\DevelDumperManagerInterface $dumper
-   *   The dumper service.
-   */
-  public function __construct(DevelDumperManagerInterface $dumper) {
-    $this->dumper = $dumper;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('devel.dumper'));
-  }
-
-  /**
-   * Returns the entity type definition of the current entity.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *    A RouteMatch object.
-   *
-   * @return array
-   *    Array of page elements to render.
-   */
-  public function entityTypeDefinition(RouteMatchInterface $route_match) {
-    $output = [];
-
-    $entity = $this->getEntityFromRouteMatch($route_match);
-
-    if ($entity instanceof EntityInterface) {
-      $output = $this->dumper->exportAsRenderable($entity->getEntityType());
-    }
-
-    return $output;
-  }
-
-  /**
-   * Returns the loaded structure of the current entity.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *    A RouteMatch object.
-   *
-   * @return array
-   *    Array of page elements to render.
-   */
-  public function entityLoad(RouteMatchInterface $route_match) {
-    $output = [];
-
-    $entity = $this->getEntityFromRouteMatch($route_match);
-
-    if ($entity instanceof EntityInterface) {
-      // Field definitions are lazy loaded and are populated only when needed.
-      // By calling ::getFieldDefinitions() we are sure that field definitions
-      // are populated and available in the dump output.
-      // @see https://www.drupal.org/node/2311557
-      if($entity instanceof FieldableEntityInterface) {
-        $entity->getFieldDefinitions();
-      }
-
-      $output = $this->dumper->exportAsRenderable($entity);
-    }
-
-    return $output;
-  }
-
-  /**
-   * Returns the render structure of the current entity.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *    A RouteMatch object.
-   *
-   * @return array
-   *    Array of page elements to render.
-   */
-  public function entityRender(RouteMatchInterface $route_match) {
-    $output = [];
-
-    $entity = $this->getEntityFromRouteMatch($route_match);
-
-    if ($entity instanceof EntityInterface) {
-      $entity_type_id = $entity->getEntityTypeId();
-      $view_hook = $entity_type_id . '_view';
-
-      $build = [];
-      // If module implements own {entity_type}_view() hook use it, otherwise
-      // fallback to the entity view builder if available.
-      if (function_exists($view_hook)) {
-        $build = $view_hook($entity);
-      }
-      elseif ($this->entityTypeManager()->hasHandler($entity_type_id, 'view_builder')) {
-        $build = $this->entityTypeManager()->getViewBuilder($entity_type_id)->view($entity);
-      }
-
-      $output = $this->dumper->exportAsRenderable($build);
-    }
-
-    return $output;
-  }
-
-  /**
-   * Retrieves entity from route match.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *   The route match.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface|null
-   *   The entity object as determined from the passed-in route match.
-   */
-  protected function getEntityFromRouteMatch(RouteMatchInterface $route_match) {
-    $parameter_name = $route_match->getRouteObject()->getOption('_devel_entity_type_id');
-    $entity = $route_match->getParameter($parameter_name);
-    return $entity;
-  }
-
-}
diff --git a/modules/devel/src/Controller/EntityTypeInfoController.php b/modules/devel/src/Controller/EntityTypeInfoController.php
deleted file mode 100644
index f8bac6d..0000000
--- a/modules/devel/src/Controller/EntityTypeInfoController.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-namespace Drupal\devel\Controller;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Url;
-use Drupal\devel\DevelDumperManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Provides route responses for the entity types info page.
- */
-class EntityTypeInfoController extends ControllerBase {
-
-  /**
-   * The dumper service.
-   *
-   * @var \Drupal\devel\DevelDumperManagerInterface
-   */
-  protected $dumper;
-
-  /**
-   * EntityTypeInfoController constructor.
-   *
-   * @param \Drupal\devel\DevelDumperManagerInterface $dumper
-   *   The dumper service.
-   */
-  public function __construct(DevelDumperManagerInterface $dumper) {
-    $this->dumper = $dumper;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('devel.dumper')
-    );
-  }
-
-  /**
-   * Builds the entity types overview page.
-   *
-   * @return array
-   *   A render array as expected by the renderer.
-   */
-  public function entityTypeList() {
-    $headers = [
-      $this->t('ID'),
-      $this->t('Name'),
-      $this->t('Provider'),
-      $this->t('Class'),
-      $this->t('Operations'),
-    ];
-
-    $rows = [];
-
-    foreach ($this->entityTypeManager()->getDefinitions() as $entity_type_id => $entity_type) {
-      $row['id'] = [
-        'data' => $entity_type->id(),
-        'class' => 'table-filter-text-source',
-      ];
-      $row['name'] = [
-        'data' => $entity_type->getLabel(),
-        'class' => 'table-filter-text-source',
-      ];
-      $row['provider'] = [
-        'data' => $entity_type->getProvider(),
-        'class' => 'table-filter-text-source',
-      ];
-      $row['class'] = [
-        'data' => $entity_type->getClass(),
-        'class' => 'table-filter-text-source',
-      ];
-      $row['operations']['data'] = [
-        '#type' => 'operations',
-        '#links' => [
-          'devel' => [
-            'title' => $this->t('Devel'),
-            'url' => Url::fromRoute('devel.entity_info_page.detail', ['entity_type_id' => $entity_type_id]),
-            'attributes' => [
-              'class' => ['use-ajax'],
-              'data-dialog-type' => 'modal',
-              'data-dialog-options' => Json::encode([
-                'width' => 700,
-                'minHeight' => 500,
-              ]),
-            ],
-          ],
-        ],
-      ];
-
-      $rows[$entity_type_id] = $row;
-    }
-
-    ksort($rows);
-
-    $output['#attached']['library'][] = 'system/drupal.system.modules';
-
-    $output['filters'] = [
-      '#type' => 'container',
-      '#attributes' => [
-        'class' => ['table-filter', 'js-show'],
-      ],
-    ];
-    $output['filters']['text'] = [
-      '#type' => 'search',
-      '#title' => $this->t('Search'),
-      '#size' => 30,
-      '#placeholder' => $this->t('Enter entity type id, provider or class'),
-      '#attributes' => [
-        'class' => ['table-filter-text'],
-        'data-table' => '.devel-filter-text',
-        'autocomplete' => 'off',
-        'title' => $this->t('Enter a part of the entity type id, provider or class to filter by.'),
-      ],
-    ];
-    $output['entities'] = [
-      '#type' => 'table',
-      '#header' => $headers,
-      '#rows' => $rows,
-      '#empty' => $this->t('No entity types found.'),
-      '#sticky' => TRUE,
-      '#attributes' => [
-        'class' => ['devel-entity-type-list', 'devel-filter-text'],
-      ],
-    ];
-
-    return $output;
-  }
-
-  /**
-   * Returns a render array representation of the entity type.
-   *
-   * @param string $entity_type_id
-   *   The name of the entity type to retrieve.
-   *
-   * @return array
-   *   A render array containing the entity type.
-   *
-   * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-   *   If the requested entity type is not defined.
-   */
-  public function entityTypeDetail($entity_type_id) {
-    if (!$entity_type = $this->entityTypeManager()->getDefinition($entity_type_id, FALSE)) {
-      throw new NotFoundHttpException();
-    }
-
-    return $this->dumper->exportAsRenderable($entity_type, $entity_type_id);
-  }
-
-}
diff --git a/modules/devel/src/Controller/EventInfoController.php b/modules/devel/src/Controller/EventInfoController.php
deleted file mode 100644
index e8ea0cd..0000000
--- a/modules/devel/src/Controller/EventInfoController.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-namespace Drupal\devel\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * Provides route responses for the event info page.
- */
-class EventInfoController extends ControllerBase {
-
-  /**
-   * Event dispatcher service.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-   */
-  protected $eventDispatcher;
-
-  /**
-   * EventInfoController constructor.
-   *
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
-   *   Event dispatcher service.
-   */
-  public function __construct(EventDispatcherInterface $event_dispatcher) {
-    $this->eventDispatcher = $event_dispatcher;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('event_dispatcher')
-    );
-  }
-
-  /**
-   * Builds the events overview page.
-   *
-   * @return array
-   *   A render array as expected by the renderer.
-   */
-  public function eventList() {
-    $headers = [
-      'name' => [
-        'data' => $this->t('Event Name'),
-        'class' => 'visually-hidden',
-      ],
-      'callable' => $this->t('Callable'),
-      'priority' => $this->t('Priority'),
-    ];
-
-    $event_listeners = $this->eventDispatcher->getListeners();
-    ksort($event_listeners);
-
-    $rows = [];
-
-    foreach ($event_listeners as $event_name => $listeners) {
-
-      $rows[][] = [
-        'data' => $event_name,
-        'class' => 'table-filter-text-source devel-event-name-header',
-        'colspan' => '3',
-        'header' => TRUE,
-      ];
-
-      foreach ($listeners as $priority => $listener) {
-        $row['name'] = [
-          'data' => $event_name,
-          'class' => 'table-filter-text-source visually-hidden',
-        ];
-        $row['class'] = [
-          'data' => $this->resolveCallableName($listener),
-        ];
-        $row['priority'] = [
-          'data' => $priority,
-        ];
-        $rows[] = $row;
-      }
-    }
-
-    $output['#attached']['library'][] = 'system/drupal.system.modules';
-
-    $output['filters'] = [
-      '#type' => 'container',
-      '#attributes' => [
-        'class' => ['table-filter', 'js-show'],
-      ],
-    ];
-    $output['filters']['name'] = [
-      '#type' => 'search',
-      '#title' => $this->t('Search'),
-      '#size' => 30,
-      '#placeholder' => $this->t('Enter event name'),
-      '#attributes' => [
-        'class' => ['table-filter-text'],
-        'data-table' => '.devel-filter-text',
-        'autocomplete' => 'off',
-        'title' => $this->t('Enter a part of the event name to filter by.'),
-      ],
-    ];
-    $output['events'] = [
-      '#type' => 'table',
-      '#header' => $headers,
-      '#rows' => $rows,
-      '#empty' => $this->t('No events found.'),
-      '#attributes' => [
-        'class' => ['devel-event-list', 'devel-filter-text'],
-      ],
-    ];
-
-    return $output;
-  }
-
-  /**
-   * Helper function for resolve callable name.
-   *
-   * @param mixed $callable
-   *   The for which resolve the name. Can be either the name of a function
-   *   stored in a string variable, or an object and the name of a method
-   *   within the object.
-   *
-   * @return string
-   *   The resolved callable name or an empty string.
-   */
-  protected function resolveCallableName($callable) {
-    if (is_callable($callable, TRUE, $callable_name)) {
-      return $callable_name;
-    }
-    return '';
-  }
-
-}
diff --git a/modules/devel/src/Controller/LayoutInfoController.php b/modules/devel/src/Controller/LayoutInfoController.php
deleted file mode 100644
index 4a2cff2..0000000
--- a/modules/devel/src/Controller/LayoutInfoController.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Drupal\devel\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Layout\LayoutPluginManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Returns response for Layout Info route.
- */
-class LayoutInfoController extends ControllerBase {
-
-  /**
-   * The Layout Plugin Manager.
-   *
-   * @var Drupal\Core\Layout\LayoutPluginManagerInterface
-   */
-  protected $layoutPluginManager;
-
-  /**
-   * LayoutInfoController constructor.
-   *
-   * @param \Drupal\Core\Layout\LayoutPluginManagerInterface $pluginManagerLayout
-   *   The layout manager.
-   */
-  public function __construct(LayoutPluginManagerInterface $pluginManagerLayout) {
-    $this->layoutPluginManager = $pluginManagerLayout;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.core.layout')
-    );
-  }
-
-  /**
-   * Builds the Layout Info page.
-   *
-   * @return array
-   *   Array of page elements to render.
-   */
-  public function layoutInfoPage() {
-    $definedLayouts = [];
-    $layouts = $this->layoutPluginManager->getDefinitions();
-    foreach ($layouts as $layout) {
-      // @todo Revisit once https://www.drupal.org/node/2660124 gets in, getting
-      // the image should be as simple as $layout->getIcon().
-      $image = NULL;
-      if ($layout->getIconPath() != NULL) {
-        $image = [
-          'data' => [
-            '#theme' => 'image',
-            '#uri' => $layout->getIconPath(),
-            '#alt' => $layout->getLabel(),
-            '#height' => '65',
-          ]
-        ];
-      }
-      $definedLayouts[] = [
-        $image,
-        $layout->getLabel(),
-        $layout->getDescription(),
-        $layout->getCategory(),
-        implode(', ', $layout->getRegionLabels()),
-        $layout->getProvider(),
-      ];
-    }
-
-    return [
-      '#theme' => 'table',
-      '#header' => [
-        $this->t('Icon'),
-        $this->t('Label'),
-        $this->t('Description'),
-        $this->t('Category'),
-        $this->t('Regions'),
-        $this->t('Provider'),
-      ],
-      '#rows' => $definedLayouts,
-      '#empty' => $this->t('No layouts available.'),
-      '#attributes' => [
-        'class' => ['devel-layout-list'],
-      ],
-    ];
-  }
-
-}
diff --git a/modules/devel/src/Controller/RouteInfoController.php b/modules/devel/src/Controller/RouteInfoController.php
deleted file mode 100644
index 45c9f6d..0000000
--- a/modules/devel/src/Controller/RouteInfoController.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-
-namespace Drupal\devel\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Routing\RouteProviderInterface;
-use Drupal\Core\Url;
-use Drupal\devel\DevelDumperManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\RouterInterface;
-
-/**
- * Provides route responses for the route info pages.
- */
-class RouteInfoController extends ControllerBase {
-
-  /**
-   * The route provider.
-   *
-   * @var \Drupal\Core\Routing\RouteProviderInterface
-   */
-  protected $routeProvider;
-
-  /**
-   * The router service.
-   *
-   * @var \Symfony\Component\Routing\RouterInterface
-   */
-  protected $router;
-
-  /**
-   * The dumper service.
-   *
-   * @var \Drupal\devel\DevelDumperManagerInterface
-   */
-  protected $dumper;
-
-  /**
-   * RouterInfoController constructor.
-   *
-   * @param \Drupal\Core\Routing\RouteProviderInterface $provider
-   *   The route provider.
-   * @param \Symfony\Component\Routing\RouterInterface $router
-   *   The router service.
-   * @param \Drupal\devel\DevelDumperManagerInterface $dumper
-   *   The dumper service.
-   */
-  public function __construct(RouteProviderInterface $provider, RouterInterface $router, DevelDumperManagerInterface $dumper) {
-    $this->routeProvider = $provider;
-    $this->router = $router;
-    $this->dumper = $dumper;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('router.route_provider'),
-      $container->get('router.no_access_checks'),
-      $container->get('devel.dumper')
-    );
-  }
-
-  /**
-   * Builds the routes overview page.
-   *
-   * @return array
-   *   A render array as expected by the renderer.
-   */
-  public function routeList() {
-    $headers = [
-      $this->t('Route Name'),
-      $this->t('Path'),
-      $this->t('Allowed Methods'),
-      $this->t('Operations'),
-    ];
-
-    $rows = [];
-
-    foreach ($this->routeProvider->getAllRoutes() as $route_name => $route) {
-      $row['name'] = [
-        'data' => $route_name,
-        'class' => 'table-filter-text-source',
-      ];
-      $row['path'] = [
-        'data' => $route->getPath(),
-        'class' => 'table-filter-text-source',
-      ];
-      $row['methods']['data'] = [
-        '#theme' => 'item_list',
-        '#items' => $route->getMethods(),
-        '#empty' => $this->t('ANY'),
-        '#context' => ['list_style' => 'comma-list'],
-      ];
-
-      // We cannot resolve routes with dynamic parameters from route path. For
-      // these routes we pass the route name.
-      // @see ::routeItem()
-      if (strpos($route->getPath(), '{') !== FALSE) {
-        $parameters = ['query' => ['route_name' => $route_name]];
-      }
-      else {
-        $parameters = ['query' => ['path' => $route->getPath()]];
-      }
-
-      $row['operations']['data'] = [
-        '#type' => 'operations',
-        '#links' => [
-          'devel' => [
-            'title' => $this->t('Devel'),
-            'url' => Url::fromRoute('devel.route_info.item', [], $parameters),
-          ],
-        ],
-      ];
-
-      $rows[] = $row;
-    }
-
-    $output['#attached']['library'][] = 'system/drupal.system.modules';
-
-    $output['filters'] = [
-      '#type' => 'container',
-      '#attributes' => [
-        'class' => ['table-filter', 'js-show'],
-      ],
-    ];
-    $output['filters']['name'] = [
-      '#type' => 'search',
-      '#title' => $this->t('Search'),
-      '#size' => 30,
-      '#placeholder' => $this->t('Enter route name or path'),
-      '#attributes' => [
-        'class' => ['table-filter-text'],
-        'data-table' => '.devel-filter-text',
-        'autocomplete' => 'off',
-        'title' => $this->t('Enter a part of the route name or path to filter by.'),
-      ],
-    ];
-    $output['routes'] = [
-      '#type' => 'table',
-      '#header' => $headers,
-      '#rows' => $rows,
-      '#empty' => $this->t('No routes found.'),
-      '#sticky' => TRUE,
-      '#attributes' => [
-        'class' => ['devel-route-list', 'devel-filter-text'],
-      ],
-    ];
-
-    return $output;
-  }
-
-  /**
-   * Returns a render array representation of the route object.
-   *
-   * The method tries to resolve the route from the 'path' or the 'route_name'
-   * query string value if available. If no route is retrieved from the query
-   * string parameters it fallbacks to the current route.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request object.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *   The route match.
-   *
-   * @return array
-   *   A render array as expected by the renderer.
-   */
-  public function routeDetail(Request $request, RouteMatchInterface $route_match) {
-    $route = NULL;
-
-    // Get the route object from the path query string if available.
-    if ($path = $request->query->get('path')) {
-      try {
-        $route = $this->router->match($path);
-      }
-      catch (\Exception $e) {
-        drupal_set_message($this->t("Unable to load route for url '%url'", ['%url' => $path]), 'warning');
-      }
-    }
-
-    // Get the route object from the route name query string if available and
-    // the route is not retrieved by path.
-    if ($route === NULL && $route_name = $request->query->get('route_name')) {
-      try {
-        $route = $this->routeProvider->getRouteByName($route_name);
-      }
-      catch (\Exception $e) {
-        drupal_set_message($this->t("Unable to load route '%name'", ['%name' => $route_name]), 'warning');
-      }
-    }
-
-    // No route retrieved from path or name specified, get the current route.
-    if ($route === NULL) {
-      $route = $route_match->getRouteObject();
-    }
-
-    return $this->dumper->exportAsRenderable($route);
-  }
-
-}
diff --git a/modules/devel/src/Controller/SwitchUserController.php b/modules/devel/src/Controller/SwitchUserController.php
deleted file mode 100644
index e5da73c..0000000
--- a/modules/devel/src/Controller/SwitchUserController.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Drupal\devel\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Session\AccountProxyInterface;
-use Drupal\Core\Session\SessionManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-
-/**
- * Controller for switch to another user account.
- */
-class SwitchUserController extends ControllerBase {
-
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountProxyInterface
-   */
-  protected $account;
-
-  /**
-   * The user storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $userStorage;
-
-  /**
-   * The session manager service.
-   *
-   * @var \Drupal\Core\Session\SessionManagerInterface
-   */
-  protected $sessionManager;
-
-  /**
-   * The session.
-   *
-   * @var \Symfony\Component\HttpFoundation\Session\Session
-   */
-  protected $session;
-
-  /**
-   * Constructs a new SwitchUserController object
-   *
-   * @param \Drupal\Core\Session\AccountProxyInterface $account
-   *   The current user.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $user_storage
-   *   The user storage.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The user storage.
-   * @param \Drupal\Core\Session\SessionManagerInterface $session_manager
-   *   The session manager service.
-   * @param \Symfony\Component\HttpFoundation\Session\Session $session
-   *   The session.
-   */
-  public function __construct(AccountProxyInterface $account, EntityStorageInterface $user_storage, ModuleHandlerInterface $module_handler, SessionManagerInterface $session_manager, Session $session) {
-    $this->account = $account;
-    $this->userStorage = $user_storage;
-    $this->moduleHandler = $module_handler;
-    $this->sessionManager = $session_manager;
-    $this->session = $session;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('current_user'),
-      $container->get('entity.manager')->getStorage('user'),
-      $container->get('module_handler'),
-      $container->get('session_manager'),
-      $container->get('session')
-    );
-  }
-
-  /**
-   * Switches to a different user.
-   *
-   * We don't call session_save_session() because we really want to change users.
-   * Usually unsafe!
-   *
-   * @param string $name
-   *   The username to switch to, or NULL to log out.
-   *
-   * @return \Symfony\Component\HttpFoundation\RedirectResponse
-   *   A redirect response object.
-   *
-   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
-   */
-  public function switchUser($name = NULL) {
-    if (empty($name) || !($account = $this->userStorage->loadByProperties(['name' => $name]))) {
-      throw new AccessDeniedHttpException();
-    }
-    $account = reset($account);
-
-    // Call logout hooks when switching from original user.
-    $this->moduleHandler->invokeAll('user_logout', [$this->account]);
-
-    // Regenerate the session ID to prevent against session fixation attacks.
-    $this->sessionManager->regenerate();
-
-    // Based off masquarade module as:
-    // https://www.drupal.org/node/218104 doesn't stick and instead only
-    // keeps context until redirect.
-    $this->account->setAccount($account);
-    $this->session->set('uid', $account->id());
-
-    // Call all login hooks when switching to masquerading user.
-    $this->moduleHandler->invokeAll('user_login', [$account]);
-
-    return $this->redirect('<front>');
-  }
-
-}
diff --git a/modules/devel/src/DevelDumperBase.php b/modules/devel/src/DevelDumperBase.php
deleted file mode 100644
index 5cfe70d..0000000
--- a/modules/devel/src/DevelDumperBase.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Drupal\devel;
-
-use Drupal\Core\Plugin\PluginBase;
-use Drupal\devel\Render\FilteredMarkup;
-
-/**
- * Defines a base devel dumper implementation.
- *
- * @see \Drupal\devel\Annotation\DevelDumper
- * @see \Drupal\devel\DevelDumperInterface
- * @see \Drupal\devel\DevelDumperPluginManager
- * @see plugin_api
- */
-abstract class DevelDumperBase extends PluginBase implements DevelDumperInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function dump($input, $name = NULL) {
-    echo (string) $this->export($input, $name);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function exportAsRenderable($input, $name = NULL) {
-    return ['#markup' => $this->export($input, $name)];
-  }
-
-  /**
-   * Wrapper for \Drupal\Core\Render\Markup::create().
-   *
-   * @param string $input
-   *   The input string to mark as safe.
-   *
-   * @return string
-   *   The unaltered input value.
-   */
-  protected function setSafeMarkup($input) {
-    return FilteredMarkup::create($input);
-  }
-
-}
diff --git a/modules/devel/src/DevelDumperInterface.php b/modules/devel/src/DevelDumperInterface.php
deleted file mode 100644
index 1236dd0..0000000
--- a/modules/devel/src/DevelDumperInterface.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Drupal\devel;
-
-/**
- * Base interface definition for DevelDumper plugins.
- *
- * @see \Drupal\devel\Annotation\DevelDumper
- * @see \Drupal\devel\DevelDumperPluginManager
- * @see \Drupal\devel\DevelDumperBase
- * @see plugin_api
- */
-interface DevelDumperInterface {
-
-  /**
-   * Dumps information about a variable.
-   *
-   * @param mixed $input
-   *   The variable to dump.
-   * @param string $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   */
-  public function dump($input, $name = NULL);
-
-  /**
-   * Returns a string representation of a variable.
-   *
-   * @param mixed $input
-   *   The variable to export.
-   * @param string $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   *
-   * @return string
-   *   String representation of a variable.
-   */
-  public function export($input, $name = NULL);
-
-  /**
-   * Returns a string representation of a variable wrapped in a render array.
-   *
-   * @param mixed $input
-   *   The variable to export.
-   * @param string $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   *
-   * @return array
-   *   String representation of a variable wrapped in a render array.
-   */
-  public function exportAsRenderable($input, $name = NULL);
-
-  /**
-   * Checks if requirements for this plugin are satisfied.
-   *
-   * @return bool
-   *   TRUE is requirements are satisfied, FALSE otherwise.
-   */
-  public static function checkRequirements();
-
-}
diff --git a/modules/devel/src/DevelDumperManager.php b/modules/devel/src/DevelDumperManager.php
deleted file mode 100644
index b88957e..0000000
--- a/modules/devel/src/DevelDumperManager.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-namespace Drupal\devel;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Session\AccountProxyInterface;
-
-/**
- * Class DevelDumperManager
- */
-class DevelDumperManager implements DevelDumperManagerInterface {
-
-  /**
-   * The devel config.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $config;
-
-  /**
-   * The current account.
-   *
-   * @var \Drupal\Core\Session\AccountProxyInterface
-   */
-  protected $account;
-
-  /**
-   * The devel dumper plugin manager.
-   *
-   * @var \Drupal\devel\DevelDumperPluginManagerInterface
-   */
-  protected $dumperManager;
-
-  /**
-   * Constructs a DevelDumperPluginManager object.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory service.
-   * @param \Drupal\Core\Session\AccountProxyInterface $account
-   *   The current account.
-   * @param \Drupal\devel\DevelDumperPluginManagerInterface $dumper_manager
-   *   The devel dumper plugin manager.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, AccountProxyInterface $account, DevelDumperPluginManagerInterface $dumper_manager) {
-    $this->config = $config_factory->get('devel.settings');
-    $this->account = $account;
-    $this->dumperManager = $dumper_manager;
-  }
-
-  /**
-   * Instances a new dumper plugin.
-   *
-   * @param string $plugin_id
-   *   (optional) The plugin ID, defaults to NULL.
-   *
-   * @return \Drupal\devel\DevelDumperInterface
-   *   Returns the devel dumper plugin instance.
-   */
-  protected function createInstance($plugin_id = NULL) {
-    if (!$plugin_id || !$this->dumperManager->isPluginSupported($plugin_id)) {
-      $plugin_id = $this->config->get('devel_dumper');
-    }
-    return $this->dumperManager->createInstance($plugin_id);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function dump($input, $name = NULL, $plugin_id = NULL) {
-    if ($this->hasAccessToDevelInformation()) {
-      $this->createInstance($plugin_id)->dump($input, $name);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function export($input, $name = NULL, $plugin_id = NULL) {
-    if ($this->hasAccessToDevelInformation()) {
-      return $this->createInstance($plugin_id)->export($input, $name);
-    }
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function message($input, $name = NULL, $type = 'status', $plugin_id = NULL) {
-    if ($this->hasAccessToDevelInformation()) {
-      $output = $this->export($input, $name, $plugin_id);
-      drupal_set_message($output, $type, TRUE);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function debug($input, $name = NULL, $plugin_id = NULL) {
-    $output = $this->createInstance($plugin_id)->export($input, $name) . "\n";
-    // The temp directory does vary across multiple simpletest instances.
-    $file = file_directory_temp() . '/drupal_debug.txt';
-    if (file_put_contents($file, $output, FILE_APPEND) === FALSE && $this->hasAccessToDevelInformation()) {
-      drupal_set_message(t('Devel was unable to write to %file.', ['%file' => $file]), 'error');
-      return FALSE;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function dumpOrExport($input, $name = NULL, $export = TRUE, $plugin_id = NULL) {
-    if ($this->hasAccessToDevelInformation()) {
-      $dumper = $this->createInstance($plugin_id);
-      if ($export) {
-        return $dumper->export($input, $name);
-      }
-      $dumper->dump($input, $name);
-    }
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function exportAsRenderable($input, $name = NULL, $plugin_id = NULL) {
-    if ($this->hasAccessToDevelInformation()) {
-      return $this->createInstance($plugin_id)->exportAsRenderable($input, $name);
-    }
-    return [];
-  }
-
-  /**
-   * Checks whether a user has access to devel information.
-   *
-   * @return bool
-   *   TRUE if the user has the permission, FALSE otherwise.
-   */
-  protected function hasAccessToDevelInformation() {
-    return $this->account && $this->account->hasPermission('access devel information');
-  }
-
-}
diff --git a/modules/devel/src/DevelDumperManagerInterface.php b/modules/devel/src/DevelDumperManagerInterface.php
deleted file mode 100644
index 71ac6c5..0000000
--- a/modules/devel/src/DevelDumperManagerInterface.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Drupal\devel;
-
-/**
- * Interface DevelDumperManagerInterface
- */
-interface DevelDumperManagerInterface {
-
-  /**
-   * Dumps information about a variable.
-   *
-   * @param mixed $input
-   *   The variable to dump.
-   * @param string $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   * @param string $plugin_id
-   *   (optional) The plugin ID, defaults to NULL.
-   */
-  public function dump($input, $name = NULL, $plugin_id = NULL);
-
-  /**
-   * Returns a string representation of a variable.
-   *
-   * @param mixed $input
-   *   The variable to dump.
-   * @param string $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   * @param string $plugin_id
-   *   (optional) The plugin ID, defaults to NULL.
-   *
-   * @return string
-   *   String representation of a variable.
-   */
-  public function export($input, $name = NULL, $plugin_id = NULL);
-
-  /**
-   * Sets a message with a string representation of a variable.
-   *
-   * @param mixed $input
-   *   The variable to dump.
-   * @param string $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   * @param string $type
-   *   (optional) The message's type. Defaults to 'status'.
-   * @param string $plugin_id
-   *   (optional) The plugin ID, defaults to NULL.
-   */
-  public function message($input, $name = NULL, $type = 'status', $plugin_id = NULL);
-
-  /**
-   * Logs a variable to a drupal_debug.txt in the site's temp directory.
-   *
-   * @param mixed $input
-   *   The variable to log to the drupal_debug.txt log file.
-   * @param string $name
-   *   (optional) If set, a label to output before $data in the log file.
-   * @param string $plugin_id
-   *   (optional) The plugin ID, defaults to NULL.
-   *
-   * @return void|false
-   *   Empty if successful, FALSE if the log file could not be written.
-   *
-   * @see dd()
-   * @see http://drupal.org/node/314112
-   */
-  public function debug($input, $name = NULL, $plugin_id = NULL);
-
-  /**
-   * Wrapper for ::dump() and ::export().
-   *
-   * @param mixed $input
-   *   The variable to dump.
-   * @param string $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   * @param bool $export
-   *   (optional) Whether return string representation of a variable.
-   * @param string $plugin_id
-   *   (optional) The plugin ID, defaults to NULL.
-   *
-   * @return string|null
-   *   String representation of a variable if $export is set to TRUE,
-   *   NULL otherwise.
-   */
-  public function dumpOrExport($input, $name = NULL, $export = TRUE, $plugin_id = NULL);
-
-  /**
-   * Returns a render array representation of a variable.
-   *
-   * @param mixed $input
-   *   The variable to export.
-   * @param string $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   * @param string $plugin_id
-   *   (optional) The plugin ID, defaults to NULL.
-   *
-   * @return array
-   *   String representation of a variable wrapped in a render array.
-   */
-  public function exportAsRenderable($input, $name = NULL, $plugin_id = NULL);
-
-}
diff --git a/modules/devel/src/DevelDumperPluginManager.php b/modules/devel/src/DevelDumperPluginManager.php
deleted file mode 100644
index 97ac38e..0000000
--- a/modules/devel/src/DevelDumperPluginManager.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\devel;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\devel\Annotation\DevelDumper;
-
-/**
- * Plugin type manager for Devel Dumper plugins.
- *
- * @see \Drupal\devel\Annotation\DevelDumper
- * @see \Drupal\devel\DevelDumperInterface
- * @see \Drupal\devel\DevelDumperBase
- * @see plugin_api
- */
-class DevelDumperPluginManager extends DefaultPluginManager implements DevelDumperPluginManagerInterface {
-
-  /**
-   * Constructs a DevelDumperPluginManager object.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   Cache backend instance to use.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler to invoke the alter hook with.
-   */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    parent::__construct('Plugin/Devel/Dumper', $namespaces, $module_handler, DevelDumperInterface::class, DevelDumper::class);
-    $this->setCacheBackend($cache_backend, 'devel_dumper_plugins');
-    $this->alterInfo('devel_dumper_info');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processDefinition(&$definition, $plugin_id) {
-    parent::processDefinition($definition, $plugin_id);
-
-    $definition['supported'] = (bool) call_user_func([$definition['class'], 'checkRequirements']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isPluginSupported($plugin_id) {
-    $definition = $this->getDefinition($plugin_id, FALSE);
-    return $definition && $definition['supported'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createInstance($plugin_id, array $configuration = []) {
-    if (!$this->isPluginSupported($plugin_id)) {
-      $plugin_id = $this->getFallbackPluginId($plugin_id);
-    }
-    return parent::createInstance($plugin_id, $configuration);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFallbackPluginId($plugin_id, array $configuration = []) {
-    return 'default';
-  }
-
-}
diff --git a/modules/devel/src/DevelDumperPluginManagerInterface.php b/modules/devel/src/DevelDumperPluginManagerInterface.php
deleted file mode 100644
index 8f42ed2..0000000
--- a/modules/devel/src/DevelDumperPluginManagerInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\devel;
-
-use Drupal\Component\Plugin\FallbackPluginManagerInterface;
-use Drupal\Component\Plugin\PluginManagerInterface;
-
-/**
- * Interface DevelDumperPluginManagerInterface.
- */
-interface DevelDumperPluginManagerInterface extends PluginManagerInterface, FallbackPluginManagerInterface {
-
-  /**
-   * Checks if plugin has a definition and is supported.
-   *
-   * @param string $plugin_id
-   *   The ID of the plugin to check.
-   *
-   * @return bool
-   *   TRUE if the plugin is supported, FALSE otherwise.
-   */
-  public function isPluginSupported($plugin_id);
-
-}
diff --git a/modules/devel/src/EntityTypeInfo.php b/modules/devel/src/EntityTypeInfo.php
deleted file mode 100644
index a72417a..0000000
--- a/modules/devel/src/EntityTypeInfo.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\devel;
-
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Manipulates entity type information.
- *
- * This class contains primarily bridged hooks for compile-time or
- * cache-clear-time hooks. Runtime hooks should be placed in EntityOperations.
- */
-class EntityTypeInfo implements ContainerInjectionInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $currentUser;
-
-  /**
-   * EntityTypeInfo constructor.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   Current user.
-   */
-  public function __construct(AccountInterface $current_user) {
-    $this->currentUser = $current_user;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('current_user')
-    );
-  }
-
-  /**
-   * Adds devel links to appropriate entity types.
-   *
-   * This is an alter hook bridge.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface[] $entity_types
-   *   The master entity type list to alter.
-   *
-   * @see hook_entity_type_alter()
-   */
-  public function entityTypeAlter(array &$entity_types) {
-    foreach ($entity_types as $entity_type_id => $entity_type) {
-      if (($entity_type->getFormClass('default') || $entity_type->getFormClass('edit')) && $entity_type->hasLinkTemplate('edit-form')) {
-        $entity_type->setLinkTemplate('devel-load', "/devel/$entity_type_id/{{$entity_type_id}}");
-      }
-      if ($entity_type->hasViewBuilderClass() && $entity_type->hasLinkTemplate('canonical')) {
-        $entity_type->setLinkTemplate('devel-render', "/devel/$entity_type_id/{{$entity_type_id}}/render");
-      }
-      if ($entity_type->hasLinkTemplate('devel-render') || $entity_type->hasLinkTemplate('devel-load')) {
-        $entity_type->setLinkTemplate('devel-definition', "/devel/$entity_type_id/{{$entity_type_id}}/definition");
-      }
-    }
-  }
-
-  /**
-   * Adds devel operations on entity that supports it.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity on which to define an operation.
-   *
-   * @return array
-   *   An array of operation definitions.
-   *
-   * @see hook_entity_operation()
-   */
-  public function entityOperation(EntityInterface $entity) {
-    $operations = [];
-    if ($this->currentUser->hasPermission('access devel information')) {
-      if ($entity->hasLinkTemplate('devel-load')) {
-        $operations['devel'] = [
-          'title' => $this->t('Devel'),
-          'weight' => 100,
-          'url' => $entity->toUrl('devel-load'),
-        ];
-      }
-      elseif ($entity->hasLinkTemplate('devel-render')) {
-        $operations['devel'] = [
-          'title' => $this->t('Devel'),
-          'weight' => 100,
-          'url' => $entity->toUrl('devel-render'),
-        ];
-      }
-    }
-    return $operations;
-  }
-
-}
diff --git a/modules/devel/src/EventSubscriber/ErrorHandlerSubscriber.php b/modules/devel/src/EventSubscriber/ErrorHandlerSubscriber.php
deleted file mode 100644
index ee5ad21..0000000
--- a/modules/devel/src/EventSubscriber/ErrorHandlerSubscriber.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Drupal\devel\EventSubscriber;
-
-use Drupal\Core\Session\AccountProxyInterface;
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-/**
- * Listener for handling PHP errors.
- */
-class ErrorHandlerSubscriber implements EventSubscriberInterface {
-
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountProxyInterface
-   */
-  protected $account;
-
-  /**
-   * ErrorHandlerSubscriber constructor.
-   *
-   * @param \Drupal\Core\Session\AccountProxyInterface $account
-   *   The current user.
-   */
-  public function __construct(AccountProxyInterface $account) {
-    $this->account = $account;
-  }
-
-  /**
-   * Register devel error handler.
-   *
-   * @param \Symfony\Component\EventDispatcher\Event $event
-   *   The event to process.
-   */
-  public function registerErrorHandler(Event $event = NULL) {
-    if ($this->account && $this->account->hasPermission('access devel information')) {
-      devel_set_handler(devel_get_handlers());
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    // Runs as soon as possible in the request but after
-    // AuthenticationSubscriber (priority 300) because you need to access to
-    // the current user for determine whether register the devel error handler
-    // or not.
-    $events[KernelEvents::REQUEST][] = ['registerErrorHandler', 256];
-
-    return $events;
-  }
-
-}
diff --git a/modules/devel/src/EventSubscriber/ThemeInfoRebuildSubscriber.php b/modules/devel/src/EventSubscriber/ThemeInfoRebuildSubscriber.php
deleted file mode 100644
index 596e709..0000000
--- a/modules/devel/src/EventSubscriber/ThemeInfoRebuildSubscriber.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Drupal\devel\EventSubscriber;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Extension\ThemeHandlerInterface;
-use Drupal\Core\Session\AccountProxyInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\Url;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-/**
- * Subscriber for force the system to rebuild the theme registry.
- */
-class ThemeInfoRebuildSubscriber implements EventSubscriberInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * Internal flag for handle user notification.
-   *
-   * @var string
-   */
-  protected $notificationFlag = 'devel.rebuild_theme_warning';
-
-  /**
-   * The devel config.
-   *
-   * @var \Drupal\Core\Config\Config;
-   */
-  protected $config;
-
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountProxyInterface
-   */
-  protected $account;
-
-  /**
-   * The theme handler.
-   *
-   * @var \Drupal\Core\Extension\ThemeHandlerInterface
-   */
-  protected $themeHandler;
-
-  /**
-   * Constructs a ThemeInfoRebuildSubscriber object.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   *   The config factory.
-   * @param \Drupal\Core\Session\AccountProxyInterface $account
-   *   The current user.
-   * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
-   *   The theme handler.
-   */
-  public function __construct(ConfigFactoryInterface $config, AccountProxyInterface $account, ThemeHandlerInterface $theme_handler) {
-    $this->config = $config->get('devel.settings');
-    $this->account = $account;
-    $this->themeHandler = $theme_handler;
-  }
-
-  /**
-   * Forces the system to rebuild the theme registry.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event
-   *   The event to process.
-   */
-  public function rebuildThemeInfo(GetResponseEvent $event) {
-    if ($this->config->get('rebuild_theme')) {
-      // Update the theme registry.
-      drupal_theme_rebuild();
-      // Refresh theme data.
-      $this->themeHandler->refreshInfo();
-      // Resets the internal state of the theme handler and clear the 'system
-      // list' cache; this allow to properly register, if needed, PSR-4
-      // namespaces for theme extensions after refreshing the info data.
-      $this->themeHandler->reset();
-      // Notify the user that the theme info are rebuilt on every request.
-      $this->triggerWarningIfNeeded($event->getRequest());
-    }
-  }
-
-  /**
-   * Notifies the user that the theme info are rebuilt on every request.
-   *
-   * The warning message is shown only to users with adequate permissions and
-   * only once per session.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request.
-   */
-  protected function triggerWarningIfNeeded(Request $request) {
-    if ($this->account && $this->account->hasPermission('access devel information')) {
-      $session = $request->getSession();
-      if (!$session->has($this->notificationFlag)) {
-        $session->set($this->notificationFlag, TRUE);
-        $message = $this->t('The theme information is being rebuilt on every request. Remember to <a href=":url">turn off</a> this feature on production websites.', [':url' => Url::fromRoute('devel.admin_settings')->toString()]);
-        drupal_set_message($message, 'warning', TRUE);
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    // Set high priority value to start as early as possible.
-    $events[KernelEvents::REQUEST][] = ['rebuildThemeInfo', 256];
-    return $events;
-  }
-
-}
diff --git a/modules/devel/src/Form/ConfigEditor.php b/modules/devel/src/Form/ConfigEditor.php
deleted file mode 100644
index e4fe88c..0000000
--- a/modules/devel/src/Form/ConfigEditor.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-namespace Drupal\devel\Form;
-
-use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
-use Drupal\Component\Serialization\Yaml;
-use Drupal\Component\Utility\UrlHelper;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Edit config variable form.
- */
-class ConfigEditor extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'devel_config_system_edit_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $config_name = '') {
-    $config = $this->config($config_name);
-
-    if ($config === FALSE || $config->isNew()) {
-      drupal_set_message(t('Config @name does not exist in the system.', array('@name' => $config_name)), 'error');
-      return;
-    }
-
-    $data = $config->getOriginal();
-
-    if (empty($data)) {
-      drupal_set_message(t('Config @name exists but has no data.', array('@name' => $config_name)), 'warning');
-      return;
-    }
-
-    try {
-      $output = Yaml::encode($data);
-    }
-    catch (InvalidDataTypeException $e) {
-      drupal_set_message(t('Invalid data detected for @name : %error', array('@name' => $config_name, '%error' => $e->getMessage())), 'error');
-      return;
-    }
-
-    $form['current'] = array(
-      '#type' => 'details',
-      '#title' => $this->t('Current value for %variable', array('%variable' => $config_name)),
-      '#attributes' => array('class' => array('container-inline')),
-    );
-    $form['current']['value'] = array(
-      '#type' => 'item',
-      '#markup' => dpr($output, TRUE),
-    );
-
-    $form['name'] = array(
-      '#type' => 'value',
-      '#value' => $config_name,
-    );
-    $form['new'] = array(
-      '#type' => 'textarea',
-      '#title' => $this->t('New value'),
-      '#default_value' => $output,
-      '#rows' => 24,
-      '#required' => TRUE,
-    );
-
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-    );
-    $form['actions']['cancel'] = array(
-      '#type' => 'link',
-      '#title' => $this->t('Cancel'),
-      '#url' => $this->buildCancelLinkUrl(),
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $value = $form_state->getValue('new');
-    // try to parse the new provided value
-    try {
-      $parsed_value = Yaml::decode($value);
-      // Config::setData needs array for the new configuration and
-      // a simple string is valid YAML for any reason.
-      if (is_array($parsed_value)) {
-        $form_state->setValue('parsed_value', $parsed_value);
-      }
-      else {
-        $form_state->setErrorByName('new', $this->t('Invalid input'));
-      }
-    }
-    catch (InvalidDataTypeException $e) {
-      $form_state->setErrorByName('new', $this->t('Invalid input: %error', array('%error' => $e->getMessage())));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $values = $form_state->getValues();
-    try {
-      $this->configFactory()->getEditable($values['name'])->setData($values['parsed_value'])->save();
-      drupal_set_message($this->t('Configuration variable %variable was successfully saved.', array('%variable' => $values['name'])));
-      $this->logger('devel')->info('Configuration variable %variable was successfully saved.', array('%variable' => $values['name']));
-
-      $form_state->setRedirectUrl(Url::fromRoute('devel.configs_list'));
-    }
-    catch (\Exception $e) {
-      drupal_set_message($e->getMessage(), 'error');
-      $this->logger('devel')->error('Error saving configuration variable %variable : %error.', array('%variable' => $values['name'], '%error' => $e->getMessage()));
-    }
-  }
-
-  /**
-   * Builds the cancel link url for the form.
-   *
-   * @return Url
-   *   Cancel url
-   */
-  private function buildCancelLinkUrl() {
-    $query = $this->getRequest()->query;
-
-    if ($query->has('destination')) {
-      $options = UrlHelper::parse($query->get('destination'));
-      $url = Url::fromUri('internal:/' . $options['path'], $options);
-    }
-    else {
-      $url = Url::fromRoute('devel.configs_list');
-    }
-
-    return $url;
-  }
-
-}
diff --git a/modules/devel/src/Form/ConfigsList.php b/modules/devel/src/Form/ConfigsList.php
deleted file mode 100644
index f0993e7..0000000
--- a/modules/devel/src/Form/ConfigsList.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Drupal\devel\Form;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Form that displays all the config variables to edit them.
- */
-class ConfigsList extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'devel_config_system_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $filter = '') {
-    $form['filter'] = array(
-      '#type' => 'details',
-      '#title' => t('Filter variables'),
-      '#attributes' => array('class' => array('container-inline')),
-      '#open' => isset($filter) && trim($filter) != '',
-    );
-    $form['filter']['name'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Variable name'),
-      '#title_display' => 'invisible',
-      '#default_value' => $filter,
-    );
-    $form['filter']['show'] = array(
-      '#type' => 'submit',
-      '#value' => $this->t('Filter'),
-    );
-
-    $header = array(
-      'name' => array('data' => $this->t('Name')),
-      'edit' => array('data' => $this->t('Operations')),
-    );
-
-    $rows = array();
-
-    $destination = $this->getDestinationArray();
-
-    // List all the variables filtered if any filter was provided.
-    $names = $this->configFactory()->listAll($filter);
-
-    foreach ($names as $config_name) {
-      $operations['edit'] = array(
-        'title' => $this->t('Edit'),
-        'url' => Url::fromRoute('devel.config_edit', array('config_name' => $config_name)),
-        'query' => $destination
-      );
-      $rows[] = array(
-        'name' => $config_name,
-        'operation' => array('data' => array('#type' => 'operations', '#links' => $operations)),
-      );
-    }
-
-    $form['variables'] = array(
-      '#type' => 'table',
-      '#header' => $header,
-      '#rows' => $rows,
-      '#empty' => $this->t('No variables found')
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $filter = $form_state->getValue('name');
-    $form_state->setRedirectUrl(Url::FromRoute('devel.configs_list', array('filter' => Html::escape($filter))));
-  }
-
-}
diff --git a/modules/devel/src/Form/DevelReinstall.php b/modules/devel/src/Form/DevelReinstall.php
deleted file mode 100644
index 109e40b..0000000
--- a/modules/devel/src/Form/DevelReinstall.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-namespace Drupal\devel\Form;
-
-use Drupal\Core\Extension\ModuleInstallerInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Display a dropdown of installed modules with the option to reinstall them.
- */
-class DevelReinstall extends FormBase {
-
-  /**
-   * The module installer.
-   *
-   * @var \Drupal\Core\Extension\ModuleInstallerInterface
-   */
-  protected $moduleInstaller;
-
-  /**
-   * Constructs a new DevelReinstall form.
-   *
-   * @param \Drupal\Core\Extension\ModuleInstallerInterface $module_installer
-   *   The module installer.
-   */
-  public function __construct(ModuleInstallerInterface $module_installer) {
-    $this->moduleInstaller = $module_installer;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('module_installer')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'devel_reinstall_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    // Get a list of all available modules.
-    $modules = system_rebuild_module_data();
-
-    $uninstallable = array_filter($modules, function ($module) use ($modules) {
-      return empty($modules[$module->getName()]->info['required']) && drupal_get_installed_schema_version($module->getName()) > SCHEMA_UNINSTALLED && $module->getName() !== 'devel';
-    });
-
-    $form['filters'] = array(
-      '#type' => 'container',
-      '#attributes' => array(
-        'class' => array('table-filter', 'js-show'),
-      ),
-    );
-    $form['filters']['text'] = array(
-      '#type' => 'search',
-      '#title' => $this->t('Search'),
-      '#size' => 30,
-      '#placeholder' => $this->t('Enter module name'),
-      '#attributes' => array(
-        'class' => array('table-filter-text'),
-        'data-table' => '#devel-reinstall-form',
-        'autocomplete' => 'off',
-        'title' => $this->t('Enter a part of the module name or description to filter by.'),
-      ),
-    );
-
-    // Only build the rest of the form if there are any modules available to
-    // uninstall;
-    if (empty($uninstallable)) {
-      return $form;
-    }
-
-    $header = array(
-      'name' => $this->t('Name'),
-      'description' => $this->t('Description'),
-    );
-
-    $rows = array();
-
-    foreach ($uninstallable as $module) {
-      $name = $module->info['name'] ? : $module->getName();
-
-      $rows[$module->getName()] = array(
-        'name' => array(
-          'data' => array(
-            '#type' => 'inline_template',
-            '#template' => '<label class="module-name table-filter-text-source">{{ module_name }}</label>',
-            '#context' => array('module_name' => $name),
-          )
-        ),
-        'description' => array(
-          'data' => $module->info['description'],
-          'class' => array('description'),
-        ),
-      );
-    }
-
-    $form['reinstall'] = array(
-      '#type' => 'tableselect',
-      '#header' => $header,
-      '#options' => $rows,
-      '#js_select' => FALSE,
-      '#empty' => $this->t('No modules are available to uninstall.'),
-    );
-
-    $form['#attached']['library'][] = 'system/drupal.system.modules';
-
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => $this->t('Reinstall'),
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    // Form submitted, but no modules selected.
-    if (!array_filter($form_state->getValue('reinstall'))) {
-      $form_state->setErrorByName('reinstall', $this->t('No modules selected.'));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    try {
-      $modules = $form_state->getValue('reinstall');
-      $reinstall = array_keys(array_filter($modules));
-      $this->moduleInstaller->uninstall($reinstall, FALSE);
-      $this->moduleInstaller->install($reinstall, FALSE);
-      drupal_set_message($this->t('Uninstalled and installed: %names.', array('%names' => implode(', ', $reinstall))));
-    }
-    catch (\Exception $e) {
-      drupal_set_message($this->t('Unable to reinstall modules. Error: %error.', array('%error' => $e->getMessage())), 'error');
-    }
-  }
-
-}
diff --git a/modules/devel/src/Form/ExecutePHP.php b/modules/devel/src/Form/ExecutePHP.php
deleted file mode 100644
index cd66bf4..0000000
--- a/modules/devel/src/Form/ExecutePHP.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Drupal\devel\Form;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Defines a form that allows privileged users to execute arbitrary PHP code.
- */
-class ExecutePHP extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'devel_execute_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form = array(
-      '#title' => $this->t('Execute PHP Code'),
-      '#description' => $this->t('Execute some PHP code'),
-    );
-    $form['execute']['code'] = array(
-      '#type' => 'textarea',
-      '#title' => t('PHP code to execute'),
-      '#description' => t('Enter some code. Do not use <code>&lt;?php ?&gt;</code> tags.'),
-      '#default_value' => (isset($_SESSION['devel_execute_code']) ? $_SESSION['devel_execute_code'] : ''),
-      '#rows' => 20,
-    );
-    $form['execute']['op'] = array('#type' => 'submit', '#value' => t('Execute'));
-    $form['#redirect'] = FALSE;
-    if (isset($_SESSION['devel_execute_code'])) {
-      unset($_SESSION['devel_execute_code']);
-    }
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    ob_start();
-    $code = $form_state->getValue('code');
-    print eval($code);
-    $_SESSION['devel_execute_code'] = $code;
-    dpm(ob_get_clean());
-  }
-
-}
diff --git a/modules/devel/src/Form/RouterRebuildConfirmForm.php b/modules/devel/src/Form/RouterRebuildConfirmForm.php
deleted file mode 100644
index a1daf89..0000000
--- a/modules/devel/src/Form/RouterRebuildConfirmForm.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace Drupal\devel\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteBuilderInterface;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides confirmation form for rebuilding the routes.
- */
-class RouterRebuildConfirmForm extends ConfirmFormBase {
-
-  /**
-   * The route builder service.
-   *
-   * @var \Drupal\Core\Routing\RouteBuilderInterface
-   */
-  protected $routeBuilder;
-
-  /**
-   * Constructs a new RouterRebuildConfirmForm object.
-   *
-   * @param \Drupal\Core\Routing\RouteBuilderInterface $route_builder
-   *   The route builder service.
-   */
-  public function __construct(RouteBuilderInterface $route_builder) {
-    $this->routeBuilder = $route_builder;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('router.builder')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'devel_menu_rebuild';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return $this->t('Are you sure you want to rebuild the router?');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('<front>');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return $this->t('Rebuilds the routes information gathering all routing data from .routing.yml files and from classes which subscribe to the route build events. This action cannot be undone.');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Rebuild');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->routeBuilder->rebuild();
-    drupal_set_message($this->t('The router has been rebuilt.'));
-    $form_state->setRedirect('<front>');
-  }
-
-}
diff --git a/modules/devel/src/Form/SettingsForm.php b/modules/devel/src/Form/SettingsForm.php
deleted file mode 100644
index 9321d79..0000000
--- a/modules/devel/src/Form/SettingsForm.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-namespace Drupal\devel\Form;
-
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\devel\DevelDumperPluginManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Defines a form that configures devel settings.
- */
-class SettingsForm extends ConfigFormBase {
-
-  /**
-   * Devel Dumper Plugin Manager.
-   *
-   * @var \Drupal\devel\DevelDumperPluginManager
-   */
-  protected $dumperManager;
-
-  /**
-   * Constructs a new SettingsForm object.
-   *
-   * @param \Drupal\devel\DevelDumperPluginManagerInterface $devel_dumper_manager
-   *   Devel Dumper Plugin Manager.
-   */
-  public function __construct(DevelDumperPluginManagerInterface $devel_dumper_manager) {
-    $this->dumperManager = $devel_dumper_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.devel_dumper')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'devel_admin_settings_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return [
-      'devel.settings',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, Request $request = NULL) {
-    $current_url = Url::createFromRequest($request);
-    $devel_config = $this->config('devel.settings');
-
-    $form['page_alter'] = array('#type' => 'checkbox',
-      '#title' => t('Display $page array'),
-      '#default_value' => $devel_config->get('page_alter'),
-      '#description' => t('Display $page array from <a href="http://api.drupal.org/api/function/hook_page_alter/7">hook_page_alter()</a> in the messages area of each page.'),
-    );
-    $form['raw_names'] = array('#type' => 'checkbox',
-      '#title' => t('Display machine names of permissions and modules'),
-      '#default_value' => $devel_config->get('raw_names'),
-      '#description' => t('Display the language-independent machine names of the permissions in mouse-over hints on the <a href=":permissions_url">Permissions</a> page and the module base file names on the Permissions and <a href=":modules_url">Modules</a> pages.', array(':permissions_url' => Url::fromRoute('user.admin_permissions')->toString(), ':modules_url' => Url::fromRoute('system.modules_list')->toString())),
-    );
-    $form['rebuild_theme'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Rebuild the theme registry on every page load'),
-      '#description' => $this->t('New templates, theme overrides, and changes to the theme.info.yml need the theme registry to be rebuilt in order to appear on the site.'),
-      '#default_value' => $devel_config->get('rebuild_theme'),
-    );
-
-    $error_handlers = devel_get_handlers();
-    $form['error_handlers'] = array(
-      '#type' => 'select',
-      '#title' => t('Error handlers'),
-      '#options' => array(
-        DEVEL_ERROR_HANDLER_NONE => t('None'),
-        DEVEL_ERROR_HANDLER_STANDARD => t('Standard Drupal'),
-        DEVEL_ERROR_HANDLER_BACKTRACE_DPM => t('Kint backtrace in the message area'),
-        DEVEL_ERROR_HANDLER_BACKTRACE_KINT => t('Kint backtrace above the rendered page'),
-      ),
-      '#multiple' => TRUE,
-      '#default_value' => empty($error_handlers) ? DEVEL_ERROR_HANDLER_NONE : $error_handlers,
-      '#description' => [
-        [
-          '#markup' => $this->t('Select the error handler(s) to use, in case you <a href=":choose">choose to show errors on screen</a>.', [':choose' => $this->url('system.logging_settings')])
-        ],
-        [
-          '#theme' => 'item_list',
-          '#items' => [
-            $this->t('<em>None</em> is a good option when stepping through the site in your debugger.'),
-            $this->t('<em>Standard Drupal</em> does not display all the information that is often needed to resolve an issue.'),
-            $this->t('<em>Kint backtrace</em> displays nice debug information when any type of error is noticed, but only to users with the %perm permission.', ['%perm' => t('Access developer information')]),
-          ],
-        ],
-        [
-          '#markup' => $this->t('Depending on the situation, the theme, the size of the call stack and the arguments, etc., some handlers may not display their messages, or display them on the subsequent page. Select <em>Standard Drupal</em> <strong>and</strong> <em>Kint backtrace above the rendered page</em> to maximize your chances of not missing any messages.') . '<br />' .
-            $this->t('Demonstrate the current error handler(s):') . ' ' .
-            $this->l('notice', $current_url->setOption('query', ['demo' => 'notice'])) . ', ' .
-            $this->l('notice+warning', $current_url->setOption('query', ['demo' => 'warning'])). ', ' .
-            $this->l('notice+warning+error', $current_url->setOption('query', ['demo' => 'error'])) . ' (' .
-            $this->t('The presentation of the @error is determined by PHP.', ['@error' => 'error']) . ')'
-        ],
-      ],
-    );
-    $form['error_handlers']['#size'] = count($form['error_handlers']['#options']);
-    if ($request->query->has('demo')) {
-      if ($request->getMethod() == 'GET') {
-        $this->demonstrateErrorHandlers($request->query->get('demo'));
-      }
-      $request->query->remove('demo');
-    }
-
-    $dumper = $devel_config->get('devel_dumper');
-    $default = $this->dumperManager->isPluginSupported($dumper) ? $dumper : $this->dumperManager->getFallbackPluginId(NULL);
-
-    $form['dumper'] = array(
-      '#type' => 'radios',
-      '#title' => $this->t('Variables Dumper'),
-      '#options' => [],
-      '#default_value' => $default,
-      '#description' => $this->t('Select the debugging tool used for formatting and displaying the variables inspected through the debug functions of Devel. You can enable the <a href=":kint_install">Kint module</a> (shipped with Devel) and select the Kint debugging tool for an improved debugging experience. <strong>NOTE</strong>: Some of these plugins require external libraries for to be enabled. Learn how install external libraries with <a href=":url">Composer</a>.', [':url' => 'https://www.drupal.org/node/2404989', ':kint_install' => Url::fromRoute('system.modules_list')->toString()]),
-    );
-
-    foreach ($this->dumperManager->getDefinitions() as $id => $definition) {
-      $form['dumper']['#options'][$id] = $definition['label'];
-
-      $supported = $this->dumperManager->isPluginSupported($id);
-      $form['dumper'][$id]['#disabled'] = !$supported;
-
-      $form['dumper'][$id]['#description'] = [
-        '#type' => 'inline_template',
-        '#template' => '{{ description }}{% if not supported %}<div><small>{% trans %}<strong>Not available</strong>. You may need to install external dependencies for use this plugin.{% endtrans %}</small></div>{% endif %}',
-        '#context' => [
-          'description' => $definition['description'],
-          'supported' => $supported,
-        ]
-      ];
-    }
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $values = $form_state->getValues();
-    $this->config('devel.settings')
-      ->set('page_alter', $values['page_alter'])
-      ->set('raw_names', $values['raw_names'])
-      ->set('error_handlers', $values['error_handlers'])
-      ->set('rebuild_theme', $values['rebuild_theme'])
-      ->set('devel_dumper', $values['dumper'])
-      ->save();
-
-    parent::submitForm($form, $form_state);
-  }
-
-  /**
-   * @param string $severity
-   */
-  protected function demonstrateErrorHandlers($severity) {
-    switch ($severity) {
-      case 'notice':
-        $undefined = $undefined;
-        break;
-      case 'warning':
-        $undefined = $undefined;
-        1/0;
-        break;
-      case 'error':
-        $undefined = $undefined;
-        1/0;
-        devel_undefined_function();
-        break;
-    }
-  }
-
-}
diff --git a/modules/devel/src/Form/SwitchUserForm.php b/modules/devel/src/Form/SwitchUserForm.php
deleted file mode 100644
index 8fbb023..0000000
--- a/modules/devel/src/Form/SwitchUserForm.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Drupal\devel\Form;
-
-use Drupal\Core\Access\CsrfTokenGenerator;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\user\Entity\User;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Defines a form that allows privileged users to generate entities.
- */
-class SwitchUserForm extends FormBase {
-
-  /**
-   * The csrf token generator.
-   *
-   * @var \Drupal\Core\Access\CsrfTokenGenerator
-   */
-  protected $csrfToken;
-
-  /**
-   * Constructs a new SwitchUserForm object.
-   *
-   * @param \Drupal\Core\Access\CsrfTokenGenerator $csrf_token_generator
-   */
-  public function __construct(CsrfTokenGenerator $csrf_token_generator) {
-    $this->csrfToken = $csrf_token_generator;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('csrf_token')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'devel_switchuser_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['autocomplete'] = [
-      '#type' => 'container',
-      '#attributes' => [
-        'class' => ['container-inline'],
-      ],
-    ];
-    $form['autocomplete']['userid'] = [
-      '#type' => 'entity_autocomplete',
-      '#title' => $this->t('Username'),
-      '#placeholder' => $this->t('Enter username'),
-      '#target_type' => 'user',
-      '#selection_settings' => [
-        'include_anonymous' => FALSE
-      ],
-      '#process_default_value' => FALSE,
-      '#maxlength' => USERNAME_MAX_LENGTH,
-      '#title_display' => 'invisible',
-      '#required' => TRUE,
-      '#size' => '28',
-    ];
-
-    $form['autocomplete']['actions'] = ['#type' => 'actions'];
-    $form['autocomplete']['actions']['submit'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Switch'),
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    if (!$account = User::load($form_state->getValue('userid'))) {
-      $form_state->setErrorByName('userid', $this->t('Username not found'));
-    }
-    else {
-      $form_state->setValue('username', $account->getAccountName());
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // We cannot rely on automatic token creation, since the csrf seed changes
-    // after the redirect and the generated token is not more valid.
-    // TODO find another way to do this.
-    $url = Url::fromRoute('devel.switch', ['name' => $form_state->getValue('username')]);
-    $url->setOption('query', ['token' => $this->csrfToken->get($url->getInternalPath())]);
-
-    $form_state->setRedirectUrl($url);
-  }
-
-}
diff --git a/modules/devel/src/Form/SystemStateEdit.php b/modules/devel/src/Form/SystemStateEdit.php
deleted file mode 100644
index d4ba0ed..0000000
--- a/modules/devel/src/Form/SystemStateEdit.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-namespace Drupal\devel\Form;
-
-use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
-use Drupal\Component\Serialization\Yaml;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\State\StateInterface;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Form API form to edit a state.
- */
-class SystemStateEdit extends FormBase {
-
-  /**
-   * The state store.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-  /**
-   * Constructs a new SystemStateEdit object.
-   *
-   * @param \Drupal\Core\State\StateInterface $state
-   *   The state service.
-   */
-  public function __construct(StateInterface $state) {
-    $this->state = $state;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('state')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'devel_state_system_edit_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $state_name = '') {
-    // Get the old value
-    $old_value = $this->state->get($state_name);
-
-    if (!isset($old_value)) {
-      drupal_set_message(t('State @name does not exist in the system.', array('@name' => $state_name)), 'warning');
-      return;
-    }
-
-    // Only simple structures are allowed to be edited.
-    $disabled = !$this->checkObject($old_value);
-
-    if ($disabled) {
-      drupal_set_message(t('Only simple structures are allowed to be edited. State @name contains objects.', array('@name' => $state_name)), 'warning');
-    }
-
-    // First we will show the user the content of the variable about to be edited.
-    $form['value'] = array(
-      '#type' => 'item',
-      '#title' => $this->t('Current value for %name', array('%name' => $state_name)),
-      '#markup' => kpr($old_value, TRUE),
-    );
-
-    $transport = 'plain';
-
-    if (!$disabled && is_array($old_value)) {
-      try {
-        $old_value = Yaml::encode($old_value);
-        $transport = 'yaml';
-      }
-      catch (InvalidDataTypeException $e) {
-        drupal_set_message(t('Invalid data detected for @name : %error', array('@name' => $state_name, '%error' => $e->getMessage())), 'error');
-        return;
-      }
-    }
-
-    // Store in the form the name of the state variable
-    $form['state_name'] = array(
-      '#type' => 'value',
-      '#value' => $state_name,
-    );
-    // Set the transport format for the new value. Values:
-    //  - plain
-    //  - yaml
-    $form['transport'] = array(
-      '#type' => 'value',
-      '#value' => $transport,
-    );
-
-    $form['new_value'] = array(
-      '#type' => 'textarea',
-      '#title' => $this->t('New value'),
-      '#default_value' => $disabled ? '' : $old_value,
-      '#disabled' => $disabled,
-      '#rows' => 15,
-    );
-
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-      '#disabled' => $disabled,
-    );
-    $form['actions']['cancel'] = array(
-      '#type' => 'link',
-      '#title' => $this->t('Cancel'),
-      '#url' => Url::fromRoute('devel.state_system_page')
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $values = $form_state->getValues();
-
-    if ($values['transport'] == 'yaml') {
-      // try to parse the new provided value
-      try {
-        $parsed_value = Yaml::decode($values['new_value']);
-        $form_state->setValue('parsed_value', $parsed_value);
-      }
-      catch (InvalidDataTypeException $e) {
-        $form_state->setErrorByName('new_value', $this->t('Invalid input: %error', array('%error' => $e->getMessage())));
-      }
-    }
-    else {
-      $form_state->setValue('parsed_value', $values['new_value']);
-    }
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Save the state
-    $values = $form_state->getValues();
-    $this->state->set($values['state_name'], $values['parsed_value']);
-
-    $form_state->setRedirectUrl(Url::fromRoute('devel.state_system_page'));
-
-    drupal_set_message($this->t('Variable %variable was successfully edited.', array('%variable' => $values['state_name'])));
-    $this->logger('devel')->info('Variable %variable was successfully edited.', array('%variable' => $values['state_name']));
-  }
-
-  /**
-   * Helper function to determine if a variable is or contains an object.
-   *
-   * @param $data
-   *   Input data to check
-   *
-   * @return bool
-   *   TRUE if the variable is not an object and does not contain one.
-   */
-  protected function checkObject($data) {
-    if (is_object($data)) {
-      return FALSE;
-    }
-    if (is_array($data)) {
-      // If the current object is an array, then check recursively.
-      foreach ($data as $value) {
-        // If there is an object the whole container is "contaminated"
-        if (!$this->checkObject($value)) {
-          return FALSE;
-        }
-      }
-    }
-
-    // All checks pass
-    return TRUE;
-  }
-
-}
diff --git a/modules/devel/src/Form/ToolbarSettingsForm.php b/modules/devel/src/Form/ToolbarSettingsForm.php
deleted file mode 100644
index d0e09fc..0000000
--- a/modules/devel/src/Form/ToolbarSettingsForm.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-namespace Drupal\devel\Form;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Menu\MenuLinkTreeInterface;
-use Drupal\Core\Menu\MenuTreeParameters;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Configures devel toolbar settings.
- */
-class ToolbarSettingsForm extends ConfigFormBase {
-
-  /**
-   * The menu link tree service.
-   *
-   * @var \Drupal\Core\Menu\MenuLinkTree
-   */
-  protected $menuLinkTree;
-
-  /**
-   * ToolbarSettingsForm constructor.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   * @param \Drupal\Core\Menu\MenuLinkTreeInterface $menu_link_tree
-   *   The menu link tree service.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, MenuLinkTreeInterface $menu_link_tree) {
-    parent::__construct($config_factory);
-    $this->menuLinkTree = $menu_link_tree;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('menu.link_tree')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'devel_toolbar_settings_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return [
-      'devel.toolbar.settings',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $config = $this->config('devel.toolbar.settings');
-
-    $form['toolbar_items'] = [
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Menu items always visible'),
-      '#options' => $this->getLinkLabels(),
-      '#default_value' => $config->get('toolbar_items') ?: [],
-      '#required' => TRUE,
-      '#description' => $this->t('Select the menu items always visible in devel toolbar tray. All the items not selected in this list will be visible only when the toolbar orientation is vertical.'),
-    ];
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $values = $form_state->getValues();
-    $toolbar_items = array_keys(array_filter($values['toolbar_items']));
-
-    $this->config('devel.toolbar.settings')
-      ->set('toolbar_items', $toolbar_items)
-      ->save();
-
-    parent::submitForm($form, $form_state);
-  }
-
-  /**
-   * Provides an array of available menu items.
-   *
-   * @return array
-   *   Associative array of devel menu item labels keyed by plugin ID.
-   */
-  protected function getLinkLabels() {
-    $options = [];
-
-    $parameters = new MenuTreeParameters();
-    $parameters->onlyEnabledLinks()->setTopLevelOnly();
-    $tree = $this->menuLinkTree->load('devel', $parameters);
-
-    foreach ($tree as $element) {
-      $link = $element->link;
-      $options[$link->getPluginId()] = $link->getTitle();
-    }
-
-    asort($options);
-
-    return $options;
-  }
-
-}
diff --git a/modules/devel/src/Plugin/Block/DevelExecutePHP.php b/modules/devel/src/Plugin/Block/DevelExecutePHP.php
deleted file mode 100644
index 23076bf..0000000
--- a/modules/devel/src/Plugin/Block/DevelExecutePHP.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Block;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Block\BlockBase;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Provides a block for executing PHP code.
- *
- * @Block(
- *   id = "devel_execute_php",
- *   admin_label = @Translation("Execute PHP")
- * )
- */
-class DevelExecutePHP extends BlockBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function blockAccess(AccountInterface $account) {
-    return AccessResult::allowedIfHasPermission($account, 'execute php code');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build() {
-    return \Drupal::formBuilder()->getForm('Drupal\devel\Form\ExecutePHP');
-  }
-
-}
diff --git a/modules/devel/src/Plugin/Block/SwitchUserBlock.php b/modules/devel/src/Plugin/Block/SwitchUserBlock.php
deleted file mode 100644
index c427fed..0000000
--- a/modules/devel/src/Plugin/Block/SwitchUserBlock.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Block;
-
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Block\BlockBase;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Routing\RedirectDestinationTrait;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Session\AnonymousUserSession;
-use Drupal\Core\Url;
-use Drupal\user\Entity\Role;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a block for switching users.
- *
- * @Block(
- *   id = "devel_switch_user",
- *   admin_label = @Translation("Switch user"),
- *   category = @Translation("Forms")
- * )
- */
-class SwitchUserBlock extends BlockBase implements ContainerFactoryPluginInterface {
-
-  use RedirectDestinationTrait;
-
-  /**
-   * The FormBuilder object.
-   *
-   * @var \Drupal\Core\Form\FormBuilderInterface
-   */
-  protected $formBuilder;
-
-  /**
-   * The Current User object.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $currentUser;
-
-  /**
-   * The user storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $userStorage;
-
-  /**
-   * Constructs a new SwitchUserBlock object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   Current user.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $user_storage
-   *   The user storage.
-   * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
-   *   The form builder service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, AccountInterface $current_user, EntityStorageInterface $user_storage, FormBuilderInterface $form_builder) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->formBuilder = $form_builder;
-    $this->currentUser = $current_user;
-    $this->userStorage = $user_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('current_user'),
-      $container->get('entity.manager')->getStorage('user'),
-      $container->get('form_builder')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return [
-      'list_size' => 12,
-      'include_anon' => FALSE,
-      'show_form' => TRUE,
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function blockAccess(AccountInterface $account) {
-    return AccessResult::allowedIfHasPermission($account, 'switch users');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function blockForm($form, FormStateInterface $form_state) {
-    $anononymous = new AnonymousUserSession();
-    $form['list_size'] = [
-      '#type' => 'number',
-      '#title' => $this->t('Number of users to display in the list'),
-      '#default_value' => $this->configuration['list_size'],
-      '#min' => 1,
-      '#max' => 50,
-    ];
-    $form['include_anon'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Include %anonymous', ['%anonymous' => $anononymous->getAccountName()]),
-      '#default_value' => $this->configuration['include_anon'],
-    ];
-    $form['show_form'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Allow entering any user name'),
-      '#default_value' => $this->configuration['show_form'],
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function blockSubmit($form, FormStateInterface $form_state) {
-    $this->configuration['list_size'] = $form_state->getValue('list_size');
-    $this->configuration['include_anon'] = $form_state->getValue('include_anon');
-    $this->configuration['show_form'] = $form_state->getValue('show_form');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheMaxAge() {
-    return 0;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build() {
-    $build = [];
-    if ($accounts = $this->getUsers()) {
-      $build['devel_links'] = $this->buildUserList($accounts);
-
-      if ($this->configuration['show_form']) {
-        $build['devel_form'] = $this->formBuilder->getForm('\Drupal\devel\Form\SwitchUserForm');
-      }
-    }
-
-    return $build;
-  }
-
-  /**
-   * Provides the list of accounts that can be used for the user switch.
-   *
-   * Inactive users are omitted from all of the following db selects. Users
-   * with 'switch users' permission and anonymous user if include_anon property
-   * is set to TRUE, are prioritized.
-   *
-   * @return \Drupal\core\Session\AccountInterface[]
-   *   List of accounts to be used for the switch.
-   */
-  protected function getUsers() {
-    $list_size = $this->configuration['list_size'];
-    $include_anonymous = $this->configuration['include_anon'];
-
-    $list_size = $include_anonymous ? $list_size - 1 : $list_size;
-
-    // Users with 'switch users' permission are prioritized so
-    // we try to load first users with this permission.
-    $query = $this->userStorage->getQuery()
-      ->condition('uid', 0, '>')
-      ->condition('status', 0, '>')
-      ->sort('access', 'DESC')
-      ->range(0, $list_size);
-
-    $roles = user_roles(TRUE, 'switch users');
-
-    if (!empty($roles) && !isset($roles[Role::AUTHENTICATED_ID])) {
-      $query->condition('roles', array_keys($roles), 'IN');
-    }
-
-    $user_ids = $query->execute();
-
-    // If we don't have enough users with 'switch users' permission, add
-    // uids until we hit $list_size.
-    if (count($user_ids) < $list_size) {
-      $query = $this->userStorage->getQuery()
-        ->condition('uid', 0, '>')
-        ->condition('status', 0, '>')
-        ->sort('access', 'DESC')
-        ->range(0, $list_size);
-
-      // Excludes the prioritized user ids only if the previous query return
-      // some records.
-      if (!empty($user_ids)) {
-        $query->condition('uid', array_keys($user_ids), 'NOT IN');
-        $query->range(0, $list_size - count($user_ids));
-      }
-
-      $user_ids += $query->execute();
-    }
-
-    $accounts = $this->userStorage->loadMultiple($user_ids);
-
-    if ($include_anonymous) {
-      $anonymous = new AnonymousUserSession();
-      $accounts[$anonymous->id()] = $anonymous;
-    }
-
-    uasort($accounts, 'static::sortUserList');
-
-    return $accounts;
-  }
-
-  /**
-   * Builds the user listing as renderable array.
-   *
-   * @param \Drupal\core\Session\AccountInterface[] $accounts
-   *   The accounts to be rendered in the list.
-   *
-   * @return array
-   *   A renderable array.
-   */
-  protected function buildUserList(array $accounts) {
-    $links = [];
-
-    foreach ($accounts as $account) {
-      $links[$account->id()] = [
-        'title' => $account->getDisplayName(),
-        'url' => Url::fromRoute('devel.switch', ['name' => $account->getAccountName()]),
-        'query' => $this->getDestinationArray(),
-        'attributes' => [
-          'title' => $account->hasPermission('switch users') ? $this->t('This user can switch back.') : $this->t('Caution: this user will be unable to switch back.'),
-        ],
-      ];
-
-      if ($account->isAnonymous()) {
-        $links[$account->id()]['url'] = Url::fromRoute('user.logout');
-      }
-
-      if ($this->currentUser->id() === $account->id()) {
-        $links[$account->id()]['title'] = new FormattableMarkup('<strong>%user</strong>', ['%user' => $account->getDisplayName()]);
-      }
-    }
-
-    return [
-      '#theme' => 'links',
-      '#links' => $links,
-      '#attached' => ['library' => ['devel/devel']],
-    ];
-  }
-
-  /**
-   * Helper callback for uasort() to sort accounts by last access.
-   */
-  public static function sortUserList(AccountInterface $a, AccountInterface $b) {
-    $a_access = (int) $a->getLastAccessedTime();
-    $b_access = (int) $b->getLastAccessedTime();
-
-    if ($a_access === $b_access) {
-      return 0;
-    }
-
-    // User never access to site.
-    if ($a_access === 0) {
-      return 1;
-    }
-
-    return ($a_access > $b_access) ? -1 : 1;
-  }
-
-}
diff --git a/modules/devel/src/Plugin/Derivative/DevelLocalTask.php b/modules/devel/src/Plugin/Derivative/DevelLocalTask.php
deleted file mode 100644
index 1d3b192..0000000
--- a/modules/devel/src/Plugin/Derivative/DevelLocalTask.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Derivative;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides local task definitions for all entity bundles.
- *
- * @see \Drupal\devel\Controller\EntityDebugController
- * @see \Drupal\devel\Routing\RouteSubscriber
- */
-class DevelLocalTask extends DeriverBase implements ContainerDeriverInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * The entity manager
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Creates an DevelLocalTask object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The translation manager.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, TranslationInterface $string_translation) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static(
-      $container->get('entity_type.manager'),
-      $container->get('string_translation')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    $this->derivatives = [];
-
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-
-      $has_edit_path = $entity_type->hasLinkTemplate('devel-load');
-      $has_canonical_path = $entity_type->hasLinkTemplate('devel-render');
-
-      if ($has_edit_path || $has_canonical_path) {
-
-        $this->derivatives["$entity_type_id.devel_tab"] = [
-          'route_name' => "entity.$entity_type_id." . ($has_edit_path ? 'devel_load' : 'devel_render'),
-          'title' => $this->t('Devel'),
-          'base_route' => "entity.$entity_type_id." . ($has_canonical_path ? "canonical" : "edit_form"),
-          'weight' => 100,
-        ];
-
-        $this->derivatives["$entity_type_id.devel_definition_tab"] = [
-          'route_name' => "entity.$entity_type_id.devel_definition",
-          'title' => $this->t('Definition'),
-          'parent_id' => "devel.entities:$entity_type_id.devel_tab",
-          'weight' => 100,
-        ];
-
-        if ($has_canonical_path) {
-          $this->derivatives["$entity_type_id.devel_render_tab"] = [
-            'route_name' => "entity.$entity_type_id.devel_render",
-            'weight' => 100,
-            'title' => $this->t('Render'),
-            'parent_id' => "devel.entities:$entity_type_id.devel_tab",
-          ];
-        }
-
-        if ($has_edit_path) {
-          $this->derivatives["$entity_type_id.devel_load_tab"] = [
-            'route_name' => "entity.$entity_type_id.devel_load",
-            'weight' => 100,
-            'title' => $this->t('Load'),
-            'parent_id' => "devel.entities:$entity_type_id.devel_tab",
-          ];
-        }
-      }
-    }
-
-    foreach ($this->derivatives as &$entry) {
-      $entry += $base_plugin_definition;
-    }
-
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/devel/src/Plugin/Devel/Dumper/ChromePhp.php b/modules/devel/src/Plugin/Devel/Dumper/ChromePhp.php
deleted file mode 100644
index df84cab..0000000
--- a/modules/devel/src/Plugin/Devel/Dumper/ChromePhp.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Devel\Dumper;
-
-use Drupal\devel\DevelDumperBase;
-
-/**
- * Provides a ChromePhp dumper plugin.
- *
- * @DevelDumper(
- *   id = "chromephp",
- *   label = @Translation("ChromePhp"),
- *   description = @Translation("Wrapper for <a href='https://craig.is/writing/chrome-logger'>ChromePhp</a> debugging tool.")
- * )
- */
-class ChromePhp extends DevelDumperBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function dump($input, $name = NULL) {
-    \ChromePhp::log($input);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function export($input, $name = NULL) {
-    $this->dump($input);
-    return $this->t('Dump was redirected to the console.');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function checkRequirements() {
-    return class_exists('ChromePhp', TRUE);
-  }
-
-}
diff --git a/modules/devel/src/Plugin/Devel/Dumper/DoctrineDebug.php b/modules/devel/src/Plugin/Devel/Dumper/DoctrineDebug.php
deleted file mode 100644
index 9df1aec..0000000
--- a/modules/devel/src/Plugin/Devel/Dumper/DoctrineDebug.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Devel\Dumper;
-
-use Doctrine\Common\Util\Debug;
-use Drupal\Component\Utility\Xss;
-use Drupal\devel\DevelDumperBase;
-
-/**
- * Provides a DoctrineDebug dumper plugin.
- *
- * @DevelDumper(
- *   id = "default",
- *   label = @Translation("Default"),
- *   description = @Translation("Wrapper for <a href='http://www.doctrine-project.org/api/common/2.3/class-Doctrine.Common.Util.Debug.html'>Doctrine</a> debugging tool.")
- * )
- */
-class DoctrineDebug extends DevelDumperBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function export($input, $name = NULL) {
-    $name = $name ? $name . ' => ' : '';
-    $variable = Debug::export($input, 6);
-
-    ob_start();
-    print_r($variable);
-    $dump = ob_get_contents();
-    ob_end_clean();
-
-    // Run Xss::filterAdmin on the resulting string to prevent
-    // cross-site-scripting (XSS) vulnerabilities.
-    $dump = Xss::filterAdmin($dump);
-
-    $dump = '<pre>' . $name . $dump . '</pre>';
-
-    return $this->setSafeMarkup($dump);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function exportAsRenderable($input, $name = NULL) {
-    $output['container'] = [
-      '#type' => 'details',
-      '#title' => $name ? : $this->t('Variable'),
-      '#attached' => [
-        'library' => ['devel/devel']
-      ],
-      '#attributes' => [
-        'class' => ['container-inline', 'devel-dumper', 'devel-selectable'],
-      ],
-      'export' => [
-        '#markup' => $this->export($input),
-      ],
-    ];
-
-    return $output;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function checkRequirements() {
-    return TRUE;
-  }
-
-}
diff --git a/modules/devel/src/Plugin/Devel/Dumper/DrupalVariable.php b/modules/devel/src/Plugin/Devel/Dumper/DrupalVariable.php
deleted file mode 100644
index a1561e3..0000000
--- a/modules/devel/src/Plugin/Devel/Dumper/DrupalVariable.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Devel\Dumper;
-
-use Drupal\Component\Utility\Variable;
-use Drupal\Component\Utility\Xss;
-use Drupal\devel\DevelDumperBase;
-
-/**
- * Provides a DrupalVariable dumper plugin.
- *
- * @DevelDumper(
- *   id = "drupal_variable",
- *   label = @Translation("Drupal variable."),
- *   description = @Translation("Wrapper for <a href='https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Component%21Utility%21Variable.php/class/Variable/8'>Drupal Variable</a> class.")
- * )
- */
-class DrupalVariable extends DevelDumperBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function export($input, $name = NULL) {
-    $name = $name ? $name . ' => ' : '';
-    $dump = Variable::export($input);
-    // Run Xss::filterAdmin on the resulting string to prevent
-    // cross-site-scripting (XSS) vulnerabilities.
-    $dump = Xss::filterAdmin($dump);
-    $dump = '<pre>' . $name . $dump . '</pre>';
-    return $this->setSafeMarkup($dump);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function exportAsRenderable($input, $name = NULL) {
-    $output['container'] = [
-      '#type' => 'details',
-      '#title' => $name ? : $this->t('Variable'),
-      '#attached' => [
-        'library' => ['devel/devel']
-      ],
-      '#attributes' => [
-        'class' => ['container-inline', 'devel-dumper', 'devel-selectable'],
-      ],
-      'export' => [
-        '#markup' => $this->export($input),
-      ],
-    ];
-
-    return $output;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function checkRequirements() {
-    return TRUE;
-  }
-
-}
diff --git a/modules/devel/src/Plugin/Devel/Dumper/FirePhp.php b/modules/devel/src/Plugin/Devel/Dumper/FirePhp.php
deleted file mode 100644
index 9140d00..0000000
--- a/modules/devel/src/Plugin/Devel/Dumper/FirePhp.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Devel\Dumper;
-
-use Drupal\devel\DevelDumperBase;
-
-/**
- * Provides a FirePhp dumper plugin.
- *
- * @DevelDumper(
- *   id = "firephp",
- *   label = @Translation("FirePhp"),
- *   description = @Translation("Wrapper for <a href='http://www.firephp.org'>FirePhp</a> debugging tool.")
- * )
- */
-class FirePhp extends DevelDumperBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function dump($input, $name = NULL) {
-    $fb = new \FB();
-    $fb->dump($name, $input);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function export($input, $name = NULL) {
-    $this->dump($input);
-    return $this->t('Dump was redirected to the console.');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function checkRequirements() {
-    return class_exists('FirePHP', TRUE);
-  }
-
-}
diff --git a/modules/devel/src/Plugin/Devel/Dumper/VarDumper.php b/modules/devel/src/Plugin/Devel/Dumper/VarDumper.php
deleted file mode 100644
index 59200fa..0000000
--- a/modules/devel/src/Plugin/Devel/Dumper/VarDumper.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Devel\Dumper;
-
-use Drupal\devel\DevelDumperBase;
-use Symfony\Component\VarDumper\Cloner\VarCloner;
-use Symfony\Component\VarDumper\Dumper\CliDumper;
-use Symfony\Component\VarDumper\Dumper\HtmlDumper;
-
-/**
- * Provides a Symfony VarDumper dumper plugin.
- *
- * @DevelDumper(
- *   id = "var_dumper",
- *   label = @Translation("Symfony var-dumper"),
- *   description = @Translation("Wrapper for <a href='https://github.com/symfony/var-dumper'>Symfony var-dumper</a> debugging tool."),
- * )
- *
- */
-class VarDumper extends DevelDumperBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function export($input, $name = NULL) {
-    $cloner = new VarCloner();
-    $dumper = 'cli' === PHP_SAPI ? new CliDumper() : new HtmlDumper();
-
-    $output = fopen('php://memory', 'r+b');
-    $dumper->dump($cloner->cloneVar($input), $output);
-    $output = stream_get_contents($output, -1, 0);
-
-    if ($name) {
-      $output = $name . ' => ' . $output;
-    }
-
-    return $this->setSafeMarkup($output);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function checkRequirements() {
-    return class_exists('Symfony\Component\VarDumper\Cloner\VarCloner', TRUE);
-  }
-
-}
diff --git a/modules/devel/src/Plugin/Mail/DevelMailLog.php b/modules/devel/src/Plugin/Mail/DevelMailLog.php
deleted file mode 100644
index 16cafc1..0000000
--- a/modules/devel/src/Plugin/Mail/DevelMailLog.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Mail;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Mail\MailFormatHelper;
-use Drupal\Core\Mail\MailInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Site\Settings;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Defines a mail backend that saves emails as temporary files.
- *
- * To enable, save a variable in settings.php (or otherwise) whose value
- * can be as simple as:
- * @code
- * $config['system.mail']['interface']['default'] = 'devel_mail_log';
- * @endcode
- *
- * By default the mails are saved in 'temporary://devel-mails'. This setting
- * can be changed using 'debug_mail_directory' config setting. For example,
- * @code
- * $config['devel.settings']['debug_mail_directory'] = 'temporary://my-directory';
- * @endcode
- *
- * The default filename pattern used is '%to-%subject-%datetime.mail.txt'. This
- * setting can be changed using 'debug_mail_directory' config setting. For example,
- * @code
- * $config['devel.settings']['debug_mail_file_format'] = 'devel-mail-%to-%subject-%datetime.mail.txt';
- * @endcode
- *
- * The following placeholders can be used in the filename pattern:
- *   - %to: the email recipient.
- *   - %subject: the email subject.
- *   - %datetime: the current datetime in 'y-m-d_his' format.
- *
- * @Mail(
- *   id = "devel_mail_log",
- *   label = @Translation("Devel Logging Mailer"),
- *   description = @Translation("Outputs the message as a file in the temporary directory.")
- * )
- */
-class DevelMailLog implements MailInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * The devel.settings config object.
-   *
-   * @var \Drupal\Core\Config\Config;
-   */
-  protected $config;
-
-  /**
-   * Constructs a new DevelMailLog object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory) {
-    $this->config = $config_factory->get('devel.settings');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('config.factory')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function mail(array $message) {
-    $directory = $this->config->get('debug_mail_directory');
-
-    if (!$this->prepareDirectory($directory)) {
-      return FALSE;
-    }
-
-    $pattern = $this->config->get('debug_mail_file_format');
-    $filename = $this->replacePlaceholders($pattern, $message);
-    $output = $this->composeMessage($message);
-
-    return (bool) file_put_contents($directory . '/' . $filename, $output);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function format(array $message) {
-    // Join the body array into one string.
-    $message['body'] = implode("\n\n", $message['body']);
-
-    // Convert any HTML to plain-text.
-    $message['body'] = MailFormatHelper::htmlToText($message['body']);
-    // Wrap the mail body for sending.
-    $message['body'] = MailFormatHelper::wrapMail($message['body']);
-
-    return $message;
-  }
-
-  /**
-   * Compose the output message.
-   *
-   * @param array $message
-   *   A message array, as described in hook_mail_alter().
-   *
-   * @return string
-   *   The output message.
-   */
-  protected function composeMessage($message) {
-    $mimeheaders = [];
-    $message['headers']['To'] = $message['to'];
-    foreach ($message['headers'] as $name => $value) {
-      $mimeheaders[] = $name . ': ' . Unicode::mimeHeaderEncode($value);
-    }
-
-    $line_endings = Settings::get('mail_line_endings', PHP_EOL);
-    $output = join($line_endings, $mimeheaders) . $line_endings;
-    // 'Subject:' is a mail header and should not be translated.
-    $output .= 'Subject: ' . $message['subject'] . $line_endings;
-    // Blank line to separate headers from body.
-    $output .= $line_endings;
-    $output .= preg_replace('@\r?\n@', $line_endings, $message['body']);
-    return $output;
-  }
-
-  /**
-   * Replaces placeholders with sanitized values in a string.
-   *
-   * @param $filename
-   *   The string that contains the placeholders. The following placeholders
-   *   are considered in the replacement:
-   *   - %to: replaced by the email recipient value.
-   *   - %subject: replaced by the email subject value.
-   *   - %datetime: replaced by the current datetime in 'y-m-d_his' format.
-   * @param array $message
-   *   A message array, as described in hook_mail_alter().
-   *
-   * @return string
-   *   The formatted string.
-   */
-  protected function replacePlaceholders($filename, $message) {
-    $tokens = [
-      '%to' => $message['to'],
-      '%subject' => $message['subject'],
-      '%datetime' => date('y-m-d_his'),
-    ];
-    $filename = str_replace(array_keys($tokens), array_values($tokens), $filename);
-    return preg_replace('/[^a-zA-Z0-9_\-\.@]/', '_', $filename);
-  }
-
-  /**
-   * Checks that the directory exists and is writable.
-   * Public directories will be protected by adding an .htaccess which
-   * indicates that the directory is private.
-   *
-   * @param $directory
-   *   A string reference containing the name of a directory path or URI.
-   *
-   * @return bool
-   *   TRUE if the directory exists (or was created), is writable and is
-   *   protected (if it is public). FALSE otherwise.
-   */
-  protected function prepareDirectory($directory) {
-    if (!file_prepare_directory($directory, FILE_CREATE_DIRECTORY)) {
-      return FALSE;
-    }
-    if (0 === strpos($directory, 'public://')) {
-      return file_save_htaccess($directory);
-    }
-
-    return TRUE;
-  }
-
-}
diff --git a/modules/devel/src/Plugin/Menu/DestinationMenuLink.php b/modules/devel/src/Plugin/Menu/DestinationMenuLink.php
deleted file mode 100644
index 4edf1c3..0000000
--- a/modules/devel/src/Plugin/Menu/DestinationMenuLink.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Menu;
-
-use Drupal\Core\Menu\MenuLinkDefault;
-use Drupal\Core\Url;
-
-/**
- * Modifies the menu link to add destination.
- */
-class DestinationMenuLink extends MenuLinkDefault {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOptions() {
-    $options = parent::getOptions();
-    // Append the current path as destination to the query string.
-    $options['query']['destination'] = Url::fromRoute('<current>')->toString();
-    return $options;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @todo Make cacheable once https://www.drupal.org/node/2582797 lands.
-   */
-  public function getCacheMaxAge() {
-    return 0;
-  }
-
-}
diff --git a/modules/devel/src/Plugin/Menu/MenuItemMenuLink.php b/modules/devel/src/Plugin/Menu/MenuItemMenuLink.php
deleted file mode 100644
index 1dd26e5..0000000
--- a/modules/devel/src/Plugin/Menu/MenuItemMenuLink.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Menu;
-
-/**
- * Modifies the menu link to add current route path.
- *
- * @deprecated in Devel 8.1.0-beta1, will be removed before Devel 8.1.0.
- *   Use \Drupal\devel\Plugin\Menu\RouteDetailMenuLink instead.
- */
-class MenuItemMenuLink extends RouteDetailMenuLink {}
diff --git a/modules/devel/src/Plugin/Menu/RouteDetailMenuLink.php b/modules/devel/src/Plugin/Menu/RouteDetailMenuLink.php
deleted file mode 100644
index 9229918..0000000
--- a/modules/devel/src/Plugin/Menu/RouteDetailMenuLink.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\devel\Plugin\Menu;
-
-use Drupal\Core\Menu\MenuLinkDefault;
-use Drupal\Core\Url;
-
-/**
- * Modifies the menu link to add current route path.
- */
-class RouteDetailMenuLink extends MenuLinkDefault {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOptions() {
-    $options = parent::getOptions();
-    $options['query']['path'] = '/' . Url::fromRoute('<current>')->getInternalPath();
-    return $options;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheMaxAge() {
-    return 0;
-  }
-
-}
diff --git a/modules/devel/src/Render/FilteredMarkup.php b/modules/devel/src/Render/FilteredMarkup.php
deleted file mode 100644
index d43c0d5..0000000
--- a/modules/devel/src/Render/FilteredMarkup.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Drupal\devel\Render;
-
-use Drupal\Component\Render\MarkupInterface;
-use Drupal\Component\Render\MarkupTrait;
-
-/**
- * Defines an object that passes safe strings through the Devel system.
- *
- * This object should only be constructed with a known safe string. If there is
- * any risk that the string contains user-entered data that has not been
- * filtered first, it must not be used.
- *
- * @internal
- *   This object is marked as internal because it should only be used in the
- *   Devel module.
- * @see \Drupal\Core\Render\Markup
- */
-final class FilteredMarkup implements MarkupInterface, \Countable {
-  use MarkupTrait;
-
-}
\ No newline at end of file
diff --git a/modules/devel/src/Routing/RouteSubscriber.php b/modules/devel/src/Routing/RouteSubscriber.php
deleted file mode 100644
index e8ea49b..0000000
--- a/modules/devel/src/Routing/RouteSubscriber.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-namespace Drupal\devel\Routing;
-
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Routing\RouteSubscriberBase;
-use Drupal\Core\Routing\RoutingEvents;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * Subscriber for Devel routes.
- *
- * @see \Drupal\devel\Controller\EntityDebugController
- * @see \Drupal\devel\Plugin\Derivative\DevelLocalTask
- */
-class RouteSubscriber extends RouteSubscriberBase {
-
-  /**
-   * The entity type manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Constructs a new RouteSubscriber object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
-   *   The entity type manager.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_manager) {
-    $this->entityTypeManager = $entity_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function alterRoutes(RouteCollection $collection) {
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      if ($route = $this->getEntityLoadRoute($entity_type)) {
-        $collection->add("entity.$entity_type_id.devel_load", $route);
-      }
-      if ($route = $this->getEntityRenderRoute($entity_type)) {
-        $collection->add("entity.$entity_type_id.devel_render", $route);
-      }
-      if ($route = $this->getEntityTypeDefinitionRoute($entity_type)) {
-        $collection->add("entity.$entity_type_id.devel_definition", $route);
-      }
-    }
-  }
-
-  /**
-   * Gets the entity load route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getEntityLoadRoute(EntityTypeInterface $entity_type) {
-    if ($devel_load = $entity_type->getLinkTemplate('devel-load')) {
-      $entity_type_id = $entity_type->id();
-      $route = new Route($devel_load);
-      $route
-        ->addDefaults([
-          '_controller' => '\Drupal\devel\Controller\EntityDebugController::entityLoad',
-          '_title' => 'Devel Load',
-        ])
-        ->addRequirements([
-          '_permission' => 'access devel information',
-        ])
-        ->setOption('_admin_route', TRUE)
-        ->setOption('_devel_entity_type_id', $entity_type_id)
-        ->setOption('parameters', [
-          $entity_type_id => ['type' => 'entity:' . $entity_type_id],
-        ]);
-
-      return $route;
-    }
-  }
-
-  /**
-   * Gets the entity render route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getEntityRenderRoute(EntityTypeInterface $entity_type) {
-    if ($devel_render = $entity_type->getLinkTemplate('devel-render')) {
-      $entity_type_id = $entity_type->id();
-      $route = new Route($devel_render);
-      $route
-        ->addDefaults([
-          '_controller' => '\Drupal\devel\Controller\EntityDebugController::entityRender',
-          '_title' => 'Devel Render',
-        ])
-        ->addRequirements([
-          '_permission' => 'access devel information'
-        ])
-        ->setOption('_admin_route', TRUE)
-        ->setOption('_devel_entity_type_id', $entity_type_id)
-        ->setOption('parameters', [
-          $entity_type_id => ['type' => 'entity:' . $entity_type_id],
-        ]);
-
-      return $route;
-    }
-  }
-
-  /**
-   * Gets the entity type definition route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getEntityTypeDefinitionRoute(EntityTypeInterface $entity_type) {
-    if ($devel_definition = $entity_type->getLinkTemplate('devel-definition')) {
-      $entity_type_id = $entity_type->id();
-      $route = new Route($devel_definition);
-      $route
-        ->addDefaults([
-          '_controller' => '\Drupal\devel\Controller\EntityDebugController::entityTypeDefinition',
-          '_title' => 'Entity type definition',
-        ])
-        ->addRequirements([
-          '_permission' => 'access devel information'
-        ])
-        ->setOption('_admin_route', TRUE)
-        ->setOption('_devel_entity_type_id', $entity_type_id)
-        ->setOption('parameters', [
-          $entity_type_id => ['type' => 'entity:' . $entity_type_id],
-        ]);
-
-      return $route;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    $events = parent::getSubscribedEvents();
-    $events[RoutingEvents::ALTER] = ['onAlterRoutes', 100];
-    return $events;
-  }
-
-}
diff --git a/modules/devel/src/ToolbarHandler.php b/modules/devel/src/ToolbarHandler.php
deleted file mode 100644
index 0d7cbcd..0000000
--- a/modules/devel/src/ToolbarHandler.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-namespace Drupal\devel;
-
-use Drupal\Core\Cache\CacheableMetadata;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Menu\MenuLinkTreeInterface;
-use Drupal\Core\Menu\MenuTreeParameters;
-use Drupal\Core\Session\AccountProxyInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Toolbar integration handler.
- */
-class ToolbarHandler implements ContainerInjectionInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * The menu link tree service.
-   *
-   * @var \Drupal\Core\Menu\MenuLinkTreeInterface
-   */
-  protected $menuLinkTree;
-
-  /**
-   * The devel toolbar config.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $config;
-
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountProxyInterface
-   */
-  protected $account;
-
-  /**
-   * ToolbarHandler constructor.
-   *
-   * @param \Drupal\Core\Menu\MenuLinkTreeInterface $menu_link_tree
-   *   The menu link tree service.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   * @param \Drupal\Core\Session\AccountProxyInterface $account
-   *   The current user.
-   */
-  public function __construct(MenuLinkTreeInterface $menu_link_tree, ConfigFactoryInterface $config_factory, AccountProxyInterface $account) {
-    $this->menuLinkTree = $menu_link_tree;
-    $this->config = $config_factory->get('devel.toolbar.settings');
-    $this->account = $account;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('toolbar.menu_tree'),
-      $container->get('config.factory'),
-      $container->get('current_user')
-    );
-  }
-
-  /**
-   * Hook bridge.
-   *
-   * @return array
-   *   The devel toolbar items render array.
-   *
-   * @see hook_toolbar()
-   */
-  public function toolbar() {
-    $items['devel'] = [
-      '#cache' => [
-        'contexts' => ['user.permissions'],
-      ],
-    ];
-
-    if ($this->account->hasPermission('access devel information')) {
-      $items['devel'] += [
-        '#type' => 'toolbar_item',
-        '#weight' => 999,
-        'tab' => [
-          '#type' => 'link',
-          '#title' => $this->t('Devel'),
-          '#url' => Url::fromRoute('devel.admin_settings'),
-          '#attributes' => [
-            'title' => $this->t('Development menu'),
-            'class' => ['toolbar-icon', 'toolbar-icon-devel'],
-          ],
-        ],
-        'tray' => [
-          '#heading' => $this->t('Development menu'),
-          'devel_menu' => [
-            // Currently devel menu is uncacheable, so instead of poisoning the
-            // entire page cache we use a lazy builder.
-            // @see \Drupal\devel\Plugin\Menu\DestinationMenuLink
-            // @see \Drupal\devel\Plugin\Menu\RouteDetailMenuItem
-            '#lazy_builder' => [ToolbarHandler::class . ':lazyBuilder', []],
-            // Force the creation of the placeholder instead of rely on the
-            // automatical placeholdering or otherwise the page results
-            // uncacheable when max-age 0 is bubbled up.
-            '#create_placeholder' => TRUE,
-          ],
-          'configuration' => [
-            '#type' => 'link',
-            '#title' => $this->t('Configure'),
-            '#url' => Url::fromRoute('devel.toolbar.settings_form'),
-            '#options' => [
-              'attributes' => ['class' => ['edit-devel-toolbar']],
-            ],
-          ],
-        ],
-        '#attached' => [
-          'library' => 'devel/devel-toolbar',
-        ],
-      ];
-    }
-
-    return $items;
-  }
-
-  /**
-   * Lazy builder callback for the devel menu toolbar.
-   *
-   * @return array
-   *   The renderable array rapresentation of the devel menu.
-   */
-  public function lazyBuilder() {
-    $parameters = new MenuTreeParameters();
-    $parameters->onlyEnabledLinks()->setTopLevelOnly();
-
-    $tree = $this->menuLinkTree->load('devel', $parameters);
-
-    $manipulators = [
-      ['callable' => 'menu.default_tree_manipulators:checkAccess'],
-      ['callable' => 'menu.default_tree_manipulators:generateIndexAndSort'],
-      ['callable' => ToolbarHandler::class . ':processTree'],
-    ];
-    $tree = $this->menuLinkTree->transform($tree, $manipulators);
-
-    $build = $this->menuLinkTree->build($tree);
-
-    CacheableMetadata::createFromRenderArray($build)
-      ->addCacheableDependency($this->config)
-      ->applyTo($build);
-
-    return $build;
-  }
-
-  /**
-   * Adds toolbar-specific attributes to the menu link tree.
-   *
-   * @param \Drupal\Core\Menu\MenuLinkTreeElement[] $tree
-   *   The menu link tree to manipulate.
-   *
-   * @return \Drupal\Core\Menu\MenuLinkTreeElement[]
-   *   The manipulated menu link tree.
-   */
-  public function processTree(array $tree) {
-    $visible_items = $this->config->get('toolbar_items') ?: [];
-
-    foreach ($tree as $element) {
-      $plugin_id = $element->link->getPluginId();
-      if (!in_array($plugin_id, $visible_items)) {
-        // Add a class that allow to hide the non prioritized menu items when
-        // the toolbar has horizontal orientation.
-        $element->options['attributes']['class'][] = 'toolbar-horizontal-item-hidden';
-      }
-    }
-
-    return $tree;
-  }
-
-}
diff --git a/modules/devel/src/Twig/Extension/Debug.php b/modules/devel/src/Twig/Extension/Debug.php
deleted file mode 100644
index 9922e61..0000000
--- a/modules/devel/src/Twig/Extension/Debug.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-
-namespace Drupal\devel\Twig\Extension;
-
-use Drupal\devel\DevelDumperManagerInterface;
-
-/**
- * Provides the Devel debugging function within Twig templates.
- *
- * NOTE: This extension doesn't do anything unless twig_debug is enabled.
- * The twig_debug setting is read from the Twig environment, not Drupal
- * Settings, so a container rebuild is necessary when toggling twig_debug on
- * and off.
- */
-class Debug extends \Twig_Extension {
-
-  /**
-   * The devel dumper service.
-   *
-   * @var \Drupal\devel\DevelDumperManagerInterface
-   */
-  protected $dumper;
-
-  /**
-   * Constructs a Debug object.
-   *
-   * @param \Drupal\devel\DevelDumperManagerInterface $dumper
-   *   The devel dumper service.
-   */
-  public function __construct(DevelDumperManagerInterface $dumper) {
-    $this->dumper = $dumper;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'devel_debug';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFunctions() {
-    $functions = [];
-
-    foreach (['devel_dump', 'kpr'] as $function) {
-      $functions[] = new \Twig_SimpleFunction($function, [$this, 'dump'], [
-        'is_safe' => ['html'],
-        'needs_environment' => TRUE,
-        'needs_context' => TRUE,
-        'is_variadic' => TRUE,
-      ]);
-    }
-
-    foreach (['devel_message', 'dpm', 'dsm'] as $function) {
-      $functions[] = new \Twig_SimpleFunction($function, [$this, 'message'], [
-        'is_safe' => ['html'],
-        'needs_environment' => TRUE,
-        'needs_context' => TRUE,
-        'is_variadic' => TRUE,
-      ]);
-    }
-
-    foreach (['devel_breakpoint'] as $function) {
-      $functions[] = new \Twig_SimpleFunction($function, [$this, 'breakpoint'], [
-        'needs_environment' => TRUE,
-        'needs_context' => TRUE,
-        'is_variadic' => TRUE,
-      ]);
-    }
-
-    return $functions;
-  }
-
-  /**
-   * Provides debug function to Twig templates.
-   *
-   * Handles 0, 1, or multiple arguments.
-   *
-   * @param \Twig_Environment $env
-   *   The twig environment instance.
-   * @param array $context
-   *   An array of parameters passed to the template.
-   * @param array $args
-   *   An array of parameters passed the function.
-   *
-   * @return string
-   *   String representation of the input variables.
-   *
-   * @see \Drupal\devel\DevelDumperManager::dump()
-   */
-  public function dump(\Twig_Environment $env, array $context, array $args = []) {
-    if (!$env->isDebug()) {
-      return;
-    }
-
-    ob_start();
-
-    // No arguments passed, display full Twig context.
-    if (empty($args)) {
-      $context_variables = $this->getContextVariables($context);
-      $this->dumper->dump($context_variables, 'Twig context');
-    }
-    else {
-      foreach ($args as $variable) {
-        $this->dumper->dump($variable);
-      }
-    }
-
-    return ob_get_clean();
-  }
-
-  /**
-   * Provides debug function to Twig templates.
-   *
-   * Handles 0, 1, or multiple arguments.
-   *
-   * @param \Twig_Environment $env
-   *   The twig environment instance.
-   * @param array $context
-   *   An array of parameters passed to the template.
-   * @param array $args
-   *   An array of parameters passed the function.
-   *
-   * @return void
-   *
-   * @see \Drupal\devel\DevelDumperManager::message()
-   */
-  public function message(\Twig_Environment $env, array $context, array $args = []) {
-    if (!$env->isDebug()) {
-      return;
-    }
-
-    // No arguments passed, display full Twig context.
-    if (empty($args)) {
-      $context_variables = $this->getContextVariables($context);
-      $this->dumper->message($context_variables, 'Twig context');
-    }
-    else {
-      foreach ($args as $variable) {
-        $this->dumper->message($variable);
-      }
-    }
-
-  }
-
-  /**
-   * Provides XDebug integration for Twig templates.
-   *
-   * To use this features simply put the following statement in the template
-   * of interest:
-   *
-   * @code
-   * {{ devel_breakpoint() }}
-   * @endcode
-   *
-   * When the template is evaluated is made a call to a dedicated method in
-   * devel twig debug extension in which is used xdebug_break(), that emits a
-   * breakpoint to the debug client (the debugger break on the specific line as
-   * if a normal file/line breakpoint was set on this line).
-   * In this way you'll be able to inspect any variables available in the
-   * template (environment, context, specific variables etc..) in your IDE.
-   *
-   * @param \Twig_Environment $env
-   *   The twig environment instance.
-   * @param array $context
-   *   An array of parameters passed to the template.
-   * @param array $args
-   *   An array of parameters passed the function.
-   */
-  public function breakpoint(\Twig_Environment $env, array $context, array $args = []) {
-    if (!$env->isDebug()) {
-      return;
-    }
-
-    if (function_exists('xdebug_break')) {
-      xdebug_break();
-    }
-  }
-
-  /**
-   * Filters the Twig context variable.
-   *
-   * @param array $context
-   *  The Twig context.
-   *
-   * @return array
-   *   An array Twig context variables.
-   */
-  protected function getContextVariables(array $context) {
-    $context_variables = [];
-    foreach ($context as $key => $value) {
-      if (!$value instanceof \Twig_Template) {
-        $context_variables[$key] = $value;
-      }
-    }
-    return $context_variables;
-  }
-
-}
diff --git a/modules/devel/tests/modules/devel_dumper_test/css/devel_dumper_test.css b/modules/devel/tests/modules/devel_dumper_test/css/devel_dumper_test.css
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.info.yml b/modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.info.yml
deleted file mode 100644
index 265aeb3..0000000
--- a/modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: 'Devel dumper test module'
-type: module
-description: 'Test pluggable dumpers.'
-package: Testing
-# version: VERSION
-# core: 8.x
-
-# Information added by Drupal.org packaging script on 2017-10-05
-version: '8.x-1.2'
-core: '8.x'
-project: 'devel'
-datestamp: 1507197848
diff --git a/modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.libraries.yml b/modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.libraries.yml
deleted file mode 100644
index 8e8c2ad..0000000
--- a/modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.libraries.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-devel_dumper_test:
-  version: 0
-  css:
-    theme:
-      css/devel_dumper_test.css: {}
-  js:
-    js/devel_dumper_test.js: {}
diff --git a/modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.routing.yml b/modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.routing.yml
deleted file mode 100644
index 650b337..0000000
--- a/modules/devel/tests/modules/devel_dumper_test/devel_dumper_test.routing.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-devel_dumper_test.dump:
-  path: '/devel_dumper_test/dump'
-  defaults:
-    _controller: '\Drupal\devel_dumper_test\Controller\DumperTestController::dump'
-    _title: 'Devel Dumper Test'
-  requirements:
-    _permission: 'access devel information'
-
-devel_dumper_test.message:
-  path: '/devel_dumper_test/message'
-  defaults:
-    _controller: '\Drupal\devel_dumper_test\Controller\DumperTestController::message'
-    _title: 'Devel Dumper Test'
-  requirements:
-    _permission: 'access devel information'
-
-devel_dumper_test.export:
-  path: '/devel_dumper_test/export'
-  defaults:
-    _controller: '\Drupal\devel_dumper_test\Controller\DumperTestController::export'
-    _title: 'Devel Dumper Test'
-  requirements:
-    _permission: 'access devel information'
-
-devel_dumper_test.export_renderable:
-  path: '/devel_dumper_test/export_renderable'
-  defaults:
-    _controller: '\Drupal\devel_dumper_test\Controller\DumperTestController::exportRenderable'
-    _title: 'Devel Dumper Test'
-  requirements:
-    _permission: 'access devel information'
-
-devel_dumper_test.debug:
-  path: '/devel_dumper_test/debug'
-  defaults:
-    _controller: '\Drupal\devel_dumper_test\Controller\DumperTestController::debug'
-    _title: 'Devel Dumper Test'
-  requirements:
-    _access: 'TRUE'
diff --git a/modules/devel/tests/modules/devel_dumper_test/js/devel_dumper_test.js b/modules/devel/tests/modules/devel_dumper_test/js/devel_dumper_test.js
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/devel/tests/modules/devel_dumper_test/src/Controller/DumperTestController.php b/modules/devel/tests/modules/devel_dumper_test/src/Controller/DumperTestController.php
deleted file mode 100644
index 2a78e6e..0000000
--- a/modules/devel/tests/modules/devel_dumper_test/src/Controller/DumperTestController.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Drupal\devel_dumper_test\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\devel\DevelDumperManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Class DumperTestController
- */
-class DumperTestController  extends ControllerBase {
-
-  /**
-   * The dumper manager.
-   *
-   * @var \Drupal\devel\DevelDumperManagerInterface
-   */
-  protected $dumper;
-
-  /**
-   * Constructs a new DumperTestController object.
-   *
-   * @param \Drupal\devel\DevelDumperManagerInterface $devel_dumper_manager
-   *   The dumper manager.
-   */
-  public function __construct(DevelDumperManagerInterface $devel_dumper_manager) {
-    $this->dumper = $devel_dumper_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('devel.dumper')
-    );
-  }
-
-  /**
-   * @return array
-   */
-  public function dump() {
-    $this->dumper->dump('Test output');
-
-    return [
-      '#markup' => 'test',
-    ];
-  }
-
-  /**
-   * @return array
-   */
-  public function message() {
-    $this->dumper->message('Test output');
-
-    return [
-      '#markup' => 'test',
-    ];
-  }
-
-  /**
-   * @return array
-   */
-  public function debug() {
-    $this->dumper->debug('Test output');
-
-    return [
-      '#markup' => 'test',
-    ];
-  }
-
-  /**
-   * @return array
-   */
-  public function export() {
-    return [
-      '#markup' => $this->dumper->export('Test output'),
-    ];
-  }
-
-  /**
-   * @return array
-   */
-  public function exportRenderable() {
-    return $this->dumper->exportAsRenderable('Test output');
-  }
-
-}
diff --git a/modules/devel/tests/modules/devel_dumper_test/src/Plugin/Devel/Dumper/AvailableTestDumper.php b/modules/devel/tests/modules/devel_dumper_test/src/Plugin/Devel/Dumper/AvailableTestDumper.php
deleted file mode 100644
index b15f567..0000000
--- a/modules/devel/tests/modules/devel_dumper_test/src/Plugin/Devel/Dumper/AvailableTestDumper.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Drupal\devel_dumper_test\Plugin\Devel\Dumper;
-
-use Drupal\devel\DevelDumperBase;
-
-/**
- * Provides a AvailableTestDumper plugin.
- *
- * @DevelDumper(
- *   id = "available_test_dumper",
- *   label = @Translation("Available test dumper."),
- *   description = @Translation("Drupal dumper for testing purposes (available).")
- * )
- */
-class AvailableTestDumper extends DevelDumperBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function dump($input, $name = NULL) {
-    // Add a predetermined string to $input to check if this dumper has been
-    // selected successfully.
-    $input = '<pre>' . 'AvailableTestDumper::dump() ' . $input . '</pre>';
-    echo $input;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function export($input, $name = NULL) {
-    // Add a predetermined string to $input to check if this dumper has been
-    // selected successfully.
-    $input = '<pre>' . 'AvailableTestDumper::export() ' . $input . '</pre>';
-    return $this->setSafeMarkup($input);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function exportAsRenderable($input, $name = NULL) {
-    // Add a predetermined string to $input to check if this dumper has been
-    // selected successfully.
-    $input = '<pre>' . 'AvailableTestDumper::exportAsRenderable() ' . $input . '</pre>';
-
-    return [
-      '#attached' => [
-        'library' => ['devel_dumper_test/devel_dumper_test']
-      ],
-      '#markup' => $this->setSafeMarkup($input),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function checkRequirements() {
-    return TRUE;
-  }
-}
diff --git a/modules/devel/tests/modules/devel_dumper_test/src/Plugin/Devel/Dumper/NotAvailableTestDumper.php b/modules/devel/tests/modules/devel_dumper_test/src/Plugin/Devel/Dumper/NotAvailableTestDumper.php
deleted file mode 100644
index 2b0d886..0000000
--- a/modules/devel/tests/modules/devel_dumper_test/src/Plugin/Devel/Dumper/NotAvailableTestDumper.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\devel_dumper_test\Plugin\Devel\Dumper;
-
-use Drupal\devel\DevelDumperBase;
-
-/**
- * Provides a NotAvailableTestDumper plugin.
- *
- * @DevelDumper(
- *   id = "not_available_test_dumper",
- *   label = @Translation("Not available test dumper."),
- *   description = @Translation("Drupal dumper for testing purposes (not available).")
- * )
- */
-class NotAvailableTestDumper extends DevelDumperBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function dump($input, $name = NULL) {
-    $input = '<pre>' . $input . '</pre>';
-    echo $input;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function export($input, $name = NULL) {
-    $input = '<pre>' . $input . '</pre>';
-    return $this->setSafeMarkup($input);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function checkRequirements() {
-    return FALSE;
-  }
-
-}
diff --git a/modules/devel/tests/modules/devel_entity_test/devel_entity_test.info.yml b/modules/devel/tests/modules/devel_entity_test/devel_entity_test.info.yml
deleted file mode 100644
index 4b01554..0000000
--- a/modules/devel/tests/modules/devel_entity_test/devel_entity_test.info.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: 'Devel entity test module'
-type: module
-description: 'Provides entity types for Devel tests.'
-package: Testing
-# version: VERSION
-# core: 8.x
-dependencies:
-  - field
-  - text
-  - entity_test
-
-# Information added by Drupal.org packaging script on 2017-10-05
-version: '8.x-1.2'
-core: '8.x'
-project: 'devel'
-datestamp: 1507197848
diff --git a/modules/devel/tests/modules/devel_entity_test/devel_entity_test.links.task.yml b/modules/devel/tests/modules/devel_entity_test/devel_entity_test.links.task.yml
deleted file mode 100644
index 052baa9..0000000
--- a/modules/devel/tests/modules/devel_entity_test/devel_entity_test.links.task.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-devel_entity_test.local_tasks:
-  deriver: 'Drupal\devel_entity_test\Plugin\Derivative\DevelEntityTestLocalTasks'
diff --git a/modules/devel/tests/modules/devel_entity_test/devel_entity_test.module b/modules/devel/tests/modules/devel_entity_test/devel_entity_test.module
deleted file mode 100644
index 4be887b..0000000
--- a/modules/devel/tests/modules/devel_entity_test/devel_entity_test.module
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @file
- * Test module for the entity API providing several entity types for testing.
- */
-
-/**
- * Implements hook_entity_view_mode_info_alter().
- */
-function devel_entity_test_entity_view_mode_info_alter(&$view_modes) {
-  $entity_info = \Drupal::entityTypeManager()->getDefinitions();
-  foreach ($entity_info as $entity_type => $info) {
-    if ($entity_info[$entity_type]->getProvider() == 'devel_entity_test_canonical' && !isset($view_modes[$entity_type])) {
-      $view_modes[$entity_type] = array(
-        'full' => array(
-          'label' => t('Full object'),
-          'status' => TRUE,
-          'cache' => TRUE,
-        ),
-        'teaser' => array(
-          'label' => t('Teaser'),
-          'status' => TRUE,
-          'cache' => TRUE,
-        ),
-      );
-    }
-  }
-}
diff --git a/modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestCanonical.php b/modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestCanonical.php
deleted file mode 100644
index e7ed04f..0000000
--- a/modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestCanonical.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\devel_entity_test\Entity;
-
-use Drupal\entity_test\Entity\EntityTest;
-
-/**
- * Defines the test entity class.
- *
- * @ContentEntityType(
- *   id = "devel_entity_test_canonical",
- *   label = @Translation("Devel test entity with canonical link"),
- *   handlers = {
- *     "list_builder" = "Drupal\entity_test\EntityTestListBuilder",
- *     "view_builder" = "Drupal\entity_test\EntityTestViewBuilder",
- *     "access" = "Drupal\entity_test\EntityTestAccessControlHandler",
- *     "form" = {
- *       "default" = "Drupal\entity_test\EntityTestForm",
- *       "delete" = "Drupal\entity_test\EntityTestDeleteForm"
- *     },
- *     "route_provider" = {
- *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
- *     },
- *     "translation" = "Drupal\content_translation\ContentTranslationHandler",
- *     "views_data" = "Drupal\entity_test\EntityTestViewsData"
- *   },
- *   base_table = "devel_entity_test_canonical",
- *   persistent_cache = FALSE,
- *   entity_keys = {
- *     "id" = "id",
- *     "uuid" = "uuid",
- *     "bundle" = "type",
- *     "label" = "name",
- *     "langcode" = "langcode",
- *   },
- *   links = {
- *     "canonical" = "/devel_entity_test_canonical/{devel_entity_test_canonical}",
- *   },
- *   field_ui_base_route = "entity.entity_test.admin_form",
- * )
- */
-class DevelEntityTestCanonical extends EntityTest {
-
-}
diff --git a/modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestEdit.php b/modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestEdit.php
deleted file mode 100644
index 3e310c4..0000000
--- a/modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestEdit.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\devel_entity_test\Entity;
-
-use Drupal\entity_test\Entity\EntityTest;
-
-/**
- * Defines the test entity class.
- *
- * @ContentEntityType(
- *   id = "devel_entity_test_edit",
- *   label = @Translation("Devel test entity with edit form link"),
- *   handlers = {
- *     "list_builder" = "Drupal\entity_test\EntityTestListBuilder",
- *     "view_builder" = "Drupal\entity_test\EntityTestViewBuilder",
- *     "access" = "Drupal\entity_test\EntityTestAccessControlHandler",
- *     "form" = {
- *       "default" = "Drupal\entity_test\EntityTestForm",
- *       "delete" = "Drupal\entity_test\EntityTestDeleteForm"
- *     },
- *     "route_provider" = {
- *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
- *     },
- *     "translation" = "Drupal\content_translation\ContentTranslationHandler",
- *     "views_data" = "Drupal\entity_test\EntityTestViewsData"
- *   },
- *   base_table = "devel_entity_test_edit",
- *   persistent_cache = FALSE,
- *   entity_keys = {
- *     "id" = "id",
- *     "uuid" = "uuid",
- *     "bundle" = "type",
- *     "label" = "name",
- *     "langcode" = "langcode",
- *   },
- *   links = {
- *     "edit-form" = "/devel_entity_test_edit/manage/{devel_entity_test_edit}",
- *   },
- *   field_ui_base_route = "entity.entity_test.admin_form",
- * )
- */
-class DevelEntityTestEdit extends EntityTest {
-
-}
diff --git a/modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestNoLinks.php b/modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestNoLinks.php
deleted file mode 100644
index 0e33af4..0000000
--- a/modules/devel/tests/modules/devel_entity_test/src/Entity/DevelEntityTestNoLinks.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\devel_entity_test\Entity;
-
-use Drupal\entity_test\Entity\EntityTest;
-
-/**
- * Defines the test entity class.
- *
- * @ContentEntityType(
- *   id = "devel_entity_test_no_links",
- *   label = @Translation("Devel test entity with no links"),
- *   handlers = {
- *     "list_builder" = "Drupal\entity_test\EntityTestListBuilder",
- *     "view_builder" = "Drupal\entity_test\EntityTestViewBuilder",
- *     "access" = "Drupal\entity_test\EntityTestAccessControlHandler",
- *     "form" = {
- *       "default" = "Drupal\entity_test\EntityTestForm",
- *       "delete" = "Drupal\entity_test\EntityTestDeleteForm"
- *     },
- *     "route_provider" = {
- *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
- *     },
- *     "translation" = "Drupal\content_translation\ContentTranslationHandler",
- *     "views_data" = "Drupal\entity_test\EntityTestViewsData"
- *   },
- *   base_table = "devel_entity_test_no_links",
- *   persistent_cache = FALSE,
- *   entity_keys = {
- *     "id" = "id",
- *     "uuid" = "uuid",
- *     "bundle" = "type",
- *     "label" = "name",
- *     "langcode" = "langcode",
- *   },
- *   field_ui_base_route = "entity.entity_test.admin_form",
- * )
- */
-class DevelEntityTestNoLinks extends EntityTest {
-
-}
diff --git a/modules/devel/tests/modules/devel_entity_test/src/Plugin/Derivative/DevelEntityTestLocalTasks.php b/modules/devel/tests/modules/devel_entity_test/src/Plugin/Derivative/DevelEntityTestLocalTasks.php
deleted file mode 100644
index 000710a..0000000
--- a/modules/devel/tests/modules/devel_entity_test/src/Plugin/Derivative/DevelEntityTestLocalTasks.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\devel_entity_test\Plugin\Derivative;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-
-/**
- * Defines the local tasks for all the entity_test entities.
- */
-class DevelEntityTestLocalTasks extends DeriverBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    $this->derivatives = array();
-
-    $this->derivatives['devel_entity_test_canonical.canonical'] = array();
-    $this->derivatives['devel_entity_test_canonical.canonical']['base_route'] = "entity.devel_entity_test_canonical.canonical";
-    $this->derivatives['devel_entity_test_canonical.canonical']['route_name'] = "entity.devel_entity_test_canonical.canonical";
-    $this->derivatives['devel_entity_test_canonical.canonical']['title'] = 'View';
-
-    $this->derivatives['devel_entity_test_edit.edit'] = array();
-    $this->derivatives['devel_entity_test_edit.edit']['base_route'] = "entity.devel_entity_test_edit.edit_form";
-    $this->derivatives['devel_entity_test_edit.edit']['route_name'] = "entity.devel_entity_test_edit.edit_form";
-    $this->derivatives['devel_entity_test_edit.edit']['title'] = 'Edit';
-
-    return parent::getDerivativeDefinitions($base_plugin_definition);
-  }
-
-}
diff --git a/modules/devel/tests/modules/devel_test/devel_test.info.yml b/modules/devel/tests/modules/devel_test/devel_test.info.yml
deleted file mode 100644
index 191c825..0000000
--- a/modules/devel/tests/modules/devel_test/devel_test.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: 'Devel test module'
-type: module
-description: 'Support module for Devel testing.'
-package: Testing
-# version: VERSION
-# core: 8.x
-
-# Information added by Drupal.org packaging script on 2017-10-05
-version: '8.x-1.2'
-core: '8.x'
-project: 'devel'
-datestamp: 1507197848
diff --git a/modules/devel/tests/modules/devel_test/devel_test.module b/modules/devel/tests/modules/devel_test/devel_test.module
deleted file mode 100644
index e94fb71..0000000
--- a/modules/devel/tests/modules/devel_test/devel_test.module
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * @file
- * Helper module for devel test.
- */
-
-/**
- * Implements hook_mail().
- */
-function devel_test_mail($key, &$message, $params) {
-  switch ($key) {
-    case 'devel_mail_log':
-      $message['subject'] = $params['subject'];
-      $message['body'][] = $params['body'];
-      $message['headers']['From'] = $params['headers']['from'];
-      $message['headers'] += $params['headers']['additional'];
-      break;
-  }
-}
diff --git a/modules/devel/tests/modules/devel_test/devel_test.routing.yml b/modules/devel/tests/modules/devel_test/devel_test.routing.yml
deleted file mode 100644
index c16a043..0000000
--- a/modules/devel/tests/modules/devel_test/devel_test.routing.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-devel.simple_page:
-  path: '/devel/simple-page'
-  defaults:
-    _controller: '\Drupal\devel_test\Controller\DevelTestController::simplePage'
-    _title: 'Simple Page'
-  requirements:
-    _permission: 'access devel information'
diff --git a/modules/devel/tests/modules/devel_test/devel_test.services.yml b/modules/devel/tests/modules/devel_test/devel_test.services.yml
deleted file mode 100644
index 17fc219..0000000
--- a/modules/devel/tests/modules/devel_test/devel_test.services.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-
-  devel_test.test_route_subscriber:
-    class: Drupal\devel_test\Routing\TestRouteSubscriber
-    tags:
-      - { name: event_subscriber }
diff --git a/modules/devel/tests/modules/devel_test/src/Controller/DevelTestController.php b/modules/devel/tests/modules/devel_test/src/Controller/DevelTestController.php
deleted file mode 100644
index fa2c77e..0000000
--- a/modules/devel/tests/modules/devel_test/src/Controller/DevelTestController.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\devel_test\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-
-/**
- * Returns responses for devel module routes.
- */
-class DevelTestController extends ControllerBase {
-
-  /**
-   * Returns a simple page output.
-   *
-   * @return array
-   *   A render array.
-   */
-  public function simplePage() {
-    return [
-      '#markup' => $this->t('Simple page'),
-    ];
-  }
-
-}
diff --git a/modules/devel/tests/modules/devel_test/src/Routing/TestRouteSubscriber.php b/modules/devel/tests/modules/devel_test/src/Routing/TestRouteSubscriber.php
deleted file mode 100644
index 1bf9332..0000000
--- a/modules/devel/tests/modules/devel_test/src/Routing/TestRouteSubscriber.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Drupal\devel_test\Routing;
-
-use Drupal\Core\Routing\RouteSubscriberBase;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * Router subscriber class for testing purpose.
- */
-class TestRouteSubscriber extends RouteSubscriberBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function alterRoutes(RouteCollection $collection) {
-    \Drupal::state()->set('devel_test_route_rebuild','Router rebuild fired');
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelContainerInfoTest.php b/modules/devel/tests/src/Functional/DevelContainerInfoTest.php
deleted file mode 100644
index c47d773..0000000
--- a/modules/devel/tests/src/Functional/DevelContainerInfoTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Core\Url;
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests container info pages and links.
- *
- * @group devel
- */
-class DevelContainerInfoTest extends BrowserTestBase {
-
-  use DevelWebAssertHelper;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['devel', 'devel_test', 'block'];
-
-  /**
-   * The user for tests.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $develUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->drupalPlaceBlock('local_tasks_block');
-    $this->drupalPlaceBlock('page_title_block');
-
-    $this->develUser = $this->drupalCreateUser(['access devel information']);
-    $this->drupalLogin($this->develUser);
-  }
-
-  /**
-   * Tests container info menu link.
-   */
-  public function testContainerInfoMenuLink() {
-    $this->drupalPlaceBlock('system_menu_block:devel');
-    // Ensures that the events info link is present on the devel menu and that
-    // it points to the correct page.
-    $this->drupalGet('');
-    $this->clickLink('Container Info');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->addressEquals('/devel/container/service');
-    $this->assertSession()->pageTextContains('Container services');
-  }
-
-  /**
-   * Tests service list page.
-   */
-  public function testServiceList() {
-    $this->drupalGet('/devel/container/service');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('Container services');
-    $this->assertContainerInfoLocalTasks();
-
-    $page = $this->getSession()->getPage();
-
-    // Ensures that the services table is found.
-    $table = $page->find('css', 'table.devel-service-list');
-    $this->assertNotNull($table);
-
-    // Ensures that the expected table headers are found.
-    /** @var $headers \Behat\Mink\Element\NodeElement[] */
-    $headers = $table->findAll('css', 'thead th');
-    $this->assertEquals(4, count($headers));
-
-    $expected_headers = ['ID', 'Class', 'Alias', 'Operations'];
-    $actual_headers = array_map(function ($element) {
-      return $element->getText();
-    }, $headers);
-    $this->assertSame($expected_headers, $actual_headers);
-
-    // Ensures that all the serivices are listed in the table.
-    $cached_definition = \Drupal::service('kernel')->getCachedContainerDefinition();
-    $this->assertNotNull($cached_definition);
-    $rows = $table->findAll('css', 'tbody tr');
-    $this->assertEquals(count($cached_definition['services']), count($rows));
-
-    // Tests the presence of some (arbitrarily chosen) services in the table.
-    $expected_services = [
-      'config.factory' => [
-        'class' => 'Drupal\Core\Config\ConfigFactory',
-        'alias' => '',
-      ],
-      'devel.route_subscriber' => [
-        'class' => 'Drupal\devel\Routing\RouteSubscriber',
-        'alias' => '',
-      ],
-      'plugin.manager.element_info' => [
-        'class' => 'Drupal\Core\Render\ElementInfoManager',
-        'alias' => 'element_info',
-      ],
-    ];
-
-    foreach ($expected_services as $service_id => $expected) {
-      $row = $table->find('css', sprintf('tbody tr:contains("%s")', $service_id));
-      $this->assertNotNull($row);
-
-      /** @var $cells \Behat\Mink\Element\NodeElement[] */
-      $cells = $row->findAll('css', 'td');
-      $this->assertEquals(4, count($cells));
-
-      $cell_service_id = $cells[0];
-      $this->assertEquals($service_id, $cell_service_id->getText());
-      $this->assertTrue($cell_service_id->hasClass('table-filter-text-source'));
-
-      $cell_class = $cells[1];
-      $this->assertEquals($expected['class'], $cell_class->getText());
-      $this->assertTrue($cell_class->hasClass('table-filter-text-source'));
-
-      $cell_alias = $cells[2];
-      $this->assertEquals($expected['alias'], $cell_alias->getText());
-      $this->assertTrue($cell_class->hasClass('table-filter-text-source'));
-
-      $cell_operations = $cells[3];
-      $actual_href = $cell_operations->findLink('Devel')->getAttribute('href');
-      $expected_href = Url::fromRoute('devel.container_info.service.detail', ['service_id' => $service_id])->toString();
-      $this->assertEquals($expected_href, $actual_href);
-    }
-
-    // Ensures that the page is accessible ony to users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet('devel/container/service');
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-  /**
-   * Tests service detail page.
-   */
-  public function testServiceDetail() {
-    $service_id = 'devel.dumper';
-
-    // Ensures that the page works as expected.
-    $this->drupalGet("/devel/container/service/$service_id");
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains("Service $service_id detail");
-
-    // Ensures that the page returns a 404 error if the requested service is
-    // not defined.
-    $this->drupalGet('/devel/container/service/not.exists');
-    $this->assertSession()->statusCodeEquals(404);
-
-    // Ensures that the page is accessible ony to users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet("devel/container/service/$service_id");
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-  /**
-   * Tests parameter list page.
-   */
-  public function testParameterList() {
-    // Ensures that the page works as expected.
-    $this->drupalGet('/devel/container/parameter');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('Container parameters');
-    $this->assertContainerInfoLocalTasks();
-
-    $page = $this->getSession()->getPage();
-
-    // Ensures that the parameters table is found.
-    $table = $page->find('css', 'table.devel-parameter-list');
-    $this->assertNotNull($table);
-
-    // Ensures that the expected table headers are found.
-    /** @var $headers \Behat\Mink\Element\NodeElement[] */
-    $headers = $table->findAll('css', 'thead th');
-    $this->assertEquals(2, count($headers));
-
-    $expected_headers = ['Name', 'Operations'];
-    $actual_headers = array_map(function ($element) {
-      return $element->getText();
-    }, $headers);
-    $this->assertSame($expected_headers, $actual_headers);
-
-    // Ensures that all the parameters are listed in the table.
-    $cached_definition = \Drupal::service('kernel')->getCachedContainerDefinition();
-    $this->assertNotNull($cached_definition);
-    $rows = $table->findAll('css', 'tbody tr');
-    $this->assertEquals(count($cached_definition['parameters']), count($rows));
-
-    // Tests the presence of some parameters in the table.
-    $expected_parameters = [
-      'container.modules',
-      'cache_bins',
-      'factory.keyvalue',
-      'twig.config',
-    ];
-
-    foreach ($expected_parameters as $parameter_name) {
-      $row = $table->find('css', sprintf('tbody tr:contains("%s")', $parameter_name));
-      $this->assertNotNull($row);
-
-      /** @var $cells \Behat\Mink\Element\NodeElement[] */
-      $cells = $row->findAll('css', 'td');
-      $this->assertEquals(2, count($cells));
-
-      $cell_parameter_name = $cells[0];
-      $this->assertEquals($parameter_name, $cell_parameter_name->getText());
-      $this->assertTrue($cell_parameter_name->hasClass('table-filter-text-source'));
-
-      $cell_operations = $cells[1];
-      $actual_href = $cell_operations->findLink('Devel')->getAttribute('href');
-      $expected_href = Url::fromRoute('devel.container_info.parameter.detail', ['parameter_name' => $parameter_name])->toString();
-      $this->assertEquals($expected_href, $actual_href);
-    }
-
-    // Ensures that the page is accessible ony to users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet('devel/container/service');
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-  /**
-   * Tests parameter detail page.
-   */
-  public function testParameterDetail() {
-    $parameter_name = 'cache_bins';
-
-    // Ensures that the page works as expected.
-    $this->drupalGet("/devel/container/parameter/$parameter_name");
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains("Parameter $parameter_name value");
-
-    // Ensures that the page returns a 404 error if the requested parameter is
-    // not defined.
-    $this->drupalGet('/devel/container/parameter/not_exists');
-    $this->assertSession()->statusCodeEquals(404);
-
-    // Ensures that the page is accessible ony to users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet("devel/container/service/$parameter_name");
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-  /**
-   * Asserts that container info local tasks are present.
-   */
-  protected function assertContainerInfoLocalTasks() {
-    $expected_local_tasks = [
-      ['devel.container_info.service', []],
-      ['devel.container_info.parameter', []],
-    ];
-
-    $this->assertLocalTasks($expected_local_tasks);
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelControllerTest.php b/modules/devel/tests/src/Functional/DevelControllerTest.php
deleted file mode 100644
index 0fc375a..0000000
--- a/modules/devel/tests/src/Functional/DevelControllerTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests Devel controller.
- *
- * @group devel
- */
-class DevelControllerTest extends BrowserTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['devel', 'node', 'entity_test', 'devel_entity_test', 'block'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Create a test entity.
-    $random_label = $this->randomMachineName();
-    $data = ['type' => 'entity_test', 'name' => $random_label];
-    $this->entity = entity_create('entity_test', $data);
-    $this->entity->save();
-
-    // Create a test entity with only canonical route.
-    $random_label = $this->randomMachineName();
-    $data = ['type' => 'devel_entity_test_canonical', 'name' => $random_label];
-    $this->entity_canonical = entity_create('devel_entity_test_canonical', $data);
-    $this->entity_canonical->save();
-
-    // Create a test entity with only edit route.
-    $random_label = $this->randomMachineName();
-    $data = ['type' => 'devel_entity_test_edit', 'name' => $random_label];
-    $this->entity_edit = entity_create('devel_entity_test_edit', $data);
-    $this->entity_edit->save();
-
-    // Create a test entity with no routes.
-    $random_label = $this->randomMachineName();
-    $data = ['type' => 'devel_entity_test_no_links', 'name' => $random_label];
-    $this->entity_no_links = entity_create('devel_entity_test_no_links', $data);
-    $this->entity_no_links->save();
-
-    $this->drupalPlaceBlock('local_tasks_block');
-
-    $web_user = $this->drupalCreateUser([
-      'view test entity',
-      'administer entity_test content',
-      'access devel information',
-    ]);
-    $this->drupalLogin($web_user);
-  }
-
-  function testRouteGeneration() {
-    // Test Devel load and render routes for entities with both route
-    // definitions.
-    $this->drupalGet('entity_test/' . $this->entity->id());
-    $this->assertText('Devel', 'Devel tab is present');
-    $this->drupalGet('devel/entity_test/' . $this->entity->id());
-    $this->assertResponse(200);
-    $this->assertText('Definition', 'Devel definition tab is present');
-    $this->assertText('Load', 'Devel load tab is present');
-    $this->assertText('Render', 'Devel load tab is present');
-    $this->assertLinkByHref('devel/entity_test/' . $this->entity->id() . '/render');
-    $this->drupalGet('devel/entity_test/' . $this->entity->id() . '/render');
-    $this->assertResponse(200);
-    $this->assertLinkByHref('devel/entity_test/' . $this->entity->id() . '/definition');
-    $this->drupalGet('devel/entity_test/' . $this->entity->id() . '/definition');
-    $this->assertResponse(200);
-
-    // Test Devel load and render routes for entities with only canonical route
-    // definitions.
-    $this->drupalGet('devel_entity_test_canonical/' . $this->entity_canonical->id());
-    $this->assertText('Devel', 'Devel tab is present');
-    //TODO this fail since assertNoLinkByHref search by partial value.
-    //$this->assertNoLinkByHref('devel/devel_entity_test_canonical/' . $this->entity_canonical->id());
-    $this->assertLinkByHref('devel/devel_entity_test_canonical/' . $this->entity_canonical->id() . '/render');
-    $this->drupalGet('devel/devel_entity_test_canonical/' . $this->entity_canonical->id());
-    $this->assertResponse(404);
-    $this->drupalGet('devel/devel_entity_test_canonical/' . $this->entity_canonical->id() . '/render');
-    $this->assertResponse(200);
-    $this->assertLinkByHref('devel/devel_entity_test_canonical/' . $this->entity_canonical->id() . '/definition');
-    $this->drupalGet('devel/devel_entity_test_canonical/' . $this->entity_canonical->id() . '/definition');
-    $this->assertResponse(200);
-
-    // Test Devel load and render routes for entities with only edit route
-    // definitions.
-    $this->drupalGet('devel_entity_test_edit/manage/' . $this->entity_edit->id());
-    $this->assertText('Devel', 'Devel tab is present');
-    $this->assertLinkByHref('devel/devel_entity_test_edit/' . $this->entity_edit->id());
-    $this->assertNoLinkByHref('devel/devel_entity_test_edit/' . $this->entity_edit->id() . '/render');
-    $this->assertNoLinkByHref('devel/devel_entity_test_edit/' . $this->entity_edit->id() . '/definition');
-    $this->drupalGet('devel/devel_entity_test_edit/' . $this->entity_edit->id());
-    $this->assertResponse(200);
-    $this->drupalGet('devel/devel_entity_test_edit/' . $this->entity_edit->id() . '/render');
-    $this->assertResponse(404);
-    $this->drupalGet('devel/devel_entity_test_edit/' . $this->entity_edit->id() . '/definition');
-    $this->assertResponse(200);
-
-    // Test Devel load and render routes for entities with no route
-    // definitions.
-    $this->drupalGet('devel_entity_test_no_links/' . $this->entity_edit->id());
-    $this->assertNoText('Devel', 'Devel tab is not present');
-    $this->assertNoLinkByHref('devel/devel_entity_test_no_links/' . $this->entity_no_links->id());
-    $this->assertNoLinkByHref('devel/devel_entity_test_no_links/' . $this->entity_no_links->id() . '/render');
-    $this->assertNoLinkByHref('devel/devel_entity_test_no_links/' . $this->entity_no_links->id() . '/definition');
-    $this->drupalGet('devel/devel_entity_test_no_links/' . $this->entity_no_links->id());
-    $this->assertResponse(404);
-    $this->drupalGet('devel/devel_entity_test_no_links/' . $this->entity_no_links->id() . '/render');
-    $this->assertResponse(404);
-    $this->drupalGet('devel/devel_entity_test_no_links/' . $this->entity_no_links->id() . '/definition');
-    $this->assertResponse(404);
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelDumperTest.php b/modules/devel/tests/src/Functional/DevelDumperTest.php
deleted file mode 100644
index a4ef9b4..0000000
--- a/modules/devel/tests/src/Functional/DevelDumperTest.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests pluggable dumper feature.
- *
- * @group devel
- */
-class DevelDumperTest extends BrowserTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['devel', 'devel_dumper_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $admin_user = $this->drupalCreateUser(['administer site configuration', 'access devel information']);
-    $this->drupalLogin($admin_user);
-  }
-
-  /**
-   * Test dumpers configuration page.
-   */
-  public function testDumpersConfiguration() {
-    $this->drupalGet('admin/config/development/devel');
-
-    // Ensures that the dumper input is present on the config page.
-    $this->assertSession()->fieldExists('dumper');
-
-    // Ensures that the 'default' dumper is enabled by default.
-    $this->assertSession()->checkboxChecked('edit-dumper-default');
-
-    // Ensures that all dumpers declared by devel are present on the config page
-    // and that only the available dumpers are selectable.
-    $dumpers = [
-      'default',
-      'drupal_variable',
-      'firephp',
-      'chromephp',
-      'var_dumper',
-    ];
-    $available_dumpers = ['default', 'drupal_variable'];
-
-    foreach ($dumpers as $dumper) {
-      $this->assertFieldByXPath('//input[@type="radio" and @name="dumper"]', $dumper);
-      if (in_array($dumper, $available_dumpers)) {
-        $this->assertFieldByXPath('//input[@name="dumper" and not(@disabled="disabled")]', $dumper);
-      }
-      else {
-        $this->assertFieldByXPath('//input[@name="dumper" and @disabled="disabled"]', $dumper);
-      }
-    }
-
-    // Ensures that dumper plugins declared by other modules are present on the
-    // config page and that only the available dumpers are selectable.
-    $this->assertFieldByXPath('//input[@name="dumper"]', 'available_test_dumper');
-    $this->assertSession()->pageTextContains('Available test dumper.');
-    $this->assertSession()->pageTextContains('Drupal dumper for testing purposes (available).');
-    $this->assertFieldByXPath('//input[@name="dumper" and not(@disabled="disabled")]', 'available_test_dumper', 'Available dumper input not is disabled.');
-
-    $this->assertFieldByXPath('//input[@name="dumper"]', 'not_available_test_dumper');
-    $this->assertSession()->pageTextContains('Not available test dumper.');
-    $this->assertSession()->pageTextContains('Drupal dumper for testing purposes (not available).Not available. You may need to install external dependencies for use this plugin.');
-    $this->assertFieldByXPath('//input[@name="dumper" and @disabled="disabled"]', 'not_available_test_dumper', 'Non available dumper input is disabled.');
-
-    // Ensures that saving of the dumpers configuration works as expected.
-    $edit = [
-      'dumper' => 'drupal_variable',
-    ];
-    $this->drupalPostForm('admin/config/development/devel', $edit, t('Save configuration'));
-    $this->assertSession()->pageTextContains(t('The configuration options have been saved.'));
-
-    $config = \Drupal::config('devel.settings')->get('devel_dumper');
-    $this->assertEquals('drupal_variable', $config, 'The configuration options have been properly saved');
-
-    // Ensure that if the chosen dumper is not available (e.g. the module that
-    // provide it is uninstalled) the 'default' dumper appears selected in the
-    // config page.
-    \Drupal::service('module_installer')->install(['kint']);
-
-    $this->drupalGet('admin/config/development/devel');
-    $this->assertFieldByXPath('//input[@name="dumper"]', 'kint');
-
-    $edit = [
-      'dumper' => 'kint',
-    ];
-    $this->drupalPostForm('admin/config/development/devel', $edit, t('Save configuration'));
-    $this->assertSession()->pageTextContains(t('The configuration options have been saved.'));
-
-    $config = \Drupal::config('devel.settings')->get('devel_dumper');
-    $this->assertEquals('kint', $config, 'The configuration options have been properly saved');
-
-    \Drupal::service('module_installer')->uninstall(['kint']);
-
-    $this->drupalGet('admin/config/development/devel');
-    $this->assertNoFieldByXPath('//input[@name="dumper"]', 'kint');
-    $this->assertSession()->checkboxChecked('edit-dumper-default');
-  }
-
-  /**
-   * Test variable is dumped in page.
-   */
-  function testDumpersOutput() {
-    $edit = [
-      'dumper' => 'available_test_dumper',
-    ];
-    $this->drupalPostForm('admin/config/development/devel', $edit, t('Save configuration'));
-    $this->assertSession()->pageTextContains(t('The configuration options have been saved.'));
-
-    $this->drupalGet('devel_dumper_test/dump');
-    $elements = $this->xpath('//body/pre[contains(text(), :message)]', [':message' => 'AvailableTestDumper::dump() Test output']);
-    $this->assertTrue(!empty($elements), 'Dumped message is present.');
-
-    $this->drupalGet('devel_dumper_test/message');
-    $elements = $this->xpath('//div[contains(@class, "messages")]/pre[contains(text(), :message)]', [':message' => 'AvailableTestDumper::export() Test output']);
-    $this->assertTrue(!empty($elements), 'Dumped message is present.');
-
-    $this->drupalGet('devel_dumper_test/export');
-    $elements = $this->xpath('//div[@class="layout-content"]//pre[contains(text(), :message)]', [':message' => 'AvailableTestDumper::export() Test output']);
-    $this->assertTrue(!empty($elements), 'Dumped message is present.');
-
-    $this->drupalGet('devel_dumper_test/export_renderable');
-    $elements = $this->xpath('//div[@class="layout-content"]//pre[contains(text(), :message)]', [':message' => 'AvailableTestDumper::exportAsRenderable() Test output']);
-    $this->assertTrue(!empty($elements), 'Dumped message is present.');
-    // Ensures that plugins can add libraries to the page when the
-    // ::exportAsRenderable() method is used.
-    $this->assertSession()->responseContains('devel_dumper_test/css/devel_dumper_test.css');
-    $this->assertSession()->responseContains('devel_dumper_test/js/devel_dumper_test.js');
-
-    $debug_filename = file_directory_temp() . '/drupal_debug.txt';
-
-    $this->drupalGet('devel_dumper_test/debug');
-    $file_content = file_get_contents($debug_filename);
-    $expected = <<<EOF
-<pre>AvailableTestDumper::export() Test output</pre>
-
-EOF;
-    $this->assertEquals($file_content, $expected, 'Dumped message is present.');
-
-    // Ensures that the DevelDumperManager::debug() is not access checked and
-    // that the dump is written in the debug file even if the user has not the
-    // 'access devel information' permission.
-    file_put_contents($debug_filename, '');
-    $this->drupalLogout();
-    $this->drupalGet('devel_dumper_test/debug');
-    $file_content = file_get_contents($debug_filename);
-    $expected = <<<EOF
-<pre>AvailableTestDumper::export() Test output</pre>
-
-EOF;
-    $this->assertEquals($file_content, $expected, 'Dumped message is present.');
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelElementInfoTest.php b/modules/devel/tests/src/Functional/DevelElementInfoTest.php
deleted file mode 100644
index 2698e24..0000000
--- a/modules/devel/tests/src/Functional/DevelElementInfoTest.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Behat\Mink\Element\NodeElement;
-use Drupal\Core\Url;
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests element info pages and links.
- *
- * @group devel
- */
-class DevelElementInfoTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['devel', 'block'];
-
-  /**
-   * The user for the test.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $develUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->drupalPlaceBlock('system_menu_block:devel');
-    $this->drupalPlaceBlock('page_title_block');
-
-    $this->develUser = $this->drupalCreateUser(['access devel information']);
-    $this->drupalLogin($this->develUser);
-  }
-
-  /**
-   * Tests element info menu link.
-   */
-  public function testElementInfoMenuLink() {
-    $this->drupalPlaceBlock('system_menu_block:devel');
-    // Ensures that the element info link is present on the devel menu and that
-    // it points to the correct page.
-    $this->drupalGet('');
-    $this->clickLink('Element Info');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->addressEquals('/devel/elements');
-    $this->assertSession()->pageTextContains('Element Info');
-  }
-
-  /**
-   * Tests element list page.
-   */
-  public function testElementList() {
-    $this->drupalGet('/devel/elements');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('Element Info');
-
-    $page = $this->getSession()->getPage();
-
-    // Ensures that the element list table is found.
-    $table = $page->find('css', 'table.devel-element-list');
-    $this->assertNotNull($table);
-
-    // Ensures that the expected table headers are found.
-    $headers = $table->findAll('css', 'thead th');
-    $this->assertEquals(4, count($headers));
-
-    $expected_headers = ['Name', 'Provider', 'Class', 'Operations'];
-    $actual_headers = array_map(function (NodeElement $element) {
-      return $element->getText();
-    }, $headers);
-    $this->assertSame($expected_headers, $actual_headers);
-
-    // Tests the presence of some (arbitrarily chosen) elements in the table.
-    $expected_elements = [
-      'button' => [
-        'class' => 'Drupal\Core\Render\Element\Button',
-        'provider' => 'core',
-      ],
-      'form' => [
-        'class' => 'Drupal\Core\Render\Element\Form',
-        'provider' => 'core',
-      ],
-      'html' => [
-        'class' => 'Drupal\Core\Render\Element\Html',
-        'provider' => 'core',
-      ],
-    ];
-
-    foreach ($expected_elements as $element_name => $element) {
-      $row = $table->find('css', sprintf('tbody tr:contains("%s")', $element_name));
-      $this->assertNotNull($row);
-
-      /** @var $cells \Behat\Mink\Element\NodeElement[] */
-      $cells = $row->findAll('css', 'td');
-      $this->assertEquals(4, count($cells));
-
-      $cell = $cells[0];
-      $this->assertEquals($element_name, $cell->getText());
-      $this->assertTrue($cell->hasClass('table-filter-text-source'));
-
-      $cell = $cells[1];
-      $this->assertEquals($element['provider'], $cell->getText());
-      $this->assertTrue($cell->hasClass('table-filter-text-source'));
-
-      $cell = $cells[2];
-      $this->assertEquals($element['class'], $cell->getText());
-      $this->assertTrue($cell->hasClass('table-filter-text-source'));
-
-      $cell = $cells[3];
-      $actual_href = $cell->findLink('Devel')->getAttribute('href');
-      $expected_href = Url::fromRoute('devel.elements_page.detail', ['element_name' => $element_name])->toString();
-      $this->assertEquals($expected_href, $actual_href);
-    }
-
-    // Ensures that the page is accessible only to the users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet('devel/elements');
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-  /**
-   * Tests element detail page.
-   */
-  public function testElementDetail() {
-    $element_name = 'button';
-
-    // Ensures that the page works as expected.
-    $this->drupalGet("/devel/elements/$element_name");
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains("Element $element_name");
-
-    // Ensures that the page returns a 404 error if the requested element is
-    // not defined.
-    $this->drupalGet('/devel/elements/not_exists');
-    $this->assertSession()->statusCodeEquals(404);
-
-    // Ensures that the page is accessible ony to users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet("/devel/elements/$element_name");
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelEntityTypeInfoTest.php b/modules/devel/tests/src/Functional/DevelEntityTypeInfoTest.php
deleted file mode 100644
index 3a708e5..0000000
--- a/modules/devel/tests/src/Functional/DevelEntityTypeInfoTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Behat\Mink\Element\NodeElement;
-use Drupal\Core\Url;
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests entity type info pages and links.
- *
- * @group devel
- */
-class DevelEntityTypeInfoTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['devel', 'block'];
-
-  /**
-   * The user for the test.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $develUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->drupalPlaceBlock('system_menu_block:devel');
-    $this->drupalPlaceBlock('page_title_block');
-
-    $this->develUser = $this->drupalCreateUser(['access devel information']);
-    $this->drupalLogin($this->develUser);
-  }
-
-  /**
-   * Tests entity info menu link.
-   */
-  public function testEntityInfoMenuLink() {
-    $this->drupalPlaceBlock('system_menu_block:devel');
-    // Ensures that the entity type info link is present on the devel menu and that
-    // it points to the correct page.
-    $this->drupalGet('');
-    $this->clickLink('Entity Info');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->addressEquals('/devel/entity/info');
-    $this->assertSession()->pageTextContains('Entity Info');
-  }
-
-  /**
-   * Tests entity type list page.
-   */
-  public function testEntityTypeList() {
-    $this->drupalGet('/devel/entity/info');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('Entity Info');
-
-    $page = $this->getSession()->getPage();
-
-    // Ensures that the entity type list table is found.
-    $table = $page->find('css', 'table.devel-entity-type-list');
-    $this->assertNotNull($table);
-
-    // Ensures that the expected table headers are found.
-    $headers = $table->findAll('css', 'thead th');
-    $this->assertEquals(5, count($headers));
-
-    $expected_headers = ['ID', 'Name', 'Provider', 'Class', 'Operations'];
-    $actual_headers = array_map(function (NodeElement $element) {
-      return $element->getText();
-    }, $headers);
-    $this->assertSame($expected_headers, $actual_headers);
-
-    // Tests the presence of some (arbitrarily chosen) entity types in the table.
-    $expected_types = [
-      'date_format' => [
-        'name' => 'Date format',
-        'class' => 'Drupal\Core\Datetime\Entity\DateFormat',
-        'provider' => 'core',
-      ],
-      'block' => [
-        'name' => 'Block',
-        'class' => 'Drupal\block\Entity\Block',
-        'provider' => 'block',
-      ],
-      'entity_view_mode' => [
-        'name' => 'View mode',
-        'class' => 'Drupal\Core\Entity\Entity\EntityViewMode',
-        'provider' => 'core',
-      ],
-    ];
-
-    foreach ($expected_types as $entity_type_id => $entity_type) {
-      $row = $table->find('css', sprintf('tbody tr:contains("%s")', $entity_type_id));
-      $this->assertNotNull($row);
-
-      /** @var $cells \Behat\Mink\Element\NodeElement[] */
-      $cells = $row->findAll('css', 'td');
-      $this->assertEquals(5, count($cells));
-
-      $cell = $cells[0];
-      $this->assertEquals($entity_type_id, $cell->getText());
-      $this->assertTrue($cell->hasClass('table-filter-text-source'));
-
-      $cell = $cells[1];
-      $this->assertEquals($entity_type['name'], $cell->getText());
-      $this->assertTrue($cell->hasClass('table-filter-text-source'));
-
-      $cell = $cells[2];
-      $this->assertEquals($entity_type['provider'], $cell->getText());
-      $this->assertTrue($cell->hasClass('table-filter-text-source'));
-
-      $cell = $cells[3];
-      $this->assertEquals($entity_type['class'], $cell->getText());
-      $this->assertTrue($cell->hasClass('table-filter-text-source'));
-
-      $cell = $cells[4];
-      $actual_href = $cell->findLink('Devel')->getAttribute('href');
-      $expected_href = Url::fromRoute('devel.entity_info_page.detail', ['entity_type_id' => $entity_type_id])->toString();
-      $this->assertEquals($expected_href, $actual_href);
-    }
-
-    // Ensures that the page is accessible only to the users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet('devel/entity/info');
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-  /**
-   * Tests entity type detail page.
-   */
-  public function testEntityTypeDetail() {
-    $entity_type_id = 'date_format';
-
-    // Ensures that the page works as expected.
-    $this->drupalGet("/devel/entity/info/$entity_type_id");
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains("Entity type $entity_type_id");
-
-    // Ensures that the page returns a 404 error if the requested entity type is
-    // not defined.
-    $this->drupalGet('/devel/entity/info/not_exists');
-    $this->assertSession()->statusCodeEquals(404);
-
-    // Ensures that the page is accessible ony to users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet("/devel/entity/info/$entity_type_id");
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelErrorHandlerTest.php b/modules/devel/tests/src/Functional/DevelErrorHandlerTest.php
deleted file mode 100644
index 9c94282..0000000
--- a/modules/devel/tests/src/Functional/DevelErrorHandlerTest.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests devel error handler.
- *
- * @group devel
- */
-class DevelErrorHandlerTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['devel'];
-
-  /**
-   * Tests devel error handler.
-   */
-  public function testErrorHandler() {
-    $messages_selector = 'div.messages--warning';
-
-    $expected_notice = new FormattableMarkup('%type: @message in %function (line ', [
-      '%type' => 'Notice',
-      '@message' => 'Undefined variable: undefined',
-      '%function' => 'Drupal\devel\Form\SettingsForm->demonstrateErrorHandlers()',
-    ]);
-
-    $expected_warning = new FormattableMarkup('%type: @message in %function (line ', [
-      '%type' => 'Warning',
-      '@message' => 'Division by zero',
-      '%function' => 'Drupal\devel\Form\SettingsForm->demonstrateErrorHandlers()',
-    ]);
-
-    $config = $this->config('system.logging');
-    $config->set('error_level', ERROR_REPORTING_DISPLAY_VERBOSE)->save();
-
-    $admin_user = $this->drupalCreateUser(['administer site configuration', 'access devel information']);
-    $this->drupalLogin($admin_user);
-
-    // Ensures that the error handler config is present on the config page and
-    // by default the standard error handler is selected.
-    $error_handlers = \Drupal::config('devel.settings')->get('error_handlers');
-    $this->assertEquals($error_handlers, [DEVEL_ERROR_HANDLER_STANDARD => DEVEL_ERROR_HANDLER_STANDARD]);
-    $this->drupalGet('admin/config/development/devel');
-    $this->assertOptionSelected('edit-error-handlers', DEVEL_ERROR_HANDLER_STANDARD);
-
-    // Ensures that selecting the DEVEL_ERROR_HANDLER_NONE option no error
-    // (raw or message) is shown on the site in case of php errors.
-    $edit = [
-      'error_handlers[]' => DEVEL_ERROR_HANDLER_NONE,
-    ];
-    $this->drupalPostForm('admin/config/development/devel', $edit, t('Save configuration'));
-    $this->assertSession()->pageTextContains('The configuration options have been saved.');
-
-    $error_handlers = \Drupal::config('devel.settings')->get('error_handlers');
-    $this->assertEquals($error_handlers, [DEVEL_ERROR_HANDLER_NONE => DEVEL_ERROR_HANDLER_NONE]);
-    $this->assertOptionSelected('edit-error-handlers', DEVEL_ERROR_HANDLER_NONE);
-
-    $this->clickLink('notice+warning');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->responseNotContains($expected_notice);
-    $this->assertSession()->responseNotContains($expected_warning);
-    $this->assertSession()->elementNotExists('css', $messages_selector);
-
-    // Ensures that selecting the DEVEL_ERROR_HANDLER_BACKTRACE_KINT option a
-    // backtrace above the rendered page is shown on the site in case of php
-    // errors.
-    $edit = [
-      'error_handlers[]' => DEVEL_ERROR_HANDLER_BACKTRACE_KINT,
-    ];
-    $this->drupalPostForm('admin/config/development/devel', $edit, t('Save configuration'));
-    $this->assertSession()->pageTextContains('The configuration options have been saved.');
-
-    $error_handlers = \Drupal::config('devel.settings')->get('error_handlers');
-    $this->assertEquals($error_handlers, [DEVEL_ERROR_HANDLER_BACKTRACE_KINT => DEVEL_ERROR_HANDLER_BACKTRACE_KINT]);
-    $this->assertOptionSelected('edit-error-handlers', DEVEL_ERROR_HANDLER_BACKTRACE_KINT);
-
-    $this->clickLink('notice+warning');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->elementNotExists('css', $messages_selector);
-
-    // Ensures that selecting the DEVEL_ERROR_HANDLER_BACKTRACE_DPM option a
-    // backtrace in the message area is shown on the site in case of php errors.
-    $edit = [
-      'error_handlers[]' => DEVEL_ERROR_HANDLER_BACKTRACE_DPM,
-    ];
-    $this->drupalPostForm('admin/config/development/devel', $edit, t('Save configuration'));
-    $this->assertSession()->pageTextContains('The configuration options have been saved.');
-
-    $error_handlers = \Drupal::config('devel.settings')->get('error_handlers');
-    $this->assertEquals($error_handlers, [DEVEL_ERROR_HANDLER_BACKTRACE_DPM => DEVEL_ERROR_HANDLER_BACKTRACE_DPM]);
-    $this->assertOptionSelected('edit-error-handlers', DEVEL_ERROR_HANDLER_BACKTRACE_DPM);
-
-    $this->clickLink('notice+warning');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->responseContains($expected_notice);
-    $this->assertSession()->responseContains($expected_warning);
-    $this->assertSession()->elementContains('css', $messages_selector, $expected_notice);
-    $this->assertSession()->elementContains('css', $messages_selector, $expected_warning);
-
-    // Ensures that when multiple handlers are selected, the output produced by
-    // every handler is shown on the site in case of php errors.
-    $edit = [
-      'error_handlers[]' => [
-        DEVEL_ERROR_HANDLER_BACKTRACE_KINT => DEVEL_ERROR_HANDLER_BACKTRACE_KINT,
-        DEVEL_ERROR_HANDLER_BACKTRACE_DPM => DEVEL_ERROR_HANDLER_BACKTRACE_DPM,
-      ],
-    ];
-    $this->drupalPostForm('admin/config/development/devel', $edit, t('Save configuration'));
-    $this->assertSession()->pageTextContains('The configuration options have been saved.');
-
-    $error_handlers = \Drupal::config('devel.settings')->get('error_handlers');
-    $this->assertEquals($error_handlers, [
-      DEVEL_ERROR_HANDLER_BACKTRACE_KINT => DEVEL_ERROR_HANDLER_BACKTRACE_KINT,
-      DEVEL_ERROR_HANDLER_BACKTRACE_DPM => DEVEL_ERROR_HANDLER_BACKTRACE_DPM,
-    ]);
-    $this->assertOptionSelected('edit-error-handlers', DEVEL_ERROR_HANDLER_BACKTRACE_KINT);
-    $this->assertOptionSelected('edit-error-handlers', DEVEL_ERROR_HANDLER_BACKTRACE_DPM);
-
-    $this->clickLink('notice+warning');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->responseContains($expected_notice);
-    $this->assertSession()->responseContains($expected_warning);
-    $this->assertSession()->elementContains('css', $messages_selector, $expected_notice);
-    $this->assertSession()->elementContains('css', $messages_selector, $expected_warning);
-
-    // Ensures that setting the error reporting to all the output produced by
-    // handlers is shown on the site in case of php errors.
-    $config->set('error_level', ERROR_REPORTING_DISPLAY_ALL)->save();
-    $this->clickLink('notice+warning');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->responseContains($expected_notice);
-    $this->assertSession()->responseContains($expected_warning);
-    $this->assertSession()->elementContains('css', $messages_selector, $expected_notice);
-    $this->assertSession()->elementContains('css', $messages_selector, $expected_warning);
-
-    // Ensures that setting the error reporting to some the output produced by
-    // handlers is shown on the site in case of php errors.
-    $config->set('error_level', ERROR_REPORTING_DISPLAY_SOME)->save();
-    $this->clickLink('notice+warning');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->responseContains($expected_notice);
-    $this->assertSession()->responseContains($expected_warning);
-    $this->assertSession()->elementContains('css', $messages_selector, $expected_notice);
-    $this->assertSession()->elementContains('css', $messages_selector, $expected_warning);
-
-    // Ensures that setting the error reporting to none the output produced by
-    // handlers is not shown on the site in case of php errors.
-    $config->set('error_level', ERROR_REPORTING_HIDE)->save();
-    $this->clickLink('notice+warning');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->responseNotContains($expected_notice);
-    $this->assertSession()->responseNotContains($expected_warning);
-    $this->assertSession()->elementNotExists('css', $messages_selector);
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelEventInfoTest.php b/modules/devel/tests/src/Functional/DevelEventInfoTest.php
deleted file mode 100644
index d33458b..0000000
--- a/modules/devel/tests/src/Functional/DevelEventInfoTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Core\Url;
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests event info pages and links.
- *
- * @group devel
- */
-class DevelEventInfoTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['devel', 'block'];
-
-  /**
-   * The user for the test.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $develUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->drupalPlaceBlock('page_title_block');
-
-    $this->develUser = $this->drupalCreateUser(['access devel information']);
-    $this->drupalLogin($this->develUser);
-  }
-
-  /**
-   * Tests event info menu link.
-   */
-  public function testEventsInfoMenuLink() {
-    $this->drupalPlaceBlock('system_menu_block:devel');
-    // Ensures that the events info link is present on the devel menu and that
-    // it points to the correct page.
-    $this->drupalGet('');
-    $this->clickLink('Events Info');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->addressEquals('/devel/events');
-    $this->assertSession()->pageTextContains('Events');
-  }
-
-  /**
-   * Tests event info page.
-   */
-  public function testEventList() {
-    $event_dispatcher = \Drupal::service('event_dispatcher');
-
-    $this->drupalGet('/devel/events');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('Events');
-
-    $page = $this->getSession()->getPage();
-
-    // Ensures that the event table is found.
-    $table = $page->find('css', 'table.devel-event-list');
-    $this->assertNotNull($table);
-
-    // Ensures that the expected table headers are found.
-    /** @var $headers \Behat\Mink\Element\NodeElement[] */
-    $headers = $table->findAll('css', 'thead th');
-    $this->assertEquals(3, count($headers));
-
-    $expected_headers = ['Event Name', 'Callable', 'Priority'];
-    $actual_headers = array_map(function ($element) {
-      return $element->getText();
-    }, $headers);
-    $this->assertSame($expected_headers, $actual_headers);
-
-    // Ensures that all the events are listed in the table.
-    $events = $event_dispatcher->getListeners();
-    $event_header_row = $table->findAll('css', 'tbody tr th.devel-event-name-header');
-    $this->assertEquals(count($events), count($event_header_row));
-
-    // Tests the presence of some (arbitrarily chosen) events and related
-    // listeners in the table. The event items are tested dynamically so no
-    // test failures are expected if listeners change.
-    $expected_events = [
-      'config.delete',
-      'kernel.request',
-      'routing.route_alter',
-    ];
-
-    foreach ($expected_events as $event_name) {
-      $listeners = $event_dispatcher->getListeners($event_name);
-
-      // Ensures that the event header is present in the table.
-      $event_header_row = $table->findAll('css', sprintf('tbody tr th:contains("%s")', $event_name));
-      $this->assertNotNull($event_header_row);
-      $this->assertEquals(1, count($event_header_row));
-
-      // Ensures that all the event listener are listed in the table.
-      /** @var $event_rows \Behat\Mink\Element\NodeElement[] */
-      $event_rows = $table->findAll('css', sprintf('tbody tr:contains("%s")', $event_name));
-      // Remove the header row.
-      array_shift($event_rows);
-      $this->assertEquals(count($listeners), count($event_rows));
-
-      foreach ($listeners as $index => $listener) {
-        /** @var $cells \Behat\Mink\Element\NodeElement[] */
-        $cells = $event_rows[$index]->findAll('css', 'td');
-        $this->assertEquals(3, count($cells));
-
-        $cell_event_name = $cells[0];
-        $this->assertEquals($event_name, $cell_event_name->getText());
-        $this->assertTrue($cell_event_name->hasClass('table-filter-text-source'));
-        $this->assertTrue($cell_event_name->hasClass('visually-hidden'));
-
-        $cell_callable = $cells[1];
-        is_callable($listener, TRUE, $callable_name);
-        $this->assertEquals($callable_name, $cell_callable->getText());
-
-        $cell_methods = $cells[2];
-        $this->assertEquals($index, $cell_methods->getText());
-      }
-    }
-
-    // Ensures that the page is accessible only to the users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet('devel/events');
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelLayoutInfoTest.php b/modules/devel/tests/src/Functional/DevelLayoutInfoTest.php
deleted file mode 100644
index 6277de1..0000000
--- a/modules/devel/tests/src/Functional/DevelLayoutInfoTest.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests layout info pages and links.
- *
- * @group devel
- */
-class DevelLayoutInfoTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['devel', 'block', 'layout_discovery'];
-
-  /**
-   * The user for the test.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $develUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    // TODO find a cleaner way to skip layout info tests when running tests on
-    // Drupal branch < 8.3.x.
-    if (version_compare(\Drupal::VERSION, '8.3', '<')) {
-      $this->markTestSkipped('Devel Layout Info Tests only available on version 8.3.x+.');
-    }
-
-    parent::setUp();
-
-    $this->drupalPlaceBlock('page_title_block');
-
-    $this->develUser = $this->drupalCreateUser(['access devel information']);
-    $this->drupalLogin($this->develUser);
-  }
-
-  /**
-   * Tests layout info menu link.
-   */
-  public function testLayoutsInfoMenuLink() {
-    $this->drupalPlaceBlock('system_menu_block:devel');
-    // Ensures that the layout info link is present on the devel menu and that
-    // it points to the correct page.
-    $this->drupalGet('');
-    $this->clickLink('Layouts Info');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->addressEquals('/devel/layouts');
-    $this->assertSession()->pageTextContains('Layout');
-  }
-
-  /**
-   * Tests layout info page.
-   */
-  public function testLayoutList() {
-    $this->drupalGet('/devel/layouts');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('Layouts');
-
-    $page = $this->getSession()->getPage();
-
-    // Ensures that the layout table is found.
-    $table = $page->find('css', 'table.devel-layout-list');
-    $this->assertNotNull($table);
-
-    // Ensures that the expected table headers are found.
-    /** @var $headers \Behat\Mink\Element\NodeElement[] */
-    $headers = $table->findAll('css', 'thead th');
-    $this->assertEquals(6, count($headers));
-
-    $expected_headers = ['Icon', 'Label', 'Description', 'Category', 'Regions', 'Provider'];
-    $actual_headers = array_map(function ($element) {
-      return $element->getText();
-    }, $headers);
-    $this->assertSame($expected_headers, $actual_headers);
-
-    // Ensures that all the layouts are listed in the table.
-    $layout_manager = \Drupal::service('plugin.manager.core.layout');
-    $layouts = $layout_manager->getDefinitions();
-    $table_rows = $table->findAll('css', 'tbody tr');
-    $this->assertEquals(count($layouts), count($table_rows));
-
-    $index = 0;
-    foreach ($layouts as $layout) {
-      $cells = $table_rows[$index]->findAll('css', 'td');
-      $this->assertEquals(6, count($cells));
-
-      $cell_layout_icon = $cells[0];
-      if (empty($layout->getIconPath())) {
-        // @todo test that the icon path image is set correctly
-      }
-      else {
-        $this->assertNull($cell_layout_icon->getText());
-      }
-
-      $cell_layout_label = $cells[1];
-      $this->assertEquals($cell_layout_label->getText(), $layout->getLabel());
-
-      $cell_layout_description = $cells[2];
-      $this->assertEquals($cell_layout_description->getText(), $layout->getDescription());
-
-      $cell_layout_category = $cells[3];
-      $this->assertEquals($cell_layout_category->getText(), $layout->getCategory());
-
-      $cell_layout_regions = $cells[4];
-      $this->assertEquals($cell_layout_regions->getText(), implode(', ', $layout->getRegionLabels()));
-
-      $cell_layout_provider = $cells[5];
-      $this->assertEquals($cell_layout_provider->getText(), $layout->getProvider());
-
-      $index++;
-    }
-
-    // Ensures that the page is accessible only to the users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet('devel/layouts');
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-  /**
-   * Tests the dependency with layout_discovery module.
-   */
-  public function testLayoutDiscoveryDependency() {
-    $this->container->get('module_installer')->uninstall(['layout_discovery']);
-    $this->drupalPlaceBlock('system_menu_block:devel');
-
-    // Ensures that the layout info link is not present on the devel menu.
-    $this->drupalGet('');
-    $this->assertSession()->linkNotExists('Layouts Info');
-
-    // Ensures that the layouts info page is not available.
-    $this->drupalGet('/devel/layouts');
-    $this->assertSession()->statusCodeEquals(404);
-
-    // Check a few other devel pages to verify devel module stil works.
-    $this->drupalGet('/devel/events');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->drupalGet('devel/routes');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->drupalGet('/devel/container/service');
-    $this->assertSession()->statusCodeEquals(200);
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelMenuLinksTest.php b/modules/devel/tests/src/Functional/DevelMenuLinksTest.php
deleted file mode 100644
index e806453..0000000
--- a/modules/devel/tests/src/Functional/DevelMenuLinksTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Core\Url;
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests devel menu links.
- *
- * @group devel
- */
-class DevelMenuLinksTest extends BrowserTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['devel', 'block', 'devel_test'];
-
-  /**
-   * The user for tests.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $develUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    // Devel links currently appears only in the devel menu.
-    // Place the devel menu block so we can ensure that these link works
-    // properly.
-    $this->drupalPlaceBlock('system_menu_block:devel');
-    $this->drupalPlaceBlock('page_title_block');
-
-    $this->develUser = $this->drupalCreateUser(['access devel information', 'administer site configuration']);
-    $this->drupalLogin($this->develUser);
-  }
-
-  /**
-   * Tests CSFR protected links.
-   */
-  public function testCsrfProtectedLinks() {
-    // Ensure CSRF link are not accessible directly.
-    $this->drupalGet('devel/run-cron');
-    $this->assertResponse(403);
-    $this->drupalGet('devel/cache/clear');
-    $this->assertResponse(403);
-
-    // Ensure clear cache link works properly.
-    $this->assertLink('Cache clear');
-    $this->clickLink('Cache clear');
-    $this->assertText('Cache cleared.');
-
-    // Ensure run cron link works properly.
-    $this->assertLink('Run cron');
-    $this->clickLink('Run cron');
-    $this->assertText('Cron ran successfully.');
-
-    // Ensure CSRF protected links work properly after change session.
-    $this->drupalLogout();
-    $this->drupalLogin($this->develUser);
-
-    $this->assertLink('Cache clear');
-    $this->clickLink('Cache clear');
-    $this->assertText('Cache cleared.');
-
-    $this->assertLink('Run cron');
-    $this->clickLink('Run cron');
-    $this->assertText('Cron ran successfully.');
-  }
-
-  /**
-   * Tests redirect destination links.
-   */
-  public function testRedirectDestinationLinks() {
-    // By default, in the testing profile, front page is the user canonical URI.
-    // For better testing do not use the default frontpage.
-    $url = Url::fromRoute('devel.simple_page');
-    $destination = Url::fromRoute('devel.simple_page', [], ['absolute' => FALSE]);
-
-    $this->drupalGet($url);
-    $this->assertLink(t('Reinstall Modules'));
-    $this->clickLink(t('Reinstall Modules'));
-    $this->assertUrl('devel/reinstall', ['query' => ['destination' => $destination->toString()]]);
-
-    $this->drupalGet($url);
-    $this->assertLink(t('Rebuild Menu'));
-    $this->clickLink(t('Rebuild Menu'));
-    $this->assertUrl('devel/menu/reset', ['query' => ['destination' => $destination->toString()]]);
-
-    $this->drupalGet($url);
-    $this->assertLink(t('Cache clear'));
-    $this->clickLink(t('Cache clear'));
-    $this->assertText('Cache cleared.');
-    $this->assertUrl($url);
-
-    $this->drupalGet($url);
-    $this->assertLink(t('Run cron'));
-    $this->clickLink(t('Run cron'));
-    $this->assertText(t('Cron ran successfully.'));
-    $this->assertUrl($url);
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelModulesReinstallTest.php b/modules/devel/tests/src/Functional/DevelModulesReinstallTest.php
deleted file mode 100644
index 5068f2c..0000000
--- a/modules/devel/tests/src/Functional/DevelModulesReinstallTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests reinstall modules.
- *
- * @group devel
- */
-class DevelModulesReinstallTest extends BrowserTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['devel'];
-
-  /**
-   * The profile to install as a basis for testing.
-   *
-   * @var string
-   */
-  protected $profile = 'minimal';
-
-  /**
-   * Set up test.
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $web_user = $this->drupalCreateUser(['administer site configuration']);
-    $this->drupalLogin($web_user);
-  }
-
-  /**
-   * Reinstall modules.
-   */
-  public function testDevelReinstallModules() {
-    // Minimal profile enables only dblog, block and node.
-    $modules = ['dblog', 'block'];
-
-    // Needed for compare correctly the message.
-    sort($modules);
-
-    $this->drupalGet('devel/reinstall');
-
-    // Prepare field data in an associative array
-    $edit = [];
-    foreach ($modules as $module) {
-      $edit["reinstall[$module]"] = TRUE;
-    }
-
-    $this->drupalPostForm('devel/reinstall', $edit, t('Reinstall'));
-    $this->assertText(t('Uninstalled and installed: @names.', ['@names' => implode(', ', $modules)]));
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelRequirementsTest.php b/modules/devel/tests/src/Functional/DevelRequirementsTest.php
deleted file mode 100644
index 876a5ff..0000000
--- a/modules/devel/tests/src/Functional/DevelRequirementsTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests devel requirements.
- *
- * @group devel
- */
-class DevelRequirementsTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['devel'];
-
-  /**
-   * Tests that the status page shows a warning when evel is enabled.
-   */
-  public function testStatusPage() {
-    $admin_user = $this->drupalCreateUser(['administer site configuration']);
-    $this->drupalLogin($admin_user);
-
-    $this->drupalGet('admin/reports/status');
-    $this->assertSession()->statusCodeEquals(200);
-
-    $this->assertSession()->pageTextContains('Devel module enabled');
-    $this->assertSession()->pageTextContains('The Devel module provides access to internal debugging information; therefore it\'s recommended to disable this module on sites in production.');
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelRouteInfoTest.php b/modules/devel/tests/src/Functional/DevelRouteInfoTest.php
deleted file mode 100644
index bdd1d11..0000000
--- a/modules/devel/tests/src/Functional/DevelRouteInfoTest.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Core\Url;
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests routes info pages and links.
- *
- * @group devel
- */
-class DevelRouteInfoTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['devel', 'devel_test', 'block'];
-
-  /**
-   * The user for the test.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $develUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->drupalPlaceBlock('system_menu_block:devel');
-    $this->drupalPlaceBlock('page_title_block');
-
-    $this->develUser = $this->drupalCreateUser(['access devel information']);
-    $this->drupalLogin($this->develUser);
-  }
-
-  /**
-   * Tests routes info.
-   */
-  public function testRouteList() {
-    // Ensures that the routes info link is present on the devel menu and that
-    // it points to the correct page.
-    $this->drupalGet('');
-    $this->clickLink('Routes Info');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->addressEquals('/devel/routes');
-    $this->assertSession()->pageTextContains('Routes');
-
-    $page = $this->getSession()->getPage();
-
-    // Ensures that the expected table headers are found.
-    /** @var $headers \Behat\Mink\Element\NodeElement[] */
-    $headers = $page->findAll('css', 'table.devel-route-list thead th');
-    $this->assertEquals(4, count($headers));
-
-    $expected_items = ['Route Name', 'Path', 'Allowed Methods', 'Operations'];
-    foreach ($headers as $key => $element) {
-      $this->assertSame($element->getText(), $expected_items[$key]);
-    }
-
-    // Ensures that all the routes are listed in the table.
-    $routes = \Drupal::service('router.route_provider')->getAllRoutes();
-    $rows = $page->findAll('css', 'table.devel-route-list tbody tr');
-    $this->assertEquals(count($routes), count($rows));
-
-    // Tests the presence of some (arbitrarily chosen) routes in the table.
-    $expected_routes = [
-      '<current>' => [
-        'path' => '/<current>',
-        'methods' => ['GET', 'POST'],
-        'dynamic' => FALSE,
-      ],
-      'user.login' => [
-        'path' => '/user/login',
-        'methods' => ['GET', 'POST'],
-        'dynamic' => FALSE,
-      ],
-      'entity.user.canonical' => [
-        'path' => '/user/{user}',
-        'methods' => ['GET', 'POST'],
-        'dynamic' => TRUE,
-      ],
-      'entity.user.devel_load' => [
-        'path' => '/devel/user/{user}',
-        'methods' => ['ANY'],
-        'dynamic' => TRUE,
-      ],
-    ];
-
-    foreach ($expected_routes as $route_name => $expected) {
-      $row = $page->find('css', sprintf('table.devel-route-list tbody tr:contains("%s")', $route_name));
-      $this->assertNotNull($row);
-
-      /** @var $cells \Behat\Mink\Element\NodeElement[] */
-      $cells = $row->findAll('css', 'td');
-      $this->assertEquals(4, count($cells));
-
-      $cell_route_name = $cells[0];
-      $this->assertEquals($route_name, $cell_route_name->getText());
-      $this->assertTrue($cell_route_name->hasClass('table-filter-text-source'));
-
-      $cell_path = $cells[1];
-      $this->assertEquals($expected['path'], $cell_path->getText());
-      $this->assertTrue($cell_path->hasClass('table-filter-text-source'));
-
-      $cell_methods = $cells[2];
-      $this->assertEquals(implode('', $expected['methods']), $cell_methods->getText());
-
-      $cell_operations = $cells[3];
-      $actual_href = $cell_operations->findLink('Devel')->getAttribute('href');
-      if ($expected['dynamic']) {
-        $parameters = ['query' => ['route_name' => $route_name]];
-      }
-      else {
-        $parameters = ['query' => ['path' => $expected['path']]];
-      }
-      $expected_href = Url::fromRoute('devel.route_info.item', [], $parameters)->toString();
-      $this->assertEquals($expected_href, $actual_href);
-    }
-
-    // Ensures that the page is accessible only to the users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet('devel/routes');
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-  /**
-   * Tests route detail page.
-   */
-  public function testRouteDetail() {
-    $expected_title = 'Route detail';
-    $xpath_warning_messages = '//div[contains(@class, "messages--warning")]';
-
-    // Ensures that devel route detail link in the menu works properly.
-    $url = $this->develUser->toUrl();
-    $path = '/' . $url->getInternalPath();
-
-    $this->drupalGet($url);
-    $this->clickLink('Current route info');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains($expected_title);
-    $expected_url = Url::fromRoute('devel.route_info.item', [], ['query' => ['path' => $path]]);
-    $this->assertSession()->addressEquals($expected_url);
-    $this->assertSession()->elementNotExists('xpath', $xpath_warning_messages);
-
-    // Ensures that devel route detail works properly even when dynamic cache
-    // is enabled.
-    $url = Url::fromRoute('devel.simple_page');
-    $path = '/' . $url->getInternalPath();
-
-    $this->drupalGet($url);
-    $this->clickLink('Current route info');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains($expected_title);
-    $expected_url = Url::fromRoute('devel.route_info.item', [], ['query' => ['path' => $path]]);
-    $this->assertSession()->addressEquals($expected_url);
-    $this->assertSession()->elementNotExists('xpath', $xpath_warning_messages);
-
-    // Ensures that if a non existent path is passed as input, a warning
-    // message is shown.
-    $this->drupalGet('devel/routes/item', ['query' => ['path' => '/undefined']]);
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains($expected_title);
-    $this->assertSession()->elementExists('xpath', $xpath_warning_messages);
-
-    // Ensures that the route detail page works properly when a valid route
-    // name input is passed.
-    $this->drupalGet('devel/routes/item', ['query' => ['route_name' => 'devel.simple_page']]);
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains($expected_title);
-    $this->assertSession()->elementNotExists('xpath', $xpath_warning_messages);
-
-    // Ensures that if a non existent route name is passed as input a warning
-    // message is shown.
-    $this->drupalGet('devel/routes/item', ['query' => ['route_name' => 'not.exists']]);
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains($expected_title);
-    $this->assertSession()->elementExists('xpath', $xpath_warning_messages);
-
-    // Ensures that if no 'path' nor 'name' query string is passed as input,
-    // devel route detail page does not return errors.
-    $this->drupalGet('devel/routes/item');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains($expected_title);
-
-    // Ensures that the page is accessible ony to the users with the adequate
-    // permissions.
-    $this->drupalLogout();
-    $this->drupalGet('devel/routes/item');
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelRouterRebuildTest.php b/modules/devel/tests/src/Functional/DevelRouterRebuildTest.php
deleted file mode 100644
index 58436a8..0000000
--- a/modules/devel/tests/src/Functional/DevelRouterRebuildTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests routes rebuild.
- *
- * @group devel
- */
-class DevelRouterRebuildTest extends BrowserTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['devel', 'devel_test'];
-
-  /**
-   * Test routes rebuild.
-   */
-  public function testRouterRebuildConfirmForm() {
-    // Reset the state flag.
-    \Drupal::state()->set('devel_test_route_rebuild', NULL);
-
-    $this->drupalGet('devel/menu/reset');
-    $this->assertSession()->statusCodeEquals(403);
-
-    $web_user = $this->drupalCreateUser(['administer site configuration']);
-    $this->drupalLogin($web_user);
-
-    $this->drupalGet('devel/menu/reset');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('Are you sure you want to rebuild the router?');
-    $route_rebuild_state = \Drupal::state()->get('devel_test_route_rebuild');
-    $this->assertEmpty($route_rebuild_state);
-
-    $this->drupalPostForm('devel/menu/reset', [], t('Rebuild'));
-    $this->assertSession()->pageTextContains('The router has been rebuilt.');
-    $route_rebuild_state = \Drupal::state()->get('devel_test_route_rebuild');
-    $this->assertEquals('Router rebuild fired', $route_rebuild_state);
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelStateEditorTest.php b/modules/devel/tests/src/Functional/DevelStateEditorTest.php
deleted file mode 100644
index aa6538c..0000000
--- a/modules/devel/tests/src/Functional/DevelStateEditorTest.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Behat\Mink\Element\NodeElement;
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests devel state editor.
- *
- * @group devel
- */
-class DevelStateEditorTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['devel', 'block'];
-
-  /**
-   * The state store.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-  /**
-   * The user for tests.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $develUser;
-
-  /**
-   * The user for tests.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->state = $this->container->get('state');
-
-    $this->drupalPlaceBlock('page_title_block');
-
-    $this->develUser = $this->drupalCreateUser(['access devel information']);
-    $this->adminUser = $this->drupalCreateUser(['access devel information', 'administer site configuration']);
-  }
-
-  /**
-   * Tests state editor menu link.
-   */
-  public function testStateEditMenuLink() {
-    $this->drupalPlaceBlock('system_menu_block:devel');
-    $this->drupalLogin($this->develUser);
-    // Ensures that the state editor link is present on the devel menu and that
-    // it points to the correct page.
-    $this->drupalGet('');
-    $this->clickLink('State editor');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->addressEquals('/devel/state');
-    $this->assertSession()->pageTextContains('State editor');
-  }
-
-  /**
-   * Tests state listing.
-   */
-  public function testStateListing() {
-    $table_selector = 'table.devel-state-list';
-
-    // Ensure that state listing page is accessible only by users with the
-    // adequate permissions.
-    $this->drupalGet('devel/state');
-    $this->assertSession()->statusCodeEquals(403);
-
-    $this->drupalLogin($this->develUser);
-    $this->drupalGet('devel/state');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('State editor');
-
-    // Ensure that the state variables table is visible.
-    $table = $this->assertSession()->elementExists('css', $table_selector);
-
-    // Ensure that all state variables are listed in the table.
-    $states = \Drupal::keyValue('state')->getAll();
-    $rows = $table->findAll('css', 'tbody tr');
-    $this->assertEquals(count($rows), count($states), 'All states are listed in the table.');
-
-    // Ensure that the added state variables are listed in the table.
-    $this->state->set('devel.simple', 'Hello!');
-    $this->drupalGet('devel/state');
-    $table = $this->assertSession()->elementExists('css', $table_selector);
-    $this->assertSession()->elementExists('css', sprintf('tbody td:contains("%s")', 'devel.simple'), $table);
-
-    // Ensure that the operations column and the actions buttons are not
-    // available for user without 'administer site configuration' permission.
-    $headers = $table->findAll('css', 'thead th');
-    $this->assertEquals(count($headers), 2, 'Correct number of table header cells found.');
-    $this->assertElementsTextEquals($headers, ['Name', 'Value']);
-    $this->assertSession()->elementNotExists('css', 'ul.dropbutton li a', $table);
-
-    // Ensure that the operations column and the actions buttons are
-    // available for user with 'administer site configuration' permission.
-    $this->drupalLogin($this->adminUser);
-    $this->drupalGet('devel/state');
-
-    $table = $this->assertSession()->elementExists('css', $table_selector);
-    $headers = $table->findAll('css', 'thead th');
-    $this->assertEquals(count($headers), 3, 'Correct number of table header cells found.');
-    $this->assertElementsTextEquals($headers, ['Name', 'Value', 'Operations']);
-    $this->assertSession()->elementExists('css', 'ul.dropbutton li a', $table);
-
-    // Test that the edit button works properly.
-    $this->clickLink('Edit');
-    $this->assertSession()->statusCodeEquals(200);
-  }
-
-  /**
-   * Tests state edit.
-   */
-  public function testStateEdit() {
-    // Create some state variables for the test.
-    $this->state->set('devel.simple', 0);
-    $this->state->set('devel.array', ['devel' => 'value']);
-    $this->state->set('devel.object', $this->randomObject());
-
-    // Ensure that state edit form is accessible only by users with the
-    // adequate permissions.
-    $this->drupalLogin($this->develUser);
-    $this->drupalGet('devel/state/edit/devel.simple');
-    $this->assertSession()->statusCodeEquals(403);
-
-    $this->drupalLogin($this->adminUser);
-
-    // Ensure that accessing an un-existent state variable cause a warning
-    // message.
-    $this->drupalGet('devel/state/edit/devel.unknown');
-    $this->assertSession()->pageTextContains(strtr('State @name does not exist in the system.', ['@name' => 'devel.unknown']));
-
-    // Ensure that state variables that contain simple type can be edited and
-    // saved.
-    $this->drupalGet('devel/state/edit/devel.simple');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains(strtr('Edit state variable: @name', ['@name' => 'devel.simple']));
-    $input = $this->assertSession()->fieldExists('edit-new-value');
-    $this->assertFalse($input->hasAttribute('disabled'));
-    $button = $this->assertSession()->buttonExists('edit-submit');
-    $this->assertFalse($button->hasAttribute('disabled'));
-
-    $edit = ['new_value' => 1];
-    $this->drupalPostForm('devel/state/edit/devel.simple', $edit, 'Save');
-    $this->assertSession()->pageTextContains(strtr('Variable @name was successfully edited.', ['@name' => 'devel.simple']));
-    $this->assertEquals(1, $this->state->get('devel.simple'));
-
-    // Ensure that state variables that contain array can be edited and saved
-    // and the new value is properly validated.
-    $this->drupalGet('devel/state/edit/devel.array');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains(strtr('Edit state variable: @name', ['@name' => 'devel.array']));
-    $input = $this->assertSession()->fieldExists('edit-new-value');
-    $this->assertFalse($input->hasAttribute('disabled'));
-    $button = $this->assertSession()->buttonExists('edit-submit');
-    $this->assertFalse($button->hasAttribute('disabled'));
-
-    // Try to save an invalid yaml input.
-    $edit = ['new_value' => 'devel: \'value updated'];
-    $this->drupalPostForm('devel/state/edit/devel.array', $edit, 'Save');
-    $this->assertSession()->pageTextContains('Invalid input:');
-
-    $edit = ['new_value' => 'devel: \'value updated\''];
-    $this->drupalPostForm('devel/state/edit/devel.array', $edit, 'Save');
-    $this->assertSession()->pageTextContains(strtr('Variable @name was successfully edited.', ['@name' => 'devel.array']));
-    $this->assertEquals(['devel' => 'value updated'], $this->state->get('devel.array'));
-
-    // Ensure that state variables that contain objects cannot be edited.
-    $this->drupalGet('devel/state/edit/devel.object');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains(strtr('Edit state variable: @name', ['@name' => 'devel.object']));
-    $this->assertSession()->pageTextContains(strtr('Only simple structures are allowed to be edited. State @name contains objects.', ['@name' => 'devel.object']));
-    $this->assertSession()->fieldDisabled('edit-new-value');
-    $button = $this->assertSession()->buttonExists('edit-submit');
-    $this->assertTrue($button->hasAttribute('disabled'));
-
-    // Ensure that the cancel link works as expected.
-    $this->clickLink('Cancel');
-    $this->assertSession()->addressEquals('devel/state');
-  }
-
-  /**
-   * Checks that the passed in elements have the expected text.
-   *
-   * @param \Behat\Mink\Element\NodeElement[] $elements
-   *   The elements for which check the text.
-   * @param array $expected_elements_text
-   *   The expected text for the passed in elements.
-   */
-  protected function assertElementsTextEquals(array $elements, array $expected_elements_text) {
-    $actual_text = array_map(function (NodeElement $element) {
-      return $element->getText();
-    }, $elements);
-    $this->assertSame($expected_elements_text, $actual_text);
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelSwitchUserTest.php b/modules/devel/tests/src/Functional/DevelSwitchUserTest.php
deleted file mode 100644
index a0c89da..0000000
--- a/modules/devel/tests/src/Functional/DevelSwitchUserTest.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests switch user.
- *
- * @group devel
- */
-class DevelSwitchUserTest extends BrowserTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['devel', 'block'];
-
-  /**
-   * The block used by this test.
-   *
-   * @var \Drupal\block\BlockInterface
-   */
-  protected $block;
-
-  /**
-   * The devel user.
-   *
-   * @var \Drupal\user\Entity\User
-   */
-  protected $develUser;
-
-  /**
-   * The switch user.
-   *
-   * @var \Drupal\user\Entity\User
-   */
-  protected $switchUser;
-
-  /**
-   * The web user.
-   *
-   * @var \Drupal\user\Entity\User
-   */
-  protected $webUser;
-
-  /**
-   * Set up test.
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->block = $this->drupalPlaceBlock('devel_switch_user', ['id' => 'switch-user']);
-
-    $this->develUser = $this->drupalCreateUser(['access devel information', 'switch users']);
-    $this->switchUser = $this->drupalCreateUser(['switch users']);
-    $this->webUser = $this->drupalCreateUser();
-  }
-
-  /**
-   * Tests switch user.
-   */
-  public function testSwitchUser() {
-    $this->drupalLogin($this->webUser);
-
-    $this->drupalGet('');
-    $this->assertNoText($this->block->label(), 'Block title was not found.');
-
-    // Ensure that a token is required to switch user.
-    $this->drupalGet('/devel/switch/' . $this->webUser->getDisplayName());
-    $this->assertResponse(403);
-
-    $this->drupalLogin($this->develUser);
-
-    $this->drupalGet('');
-    $this->assertText($this->block->label(), 'Block title was found.');
-
-    // Ensure that if name in not passed the controller returns access denied.
-    $this->drupalGet('/devel/switch');
-    $this->assertResponse(403);
-
-    // Ensure that a token is required to switch user.
-    $this->drupalGet('/devel/switch/' . $this->switchUser->getDisplayName());
-    $this->assertResponse(403);
-
-    // Switch to another user account.
-    $this->drupalGet('/user/' . $this->switchUser->id());
-    $this->clickLink($this->switchUser->getDisplayName());
-    $this->assertSessionByUid($this->switchUser->id());
-    $this->assertNoSessionByUid($this->develUser->id());
-
-    // Switch back to initial account.
-    $this->clickLink($this->develUser->getDisplayName());
-    $this->assertNoSessionByUid($this->switchUser->id());
-    $this->assertSessionByUid($this->develUser->id());
-
-    // Use the search form to switch to another account.
-    $edit = ['userid' => $this->switchUser->getDisplayName()];
-    $this->drupalPostForm(NULL, $edit, t('Switch'));
-    $this->assertSessionByUid($this->switchUser->id());
-    $this->assertNoSessionByUid($this->develUser->id());
-  }
-
-  /**
-   * Tests the switch user block configuration.
-   */
-  public function testSwitchUserBlockConfiguration() {
-    $anonymous = \Drupal::config('user.settings')->get('anonymous');
-
-    // Create some users for the test.
-    for ($i = 0; $i < 12; $i++) {
-      $this->drupalCreateUser();
-    }
-
-    $this->drupalLogin($this->develUser);
-
-    $this->drupalGet('');
-    $this->assertText($this->block->label(), 'Block title was found.');
-
-    // Ensure that block default configuration is effectively used. The block
-    // default configuration is the following:
-    // - list_size : 12
-    // - include_anon : FALSE
-    // - show_form : TRUE
-    $this->assertSwitchUserSearchForm();
-    $this->assertSwitchUserListCount(12);
-    $this->assertSwitchUserListNoContainsUser($anonymous);
-
-    // Ensure that changing the list_size configuration property the number of
-    // user displayed in the list change.
-    $this->setBlockConfiguration('list_size', 4);
-    $this->drupalGet('');
-    $this->assertSwitchUserListCount(4);
-
-    // Ensure that changing the include_anon configuration property the
-    // anonymous user is displayed in the list.
-    $this->setBlockConfiguration('include_anon', TRUE);
-    $this->drupalGet('');
-    $this->assertSwitchUserListContainsUser($anonymous);
-
-    // Ensure that changing the show_form configuration property the
-    // form is not displayed.
-    $this->setBlockConfiguration('show_form', FALSE);
-    $this->drupalGet('');
-    $this->assertSwitchUserNoSearchForm();
-  }
-
-  /**
-   * Test the user list items.
-   */
-  public function testSwitchUserListItems() {
-    $anonymous = \Drupal::config('user.settings')->get('anonymous');
-
-    $this->setBlockConfiguration('list_size', 2);
-
-    // Login as web user so we are sure that this account is prioritized
-    // in the list if not enougth user with 'switch users' permission are
-    // present.
-    $this->drupalLogin($this->webUser);
-
-    $this->drupalLogin($this->develUser);
-    $this->drupalGet('');
-
-    // Ensure that user with 'switch users' permission are prioritized.
-    $this->assertSwitchUserListCount(2);
-    $this->assertSwitchUserListContainsUser($this->develUser->getDisplayName());
-    $this->assertSwitchUserListContainsUser($this->switchUser->getDisplayName());
-
-    // Ensure that blocked users are not shown in the list.
-    $this->switchUser->set('status', 0)->save();
-    $this->drupalGet('');
-    $this->assertSwitchUserListCount(2);
-    $this->assertSwitchUserListContainsUser($this->develUser->getDisplayName());
-    $this->assertSwitchUserListContainsUser($this->webUser->getDisplayName());
-    $this->assertSwitchUserListNoContainsUser($this->switchUser->getDisplayName());
-
-    // Ensure that anonymous user are prioritized if include_anon is set to true.
-    $this->setBlockConfiguration('include_anon', TRUE);
-    $this->drupalGet('');
-    $this->assertSwitchUserListCount(2);
-    $this->assertSwitchUserListContainsUser($this->develUser->getDisplayName());
-    $this->assertSwitchUserListContainsUser($anonymous);
-
-    // Ensure that the switch user block works properly even if no prioritized
-    // users are found (special handling for user 1).
-    $this->drupalLogout();
-    $this->develUser->delete();
-
-    $this->drupalLogin($this->rootUser);
-    $this->drupalGet('');
-    $this->assertSwitchUserListCount(2);
-    $this->assertSwitchUserListContainsUser($this->rootUser->getDisplayName());
-    $this->assertSwitchUserListContainsUser($anonymous);
-
-    // Ensure that the switch user block works properly even if no roles have
-    // the 'switch users' permission associated (special handling for user 1).
-    $roles = user_roles(TRUE, 'switch users');
-    \Drupal::entityTypeManager()->getStorage('user_role')->delete($roles);
-
-    $this->drupalGet('');
-    $this->assertSwitchUserListCount(2);
-    $this->assertSwitchUserListContainsUser($this->rootUser->getDisplayName());
-    $this->assertSwitchUserListContainsUser($anonymous);
-  }
-
-  /**
-   * Helper function for verify the number of items shown in the user list.
-   *
-   * @param int $number
-   *   The expected numer of items.
-   */
-  public function assertSwitchUserListCount($number) {
-    $result = $this->xpath('//div[@id=:block]//ul/li/a', [':block' => 'block-switch-user']);
-    $this->assert(count($result) == $number, 'The number of users shown in switch user is correct.');
-  }
-
-  /**
-   * Helper function for verify if the user list contains a username.
-   *
-   * @param string $username
-   *   The username to check.
-   */
-  public function assertSwitchUserListContainsUser($username) {
-    $result = $this->xpath('//div[@id=:block]//ul/li/a[normalize-space()=:user]', [':block' => 'block-switch-user', ':user' => $username]);
-    $this->assert(count($result) > 0, new FormattableMarkup('User "%user" is included in the switch user list.', ['%user' => $username]));
-  }
-
-  /**
-   * Helper function for verify if the user list not contains a username.
-   *
-   * @param string $username
-   *   The username to check.
-   */
-  public function assertSwitchUserListNoContainsUser($username) {
-    $result = $this->xpath('//div[@id=:block]//ul/li/a[normalize-space()=:user]', [':block' => 'block-switch-user', ':user' => $username]);
-    $this->assert(count($result) == 0, new FormattableMarkup('User "%user" is not included in the switch user list.', ['%user' => $username]));
-  }
-
-  /**
-   * Helper function for verify if the search form is shown.
-   */
-  public function assertSwitchUserSearchForm() {
-    $result = $this->xpath('//div[@id=:block]//form[contains(@class, :form)]', [':block' => 'block-switch-user', ':form' => 'devel-switchuser-form']);
-    $this->assert(count($result) > 0, 'The search form is shown.');
-  }
-
-  /**
-   * Helper function for verify if the search form is not shown.
-   */
-  public function assertSwitchUserNoSearchForm() {
-    $result = $this->xpath('//div[@id=:block]//form[contains(@class, :form)]', [':block' => 'block-switch-user', ':form' => 'devel-switchuser-form']);
-    $this->assert(count($result) == 0, 'The search form is not shown.');
-  }
-
-  /**
-   * Protected helper method to set the test block's configuration.
-   */
-  protected function setBlockConfiguration($key, $value) {
-    $block = $this->block->getPlugin();
-    $block->setConfigurationValue($key, $value);
-    $this->block->save();
-  }
-
-  /**
-   * Asserts that there is a session for a given user ID.
-   *
-   * Based off masquarade module.
-   *
-   * @param int $uid
-   *   The user ID for which to find a session record.
-   *
-   * TODO find a cleaner way to do this check.
-   */
-  protected function assertSessionByUid($uid) {
-    $query = \Drupal::database()->select('sessions');
-    $query->fields('sessions', ['uid']);
-    $query->condition('uid', $uid);
-    $result = $query->execute()->fetchAll();
-
-    if (empty($result)) {
-      $this->fail(new FormattableMarkup('No session found for uid @uid', ['@uid' => $uid]));
-    }
-    elseif (count($result) > 1) {
-      // If there is more than one session, then that must be unexpected.
-      $this->fail("Found more than 1 session for uid $uid.");
-    }
-    else {
-      $this->pass("Found session for uid $uid.");
-    }
-  }
-
-  /**
-   * Asserts that no session exists for a given uid.
-   *
-   * Based off masquarade module.
-   *
-   * @param int $uid
-   *   The user ID to assert.
-   *
-   * TODO find a cleaner way to do this check.
-   */
-  protected function assertNoSessionByUid($uid) {
-    $query = \Drupal::database()->select('sessions');
-    $query->fields('sessions', ['uid']);
-    $query->condition('uid', $uid);
-    $result = $query->execute()->fetchAll();
-    $this->assert(empty($result), "No session for uid $uid found.");
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelToolbarTest.php b/modules/devel/tests/src/Functional/DevelToolbarTest.php
deleted file mode 100644
index 26293f8..0000000
--- a/modules/devel/tests/src/Functional/DevelToolbarTest.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Core\Menu\MenuTreeParameters;
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests devel toolbar module functionality.
- *
- * @group devel
- */
-class DevelToolbarTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['devel', 'toolbar', 'block'];
-
-  /**
-   * The user for tests.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $toolbarUser;
-
-  /**
-   * The user for tests.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $develUser;
-
-  /**
-   * The dafault toolbar items.
-   *
-   * @var array
-   */
-  protected $defaultToolbarItems = [
-    'devel.cache_clear',
-    'devel.container_info.service',
-    'devel.admin_settings_link',
-    'devel.execute_php',
-    'devel.menu_rebuild',
-    'devel.reinstall',
-    'devel.route_info',
-    'devel.run_cron',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->drupalPlaceBlock('local_tasks_block');
-    $this->drupalPlaceBlock('page_title_block');
-
-    $this->develUser = $this->drupalCreateUser([
-      'administer site configuration',
-      'access devel information',
-      'execute php code',
-      'access toolbar',
-    ]);
-    $this->toolbarUser = $this->drupalCreateUser([
-      'access toolbar',
-    ]);
-  }
-
-  /**
-   * Tests configuration form.
-   */
-  public function testConfigurationForm() {
-    // Ensures that the page is accessible ony to users with the adequate
-    // permissions.
-    $this->drupalGet('admin/config/development/devel/toolbar');
-    $this->assertSession()->statusCodeEquals(403);
-
-    // Ensures that the config page is accessible for users with the adequate
-    // permissions and exists the Devel toolbar local task.
-    $this->drupalLogin($this->develUser);
-    $this->drupalGet('admin/config/development/devel/toolbar');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->elementExists('css', '.tabs .primary a:contains("Toolbar Settings")');
-    $this->assertSession()->pageTextContains('Devel Toolbar Settings');
-
-    // Ensures and that all devel menu links are listed in the configuration
-    // page.
-    foreach ($this->getMenuLinkInfos() as $link) {
-      $this->assertSession()->fieldExists(sprintf('toolbar_items[%s]', $link['id']));
-    }
-
-    // Ensures and that the default configuration items are selected by
-    // default.
-    foreach ($this->defaultToolbarItems as $item) {
-      $this->assertSession()->checkboxChecked(sprintf('toolbar_items[%s]', $item));
-    }
-
-    // Ensures that the configuration save works as expected.
-    $edit = [
-      'toolbar_items[devel.event_info]' => 'devel.event_info',
-      'toolbar_items[devel.theme_registry]' => 'devel.theme_registry',
-    ];
-    $this->drupalPostForm('admin/config/development/devel/toolbar', $edit, t('Save configuration'));
-    $this->assertSession()->pageTextContains('The configuration options have been saved.');
-
-    $expected_items = array_merge($this->defaultToolbarItems, ['devel.event_info', 'devel.theme_registry']);
-    sort($expected_items);
-    $config_items = \Drupal::config('devel.toolbar.settings')->get('toolbar_items');
-    sort($config_items);
-
-    $this->assertEquals($expected_items, $config_items);
-  }
-
-  /**
-   * Tests cache metadata headers.
-   */
-  public function testCacheHeaders() {
-    // Disable user toolbar tab so we can test properly if the devel toolbar
-    // implementation interferes with the page cacheability.
-    \Drupal::service('module_installer')->install(['toolbar_disable_user_toolbar']);
-
-    // The menu is not loaded for users without the adequate permission,
-    // so no cache tags for configuration are added.
-    $this->drupalLogin($this->toolbarUser);
-    $this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'config:devel.toolbar.settings');
-    $this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'config:system.menu.devel');
-
-    // Make sure that the configuration cache tags are present for users with
-    // the adequate permission.
-    $this->drupalLogin($this->develUser);
-    $this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'config:devel.toolbar.settings');
-    $this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'config:system.menu.devel');
-
-    // The Devel toolbar implementation should not interfere with the page
-    // cacheability, so you expect a MISS value in the X-Drupal-Dynamic-Cache
-    // header the first time.
-    $this->assertSession()->responseHeaderContains('X-Drupal-Dynamic-Cache', 'MISS');
-
-    // Triggers a page reload and verify that the page is served from the
-    // cache.
-    $this->drupalGet('');
-    $this->assertSession()->responseHeaderContains('X-Drupal-Dynamic-Cache', 'HIT');
-  }
-
-  /**
-   * Tests toolbar integration.
-   */
-  public function testToolbarIntegration() {
-    $library_css_url = 'devel/css/devel.toolbar.css';
-    $toolbar_selector = '#toolbar-bar .toolbar-tab';
-    $toolbar_tab_selector = '#toolbar-bar .toolbar-tab a.toolbar-icon-devel';
-    $toolbar_tray_selector = '#toolbar-bar .toolbar-tab #toolbar-item-devel-tray';
-
-    // Ensures that devel toolbar item is accessible only for user with the
-    // adequate permissions.
-    $this->drupalGet('');
-    $this->assertSession()->responseNotContains($library_css_url);
-    $this->assertSession()->elementNotExists('css', $toolbar_selector);
-    $this->assertSession()->elementNotExists('css', $toolbar_tab_selector);
-
-    $this->drupalLogin($this->toolbarUser);
-    $this->assertSession()->responseNotContains($library_css_url);
-    $this->assertSession()->elementExists('css', $toolbar_selector);
-    $this->assertSession()->elementNotExists('css', $toolbar_tab_selector);
-
-    $this->drupalLogin($this->develUser);
-    $this->assertSession()->responseContains($library_css_url);
-    $this->assertSession()->elementExists('css', $toolbar_selector);
-    $this->assertSession()->elementExists('css', $toolbar_tab_selector);
-    $this->assertSession()->elementTextContains('css', $toolbar_tab_selector, 'Devel');
-
-    // Ensures that the configure link in the toolbar is present and point to
-    // the correct page.
-    $this->clickLink('Configure');
-    $this->assertSession()->addressEquals('admin/config/development/devel/toolbar');
-
-    // Ensures that the toolbar tray contains the all the menu links. To the
-    // links not marked as always visible will be assigned a css class that
-    // allow to hide they when the toolbar has horizontal orientation.
-    $this->drupalGet('');
-    $toolbar_tray = $this->assertSession()->elementExists('css', $toolbar_tray_selector);
-
-    $devel_menu_items = $this->getMenuLinkInfos();
-    $toolbar_items = $toolbar_tray->findAll('css', 'ul.toolbar-menu a');
-    $this->assertCount(count($devel_menu_items), $toolbar_items);
-
-    foreach ($devel_menu_items as $link) {
-      $item_selector = sprintf('ul.toolbar-menu a:contains("%s")', $link['title']);
-      $item = $this->assertSession()->elementExists('css', $item_selector, $toolbar_tray);
-      // TODO: find a more correct way to test link url.
-      $this->assertContains(strtok($link['url'], '?'), $item->getAttribute('href'));
-
-      $not_visible = !in_array($link['id'], $this->defaultToolbarItems);
-      $this->assertTrue($not_visible === $item->hasClass('toolbar-horizontal-item-hidden'));
-    }
-
-    // Ensures that changing the toolbar settings configuration the changes are
-    // immediately visible.
-    $saved_items = $this->config('devel.toolbar.settings')->get('toolbar_items');
-    $saved_items[] = 'devel.event_info';
-
-    $this->config('devel.toolbar.settings')
-      ->set('toolbar_items', $saved_items)
-      ->save();
-
-    $this->drupalGet('');
-    $toolbar_tray = $this->assertSession()->elementExists('css', $toolbar_tray_selector);
-    $item = $this->assertSession()->elementExists('css', sprintf('ul.toolbar-menu a:contains("%s")', 'Events Info'), $toolbar_tray);
-    $this->assertFalse($item->hasClass('toolbar-horizontal-item-hidden'));
-
-    // Ensures that disabling a menu link it will not more shown in the toolbar
-    // and that the changes are immediately visible.
-    $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
-    $menu_link_manager->updateDefinition('devel.event_info', ['enabled' => FALSE]);
-
-    $this->drupalGet('');
-    $toolbar_tray = $this->assertSession()->elementExists('css', $toolbar_tray_selector);
-    $this->assertSession()->elementNotExists('css', sprintf('ul.toolbar-menu a:contains("%s")', 'Events Info'), $toolbar_tray);
-  }
-
-  /**
-   * Tests devel when toolbar module is not installed.
-   */
-  public function testToolbarModuleNotInstalled() {
-    // Ensures that when toolbar module is not installed all works properly.
-    \Drupal::service('module_installer')->uninstall(['toolbar']);
-
-    $this->drupalLogin($this->develUser);
-
-    // Toolbar settings page should respond with 404.
-    $this->drupalGet('admin/config/development/devel/toolbar');
-    $this->assertSession()->statusCodeEquals(404);
-
-    // Primary local task should not contains toolbar tab.
-    $this->drupalGet('admin/config/development/devel');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->elementNotExists('css', '.tabs .primary a:contains("Toolbar Settings")');
-
-    // Toolbar setting config and devel menu cache tags sholud not present.
-    $this->drupalGet('');
-    $this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'config:devel.toolbar.settings');
-    $this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'config:system.menu.devel');
-  }
-
-  /**
-   * Helper function for retrieve the menu link informations.
-   *
-   * @return array
-   *   An array containing the menu link informations.
-   */
-  protected function getMenuLinkInfos() {
-    $parameters = new MenuTreeParameters();
-    $parameters->onlyEnabledLinks()->setTopLevelOnly();
-    $tree = \Drupal::menuTree()->load('devel', $parameters);
-
-    $links = [];
-    foreach ($tree as $element) {
-      $links[] = [
-        'id' => $element->link->getPluginId(),
-        'title' => $element->link->getTitle(),
-        'url' => $element->link->getUrlObject()->toString(),
-      ];
-    }
-    return $links;
-  }
-
-}
diff --git a/modules/devel/tests/src/Functional/DevelWebAssertHelper.php b/modules/devel/tests/src/Functional/DevelWebAssertHelper.php
deleted file mode 100644
index 01f3770..0000000
--- a/modules/devel/tests/src/Functional/DevelWebAssertHelper.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Functional;
-
-use Drupal\Core\Url;
-
-/**
- * Provides convenience methods for assertions in browser tests.
- */
-trait DevelWebAssertHelper {
-
-  /**
-   * Asserts local tasks in the page output.
-   *
-   * @param array $routes
-   *   A list of expected local tasks, prepared as an array of route names and
-   *   their associated route parameters, to assert on the page (in the given
-   *   order).
-   * @param int $level
-   *   (optional) The local tasks level to assert; 0 for primary, 1 for
-   *   secondary. Defaults to 0.
-   */
-  protected function assertLocalTasks(array $routes, $level = 0) {
-    $type_class = $level == 0 ? 'tabs primary' : 'tabs secondary';
-    $elements = $this->xpath('//*[contains(@class, :class)]//a', [':class' => $type_class]);
-    $this->assertTrue(count($elements), 'Local tasks found.');
-    foreach ($routes as $index => $route_info) {
-      list($route_name, $route_parameters) = $route_info;
-      $expected = Url::fromRoute($route_name, $route_parameters)->toString();
-      $this->assertEquals($expected, $elements[$index]->getAttribute('href'));
-    }
-  }
-
-}
diff --git a/modules/devel/tests/src/Kernel/DevelDumperTestTrait.php b/modules/devel/tests/src/Kernel/DevelDumperTestTrait.php
deleted file mode 100644
index ff80cf1..0000000
--- a/modules/devel/tests/src/Kernel/DevelDumperTestTrait.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Kernel;
-
-/**
- * Provides a class for checking dumper output.
- */
-trait DevelDumperTestTrait {
-
-  /**
-   * Asserts that the string passed in input is equals to the string
-   * representation of a variable obtained exporting the data.
-   *
-   * Use \Drupal\devel\DevelDumperManager::export().
-   *
-   * @param $dump
-   *   The string that contains the dump output to test.
-   * @param $data
-   *   The variable to dump.
-   * @param null $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   * @param string $message
-   *   (optional) A message to display with the assertion.
-   */
-  public function assertDumpExportEquals($dump, $data, $name = NULL, $message = '') {
-    $output = $this->getDumperExportDump($data, $name);
-    $this->assertEqual(rtrim($dump), $output, $message);
-  }
-
-  /**
-   * Asserts that a haystack contains the dump export output.
-   *
-   * Use \Drupal\devel\DevelDumperManager::export().
-   *
-   * @param $haystack
-   *   The string that contains the dump output to test.
-   * @param $data
-   *   The variable to dump.
-   * @param null $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   * @param string $message
-   *   (optional) A message to display with the assertion.
-   */
-  public function assertContainsDumpExport($haystack, $data, $name = NULL, $message = '') {
-    $output = $this->getDumperExportDump($data, $name);
-    $this->assertContains($output, (string) $haystack, $message);
-  }
-
-  /**
-   * Asserts that the string passed in input is equals to the string
-   * representation of a variable obtained dumping the data.
-   *
-   * Use \Drupal\devel\DevelDumperManager::dump().
-   *
-   * @param $dump
-   *   The string that contains the dump output to test.
-   * @param $data
-   *   The variable to dump.
-   * @param null $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   * @param string $message
-   *   (optional) A message to display with the assertion.
-   */
-  public function assertDumpEquals($dump, $data, $name = NULL, $message = '') {
-    $output = $this->getDumperDump($data, $name);
-    $this->assertEqual(rtrim($dump), $output, $message);
-  }
-
-  /**
-   * Asserts that a haystack contains the dump output.
-   *
-   * Use \Drupal\devel\DevelDumperManager::dump().
-   *
-   * @param $haystack
-   *   The string that contains the dump output to test.
-   * @param $data
-   *   The variable to dump.
-   * @param null $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   * @param string $message
-   *   (optional) A message to display with the assertion.
-   */
-  public function assertContainsDump($haystack, $data, $name = NULL, $message = '') {
-    $output = $this->getDumperDump($data, $name);
-    $this->assertContains($output, (string) $haystack, $message);
-  }
-
-  /**
-   * Returns a string representation of a variable.
-   *
-   * @param mixed $input
-   *   The variable to dump.
-   * @param string $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   *
-   * @return string
-   *   String representation of a variable.
-   *
-   * @see \Drupal\devel\DevelDumperManager::export()
-   */
-  private function getDumperExportDump($input, $name = NULL) {
-    $output = \Drupal::service('devel.dumper')->export($input, $name);
-    return rtrim($output);
-  }
-
-  /**
-   * Returns a string representation of a variable.
-   *
-   * @param mixed $input
-   *   The variable to dump.
-   * @param string $name
-   *   (optional) The label to output before variable, defaults to NULL.
-   *
-   * @return string
-   *   String representation of a variable.
-   *
-   * @see \Drupal\devel\DevelDumperManager::dump()
-   */
-  private function getDumperDump($input, $name = NULL) {
-    ob_start();
-    \Drupal::service('devel.dumper')->dump($input, $name);
-    $output = ob_get_contents();
-    ob_end_clean();
-    return rtrim($output);
-  }
-
-}
diff --git a/modules/devel/tests/src/Kernel/DevelEnforcedDependenciesTest.php b/modules/devel/tests/src/Kernel/DevelEnforcedDependenciesTest.php
deleted file mode 100644
index b67965b..0000000
--- a/modules/devel/tests/src/Kernel/DevelEnforcedDependenciesTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Kernel;
-
-use Drupal\block\Entity\Block;
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\system\Entity\Menu;
-
-/**
- * Tests Devel enforced dependencies.
- *
- * @group devel
- */
-class DevelEnforcedDependenciesTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['devel', 'block', 'user', 'system'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('user');
-    $this->installConfig('devel');
-    // For uninstall to work.
-    $this->installSchema('user', ['users_data']);
-  }
-
-  /**
-   * Tests devel menu enforced dependencies.
-   */
-  public function testMenuEnforcedDependencies() {
-    /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
-    $config_manager = $this->container->get('config.manager');
-
-    // Ensure that the Devel menu has explicit enforced dependencies on devel
-    // module.
-    $menu = Menu::load('devel');
-    $this->assertEquals(['enforced' => ['module' => ['devel']]], $menu->get('dependencies'));
-
-    // Creates an instance of devel menu block so you can test if enforced
-    // dependencies work properly with it.
-    $block_id = strtolower($this->randomMachineName(8));
-
-    $block = Block::create([
-      'plugin' => 'system_menu_block:devel',
-      'region' => 'sidebar_first',
-      'id' => $block_id,
-      'theme' => $this->config('system.theme')->get('default'),
-      'label' => $this->randomMachineName(8),
-      'visibility' => array(),
-      'weight' => 0,
-    ]);
-    $block->save();
-
-    // Ensure that the menu and block instance depend on devel module.
-    $dependents = $config_manager->findConfigEntityDependents('module', ['devel']);
-    $this->assertTrue(isset($dependents['system.menu.devel']));
-    $this->assertTrue(isset($dependents['block.block.' . $block_id]));
-
-    $this->container->get('module_installer')->uninstall(['devel']);
-
-    // Ensure that the menu and block instance are deleted when the dependency
-    // is uninstalled.
-    $this->assertNull(Menu::load('devel'));
-    $this->assertNull(Block::load($block_id));
-
-    // Ensure that no config entities depend on devel once uninstalled.
-    $dependents = $config_manager->findConfigEntityDependents('module', ['devel']);
-    $this->assertFalse(isset($dependents['system.menu.devel']));
-    $this->assertFalse(isset($dependents['block.block.' . $block_id]));
-  }
-
-}
diff --git a/modules/devel/tests/src/Kernel/DevelMailLogTest.php b/modules/devel/tests/src/Kernel/DevelMailLogTest.php
deleted file mode 100644
index ebaa2fb..0000000
--- a/modules/devel/tests/src/Kernel/DevelMailLogTest.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Kernel;
-
-use Drupal\Core\Mail\Plugin\Mail\TestMailCollector;
-use Drupal\devel\Plugin\Mail\DevelMailLog;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests sending mails with debug interface.
- *
- * @group devel
- */
-class DevelMailLogTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['devel', 'devel_test', 'system'];
-
-  /**
-   * The mail manager.
-   *
-   * @var \Drupal\Core\Mail\MailManagerInterface
-   */
-  protected $mailManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', 'mail');
-    $this->installConfig(['system', 'devel']);
-
-    // Configure system.site mail settings.
-    $this->config('system.site')->set('mail', 'devel-test@example.com')->save();
-
-    $this->mailManager = $this->container->get('plugin.manager.mail');
-  }
-
-  /**
-   * Tests devel_mail_log plugin as default mail backend.
-   */
-  public function testDevelMailLogDefaultBackend() {
-    // Configure devel_mail_log as default mail backends.
-    $this->setDevelMailLogAsDefaultBackend();
-
-    // Ensures that devel_mail_log is the default mail plugin .
-    $mail_backend = $this->mailManager->getInstance(['module' => 'default', 'key' => 'default']);
-    $this->assertInstanceOf(DevelMailLog::class, $mail_backend);
-
-    $mail_backend = $this->mailManager->getInstance(['module' => 'somemodule', 'key' => 'default']);
-    $this->assertInstanceOf(DevelMailLog::class, $mail_backend);
-  }
-
-  /**
-   * Tests devel_mail_log plugin with multiple mail backend.
-   */
-  public function testDevelMailLogMultipleBackend() {
-    // Configure test_mail_collector as default mail backend.
-    $this->config('system.mail')
-      ->set('interface.default', 'test_mail_collector')
-      ->save();
-
-    // Configure devel_mail_log as a module-specific mail backend.
-    $this->config('system.mail')
-      ->set('interface.somemodule', 'devel_mail_log')
-      ->save();
-
-    // Ensures that devel_mail_log is not the default mail plugin.
-    $mail_backend = $this->mailManager->getInstance(['module' => 'default', 'key' => 'default']);
-    $this->assertInstanceOf(TestMailCollector::class, $mail_backend);
-
-    // Ensures that devel_mail_log is used as mail backend only for the
-    // specified module.
-    $mail_backend = $this->mailManager->getInstance(['module' => 'somemodule', 'key' => 'default']);
-    $this->assertInstanceOf(DevelMailLog::class, $mail_backend);
-  }
-
-  /**
-   * Tests devel_mail_log default settings.
-   */
-  public function testDevelMailDefaultSettings() {
-    $config = \Drupal::config('devel.settings');
-    $this->assertEquals('temporary://devel-mails', $config->get('debug_mail_directory'));
-    $this->assertEquals('%to-%subject-%datetime.mail.txt', $config->get('debug_mail_file_format'));
-  }
-
-  /**
-   * Tests devel mail log output.
-   */
-  public function testDevelMailLogOutput() {
-    $config = \Drupal::config('devel.settings');
-
-    // Parameters used for send the email.
-    $mail = [
-      'module' => 'devel_test',
-      'key' => 'devel_mail_log',
-      'to' => 'drupal@example.com',
-      'reply' => 'replyto@example.com',
-      'lang' => \Drupal::languageManager()->getCurrentLanguage(),
-    ];
-
-    // Parameters used for compose the email in devel_test module.
-    // @see devel_test_mail()
-    $params = [
-      'subject' => 'Devel mail log subject',
-      'body' => 'Devel mail log body',
-      'headers' => [
-        'from' => 'postmaster@example.com',
-        'additional' => [
-          'X-stupid' => 'dumb',
-        ],
-      ],
-    ];
-
-    // Configure devel_mail_log as default mail backends.
-    $this->setDevelMailLogAsDefaultBackend();
-
-    // Changes the default filename pattern removing the dynamic date
-    // placeholder for a more predictable filename output.
-    $random = $this->randomMachineName();
-    $filename_pattern = '%to-%subject-' . $random . '.mail.txt';
-    $this->config('devel.settings')
-      ->set('debug_mail_file_format', $filename_pattern)
-      ->save();
-
-    $expected_filename = 'drupal@example.com-Devel_mail_log_subject-' . $random . '.mail.txt';
-    $expected_output = <<<EOF
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8; format=flowed; delsp=yes
-Content-Transfer-Encoding: 8Bit
-X-Mailer: Drupal
-Return-Path: devel-test@example.com
-Sender: devel-test@example.com
-From: postmaster@example.com
-Reply-to: replyto@example.com
-X-stupid: dumb
-To: drupal@example.com
-Subject: Devel mail log subject
-
-Devel mail log body
-
-EOF;
-
-    // Ensures that the mail is captured by devel_mail_log and the placeholders
-    // in the filename are properly resolved.
-    $default_output_directory = $config->get('debug_mail_directory');
-    $expected_file_path = $default_output_directory . '/' . $expected_filename;
-
-    $this->mailManager->mail($mail['module'], $mail['key'], $mail['to'], $mail['lang'], $params, $mail['reply']);
-    $this->assertFileExists($expected_file_path);
-    $this->assertStringEqualsFile($expected_file_path, $expected_output);
-
-    // Ensures that even changing the default output directory devel_mail_log
-    // works as expected.
-    $changed_output_directory = 'temporary://my-folder';
-    $expected_file_path = $changed_output_directory . '/' . $expected_filename;
-    $this->config('devel.settings')
-      ->set('debug_mail_directory', $changed_output_directory)
-      ->save();
-
-    $result = $this->mailManager->mail($mail['module'], $mail['key'], $mail['to'], $mail['lang'], $params, $mail['reply']);
-    $this->assertSame(TRUE, $result['result']);
-    $this->assertFileExists($expected_file_path);
-    $this->assertStringEqualsFile($expected_file_path, $expected_output);
-
-    // Ensures that if the default output directory is a public directory it
-    // will be protected by adding an .htaccess.
-    $public_output_directory = 'public://my-folder';
-    $expected_file_path = $public_output_directory . '/' . $expected_filename;
-    $this->config('devel.settings')
-      ->set('debug_mail_directory', $public_output_directory)
-      ->save();
-
-    $this->mailManager->mail($mail['module'], $mail['key'], $mail['to'], $mail['lang'], $params, $mail['reply']);
-    $this->assertFileExists($expected_file_path);
-    $this->assertStringEqualsFile($expected_file_path, $expected_output);
-    $this->assertFileExists($public_output_directory . '/.htaccess');
-  }
-
-  /**
-   * Configure devel_mail_log as default mail backend.
-   */
-  private function setDevelMailLogAsDefaultBackend() {
-    // TODO can this be avoided?
-    // KernelTestBase enforce the usage of 'test_mail_collector' plugin for
-    // collect the mails. Since we need to test devel mail plugin we manually
-    // configure the mail implementation to use 'devel_mail_log'.
-    $GLOBALS['config']['system.mail']['interface']['default'] = 'devel_mail_log';
-
-    // Configure devel_mail_log as default mail backend.
-    $this->config('system.mail')
-      ->set('interface.default', 'devel_mail_log')
-      ->save();
-  }
-
-}
diff --git a/modules/devel/tests/src/Kernel/DevelQueryDebugTest.php b/modules/devel/tests/src/Kernel/DevelQueryDebugTest.php
deleted file mode 100644
index 3f12925..0000000
--- a/modules/devel/tests/src/Kernel/DevelQueryDebugTest.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\user\Entity\Role;
-use Drupal\user\Entity\User;
-
-/**
- * Tests query debug.
- *
- * @group devel
- */
-class DevelQueryDebugTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['devel', 'system', 'user'];
-
-  /**
-   * The user used in test.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $develUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', 'sequences');
-    $this->installConfig(['system', 'devel']);
-    $this->installEntitySchema('user');
-
-    $devel_role = Role::create([
-      'id' => 'admin',
-      'permissions' => ['access devel information'],
-    ]);
-    $devel_role->save();
-
-    $this->develUser = User::create([
-      'name' => $this->randomMachineName(),
-      'roles' => [$devel_role->id()],
-    ]);
-    $this->develUser->save();
-  }
-
-  /**
-   * Tests devel_query_debug_alter() for select queries.
-   */
-  public function testSelectQueryDebugTag() {
-    // Clear the messages stack.
-    $this->getDrupalMessages();
-
-    // Ensures that no debug message is shown to user without the adequate
-    // permissions.
-    $query = \Drupal::database()->select('users', 'u');
-    $query->fields('u', ['uid']);
-    $query->addTag('debug');
-    $query->execute();
-
-    $messages = $this->getDrupalMessages();
-    $this->assertEmpty($messages);
-
-    // Ensures that the SQL debug message is shown to user with the adequate
-    // permissions. We expect only one status message containing the SQL for
-    // the debugged query.
-    \Drupal::currentUser()->setAccount($this->develUser);
-    $expected_message = "SELECT u.uid AS uid\nFROM \n{users} u";
-
-    $query = \Drupal::database()->select('users', 'u');
-    $query->fields('u', ['uid']);
-    $query->addTag('debug');
-    $query->execute();
-
-    $messages = $this->getDrupalMessages();
-    $this->assertTrue(!empty($messages['status']));
-    $this->assertCount(1, $messages['status']);
-    $this->assertEquals(strip_tags($messages['status'][0]), $expected_message);
-  }
-
-  /**
-   * Tests devel_query_debug_alter() for entity queries.
-   */
-  public function testEntityQueryDebugTag() {
-    // Clear the messages stack.
-    $this->getDrupalMessages();
-
-    // Ensures that no debug message is shown to user without the adequate
-    // permissions.
-    $query = \Drupal::entityQuery('user');
-    $query->addTag('debug');
-    $query->execute();
-
-    $messages = $this->getDrupalMessages();
-    $this->assertEmpty($messages);
-
-    // Ensures that the SQL debug message is shown to user with the adequate
-    // permissions. We expect only one status message containing the SQL for
-    // the debugged entity query.
-    \Drupal::currentUser()->setAccount($this->develUser);
-    $expected_message = "SELECT base_table.uid AS uid, base_table.uid AS base_table_uid\nFROM \n{users} base_table";
-
-    $query = \Drupal::entityQuery('user');
-    $query->addTag('debug');
-    $query->execute();
-
-    $messages = $this->getDrupalMessages();
-    $this->assertTrue(!empty($messages['status']));
-    $this->assertCount(1, $messages['status']);
-    $this->assertEquals(strip_tags($messages['status'][0]), $expected_message);
-  }
-
-  /**
-   * Retrieves the drupal messages.
-   *
-   * @return array
-   *   The messages
-   */
-  protected function getDrupalMessages() {
-    return drupal_get_messages();
-  }
-
-}
diff --git a/modules/devel/tests/src/Kernel/DevelTwigExtensionTest.php b/modules/devel/tests/src/Kernel/DevelTwigExtensionTest.php
deleted file mode 100644
index 3d22d13..0000000
--- a/modules/devel/tests/src/Kernel/DevelTwigExtensionTest.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-
-namespace Drupal\Tests\devel\Kernel;
-
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\devel\Twig\Extension\Debug;
-use Drupal\user\Entity\Role;
-use Drupal\user\Entity\User;
-
-/**
- * Tests Twig extensions.
- *
- * @group devel
- */
-class DevelTwigExtensionTest extends KernelTestBase {
-
-  use DevelDumperTestTrait;
-
-  /**
-   * The user used in test.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $develUser;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['devel', 'user', 'system'];
-
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('user');
-    $this->installSchema('system', 'sequences');
-
-    $devel_role = Role::create([
-      'id' => 'admin',
-      'permissions' => ['access devel information'],
-    ]);
-    $devel_role->save();
-
-    $this->develUser = User::create([
-      'name' => $this->randomMachineName(),
-      'roles' => [$devel_role->id()],
-    ]);
-    $this->develUser->save();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function register(ContainerBuilder $container) {
-    parent::register($container);
-
-    $parameters = $container->getParameter('twig.config');
-    $parameters['debug'] = TRUE;
-    $container->setParameter('twig.config', $parameters);
-  }
-
-  /**
-   * Tests that Twig extension loads appropriately.
-   */
-  public function testTwigExtensionLoaded() {
-    $twig_service = \Drupal::service('twig');
-    $extension = $twig_service->getExtension('devel_debug');
-    $this->assertEquals(get_class($extension), Debug::class, 'Debug Extension loaded successfully.');
-  }
-
-  /**
-   * Tests that the Twig dump functions are registered properly.
-   */
-  public function testDumpFunctionsRegistered() {
-    /** @var \Twig_SimpleFunction[] $functions */
-    $functions = \Drupal::service('twig')->getFunctions();
-
-    $dump_functions = ['devel_dump', 'kpr'];
-    $message_functions = ['devel_message', 'dpm', 'dsm'];
-    $registered_functions = $dump_functions + $message_functions;
-
-    foreach ($registered_functions as $name) {
-      $function = $functions[$name];
-      $this->assertTrue($function instanceof \Twig_SimpleFunction);
-      $this->assertEquals($function->getName(), $name);
-      $this->assertTrue($function->needsContext());
-      $this->assertTrue($function->needsEnvironment());
-      $this->assertTrue($function->isVariadic());
-
-      is_callable($function->getCallable(), TRUE, $callable);
-      if (in_array($name, $dump_functions)) {
-        $this->assertEquals($callable, 'Drupal\devel\Twig\Extension\Debug::dump');
-      }
-      else {
-        $this->assertEquals($callable, 'Drupal\devel\Twig\Extension\Debug::message');
-      }
-    }
-  }
-
-  /**
-   * Tests that the Twig function for XDebug integration is registered properly.
-   */
-  public function testXDebugIntegrationFunctionsRegistered() {
-    /** @var \Twig_SimpleFunction $function */
-    $function = \Drupal::service('twig')->getFunction('devel_breakpoint');
-    $this->assertTrue($function instanceof \Twig_SimpleFunction);
-    $this->assertEquals($function->getName(), 'devel_breakpoint');
-    $this->assertTrue($function->needsContext());
-    $this->assertTrue($function->needsEnvironment());
-    $this->assertTrue($function->isVariadic());
-    is_callable($function->getCallable(), TRUE, $callable);
-    $this->assertEquals($callable, 'Drupal\devel\Twig\Extension\Debug::breakpoint');
-  }
-
-  /**
-   * Tests that the Twig extension's dump functions produce the expected output.
-   */
-  public function testDumpFunctions() {
-    $template = 'test-with-context {{ twig_string }} {{ twig_array.first }} {{ twig_array.second }}{{ devel_dump() }}';
-    $expected_template_output = 'test-with-context context! first value second value';
-
-    $context = [
-      'twig_string' => 'context!',
-      'twig_array' => [
-        'first' => 'first value',
-        'second' => 'second value',
-      ],
-      'twig_object' => new \stdClass(),
-    ];
-
-    /** @var \Drupal\Core\Template\TwigEnvironment $environment */
-    $environment = \Drupal::service('twig');
-
-    // Ensures that the twig extension does nothing if the current
-    // user has not the adequate permission.
-    $this->assertTrue($environment->isDebug());
-    $this->assertEquals($environment->renderInline($template, $context), $expected_template_output);
-
-    \Drupal::currentUser()->setAccount($this->develUser);
-
-    // Ensures that if no argument is passed to the function the twig context is
-    // dumped.
-    $output = (string) $environment->renderInline($template, $context);
-    $this->assertContains($expected_template_output,  $output);
-    $this->assertContainsDump($output, $context, 'Twig context');
-
-    // Ensures that if an argument is passed to the function it is dumped.
-    $template = 'test-with-context {{ twig_string }} {{ twig_array.first }} {{ twig_array.second }}{{ devel_dump(twig_array) }}';
-    $output = (string) $environment->renderInline($template, $context);
-    $this->assertContains($expected_template_output, $output);
-    $this->assertContainsDump($output, $context['twig_array']);
-
-    // Ensures that if more than one argument is passed the function works
-    // properly and every argument is dumped separately.
-    $template = 'test-with-context {{ twig_string }} {{ twig_array.first }} {{ twig_array.second }}{{ devel_dump(twig_string, twig_array.first, twig_array, twig_object) }}';
-    $output = (string) $environment->renderInline($template, $context);
-    $this->assertContains($expected_template_output, $output);
-    $this->assertContainsDump($output, $context['twig_string']);
-    $this->assertContainsDump($output, $context['twig_array']['first']);
-    $this->assertContainsDump($output, $context['twig_array']);
-    $this->assertContainsDump($output, $context['twig_object']);
-
-    // Clear messages.
-    drupal_get_messages();
-
-    $retrieve_message = function ($messages, $index) {
-      return isset($messages['status'][$index]) ? (string) $messages['status'][$index] : NULL;
-    };
-
-    // Ensures that if no argument is passed to the function the twig context is
-    // dumped.
-    $template = 'test-with-context {{ twig_string }} {{ twig_array.first }} {{ twig_array.second }}{{ devel_message() }}';
-    $output = (string) $environment->renderInline($template, $context);
-    $this->assertContains($expected_template_output, $output);
-    $messages = drupal_get_messages();
-    $this->assertDumpExportEquals($retrieve_message($messages, 0), $context, 'Twig context');
-
-    // Ensures that if an argument is passed to the function it is dumped.
-    $template = 'test-with-context {{ twig_string }} {{ twig_array.first }} {{ twig_array.second }}{{ devel_message(twig_array) }}';
-    $output = (string) $environment->renderInline($template, $context);
-    $this->assertContains($expected_template_output, $output);
-    $messages = drupal_get_messages();
-    $this->assertDumpExportEquals($retrieve_message($messages, 0), $context['twig_array']);
-
-    // Ensures that if more than one argument is passed to the function works
-    // properly and every argument is dumped separately.
-    $template = 'test-with-context {{ twig_string }} {{ twig_array.first }} {{ twig_array.second }}{{ devel_message(twig_string, twig_array.first, twig_array, twig_object) }}';
-    $output = (string) $environment->renderInline($template, $context);
-    $this->assertContains($expected_template_output, $output);
-    $messages = drupal_get_messages();
-    $this->assertDumpExportEquals($retrieve_message($messages, 0), $context['twig_string']);
-    $this->assertDumpExportEquals($retrieve_message($messages, 1), $context['twig_array']['first']);
-    $this->assertDumpExportEquals($retrieve_message($messages, 2), $context['twig_array']);
-    $this->assertDumpExportEquals($retrieve_message($messages, 3), $context['twig_object']);
-  }
-
-}
diff --git a/modules/devel/webprofiler/README.md b/modules/devel/webprofiler/README.md
deleted file mode 100644
index af78b41..0000000
--- a/modules/devel/webprofiler/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-!! README.md is a work in progress !!
-
-# Dependencies
-
-- d3.js: Webprofiler module requires D3 library 3.x (not 4.x) to render data.
-
-- highlight.js: Webprofiler module requires highlight 9.7.x library to syntax highlight collected queries.
-
-## Install using Composer (recommended)
-
-If you use Composer to manage dependencies, edit `/composer.json` as follows.
-
-1\. Run `composer require --prefer-dist composer/installers` to ensure that you have the `composer/installers` package installed. This package facilitates the installation of packages into directories other than `/vendor` (e.g. `/libraries`) using Composer.
-
-2\. Add the following to the "installer-paths" section of `composer.json`:
-
-```
-"libraries/{$name}": ["type:drupal-library"],
-```
-
-3\. Add the following to the "repositories" section of `composer.json`:
-
-```
-"d3": {
-    "type": "package",
-    "package": {
-        "name": "d3/d3",
-        "version": "v3.5.17",
-        "type": "drupal-library",
-        "dist": {
-            "url": "https://github.com/d3/d3/archive/v3.5.17.zip",
-            "type": "zip"
-        }
-    }
-},
-"highlightjs": {
-    "type": "package",
-    "package": {
-        "name": "components/highlightjs",
-        "version": "9.7.0",
-        "type": "drupal-library",
-        "dist": {
-            "url": "https://github.com/components/highlightjs/archive/9.7.0.zip",
-            "type": "zip"
-        }
-    }
-}
-```
-4\. Run `composer require --prefer-dist d3/d3:3.5.* components/highlightjs:9.7.*` - you should find that new directories have been created
-under `/libraries`
-
-## Install manually
-
-- d3.js:
-
-  - Create a `/libraries/d3/` directory below your Drupal root directory
-  - Download https://d3js.org/d3.v3.min.js
-  - Rename it to `/libraries/d3/d3.min.js`
-
-  For further details on how to obtain D3.js, see https://github.com/d3/d3/
-
-- highlight.js:
-
-  - Create `/libraries/highlightjs/` directory below your Drupal root directory
-  - Download the library and CSS from http://highlightjs.org into it
-
-# IDE link
-
-Each class name discovered while profiling (controller class, event class) is specially linked to open the class in
-an IDE. You can configure the URLs for these links to work for your IDE.
-
-## Sublime text (2 and 3) - macOS
-See https://github.com/dhoulb/subl
-
-## Textmate
-Use txmt://open?url=file://@file&line=@line
-
-## PhpStorm 8+
-Use phpstorm://open?file=@file&line=@line
-
-# Timeline
-
-It is also possible to collect the time needed to instantiate every single service used in a request.
-
-Add the following two lines to `settings.php` (or, even better, to `settings.local.php`):
-
-```
-$class_loader->addPsr4('Drupal\\webprofiler\\', [ __DIR__ . '/../../modules/contrib/devel/webprofiler/src']);
-$settings['container_base_class'] = '\Drupal\webprofiler\DependencyInjection\TraceableContainer';
-```
-
-Check if the path from the Webprofiler module in your `settings.php` file matches the location of the installed Webprofiler module in your project.
diff --git a/modules/devel/webprofiler/composer.json b/modules/devel/webprofiler/composer.json
deleted file mode 100644
index 4ab96f7..0000000
--- a/modules/devel/webprofiler/composer.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "drupal/webprofiler",
-  "description": "Drupal Web Profiler.",
-  "type": "drupal-module",
-  "authors": [
-    {
-      "name": "Luca Lusso",
-      "email": "lussoluca@gmail.com",
-      "homepage": "https://github.com/lussoluca",
-      "role": "Maintainer"
-    }
-  ],
-  "license": "GPL-2.0+",
-  "require": {}
-}
diff --git a/modules/devel/webprofiler/config/install/webprofiler.config.yml b/modules/devel/webprofiler/config/install/webprofiler.config.yml
deleted file mode 100644
index 5e81274..0000000
--- a/modules/devel/webprofiler/config/install/webprofiler.config.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-purge_on_cache_clear: true
-storage: profiler.database_storage
-exclude: "/contextual/*\r\n/toolbar/*\r\n/edit/*\r\n*.js\r\n*.css"
-ide_link: "txmt://open?url=file://@file&line=@line"
-ide_link_remote: ""
-ide_link_local: ""
-active_toolbar_items:
-  devel: devel
-  assets: assets
-  blocks: blocks
-  cache: cache
-  database: database
-  drupal_extension: drupal_extension
-  forms: forms
-  performance_timing: performance_timing
-  php_config: php_config
-  request: request
-  time: time
-  user: user
-  views: views
-  config: '0'
-  events: '0'
-  http: '0'
-  routing: '0'
-  services: '0'
-  state: '0'
-query_sort: source
-query_highlight: 5
diff --git a/modules/devel/webprofiler/config/schema/webprofiler.schema.yml b/modules/devel/webprofiler/config/schema/webprofiler.schema.yml
deleted file mode 100644
index 1adc2f1..0000000
--- a/modules/devel/webprofiler/config/schema/webprofiler.schema.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Schema for the configuration files of the Webprofiler module.
-webprofiler.config:
-  type: config_object
-  label: 'Webprofiler configuration'
-  mapping:
-    purge_on_cache_clear:
-      type: boolean
-      label: 'Purge profiles on cache clear'
-    storage:
-      type: string
-      label: 'Storage implementation'
-    exclude:
-      type: string
-      label: 'Paths to exclude'
-    active_toolbar_items:
-      type: sequence
-      label: 'Active toolbar items'
-      sequence:
-        - type: string
-          label: 'Toolbar item'
-    ide_link:
-      type: string
-      label: 'IDE link'
-    ide_link_remote:
-      type: string
-      label: 'IDE link remote path'
-    ide_link_local:
-      type: string
-      label: 'IDE link local path'
-    query_sort:
-      type: string
-      label: 'Sort query log'
-    query_highlight:
-      type: integer
-      label: 'Slow query highlighting'
diff --git a/modules/devel/webprofiler/console.services.yml b/modules/devel/webprofiler/console.services.yml
deleted file mode 100644
index fc662e4..0000000
--- a/modules/devel/webprofiler/console.services.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-services:
-  webprofiler.list:
-    class: Drupal\webprofiler\Command\ListCommand
-    tags:
-      - { name: drupal.command }
-    lazy: true
-  webprofiler.export:
-    class: Drupal\webprofiler\Command\ExportCommand
-    tags:
-      - { name: drupal.command }
-  webprofiler.benchmark:
-    class: Drupal\webprofiler\Command\BenchmarkCommand
-    tags:
-      - { name: drupal.command }
diff --git a/modules/devel/webprofiler/console/translations/en/webprofiler.benchmark.yml b/modules/devel/webprofiler/console/translations/en/webprofiler.benchmark.yml
deleted file mode 100644
index 3f6da36..0000000
--- a/modules/devel/webprofiler/console/translations/en/webprofiler.benchmark.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-description: Benchmark an url.
-arguments:
- url: Url to benchmark.
-options:
-  runs: Number of runs.
-  file: Save results as file.
-  cache-rebuild: Rebuild cache before start benchmark.
-messages:
-  not_git: Not in a git repository.
-  error_login: Impossibile to login in the user.
-progress:
-  cache_rebuild: Rebuilding cache...
-  login: Login user...
-  get: Http request...
-  compute_avg: Compute average...
-  compute_median: Compute median...
-  compute_95percentile: Compute 95 percentile...
-  git_hash: Compute GIT hash...
-  yaml: Generate output...
-  done: Done.
diff --git a/modules/devel/webprofiler/console/translations/en/webprofiler.export.yml b/modules/devel/webprofiler/console/translations/en/webprofiler.export.yml
deleted file mode 100644
index e11c8d7..0000000
--- a/modules/devel/webprofiler/console/translations/en/webprofiler.export.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-description: Exports Webprofiler profile/s to file.
-arguments:
-  id: Profile id.
-options:
-  directory: Destination directory to store exported file/s.
-messages:
-  success: Succesfully exported to %s
-  exported_count: <info>Exported %s profiles</info>
-  error_writing: Error writing file %s
-  error_no_profile: No profile with id %s
-progress:
-  exporting: Exporting profiles...
-  archive: Create archive...
-  delete_tmp: Delete temp files...
-  done: Done.
diff --git a/modules/devel/webprofiler/console/translations/en/webprofiler.list.yml b/modules/devel/webprofiler/console/translations/en/webprofiler.list.yml
deleted file mode 100644
index c8cb699..0000000
--- a/modules/devel/webprofiler/console/translations/en/webprofiler.list.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-description: Lists Webprofiler profiles.
-options:
-  ip: Filter by IP.
-  url: Filter by URL.
-  method: Filter by HTTP method.
-  limit: Limit printed profiles.
-rows:
-  time: D, m/d/Y - H:i:s
-header:
-  token: Token
-  ip: IP
-  method: Method
-  url: URL
-  time: Time
diff --git a/modules/devel/webprofiler/console/translations/es/webprofiler.benchmark.yml b/modules/devel/webprofiler/console/translations/es/webprofiler.benchmark.yml
deleted file mode 100644
index 8ed902e..0000000
--- a/modules/devel/webprofiler/console/translations/es/webprofiler.benchmark.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-description: Benchmark una URL.
-arguments:
-  url: Url para efectuar un benchmark.
-options:
-  runs: Número de ejecuciones.
-  file: Guardar los resultados en un archivo.
-  cache-rebuild: Reconstruir cache antes de iniciar el benchmark.
-messages:
-  not_git: No en un repositorio git.
-  error_login: Error ingresando al sistema.
-progress:
-  cache_rebuild: Reconstruyendo cache...
-  login: Ingresando al sistema...
-  get: Solicitud Http...
-  compute_avg: Calculando promedio...
-  compute_median: Calculando media...
-  compute_95percentile: Calculando percentile 95...
-  git_hash: Calculando GIT hash...
-  yaml: Generando salida...
-  done: Terminado.
diff --git a/modules/devel/webprofiler/console/translations/es/webprofiler.export.yml b/modules/devel/webprofiler/console/translations/es/webprofiler.export.yml
deleted file mode 100644
index d7ca920..0000000
--- a/modules/devel/webprofiler/console/translations/es/webprofiler.export.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-description: Exportar Webprofiler perfil(es) a un archivo.
-arguments:
-  id: Profile id.
-options:
-  directory: Directorio de destiono para almacenar archivo(s) exportados.
-messages:
-  success: Satisfactoriamente exportado en %s
-  exported_count: <info>Exportados %s perfiles</info>
-  error_writing: Error escribiendo el archivo %s
-  error_no_profile: No fue encontrado un perfil con id %s
-progress:
-    exporting: Exportando perfiles...
-    archive: Creando archivos...
-    delete_tmp: Borrando archivos temporales...
-    done: Terminado.
diff --git a/modules/devel/webprofiler/console/translations/es/webprofiler.list.yml b/modules/devel/webprofiler/console/translations/es/webprofiler.list.yml
deleted file mode 100644
index e4635ae..0000000
--- a/modules/devel/webprofiler/console/translations/es/webprofiler.list.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-description: Listar perfiles Webprofiler.
-options:
-  ip: Filtrar por IP.
-  url: Filtrar por URL.
-  method: Filtrar por método HTTP.
-  limit: Limitar perfiles a mostrar.
-rows:
-  time: D, d/m/Y - H:i:s
-header:
-  token: Token
-  ip: IP
-  method: Método
-  url: URL
-  time: Fecha
diff --git a/modules/devel/webprofiler/css/app/dashboard.css b/modules/devel/webprofiler/css/app/dashboard.css
deleted file mode 100644
index dfa517a..0000000
--- a/modules/devel/webprofiler/css/app/dashboard.css
+++ /dev/null
@@ -1,582 +0,0 @@
-/* base themes */
-#webrofiler {
-  overflow: hidden;
-  font-size: 1em;
-  line-height: 1.2;
-  color: rgba(0, 0, 0, 0.7);
-  background-color: #ffffff; }
-  #webrofiler * {
-    box-sizing: border-box; }
-
-#webprofiler {
-  /*
-  
-  overview example
-  
-  <ul class="overview__list">
-    <li>
-      <a class="overview__link">
-        <img class="overview__icon" src="data:">
-        <span class="overview__title">
-        <span class="overview__subtitle">
-  
-  
-  */
-  /*
-  
-  general element template
-  
-  will be implemented in the next dashboard relase
-  
-  this HTML will contain the preview of any single card present inside the dashboard
-  
-  <a class="ui--[red||pink||purple||deepPurple||indigo||blue||lightBlue||cyan||teal||green||lightGreen||lime||yellow||amber||orange||deepOrange||brown||gray||blueGray] app l-card">
-  
-    <div class="app__bar">
-      <h3 class="app__title">
-      <img class="app__icon" src="data:">
-  
-    <div class="app__container">
-      <div class="app__main-data"> text
-      <div class="app__secondary-data"> text
-  
-  */ }
-  #webprofiler .tabs:after, #webprofiler .tabs__tabs:after, #webprofiler .tabs__panels:after, #webprofiler .tabs__panel:after, #webprofiler .resume:after, #webprofiler .collectors:after, #webprofiler .panel:after, #webprofiler .panel__toolbar:after, #webprofiler .panel__container:after, #webprofiler .panel__expand-header:after, #webprofiler .panel__expand-content:after, #webprofiler .app__bar:after, #webprofiler .app__container:after, #webprofiler .modal__bar:after, #webprofiler .modal__content:after {
-    content: ' ';
-    display: block;
-    clear: both; }
-  #webprofiler .panel__container, #webprofiler .ui--red, #webprofiler .ui--pink, #webprofiler .ui--purple, #webprofiler .ui--deepPurple, #webprofiler .ui--indigo, #webprofiler .ui--blue, #webprofiler .ui--lightBlue, #webprofiler .ui--cyan, #webprofiler .ui--teal, #webprofiler .ui--green, #webprofiler .ui--lightGreen, #webprofiler .ui--lime, #webprofiler .ui--yellow, #webprofiler .ui--amber, #webprofiler .ui--orange, #webprofiler .ui--deepOrange, #webprofiler .ui--brown, #webprofiler .ui--gray, #webprofiler .ui--blueGray, #webprofiler .modal__container {
-    box-shadow: 0 2px 4px -2px #000000;
-    margin-bottom: 40px;
-    border-bottom-right-radius: 2px;
-    border-bottom-left-radius: 2px;
-    overflow: hidden; }
-  #webprofiler .ui--red .app__title, #webprofiler .ui--pink .app__title, #webprofiler .ui--purple .app__title, #webprofiler .ui--deepPurple .app__title, #webprofiler .ui--blue .app__title, #webprofiler .ui--lightBlue .app__title, #webprofiler .ui--cyan .app__title, #webprofiler .ui--green .app__title, #webprofiler .ui--lightGreen .app__title, #webprofiler .ui--lime .app__title, #webprofiler .ui--yellow .app__title, #webprofiler .ui--amber .app__title, #webprofiler .ui--orange .app__title, #webprofiler .ui--deepOrange .app__title, #webprofiler .ui--brown .app__title {
-    color: white; }
-  #webprofiler .ui--indigo .app__title, #webprofiler .ui--teal .app__title, #webprofiler .ui--gray .app__title, #webprofiler .ui--blueGray .app__title, #webprofiler .modal__title {
-    color: rgba(0, 0, 0, 0.87); }
-  #webprofiler .ui--red .app__main-data, #webprofiler .ui--pink .app__main-data, #webprofiler .ui--purple .app__main-data, #webprofiler .ui--deepPurple .app__main-data, #webprofiler .ui--indigo .app__main-data, #webprofiler .ui--blue .app__main-data, #webprofiler .ui--lightBlue .app__main-data, #webprofiler .ui--cyan .app__main-data, #webprofiler .ui--teal .app__main-data, #webprofiler .ui--green .app__main-data, #webprofiler .ui--lightGreen .app__main-data, #webprofiler .ui--lime .app__main-data, #webprofiler .ui--yellow .app__main-data, #webprofiler .ui--amber .app__main-data, #webprofiler .ui--orange .app__main-data, #webprofiler .ui--deepOrange .app__main-data, #webprofiler .ui--brown .app__main-data, #webprofiler .ui--gray .app__main-data, #webprofiler .ui--blueGray .app__main-data, #webprofiler .modal__content {
-    color: rgba(0, 0, 0, 0.7); }
-  #webprofiler .ui--red .app__secondary-data, #webprofiler .ui--pink .app__secondary-data, #webprofiler .ui--purple .app__secondary-data, #webprofiler .ui--deepPurple .app__secondary-data, #webprofiler .ui--indigo .app__secondary-data, #webprofiler .ui--blue .app__secondary-data, #webprofiler .ui--lightBlue .app__secondary-data, #webprofiler .ui--cyan .app__secondary-data, #webprofiler .ui--teal .app__secondary-data, #webprofiler .ui--green .app__secondary-data, #webprofiler .ui--lightGreen .app__secondary-data, #webprofiler .ui--lime .app__secondary-data, #webprofiler .ui--yellow .app__secondary-data, #webprofiler .ui--amber .app__secondary-data, #webprofiler .ui--orange .app__secondary-data, #webprofiler .ui--deepOrange .app__secondary-data, #webprofiler .ui--brown .app__secondary-data, #webprofiler .ui--gray .app__secondary-data, #webprofiler .ui--blueGray .app__secondary-data {
-    color: rgba(0, 0, 0, 0.3); }
-  #webprofiler a {
-    color: #2979ff; }
-    #webprofiler a:hover {
-      color: #2962ff;
-      text-decoration: none; }
-  #webprofiler .list--unstyled {
-    margin: 0;
-    list-style-type: none;
-    padding: 0; }
-    #webprofiler .list--unstyled > li {
-      display: block;
-      padding: 0 8px; }
-  #webprofiler .list--inline {
-    margin: 0;
-    list-style-type: none;
-    padding: 0; }
-  #webprofiler .list--inline > li {
-      display: inline-block;
-      padding: 8px; }
-  #webprofiler .list--level-0 li {
-    padding: 0 0 0 0; }
-  #webprofiler .list--level-1 li {
-    padding: 0 0 0 8px; }
-  #webprofiler .list--level-3 li {
-    padding: 0 0 0 16px; }
-  #webprofiler pre {
-    padding: 16px; }
-  #webprofiler pre, #webprofiler code {
-    white-space: normal;
-    word-break: break-all;
-    word-break: break-word;
-    font-size: 14px;
-    background-color: #f5f5f5; }
-  #webprofiler .list-item--bold {
-      font-weight: bold;
-  }
-  #webprofiler code.code--json {
-    white-space: pre-wrap; }
-  #webprofiler thead {
-    white-space: nowrap; }
-    #webprofiler thead th {
-      background-color: transparent; }
-  #webprofiler th {
-    font-size: 12px;
-    color: rgba(0, 0, 0, 0.54);
-    border: none; }
-  #webprofiler td {
-    word-break: break-all;
-    font-size: 13px;
-    color: rgba(0, 0, 0, 0.87); }
-  #webprofiler tr {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.18); }
-    #webprofiler tr:hover {
-      background-color: #eeeeee; }
-  #webprofiler td, #webprofiler th {
-    padding: 16px 24px;
-    min-height: 46px;
-    text-transform: none;
-    vertical-align: top; }
-  #webprofiler .table--compact {
-    table-layout: fixed; }
-    #webprofiler .table--compact td, #webprofiler .table--compact th {
-      word-spacing: 99em; }
-  #webprofiler .table--fixed {
-    table-layout: fixed; }
-  #webprofiler .table--duo th:first-child,
-  #webprofiler .table--duo td:first-child {
-    width: 35%; }
-  #webprofiler .table--trio th:first-child,
-  #webprofiler .table--trio td:first-child {
-    width: 80%; }
-  #webprofiler .table--trio th:nth-child(2),
-  #webprofiler .table--trio td:nth-child(2),
-  #webprofiler .table--trio th:nth-child(3),
-  #webprofiler .table--trio td:nth-child(3) {
-    width: 10%; }
-  #webprofiler [class*="button"] {
-    display: block;
-    color: #2979ff;
-    border-bottom-right-radius: 2px;
-    border-bottom-left-radius: 2px;
-    border: none;
-    text-transform: uppercase;
-    font-size: 16px;
-    text-align: center;
-    padding: 16px;
-    margin: 8px;
-    cursor: pointer;
-    min-width: 42px; }
-  #webprofiler .button--flat {
-    background-color: transparent; }
-    #webprofiler .button--flat:hover {
-      background-color: #eeeeee; }
-    #webprofiler .button--flat:active, #webprofiler .button--flat:focus {
-      background-color: #bdbdbd; }
-  #webprofiler .tabs {
-    position: relative;
-    margin: -16px 0 16px 0; }
-    #webprofiler .tabs a {
-      display: inline; }
-    #webprofiler .tabs__radio {
-      display: none; }
-    #webprofiler .tabs__tabs {
-      margin: 0 -16px 16px -16px;
-      text-transform: uppercase;
-      height: 48px;
-      background-color: #f5f5f5; }
-      #webprofiler .tabs__tabs > li {
-        padding: 0; }
-    #webprofiler .tabs__label {
-      border-bottom: 5px solid transparent;
-      text-align: center;
-      line-height: 48px;
-      min-width: 160px;
-      display: inline-block;
-      margin: -5px 0 0 0; }
-    #webprofiler .tabs__panel {
-      display: none;
-      width: 100%; }
-    #webprofiler .tabs__radio:checked:nth-child(1) ~ .tabs__panels .tabs__panel:nth-child(1) {
-      display: block; }
-    #webprofiler .tabs__radio:checked:nth-child(2) ~ .tabs__panels .tabs__panel:nth-child(2) {
-      display: block; }
-    #webprofiler .tabs__radio:checked:nth-child(3) ~ .tabs__panels .tabs__panel:nth-child(3) {
-      display: block; }
-    #webprofiler .tabs__radio:checked:nth-child(1) ~ .tabs__tabs li:nth-child(1) .tabs__label {
-      border-bottom-color: #2962ff; }
-    #webprofiler .tabs__radio:checked:nth-child(2) ~ .tabs__tabs li:nth-child(2) .tabs__label {
-      border-bottom-color: #2962ff; }
-    #webprofiler .tabs__radio:checked:nth-child(3) ~ .tabs__tabs li:nth-child(3) .tabs__label {
-      border-bottom-color: #2962ff; }
-  #webprofiler .overview {
-    display: table-cell;
-    width: 20%;
-    vertical-align: top;
-    font-size: 1.2em;
-    line-height: 2em;
-    background: #ffffff; }
-  #webprofiler .overview__list {
-    padding: 0;
-    margin: -1px -1px 0 0;
-    list-style-type: none;
-    border-top: 1px solid rgba(0, 0, 0, 0.18); }
-  #webprofiler .overview__link {
-    position: relative;
-    display: block;
-    padding: 0 0 0 72px;
-    border-right: 5px solid transparent; }
-    #webprofiler .overview__link:after {
-      content: '';
-      display: block;
-      position: absolute;
-      bottom: 0;
-      right: -5px;
-      left: 72px;
-      border-bottom: 1px solid rgba(0, 0, 0, 0.18); }
-  #webprofiler .overview__icon {
-    position: absolute;
-    top: 16px;
-    left: 16px; }
-  #webprofiler .overview__title {
-    display: block;
-    font-size: 16px;
-    line-height: 22px;
-    padding-top: 16px;
-    padding-bottom: 16px;
-    padding-right: 11px; }
-  #webprofiler .overview__subtitle {
-    display: block;
-    font-size: 14px;
-    line-height: 20px;
-    padding-bottom: 16px;
-    padding-right: 11px;
-    margin-top: -16px; }
-  #webprofiler .is--selected .overview__link {
-    color: #000000;
-    background-color: #f5f5f5;
-    border-right-color: #2962ff; }
-  #webprofiler .overview__link:hover {
-    color: #000000;
-    background-color: #82b1ff; }
-  #webprofiler .resume {
-    position: relative;
-    background-color: #e0e0e0;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.18);
-    border-left: 1px solid rgba(0, 0, 0, 0.18);
-    padding: 16px 16px 0 16px;
-    margin-left: 20%; }
-  #webprofiler .resume__title {
-    display: block;
-    font-size: 24px;
-    line-height: 32px; }
-  #webprofiler .resume__subtitle,
-  #webprofiler .resume__time {
-    display: block;
-    font-size: 16px;
-    line-height: 24px; }
-  #webprofiler .resume__time {
-    margin-bottom: 52px; }
-  #webprofiler .resume__button {
-    position: absolute;
-    bottom: 0;
-    right: 16px; }
-  #webprofiler .collectors {
-    display: table;
-    width: 100%; }
-  #webprofiler .details {
-    display: table-cell;
-    overflow: hidden;
-    padding: 16px;
-    border-left: 1px solid rgba(0, 0, 0, 0.18); }
-  #webprofiler .details__title {
-    border-bottom: 1px solid #ccc;
-    padding-bottom: 5px; }
-  #webprofiler .details svg {
-    max-width: 100%; }
-  #webprofiler [class*='panel__filter--'] {
-    display: inline-block;
-    padding: 32px 16px 0 16px;
-    position: relative; }
-  #webprofiler .panel {
-    margin: 0 0 20px;
-    padding: 0;
-    background: #fafafa;
-    border: none; }
-    #webprofiler .panel select,
-    #webprofiler .panel input[type="text"] {
-      min-width: 165px;
-      font-size: 16px;
-      background-color: #fafafa;
-      border-color: transparent;
-      border-width: 0;
-      border-bottom: 2px solid #ffffff;
-      padding: 8px 0;
-      margin-bottom: 8px; }
-      #webprofiler .panel select:focus,
-      #webprofiler .panel input[type="text"]:focus {
-        outline: none;
-        border-bottom-color: #2979ff; }
-        #webprofiler .panel select:focus + label,
-        #webprofiler .panel input[type="text"]:focus + label {
-          color: #2979ff; }
-    #webprofiler .panel select {
-      min-width: 165px;
-      padding-right: 24px;
-      border-radius: 0;
-      background: url(../../images/caret-down.svg) no-repeat 99% 63%;
-      -moz-appearance: none; }
-      #webprofiler .panel select:hover {
-        box-shadow: none; }
-    #webprofiler .panel__title {
-      font-size: 24px;
-      line-height: 1;
-      background-color: #f5f5f5;
-      text-transform: none;
-      padding: 16px;
-      margin: -16px -16px 16px -16px; }
-    #webprofiler .panel__toolbar {
-      background-color: #fafafa;
-      margin: -16px -16px 16px -16px; }
-    #webprofiler .panel__filter-action {
-      display: inline-block; }
-    #webprofiler .panel__filter-label {
-      display: block;
-      position: absolute;
-      top: 0;
-      margin-top: 16px; }
-    #webprofiler .panel__container {
-      background-color: #ffffff;
-      position: relative;
-      padding: 16px; }
-    #webprofiler .panel__expand-content {
-      display: none; }
-  #webprofiler .is--open .panel__expand-content {
-    display: block; }
-  #webprofiler .is--hightlighted {
-    border-right: 10px solid #aa00ff;
-    padding-right: 6px; }
-  #webprofiler .is--hidden {
-    display: none; }
-  #webprofiler .app {
-    overflow: hidden;
-    position: relative;
-    display: block;
-    cursor: pointer; }
-    #webprofiler .app__bar {
-      padding: 16px; }
-    #webprofiler .app__title {
-      margin: 8px 32px 0 0;
-      font-weight: normal; }
-    #webprofiler .app__icon {
-      float: right;
-      height: 32px;
-      width: 32px; }
-    #webprofiler .app__container {
-      padding: 16px; }
-    #webprofiler .app__main-data {
-      font-size: 24px;
-      padding-bottom: 16px; }
-    #webprofiler .app__secondary-data {
-      font-size: 14px;
-      padding-bottom: 16px;
-      margin-top: -8px; }
-  #webprofiler .ui--red .app__bar {
-    background-color: #ff1744; }
-  #webprofiler .ui--red .app__container {
-    background-color: #ff8a80; }
-  #webprofiler .ui--pink .app__bar {
-    background-color: #f50057; }
-  #webprofiler .ui--pink .app__container {
-    background-color: #ff80ab; }
-  #webprofiler .ui--purple .app__bar {
-    background-color: #d500f9; }
-  #webprofiler .ui--purple .app__container {
-    background-color: #ea80fc; }
-  #webprofiler .ui--deepPurple .app__bar {
-    background-color: #651fff; }
-  #webprofiler .ui--deepPurple .app__container {
-    background-color: #b388ff; }
-  #webprofiler .ui--indigo .app__bar {
-    background-color: #3d5afe; }
-  #webprofiler .ui--indigo .app__container {
-    background-color: #8c9eff; }
-  #webprofiler .ui--blue .app__bar {
-    background-color: #2979ff; }
-  #webprofiler .ui--blue .app__container {
-    background-color: #82b1ff; }
-  #webprofiler .ui--lightBlue .app__bar {
-    background-color: #00b0ff; }
-  #webprofiler .ui--lightBlue .app__container {
-    background-color: #80d8ff; }
-  #webprofiler .ui--cyan .app__bar {
-    background-color: #00e5ff; }
-  #webprofiler .ui--cyan .app__container {
-    background-color: #84ffff; }
-  #webprofiler .ui--teal .app__bar {
-    background-color: #ade9b6; }
-  #webprofiler .ui--teal .app__container {
-    background-color: #a7ffeb; }
-  #webprofiler .ui--green .app__bar {
-    background-color: #00e676; }
-  #webprofiler .ui--green .app__container {
-    background-color: #b9f6ca; }
-  #webprofiler .ui--lightGreen .app__bar {
-    background-color: #76ff03; }
-  #webprofiler .ui--lightGreen .app__container {
-    background-color: #ccff90; }
-  #webprofiler .ui--lime .app__bar {
-    background-color: #c6ff00; }
-  #webprofiler .ui--lime .app__container {
-    background-color: #f4ff81; }
-  #webprofiler .ui--yellow .app__bar {
-    background-color: #ffea00; }
-  #webprofiler .ui--yellow .app__container {
-    background-color: #ffff8d; }
-  #webprofiler .ui--amber .app__bar {
-    background-color: #ffc400; }
-  #webprofiler .ui--amber .app__container {
-    background-color: #ffe57f; }
-  #webprofiler .ui--orange .app__bar {
-    background-color: #ff9100; }
-  #webprofiler .ui--orange .app__container {
-    background-color: #ffd180; }
-  #webprofiler .ui--deepOrange .app__bar {
-    background-color: #ff3d00; }
-  #webprofiler .ui--deepOrange .app__container {
-    background-color: #ff9e80; }
-  #webprofiler .ui--brown .app__bar {
-    background-color: #8d6e63; }
-  #webprofiler .ui--brown .app__container {
-    background-color: #d7ccc8; }
-  #webprofiler .ui--gray .app__bar {
-    background-color: #bdbdbd; }
-  #webprofiler .ui--gray .app__container {
-    background-color: #f5f5f5; }
-  #webprofiler .ui--blueGray .app__bar {
-    background-color: #bdbdbd; }
-  #webprofiler .ui--blueGray .app__container {
-    background-color: #f5f5f5; }
-  #webprofiler .loader--fixed {
-    position: fixed;
-    right: 0;
-    top: 50%;
-    width: 80%;
-    height: 100px;
-    zoom: 1.7;
-    text-align: center; }
-  #webprofiler .loader__circle {
-    animation: rotate 2s linear infinite;
-    height: 100px;
-    position: relative;
-    width: 100px; }
-  #webprofiler .loader__path {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0;
-    animation: dash 1.5s ease-in-out infinite, color 6s ease-in-out infinite;
-    stroke-linecap: round; }
-@keyframes rotate {
-  100% {
-    transform: rotate(360deg); } }
-@keyframes dash {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0; }
-  50% {
-    stroke-dasharray: 89, 200;
-    stroke-dashoffset: -35; }
-  100% {
-    stroke-dasharray: 89, 200;
-    stroke-dashoffset: -124; } }
-@keyframes color {
-  100%, 0% {
-    stroke: #ff1744; }
-  40% {
-    stroke: #2979ff; }
-  66% {
-    stroke: #00e676; }
-  80%, 90% {
-    stroke: #ffea00; } }
-  #webprofiler .loader--linear {
-    height: 3px;
-    background-color: #ffea00;
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0; }
-  #webprofiler .loader__bar {
-    content: "";
-    display: inline;
-    position: absolute;
-    width: 0;
-    height: 100%;
-    left: 50%;
-    text-align: center; }
-  #webprofiler .loader__bar:nth-child(1) {
-    background-color: #ff1744;
-    animation: loading 3s linear infinite; }
-  #webprofiler .loader__bar:nth-child(2) {
-    background-color: #2979ff;
-    animation: loading 3s linear 1s infinite; }
-  #webprofiler .loader__bar:nth-child(3) {
-    background-color: #00e676;
-    animation: loading 3s linear 2s infinite; }
-@keyframes loading {
-  from {
-    left: 50%;
-    width: 0;
-    z-index: 100; }
-  33.3333% {
-    left: 0;
-    width: 100%;
-    z-index: 10; }
-  to {
-    left: 0;
-    width: 100%; } }
-  #webprofiler .modal {
-    background-color: rgba(0, 0, 0, 0.87);
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0; }
-    #webprofiler .modal__container {
-      border-top-right-radius: 2px;
-      border-top-left-radius: 2px;
-      box-shadow: 0 2px 4px -2px #000000;
-      background-color: #ffffff;
-      position: relative;
-      width: 33%;
-      min-width: 350px;
-      margin: 0 auto;
-      margin-top: 15%; }
-    #webprofiler .modal__bar {
-      padding: 16px; }
-    #webprofiler .modal__content {
-      padding: 16px;
-      font-size: 14px; }
-    #webprofiler .modal__title {
-      margin: 8px 32px 0 0;
-      font-weight: normal;
-      font-size: 24px; }
-    #webprofiler .modal__main-data {
-      font-size: 24px;
-      padding-bottom: 16px; }
-    #webprofiler .modal textarea {
-      white-space: normal;
-      word-break: break-all;
-      word-break: break-word;
-      font-size: 14px;
-      background-color: #f5f5f5;
-      max-width: 100%;
-      height: 320px;
-      width: 100%;
-      padding: 16px;
-      box-sizing: border-box;
-      border: none; }
-  #webprofiler .t--heading, #webprofiler .tabs__radio:checked:nth-child(1) ~ .tabs__tabs li:nth-child(1) .tabs__label, #webprofiler .tabs__radio:checked:nth-child(2) ~ .tabs__tabs li:nth-child(2) .tabs__label, #webprofiler .tabs__radio:checked:nth-child(3) ~ .tabs__tabs li:nth-child(3) .tabs__label, #webprofiler .overview__title, #webprofiler .resume__title, #webprofiler .panel select,
-  #webprofiler .panel input[type="text"], #webprofiler .panel__title {
-    color: black; }
-  #webprofiler .t--notice, #webprofiler .tabs__label, #webprofiler .overview__subtitle, #webprofiler .resume__subtitle,
-  #webprofiler .resume__time, #webprofiler .panel__filter-label {
-    color: rgba(0, 0, 0, 0.3); }
-  #webprofiler .l-card {
-    width: 32%;
-    margin-left: 1%;
-    margin-right: 1%;
-    float: left; }
-    #webprofiler .l-card:nth-child(3n + 1) {
-      margin-left: 0; }
-    #webprofiler .l-card:nth-child(3n) {
-      margin-right: 0; }
-  #webprofiler .l-left {
-    float: left; }
-  #webprofiler .l-right {
-    float: right; }
-  #webprofiler .h--word-broken {
-    word-break: break-all; }
-  #webprofiler .h--word-intact {
-    word-break: normal; }
-
-/*# sourceMappingURL=dashboard.css.map */
diff --git a/modules/devel/webprofiler/css/timeline.css b/modules/devel/webprofiler/css/timeline.css
deleted file mode 100644
index f762310..0000000
--- a/modules/devel/webprofiler/css/timeline.css
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Timeline
- */
-
-.timeline__legends {
-  font-size: 12px;
-  line-height: 1.5em;
-}
-
-.timeline__legends span {
-  border-left-width: 10px;
-  border-left-style: solid;
-  padding: 0 10px 0 5px;
-}
-
-.timeline__legends--default {
-  border-left-color: #E91E63;
-}
-
-.timeline__legends--section {
-  border-left-color: #3F51B5;
-}
-
-.timeline__legends--event_listener {
-  border-left-color: #00BCD4;
-}
-
-.timeline__legends--event_listener_loading {
-  border-left-color: #8BC34A;
-}
-
-.timeline__legends--template {
-  border-left-color: #FFC107;
-}
-
-.timeline__legends--service {
-    border-left-color: #795548;
-}
-
-text {
-    font-size: 12px;
-    line-height: 20px;
-    height: 22px;
-    fill: rgba(0, 0, 0, 0.87);
-}
-#timeline {
-    background: white;
-    margin: 10px 0;
-    width: 100%;
-    position: relative;
-    padding:  0 0 40px 0;
-}
-.timeline__row,
-.timeline__scale--x,
-.timeline__label rect {
-    stroke: rgba(0, 0, 0, 0.18);
-}
-.timeline__row{
-    fill: transparent;
-}
-.timeline__label rect {
-    fill: white;
-}
-.timeline__period--default {
-    fill: #E91E63;
-}
-.timeline__period--service {
-    fill: #795548;
-}
-.timeline__period--section {
-    fill: #3F51B5;
-}
-.timeline__period--event_listener {
-    fill: #00BCD4;
-}
-.timeline__period--event_listener_loading {
-    fill: #8BC34A;
-}
-.timeline__period--template {
-    fill: #FFC107;
-}
-.timeline__period-trigger{
-    fill: transparent;
-}
-.tooltip{
-    position: absolute;
-    padding: 8px;
-    background: rgb(0,0,0);
-    background: rgba(0, 0, 0, 0.87);
-    border-bottom-left-radius: 2px;
-    border-bottom-right-radius: 2px;
-    width: 175px;
-    text-align: center;
-    display: none;
-    color: white;
-}
-.tooltip__title{
-    display: block;
-}
-.tooltip__content{
-    display: block;
-}
-.axis{
-    stroke-width: 2px;
-    fill: none;
-}
\ No newline at end of file
diff --git a/modules/devel/webprofiler/images/caret-down.svg b/modules/devel/webprofiler/images/caret-down.svg
deleted file mode 100644
index 4e48c8c..0000000
--- a/modules/devel/webprofiler/images/caret-down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#333333" d="M3.8 5.4c-.165-.22-.075-.4.2-.4h8.002c.275 0 .365.18.199.4l-3.898 5.2c-.166.221-.436.221-.6 0l-3.903-5.2z"/></svg>
diff --git a/modules/devel/webprofiler/js/app/collections/collectors.js b/modules/devel/webprofiler/js/app/collections/collectors.js
deleted file mode 100644
index ed26836..0000000
--- a/modules/devel/webprofiler/js/app/collections/collectors.js
+++ /dev/null
@@ -1,35 +0,0 @@
-(function ($, Drupal, drupalSettings, Backbone) {
-
-  "use strict";
-
-  Drupal.webprofiler.collectors.Collectors = Backbone.Collection.extend({
-    model: Drupal.webprofiler.models.Collector,
-
-    url: Drupal.url('admin/reports/profiler/view/' + drupalSettings.webprofiler.token + '/collectors'),
-
-    /**
-     * Unselect all models.
-     */
-    resetSelected: function () {
-      this.each(function (model) {
-        model.set({"selected": false});
-      });
-    },
-
-    /**
-     * Select a specific model from the collection.
-     *
-     * @param id
-     * @returns {*}
-     */
-    selectByID: function (id) {
-      this.resetSelected();
-      var collector = this.get(id);
-      collector.set({"selected": true});
-
-      return collector.id;
-    }
-  });
-
-}(jQuery, Drupal, drupalSettings, Backbone));
-
diff --git a/modules/devel/webprofiler/js/app/helpers.js b/modules/devel/webprofiler/js/app/helpers.js
deleted file mode 100644
index caa8bdb..0000000
--- a/modules/devel/webprofiler/js/app/helpers.js
+++ /dev/null
@@ -1,107 +0,0 @@
-(function (drupalSettings) {
-
-  Drupal.webprofiler.helpers = (function () {
-
-    "use strict";
-
-    var escapeRx = function escapeRegExp(string) {
-        return string.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1");
-      },
-
-      repl = function replaceAll(string, find, replace) {
-        if (typeof string != 'string') {
-          return '';
-        }
-        return string.replace(new RegExp(escapeRx(find), 'g'), replace);
-      },
-
-      shortLink = function (clazz) {
-        if (!clazz) {
-          return null;
-        }
-        clazz = repl(clazz, '/', '\\');
-        var parts = clazz.split("\\"), result = [], size = (parts.length - 1);
-
-        _.each(parts, function (item, key) {
-          if (key < size) {
-            result.push(item.substring(0, 1));
-          } else {
-            result.push(item);
-          }
-        });
-        return result.join("\\");
-      },
-
-      abbr = function (clazz) {
-        if (!clazz) {
-          return null;
-        }
-
-        return '<abbr title="' + clazz + '">' + shortLink(clazz) + '</abbr>';
-      },
-
-      ideLink = function (file, line) {
-        if (!file) {
-          return null;
-        }
-
-        line = line || 0;
-
-        file = file.replace(drupalSettings.webprofiler.ide_link_remote, drupalSettings.webprofiler.ide_link_local);
-
-        return drupalSettings.webprofiler.ide_link.replace("@file", file).replace("@line", line);
-      },
-
-      classLink = function (data) {
-        var link = ideLink(data['file'], data['line']), clazz = abbr(data['class']), method = data['method'], output = '';
-
-        output = clazz;
-        if (method) {
-          output += '::' + method;
-        }
-
-        if (link) {
-          output = '<a href="' + link + '">' + output + '</a>';
-        }
-
-        return output;
-      },
-
-      printTime = function (data, unit) {
-        unit = unit || 'ms';
-        data = Math.round((data + 0.00001) * 100) / 100;
-        return data + ' ' + unit;
-      },
-
-      frm = function (obj, level) {
-        level = level || 0;
-        var str = '<ul class="list--unstyled list--level-' + level + ' list--flat">', prop;
-        if (typeof obj != 'object') {
-          return obj;
-        }
-        for (prop in obj) {
-          if (isInt(prop)) {
-            str += '<li>' + frm(obj[prop], level + 1) + '</li>';
-          } else {
-            str += '<li><span class="list-item--bold">' + prop + '</span>: ' + frm(obj[prop], level + 1) + '</li>';
-          }
-        }
-        return str + '</ul>';
-      },
-
-      isInt = function (value) {
-        var x;
-        return isNaN(value) ? !1 : (x = parseFloat(value), (0 | x) === x);
-      };
-
-    return {
-      frm: frm,
-      ideLink: ideLink,
-      shortLink: shortLink,
-      classLink: classLink,
-      printTime: printTime
-    }
-
-  })();
-
-}(drupalSettings));
diff --git a/modules/devel/webprofiler/js/app/main.js b/modules/devel/webprofiler/js/app/main.js
deleted file mode 100644
index d5d71cd..0000000
--- a/modules/devel/webprofiler/js/app/main.js
+++ /dev/null
@@ -1,105 +0,0 @@
-(function ($, Drupal, Backbone) {
-
-    "use strict";
-
-    /**
-     * Define namespaces.
-     */
-    Drupal.webprofiler = {
-        views: {},
-        models: {},
-        collectors: {},
-        routers: {}
-    };
-
-    Drupal.behaviors.webprofiler = {
-        attach: function (context) {
-            var el,
-                elz,
-                key,
-                sel,
-                value,
-                select,
-                selector,
-                unselected,
-                filter = [],
-
-                livefilter = function (e) {
-                    el = $(e).attr('id').replace('edit-', '');
-                    value = $(e).val();
-                    filter[el] = value.replace('/', '\/');
-                    selector = [];
-                    unselected = [];
-
-                    for (key in filter) {
-                        if (filter[key].length > 0 && filter[key] != ' ') {
-                            select = filter[key].split(' ').filter(Boolean);
-                            for (sel in select) {
-                                selector.push('[data-wp-' + key + ' *= ' + select[sel].toLowerCase() + ']');
-                                unselected.push('[data-wp-' + key + ']:not([data-wp-' + key + ' *= ' + select[sel].toLowerCase() + '])');
-                            }
-                        }
-                        else {
-                            selector.push('[data-wp-' + key + ']');
-                        }
-                    }
-                    for (elz in unselected) {
-                        $(unselected[elz]).addClass('is--hidden');
-                    }
-                    $(selector.join('')).removeClass('is--hidden');
-                },
-
-                modalFill = function(t,c){
-                    $('.modal__title').html(t);
-                    $('.modal__main-data').html(c);
-                },
-
-                clipboard = function (e, t) {
-                    var clip = e.parent().find(t).get(0),
-                        title = 'Original Code',
-                        content = '<textarea readonly >' +
-                            clip.textContent +
-                            '</textarea>';
-
-                    modalFill(title,content);
-                    $('.modal').show();
-                };
-
-            $(context).find('#collectors').once('webprofiler').each(function () {
-                new Drupal.webprofiler.routers.CollectorsRouter({el: $('#collectors')});
-                Backbone.history.start({
-                    pushState: false
-                });
-            });
-
-            $(context).find('.js--modal-close').each(function () {
-                $(this).on('click', function () {
-                    $('.js--modal').hide();
-                });
-            });
-
-            $(context).find('.js--live-filter').each(function () {
-                $(this).on('keyup', function () {
-                    livefilter($(this));
-                });
-                $(this).on('change', function () {
-                    livefilter($(this));
-                });
-            });
-
-            $(context).find('.js--panel-toggle').once('js--panel-toggle').each(function () {
-                $(this).on('click', function () {
-                    $(this).parent().parent().toggleClass('is--open');
-                });
-            });
-
-            $(context).find('.js--clipboard-trigger').once('js--clipboard-trigger').each(function () {
-                $(this).on('click', function () {
-                        clipboard($(this), '.js--clipboard-target')
-                    }
-                );
-            });
-        }
-    };
-
-}(jQuery, Drupal, Backbone));
diff --git a/modules/devel/webprofiler/js/app/models/collector.js b/modules/devel/webprofiler/js/app/models/collector.js
deleted file mode 100644
index 483033c..0000000
--- a/modules/devel/webprofiler/js/app/models/collector.js
+++ /dev/null
@@ -1,15 +0,0 @@
-(function ($, Drupal, drupalSettings, Backbone) {
-
-  "use strict";
-
-  Drupal.webprofiler.models.Collector = Backbone.Model.extend({
-    idAttribute: 'name',
-    urlRoot: Drupal.url('admin/reports/profiler/view/' + drupalSettings.webprofiler.token + '/collectors'),
-    defaults: {
-      name: "default",
-      data: [],
-      selected: false
-    }
-  });
-
-}(jQuery, Drupal, drupalSettings, Backbone));
diff --git a/modules/devel/webprofiler/js/app/routers/collectors.js b/modules/devel/webprofiler/js/app/routers/collectors.js
deleted file mode 100644
index 876f238..0000000
--- a/modules/devel/webprofiler/js/app/routers/collectors.js
+++ /dev/null
@@ -1,48 +0,0 @@
-(function ($, Drupal, drupalSettings, Backbone) {
-
-  "use strict";
-
-  var collectors = new Drupal.webprofiler.collectors.Collectors(drupalSettings.webprofiler.collectors);
-
-  Drupal.webprofiler.routers.CollectorsRouter = Backbone.Router.extend({
-    routes: {
-      ':id': 'selectCollector'
-    },
-
-    /**
-     *
-     * @param id
-     */
-    selectCollector: function (id) {
-      var collectors = this.collectors, layout = this.layout;
-
-      //collectors.resetSelected();
-      collectors.selectByID(id);
-
-      var collector = collectors.get(id);
-
-      if (collector.get('data').length != 0) {
-        layout.setDetails(collector);
-      } else {
-        var deferred = collectors.get(id).fetch();
-        deferred.done(function () {
-          layout.setDetails(collector);
-        });
-      }
-    },
-
-    /**
-     *
-     * @param options
-     */
-    initialize: function (options) {
-      this.collectors = collectors;
-      this.layout = Drupal.webprofiler.views.Layout.getInstance({
-        el: options.el,
-        router: this
-      });
-      this.layout.render();
-    }
-  });
-
-}(jQuery, Drupal, drupalSettings, Backbone));
diff --git a/modules/devel/webprofiler/js/app/views/collector.js b/modules/devel/webprofiler/js/app/views/collector.js
deleted file mode 100644
index 955a36e..0000000
--- a/modules/devel/webprofiler/js/app/views/collector.js
+++ /dev/null
@@ -1,29 +0,0 @@
-(function ($, Drupal, Backbone) {
-
-  "use strict";
-
-  Drupal.webprofiler.views.CollectorView = Backbone.View.extend({
-    tagName: 'li',
-    template: _.template($("script#collector").html()),
-
-    /**
-     *
-     */
-    initialize: function () {
-      _.bindAll(this, "render");
-      this.listenTo(this.model, 'change:selected', this.render);
-    },
-
-    /**
-     *
-     * @returns {Drupal.webprofiler.views.CollectorView}
-     */
-    render: function () {
-      this.$el.html(this.template(this.model.toJSON()));
-      this.$el.toggleClass('is--selected', this.model.get('selected'));
-      return this;
-    }
-
-  });
-
-}(jQuery, Drupal, Backbone));
diff --git a/modules/devel/webprofiler/js/app/views/collectorsList.js b/modules/devel/webprofiler/js/app/views/collectorsList.js
deleted file mode 100644
index 8628371..0000000
--- a/modules/devel/webprofiler/js/app/views/collectorsList.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function ($, Drupal, Backbone) {
-
-  "use strict";
-
-  Drupal.webprofiler.views.CollectorsList = Backbone.View.extend({
-    tagName: 'section',
-
-    /**
-     *
-     * @returns {Drupal.webprofiler.views.CollectorsList}
-     */
-    render: function () {
-      var collectorsView = this.collection.map(function (collector) {
-        return (new Drupal.webprofiler.views.CollectorView({model: collector})).render().el;
-      });
-      this.$el.html(collectorsView);
-      return this;
-    }
-  });
-
-}(jQuery, Drupal, Backbone));
diff --git a/modules/devel/webprofiler/js/app/views/details.js b/modules/devel/webprofiler/js/app/views/details.js
deleted file mode 100644
index 709f17e..0000000
--- a/modules/devel/webprofiler/js/app/views/details.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function ($, Drupal, Backbone) {
-
-  "use strict";
-
-  Drupal.webprofiler.views.DetailsView = Backbone.View.extend({
-    el: '#details',
-
-    /**
-     *
-     * @returns {Drupal.webprofiler.views.DetailsView}
-     */
-    render: function () {
-      var template = _.template($("script#" + this.model.get('name')).html());
-
-      this.$el.html(template(this.model.toJSON()));
-      return this;
-    }
-  });
-
-}(jQuery, Drupal, Backbone));
diff --git a/modules/devel/webprofiler/js/app/views/layout.js b/modules/devel/webprofiler/js/app/views/layout.js
deleted file mode 100644
index 6168b34..0000000
--- a/modules/devel/webprofiler/js/app/views/layout.js
+++ /dev/null
@@ -1,83 +0,0 @@
-(function ($, Drupal, drupalSettings, Backbone) {
-
-  "use strict";
-
-  Drupal.webprofiler.views.Layout = Backbone.View.extend({
-    template: _.template(
-      '<div id="overview" class="overview">' +
-      '<ul class="overview__list"></ul>' +
-      '</div>' +
-      '<div id="details" class="details">' +
-      'Choose a collector.' +
-      '</div>'
-    ),
-
-    /**
-     *
-     * @returns {Drupal.webprofiler.views.Layout}
-     */
-    render: function () {
-      this.$el.html(this.template());
-
-      if(this.currentDetails) {
-        this.currentDetails.setElement(this.$('#details')).render();
-      }
-
-      this.overview.setElement(this.$('#overview ul')).render();
-      return this;
-    },
-
-    /**
-     *
-     * @param options
-     */
-    initialize: function (options) {
-      options.router.collectors.on('request', this.beginSync);
-      options.router.collectors.on('sync', this.finishSync);
-
-      this.overview = new Drupal.webprofiler.views.CollectorsList({
-        collection: options.router.collectors,
-        router: options.router
-      });
-    },
-
-    /**
-     *
-     * @param collector
-     */
-    setDetails: function (collector) {
-      if (this.currentDetails) this.currentDetails.remove();
-      this.currentDetails = new Drupal.webprofiler.views.DetailsView({model: collector});
-      this.render();
-      Drupal.attachBehaviors(/*this.$el, drupalSettings*/);
-    },
-
-    /**
-     *
-     */
-    beginSync: function () {
-            $('.loader--fixed').fadeIn({duration: 100});
-    },
-
-    /**
-     *
-     */
-    finishSync: function () {
-            $('.loader--fixed').fadeOut({duration: 100});
-    }
-  });
-
-  var instance;
-  Drupal.webprofiler.views.Layout.getInstance = function (options) {
-    if (!instance) {
-      instance = new Drupal.webprofiler.views.Layout({
-        el: options.el,
-        router: options.router,
-        collection: options.router.collectors
-      });
-    }
-
-    return instance;
-  }
-
-}(jQuery, Drupal, drupalSettings, Backbone));
diff --git a/modules/devel/webprofiler/js/database.js b/modules/devel/webprofiler/js/database.js
deleted file mode 100644
index 5f50430..0000000
--- a/modules/devel/webprofiler/js/database.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * @file
- * Database panel app.
- */
-(function ($, Drupal, drupalSettings) {
-
-    "use strict";
-
-    Drupal.behaviors.webprofiler_database = {
-        attach: function (context) {
-            $(context).find('.js--explain-trigger').once('js--explain-trigger').each(function () {
-
-                $(this).on('click', function () {
-                    var position = $(this).attr('data-wp-queryPosition'),
-                        wrapper = $(this).parent().parent().find('.js--explain-target'),
-                        loader = $(this).parent().parent().find('.js--loader');
-
-                    if (wrapper.html().length === 0) {
-
-                        var url = Drupal.url('admin/reports/profiler/database_explain/' + drupalSettings.webprofiler.token + '/' + position);
-
-                        loader.show();
-
-                        $.getJSON(url, function (data) {
-                            _.templateSettings.variable = 'rc';
-                            var template = _.template(
-                                $("#wp-query-explain-template").html()
-                            );
-                            wrapper.html(template(data));
-                            loader.hide();
-                            delete _.templateSettings.variable;
-                        });
-                    }
-                    wrapper.toggle();
-
-                });
-            });
-
-            $(context).find('.js--code-toggle').once('js--code-toggle').each(function () {
-                $(this).on('click', function () {
-                    $(this).parent().find('.js--code-target').find('code').toggleClass('is--hidden');
-                });
-            });
-
-            $(context).find('.js--code-toggle--global').once('js--code-toggle--global').each(function () {
-                $(this).on('click', function () {
-
-                    if($(this).hasClass('js--placeholder-visible')){
-                        $('.js--placeholder-query').addClass('is--hidden');
-                        $('.js--original-query').removeClass('is--hidden');
-
-                    }else{
-                        $('.js--placeholder-query').removeClass('is--hidden');
-                        $('.js--original-query').addClass('is--hidden');
-                    }
-                    $(this).toggleClass('js--placeholder-visible');
-                });
-            });
-
-            if (typeof hljs != "undefined") {
-                $('code.sql').each(function (i, block) {
-                    hljs.highlightBlock(block);
-                });
-            }
-        }
-    }
-})
-(jQuery, Drupal, drupalSettings);
diff --git a/modules/devel/webprofiler/js/timeline.js b/modules/devel/webprofiler/js/timeline.js
deleted file mode 100644
index f550e08..0000000
--- a/modules/devel/webprofiler/js/timeline.js
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * @file
- * Timeline panel app.
- */
-(function ($, Drupal, drupalSettings, d3) {
-
-  'use strict';
-
-  Drupal.behaviors.webprofiler_timeline = {
-    attach: function (context) {
-      if (typeof d3 != 'undefined') {
-
-        // data
-        var data = drupalSettings.webprofiler.time.events;
-        var parts = [];
-        var dataL = data.length;
-        var perL;
-        var labelW = [];
-        var rowW;
-        var scalePadding;
-        var endTime = parseInt(data[(dataL - 1)].endtime);
-        var roundTime = Math.ceil(endTime / 1000) * 1000;
-        var endScale;
-
-        for (var j = 0; j < dataL; j++) {
-          perL = data[j].periods.length;
-          for (var k = 0; k < perL; k++) {
-            parts.push({
-              lane: j,
-              category: data[j].category,
-              memory: data[j].memory,
-              name: data[j].name,
-              start: data[j].periods[k].start,
-              end: data[j].periods[k].end
-            });
-          }
-        }
-
-        var tooltipCtrl = function (d, i) {
-          tooltip.html('<span class="tooltip__content">memory usage: ' + d.memory + '</span>' +
-          '<span class="tooltip__content">' + parseInt(d.start) + 'ms ~ ' + parseInt(d.end) + 'ms</span>');
-          tooltip
-            .style('display', 'block')
-            .style('left', (d3.event.layerX - 87) + 'px')
-            .style('top', ((d.lane + 1) * 22) + 'px')
-            .style('opacity', .9);
-        };
-
-        var xscale = d3.scale.linear().domain([0, roundTime]).range([0, 1000]);
-        d3.select('#timeline').append('svg').attr('height', (dataL + 1) * 22 + 'px').attr('width', '100%').attr('class', 'timeline__canvas');
-
-        // tooltips
-        var tooltip = d3.select('#timeline')
-          .append('div')
-          .attr('class', 'tooltip');
-
-
-        // Add a rectangle for every data element.
-        d3.select('.timeline__canvas')
-            .append('g')
-            .attr('class', 'timeline__rows')
-            .attr('x', 0)
-            .attr('y', 0)
-            .selectAll('g')
-            .data(data)
-            .enter()
-            .append('rect')
-            .attr('class', 'timeline__row')
-            .attr('x', 0)
-            .attr('y', function (d, i) {
-              return (i * 22);
-            })
-            .attr('height', 22)
-            .attr('width', '100%')
-            .each(function () {
-              rowW = this.getBoundingClientRect().width;
-            });
-
-        // scale
-        var scale = d3.select('.timeline__canvas')
-          .append('g')
-          .attr('class', 'timeline__scale')
-          .attr('id', 'timeline__scale')
-          .attr('x', 0)
-          .attr('y', 0)
-          .selectAll('g')
-          .data(data)
-          .enter()
-          .append('a')
-          .attr('xlink:href', function (d) {
-            return Drupal.webprofiler.helpers.ideLink(d.link);
-          })
-          .attr('class', function (d) {
-            return 'timeline__label ' + d.category;
-          })
-          .attr('x', xscale(5))
-          .attr('y', function (d, i) {
-            return (((i + 1) * 22) - 5);
-          });
-
-        scale.append('title')
-          .text(function (d) {
-            return d.name;
-          });
-
-        scale.append('text')
-          .attr('x', xscale(5))
-          .attr('y', function (d, i) {
-            return (((i + 1) * 22) - 5);
-          })
-          .text(function (d) {
-            return Drupal.webprofiler.helpers.shortLink(d.name);
-          })
-          .each(function (d) {
-            labelW.push(this.getBoundingClientRect().width);
-          });
-
-        scalePadding = Math.max.apply(null, labelW) + 10;
-
-        scale.insert('rect', 'title')
-          .attr('x', 0)
-          .attr('y', function (d, i) {
-            return (i * 22);
-          })
-          .attr('height', 22)
-          .attr('stroke', 'transparent')
-          .attr('strokw-width', 1)
-          .attr('width', scalePadding);
-
-        // times
-        var events = d3.select('.timeline__canvas')
-          .insert('g', '.timeline__scale')
-          .attr('class', 'timeline__parts')
-          .attr('x', 0)
-          .attr('y', 0)
-          .selectAll('g')
-          .data(parts)
-          .enter();
-
-        events.append('rect').attr('class', function (d) {
-          return 'timeline__period--' + d.category;
-        })
-          .attr('x', function (d) {
-            return xscale(parseInt(d.start)) + scalePadding;
-          })
-          .attr('y', function (d) {
-            return d.lane * 22;
-          })
-          .attr('height', 22)
-          .attr('width', function (d) {
-            return xscale(Math.max(parseInt(d.end - d.start), 1));
-          });
-
-        events.append('rect')
-          .attr('class', function (d) {
-            return 'timeline__period-trigger';
-          })
-          .attr('x', function (d) {
-            return xscale(parseInt(d.start)) + scalePadding - 5;
-          })
-          .attr('y', function (d) {
-            return d.lane * 22;
-          })
-          .attr('height', 22)
-          .attr('width', function (d) {
-            return xscale(Math.max(parseInt(d.end - d.start), 1)) + 11;
-          })
-          .on('mouseover', function (d, i) {
-            tooltipCtrl(d, i);
-          })
-          .on('mouseout', function (d) {
-            tooltip
-            .style('display', 'none');
-          });
-
-        // Draw X-axis grid lines
-        d3.select('.timeline__parts').insert('g', '.timeline__parts')
-          .selectAll('line')
-          .data(xscale.ticks(10))
-          .enter()
-          .append('line')
-          .attr('class', 'timeline__scale--x')
-          .attr('x1', xscale)
-          .attr('x2', xscale)
-          .attr('y1', 0)
-          .attr('y2', data.length * 22)
-          .attr('transform', 'translate( ' + scalePadding + ' , 0)');
-
-        var xAxis = d3.svg.axis().scale(xscale).ticks(10).orient('bottom').tickFormat(function (d) {
-          return d + ' ms';
-        });
-
-        d3.select('.timeline__parts').insert('g', '.timeline__parts')
-          .attr('class', 'axis')
-          .attr('transform', 'translate(' + scalePadding + ', ' + dataL * 22 + ')')
-          .call(xAxis);
-
-        endScale = xscale(endTime) - rowW - parseInt(scalePadding);
-
-        if (parseInt(xscale(endTime)) > (rowW - parseInt(scalePadding))) {
-          d3.select('.timeline__canvas')
-            .call(
-            d3.behavior.zoom()
-                .scaleExtent([1, 1])
-                .x(xscale)
-                .on('zoom', function () {
-
-                  var t = d3.event.translate;
-                  var tx = t[0];
-
-                  tx = tx > 0 ? 0 : tx;
-
-                  tx = tx < endScale ? endScale : tx;
-
-                  d3.select('.timeline__parts').attr('transform', 'translate( ' + tx + ' , 0)');
-                }));
-        }
-
-      }
-    }
-  };
-
-})(jQuery, Drupal, drupalSettings, d3);
diff --git a/modules/devel/webprofiler/src/Access/AccessManagerWrapper.php b/modules/devel/webprofiler/src/Access/AccessManagerWrapper.php
deleted file mode 100644
index 5de834f..0000000
--- a/modules/devel/webprofiler/src/Access/AccessManagerWrapper.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Access;
-
-use Drupal\Core\Access\AccessException;
-use Drupal\Core\Access\AccessManager;
-use Drupal\Component\Utility\ArgumentsResolverInterface;
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Access\AccessResultInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\webprofiler\DataCollector\RequestDataCollector;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Attaches access check services to routes and runs them on request.
- *
- * @see \Drupal\Tests\Core\Access\AccessManagerTest
- */
-class AccessManagerWrapper extends AccessManager {
-
-  /**
-   * @var \Drupal\webprofiler\DataCollector\RequestDataCollector
-   */
-  private $dataCollector;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function check(RouteMatchInterface $route_match, AccountInterface $account = NULL, Request $request = NULL, $return_as_object = FALSE) {
-    if (!isset($account)) {
-      $account = $this->currentUser;
-    }
-    $route = $route_match->getRouteObject();
-    $checks = $route->getOption('_access_checks') ?: array();
-
-    // Filter out checks which require the incoming request.
-    if (!isset($request)) {
-      $checks = array_diff($checks, $this->checkProvider->getChecksNeedRequest());
-    }
-
-    $result = AccessResult::neutral();
-    if (!empty($checks)) {
-      $arguments_resolver = $this->argumentsResolverFactory->getArgumentsResolver($route_match, $account, $request);
-
-      if (!$checks) {
-        return AccessResult::neutral();
-      }
-      $result = AccessResult::allowed();
-      foreach ($checks as $service_id) {
-        $result = $result->andIf($this->performCheck($service_id, $arguments_resolver, $request));
-      }
-    }
-    return $return_as_object ? $result : $result->isAllowed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function performCheck($service_id, ArgumentsResolverInterface $arguments_resolver, Request $request = NULL) {
-    $callable = $this->checkProvider->loadCheck($service_id);
-    $arguments = $arguments_resolver->getArguments($callable);
-    /** @var \Drupal\Core\Access\AccessResultInterface $service_access **/
-    $service_access = call_user_func_array($callable, $arguments);
-
-    if (!$service_access instanceof AccessResultInterface) {
-      throw new AccessException("Access error in $service_id. Access services must return an object that implements AccessResultInterface.");
-    }
-
-    if($request) {
-      $this->dataCollector->addAccessCheck($service_id, $callable, $request);
-    }
-
-    return $service_access;
-  }
-
-  /**
-   * @param \Drupal\webprofiler\DataCollector\RequestDataCollector $dataCollector
-   */
-  public function setDataCollector(RequestDataCollector $dataCollector) {
-    $this->dataCollector = $dataCollector;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Asset/CssCollectionRendererWrapper.php b/modules/devel/webprofiler/src/Asset/CssCollectionRendererWrapper.php
deleted file mode 100644
index cf13ac6..0000000
--- a/modules/devel/webprofiler/src/Asset/CssCollectionRendererWrapper.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Asset;
-
-use Drupal\Core\Asset\AssetCollectionRendererInterface;
-use Drupal\webprofiler\DataCollector\AssetsDataCollector;
-
-/**
- * Class CssCollectionRendererWrapper.
- */
-class CssCollectionRendererWrapper implements AssetCollectionRendererInterface {
-
-  /**
-   * @var \Drupal\Core\Asset\AssetCollectionRendererInterface
-   */
-  private $assetCollectionRenderer;
-
-  /**
-   * @var \Drupal\webprofiler\DataCollector\AssetsDataCollector
-   */
-  private $dataCollector;
-
-  /**
-   * @param \Drupal\Core\Asset\AssetCollectionRendererInterface $assetCollectionRenderer
-   * @param \Drupal\webprofiler\DataCollector\AssetsDataCollector $dataCollector
-   */
-  public function __construct(AssetCollectionRendererInterface $assetCollectionRenderer, AssetsDataCollector $dataCollector) {
-    $this->assetCollectionRenderer = $assetCollectionRenderer;
-    $this->dataCollector = $dataCollector;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function render(array $css_assets) {
-    $this->dataCollector->addCssAsset($css_assets);
-
-    return $this->assetCollectionRenderer->render($css_assets);
-  }
-}
diff --git a/modules/devel/webprofiler/src/Asset/JsCollectionRendererWrapper.php b/modules/devel/webprofiler/src/Asset/JsCollectionRendererWrapper.php
deleted file mode 100644
index dd7596a..0000000
--- a/modules/devel/webprofiler/src/Asset/JsCollectionRendererWrapper.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Asset;
-
-use Drupal\Core\Asset\AssetCollectionRendererInterface;
-use Drupal\webprofiler\DataCollector\AssetsDataCollector;
-
-/**
- * Class JsCollectionRendererWrapper.
- */
-class JsCollectionRendererWrapper implements AssetCollectionRendererInterface {
-
-  /**
-   * @var \Drupal\Core\Asset\AssetCollectionRendererInterface
-   */
-  private $assetCollectionRenderer;
-
-  /**
-   * @var \Drupal\webprofiler\DataCollector\AssetsDataCollector
-   */
-  private $dataCollector;
-
-  /**
-   * @param \Drupal\Core\Asset\AssetCollectionRendererInterface $assetCollectionRenderer
-   * @param \Drupal\webprofiler\DataCollector\AssetsDataCollector $dataCollector
-   */
-  public function __construct(AssetCollectionRendererInterface $assetCollectionRenderer, AssetsDataCollector $dataCollector) {
-    $this->assetCollectionRenderer = $assetCollectionRenderer;
-    $this->dataCollector = $dataCollector;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function render(array $js_assets) {
-    $this->dataCollector->addJsAsset($js_assets);
-
-    return $this->assetCollectionRenderer->render($js_assets);
-  }
-}
diff --git a/modules/devel/webprofiler/src/Cache/CacheBackendWrapper.php b/modules/devel/webprofiler/src/Cache/CacheBackendWrapper.php
deleted file mode 100644
index 4050b41..0000000
--- a/modules/devel/webprofiler/src/Cache/CacheBackendWrapper.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Cache;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
-use Drupal\webprofiler\DataCollector\CacheDataCollector;
-
-/**
- * Wraps an existing cache backend to track calls to the cache backend.
- */
-class CacheBackendWrapper implements CacheBackendInterface, CacheTagsInvalidatorInterface {
-
-  /**
-   * The data collector to register the calls.
-   *
-   * @var \Drupal\webprofiler\DataCollector\CacheDataCollector
-   */
-  protected $cacheDataCollector;
-
-  /**
-   * The wrapped cache backend.
-   *
-   * @var \Drupal\Core\Cache\CacheBackendInterface
-   */
-  protected $cacheBackend;
-
-  /**
-   * The name of the wrapped cache bin.
-   *
-   * @var string
-   */
-  protected $bin;
-
-  /**
-   * Constructs a new CacheBackendWrapper.
-   *
-   * @param \Drupal\webprofiler\DataCollector\CacheDataCollector $cacheDataCollector
-   *   The cache data collector to inform about cache get calls.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cacheBackend
-   *   The wrapped cache backend.
-   * @param string $bin
-   *   The name of the wrapped cache bin.
-   */
-  public function __construct(CacheDataCollector $cacheDataCollector, CacheBackendInterface $cacheBackend, $bin) {
-    $this->cacheDataCollector = $cacheDataCollector;
-    $this->cacheBackend = $cacheBackend;
-    $this->bin = $bin;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function get($cid, $allow_invalid = FALSE) {
-    $cache = $this->cacheBackend->get($cid, $allow_invalid);
-
-    if ($cache) {
-      $cacheCopy = new \stdClass();
-      $cacheCopy->cid = $cache->cid;
-      $cacheCopy->expire = $cache->expire;
-      $cacheCopy->tags = $cache->tags;
-
-      $this->cacheDataCollector->registerCacheHit($this->bin, $cacheCopy);
-    }
-    else {
-      $this->cacheDataCollector->registerCacheMiss($this->bin, $cid);
-    }
-
-    return $cache;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMultiple(&$cids, $allow_invalid = FALSE) {
-    $cidsCopy = $cids;
-    $cache = $this->cacheBackend->getMultiple($cids, $allow_invalid);
-
-    foreach ($cidsCopy as $cid) {
-      if (in_array($cid, $cids)) {
-        $this->cacheDataCollector->registerCacheMiss($this->bin, $cid);
-      }
-      else {
-        $cacheCopy = new \stdClass();
-        $cacheCopy->cid = $cache[$cid]->cid;
-        $cacheCopy->expire = $cache[$cid]->expire;
-        $cacheCopy->tags = $cache[$cid]->tags;
-
-        $this->cacheDataCollector->registerCacheHit($this->bin, $cacheCopy);
-      }
-    }
-
-    return $cache;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []) {
-    return $this->cacheBackend->set($cid, $data, $expire, $tags);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setMultiple(array $items) {
-    return $this->cacheBackend->setMultiple($items);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function delete($cid) {
-    return $this->cacheBackend->delete($cid);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteMultiple(array $cids) {
-    return $this->cacheBackend->deleteMultiple($cids);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteAll() {
-    return $this->cacheBackend->deleteAll();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function invalidate($cid) {
-    return $this->cacheBackend->invalidate($cid);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function invalidateMultiple(array $cids) {
-    return $this->cacheBackend->invalidateMultiple($cids);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function invalidateTags(array $tags) {
-    if ($this->cacheBackend instanceof CacheTagsInvalidatorInterface) {
-      $this->cacheBackend->invalidateTags($tags);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function invalidateAll() {
-    return $this->cacheBackend->invalidateAll();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function garbageCollection() {
-    return $this->cacheBackend->garbageCollection();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function removeBin() {
-    return $this->cacheBackend->removeBin();
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Cache/CacheFactoryWrapper.php b/modules/devel/webprofiler/src/Cache/CacheFactoryWrapper.php
deleted file mode 100644
index d37e894..0000000
--- a/modules/devel/webprofiler/src/Cache/CacheFactoryWrapper.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Cache;
-
-use Drupal\Core\Cache\CacheFactoryInterface;
-use Drupal\webprofiler\DataCollector\CacheDataCollector;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-
-/**
- * Wraps a cache factory to register all calls to the cache system.
- */
-class CacheFactoryWrapper implements CacheFactoryInterface, ContainerAwareInterface {
-
-  use ContainerAwareTrait;
-
-  /**
-   * The cache factory.
-   *
-   * @var \Drupal\Core\Cache\CacheFactoryInterface
-   */
-  protected $cacheFactory;
-
-  /**
-   * The cache data collector.
-   *
-   * @var \Drupal\webprofiler\DataCollector\CacheDataCollector
-   */
-  protected $cacheDataCollector;
-
-  /**
-   * All wrapped cache backends.
-   *
-   * @var \Drupal\webprofiler\Cache\CacheBackendWrapper[]
-   */
-  protected $cacheBackends = [];
-
-  /**
-   * Creates a new CacheFactoryWrapper instance.
-   *
-   * @param \Drupal\Core\Cache\CacheFactoryInterface $cache_factory
-   *   The cache factory.
-   * @param \Drupal\webprofiler\DataCollector\CacheDataCollector $cacheDataCollector
-   *   The cache data collector.
-   */
-  public function __construct(CacheFactoryInterface $cache_factory, CacheDataCollector $cacheDataCollector) {
-    $this->cacheFactory = $cache_factory;
-    $this->cacheDataCollector = $cacheDataCollector;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function get($bin) {
-    if (!isset($this->cacheBackends[$bin])) {
-      $cache_backend = $this->cacheFactory->get($bin);
-      $this->cacheBackends[$bin] = new CacheBackendWrapper($this->cacheDataCollector, $cache_backend, $bin);
-    }
-    return $this->cacheBackends[$bin];
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Command/BenchmarkCommand.php b/modules/devel/webprofiler/src/Command/BenchmarkCommand.php
deleted file mode 100644
index c33905b..0000000
--- a/modules/devel/webprofiler/src/Command/BenchmarkCommand.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Command;
-
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Cookie\CookieJar;
-use Symfony\Component\Console\Helper\ProgressBar;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\DomCrawler\Crawler;
-use Symfony\Component\Process\Process;
-use Symfony\Component\Yaml\Yaml;
-use Drupal\Console\Annotations\DrupalCommand;
-
-/**
- * Class BenchmarkCommand
- *
- * @DrupalCommand (
- *     extension="webprofiler",
- *     extensionType="module"
- * )
- */
-class BenchmarkCommand extends Command {
-
-  use ContainerAwareCommandTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function configure() {
-    $this
-      ->setName('webprofiler:benchmark')
-      ->setDescription($this->trans('commands.webprofiler.benchmark.description'))
-      ->addArgument('url', InputArgument::REQUIRED, $this->trans('commands.webprofiler.benchmark.arguments.url'))
-      ->addOption('runs', NULL, InputOption::VALUE_REQUIRED, $this->trans('commands.webprofiler.benchmark.options.runs'), 100)
-      ->addOption('file', NULL, InputOption::VALUE_REQUIRED, $this->trans('commands.webprofiler.benchmark.options.file'))
-      ->addOption('cache-rebuild', 'cr', InputOption::VALUE_NONE, $this->trans('commands.webprofiler.benchmark.options.cache_rebuild'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function execute(InputInterface $input, OutputInterface $output) {
-    $runs = $input->getOption('runs');
-    $file = $input->getOption('file');
-    $cache_rebuild = $input->getOption('cache-rebuild');
-
-    // http://username:password@hostname/
-    $url = $input->getArgument('url');
-    $url_components = parse_url($url);
-    $login = isset($url_components['user']) && isset($url_components['pass']);
-
-    $steps = 3;
-
-    if ($cache_rebuild) {
-      $steps++;
-    }
-
-    if ($login) {
-      $steps++;
-    }
-
-    /** @var \Drupal\Core\Http\Client $client */
-    $client = $this->container->get('http_client');
-
-    $progress = new ProgressBar($output, $runs + $steps);
-    $progress->setFormat(' %current%/%max% [%bar%] %percent:3s%% %message%');
-
-    if ($cache_rebuild) {
-      $progress->setMessage($this->trans('commands.webprofiler.benchmark.progress.cache_rebuild'));
-      $this->RebuildCache();
-      $progress->advance();
-    }
-
-    if ($login) {
-      $progress->setMessage($this->trans('commands.webprofiler.benchmark.progress.login'));
-      $login_url = "{$url_components['scheme']}://{$url_components['host']}/user/login";
-
-      // Enable cookies storage.
-      $cookieJar = new CookieJar();
-      $client->setDefaultOption('cookies', $cookieJar);
-
-      // Retrieve a form_build_id using the DomCrawler component.
-      $response = $client->get($login_url)->getBody()->getContents();
-      $crawler = new Crawler($response);
-      $form_build_id = $crawler->filter('#user-login-form input[name=form_build_id]')
-        ->attr('value');
-      $op = $crawler->filter('#user-login-form input[name=op]')->attr('value');
-
-      // Login a user.
-      $response = $client->post($login_url, [
-        'body' => [
-          'name' => $url_components['user'],
-          'pass' => $url_components['pass'],
-          'form_build_id' => $form_build_id,
-          'form_id' => 'user_login_form',
-          'op' => $op,
-        ]
-      ]);
-      $progress->advance();
-
-      if ($response->getStatusCode() != 200) {
-        throw new \Exception($this->trans('commands.webprofiler.benchmark.messages.error_login'));
-      }
-    }
-
-    $datas = [];
-    for ($i = 0; $i < $runs; $i++) {
-      $progress->setMessage($this->trans('commands.webprofiler.benchmark.progress.get'));
-      $datas[] = $this->getData($client, $url);
-      $progress->advance();
-    }
-
-    $progress->setMessage($this->trans('commands.webprofiler.benchmark.progress.compute_avg'));
-    $avg = $this->computeAvg($datas);
-    $progress->advance();
-
-    $progress->setMessage($this->trans('commands.webprofiler.benchmark.progress.compute_median'));
-    $median = $this->computePercentile($datas, 50);
-    $progress->advance();
-
-    $progress->setMessage($this->trans('commands.webprofiler.benchmark.progress.compute_95percentile'));
-    $percentile95 = $this->computePercentile($datas, 95);
-    $progress->advance();
-
-    $progress->setMessage($this->trans('commands.webprofiler.benchmark.progress.git_hash'));
-    $gitHash = $this->getGitHash();
-    $progress->advance();
-
-    $progress->setMessage($this->trans('commands.webprofiler.benchmark.progress.yaml'));
-    $yaml = $this->generateYaml($gitHash, $runs, $url, $avg, $median, $percentile95);
-    $progress->advance();
-
-    $progress->setMessage($this->trans('commands.webprofiler.benchmark.progress.done'));
-    $progress->finish();
-    $output->writeln('');
-
-    if ($file) {
-      file_put_contents($file, $yaml);
-    }
-    else {
-      $output->writeln($yaml);
-    }
-
-  }
-
-  /**
-   * @param \GuzzleHttp\ClientInterface $client
-   * @param $url
-   *
-   * @return array
-   */
-  private function getData(ClientInterface $client, $url) {
-    /** @var \GuzzleHttp\Message\ResponseInterface $response */
-    $response = $client->get($url);
-
-    $token = $response->getHeader('X-Debug-Token');
-
-    /** @var \Drupal\webprofiler\Profiler\Profiler $profiler */
-    $profiler = $this->container->get('profiler');
-
-    /** @var \Symfony\Component\HttpKernel\Profiler\Profile $profile */
-    $profile = $profiler->loadProfile($token);
-
-    /** @var \Drupal\webprofiler\DataCollector\TimeDataCollector $timeDataCollector */
-    $timeDataCollector = $profile->getCollector('time');
-
-    return new BenchmarkData(
-      $token,
-      $timeDataCollector->getMemory(),
-      $timeDataCollector->getDuration());
-  }
-
-  /**
-   * @param \Drupal\webprofiler\Command\BenchmarkData[] $datas
-   *
-   * @return \Drupal\webprofiler\Command\BenchmarkData
-   */
-  private function computeAvg($datas) {
-    $profiles = count($datas);
-    $totalTime = 0;
-    $totalMemory = 0;
-
-    foreach ($datas as $data) {
-      $totalTime += $data->getTime();
-      $totalMemory += $data->getMemory();
-    }
-
-    return new BenchmarkData(NULL, $totalMemory / $profiles, $totalTime / $profiles);
-  }
-
-  /**
-   * Computes percentile using The Nearest Rank method.
-   *
-   * @param \Drupal\webprofiler\Command\BenchmarkData[] $datas
-   * @param $percentile
-   *
-   * @return \Drupal\webprofiler\Command\BenchmarkData
-   *
-   * @throws \Exception
-   */
-  private function computePercentile($datas, $percentile) {
-    if ($percentile < 0 || $percentile > 100) {
-      throw new \Exception('Percentile has to be between 0 and 100');
-    }
-
-    $profiles = count($datas);
-
-    $n = ceil((($percentile / 100) * $profiles));
-    $index = (int) $n - 1;
-
-    $orderedTime = $datas;
-    $this->getOrderedDatas($orderedTime, 'Time');
-
-    $orderedMemory = $datas;
-    $this->getOrderedDatas($orderedMemory, 'Memory');
-
-    return new BenchmarkData(NULL, $orderedMemory[$index]->getMemory(), $orderedTime[$index]->getTime());
-  }
-
-  /**
-   * @return string
-   */
-  private function getGitHash() {
-    try {
-      $process = new Process('git rev-parse HEAD');
-      $process->setTimeout(3600);
-      $process->run();
-      $git_hash = $process->getOutput();
-    } catch (\Exception $e) {
-      $git_hash = $this->trans('commands.webprofiler.benchmark.messages.not_git');
-    }
-
-    return $git_hash;
-  }
-
-  /**
-   * @param \Drupal\webprofiler\Command\BenchmarkData[] $datas
-   * @param $string
-   *
-   * @return array
-   */
-  private function getOrderedDatas(&$datas, $string) {
-    usort($datas, function ($a, $b) use ($string) {
-      $method = 'get' . $string;
-      if ($a->{$method} > $b->{$method}) {
-        return 1;
-      }
-      if ($a->{$method} < $b->{$method}) {
-        return -1;
-      }
-      return 0;
-    });
-  }
-
-  /**
-   * Rebuilds Drupal cache.
-   */
-  protected function RebuildCache() {
-    require_once DRUPAL_ROOT . '/core/includes/utility.inc';
-    $kernelHelper = $this->getHelper('kernel');
-    $classLoader = $kernelHelper->getClassLoader();
-    $request = $kernelHelper->getRequest();
-    drupal_rebuild($classLoader, $request);
-  }
-
-  /**
-   * @param $gitHash
-   * @param $runs
-   * @param $url
-   * @param \Drupal\webprofiler\Command\BenchmarkData $avg
-   * @param \Drupal\webprofiler\Command\BenchmarkData $median
-   * @param \Drupal\webprofiler\Command\BenchmarkData $percentile95
-   *
-   * @return string
-   */
-  private function generateYaml($gitHash, $runs, $url, BenchmarkData $avg, BenchmarkData $median, BenchmarkData $percentile95) {
-    $yaml = Yaml::dump([
-      'date' => date($this->trans('commands.webprofiler.list.rows.time'), time()),
-      'git_commit' => $gitHash,
-      'number_of_runs' => $runs,
-      'url' => $url,
-      'results' => [
-        'average' => [
-          'time' => sprintf('%.0f ms', $avg->getTime()),
-          'memory' => sprintf('%.1f MB', $avg->getMemory() / 1024 / 1024),
-        ],
-        'median' => [
-          'time' => sprintf('%.0f ms', $median->getTime()),
-          'memory' => sprintf('%.1f MB', $median->getMemory() / 1024 / 1024),
-        ],
-        '95_percentile' => [
-          'time' => sprintf('%.0f ms', $percentile95->getTime()),
-          'memory' => sprintf('%.1f MB', $percentile95->getMemory() / 1024 / 1024),
-        ],
-      ],
-    ]);
-    return $yaml;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function showMessage($output, $message, $type = 'info') {
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Command/BenchmarkData.php b/modules/devel/webprofiler/src/Command/BenchmarkData.php
deleted file mode 100644
index e587c90..0000000
--- a/modules/devel/webprofiler/src/Command/BenchmarkData.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Command;
-
-/**
- * Class BenchmarkData
- */
-class BenchmarkData {
-
-  /**
-   * @var
-   */
-  private $token;
-
-  /**
-   * @var
-   */
-  private $memory;
-
-  /**
-   * @var
-   */
-  private $time;
-
-  /**
-   * @param $token
-   * @param $memory
-   * @param $time
-   */
-  public function __construct($token, $memory, $time) {
-    $this->token = $token;
-    $this->memory = $memory;
-    $this->time = $time;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getToken() {
-    return $this->token;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getMemory() {
-    return $this->memory;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getTime() {
-    return $this->time;
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Command/ExportCommand.php b/modules/devel/webprofiler/src/Command/ExportCommand.php
deleted file mode 100644
index 20c1e41..0000000
--- a/modules/devel/webprofiler/src/Command/ExportCommand.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Command;
-
-use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait;
-use Drupal\Core\Archiver\ArchiveTar;
-use Drupal\webprofiler\Profiler\Profiler;
-use Symfony\Component\Console\Helper\ProgressBar;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Annotations\DrupalCommand;
-
-/**
- * Class ExportCommand
- *
- * @DrupalCommand (
- *     extension="webprofiler",
- *     extensionType="module"
- * )
- */
-class ExportCommand extends Command {
-
-  use ContainerAwareCommandTrait;
-
-  /** @var string */
-  private $filename;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function configure() {
-    $this
-      ->setName('webprofiler:export')
-      ->setDescription($this->trans('commands.webprofiler.export.description'))
-      ->addArgument('id', InputArgument::OPTIONAL, $this->trans('commands.webprofiler.export.arguments.id'))
-      ->addOption('directory', NULL, InputOption::VALUE_REQUIRED, $this->trans('commands.webprofiler.export.options.directory'), '/tmp');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function execute(InputInterface $input, OutputInterface $output) {
-    $id = $input->getArgument('id');
-    $directory = $input->getOption('directory');
-
-    /** @var \Drupal\webprofiler\Profiler\Profiler $profiler */
-    $profiler = $this->container->get('profiler');
-
-    try {
-      if ($id) {
-        $this->filename = $this->exportSingle($profiler, $id, $directory);
-      }
-      else {
-        $this->filename = $this->exportAll($profiler, $directory, $output);
-      }
-
-    } catch (\Exception $e) {
-      $output->writeln('<error>' . $e->getMessage() . '</error>');
-    }
-  }
-
-  /**
-   * Exports a single profile.
-   *
-   * @param \Drupal\webprofiler\Profiler\Profiler $profiler
-   * @param int $id
-   * @param string $directory
-   *
-   * @return string
-   *
-   * @throws \Exception
-   */
-  private function exportSingle(Profiler $profiler, $id, $directory) {
-    $profile = $profiler->loadProfile($id);
-    if ($profile) {
-      $data = $profiler->export($profile);
-
-      $filename = $directory . DIRECTORY_SEPARATOR . $id . '.txt';
-      if (file_put_contents($filename, $data) === FALSE) {
-        throw new \Exception(sprintf(
-          $this->trans('commands.webprofiler.export.messages.error_writing'),
-          $filename));
-      }
-    }
-    else {
-      throw new \Exception(sprintf(
-        $this->trans('commands.webprofiler.export.messages.error_no_profile'),
-        $id));
-    }
-
-    return $filename;
-  }
-
-  /**
-   * Exports all stored profiles (cap limit at 1000 items).
-   *
-   * @param \Drupal\webprofiler\Profiler\Profiler $profiler
-   * @param string $directory
-   * @param \Symfony\Component\Console\Output\OutputInterface $output
-   *
-   * @return string
-   */
-  private function exportAll(Profiler $profiler, $directory, $output) {
-    $filename = $directory . DIRECTORY_SEPARATOR . 'profiles_' . time() . '.tar.gz';
-    $archiver = new ArchiveTar($filename, 'gz');
-    $profiles = $profiler->find(NULL, NULL, 1000, NULL, '', '');
-    $progress = new ProgressBar($output, count($profiles) + 2);
-    $progress->setFormat(' %current%/%max% [%bar%] %percent:3s%% %message%');
-
-    $files = [];
-    $progress->start();
-    $progress->setMessage($this->trans('commands.webprofiler.export.progress.exporting'));
-    foreach ($profiles as $profile) {
-      $data = $profiler->export($profiler->loadProfile($profile['token']));
-      $profileFilename = $directory . "/{$profile['token']}.txt";
-      file_put_contents($profileFilename, $data);
-      $files[] = $profileFilename;
-      $progress->advance();
-    }
-
-    $progress->setMessage($this->trans('commands.webprofiler.export.progress.archive'));
-    $archiver->createModify($files, '', $directory);
-    $progress->advance();
-
-    $progress->setMessage($this->trans('commands.webprofiler.export.progress.delete_tmp'));
-    foreach ($files as $file) {
-      unlink($file);
-    }
-    $progress->advance();
-
-    $progress->setMessage($this->trans('commands.webprofiler.export.progress.done'));
-    $progress->finish();
-    $output->writeln('');
-
-    $output->writeln(sprintf(
-      $this->trans('commands.webprofiler.export.messages.exported_count'),
-      count($profiles)));
-
-    return $filename;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function showMessage($output, $message, $type = 'info') {
-    if (!$this->filename) {
-      return;
-    }
-
-    $completeMessageKey = 'commands.webprofiler.export.messages.success';
-    $completeMessage = sprintf($this->trans($completeMessageKey), $this->filename);
-
-    if ($completeMessage != $completeMessageKey) {
-      parent::showMessage($output, $completeMessage);
-    }
-  }
-}
diff --git a/modules/devel/webprofiler/src/Command/ListCommand.php b/modules/devel/webprofiler/src/Command/ListCommand.php
deleted file mode 100644
index 29f4d8f..0000000
--- a/modules/devel/webprofiler/src/Command/ListCommand.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Command;
-
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait;
-use Drupal\Console\Annotations\DrupalCommand;
-
-/**
- * Class ListCommand
- **
- * @DrupalCommand (
- *     extension="webprofiler",
- *     extensionType="module"
- * )
- */
-class ListCommand extends Command {
-
-  use ContainerAwareCommandTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function configure() {
-    $this
-      ->setName('webprofiler:list')
-      ->setDescription($this->trans('commands.webprofiler.list.description'))
-      ->addOption('ip', NULL, InputOption::VALUE_REQUIRED, $this->trans('commands.webprofiler.list.options.ip'), NULL)
-      ->addOption('url', NULL, InputOption::VALUE_REQUIRED, $this->trans('commands.webprofiler.list.options.url'), NULL)
-      ->addOption('method', NULL, InputOption::VALUE_REQUIRED, $this->trans('commands.webprofiler.list.options.method'), NULL)
-      ->addOption('limit', NULL, InputOption::VALUE_REQUIRED, $this->trans('commands.webprofiler.list.options.limit'), 10);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function execute(InputInterface $input, OutputInterface $output) {
-    $ip = $input->getOption('ip');
-    $url = $input->getOption('url');
-    $method = $input->getOption('method');
-    $limit = $input->getOption('limit');
-
-    /** @var \Drupal\webprofiler\Profiler\Profiler $profiler */
-    $profiler = $this->container->get('profiler');
-    $profiles = $profiler->find($ip, $url, $limit, $method, '', '');
-
-    $rows = [];
-    foreach ($profiles as $profile) {
-      $row = [];
-
-      $row[] = $profile['token'];
-      $row[] = $profile['ip'];
-      $row[] = $profile['method'];
-      $row[] = $profile['url'];
-      $row[] = date($this->trans('commands.webprofiler.list.rows.time'), $profile['time']);
-
-      $rows[] = $row;
-    }
-
-    $table = new Table($output);
-    $table
-      ->setHeaders([
-        $this->trans('commands.webprofiler.list.header.token'),
-        $this->trans('commands.webprofiler.list.header.ip'),
-        $this->trans('commands.webprofiler.list.header.method'),
-        $this->trans('commands.webprofiler.list.header.url'),
-        $this->trans('commands.webprofiler.list.header.time'),
-      ])
-      ->setRows($rows);
-    $table->render();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function showMessage($output, $message, $type = 'info') {
-  }
-}
diff --git a/modules/devel/webprofiler/src/Compiler/DecoratorPass.php b/modules/devel/webprofiler/src/Compiler/DecoratorPass.php
deleted file mode 100644
index e460b22..0000000
--- a/modules/devel/webprofiler/src/Compiler/DecoratorPass.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * Class DecoratorPass.
- */
-class DecoratorPass implements CompilerPassInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function process(ContainerBuilder $container) {
-    // Builds a decorator around plugin.manager.mail.
-    $definition = $container->findDefinition('plugin.manager.mail');
-    $definition->setPublic(FALSE);
-    $container->setDefinition('webprofiler.debug.plugin.manager.mail.default', $definition);
-    $container->register('plugin.manager.mail', 'Drupal\webprofiler\Mail\MailManagerWrapper')
-      ->addArgument(new Reference('container.namespaces'))
-      ->addArgument(new Reference('cache.discovery'))
-      ->addArgument(new Reference('module_handler'))
-      ->addArgument(new Reference('config.factory'))
-      ->addArgument(new Reference('logger.factory'))
-      ->addArgument(new Reference('string_translation'))
-      ->addArgument(new Reference('webprofiler.debug.plugin.manager.mail.default'))
-      ->addArgument(new Reference('webprofiler.mail'))
-      ->setProperty('_serviceId', 'plugin.manager.mail');
-  }
-}
diff --git a/modules/devel/webprofiler/src/Compiler/ProfilerPass.php b/modules/devel/webprofiler/src/Compiler/ProfilerPass.php
deleted file mode 100644
index 10b8d24..0000000
--- a/modules/devel/webprofiler/src/Compiler/ProfilerPass.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Compiler;
-
-use Drupal\Core\StreamWrapper\PublicStream;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-
-/**
- * Class ProfilerPass
- */
-class ProfilerPass implements CompilerPassInterface {
-
-  /**
-   * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
-   *
-   * @throws \InvalidArgumentException
-   */
-  public function process(ContainerBuilder $container) {
-    // configure the profiler service
-    if (FALSE === $container->hasDefinition('profiler')) {
-      return;
-    }
-
-    $definition = $container->getDefinition('profiler');
-
-    $collectors = new \SplPriorityQueue();
-    $order = PHP_INT_MAX;
-    foreach ($container->findTaggedServiceIds('data_collector') as $id => $attributes) {
-      $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
-      $template = NULL;
-
-      if (isset($attributes[0]['template'])) {
-        if (!isset($attributes[0]['id'])) {
-          throw new \InvalidArgumentException(sprintf('Data collector service "%s" must have an id attribute in order to specify a template', $id));
-        }
-        if (!isset($attributes[0]['title'])) {
-          throw new \InvalidArgumentException(sprintf('Data collector service "%s" must have a title attribute', $id));
-        }
-
-        $template = [
-          $attributes[0]['id'],
-          $attributes[0]['template'],
-          $attributes[0]['title']
-        ];
-      }
-
-      $collectors->insert([$id, $template], [-$priority, --$order]);
-    }
-
-    $templates = [];
-    foreach ($collectors as $collector) {
-      $definition->addMethodCall('add', [new Reference($collector[0])]);
-      $templates[$collector[0]] = $collector[1];
-    }
-
-    $container->setParameter('data_collector.templates', $templates);
-
-    // set parameter to store the public folder path
-    $path = 'file:' . DRUPAL_ROOT . '/' . PublicStream::basePath() . '/profiler';
-    $container->setParameter('data_collector.storage', $path);
-  }
-}
diff --git a/modules/devel/webprofiler/src/Compiler/ServicePass.php b/modules/devel/webprofiler/src/Compiler/ServicePass.php
deleted file mode 100644
index 4928418..0000000
--- a/modules/devel/webprofiler/src/Compiler/ServicePass.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Compiler\ServiceReferenceGraph;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
-
-/**
- * Class ServicePass
- */
-class ServicePass implements CompilerPassInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function process(ContainerBuilder $container) {
-    if (FALSE === $container->hasDefinition('webprofiler.services')) {
-      return;
-    }
-
-    $definition = $container->getDefinition('webprofiler.services');
-    $graph = $container->getCompiler()->getServiceReferenceGraph();
-
-    $definition->addMethodCall('setServices', [$this->extractData($container, $graph)]);
-  }
-
-  /**
-   * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
-   * @param \Symfony\Component\DependencyInjection\Compiler\ServiceReferenceGraph $graph
-   *
-   * @return array
-   */
-  private function extractData(ContainerBuilder $container, ServiceReferenceGraph $graph) {
-    $data = [];
-
-    foreach ($container->getDefinitions() as $id => $definition) {
-      $inEdges = [];
-      $outEdges = [];
-
-      if ($graph->hasNode($id)) {
-        $node = $graph->getNode($id);
-
-        /** @var \Symfony\Component\DependencyInjection\Compiler\ServiceReferenceGraphEdge $edge */
-        foreach ($node->getInEdges() as $edge) {
-          /** @var \Symfony\Component\DependencyInjection\Reference $edgeValue */
-          $edgeValue = $edge->getValue();
-
-          $inEdges[] = [
-            'id' => $edge->getSourceNode()->getId(),
-            'invalidBehavior' => $edgeValue ? $edgeValue->getInvalidBehavior() : NULL,
-          ];
-        }
-
-
-        /** @var \Symfony\Component\DependencyInjection\Compiler\ServiceReferenceGraphEdge $edge */
-        foreach ($node->getOutEdges() as $edge) {
-          /** @var \Symfony\Component\DependencyInjection\Reference $edgeValue */
-          $edgeValue = $edge->getValue();
-
-          $outEdges[] = [
-            'id' => $edge->getDestNode()->getId(),
-            'invalidBehavior' => $edgeValue ? $edgeValue->getInvalidBehavior() : NULL,
-          ];
-        }
-      }
-
-      if ($definition instanceof Definition) {
-        $class = $definition->getClass();
-
-        try {
-          $reflectedClass = new \ReflectionClass($class);
-          $file = $reflectedClass->getFileName();
-        } catch (\ReflectionException $e) {
-          $file = NULL;
-        }
-
-        $tags = $definition->getTags();
-        $public = $definition->isPublic();
-        $synthetic = $definition->isSynthetic();
-      }
-      else {
-        $id = $definition->__toString();
-        $class = NULL;
-        $file = NULL;
-        $tags = [];
-        $public = NULL;
-        $synthetic = NULL;
-      }
-
-      $data[$id] = [
-        'inEdges' => $inEdges,
-        'outEdges' => $outEdges,
-        'value' => [
-          'class' => $class,
-          'file' => $file,
-          'id' => $id,
-          'tags' => $tags,
-          'public' => $public,
-          'synthetic' => $synthetic,
-        ],
-      ];
-    }
-
-    return $data;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Compiler/StoragePass.php b/modules/devel/webprofiler/src/Compiler/StoragePass.php
deleted file mode 100644
index 8b26e63..0000000
--- a/modules/devel/webprofiler/src/Compiler/StoragePass.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Compiler;
-
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-
-/**
- * Class StoragePass
- */
-class StoragePass implements CompilerPassInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function process(ContainerBuilder $container) {
-    if (FALSE === $container->hasDefinition('profiler.storage_manager')) {
-      return;
-    }
-
-    $definition = $container->getDefinition('profiler.storage_manager');
-
-    foreach ($container->findTaggedServiceIds('webprofiler_storage') as $id => $attributes) {
-      $definition->addMethodCall('addStorage', [
-        $id,
-        $attributes[0]['title'],
-        new Reference($id)
-      ]);
-    }
-  }
-}
diff --git a/modules/devel/webprofiler/src/Config/ConfigFactoryWrapper.php b/modules/devel/webprofiler/src/Config/ConfigFactoryWrapper.php
deleted file mode 100644
index 1f4b75e..0000000
--- a/modules/devel/webprofiler/src/Config/ConfigFactoryWrapper.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Config;
-
-use Drupal\Core\Config\ConfigFactory;
-use Drupal\webprofiler\DataCollector\ConfigDataCollector;
-
-/**
- * Wraps a config factory to be able to figure out all used config files.
- */
-class ConfigFactoryWrapper extends ConfigFactory {
-
-  /**
-   * @var \Drupal\webprofiler\DataCollector\ConfigDataCollector
-   */
-  private $dataCollector;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function get($name) {
-    $result = parent::get($name);
-    $this->dataCollector->addConfigName($name);
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function loadMultiple(array $names) {
-    $result = parent::loadMultiple($names);
-    foreach (array_keys($result) as $name) {
-      $this->dataCollector->addConfigName($name);
-    }
-    return $result;
-  }
-
-  /**
-   * @param \Drupal\webprofiler\DataCollector\ConfigDataCollector $dataCollector
-   */
-  public function setDataCollector(ConfigDataCollector $dataCollector) {
-    $this->dataCollector = $dataCollector;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Controller/DashboardController.php b/modules/devel/webprofiler/src/Controller/DashboardController.php
deleted file mode 100644
index 2b1d93e..0000000
--- a/modules/devel/webprofiler/src/Controller/DashboardController.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Datetime\DateFormatter;
-use Drupal\Core\Url;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\webprofiler\Profiler\ProfilerStorageManager;
-use Drupal\webprofiler\Profiler\TemplateManager;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Drupal\webprofiler\Profiler\Profiler;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Profiler\Profile;
-use Symfony\Component\Routing\RouterInterface;
-
-/**
- * Class DashboardController
- */
-class DashboardController extends ControllerBase {
-
-  /**
-   * @var \Drupal\webprofiler\Profiler\Profiler
-   */
-  private $profiler;
-
-  /**
-   * @var \Symfony\Cmf\Component\Routing\ChainRouter
-   */
-  private $router;
-
-  /**
-   * @var \Drupal\webprofiler\Profiler\TemplateManager
-   */
-  private $templateManager;
-
-  /**
-   * @var \Drupal\Core\Datetime\DateFormatter
-   */
-  private $date;
-
-  /**
-   * @var \Drupal\webprofiler\Profiler\ProfilerStorageManager
-   */
-  private $storageManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('profiler'),
-      $container->get('router'),
-      $container->get('template_manager'),
-      $container->get('date.formatter'),
-      $container->get('profiler.storage_manager')
-    );
-  }
-
-  /**
-   * Constructs a new WebprofilerController.
-   *
-   * @param \Drupal\webprofiler\Profiler\Profiler $profiler
-   * @param \Symfony\Component\Routing\RouterInterface $router
-   * @param \Drupal\webprofiler\Profiler\TemplateManager $templateManager
-   * @param \Drupal\Core\Datetime\DateFormatter $date
-   * @param \Drupal\webprofiler\Profiler\ProfilerStorageManager $storageManager
-   */
-  public function __construct(Profiler $profiler, RouterInterface $router, TemplateManager $templateManager, DateFormatter $date, ProfilerStorageManager $storageManager) {
-    $this->profiler = $profiler;
-    $this->router = $router;
-    $this->templateManager = $templateManager;
-    $this->date = $date;
-    $this->storageManager = $storageManager;
-  }
-
-  /**
-   * Generates the dashboard page.
-   *
-   * @param Profile $profile
-   *
-   * @return array
-   */
-  public function dashboardAction(Profile $profile) {
-    $this->profiler->disable();
-
-    $templateManager = $this->templateManager;
-    $templates = $templateManager->getTemplates($profile);
-
-    $panels = [];
-    $libraries = ['webprofiler/dashboard'];
-    $drupalSettings = [
-      'webprofiler' => [
-        'token' => $profile->getToken(),
-        'ide_link' => $this->config('webprofiler.config')->get('ide_link'),
-        'ide_link_remote' => $this->config('webprofiler.config')->get('ide_link_remote'),
-        'ide_link_local' => $this->config('webprofiler.config')->get('ide_link_local'),
-        'collectors' => [],
-      ],
-    ];
-
-    foreach ($templates as $name => $template) {
-      /** @var DrupalDataCollectorInterface $collector */
-      $collector = $profile->getCollector($name);
-
-      if ($collector->hasPanel()) {
-        $rendered = $template->renderBlock('panel', [
-          'token' => $profile->getToken(),
-          'name' => $name,
-        ]);
-
-        $panels[] = [
-          '#theme' => 'webprofiler_panel',
-          '#panel' => $rendered,
-        ];
-
-        $drupalSettings['webprofiler']['collectors'][] = [
-          'id' => $name,
-          'name' => $name,
-          'label' => $collector->getTitle(),
-          'summary' => $collector->getPanelSummary(),
-          'icon' => $collector->getIcon(),
-        ];
-
-        $libraries = array_merge($libraries, $collector->getLibraries());
-        $drupalSettings['webprofiler'] += $collector->getDrupalSettings();
-      }
-    }
-
-    $build = [];
-    $build['panels'] = [
-      '#theme' => 'webprofiler_dashboard',
-      '#profile' => $profile,
-      '#panels' => $panels,
-      '#spinner_path' => '/' . $this->moduleHandler()
-          ->getModule('webprofiler')
-          ->getPath() . '/images/searching.gif',
-      '#attached' => [
-        'drupalSettings' => $drupalSettings,
-        'library' => $libraries,
-      ],
-    ];
-
-    return $build;
-  }
-
-  /**
-   * Generates the list page.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *
-   * @return array
-   */
-  public function listAction(Request $request) {
-    $limit = $request->get('limit', 10);
-    $this->profiler->disable();
-
-    $ip = $request->query->get('ip');
-    $method = $request->query->get('method');
-    $url = $request->query->get('url');
-
-    $profiles = $this->profiler->find($ip, $url, $limit, $method, '', '');
-
-    $rows = [];
-    if (count($profiles)) {
-      foreach ($profiles as $profile) {
-        $row = [];
-        $row[] = $this->l($profile['token'], new Url('webprofiler.dashboard', ['profile' => $profile['token']]));
-        $row[] = $profile['ip'];
-        $row[] = $profile['method'];
-        $row[] = $profile['url'];
-        $row[] = $this->date->format($profile['time']);
-
-        $rows[] = $row;
-      }
-    }
-    else {
-      $rows[] = [
-        [
-          'data' => $this->t('No profiles found'),
-          'colspan' => 6,
-        ],
-      ];
-    }
-
-    $build = [];
-
-    $storage_id = $this->config('webprofiler.config')->get('storage');
-    $storage = $this->storageManager->getStorage($storage_id);
-
-    $build['resume'] = [
-      '#type' => 'inline_template',
-      '#template' => '<p>{{ message }}</p>',
-      '#context' => [
-        'message' => $this->t('Profiles stored with %storage service.', ['%storage' => $storage['title']]),
-      ],
-    ];
-
-    $build['filters'] = $this->formBuilder()
-      ->getForm('Drupal\\webprofiler\\Form\\ProfilesFilterForm');
-
-    $build['table'] = [
-      '#type' => 'table',
-      '#rows' => $rows,
-      '#header' => [
-        $this->t('Token'),
-        [
-          'data' => $this->t('Ip'),
-          'class' => [RESPONSIVE_PRIORITY_LOW],
-        ],
-        [
-          'data' => $this->t('Method'),
-          'class' => [RESPONSIVE_PRIORITY_LOW],
-        ],
-        $this->t('Url'),
-        [
-          'data' => $this->t('Time'),
-          'class' => [RESPONSIVE_PRIORITY_MEDIUM],
-        ],
-      ],
-      '#sticky' => TRUE,
-    ];
-
-    return $build;
-  }
-
-  /**
-   * Exposes collector's data as JSON.
-   *
-   * @param \Symfony\Component\HttpKernel\Profiler\Profile $profile
-   * @param $collector
-   *
-   * @return \Symfony\Component\HttpFoundation\JsonResponse
-   */
-  public function restCollectorAction(Profile $profile, $collector) {
-    $this->profiler->disable();
-
-    $data = $profile->getCollector($collector)->getData();
-
-    return new JsonResponse(['data' => $data]);
-  }
-}
diff --git a/modules/devel/webprofiler/src/Controller/DatabaseController.php b/modules/devel/webprofiler/src/Controller/DatabaseController.php
deleted file mode 100644
index f6a5b95..0000000
--- a/modules/devel/webprofiler/src/Controller/DatabaseController.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Database\Connection;
-use Drupal\webprofiler\DataCollector\DatabaseDataCollector;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\Profiler\Profile;
-use Symfony\Component\HttpKernel\Profiler\Profiler;
-
-/**
- * Class DatabaseController
- */
-class DatabaseController extends ControllerBase {
-
-  /**
-   * @var \Symfony\Component\HttpKernel\Profiler\Profiler
-   */
-  private $profiler;
-
-  /**
-   * @var \Drupal\Core\Database\Connection
-   */
-  private $database;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('profiler'),
-      $container->get('database')
-    );
-  }
-
-  /**
-   * Constructs a new WebprofilerController.
-   *
-   * @param \Symfony\Component\HttpKernel\Profiler\Profiler $profiler
-   * @param \Drupal\Core\Database\Connection $database
-   */
-  public function __construct(Profiler $profiler, Connection $database) {
-    $this->profiler = $profiler;
-    $this->database = $database;
-  }
-
-  /**
-   * @param Profile $profile
-   * @param int $qid
-   *
-   * @return JsonResponse
-   */
-  public function explainAction(Profile $profile, $qid) {
-    $query = $this->getQuery($profile, $qid);
-
-    $data = [];
-    $result = $this->database->query('EXPLAIN ' . $query['query'], (array) $query['args'])
-      ->fetchAllAssoc('table');
-    $i = 1;
-    foreach ($result as $row) {
-      foreach ($row as $key => $value) {
-        $data[$i][$key] = $value;
-      }
-      $i++;
-    }
-
-    return new JsonResponse(['data' => $data]);
-  }
-
-  /**
-   * @param $profile ->getToken()
-   * @param int $qid
-   *
-   * @return array
-   */
-  private function getQuery(Profile $profile, $qid) {
-    $this->profiler->disable();
-    $token = $profile->getToken();
-
-    if (!$profile = $this->profiler->loadProfile($token)) {
-      throw new NotFoundHttpException($this->t('Token @token does not exist.', ['@token' => $token]));
-    }
-
-    /** @var DatabaseDataCollector $databaseCollector */
-    $databaseCollector = $profile->getCollector('database');
-
-    $queries = $databaseCollector->getQueries();
-    $query = $queries[$qid];
-
-    return $query;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Controller/ToolbarController.php b/modules/devel/webprofiler/src/Controller/ToolbarController.php
deleted file mode 100644
index de0e240..0000000
--- a/modules/devel/webprofiler/src/Controller/ToolbarController.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Controller;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Render\RendererInterface;
-use Drupal\webprofiler\Profiler\Profiler;
-use Drupal\webprofiler\Profiler\TemplateManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Profiler\Profile;
-
-/**
- * Class ToolbarController
- */
-class ToolbarController extends ControllerBase {
-
-  /**
-   * @var \Drupal\webprofiler\Profiler\Profiler
-   */
-  private $profiler;
-
-  /**
-   * @var \Drupal\webprofiler\Profiler\TemplateManager
-   */
-  private $templateManager;
-
-  /**
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  private $renderer;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('profiler'),
-      $container->get('template_manager'),
-      $container->get('renderer')
-    );
-  }
-
-  /**
-   * Constructs a new WebprofilerController.
-   *
-   * @param \Drupal\webprofiler\Profiler\Profiler $profiler
-   * @param \Drupal\webprofiler\Profiler\TemplateManager $templateManager
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   */
-  public function __construct(Profiler $profiler, TemplateManager $templateManager, RendererInterface $renderer) {
-    $this->profiler = $profiler;
-    $this->templateManager = $templateManager;
-    $this->renderer = $renderer;
-  }
-
-  /**
-   * Generates the toolbar.
-   *
-   * @param Profile $profile
-   *
-   * @return array
-   */
-  public function toolbarAction(Profile $profile) {
-    $this->profiler->disable();
-
-    $templates = $this->templateManager->getTemplates($profile);
-
-    $rendered = '';
-    foreach ($templates as $name => $template) {
-      $rendered .= $template->renderBlock('toolbar', [
-        'collector' => $profile->getcollector($name),
-        'token' => $profile->getToken(),
-        'name' => $name
-      ]);
-    }
-
-    $toolbar = [
-      '#theme' => 'webprofiler_toolbar',
-      '#toolbar' => $rendered,
-      '#token' => $profile->getToken(),
-    ];
-
-    return new Response($this->renderer->render($toolbar));
-  }
-
-  /**
-   * @param \Symfony\Component\HttpKernel\Profiler\Profile $profile
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *
-   * @return \Symfony\Component\HttpFoundation\JsonResponse
-   */
-  public function savePerformanceTimingAction(Profile $profile, Request $request) {
-    $this->profiler->disable();
-
-    $data = Json::decode($request->getContent());
-
-    /** @var  $collector */
-    $collector = $profile->getCollector('performance_timing');
-    $collector->setData($data);
-    $this->profiler->updateProfile($profile);
-
-    return new JsonResponse(['success' => TRUE]);
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/AssetsDataCollector.php b/modules/devel/webprofiler/src/DataCollector/AssetsDataCollector.php
deleted file mode 100644
index 7eabac8..0000000
--- a/modules/devel/webprofiler/src/DataCollector/AssetsDataCollector.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Component\Utility\NestedArray;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Collects data about the used assets (CSS/JS).
- */
-class AssetsDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * The app root.
-   *
-   * @var string
-   */
-  protected $root;
-
-  /**
-   * Constructs a AssetDataCollector object.
-   *
-   * @param string $root
-   *   The app root.
-   */
-  public function __construct($root) {
-    $this->root = $root;
-
-    $this->data['js'] = [];
-    $this->data['css'] = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $this->data['assets']['installation_path'] = $this->root . '/';
-  }
-
-  /**
-   * @param $jsAsset
-   */
-  public function addJsAsset($jsAsset) {
-    $this->data['js'] = NestedArray::mergeDeepArray([
-      $jsAsset,
-      $this->data['js']
-    ]);
-  }
-
-  /**
-   * @param $cssAsset
-   */
-  public function addCssAsset($cssAsset) {
-    $this->data['css'] = NestedArray::mergeDeepArray([
-      $cssAsset,
-      $this->data['css']
-    ]);
-  }
-
-  /**
-   * Twig callback to return the amount of CSS files.
-   */
-  public function getCssCount() {
-    return count($this->data['css']);
-  }
-
-  /**
-   * Twig callback to return the amount of JS files.
-   */
-  public function getJsCount() {
-    return count($this->data['js']) - 1;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'assets';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Assets');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Total: @count', ['@count' => ($this->getCssCount() + $this->getJsCount())]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxQUE0NEI2NTlCQTkxMUUzQkFDRjg2NUVCQ0NFNTcwQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxQUE0NEI2NjlCQTkxMUUzQkFDRjg2NUVCQ0NFNTcwQiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjFBQTQ0QjYzOUJBOTExRTNCQUNGODY1RUJDQ0U1NzBCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjFBQTQ0QjY0OUJBOTExRTNCQUNGODY1RUJDQ0U1NzBCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+C1mVdgAAAktJREFUeNrUlk+I6VEUx48/4SVKpkgiCywkK8ksWVhYSFm9hYXFqxfbt2KnLJS9hbKQhZXtFMVmUrKYkZmslPxLSvnvYZx37+2NTDPP03ss5tTpcu/xued77rm/Hw4iwqWNC1cwzv8CPlJ6lUypfSf+k256Ad8R/0HlL4l/uWCSL5zfO/xTLTkczrvx9aDwU7QUX61Ww/Pz88WAdrv9Oplyzz0UPp8PIpEIzrnWJ6EUJBAI2DgYDOD+/h7EYjFwuadz4X80SUFCoRB6vR6Mx2Mwm82QTqfh4eEBNBoN3NzcgFQqhdVqBbvd7s+ZUlkUJpFIoN1uQyQSAYvFAqlUiq2Xy2VwuVwQCoXAZrNBMpmE6XTK4nk83lsqOX0ki0h2xUajgYFAAJVKJRoMBoxGo9hqtXA4HCKNq1ar+Pj4iMFgEFUqFer1egyHw9jv93GxWDCOyWTCA5RaLBZjd9jhcGCz2cRXKxQKqNVqcTQaHeZKpRLqdDoWf3d3h6QMB+hB/nK5BL/fD4lEAsiPmUSfzwf1eh1qtRoYjUaQy+WQz+eBbAoej4fVN5PJgNVqZfV9J586lUBtMplgLpdDEoyktuj1ejEej7M1p9OJbrcbi8UirtdrNjebzQ6MN/KPfT6f436/Z3XudDp4e3uLlUqFQej37XbL5B7DjqEfthQBAgGzfpTJZJDNZpn0zWbDRgI/eQlOdjGFU1coFIfHGu3Lv90qbrfbXRFpJ4POAVGjh/r09PRCP38l3r3Q62RA/NtV3qb8T/Nn4irQXwIMANMNuV/Q8qbhAAAAAElFTkSuQmCC';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/BlocksDataCollector.php b/modules/devel/webprofiler/src/DataCollector/BlocksDataCollector.php
deleted file mode 100644
index a6f2e7a..0000000
--- a/modules/devel/webprofiler/src/DataCollector/BlocksDataCollector.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\block\Entity\Block;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\webprofiler\Entity\EntityDecorator;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Class BlocksDataCollector
- */
-class BlocksDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  private $entityManager;
-
-  /**
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityManager
-   */
-  public function __construct(EntityTypeManagerInterface $entityManager) {
-    $this->entityManager = $entityManager;
-
-    $this->data['blocks']['loaded'] = [];
-    $this->data['blocks']['rendered'] = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $storage = $this->entityManager->getStorage('block');
-
-    $loaded = $this->entityManager->getLoaded('config', 'block');
-    $rendered = $this->entityManager->getRendered('block');
-
-    if ($loaded) {
-      $this->data['blocks']['loaded'] = $this->getBlocksData($loaded, $storage);
-
-    }
-
-    if ($rendered) {
-      $this->data['blocks']['rendered'] = $this->getBlocksData($rendered, $storage);
-    }
-  }
-
-  /**
-   * @return array
-   */
-  public function getRenderedBlocks() {
-    return $this->data['blocks']['rendered'];
-  }
-
-  /**
-   * @return int
-   */
-  public function getRenderedBlocksCount() {
-    return count($this->getRenderedBlocks());
-  }
-
-  /**
-   * @return array
-   */
-  public function getLoadedBlocks() {
-    return $this->data['blocks']['loaded'];
-  }
-
-  /**
-   * @return int
-   */
-  public function getLoadedBlocksCount() {
-    return count($this->getLoadedBlocks());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'blocks';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Blocks');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Loaded: @loaded, rendered: @rendered', [
-      '@loaded' => $this->getLoadedBlocksCount(),
-      '@rendered' => $this->getRenderedBlocksCount()
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowNDgwMTE3NDA3MjA2ODExOEY2MkNCNjI0NDY3NzkwRCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDowQjg5OTA4OEYwQTgxMUUzQkJDRThFQjA5Q0E1REFCRCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowQjg5OTA4N0YwQTgxMUUzQkJDRThFQjA5Q0E1REFCRCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1LjEgTWFjaW50b3NoIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDM4MDExNzQwNzIwNjgxMTg3MUZDQ0I0RjY1RTlEM0IiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDQ4MDExNzQwNzIwNjgxMThGNjJDQjYyNDQ2Nzc5MEQiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz68h+kGAAAAWElEQVR42mL8//8/A7UBEwMNwAg3lAVEODg4UCW2Dhw4wDgapgyMtEj8eCMKFPCkyI1GFCJMiUnQVDUUX0SNllK4wxRf+JAdUeQUfaMRRd+ib4SHKUCAAQAMcyf8vLAstgAAAABJRU5ErkJggg==';
-  }
-
-  /**
-   * @param $decorator
-   * @param $storage
-   *
-   * @return array
-   */
-  private function getBlocksData(EntityDecorator $decorator, EntityStorageInterface $storage) {
-    $blocks = [];
-
-    /** @var \Drupal\block\BlockInterface $block */
-    foreach ($decorator->getEntities() as $block) {
-      /** @var Block $entity */
-      if (null !== $block && $entity = $storage->load($block->get('id'))) {
-
-        $route = '';
-        if ($entity->hasLinkTemplate('edit-form')) {
-          $route = $entity->toUrl('edit-form')->toString();
-        }
-
-        $id = $block->get('id');
-        $blocks[$id] = [
-          'id' => $id,
-          'region' => $block->getRegion(),
-          'status' => $block->get('status'),
-          'theme' => $block->getTheme(),
-          'plugin' => $block->get('plugin'),
-          'settings' => $block->get('settings'),
-          'route' => $route,
-        ];
-      }
-    }
-
-    return $blocks;
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/CacheDataCollector.php b/modules/devel/webprofiler/src/DataCollector/CacheDataCollector.php
deleted file mode 100644
index 57371e8..0000000
--- a/modules/devel/webprofiler/src/DataCollector/CacheDataCollector.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Collects the used cache bins and cache CIDs.
- */
-class CacheDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  const WEBPROFILER_CACHE_HIT = 'bin_cids_hit';
-  const WEBPROFILER_CACHE_MISS = 'bin_cids_miss';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-  }
-
-  /**
-   *
-   */
-  public function __construct() {
-    $this->data['total'][CacheDataCollector::WEBPROFILER_CACHE_HIT] = 0;
-    $this->data['total'][CacheDataCollector::WEBPROFILER_CACHE_MISS] = 0;
-    $this->data['cache'] = [];
-  }
-
-  /**
-   * Registers a cache get on a specific cache bin.
-   *
-   * @param $cache
-   */
-  public function registerCacheHit($bin, $cache) {
-    $current = isset($this->data['cache'][$bin][$cache->cid]) ? $this->data['cache'][$bin][$cache->cid] : NULL;
-
-    if (!$current) {
-      $current = $cache;
-      $current->{CacheDataCollector::WEBPROFILER_CACHE_HIT} = 0;
-      $current->{CacheDataCollector::WEBPROFILER_CACHE_MISS} = 0;
-      $this->data['cache'][$bin][$cache->cid] = $current;
-    }
-
-    $current->{CacheDataCollector::WEBPROFILER_CACHE_HIT}++;
-    $this->data['total'][CacheDataCollector::WEBPROFILER_CACHE_HIT]++;
-  }
-
-  /**
-   * Registers a cache get on a specific cache bin.
-   *
-   * @param $bin
-   * @param $cid
-   */
-  public function registerCacheMiss($bin, $cid) {
-    $current = isset($this->data['cache'][$bin][$cid]) ?
-      $this->data['cache'][$bin][$cid] : NULL;
-
-    if (!$current) {
-      $current = new \StdClass();
-      $current->{CacheDataCollector::WEBPROFILER_CACHE_HIT} = 0;
-      $current->{CacheDataCollector::WEBPROFILER_CACHE_MISS} = 0;
-      $this->data['cache'][$bin][$cid] = $current;
-    }
-
-    $current->{CacheDataCollector::WEBPROFILER_CACHE_MISS}++;
-    $this->data['total'][CacheDataCollector::WEBPROFILER_CACHE_MISS]++;
-  }
-
-  /**
-   * Callback to return the total amount of requested cache CIDS.
-   *
-   * @param string $type
-   *
-   * @return int
-   */
-  public function getCacheCidsCount($type) {
-    return $this->data['total'][$type];
-  }
-
-  /**
-   * Callback to return the total amount of hit cache CIDS.
-   *
-   * @return int
-   */
-  public function getCacheHitsCount() {
-    return $this->getCacheCidsCount(CacheDataCollector::WEBPROFILER_CACHE_HIT);
-  }
-
-  /**
-   * Callback to return the total amount of miss cache CIDS.
-   *
-   * @return int
-   */
-  public function getCacheMissesCount() {
-    return $this->getCacheCidsCount(CacheDataCollector::WEBPROFILER_CACHE_MISS);
-  }
-
-  /**
-   * Callback to return the total amount of hit cache CIDs keyed by bin.
-   *
-   * @param $type
-   *
-   * @return array
-   */
-  public function cacheCids($type) {
-    $hits = [];
-    foreach ($this->data['cache'] as $bin => $caches) {
-      $hits[$bin] = 0;
-      foreach ($caches as $cid => $cache) {
-        $hits[$bin] += $cache->{$type};
-      }
-    }
-
-    return $hits;
-  }
-
-  /**
-   * Callback to return hit cache CIDs keyed by bin.
-   *
-   * @return array
-   */
-  public function getCacheHits() {
-    return $this->cacheCids(CacheDataCollector::WEBPROFILER_CACHE_HIT);
-  }
-
-  /**
-   * Callback to return miss cache CIDs keyed by bin.
-   *
-   * @return array
-   */
-  public function getCacheMisses() {
-    return $this->cacheCids(CacheDataCollector::WEBPROFILER_CACHE_MISS);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'cache';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Cache');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Hit: @cache_hit, miss: @cache_miss', [
-      '@cache_hit' => $this->getCacheCidsCount(CacheDataCollector::WEBPROFILER_CACHE_HIT),
-      '@cache_miss' => $this->getCacheCidsCount(CacheDataCollector::WEBPROFILER_CACHE_MISS),
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABQAAAAcCAYAAABh2p9gAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo2Njc3QTVEQTkxNkMxMUUzQjA3OUEzQTNEMUVGMjVDOCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo2Njc3QTVEQjkxNkMxMUUzQjA3OUEzQTNEMUVGMjVDOCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjRGQTVBQzYxOTE2QzExRTNCMDc5QTNBM0QxRUYyNUM4IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjRGQTVBQzYyOTE2QzExRTNCMDc5QTNBM0QxRUYyNUM4Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+BsBwAAAAAJtJREFUeNpi/P//PwM1ARMDlcEIMdDBweEZjM0IihSgwEx8Gg4cOJCOrhGHOimqe5kF2QVYvDITl0vQvQwTo4oLkS1gQrPpPwiTEBkY6pnwKJ5JyOskJRvkcMUVxjgjhRhDsUUGSQZu3rwZb1j6+voyjhYOI9VAFmKTBTC3oMsTbyAx+RndAqxejo2NJdmL6HoYR6vRwWcgQIABAOn0PsqqgQzcAAAAAElFTkSuQmCC';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/ConfigDataCollector.php b/modules/devel/webprofiler/src/DataCollector/ConfigDataCollector.php
deleted file mode 100644
index 21f1107..0000000
--- a/modules/devel/webprofiler/src/DataCollector/ConfigDataCollector.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Provides a datacollector to show all requested configs.
- */
-class ConfigDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-  }
-
-  /**
-   * Registers a new requested config name.
-   *
-   * @param string $name
-   *   The name of the config.
-   */
-  public function addConfigName($name) {
-    $this->data['config_names'][$name] = isset($this->data['config_names'][$name]) ? $this->data['config_names'][$name] + 1 : 1;
-  }
-
-  /**
-   * Callback to display the config names.
-   */
-  public function getConfigNames() {
-    return $this->data['config_names'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'config';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Config');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Total: @count', ['@count' => count($this->getConfigNames())]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABsAAAAcCAYAAACQ0cTtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo2Njc3QTVFMjkxNkMxMUUzQjA3OUEzQTNEMUVGMjVDOCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo2Njc3QTVFMzkxNkMxMUUzQjA3OUEzQTNEMUVGMjVDOCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjY2NzdBNUUwOTE2QzExRTNCMDc5QTNBM0QxRUYyNUM4IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjY2NzdBNUUxOTE2QzExRTNCMDc5QTNBM0QxRUYyNUM4Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+f0Re8gAAA3RJREFUeNrsVk9ME1kY/82fTqfQf5ROW2gpuKCioHbdEDeBxITdxE08eOHkiQOr8cZhNx7k4MGDmpAQxTtHPBgPXjCbeLDE/XtglSUGGyhxgBYLdNpSOu3MPN+MwUSQP1HUZONv8st7897M9833fb837zGEEHwusPiM+P86AxjmEqVKSfaBGuWvlHgf6cUUb9+65WhsbPzo706n0/j5wgWddgOUK1vSKEnSvjgyEQwGQW1xtBv+4jXjc7kcBgcH981gJpPZ3tmnjoa7NgOSXwYK2U+bRu76y73XLBaLIRQKvXe8paVlZ0c35L2ncWho6K3B/v5+JBIJOJ3Ot+PmfV9fnzWvcyJWpeNQ/O0oH7oILhK7Q4cnKR9RjlEWrCVtF0Xy/alTW5z19PRgbGwMo6OjlmHToekolUpheHgYhYL1Pso2F+a+OQd/cwTftdlRH9QhujPGconJx5/VyRMvpD+IWrxCa5bmeJ6/GolEtjibmppCuVyGz+dDd3e3ZTwajWJgYMAatyJiBcyGf0J7pwcdzQEcbktBnW8Fr3NMXcOSeLRpKSCw2cD0tNgEQ3+0q0DGx8ettre3FyMjI+/MrYhReKMcgpII1jePdZVBWQXcBxJYfOFGzsjjYGsyErYvdkLJnN1V+hMTE1Zrpm+jv4FVxoemhjISyWqsKi68JDWwcSUsPhWQSQBSdA4Lz+vh92j18rRyZs/rbLMjE0WaTSJlsab+h1LqNES7BqLpYB2vIPwYx/zjNqwlDsBR8VaRwlzzrs42FGlGtgWaBiVZjzLngVChNYQBGATas5OoKCvQSB6k4x64uXYGTwyW322dmao01WgqczNEujMRRYSjqhUOhwAbz4Klu4nB8yhyEtZyPEqh36BquSLYzpltBdLV1WWJwmzN6EzZb4aPUZCfVRHyeiA53Qi6XKhzuxGurUFD8Qz8Xga1BQ+y8SNLEKoe8jupcEOJ26HWSGN5VYYiJ3Ei9i14GpaNezOn8gIcjISn/3Sks8n2PyFqDzhd1y/XeL02URQ/4ExhwFOSMbtux0qxgoDHBb+7GiLPG9l8ce2vyYI8nQjHMXn/Fzy+uWzu1Ofpeze32/D29scVgLpjwMEfSrSVUe1PoUK/Yib+N/69+zuy8gJ9apGxzgcfCkLMmjspq3b4qZsH03XKPPP1kLofeC3AAMaxXzYck+ZeAAAAAElFTkSuQmCC';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php b/modules/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php
deleted file mode 100644
index 2c766a4..0000000
--- a/modules/devel/webprofiler/src/DataCollector/DatabaseDataCollector.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Database\Database;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Class DatabaseDataCollector
- */
-class DatabaseDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \Drupal\Core\Database\Connection
-   */
-  private $database;
-
-  /**
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  private $configFactory;
-
-  /**
-   * @param \Drupal\Core\Database\Connection $database
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
-   */
-  public function __construct(Connection $database, ConfigFactoryInterface $configFactory) {
-    $this->database = $database;
-    $this->configFactory = $configFactory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $connections = [];
-    foreach (Database::getAllConnectionInfo() as $key => $info) {
-      $database = Database::getConnection('default', $key);
-      $connections[$key] = $database->getLogger()->get('webprofiler');
-    }
-
-    $this->data['connections'] = array_keys($connections);
-
-    $data = [];
-    foreach ($connections as $key => $queries) {
-      foreach ($queries as $query) {
-        // Remove caller args.
-        unset($query['caller']['args']);
-
-        // Remove query args element if empty.
-        if (isset($query['args']) && empty($query['args'])) {
-          unset($query['args']);
-        }
-
-        // Save time in milliseconds.
-        $query['time'] = $query['time'] * 1000;
-        $query['database'] = $key;
-        $data[] = $query;
-      }
-    }
-
-    $querySort = $this->configFactory->get('webprofiler.config')
-      ->get('query_sort');
-    if ('duration' === $querySort) {
-      usort(
-        $data, [
-          "Drupal\\webprofiler\\DataCollector\\DatabaseDataCollector",
-          "orderQueryByTime",
-        ]
-      );
-    }
-
-    $this->data['queries'] = $data;
-
-    $options = $this->database->getConnectionOptions();
-
-    // Remove password for security.
-    unset($options['password']);
-
-    $this->data['database'] = $options;
-  }
-
-  /**
-   * @return array
-   */
-  public function getDatabase() {
-    return $this->data['database'];
-  }
-
-  /**
-   * @return int
-   */
-  public function getQueryCount() {
-    return count($this->data['queries']);
-  }
-
-  /**
-   * @return array
-   */
-  public function getQueries() {
-    return $this->data['queries'];
-  }
-
-  /**
-   * Returns the total execution time.
-   *
-   * @return float
-   */
-  public function getTime() {
-    $time = 0;
-
-    foreach ($this->data['queries'] as $query) {
-      $time += $query['time'];
-    }
-
-    return $time;
-  }
-
-  /**
-   * Returns a color based on the number of executed queries.
-   *
-   * @return string
-   */
-  public function getColorCode() {
-    if ($this->getQueryCount() < 100) {
-      return 'green';
-    }
-    if ($this->getQueryCount() < 200) {
-      return 'yellow';
-    }
-
-    return 'red';
-  }
-
-  /**
-   * Returns the configured query highlight threshold.
-   *
-   * @return int
-   */
-  public function getQueryHighlightThreshold() {
-    // When a profile is loaded from storage this object is deserialized and
-    // no constructor is called so we cannot use dependency injection.
-    return \Drupal::config('webprofiler.config')->get('query_highlight');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'database';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Database');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Executed queries: @count', ['@count' => $this->getQueryCount()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABQAAAAcCAYAAABh2p9gAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQRJREFUeNpi/P//PwM1ARMDlcGogZQDlpMnT7pxc3NbA9nhQKxOpL5rQLwJiPeBsI6Ozl+YBOOOHTv+AOllQNwtLS39F2owKYZ/gRq8G4i3ggxEToggWzvc3d2Pk+1lNL4fFAs6ODi8JzdS7mMRVyDVoAMHDsANdAPiOCC+jCQvQKqBQB/BDbwBxK5AHA3E/kB8nKJkA8TMQBwLxaBIKQbi70AvTADSBiSadwFXpCikpKQU8PDwkGTaly9fHFigkaKIJid4584dkiMFFI6jkTJII0WVmpHCAixZQEXWYhDeuXMnyLsVlEQKI45qFBQZ8eRECi4DBaAlDqle/8A48ip6gAADANdQY88Uc0oGAAAAAElFTkSuQmCC';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLibraries() {
-    return [
-      'webprofiler/database',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getData() {
-    $data = $this->data;
-
-    $conn = Database::getConnection();
-    foreach ($data['queries'] as &$query) {
-      $explain = TRUE;
-      $type = 'select';
-
-      if (strpos($query['query'], 'INSERT') !== FALSE) {
-        $explain = FALSE;
-        $type = 'insert';
-      }
-
-      if (strpos($query['query'], 'UPDATE') !== FALSE) {
-        $explain = FALSE;
-        $type = 'update';
-      }
-
-      if (strpos($query['query'], 'CREATE') !== FALSE) {
-        $explain = FALSE;
-        $type = 'create';
-      }
-
-      if (strpos($query['query'], 'DELETE') !== FALSE) {
-        $explain = FALSE;
-        $type = 'delete';
-      }
-
-      $query['explain'] = $explain;
-      $query['type'] = $type;
-
-      $quoted = [];
-
-      if (isset($query['args'])) {
-        foreach ((array) $query['args'] as $key => $val) {
-          $quoted[$key] = is_null($val) ? 'NULL' : $conn->quote($val);
-        }
-      }
-
-      $query['query_args'] = strtr($query['query'], $quoted);
-    }
-
-    $data['query_highlight_threshold'] = $this->getQueryHighlightThreshold();
-
-    return $data;
-  }
-
-  /**
-   * @param $a
-   * @param $b
-   *
-   * @return int
-   */
-  private function orderQueryByTime($a, $b) {
-    $at = $a['time'];
-    $bt = $b['time'];
-
-    if ($at == $bt) {
-      return 0;
-    }
-    return ($at < $bt) ? 1 : -1;
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/DevelDataCollector.php b/modules/devel/webprofiler/src/DataCollector/DevelDataCollector.php
deleted file mode 100644
index 3c554ac..0000000
--- a/modules/devel/webprofiler/src/DataCollector/DevelDataCollector.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\Link;
-use Drupal\Core\Menu\MenuTreeParameters;
-use Drupal\Core\Render\Markup;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\devel\Plugin\Menu\DestinationMenuLink;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Class DevelDataCollector
- */
-class DevelDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $this->data['original_url'] = $request->getPathInfo();
-  }
-
-  /**
-   * @return string
-   */
-  public function getLinks() {
-    return $this->develMenuLinks($this->data['original_url']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'devel';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Development');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasPanel() {
-    return FALSE;
-  }
-
-  /**
-   * Returns the collector icon in base64 format.
-   *
-   * @return string
-   *   The collector icon.
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABYAAAAcCAYAAABlL09dAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo2RTdCREU2NUVFQUUxMUU1QTc4Q0Q0OEU5RUY0N0YwMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo2RTdCREU2NkVFQUUxMUU1QTc4Q0Q0OEU5RUY0N0YwMyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjZFN0JERTYzRUVBRTExRTVBNzhDRDQ4RTlFRjQ3RjAzIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjZFN0JERTY0RUVBRTExRTVBNzhDRDQ4RTlFRjQ3RjAzIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+6sNOKAAAAPVJREFUeNpi/P//PwMtABMDjcCowbQ3mNHe3h6XnBUQTwJiTRzy14E4+8CBAyexSbLgsZQbiI2BOBCH/HqoGgZSDYaBDXjk/uMzuBaLzeVI7FV4DN7n4OAAojvRxL+CwvgnkMFG5bj7BUoVv4lUfBWIrxGp9jcoKM4DsQABhZ+A2BPqs61AzEVA/XuQwT1AzElA4Q8g/gJN951EBN13kMFLgJiHgMJvQCwNxOxAvJwIg7+wEBnGv4D4M1TtLyIMBocxMQUyKExnAzEzEHMQof4/C5GxDHJh4qAp3VhpYC4rKCieAbEQlQ1+yzhamY4aTD+DAQIMAFv+MFaJEyYhAAAAAElFTkSuQmCC';
-  }
-
-  /**
-   * @param string $original_url
-   *
-   * @return array Array containing Devel Menu links
-   *   Array containing Devel Menu links
-   */
-  protected function develMenuLinks($original_url) {
-    // We cannot use injected services here because at this point this
-    // class is deserialized from a storage and not constructed.
-    $menuLinkTreeService = \Drupal::service('menu.link_tree');
-    $rendererService = \Drupal::service('renderer');
-
-    $parameters = new MenuTreeParameters();
-    $parameters->setMaxDepth(1)->onlyEnabledLinks();
-    $tree = $menuLinkTreeService->load('devel', $parameters);
-
-    $manipulators = array(
-      array('callable' => 'menu.default_tree_manipulators:checkAccess'),
-      array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
-    );
-    $tree = $menuLinkTreeService->transform($tree, $manipulators);
-
-    $links = array();
-
-    foreach ($tree as $item) {
-      /** @var DestinationMenuLink $link */
-      $link = $item->link;
-      $renderable = Link::fromTextAndUrl($link->getTitle(), $link->getUrlObject())
-        ->toRenderable();
-      $rendered = $rendererService->renderPlain($renderable);
-      $linkString = preg_replace('/\/profiler\/(.*)&/', $original_url . '&', $rendered);
-      $links[] = Markup::create($linkString);;
-    }
-
-    return $links;
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/DrupalDataCollector.php b/modules/devel/webprofiler/src/DataCollector/DrupalDataCollector.php
deleted file mode 100644
index 63ec647..0000000
--- a/modules/devel/webprofiler/src/DataCollector/DrupalDataCollector.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal;
-use Drupal\Core\Routing\RedirectDestinationInterface;
-use Drupal\Core\Routing\UrlGeneratorInterface;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-use Symfony\Component\Process\Exception\ProcessFailedException;
-use Symfony\Component\Process\Exception\RuntimeException;
-use Symfony\Component\Process\Process;
-
-/**
- * Class DrupalDataCollector
- */
-class DrupalDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \Drupal\Core\Routing\RedirectDestinationInterface
-   */
-  private $redirectDestination;
-
-  /**
-   * @var \Drupal\Core\Routing\UrlGeneratorInterface
-   */
-  private $urlGenerator;
-
-  /**
-   * @param \Drupal\Core\Routing\RedirectDestinationInterface $redirectDestination
-   * @param \Drupal\Core\Routing\UrlGeneratorInterface $urlGenerator
-   */
-  public function __construct(RedirectDestinationInterface $redirectDestination, UrlGeneratorInterface $urlGenerator) {
-    $this->redirectDestination = $redirectDestination;
-    $this->urlGenerator = $urlGenerator;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $this->data['version'] = Drupal::VERSION;
-    $this->data['profile'] = drupal_get_profile();
-    $this->data['config_url'] = (new Drupal\Core\Url('webprofiler.settings', [], ['query' => $this->redirectDestination->getAsArray()]))->toString();
-
-    try {
-      $process = new Process("git log -1 --pretty=format:'%H - %s (%ci)' --abbrev-commit");
-      $process->setTimeout(3600);
-      $process->mustRun();
-      $this->data['git_commit'] = $process->getOutput();
-
-      $process = new Process("git log -1 --pretty=format:'%h' --abbrev-commit");
-      $process->setTimeout(3600);
-      $process->mustRun();
-      $this->data['abbr_git_commit'] = $process->getOutput();
-    } catch (ProcessFailedException $e) {
-      $this->data['git_commit'] = $this->data['git_commit_abbr'] = NULL;
-    } catch (RuntimeException $e) {
-      $this->data['git_commit'] = $this->data['git_commit_abbr'] = NULL;
-    }
-  }
-
-  /**
-   * @return string
-   */
-  public function getVersion() {
-    return $this->data['version'];
-  }
-
-  /**
-   * @return string
-   */
-  public function getProfile() {
-    return $this->data['profile'];
-  }
-
-  /**
-   * @return string
-   */
-  public function getConfigUrl() {
-    return $this->data['config_url'];
-  }
-
-  /**
-   * @return string
-   */
-  public function getGitCommit() {
-    return $this->data['git_commit'];
-  }
-
-  /**
-   * @return string
-   */
-  public function getAbbrGitCommit() {
-    return $this->data['abbr_git_commit'];
-  }
-
-  /**
-   * Returns the name of the collector.
-   *
-   * @return string The collector name
-   *
-   * @api
-   */
-  public function getName() {
-    return 'drupal';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Drupal');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasPanel() {
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpCRDU5MUVDNzVGRTkxMUUzODdBMEJDOEZFRjA2QUY5MiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpCRDU5MUVDODVGRTkxMUUzODdBMEJDOEZFRjA2QUY5MiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkJENTkxRUM1NUZFOTExRTM4N0EwQkM4RkVGMDZBRjkyIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkJENTkxRUM2NUZFOTExRTM4N0EwQkM4RkVGMDZBRjkyIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+iYsuIgAAAiNJREFUeNq8lj3KwkAQhhOxUPAnoIgWQiysbFLYG2/gEVJaegQ9QfQECh4g3kA9QbxBLMQ2KaxE2G/ffG5Yl/ytiguDJBn32Z15d2dUQojy0wGgDHQwGFjj8Vh7hxFyZIHNZtOt1+uuDPRtYK/Xs4rFIpyJDFQaiIm73a7NYMyq1arf7/dnWWApIN3VHBPzINHwHX5J4FxAKg6j0Wh4aSDREGb8TxqIXJVKJSIDY1Yul30RmgqE87swHkrDq2cCkYNareZ9AmPWarX2mUAk/hswZrgkUoGyIsm7y1ggDachnrNPrVKpEKSJBxZYnC+Xi/l4PL56T99uN/y8KDYCUpj2i2JRzONkWZYyGo0UXdeV4/GobDYb5Xw+J/obxv+mTqdT8rWTpND1ek3ihm3bRNO0F188O44T+UwmE+TQjBXNcDiciLD5fE7Shuu6xDTN0JdGgfi+//J9v98nA6EmqIoHYsJPxuFwIOKxiERDVxNQ4I4PNw1Ram6DIFAWiwUWG5uv+/2+E98V+IdOp7OiZzF6pitMhC2XyxDEfOKg1+t1ldnTtNtthxcB8sAGcgQRUbWGufM8LxQPfJBv3n+73Tq5qgVyibqWdYsASOUfLYyJJ679yKyHadDZbBYqkn8HMHaO3ydMl674rI8RayOACKUo/+l0SuAf12ZI9TRYLSZCJYk76GgbnyA9TxOlMpiqqrnuQhxk7igd8raJbKi/bvX/BBgANANSieJk+XMAAAAASUVORK5CYII=';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php b/modules/devel/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php
deleted file mode 100644
index 98a3faf..0000000
--- a/modules/devel/webprofiler/src/DataCollector/DrupalDataCollectorTrait.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-/**
- * Class DrupalDataCollectorTrait
- */
-trait DrupalDataCollectorTrait {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasPanel() {
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLibraries() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDrupalSettings() {
-    return [];
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getData() {
-    return $this->data;
-  }
-
-  /**
-   * @param $class
-   * @param $method
-   *
-   * @return array
-   *
-   * @throws \ReflectionException
-   */
-  public function getMethodData($class, $method) {
-    $class = is_object($class) ? get_class($class) : $class;
-    $data = [];
-
-    try {
-      $reflectedMethod = new \ReflectionMethod($class, $method);
-
-      $data = [
-        'class' => $class,
-        'method' => $method,
-        'file' => $reflectedMethod->getFilename(),
-        'line' => $reflectedMethod->getStartLine(),
-      ];
-    } catch (\ReflectionException $re) {
-      // TODO: handle the exception.
-    } finally {
-      return $data;
-    }
-  }
-
-  /**
-   * @param $value
-   *
-   * @return int|string
-   */
-  private function convertToBytes($value) {
-    if ('-1' === $value) {
-      return -1;
-    }
-
-    $value = strtolower($value);
-    $max = strtolower(ltrim($value, '+'));
-    if (0 === strpos($max, '0x')) {
-      $max = intval($max, 16);
-    }
-    elseif (0 === strpos($max, '0')) {
-      $max = intval($max, 8);
-    }
-    else {
-      $max = intval($max);
-    }
-
-    switch (substr($value, -1)) {
-      case 't':
-        $max *= 1024;
-        break;
-
-      case 'g':
-        $max *= 1024;
-        break;
-
-      case 'm':
-        $max *= 1024;
-        break;
-
-      case 'k':
-        $max *= 1024;
-        break;
-    }
-
-    return $max;
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/EventsDataCollector.php b/modules/devel/webprofiler/src/DataCollector/EventsDataCollector.php
deleted file mode 100644
index 6374ca9..0000000
--- a/modules/devel/webprofiler/src/DataCollector/EventsDataCollector.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\webprofiler\EventDispatcher\EventDispatcherTraceableInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
-
-/**
- * Class EventsDataCollector
- */
-class EventsDataCollector extends DataCollector implements DrupalDataCollectorInterface, LateDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-   */
-  private $eventDispatcher;
-
-  /**
-   * EventsDataCollector constructor.
-   *
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
-   */
-  public function __construct(EventDispatcherInterface $event_dispatcher) {
-    $this->eventDispatcher = $event_dispatcher;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $this->data = [
-      'called_listeners' => [],
-      'called_listeners_count' => 0,
-      'not_called_listeners' => [],
-      'not_called_listeners_count' => 0,
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function lateCollect() {
-    if ($this->eventDispatcher instanceof EventDispatcherTraceableInterface) {
-      $countCalled = 0;
-      $calledListeners = $this->eventDispatcher->getCalledListeners();
-      foreach ($calledListeners as &$events) {
-        foreach ($events as &$priority) {
-          foreach ($priority as &$listener) {
-            $countCalled++;
-            $listener['clazz'] = $this->getMethodData($listener['class'], $listener['method']);
-          }
-        }
-      }
-
-      $countNotCalled = 0;
-      $notCalledListeners = $this->eventDispatcher->getNotCalledListeners();
-      foreach ($notCalledListeners as $events) {
-        foreach ($events as $priority) {
-          foreach ($priority as $listener) {
-            $countNotCalled++;
-          }
-        }
-      }
-
-      $this->data = [
-        'called_listeners' => $calledListeners,
-        'called_listeners_count' => $countCalled,
-        'not_called_listeners' => $notCalledListeners,
-        'not_called_listeners_count' => $countNotCalled,
-      ];
-    }
-  }
-
-  /**
-   * @return array
-   */
-  public function getCalledListeners() {
-    return $this->data['called_listeners'];
-  }
-
-  /**
-   * @return array
-   */
-  public function getNotCalledListeners() {
-    return $this->data['not_called_listeners'];
-  }
-
-  /**
-   * @return int
-   */
-  public function getCalledListenersCount() {
-    return $this->data['called_listeners_count'];
-  }
-
-  /**
-   * @return int
-   */
-  public function getNotCalledListenersCount() {
-    return $this->data['not_called_listeners_count'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'events';
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getData() {
-    return $this->data;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Events');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Called listeners: @listeners', ['@listeners' => $this->getCalledListenersCount()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABFJJREFUeNrkVVlIY2cY/RMTE81NMkkajUs1OBqkiVsjjAtStGrtSGyFjOjAQNVCKRb66ot9KrjgQx+FUgTBKkURbIfighWl4r6h44pajcZEo3ESTeKS9PzB2AyNZaD1qRcOem+S83/f+c53Lsvj8ZD/+mKTB7gehJTj+2d9fZ1MTk6S0NBQSW9vb97e3t7jmpqaXzIzM185HA7vd4KDg8nGxoaysbGxVCwWm/V6/aDL5TKlpKSQpKSkv5NyuVxyc3Mj7e7u/jw2NjYxJyfnMDIykmGz2UQgEBAWi0XcbjeRSqWhZWVl4v39fXVXV5cqNzf3exxmCNj+9fU1MzQ09JVWq32sUqmMu7u7QhwiDwoKIoeHh2R7e5twOByCwcrQhUShUJjz8vJkw8PDX5+fn8sDkvb3938YHR39rlAoNBoMBgGqtWxubnJRKbu9vZ20trZSQoJnvKioKMvZ2Rn/6urKmpqayvT19ekCks7NzaUnJyeboK0kPj7+cGZmJprH4zGnp6duEBFUTg4ODqjmIfPz87GQxoRnori4ODOKUPuTsnw+RRvPGIYJMZvNDNplYmJiLvPz839oamoSj4yMfAJNuRqN5mV9ff0fOPDF1NSUAt85lclkDkjnys7O/vGOlZLeQgjIgUggnmqHqmMqKip+z8jI8MAFnpKSkpXZ2dn38JkIUAFRQNjt/R2Xv09twBFwAGwClunp6efLy8tZdFgUW1tbiaOjo1/is9fUhcA+YL69fzvzSyQSEQZHfBJBT4J2Bf9qo9Rq9bxcLndeXl4STJrA8B4Mc/atN4pesAk5OTkh1PB0exYXF/kWi4UTFhZG+Hw+wZQJ5BDR7fEPIroYASu9uLggJpOJYO2I0+kkqI47Njb2MdzAKS4uXisvL5/FurIGBgaeYoDS1dVVsrKyQpaWlghsF7hS2IJERER4T4U/qckT4ccP6BYplco+rOcxqn0fZFqj0fgkLS3tV18m0EICktJV9F101xcWFj5Cu+HQ1YGNoeSXWGErpv8IwVOSlZXVh7xw0zy4V1MY3/uXWgetMzB8EZUHw7lKSEjgQ0MONLei2kcTExN5R0dHMehshw7x3umLRKI7YDhaDOSJ18hstq2qquobLMG30DKYkuzs7KggTa5Pf4p/rJReSCud1WplEBYuSMGrra39FG1ywsPDgwsLC+0YFoMAKi0qKupA5c57K0V1XjsdHx+/g6mXUksVFBS8wmF23FeMj48/w7PXiLsxePcG65qPDNCsra15XRCQFNP1AgRPMaA4aOvp6OjQ2O12cVtb20vE389YAHFLS0sO2vbYbLYQHKRHShEEy5ul+kIAe02Q5vy6urouTNyDV8VNT0/PBGzzxW1wRIHsM7T+W3V1tROvEE9lZeUCKlVgSfyD6S9SGsKdnZ1pOp3OkJ6efj04OPgTnmsAlv8PACXa/Q4L4UByuZqbm/UNDQ1vkLL+3+/9ByH9U4ABADscgvUMKuLiAAAAAElFTkSuQmCC';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/ExtensionDataCollector.php b/modules/devel/webprofiler/src/DataCollector/ExtensionDataCollector.php
deleted file mode 100644
index bdf08f4..0000000
--- a/modules/devel/webprofiler/src/DataCollector/ExtensionDataCollector.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Extension\ThemeHandlerInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Defines a data collector for the extension system.
- */
-class ExtensionDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The theme handler.
-   *
-   * @var \Drupal\Core\Extension\ThemeHandlerInterface
-   */
-  protected $themeHandler;
-
-  /**
-   * The app root.
-   *
-   * @var string
-   */
-  protected $root;
-
-  /**
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
-   *   The theme handler.
-   * @param string $root
-   *   The app root.
-   */
-  public function __construct(ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, $root) {
-    $this->moduleHandler = $module_handler;
-    $this->themeHandler = $theme_handler;
-    $this->root = $root;
-
-    $this->data['drupal_extension']['modules'] = [];
-    $this->data['drupal_extension']['themes'] = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $modules = $this->moduleHandler->getModuleList();
-    $themes = $this->themeHandler->listInfo();
-
-    $this->data['drupal_extension']['count'] = count($modules) + count($themes);
-    $this->data['drupal_extension']['modules'] = $modules;
-    $this->data['drupal_extension']['themes'] = $themes;
-    $this->data['drupal_extension']['installation_path'] = $this->root . '/';
-  }
-
-  /**
-   * Returns the total number of active extensions.
-   *
-   * @return int
-   */
-  public function getExtensionsCount() {
-    return isset($this->data['drupal_extension']['count']) ? $this->data['drupal_extension']['count'] : 0;
-  }
-
-  /**
-   * Returns the total number of active modules.
-   *
-   * @return int
-   */
-  public function getModulesCount() {
-    return count($this->data['drupal_extension']['modules']);
-  }
-
-  /**
-   * Returns the total number of active themes.
-   *
-   * @return int
-   */
-  public function getThemesCount() {
-    return count($this->data['drupal_extension']['themes']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'drupal_extension';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Extensions');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Total: @extensions', ['@extensions' => $this->getExtensionsCount()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABQAAAAcCAYAAABh2p9gAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo0RkE1QUM1RjkxNkMxMUUzQjA3OUEzQTNEMUVGMjVDOCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo0RkE1QUM2MDkxNkMxMUUzQjA3OUEzQTNEMUVGMjVDOCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjRGQTVBQzVEOTE2QzExRTNCMDc5QTNBM0QxRUYyNUM4IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjRGQTVBQzVFOTE2QzExRTNCMDc5QTNBM0QxRUYyNUM4Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+7LqYtwAAAUBJREFUeNpi/P//PwM1ARMDlcGogYPQQBYQ4eDgQIza/SClQNwIxA3okgcOHCDZhRVAfA6I64F4EjW8fBLqwn1AnAvE8aQaqAc1QAZJ7DMQRwPxayDuAGIBYgwUAeL1QHwWGm6XgLgUSf4FEPcAsQQQ+xBjICh8AmARBgSCQNwFxEFIatYCMagQcEHXzGhvb09s6bAdiL2gbHYg/oEm/x8Y00ykRAofEvsvzlgGmsoIpIWBWBaIlYD4Bg61B5DY/ED8HRrjIH2yINchh+E7IH4CxPeBuAAam8jgBBD3IfEtgZgTiPdC9T1BySloYCcQ20DTmTg0tuegWVICjZSNWLMeFgBKKsU45EDi9kA8H4ivEmsgNsAKxEXQBH0TiMtwFg5EgvnQXHIFmibfUGrgeaghTdBIxAoYR2u9EWAgQIABAKKeRzEX0gXIAAAAAElFTkSuQmCC';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getData() {
-    $data = $this->data;
-
-    // Copy protected properties over public ones to
-    // let json_encode to find them.
-    $this->copyToPublic($data['drupal_extension']['modules']);
-    $this->copyToPublic($data['drupal_extension']['themes']);
-
-    return $data;
-  }
-
-  /**
-   * Copies protected properties to public ones.
-   *
-   * @param \Drupal\Core\Extension\Extension[] $extensions
-   */
-  private function copyToPublic($extensions) {
-    foreach ($extensions as &$extension) {
-      $extension->public_type = $extension->getType();
-      $extension->public_name = $extension->getName();
-      $extension->public_path = $extension->getPath();
-      $extension->public_pathname = $extension->getPathname();
-      $extension->public_filename = $extension->getFilename();
-      $extension->public_extension_pathname = $extension->getExtensionPathname();
-      $extension->public_extension_filename = $extension->getExtensionFilename();
-    }
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/FormsDataCollector.php b/modules/devel/webprofiler/src/DataCollector/FormsDataCollector.php
deleted file mode 100644
index 79f6332..0000000
--- a/modules/devel/webprofiler/src/DataCollector/FormsDataCollector.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\webprofiler\Form\FormBuilderWrapper;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Class FormsDataCollector
- */
-class FormsDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \Drupal\webprofiler\Form\FormBuilderWrapper
-   */
-  private $formBuilder;
-
-  /**
-   * @param \Drupal\webprofiler\Form\FormBuilderWrapper $formBuilder
-   */
-  public function __construct(FormBuilderWrapper $formBuilder) {
-    $this->formBuilder = $formBuilder;
-
-    $this->data['forms'] = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $this->data['forms'] = $this->formBuilder->getBuildForm();
-  }
-
-  /**
-   * @return array
-   */
-  public function getForms() {
-    return $this->data['forms'];
-  }
-
-  /**
-   * @return array
-   */
-  public function getFormsCount() {
-    return count($this->getForms());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'forms';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Forms');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Rendered: @forms', ['@forms' => $this->getFormsCount()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABQAAAAcCAYAAABh2p9gAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo0RkE1QUM1QjkxNkMxMUUzQjA3OUEzQTNEMUVGMjVDOCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo0RkE1QUM1QzkxNkMxMUUzQjA3OUEzQTNEMUVGMjVDOCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjRGQTVBQzU5OTE2QzExRTNCMDc5QTNBM0QxRUYyNUM4IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjRGQTVBQzVBOTE2QzExRTNCMDc5QTNBM0QxRUYyNUM4Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+I7130QAAAKRJREFUeNrsVVsKxCAMzIgH8897eDHxGP55LX+0RmjpYxHdyrLsNl9iknEyExA5Z5oZgibH9wPKVlJrnVNKRwZCkPceQ4AhhOpUjJFaeaXUBRjssrW2FvDZGINS2GV9AQb3rpvCvZWhc24rKpdDmp17P2MKjzIFEAD16vdDi73Xbx2/pelZItnz6oiusneB32b4is0Iw8eUfzBlOiCef/l2LAIMAGACWQCJ5bXFAAAAAElFTkSuQmCC';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/HttpDataCollector.php b/modules/devel/webprofiler/src/DataCollector/HttpDataCollector.php
deleted file mode 100644
index 8544083..0000000
--- a/modules/devel/webprofiler/src/DataCollector/HttpDataCollector.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\webprofiler\Http\HttpClientMiddleware;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Collects data about http calls during request.
- */
-class HttpDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \GuzzleHttp\Client
-   */
-  private $middleware;
-
-  /**
-   * @param \Drupal\webprofiler\Http\HttpClientMiddleware $middleware
-   */
-  public function __construct(HttpClientMiddleware $middleware) {
-    $this->middleware = $middleware;
-
-    $this->data['completed'] = [];
-    $this->data['failed'] = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $completed = $this->middleware->getCompletedRequests();
-    $failed = $this->middleware->getFailedRequests();
-
-    foreach ($completed as $data) {
-      /** @var \GuzzleHttp\Psr7\Request $request */
-      $request = $data['request'];
-      /** @var \GuzzleHttp\Psr7\Response $response */
-      $response = $data['response'];
-      /** @var \GuzzleHttp\TransferStats $stats */
-      $stats = $request->stats;
-
-      $uri = $request->getUri();
-      $this->data['completed'][] = [
-        'request' => [
-          'method' => $request->getMethod(),
-          'uri' => [
-            'schema' => $uri->getScheme(),
-            'host' => $uri->getHost(),
-            'port' => $uri->getPort(),
-            'path' => $uri->getPath(),
-            'query' => $uri->getQuery(),
-            'fragment' => $uri->getFragment(),
-          ],
-          'headers' => $request->getHeaders(),
-          'protocol' => $request->getProtocolVersion(),
-          'request_target' => $request->getRequestTarget(),
-          'stats' => [
-            'transferTime' => $stats->getTransferTime(),
-            'handlerStats' => $stats->getHandlerStats(),
-          ],
-        ],
-        'response' => [
-          'phrase' => $response->getReasonPhrase(),
-          'status' => $response->getStatusCode(),
-          'headers' => $response->getHeaders(),
-          'protocol' => $response->getProtocolVersion(),
-        ],
-      ];
-    }
-
-    foreach ($failed as $data) {
-      /** @var \GuzzleHttp\Psr7\Request $request */
-      $request = $data['request'];
-      /** @var \GuzzleHttp\Psr7\Response $response */
-      $response = $data['response'];
-
-      $uri = $request->getUri();
-      $failureData = [
-        'request' => [
-          'method' => $request->getMethod(),
-          'uri' => [
-            'schema' => $uri->getScheme(),
-            'host' => $uri->getHost(),
-            'port' => $uri->getPort(),
-            'path' => $uri->getPath(),
-            'query' => $uri->getQuery(),
-            'fragment' => $uri->getFragment(),
-          ],
-          'headers' => $request->getHeaders(),
-          'protocol' => $request->getProtocolVersion(),
-          'request_target' => $request->getRequestTarget(),
-        ],
-      ];
-
-      if ($response) {
-        $failureData['response'] = [
-          'phrase' => $response->getReasonPhrase(),
-          'status' => $response->getStatusCode(),
-          'headers' => $response->getHeaders(),
-          'protocol' => $response->getProtocolVersion(),
-        ];
-      }
-
-      $this->data['failed'][] = $failureData;
-    }
-  }
-
-  /**
-   * @return int
-   */
-  public function getCompletedRequestsCount() {
-    return count($this->getCompletedRequests());
-  }
-
-  /**
-   * @return array
-   */
-  public function getCompletedRequests() {
-    return $this->data['completed'];
-  }
-
-  /**
-   * @return int
-   */
-  public function getFailedRequestsCount() {
-    return count($this->getFailedRequests());
-  }
-
-  /**
-   * @return array
-   */
-  public function getFailedRequests() {
-    return $this->data['failed'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'http';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Http');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t(
-      'Completed @completed, error @error', [
-      '@completed' => $this->getCompletedRequestsCount(),
-      '@error' => $this->getFailedRequestsCount(),
-    ]
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAATlJREFUeNrsleERgjAMha0TdISOwAZ2BEZghI7ABo7AOQFuwAjoBLgBblBbfb0LudByp/4jdw+PNnxtkqYq7/3h13Y8/MF26B9spfo6yAX1QSa6EY2Y0xLrzROgddAMOcgLmuFbhDqyG00W8Rm1JWgEWCG0oQBuJKjGigNUs/xWUJdJheZQJzhZFGkgKWkw1mM8bmTCvOPQcSVXrTA+Ydc0kujXJGg6p5VwrG5BJzb2CLriN9kT74afUylPloQ+kdDPELXpg1qGvwbtURwjFGkkC8RIZw6d2QeO7MII81wRbDm0Z068Zf0G1bxQl8z1UH1zoQwk9NRZdkPoHt+KbZoqa+HYZS4T3iimdEvRDrIF4KIRclBNjk+uSB2/eBJUvR9KSek26BZHOit2zl3oqkV91P6//3N7CTAAIIc/qj2gy4gAAAAASUVORK5CYII=';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/MailDataCollector.php b/modules/devel/webprofiler/src/DataCollector/MailDataCollector.php
deleted file mode 100644
index 7955150..0000000
--- a/modules/devel/webprofiler/src/DataCollector/MailDataCollector.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\Mail\MailInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Class MailDataCollector
- */
-class MailDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var
-   */
-  private $messages;
-
-  /**
-   *
-   */
-  public function __construct() {
-    $this->messages = [];
-  }
-
-  /**
-   * Collects data for the given Request and Response.
-   *
-   * @param Request $request A Request instance
-   * @param Response $response A Response instance
-   * @param \Exception $exception An Exception instance
-   *
-   * @api
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $this->data['mail'] = $this->messages;
-  }
-
-  /**
-   * @param $message
-   * @param \Drupal\Core\Mail\MailInterface $mail
-   */
-  public function addMessage($message, MailInterface $mail) {
-    $class = get_class($mail);
-    $method = $this->getMethodData($class, 'mail');
-
-    $this->messages[] = [
-      'message' => $message,
-      'method' => $method,
-    ];
-  }
-
-  /**
-   * @return int
-   */
-  public function getMailSent() {
-    return count($this->data['mail']);
-  }
-
-  /**
-   * Returns the name of the collector.
-   *
-   * @return string The collector name
-   *
-   * @api
-   */
-  public function getName() {
-    return 'mail';
-  }
-
-  /**
-   * Returns the datacollector title.
-   *
-   * @return string
-   *   The datacollector title.
-   */
-  public function getTitle() {
-    return $this->t('Mail');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Total: @count', ['@count' => $this->getMailSent()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABcAAAAcCAYAAACK7SRjAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0NEOTU1MjM0OThFMTFFMDg3NzJBNTE2ODgwQzMxMzQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0NEOTU1MjQ0OThFMTFFMDg3NzJBNTE2ODgwQzMxMzQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoxMEQ5OTQ5QzQ5OEMxMUUwODc3MkE1MTY4ODBDMzEzNCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3Q0Q5NTUyMjQ5OEUxMUUwODc3MkE1MTY4ODBDMzEzNCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PpkRnSAAAAJ0SURBVHjaYvz//z8DrQATAw3BqOFYAaO9vT1FBhw4cGCAXA5MipxBQUHT3r17l0AVAxkZ/wkLC89as2ZNIcjlYkALXKnlWqBZTH/+/PEDmQsynLW/v3+NoaHhN2oYDjJn8uTJK4BMNpDhPwsLCwOKiop2+fn5vafEYC8vrw8gc/Lz8wOB3B8gw/nev38vn5WV5eTg4LA/Ly/vESsrK2npmYmJITU19SnQ8L0gc4DxpwgyF2S4EEjB58+f+crLy31YWFjOt7S0XBYUFPxHjMEcHBz/6+rqboqJiZ0qKSnxBpkDlRICGc4MU/j792+2CRMm+L18+fLSxIkTDykoKPzBZ7CoqOi/np6eE8rKylvb29v9fvz4wYEkzYKRzjk5OX/LyMjcnDRpEkjjdisrK6wRraOj8wvokAMLFy788ejRoxcaGhrPCWai4ODgB8DUE3/mzBknYMToASNoMzAfvEVW4+Tk9LmhoWFbTU2NwunTpx2BjiiMjo6+hm4WCzJHUlLyz+vXrxkfP36sDOI/ffpUPikpibe7u3sLsJjQW7VqlSrQxe+Avjmanp7u9PbtWzGQOmCCkARmmu/m5uYfT548yY/V5UpKSl+2b9+uiiz26dMnIWBSDTp27NgdYGrYCIzwE7m5uR4wg2Hg/PnzSsDI/QlKOcjZ3wGUBLm5uf+DwLdv38gub4AG/xcSEvr35s0bZmCB5sgCE/z69SsjyDJKMtG/f/8YQQYD8wkoGf8H51AbG5sH1CpbQBnQ09PzBiiHgoIFFHlBQGwLxLxUMP8dqJgH4k3gIhfIkAKVYkDMTmmhCHIxEL8A4peMo02L4WU4QIABANxZAoDIQDv3AAAAAElFTkSuQmCC';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/PerformanceTimingDataCollector.php b/modules/devel/webprofiler/src/DataCollector/PerformanceTimingDataCollector.php
deleted file mode 100644
index 6a5e699..0000000
--- a/modules/devel/webprofiler/src/DataCollector/PerformanceTimingDataCollector.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\webprofiler\Frontend\PerformanceTimingData;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Collects data about frontend performance.
- */
-class PerformanceTimingDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-
-  }
-
-  /**
-   * @param $data
-   */
-  public function setData($data) {
-    $this->data['performance'] = $data;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'performance_timing';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Performance Timing');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    if (isset($this->data['performance'])) {
-      $performanceData = new PerformanceTimingData($this->data['performance']);
-      return $this->t('TTFB: @ttfb', ['@ttfb' => sprintf('%.0f ms', $performanceData->getTtfbTiming())]);
-    }
-
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQJJREFUeNpi/P//PwO1ARMDDcCooUPEUEYi1AgAcQIQ+0P5H4B4IxAvwKaYmCSqAMT7gbgBajhMrB8qLkCsoQFQQ0CuOw/EBjgsLIAajmEouvdBhukD8UQgdkASwwXuA7EhNEhwuvQ8iXHSj2Q53FBY7BtADVxIoqEfoQYnYJPEF3bEROZ6WDDBvO+ALcCxJCsBAmpA4SuA7P2PBDQUEOGTDTA1TNCYs6dCRgIlxQswQ0GMB0A8nwgv4gqa+VCXgpMWC1QiEerF9WgaDmJJp/OhkUNIHUHQgJ4ecQHkiMKXXALQIowqpdR8pJi/AA0qvC4lFsyHYqK8zzhaRQ8NQwECDABNaU12xhTp2QAAAABJRU5ErkJggg==';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getData() {
-    $data = $this->data;
-
-    if (isset($this->data['performance'])) {
-      $performanceData = new PerformanceTimingData($this->data['performance']);
-      $data['performance']['computed']['DNS lookup time'] = $performanceData->getDNSTiming();
-      $data['performance']['computed']['TCP handshake time'] = $performanceData->getTCPTiming();
-      $data['performance']['computed']['Time to first byte'] = $performanceData->getTtfbTiming();
-      $data['performance']['computed']['Data download time'] = $performanceData->getDataTiming();
-      $data['performance']['computed']['DOM building time'] = $performanceData->getDomTiming();
-    }
-
-    return $data;
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/PhpConfigDataCollector.php b/modules/devel/webprofiler/src/DataCollector/PhpConfigDataCollector.php
deleted file mode 100644
index d959a48..0000000
--- a/modules/devel/webprofiler/src/DataCollector/PhpConfigDataCollector.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\Routing\LinkGeneratorTrait;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Provides a data collector to collect all kind of php information.
- */
-class PhpConfigDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait, LinkGeneratorTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $this->data = [
-      'token' => $response->headers->get('X-Debug-Token'),
-      'php_version' => PHP_VERSION,
-      'xdebug_enabled' => extension_loaded('xdebug'),
-      'xhprof_enabled' => extension_loaded('xhprof'),
-      'eaccel_enabled' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'),
-      'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'),
-      'xcache_enabled' => extension_loaded('xcache') && ini_get('xcache.cacher'),
-      'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
-      'zend_opcache_enabled' => extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
-      'sapi_name' => php_sapi_name()
-    ];
-  }
-
-  /**
-   * Gets the token.
-   *
-   * @return string The token
-   */
-  public function getToken() {
-    return $this->data['token'];
-  }
-
-  /**
-   * Gets the PHP version.
-   *
-   * @return string The PHP version
-   */
-  public function getPhpVersion() {
-    return $this->data['php_version'];
-  }
-
-  /**
-   * Returns true if the XDebug is enabled.
-   *
-   * @return Boolean true if XDebug is enabled, false otherwise
-   */
-  public function hasXDebug() {
-    return $this->data['xdebug_enabled'];
-  }
-
-  /**
-   * Returns true if the XHProf is enabled.
-   *
-   * @return Boolean true if XHProf is enabled, false otherwise
-   */
-  public function hasXHProf() {
-    return $this->data['xhprof_enabled'];
-  }
-
-  /**
-   * Returns true if EAccelerator is enabled.
-   *
-   * @return Boolean true if EAccelerator is enabled, false otherwise
-   */
-  public function hasEAccelerator() {
-    return $this->data['eaccel_enabled'];
-  }
-
-  /**
-   * Returns true if APC is enabled.
-   *
-   * @return Boolean true if APC is enabled, false otherwise
-   */
-  public function hasApc() {
-    return $this->data['apc_enabled'];
-  }
-
-  /**
-   * Returns true if Zend OPcache is enabled
-   *
-   * @return Boolean true if Zend OPcache is enabled, false otherwise
-   */
-  public function hasZendOpcache() {
-    return $this->data['zend_opcache_enabled'];
-  }
-
-  /**
-   * Returns true if XCache is enabled.
-   *
-   * @return Boolean true if XCache is enabled, false otherwise
-   */
-  public function hasXCache() {
-    return $this->data['xcache_enabled'];
-  }
-
-  /**
-   * Returns true if WinCache is enabled.
-   *
-   * @return Boolean true if WinCache is enabled, false otherwise
-   */
-  public function hasWinCache() {
-    return $this->data['wincache_enabled'];
-  }
-
-  /**
-   * Returns true if any accelerator is enabled.
-   *
-   * @return Boolean true if any accelerator is enabled, false otherwise
-   */
-  public function hasAccelerator() {
-    return $this->hasApc() || $this->hasZendOpcache() || $this->hasEAccelerator() || $this->hasXCache() || $this->hasWinCache();
-  }
-
-  /**
-   * Gets the PHP SAPI name.
-   *
-   * @return string The environment
-   */
-  public function getSapiName() {
-    return $this->data['sapi_name'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('PHP Config');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('PHP: @version', ['@version' => $this->getPhpVersion()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'php_config';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAMAAAC5xgRsAAAAZlBMVEX///////////////////////////////////////////////////////////////////////////////////////////+ZmZmZmZlISEhJSUmdnZ1HR0fR0dFZWVlpaWlfX18/Pz+puygPAAAAIXRSTlMACwwlJygpLzIzNjs8QEtMUmd6e32AucDBw8fIydTm6u5l8MjvAAAAo0lEQVR42r2P2Q6CMBBFL6XsZRGRfZv//0nbDBNEE19MnJeTc5ILKf58ahiUwzy/AJpIWwREwQnEXRdbGCLjrO+djWRvVMiJcigxB7viGogxDdJpSmHEmCVPS7YczJvgUu+CS30IvtbNYZMvsGVo2mVpG/kbm4auiCpdcC3YPCAhSpAdUzaAn6qPKZtUT6ZSzb4bi2hdo9MQ1nX4ASjfV+/4/Z40pyCHrNTbIgAAAABJRU5ErkJggg==';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/RequestDataCollector.php b/modules/devel/webprofiler/src/DataCollector/RequestDataCollector.php
deleted file mode 100644
index 9de8f49..0000000
--- a/modules/devel/webprofiler/src/DataCollector/RequestDataCollector.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\Controller\ControllerResolverInterface;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector as BaseRequestDataCollector;
-
-/**
- * Integrate _content into the RequestDataCollector
- */
-class RequestDataCollector extends BaseRequestDataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \Drupal\Core\Controller\ControllerResolverInterface
-   */
-  private $controllerResolver;
-
-  /**
-   * @var array
-   */
-  private $accessCheck;
-
-  /**
-   * @param \Drupal\Core\Controller\ControllerResolverInterface $controllerResolver
-   */
-  public function __construct(ControllerResolverInterface $controllerResolver) {
-    parent::__construct();
-
-    $this->controllerResolver = $controllerResolver;
-    $this->accessCheck = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    parent::collect($request, $response, $exception);
-
-    $controller = $this->controllerResolver->getController($request);
-
-    $this->data['controller'] = $this->getMethodData($controller[0], $controller[1]);
-    $this->data['access_check'] = $this->accessCheck;
-  }
-
-  /**
-   * @param $service_id
-   * @param $callable
-   * @param $request
-   */
-  public function addAccessCheck($service_id, $callable, Request $request) {
-    $this->accessCheck[$request->getPathInfo()][] = [
-      'service_id' => $service_id,
-      'callable' => $this->getMethodData($callable[0], $callable[1]),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Request');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->data['status_code'].' '.$this->data['status_text'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAQAAADYBBcfAAACvElEQVR42tVTbUhTYRTerDCnKVoUUr/KCZmypA9Koet0bXNLJ5XazDJ/WFaCUY0pExRZXxYiJgsxWWjkaL+yK+po1gjyR2QfmqWxtBmaBtqWGnabT++c11Fu4l/P4VzOPc95zoHznsNZodIbLDdRcKnc1Bu8DAK45ZsOnykQNMopsNooLxCknb0cDq5vml9FtHiIgpBR0R6iihYyFMTDt2Lg56ObPkI6TMGXSof1EV67IqCwisJSWliFAG/E0CfFIiebdNypcxi/1zgyFiIiZ3sJQr0RQx5frLa6k7SOKRo3oMFNR5t62h2rttKXEOKFqDCxtXNmmBokO2KKTlp3IdWuT2dYRNGKwEXEBCcL172G5FG0aIxC0kR9PBTVH1kkwQn+IqJnCE33EalVzT9GJQS1tAdD3CKicJYFrxqx7W2ejCEdZy1FiC5tZxHhLJKOZaRdQJAyV/YAvDliySALHxmxR4Hqe2iwvaOR/CEuZYJFSgYhVbZRkA8KGdEktrqnqra90NndCdkt77fjIHIhexOrfO6O3bbbOj/rqu5IptgyR3sU93QbOYhquZK4MCDp0Ina/PLsu5JvbCTRaapUdUmIV/RzoMdsk/0hWRNdAvKOmvqlN0drsJbJf1P4YsQ5lGrJeuosiOUgbOC8cto3LfOXTdVd7BqZsQKbse+0jUL6WPcesqs4MNSUTQAxGjwFiC8m3yzmqwHJBWYKBJ9WNqW/dHkpU/osch1Yj5RJfXPfSEe/2UPsN490NPfZG5CKyJmcV5ayHyzy7BMqsXfuHhGK/cjAIeSpR92gehR55D8TcQhDEKJwytBJ4fr4NULvrEM8NszfJPyxDoHYAQ1oPCWmIX4gifmDS/DV2DKeb25FHWr76yEG7/9L4YFPeiQQ4/8LkgJ8Et+NncTCsYqzXAEXa7CWdPZzGWdlyV+vST0JanfPvwAAAABJRU5ErkJggg==';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/RoutingDataCollector.php b/modules/devel/webprofiler/src/DataCollector/RoutingDataCollector.php
deleted file mode 100644
index e892b9a..0000000
--- a/modules/devel/webprofiler/src/DataCollector/RoutingDataCollector.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\Core\Routing\RouteProviderInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Provides a data collector which shows all available routes.
- */
-class RoutingDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * The route profiler.
-   *
-   * @var \Drupal\Core\Routing\RouteProviderInterface
-   */
-  protected $routeProvider;
-
-  /**
-   * Constructs a new RoutingDataCollector.
-   *
-   * @param \Drupal\Core\Routing\RouteProviderInterface $routeProvider
-   *   The route provider.
-   */
-  public function __construct(RouteProviderInterface $routeProvider) {
-    $this->routeProvider = $routeProvider;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $this->data['routing'] = [];
-    foreach ($this->routeProvider->getAllRoutes() as $route_name => $route) {
-      // @TODO Find a better visual representation.
-      $this->data['routing'][] = [
-        'name' => $route_name,
-        'path' => $route->getPath(),
-      ];
-    }
-  }
-
-  /**
-   * @return int
-   */
-  public function getRoutesCount() {
-    return count($this->routing());
-  }
-
-  /**
-   * Twig callback for displaying the routes.
-   */
-  public function routing() {
-    return $this->data['routing'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Routing');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'routing';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Defined routes: @route', ['@route' => $this->getRoutesCount()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAPxJREFUeNrkVsERREAQ7D0koXwlIAISkIGXvwAkoJSfHITg5SMUVR4eMuCxZ1xxV+5uuTL30lV8bPX09PSuFVJKcOOGP+DipLrrusoFdV1Lz/NgmiaKosC0XrAopYT0fc/f/jAMa41Pj23bkrpi9bRpGmRZ9lRKFSzLkl9UHMI4jijLcuaaSZMkQdd1fNMn5r0EHIFhGEjTlDenYRjCcZyHUnqRwXEcz77sYepM+Z1yTOEXZEFVVYcUba2iItsNcbr9IAiw5HMd1CJZtU1VpG3bIooi3gPF933keY43pb9gb1Bskdrap58luMjvRNO04wcK18RfIa59mbgLMAASuWsKAyoEhgAAAABJRU5ErkJggg==';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/ServicesDataCollector.php b/modules/devel/webprofiler/src/DataCollector/ServicesDataCollector.php
deleted file mode 100644
index ef653f8..0000000
--- a/modules/devel/webprofiler/src/DataCollector/ServicesDataCollector.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\webprofiler\DependencyInjection\TraceableContainer;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Class ServicesDataCollector
- */
-class ServicesDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \Symfony\Component\DependencyInjection\ContainerInterface
-   *   $container
-   */
-  private $container;
-
-  /**
-   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
-   */
-  public function __construct(ContainerInterface $container) {
-    $this->container = $container;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    if ($this->getServicesCount()) {
-
-      $tracedData = [];
-      if ($this->container instanceof TraceableContainer) {
-        $tracedData = $this->container->getTracedData();
-      }
-
-      foreach (array_keys($this->getServices()) as $id) {
-        $this->data['services'][$id]['initialized'] = ($this->container->initialized($id)) ? TRUE : FALSE;
-        $this->data['services'][$id]['time'] = isset($tracedData[$id]) ? $tracedData[$id] : NULL;
-      }
-    }
-  }
-
-  /**
-   * @param $services
-   */
-  public function setServices($services) {
-    $this->data['services'] = $services;
-  }
-
-  /**
-   * @return array
-   */
-  public function getServices() {
-    return $this->data['services'];
-  }
-
-  /**
-   * @return int
-   */
-  public function getServicesCount() {
-    return count($this->getServices());
-  }
-
-  /**
-   * @return array
-   */
-  public function getInitializedServices() {
-    return array_filter($this->getServices(), function($item) {
-      return $item['initialized'];
-    });
-  }
-
-  /**
-   * @return int
-   */
-  public function getInitializedServicesCount() {
-    return count($this->getInitializedServices());
-  }
-
-  /**
-   * @return array
-   */
-  public function getInitializedServicesWithoutWebprofiler() {
-    return array_filter($this->getInitializedServices(), function($item) {
-      return strpos($item['value']['id'], 'webprofiler') !== 0;
-    });
-  }
-
-  /**
-   * @return int
-   */
-  public function getInitializedServicesWithoutWebprofilerCount() {
-    return count($this->getInitializedServicesWithoutWebprofiler());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'services';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Services');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Initialized: @count', [
-      '@count' => $this->getInitializedServicesCount(),
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQVJREFUeNrkVe0NgjAQBeMAdYO6AWxQNtANGEFHcALZANyADegGsIFsIBvgu6Q/LtWmxdTEjyYvd6Hw8t5de6TzPCex1yp5w/pz0rVrQymVIXSAACqt9TGG0p0hpHWIZb9lebWENOXn1FgWbL8GJHACNHs+ohyjlxSEZPEcKGYC6SbEvljgUHzEOR3IXiiB6YOTlLqdo1Y54tZHDLIauCHtETtn962P6EUVqhhi0gelIJEEk1MjMg9Py9xol/0SuBqFva/DULY3ZSqQF767v8TyZKv83tFXWVaEufsUG+DCr2nwQLGOlGQNizZPy3fMU16K5uV5+qQEpFTC+hCN9Pd/0XcBBgBxwVqjDkAznAAAAABJRU5ErkJggg==';
-  }
-
-  /**
-   * @return array
-   */
-  public function getData() {
-    $data = $this->data;
-
-    $http_middleware = array_filter($data['services'], function($service) {
-      return isset($service['value']['tags']['http_middleware']);
-    });
-
-    foreach ($http_middleware as &$service) {
-      $service['value']['handle_method'] = $this->getMethodData($service['value']['class'], 'handle');
-    }
-
-    uasort($http_middleware, function ($a, $b) {
-      $va = $a['value']['tags']['http_middleware'][0]['priority'];
-      $vb = $b['value']['tags']['http_middleware'][0]['priority'];
-
-      if ($va == $vb) {
-        return 0;
-      }
-      return ($va > $vb) ? -1 : 1;
-    });
-
-    $data['http_middleware'] = $http_middleware;
-
-    return $data;
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/StateDataCollector.php b/modules/devel/webprofiler/src/DataCollector/StateDataCollector.php
deleted file mode 100644
index 20bab44..0000000
--- a/modules/devel/webprofiler/src/DataCollector/StateDataCollector.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Provides a data collector to get all requested state values.
- */
-class StateDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-  }
-
-  /**
-   * @param $key
-   */
-  public function addState($key) {
-    $this->data['state_get'][$key] = isset($this->data['state_get'][$key]) ? $this->data['state_get'][$key] + 1 : 1;
-  }
-
-  /**
-   * Twig callback to show all requested state keys.
-   */
-  public function getStateKeysCount() {
-    return count($this->data['state_get']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('State');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'state';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Total: @variables', ['@variables' => $this->getStateKeysCount()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo2Njc3QTVERTkxNkMxMUUzQjA3OUEzQTNEMUVGMjVDOCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo2Njc3QTVERjkxNkMxMUUzQjA3OUEzQTNEMUVGMjVDOCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjY2NzdBNURDOTE2QzExRTNCMDc5QTNBM0QxRUYyNUM4IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjY2NzdBNUREOTE2QzExRTNCMDc5QTNBM0QxRUYyNUM4Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+tji6wwAAAUFJREFUeNpi/P//PwO1ARMDDcDQMZSBgZExE4h/AvF/KuA/QFzKCCS+TZ40iVNeXp5i9718+ZIhNS3tL5OoqChVDAQBcXFxBqBZzDQJU0Z2Do7/FubmVDPwzNmzwymdhoSEgDEM8PDwgPkJCQk49bDgMxCkEWQAyKAXL14wXLhwgWHChAlguTVr1pBnKMiwgoICsEEgC+7cuQPGHR0deH3HzMLC0iAjI4NV8tSpUwzv3r1jYGNjY3BycoJbgg88e/6cuIg6cuQImAZ5n2qx7+HhAaZtbGzArqXYUJCBIAwKR1jMq6ioMBgYGJAeURUVFWCNsHAERRAsKYFofJGF01CQIaBktGPHDjANAjU1NWBXg8IWX/gOobz/8+fP7x8/fqSKYV++fGH4+vXrX1B1EgXET6hUnTwH4jTG0Xqf6gAgwABnDJn0eW/JMwAAAABJRU5ErkJggg==';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/ThemeDataCollector.php b/modules/devel/webprofiler/src/DataCollector/ThemeDataCollector.php
deleted file mode 100644
index 717cfdf..0000000
--- a/modules/devel/webprofiler/src/DataCollector/ThemeDataCollector.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\Theme\ThemeManagerInterface;
-use Drupal\Core\Theme\ThemeNegotiatorInterface;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\webprofiler\Theme\ThemeNegotiatorWrapper;
-use Drupal\webprofiler\Twig\Dumper\HtmlDumper;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
-
-/**
- * Class ThemeDataCollector
- */
-class ThemeDataCollector extends DataCollector implements DrupalDataCollectorInterface, LateDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \Drupal\Core\Theme\ThemeManagerInterface
-   */
-  private $themeManager;
-
-  /**
-   * @var \Drupal\Core\Theme\ThemeNegotiatorInterface
-   */
-  private $themeNegotiator;
-
-  /**
-   * @var \Twig_Profiler_Profile
-   */
-  private $profile;
-
-  /**
-   * @var
-   */
-  private $computed;
-
-  /**
-   * @param \Drupal\Core\Theme\ThemeManagerInterface $themeManager
-   * @param \Drupal\Core\Theme\ThemeNegotiatorInterface $themeNegotiator
-   * @param \Twig_Profiler_Profile $profile
-   */
-  public function __construct(ThemeManagerInterface $themeManager, ThemeNegotiatorInterface $themeNegotiator, \Twig_Profiler_Profile $profile) {
-    $this->themeManager = $themeManager;
-    $this->themeNegotiator = $themeNegotiator;
-    $this->profile = $profile;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $activeTheme = $this->themeManager->getActiveTheme();
-
-    $this->data['activeTheme'] = [
-      'name' => $activeTheme->getName(),
-      'path' => $activeTheme->getPath(),
-      'engine' => $activeTheme->getEngine(),
-      'owner' => $activeTheme->getOwner(),
-      'baseThemes' => $activeTheme->getBaseThemes(),
-      'extension' => $activeTheme->getExtension(),
-      'styleSheetsRemove' => $activeTheme->getStyleSheetsRemove(),
-      'libraries' => $activeTheme->getLibraries(),
-      'regions' => $activeTheme->getRegions(),
-    ];
-
-    if ($this->themeNegotiator instanceof ThemeNegotiatorWrapper) {
-      $this->data['negotiator'] = [
-        'class' => $this->getMethodData($this->themeNegotiator->getNegotiator(), 'determineActiveTheme'),
-        'id' => $this->themeNegotiator->getNegotiator()->_serviceId,
-      ];
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function lateCollect() {
-    $this->data['twig'] = serialize($this->profile);
-  }
-
-  /**
-   * @return string
-   */
-  public function getActiveTheme() {
-    return $this->data['activeTheme'];
-  }
-
-  /**
-   * @return array
-   */
-  public function getThemeNegotiator() {
-    return $this->data['negotiator'];
-  }
-
-  /**
-   * @return int
-   */
-  public function getTime() {
-    return $this->getProfile()->getDuration() * 1000;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getTemplateCount() {
-    return $this->getComputedData('template_count');
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getTemplates() {
-    return $this->getComputedData('templates');
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getBlockCount() {
-    return $this->getComputedData('block_count');
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getMacroCount() {
-    return $this->getComputedData('macro_count');
-  }
-
-  /**
-   * @return \Twig_Markup
-   */
-  public function getHtmlCallGraph() {
-    $dumper = new HtmlDumper();
-
-    return new \Twig_Markup($dumper->dump($this->getProfile()), 'UTF-8');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'theme';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Theme');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Name: @name', ['@name' => $this->getActiveTheme()['name']]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAlVJREFUeNrMlk1IVFEUx53K6AOjUBQri6SihQiRziaRQegDlKJFBCpSiZtoE4hWtFFRwcCVBqEWfaAE7SoXajXLQoRcFAUSaBgUJQxKYUrT78D/wevx3psaE7rw49x377ln7vl4500kmUxm/OuxJmMVxrqwzVgsth5xHKogCnthCd7BU7gdj8envOciQe5j8CyiFQq0tAgDsA+OaG0eLmF4INQoxrYg+iEXhqEGiqGBw/3SGUeU6MgC61mBMUU5GzEKJ6ES5S5knbbXui/jmv8MjCkGMxEPFbsFyAeL1y6pXEenSO4fctlIhCXqqtmGj5ADcblZoX1z8aLn/Es475soDhcyfwt3LPDK8jPYFlIcZrCCEH0LqlP7NXN/CCUL/CvmkynKcczPoNv9Y5LXuHVC2Y6mMFoetOG4/0kl9LfDquMyN076ue/I11ANHSqVH0pgLUz7GK2HjUHuf1DGm/jVYZVYJeILz5163oy46Tn/GL5r396yc+hXOzcckiyVQp7CsVNvmI2DHoODcMFcR6eZ+RO4747pJuYjcFilssMM6vB7+Or8IGMWWjDWx7ntzHvglCWZtfbf3n0UtiJ6FVO/8QbuQh+H59C37nUD9sAj1k6ENZQylctuJWsGJswDDibY32C3gitKsCUwyt7nlK0vpMc2Wh/Q4zIcxeDztDu/QjSoPmujzWswZef3GLRXuV2xPa3u/yDwjfoDgxE1nP1aquOG91b64StWlp0xtaKvKbfMUS1maukWvEj7a6pxBg6oL1iddnsbSFox/S/+TKyK0V8CDABrCdI/1oTqiQAAAABJRU5ErkJggg==';
-  }
-
-  /**
-   * @return array
-   */
-  public function getData() {
-    $data = $this->data;
-
-    $data['twig'] = [
-      'callgraph' => (string) $this->getHtmlCallGraph(),
-      'render_time' => $this->getTime(),
-      'template_count' => $this->getTemplateCount(),
-      'templates' => $this->getTemplates(),
-      'block_count' => $this->getBlockCount(),
-      'macro_count' => $this->getMacroCount(),
-    ];
-
-    return $data;
-  }
-
-  /**
-   * @return mixed|\Twig_Profiler_Profile
-   */
-  private function getProfile() {
-    if (NULL === $this->profile) {
-      $this->profile = unserialize($this->data['twig']);
-    }
-
-    return $this->profile;
-  }
-
-  /**
-   * @param $index
-   *
-   * @return mixed
-   */
-  private function getComputedData($index) {
-    if (NULL === $this->computed) {
-      $this->computed = $this->computeData($this->getProfile());
-    }
-
-    return $this->computed[$index];
-  }
-
-  /**
-   * @param \Twig_Profiler_Profile $profile
-   *
-   * @return array
-   */
-  private function computeData(\Twig_Profiler_Profile $profile) {
-    $data = [
-      'template_count' => 0,
-      'block_count' => 0,
-      'macro_count' => 0,
-    ];
-
-    $templates = [];
-    foreach ($profile as $p) {
-      $d = $this->computeData($p);
-
-      $data['template_count'] += ($p->isTemplate() ? 1 : 0) + $d['template_count'];
-      $data['block_count'] += ($p->isBlock() ? 1 : 0) + $d['block_count'];
-      $data['macro_count'] += ($p->isMacro() ? 1 : 0) + $d['macro_count'];
-
-      if ($p->isTemplate()) {
-        if (!isset($templates[$p->getTemplate()])) {
-          $templates[$p->getTemplate()] = 1;
-        }
-        else {
-          $templates[$p->getTemplate()]++;
-        }
-      }
-
-      foreach ($d['templates'] as $template => $count) {
-        if (!isset($templates[$template])) {
-          $templates[$template] = $count;
-        }
-        else {
-          $templates[$template] += $count;
-        }
-      }
-    }
-    $data['templates'] = $templates;
-
-    return $data;
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/TimeDataCollector.php b/modules/devel/webprofiler/src/DataCollector/TimeDataCollector.php
deleted file mode 100644
index d2aa044..0000000
--- a/modules/devel/webprofiler/src/DataCollector/TimeDataCollector.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\TimeDataCollector as BaseTimeDataCollector;
-use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Component\Stopwatch\StopwatchEvent;
-
-/**
- * Class TimeDataCollector.
- */
-class TimeDataCollector extends BaseTimeDataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @param \Symfony\Component\HttpKernel\KernelInterface $kernel
-   * @param $stopwatch
-   */
-  public function __construct(KernelInterface $kernel = NULL, $stopwatch = NULL) {
-    parent::__construct($kernel, $stopwatch);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    parent::collect($request, $response, $exception);
-
-    $this->data['memory_limit'] = $this->convertToBytes(ini_get('memory_limit'));
-    $this->updateMemoryUsage();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function lateCollect() {
-    parent::lateCollect();
-
-    $this->updateMemoryUsage();
-  }
-
-  /**
-   * Gets the memory.
-   *
-   * @return int
-   *   The memory
-   */
-  public function getMemory() {
-    return $this->data['memory'];
-  }
-
-  /**
-   * Gets the PHP memory limit.
-   *
-   * @return int
-   *   The memory limit
-   */
-  public function getMemoryLimit() {
-    return $this->data['memory_limit'];
-  }
-
-  /**
-   * Updates the memory usage data.
-   */
-  public function updateMemoryUsage() {
-    $this->data['memory'] = memory_get_peak_usage(TRUE);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Timeline');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Duration: @duration', ['@duration' => sprintf('%.0f ms', $this->getDuration())]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAcCAYAAABoMT8aAAABqUlEQVR42t2Vv0sCYRyHX9OmEhsMx/YKGlwLQ69DTEUSBJEQEy5J3FRc/BsuiFqEIIcQIRo6ysUhoaBBWhoaGoJwiMJLglRKrs8bXgienmkQdPDAwX2f57j3fhFJkkbiPwTK5bIiFoul3kmPud8MqKMewDXpwuGww+12n9hsNhFnlijYf/Z4PDmO45Yxo+10ZFGTyWRMEItU6AdCx7lczkgd6n7J2Wx2xm63P6jJMk6n80YQBBN1aUDv9XqvlAbbm2LE7/cLODRB0un0VveAeoDC8/waCQQC18MGQqHQOcEKvw8bcLlcL6TfYnVtCrGRAlartUUYhmn1jKg/E3USjUYfhw3E4/F7ks/nz4YNFIvFQ/ogbUYikdefyqlU6gnuOg2YK5XKvs/n+xhUDgaDTVEUt+HO04ABOBA5isViDTU5kUi81Wq1AzhWMEkDGmAEq2C3UCjcYXGauDvfEsuyUjKZbJRKpVvM8IABU9SVX+cxYABmwIE9cFqtVi9xtgvsC2AHbIAFoKey0gdlHEyDObAEWLACFsEsMALdIJ80+dK0bTS95v7+v/AJnis0eO906QwAAAAASUVORK5CYII=';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLibraries() {
-    return [
-      'webprofiler/timeline',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDrupalSettings() {
-    /** @var StopwatchEvent[] $collectedEvents */
-    $collectedEvents = $this->getEvents();
-
-    if (!empty($collectedEvents)) {
-      $sectionPeriods = $collectedEvents['__section__']->getPeriods();
-      $endTime = end($sectionPeriods)->getEndTime();
-      $events = [];
-
-      foreach ($collectedEvents as $key => $collectedEvent) {
-        if ('__section__' != $key) {
-          $periods = [];
-          foreach ($collectedEvent->getPeriods() as $period) {
-            $periods[] = [
-              'start' => sprintf("%F", $period->getStartTime()),
-              'end' => sprintf("%F", $period->getEndTime()),
-            ];
-          }
-
-          $events[] = [
-            "name" => $key,
-            "category" => $collectedEvent->getCategory(),
-            "origin" => sprintf("%F", $collectedEvent->getOrigin()),
-            "starttime" => sprintf("%F", $collectedEvent->getStartTime()),
-            "endtime" => sprintf("%F", $collectedEvent->getEndTime()),
-            "duration" => sprintf("%F", $collectedEvent->getDuration()),
-            "memory" => sprintf("%.1F", $collectedEvent->getMemory() / 1024 / 1024),
-            "periods" => $periods,
-          ];
-        }
-      }
-
-      return ['time' => ['events' => $events, 'endtime' => $endTime]];
-    }
-    else {
-      return ['time' => ['events' => [], 'endtime' => 0]];
-    }
-  }
-
-  /**
-   * @return array
-   */
-  public function getData() {
-    $data = $this->data;
-
-    $data['duration'] = $this->getDuration();
-    $data['initTime'] = $this->getInitTime();
-
-    return $data;
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/TranslationsDataCollector.php b/modules/devel/webprofiler/src/DataCollector/TranslationsDataCollector.php
deleted file mode 100644
index 23b49ea..0000000
--- a/modules/devel/webprofiler/src/DataCollector/TranslationsDataCollector.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\Routing\UrlGeneratorInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\webprofiler\StringTranslation\TranslationManagerWrapper;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Class TranslationsDataCollector
- */
-class TranslationsDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \Drupal\Core\StringTranslation\TranslationInterface
-   */
-  private $translation;
-
-  /**
-   * @var \Drupal\Core\Routing\UrlGeneratorInterface
-   */
-  private $urlGenerator;
-
-  /**
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $translation
-   * @param \Drupal\Core\Routing\UrlGeneratorInterface $urlGenerator
-   */
-  public function __construct(TranslationInterface $translation, UrlGeneratorInterface $urlGenerator) {
-    $this->translation = $translation;
-    $this->urlGenerator = $urlGenerator;
-
-    $this->data['translations']['translated'] = [];
-    $this->data['translations']['untranslated'] = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    if($this->translation instanceof TranslationManagerWrapper) {
-      /** \Drupal\webprofiler\StringTranslation\TranslationManagerWrapper $this->translation */
-      $this->data['translations']['translated'] = $this->translation->getTranslated();
-      $this->data['translations']['untranslated'] = $this->translation->getUntranslated();
-    }
-    $this->data['user_interface_translations_path'] = $this->urlGenerator->generateFromRoute('locale.translate_page');
-  }
-
-  /**
-   * @return int
-   */
-  public function getTranslatedCount() {
-    return count($this->data['translations']['translated']);
-  }
-
-  /**
-   * @return int
-   */
-  public function getUntranslatedCount() {
-    return count($this->data['translations']['untranslated']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'translations';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Translations');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Translated: @translated, untranslated: @untranslated', [
-      '@translated' => $this->getTranslatedCount(),
-      '@untranslated' => $this->getUntranslatedCount()
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAgpJREFUeNrUVrFuwjAQPUcZiAQDQ6WEbgwwMCJVqhjgBxhYGSvEDzBkZYSBH+ADoFJHlg4MdIMKxiLBXKAbUmEm9bPiyAREEgRDTzqZ2Mfzu7tnJ8xxHLq1aXQHuwsos2078p9arVYg0yL3CXcnwCdubKDp3F+5myFin9xYK0xNzQiZm1c3KpVKUb1ep2QyebvuFwoFSqfTlM/nbweay+VoOBxeDar7JwC03W49UO5fs9nsZTwef8qYUqkUjSmAYrGYqKlhGFSpVH45oBFFdkdM0RjUst1uC7Z45ofjWdO0t8Ph8CDjyuUyZTIZ6na7tNvtTmSn+2s5n88FIMwdPzhgUWYBA2A2mxVjIpEQarEsiwaDAS2XSxPH9OI1xVNnbmo0Go28eTDkAOL3YrGg/X4v1tfr9WmjLplsULVaFawbjYbHkjfzqPsr7o9RwJE2HOkifbAGS1ljdL/G/ScsWK/XE+NmsxGMkW6/3xfgWMMIpu9hLgkEN5tNDwClgAoADjAYRszr8m7kD2gGU5uh1hEjmoGUUU/oGLVEXaVhA2yoKYAwRwFx/Ezj8bjHEIYaSgVgDptNp1NiePG5QCfS4qyZXANop9MR7JANWAFA6hWgWEcmqqTYOWBVl0jZf0ViU+hUNk0AyVf0ObYK0+8IslupF8qlkxVWdoipsaCPiaBr7uwr+t98ofwJMADuIP9IDjFbLwAAAABJRU5ErkJggg==';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/UserDataCollector.php b/modules/devel/webprofiler/src/DataCollector/UserDataCollector.php
deleted file mode 100644
index e2b7a10..0000000
--- a/modules/devel/webprofiler/src/DataCollector/UserDataCollector.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\Authentication\AuthenticationCollectorInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Class UserDataCollector
- */
-class UserDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  private $currentUser;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  private $entityManager;
-
-  /**
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  private $configFactory;
-
-  /**
-   * @var \Drupal\Core\Authentication\AuthenticationCollectorInterface
-   */
-  private $providerCollector;
-
-  /**
-   * @param \Drupal\Core\Session\AccountInterface $currentUser
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entityManager
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
-   * @param \Drupal\Core\Authentication\AuthenticationCollectorInterface $providerCollector
-   */
-  public function __construct(AccountInterface $currentUser, EntityManagerInterface $entityManager, ConfigFactoryInterface $configFactory, AuthenticationCollectorInterface $providerCollector) {
-    $this->currentUser = $currentUser;
-    $this->entityManager = $entityManager;
-    $this->configFactory = $configFactory;
-    $this->providerCollector = $providerCollector;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $this->data['name'] = $this->currentUser->getDisplayName();
-    $this->data['authenticated'] = $this->currentUser->isAuthenticated();
-
-    $this->data['roles'] = [];
-    $storage = $this->entityManager->getStorage('user_role');
-    foreach ($this->currentUser->getRoles() as $role) {
-      $entity = $storage->load($role);
-      $this->data['roles'][] = $entity->label();
-    }
-
-    foreach ($this->providerCollector->getSortedProviders() as $provider_id => $provider) {
-      if ($provider->applies($request)) {
-        $this->data['provider'] = $provider_id;
-      }
-    }
-
-    $this->data['anonymous'] = $this->configFactory->get('user.settings')
-      ->get('anonymous');
-  }
-
-  /**
-   * @return \Drupal\Core\Session\AccountInterface
-   */
-  public function getUserName() {
-    return $this->data['name'];
-  }
-
-  /**
-   * @return bool
-   */
-  public function getAuthenticated() {
-    return $this->data['authenticated'];
-  }
-
-  /**
-   * @return array
-   */
-  public function getRoles() {
-    return $this->data['roles'];
-  }
-
-  /**
-   * @return string
-   */
-  public function getProvider() {
-    return $this->data['provider'];
-  }
-
-  /**
-   * @return string
-   */
-  public function getAnonymous() {
-    return $this->data['anonymous'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'user';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('User');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->getUserName();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABgAAAAcCAYAAAB75n/uAAAC70lEQVR42u2V3UtTYRzHu+mFwCwK+gO6CEryPlg7yiYx50vDqUwjFIZDSYUk2ZTmCysHvg9ZVggOQZiRScsR4VwXTjEwdKZWk8o6gd5UOt0mbev7g/PAkLONIOkiBx+25/v89vuc85zn2Q5Fo9F95UDwnwhS5HK5TyqVRv8m1JN6k+AiC+fn54cwbgFNIrTQ/J9IqDcJJDGBHsgDgYBSq9W6ysvLPf39/SSUUU7zsQ1yc3MjmN90OBzfRkZG1umzQqGIxPSTkIBjgdDkaGNjoza2kcFgUCE/QvMsq6io2PV6vQu1tbV8Xl7etkql2qqvr/+MbDE/Pz8s9OP2Cjhwwmw29+4R3Kec1WZnZ4fn5uamc3Jyttra2qbH8ero6JgdHh5+CvFHq9X6JZHgzODgoCVW0NPTY0N+ltU2Nzdv4GqXsYSrPp+vDw80aLFYxru6uhyQ/rDb7a8TCVJDodB1jUazTVlxcXGQ5/mbyE+z2u7u7veY38BVT3Z2djopm5qa6isrK/tQWVn5qb29fSGR4DC4PDAwMEsZHuArjGnyGKutq6v7ajQaF6urq9/MzMz0QuSemJiwQDwGkR0POhhXgILjNTU1TaWlpTxlOp1uyWQyaUjMajMzM8Nut/tJQUHBOpZppbCwkM/KytrBznuL9xDVxBMo8KXHYnu6qKjIivmrbIy67x6Px4Yd58W672ApfzY0NCyNjo7OZmRkiAv8fr+O47iwmABXtoXaG3uykF6vX7bZbF6cgZWqqiqezYkKcNtmjO+CF2AyhufgjsvlMiU7vXEF+4C4ALf9CwdrlVAqlcFkTdRqdQSHLUDgBEeSCrArAsiGwENs0XfJBE6ncxm1D8Aj/B6tigkkJSUlmxSwLYhMDeRsyyUCd+lHrWxtbe2aTCbbZTn1ZD92F0Cr8GBfgnsgDZwDt8EzMBmHMXBLqD0PDMAh9Gql3iRIESQSIAXp4CRIBZeEjIvDFZAm1J4C6UK9ROiZcvCn/+8FvwHtDdJEaRY+oQAAAABJRU5ErkJggg==';
-  }
-}
diff --git a/modules/devel/webprofiler/src/DataCollector/ViewsDataCollector.php b/modules/devel/webprofiler/src/DataCollector/ViewsDataCollector.php
deleted file mode 100644
index 64706f7..0000000
--- a/modules/devel/webprofiler/src/DataCollector/ViewsDataCollector.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DataCollector;
-
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\webprofiler\DrupalDataCollectorInterface;
-use Drupal\webprofiler\Views\TraceableViewExecutable;
-use Drupal\webprofiler\Views\ViewExecutableFactoryWrapper;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-
-/**
- * Collects data about rendered views.
- */
-class ViewsDataCollector extends DataCollector implements DrupalDataCollectorInterface {
-
-  use StringTranslationTrait, DrupalDataCollectorTrait;
-
-  /**
-   * @var \Drupal\webprofiler\Views\ViewExecutableFactoryWrapper
-   */
-  private $view_executable_factory;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  private $entityManager;
-
-  /**
-   * @param ViewExecutableFactoryWrapper $view_executable_factory
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entityManager
-   */
-  public function __construct(ViewExecutableFactoryWrapper $view_executable_factory, EntityManagerInterface $entityManager) {
-    $this->entityManager = $entityManager;
-    $this->view_executable_factory = $view_executable_factory;
-
-    $this->data['views'] = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function collect(Request $request, Response $response, \Exception $exception = NULL) {
-    $views = $this->view_executable_factory->getViews();
-    $storage = $this->entityManager->getStorage('view');
-
-    /** @var TraceableViewExecutable $view */
-    foreach ($views as $view) {
-      if ($view->executed) {
-        $data = [
-          'id' => $view->storage->id(),
-          'current_display' => $view->current_display,
-          'build_time' => $view->getBuildTime(),
-          'execute_time' => $view->getExecuteTime(),
-          'render_time' => $view->getRenderTime(),
-        ];
-
-        $entity = $storage->load($view->storage->id());
-        if ($entity->hasLinkTemplate('edit-display-form')) {
-          $route = $entity->toUrl('edit-display-form');
-          $route->setRouteParameter('display_id', $view->current_display);
-          $data['route'] = $route->toString();
-        }
-
-        $this->data['views'][] = $data;
-      }
-    }
-
-//    TODO: also use those data.
-//    $loaded = $this->entityManager->getLoaded('view');
-//
-//    if ($loaded) {
-//      /** @var \Drupal\webprofiler\Entity\EntityStorageDecorator $views */
-//      foreach ($loaded->getEntities() as $views) {
-//        $this->data['views'][] = array(
-//          'id' => $views->get('id'),
-//        );
-//      }
-//    }
-  }
-
-  /**
-   * @return int
-   */
-  public function getViewsCount() {
-    return count($this->data['views']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'views';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return $this->t('Views');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPanelSummary() {
-    return $this->t('Total: @count', ['@count' => $this->getViewsCount()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIcon() {
-    return 'iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowNDgwMTE3NDA3MjA2ODExOEY2MkNCNjI0NDY3NzkwRCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozNEVFREM2NkQ4MUMxMUUzQkMwRUNBMkQwMzE4QjVBMyIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozNEVFREM2NUQ4MUMxMUUzQkMwRUNBMkQwMzE4QjVBMyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1LjEgTWFjaW50b3NoIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDQ4MDExNzQwNzIwNjgxMThGNjJDQjYyNDQ2Nzc5MEQiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDQ4MDExNzQwNzIwNjgxMThGNjJDQjYyNDQ2Nzc5MEQiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6vqYfFAAAAXUlEQVR42mL8//8/A7UBEwMNwKih1AcsIGLz5s1USwK+vr6MLMgcSg2EOW6IhSkycHR0BHth//79jMh8fACmlr4uRbcVnT8apqNhOhqmAxZR1CyoGUfrfaoDgAADAA4QNs9x67RnAAAAAElFTkSuQmCC';
-  }
-}
diff --git a/modules/devel/webprofiler/src/Decorator.php b/modules/devel/webprofiler/src/Decorator.php
deleted file mode 100644
index 270117d..0000000
--- a/modules/devel/webprofiler/src/Decorator.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler;
-
-/**
- * Generic class Decorator.
- */
-class Decorator {
-
-  /**
-   * @var
-   */
-  protected $object;
-
-  /**
-   * Class constructor.
-   *
-   * @param object $object
-   *   The object to decorate.
-   */
-  public function __construct($object) {
-    $this->object = $object;
-  }
-
-  /**
-   * Return the original (i.e. non decorated) object.
-   *
-   * @return mixed
-   *   The original object.
-   */
-  public function getOriginalObject() {
-    $object = $this->object;
-    while ($object instanceof Decorator) {
-      $object = $object->getOriginalObject();
-    }
-    return $object;
-  }
-
-  /**
-   * Returns true if $method is a PHP callable.
-   *
-   * @param string $method
-   *   The method name.
-   * @param bool $checkSelf
-   *
-   * @return bool|mixed
-   */
-  public function isCallable($method, $checkSelf = FALSE) {
-    //Check the original object
-    $object = $this->getOriginalObject();
-    if (is_callable([$object, $method])) {
-      return $object;
-    }
-    // Check Decorators.
-    $object = $checkSelf ? $this : $this->object;
-    while ($object instanceof Decorator) {
-      if (is_callable([$object, $method])) {
-        return $object;
-      }
-      $object = $this->object;
-    }
-    return FALSE;
-  }
-
-  /**
-   * @param $method
-   * @param $args
-   *
-   * @return mixed
-   *
-   * @throws \Exception
-   */
-  public function __call($method, $args) {
-    if ($object = $this->isCallable($method)) {
-      return call_user_func_array([$object, $method], $args);
-    }
-    throw new \Exception(
-      'Undefined method - ' . get_class($this->getOriginalObject()) . '::' . $method
-    );
-  }
-
-  /**
-   * @param $property
-   *
-   * @return null
-   */
-  public function __get($property) {
-    $object = $this->getOriginalObject();
-    if (property_exists($object, $property)) {
-      return $object->$property;
-    }
-    return NULL;
-  }
-}
diff --git a/modules/devel/webprofiler/src/DependencyInjection/TraceableContainer.php b/modules/devel/webprofiler/src/DependencyInjection/TraceableContainer.php
deleted file mode 100644
index adea886..0000000
--- a/modules/devel/webprofiler/src/DependencyInjection/TraceableContainer.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\DependencyInjection;
-
-use Drupal\Component\Utility\Timer;
-use Drupal\Core\DependencyInjection\Container;
-
-/**
- * Extends the Drupal container class to trace service instantiations.
- */
-class TraceableContainer extends Container {
-
-  /**
-   * @var array
-   */
-  protected $tracedData;
-
-  /**
-   * @var \Symfony\Component\Stopwatch\Stopwatch
-   */
-  private $stopwatch = NULL;
-
-  /**
-   * @var bool
-   */
-  private $hasStopwatch = FALSE;
-
-  /**
-   * @param string $id
-   * @param int $invalidBehavior
-   *
-   * @return object
-   */
-  public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE) {
-    if (!$this->stopwatch && $this->has('stopwatch')) {
-      $this->stopwatch = parent::get('stopwatch');
-      $this->stopwatch->openSection();
-      $this->hasStopwatch = TRUE;
-    }
-
-    if ('stopwatch' === $id) {
-      return $this->stopwatch;
-    }
-
-    Timer::start($id);
-    if ($this->hasStopwatch) {
-      $e = $this->stopwatch->start($id, 'service');
-    }
-
-    $service = parent::get($id, $invalidBehavior);
-
-    $this->tracedData[$id] = Timer::stop($id);
-    if ($this->hasStopwatch && $e->isStarted()) {
-      $e->stop();
-    }
-
-    return $service;
-  }
-
-  /**
-   * @return array
-   */
-  public function getTracedData() {
-    return $this->tracedData;
-  }
-}
diff --git a/modules/devel/webprofiler/src/DrupalDataCollectorInterface.php b/modules/devel/webprofiler/src/DrupalDataCollectorInterface.php
deleted file mode 100644
index 8a02b35..0000000
--- a/modules/devel/webprofiler/src/DrupalDataCollectorInterface.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler;
-
-/**
- * Interface DrupalDataCollectorInterface.
- */
-interface DrupalDataCollectorInterface {
-
-  /**
-   * Returns the datacollector title.
-   *
-   * @return string
-   *   The datacollector title.
-   */
-  public function getTitle();
-
-  /**
-   * Returns the name of the collector.
-   *
-   * @return string
-   *   The collector name.
-   */
-  public function getName();
-
-  /**
-   * Returns the string used in vertical tab summary.
-   *
-   * @return string
-   *   The panel summary.
-   */
-  public function getPanelSummary();
-
-  /**
-   * Returns the collector icon in base64 format.
-   *
-   * @return string
-   *   The collector icon.
-   */
-  public function getIcon();
-
-  /**
-   * Returns true if this datacollector has a detail panel.
-   *
-   * @return bool
-   *   True if datacollector has a detail panel, false otherwise.
-   */
-  public function hasPanel();
-
-  /**
-   * Returns the libraries needed in detail panel.
-   *
-   * @return array
-   *   The render array for detail panel.
-   */
-  public function getLibraries();
-
-  /**
-   * @return array
-   */
-  public function getDrupalSettings();
-
-  /**
-   * @return mixed
-   */
-  public function getData();
-}
diff --git a/modules/devel/webprofiler/src/Entity/Decorators/Config/ConfigEntityStorageDecorator.php b/modules/devel/webprofiler/src/Entity/Decorators/Config/ConfigEntityStorageDecorator.php
deleted file mode 100644
index b9a06f5..0000000
--- a/modules/devel/webprofiler/src/Entity/Decorators/Config/ConfigEntityStorageDecorator.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Entity\Decorators\Config;
-
-use Drupal\Core\Config\Config;
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-use Drupal\Core\Config\Entity\ConfigEntityStorageInterface;
-use Drupal\Core\Config\Entity\ImportableEntityStorageInterface;
-use Drupal\Core\Entity\EntityHandlerInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\webprofiler\Entity\EntityDecorator;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Class ConfigEntityStorageDecorator
- */
-class ConfigEntityStorageDecorator extends EntityDecorator implements ConfigEntityStorageInterface, ImportableEntityStorageInterface, EntityHandlerInterface {
-
-  /**
-   * @param ConfigEntityStorageInterface $controller
-   */
-  public function __construct(ConfigEntityStorageInterface $controller) {
-    parent::__construct($controller);
-
-    $this->entities = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resetCache(array $ids = NULL) {
-    $this->getOriginalObject()->resetCache($ids);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function loadMultiple(array $ids = NULL) {
-    $entities = $this->getOriginalObject()->loadMultiple($ids);
-
-    $this->entities = array_merge($this->entities, $entities);
-
-    return $entities;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function load($id) {
-    $entity = $this->getOriginalObject()->load($id);
-
-    $this->entities[$id] = $entity;
-
-    return $entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function loadUnchanged($id) {
-    return $this->getOriginalObject()->loadUnchanged($id);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function loadRevision($revision_id) {
-    return $this->getOriginalObject()->loadRevision($revision_id);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteRevision($revision_id) {
-    $this->getOriginalObject()->deleteRevision($revision_id);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function loadByProperties(array $values = []) {
-    $entities = $this->getOriginalObject()->loadByProperties($values);
-
-    $this->entities = array_merge($this->entities, $entities);
-
-    return $entities;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function create(array $values = []) {
-    return $this->getOriginalObject()->create($values);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function delete(array $entities) {
-    $this->getOriginalObject()->delete($entities);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(EntityInterface $entity) {
-    return $this->getOriginalObject()->save($entity);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasData() {
-    return $this->getOriginalObject()->hasData();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuery($conjunction = 'AND') {
-    return $this->getOriginalObject()->getQuery($conjunction);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntityTypeId() {
-    return $this->getOriginalObject()->getEntityTypeId();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntityType() {
-    return $this->getOriginalObject()->getEntityType();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getIDFromConfigName($config_name, $config_prefix) {
-    return substr($config_name, strlen($config_prefix . '.'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createFromStorageRecord(array $values) {
-    return $this->getOriginalObject()->createFromStorageRecord($values);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function updateFromStorageRecord(ConfigEntityInterface $entity, array $values) {
-    return $this->getOriginalObject()
-      ->updateFromStorageRecord($entity, $values);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAggregateQuery($conjunction = 'AND') {
-    return $this->getOriginalObject()->getAggregateQuery($conjunction);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function loadOverrideFree($id) {
-    return $this->getOriginalObject()->loadOverrideFree($id);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function loadMultipleOverrideFree(array $ids = NULL) {
-    return $this->getOriginalObject()->loadMultipleOverrideFree($ids);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function importCreate($name, Config $new_config, Config $old_config) {
-    $this->getOriginalObject()->importCreate($name, $new_config, $old_config);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function importUpdate($name, Config $new_config, Config $old_config) {
-    $this->getOriginalObject()->importUpdate($name, $new_config, $old_config);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function importDelete($name, Config $new_config, Config $old_config) {
-    $this->getOriginalObject()->importDelete($name, $new_config, $old_config);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function importRename($old_name, Config $new_config, Config $old_config) {
-    $this->getOriginalObject()->importRename($old_name, $new_config, $old_config);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
-      $entity_type,
-      $container->get('config.factory'),
-      $container->get('uuid'),
-      $container->get('language_manager')
-    );
-  }
-}
diff --git a/modules/devel/webprofiler/src/Entity/Decorators/Config/RoleStorageDecorator.php b/modules/devel/webprofiler/src/Entity/Decorators/Config/RoleStorageDecorator.php
deleted file mode 100644
index ede1e50..0000000
--- a/modules/devel/webprofiler/src/Entity/Decorators/Config/RoleStorageDecorator.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Entity\Decorators\Config;
-
-use Drupal\user\RoleStorageInterface;
-
-/**
- * Class RoleStorageDecorator
- */
-class RoleStorageDecorator extends ConfigEntityStorageDecorator implements RoleStorageInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isPermissionInRoles($permission, array $rids) {
-    return $this->getOriginalObject()->isPermissionInRoles($permission, $rids);
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Entity/Decorators/Config/ShortcutSetStorageDecorator.php b/modules/devel/webprofiler/src/Entity/Decorators/Config/ShortcutSetStorageDecorator.php
deleted file mode 100644
index 7248ba1..0000000
--- a/modules/devel/webprofiler/src/Entity/Decorators/Config/ShortcutSetStorageDecorator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Entity\Decorators\Config;
-
-use Drupal\Core\Session\AccountInterface;
-use Drupal\shortcut\ShortcutSetInterface;
-use Drupal\shortcut\ShortcutSetStorageInterface;
-
-/**
- * Class ShortcutSetStorageDecorator
- */
-class ShortcutSetStorageDecorator extends ConfigEntityStorageDecorator implements ShortcutSetStorageInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assignUser(ShortcutSetInterface $shortcut_set, $account) {
-    $this->getOriginalObject()->assignUser($shortcut_set, $account);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function unassignUser($account) {
-    return $this->getOriginalObject()->unassignUser($account);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteAssignedShortcutSets(ShortcutSetInterface $entity) {
-    $this->getOriginalObject()->deleteAssignedShortcutSets($entity);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAssignedToUser($account) {
-    return $this->getOriginalObject()->getAssignedToUser($account);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function countAssignedUsers(ShortcutSetInterface $shortcut_set) {
-    return $this->getOriginalObject()->countAssignedUsers($shortcut_set);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefaultSet(AccountInterface $account) {
-    return $this->getOriginalObject()->getDefaultSet($account);
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Entity/Decorators/Config/VocabularyStorageDecorator.php b/modules/devel/webprofiler/src/Entity/Decorators/Config/VocabularyStorageDecorator.php
deleted file mode 100644
index 6c40134..0000000
--- a/modules/devel/webprofiler/src/Entity/Decorators/Config/VocabularyStorageDecorator.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Entity\Decorators\Config;
-
-use Drupal\taxonomy\VocabularyStorageInterface;
-
-/**
- * Class EntityStorageDecorator
- */
-class VocabularyStorageDecorator extends ConfigEntityStorageDecorator implements VocabularyStorageInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getToplevelTids($vids) {
-    $this->getOriginalObject()->getToplevelTids($vids);
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Entity/EntityDecorator.php b/modules/devel/webprofiler/src/Entity/EntityDecorator.php
deleted file mode 100644
index 3ec186d..0000000
--- a/modules/devel/webprofiler/src/Entity/EntityDecorator.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Entity;
-
-use Drupal\webprofiler\Decorator;
-
-/**
- * Class EntityDecorator
- */
-class EntityDecorator extends Decorator {
-
-  /**
-   * @var array
-   */
-  protected $entities;
-
-  /**
-   * @return mixed
-   */
-  public function getEntities() {
-    return $this->entities;
-  }
-  
-}
diff --git a/modules/devel/webprofiler/src/Entity/EntityManagerWrapper.php b/modules/devel/webprofiler/src/Entity/EntityManagerWrapper.php
deleted file mode 100644
index c6381a0..0000000
--- a/modules/devel/webprofiler/src/Entity/EntityManagerWrapper.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityStorageInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\EntityViewBuilderInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\webprofiler\Entity\Decorators\Config\ConfigEntityStorageDecorator;
-use Drupal\webprofiler\Entity\Decorators\Config\RoleStorageDecorator;
-use Drupal\webprofiler\Entity\Decorators\Config\ShortcutSetStorageDecorator;
-use Drupal\webprofiler\Entity\Decorators\Config\VocabularyStorageDecorator;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Class EntityManagerWrapper
- */
-class EntityManagerWrapper extends DefaultPluginManager implements EntityTypeManagerInterface, ContainerAwareInterface {
-
-  /**
-   * @var array
-   */
-  private $loaded;
-
-  /**
-   * @var array
-   */
-  private $rendered;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  private $entityManager;
-
-  /**
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityManager
-   */
-  public function __construct(EntityTypeManagerInterface $entityManager) {
-    $this->entityManager = $entityManager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getStorage($entity_type) {
-    /** @var ConfigEntityStorageInterface $handler */
-    $handler = $this->getHandler($entity_type, 'storage');
-    $type = ($handler instanceof ConfigEntityStorageInterface) ? 'config' : 'content';
-
-    if (!isset($this->loaded[$type][$entity_type])) {
-      $handler = $this->getStorageDecorator($entity_type, $handler);
-      $this->loaded[$type][$entity_type] = $handler;
-    }
-    else {
-      $handler = $this->loaded[$type][$entity_type];
-    }
-
-    return $handler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getViewBuilder($entity_type) {
-    /** @var EntityViewBuilderInterface $handler */
-    $handler = $this->getHandler($entity_type, 'view_builder');
-
-    if ($handler instanceof EntityViewBuilderInterface) {
-      if (!isset($this->rendered[$entity_type])) {
-        $handler = new EntityViewBuilderDecorator($handler);
-        $this->rendered[$entity_type] = $handler;
-      }
-      else {
-        $handler = $this->rendered[$entity_type];
-      }
-    }
-
-    return $handler;
-  }
-
-  /**
-   * @param $entity_type
-   * @param $handler
-   *
-   * @return \Drupal\webprofiler\Entity\EntityDecorator
-   */
-  private function getStorageDecorator($entity_type, $handler) {
-    if ($handler instanceof ConfigEntityStorageInterface) {
-      switch ($entity_type) {
-        case 'taxonomy_vocabulary':
-          return new VocabularyStorageDecorator($handler);
-          break;
-        case 'user_role':
-          return new RoleStorageDecorator($handler);
-          break;
-        case 'shortcut_set':
-          return new ShortcutSetStorageDecorator($handler);
-          break;
-        default:
-          return new ConfigEntityStorageDecorator($handler);
-          break;
-      }
-    }
-    return $handler;
-  }
-
-  /**
-   * @param $type
-   * @param $entity_type
-   *
-   * @return array
-   */
-  public function getLoaded($type, $entity_type) {
-    return isset($this->loaded[$type][$entity_type]) ? $this->loaded[$type][$entity_type] : NULL;
-  }
-
-  /**
-   * @param $entity_type
-   *
-   * @return array
-   */
-  public function getRendered( $entity_type) {
-    return isset($this->rendered[$entity_type]) ? $this->rendered[$entity_type] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function useCaches($use_caches = FALSE) {
-    $this->entityManager->useCaches($use_caches);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasDefinition($plugin_id) {
-    return $this->entityManager->hasDefinition($plugin_id);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAccessControlHandler($entity_type) {
-    return $this->entityManager->getAccessControlHandler($entity_type);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function clearCachedDefinitions() {
-    $this->entityManager->clearCachedDefinitions();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getListBuilder($entity_type) {
-    return $this->entityManager->getListBuilder($entity_type);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormObject($entity_type, $operation) {
-    return $this->entityManager->getFormObject($entity_type, $operation);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRouteProviders($entity_type) {
-    return $this->entityManager->getRouteProviders($entity_type);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasHandler($entity_type, $handler_type) {
-    return $this->entityManager->hasHandler($entity_type, $handler_type);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getHandler($entity_type, $handler_type) {
-    return $this->entityManager->getHandler($entity_type, $handler_type);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createHandlerInstance(
-    $class,
-    EntityTypeInterface $definition = NULL
-  ) {
-    return $this->entityManager->createHandlerInstance($class, $definition);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefinition($entity_type_id, $exception_on_invalid = TRUE) {
-    return $this->entityManager->getDefinition(
-      $entity_type_id,
-      $exception_on_invalid
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefinitions() {
-    return $this->entityManager->getDefinitions();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createInstance($plugin_id, array $configuration = []) {
-    return $this->entityManager->createInstance($plugin_id, $configuration);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getInstance(array $options) {
-    return $this->entityManager->getInstance($options);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setContainer(ContainerInterface $container = NULL) {
-    $this->entityManager->setContainer($container);
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Entity/EntityViewBuilderDecorator.php b/modules/devel/webprofiler/src/Entity/EntityViewBuilderDecorator.php
deleted file mode 100644
index 0b201ac..0000000
--- a/modules/devel/webprofiler/src/Entity/EntityViewBuilderDecorator.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Entity;
-
-use Drupal\Core\Entity\EntityHandlerInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\EntityViewBuilderInterface;
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Class EntityViewBuilderDecorator
- */
-class EntityViewBuilderDecorator extends EntityDecorator implements EntityHandlerInterface, EntityViewBuilderInterface {
-
-  /**
-   * @param EntityViewBuilderInterface $controller
-   */
-  public function __construct(EntityViewBuilderInterface $controller) {
-    parent::__construct($controller);
-
-    $this->entities = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildComponents(array &$build, array $entities, array $displays, $view_mode, $langcode = NULL) {
-    $this->getOriginalObject()
-      ->buildComponents($build, $entities, $displays, $view_mode, $langcode);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function view(EntityInterface $entity, $view_mode = 'full', $langcode = NULL) {
-    $this->entities[] = $entity;
-
-    return $this->getOriginalObject()->view($entity, $view_mode, $langcode);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function viewMultiple(array $entities = [], $view_mode = 'full', $langcode = NULL) {
-    $this->entities = array_merge($this->entities, $entities);
-
-    return $this->getOriginalObject()
-      ->viewMultiple($entities, $view_mode, $langcode);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resetCache(array $entities = NULL) {
-    $this->getOriginalObject()->resetCache($entities);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function viewField(FieldItemListInterface $items, $display_options = []) {
-    return $this->getOriginalObject()->viewField($items, $display_options);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function viewFieldItem(FieldItemInterface $item, $display_options = []) {
-    return $this->getOriginalObject()->viewFieldItem($item, $display_options);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return $this->getOriginalObject()->getCacheTag();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
-      $entity_type,
-      $container->get('entity.manager'),
-      $container->get('language_manager')
-    );
-  }
-}
diff --git a/modules/devel/webprofiler/src/EventDispatcher/EventDispatcherTraceableInterface.php b/modules/devel/webprofiler/src/EventDispatcher/EventDispatcherTraceableInterface.php
deleted file mode 100644
index dbad151..0000000
--- a/modules/devel/webprofiler/src/EventDispatcher/EventDispatcherTraceableInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\EventDispatcher;
-
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-interface EventDispatcherTraceableInterface extends EventDispatcherInterface {
-
-  /**
-   * @return array
-   */
-  public function getCalledListeners();
-
-  /**
-   * @return mixed
-   */
-  public function getNotCalledListeners();
-
-}
diff --git a/modules/devel/webprofiler/src/EventDispatcher/TraceableEventDispatcher.php b/modules/devel/webprofiler/src/EventDispatcher/TraceableEventDispatcher.php
deleted file mode 100644
index b3451fb..0000000
--- a/modules/devel/webprofiler/src/EventDispatcher/TraceableEventDispatcher.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\EventDispatcher;
-
-use Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher;
-use Drupal\webprofiler\Stopwatch;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-/**
- * Class TraceableEventDispatcher
- */
-class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements EventDispatcherTraceableInterface {
-
-  /**
-   * @var \Drupal\webprofiler\Stopwatch
-   *   The stopwatch service.
-   */
-  protected $stopwatch;
-
-  /**
-   * @var array
-   */
-  protected $calledListeners;
-
-  /**
-   * @var array
-   */
-  protected $notCalledListeners;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(ContainerInterface $container, array $listeners = []) {
-    parent::__construct($container, $listeners);
-    $this->notCalledListeners = $listeners;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addListener($event_name, $listener, $priority = 0) {
-    parent::addListener($event_name, $listener, $priority);
-    $this->notCalledListeners[$event_name][$priority][] = ['callable' => $listener];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function dispatch($event_name, Event $event = NULL) {
-    if ($event === NULL) {
-      $event = new Event();
-    }
-
-    $this->preDispatch($event_name, $event);
-    $e = $this->stopwatch->start($event_name, 'section');
-
-    if (isset($this->listeners[$event_name])) {
-      // Sort listeners if necessary.
-      if (isset($this->unsorted[$event_name])) {
-        krsort($this->listeners[$event_name]);
-        unset($this->unsorted[$event_name]);
-      }
-
-      // Invoke listeners and resolve callables if necessary.
-      foreach ($this->listeners[$event_name] as $priority => &$definitions) {
-        foreach ($definitions as $key => &$definition) {
-          if (!isset($definition['callable'])) {
-            $definition['callable'] = [
-              $this->container->get($definition['service'][0]),
-              $definition['service'][1],
-            ];
-          }
-
-          $definition['callable']($event, $event_name, $this);
-
-          $this->addCalledListener($definition, $event_name, $priority);
-
-          if ($event->isPropagationStopped()) {
-            return $event;
-          }
-        }
-      }
-    }
-
-    if ($e->isStarted()) {
-      $e->stop();
-    }
-
-    $this->postDispatch($event_name, $event);
-
-    return $event;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCalledListeners() {
-    return $this->calledListeners;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getNotCalledListeners() {
-    return $this->notCalledListeners;
-  }
-
-  /**
-   * @param \Drupal\webprofiler\Stopwatch $stopwatch
-   */
-  public function setStopwatch(Stopwatch $stopwatch) {
-    $this->stopwatch = $stopwatch;
-  }
-
-  /**
-   * Called before dispatching the event.
-   *
-   * @param string $eventName The event name
-   * @param Event $event The event
-   */
-  protected function preDispatch($eventName, Event $event) {
-    switch ($eventName) {
-      case KernelEvents::VIEW:
-      case KernelEvents::RESPONSE:
-        // stop only if a controller has been executed
-        if ($this->stopwatch->isStarted('controller')) {
-          $this->stopwatch->stop('controller');
-        }
-        break;
-    }
-  }
-
-  /**
-   * Called after dispatching the event.
-   *
-   * @param string $eventName The event name
-   * @param Event $event The event
-   */
-  protected function postDispatch($eventName, Event $event) {
-    switch ($eventName) {
-      case KernelEvents::CONTROLLER:
-        $this->stopwatch->start('controller', 'section');
-        break;
-      case KernelEvents::RESPONSE:
-        $token = $event->getResponse()->headers->get('X-Debug-Token');
-        try {
-          $this->stopwatch->stopSection($token);
-        }
-        catch (\LogicException $e) {
-        }
-        break;
-      case KernelEvents::TERMINATE:
-        // In the special case described in the `preDispatch` method above, the `$token` section
-        // does not exist, then closing it throws an exception which must be caught.
-        $token = $event->getResponse()->headers->get('X-Debug-Token');
-        try {
-          $this->stopwatch->stopSection($token);
-        }
-        catch (\LogicException $e) {
-        }
-        break;
-    }
-  }
-
-  /**
-   * @param $definition
-   * @param $event_name
-   * @param $priority
-   */
-  private function addCalledListener($definition, $event_name, $priority) {
-    $this->calledListeners[$event_name][$priority][] = [
-      'class' => get_class($definition['callable'][0]),
-      'method' => $definition['callable'][1],
-    ];
-
-    foreach ($this->notCalledListeners[$event_name][$priority] as $key => $listener) {
-      if (isset($listener['service'])) {
-        if ($listener['service'][0] == $definition['service'][0] && $listener['service'][1] == $definition['service'][1]) {
-          unset($this->notCalledListeners[$event_name][$priority][$key]);
-        }
-      }
-      else {
-        if (get_class($listener['callable'][0]) == get_class($definition['callable'][0]) && $listener['callable'][1] == $definition['callable'][1]) {
-          unset($this->notCalledListeners[$event_name][$priority][$key]);
-        }
-      }
-
-    }
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/EventSubscriber/WebprofilerEventSubscriber.php b/modules/devel/webprofiler/src/EventSubscriber/WebprofilerEventSubscriber.php
deleted file mode 100644
index 46a42a1..0000000
--- a/modules/devel/webprofiler/src/EventSubscriber/WebprofilerEventSubscriber.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\EventSubscriber;
-
-use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Routing\UrlGeneratorInterface;
-use Drupal\Core\Session\AccountInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-/**
- * Class WebprofilerEventSubscriber
- */
-class WebprofilerEventSubscriber implements EventSubscriberInterface {
-
-  /**
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  private $currentUser;
-
-  /**
-   * @var \Drupal\Core\Routing\UrlGeneratorInterface
-   */
-  protected $urlGenerator;
-
-  /**
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * @param \Drupal\Core\Session\AccountInterface $currentUser
-   * @param \Drupal\Core\Routing\UrlGeneratorInterface $urlGenerator
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   */
-  public function __construct(AccountInterface $currentUser, UrlGeneratorInterface $urlGenerator, RendererInterface $renderer) {
-    $this->currentUser = $currentUser;
-    $this->urlGenerator = $urlGenerator;
-    $this->renderer = $renderer;
-  }
-
-  /**
-   * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
-   */
-  public function onKernelResponse(FilterResponseEvent $event) {
-    $response = $event->getResponse();
-    $request = $event->getRequest();
-
-    if ($response->headers->has('X-Debug-Token') && NULL !== $this->urlGenerator) {
-      $response->headers->set(
-        'X-Debug-Token-Link',
-        $this->urlGenerator->generate('webprofiler.dashboard', ['profile' => $response->headers->get('X-Debug-Token')])
-      );
-    }
-
-    // do not capture redirects or modify XML HTTP Requests
-    if ($request->isXmlHttpRequest()) {
-      return;
-    }
-
-    if ($this->currentUser->hasPermission('view webprofiler toolbar')) {
-      $this->injectToolbar($response);
-    }
-  }
-
-  /**
-   * @param \Symfony\Component\HttpFoundation\Response $response
-   */
-  protected function injectToolbar(Response $response) {
-    $content = $response->getContent();
-    $pos = mb_strripos($content, '</body>');
-
-    if (FALSE !== $pos) {
-      if ($token = $response->headers->get('X-Debug-Token')) {
-        $loader = [
-          '#theme' => 'webprofiler_loader',
-          '#token' => $token,
-          '#profiler_url' => $this->urlGenerator->generate('webprofiler.toolbar', ['profile' => $token]),
-        ];
-
-        $content = mb_substr($content, 0, $pos) . $this->renderer->renderRoot($loader) . mb_substr($content, $pos);
-        $response->setContent($content);
-      }
-    }
-  }
-
-  /**
-   * @return array
-   */
-  public static function getSubscribedEvents() {
-    return [
-      KernelEvents::RESPONSE => ['onKernelResponse', -128],
-    ];
-  }
-}
diff --git a/modules/devel/webprofiler/src/Form/ConfigForm.php b/modules/devel/webprofiler/src/Form/ConfigForm.php
deleted file mode 100644
index e99e216..0000000
--- a/modules/devel/webprofiler/src/Form/ConfigForm.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Form;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\webprofiler\Profiler\ProfilerStorageManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Profiler\Profiler;
-
-/**
- * Class ConfigForm
- */
-class ConfigForm extends ConfigFormBase {
-
-  /**
-   * @var \Symfony\Component\HttpKernel\Profiler\Profiler
-   */
-  private $profiler;
-
-  /**
-   * @var array
-   */
-  private $templates;
-
-  /**
-   * @var \Drupal\webprofiler\Profiler\ProfilerStorageManager
-   */
-  private $storageManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('profiler'),
-      $container->get('profiler.storage_manager'),
-      $container->getParameter('data_collector.templates')
-    );
-  }
-
-  /**
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   * @param Profiler $profiler
-   * @param \Drupal\webprofiler\Profiler\ProfilerStorageManager $storageManager
-   * @param array $templates
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, Profiler $profiler, ProfilerStorageManager $storageManager, $templates) {
-    parent::__construct($config_factory);
-
-    $this->profiler = $profiler;
-    $this->templates = $templates;
-    $this->storageManager = $storageManager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'webprofiler_config';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $config = $this->config('webprofiler.config');
-
-    $form['purge_on_cache_clear'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Purge on cache clear'),
-      '#description' => $this->t('Deletes all profiler files during cache clear.'),
-      '#default_value' => $config->get('purge_on_cache_clear'),
-    ];
-
-    $storages = $this->storageManager->getStorages();
-
-    $form['storage'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Storage backend'),
-      '#description' => $this->t('Choose were to store profiler data.'),
-      '#options' => $storages,
-      '#default_value' => $config->get('storage'),
-    ];
-
-    $form['exclude'] = [
-      '#type' => 'textarea',
-      '#title' => $this->t('Exclude'),
-      '#default_value' => $config->get('exclude'),
-      '#description' => $this->t('Paths to exclude for profiling. One path per line.'),
-    ];
-
-    $form['active_toolbar_items'] = [
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Active toolbar items'),
-      '#options' => $this->getCollectors(),
-      '#description' => $this->t('Choose which items to show into the toolbar.'),
-      '#default_value' => $config->get('active_toolbar_items'),
-    ];
-
-    $form['ide_settings'] = [
-      '#type' => 'details',
-      '#title' => $this->t('IDE settings'),
-      '#open' => FALSE,
-    ];
-
-    $form['ide_settings']['ide_link'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('IDE link'),
-      '#description' => $this->t('IDE link for open files.'),
-      '#default_value' => $config->get('ide_link'),
-    ];
-
-    $form['ide_settings']['ide_link_remote'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('IDE link remote path'),
-      '#description' => $this->t('The path of the remote docroot. Leave blank if the docroot is on the same machine of the IDE. No trailing slash.'),
-      '#default_value' => $config->get('ide_link_remote'),
-    ];
-
-    $form['ide_settings']['ide_link_local'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('IDE link local path'),
-      '#description' => $this->t('The path of the local docroot. Leave blank if the docroot is on the same machine of IDE. No trailing slash.'),
-      '#default_value' => $config->get('ide_link_local'),
-    ];
-
-    $form['database'] = [
-      '#type' => 'details',
-      '#title' => $this->t('Database settings'),
-      '#open' => FALSE,
-      '#states' => array(
-        'visible' => array(
-          array(
-            'input[name="active_toolbar_items[database]"]' => array('checked' => TRUE),
-          ),
-        ),
-      ),
-    ];
-
-    $form['database']['query_sort'] = [
-      '#type' => 'radios',
-      '#title' => $this->t('Sort query log'),
-      '#options' => ['source' => 'by source', 'duration' => 'by duration'],
-      '#description' => $this->t('The query table can be sorted in the order that the queries were executed or by descending duration.'),
-      '#default_value' => $config->get('query_sort'),
-    ];
-
-    $form['database']['query_highlight'] = [
-      '#type' => 'number',
-      '#title' => $this->t('Slow query highlighting'),
-      '#description' => $this->t('Enter an integer in milliseconds. Any query which takes longer than this many milliseconds will be highlighted in the query log. This indicates a possibly inefficient query, or a candidate for caching.'),
-      '#default_value' => $config->get('query_highlight'),
-      '#min' => 0,
-    ];
-
-    $storageId = $this->config('webprofiler.config')->get('storage');
-    $storage = $this->storageManager->getStorage($storageId);
-
-    $form['purge'] = [
-      '#type' => 'details',
-      '#title' => $this->t('Purge profiles'),
-      '#open' => FALSE,
-    ];
-
-    $form['purge']['purge'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Purge'),
-      '#submit' => [[$this, 'purge']],
-    ];
-
-    $form['purge']['purge-help'] = [
-      '#type' => 'inline_template',
-      '#template' => '<div class="form-item">{{ message }}</div>',
-      '#context' => [
-        'message' => $this->t('Purge %storage profiles.', ['%storage' => $storage['title']]),
-      ],
-    ];
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->config('webprofiler.config')
-      ->set('purge_on_cache_clear', $form_state->getValue('purge_on_cache_clear'))
-      ->set('storage', $form_state->getValue('storage'))
-      ->set('exclude', $form_state->getValue('exclude'))
-      ->set('active_toolbar_items', $form_state->getValue('active_toolbar_items'))
-      ->set('ide_link', $form_state->getValue('ide_link'))
-      ->set('ide_link_remote', $form_state->getValue('ide_link_remote'))
-      ->set('ide_link_local', $form_state->getValue('ide_link_local'))
-      ->set('query_sort', $form_state->getValue('query_sort'))
-      ->set('query_highlight', $form_state->getValue('query_highlight'))
-      ->save();
-
-    parent::submitForm($form, $form_state);
-  }
-
-  /**
-   * Purges profiles.
-   */
-  public function purge(array &$form, FormStateInterface $form_state) {
-    $this->profiler->purge();
-    drupal_set_message($this->t('Profiles purged'));
-  }
-
-  /**
-   * @return array
-   */
-  private function getCollectors() {
-    $options = [];
-    foreach ($this->templates as $template) {
-      // drupal collector should not be disabled
-      if ($template[0] != 'drupal') {
-        $options[$template[0]] = $template[2];
-      }
-    }
-
-    asort($options);
-
-    return $options;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEditableConfigNames() {
-    return [
-      'webprofiler.config',
-    ];
-  }
-}
diff --git a/modules/devel/webprofiler/src/Form/FormBuilderWrapper.php b/modules/devel/webprofiler/src/Form/FormBuilderWrapper.php
deleted file mode 100644
index 48064b8..0000000
--- a/modules/devel/webprofiler/src/Form/FormBuilderWrapper.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Form;
-
-use Drupal\Core\Form\FormBuilder;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Class FormBuilderWrapper
- */
-class FormBuilderWrapper extends FormBuilder {
-
-  /**
-   * @var array
-   */
-  private $buildForms;
-
-  /**
-   * @return array
-   */
-  public function getBuildForm() {
-    return $this->buildForms;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function prepareForm($form_id, &$form, FormStateInterface &$form_state) {
-    parent::prepareForm($form_id, $form, $form_state);
-
-    if (!$this->buildForms) {
-      $this->buildForms = [];
-    }
-
-    $elements = [];
-    foreach ($form as $key => $value) {
-      if (strpos($key, '#') !== 0) {
-        $elements[$key]['#title'] = isset($value['#title']) ? $value['#title'] : NULL;
-        $elements[$key]['#access'] = isset($value['#access']) ? $value['#access'] : NULL;
-        $elements[$key]['#type'] = isset($value['#type']) ? $value['#type'] : NULL;
-      }
-    }
-
-    $buildInfo = $form_state->getBuildInfo();
-
-    $class = get_class($buildInfo['callback_object']);
-    $method = new \ReflectionMethod($class, 'buildForm');
-
-    $this->buildForms[$buildInfo['form_id']] = [
-      'class' => [
-        'class' => $class,
-        'method' => 'buildForm',
-        'file' => $method->getFilename(),
-        'line' => $method->getStartLine(),
-      ],
-      'form' => $elements,
-    ];
-
-    return $form;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Form/ProfilesFilterForm.php b/modules/devel/webprofiler/src/Form/ProfilesFilterForm.php
deleted file mode 100644
index 88d85ee..0000000
--- a/modules/devel/webprofiler/src/Form/ProfilesFilterForm.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Form;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Class ProfilesFilterForm
- */
-class ProfilesFilterForm extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'webprofiler_profiles_filter';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['ip'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('IP'),
-      '#size' => 30,
-      '#default_value' => $this->getRequest()->query->get('ip'),
-      '#prefix' => '<div class="form--inline clearfix">',
-    ];
-
-    $form['url'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Url'),
-      '#size' => 30,
-      '#default_value' => $this->getRequest()->query->get('url'),
-    ];
-
-    $form['method'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Method'),
-      '#options' => ['GET' => 'GET', 'POST' => 'POST'],
-      '#default_value' => $this->getRequest()->query->get('method'),
-    ];
-
-    $limits = [10, 50, 100];
-    $form['limit'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Limit'),
-      '#options' => array_combine($limits, $limits),
-      '#default_value' => $this->getRequest()->query->get('limit'),
-    ];
-
-    $form['actions'] = ['#type' => 'actions'];
-    $form['actions']['filter'] = [
-      '#type' => 'submit',
-      '#value' => t('Filter'),
-      '#attributes' => ['class' => ['button--primary']],
-      '#suffix' => '</div>',
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $ip = $form_state->getValue('ip');// ['values']['ip'];
-    $url = $form_state->getValue('url');
-    $method = $form_state->getValue('method');
-    $limit = $form_state->getValue('limit');
-
-    $url = new Url('webprofiler.admin_list', [], [
-      'query' => [
-        'ip' => $ip,
-        'url' => $url,
-        'method' => $method,
-        'limit' => $limit,
-      ]
-    ]);
-
-    $form_state->setRedirectUrl($url);
-  }
-}
diff --git a/modules/devel/webprofiler/src/Frontend/PerformanceTimingData.php b/modules/devel/webprofiler/src/Frontend/PerformanceTimingData.php
deleted file mode 100644
index da5565c..0000000
--- a/modules/devel/webprofiler/src/Frontend/PerformanceTimingData.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Frontend;
-
-/**
- * Class PerformanceTimingData
- */
-class PerformanceTimingData {
-
-  /**
-   * @var array
-   */
-  private $data;
-
-  /**
-   * @param array $data
-   */
-  public function __construct($data) {
-    $this->data = $data;
-  }
-
-  /**
-   * @return int
-   */
-  public function getDNSTiming() {
-    if (isset($this->data['domainLookupEnd']) && isset($this->data['domainLookupStart'])) {
-      return $this->data['domainLookupEnd'] - $this->data['domainLookupStart'];
-    }
-    else {
-      return 0;
-    }
-  }
-
-  /**
-   * @return int
-   */
-  public function getTCPTiming() {
-    if (isset($this->data['connectEnd']) && isset($this->data['connectStart'])) {
-      return $this->data['connectEnd'] - $this->data['connectStart'];
-    }
-    else {
-      return 0;
-    }
-  }
-
-  /**
-   * @return int
-   */
-  public function getTtfbTiming() {
-    if (isset($this->data['responseStart']) && isset($this->data['connectEnd'])) {
-      return $this->data['responseStart'] - $this->data['connectEnd'];
-    }
-    else {
-      return 0;
-    }
-  }
-
-  /**
-   * @return int
-   */
-  public function getDataTiming() {
-    if (isset($this->data['responseEnd']) && isset($this->data['responseStart'])) {
-      return $this->data['responseEnd'] - $this->data['responseStart'];
-    }
-    else {
-      return 0;
-    }
-  }
-
-  /**
-   * @return int
-   */
-  public function getDomTiming() {
-    if (isset($this->data['loadEventStart']) && isset($this->data['responseEnd'])) {
-      return $this->data['loadEventStart'] - $this->data['responseEnd'];
-    }
-    else {
-      return 0;
-    }
-  }
-}
diff --git a/modules/devel/webprofiler/src/Helper/ClassShortener.php b/modules/devel/webprofiler/src/Helper/ClassShortener.php
deleted file mode 100644
index 204de32..0000000
--- a/modules/devel/webprofiler/src/Helper/ClassShortener.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Helper;
-
-use Drupal\Component\Render\FormattableMarkup;
-
-/**
- * Class ClassShortener
- */
-class ClassShortener implements ClassShortenerInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function shortenClass($class) {
-    $parts = explode('\\', $class);
-    $result = [];
-    $size = count($parts) - 1;
-
-    foreach ($parts as $key => $part) {
-      if ($key < $size) {
-        $result[] = substr($part, 0, 1);
-      }
-      else {
-        $result[] = $part;
-      }
-    }
-
-    return new FormattableMarkup("<abbr title=\"@class\">@short</abbr>", [
-      '@class' => $class,
-      '@short' => implode('\\', $result)
-    ]);
-  }
-}
diff --git a/modules/devel/webprofiler/src/Helper/ClassShortenerInterface.php b/modules/devel/webprofiler/src/Helper/ClassShortenerInterface.php
deleted file mode 100644
index e1b2af5..0000000
--- a/modules/devel/webprofiler/src/Helper/ClassShortenerInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Helper;
-
-/**
- * Interface ClassShortenerInterface
- */
-interface ClassShortenerInterface {
-
-  /**
-   * @param string $class
-   *
-   * @return string
-   */
-  public function shortenClass($class);
-
-}
diff --git a/modules/devel/webprofiler/src/Helper/IdeLinkGenerator.php b/modules/devel/webprofiler/src/Helper/IdeLinkGenerator.php
deleted file mode 100644
index 87f7e74..0000000
--- a/modules/devel/webprofiler/src/Helper/IdeLinkGenerator.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Helper;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Component\Render\FormattableMarkup;
-
-/**
- * Class IdeLinkGenerator.
- */
-class IdeLinkGenerator implements IdeLinkGeneratorInterface {
-
-  /**
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  private $config_factory;
-
-  /**
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   */
-  public function __construct(ConfigFactoryInterface $config_factory) {
-    $this->config_factory = $config_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function generateLink($file, $line) {
-    $ide_link = $this->config_factory->get('webprofiler.config')
-      ->get('ide_link');
-    $ide_link_remote = $this->config_factory->get('webprofiler.config')
-      ->get('ide_link_remote');
-    $ide_link_local = $this->config_factory->get('webprofiler.config')
-      ->get('ide_link_local');
-
-    $file = str_replace($ide_link_remote, $ide_link_local, $file);
-
-    return new FormattableMarkup($ide_link, ['@file' => $file, '@line' => $line]);
-  }
-}
diff --git a/modules/devel/webprofiler/src/Helper/IdeLinkGeneratorInterface.php b/modules/devel/webprofiler/src/Helper/IdeLinkGeneratorInterface.php
deleted file mode 100644
index 0626208..0000000
--- a/modules/devel/webprofiler/src/Helper/IdeLinkGeneratorInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Helper;
-
-/**
- * Interface IdeLinkGeneratorInterface.
- */
-interface IdeLinkGeneratorInterface {
-
-  /**
-   * @param $file
-   * @param $line
-   *
-   * @return string
-   */
-  public function generateLink($file, $line);
-}
diff --git a/modules/devel/webprofiler/src/Http/HttpClientMiddleware.php b/modules/devel/webprofiler/src/Http/HttpClientMiddleware.php
deleted file mode 100644
index b64a2a6..0000000
--- a/modules/devel/webprofiler/src/Http/HttpClientMiddleware.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Http;
-
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\TransferStats;
-use Psr\Http\Message\RequestInterface;
-
-/**
- * Class HttpClientMiddleware
- */
-class HttpClientMiddleware {
-
-  /**
-   * @var array
-   */
-  private $completedRequests;
-
-  /**
-   * @var array
-   */
-  private $failedRequests;
-
-  /**
-   *
-   */
-  public function __construct() {
-    $this->completedRequests = [];
-    $this->failedRequests = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __invoke() {
-    return function ($handler) {
-      return function (RequestInterface $request, array $options) use ($handler) {
-
-        $options['on_stats'] = function (TransferStats $stats) use ($request) {
-          $request->stats = $stats;
-        };
-
-        return $handler($request, $options)->then(
-          function ($response) use ($request) {
-
-            $this->completedRequests[] = [
-              'request' => $request,
-              'response' => $response,
-            ];
-
-            return $response;
-          },
-          function ($reason) use ($request) {
-            $response = $reason instanceof RequestException
-              ? $reason->getResponse()
-              : null;
-
-            $this->failedRequests[] = [
-              'request' => $request,
-              'response' => $response,
-              'message' => $reason->getMessage(),
-            ];
-
-            return \GuzzleHttp\Promise\rejection_for($reason);
-          }
-        );
-      };
-    };
-  }
-
-  /**
-   * @return array
-   */
-  public function getCompletedRequests() {
-    return $this->completedRequests;
-  }
-
-  /**
-   * @return array
-   */
-  public function getFailedRequests() {
-    return $this->failedRequests;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Mail/MailManagerWrapper.php b/modules/devel/webprofiler/src/Mail/MailManagerWrapper.php
deleted file mode 100644
index 58ecddc..0000000
--- a/modules/devel/webprofiler/src/Mail/MailManagerWrapper.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Mail;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Logger\LoggerChannelFactoryInterface;
-use Drupal\Core\Mail\MailManagerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\webprofiler\DataCollector\MailDataCollector;
-
-/**
- * Class MailManagerWrapper
- */
-class MailManagerWrapper extends DefaultPluginManager implements MailManagerInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * @var \Drupal\webprofiler\DataCollector\MailDataCollector
-   */
-  private $dataCollector;
-
-  /**
-   * @var \Drupal\Core\Mail\MailManagerInterface
-   */
-  private $mailManager;
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The logger factory.
-   *
-   * @var \Drupal\Core\Logger\LoggerChannelFactoryInterface
-   */
-  protected $loggerFactory;
-
-  /**
-   * List of already instantiated mail plugins.
-   *
-   * @var array
-   */
-  protected $instances = array();
-
-  /**
-   * Constructs the MailManager object.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   Cache backend instance to use.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler to invoke the alter hook with.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The configuration factory.
-   * @param \Drupal\Core\Logger\LoggerChannelFactoryInterface $logger_factory
-   *   The logger channel factory.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   * @param \Drupal\Core\Mail\MailManagerInterface $mailManager
-   * @param \Drupal\webprofiler\DataCollector\MailDataCollector $dataCollector
-   */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory, LoggerChannelFactoryInterface $logger_factory, TranslationInterface $string_translation, MailManagerInterface $mailManager, MailDataCollector $dataCollector) {
-    parent::__construct('Plugin/Mail', $namespaces, $module_handler, 'Drupal\Core\Mail\MailInterface', 'Drupal\Core\Annotation\Mail');
-    $this->alterInfo('mail_backend_info');
-    $this->setCacheBackend($cache_backend, 'mail_backend_plugins');
-    $this->configFactory = $config_factory;
-    $this->loggerFactory = $logger_factory;
-    $this->stringTranslation = $string_translation;
-    $this->dataCollector = $dataCollector;
-    $this->mailManager = $mailManager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function mail($module, $key, $to, $langcode, $params = array(), $reply = NULL, $send = TRUE) {
-    $message = $this->mailManager->mail($module, $key, $to, $langcode, $params, $reply, $send);
-
-    $instance = $this->mailManager->getInstance(['module' => $module, 'key' => $key]);
-    $this->dataCollector->addMessage($message, $instance);
-
-    return $message;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Profiler/DatabaseProfilerStorage.php b/modules/devel/webprofiler/src/Profiler/DatabaseProfilerStorage.php
deleted file mode 100644
index d86045d..0000000
--- a/modules/devel/webprofiler/src/Profiler/DatabaseProfilerStorage.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Profiler;
-
-use Drupal\Core\Database\Connection;
-use Symfony\Component\HttpKernel\Profiler\Profile;
-use Symfony\Component\HttpKernel\Profiler\ProfilerStorageInterface;
-
-/**
- * Implements a profiler storage using the DBTNG query api.
- */
-class DatabaseProfilerStorage implements ProfilerStorageInterface {
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * Constructs a new DatabaseProfilerStorage instance.
-   *
-   * @param \Drupal\Core\Database\Connection $database
-   *   The database connection.
-   */
-  function __construct(Connection $database) {
-    $this->database = $database;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function find($ip, $url, $limit, $method, $start = NULL, $end = NULL) {
-    $select = $this->database->select('webprofiler', 'wp', ['fetch' => \PDO::FETCH_ASSOC]);
-
-    if (NULL === $start) {
-      $start = 0;
-    }
-
-    if (NULL === $end) {
-      $end = time();
-    }
-
-    if ($ip = preg_replace('/[^\d\.]/', '', $ip)) {
-      $select->condition('ip', '%' . $this->database->escapeLike($ip) . '%', 'LIKE');
-    }
-
-    if ($url) {
-      $select->condition('url', '%' . $this->database->escapeLike(addcslashes($url, '%_\\')) . '%', 'LIKE');
-    }
-
-    if ($method) {
-      $select->condition('method', $method);
-    }
-
-    if (!empty($start)) {
-      $select->condition('time', $start, '>=');
-    }
-
-    if (!empty($end)) {
-      $select->condition('time', $end, '<=');
-    }
-
-    $select->fields('wp', [
-      'token',
-      'ip',
-      'method',
-      'url',
-      'time',
-      'parent',
-      'status_code'
-    ]);
-    $select->orderBy('time', 'DESC');
-    $select->range(0, $limit);
-    return $select->execute()
-      ->fetchAllAssoc('token');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function read($token) {
-    $record = $this->database->select('webprofiler', 'w')
-      ->fields('w')
-      ->condition('token', $token)
-      ->execute()
-      ->fetch();
-    if (isset($record->data)) {
-      return $this->createProfileFromData($token, $record);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function write(Profile $profile) {
-    $args = [
-      'token' => $profile->getToken(),
-      'parent' => $profile->getParentToken(),
-      'data' => base64_encode(serialize($profile->getCollectors())),
-      'ip' => $profile->getIp(),
-      'method' => $profile->getMethod(),
-      'url' => $profile->getUrl(),
-      'time' => $profile->getTime(),
-      'created_at' => time(),
-      'status_code' => $profile->getStatusCode(),
-    ];
-
-    try {
-      $query = $this->database->select('webprofiler', 'w')
-        ->fields('w', ['token']);
-      $query->condition('token', $profile->getToken());
-      $count = $query->countQuery()->execute()->fetchAssoc();
-
-      if ($count['expression']) {
-        $this->database->update('webprofiler')
-          ->fields($args)
-          ->condition('token', $profile->getToken())
-          ->execute();
-      }
-      else {
-        $this->database->insert('webprofiler')->fields($args)->execute();
-      }
-
-      $status = TRUE;
-    } catch (\Exception $e) {
-      $status = FALSE;
-    }
-
-    return $status;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function purge() {
-    $this->database->truncate('webprofiler')->execute();
-  }
-
-  /**
-   * @param string $token
-   * @param $data
-   *
-   * @return Profile
-   */
-  private function createProfileFromData($token, $data) {
-    $profile = new Profile($token);
-    $profile->setIp($data->ip);
-    $profile->setMethod($data->method);
-    $profile->setUrl($data->url);
-    $profile->setTime($data->time);
-    $profile->setCollectors(unserialize(base64_decode($data->data)));
-    $profile->setStatusCode($data->status_code);
-
-    return $profile;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Profiler/FileProfilerStorage.php b/modules/devel/webprofiler/src/Profiler/FileProfilerStorage.php
deleted file mode 100644
index 7eb63ac..0000000
--- a/modules/devel/webprofiler/src/Profiler/FileProfilerStorage.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Profiler;
-
-use Symfony\Component\HttpKernel\Profiler\FileProfilerStorage as SymfonyFileProfilerStorage;
-use Symfony\Component\HttpKernel\Profiler\Profile;
-
-class FileProfilerStorage extends SymfonyFileProfilerStorage {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createProfileFromData($token, $data, $parent = NULL) {
-    $profile = new Profile($token);
-    $profile->setIp($data['ip']);
-    $profile->setMethod($data['method']);
-    $profile->setUrl($data['url']);
-    $profile->setTime($data['time']);
-    $profile->setCollectors($data['data']);
-    $profile->setStatusCode($data['status_code']);
-
-    return $profile;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Profiler/Profiler.php b/modules/devel/webprofiler/src/Profiler/Profiler.php
deleted file mode 100644
index 438dcb4..0000000
--- a/modules/devel/webprofiler/src/Profiler/Profiler.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Profiler;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
-use Symfony\Component\HttpKernel\Profiler\Profile;
-use Symfony\Component\HttpKernel\Profiler\Profiler as SymfonyProfiler;
-use Symfony\Component\HttpKernel\Profiler\ProfilerStorageInterface;
-
-/**
- * Class Profiler
- */
-class Profiler extends SymfonyProfiler {
-
-  /**
-   * @var \Drupal\Core\Config\ConfigFactoryInterface $config
-   */
-  private $config;
-
-  /**
-   * @var array
-   */
-  private $activeToolbarItems;
-
-  private $localStorage;
-  private $localLogger;
-
-  /**
-   * Constructor.
-   *
-   * @param \Symfony\Component\HttpKernel\Profiler\ProfilerStorageInterface $storage
-   *   A ProfilerStorageInterface instance
-   * @param \Psr\Log\LoggerInterface $logger
-   *   A LoggerInterface instance
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   */
-  public function __construct(ProfilerStorageInterface $storage, LoggerInterface $logger = NULL, ConfigFactoryInterface $config) {
-    parent::__construct($storage, $logger);
-
-    $this->localStorage = $storage;
-    $this->localLogger = $logger;
-
-    $this->config = $config;
-    $this->activeToolbarItems = $this->config->get('webprofiler.config')
-      ->get('active_toolbar_items');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function add(DataCollectorInterface $collector) {
-    // drupal collector should not be disabled
-    if ($collector->getName() == 'drupal') {
-      parent::add($collector);
-    }
-    else {
-      if ($this->activeToolbarItems && array_key_exists($collector->getName(), $this->activeToolbarItems) && $this->activeToolbarItems[$collector->getName()] !== '0') {
-        parent::add($collector);
-      }
-    }
-  }
-
-  /**
-   * @param \Symfony\Component\HttpKernel\Profiler\Profile $profile
-   *
-   * @return bool
-   */
-  public function updateProfile(Profile $profile) {
-    if (!($ret = $this->localStorage->write($profile)) && NULL !== $this->localLogger) {
-      $this->localLogger->warning('Unable to store the profiler information.');
-    }
-
-    return $ret;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Profiler/ProfilerStorageFactory.php b/modules/devel/webprofiler/src/Profiler/ProfilerStorageFactory.php
deleted file mode 100644
index 5ba1545..0000000
--- a/modules/devel/webprofiler/src/Profiler/ProfilerStorageFactory.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Profiler;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Class ProfilerStorageFactory
- */
-class ProfilerStorageFactory {
-
-  /**
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
-   *
-   * @return \Symfony\Component\HttpKernel\Profiler\ProfilerStorageInterface
-   */
-  final public static function getProfilerStorage(ConfigFactoryInterface $config, ContainerInterface $container) {
-    $storage = $config->get('webprofiler.config')
-      ->get('storage') ?: 'profiler.database_storage';
-
-    return $container->get($storage);
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Profiler/ProfilerStorageManager.php b/modules/devel/webprofiler/src/Profiler/ProfilerStorageManager.php
deleted file mode 100644
index fcd3683..0000000
--- a/modules/devel/webprofiler/src/Profiler/ProfilerStorageManager.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Profiler;
-
-use Symfony\Component\HttpKernel\Profiler\ProfilerStorageInterface;
-
-/**
- * Class ProfilerStorageManager
- */
-class ProfilerStorageManager {
-
-  /**
-   * @var array
-   */
-  private $storages;
-
-  /**
-   * @return array
-   */
-  public function getStorages() {
-    $output = [];
-
-    /** @var \Symfony\Component\HttpKernel\Profiler\ProfilerStorageInterface $storage */
-    foreach ($this->storages as $id => $storage) {
-      $output[$id] = $storage['title'];
-    }
-
-    return $output;
-  }
-
-  /**
-   * @param $id
-   *
-   * @return array
-   */
-  public function getStorage($id) {
-    return $this->storages[$id];
-  }
-
-  /**
-   * @param $id
-   * @param $title
-   * @param \Symfony\Component\HttpKernel\Profiler\ProfilerStorageInterface $storage
-   */
-  public function addStorage($id, $title, ProfilerStorageInterface $storage) {
-    $this->storages[$id] = [
-      'title' => $title,
-      'class' => $storage,
-    ];
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Profiler/TemplateManager.php b/modules/devel/webprofiler/src/Profiler/TemplateManager.php
deleted file mode 100644
index 87aa685..0000000
--- a/modules/devel/webprofiler/src/Profiler/TemplateManager.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Drupal\webprofiler\Profiler;
-
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\Profiler\Profiler as SymfonyProfiler;
-use Symfony\Component\HttpKernel\Profiler\Profile;
-
-/**
- * Profiler Templates Manager
- */
-class TemplateManager {
-
-  /**
-   * @var \Twig_Environment
-   */
-  protected $twig;
-
-  /**
-   * @var \Twig_Loader_Chain
-   */
-  protected $twigLoader;
-
-  /**
-   * @var array
-   */
-  protected $templates;
-
-  /**
-   * @var \Symfony\Component\HttpKernel\Profiler\Profiler
-   */
-  protected $profiler;
-
-  /**
-   * Constructor.
-   *
-   * @param SymfonyProfiler $profiler
-   * @param \Twig_Environment $twig
-   * @param \Twig_Loader_Chain $twigLoader
-   * @param array $templates
-   */
-  public function __construct(SymfonyProfiler $profiler, \Twig_Environment $twig, \Twig_Loader_Chain $twigLoader, array $templates) {
-    $this->profiler = $profiler;
-    $this->twig = $twig;
-    $this->twigLoader = $twigLoader;
-    $this->templates = $templates;
-  }
-
-  /**
-   * Gets the template name for a given panel.
-   *
-   * @param Profile $profile
-   * @param string $panel
-   *
-   * @return mixed
-   *
-   * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-   */
-  public function getName(Profile $profile, $panel) {
-    $templates = $this->getNames($profile);
-
-    if (!isset($templates[$panel])) {
-      throw new NotFoundHttpException(sprintf('Panel "%s" is not registered in profiler or is not present in viewed profile.', $panel));
-    }
-
-    return $templates[$panel];
-  }
-
-  /**
-   * Gets the templates for a given profile.
-   *
-   * @param \Symfony\Component\HttpKernel\Profiler\Profile $profile
-   *
-   * @return array
-   */
-  public function getTemplates(Profile $profile) {
-    $templates = $this->getNames($profile);
-    foreach ($templates as $name => $template) {
-      $templates[$name] = $this->twig->loadTemplate($template);
-    }
-
-    return $templates;
-  }
-
-  /**
-   * Gets template names of templates that are present in the viewed profile.
-   *
-   * @param \Symfony\Component\HttpKernel\Profiler\Profile $profile
-   *
-   * @return array
-   *
-   * @throws \UnexpectedValueException
-   */
-  protected function getNames(Profile $profile) {
-    $templates = [];
-
-    foreach ($this->templates as $arguments) {
-      if (NULL === $arguments) {
-        continue;
-      }
-
-      list($name, $template) = $arguments;
-
-      if (!$this->profiler->has($name) || !$profile->hasCollector($name)) {
-        continue;
-      }
-
-      if ('.html.twig' === substr($template, -10)) {
-        $template = substr($template, 0, -10);
-      }
-
-      if (!$this->twigLoader->exists($template . '.html.twig')) {
-        throw new \UnexpectedValueException(sprintf('The profiler template "%s.html.twig" for data collector "%s" does not exist.', $template, $name));
-      }
-
-      $templates[$name] = $template . '.html.twig';
-    }
-
-    return $templates;
-  }
-}
diff --git a/modules/devel/webprofiler/src/RequestMatcher/WebprofilerRequestMatcher.php b/modules/devel/webprofiler/src/RequestMatcher/WebprofilerRequestMatcher.php
deleted file mode 100644
index 17087cc..0000000
--- a/modules/devel/webprofiler/src/RequestMatcher/WebprofilerRequestMatcher.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\RequestMatcher;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Path\PathMatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestMatcherInterface;
-
-/**
- * Class WebprofilerRequestMatcher
- */
-class WebprofilerRequestMatcher implements RequestMatcherInterface {
-
-  /**
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  private $configFactory;
-
-  /**
-   * @var \Drupal\Core\Path\PathMatcherInterface
-   */
-  private $pathMatcher;
-
-  /**
-   * @param ConfigFactoryInterface $configFactory
-   * @param \Drupal\Core\Path\PathMatcherInterface $pathMatcher
-   */
-  public function __construct(ConfigFactoryInterface $configFactory, PathMatcherInterface $pathMatcher) {
-    $this->configFactory = $configFactory;
-    $this->pathMatcher = $pathMatcher;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function matches(Request $request) {
-    $path = $request->getPathInfo();
-
-    $patterns = $this->configFactory->get('webprofiler.config')->get('exclude');
-
-    // never add Webprofiler to phpinfo page.
-    $patterns .= "\r\n/admin/reports/status/php";
-
-    // never add Webprofiler to uninstall confirm page.
-    $patterns .= "\r\n/admin/modules/uninstall/*";
-
-    return !$this->pathMatcher->matchPath($path, $patterns);
-  }
-}
diff --git a/modules/devel/webprofiler/src/Routing/TokenConverter.php b/modules/devel/webprofiler/src/Routing/TokenConverter.php
deleted file mode 100644
index a849610..0000000
--- a/modules/devel/webprofiler/src/Routing/TokenConverter.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Routing;
-
-use Drupal\Core\ParamConverter\ParamConverterInterface;
-use Symfony\Component\Routing\Route;
-
-/**
- * Class TokenConverter
- */
-class TokenConverter implements ParamConverterInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function convert($value, $definition, $name, array $defaults) {
-    // "profiler" service isn't injected to prevent circular reference when
-    // more than one language is active and "Account administration pages" is
-    // enabled on admin/config/regional/language/detection. See #2710787 for
-    // more information.
-    /** @var \Drupal\webprofiler\Profiler\Profiler $profiler */
-    $profiler = \Drupal::service('profiler');
-
-    if (NULL === $profiler) {
-      return NULL;
-    }
-
-    $profile = $profiler->loadProfile($value);
-
-    if (NULL === $profile) {
-      return NULL;
-    }
-
-    return $profile;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies($definition, $name, Route $route) {
-    if (!empty($definition['type']) && $definition['type'] === 'webprofiler:token') {
-      return TRUE;
-    }
-    return FALSE;
-  }
-}
diff --git a/modules/devel/webprofiler/src/StackMiddleware/WebprofilerMiddleware.php b/modules/devel/webprofiler/src/StackMiddleware/WebprofilerMiddleware.php
deleted file mode 100644
index dac9198..0000000
--- a/modules/devel/webprofiler/src/StackMiddleware/WebprofilerMiddleware.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\StackMiddleware;
-
-use Drupal\Core\Database\Database;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-
-/**
- * Class WebprofilerMiddleware
- */
-class WebprofilerMiddleware implements HttpKernelInterface {
-
-  /**
-   * The decorated kernel.
-   *
-   * @var \Symfony\Component\HttpKernel\HttpKernelInterface
-   */
-  protected $httpKernel;
-
-  /**
-   * Constructs a WebprofilerMiddleware object.
-   *
-   * @param \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel
-   *   The decorated kernel.
-   */
-  public function __construct(HttpKernelInterface $http_kernel) {
-    $this->httpKernel = $http_kernel;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE) {
-    foreach (Database::getAllConnectionInfo() as $key => $info) {
-      Database::startLog('webprofiler', $key);
-    }
-    return $this->httpKernel->handle($request, $type, $catch);
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/State/StateWrapper.php b/modules/devel/webprofiler/src/State/StateWrapper.php
deleted file mode 100644
index 23f930a..0000000
--- a/modules/devel/webprofiler/src/State/StateWrapper.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\State;
-
-use Drupal\Core\Cache\CacheCollector;
-use Drupal\Core\State\StateInterface;
-use Drupal\webprofiler\DataCollector\StateDataCollector;
-
-/**
- * Class StateWrapper.
- */
-class StateWrapper extends CacheCollector implements StateInterface {
-
-  /**
-   * The system state.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  private $state;
-
-  /**
-   * The state data collector.
-   *
-   * @var \Drupal\webprofiler\DataCollector\StateDataCollector
-   */
-  private $dataCollector;
-
-  /**
-   * StateWrapper constructor.
-   *
-   * @param \Drupal\Core\State\StateInterface $state
-   *   The system state.
-   * @param \Drupal\webprofiler\DataCollector\StateDataCollector $dataCollector
-   *   The state data collector.
-   */
-  public function __construct(StateInterface $state, StateDataCollector $dataCollector) {
-    $this->state = $state;
-    $this->dataCollector = $dataCollector;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function get($key, $default = NULL) {
-    $this->dataCollector->addState($key);
-
-    return $this->state->get($key, $default);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMultiple(array $keys) {
-    foreach ($keys as $key) {
-      $this->dataCollector->addState($key);
-    }
-
-    return $this->state->getMultiple($keys);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function set($key, $value) {
-    $this->state->set($key, $value);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setMultiple(array $data) {
-    $this->state->setMultiple($data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function delete($key) {
-    $this->state->delete($key);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteMultiple(array $keys) {
-    $this->state->deleteMultiple($keys);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resetCache() {
-    $this->state->resetCache();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function resolveCacheMiss($key) {
-    return $this->state->resolveCacheMiss($key);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function destruct() {
-    $this->updateCache();
-  }
-
-  /**
-   * Passes through all non-tracked calls onto the decorated object.
-   *
-   * @param string $method
-   *   The called method.
-   * @param mixed $args
-   *   The passed in arguments.
-   *
-   * @return mixed
-   *   The return argument of the call.
-   */
-  public function __call($method, $args) {
-    return call_user_func_array([$this->state, $method], $args);
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Stopwatch.php b/modules/devel/webprofiler/src/Stopwatch.php
deleted file mode 100644
index 35714bf..0000000
--- a/modules/devel/webprofiler/src/Stopwatch.php
+++ /dev/null
@@ -1,543 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler {
-
-  /**
-   * Class Stopwatch
-   */
-  class Stopwatch extends \Symfony\Component\Stopwatch\Stopwatch {
-
-  }
-
-}
-
-namespace Symfony\Component\Stopwatch {
-
-  /**
-   * Class Stopwatch
-   */
-  class Stopwatch {
-    /**
-     * @var Section[]
-     */
-    private $sections;
-
-    /**
-     * @var array
-     */
-    private $activeSections;
-
-    /**
-     *
-     */
-    public function __construct() {
-      $this->sections = $this->activeSections = ['__root__' => new Section('__root__')];
-    }
-
-    /**
-     * Creates a new section or re-opens an existing section.
-     *
-     * @param string|null $id The id of the session to re-open, null to create a new one
-     *
-     * @throws \LogicException When the section to re-open is not reachable
-     */
-    public function openSection($id = NULL) {
-      $current = end($this->activeSections);
-
-      if (NULL !== $id && NULL === $current->get($id)) {
-        throw new \LogicException(sprintf('The section "%s" has been started at an other level and can not be opened.', $id));
-      }
-
-      $this->start('__section__.child', 'section');
-      $this->activeSections[] = $current->open($id);
-      $this->start('__section__');
-    }
-
-    /**
-     * Stops the last started section.
-     *
-     * The id parameter is used to retrieve the events from this section.
-     *
-     * @see getSectionEvents
-     *
-     * @param string $id The identifier of the section
-     *
-     * @throws \LogicException When there's no started section to be stopped
-     */
-    public function stopSection($id) {
-      $this->stop('__section__');
-
-      if (1 == count($this->activeSections)) {
-        throw new \LogicException('There is no started section to stop.');
-      }
-
-      $this->sections[$id] = array_pop($this->activeSections)->setId($id);
-      $this->stop('__section__.child');
-    }
-
-    /**
-     * Starts an event.
-     *
-     * @param string $name The event name
-     * @param string $category The event category
-     *
-     * @return StopwatchEvent A StopwatchEvent instance
-     */
-    public function start($name, $category = NULL) {
-      return end($this->activeSections)->startEvent($name, $category);
-    }
-
-    /**
-     * Checks if the event was started
-     *
-     * @param string $name The event name
-     *
-     * @return bool
-     */
-    public function isStarted($name) {
-      return end($this->activeSections)->isEventStarted($name);
-    }
-
-    /**
-     * Stops an event.
-     *
-     * @param string $name The event name
-     *
-     * @return StopwatchEvent A StopwatchEvent instance
-     */
-    public function stop($name) {
-      return end($this->activeSections)->stopEvent($name);
-    }
-
-    /**
-     * Stops then restarts an event.
-     *
-     * @param string $name The event name
-     *
-     * @return StopwatchEvent A StopwatchEvent instance
-     */
-    public function lap($name) {
-      return end($this->activeSections)->stopEvent($name)->start();
-    }
-
-    /**
-     * Gets all events for a given section.
-     *
-     * @param string $id A section identifier
-     *
-     * @return StopwatchEvent[] An array of StopwatchEvent instances
-     */
-    public function getSectionEvents($id) {
-      return isset($this->sections[$id]) ? $this->sections[$id]->getEvents() : [];
-    }
-  }
-
-
-  /**
-   * @internal This class is for internal usage only
-   *
-   * @author Fabien Potencier <fabien@symfony.com>
-   */
-  class Section {
-    /**
-     * @var StopwatchEvent[]
-     */
-    private $events = [];
-
-    /**
-     * @var null|float
-     */
-    private $origin;
-
-    /**
-     * @var string
-     */
-    private $id;
-
-    /**
-     * @var Section[]
-     */
-    private $children = [];
-
-    /**
-     * Constructor.
-     *
-     * @param float|null $origin Set the origin of the events in this section, use null to set their origin to their start time
-     */
-    public function __construct($origin = NULL) {
-      $this->origin = is_numeric($origin) ? $origin : NULL;
-    }
-
-    /**
-     * Returns the child section.
-     *
-     * @param string $id The child section identifier
-     *
-     * @return Section|null The child section or null when none found
-     */
-    public function get($id) {
-      foreach ($this->children as $child) {
-        if ($id === $child->getId()) {
-          return $child;
-        }
-      }
-
-      return NULL;
-    }
-
-    /**
-     * Creates or re-opens a child section.
-     *
-     * @param string|null $id null to create a new section, the identifier to re-open an existing one.
-     *
-     * @return Section A child section
-     */
-    public function open($id) {
-      if (NULL === $session = $this->get($id)) {
-        $session = $this->children[] = new self(microtime(TRUE) * 1000);
-      }
-
-      return $session;
-    }
-
-    /**
-     * @return string The identifier of the section
-     */
-    public function getId() {
-      return $this->id;
-    }
-
-    /**
-     * Sets the session identifier.
-     *
-     * @param string $id The session identifier
-     *
-     * @return Section The current section
-     */
-    public function setId($id) {
-      $this->id = $id;
-
-      return $this;
-    }
-
-    /**
-     * Starts an event.
-     *
-     * @param string $name The event name
-     * @param string $category The event category
-     *
-     * @return StopwatchEvent The event
-     */
-    public function startEvent($name, $category) {
-      if (!isset($this->events[$name])) {
-        $this->events[$name] = new StopwatchEvent($this->origin ?: microtime(TRUE) * 1000, $category);
-      }
-
-      return $this->events[$name]->start();
-    }
-
-    /**
-     * Checks if the event was started
-     *
-     * @param string $name The event name
-     *
-     * @return bool
-     */
-    public function isEventStarted($name) {
-      return isset($this->events[$name]) && $this->events[$name]->isStarted();
-    }
-
-    /**
-     * Stops an event.
-     *
-     * @param string $name The event name
-     *
-     * @return StopwatchEvent The event
-     *
-     * @throws \LogicException When the event has not been started
-     */
-    public function stopEvent($name) {
-      if (!isset($this->events[$name])) {
-        throw new \LogicException(sprintf('Event "%s" is not started.', $name));
-      }
-
-      return $this->events[$name]->stop();
-    }
-
-    /**
-     * Stops then restarts an event.
-     *
-     * @param string $name The event name
-     *
-     * @return StopwatchEvent The event
-     *
-     * @throws \LogicException When the event has not been started
-     */
-    public function lap($name) {
-      return $this->stopEvent($name)->start();
-    }
-
-    /**
-     * Returns the events from this section.
-     *
-     * @return StopwatchEvent[] An array of StopwatchEvent instances
-     */
-    public function getEvents() {
-      return $this->events;
-    }
-  }
-
-  /**
-   * Class StopwatchEvent
-   */
-  class StopwatchEvent {
-    /**
-     * @var StopwatchPeriod[]
-     */
-    private $periods = [];
-
-    /**
-     * @var float
-     */
-    private $origin;
-
-    /**
-     * @var string
-     */
-    private $category;
-
-    /**
-     * @var float[]
-     */
-    private $started = [];
-
-    /**
-     * Constructor.
-     *
-     * @param float $origin The origin time in milliseconds
-     * @param string|null $category The event category or null to use the default
-     *
-     * @throws \InvalidArgumentException When the raw time is not valid
-     */
-    public function __construct($origin, $category = NULL) {
-      $this->origin = $this->formatTime($origin);
-      $this->category = is_string($category) ? $category : 'default';
-    }
-
-    /**
-     * Gets the category.
-     *
-     * @return string The category
-     */
-    public function getCategory() {
-      return $this->category;
-    }
-
-    /**
-     * Gets the origin.
-     *
-     * @return float The origin in milliseconds
-     */
-    public function getOrigin() {
-      return $this->origin;
-    }
-
-    /**
-     * Starts a new event period.
-     *
-     * @return StopwatchEvent The event
-     */
-    public function start() {
-      $this->started[] = $this->getNow();
-
-      return $this;
-    }
-
-    /**
-     * Stops the last started event period.
-     *
-     * @throws \LogicException When start wasn't called before stopping
-     *
-     * @return StopwatchEvent The event
-     *
-     * @throws \LogicException When stop() is called without a matching call to start()
-     */
-    public function stop() {
-      if (!count($this->started)) {
-        throw new \LogicException('stop() called but start() has not been called before.');
-      }
-
-      $this->periods[] = new StopwatchPeriod(array_pop($this->started), $this->getNow());
-
-      return $this;
-    }
-
-    /**
-     * Checks if the event was started
-     *
-     * @return bool
-     */
-    public function isStarted() {
-      return !empty($this->started);
-    }
-
-    /**
-     * Stops the current period and then starts a new one.
-     *
-     * @return StopwatchEvent The event
-     */
-    public function lap() {
-      return $this->stop()->start();
-    }
-
-    /**
-     * Stops all non already stopped periods.
-     */
-    public function ensureStopped() {
-      while (count($this->started)) {
-        $this->stop();
-      }
-    }
-
-    /**
-     * Gets all event periods.
-     *
-     * @return StopwatchPeriod[] An array of StopwatchPeriod instances
-     */
-    public function getPeriods() {
-      return $this->periods;
-    }
-
-    /**
-     * Gets the relative time of the start of the first period.
-     *
-     * @return integer The time (in milliseconds)
-     */
-    public function getStartTime() {
-      return isset($this->periods[0]) ? $this->periods[0]->getStartTime() : 0;
-    }
-
-    /**
-     * Gets the relative time of the end of the last period.
-     *
-     * @return integer The time (in milliseconds)
-     */
-    public function getEndTime() {
-      return ($count = count($this->periods)) ? $this->periods[$count - 1]->getEndTime() : 0;
-    }
-
-    /**
-     * Gets the duration of the events (including all periods).
-     *
-     * @return integer The duration (in milliseconds)
-     */
-    public function getDuration() {
-      $total = 0;
-      foreach ($this->periods as $period) {
-        $total += $period->getDuration();
-      }
-
-      return $total;
-    }
-
-    /**
-     * Gets the max memory usage of all periods.
-     *
-     * @return integer The memory usage (in bytes)
-     */
-    public function getMemory() {
-      $memory = 0;
-      foreach ($this->periods as $period) {
-        if ($period->getMemory() > $memory) {
-          $memory = $period->getMemory();
-        }
-      }
-
-      return $memory;
-    }
-
-    /**
-     * Return the current time relative to origin.
-     *
-     * @return float Time in ms
-     */
-    protected function getNow() {
-      return $this->formatTime(microtime(TRUE) * 1000 - $this->origin);
-    }
-
-    /**
-     * Formats a time.
-     *
-     * @param integer|float $time A raw time
-     *
-     * @return float The formatted time
-     *
-     * @throws \InvalidArgumentException When the raw time is not valid
-     */
-    private function formatTime($time) {
-      if (!is_numeric($time)) {
-        throw new \InvalidArgumentException('The time must be a numerical value');
-      }
-
-      return round($time, 1);
-    }
-  }
-
-  /**
-   * Class StopwatchPeriod
-   */
-  class StopwatchPeriod {
-    private $start;
-    private $end;
-    private $memory;
-
-    /**
-     * Constructor.
-     *
-     * @param integer $start The relative time of the start of the period (in milliseconds)
-     * @param integer $end The relative time of the end of the period (in milliseconds)
-     */
-    public function __construct($start, $end) {
-      $this->start = (integer) $start;
-      $this->end = (integer) $end;
-      $this->memory = memory_get_usage(TRUE);
-    }
-
-    /**
-     * Gets the relative time of the start of the period.
-     *
-     * @return integer The time (in milliseconds)
-     */
-    public function getStartTime() {
-      return $this->start;
-    }
-
-    /**
-     * Gets the relative time of the end of the period.
-     *
-     * @return integer The time (in milliseconds)
-     */
-    public function getEndTime() {
-      return $this->end;
-    }
-
-    /**
-     * Gets the time spent in this period.
-     *
-     * @return integer The period duration (in milliseconds)
-     */
-    public function getDuration() {
-      return $this->end - $this->start;
-    }
-
-    /**
-     * Gets the memory usage.
-     *
-     * @return integer The memory usage (in bytes)
-     */
-    public function getMemory() {
-      return $this->memory;
-    }
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/StringTranslation/TranslationManagerWrapper.php b/modules/devel/webprofiler/src/StringTranslation/TranslationManagerWrapper.php
deleted file mode 100644
index 7967646..0000000
--- a/modules/devel/webprofiler/src/StringTranslation/TranslationManagerWrapper.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\StringTranslation;
-
-use Drupal\Core\StringTranslation\TranslationManager;
-
-/**
- * Class TranslationManagerWrapper
- */
-class TranslationManagerWrapper extends TranslationManager {
-
-  /**
-   * @var \Drupal\webprofiler\StringTranslation\TranslationManagerWrapper
-   */
-  private $translationManager;
-
-  /**
-   * @var array
-   */
-  private $translated;
-
-  /**
-   * @var array
-   */
-  private $untranslated;
-
-  /**
-   * @param \Drupal\webprofiler\StringTranslation\TranslationManagerWrapper $translationManager
-   */
-  public function setDataCollector(TranslationManagerWrapper $translationManager) {
-    $this->translationManager = $translationManager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function doTranslate($string, array $options = array()) {
-    // Merge in defaults.
-    if (empty($options['langcode'])) {
-      $options['langcode'] = $this->defaultLangcode;
-    }
-    if (empty($options['context'])) {
-      $options['context'] = '';
-    }
-    $translation = $this->getStringTranslation($options['langcode'], $string, $options['context']);
-
-    if($translation) {
-      $this->translated[$string] = $translation;
-    } else {
-      $this->untranslated[$string] = $string;
-    }
-
-    return $translation === FALSE ? $string : $translation;
-  }
-
-  /**
-   * @return array
-   */
-  public function getTranslated() {
-    return $this->translated;
-  }
-
-  /**
-   * @return array
-   */
-  public function getUntranslated() {
-    return $this->untranslated;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Theme/ThemeNegotiatorWrapper.php b/modules/devel/webprofiler/src/Theme/ThemeNegotiatorWrapper.php
deleted file mode 100644
index 8a96b08..0000000
--- a/modules/devel/webprofiler/src/Theme/ThemeNegotiatorWrapper.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Theme;
-
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Theme\ThemeNegotiator;
-
-/**
- * Class ThemeNegotiatorWrapper
- */
-class ThemeNegotiatorWrapper extends ThemeNegotiator {
-
-  /**
-   * @var \Drupal\Core\Theme\ThemeNegotiatorInterface
-   */
-  private $negotiator;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function determineActiveTheme(RouteMatchInterface $route_match) {
-    // This method has changed in Drupal 8.4.x, to maintain compatibility with
-    // Drupal 8.3.x we check the existence or not of the classResolver
-    // property.
-    // TODO: remove this logic when we decide to drop Drupal 8.3.x support.
-    if (property_exists($this, 'classResolver')) {
-      $classResolver = $this->classResolver;
-      $negotiators = $this->negotiators;
-    } else {
-      $classResolver = \Drupal::classResolver();
-      $negotiators = $this->getSortedNegotiators();
-    }
-
-    foreach ($negotiators as $negotiator_id) {
-      if (property_exists($this, 'classResolver')) {
-        $negotiator = $classResolver->getInstanceFromDefinition($negotiator_id);
-      } else {
-        $negotiator = $negotiator_id;
-      }
-
-      if ($negotiator->applies($route_match)) {
-        $theme = $negotiator->determineActiveTheme($route_match);
-        if ($theme !== NULL && $this->themeAccess->checkAccess($theme)) {
-          $this->negotiator = $negotiator;
-          return $theme;
-        }
-      }
-    }
-  }
-
-  /**
-   * @return \Drupal\Core\Theme\ThemeNegotiatorInterface
-   */
-  public function getNegotiator() {
-    return $this->negotiator;
-  }
-
-  /**
-   * Returns the sorted array of theme negotiators.
-   *
-   * @return array|\Drupal\Core\Theme\ThemeNegotiatorInterface[]
-   *   An array of theme negotiator objects.
-   *
-   * TODO: remove this method when we decide to drop Drupal 8.3.x support.
-   */
-  protected function getSortedNegotiators() {
-    if (!isset($this->sortedNegotiators)) {
-      // Sort the negotiators according to priority.
-      krsort($this->negotiators);
-      // Merge nested negotiators from $this->negotiators into
-      // $this->sortedNegotiators.
-      $this->sortedNegotiators = [];
-      foreach ($this->negotiators as $builders) {
-        $this->sortedNegotiators = array_merge($this->sortedNegotiators, $builders);
-      }
-    }
-    return $this->sortedNegotiators;
-  }
-
-}
diff --git a/modules/devel/webprofiler/src/Twig/Dumper/HtmlDumper.php b/modules/devel/webprofiler/src/Twig/Dumper/HtmlDumper.php
deleted file mode 100644
index 7b3ac02..0000000
--- a/modules/devel/webprofiler/src/Twig/Dumper/HtmlDumper.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Twig\Dumper;
-
-/**
- * Class HtmlDumper
- */
-class HtmlDumper extends \Twig_Profiler_Dumper_Text {
-
-  private static $colors = array(
-    'block' => '#dfd',
-    'macro' => '#ddf',
-    'template' => '#ffd',
-    'big' => '#d44',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  public function dump(\Twig_Profiler_Profile $profile) {
-    return '<pre class="h--word-intact"><code class="code--json">' . parent::dump($profile) . '</code></pre>';
-  }
-
-  protected function formatTemplate(\Twig_Profiler_Profile $profile, $prefix) {
-    return sprintf('%s└ <span style="background-color: %s">%s</span>', $prefix, self::$colors['template'], $profile->getTemplate());
-  }
-
-  protected function formatNonTemplate(\Twig_Profiler_Profile $profile, $prefix) {
-    return sprintf('%s└ %s::%s(<span style="background-color: %s">%s</span>)', $prefix, $profile->getTemplate(), $profile->getType(), isset(self::$colors[$profile->getType()]) ? self::$colors[$profile->getType()] : 'auto', $profile->getName());
-  }
-
-  protected function formatTime(\Twig_Profiler_Profile $profile, $percent) {
-    return sprintf('<span style="color: %s">%.2fms/%.0f%%</span>', $percent > 20 ? self::$colors['big'] : 'auto', $profile->getDuration() * 1000, $percent);
-  }
-}
diff --git a/modules/devel/webprofiler/src/Twig/Extension/ProfilerExtension.php b/modules/devel/webprofiler/src/Twig/Extension/ProfilerExtension.php
deleted file mode 100644
index ed598e4..0000000
--- a/modules/devel/webprofiler/src/Twig/Extension/ProfilerExtension.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Twig\Extension;
-
-use Drupal\webprofiler\Helper\ClassShortenerInterface;
-use Drupal\webprofiler\Helper\IdeLinkGeneratorInterface;
-use Symfony\Component\Stopwatch\Stopwatch;
-
-/**
- * Class ProfilerExtension
- */
-class ProfilerExtension extends \Twig_Extension_Profiler {
-
-  /**
-   * @var \Symfony\Component\Stopwatch\Stopwatch
-   */
-  private $stopwatch;
-  private $events;
-  private $ideLink;
-  private $classShortener;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(\Twig_Profiler_Profile $profile, Stopwatch $stopwatch = NULL, IdeLinkGeneratorInterface $ideLink, ClassShortenerInterface $classShortener) {
-    parent::__construct($profile);
-
-    $this->ideLink = $ideLink;
-    $this->classShortener = $classShortener;
-
-    $this->stopwatch = $stopwatch;
-    $this->events = new \SplObjectStorage();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function enter(\Twig_Profiler_Profile $profile) {
-    if ($this->stopwatch && $profile->isTemplate()) {
-      $this->events[$profile] = $this->stopwatch->start($profile->getName(), 'template');
-    }
-
-    parent::enter($profile);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function leave(\Twig_Profiler_Profile $profile) {
-    parent::leave($profile);
-
-    if ($this->stopwatch && $profile->isTemplate()) {
-      $this->events[$profile]->stop();
-      unset($this->events[$profile]);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFunctions() {
-    return [
-      new \Twig_SimpleFunction('abbr', [$this, 'getAbbr']),
-      new \Twig_SimpleFunction('idelink', [$this, 'getIdeLink']),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return 'native_profiler';
-  }
-
-  /**
-   * @param $class
-   *
-   * @return string
-   */
-  public function getAbbr($class) {
-    return $this->classShortener->shortenClass($class);
-  }
-
-  /**
-   * @param $file
-   * @param $line
-   *
-   * @return string
-   */
-  public function getIdeLink($file, $line) {
-    return $this->ideLink->generateLink($file, $line);
-  }
-}
diff --git a/modules/devel/webprofiler/src/Views/TraceableViewExecutable.php b/modules/devel/webprofiler/src/Views/TraceableViewExecutable.php
deleted file mode 100644
index afd6e39..0000000
--- a/modules/devel/webprofiler/src/Views/TraceableViewExecutable.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Views;
-
-use Drupal\views\ViewExecutable;
-use Drupal\views\Views;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Class TraceableViewExecutable
- */
-class TraceableViewExecutable extends ViewExecutable {
-
-  /**
-   * @var float
-   */
-  protected $render_time;
-
-  /**
-   * Gets the build time.
-   *
-   * @return float
-   */
-  public function getBuildTime() {
-    return $this->build_time;
-  }
-
-  /**
-   * Gets the execute time.
-   *
-   * @return float
-   */
-  public function getExecuteTime() {
-    return property_exists($this, 'execute_time') ? $this->execute_time : 0.0;
-  }
-
-  /**
-   * Gets the render time.
-   *
-   * @return float
-   */
-  public function getRenderTime() {
-    return $this->render_time;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function render($display_id = NULL) {
-    $start = microtime(TRUE);
-
-    $this->execute($display_id);
-
-    // Check to see if the build failed.
-    if (!empty($this->build_info['fail'])) {
-      return;
-    }
-    if (!empty($this->build_info['denied'])) {
-      return;
-    }
-
-    /** @var \Drupal\views\Plugin\views\exposed_form\ExposedFormPluginInterface $exposed_form */
-    $exposed_form = $this->display_handler->getPlugin('exposed_form');
-    $exposed_form->preRender($this->result);
-
-    $module_handler = \Drupal::moduleHandler();
-
-    // @TODO In the longrun, it would be great to execute a view without
-    //   the theme system at all. See https://www.drupal.org/node/2322623.
-    $active_theme = \Drupal::theme()->getActiveTheme();
-    $themes = array_keys($active_theme->getBaseThemes());
-    $themes[] = $active_theme->getName();
-
-    // Check for already-cached output.
-    /** @var \Drupal\views\Plugin\views\cache\CachePluginBase $cache */
-    if (!empty($this->live_preview)) {
-      $cache = Views::pluginManager('cache')->createInstance('none');
-    }
-    else {
-      $cache = $this->display_handler->getPlugin('cache');
-    }
-
-    // Run preRender for the pager as it might change the result.
-    if (!empty($this->pager)) {
-      $this->pager->preRender($this->result);
-    }
-
-    // Initialize the style plugin.
-    $this->initStyle();
-
-    if (!isset($this->response)) {
-      // Set the response so other parts can alter it.
-      $this->response = new Response('', 200);
-    }
-
-    // Give field handlers the opportunity to perform additional queries
-    // using the entire resultset prior to rendering.
-    if ($this->style_plugin->usesFields()) {
-      foreach ($this->field as $id => $handler) {
-        if (!empty($this->field[$id])) {
-          $this->field[$id]->preRender($this->result);
-        }
-      }
-    }
-
-    $this->style_plugin->preRender($this->result);
-
-    // Let each area handler have access to the result set.
-    $areas = ['header', 'footer'];
-    // Only call preRender() on the empty handlers if the result is empty.
-    if (empty($this->result)) {
-      $areas[] = 'empty';
-    }
-    foreach ($areas as $area) {
-      foreach ($this->{$area} as $handler) {
-        $handler->preRender($this->result);
-      }
-    }
-
-    // Let modules modify the view just prior to rendering it.
-    $module_handler->invokeAll('views_pre_render', [$this]);
-
-    // Let the themes play too, because pre render is a very themey thing.
-    foreach ($themes as $theme_name) {
-      $function = $theme_name . '_views_pre_render';
-      if (function_exists($function)) {
-        $function($this);
-      }
-    }
-
-    $this->display_handler->output = $this->display_handler->render();
-
-    $exposed_form->postRender($this->display_handler->output);
-
-    $cache->postRender($this->display_handler->output);
-
-    // Let modules modify the view output after it is rendered.
-    $module_handler->invokeAll('views_post_render', [
-      $this,
-      &$this->display_handler->output,
-      $cache
-    ]);
-
-    // Let the themes play too, because post render is a very themey thing.
-    foreach ($themes as $theme_name) {
-      $function = $theme_name . '_views_post_render';
-      if (function_exists($function)) {
-        $function($this, $this->display_handler->output, $cache);
-      }
-    }
-
-    $this->render_time = microtime(TRUE) - $start;
-
-    return $this->display_handler->output;
-  }
-}
diff --git a/modules/devel/webprofiler/src/Views/ViewExecutableFactoryWrapper.php b/modules/devel/webprofiler/src/Views/ViewExecutableFactoryWrapper.php
deleted file mode 100644
index 6aa363f..0000000
--- a/modules/devel/webprofiler/src/Views/ViewExecutableFactoryWrapper.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler\Views;
-
-use Drupal\Core\Routing\RouteProviderInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\views\ViewEntityInterface;
-use Drupal\views\ViewExecutable;
-use Drupal\views\ViewExecutableFactory;
-use Drupal\views\ViewsData;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-/**
- * Class ViewExecutableFactoryWrapper
- */
-class ViewExecutableFactoryWrapper extends ViewExecutableFactory {
-
-  /** @var ViewExecutable $view_executable */
-  private $views;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(AccountInterface $user, RequestStack $request_stack, ViewsData $views_data, RouteProviderInterface $route_provider) {
-    parent::__construct($user, $request_stack, $views_data, $route_provider);
-
-    $this->views = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function get(ViewEntityInterface $view) {
-    $view_executable = new TraceableViewExecutable($view, $this->user, $this->viewsData, $this->routeProvider);
-    $view_executable->setRequest($this->requestStack->getCurrentRequest());
-    $this->views[] = $view_executable;
-
-    return $view_executable;
-  }
-
-  /**
-   * @return TraceableViewExecutable
-   */
-  public function getViews() {
-    return $this->views;
-  }
-}
diff --git a/modules/devel/webprofiler/src/WebprofilerServiceProvider.php b/modules/devel/webprofiler/src/WebprofilerServiceProvider.php
deleted file mode 100644
index 3ba1ff0..0000000
--- a/modules/devel/webprofiler/src/WebprofilerServiceProvider.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-namespace Drupal\webprofiler;
-
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\DependencyInjection\ServiceProviderBase;
-use Drupal\webprofiler\Compiler\DecoratorPass;
-use Drupal\webprofiler\Compiler\EventPass;
-use Drupal\webprofiler\Compiler\ProfilerPass;
-use Drupal\webprofiler\Compiler\ServicePass;
-use Drupal\webprofiler\Compiler\StoragePass;
-use Symfony\Component\DependencyInjection\Compiler\PassConfig;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * Defines a service profiler for the webprofiler module.
- */
-class WebprofilerServiceProvider extends ServiceProviderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function register(ContainerBuilder $container) {
-    // Add a compiler pass to discover all data collector services.
-    $container->addCompilerPass(new ProfilerPass());
-
-    // Add a compiler pass to discover all available storage backend.
-    $container->addCompilerPass(new StoragePass());
-
-    $container->addCompilerPass(new ServicePass(), PassConfig::TYPE_AFTER_REMOVING);
-    $container->addCompilerPass(new DecoratorPass(), PassConfig::TYPE_AFTER_REMOVING);
-
-    $modules = $container->getParameter('container.modules');
-
-    // Add ViewsDataCollector only if Views module is enabled.
-    if (isset($modules['views'])) {
-      $container->register('webprofiler.views', 'Drupal\webprofiler\DataCollector\ViewsDataCollector')
-        ->addArgument(new Reference(('views.executable')))
-        ->addArgument(new Reference(('entity.manager')))
-        ->addTag('data_collector', [
-          'template' => '@webprofiler/Collector/views.html.twig',
-          'id' => 'views',
-          'title' => 'Views',
-          'priority' => 75,
-        ]);
-    }
-
-    // Add BlockDataCollector only if Block module is enabled.
-    if (isset($modules['block'])) {
-      $container->register('webprofiler.blocks', 'Drupal\webprofiler\DataCollector\BlocksDataCollector')
-        ->addArgument(new Reference(('entity_type.manager')))
-        ->addTag('data_collector', [
-          'template' => '@webprofiler/Collector/blocks.html.twig',
-          'id' => 'blocks',
-          'title' => 'Blocks',
-          'priority' => 78,
-        ]);
-    }
-
-    // Add TranslationsDataCollector only if Locale module is enabled.
-    if (isset($modules['locale'])) {
-      $container->register('webprofiler.translations', 'Drupal\webprofiler\DataCollector\TranslationsDataCollector')
-        ->addArgument(new Reference(('string_translation')))
-        ->addArgument(new Reference(('url_generator')))
-        ->addTag('data_collector', [
-          'template' => '@webprofiler/Collector/translations.html.twig',
-          'id' => 'translations',
-          'title' => 'Translations',
-          'priority' => 210,
-        ]);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alter(ContainerBuilder $container) {
-    $modules = $container->getParameter('container.modules');
-
-    // Alter the views.executable service only if Views module is enabled.
-    if (isset($modules['views'])) {
-      $container->getDefinition('views.executable')
-        ->setClass('Drupal\webprofiler\Views\ViewExecutableFactoryWrapper');
-    }
-
-    // Replace the regular form_builder service with a traceable one.
-    $container->getDefinition('form_builder')
-      ->setClass('Drupal\webprofiler\Form\FormBuilderWrapper');
-
-    // Replace the regular access_manager service with a traceable one.
-    $container->getDefinition('access_manager')
-      ->setClass('Drupal\webprofiler\Access\AccessManagerWrapper')
-      ->addMethodCall('setDataCollector', [new Reference('webprofiler.request')]);
-
-    // Replace the regular theme.negotiator service with a traceable one.
-    $container->getDefinition('theme.negotiator')
-      ->setClass('Drupal\webprofiler\Theme\ThemeNegotiatorWrapper');
-
-    // Replace the regular config.factory service with a traceable one.
-    $container->getDefinition('config.factory')
-      ->setClass('Drupal\webprofiler\Config\ConfigFactoryWrapper')
-      ->addMethodCall('setDataCollector', [new Reference('webprofiler.config')]);
-
-    // Replace the regular string_translation service with a traceable one.
-    $container->getDefinition('string_translation')
-      ->setClass('Drupal\webprofiler\StringTranslation\TranslationManagerWrapper');
-
-    // Replace the regular event_dispatcher service with a traceable one.
-    $container->getDefinition('event_dispatcher')
-      ->setClass('Drupal\webprofiler\EventDispatcher\TraceableEventDispatcher')
-      ->addMethodCall('setStopwatch', [new Reference('stopwatch')]);
-
-    $container->getDefinition('http_kernel.basic')
-      ->replaceArgument(1, new Reference('webprofiler.debug.controller_resolver'));
-  }
-
-}
diff --git a/modules/devel/webprofiler/templates/Collector/assets.html.twig b/modules/devel/webprofiler/templates/Collector/assets.html.twig
deleted file mode 100644
index d537541..0000000
--- a/modules/devel/webprofiler/templates/Collector/assets.html.twig
+++ /dev/null
@@ -1,133 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'assets'}) }}" title="{{ 'Assets'|t }}">
-        <img width="20" height="28" alt="{{ 'Assets'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.getcsscount + collector.getjscount }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-
-    <div class="sf-toolbar-info-piece">
-        <b>CSS</b>
-        <span>{{ collector.getcsscount }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>JS</b>
-        <span>{{ collector.getjscount }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="assets" type="text/template">
-        <h2 class="panel__title">{{ 'Assets'|t }}</h2>
-        <div class="tabs">
-            <% if( data.js.length != 0){ %>
-            <input class="tabs__radio" type="radio" id="js" name="tabs" checked/>
-            <% } %>
-            <% if( data.js.length != 0){ %>
-            <input class="tabs__radio" type="radio" id="css" name="tabs"/>
-            <% } %>
-            <ul class="tabs__tabs list--inline">
-                <% if( data.js.length != 0){ %>
-                <li><label class="tabs__label" for="js">JS</label></li>
-                <% } %>
-                <% if( data.js.length != 0){ %>
-                <li><label class="tabs__label" for="css">CSS</label></li>
-                <% } %>
-            </ul>
-            <div class="tabs__panels">
-                <div class="tabs__panel">
-                    <% if( data.js.length != 0){ %>
-                    <% _.each( data.js, function( item, key ){ %>
-                    <% if( key === 'drupalSettings' ){ %>
-                    <div class="panel__container">
-                        <div class="panel__expand-header ">
-                            <ul class="list--inline">
-                                <li><b>asset</b> <%- key %></li>
-                            </ul>
-                            <div class="button--flat l-right js--panel-toggle">{{ 'Data'|t }}</div>
-                        </div>
-                        <div class="panel__expand-content">
-                            <% if(item.data && item.data.length != 0){ %>
-                        <pre>
-                            <code class="code--json "><%= JSON.stringify(item.data, null, 4) %></code>
-                        </pre>
-                            <% } %>
-                            <table class="table--duo">
-                                <% _.each( item, function( item, key ){ %>
-                                <tr>
-                                    <% if(key != 'data'){ %>
-                                    <th><%- key %></th>
-                                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                                    <% } %>
-                                </tr>
-                                <% }); %>
-                            </table>
-                        </div>
-                    </div>
-                    <% } else { %>
-                    <div class="panel__container">
-                        <div class="panel__expand-header ">
-                            <ul class="list--inline">
-                                <li><b>asset</b> <%= Drupal.webprofiler.helpers.classLink({"file":
-                                    data.assets.installation_path + key, "class": key, "line": 0}) %>
-                                </li>
-                                <li><b>version</b> <%- item.version %></li>
-                                <li><b>scope</b> <%- item.scope %></li>
-                            </ul>
-                            <div class="button--flat l-right js--panel-toggle">{{ 'Data'|t }}</div>
-                        </div>
-                        <div class="panel__expand-content">
-                            <table class="table--duo">
-                                <% _.each( item, function( item, key ){ %>
-                                <tr>
-                                    <th><%- key %></th>
-                                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                                </tr>
-                                <% }); %>
-                            </table>
-                        </div>
-                    </div>
-                    <% } %>
-                    <% }); %>
-                    <% } %>
-                </div>
-                <div class="tabs__panel">
-                    <% if( data.css.length != 0){ %>
-                    <% _.each( data.css, function( item, key ){ %>
-                    <div class="panel__container">
-                        <div class="panel__expand-header ">
-                            <ul class="list--inline">
-                                <li><b>asset</b> <%= Drupal.webprofiler.helpers.classLink({"file":
-                                    data.assets.installation_path + key, "class": key, "line": 0}) %>
-                                </li>
-                                <li><b>version</b> <%- item.version %></li>
-                            </ul>
-                            <div class="button--flat l-right js--panel-toggle">{{ 'Data'|t }}</div>
-                        </div>
-                        <div class="panel__expand-content">
-                            <table class="table--duo">
-                                <% _.each( item, function( item, key ){ %>
-                                <tr>
-                                    <th><%- key %></th>
-                                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                                </tr>
-                                <% }); %>
-                            </table>
-                        </div>
-                    </div>
-                    <% }); %>
-                </div>
-            </div>
-        </div>
-
-        <% } %>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/blocks.html.twig b/modules/devel/webprofiler/templates/Collector/blocks.html.twig
deleted file mode 100644
index 4146f27..0000000
--- a/modules/devel/webprofiler/templates/Collector/blocks.html.twig
+++ /dev/null
@@ -1,113 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'blocks'}) }}" title="{{ 'Blocks'|t }}">
-        <img width="20" height="28" alt="{{ 'Blocks'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.renderedBlocksCount }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Loaded'|t }}</b>
-        <span>{{ collector.loadedBlocksCount }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Rendered'|t }}</b>
-        <span>{{ collector.renderedBlocksCount }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="blocks" type="text/template">
-        <h2 class="panel__title">{{ 'Blocks'|t }}</h2>
-
-        <form class="panel__toolbar">
-            <div class="panel__filter--text">
-                <input id="edit-sid" class="js--live-filter" placeholder="{{ 'ID'|t }}" type="text"/>
-                <label for="edit-sid" class="panel__filter-label">{{ 'ID'|t }}</label>
-            </div>
-            <div class="panel__filter--text">
-                <input id="edit-label" class="js--live-filter" placeholder="{{ 'Label'|t }}" type="text"/>
-                <label for="edit-label" class="panel__filter-label">{{ 'Label'|t }}</label>
-            </div>
-            <div class="panel__filter--text">
-                <input id="edit-region" class="js--live-filter" placeholder="{{ 'Region'|t }}" type="text"/>
-                <label for="edit-region" class="panel__filter-label">{{ 'Region'|t }}</label>
-            </div>
-            <div class="panel__filter--text">
-                <input id="edit-provider" class="js--live-filter" placeholder="{{ 'Provider'|t }}" type="text"/>
-                <label for="edit-provider" class="panel__filter-label">{{ 'Provider'|t }}</label>
-            </div>
-            <div class="panel__filter--select">
-                <select id="edit-rendered" class="js--live-filter">
-                    <option value="">{{ 'Any'|t }}</option>
-                    <option value="1">{{ 'Yes'|t }}</option>
-                    <option value="0">{{ 'No'|t }}</option>
-                </select>
-                <label for="edit-rendered" class="panel__filter-label">{{ 'Rendered'|t }}</label>
-            </div>
-        </form>
-
-        <% _.each( data.blocks.loaded, function( item ){ %>
-
-        <div class="panel__container"
-             data-wp-sid="<%- item.id %>"
-             data-wp-label="<%= item.settings.label %>"
-             data-wp-region="<%= item.region %>"
-             data-wp-provider="<%= item.settings.provider %>"
-             data-wp-rendered="<%- (data.blocks.rendered[item.id]) ? '1' : '0' %>">
-
-            <div class="panel__expand-header">
-                <ul class="list--inline">
-                    <li>
-                        <b>{{ 'ID'|t }}</b> <%- item.id %>
-                    </li>
-                    <li>
-                        <b>{{ 'Label'|t }}</b> <%= item.settings.label %>
-                    </li>
-                    <li>
-                        <b>{{ 'Region'|t }}</b> <%= (item.region == -1) ? '{{ 'No region'|t }}' : item.region %>
-                    </li>
-                    <li>
-                        <b><%- (data.blocks.rendered[item.id]) ? '' : '{{ 'Not rendered'|t }}' %></b>
-                    </li>
-                </ul>
-                <div class="button--flat l-right js--panel-toggle">{{ 'Info'|t }}</div>
-                <a class="button--flat l-right " href="<%- item.route %>">{{ 'Edit'|t }}</a>
-
-            </div>
-
-            <div class="panel__expand-content">
-                <div class="wp-query-arguments">
-                    <table class="table--duo">
-                        <tr>
-                            <th>{{ 'Provider'|t }}</th>
-                            <td><%- item.settings.provider %></td>
-                        </tr>
-                        <tr>
-                            <th>{{ 'Theme'|t }}</th>
-                            <td><%- item.theme %></td>
-                        </tr>
-                        <tr>
-                            <th>{{ 'Status'|t }}</th>
-                            <td><%- (item.status) ? '{{ 'Enabled'|t }}' : '{{ 'Disabled'|t }}' %></td>
-                        </tr>
-                        <tr>
-                            <th>{{ 'Plugin'|t }}</th>
-                            <td><%- item.plugin %></td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </div>
-        <% }); %>
-
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/cache.html.twig b/modules/devel/webprofiler/templates/Collector/cache.html.twig
deleted file mode 100644
index 61539b6..0000000
--- a/modules/devel/webprofiler/templates/Collector/cache.html.twig
+++ /dev/null
@@ -1,63 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'cache'}) }}" title="{{ 'Cache'|t }}">
-        <img width="20" height="28" alt="{{ 'Cache'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.getCacheHitsCount }}
-            / {{ collector.getCacheMissesCount }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-
-    {% for bin, cids in collector.getCacheHits %}
-        <div class="sf-toolbar-info-piece">
-            <b>{{ bin }}</b>
-            <span>{{ cids }}</span>
-        </div>
-    {% endfor %}
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="cache" type="text/template">
-        <h2 class="panel__title">{{ 'Cache'|t }}</h2>
-        <% if( data.cache.length != 0){ %>
-        <% _.each( data.cache, function( item, key ){ %>
-        <div class="panel__container">
-
-            <ul class="list--inline">
-                <li><b>Bin</b> <%= key %></li>
-            </ul>
-
-            <table class="table--trio">
-                <thead>
-                <tr>
-                    <th>{{ 'ID'|t }}</th>
-                    <th>{{ 'hit'|t }}</th>
-                    <th>{{ 'miss'|t }}</th>
-                </tr>
-                </thead>
-                <tbody>
-                <% _.each( item, function( value, key ){ %>
-                <tr>
-                    <td><%= key %></td>
-                    <td><%= value['bin_cids_hit'] %></td>
-                    <td><%= value['bin_cids_miss'] %></td>
-                </tr>
-                <% }); %>
-                </tbody>
-            </table>
-        </div>
-        <% }); %>
-        <% } else { %>
-        <div class="panel__container">
-            <p>{{ 'No results'|t }}</p>
-        </div>
-        <% } %>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/config.html.twig b/modules/devel/webprofiler/templates/Collector/config.html.twig
deleted file mode 100644
index 954ea5f..0000000
--- a/modules/devel/webprofiler/templates/Collector/config.html.twig
+++ /dev/null
@@ -1,37 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: "config"}) }}" title="{{ 'Config'|t }}">
-        <img width="20" height="28" alt="{{ 'Config'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.getConfigNames|length }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Config get'|t }}</b>
-        <span>{{ collector.getConfigNames|length }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="config" type="text/template">
-        <h2 class="panel__title">{{ 'Configuration'|t }}</h2>
-        <div class="panel__container">
-            <table>
-                <% _.each( data.config_names, function( item, key ){ %>
-                <tr>
-                    <th><%- key %></th>
-                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                </tr>
-                <% }); %>
-            </table>
-
-        </div>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/database.html.twig b/modules/devel/webprofiler/templates/Collector/database.html.twig
deleted file mode 100644
index cbe1551..0000000
--- a/modules/devel/webprofiler/templates/Collector/database.html.twig
+++ /dev/null
@@ -1,168 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'database'}) }}" title="{{ 'Database'|t }}">
-        <img width="20" height="28" alt="{{ 'Database'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status sf-toolbar-status-{{ collector.colorCode }}">{{ collector.querycount }}</span>
-        {% if collector.querycount > 0 %}
-            <span class="sf-toolbar-info-piece-additional-detail">in {{ '%0.2f ms'|format(collector.time) }}</span>
-        {% endif %}
-    </a>
-    {% endset %}
-    {% set text %}
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'DB Queries'|t }}</b>
-        <span>{{ collector.querycount }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Query time'|t }}</b>
-        <span>{{ '%0.2f ms'|format(collector.time) }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Default database'|t }}</b>
-        <span>{{ collector.database.driver }}://{{ collector.database.host }}:{{ collector.database.port }}
-            /{{ collector.database.database }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="database" type="text/template">
-        <h2 class="panel__title">{{ 'Database'|t }}</h2>
-
-        <form class="panel__toolbar">
-            <div class="panel__filter--text">
-                <input id="edit-caller" class="js--live-filter" placeholder="{{ 'Caller'|t }}" type="text"/>
-                <label for="edit-caller" class="panel__filter-label">{{ 'Caller'|t }}</label>
-            </div>
-            <div class="panel__filter--select">
-                <select id="edit-type" class="js--live-filter">
-                    <option value="">{{ 'Any'|t }}</option>
-                    <option value="select">Select</option>
-                    <option value="insert">Insert</option>
-                    <option value="update">Update</option>
-                    <option value="create">Create</option>
-                    <option value="delete">Delete</option>
-                </select>
-                <label for="edit-type" class="panel__filter-label">{{ 'Query type'|t }}</label>
-            </div>
-            <div class="panel__filter--select">
-                <select id="edit-hightlighted" class="js--live-filter">
-                    <option value="">{{ 'Any'|t }}</option>
-                    <option value="1">{{ 'Yes'|t }}</option>
-                    <option value="0">{{ 'No'|t }}</option>
-                </select>
-                <label for="edit-type" class="panel__filter-label">{{ 'Slow queryes'|t }}</label>
-            </div>
-            <div class="panel__filter--select">
-                <select id="edit-database" class="js--live-filter">
-                    <option value="">{{ 'Any'|t }}</option>
-                    <% _.each(data.connections, function( item ){ %>
-                        <option value="<%- item %>"><%- item %></option>
-                    <% }) %>
-                </select>
-                <label for="edit-database" class="panel__filter-label">{{ 'Database'|t }}</label>
-            </div>
-
-            <div class="button--flat l-right js--code-toggle--global js--placeholder-visible">{{ 'Swap Placeholders'|t }}</div>
-
-        </form>
-
-        <% _.each( data.queries, function( item, key ){ %>
-        <div class="panel__container<% if (item.time > data.query_highlight_threshold) { %> is--hightlighted <% } %>"
-             data-wp-caller="<%- item.caller.class != null ? item.caller.class.toLowerCase() : '' %>"
-             data-wp-database="<%- item.database %>"
-             data-wp-type="<%- item.type %>"
-             data-wp-hightlighted="<%- (item.time > data.query_highlight_threshold) ? '1' : '0' %>">
-            <div class="panel__expand-header ">
-                    <pre <% if( item.query_args) { %> class="js--code-target"<% } %> >
-                        <code class="sql js--placeholder-query">
-                            <%- item.query %>
-                        </code>
-                        <% if( item.query_args) { %>
-                        <code class="sql js--clipboard-target is--hidden js--original-query">
-                            <%- item.query_args %>
-                        </code>
-                        <% } %>
-                    </pre>
-                <ul class="list--inline">
-                    <li><b>{{ 'Time'|t }}</b>: <%- Drupal.webprofiler.helpers.printTime(item.time) %></li>
-                    <li><b>{{ 'Caller'|t }}</b>: <%= Drupal.webprofiler.helpers.classLink({"file" : item.caller.file,
-                        "class" : item.caller.class, "line" : item.caller.line, "method" : item.caller.function}) %>
-                    </li>
-                    <li><b>{{ 'Database'|t }}</b>: <%- item.database %></li>
-                    <li><b>{{ 'Target'|t }}</b>: <%- item.target %></li>
-                </ul>
-
-                <% if(item.query_args){ %>
-                <div class="button--flat l-right js--code-toggle">{{ 'Swap Placeholders'|t }}</div>
-                <% } %>
-                <% if(item.args){ %>
-                <div class="button--flat l-right js--panel-toggle">{{ 'Info'|t }}</div>
-                <% } %>
-                <!--div class="button--flat l-right js--clipboard-trigger">{{ 'Copy Query'|t }}</div-->
-                <% if(item.explain){ %>
-                <div class="button--flat l-right js--explain-trigger"
-                     data-wp-queryPosition="<%- key %>"
-                        >{{ 'Explain'|t }}</div>
-                <% } %>
-            </div>
-
-            <% if(item.explain){ %>
-            <div class="loader--linear js--loader" style="display: none">
-                <div class="loader__bar"></div>
-                <div class="loader__bar"></div>
-                <div class="loader__bar"></div>
-            </div>
-            <div class="panel__expand-content js--explain-target"></div>
-            <% } %>
-
-            <% if(item.args){ %>
-            <div class="panel__expand-content">
-                <div class="wp-query-arguments">
-                    <table class="table--duo">
-                        <thead>
-                        <tr>
-                            <th>{{ 'placeholder'|t }}</th>
-                            <th>{{ 'value'|t }}</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <% _.each( item.args, function( item, key ){ %>
-                        <tr>
-                            <td><%- key %></td>
-                            <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                        </tr>
-                        <% }); %>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <% } %>
-        </div>
-        <% }); %>
-    </script>
-    <script id="wp-query-explain-template" type="text/template">
-        <table class="table--compact">
-            <thead>
-            <tr>
-                <% _.each(rc.data[1], function(value, key, list) { %>
-                <th><%= key %></th>
-                <% }); %>
-            </tr>
-            </thead>
-            <% _.each(rc.data, function(value) { %>
-            <tr>
-                <% _.each(value, function(value2, key, list) { %>
-                <td><%= value2 %></td>
-                <% }); %>
-            </tr>
-            <% }); %>
-        </table>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/devel.html.twig b/modules/devel/webprofiler/templates/Collector/devel.html.twig
deleted file mode 100644
index 7b6ba3a..0000000
--- a/modules/devel/webprofiler/templates/Collector/devel.html.twig
+++ /dev/null
@@ -1,24 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-        <a href="{{ url("devel.admin_settings") }}" title="{{ 'Devel menu'|t }}">
-            <img width="26" height="28" alt="{{ collector.title }}"
-                 src="data:image/png;base64,{{ collector.icon }}"/>
-        </a>
-    {% endset %}
-
-    {% set text %}
-    {% spaceless %}
-        {% for item in collector.links %}
-            <div class="sf-toolbar-info-piece">
-                <span>{{ item }}</span>
-            </div>
-        {% endfor %}
-    {% endspaceless %}
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/drupal.html.twig b/modules/devel/webprofiler/templates/Collector/drupal.html.twig
deleted file mode 100644
index 1c1dc48..0000000
--- a/modules/devel/webprofiler/templates/Collector/drupal.html.twig
+++ /dev/null
@@ -1,66 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <span>
-        <img width="13" height="28" alt="Drupal"
-             src="data:image/png;base64,{{ collector.icon }}">
-        <a href="https://www.drupal.org">
-            <span>{{ collector.version }}</span>
-        </a>
-        </span>
-    {% endset %}
-    {% set text %}
-    {% spaceless %}
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'Drupal version'|t }}</b>
-            <span>{{ collector.version }}</span>
-        </div>
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'Installed profile'|t }}</b>
-            <span>{{ collector.profile }}</span>
-        </div>
-
-        {% if collector.getGitCommit %}
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'Git commit'|t }}</b>
-            <span><abbr title="{{ collector.getGitCommit }}">{{ collector.getAbbrGitCommit }}</abbr></span>
-        </div>
-        {% endif %}
-
-        <div class="sf-toolbar-info-piece">
-            <span><a href="{{ collector.getConfigUrl }}"
-                     title="{{ 'Configure Webprofiler'|t }}">{{ 'Configure Webprofiler'|t }}</a></span>
-        </div>
-        <div class="sf-toolbar-info-piece">
-            <span><a href="{{ url("webprofiler.admin_list") }}"
-                     title="{{ 'View latest reports'|t }}">{{ 'View latest reports'|t }}</a></span>
-        </div>
-        <hr/>
-        <div class="sf-toolbar-info-piece">
-            <span><a href="https://www.drupal.org/documentation">{{ 'Drupal Documentation'|t }}</a></span>
-        </div>
-        <div class="sf-toolbar-info-piece">
-            <span><a href="https://www.drupal.org/contribute">{{ 'Get involved!'|t }}</a></span>
-        </div>
-    {% endspaceless %}
-    {% endset %}
-
-    {% if link %}
-        {% set icon %}
-        <a href="#">{{ icon }}</a>
-        {% endset %}
-    {% endif %}
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="drupal" type="text/template">
-        <h2 class="panel__title">{{ 'Drupal'|t }}</h2>
-        <div class="panel__container">
-
-        </div>
-    </script>
-{% endblock %}
-
diff --git a/modules/devel/webprofiler/templates/Collector/events.html.twig b/modules/devel/webprofiler/templates/Collector/events.html.twig
deleted file mode 100644
index 17087e1..0000000
--- a/modules/devel/webprofiler/templates/Collector/events.html.twig
+++ /dev/null
@@ -1,82 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-        <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'events'}) }}" title="{{ 'Events'|t }}">
-            <img width="20" height="28" alt="{{ 'Events'|t }}"
-                 src="data:image/png;base64,{{ collector.icon }}">
-            <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.getCalledListenersCount }}</span>
-        </a>
-    {% endset %}
-
-    {% set text %}
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'Called'|t }}</b>
-            <span>{{ collector.getCalledListenersCount }}</span>
-        </div>
-
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'Not called'|t }}</b>
-            <span>{{ collector.getNotCalledListenersCount }}</span>
-        </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="events" type="text/template">
-
-        <h2 class="panel__title">{{ 'Events'|t }}</h2>
-        <div class="panel__container">
-
-            <table class="table--duo">
-                <thead>
-                <th>{{ 'Called listeners'|t }}</th>
-                <th>{{ 'Class'|t }}</th>
-                <th>{{ 'Priority'|t }}</th>
-                </thead>
-                <tbody>
-                <% _.each( data.called_listeners, function( events, event_name ){ %>
-                    <% _.each( events, function( priority, priority_value ){ %>
-                        <% _.each( priority, function( listener ){ %>
-                            <tr>
-                                <td><%= event_name %></td>
-                                <% if( listener.clazz ) { %>
-                                    <td><%= Drupal.webprofiler.helpers.classLink(listener.clazz) %></td>
-                                <% } else { %>
-                                    <td><%= listener.service[0] %>::<%= listener.service[1] %></td>
-                                <% } %>
-                                <td><%= priority_value %></td>
-                            </tr>
-                        <% }); %>
-                    <% }); %>
-                <% }); %>
-                </tbody>
-            </table>
-
-            <table class="table--duo">
-                <thead>
-                <th>{{ 'Not called listeners'|t }}</th>
-                <th>{{ 'Service'|t }}</th>
-                <th>{{ 'Priority'|t }}</th>
-                </thead>
-                <tbody>
-                <% _.each( data.not_called_listeners, function( events, event_name ){ %>
-                <% _.each( events, function( priority, priority_value ){ %>
-                <% _.each( priority, function( listener ){ %>
-                <tr>
-                    <td><%= event_name %></td>
-                    <td><%= listener.service[0] %>::<%= listener.service[1] %></td>
-                    <td><%= priority_value %></td>
-                </tr>
-                <% }); %>
-                <% }); %>
-                <% }); %>
-                </tbody>
-            </table>
-        </div>
-
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/extensions.html.twig b/modules/devel/webprofiler/templates/Collector/extensions.html.twig
deleted file mode 100644
index 987a9fe..0000000
--- a/modules/devel/webprofiler/templates/Collector/extensions.html.twig
+++ /dev/null
@@ -1,95 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'drupal_extension'}) }}"
-       title="{{ 'Extensions'|t }}">
-        <img width="20" height="28" alt="{{ 'Extensions'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status{% if 150 < collector.countExtensions %} sf-toolbar-status-yellow{% endif %}">{{ collector.getExtensionsCount }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Active Modules'|t }}</b>
-        <span>{{ collector.getModulesCount }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Active Themes'|t }}</b>
-        <span>{{ collector.getThemesCount }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="drupal_extension" type="text/template">
-        <h2 class="panel__title">{{ 'Extensions'|t }}</h2>
-        <div class="tabs">
-            <input class="tabs__radio" type="radio" id="modules" name="tabs" checked/>
-            <input class="tabs__radio" type="radio" id="themes" name="tabs"/>
-            <ul class="tabs__tabs list--inline">
-                <li><label class="tabs__label" for="modules">{{ 'Modules'|t }}</label></li>
-                <li><label class="tabs__label" for="themes">{{ 'Themes'|t }}</label></li>
-            </ul>
-
-            <div class="tabs__panels">
-                <div class="tabs__panel">
-                    <div class="panel__container">
-                        <table class="table--compact">
-                            <thead>
-                            <tr>
-                                <th>{{ 'Name'|t }}</th>
-                                <th>{{ 'Path'|t }}</th>
-                                <th>{{ 'Info file'|t }}</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <% _.each( data.drupal_extension.modules, function( value, key ){ %>
-                            <% if(value.public_type == 'module') { %>
-                            <tr>
-                                <td><%- key %></td>
-                                <td><%- value.public_path %></td>
-                                <td><%= Drupal.webprofiler.helpers.classLink({"file" :
-                                    data.drupal_extension.installation_path + value.public_pathname, "class":
-                                    value.public_pathname, "line": 0}) %>
-                                </td>
-                            </tr>
-                            <% } %>
-                            <% }); %>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-
-                <div class="tabs__panel">
-                    <div class="panel__container">
-                        <table class="table--compact">
-                            <thead>
-                            <tr>
-                                <th>{{ 'Name'|t }}</th>
-                                <th>{{ 'Path'|t }}</th>
-                                <th>{{ 'Info file'|t }}</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <% _.each( data.drupal_extension.themes, function( value, key ){ %>
-                            <tr>
-                                <td><%- key %></td>
-                                <td><%- value.public_path %></td>
-                                <td><%= Drupal.webprofiler.helpers.classLink({"file" :
-                                    data.drupal_extension.installation_path + value.public_pathname, "class":
-                                    value.public_pathname, "line": 0}) %>
-                                </td>
-                            </tr>
-                            <% }); %>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/forms.html.twig b/modules/devel/webprofiler/templates/Collector/forms.html.twig
deleted file mode 100644
index a602f45..0000000
--- a/modules/devel/webprofiler/templates/Collector/forms.html.twig
+++ /dev/null
@@ -1,67 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'forms'}) }}" title="{{ 'Forms'|t }}">
-        <img width="21" height="28" alt="{{ 'Forms'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}">
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.getFormsCount }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-    {% spaceless %}
-        <div class="sf-toolbar-info-piece">
-            {% for keys, form in collector.getForms %}
-                <b>{{ keys }}</b>
-                <div><a href="{{ idelink(form.class.file, form.class.line)|raw }}">{{ abbr(form.class.class)|raw }}
-                        ::{{ form.class.method }}</a></div>
-            {% endfor %}
-        </div>
-    {% endspaceless %}
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="forms" type="text/template">
-        <h2 class="panel__title">{{ 'Forms'|t }}</h2>
-        <% if( data.forms && data.forms.length != 0){ %>
-            <% _.each( data.forms, function( item, key ){ %>
-                <div class="panel__container">
-
-                    <ul class="list--inline">
-                        <li><b>ID</b> <%= key %></li>
-                        <li><b>class</b> <%= Drupal.webprofiler.helpers.classLink(item.class) %></li>
-                    </ul>
-
-                    <table class="table--compact">
-                        <thead>
-                        <tr>
-                            <th>{{ 'form'|t }}</th>
-                            <th>{{ 'title'|t }}</th>
-                            <th>{{ 'access'|t }}</th>
-                            <th>{{ 'type'|t }}</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <% _.each( item.form, function( value , key ){ %>
-                        <tr>
-                            <td><%= key %></td>
-                            <td><% if(value['#title'] == null ){ %> {{ '-' }} <% } else { %> <%= value['#title'] %><% } %></td>
-                            <td><% if(value['#access'] == null ){ %> {{ 'null' }} <% } else { %> <%= value['#access'] %><% } %></td>
-                            <td><% if(value['#type'] == null ){ %> {{ 'null' }} <% } else { %> <%= value['#type'] %><% } %></td>
-                        </tr>
-                        <% }); %>
-                        </tbody>
-                    </table>
-                </div>
-            <% }); %>
-        <% } else { %>
-            <div class="panel__container">
-                <p>{{ 'No results'|t }}</p>
-            </div>
-        <% } %>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/http.html.twig b/modules/devel/webprofiler/templates/Collector/http.html.twig
deleted file mode 100644
index ea7ad04..0000000
--- a/modules/devel/webprofiler/templates/Collector/http.html.twig
+++ /dev/null
@@ -1,77 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'http'}) }}" title="{{ 'Http'|t }}">
-        <img width="20" height="28" alt="{{ 'Http'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.completedRequestsCount }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Completed'|t }}</b>
-        <span>{{ collector.completedRequestsCount }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-      <b>{{ 'Failed'|t }}</b>
-      <span>{{ collector.failedRequestsCount }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="http" type="text/template">
-        <h2 class="panel__title">{{ 'Http'|t }}</h2>
-
-        <% if( data.completed.length != 0 || data.failed.length != 0){ %>
-        <% _.each( data.completed, function( item ) { %>
-        <div class="panel__container">
-            <div class="panel__expand-header">
-                <ul class="list--inline">
-                    <li>
-                        <b>{{ 'Host'|t }}</b>: <%- item.request.uri.host %>
-                    </li>
-                    <li>
-                        <b>{{ 'Path'|t }}</b>: <%- item.request.uri.path %>
-                    </li>
-                    <li>
-                        <b>{{ 'Status'|t }}</b>: <%- item.response.status %> <%- item.response.phrase %>
-                    </li>
-                </ul>
-                <div class="button--flat l-right js--panel-toggle">{{ 'Info'|t }}</div>
-            </div>
-
-            <div class="panel__expand-content">
-                <table class="table--duo">
-                    <% _.each( item.request, function( message, key ) { %>
-
-                    <% if(key == 'stats') { key = 'stats (time in milliseconds and data in bytes)' } %>
-
-                    <tr>
-                        <th><%- key %></th>
-                        <td><%= Drupal.webprofiler.helpers.frm(message) %></td>
-                    </tr>
-                    <% }); %>
-                </table>
-                <table class="table--duo">
-                    <% _.each( item.response, function( header, key ) { %>
-                    <tr>
-                        <th><%- key %></th>
-                        <td><%= Drupal.webprofiler.helpers.frm(header) %></td>
-                    </tr>
-                    <% }); %>
-                </table>
-            </div>
-        </div>
-        <% }); %>
-        <% } else { %>
-        <div class="panel__container">
-            <p>{{ 'No external http calls'|t }}</p>
-        </div>
-        <% } %>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/mail.html.twig b/modules/devel/webprofiler/templates/Collector/mail.html.twig
deleted file mode 100644
index 3b34062..0000000
--- a/modules/devel/webprofiler/templates/Collector/mail.html.twig
+++ /dev/null
@@ -1,76 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: "mail"}) }}" title="{{ 'Mail'|t }}">
-        <img height="28" alt="{{ 'Mail'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-status">{{ collector.mailsent }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-    <div class="sf-toolbar-info-piece">
-        <b>Mail sent</b>
-        <span>{{ collector.mailsent }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="mail" type="text/template">
-        <h2 class="panel__title">{{ 'Mail dashboard'|t }}</h2>
-
-        <% if( data.mail.length != 0){ %>
-        <% _.each( data.mail, function( item ) { %>
-        <div class="panel__container">
-            <div class="panel__expand-header">
-                <ul class="list--inline">
-                    <li>
-                        <b>{{ 'Plugin'|t }}</b>: <%= Drupal.webprofiler.helpers.classLink(item.method) %>
-                    </li>
-                    <li>
-                        <b>{{ 'ID'|t }}</b>: <%- item.message.id %>
-                    </li>
-                    <li>
-                        <b>{{ 'To'|t }}</b>: <%- item.message.to %>
-                    </li>
-                    <li>
-                        <b>{{ 'Subject'|t }}</b>: <%- item.message.subject %>
-                    </li>
-                </ul>
-                <div class="button--flat l-right js--panel-toggle">{{ 'Info'|t }}</div>
-            </div>
-
-            <div class="panel__expand-content">
-                <table class="table--duo">
-                <% _.each( item.message, function( message, key ) { %>
-                <% if( key != 'params' && key != 'headers' ){ %>
-                <tr>
-                    <th><%- key %></th>
-                    <td><%- message %></td>
-                </tr>
-                <% } %>
-                <% }); %>
-                </table>
-                <table class="table--duo">
-                    <% _.each( item.message.headers, function( header, key ) { %>
-                    <tr>
-                        <th><%- key %></th>
-                        <td><%- header %></td>
-                    </tr>
-                    <% }); %>
-                </table>
-            </div>
-
-        </div>
-        <% }); %>
-        <% } else { %>
-        <div class="panel__container">
-            <p>{{ 'No mail sent'|t }}</p>
-        </div>
-        <% } %>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/performance_timing.html.twig b/modules/devel/webprofiler/templates/Collector/performance_timing.html.twig
deleted file mode 100644
index 5e8cf41..0000000
--- a/modules/devel/webprofiler/templates/Collector/performance_timing.html.twig
+++ /dev/null
@@ -1,76 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'performance_timing'}) }}"
-       title="{{ 'Performance Timing'|t }}">
-        <img width="20" height="28" alt="{{ 'Performance Timing'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span id="wp--frontend__toolbar"></span>
-    </a>
-    {% endset %}
-    {% set text %}
-
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'DNS lookup'|t }}</b>
-        <span id="wp--frontend__dns"></span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'TCP handshake'|t }}</b>
-        <span id="wp--frontend__tcp"></span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'TTFB' }}</b>
-        <span id="wp--frontend__ttfb"></span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Data download'|t }}</b>
-        <span id="wp--frontend__data"></span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'DOM building'|t }}</b>
-        <span id="wp--frontend__dom"></span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-
-    <script>
-        var perf = performance.timing,
-                dns = parseInt(perf.domainLookupEnd - perf.domainLookupStart),
-                tcp = parseInt(perf.connectEnd - perf.connectStart),
-                ttfb = parseInt(perf.responseStart - perf.connectEnd),
-                data = parseInt(perf.responseEnd - perf.responseStart),
-                dom = parseInt(perf.loadEventStart - perf.responseEnd);
-
-        Webprofiler.ajax('{{ url("webprofiler.frontend.save", {profile: token}) }}', false, JSON.stringify(perf));
-
-        document.getElementById('wp--frontend__toolbar').innerHTML = ttfb + ' ms';
-        document.getElementById('wp--frontend__dns').innerHTML = dns + ' ms';
-        document.getElementById('wp--frontend__tcp').innerHTML = tcp + ' ms';
-        document.getElementById('wp--frontend__ttfb').innerHTML = ttfb + ' ms';
-        document.getElementById('wp--frontend__data').innerHTML = data + ' ms';
-        document.getElementById('wp--frontend__dom').innerHTML = dom + ' ms';
-    </script>
-{% endblock %}
-
-{% block panel %}
-    <script id="performance_timing" type="text/template">
-        <h2 class="panel__title">{{ 'Performance timing'|t }}</h2>
-        <div class="panel__container">
-            <% if(data.performance && data.performance.computed) { %>
-                <table class="table--duo">
-                    <% _.each( data.performance.computed, function( item, key ){ %>
-                    <tr>
-                        <th><%- key %></th>
-                        <td><%- Drupal.webprofiler.helpers.printTime(item) %></td>
-                    </tr>
-                    <% }); %>
-                </table>
-            <% } else { %>
-                <p>{{ 'No collected data, maybe this profile hasn\'t been generated by a browser GET o has been generated by an unsupported browser.'|t }}</p>
-            <% } %>
-        </div>
-    </script>
-{% endblock %}
\ No newline at end of file
diff --git a/modules/devel/webprofiler/templates/Collector/php_config.html.twig b/modules/devel/webprofiler/templates/Collector/php_config.html.twig
deleted file mode 100644
index c91f9f3..0000000
--- a/modules/devel/webprofiler/templates/Collector/php_config.html.twig
+++ /dev/null
@@ -1,52 +0,0 @@
-{% block toolbar %}
-    {# PHP Information #}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'php_config'}) }}"
-       title="{{ 'PHP config'|t }}">
-        <img width="26" height="28" alt="{{ 'PHP config'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}">
-    </a>
-    {% endset %}
-    {% set text %}
-    {% spaceless %}
-        <div class="sf-toolbar-info-piece sf-toolbar-info-php">
-            <b>PHP</b>
-            <span><a href="{{ url("system.php") }}">{{ collector.phpversion }}</a></span>
-        </div>
-        <div class="sf-toolbar-info-piece sf-toolbar-info-php-ext">
-            <b>{{ 'PHP Extensions'|t }}</b>
-            <span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasxdebug ? 'green' : 'red' }}">xdebug</span>
-            <span class="sf-toolbar-status sf-toolbar-status-{{ collector.hasaccelerator ? 'green' : 'red' }}">accel</span>
-        </div>
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'PHP SAPI'|t }}</b>
-            <span>{{ collector.sapiName }}</span>
-        </div>
-        <div class="sf-toolbar-info-piece">
-            <b>Token</b>
-            <span>{{ token }}</span>
-        </div>
-    {% endspaceless %}
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="php_config" type="text/template">
-        <h2 class="panel__title">{{ 'PHP config'|t }}</h2>
-        <div class="panel__container">
-            <table class="table--duo">
-                <% _.each( data, function( item, key ){ %>
-                <tr>
-                    <th><%- key %></th>
-                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                </tr>
-                <% }); %>
-            </table>
-        </div>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/request.html.twig b/modules/devel/webprofiler/templates/Collector/request.html.twig
deleted file mode 100644
index 4a1e1e3..0000000
--- a/modules/devel/webprofiler/templates/Collector/request.html.twig
+++ /dev/null
@@ -1,206 +0,0 @@
-{% block toolbar %}
-    {% set request_handler %}
-    <a href="{{ idelink(collector.controller.file, collector.controller.line)|raw }}">{{ abbr(collector.controller.class)|raw }}
-        ::{{ collector.controller.method }}</a>
-    {% endset %}
-
-    {% set request_status_code_color = (400 > collector.statuscode) ? ((200 == collector.statuscode) ? 'green' : 'yellow') : 'red' %}
-
-    {% set request_route = collector.route ? collector.route : 'NONE' %}
-
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'request'}) }}" title="{{ 'Request'|t }}">
-        <img width="28" height="28" alt="{{ 'Request'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}">
-    <span class="sf-toolbar-status sf-toolbar-status-{{ request_status_code_color }}"
-          title="{{ collector.statustext }}">{{ collector.statuscode }}</span>
-    </a>
-    {% endset %}
-
-    {% set text %}
-    {% spaceless %}
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'Status'|t }}</b>
-            <span class="sf-toolbar-status sf-toolbar-status-{{ request_status_code_color }}">{{ collector.statuscode }}</span> {{ collector.statustext }}
-        </div>
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'Controller'|t }}</b>
-            {{ request_handler }}
-        </div>
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'Route name'|t }}</b>
-            <span>{{ request_route }}</span>
-        </div>
-    {% endspaceless %}
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="request" type="text/template">
-        <h2 class="panel__title">{{ 'Request'|t }}</h2>
-
-        <% if (!_.isEmpty(data.request_query)) { %>
-        <div class="panel__container">
-            <table class="table--duo">
-                <thead>
-                <th>{{ 'GET Parameters'|t }}</th>
-                <th>{{ 'Value'|t }}</th>
-                </thead>
-                <tbody>
-                <% _.each( data.request_query, function( item, key ){ %>
-                <tr>
-                    <td><%- key %></td>
-                    <td><%- item %></td>
-                </tr>
-                <% }); %>
-                </tbody>
-            </table>
-        </div>
-        <% } %>
-
-        <% if (!_.isEmpty(data.request_request)) { %>
-        <div class="panel__container">
-            <table class="table--duo">
-                <thead>
-                <th>{{ 'POST Parameters'|t }}</th>
-                <th>{{ 'Value'|t }}</th>
-                </thead>
-                <tbody>
-                <% _.each( data.request_request, function( item, key ){ %>
-                <tr>
-                    <td><%- key %></td>
-                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                </tr>
-                <% }); %>
-                </tbody>
-            </table>
-        </div>
-        <% } %>
-
-        <div class="panel__container">
-            <table class="table--duo">
-                <thead>
-                <th>{{ 'Attributes'|t }}</th>
-                <th>{{ 'Value'|t }}</th>
-                </thead>
-                <tbody>
-                <% _.each( data.request_attributes, function( item, key ){ %>
-                <tr>
-                    <td><%- key %></td>
-
-                    <% if(key == '_controller') { %>
-                    <td><%= Drupal.webprofiler.helpers.classLink(data.controller) %></td>
-                    <% } else { %>
-                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                    <% } %>
-                </tr>
-                <% }); %>
-                </tbody>
-            </table>
-        </div>
-
-        <% if (!_.isEmpty(data.request_cookies)) { %>
-        <div class="panel__container">
-            <table class="table--duo">
-                <thead>
-                <th>{{ 'Cookies'|t }}</th>
-                <th>{{ 'Value'|t }}</th>
-                </thead>
-                <tbody>
-                <% _.each( data.request_cookies, function( item, key ){ %>
-                <tr>
-                    <td><%- key %></td>
-                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                </tr>
-                <% }); %>
-                </tbody>
-            </table>
-        </div>
-        <% } %>
-
-        <div class="panel__container">
-            <table class="table--duo">
-                <thead>
-                <th>{{ 'Request headers'|t }}</th>
-                <th>{{ 'Value'|t }}</th>
-                </thead>
-                <tbody>
-                <% _.each( data.request_headers, function( item, key ){ %>
-                <tr>
-                    <td><%- key %></td>
-                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                </tr>
-                <% }); %>
-                </tbody>
-            </table>
-        </div>
-
-        <% if (!_.isEmpty(data.content)) { %>
-        <div class="panel__container">
-            <div class="h--word-broken"><%- data.content %></div>
-        </div>
-        <% } %>
-
-        <% if (!_.isEmpty(data.access_check)) { %>
-        <div class="panel__container">
-            <table class="table--duo">
-                <thead>
-                <th>{{ 'Path'|t }}</th>
-                <th>{{ 'Access check'|t }}</th>
-                </thead>
-                <tbody>
-                <% _.each(data.access_check, function(items, key){ %>
-                <tr>
-                    <td><%- key %></td>
-                    <td>
-                        <% _.each(items, function(item){ %>
-                        <%- item.service_id %>
-                        <% }); %>
-                    </td>
-                </tr>
-                <% }); %>
-                </tbody>
-            </table>
-        </div>
-        <% } %>
-
-        <div class="panel__container">
-            <table class="table--duo">
-                <thead>
-                <th>{{ 'Server Parameters'|t }}</th>
-                <th>{{ 'Value'|t }}</th>
-                </thead>
-                <tbody>
-                <% _.each( data.request_server, function( item, key ){ %>
-                <tr>
-                    <td><%- key %></td>
-                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                </tr>
-                <% }); %>
-                </tbody>
-            </table>
-        </div>
-
-        <div class="panel__container">
-            <table class="table--duo">
-                <thead>
-                <th>{{ 'Response headers'|t }}</th>
-                <th>{{ 'Value'|t }}</th>
-                </thead>
-                <tbody>
-                <% _.each( data.response_headers, function( item, key ){ %>
-                <tr>
-                    <td><%- key %></td>
-                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                </tr>
-                <% }); %>
-                </tbody>
-            </table>
-        </div>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/routing.html.twig b/modules/devel/webprofiler/templates/Collector/routing.html.twig
deleted file mode 100644
index 7670011..0000000
--- a/modules/devel/webprofiler/templates/Collector/routing.html.twig
+++ /dev/null
@@ -1,50 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'routing'}) }}" title="{{ 'Routing'|t }}">
-        <img width="20" height="28" alt="{{ 'Routing'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}">
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.getRoutesCount }}</span>
-    </a>
-
-    {% endset %}
-
-    {% set text %}
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Routes'|t }}</b>
-        <span>{{ collector.getRoutesCount }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="routing" type="text/template">
-        <h2 class="panel__title">{{ 'Routing'|t }}</h2>
-        <div class="panel__container">
-            <table class="table--duo">
-                <thead>
-                <tr>
-                    <th>{{ 'name'|t }}</th>
-                    <th>{{ 'path'|t }}</th>
-                </tr>
-                </thead>
-                <tbody>
-                <% _.each( data.routing, function( item ){ %>
-                    <tr>
-                        <td>
-                            <%- item.name %>
-                        </td>
-                        <td>
-                            <%- item.path %>
-                        </td>
-                    </tr>
-                <% }); %>
-                </tbody>
-            </table>
-        </div>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/services.html.twig b/modules/devel/webprofiler/templates/Collector/services.html.twig
deleted file mode 100644
index dab3e55..0000000
--- a/modules/devel/webprofiler/templates/Collector/services.html.twig
+++ /dev/null
@@ -1,149 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'services'}) }}" title="{{ 'Services'|t }}">
-        <img width="20" height="28" alt="{{ 'Services'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.getInitializedServicesCount }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Initialized'|t }}</b>
-        <span>{{ collector.getInitializedServicesCount }} ({{ collector.getInitializedServicesWithoutWebprofilerCount }}
-            )</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Available'|t }}</b>
-        <span>{{ collector.getServicesCount }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="services" type="text/template">
-        <h2 class="panel__title">{{ 'Services'|t }}</h2>
-        <div class="tabs">
-            <input class="tabs__radio" type="radio" id="services" name="tabs" checked/>
-            <input class="tabs__radio" type="radio" id="http_middleware" name="tabs"/>
-            <ul class="tabs__tabs list--inline">
-                <li><label class="tabs__label" for="services">services</label></li>
-                <li><label class="tabs__label" for="http_middleware">middleware</label></li>
-            </ul>
-
-            <div class="tabs__panels">
-                <div class="tabs__panel">
-                    <form class="panel__toolbar">
-                        <div class="panel__filter--text">
-                            <input id="edit-sid" class="js--live-filter" placeholder="{{ 'ID'|t }}" type="text"/>
-                            <label for="edit-sid" class="panel__filter-label">{{ 'ID'|t }}</label>
-                        </div>
-                        <div class="panel__filter--text">
-                            <input id="edit-class" class="js--live-filter" placeholder="{{ 'Class'|t }}" type="text"/>
-                            <label for="edit-class" class="panel__filter-label">{{ 'Class'|t }}</label>
-                        </div>
-                        <div class="panel__filter--text">
-                            <input id="edit-tags" class="js--live-filter" placeholder="{{ 'Tags'|t }}" type="text"/>
-                            <label for="edit-tags" class="panel__filter-label">{{ 'Tags'|t }}</label>
-                        </div>
-                        <div class="panel__filter--select">
-                            <select id="edit-initialized" class="js--live-filter">
-                                <option value="">{{ 'Any'|t }}</option>
-                                <option value="1">{{ 'Yes'|t }}</option>
-                                <option value="0">{{ 'No'|t }}</option>
-                            </select>
-                            <label for="edit-initialized" class="panel__filter-label">{{ 'Initialized'|t }}</label>
-                        </div>
-                    </form>
-
-                    <% _.each( data.services, function( item, key ){ %>
-
-                    <% clazz = Drupal.webprofiler.helpers.classLink({"file" : item.value.file, "class" :
-                    item.value.class}) %>
-                    <% depends = _.map(item.outEdges, function(el) { return el.id; }).join(', ') %>
-                    <% tags = _.map(item.value.tags, function(el, key) { return key; }).join(', ') %>
-
-                    <div class="panel__container"
-                         data-wp-sid="<%- key %>"
-                         data-wp-class="<%- item.value.class %>"
-                         data-wp-tags="<%- tags %>"
-                         data-wp-initialized="<%- (item.initialized) ? '1' : '0' %>">
-
-                        <div class="panel__expand-header">
-                            <ul class="list--inline">
-                                <li>
-                                    <b>{{ 'ID'|t }}</b> <%- key %>
-                                </li>
-                                <% if (clazz) { %>
-                                <li>
-                                    <b>{{ 'Class'|t }}</b> <%= clazz %>
-                                </li>
-                                <% } %>
-                                <li>
-                                    <b>{{ 'Initialized'|t }}</b> <%- (item.initialized) ? '{{ 'Yes'|t }}' : '{{ 'No'|t }}' %>
-                                </li>
-                                <% if ( item.time ) { %>
-                                    <li>
-                                        <b>{{ 'Count'|t }}</b> <%- item.time.count %>
-                                    </li>
-                                    <li>
-                                        <b>{{ 'Time'|t }}</b> <%- Drupal.webprofiler.helpers.printTime(item.time.time) %>
-                                    </li>
-                                <% } %>
-                            </ul>
-                            <% if ( tags.length > 0 || depends.length > 0 ) { %>
-                            <div class="button--flat l-right js--panel-toggle">{{ 'Info'|t }}</div>
-                            <% } %>
-                        </div>
-
-                        <% if ( tags.length > 0 || depends.length > 0 ) { %>
-                        <div class="panel__expand-content">
-                            <div class="wp-query-arguments">
-                                <table class="table--duo">
-                                    <tr>
-                                        <th>{{ 'Tags'|t }}</th>
-                                        <td><%- (tags) ? tags : '-' %></td>
-                                    </tr>
-                                    <tr>
-                                        <th>{{ 'Depends'|t }}</th>
-                                        <td><%- (depends) ? depends : '-' %></td>
-                                    </tr>
-                                </table>
-                            </div>
-                        </div>
-                        <% } %>
-                    </div>
-                    <% }); %>
-                </div>
-
-                <div class="tabs__panel">
-                    <div class="panel__container">
-                        <table>
-                            <thead>
-                            <tr>
-                                <th>{{ 'id'|t }}</th>
-                                <th>{{ 'class'|t }}</th>
-                                <th>{{ 'priority'|t }}</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <% _.each( data.http_middleware, function( item, key ){ %>
-                            <% clazz = Drupal.webprofiler.helpers.classLink(item.value.handle_method) %>
-                            <tr>
-                                <td><%- key %></td>
-                                <td><%= clazz %></td>
-                                <td><%- item.value.tags.http_middleware[0].priority %></td>
-                            </tr>
-                            <% }); %>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/state.html.twig b/modules/devel/webprofiler/templates/Collector/state.html.twig
deleted file mode 100644
index e19b13b..0000000
--- a/modules/devel/webprofiler/templates/Collector/state.html.twig
+++ /dev/null
@@ -1,36 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'state'}) }}" title="{{ 'State'|t }}">
-        <img width="20" height="28" alt="{{ 'State'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.getStateKeysCount }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'State get'|t }}</b>
-        <span>{{ collector.getStateKeysCount }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="state" type="text/template">
-        <h2 class="panel__title">{{ 'State'|t }}</h2>
-        <div class="panel__container">
-            <table>
-                <% _.each( data.state_get, function( item, key ){ %>
-                <tr>
-                    <th><%- key %></th>
-                    <td><%= Drupal.webprofiler.helpers.frm(item) %></td>
-                </tr>
-                <% }); %>
-            </table>
-        </div>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/theme.html.twig b/modules/devel/webprofiler/templates/Collector/theme.html.twig
deleted file mode 100644
index 66fa5fd..0000000
--- a/modules/devel/webprofiler/templates/Collector/theme.html.twig
+++ /dev/null
@@ -1,147 +0,0 @@
-{% block toolbar %}
-    {% set negotiator %}
-    <a href="{{ idelink(collector.themeNegotiator.class.file, collector.themeNegotiator.class.line)|raw }}">{{ abbr(collector.themeNegotiator.class.class)|raw }}
-        ::{{ collector.themeNegotiator.class.method }}</a>
-    {% endset %}
-    {% set time = collector.templatecount ? '%0.0f ms'|format(collector.time) : 'n/a' %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'theme'}) }}" title="{{ 'Theme'|t }}">
-        <img width="20" height="28" alt="{{ 'Theme'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.activeTheme.name }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Name'|t }}</b>
-        <span>{{ collector.activeTheme.name }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Engine'|t }}</b>
-        <span>{{ collector.activeTheme.engine }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Negotiator'|t }}</b>
-        <span>{{ negotiator }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Render Time'|t }}</b>
-        <span>{{ time }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Template Calls'|t }}</b>
-        <span>{{ collector.templatecount }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Block Calls'|t }}</b>
-        <span>{{ collector.blockcount }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Macro Calls'|t }}</b>
-        <span>{{ collector.macrocount }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="theme" type="text/template">
-        <h2 class="panel__title">{{ 'Theme'|t }}</h2>
-        <div class="panel__container">
-            <table class="table--fixed">
-                <tr>
-                    <th>{{ 'Name'|t }}</th>
-                    <td><%- data.activeTheme.name %> (<a href="/admin/appearance/settings/bartik">{{ 'Edit'|t }})</a>
-                    </td>
-                </tr>
-                <tr>
-                    <th>{{ 'Engine'|t }}</th>
-                    <td><%- data.activeTheme.engine %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Base theme'|t }}</th>
-                    <td><%- data.activeTheme.extension.base_theme %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Regions'|t }}</th>
-                    <td><%= Drupal.webprofiler.helpers.frm(data.activeTheme.regions) %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Libraries'|t }}</th>
-                    <td><%= Drupal.webprofiler.helpers.frm(data.activeTheme.libraries) %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Style sheets removed'|t }}</th>
-                    <td><%= Drupal.webprofiler.helpers.frm(data.activeTheme.styleSheetsRemove) %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Path'|t }}</th>
-                    <td><%- data.activeTheme.path %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Negotiator'|t }}</th>
-                    <td><%= Drupal.webprofiler.helpers.classLink(data.negotiator.class) %></td>
-                </tr>
-            </table>
-        </div>
-
-        <div class="panel__container">
-            <ul class="list--inline">
-                <li><b>{{ 'Twig statistics'|t }}</b></li>
-            </ul>
-
-            <table class="table--fixed">
-                <tr>
-                    <th>{{ 'Total Render Time'|t }}</th>
-                    <td><%- Drupal.webprofiler.helpers.printTime(data.twig.render_time) %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Template Calls'|t }}</th>
-                    <td><%- data.twig.template_count %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Block Calls'|t }}</th>
-                    <td><%- data.twig.block_count %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Macro Calls'|t }}</th>
-                    <td><%- data.twig.macro_count %></td>
-                </tr>
-            </table>
-        </div>
-
-        <div class="panel__container">
-            <ul class="list--inline">
-                <li><b>{{ 'Twig rendered templates'|t }}</b></li>
-            </ul>
-
-            <table class="table--fixed">
-                <thead>
-                <tr>
-                    <th>{{ 'template'|t }}</th>
-                    <th>{{ 'count'|t }}</th>
-                </tr>
-                </thead>
-                <% _.each( data.twig.templates, function( item, key ){ %>
-                <tr>
-                    <th><%- key %></th>
-                    <td><%- item %></td>
-                </tr>
-                <% }); %>
-            </table>
-        </div>
-
-        <div class="panel__container">
-            <ul class="list--inline">
-                <li><b>{{ 'Twig callgraph'|t }}</b></li>
-            </ul>
-
-            <%= data.twig.callgraph %>
-        </div>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/time.html.twig b/modules/devel/webprofiler/templates/Collector/time.html.twig
deleted file mode 100644
index 9aeb76a..0000000
--- a/modules/devel/webprofiler/templates/Collector/time.html.twig
+++ /dev/null
@@ -1,59 +0,0 @@
-{% block toolbar %}
-    {% set duration = collector.events|length ? '%.0f ms'|format(collector.duration) : 'n/a' %}
-    {% set memory = '%.1f MB'|format(collector.memory / 1024 / 1024) %}
-    {% set total_memory = collector.memoryLimit == -1 ? '&infin;' : '%.1f MB'|format(collector.memoryLimit / 1024)|escape %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: "time"}) }}" title="{{ 'Timeline'|t }}">
-        <img width="20" height="28" alt="{{ 'Timeline'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span>{{ duration }} / {{ memory }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Total time'|t }}</b>
-        <span>{{ duration }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Memory'|t }}</b>
-        <span>{{ memory }} / {{ total_memory }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="time" type="text/template">
-        <h2 class="panel__title">{{ 'Timeline'|t }}</h2>
-
-        <div class="panel__container">
-            <ul class="list--inline">
-                <li>
-                    <b>{{ 'Total time'|t }}</b> <%- Drupal.webprofiler.helpers.printTime(data.duration) %>
-                </li>
-                <li>
-                    <b>{{ 'Initialization time'|t }}</b> <%- Drupal.webprofiler.helpers.printTime(data.initTime) %>
-                </li>
-            </ul>
-            <br/><br/>
-
-            <div class="timeline">
-                <div class="timeline__legends">
-                    <span class="timeline__legends--default">default</span>
-                    <span class="timeline__legends--section">section</span>
-                    <span class="timeline__legends--event_listener">event_listener</span>
-                    <span class="timeline__legends--event_listener_loading">event_listener_loading</span>
-                    <span class="timeline__legends--template">template</span>
-                    <span class="timeline__legends--service">service</span>
-                </div>
-
-                <div id="timeline"></div>
-            </div>
-        </div>
-
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/translations.html.twig b/modules/devel/webprofiler/templates/Collector/translations.html.twig
deleted file mode 100644
index 08683ba..0000000
--- a/modules/devel/webprofiler/templates/Collector/translations.html.twig
+++ /dev/null
@@ -1,85 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: "translations"}) }}"
-       title="{{ 'Translations'|t }}">
-        <img height="28" alt="{{ 'Translations'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-status">{{ collector.untranslatedCount }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Translated'|t }}</b>
-        <span>{{ collector.translatedCount }}</span>
-    </div>
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Untranslated'|t }}</b>
-        <span>{{ collector.untranslatedCount }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="translations" type="text/template">
-        <h2 class="panel__title">{{ 'Translations'|t }}</h2>
-        <div class="tabs">
-            <input class="tabs__radio" type="radio" id="translated" name="tabs" checked/>
-            <input class="tabs__radio" type="radio" id="untranslated" name="tabs"/>
-            <ul class="tabs__tabs list--inline">
-                <li><label class="tabs__label" for="translated">{{ 'Translated'|t }}</label></li>
-                <li><label class="tabs__label" for="untranslated">{{ 'Unranslated'|t }}</label></li>
-            </ul>
-
-            <div class="tabs__panels">
-                <div class="tabs__panel">
-                    <div class="panel__container">
-                        <table class="table--duo">
-                            <thead>
-                            <tr>
-                                <th>{{ 'Original'|t }}</th>
-                                <th>{{ 'Tanslation'|t }}</th>
-                                <th>{{ 'Action'|t }}</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <% _.each( data.translations.translated, function( value, key ){ %>
-                            <tr>
-                                <td><%= key %></td>
-                                <td><%= value %></td>
-                                <td><a href="<%- data.user_interface_translations_path %>?string=<%- key%>" target="_blank" class="h--word-intact">{{ 'Edit'|t }}</a></td>
-                            </tr>
-                            <% }); %>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-
-                <div class="tabs__panel">
-                    <div class="panel__container">
-                        <table class="table--duo">
-                            <thead>
-                            <tr>
-                                <th>{{ 'Original'|t }}</th>
-                                <th>{{ 'Action'|t }}</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <% _.each( data.translations.untranslated, function( value, key ){ %>
-                            <tr>
-                                <td><%= key %></td>
-                                <td><a href="<%- data.user_interface_translations_path %>?string=<%- key%>" target="_blank" class="h--word-intact">{{ 'Edit'|t }}</a></td>
-                            </tr>
-                            <% }); %>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/user.html.twig b/modules/devel/webprofiler/templates/Collector/user.html.twig
deleted file mode 100644
index ef36997..0000000
--- a/modules/devel/webprofiler/templates/Collector/user.html.twig
+++ /dev/null
@@ -1,63 +0,0 @@
-{% block toolbar %}
-    {% set color_code = (collector.authenticated) ? 'green' : 'red' %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'user'}) }}" title="{{ 'User'|t }}">
-        <img width="24" height="28" alt="{{ 'User'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status sf-toolbar-status-{{ color_code }}">
-            {% if collector.authenticated %}
-                {{ collector.username }}
-            {% endif %}
-        </span>
-    </a>
-    {% endset %}
-    {% set text %}
-    {% if collector.authenticated %}
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'Logged in as'|t }}</b>
-            <span class="sf-toolbar-status sf-toolbar-status-{{ color_code }}">{{ collector.username }}</span>
-        </div>
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'Roles'|t }}</b>
-            <span>{{ collector.roles|join(', ') }}</span>
-        </div>
-        <div class="sf-toolbar-info-piece">
-            <b>{{ 'Authenticated by'|t }}</b>
-            <span>{{ collector.provider }}</span>
-        </div>
-    {% else %}
-        {{ collector.anonymous }}
-    {% endif %}
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="user" type="text/template">
-        <h2 class="panel__title">{{ 'User'|t }}</h2>
-        <div class="panel__container">
-            <table class="table--duo">
-                <tr>
-                    <th>{{ 'Name'|t }}</th>
-                    <td><%- data.name %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Authenticated'|t }}</th>
-                    <td><%- data.authenticated %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Provider'|t }}</th>
-                    <td><%- data.provider %></td>
-                </tr>
-                <tr>
-                    <th>{{ 'Roles'|t }}</th>
-                    <td><%- data.roles.join(', ') %></td>
-                </tr>
-            </table>
-        </div>
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Collector/views.html.twig b/modules/devel/webprofiler/templates/Collector/views.html.twig
deleted file mode 100644
index d4a2e2f..0000000
--- a/modules/devel/webprofiler/templates/Collector/views.html.twig
+++ /dev/null
@@ -1,58 +0,0 @@
-{% block toolbar %}
-    {% set icon %}
-    <a href="{{ url("webprofiler.dashboard", {profile: token}, {fragment: 'views'}) }}" title="{{ 'Views'|t }}">
-        <img width="20" height="28" alt="{{ 'Views'|t }}"
-             src="data:image/png;base64,{{ collector.icon }}"/>
-        <span class="sf-toolbar-info-piece-additional sf-toolbar-status">{{ collector.getViewsCount }}</span>
-    </a>
-    {% endset %}
-    {% set text %}
-
-    <div class="sf-toolbar-info-piece">
-        <b>{{ 'Views'|t }}</b>
-        <span>{{ collector.getViewsCount }}</span>
-    </div>
-    {% endset %}
-
-    <div class="sf-toolbar-block">
-        <div class="sf-toolbar-icon">{{ icon|default('') }}</div>
-        <div class="sf-toolbar-info">{{ text|default('') }}</div>
-    </div>
-{% endblock %}
-
-{% block panel %}
-    <script id="views" type="text/template">
-        <h2 class="panel__title">{{ 'Views'|t }}</h2>
-        <div class="panel__container">
-            <% if( data.views.length != 0){ %>
-            <table class="table--duo">
-                <thead>
-                <tr>
-                    <th>{{ 'name'|t }}</th>
-                    <th>{{ 'display'|t }}</th>
-                    <th>{{ 'build time'|t }}</th>
-                    <th>{{ 'execute time'|t }}</th>
-                    <th>{{ 'render time'|t }}</th>
-                    <th>{{ 'Action'|t }}</th>
-                </tr>
-                </thead>
-                <tbody>
-                <% _.each( data.views, function( item ){ %>
-                <tr>
-                    <td><%- item.id %></td>
-                    <td><%- item.current_display %></td>
-                    <td><%- Drupal.webprofiler.helpers.printTime(item.build_time) %></td>
-                    <td><%- Drupal.webprofiler.helpers.printTime(item.execute_time) %></td>
-                    <td><%- Drupal.webprofiler.helpers.printTime(item.render_time) %></td>
-                    <td><a href="<%- item.route %>">{{ 'Edit'|t }}</a></td>
-                </tr>
-                <% }); %>
-                </tbody>
-            </table>
-            <% } else { %>
-            <p>{{ 'No results'|t }}</p>
-            <% } %>
-        </div>
-
-    </script>
-{% endblock %}
diff --git a/modules/devel/webprofiler/templates/Profiler/webprofiler_dashboard.html.twig b/modules/devel/webprofiler/templates/Profiler/webprofiler_dashboard.html.twig
deleted file mode 100644
index be4fb68..0000000
--- a/modules/devel/webprofiler/templates/Profiler/webprofiler_dashboard.html.twig
+++ /dev/null
@@ -1,57 +0,0 @@
-{% set resume %}
-<div id="resume" class="resume">
-    <span class="resume__subtitle">
-        {{ profile.method|upper }}
-        {% if profile.method|upper in ['GET', 'HEAD'] %}
-            <a href="{{ profile.url }}">{{ profile.url }}</a>
-        {% else %}
-            <em>{{ profile.url }}</em>
-        {% endif %}
-    </span>
-    <span class="resume__time">
-        <em>by {{ profile.ip }}</em> at <em>{{ profile.time|date('r') }}</em>
-    </span>
-
-    <a id="resume-view-all" class="button--flat resume__button"
-       href="{{ url("webprofiler.admin_list") }}">{{ 'View latest'|t }}</a>
-</div>
-{% endset %}
-
-<div id="webprofiler">
-
-    {{ resume }}
-
-    <div id="collectors" class="collectors panel">
-    </div>
-
-    <div class="loader--fixed" style="display: none">
-        <svg class="loader__circle">
-            <circle class="loader__path" cx="50" cy="50" r="20" fill="none" stroke-width="2" stroke-miterlimit="10"/>
-        </svg>
-    </div>
-
-    <script id="collector" type="text/template">
-        <a href="#<%= id %>" title="<%= summary %>" class="overview__link">
-            <img src="data:image/png;base64,<%= icon %>"
-                 class="overview__icon">
-            <span class="overview__title"><%= label %></span>
-            <% if(typeof(summary) !== "undefined") { %>
-            <span class="overview__subtitle"><%= summary %></span>
-            <% } %>
-        </a>
-    </script>
-
-    {{ panels }}
-
-    <div class="modal js--modal" style="display: none">
-        <div class="modal__container">
-            <div class="modal__bar">
-                <h3 class="modal__title"></h3>
-            </div>
-            <div class="modal__content">
-                <div class="modal__main-data"></div>
-            </div>
-            <a class="button--flat js--modal-close l-right">Close</a>
-        </div>
-    </div>
-</div>
diff --git a/modules/devel/webprofiler/templates/Profiler/webprofiler_loader.html.twig b/modules/devel/webprofiler/templates/Profiler/webprofiler_loader.html.twig
deleted file mode 100644
index ad8da9b..0000000
--- a/modules/devel/webprofiler/templates/Profiler/webprofiler_loader.html.twig
+++ /dev/null
@@ -1,73 +0,0 @@
-<div id="webprofiler{{ token }}" class="sf-toolbar" style="display: none"></div>
-
-<script>
-    Webprofiler = (function () {
-        "use strict";
-
-        var key = 'webprofiler/profiler/',
-
-                getPreference = function (name) {
-                    if (!window.localStorage) {
-                        return null;
-                    }
-
-                    return localStorage.getItem(key + name);
-                },
-
-                setPreference = function (name, value) {
-                    if (!window.localStorage) {
-                        return null;
-                    }
-
-                    localStorage.setItem(key + name, value);
-                    return true;
-                },
-
-                load = function () {
-                    ajax('{{ profiler_url }}', function (result) {
-                        var toolbar = document.getElementById('webprofiler{{ token }}');
-                        toolbar.innerHTML = result;
-                        toolbar.style.display = 'block';
-
-                        if (getPreference('toolbar/displayState') == 'none') {
-                            document.getElementById('sfToolbarMainContent-{{ token }}').style.display = 'none';
-                            document.getElementById('sfToolbarClearer-{{ token }}').style.display = 'none';
-                            document.getElementById('sfMiniToolbar-{{ token }}').style.display = 'block';
-                        } else {
-                            document.getElementById('sfToolbarMainContent-{{ token }}').style.display = 'block';
-                            document.getElementById('sfToolbarClearer-{{ token }}').style.display = 'block';
-                            document.getElementById('sfMiniToolbar-{{ token }}').style.display = 'none';
-                        }
-
-                        var arr = toolbar.getElementsByTagName('script');
-                        for (var n = 0; n < arr.length; n++) {
-                            eval(arr[n].innerHTML);
-                        }
-                    });
-                },
-
-                ajax = function (url, callback, data) {
-                    try {
-                        var x = new (XMLHttpRequest || ActiveXObject)('MSXML2.XMLHTTP.3.0');
-                        x.open(data ? 'POST' : 'GET', url, 1);
-                        x.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-                        x.setRequestHeader('Content-type', 'application/json');
-                        x.onreadystatechange = function () {
-                            x.readyState > 3 && x.status === 200 && callback && callback(x.responseText, x);
-                        };
-                        x.send(data);
-                    } catch (e) {
-                        window.console && console.log(e);
-                    }
-                };
-
-        return {
-            getPreference: getPreference,
-            setPreference: setPreference,
-            load: load,
-            ajax: ajax
-        }
-    })();
-
-    Webprofiler.load();
-</script>
diff --git a/modules/devel/webprofiler/templates/Profiler/webprofiler_panel.html.twig b/modules/devel/webprofiler/templates/Profiler/webprofiler_panel.html.twig
deleted file mode 100644
index b06daff..0000000
--- a/modules/devel/webprofiler/templates/Profiler/webprofiler_panel.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-{{ panel|raw }}
diff --git a/modules/devel/webprofiler/templates/Profiler/webprofiler_toolbar.css.twig b/modules/devel/webprofiler/templates/Profiler/webprofiler_toolbar.css.twig
deleted file mode 100644
index fccb64b..0000000
--- a/modules/devel/webprofiler/templates/Profiler/webprofiler_toolbar.css.twig
+++ /dev/null
@@ -1,311 +0,0 @@
-.sf-minitoolbar {
-display: none;
-
-position: fixed;
-bottom: 0;
-right: 0;
-
-padding: 5px 5px 0;
-
-background-color: #f7f7f7;
-background-image: -moz-linear-gradient(top, #e4e4e4, #ffffff);
-background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#e4e4e4), to(#ffffff));
-background-image: -o-linear-gradient(top, #e4e4e4, #ffffff);
-background: linear-gradient(top, #e4e4e4, #ffffff);
-
-border-radius: 16px 0 0 0;
-
-z-index: 6000000;
-}
-
-.sf-toolbarreset {
-position: fixed;
-background-color: #f7f7f7;
-left: 0;
-right: 0;
-height: 38px;
-margin: 0;
-padding: 0 40px 0 0;
-z-index: 6000000;
-font: 11px Verdana, Arial, sans-serif;
-text-align: left;
-color: #2f2f2f;
-
-background-image: -moz-linear-gradient(top, #e4e4e4, #ffffff);
-background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#e4e4e4), to(#ffffff));
-background-image: -o-linear-gradient(top, #e4e4e4, #ffffff);
-background: linear-gradient(top, #e4e4e4, #ffffff);
-
-bottom: 0;
-border-top: 1px solid #bbb;
-}
-.sf-toolbarreset abbr {
-border-bottom: 1px dotted #000000;
-}
-.sf-toolbarreset span,
-.sf-toolbarreset div {
-font-size: 11px;
-}
-.sf-toolbarreset img {
-width: auto;
-display: inline;
-}
-
-.sf-toolbarreset .hide-button {
-display: block;
-position: absolute;
-top: 0;
-right: 0;
-width: 40px;
-height: 40px;
-cursor: pointer;
-background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAAllBMVEXDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PExMTPz8/Q0NDR0dHT09Pb29vc3Nzf39/h4eHi4uLj4+P6+vr7+/v8/Pz9/f3///+Nh2QuAAAAIXRSTlMABgwPGBswMzk8QktRV4SKjZOWmaKlq7TAxszb3urt+fy1vNEpAAAAiklEQVQIHUXBBxKCQBREwRFzDqjoGh+C2YV//8u5Sll2S0E/dof1tKdKM6GyqCto7PjZRJIS/mbSELgXOSd/BzpKIH1ZefVWpDDTHsi8mZVnwImPi5ndCLbaAZk3M58Bay0h9VbeSvMpjDUAHj4jL55AW1rxN5fU2PLjIgVRzNdxVFOlGzvnJi0Fb1XNGBHA9uQOAAAAAElFTkSuQmCC');
-background-repeat: no-repeat;
-background-position: 13px 11px;
-}
-.sf-toolbarreset a {
-color: #000 !important;
-border: none;
-}
-
-.sf-toolbar-block {
-white-space: nowrap;
-color: #2f2f2f;
-display: block;
-min-height: 28px;
-border-right: 1px solid #e4e4e4;
-padding: 0;
-float: left;
-cursor: default;
-}
-
-.sf-toolbar-block span {
-display: inline-block;
-}
-
-.sf-toolbar-block .sf-toolbar-info-piece {
-line-height: 19px;
-margin-bottom: 5px;
-}
-
-.sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status {
-padding: 0px 5px;
-border-radius: 5px;
-margin-bottom: 0px;
-vertical-align: top;
-}
-
-.sf-toolbar-block .sf-toolbar-info-piece:last-child {
-margin-bottom: 0;
-}
-
-.sf-toolbar-block .sf-toolbar-info-piece a,
-.sf-toolbar-block .sf-toolbar-info-piece abbr {
-color: #2f2f2f;
-}
-
-.sf-toolbar-block .sf-toolbar-info-piece b {
-display: inline-block;
-width: 150px;
-vertical-align: top;
-}
-
-.sf-toolbar-block .sf-toolbar-info-with-next-pointer:after {
-content: ' :: ';
-color: #999;
-}
-
-.sf-toolbar-block .sf-toolbar-info-with-delimiter {
-border-right: 1px solid #999;
-padding-right: 5px;
-margin-right: 5px;
-}
-
-.sf-toolbar-block .sf-toolbar-info {
-display: none;
-position: absolute;
-background-color: #fff;
-border: 1px solid #bbb;
-padding: 9px 0;
-margin-left: -1px;
-
-bottom: 38px;
-border-bottom-width: 0;
-border-bottom: 1px solid #bbb;
-border-radius: 4px 4px 0 0;
-}
-
-.sf-toolbarreset > div:last-of-type .sf-toolbar-info {
-right: -1px;
-}
-
-.sf-toolbar-block .sf-toolbar-info:empty {
-visibility: hidden;
-}
-
-.sf-toolbar-block .sf-toolbar-status {
-display: inline-block;
-color: #fff;
-background-color: #666;
-padding: 3px 6px;
-border-radius: 3px;
-margin-bottom: 2px;
-vertical-align: middle;
-min-width: 6px;
-min-height: 13px;
-}
-
-.sf-toolbar-block .sf-toolbar-status abbr {
-color: #fff;
-border-bottom: 1px dotted black;
-}
-
-.sf-toolbar-block .sf-toolbar-status-green {
-background-color: #759e1a;
-}
-
-.sf-toolbar-block .sf-toolbar-status-red {
-background-color: #a33;
-}
-
-.sf-toolbar-block .sf-toolbar-status-yellow {
-background-color: #ffcc00;
-color: #000;
-}
-
-.sf-toolbar-block .sf-toolbar-status-black {
-background-color: #000;
-}
-
-.sf-toolbar-block .sf-toolbar-icon {
-display: block;
-}
-
-.sf-toolbar-block .sf-toolbar-icon > a,
-.sf-toolbar-block .sf-toolbar-icon > span {
-display: block;
-font-weight: normal;
-text-decoration: none;
-margin: 0;
-padding: 5px 6px;
-min-width: 20px;
-text-align: center;
-vertical-align: middle;
-}
-
-.sf-toolbar-block .sf-toolbar-icon > a,
-.sf-toolbar-block .sf-toolbar-icon > a:link
-.sf-toolbar-block .sf-toolbar-icon > a:hover {
-color: black !important;
-}
-
-.sf-toolbar-block .sf-toolbar-icon > a[href]:after {
-content: "";
-}
-
-.sf-toolbar-block .sf-toolbar-icon img {
-border-width: 0;
-vertical-align: middle;
-}
-
-.sf-toolbar-block .sf-toolbar-icon img + span {
-margin-left: 0;
-margin-top: 2px;
-}
-
-.sf-toolbar-block .sf-toolbar-icon .sf-toolbar-status {
-border-radius: 12px;
-border-bottom-left-radius: 0;
-margin-top: 0;
-}
-
-.sf-toolbar-block .sf-toolbar-info-method {
-cursor: hand;
-}
-
-.sf-toolbar-block .sf-toolbar-info-method[onclick=""] {
-border-bottom: none;
-cursor: inherit;
-}
-
-.sf-toolbar-info-php {}
-.sf-toolbar-info-php-ext {}
-
-.sf-toolbar-info-php-ext .sf-toolbar-status {
-margin-left: 2px;
-}
-
-.sf-toolbar-info-php-ext .sf-toolbar-status:first-child {
-margin-left: 0;
-}
-
-.sf-toolbar-block a .sf-toolbar-info-piece-additional,
-.sf-toolbar-block a .sf-toolbar-info-piece-additional-detail {
-display: inline-block;
-}
-
-.sf-toolbar-block a .sf-toolbar-info-piece-additional:empty,
-.sf-toolbar-block a .sf-toolbar-info-piece-additional-detail:empty {
-display: none;
-}
-
-.sf-toolbarreset:hover {
-box-shadow: rgba(0, 0, 0, 0.3) 0 0 50px;
-}
-
-.sf-toolbar-block:hover {
-box-shadow: rgba(0, 0, 0, 0.35) 0 0 5px;
-border-right: none;
-margin-right: 1px;
-position: relative;
-}
-
-.sf-toolbar-block:hover .sf-toolbar-icon {
-background-color: #fff;
-border-top: 1px dotted #DDD;
-position: relative;
-margin-top: -1px;
-z-index: 10002;
-}
-
-.sf-toolbar-block:hover .sf-toolbar-info {
-display: block;
-min-width: -webkit-calc(100% + 2px);
-min-width: calc(100% + 2px);
-z-index: 10001;
-box-sizing: border-box;
-padding: 9px;
-line-height: 19px;
-}
-
-/***** Media query *****/
-@media screen and (max-width: 779px) {
-.sf-toolbar-block .sf-toolbar-icon > * > :first-child ~ * {
-display: none;
-}
-
-.sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional,
-.sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional-detail {
-display: none !important;
-}
-}
-
-@media screen and (max-width: 1179px) {
-.sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional {
-display: none;
-}
-}
-
-@media screen and (max-width: 1439px) {
-.sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional-detail {
-display: none;
-}
-}
-
-/***** Media query print: Do not print the Toolbar. *****/
-@media print {
-.sf-toolbar {
-display: none;
-visibility: hidden;
-}
-}
diff --git a/modules/devel/webprofiler/templates/Profiler/webprofiler_toolbar.html.twig b/modules/devel/webprofiler/templates/Profiler/webprofiler_toolbar.html.twig
deleted file mode 100644
index f452aec..0000000
--- a/modules/devel/webprofiler/templates/Profiler/webprofiler_toolbar.html.twig
+++ /dev/null
@@ -1,35 +0,0 @@
-<div id="sfMiniToolbar-{{ token }}" class="sf-minitoolbar">
-    <a href="javascript:void(0);" title="{{ "Show Drupal toolbar"|t }}" onclick="
-            var elem = this.parentNode;
-            if (elem.style.display == 'none') {
-            document.getElementById('sfToolbarMainContent-{{ token }}').style.display = 'none';
-            document.getElementById('sfToolbarClearer-{{ token }}').style.display = 'none';
-            elem.style.display = 'block';
-            } else {
-            document.getElementById('sfToolbarMainContent-{{ token }}').style.display = 'block';
-            document.getElementById('sfToolbarClearer-{{ token }}').style.display = 'block';
-            elem.style.display = 'none'
-            }
-
-            Webprofiler.setPreference('toolbar/displayState', 'block');
-            ">
-        <img width="26" height="28" alt="Drupal"
-             src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpCRDU5MUVDNzVGRTkxMUUzODdBMEJDOEZFRjA2QUY5MiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpCRDU5MUVDODVGRTkxMUUzODdBMEJDOEZFRjA2QUY5MiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkJENTkxRUM1NUZFOTExRTM4N0EwQkM4RkVGMDZBRjkyIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkJENTkxRUM2NUZFOTExRTM4N0EwQkM4RkVGMDZBRjkyIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+iYsuIgAAAiNJREFUeNq8lj3KwkAQhhOxUPAnoIgWQiysbFLYG2/gEVJaegQ9QfQECh4g3kA9QbxBLMQ2KaxE2G/ffG5Yl/ytiguDJBn32Z15d2dUQojy0wGgDHQwGFjj8Vh7hxFyZIHNZtOt1+uuDPRtYK/Xs4rFIpyJDFQaiIm73a7NYMyq1arf7/dnWWApIN3VHBPzINHwHX5J4FxAKg6j0Wh4aSDREGb8TxqIXJVKJSIDY1Yul30RmgqE87swHkrDq2cCkYNareZ9AmPWarX2mUAk/hswZrgkUoGyIsm7y1ggDachnrNPrVKpEKSJBxZYnC+Xi/l4PL56T99uN/y8KDYCUpj2i2JRzONkWZYyGo0UXdeV4/GobDYb5Xw+J/obxv+mTqdT8rWTpND1ek3ihm3bRNO0F188O44T+UwmE+TQjBXNcDiciLD5fE7Shuu6xDTN0JdGgfi+//J9v98nA6EmqIoHYsJPxuFwIOKxiERDVxNQ4I4PNw1Ram6DIFAWiwUWG5uv+/2+E98V+IdOp7OiZzF6pitMhC2XyxDEfOKg1+t1ldnTtNtthxcB8sAGcgQRUbWGufM8LxQPfJBv3n+73Tq5qgVyibqWdYsASOUfLYyJJ679yKyHadDZbBYqkn8HMHaO3ydMl674rI8RayOACKUo/+l0SuAf12ZI9TRYLSZCJYk76GgbnyA9TxOlMpiqqrnuQhxk7igd8raJbKi/bvX/BBgANANSieJk+XMAAAAASUVORK5CYII=">
-    </a>
-</div>
-<style>
-    {% include '@webprofiler/Profiler/webprofiler_toolbar.css.twig' with { 'floatable': true } %}
-</style>
-<div id="sfToolbarClearer-{{ token }}" style="clear: both; height: 38px;"></div>
-
-<div id="sfToolbarMainContent-{{ token }}" class="sf-toolbarreset">
-    {{ toolbar|raw }}
-
-    <a class="hide-button" title="{{ "Close Toolbar"|t }}" onclick="
-            var p = this.parentNode;
-            p.style.display = 'none';
-            (p.previousElementSibling || p.previousSibling).style.display = 'none';
-            document.getElementById('sfMiniToolbar-{{ token }}').style.display = 'block';
-            Webprofiler.setPreference('toolbar/displayState', 'none');
-            "></a>
-</div>
diff --git a/modules/devel/webprofiler/tests/src/FunctionalJavascript/ToolbarTest.php b/modules/devel/webprofiler/tests/src/FunctionalJavascript/ToolbarTest.php
deleted file mode 100644
index 84c7d82..0000000
--- a/modules/devel/webprofiler/tests/src/FunctionalJavascript/ToolbarTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Drupal\Tests\webprofiler\FunctionalJavascript;
-
-/**
- * Tests the JavaScript functionality of webprofiler.
- *
- * @group webprofiler
- */
-class ToolbarTest extends WebprofilerTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['webprofiler', 'node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    \Drupal::configFactory()->getEditable('system.site')->set('page.front', '/node')->save(TRUE);
-  }
-
-  /**
-   * Tests if the toolbar appears on front page.
-   */
-  public function testToolbarOnFrontPage() {
-    $this->loginForToolbar();
-
-    $this->drupalGet('<front>');
-
-    $this->waitForToolbar();
-
-    $assert = $this->assertSession();
-    $assert->pageTextContains(\Drupal::VERSION);
-    $assert->pageTextContains('Configure Webprofiler');
-    $assert->pageTextContains('View latest reports');
-    $assert->pageTextContains('Drupal Documentation');
-    $assert->pageTextContains('Get involved!');
-  }
-
-  /**
-   * Tests the toolbar report page.
-   */
-  public function testToolbarReportPage() {
-    $this->loginForDashboard();
-
-    $this->drupalGet('<front>');
-
-    $token = $this->waitForToolbar();
-
-    $this->drupalGet('admin/reports/profiler/list');
-
-    $assert = $this->assertSession();
-    $assert->pageTextContains($token);
-  }
-
-  /**
-   * Tests the toolbar not appears on excluded path.
-   */
-  public function testToolbarNotAppearsOnExcludedPath() {
-    $this->loginForDashboard();
-
-    $this->drupalGet('admin/config/development/devel');
-    $token = $this->waitForToolbar();
-    $assert = $this->assertSession();
-    $assert->pageTextContains($token);
-    $assert->pageTextContains('Configure Webprofiler');
-
-    $this->config('webprofiler.config')
-      ->set('exclude', '/admin/config/development/devel')
-      ->save();
-    $this->drupalGet('admin/config/development/devel');
-    $this->assertSession()->pageTextNotContains('sf-toolbar');
-  }
-
-}
diff --git a/modules/devel/webprofiler/tests/src/FunctionalJavascript/WebprofilerTestBase.php b/modules/devel/webprofiler/tests/src/FunctionalJavascript/WebprofilerTestBase.php
deleted file mode 100644
index b38a1f2..0000000
--- a/modules/devel/webprofiler/tests/src/FunctionalJavascript/WebprofilerTestBase.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace Drupal\Tests\webprofiler\FunctionalJavascript;
-
-use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
-use PHPUnit_Framework_AssertionFailedError;
-
-/**
- * Class WebprofilerTestBase.
- *
- * @group webprofiler
- */
-abstract class WebprofilerTestBase extends JavascriptTestBase {
-
-  /**
-   * Wait until the toolbar is present on page.
-   */
-  protected function waitForToolbar() {
-    $session = $this->getSession();
-    $token = $this->getToken();
-    $page = $session->getPage();
-
-    $toolbar = $page->findById('webprofiler' . $token);
-    $this->assertTrue($toolbar->hasClass('sf-toolbar'), 'Toolbar loader is present in page');
-
-    $session->wait(1000, 'null !== document.getElementById(\'sfToolbarMainContent-' . $token . '\')');
-
-    return $token;
-  }
-
-  /**
-   * Return the Webprofiler token.
-   *
-   * @return null|string
-   *   The page token
-   */
-  protected function getToken() {
-    $token = $this->getSession()->getResponseHeader('X-Debug-Token');
-
-    if (NULL === $token) {
-      throw new PHPUnit_Framework_AssertionFailedError();
-    }
-
-    return $token;
-  }
-
-  /**
-   * Login with a user that can see the toolbar.
-   */
-  protected function loginForToolbar() {
-    $admin_user = $this->drupalCreateUser(
-      [
-        'view webprofiler toolbar',
-      ]
-    );
-    $this->drupalLogin($admin_user);
-  }
-
-  /**
-   * Login with a user that can see the toolbar and the dashboard.
-   */
-  protected function loginForDashboard() {
-    $admin_user = $this->drupalCreateUser(
-      [
-        'view webprofiler toolbar',
-        'access webprofiler',
-      ]
-    );
-    $this->drupalLogin($admin_user);
-  }
-
-  /**
-   * Flush cache.
-   */
-  protected function flushCache() {
-    $module_handler = \Drupal::moduleHandler();
-    $module_handler->invokeAll('cache_flush');
-  }
-
-}
diff --git a/modules/devel/webprofiler/tests/src/Kernel/DecoratorTest.php b/modules/devel/webprofiler/tests/src/Kernel/DecoratorTest.php
deleted file mode 100644
index a557c08..0000000
--- a/modules/devel/webprofiler/tests/src/Kernel/DecoratorTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Drupal\Tests\webprofiler\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Class DecoratorTest.
- *
- * @group webprofiler
- */
-class DecoratorTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['system', 'views'];
-
-  /**
-   * Tests the Entity Type Manager service decoration.
-   *
-   * @param string $service
-   *   The service name.
-   * @param string $original
-   *   The original class.
-   * @param string $decorated
-   *   The decorated class.
-   *
-   * @dataProvider decorators
-   */
-  public function testEntityTypeDecorator($service, $original, $decorated) {
-    $entityTypeManagerOriginal = $this->container->get($service);
-
-    $this->assertInstanceOf($original, $entityTypeManagerOriginal);
-
-    $this->container->get('module_installer')->install(['webprofiler']);
-
-    $entityTypeManagerDecorated = $this->container->get($service);
-
-    $this->assertInstanceOf($decorated, $entityTypeManagerDecorated);
-  }
-
-  /**
-   * DataProvider for testEntityTypeDecorator.
-   *
-   * @return array
-   *   The array of values to run tests on.
-   */
-  public function decorators() {
-    return array(
-      array('entity_type.manager', 'Drupal\Core\Entity\EntityTypeManager', 'Drupal\webprofiler\Entity\EntityManagerWrapper'),
-      array('cache_factory', 'Drupal\Core\Cache\MemoryBackendFactory', 'Drupal\webprofiler\Cache\CacheFactoryWrapper'),
-      array('asset.css.collection_renderer', 'Drupal\Core\Asset\CssCollectionRenderer', 'Drupal\webprofiler\Asset\CssCollectionRendererWrapper'),
-      array('asset.js.collection_renderer', 'Drupal\Core\Asset\JsCollectionRenderer', 'Drupal\webprofiler\Asset\JsCollectionRendererWrapper'),
-      array('state', 'Drupal\Core\State\State', 'Drupal\webprofiler\State\StateWrapper'),
-      array('views.executable', 'Drupal\views\ViewExecutableFactory', 'Drupal\webprofiler\Views\ViewExecutableFactoryWrapper'),
-      array('form_builder', 'Drupal\Core\Form\FormBuilder', 'Drupal\webprofiler\Form\FormBuilderWrapper'),
-      array('access_manager', 'Drupal\Core\Access\AccessManager', 'Drupal\webprofiler\Access\AccessManagerWrapper'),
-      array('theme.negotiator', 'Drupal\Core\Theme\ThemeNegotiator', 'Drupal\webprofiler\Theme\ThemeNegotiatorWrapper'),
-      array('config.factory', 'Drupal\Core\Config\ConfigFactory', 'Drupal\webprofiler\Config\ConfigFactoryWrapper'),
-      array('string_translation', 'Drupal\Core\StringTranslation\TranslationManager', 'Drupal\webprofiler\StringTranslation\TranslationManagerWrapper'),
-    );
-  }
-
-}
diff --git a/modules/devel/webprofiler/tests/src/Unit/DataCollector/AssetsDataCollectorTest.php b/modules/devel/webprofiler/tests/src/Unit/DataCollector/AssetsDataCollectorTest.php
deleted file mode 100644
index 37d6ac3..0000000
--- a/modules/devel/webprofiler/tests/src/Unit/DataCollector/AssetsDataCollectorTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Drupal\Tests\webprofiler\Unit\DataCollector;
-
-use Drupal\webprofiler\Asset\CssCollectionRendererWrapper;
-use Drupal\webprofiler\DataCollector\AssetsDataCollector;
-
-/**
- * @coversDefaultClass \Drupal\webprofiler\DataCollector\AssetsDataCollector
- *
- * @group webprofiler
- */
-class AssetsDataCollectorTest extends DataCollectorBaseTest {
-
-  /**
-   * @var \Drupal\webprofiler\DataCollector\AssetsDataCollector
-   */
-  private $assetDataCollector;
-
-  /**
-   * @var \PHPUnit_Framework_MockObject_MockObject
-   */
-  private $assetCollectionRendererInterface;
-
-  const ROOT = 'test_root';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->assetDataCollector = new AssetsDataCollector(AssetsDataCollectorTest::ROOT);
-    $this->assetCollectionRendererInterface = $this->getMock('Drupal\Core\Asset\AssetCollectionRendererInterface');
-  }
-
-  /**
-   * Tests the Assets data collector.
-   */
-  public function testCSS() {
-    $css = [
-      'core/assets/vendor/normalize-css/normalize.css' => [
-        'weight' => -219.944,
-        'group' => 0,
-        'type' => 'file',
-        'data' => 'core\/assets\/vendor\/normalize-css\/normalize.css',
-        'version' => '3.0.3',
-        'media' => 'all',
-        'preprocess' => TRUE,
-        'browsers' => [
-          'IE' => TRUE,
-          '!IE' => TRUE,
-        ],
-      ],
-    ];
-
-    $cssCollectionRendererWrapper = new CssCollectionRendererWrapper($this->assetCollectionRendererInterface, $this->assetDataCollector);
-    $cssCollectionRendererWrapper->render($css);
-
-    $this->assertEquals(1, $this->assetDataCollector->getCssCount());
-
-    $this->assetDataCollector->collect($this->request, $this->response, $this->exception);
-
-    $data = $this->assetDataCollector->getData();
-    $this->assertEquals(AssetsDataCollectorTest::ROOT . '/', $data['assets']['installation_path']);
-  }
-
-}
diff --git a/modules/devel/webprofiler/tests/src/Unit/DataCollector/CacheDataCollectorTest.php b/modules/devel/webprofiler/tests/src/Unit/DataCollector/CacheDataCollectorTest.php
deleted file mode 100644
index d51e604..0000000
--- a/modules/devel/webprofiler/tests/src/Unit/DataCollector/CacheDataCollectorTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Drupal\Tests\webprofiler\Unit\DataCollector;
-
-use Drupal\webprofiler\Cache\CacheBackendWrapper;
-use Drupal\webprofiler\DataCollector\CacheDataCollector;
-
-/**
- * @coversDefaultClass \Drupal\webprofiler\DataCollector\CacheDataCollector
- *
- * @group webprofiler
- */
-class CacheDataCollectorTest extends DataCollectorBaseTest {
-
-  /**
-   * @var \Drupal\webprofiler\DataCollector\CacheDataCollector
-   */
-  private $cacheDataCollector;
-
-  /**
-   * @var \PHPUnit_Framework_MockObject_MockObject
-   */
-  private $cacheBackendInterface;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    $this->cacheDataCollector = new CacheDataCollector();
-    $this->cacheBackendInterface = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
-  }
-
-  /**
-   * Tests the collection of a cache miss.
-   */
-  public function testCacheCollectorMiss() {
-    $this->cacheBackendInterface->expects($this->once())
-      ->method('get')
-      ->will($this->returnValue(FALSE));
-
-    $cacheBackendWrapper = new CacheBackendWrapper($this->cacheDataCollector, $this->cacheBackendInterface, 'default');
-    $cache = $cacheBackendWrapper->get('cache_id');
-
-    $this->assertFalse($cache);
-
-    $this->assertEquals(1, $this->cacheDataCollector->getCacheMissesCount());
-  }
-
-  /**
-   * Tests the collection of a cache hit.
-   */
-  public function testCacheCollectorHit() {
-    $cache = new \stdClass();
-    $cache->cid = 'cache_id';
-    $cache->expire = 1;
-    $cache->tags = ['tag1', 'tag2'];
-    $this->cacheBackendInterface->expects($this->once())
-      ->method('get')
-      ->will($this->returnValue($cache));
-
-    $cacheBackendWrapper = new CacheBackendWrapper($this->cacheDataCollector, $this->cacheBackendInterface, 'default');
-    $cache2 = $cacheBackendWrapper->get('cache_id');
-
-    $this->assertNotNull($cache2);
-
-    $this->assertEquals(1, $this->cacheDataCollector->getCacheHitsCount());
-  }
-
-}
diff --git a/modules/devel/webprofiler/tests/src/Unit/DataCollector/DataCollectorBaseTest.php b/modules/devel/webprofiler/tests/src/Unit/DataCollector/DataCollectorBaseTest.php
deleted file mode 100644
index 8d62e78..0000000
--- a/modules/devel/webprofiler/tests/src/Unit/DataCollector/DataCollectorBaseTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\Tests\webprofiler\Unit\DataCollector;
-
-use Drupal\Tests\UnitTestCase;
-
-/**
- * Class DataCollectorBaseTest.
- *
- * @group webprofiler
- */
-abstract class DataCollectorBaseTest extends UnitTestCase {
-
-  /**
-   * @var
-   */
-  protected $request;
-
-  /**
-   * @var
-   */
-  protected $response;
-
-  /**
-   * @var
-   */
-  protected $exception;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->request = $this->getMock('Symfony\Component\HttpFoundation\Request');
-    $this->response = $this->getMock('Symfony\Component\HttpFoundation\Response');
-    $this->exception = $this->getMock('Exception');
-  }
-
-}
diff --git a/modules/devel/webprofiler/webprofiler.info.yml b/modules/devel/webprofiler/webprofiler.info.yml
deleted file mode 100644
index 8aebae2..0000000
--- a/modules/devel/webprofiler/webprofiler.info.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Web Profiler
-type: module
-description: 'Drupal Web Profiler.'
-package: Development
-# core: 8.x
-configure: webprofiler.settings
-tags:
- - developer
-dependencies:
- - devel
-
-# Information added by Drupal.org packaging script on 2017-10-05
-version: '8.x-1.2'
-core: '8.x'
-project: 'devel'
-datestamp: 1507197848
diff --git a/modules/devel/webprofiler/webprofiler.install b/modules/devel/webprofiler/webprofiler.install
deleted file mode 100644
index e9828ed..0000000
--- a/modules/devel/webprofiler/webprofiler.install
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, update and uninstall functions for the webprofiler module.
- */
-
-use Drupal\Core\Url;
-
-/**
- * Implements hook_schema().
- */
-function webprofiler_schema() {
-  $schema['webprofiler'] = [
-    'description' => 'Webprofiler profiles storage.',
-    'fields' => [
-      'token' => [
-        'description' => 'Profile token.',
-        'type' => 'varchar',
-        'length' => 6,
-        'not null' => TRUE,
-      ],
-      'data' => [
-        'description' => 'Profile data.',
-        'type' => 'text',
-        'size' => 'big',
-        'not null' => TRUE,
-      ],
-      'ip' => [
-        'description' => 'Request IP.',
-        'type' => 'varchar',
-        'length' => 64,
-        'not null' => TRUE,
-      ],
-      'method' => [
-        'description' => 'Request method.',
-        'type' => 'varchar',
-        'length' => 6,
-        'not null' => TRUE,
-      ],
-      'url' => [
-        'description' => 'Requested URL.',
-        'type' => 'varchar',
-        'length' => 2048,
-        'not null' => TRUE,
-      ],
-      'time' => [
-        'description' => 'Request time.',
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ],
-      'parent' => [
-        'description' => 'Profile parent.',
-        'type' => 'varchar',
-        'length' => 6,
-        'not null' => FALSE,
-      ],
-      'created_at' => [
-        'description' => 'Profile created time.',
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ],
-      'status_code' => [
-        'description' => 'Profile status code.',
-        'type' => 'int',
-        'size' => 'small',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ],
-    ],
-    'indexes' => [
-      'created_at' => ['created_at'],
-      'ip' => ['ip'],
-      'method' => ['method'],
-      'parent' => ['parent'],
-    ],
-    'primary key' => ['token'],
-  ];
-
-  return $schema;
-}
-
-/**
- * Implements hook_requirements().
- */
-function webprofiler_requirements($phase) {
-  $requirements = [];
-
-  if ('runtime' == $phase) {
-    $has_d3 = _webprofiler_verify_library('webprofiler', 'd3');
-    $requirements['d3js'] = [
-      'title' => t('D3.js library'),
-      'value' => $has_d3 ? t('Enabled') : t('Not found'),
-    ];
-
-    if (!$has_d3) {
-      $requirements['d3js']['severity'] = REQUIREMENT_WARNING;
-      $requirements['d3js']['description'] = [
-        '#prefix' => ' ',
-        '#markup' => t('Webprofiler module requires D3.js library to properly render data. Composer based install recommended, see README.md file for instructions.'),
-      ];
-    }
-
-    $has_highlight = _webprofiler_verify_library('webprofiler', 'highlightjs');
-    $requirements['highlightjs'] = [
-      'title' => t('highlight.js library'),
-      'value' => $has_highlight ? t('Enabled') : t('Not found'),
-    ];
-
-    if (!$has_highlight) {
-      $requirements['highlightjs']['severity'] = REQUIREMENT_WARNING;
-      $requirements['highlightjs']['description'] = [
-        '#prefix' => ' ',
-        '#markup' => t('Webprofiler module requires highlight.js library to syntax highlight collected queries. Composer based install recommended, see README.md file for instructions.'),
-      ];
-    }
-  }
-
-  return $requirements;
-}
-
-/**
- * Verify that the library files exist.
- *
- * @param string $extension
- *   The name of the extension that registered a library.
- * @param string $name
- *   The name of a registered library to retrieve.
- *
- * @return bool
- *   TRUE if all files of this library exists, FALSE otherwise
- *
- * @see https://drupal.org/node/2231385
- */
-function _webprofiler_verify_library($extension, $name) {
-  /** @var Drupal\Core\Asset\LibraryDiscovery $library_discovery */
-  $library_discovery = \Drupal::service('library.discovery');
-  $library = $library_discovery->getLibraryByName($extension, $name);
-
-  $exist = TRUE;
-  if ($library['js']) {
-    foreach ($library['js'] as $js) {
-      if ($js['type'] == 'file') {
-        if (!file_exists(DRUPAL_ROOT . '/' . $js['data'])) {
-          $exist = FALSE;
-        }
-      }
-    }
-  }
-
-  if ($library['css']) {
-    foreach ($library['css'] as $css) {
-      if ($css['type'] == 'file') {
-        if (!file_exists(DRUPAL_ROOT . '/' . $css['data'])) {
-          $exist = FALSE;
-        }
-      }
-    }
-  }
-
-  if ($library['dependencies']) {
-    foreach ($library['dependencies'] as $dependency) {
-      $parts = explode('/', $dependency);
-      $exist = _webprofiler_verify_library($parts[0], $parts[1]);
-    }
-  }
-
-  return $exist;
-}
-
-/**
- * Add a status_code column to the webprofiler table.
- */
-function webprofiler_update_8001() {
-  $database = \Drupal::database();
-  $schema = $database->schema();
-
-  $spec = array(
-    'description' => 'Profile status code.',
-    'type' => 'int',
-    'size' => 'small',
-    'unsigned' => TRUE,
-    'not null' => TRUE,
-  );
-  $schema->addField('webprofiler', 'status_code', $spec);
-}
diff --git a/modules/devel/webprofiler/webprofiler.libraries.yml b/modules/devel/webprofiler/webprofiler.libraries.yml
deleted file mode 100644
index f99c628..0000000
--- a/modules/devel/webprofiler/webprofiler.libraries.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-d3:
-  remote: https://github.com/d3/d3
-  version: 3.5.17
-  license:
-    name: BSD-3
-    url: https://github.com/d3/d3/blob/master/LICENSE
-    gpl-compatible: true
-  js:
-    /libraries/d3/d3.min.js: {}
-highlightjs:
-  remote: https://github.com/isagalaev/highlight.js
-  version: 9.7.0
-  license:
-    name: BSD-3
-    url: https://github.com/isagalaev/highlight.js/blob/master/LICENSE
-    gpl-compatible: true
-  js:
-    /libraries/highlightjs/highlight.pack.js: {}
-  css:
-    component:
-      /libraries/highlightjs/styles/idea.css: {}
-dashboard:
-  version: 2.0
-  js:
-    js/app/main.js: {}
-    js/app/helpers.js: {}
-    js/app/models/collector.js: {}
-    js/app/collections/collectors.js: {}
-    js/app/views/collector.js: {}
-    js/app/views/collectorsList.js: {}
-    js/app/views/layout.js: {}
-    js/app/views/details.js: {}
-    js/app/routers/collectors.js: {}
-  css:
-    component:
-      css/app/dashboard.css: {}
-  dependencies:
-    - core/jquery
-    - core/jquery.once
-    - core/drupal
-    - core/drupalSettings
-    - core/backbone
-database:
-  version: 2.0
-  js:
-    js/database.js: {}
-  dependencies:
-    - core/jquery
-    - core/drupal
-    - core/drupalSettings
-    - webprofiler/highlightjs
-timeline:
-  version: 2.0
-  js:
-    js/timeline.js: {}
-  css:
-    component:
-      css/timeline.css: {}
-  dependencies:
-    - core/jquery
-    - core/drupal
-    - core/drupalSettings
-    - webprofiler/d3
diff --git a/modules/devel/webprofiler/webprofiler.links.menu.yml b/modules/devel/webprofiler/webprofiler.links.menu.yml
deleted file mode 100644
index b2d4a73..0000000
--- a/modules/devel/webprofiler/webprofiler.links.menu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-webprofiler.admin_list:
-  title: 'Webprofiler'
-  description: 'List saved profiles.'
-  route_name: webprofiler.admin_list
-  parent: system.admin_reports
diff --git a/modules/devel/webprofiler/webprofiler.links.task.yml b/modules/devel/webprofiler/webprofiler.links.task.yml
deleted file mode 100644
index 741eb15..0000000
--- a/modules/devel/webprofiler/webprofiler.links.task.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-webprofiler.settings:
-  title: 'Webprofiler'
-  route_name: webprofiler.settings
-  base_route: devel.admin_settings
-  weight: 10
-webprofiler.dashboard:
-  title: 'dashboard'
-  route_name: webprofiler.dashboard
-  base_route: webprofiler.dashboard
diff --git a/modules/devel/webprofiler/webprofiler.make.yml b/modules/devel/webprofiler/webprofiler.make.yml
deleted file mode 100644
index 1f5d068..0000000
--- a/modules/devel/webprofiler/webprofiler.make.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-core: "8.x"
-api: 2
-
-libraries:
-  highlightjs:
-    download:
-      type: "git"
-      url: "https://github.com/isagalaev/highlight.js.git"
-  d3:
-    download:
-      type: "git"
-      url: "https://github.com/d3/d3.git"
diff --git a/modules/devel/webprofiler/webprofiler.module b/modules/devel/webprofiler/webprofiler.module
deleted file mode 100644
index 01e9b95..0000000
--- a/modules/devel/webprofiler/webprofiler.module
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * @file
- * Legacy Webprofiler module file.
- */
-
-/**
- * Implements hook_theme().
- */
-function webprofiler_theme() {
-  return [
-    'webprofiler_loader' => [
-      'template' => 'Profiler/webprofiler_loader',
-      'variables' => ['token' => NULL, 'profiler_url' => NULL],
-    ],
-    'webprofiler_toolbar' => [
-      'template' => 'Profiler/webprofiler_toolbar',
-      'variables' => [
-        'token' => NULL,
-        'toolbar' => NULL,
-      ],
-    ],
-    'webprofiler_panel' => [
-      'template' => 'Profiler/webprofiler_panel',
-      'variables' => [
-        'panel' => NULL,
-      ],
-    ],
-    'webprofiler_dashboard' => [
-      'template' => 'Profiler/webprofiler_dashboard',
-      'variables' => [
-        'profile' => [],
-        'panels' => [],
-        'spinner_path' => NULL,
-      ],
-    ],
-  ];
-}
-
-/**
- * Implements hook_cache_flush().
- */
-function webprofiler_cache_flush() {
-  $config = \Drupal::configFactory()->get('webprofiler.config');
-
-  if ($config->get('purge_on_cache_clear')) {
-    $profiler = \Drupal::service('profiler');
-    $profiler->purge();
-  }
-}
diff --git a/modules/devel/webprofiler/webprofiler.permissions.yml b/modules/devel/webprofiler/webprofiler.permissions.yml
deleted file mode 100644
index b397525..0000000
--- a/modules/devel/webprofiler/webprofiler.permissions.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-'access webprofiler':
-  title: 'Access webprofiler'
-  description: 'Access webprofiler collected data.'
-  'restrict access': TRUE
-'view webprofiler toolbar':
-  title: 'View webprofiler toolbar'
-  description: 'View webprofiler toolbar.'
diff --git a/modules/devel/webprofiler/webprofiler.routing.yml b/modules/devel/webprofiler/webprofiler.routing.yml
deleted file mode 100644
index 11543ec..0000000
--- a/modules/devel/webprofiler/webprofiler.routing.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-# toolbar
-webprofiler.toolbar:
-  path: '/profiler/{profile}'
-  defaults:
-    _controller: '\Drupal\webprofiler\Controller\ToolbarController::toolbarAction'
-  options:
-    parameters:
-      profile:
-        type: 'webprofiler:token'
-  requirements:
-    _permission: 'view webprofiler toolbar'
-
-# save frontend data
-webprofiler.frontend.save:
-  path: '/admin/reports/profiler/frontend/{profile}/save'
-  defaults:
-    _controller: '\Drupal\webprofiler\Controller\ToolbarController::savePerformanceTimingAction'
-    _title: 'Save performance timing data'
-  options:
-    parameters:
-      profile:
-        type: 'webprofiler:token'
-  methods:  [POST]
-  requirements:
-    _permission: 'view webprofiler toolbar'
-
-# view profile
-webprofiler.dashboard:
-  path: '/admin/reports/profiler/view/{profile}'
-  defaults:
-    _controller: '\Drupal\webprofiler\Controller\DashboardController::dashboardAction'
-    _title: 'Webprofiler'
-  options:
-    parameters:
-      profile:
-        type: 'webprofiler:token'
-  requirements:
-    _permission: 'access webprofiler'
-
-# list stored profiles
-webprofiler.admin_list:
-  path: '/admin/reports/profiler/list'
-  defaults:
-    _controller: '\Drupal\webprofiler\Controller\DashboardController::listAction'
-    _title: 'Webprofiler'
-  requirements:
-    _permission: 'access webprofiler'
-
-webprofiler.rest.collector:
-  path: '/admin/reports/profiler/view/{profile}/collectors/{collector}'
-  defaults:
-    _controller: '\Drupal\webprofiler\Controller\DashboardController::restCollectorAction'
-    _title: 'Webprofiler'
-  options:
-    parameters:
-      profile:
-        type: 'webprofiler:token'
-  requirements:
-    _permission: 'access webprofiler'
-
-# get query explain
-webprofiler.database.explain:
-  path: '/admin/reports/profiler/database_explain/{profile}/{qid}'
-  defaults:
-    _controller: '\Drupal\webprofiler\Controller\DatabaseController::explainAction'
-    _title: 'Query explain'
-  options:
-    parameters:
-      profile:
-        type: 'webprofiler:token'
-  requirements:
-    _permission: 'access webprofiler'
-
-# configure webprofiler
-webprofiler.settings:
-  path: '/admin/config/development/devel/webprofiler'
-  defaults:
-    _form: 'Drupal\webprofiler\Form\ConfigForm'
-    _title: 'Webprofiler settings'
-  requirements:
-    _permission: 'access webprofiler'
diff --git a/modules/devel/webprofiler/webprofiler.services.yml b/modules/devel/webprofiler/webprofiler.services.yml
deleted file mode 100644
index 6332fef..0000000
--- a/modules/devel/webprofiler/webprofiler.services.yml
+++ /dev/null
@@ -1,262 +0,0 @@
-parameters:
-  webprofiler.only_exceptions: false
-  webprofiler.only_master_requests: false
-
-services:
-
-# profiler services
-  logger.channel.webprofiler:
-    class: Drupal\Core\Logger\LoggerChannel
-    factory: logger.factory:get
-    arguments: ['webprofiler']
-
-  profiler.file_storage:
-    class: Drupal\webprofiler\Profiler\FileProfilerStorage
-    arguments: ['%data_collector.storage%']
-    tags:
-      - { name: webprofiler_storage, title: 'File storage' }
-
-  profiler.database_storage:
-    class: Drupal\webprofiler\Profiler\DatabaseProfilerStorage
-    arguments: ['@database']
-    tags:
-      - { name: webprofiler_storage, title: 'Database storage' }
-
-  profiler.storage_manager:
-    class: Drupal\webprofiler\Profiler\ProfilerStorageManager
-
-  profiler.storage:
-    class: Symfony\Component\HttpKernel\Profiler\ProfilerStorageInterface
-    factory: Drupal\webprofiler\Profiler\ProfilerStorageFactory::getProfilerStorage
-    arguments: ['@config.factory', '@service_container']
-
-  profiler:
-    class: Drupal\webprofiler\Profiler\Profiler
-    arguments: ['@profiler.storage', '@logger.channel.webprofiler', '@config.factory']
-
-# template manager
-  template_manager:
-    class: Drupal\webprofiler\Profiler\TemplateManager
-    arguments: ['@profiler', '@twig', '@twig.loader', '%data_collector.templates%']
-
-# request matcher
-  webprofiler.matcher:
-    class: Drupal\webprofiler\RequestMatcher\WebprofilerRequestMatcher
-    arguments: ['@config.factory', '@path.matcher']
-
-# event subscribers
-  webprofiler.profiler_listener:
-    class: Symfony\Component\HttpKernel\EventListener\ProfilerListener
-    arguments: ['@profiler', '@request_stack', '@?webprofiler.matcher', '%webprofiler.only_exceptions%', '%webprofiler.only_master_requests%']
-    tags:
-      - { name: event_subscriber }
-
-  webprofiler.webprofiler_event_subscriber:
-      class: Drupal\webprofiler\EventSubscriber\WebprofilerEventSubscriber
-      arguments: ['@current_user', '@url_generator', '@renderer']
-      tags:
-        - { name: event_subscriber }
-
-# twig profiler
-  twig.profile:
-    class: Twig_Profiler_Profile
-
-  twig.extension.profiler:
-    class: Drupal\webprofiler\Twig\Extension\ProfilerExtension
-    arguments: ['@twig.profile', '@stopwatch', '@webprofiler.ide_link_generator', '@webprofiler.class_shortener']
-    tags:
-      - { name: twig.extension, priority: 100 }
-
-# datacollector services
-  webprofiler.drupal:
-    class: Drupal\webprofiler\DataCollector\DrupalDataCollector
-    arguments: ['@redirect.destination', '@url_generator']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/drupal.html.twig', id: 'drupal', title: 'Drupal', priority: 10 }
-
-  webprofiler.devel:
-    class: Drupal\webprofiler\DataCollector\DevelDataCollector
-    arguments: ['@menu.link_tree']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/devel.html.twig', id: 'devel', title: 'Devel', priority: 15 }
-
-  webprofiler.php_config:
-    class: Drupal\webprofiler\DataCollector\PhpConfigDataCollector
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/php_config.html.twig', id: 'php_config', title: 'PHP Config', priority: 20 }
-
-  webprofiler.request:
-    class: Drupal\webprofiler\DataCollector\RequestDataCollector
-    arguments: ['@controller_resolver']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/request.html.twig', id: 'request', title: 'Request', priority: 30 }
-      - { name: event_subscriber }
-
-  webprofiler.time:
-    class: Drupal\webprofiler\DataCollector\TimeDataCollector
-    arguments: [NULL, '@stopwatch']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/time.html.twig', id: 'time', title: 'Timeline', priority: 40 }
-
-  webprofiler.performance_timing:
-    class: Drupal\webprofiler\DataCollector\PerformanceTimingDataCollector
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/performance_timing.html.twig', id: 'performance_timing', title: 'Performance Timing', priority: 50 }
-
-  webprofiler.database:
-    class: Drupal\webprofiler\DataCollector\DatabaseDataCollector
-    arguments: ['@database', '@config.factory']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/database.html.twig', id: 'database', title: 'Database', priority: 60 }
-
-  webprofiler.user:
-    class: Drupal\webprofiler\DataCollector\UserDataCollector
-    arguments: ['@current_user', '@entity.manager', '@config.factory', '@authentication_collector']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/user.html.twig', id: 'user', title: 'User', priority: 70 }
-
-  webprofiler.forms:
-    class: Drupal\webprofiler\DataCollector\FormsDataCollector
-    arguments: ['@form_builder']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/forms.html.twig', id: 'forms', title: 'Forms', priority: 80 }
-
-  webprofiler.drupal_extensions:
-    class: Drupal\webprofiler\DataCollector\ExtensionDataCollector
-    arguments: ['@module_handler', '@theme_handler', '@app.root']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/extensions.html.twig', id: 'drupal_extension', title: 'Extensions', priority: 90 }
-
-  webprofiler.routing:
-    class: Drupal\webprofiler\DataCollector\RoutingDataCollector
-    arguments: ['@router.route_provider']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/routing.html.twig', id: 'routing', title: 'Routing', priority: 100 }
-
-  webprofiler.cache:
-    class: Drupal\webprofiler\DataCollector\CacheDataCollector
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/cache.html.twig', id: 'cache', title: 'Cache', priority: 110 }
-
-  webprofiler.assets:
-    class: Drupal\webprofiler\DataCollector\AssetsDataCollector
-    arguments: ['@app.root']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/assets.html.twig', id: 'assets', title: 'Assets', priority: 120}
-
-  webprofiler.config:
-    class: Drupal\webprofiler\DataCollector\ConfigDataCollector
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/config.html.twig', id: 'config', title: 'Config', priority: 130 }
-
-  webprofiler.state:
-    class: Drupal\webprofiler\DataCollector\StateDataCollector
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/state.html.twig', id: 'state', title: 'State', priority: 140 }
-
-  webprofiler.events:
-    class: Drupal\webprofiler\DataCollector\EventsDataCollector
-    arguments: ['@event_dispatcher']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/events.html.twig', id: 'events', title: 'Events', priority: 150 }
-
-  webprofiler.services:
-    class: Drupal\webprofiler\DataCollector\ServicesDataCollector
-    arguments: ['@service_container']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/services.html.twig', id: 'services', title: 'Services', priority: 160 }
-
-  webprofiler.http:
-    class: Drupal\webprofiler\DataCollector\HttpDataCollector
-    arguments: ['@http_client_middleware.webprofiler']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/http.html.twig', id: 'http', title: 'Http', priority: 170 }
-
-  webprofiler.theme:
-    class: Drupal\webprofiler\DataCollector\ThemeDataCollector
-    arguments: ['@theme.manager', '@theme.negotiator', '@twig.profile']
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/theme.html.twig', id: 'theme', title: 'Theme', priority: 180 }
-
-  webprofiler.mail:
-    class: Drupal\webprofiler\DataCollector\MailDataCollector
-    tags:
-      - { name: data_collector, template: '@webprofiler/Collector/mail.html.twig', id: 'mail', title: 'Mail', priority: 190 }
-
-# debug services
-  stopwatch:
-    class: Drupal\webprofiler\Stopwatch
-
-  webprofiler.debug.plugin.manager.mail.default:
-    class: Drupal\Core\Mail\MailManager
-    arguments: ['@container.namespaces', '@cache.discovery', '@module_handler', '@config.factory', '@logger.factory', '@string_translation', '@renderer']
-
-  webprofiler.debug.controller_resolver:
-    class: Symfony\Component\HttpKernel\Controller\TraceableControllerResolver
-    arguments: ['@controller_resolver', '@stopwatch']
-
-  webprofiler.debug.cache_factory:
-    class: Drupal\webprofiler\Cache\CacheFactoryWrapper
-    public: false
-    decorates: cache_factory
-    arguments: ['@webprofiler.debug.cache_factory.inner', '@webprofiler.cache']
-    properties:
-      _serviceId: 'cache_factory'
-
-  webprofiler.debug.asset.css.collection_renderer:
-    class: Drupal\webprofiler\Asset\CssCollectionRendererWrapper
-    public: false
-    decorates: asset.css.collection_renderer
-    arguments: ['@webprofiler.debug.asset.css.collection_renderer.inner', '@webprofiler.assets']
-    properties:
-      _serviceId: 'asset.css.collection_renderer'
-
-  webprofiler.debug.asset.js.collection_renderer:
-    class: Drupal\webprofiler\Asset\JsCollectionRendererWrapper
-    public: false
-    decorates: asset.js.collection_renderer
-    arguments: ['@webprofiler.debug.asset.js.collection_renderer.inner', '@webprofiler.assets']
-    properties:
-      _serviceId: 'asset.js.collection_renderer'
-
-  webprofiler.debug.entity_type.manager:
-    class: Drupal\webprofiler\Entity\EntityManagerWrapper
-    public: false
-    decorates: entity_type.manager
-    arguments: ['@webprofiler.debug.entity_type.manager.inner']
-    properties:
-      _serviceId: 'entity_type.manager'
-
-  webprofiler.debug.state:
-    class: Drupal\webprofiler\State\StateWrapper
-    public: false
-    decorates: state
-    arguments: ['@webprofiler.debug.state.inner', '@webprofiler.state']
-    properties:
-      _serviceId: 'state'
-
-# middleware
-  http_middleware.webprofiler:
-    class: Drupal\webprofiler\StackMiddleware\WebprofilerMiddleware
-    tags:
-      - { name: http_middleware, priority: 350 }
-
-  http_client_middleware.webprofiler:
-    class: Drupal\webprofiler\Http\HttpClientMiddleware
-    tags:
-      - { name: http_client_middleware }
-
-# parameter converter service for profile token
-  webprofiler.token_converter:
-    class: Drupal\webprofiler\Routing\TokenConverter
-    tags:
-      - { name: paramconverter }
-
-# IDE link generator service
-  webprofiler.ide_link_generator:
-    class: Drupal\webprofiler\Helper\IdeLinkGenerator
-    arguments: ['@config.factory']
-
-# class shortener service
-  webprofiler.class_shortener:
-    class: Drupal\webprofiler\Helper\ClassShortener
diff --git a/modules/diff/LICENSE.txt b/modules/diff/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/diff/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/diff/README.txt b/modules/diff/README.txt
deleted file mode 100644
index 23f1aee..0000000
--- a/modules/diff/README.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Diff module for Drupal 8
--------------------------------------
-
-Allows the user to compare revisions with different layouts.
-
-Requirements
-------------------
-
-To use Diff you need to install and activate the
-following modules:
-
- * Entity
-
-And the following libraries dependencies:
- * php-htmldiff-advanced (Used for displaying the comparison as a rendered
-   entity)
-
-Installation
-------------------
-
-To use all the layout plugins provided by Diff please follow the next steps:
-
- * Use composer to download the required dependencies. Run:
-   "composer require drupal/diff".
-
- * Follow the link below for more information about composer and Drupal:
-   https://www.drupal.org/node/2404989
diff --git a/modules/diff/composer.json b/modules/diff/composer.json
deleted file mode 100644
index 869e138..0000000
--- a/modules/diff/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "name": "drupal/diff",
-  "description": "Compares two entity revisions",
-  "type": "drupal-module",
-  "license": "GPL-2.0+",
-  "authors": [
-    {
-      "name": "Miro Dietiker (miro_dietiker)",
-      "homepage": "https://www.drupal.org/u/miro_dietiker",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Juampy NR (juampynr)",
-      "homepage": "https://www.drupal.org/u/juampynr",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Lucian Hangea (lhangea)",
-      "homepage": "https://www.drupal.org/u/lhangea",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Alan D.",
-      "homepage": "https://www.drupal.org/u/alan-d.",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Brian Gilbert (realityloop).",
-      "homepage": "https://www.drupal.org/u/realityloop",
-      "role": "Maintainer"
-    }
-  ],
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/diff",
-    "source": "http://cgit.drupalcode.org/diff"
-  },
-  "require":{
-    "mkalkbrenner/php-htmldiff-advanced": "~0.0.8"
-  }
-}
diff --git a/modules/diff/config/install/diff.settings.yml b/modules/diff/config/install/diff.settings.yml
deleted file mode 100644
index 719563e..0000000
--- a/modules/diff/config/install/diff.settings.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-general_settings:
-  radio_behavior: simple
-  context_lines_leading: 1
-  context_lines_trailing: 1
-  revision_pager_limit: 50
-  layout_plugins:
-    visual_inline:
-      enabled: false
-      weight: 0
-    split_fields:
-      enabled: true
-      weight: 1
-    unified_fields:
-      enabled: true
-      weight: 2
-  visual_inline_theme: default
diff --git a/modules/diff/config/optional/core.entity_view_mode.node.diff.yml b/modules/diff/config/optional/core.entity_view_mode.node.diff.yml
deleted file mode 100644
index eb366aa..0000000
--- a/modules/diff/config/optional/core.entity_view_mode.node.diff.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-id: node.diff
-label: 'Revision comparison'
-status: false
-cache: true
-targetEntityType: node
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - node
-      - diff
diff --git a/modules/diff/config/schema/diff.schema.yml b/modules/diff/config/schema/diff.schema.yml
deleted file mode 100644
index 9a1badc..0000000
--- a/modules/diff/config/schema/diff.schema.yml
+++ /dev/null
@@ -1,205 +0,0 @@
-diff.settings:
-  type: config_object
-  label: 'Settings'
-  mapping:
-    general_settings:
-      type: mapping
-      label: 'General Settings'
-      mapping:
-        radio_behavior:
-          type: label
-          label: 'Radio button behaviour'
-        context_lines_leading:
-          type: integer
-          label: 'Number of leading context lines'
-        context_lines_trailing:
-          type: integer
-          label: 'Number of trailing context lines'
-        revision_pager_limit:
-          type: integer
-          label: 'Revisions per page to be displayed in diff pager'
-        layout_plugins:
-          type: sequence
-          label: 'Plugins'
-          sequence:
-            type: mapping
-            label: 'Layout plugins configuration'
-            mapping:
-              enabled:
-                type: boolean
-                label: 'Enabled'
-              weight:
-                type: integer
-                label: 'Weight'
-        visual_inline_theme:
-          type: string
-          label: 'Theme'
-    entity:
-      type: sequence
-      label: 'Entities'
-      sequence:
-        - type: sequence
-          label: 'Entity ID'
-          sequence:
-            - type: integer
-              label: 'Compare base field'
-
-diff.plugins:
-  type: config_object
-  label: 'Entity Type'
-  mapping:
-    fields:
-      type: sequence
-      label: 'Field'
-      sequence:
-        type: sequence
-        sequence:
-          type: mapping
-          label: 'Diff configuration for a field type'
-          mapping:
-            type:
-              type: text
-              label: 'Plugin key'
-            settings:
-              type: diff.plugin.settings.[%parent.type]
-
-diff.plugin.settings_base:
-  type: mapping
-  label: 'Settings for base diff builder plugin'
-  mapping:
-    show_header:
-      type: integer
-      label: 'Compare the field title'
-    markdown:
-      type: string
-      label: 'Mark-down function ID'
-
-# The plugins which extend the base diff builder plugin and don't provide
-# any configuration form will validate on this entry.
-diff.plugin.settings.*:
-  type: diff.plugin.settings_base
-
-diff.plugin.settings.file_field_diff_builder:
-  type: diff.plugin.settings_base
-  label: 'Settings for file field diff builder plugin'
-  mapping:
-    show_id:
-      type: integer
-      label: 'Compare the ID of the file'
-    compare_description_field:
-      type: integer
-      label: 'Compare the description of the file'
-    compare_display_field:
-      type: integer
-      label: 'Compare the description of the file'
-    property_separator:
-      type: text
-      label: 'Separator between multiple compared properties'
-
-diff.plugin.settings.image_field_diff_builder:
-  type: diff.plugin.settings_base
-  label: 'Settings for image field diff builder plugin'
-  mapping:
-    show_id:
-      type: integer
-      label: 'Compare the ID of the image'
-    compare_alt_field:
-      type: integer
-      label: 'Compare the alt of the image'
-    compare_title_field:
-      type: integer
-      label: 'Compare the title of the image'
-    property_separator:
-      type: text
-      label: 'Separator between multiple compared properties'
-    show_thumbnail:
-      type: integer
-      label: 'Show the image thumbnail'
-
-diff.plugin.settings.list_field_diff_builder:
-  type: diff.plugin.settings_base
-  label: 'Settings for list field diff builder plugin'
-  mapping:
-    compare:
-      type: text
-      label: 'Comparison method key'
-
-diff.plugin.settings.term_reference_field_diff_builder:
-  type: diff.plugin.settings_base
-  label: 'Settings for term reference field diff builder plugin'
-  mapping:
-    show_name:
-      type: integer
-      label: 'Compare the taxonomy term string'
-    show_id:
-      type: integer
-      label: 'Compare the taxonomy term id'
-
-diff.plugin.settings.text_field_diff_builder:
-  type: diff.plugin.settings_base
-  label: 'Settings for text field diff builder plugin'
-  mapping:
-    compare_format:
-      type: integer
-      label: 'Compare the format of the text'
-
-diff.plugin.settings.text_summary_field_diff_builder:
-  type: diff.plugin.settings_base
-  label: 'Settings for text with summary field diff builder plugin'
-  mapping:
-    compare_format:
-      type: integer
-      label: 'Compare the format of the text'
-    compare_summary:
-      type: integer
-      label: 'Compare the summary of the text'
-
-diff.plugin.settings.link_field_diff_builder:
-  type: diff.plugin.settings_base
-  label: 'Settings for link field diff builder plugin'
-  mapping:
-    compare_title:
-      type: integer
-      label: 'Compare the title of the link'
-    compare_uri:
-      type: integer
-      label: 'Compare the URI of the link'
-
-diff.plugin.settings.comment_field_diff_builder:
-  type: diff.plugin.settings_base
-  label: 'Settings for comment field diff builder plugin'
-  mapping:
-    compare_key:
-      type: integer
-      label: 'Compare the status key of the comments'
-    compare_string:
-      type: integer
-      label: 'Compare the status string of the comments'
-
-diff.plugin.settings.entity_reference_field_diff_builder:
-  type: diff.plugin.settings_base
-  label: 'Settings for entity reference field diff builder plugin'
-  mapping:
-    compare_entity_reference:
-      type: integer
-      label: 'Entity reference component to compare'
-
-diff.layout_plugins:
-  type: config_object
-  label: 'Plugin'
-  mapping:
-    type: sequence
-    sequence:
-      type: mapping
-      label: 'Diff configuration for a field type'
-      mapping:
-        type:
-          type: text
-          label: 'Plugin key'
-        settings:
-          type: diff.layout_plugin.settings.[%parent.type]
-
-diff.layout_plugin.settings_base:
-  type: mapping
-  label: 'Settings for base diff layout plugin'
-  mapping:
diff --git a/modules/diff/css/diff.colors.css b/modules/diff/css/diff.colors.css
deleted file mode 100644
index 0ab76c8..0000000
--- a/modules/diff/css/diff.colors.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file
- * Stylesheet for the diff table.
- */
-td.diff-section-title,
-div.diff-section-title {
-  background-color: #f0f0ff;
-}
-td.diff-deletedline {
-  background-color: #fdd;
-}
-td.diff-addedline {
-  background-color: #dfd;
-}
-td.field-name {
-  background-color: #f7fcff;
-}
-td.diff-addedline span.diffchange {
-  background-color: #77f177;
-}
-td.diff-deletedline span.diffchange {
-  background-color: #faa;
-}
diff --git a/modules/diff/css/diff.double-column.css b/modules/diff/css/diff.double-column.css
deleted file mode 100644
index e6c7170..0000000
--- a/modules/diff/css/diff.double-column.css
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @file
- * Stylesheet for the diff table.
- */
-td.diff-section-title,
-div.diff-section-title {
-  font-size: 0.83em;
-  font-weight: bold;
-  padding: 0.1em 1em;
-}
-td.diff-prevlink {
-  text-align: left;
-}
-td.diff-nextlink {
-  text-align: right;
-}
-td.diff-deletedline {
-  width: 50%;
-  padding: 0 1em;
-}
-td.diff-addedline {
-  width: 50%;
-  padding: 0 1em;
-}
-td.field-name {
-  text-align: left;
-  font-weight: bold;
-}
-td.rev-navigation {
-  text-align: center;
-  vertical-align: middle;
-}
-td.diff-context {
-  padding: 0.3em 1em;
-  vertical-align: top;
-}
-td.diff-marker {
-  text-align: center;
-  padding: 0.3em 1em;
-  width: 1%;
-}
-td.diff td {
-  padding: 0 1em;
-}
-td.diff-line-number {
-  text-align: center;
-  padding: 0.3em 1em;
-  width: 1%;
-  color: #AAA;
-  border-right: 1px #e6e4df solid;
-}
diff --git a/modules/diff/css/diff.general.css b/modules/diff/css/diff.general.css
deleted file mode 100644
index 8f5e0e6..0000000
--- a/modules/diff/css/diff.general.css
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * @file
- * General stylesheet for the diff module.
- */
-.diff-button {
-  margin-bottom: 20px;
-}
-
-.diff-responsive-table-wrapper {
-  min-height: 0%;
-  overflow-x: auto;
-}
-.diff-responsive-table {
-  max-width: 100%;
-}
-
-#diffadminplugins .messages {
-  margin-bottom: 0.5em;
-}
-
-.diff-navigation {
-  display: flex;
-  justify-content: space-between;
-}
-.diff-navigation label {
-  display: none;
-}
-@media screen and (min-width: 920px) {
-  .diff-navigation label {
-    display: block;
-  }
-}
-
-.diff-controls {
-  display: flex;
-  margin-bottom: 1em;
-  width: 100%;
-}
-.diff-controls__item {
-  padding-right: 1em;
-}
-
-.diff-revision__items-group:first-child {
-  margin-bottom: 0.5em;
-}
-.diff-revision__item-date {
-  float: left;
-  padding-right: 1em;
-}
-@media screen and (min-width: 560px) {
-  .diff-revision__items {
-    display: table;
-    margin-left: -1em;
-    margin-right: -1em;
-  }
-  .diff-revision__items-group {
-    display: table-row;
-  }
-  .diff-revision__item {
-    display: table-cell;
-    padding-left: 1em;
-    padding-right: 1em;
-  }
-  .diff-revision__item-date {
-    float: none;
-    white-space: nowrap;
-  }
-  .diff-revision__item-author {
-    white-space: nowrap;
-  }
-}
-
-@media screen and (min-width: 920px) {
-  .diff-header {
-    display: flex;
-  }
-
-  .diff-navigation {
-    flex-direction: column;
-    justify-content: flex-start;
-    width: 25%;
-  }
-  .diff-navigation__link.prev-link {
-    order: 1;
-  }
-
-  .diff-revision {
-    width: 75%;
-  }
-}
diff --git a/modules/diff/css/diff.single-column.css b/modules/diff/css/diff.single-column.css
deleted file mode 100644
index 1df2847..0000000
--- a/modules/diff/css/diff.single-column.css
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @file
- * Stylesheet for the diff table.
- */
-td.diff-section-title,
-div.diff-section-title {
-  font-size: 0.83em;
-  font-weight: bold;
-  padding: 0.1em 1em;
-}
-td.diff-prevlink {
-  text-align: left;
-}
-td.diff-nextlink {
-  text-align: right;
-}
-td.diff-deletedline {
-  width: 100%;
-  padding: 0 1em;
-}
-td.diff-addedline {
-  width: 100%;
-  padding: 0 1em;
-}
-td.field-name {
-  text-align: left;
-  font-weight: bold;
-}
-td.rev-navigation {
-  text-align: center;
-  vertical-align: middle;
-}
-td.diff-context {
-  padding: 0.3em 1em;
-  vertical-align: top;
-}
-td.diff-marker {
-  text-align: center;
-  padding: 0.3em 1em;
-  width: 1%;
-}
-td.diff td {
-  padding: 0 1em;
-}
-td.diff-line-number {
-  text-align: center;
-  padding: 0.3em 1em;
-  width: 1%;
-  color: #AAA;
-  border-right: 1px #e6e4df solid;
-}
\ No newline at end of file
diff --git a/modules/diff/css/diff.visual-inline.css b/modules/diff/css/diff.visual-inline.css
deleted file mode 100644
index 6501847..0000000
--- a/modules/diff/css/diff.visual-inline.css
+++ /dev/null
@@ -1,7 +0,0 @@
-del {
-  background-color: #fcc;
-}
-
-ins {
-  background-color: #cfc;
-}
diff --git a/modules/diff/diff.api.php b/modules/diff/diff.api.php
deleted file mode 100644
index f4c0d67..0000000
--- a/modules/diff/diff.api.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * @file
- * Hooks and documentation related to diff module.
- */
-
-/**
- * @defgroup diff Diff API
- *
- * @{
- * Diff module provides a new plugin type, which determines how entity fields
- * are mapped into strings which are then compared by the Diff component.
- *
- * Field diff builders are plugins annotated with class
- * \Drupal\diff\Annotation\FieldDiffBuilder, and implement plugin interface
- * \Drupal\diff\FieldDiffBuilderInterface. Field diff builders plugins are
- * managed by the \Drupal\diff\DiffBuilderManager class. Field diff builders
- * classes usually extend base class \Drupal\diff\FieldDiffBuilderBase and need
- * to be in the namespace \Drupal\{your_module}\Plugin\diff\Field\. See the
- * @link plugin_api Plugin API topic @endlink for more information on how to
- * define plugins.
- *
- * @} End of "defgroup diff".
- */
-
-/**
- * @addtogroup hooks
- * @{
- */
-
-/**
- * Alter the information provided in \Drupal\diff\Annotation\FieldDiffBuilder.
- *
- * @param array $diff_builders
- *   The array of field diff builders plugins, keyed on the machine-readable
- *    plugin name.
- */
-function hook_field_diff_builder_info_alter(array &$diff_builders) {
-  // Set a new label for the text_field_diff_builder plugin
-  // instead of the one provided in the annotation.
-  $diff_builders['text_field_diff_builder']['label'] = t('New label');
-}
-
-/**
- * Alter the information provided in \Drupal\diff\Annotation\DiffLayoutBuilder.
- *
- * @param array $diff_layouts
- *   The array of diff layout builders plugins, keyed on the machine-readable
- *    plugin name.
- */
-function hook_diff_layout_builder_info_alter(array &$diff_layouts) {
-  // Set a new label for the text_field_diff_builder plugin
-  // instead of the one provided in the annotation.
-  $diff_layouts['my_layout']['label'] = t('New label');
-}
-
-/**
- * @} End of "addtogroup hooks".
- */
diff --git a/modules/diff/diff.info.yml b/modules/diff/diff.info.yml
deleted file mode 100644
index f28f2c9..0000000
--- a/modules/diff/diff.info.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Diff
-type: module
-description: Shows changes between content revisions.
-# core: 8.x
-configure: diff.general_settings
-
-# Information added by Drupal.org packaging script on 2017-01-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'diff'
-datestamp: 1484566687
diff --git a/modules/diff/diff.install b/modules/diff/diff.install
deleted file mode 100644
index 470b242..0000000
--- a/modules/diff/diff.install
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * @file
- * Installation hooks for diff module.
- */
-
-use Drupal\Core\Url;
-
-/**
- * Implements hook_requirements().
- */
-function diff_requirements($phase) {
-  $requirements = [];
-
-  if ($phase == 'runtime') {
-    $config = \Drupal::config('diff.settings');
-    $setting_enabled = $config->get('general_settings.layout_plugins.visual_inline.enabled');
-    $has_htmlDiffAdvanced = class_exists('\HtmlDiffAdvanced');
-
-    $requirements['html_diff_advanced'] = [
-      'title' => t('Diff'),
-      'value' => t('Installed correctly'),
-      'description' => t('Diff module has been installed correctly.'),
-    ];
-    if (!$has_htmlDiffAdvanced) {
-      if ($setting_enabled) {
-        $requirements['html_diff_advanced']['value'] = t('Dependencies not found');
-        $requirements['html_diff_advanced']['severity'] = REQUIREMENT_ERROR;
-        $requirements['html_diff_advanced']['description'] = t("The HTML Diff layout requires the HtmlDiffAdvanced library. Please consult README.txt for installation instructions.");
-      }
-      else {
-        $requirements['html_diff_advanced']['value'] = t('Visual inline layout');
-        $requirements['html_diff_advanced']['severity'] = REQUIREMENT_INFO;
-        $requirements['html_diff_advanced']['description'] = t('Diff adds a visual rendered display, consult README.txt for installation instructions and enable it in <a href=":settings">settings</a>.', [':settings' => Url::fromRoute('diff.general_settings')->toString()]);
-      }
-    }
-  }
-
-  return $requirements;
-}
-
-/**
- * Implements hook_install().
- */
-function diff_install() {
-  $visual_inline = \Drupal::service('plugin.manager.diff.layout')->hasDefinition('visual_inline');
-  // Enable Visual Inline layout if library found.
-  if ($visual_inline) {
-    $config = \Drupal::configFactory()->getEditable('diff.settings');
-    $settings_enabled = $config->get('general_settings.layout_plugins.visual_inline.enabled');
-    if (!$settings_enabled) {
-      $config->set('general_settings.layout_plugins.visual_inline.enabled', TRUE);
-    }
-    $config->save();
-  }
-}
-
-/**
- * Delete stale field diff configuration. Please reconfigure diff plugins.
- */
-function diff_update_8001() {
-  $config = \Drupal::configFactory()->getEditable('diff.settings');
-  $config->clear('entity');
-  $config->save();
-  $config = \Drupal::configFactory()->getEditable('diff.plugins');
-  $config->clear('field_types');
-  $config->save();
-}
-
-/**
- * Update diff.settings to include general_settings.revision_pager_limit.
- */
-function diff_update_8002() {
-  $config_factory = \Drupal::configFactory();
-  $config = $config_factory->getEditable('diff.settings');
-  $config->set('general_settings.revision_pager_limit', 50);
-  $config->save(TRUE);
-}
-
-/**
- * Delete stale theme configuration.
- */
-function diff_update_8003() {
-  $config = \Drupal::configFactory()->getEditable('diff.settings');
-  $config->clear('general_settings.theme');
-  $config->save();
-}
-
-/**
- * Enable all layout plugins to be used.
- */
-function diff_update_8004() {
-  $config = \Drupal::configFactory()->getEditable('diff.settings');
-  $plugins = \Drupal::service('plugin.manager.diff.layout')->getDefinitions();
-  foreach ($plugins as $key => $value) {
-    $plugin_options[$key] = $value['label'];
-    $config->set('general_settings.layout_plugins.' . $key . '.enabled', TRUE);
-  }
-  $config->save();
-}
-
-/**
- * Update settings.
- */
-function diff_update_8005() {
-  // The original update function had a bug, it set the new configuration of
-  // layout plugins using the old keys (which were changed). Update 8006 will
-  // fix this issue.
-}
-
-/**
- * Update settings, set the new keys of layout plugins.
- */
-function diff_update_8006() {
-  $config = \Drupal::configFactory()->getEditable('diff.settings');
-  $layout_manager = \Drupal::service('plugin.manager.diff.layout');
-  $layout_manager->clearCachedDefinitions();
-  $plugins = $layout_manager->getDefinitions();
-  $config->clear('general_settings.layout_plugins');
-  foreach ($plugins as $key => $value) {
-    $plugin_options[$key] = $value['label'];
-    $config->set('general_settings.layout_plugins.' . $key . '.enabled', TRUE);
-  }
-  $config->save();
-}
-
-/**
- * Update settings, renamed 'standard' to 'default'.
- */
-function diff_update_8008() {
-  $config = \Drupal::configFactory()->getEditable('diff.settings');
-  $config->set('general_settings.visual_inline_theme', 'default');
-  $config->save();
-}
-
-/**
- * Remove content type settings.
- */
-function diff_update_8009() {
-  $config = \Drupal::configFactory()->getEditable('diff.settings');
-  $config->clear('content_type_settings');
-  $config->save();
-}
diff --git a/modules/diff/diff.libraries.yml b/modules/diff/diff.libraries.yml
deleted file mode 100644
index cee65e3..0000000
--- a/modules/diff/diff.libraries.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-diff.general:
-  version: 1.x
-  css:
-    theme:
-      css/diff.general.css: {}
-  js:
-    js/diff.js: {}
-  dependencies:
-    - core/drupalSettings
-    - core/jquery.once
-
-diff.double_column:
-  version: 1.x
-  css:
-    theme:
-      css/diff.double-column.css: {}
-
-diff.single_column:
-  version: 1.x
-  css:
-    theme:
-      css/diff.single-column.css: {}
-
-diff.colors:
-  version: 1.x
-  css:
-    theme:
-      css/diff.colors.css: {}
-
-diff.visual_inline:
-  version: VERSION
-  css:
-    base:
-      css/diff.visual-inline.css: {}
diff --git a/modules/diff/diff.links.menu.yml b/modules/diff/diff.links.menu.yml
deleted file mode 100644
index b2f7380..0000000
--- a/modules/diff/diff.links.menu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-diff.settings:
-  title: 'Diff'
-  parent: system.admin_config_content
-  description: 'Configure how entity fields are compared.'
-  route_name: diff.general_settings
\ No newline at end of file
diff --git a/modules/diff/diff.links.task.yml b/modules/diff/diff.links.task.yml
deleted file mode 100644
index caa8a36..0000000
--- a/modules/diff/diff.links.task.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-diff.general_settings:
-  route_name: diff.general_settings
-  base_route: diff.general_settings
-  title: Settings
-
-diff.fields_list:
-  route_name: diff.fields_list
-  base_route: diff.general_settings
-  title: Fields
diff --git a/modules/diff/diff.module b/modules/diff/diff.module
deleted file mode 100644
index b217bbc..0000000
--- a/modules/diff/diff.module
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * @file
- * This is the diff module to compare revisions.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Implements hook_help().
- */
-function diff_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    case 'help.page.diff':
-      $output = '';
-      $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Diff module replaces the normal <em>Revisions </em> node tab and enhances the listing of revisions with an option to view the differences between any two content revisions.') . '</p>';
-      $output .= '<h3>' . t('Uses') . '</h3>';
-      $output .= '<dl>';
-      $output .= '<dt>' . t('Compare content entity revisions') . '</dt>';
-      $output .= '<dd>' . t('Diff provides the possibility of comparing two node revisions but it also provides support for comparing any two content entities. With minimum effort it can be extended to display differences between any two content entities.') . '</dd>';
-      $output .= '<dt>' . t('Control field visibility settings') . '</dt>';
-      $output .= '<dd>' . t('Fields visibility can be controlled from view modes for configurable fields and from Diff settings page for entity base fields. Diff field types specific settings can also be configured from Diff settings page') . '</dd>';
-      $output .= '<dt>' . t('Configure diff field type settings') . '</dt>';
-      $output .= '<dd>' . t('Every field type has specific diff settings (display or not the field title, markdown format or other settings). These settings can be configured from Diff settings page') . '</dd>';
-      $output .= '</dl>';
-      return $output;
-
-    case 'diff.general_settings':
-      return '<p>' . t('Configurations for the revision comparison functionality and diff layout plugins.') . '</p>';
-
-    case 'diff.revision_overview':
-      return '<p>' . t('Revisions allow you to track differences between multiple versions of your content, and revert to older versions.') . '</p>';
-
-    case 'diff.fields_list':
-      return '<p>' . t('This table provides a summary of the field support found on the system. For every field, a diff plugin can be selected and configured. These settings are applied to Unified and Split fields layouts.') . '</p>';
-  }
-}
-
-/**
- * Returns the label of a certain field.
- *
- * Therefore it looks up in all bundles to find the most used field.
- *
- * @param string $entity_type
- *   The entity type id.
- * @param string $field_name
- *   The field name.
- *
- * @return array
- *   Array of labels used for the field sorted by the most used.
- */
-function _diff_field_label($entity_type, $field_name) {
-  $labels = [];
-  // Count the amount of instances of each label per field storage.
-  $bundles = \Drupal::service('entity_type.bundle.info')->getBundleInfo($entity_type);
-  $field_manager = \Drupal::service('entity_field.manager');
-  foreach (array_keys($bundles) as $bundle) {
-    $bundle_instances = $field_manager->getFieldDefinitions($entity_type, $bundle);
-    if (isset($bundle_instances[$field_name])) {
-      $instance = $bundle_instances[$field_name];
-      $label = (string) $instance->getLabel();
-      $labels[$label] = isset($labels[$label]) ? ++$labels[$label] : 1;
-    }
-  }
-
-  if (empty($labels)) {
-    // Return the original field name if there is no other label found.
-    return [$field_name];
-  }
-
-  // Return the labels sorted by the most used.
-  arsort($labels);
-  return array_keys($labels);
-}
diff --git a/modules/diff/diff.routing.yml b/modules/diff/diff.routing.yml
deleted file mode 100644
index c3314dd..0000000
--- a/modules/diff/diff.routing.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-diff.revisions_diff:
-  path: '/node/{node}/revisions/view/{left_revision}/{right_revision}/{filter}'
-  defaults:
-    _controller: '\Drupal\diff\Controller\NodeRevisionController::compareNodeRevisions'
-    _title: Diff General Settings
-  requirements:
-    _access_node_revision: 'view'
-  options:
-    _admin_route: TRUE
-
-diff.general_settings:
-  path: '/admin/config/content/diff/general'
-  defaults:
-    _form: '\Drupal\diff\Form\GeneralSettingsForm'
-    _title: Diff General Settings
-  requirements:
-    _permission: 'administer site configuration'
-
-diff.fields_list:
-  path: '/admin/config/content/diff/fields'
-  defaults:
-    _form: '\Drupal\diff\Form\FieldsSettingsForm'
-    _title: Fields Settings
-  requirements:
-    _permission: 'administer site configuration'
diff --git a/modules/diff/diff.services.yml b/modules/diff/diff.services.yml
deleted file mode 100644
index b670e5f..0000000
--- a/modules/diff/diff.services.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-services:
-  diff.route_subscriber:
-    class: Drupal\diff\Routing\RouteSubscriber
-    tags:
-      - { name: event_subscriber }
-
-  diff.diff.formatter:
-    class: Drupal\diff\DiffFormatter
-    arguments: ['@config.factory']
-
-  plugin.manager.diff.builder:
-    class: Drupal\diff\DiffBuilderManager
-    parent: default_plugin_manager
-    arguments: ['@entity_type.manager', '@config.factory']
-
-  plugin.manager.diff.layout:
-    class: Drupal\diff\DiffLayoutManager
-    parent: default_plugin_manager
-    arguments: ['@entity_type.manager', '@config.factory']
-
-  diff.entity_parser:
-    class: Drupal\diff\DiffEntityParser
-    arguments: ['@plugin.manager.diff.builder', '@config.factory']
-
-  diff.entity_comparison:
-    class: Drupal\diff\DiffEntityComparison
-    arguments: ['@config.factory', '@diff.diff.formatter','@plugin.manager.field.field_type', '@diff.entity_parser', '@plugin.manager.diff.builder']
-
-  diff.html_diff:
-    class: HtmlDiffAdvanced
-
-  theme.negotiator.visual_diff:
-    class: Drupal\diff\VisualDiffThemeNegotiator
-    arguments: ['@config.factory']
-    tags:
-      - { name: theme_negotiator, priority: 0 }
diff --git a/modules/diff/diff.views.inc b/modules/diff/diff.views.inc
deleted file mode 100644
index 1c9e876..0000000
--- a/modules/diff/diff.views.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * @file
- * Provide views data for diff.module.
- */
-
-/**
- * Implements hook_views_data().
- */
-function diff_views_data() {
-  $data = [];
-
-  /** @var \Drupal\Core\Entity\EntityTypeInterface $entity_type */
-  foreach (\Drupal::entityTypeManager()->getDefinitions() as $entity_type) {
-    // Add the diff_from and diff_to fields to every revisionable entity type.
-    if ($entity_type->isRevisionable()) {
-      $revision_base_table = $entity_type->getRevisionDataTable() ?: $entity_type->getRevisionTable();
-
-      $data[$revision_base_table]['diff_from'] = [
-        'title' => t('Diff from'),
-        'help' => 'Diff "from" radio button to compare revisions. Also adds the "Compare" button.',
-        'field' => [
-          'id' => 'diff__from',
-        ],
-      ];
-      $data[$revision_base_table]['diff_to'] = [
-        'title' => t('Diff to'),
-        'help' => 'Diff "to" radio button to compare revisions.',
-        'field' => [
-          'id' => 'diff__to',
-        ],
-      ];
-    }
-  }
-
-  return $data;
-}
diff --git a/modules/diff/js/diff.js b/modules/diff/js/diff.js
deleted file mode 100644
index d417aba..0000000
--- a/modules/diff/js/diff.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function ($, Drupal, drupalSettings) {
-
-  'use strict';
-
-  Drupal.behaviors.diffRevisions = {
-    attach: function (context, settings) {
-      // drupalSettings in not anymore bound to attached functions.
-      // It is available outside the scope of this anonymous function also.
-      var $rows = $('table.diff-revisions tbody tr').once('diff-revisions');
-      if ($rows.length === 0) {
-        return;
-      }
-
-      function updateDiffRadios() {
-        var newTd = false;
-        var oldTd = false;
-        if (!$rows.length) {
-          return true;
-        }
-        $rows.each(function () {
-          var $row = $(this);
-          var $inputs = $row.find('input[type="radio"]');
-          var $oldRadio = $inputs.filter('[name="radios_left"]').eq(0);
-          var $newRadio = $inputs.filter('[name="radios_right"]').eq(0);
-          if (!$oldRadio.length || !$newRadio.length) {
-            return true;
-          }
-          if ($oldRadio.prop('checked')) {
-            oldTd = true;
-            $oldRadio.css('visibility', 'visible');
-            $newRadio.css('visibility', 'hidden');
-          }
-          else if ($newRadio.prop('checked')) {
-            newTd = true;
-            $oldRadio.css('visibility', 'hidden');
-            $newRadio.css('visibility', 'visible');
-          }
-          else {
-            if (drupalSettings.diffRevisionRadios === 'linear') {
-              if (newTd && oldTd) {
-                $oldRadio.css('visibility', 'visible');
-                $newRadio.css('visibility', 'hidden');
-              }
-              else if (newTd) {
-                $newRadio.css('visibility', 'visible');
-                $oldRadio.css('visibility', 'visible');
-              }
-              else {
-                $newRadio.css('visibility', 'visible');
-                $oldRadio.css('visibility', 'hidden');
-              }
-            }
-            else {
-              $newRadio.css('visibility', 'visible');
-              $oldRadio.css('visibility', 'visible');
-            }
-          }
-        });
-        return true;
-      }
-
-      if (drupalSettings.diffRevisionRadios) {
-        $rows.find('input[name="radios_left"], input[name="radios_right"]').click(updateDiffRadios);
-        updateDiffRadios();
-      }
-    }
-  };
-
-})(jQuery, Drupal, drupalSettings);
diff --git a/modules/diff/src/Annotation/DiffLayoutBuilder.php b/modules/diff/src/Annotation/DiffLayoutBuilder.php
deleted file mode 100644
index f13ae12..0000000
--- a/modules/diff/src/Annotation/DiffLayoutBuilder.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\diff\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a DiffLayoutBuilder annotation object.
- *
- * Diff builders handle how fields are compared by the diff module.
- *
- * @Annotation
- */
-class DiffLayoutBuilder extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the diff layout builder.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   *
-   * @ingroup plugin_translatable
-   */
-  public $label;
-
-  /**
-   * The plugin description.
-   *
-   * @var string
-   */
-  public $description;
-
-}
diff --git a/modules/diff/src/Annotation/FieldDiffBuilder.php b/modules/diff/src/Annotation/FieldDiffBuilder.php
deleted file mode 100644
index c5d7c33..0000000
--- a/modules/diff/src/Annotation/FieldDiffBuilder.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\diff\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a FieldDiffBuilder annotation object.
- *
- * Diff builders handle how fields are compared by the diff module.
- *
- * Additional annotation keys for diff builders can be defined in
- * hook_field_diff_builder_info_alter().
- *
- * @Annotation
- *
- * @see \Drupal\diff\FieldDiffBuilderPluginManager
- * @see \Drupal\diff\FieldDiffBuilderInterface
- */
-class FieldDiffBuilder extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the diff builder.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   *
-   * @ingroup plugin_translatable
-   */
-  public $label;
-
-  /**
-   * An array of field types the diff builder supports.
-   *
-   * @var array
-   */
-  public $field_types = [];
-
-  /**
-   * The weight of the plugin that defines its importance when applied.
-   *
-   * @var int
-   */
-  public $weight = 0;
-}
diff --git a/modules/diff/src/Controller/NodeRevisionController.php b/modules/diff/src/Controller/NodeRevisionController.php
deleted file mode 100644
index 3b0fec7..0000000
--- a/modules/diff/src/Controller/NodeRevisionController.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\diff\Controller;
-
-use Drupal\node\NodeInterface;
-
-/**
- * Returns responses for Node Revision routes.
- */
-class NodeRevisionController extends PluginRevisionController {
-
-  /**
-   * Returns a form for revision overview page.
-   *
-   * @todo This might be changed to a view when the issue at this link is
-   *   resolved: https://drupal.org/node/1863906
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node whose revisions are inspected.
-   *
-   * @return array
-   *   Render array containing the revisions table for $node.
-   */
-  public function revisionOverview(NodeInterface $node) {
-    return $this->formBuilder()->getForm('Drupal\diff\Form\RevisionOverviewForm', $node);
-  }
-
-  /**
-   * Returns a table which shows the differences between two node revisions.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node whose revisions are compared.
-   * @param int $left_revision
-   *   Vid of the node revision from the left.
-   * @param int $right_revision
-   *   Vid of the node revision from the right.
-   * @param string $filter
-   *   If $filter == 'raw' raw text is compared (including html tags)
-   *   If $filter == 'raw-plain' markdown function is applied to the text before comparison.
-   *
-   * @return array
-   *   Table showing the diff between the two node revisions.
-   */
-  public function compareNodeRevisions(NodeInterface $node, $left_revision, $right_revision, $filter) {
-    $storage = $this->entityTypeManager()->getStorage('node');
-    $route_match = \Drupal::routeMatch();
-    $left_revision = $storage->loadRevision($left_revision);
-    $right_revision = $storage->loadRevision($right_revision);
-    $build = $this->compareEntityRevisions($route_match, $left_revision, $right_revision, $filter);
-    return $build;
-  }
-
-}
diff --git a/modules/diff/src/Controller/PluginRevisionController.php b/modules/diff/src/Controller/PluginRevisionController.php
deleted file mode 100644
index 7b6a53d..0000000
--- a/modules/diff/src/Controller/PluginRevisionController.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-
-namespace Drupal\diff\Controller;
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Component\Utility\UrlHelper;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Link;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\diff\DiffLayoutManager;
-use Drupal\diff\DiffEntityComparison;
-
-/**
- * Base class for controllers that return responses on entity revision routes.
- */
-class PluginRevisionController extends ControllerBase {
-
-  /**
-   * Wrapper object for writing/reading configuration from diff.plugins.yml.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $config;
-
-  /**
-   * The diff entity comparison service.
-   *
-   * @var \Drupal\diff\DiffEntityComparison
-   */
-  protected $entityComparison;
-
-  /**
-   * The field diff layout plugin manager service.
-   *
-   * @var \Drupal\diff\DiffLayoutManager
-   */
-  protected $diffLayoutManager;
-
-  /**
-   * The request stack.
-   *
-   * @var \Symfony\Component\HttpFoundation\RequestStack
-   */
-  protected $requestStack;
-
-  /**
-   * Constructs a PluginRevisionController object.
-   *
-   * @param \Drupal\diff\DiffEntityComparison $entity_comparison
-   *   The diff entity comparison service.
-   * @param \Drupal\diff\DiffLayoutManager $diff_layout_manager
-   *   The diff layout service.
-   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *   The request stack.
-   */
-  public function __construct(DiffEntityComparison $entity_comparison, DiffLayoutManager $diff_layout_manager, RequestStack $request_stack) {
-    $this->config = $this->config('diff.settings');
-    $this->diffLayoutManager = $diff_layout_manager;
-    $this->entityComparison = $entity_comparison;
-    $this->requestStack = $request_stack;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('diff.entity_comparison'),
-      $container->get('plugin.manager.diff.layout'),
-      $container->get('request_stack')
-    );
-  }
-
-  /**
-   * Get all the revision ids of given entity id.
-   *
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
-   *   The entity storage manager.
-   * @param int $entity_id
-   *   The entity to find revisions of.
-   *
-   * @return int[]
-   *   The revision ids.
-   */
-  public function getRevisionIds(EntityStorageInterface $storage, $entity_id) {
-    $result = $storage->getQuery()
-      ->allRevisions()
-      ->condition($storage->getEntityType()->getKey('id'), $entity_id)
-      ->execute();
-    $result_array = array_keys($result);
-    sort($result_array);
-    return $result_array;
-  }
-
-  /**
-   * Returns a table which shows the differences between two entity revisions.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *   The route match.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $left_revision
-   *   The left revision.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $right_revision
-   *   The right revision.
-   * @param string $filter
-   *   If $filter == 'raw' raw text is compared (including html tags)
-   *   If filter == 'raw-plain' markdown function is applied to the text before comparison.
-   *
-   * @return array
-   *   Table showing the diff between the two entity revisions.
-   */
-  public function compareEntityRevisions(RouteMatchInterface $route_match, ContentEntityInterface $left_revision, ContentEntityInterface $right_revision, $filter) {
-    $entity_type_id = $left_revision->getEntityTypeId();
-    /** @var \Drupal\Core\Entity\EntityInterface $entity */
-    $entity = $route_match->getParameter($entity_type_id);
-
-    $entity_type_id = $entity->getEntityTypeId();
-    $storage = $this->entityTypeManager()->getStorage($entity_type_id);
-    // Get language from the entity context.
-    $langcode = $entity->language()->getId();
-
-    // Get left and right revision in current language.
-    $left_revision = $left_revision->getTranslation($langcode);
-    $right_revision = $right_revision->getTranslation($langcode);
-
-    $revisions_ids = [];
-    // Filter revisions of current translation and where the translation is
-    // affected.
-    foreach ($this->getRevisionIds($storage, $entity->id()) as $revision_id) {
-      /** @var \Drupal\Core\Entity\ContentEntityInterface $revision */
-      $revision = $storage->loadRevision($revision_id);
-      if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
-        $revisions_ids[] = $revision_id;
-      }
-    }
-
-    $build = [
-      '#title' => $this->t('Changes to %title', ['%title' => $entity->label()]),
-      'header' => [
-        '#prefix' => '<header class="diff-header">',
-        '#suffix' => '</header>',
-      ],
-      'controls' => [
-        '#prefix' => '<div class="diff-controls">',
-        '#suffix' => '</div>',
-      ],
-    ];
-
-    // Build the navigation links.
-    $build['header']['diff_navigation'] = $this->buildRevisionsNavigation($entity, $revisions_ids, $left_revision->getRevisionId(), $right_revision->getRevisionId(), $filter);
-
-    // Build the layout filter.
-    $build['controls']['diff_layout'] = [
-      '#type' => 'item',
-      '#title' => $this->t('Layout'),
-      '#wrapper_attributes' => ['class' => 'diff-controls__item'],
-      'filter' => $this->buildLayoutNavigation($entity, $left_revision->getRevisionId(), $right_revision->getRevisionId(), $filter),
-    ];
-
-    // Perform comparison only if both entity revisions loaded successfully.
-    if ($left_revision != FALSE && $right_revision != FALSE) {
-      // Build the diff comparison with the plugin.
-      if ($plugin = $this->diffLayoutManager->createInstance($filter)) {
-        $build = array_merge_recursive($build, $plugin->build($left_revision, $right_revision, $entity));
-        $build['diff']['#prefix'] = '<div class="diff-responsive-table-wrapper">';
-        $build['diff']['#suffix'] = '<div>';
-        $build['diff']['#attributes']['class'][] = 'diff-responsive-table';
-      }
-    }
-
-    $build['#attached']['library'][] = 'diff/diff.general';
-    return $build;
-  }
-
-  /**
-   * Builds a navigation dropdown button between the layout plugins.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity to be compared.
-   * @param int $left_revision_id
-   *   Revision id of the left revision.
-   * @param int $right_revision_id
-   *   Revision id of the right revision.
-   * @param string $active_filter
-   *   The active filter.
-   *
-   * @return array
-   *   The layout filter.
-   */
-  protected function buildLayoutNavigation(ContentEntityInterface $entity, $left_revision_id, $right_revision_id, $active_filter) {
-    $links = [];
-    $layouts = $this->diffLayoutManager->getPluginOptions();
-    foreach ($layouts as $key => $value) {
-      $links[$key] = array(
-        'title' => $value,
-        'url' => $this->diffRoute($entity, $left_revision_id, $right_revision_id, $key),
-      );
-    }
-
-    // Set as the first element the current filter.
-    $filter = $links[$active_filter];
-    unset($links[$active_filter]);
-    array_unshift($links, $filter);
-
-    $filter = [
-      '#type' => 'operations',
-      '#links' => $links,
-    ];
-
-    return $filter;
-  }
-
-  /**
-   * Creates navigation links between the previous changes and the new ones.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity to be compared.
-   * @param array $revision_ids
-   *   The revision ids.
-   * @param int $left_revision_id
-   *   Revision id of the left revision.
-   * @param int $right_revision_id
-   *   Revision id of the right revision.
-   * @param string $filter
-   *   The filter.
-   *
-   * @return array
-   *   The revision navigation links.
-   */
-  protected function buildRevisionsNavigation(ContentEntityInterface $entity, array $revision_ids, $left_revision_id, $right_revision_id, $filter) {
-    $revisions_count = count($revision_ids);
-    $layout_options = &drupal_static(__FUNCTION__);
-    if (!isset($layout_options)) {
-      $layout_options = UrlHelper::filterQueryParameters($this->requestStack->getCurrentRequest()->query->all(), ['page']);
-    }
-    // If there are only 2 revision return an empty row.
-    if ($revisions_count == 2) {
-      return [];
-    }
-    else {
-      $left_link = $right_link = '';
-      $element = [
-        '#type' => 'item',
-        '#title' => $this->t('Navigation'),
-        '#wrapper_attributes' => ['class' => 'diff-navigation'],
-      ];
-      $i = 0;
-      // Find the previous revision.
-      while ($left_revision_id > $revision_ids[$i]) {
-        $i += 1;
-      }
-      if ($i != 0) {
-        // Build the left link.
-        $left_link = Link::fromTextAndUrl($this->t('Previous change'), $this->diffRoute($entity, $revision_ids[$i - 1], $left_revision_id, $filter, $layout_options))->toString();
-      }
-      $element['left'] = [
-        '#type' => 'markup',
-        '#markup' => $left_link,
-        '#prefix' => '<div class="diff-navigation__link prev-link">',
-        '#suffix' => '</div>',
-      ];
-      // Find the next revision.
-      $i = 0;
-      while ($i < $revisions_count && $right_revision_id >= $revision_ids[$i]) {
-        $i += 1;
-      }
-      if ($revisions_count != $i && $revision_ids[$i - 1] != $revision_ids[$revisions_count - 1]) {
-        // Build the right link.
-        $right_link = Link::fromTextAndUrl($this->t('Next change'), $this->diffRoute($entity, $right_revision_id, $revision_ids[$i], $filter, $layout_options))->toString();
-      }
-      $element['right'] = [
-        '#type' => 'markup',
-        '#markup' => $right_link,
-        '#prefix' => '<div class="diff-navigation__link next-link">',
-        '#suffix' => '</div>',
-      ];
-      return $element;
-    }
-  }
-
-  /**
-   * Creates an url object for diff.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity to be compared.
-   * @param int $left_revision_id
-   *   Revision id of the left revision.
-   * @param int $right_revision_id
-   *   Revision id of the right revision.
-   * @param string $layout
-   *   (optional) The filter/layout added to the route.
-   * @param array $layout_options
-   *   (optional) The layout options provided by the selected layout.
-   *
-   * @return \Drupal\Core\Url
-   *   The URL object.
-   */
-  public static function diffRoute(ContentEntityInterface $entity, $left_revision_id, $right_revision_id, $layout = NULL, array $layout_options = NULL) {
-    $entity_type_id = $entity->getEntityTypeId();
-    // @todo Remove the diff.revisions_diff route so we avoid adding extra cases.
-    if ($entity->getEntityTypeId() == 'node') {
-      $route_name = 'diff.revisions_diff';
-    }
-    else {
-      $route_name = "entity.$entity_type_id.revisions_diff";
-    }
-    $route_parameters = [
-      $entity_type_id => $entity->id(),
-      'left_revision' => $left_revision_id,
-      'right_revision' => $right_revision_id,
-    ];
-    if ($layout) {
-      $route_parameters['filter'] = $layout;
-    }
-    $options = [];
-    if ($layout_options) {
-      $options = [
-        'query' => $layout_options,
-      ];
-    }
-    return Url::fromRoute($route_name, $route_parameters, $options);
-  }
-
-}
diff --git a/modules/diff/src/DiffBuilderManager.php b/modules/diff/src/DiffBuilderManager.php
deleted file mode 100644
index 41bc24a..0000000
--- a/modules/diff/src/DiffBuilderManager.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-
-namespace Drupal\diff;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\field\Entity\FieldStorageConfig;
-
-/**
- * Plugin type manager for field diff builders.
- *
- * @ingroup field_diff_builder
- *
- * Plugin directory Plugin/diff/Field.
- *
- * @see \Drupal\diff\Annotation\FieldDiffBuilder
- * @see \Drupal\diff\FieldDiffBuilderInterface
- * @see plugin_api
- */
-class DiffBuilderManager extends DefaultPluginManager {
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Wrapper object for simple configuration from diff.settings.yml.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $config;
-
-  /**
-   * Wrapper object for simple configuration from diff.plugins.yml.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $pluginsConfig;
-
-  /**
-   * Static cache of field definitions per bundle and entity type.
-   *
-   * @var array
-   */
-  protected $pluginDefinitions;
-
-  /**
-   * Constructs a DiffBuilderManager object.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   Cache backend instance to use.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, EntityTypeManagerInterface $entity_type_manager, ConfigFactoryInterface $config_factory) {
-    parent::__construct('Plugin/diff/Field', $namespaces, $module_handler, '\Drupal\diff\FieldDiffBuilderInterface', 'Drupal\diff\Annotation\FieldDiffBuilder');
-
-    $this->setCacheBackend($cache_backend, 'field_diff_builder_plugins');
-    $this->alterInfo('field_diff_builder_info');
-    $this->entityTypeManager = $entity_type_manager;
-    $this->config = $config_factory->get('diff.settings');
-    $this->pluginsConfig = $config_factory->get('diff.plugins');
-
-  }
-
-  /**
-   * Define whether a field should be displayed or not as a diff change.
-   *
-   * To define if a field should be displayed in the diff comparison, check if
-   * it is revisionable and is not the bundle or revision field of the entity.
-   *
-   * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_storage_definition
-   *   The field storage definition.
-   *
-   * @return bool
-   *   TRUE if the field will be displayed.
-   */
-  public function showDiff(FieldStorageDefinitionInterface $field_storage_definition) {
-    $show_diff = FALSE;
-    // Check if the field is revisionable.
-    if ($field_storage_definition->isRevisionable()) {
-      $show_diff = TRUE;
-      // Do not display the field, if it is the bundle or revision field of the
-      // entity.
-      $entity_type = $this->entityTypeManager->getDefinition($field_storage_definition->getTargetEntityTypeId());
-      // @todo Don't hard code fields after: https://www.drupal.org/node/2248983
-      if (in_array($field_storage_definition->getName(), [
-        'revision_log',
-        'revision_uid',
-        $entity_type->getKey('bundle'),
-        $entity_type->getKey('revision'),
-      ])) {
-        $show_diff = FALSE;
-      }
-    }
-    return $show_diff;
-  }
-
-  /**
-   * Creates a plugin instance for a field definition.
-   *
-   * Creates the instance based on the selected plugin for the field.
-   *
-   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
-   *   The field definition.
-   *
-   * @return \Drupal\diff\FieldDiffBuilderInterface|null
-   *   The plugin instance, NULL if none.
-   */
-  public function createInstanceForFieldDefinition(FieldDefinitionInterface $field_definition) {
-    $selected_plugin = $this->getSelectedPluginForFieldStorageDefinition($field_definition->getFieldStorageDefinition());
-    if ($selected_plugin['type'] != 'hidden') {
-      return $this->createInstance($selected_plugin['type'], $selected_plugin['settings']);
-    }
-    return NULL;
-  }
-
-  /**
-   * Selects a default plugin for a field storage definition.
-   *
-   * Checks if a plugin has been already selected for the field, otherwise
-   * chooses one between the plugins that can be applied to the field.
-   *
-   * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_definition
-   *   The field storage definition.
-   *
-   * @return array
-   *   An array with the key type (which contains the plugin ID) and settings.
-   *   The special type hidden indicates that the field should not be shown.
-   */
-  public function getSelectedPluginForFieldStorageDefinition(FieldStorageDefinitionInterface $field_definition) {
-    $plugin_options = $this->getApplicablePluginOptions($field_definition);
-    $field_key = $field_definition->getTargetEntityTypeId() . '.' . $field_definition->getName();
-
-    // Start with the stored configuration, this returns NULL if there is none.
-    $selected_plugin = $this->pluginsConfig->get('fields.' . $field_key);
-
-    // If there is configuration and it is a valid type or exlplicitly set to
-    // hidden, then use that, otherwise try to find a suitable default plugin.
-    if ($selected_plugin && (in_array($selected_plugin['type'], array_keys($plugin_options)) || $selected_plugin['type'] == 'hidden')) {
-      return $selected_plugin + ['settings' => []];
-    }
-    elseif (!empty($plugin_options) && $this->isFieldStorageDefinitionDisplayed($field_definition)) {
-      return ['type' => key($plugin_options), 'settings' => []];
-    }
-    else {
-      return ['type' => 'hidden', 'settings' => []];
-    }
-  }
-
-  /**
-   * Determines if the field is displayed.
-   *
-   * Determines if a field should be displayed when comparing revisions based on
-   * the entity view display if there is no plugin selected for the field.
-   *
-   * @param FieldStorageDefinitionInterface $field_storage_definition
-   *   The field name.
-   *
-   * @return bool
-   *   Whether the field is displayed.
-   */
-  public function isFieldStorageDefinitionDisplayed(FieldStorageDefinitionInterface $field_storage_definition) {
-    if (($field_storage_definition instanceof BaseFieldDefinition && $field_storage_definition->isDisplayConfigurable('view')) || $field_storage_definition instanceof FieldStorageConfig) {
-      $field_key = 'content.' . $field_storage_definition->getName() . '.type';
-      $storage = $this->entityTypeManager->getStorage('entity_view_display');
-      $query = $storage->getQuery()->condition('targetEntityType', $field_storage_definition->getTargetEntityTypeId());
-      if ($field_storage_definition instanceof FieldStorageConfig) {
-        $bundles = $field_storage_definition->getBundles();
-        $query->condition('bundle', (array) $bundles, 'IN');
-      }
-      $result = $query->exists($field_key)->range(0, 1)->execute();
-      return !empty($result) ? TRUE : FALSE;
-    }
-    else {
-      $view_options = (bool) $field_storage_definition->getDisplayOptions('view');
-      return $view_options;
-    }
-  }
-
-  /**
-   * Gets the applicable plugin options for a given field.
-   *
-   * Loop over the plugins that can be applied to the field and builds an array
-   * of possible plugins based on each plugin weight.
-   *
-   * @param FieldStorageDefinitionInterface $field_definition
-   *   The field storage definition.
-   *
-   * @return array
-   *   The plugin option for the given field based on plugin weight.
-   */
-  public function getApplicablePluginOptions(FieldStorageDefinitionInterface $field_definition) {
-    $plugins = $this->getPluginDefinitions();
-    // Build a list of all diff plugins supporting the field type of the field.
-    $plugin_options = [];
-    if (isset($plugins[$field_definition->getType()])) {
-      // Sort the plugins based on their weight.
-      uasort($plugins[$field_definition->getType()], 'Drupal\Component\Utility\SortArray::sortByWeightElement');
-
-      foreach ($plugins[$field_definition->getType()] as $id => $weight) {
-        $definition = $this->getDefinition($id, FALSE);
-        // Check if the plugin is applicable.
-        if (isset($definition['class']) && in_array($field_definition->getType(), $definition['field_types'])) {
-          /** @var FieldDiffBuilderInterface $class */
-          $class = $definition['class'];
-          if ($class::isApplicable($field_definition)) {
-            $plugin_options[$id] = $this->getDefinitions()[$id]['label'];
-          }
-        }
-      }
-    }
-    return $plugin_options;
-  }
-
-  /**
-   * Initializes the local pluginDefinitions property.
-   *
-   * Loop over the plugin definitions and build an array keyed by the field type
-   * that plugins can be applied to.
-   *
-   * @return array
-   *   The initialized plugins array sort by field type.
-   */
-  public function getPluginDefinitions() {
-    if (!isset($this->pluginDefinitions)) {
-      // Get the definition of all the FieldDiffBuilder plugins.
-      foreach ($this->getDefinitions() as $plugin_definition) {
-        if (isset($plugin_definition['field_types'])) {
-          // Iterate through all the field types this plugin supports
-          // and for every such field type add the id of the plugin.
-          if (!isset($plugin_definition['weight'])) {
-            $plugin_definition['weight'] = 0;
-          }
-
-          foreach ($plugin_definition['field_types'] as $id) {
-            $this->pluginDefinitions[$id][$plugin_definition['id']]['weight'] = $plugin_definition['weight'];
-          }
-        }
-      }
-    }
-    return $this->pluginDefinitions;
-  }
-
-  /**
-   * Clear the pluginDefinitions local property array.
-   */
-  public function clearCachedDefinitions() {
-    unset($this->pluginDefinitions);
-  }
-
-}
diff --git a/modules/diff/src/DiffEntityComparison.php b/modules/diff/src/DiffEntityComparison.php
deleted file mode 100644
index 65e15d0..0000000
--- a/modules/diff/src/DiffEntityComparison.php
+++ /dev/null
@@ -1,354 +0,0 @@
-<?php
-
-namespace Drupal\diff;
-
-use Drupal\Core\Config\ConfigFactory;
-use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Component\Diff\Diff;
-use Drupal\Core\Entity\RevisionLogInterface;
-use Drupal\Component\Utility\Xss;
-
-/**
- * Entity comparison service that prepares a diff of a pair of entities.
- */
-class DiffEntityComparison {
-
-  /**
-   * Contains the configuration object factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * Wrapper object for simple configuration from diff.plugins.yml.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $pluginsConfig;
-
-  /**
-   * The diff formatter.
-   *
-   * @var \Drupal\Core\Diff\DiffFormatter
-   */
-  protected $diffFormatter;
-
-  /**
-   * A list of all the field types from the system and their definitions.
-   *
-   * @var array
-   */
-  protected $fieldTypeDefinitions;
-
-  /**
-   * The entity parser.
-   *
-   * @var \Drupal\diff\DiffEntityParser
-   */
-  protected $entityParser;
-
-  /**
-   * The field diff plugin manager service.
-   *
-   * @var \Drupal\diff\DiffBuilderManager
-   */
-  protected $diffBuilderManager;
-
-  /**
-   * Constructs a DiffEntityComparison object.
-   *
-   * @param \Drupal\Core\Config\ConfigFactory $config_factory
-   *   The configuration factory.
-   * @param \Drupal\diff\DiffFormatter $diff_formatter
-   *   The diff formatter service.
-   * @param \Drupal\Component\Plugin\PluginManagerInterface $plugin_manager
-   *   The plugin manager service.
-   * @param \Drupal\diff\DiffEntityParser $entity_parser
-   *   The entity parser.
-   * @param \Drupal\diff\DiffBuilderManager $diff_builder_manager
-   *   The diff builder manager.
-   */
-  public function __construct(ConfigFactory $config_factory, DiffFormatter $diff_formatter, PluginManagerInterface $plugin_manager, DiffEntityParser $entity_parser, DiffBuilderManager $diff_builder_manager) {
-    $this->configFactory = $config_factory;
-    $this->pluginsConfig = $this->configFactory->get('diff.plugins');
-    $this->diffFormatter = $diff_formatter;
-    $this->fieldTypeDefinitions = $plugin_manager->getDefinitions();
-    $this->entityParser = $entity_parser;
-    $this->diffBuilderManager = $diff_builder_manager;
-  }
-
-  /**
-   * This method should return an array of items ready to be compared.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $left_entity
-   *   The left entity.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $right_entity
-   *   The right entity.
-   *
-   * @return array
-   *   Items ready to be compared by the Diff component.
-   */
-  public function compareRevisions(ContentEntityInterface $left_entity, ContentEntityInterface $right_entity) {
-    $result = array();
-
-    $left_values = $this->entityParser->parseEntity($left_entity);
-    $right_values = $this->entityParser->parseEntity($right_entity);
-
-    foreach ($left_values as $left_key => $values) {
-      list (, $field_key) = explode(':', $left_key);
-      // Get the compare settings for this field type.
-      $compare_settings = $this->pluginsConfig->get('fields.' . $field_key);
-      $result[$left_key] = [
-        '#name' => (isset($compare_settings['settings']['show_header']) && $compare_settings['settings']['show_header'] == 0) ? '' : $values['label'],
-        '#settings' => $compare_settings,
-        '#data' => [],
-      ];
-
-      // Fields which exist on the right entity also.
-      if (isset($right_values[$left_key])) {
-        $result[$left_key]['#data'] += $this->combineFields($left_values[$left_key], $right_values[$left_key]);
-        // Unset the field from the right entity so that we know if the right
-        // entity has any fields that left entity doesn't have.
-        unset($right_values[$left_key]);
-      }
-      // This field exists only on the left entity.
-      else {
-        $result[$left_key]['#data'] += $this->combineFields($left_values[$left_key], []);
-      }
-    }
-
-    // Fields which exist only on the right entity.
-    foreach ($right_values as $right_key => $values) {
-      list (, $field_key) = explode(':', $right_key);
-      $compare_settings = $this->pluginsConfig->get('fields.' . $field_key);
-      $result[$right_key] = [
-        '#name' => (isset($compare_settings['settings']['show_header']) && $compare_settings['settings']['show_header'] == 0) ? '' : $values['label'],
-        '#settings' => $compare_settings,
-        '#data' => [],
-      ];
-      $result[$right_key]['#data'] += $this->combineFields([], $right_values[$right_key]);
-    }
-
-    return $result;
-  }
-
-  /**
-   * Combine two fields into an array with keys '#left' and '#right'.
-   *
-   * @param array $left_values
-   *   Entity field formatted into an array of strings.
-   * @param array $right_values
-   *   Entity field formatted into an array of strings.
-   *
-   * @return array
-   *   Array resulted after combining the left and right values.
-   */
-  protected function combineFields(array $left_values, array $right_values) {
-    $result = array(
-      '#left' => array(),
-      '#right' => array(),
-    );
-    $max = max(array(count($left_values), count($right_values)));
-    for ($delta = 0; $delta < $max; $delta++) {
-      // EXPERIMENTAL: Transform thumbnail from ImageFieldBuilder.
-      // @todo Make thumbnail / rich diff data pluggable.
-      // @see https://www.drupal.org/node/2840566
-      if (isset($left_values[$delta])) {
-        $value = $left_values[$delta];
-        if (isset($value['#thumbnail'])) {
-          $result['#left_thumbnail'][] = $value['#thumbnail'];
-        }
-        else {
-          $result['#left'][] = is_array($value) ? implode("\n", $value) : $value;
-        }
-      }
-      if (isset($right_values[$delta])) {
-        $value = $right_values[$delta];
-        if (isset($value['#thumbnail'])) {
-          $result['#right_thumbnail'][] = $value['#thumbnail'];
-        }
-        else {
-          $result['#right'][] = is_array($value) ? implode("\n", $value) : $value;
-        }
-      }
-    }
-
-    // If a field has multiple values combine them into one single string.
-    $result['#left'] = implode("\n", $result['#left']);
-    $result['#right'] = implode("\n", $result['#right']);
-
-    return $result;
-  }
-
-  /**
-   * Prepare the table rows for #type 'table'.
-   *
-   * @param string $a
-   *   The source string to compare from.
-   * @param string $b
-   *   The target string to compare to.
-   * @param bool $show_header
-   *   Display diff context headers. For example, "Line x".
-   * @param array $line_stats
-   *   Tracks line numbers across multiple calls to DiffFormatter.
-   *
-   * @see \Drupal\Component\Diff\DiffFormatter::format
-   *
-   * @return array
-   *   Array of rows usable with #type => 'table' returned by the core diff
-   *   formatter when format a diff.
-   */
-  public function getRows($a, $b, $show_header = FALSE, array &$line_stats = NULL) {
-    if (!isset($line_stats)) {
-      $line_stats = array(
-        'counter' => array('x' => 0, 'y' => 0),
-        'offset' => array('x' => 0, 'y' => 0),
-      );
-    }
-
-    // Header is the line counter.
-    $this->diffFormatter->show_header = $show_header;
-    $diff = new Diff($a, $b);
-
-    return $this->diffFormatter->format($diff);
-  }
-
-  /**
-   * Splits the strings into lines and counts the resulted number of lines.
-   *
-   * @param array $diff
-   *   Array of strings.
-   */
-  public function processStateLine(array &$diff) {
-    $data = $diff['#data'];
-    if (isset($data['#left']) && $data['#left'] != '') {
-      if (is_string($data['#left'])) {
-        $diff['#data']['#left'] = explode("\n", $data['#left']);
-      }
-      $diff['#data']['#count_left'] = count($diff['#data']['#left']);
-    }
-    else {
-      $diff['#data']['#count_left'] = 0;
-      $diff['#data']['#left'] = [];
-    }
-    if (isset($data['#right']) && $data['#right'] != '') {
-      if (is_string($data['#right'])) {
-        $diff['#data']['#right'] = explode("\n", $data['#right']);
-      }
-      $diff['#data']['#count_right'] = count($diff['#data']['#right']);
-    }
-    else {
-      $diff['#data']['#count_right'] = 0;
-      $diff['#data']['#right'] = [];
-    }
-  }
-
-  /**
-   * Gets the revision description of the revision.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $revision
-   *   The current revision.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $previous_revision
-   *   (optional) The previous revision. Defaults to NULL.
-   *
-   * @return string
-   *   The revision log message.
-   */
-  public function getRevisionDescription(ContentEntityInterface $revision, ContentEntityInterface $previous_revision = NULL) {
-    $summary_elements = [];
-    $revision_summary = '';
-    // Check if the revision has a revision log message.
-    if ($revision instanceof RevisionLogInterface) {
-      $revision_summary = Xss::filter($revision->getRevisionLogMessage());
-    }
-    // Auto generate the revision log.
-    if ($revision_summary == '') {
-      // If there is a previous revision, load values of both revisions, loop
-      // over the current revision fields.
-      if ($previous_revision) {
-        $left_values = $this->summary($previous_revision);
-        $right_values = $this->summary($revision);
-        foreach ($right_values as $key => $value) {
-          // Unset left values after comparing. Add right value label to the
-          // summary if it is changed or new.
-          if (isset($left_values[$key])) {
-            if ($value['value'] != $left_values[$key]['value']) {
-              $summary_elements[] = $value['label'];
-            }
-            unset($left_values[$key]);
-          }
-          else {
-            $summary_elements[] = $value['label'];
-          }
-        }
-        // Add the remaining left values if not present in the right entity.
-        foreach ($left_values as $key => $value) {
-          if (!isset($right_values[$key])) {
-            $summary_elements[] = $value['label'];
-          }
-        }
-        if (count($summary_elements) > 0) {
-          $revision_summary = 'Changes on: ' . implode(', ', $summary_elements);
-        }
-        else {
-          $revision_summary = 'No changes.';
-        }
-      }
-      else {
-        $revision_summary = 'Initial revision.';
-      }
-    }
-
-    return $revision_summary;
-  }
-
-  /**
-   * Creates an log message based on the changes of entity fields.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $revision
-   *   The current revision.
-   *
-   * @return array
-   *   Array of the revision fields with their value and label.
-   */
-  protected function summary(ContentEntityInterface $revision) {
-    $result = [];
-    $entity_type_id = $revision->getEntityTypeId();
-    // Loop through entity fields and transform every FieldItemList object
-    // into an array of strings according to field type specific settings.
-    /** @var \Drupal\Core\Field\FieldItemListInterface $field_items */
-    foreach ($revision as $field_items) {
-      $show_delta = FALSE;
-      // Create a plugin instance for the field definition.
-      $plugin = $this->diffBuilderManager->createInstanceForFieldDefinition($field_items->getFieldDefinition());
-      if ($plugin && $this->diffBuilderManager->showDiff($field_items->getFieldDefinition()->getFieldStorageDefinition())) {
-        // Create the array with the fields of the entity. Recursive if the
-        // field contains entities.
-        if ($plugin instanceof FieldReferenceInterface) {
-          foreach ($plugin->getEntitiesToDiff($field_items) as $entity_key => $reference_entity) {
-            foreach ($this->summary($reference_entity) as $key => $build) {
-              if ($field_items->getFieldDefinition()->getFieldStorageDefinition()->getCardinality() != 1) {
-                $show_delta = TRUE;
-              }
-              $result[$key] = $build;
-              $delta = $show_delta ? '<sub>' . ($entity_key + 1) . '</sub> ' : ' - ';
-              $result[$key]['label'] = $field_items->getFieldDefinition()->getLabel() . $delta . $result[$key]['label'];
-            };
-          }
-        }
-        else {
-          // Create a unique flat key.
-          $key = $revision->id() . ':' . $entity_type_id . '.' . $field_items->getName();
-
-          $result[$key]['value'] = $field_items->getValue();
-          $result[$key]['label'] = $field_items->getFieldDefinition()->getLabel();
-        }
-      }
-    }
-
-    return $result;
-  }
-
-}
diff --git a/modules/diff/src/DiffEntityParser.php b/modules/diff/src/DiffEntityParser.php
deleted file mode 100644
index bc41aa2..0000000
--- a/modules/diff/src/DiffEntityParser.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace Drupal\diff;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Language\LanguageInterface;
-
-/**
- * Transforms an entity into an array of strings for diff.
- */
-class DiffEntityParser {
-
-  /**
-   * The diff field builder plugin manager.
-   *
-   * @var \Drupal\diff\DiffBuilderManager
-   */
-  protected $diffBuilderManager;
-
-  /**
-   * Wrapper object for simple configuration from diff.settings.yml.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $config;
-
-  /**
-   * Wrapper object for simple configuration from diff.plugins.yml.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $pluginsConfig;
-
-  /**
-   * Constructs a DiffEntityParser object.
-   *
-   * @param \Drupal\diff\DiffBuilderManager $diff_builder_manager
-   *   The diff builder manager.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The configuration factory.
-   */
-  public function __construct(DiffBuilderManager $diff_builder_manager, ConfigFactoryInterface $config_factory) {
-    $this->config = $config_factory->get('diff.settings');
-    $this->pluginsConfig = $config_factory->get('diff.plugins');
-    $this->diffBuilderManager = $diff_builder_manager;
-  }
-
-  /**
-   * Transforms an entity into an array of strings.
-   *
-   * Parses an entity's fields and for every field it builds an array of string
-   * to be compared. Basically this function transforms an entity into an array
-   * of strings.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   An entity containing fields.
-   *
-   * @return array
-   *   Array of strings resulted by parsing the entity.
-   */
-  public function parseEntity(ContentEntityInterface $entity) {
-    $result = array();
-    $langcode = \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
-    // Load entity of current language, otherwise fields are always compared by
-    // their default language.
-    if ($entity->hasTranslation($langcode)) {
-      $entity = $entity->getTranslation($langcode);
-    }
-    $entity_type_id = $entity->getEntityTypeId();
-    // Loop through entity fields and transform every FieldItemList object
-    // into an array of strings according to field type specific settings.
-    /** @var \Drupal\Core\Field\FieldItemListInterface $field_items */
-    foreach ($entity as $field_items) {
-      // Define if the current field should be displayed as a diff change.
-      $show_diff = $this->diffBuilderManager->showDiff($field_items->getFieldDefinition()->getFieldStorageDefinition());
-      if (!$show_diff || !$entity->get($field_items->getFieldDefinition()->getName())->access('view')) {
-        continue;
-      }
-      // Create a plugin instance for the field definition.
-      $plugin = $this->diffBuilderManager->createInstanceForFieldDefinition($field_items->getFieldDefinition());
-      if ($plugin) {
-        // Create the array with the fields of the entity. Recursive if the
-        // field contains entities.
-        if ($plugin instanceof FieldReferenceInterface) {
-          foreach ($plugin->getEntitiesToDiff($field_items) as $entity_key => $reference_entity) {
-            foreach ($this->parseEntity($reference_entity) as $key => $build) {
-              $result[$key] = $build;
-              $result[$key]['label'] = $field_items->getFieldDefinition()->getLabel() . ' > ' . $result[$key]['label'];
-            };
-          }
-        }
-        else {
-          $build = $plugin->build($field_items);
-          if (!empty($build)) {
-            $result[$entity->id() . ':' . $entity_type_id . '.' . $field_items->getName()] = $build;
-            $result[$entity->id() . ':' . $entity_type_id . '.' . $field_items->getName()]['label'] = $field_items->getFieldDefinition()->getLabel();
-          }
-        }
-      }
-    }
-
-    $this->diffBuilderManager->clearCachedDefinitions();
-    return $result;
-  }
-
-}
diff --git a/modules/diff/src/DiffFormatter.php b/modules/diff/src/DiffFormatter.php
deleted file mode 100644
index 020fc57..0000000
--- a/modules/diff/src/DiffFormatter.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\diff;
-
-use Drupal\Core\Diff\DiffFormatter as CoreDiffFormatterBase;
-use Drupal\Core\Config\ConfigFactoryInterface;
-
-/**
- * Diff formatter which returns output that can be rendered to a table.
- */
-class DiffFormatter extends CoreDiffFormatterBase {
-
-  /**
-   * Creates a DiffFormatter to render diffs in a table.
-   *
-   * We need to extend the constructor of the diff formatter used by the
-   * core config system in order to provide our own settings.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory) {
-    parent::__construct($config_factory);
-
-    $config = $config_factory->get('diff.settings');
-    $this->leading_context_lines = $config->get('general_settings.context_lines_leading');
-    $this->trailing_context_lines = $config->get('general_settings.context_lines_trailing');
-  }
-
-}
diff --git a/modules/diff/src/DiffLayoutBase.php b/modules/diff/src/DiffLayoutBase.php
deleted file mode 100644
index 85c423a..0000000
--- a/modules/diff/src/DiffLayoutBase.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-
-namespace Drupal\diff;
-
-use Drupal\Component\Plugin\PluginBase;
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Datetime\DateFormatter;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\RevisionLogInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Mail\MailFormatHelper;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Link;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\Url;
-use Drupal\diff\Controller\PluginRevisionController;
-use Drupal\node\NodeInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Base class for diff layout plugins.
- */
-abstract class DiffLayoutBase extends PluginBase implements DiffLayoutInterface, ContainerFactoryPluginInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * Contains the configuration object factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The entity parser.
-   *
-   * @var \Drupal\diff\DiffEntityParser
-   */
-  protected $entityParser;
-
-  /**
-   * The date service.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatter
-   */
-  protected $date;
-
-  /**
-   * Constructs a DiffLayoutBase object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   *   The configuration factory object.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\diff\DiffEntityParser $entity_parser
-   *   The entity parser.
-   * @param \Drupal\Core\DateTime\DateFormatter $date
-   *   The date service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config, EntityTypeManagerInterface $entity_type_manager, DiffEntityParser $entity_parser, DateFormatter $date) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->configFactory = $config;
-    $this->entityTypeManager = $entity_type_manager;
-    $this->entityParser = $entity_parser;
-    $this->date = $date;
-    $this->configuration += $this->defaultConfiguration();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('config.factory'),
-      $container->get('entity_type.manager'),
-      $container->get('diff.entity_parser'),
-      $container->get('date.formatter')
-    );
-  }
-
-  /**
-   * Build the revision link for a revision.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $revision
-   *   A revision where to add a link.
-   *
-   * @return \Drupal\Core\Link
-   *   Header link for a revision in the table.
-   */
-  protected function buildRevisionLink(ContentEntityInterface $revision) {
-    $entity_type_id = $revision->getEntityTypeId();
-    if ($revision instanceof RevisionLogInterface) {
-      $revision_date = $this->date->format($revision->getRevisionCreationTime(), 'short');
-      $route_name = $entity_type_id != 'node' ? "entity.$entity_type_id.revisions_diff" : 'entity.node.revision';
-      $revision_link = Link::fromTextAndUrl($revision_date, Url::fromRoute($route_name, [
-        $entity_type_id => $revision->id(),
-        $entity_type_id . '_revision' => $revision->getRevisionId(),
-      ]))->toString();
-    }
-    else {
-      $revision_link = Link::fromTextAndUrl($revision->label(), $revision->toUrl('revision'))
-        ->toString();
-    }
-    return $revision_link;
-  }
-
-  /**
-   * Build the revision link for the compared revisions.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $left_revision
-   *   Left revision that is compared.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $right_revision
-   *   Right revision that is compared.
-   *
-   * @return array
-   *   Header link for a revision in the revision comparison display.
-   */
-  public function buildRevisionsData(ContentEntityInterface $left_revision, ContentEntityInterface $right_revision) {
-    $right_revision = $this->buildRevisionData($right_revision);
-    $right_revision['#prefix'] = '<div class="diff-revision__items-group">';
-    $right_revision['#suffix'] = '</div>';
-
-    $left_revision = $this->buildRevisionData($left_revision);
-    $left_revision['#prefix'] = '<div class="diff-revision__items-group">';
-    $left_revision['#suffix'] = '</div>';
-
-    // Show the revisions that are compared.
-    return [
-      'header' => [
-        'diff_revisions' => [
-          '#type' => 'item',
-          '#title' => $this->t('Comparing'),
-          '#wrapper_attributes' => ['class' => 'diff-revision'],
-          'items' => [
-            '#prefix' => '<div class="diff-revision__items">',
-            '#suffix' => '</div></div>',
-            'right_revision' => $right_revision,
-            'left_revision' => $left_revision,
-          ],
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * Build the revision link for a revision.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $revision
-   *   Left revision that is compared.
-   *
-   * @return array
-   *   Revision data about author, creation date and log.
-   */
-  protected function buildRevisionData(ContentEntityInterface $revision) {
-    $entity_type_id = $revision->getEntityTypeId();
-    if ($revision instanceof RevisionLogInterface) {
-      $revision_log = Xss::filter($revision->getRevisionLogMessage());
-      $user_id = $revision->getRevisionUserId();
-      $route_name = $entity_type_id != 'node' ? "entity.$entity_type_id.revisions_diff" : 'entity.node.revision';
-
-      $revision_link['date'] = [
-        '#type' => 'link',
-        '#title' => $this->date->format($revision->getRevisionCreationTime(), 'short'),
-        '#url' => Url::fromRoute($route_name, [
-          $entity_type_id => $revision->id(),
-          $entity_type_id . '_revision' => $revision->getRevisionId(),
-        ]),
-        '#prefix' => '<div class="diff-revision__item diff-revision__item-date">',
-        '#suffix' => '</div>',
-      ];
-
-      $revision_link['author'] = [
-        '#type' => 'link',
-        '#title' => $revision->getRevisionUser()->getDisplayName(),
-        '#url' => Url::fromUri(\Drupal::request()->getUriForPath('/user/' . $user_id)),
-        '#theme' => 'username',
-        '#account' => $revision->getRevisionUser(),
-        '#prefix' => '<div class="diff-revision__item diff-revision__item-author">',
-        '#suffix' => '</div>',
-      ];
-
-      if ($revision_log) {
-        $revision_link['message'] = [
-          '#type' => 'markup',
-          '#prefix' => '<div class="diff-revision__item diff-revision__item-message">',
-          '#suffix' => '</div>',
-          '#markup' => $revision_log,
-        ];
-      }
-    }
-    else {
-      $revision_link['label'] = [
-        '#type' => 'link',
-        '#title' => $revision->label(),
-        '#url' => $revision->toUrl('revision'),
-        '#prefix' => '<div class="diff-revision__item diff-revision__item-date">',
-        '#suffix' => '</div>',
-      ];
-    }
-    return $revision_link;
-  }
-
-  /**
-   * Build the filter navigation for the diff comparison.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $left_revision
-   *   Revision from the left side.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $right_revision
-   *   Revision from the right side.
-   * @param string $layout
-   *   The layout plugin selected.
-   * @param string $active_filter
-   *   The active filter.
-   *
-   * @return array
-   *   The filter options.
-   */
-  protected function buildFilterNavigation(ContentEntityInterface $entity, ContentEntityInterface $left_revision, ContentEntityInterface $right_revision, $layout, $active_filter) {
-    // Build the view modes filter.
-    $options['raw'] = [
-      'title' => $this->t('Raw'),
-      'url' => PluginRevisionController::diffRoute($entity,
-        $left_revision->getRevisionId(),
-        $right_revision->getRevisionId(),
-        $layout,
-        ['filter' => 'raw']
-      ),
-    ];
-
-    $options['strip_tags'] = [
-      'title' => $this->t('Strip tags'),
-      'url' => PluginRevisionController::diffRoute($entity,
-         $left_revision->getRevisionId(),
-         $right_revision->getRevisionId(),
-         $layout,
-         ['filter' => 'strip_tags']
-      ),
-    ];
-
-    $filter = $options[$active_filter];
-    unset($options[$active_filter]);
-    array_unshift($options, $filter);
-
-    $build['options'] = [
-      '#type' => 'operations',
-      '#links' => $options,
-    ];
-    return $build;
-  }
-
-  /**
-   * Applies a markdown function to a string.
-   *
-   * @param string $markdown
-   *   Key of the markdown function to be applied to the items.
-   *   One of drupal_html_to_text, filter_xss, filter_xss_all.
-   * @param string $items
-   *   String to be processed.
-   *
-   * @return array|string
-   *   Result after markdown was applied on $items.
-   */
-  protected function applyMarkdown($markdown, $items) {
-    if (!$markdown) {
-      return $items;
-    }
-
-    if ($markdown == 'drupal_html_to_text') {
-      return trim(MailFormatHelper::htmlToText($items), "\n");
-    }
-    elseif ($markdown == 'filter_xss') {
-      return trim(Xss::filter($items), "\n");
-    }
-    elseif ($markdown == 'filter_xss_all') {
-      return trim(Xss::filter($items, []), "\n");
-    }
-    else {
-      return $items;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfiguration() {
-    return $this->configFactory->getEditable('diff.layout_plugins');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConfiguration(array $configuration) {
-    $config = $this->configFactory->getEditable('diff.layout_plugins');
-    $config->set($this->pluginId, $configuration);
-    $config->save();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    return [];
-  }
-
-}
diff --git a/modules/diff/src/DiffLayoutInterface.php b/modules/diff/src/DiffLayoutInterface.php
deleted file mode 100644
index 299c559..0000000
--- a/modules/diff/src/DiffLayoutInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\diff;
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Plugin\PluginFormInterface;
-use Drupal\Component\Plugin\ConfigurablePluginInterface;
-
-/**
- * Builds a diff layout.
- */
-interface DiffLayoutInterface extends PluginFormInterface, ConfigurablePluginInterface {
-
-  /**
-   * Builds a diff comparison between two revisions.
-   *
-   * This method is responsible for building the diff comparison between
-   * revisions of the same entity. It can build a table, navigation links and
-   * headers of a diff comparison.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $left_revision
-   *   The left revision.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $right_revision
-   *   The right revision.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity.
-   *
-   * @return array
-   *   The modified build array that the plugin builds.
-   */
-  public function build(ContentEntityInterface $left_revision, ContentEntityInterface $right_revision, ContentEntityInterface $entity);
-
-}
diff --git a/modules/diff/src/DiffLayoutManager.php b/modules/diff/src/DiffLayoutManager.php
deleted file mode 100644
index 4df7a8d..0000000
--- a/modules/diff/src/DiffLayoutManager.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-namespace Drupal\diff;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-
-/**
- * Plugin type manager for field diff builders.
- *
- * @ingroup diff_layout_builder
- */
-class DiffLayoutManager extends DefaultPluginManager {
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Wrapper object for simple configuration from diff.settings.yml.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $config;
-
-  /**
-   * Wrapper object for simple configuration from diff.plugins.yml.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $layoutPluginsConfig;
-
-  /**
-   * Constructs a DiffLayoutManager object.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   Cache backend instance to use.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The configuration factory.
-   */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, EntityTypeManagerInterface $entity_type_manager, ConfigFactoryInterface $config_factory) {
-    parent::__construct('Plugin/diff/Layout', $namespaces, $module_handler, '\Drupal\diff\DiffLayoutInterface', 'Drupal\diff\Annotation\DiffLayoutBuilder');
-
-    $this->setCacheBackend($cache_backend, 'diff_layout_builder_plugins');
-    $this->alterInfo('diff_layout_builder_info');
-    $this->entityTypeManager = $entity_type_manager;
-    $this->config = $config_factory->get('diff.settings');
-    $this->layoutPluginsConfig = $config_factory->get('diff.layout_plugins');
-  }
-
-  /**
-   * Gets the applicable layout plugins.
-   *
-   * Loop over the plugins that can be used to display the diff comparison
-   * sorting them by the weight.
-   *
-   * @return array
-   *   The layout plugin options.
-   */
-  public function getPluginOptions() {
-    $plugins = $this->config->get('general_settings.layout_plugins');
-    $plugin_options = [];
-    // Get the plugins sorted and build an array keyed by the plugin id.
-    if ($plugins) {
-      // Sort the plugins based on their weight.
-      uasort($plugins, 'Drupal\Component\Utility\SortArray::sortByWeightElement');
-      foreach ($plugins as $key => $value) {
-        if ($this->hasDefinition($key)) {
-          $plugin = $this->getDefinition($key);
-          if ($plugin && $value['enabled']) {
-            $plugin_options[$key] = $plugin['label'];
-          }
-        }
-      }
-    }
-    return $plugin_options;
-  }
-
-  /**
-   * Gets the default layout plugin selected.
-   *
-   * Take the first option of the array returned by getPluginOptions.
-   *
-   * @return string
-   *   The id of the default plugin.
-   */
-  public function getDefaultLayout() {
-    $plugins = array_keys($this->getPluginOptions());
-    return reset($plugins);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function findDefinitions() {
-    $definitions = parent::findDefinitions();
-
-    // Remove plugin html_diff if library is not present.
-    $has_htmlDiffAdvanced = class_exists('\HtmlDiffAdvanced');
-    if (!$has_htmlDiffAdvanced) {
-      unset($definitions['visual_inline']);
-    }
-    return $definitions;
-  }
-
-}
diff --git a/modules/diff/src/FieldDiffBuilderBase.php b/modules/diff/src/FieldDiffBuilderBase.php
deleted file mode 100644
index e271d7f..0000000
--- a/modules/diff/src/FieldDiffBuilderBase.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-namespace Drupal\diff;
-
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Plugin\PluginBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-
-/**
- * Base class for field diff builder plugins.
- */
-abstract class FieldDiffBuilderBase extends PluginBase implements FieldDiffBuilderInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * Contains the configuration object factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The entity parser.
-   *
-   * @var \Drupal\diff\DiffEntityParser
-   */
-  protected $entityParser;
-
-  /**
-   * Constructs a FieldDiffBuilderBase object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\diff\DiffEntityParser $entity_parser
-   *   The entity parser.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, DiffEntityParser $entity_parser) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->entityParser = $entity_parser;
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->configuration += $this->defaultConfiguration();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity_type.manager'),
-      $container->get('diff.entity_parser')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['show_header'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Show field title'),
-      '#weight' => -5,
-      '#default_value' => $this->configuration['show_header'],
-    );
-    $form['markdown'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Markdown callback'),
-      '#default_value' => $this->configuration['markdown'],
-      '#options' => array(
-        'drupal_html_to_text' => $this->t('Drupal HTML to Text'),
-        'filter_xss' => $this->t('Filter XSS (some tags)'),
-        'filter_xss_all' => $this->t('Filter XSS (all tags)'),
-      ),
-      '#description' => $this->t('These provide ways to clean markup tags to make comparisons easier to read.'),
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
-    // By default an empty validation function is provided.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['show_header'] = $form_state->getValue('show_header');
-    $this->configuration['markdown'] = $form_state->getValue('markdown');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return array(
-      'show_header' => 1,
-      'markdown' => 'drupal_html_to_text',
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfiguration() {
-    return $this->configuration;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConfiguration(array $configuration) {
-    $this->configuration = $configuration + $this->defaultConfiguration();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    return array();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function isApplicable(FieldStorageDefinitionInterface $field_definition) {
-    return TRUE;
-  }
-
-}
diff --git a/modules/diff/src/FieldDiffBuilderInterface.php b/modules/diff/src/FieldDiffBuilderInterface.php
deleted file mode 100644
index 54dbc26..0000000
--- a/modules/diff/src/FieldDiffBuilderInterface.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\diff;
-
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Plugin\PluginFormInterface;
-use Drupal\Component\Plugin\ConfigurablePluginInterface;
-
-/**
- * Builds a diff from field item list.
- */
-interface FieldDiffBuilderInterface extends PluginFormInterface, ConfigurablePluginInterface {
-
-  /**
-   * Builds an array of strings.
-   *
-   * This method is responsible for transforming a FieldItemListInterface object
-   * into an array of strings. The resulted array of strings is then compared by
-   * the Diff component with another such array of strings and the result
-   * represents the difference between two entity fields.
-   *
-   * Example of FieldItemListInterface built into an array of strings:
-   * @code
-   * array(
-   *   0 => "This is an example string",
-   *   1 => "Field values or properties",
-   * )
-   * @endcode
-   *
-   * @see \Drupal\diff\Plugin\diff\Field\TextFieldBuilder
-   *
-   * @param FieldItemListInterface $field_items
-   *   Represents an entity field.
-   *
-   * @return mixed
-   *   An array of strings to be compared. If an empty array is returned it
-   *   means that a field is either empty or no properties need to be compared
-   *   for that field.
-   */
-  public function build(FieldItemListInterface $field_items);
-
-  /**
-   * Returns if the plugin can be used for the provided field.
-   *
-   * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_definition
-   *   The field definition that should be checked.
-   *
-   * @return bool
-   *   TRUE if the plugin can be used, FALSE otherwise.
-   */
-  public static function isApplicable(FieldStorageDefinitionInterface $field_definition);
-
-}
diff --git a/modules/diff/src/FieldReferenceInterface.php b/modules/diff/src/FieldReferenceInterface.php
deleted file mode 100644
index 92daf34..0000000
--- a/modules/diff/src/FieldReferenceInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\diff;
-
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Plugin\PluginFormInterface;
-use Drupal\Component\Plugin\ConfigurablePluginInterface;
-
-/**
- * Provides referenced entities to recurse in diff.
- */
-interface FieldReferenceInterface extends PluginFormInterface, ConfigurablePluginInterface {
-
-  /**
-   * Builds an array of entities.
-   *
-   * This method is responsible for transforming a FieldItemListInterface object
-   * into an array of entities. The resulted array of entities is then used when
-   * parsing the entity to get a clean array of fields that will be compared.
-   *
-   * @param \Drupal\Core\Field\FieldItemListInterface $field_items
-   *   Represents an entity field.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface[]
-   *   An array of entities to be compared. If an empty array is returned it
-   *   means that a field is either empty or no properties need to be compared
-   *   for that field.
-   */
-  public function getEntitiesToDiff(FieldItemListInterface $field_items);
-
-}
diff --git a/modules/diff/src/Form/FieldsSettingsForm.php b/modules/diff/src/Form/FieldsSettingsForm.php
deleted file mode 100644
index 95ab44f..0000000
--- a/modules/diff/src/Form/FieldsSettingsForm.php
+++ /dev/null
@@ -1,528 +0,0 @@
-<?php
-
-namespace Drupal\diff\Form;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\diff\DiffBuilderManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Core\Form\FormState;
-
-/**
- * Configure fields with their diff builder plugin settings.
- *
- * This form lists all the field types from the system and for every field type
- * it provides a select-box having as options all the FieldDiffBuilder plugins
- * that support that field type.
- */
-class FieldsSettingsForm extends ConfigFormBase {
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The entity field manager.
-   *
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
-   */
-  protected $entityFieldManager;
-
-  /**
-   * The field type plugin manager service.
-   *
-   * @var \Drupal\Component\Plugin\PluginManagerInterface
-   */
-  protected $fieldTypePluginManager;
-
-  /**
-   * The field diff plugin manager service.
-   *
-   * @var \Drupal\diff\DiffBuilderManager
-   */
-  protected $diffBuilderManager;
-
-  /**
-   * Constructs a FieldsSettingsForm object.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The factory for configuration objects.
-   * @param \Drupal\Component\Plugin\PluginManagerInterface $plugin_manager
-   *   The plugin manager service.
-   * @param \Drupal\diff\DiffBuilderManager $diff_builder_manager
-   *   The diff builder manager.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
-   *   The entity field manager.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, PluginManagerInterface $plugin_manager, DiffBuilderManager $diff_builder_manager, EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager) {
-    parent::__construct($config_factory);
-
-    $this->fieldTypePluginManager = $plugin_manager;
-    $this->diffBuilderManager = $diff_builder_manager;
-    $this->entityTypeManager = $entity_type_manager;
-    $this->entityFieldManager = $entity_field_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('plugin.manager.field.field_type'),
-      $container->get('plugin.manager.diff.builder'),
-      $container->get('entity_type.manager'),
-      $container->get('entity_field.manager')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'diff_admin_plugins';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return ['diff.plugins'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form = parent::buildForm($form, $form_state);
-    // The table containing all the field types discovered in the system.
-    $form['fields'] = array(
-      '#type' => 'table',
-      '#tree' => TRUE,
-      '#header' => $this->getTableHeader(),
-      '#empty' => $this->t('No field types found.'),
-      '#prefix' => '<div id="field-display-overview-wrapper">',
-      '#suffix' => '</div>',
-      '#attributes' => array(
-        'class' => array('field-ui-overview'),
-        'id' => 'field-display-overview',
-      ),
-    );
-
-    // Build a row in the table for each field of each entity type. Get all the
-    // field plugins.
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_name => $entity_type) {
-      // Exclude non-revisionable entities.
-      if (!$entity_type->isRevisionable()) {
-        continue;
-      }
-      $field_definitions = $this->entityFieldManager->getFieldStorageDefinitions($entity_type_name);
-      foreach ($field_definitions as $field_name => $field_definition) {
-
-        $show_diff = $this->diffBuilderManager->showDiff($field_definition);
-        if (!$show_diff) {
-          continue;
-        }
-
-        $key = $entity_type_name . '.' . $field_name;
-        // Build a row in the table for this field.
-        $form['fields'][$key] = $this->buildFieldRow($entity_type, $field_definition, $form_state);
-      }
-    }
-
-    $this->diffBuilderManager->clearCachedDefinitions();
-    // Submit button for the form.
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#button_type' => 'primary',
-      '#value' => $this->t('Save'),
-    );
-    $form['#attached']['library'][] = 'field_ui/drupal.field_ui';
-    $form['#attached']['library'][] = 'diff/diff.general';
-
-    return $form;
-  }
-
-  /**
-   * Builds a row for the table. Each row corresponds to a field type.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_definition
-   *   Definition the field type.
-   * @param FormStateInterface $form_state
-   *   THe form state object.
-   *
-   * @return array
-   *   A table row for the field type listing table.
-   */
-  protected function buildFieldRow(EntityTypeInterface $entity_type, FieldStorageDefinitionInterface $field_definition, FormStateInterface $form_state) {
-    $entity_type_label = $entity_type->getLabel();
-    $field_name = $field_definition->getName();
-    $field_type = $field_definition->getType();
-    $field_key = $entity_type->id() . '.' . $field_name;
-
-    $display_options = $this->diffBuilderManager->getSelectedPluginForFieldStorageDefinition($field_definition);
-    $plugin_options = $this->diffBuilderManager->getApplicablePluginOptions($field_definition);
-
-    // Base button element for the various plugin settings actions.
-    $base_button = [
-      '#submit' => [[$this, 'multiStepSubmit']],
-      '#ajax' => [
-        'callback' => [$this, 'multiStepAjax'],
-        'wrapper' => 'field-display-overview-wrapper',
-        'effect' => 'fade',
-      ],
-      '#field_key' => $field_key,
-    ];
-
-    $field_row['entity_type'] = [
-      '#markup' => $entity_type_label,
-    ];
-    $labels = _diff_field_label($entity_type->id(), $field_name);
-    $field_row['field_label'] = [
-      '#markup' => array_shift($labels),
-    ];
-
-    $field_type_label = $this->fieldTypePluginManager->getDefinitions()[$field_type]['label'];
-    $field_row['field_type'] = [
-      '#markup' => $field_type_label,
-    ];
-
-    // Check the currently selected plugin, and merge persisted values for its
-    // settings.
-    if ($type = $form_state->getValue(['fields', $field_key, 'plugin', 'type'])) {
-      $display_options['type'] = $type;
-    }
-
-    $plugin_settings = $form_state->get('plugin_settings');
-
-    if (isset($plugin_settings[$field_key]['settings'])) {
-      $modified = FALSE;
-      if (!empty($display_options['settings'])) {
-        foreach ($display_options['settings'] as $key => $value) {
-          if ($plugin_settings[$field_key]['settings'][$key] != $value) {
-            $modified = TRUE;
-            break;
-          }
-        }
-      }
-      // In case settings are not identical to the ones in the config display
-      // a warning message. Don't display it twice.
-      if ($modified && empty($_SESSION['messages']['warning'])) {
-        drupal_set_message($this->t('You have unsaved changes.'), 'warning');
-      }
-      $display_options['settings'] = $plugin_settings[$field_key]['settings'];
-    }
-
-    $field_row['plugin'] = array(
-      'type' => array(
-        '#type' => 'select',
-        '#options' => $plugin_options,
-        '#empty_option' => $this->t("- Don't compare -"),
-        '#empty_value' => 'hidden',
-        '#title_display' => 'invisible',
-        '#attributes' => array(
-          'class' => array('field-plugin-type'),
-        ),
-        '#default_value' => $display_options,
-        '#ajax' => array(
-          'callback' => [$this, 'multiStepAjax'],
-          'method' => 'replace',
-          'wrapper' => 'field-display-overview-wrapper',
-          'effect' => 'fade',
-        ),
-        '#field_key' => $field_key,
-      ),
-      'settings_edit_form' => array(),
-    );
-
-    // Get a configured instance of the plugin.
-    $plugin = $this->getPlugin($display_options);
-
-    // We are currently editing this field's plugin settings. Display the
-    // settings form and submit buttons.
-    if ($form_state->get('plugin_settings_edit') == $field_key) {
-      $field_row['plugin']['settings_edit_form'] = array(
-        '#type' => 'container',
-        '#attributes' => array('class' => array('field-plugin-settings-edit-form')),
-        '#parents' => ['fields', $field_key, 'settings_edit_form'],
-        'label' => array(
-          '#markup' => $this->t('Plugin settings:' . ' <span class="plugin-name">' . $plugin_options[$display_options['type']] . '</span>'),
-        ),
-        'settings' => $plugin->buildConfigurationForm(array(), $form_state),
-        'actions' => array(
-          '#type' => 'actions',
-          'save_settings' => $base_button + [
-            '#type' => 'submit',
-            '#button_type' => 'primary',
-            '#name' => $field_key . '_plugin_settings_update',
-            '#value' => $this->t('Update'),
-            '#op' => 'update',
-          ],
-          'cancel_settings' => $base_button + [
-            '#type' => 'submit',
-            '#name' => $field_key . '_plugin_settings_cancel',
-            '#value' => $this->t('Cancel'),
-            '#op' => 'cancel',
-            // Do not check errors for the 'Cancel' button, but make sure we
-            // get the value of the 'plugin type' select.
-            '#limit_validation_errors' => [['fields', $field_key, 'plugin', 'type']],
-          ],
-        ),
-      );
-      $field_row['settings_edit'] = array();
-      $field_row['#attributes']['class'][] = 'field-plugin-settings-editing';
-    }
-    else {
-      $field_row['settings_edit'] = [];
-      // Display the configure settings button only if a plugin is selected.
-      if ($plugin) {
-        $field_row['settings_edit'] = $base_button + array(
-          '#type' => 'image_button',
-          '#name' => $field_key . '_settings_edit',
-          '#src' => 'core/misc/icons/787878/cog.svg',
-          '#attributes' => ['class' => ['field-plugin-settings-edit'], 'alt' => $this->t('Edit')],
-          '#op' => 'edit',
-          // Do not check errors for the 'Edit' button, but make sure we get
-          // the value of the 'plugin type' select.
-          '#limit_validation_errors' => [['fields', $field_key, 'plugin', 'type']],
-          '#prefix' => '<div class="field-plugin-settings-edit-wrapper">',
-          '#suffix' => '</div>',
-        );
-      }
-    }
-
-    return $field_row;
-  }
-
-  /**
-   * Form submission handler for multi-step buttons.
-   *
-   * @param array $form
-   *   The form array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The form state object.
-   */
-  public function multiStepSubmit(array $form, FormStateInterface $form_state) {
-    $trigger = $form_state->getTriggeringElement();
-    $op = $trigger['#op'];
-
-    switch ($op) {
-      case 'edit':
-        // Store the field whose settings are currently being edited.
-        $field_key = $trigger['#field_key'];
-        $form_state->set('plugin_settings_edit', $field_key);
-        break;
-
-      case 'update':
-        // Store the saved settings, and set the field back to 'non edit' mode.
-        $field_key = $trigger['#field_key'];
-        if ($plugin_settings = $form_state->getValue(['fields', $field_key, 'settings_edit_form', 'settings'])) {
-          $form_state->set(['plugin_settings', $field_key, 'settings'], $plugin_settings);
-        }
-        $form_state->set('plugin_settings_edit', NULL);
-        break;
-
-      case 'cancel':
-        // Set the field back to 'non edit' mode.
-        $form_state->set('plugin_settings_edit', NULL);
-        break;
-    }
-
-    $form_state->setRebuild();
-  }
-
-  /**
-   * Ajax handler for multi-step buttons.
-   *
-   * @param array $form
-   *   The form array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The form state object.
-   *
-   * @return array
-   *   The fields form for a plugin.
-   */
-  public function multiStepAjax(array $form, FormStateInterface $form_state) {
-    $trigger = $form_state->getTriggeringElement();
-    if (isset($trigger['#op'])) {
-      $op = $trigger['#op'];
-
-      // Pick the elements that need to receive the ajax-new-content effect.
-      $updated_rows = [];
-      $updated_columns = [];
-      switch ($op) {
-        case 'edit':
-          $updated_rows = [$trigger['#field_key']];
-          $updated_columns = array('plugin');
-          break;
-
-        case 'update':
-        case 'cancel':
-          $updated_rows = [$trigger['#field_key']];
-          $updated_columns = array('plugin', 'settings_edit');
-          break;
-      }
-
-      foreach ($updated_rows as $name) {
-        foreach ($updated_columns as $key) {
-          $element = &$form['fields'][$name][$key];
-          $element['#prefix'] = '<div class="ajax-new-content">' . (isset($element['#prefix']) ? $element['#prefix'] : '');
-          $element['#suffix'] = (isset($element['#suffix']) ? $element['#suffix'] : '') . '</div>';
-        }
-      }
-    }
-    // Return the whole table.
-    return $form['fields'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $form_values = $form_state->getValues();
-    $plugin_settings = $form_state->get('plugin_settings');
-    $fields = $form_values['fields'];
-
-    foreach ($fields as $field_key => $field_values) {
-      // Validate only non-null plugins.
-      if ($field_values['plugin']['type'] != 'hidden') {
-        $settings = array();
-        $key = NULL;
-        // Form submitted without pressing update button on plugin settings form.
-        if (isset($field_values['settings_edit_form']['settings'])) {
-          $settings = $field_values['settings_edit_form']['settings'];
-          $key = 1;
-        }
-        // Form submitted after settings were updated.
-        elseif (isset($plugin_settings[$field_key]['settings'])) {
-          $settings = $plugin_settings[$field_key]['settings'];
-          $key = 2;
-        }
-        if (!empty($settings)) {
-          // Build a new Form State object and populate it with values.
-          $state = new FormState();
-          $state->setValues($settings);
-          $state->set('fields', $field_key);
-          $plugin = $this->diffBuilderManager->createInstance($field_values['plugin']['type'], []);
-          // Send the values to the plugins form validate handler.
-          $plugin->validateConfigurationForm($form, $state);
-          // Assign the validation messages back to the big table.
-          if ($key == 1) {
-            $form_state->setValue(['fields', $field_key, 'settings_edit_form', 'settings'], $state->getValues());
-          }
-          elseif ($key == 2) {
-            $form_state->set(['plugin_settings', $field_key, 'settings'], $state->getValues());
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $form_values = $form_state->getValues();
-    $plugin_settings = $form_state->get('plugin_settings');
-    $fields = $form_values['fields'];
-
-    $config = $this->config('diff.plugins');
-
-    // Save the settings.
-    foreach ($fields as $field_key => $field_values) {
-      if ($field_values['plugin']['type'] == 'hidden') {
-        $config->set('fields.' . $field_key, ['type' => 'hidden', 'settings' => []]);
-      }
-      else {
-
-        // Initialize the plugin, if the type is unchanged then with the
-        // existing settings, otherwise let it fall back to the default
-        // settings.
-        $configuration = [];
-        if ($config->get('fields.' . $field_key . '.type') == $field_values['plugin']['type'] && $config->get('fields.' . $field_key . '.settings')) {
-          $configuration = $config->get('fields.' . $field_key . '.settings');
-        }
-        $plugin = $this->diffBuilderManager->createInstance($field_values['plugin']['type'], $configuration);
-
-        // Get plugin settings. They lie either directly in submitted form
-        // values (if the whole form was submitted while some plugin settings
-        // were being edited), or have been persisted in $form_state.
-
-        $values = NULL;
-        // Form submitted without pressing update button on plugin settings form.
-        if (isset($field_values['settings_edit_form']['settings'])) {
-          $values = $field_values['settings_edit_form']['settings'];
-        }
-        // Form submitted after settings were updated.
-        elseif (isset($plugin_settings[$field_key]['settings'])) {
-          $values = $plugin_settings[$field_key]['settings'];
-        }
-
-        // Build a FormState object and call the plugin submit handler.
-        if ($values) {
-          $state = new FormState();
-          $state->setValues($values);
-          $plugin->submitConfigurationForm($form, $state);
-        }
-
-        $config->set('fields.' . $field_key, [
-          'type' => $field_values['plugin']['type'],
-          'settings' => $plugin->getConfiguration(),
-        ]);
-      }
-    }
-    $config->save();
-
-    drupal_set_message($this->t('Your settings have been saved.'));
-  }
-
-  /**
-   * Returns a plugin object or NULL if no plugin could be found.
-   *
-   * @param array $configuration
-   *   The plugin configuration.
-   *
-   * @return \Drupal\diff\FieldDiffBuilderInterface|null
-   *   The plugin.
-   */
-  protected function getPlugin(array $configuration) {
-    if ($configuration && isset($configuration['type']) && $configuration['type'] != 'hidden') {
-      if (!isset($configuration['settings'])) {
-        $configuration['settings'] = array();
-      }
-      return $this->diffBuilderManager->createInstance(
-        $configuration['type'], $configuration['settings']
-      );
-    }
-
-    return NULL;
-  }
-
-  /**
-   * Returns the header for the table.
-   */
-  protected function getTableHeader() {
-    return array(
-      'entity_type' => $this->t('Entity Type'),
-      'field_name' => $this->t('Field'),
-      'field_type' => $this->t('Field Type'),
-      'plugin' => $this->t('Plugin'),
-      'settings_edit' => '',
-    );
-  }
-
-}
diff --git a/modules/diff/src/Form/GeneralSettingsForm.php b/modules/diff/src/Form/GeneralSettingsForm.php
deleted file mode 100644
index 596f5d1..0000000
--- a/modules/diff/src/Form/GeneralSettingsForm.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-
-namespace Drupal\diff\Form;
-
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\diff\DiffLayoutManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Configure global diff settings.
- */
-class GeneralSettingsForm extends ConfigFormBase {
-
-  /**
-   * The field diff layout plugin manager service.
-   *
-   * @var \Drupal\diff\DiffLayoutManager
-   */
-  protected $diffLayoutManager;
-
-  /**
-   * GeneralSettingsForm constructor.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The factory for configuration objects.
-   * @param \Drupal\diff\DiffLayoutManager $diff_layout_manager
-   *   The diff layout manager service.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, DiffLayoutManager $diff_layout_manager) {
-    parent::__construct($config_factory);
-
-    $this->diffLayoutManager = $diff_layout_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('plugin.manager.diff.layout')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'diff_general_settings';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return [
-      'diff.settings',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $field_type = NULL) {
-    $config = $this->config('diff.settings');
-
-    $form['radio_behavior'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Diff radio behavior'),
-      '#default_value' => $config->get('general_settings' . '.' . 'radio_behavior'),
-      '#options' => array(
-        'simple' => $this->t('Simple exclusion'),
-        'linear' => $this->t('Linear restrictions'),
-      ),
-      '#empty_option' => $this->t('- None -'),
-      '#description' => $this->t('<em>Simple exclusion</em> means that users will not be able to select the same revision, <em>Linear restrictions</em> means that users can only select older or newer revisions of the current selections.'),
-    );
-
-    $layout_plugins = $this->diffLayoutManager->getDefinitions();
-    $weight = count($layout_plugins) + 1;
-    $layout_plugins_order = [];
-    foreach ($layout_plugins as $id => $layout_plugin) {
-      $layout_plugin_settings = $config->get('general_settings.layout_plugins')[$id];
-      $layout_plugins_order[$id] = [
-        'label' => $layout_plugin['label'],
-        'description' => $layout_plugin['description'] ?: '',
-        'enabled' => $layout_plugin_settings['enabled'],
-        'weight' => isset($layout_plugin_settings['weight']) ? $layout_plugin_settings['weight'] : $weight,
-      ];
-      $weight++;
-    }
-
-    $form['layout_plugins'] = [
-      '#type' => 'table',
-      '#header' => [t('Layout'), t('Description'), t('Weight')],
-      '#empty' => t('There are no items yet. Add an item.'),
-      '#suffix' => '<div class="description">' . $this->t('The layout plugins that are enabled to display the revision comparison.') . '</div>',
-      '#tabledrag' => [
-        [
-          'action' => 'order',
-          'relationship' => 'sibling',
-          'group' => 'diff-layout-plugins-order-weight',
-        ],
-      ],
-    ];
-
-    uasort($layout_plugins_order, 'Drupal\Component\Utility\SortArray::sortByWeightElement');
-
-    foreach ($layout_plugins_order as $id => $layout_plugin) {
-      $form['layout_plugins'][$id] = [
-        '#attributes' => [
-          'class' => ['draggable'],
-        ],
-        'enabled' => [
-          '#type' => 'checkbox',
-          '#title' => $layout_plugin['label'],
-          '#title_display' => 'after',
-          '#default_value' => $layout_plugin['enabled'],
-        ],
-        'description' => [
-          '#type' => 'markup',
-          '#markup' => Xss::filter($layout_plugin['description']),
-        ],
-        'weight' => [
-          '#type' => 'weight',
-          '#title' => t('Weight for @title', ['@title' => $layout_plugin['label']]),
-          '#title_display' => 'invisible',
-          '#delta' => 50,
-          '#default_value' => (int) $layout_plugin['weight'],
-          '#array_parents' => [
-            'settings',
-            'sites',
-            $id,
-          ],
-          '#attributes' => ['class' => ['diff-layout-plugins-order-weight']],
-        ],
-      ];
-    }
-
-    $form['field_based_settings'] = [
-      '#type' => 'details',
-      '#title' => $this->t('Field based layout settings'),
-      '#open' => TRUE,
-      '#states' => [
-        'visible' => [
-          [':input[name="layout_plugins[split_fields][enabled]"]' => ['checked' => TRUE]],
-          [':input[name="layout_plugins[unified_fields][enabled]"]' => ['checked' => TRUE]],
-        ],
-      ],
-    ];
-
-    $context_lines = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-    $options = array_combine($context_lines, $context_lines);
-    $form['field_based_settings']['context_lines_leading'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Leading'),
-      '#description' => $this->t('This governs the number of unchanged <em>leading context "lines"</em> to preserve.'),
-      '#default_value' => $config->get('general_settings' . '.' . 'context_lines_leading'),
-      '#options' => $options,
-    );
-    $form['field_based_settings']['context_lines_trailing'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Trailing'),
-      '#description' => $this->t('This governs the number of unchanged <em>trailing context "lines"</em> to preserve.'),
-      '#default_value' => $config->get('general_settings' . '.' . 'context_lines_trailing'),
-      '#options' => $options,
-    );
-
-    // Check if Visual inline layout is installed.
-    if ($this->diffLayoutManager->hasDefinition('visual_inline')) {
-      $form['visual_inline_settings'] = [
-        '#type' => 'details',
-        '#title' => $this->t('Visual layout settings'),
-        '#open' => TRUE,
-        '#states' => [
-          'visible' => [
-            ':input[name="layout_plugins[visual_inline][enabled]"]' => ['checked' => TRUE],
-          ],
-        ],
-      ];
-
-      // Get the theme data to display the related theme name.
-      $default_theme_name = $this->config('system.theme')->get('default');
-      $admin_theme_name = $this->config('system.theme')->get('admin');
-      $form['visual_inline_settings']['visual_inline_theme'] = [
-        '#type' => 'select',
-        '#title' => $this->t('Theme'),
-        '#options' => [
-          'default' => $this->t('Default'),
-          'admin' => $this->t('Admin'),
-        ],
-        '#description' => $this->t('Use Default to display the comparison as %default theme, or Admin as %admin theme.', [
-          '%default' => $default_theme_name,
-          '%admin' => $admin_theme_name,
-        ]),
-        '#default_value' => $config->get('general_settings')['visual_inline_theme'],
-      ];
-    }
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    parent::validateForm($form, $form_state);
-
-    // Make sure there is at least one layout enabled.
-    $enabled_layouts = [];
-    foreach ($form_state->getValue('layout_plugins') as $key => $layout) {
-      if ($layout['enabled']) {
-        $enabled_layouts[] = $key;
-      }
-    }
-    if (!$enabled_layouts) {
-      $form_state->setErrorByName('layout_plugins', t('At least one layout plugin needs to be enabled.'));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $config = $this->config('diff.settings');
-
-    $keys = array(
-      'radio_behavior',
-      'context_lines_leading',
-      'context_lines_trailing',
-      'layout_plugins',
-      'visual_inline_theme',
-    );
-    foreach ($keys as $key) {
-      $config->set('general_settings.' . $key, $form_state->getValue($key));
-    }
-    $config->save();
-
-    parent::submitForm($form, $form_state);
-  }
-
-}
diff --git a/modules/diff/src/Form/RevisionOverviewForm.php b/modules/diff/src/Form/RevisionOverviewForm.php
deleted file mode 100644
index fcb6d50..0000000
--- a/modules/diff/src/Form/RevisionOverviewForm.php
+++ /dev/null
@@ -1,422 +0,0 @@
-<?php
-
-namespace Drupal\diff\Form;
-
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Entity\Query\QueryFactory;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\Link;
-use Drupal\diff\DiffEntityComparison;
-use Drupal\diff\DiffLayoutManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Datetime\DateFormatter;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\Core\Render\RendererInterface;
-
-/**
- * Provides a form for revision overview page.
- */
-class RevisionOverviewForm extends FormBase {
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The current user service.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $currentUser;
-
-  /**
-   * The date service.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatter
-   */
-  protected $date;
-
-  /**
-   * The renderer service.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * The language manager.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
-   * Wrapper object for simple configuration from diff.settings.yml.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $config;
-
-  /**
-   * The field diff layout plugin manager service.
-   *
-   * @var \Drupal\diff\DiffLayoutManager
-   */
-  protected $diffLayoutManager;
-
-  /**
-   * The diff entity comparison service.
-   *
-   * @var \Drupal\diff\DiffEntityComparison
-   */
-  protected $entityComparison;
-
-  /**
-   * The entity query factory service.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $entityQuery;
-
-  /**
-   * Constructs a RevisionOverviewForm object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   The current user.
-   * @param \Drupal\Core\Datetime\DateFormatter $date
-   *   The date service.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer service.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The language manager.
-   * @param \Drupal\diff\DiffLayoutManager $diff_layout_manager
-   *   The diff layout service.
-   * @param \Drupal\diff\DiffEntityComparison $entity_comparison
-   *   The diff entity comparison service.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query
-   *   The entity query factory.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, AccountInterface $current_user, DateFormatter $date, RendererInterface $renderer, LanguageManagerInterface $language_manager, DiffLayoutManager $diff_layout_manager, DiffEntityComparison $entity_comparison, QueryFactory $entity_query) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->currentUser = $current_user;
-    $this->date = $date;
-    $this->renderer = $renderer;
-    $this->languageManager = $language_manager;
-    $this->config = $this->config('diff.settings');
-    $this->diffLayoutManager = $diff_layout_manager;
-    $this->entityComparison = $entity_comparison;
-    $this->entityQuery = $entity_query;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity_type.manager'),
-      $container->get('current_user'),
-      $container->get('date.formatter'),
-      $container->get('renderer'),
-      $container->get('language_manager'),
-      $container->get('plugin.manager.diff.layout'),
-      $container->get('diff.entity_comparison'),
-      $container->get('entity.query')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'revision_overview_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $node = NULL) {
-    $account = $this->currentUser;
-    /** @var \Drupal\node\NodeInterface $node */
-    $langcode = $node->language()->getId();
-    $langname = $node->language()->getName();
-    $languages = $node->getTranslationLanguages();
-    $has_translations = (count($languages) > 1);
-    $node_storage = $this->entityTypeManager->getStorage('node');
-    $type = $node->getType();
-
-    $pagerLimit = $this->config->get('general_settings.revision_pager_limit');
-
-    $query = $this->entityQuery->get('node')
-      ->condition($node->getEntityType()->getKey('id'), $node->id())
-      ->pager($pagerLimit)
-      ->allRevisions()
-      ->sort($node->getEntityType()->getKey('revision'), 'DESC')
-      ->execute();
-    $vids = array_keys($query);
-
-    $revision_count = count($vids);
-
-    $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', [
-      '@langname' => $langname,
-      '%title' => $node->label(),
-    ]) : $this->t('Revisions for %title', [
-      '%title' => $node->label(),
-    ]);
-    $build['nid'] = array(
-      '#type' => 'hidden',
-      '#value' => $node->id(),
-    );
-
-    $table_header = [];
-    $table_header['revision'] = $this->t('Revision');
-
-    // Allow comparisons only if there are 2 or more revisions.
-    if ($revision_count > 1) {
-      $table_header += array(
-        'select_column_one' => '',
-        'select_column_two' => '',
-      );
-    }
-    $table_header['operations'] = $this->t('Operations');
-
-    $rev_revert_perm = $account->hasPermission("revert $type revisions") ||
-      $account->hasPermission('revert all revisions') ||
-      $account->hasPermission('administer nodes');
-    $rev_delete_perm = $account->hasPermission("delete $type revisions") ||
-      $account->hasPermission('delete all revisions') ||
-      $account->hasPermission('administer nodes');
-    $revert_permission = $rev_revert_perm && $node->access('update');
-    $delete_permission = $rev_delete_perm && $node->access('delete');
-
-    // Contains the table listing the revisions.
-    $build['node_revisions_table'] = array(
-      '#type' => 'table',
-      '#header' => $table_header,
-      '#attributes' => array('class' => array('diff-revisions')),
-    );
-
-    $build['node_revisions_table']['#attached']['library'][] = 'diff/diff.general';
-    $build['node_revisions_table']['#attached']['drupalSettings']['diffRevisionRadios'] = $this->config->get('general_settings.radio_behavior');
-
-    $default_revision = $node->getRevisionId();
-    // Add rows to the table.
-    foreach ($vids as $key => $vid) {
-      $previous_revision = NULL;
-      if (isset($vids[$key + 1])) {
-        $previous_revision = $node_storage->loadRevision($vids[$key + 1]);
-      }
-      /** @var \Drupal\Core\Entity\ContentEntityInterface $revision */
-      if ($revision = $node_storage->loadRevision($vid)) {
-        if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
-          $username = array(
-            '#theme' => 'username',
-            '#account' => $revision->getRevisionAuthor(),
-          );
-          $revision_date = $this->date->format($revision->getRevisionCreationTime(), 'short');
-          // Use revision link to link to revisions that are not active.
-          if ($vid != $node->getRevisionId()) {
-            $link = Link::fromTextAndUrl($revision_date, new Url('entity.node.revision', ['node' => $node->id(), 'node_revision' => $vid]));
-          }
-          else {
-            $link = $node->toLink($revision_date);
-          }
-
-          if ($vid == $default_revision) {
-            $row = [
-              'revision' => $this->buildRevision($link, $username, $revision, $previous_revision),
-            ];
-
-            // Allow comparisons only if there are 2 or more revisions.
-            if ($revision_count > 1) {
-              $row += [
-                'select_column_one' => $this->buildSelectColumn('radios_left', $vid, FALSE),
-                'select_column_two' => $this->buildSelectColumn('radios_right', $vid, $vid),
-              ];
-            }
-            $row['operations'] = array(
-              '#prefix' => '<em>',
-              '#markup' => $this->t('Current revision'),
-              '#suffix' => '</em>',
-              '#attributes' => array(
-                'class' => array('revision-current'),
-              ),
-            );
-            $row['#attributes'] = [
-              'class' => ['revision-current'],
-            ];
-          }
-          else {
-            $route_params = array(
-              'node' => $node->id(),
-              'node_revision' => $vid,
-              'langcode' => $langcode,
-            );
-            $links = array();
-            if ($revert_permission) {
-              $links['revert'] = [
-                'title' => $vid < $node->getRevisionId() ? $this->t('Revert') : $this->t('Set as current revision'),
-                'url' => $has_translations ?
-                  Url::fromRoute('node.revision_revert_translation_confirm', ['node' => $node->id(), 'node_revision' => $vid, 'langcode' => $langcode]) :
-                  Url::fromRoute('node.revision_revert_confirm', ['node' => $node->id(), 'node_revision' => $vid]),
-              ];
-            }
-            if ($delete_permission) {
-              $links['delete'] = array(
-                'title' => $this->t('Delete'),
-                'url' => Url::fromRoute('node.revision_delete_confirm', $route_params),
-              );
-            }
-
-            // Here we don't have to deal with 'only one revision' case because
-            // if there's only one revision it will also be the default one,
-            // entering on the first branch of this if else statement.
-            $row = [
-              'revision' => $this->buildRevision($link, $username, $revision, $previous_revision),
-              'select_column_one' => $this->buildSelectColumn('radios_left', $vid,
-                isset($vids[1]) ? $vids[1] : FALSE),
-              'select_column_two' => $this->buildSelectColumn('radios_right', $vid, FALSE),
-              'operations' => [
-                '#type' => 'operations',
-                '#links' => $links,
-              ],
-            ];
-          }
-          // Add the row to the table.
-          $build['node_revisions_table'][] = $row;
-        }
-      }
-    }
-
-    // Allow comparisons only if there are 2 or more revisions.
-    if ($revision_count > 1) {
-      $build['submit'] = array(
-        '#type' => 'submit',
-        '#button_type' => 'primary',
-        '#value' => t('Compare selected revisions'),
-        '#attributes' => array(
-          'class' => array(
-            'diff-button',
-          ),
-        ),
-      );
-    }
-    $build['pager'] = array(
-      '#type' => 'pager',
-    );
-    $build['#attached']['library'][] = 'node/drupal.node.admin';
-    return $build;
-  }
-
-  /**
-   * Set column attributes and return config array.
-   *
-   * @param string $name
-   *   Name attribute.
-   * @param string $return_val
-   *   Return value attribute.
-   * @param string $default_val
-   *   Default value attribute.
-   *
-   * @return array
-   *   Configuration array.
-   */
-  protected function buildSelectColumn($name, $return_val, $default_val) {
-    return [
-      '#type' => 'radio',
-      '#title_display' => 'invisible',
-      '#name' => $name,
-      '#return_value' => $return_val,
-      '#default_value' => $default_val,
-    ];
-  }
-
-  /**
-   * Set and return configuration for revision.
-   *
-   * @param \Drupal\Core\Link $link
-   *   Link attribute.
-   * @param string $username
-   *   Username attribute.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $revision
-   *   Revision parameter for getRevisionDescription function.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $previous_revision
-   *   (optional) Previous revision for getRevisionDescription function.
-   *   Defaults to NULL.
-   *
-   * @return array
-   *   Configuration for revision.
-   */
-  protected function buildRevision(Link $link, $username, ContentEntityInterface $revision, ContentEntityInterface $previous_revision = NULL) {
-    return [
-      '#type' => 'inline_template',
-      '#template' => '{% trans %}{{ date }} by {{ username }}{% endtrans %}{% if message %}<p class="revision-log">{{ message }}</p>{% endif %}',
-      '#context' => [
-        'date' => $link->toString(),
-        'username' => $this->renderer->renderPlain($username),
-        'message' => [
-          '#markup' => $this->entityComparison->getRevisionDescription($revision, $previous_revision),
-          '#allowed_tags' => Xss::getAdminTagList(),
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $input = $form_state->getUserInput();
-
-    if (count($form_state->getValue('node_revisions_table')) <= 1) {
-      $form_state->setErrorByName('node_revisions_table', $this->t('Multiple revisions are needed for comparison.'));
-    }
-    elseif (!isset($input['radios_left']) || !isset($input['radios_right'])) {
-      $form_state->setErrorByName('node_revisions_table', $this->t('Select two revisions to compare.'));
-    }
-    elseif ($input['radios_left'] == $input['radios_right']) {
-      // @todo Radio-boxes selection resets if there are errors.
-      $form_state->setErrorByName('node_revisions_table', $this->t('Select different revisions to compare.'));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $input = $form_state->getUserInput();
-    $vid_left = $input['radios_left'];
-    $vid_right = $input['radios_right'];
-    $nid = $input['nid'];
-
-    // Always place the older revision on the left side of the comparison
-    // and the newer revision on the right side (however revisions can be
-    // compared both ways if we manually change the order of the parameters).
-    if ($vid_left > $vid_right) {
-      $aux = $vid_left;
-      $vid_left = $vid_right;
-      $vid_right = $aux;
-    }
-    // Builds the redirect Url.
-    $redirect_url = Url::fromRoute(
-      'diff.revisions_diff',
-      array(
-        'node' => $nid,
-        'left_revision' => $vid_left,
-        'right_revision' => $vid_right,
-        'filter' => $this->diffLayoutManager->getDefaultLayout(),
-      )
-    );
-    $form_state->setRedirectUrl($redirect_url);
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/CommentFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/CommentFieldBuilder.php
deleted file mode 100644
index ee3c3c0..0000000
--- a/modules/diff/src/Plugin/diff/Field/CommentFieldBuilder.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Field;
-
-use Drupal\diff\FieldDiffBuilderBase;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
-
-/**
- * Plugin to diff comment fields.
- *
- * @FieldDiffBuilder(
- *   id = "comment_field_diff_builder",
- *   label = @Translation("Comment Field Diff"),
- *   field_types = {
- *     "comment"
- *   },
- * )
- */
-class CommentFieldBuilder extends FieldDiffBuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(FieldItemListInterface $field_items) {
-    $result = array();
-
-    // Every item from $field_items is of type FieldItemInterface.
-    foreach ($field_items as $field_key => $field_item) {
-      if (!$field_item->isEmpty()) {
-        $values = $field_item->getValue();
-        // Compare the key of the comment status.
-        if ($this->configuration['compare_key']) {
-          if (isset($values['status'])) {
-            $result[$field_key][] = $values['status'];
-          }
-        }
-        // A more human friendly representation.
-        if ($this->configuration['compare_string']) {
-          if (isset($values['status'])) {
-            switch ($values['status']) {
-              case CommentItemInterface::OPEN:
-                $result[$field_key][] = $this->t('Comments for this entity are open.');
-                break;
-
-              case CommentItemInterface::CLOSED:
-                $result[$field_key][] = $this->t('Comments for this entity are closed.');
-                break;
-
-              case CommentItemInterface::HIDDEN:
-                $result[$field_key][] = $this->t('Comments for this entity are hidden.');
-                break;
-            }
-          }
-        }
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['compare_key'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Compare comment status key'),
-      '#default_value' => $this->configuration['compare_key'],
-    );
-    $form['compare_string'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Compare comment status string'),
-      '#default_value' => $this->configuration['compare_string'],
-    );
-
-    return parent::buildConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['compare_key'] = $form_state->getValue('compare_key');
-    $this->configuration['compare_string'] = $form_state->getValue('compare_string');
-
-    parent::submitConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    $default_configuration = array(
-      'compare_key' => 0,
-      'compare_string' => 1,
-    );
-    $default_configuration += parent::defaultConfiguration();
-
-    return $default_configuration;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/CoreFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/CoreFieldBuilder.php
deleted file mode 100644
index bba3258..0000000
--- a/modules/diff/src/Plugin/diff/Field/CoreFieldBuilder.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Field;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Render\RendererInterface;
-use Drupal\diff\DiffEntityParser;
-use Drupal\diff\FieldDiffBuilderBase;
-use Drupal\Core\Field\FieldItemListInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Plugin to diff core field types.
- *
- * @FieldDiffBuilder(
- *   id = "core_field_diff_builder",
- *   label = @Translation("Core Field Diff"),
- *   field_types = {"decimal", "integer", "float", "email", "telephone",
- *     "date", "uri", "string", "timestamp", "created",
- *     "string_long", "language", "uuid", "map", "datetime", "boolean"
- *   },
- * )
- */
-class CoreFieldBuilder extends FieldDiffBuilderBase {
-
-  /**
-   * The renderer.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * Constructs a CoreFieldBuilder object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   *   The configuration factory object.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\diff\DiffEntityParser $entity_parser
-   *   The entity parser.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, DiffEntityParser $entity_parser, RendererInterface $renderer) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $entity_parser);
-    $this->renderer = $renderer;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity_type.manager'),
-      $container->get('diff.entity_parser'),
-      $container->get('renderer')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(FieldItemListInterface $field_items) {
-    $result = array();
-
-    // Every item from $field_items is of type FieldItemInterface.
-    foreach ($field_items as $field_key => $field_item) {
-      if (!$field_item->isEmpty()) {
-        $values = $field_item->getValue();
-        if (isset($values['value'])) {
-          $value = $field_item->view(['label' => 'hidden']);
-          $result[$field_key][] = $this->renderer->renderPlain($value);
-        }
-      }
-    }
-
-    return $result;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/EntityReferenceFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/EntityReferenceFieldBuilder.php
deleted file mode 100644
index 3579dcb..0000000
--- a/modules/diff/src/Plugin/diff/Field/EntityReferenceFieldBuilder.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Field;
-
-use Drupal\diff\FieldDiffBuilderBase;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-const COMPARE_ENTITY_REFERENCE_ID = 0;
-const COMPARE_ENTITY_REFERENCE_LABEL = 1;
-
-
-/**
- * Plugin to diff entity reference fields.
- *
- * @FieldDiffBuilder(
- *   id = "entity_reference_field_diff_builder",
- *   label = @Translation("Entity Reference Field Diff"),
- *   field_types = {
- *     "entity_reference"
- *   },
- * )
- */
-class EntityReferenceFieldBuilder extends FieldDiffBuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(FieldItemListInterface $field_items) {
-    $result = array();
-    // Every item from $field_items is of type FieldItemInterface.
-    foreach ($field_items as $field_key => $field_item) {
-      if (!$field_item->isEmpty()) {
-        $values = $field_item->getValue();
-        // Compare entity ids.
-        if ($field_item->entity) {
-          if ($this->configuration['compare_entity_reference'] == COMPARE_ENTITY_REFERENCE_LABEL) {
-            /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
-            $entity = $field_item->entity;
-            $result[$field_key][] = $entity->label();
-          }
-          else {
-            $result[$field_key][] = $this->t('Entity ID: :id', [
-              ':id' => $values['target_id'],
-            ]);
-          }
-        }
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['compare_entity_reference'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Compare'),
-      '#options' => array(COMPARE_ENTITY_REFERENCE_ID => t('ID'), COMPARE_ENTITY_REFERENCE_LABEL => t('Label')),
-      '#default_value' => $this->configuration['compare_entity_reference'],
-    );
-
-    return parent::buildConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['compare_entity_reference'] = $form_state->getValue('compare_entity_reference');
-
-    parent::submitConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    $default_configuration = array(
-      'compare_entity_reference' => COMPARE_ENTITY_REFERENCE_LABEL,
-    );
-    $default_configuration += parent::defaultConfiguration();
-
-    return $default_configuration;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/FileFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/FileFieldBuilder.php
deleted file mode 100644
index e9b16f5..0000000
--- a/modules/diff/src/Plugin/diff/Field/FileFieldBuilder.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Field;
-
-use Drupal\diff\FieldDiffBuilderBase;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Plugin to diff file fields.
- *
- * @FieldDiffBuilder(
- *   id = "file_field_diff_builder",
- *   label = @Translation("File Field Diff"),
- *   field_types = {
- *     "file"
- *   },
- * )
- */
-class FileFieldBuilder extends FieldDiffBuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(FieldItemListInterface $field_items) {
-    $result = array();
-    $fileManager = $this->entityTypeManager->getStorage('file');
-
-    // Every item from $field_items is of type FieldItemInterface.
-    foreach ($field_items as $field_key => $field_item) {
-      if (!$field_item->isEmpty()) {
-        $values = $field_item->getValue();
-
-        // Add file name to the comparison.
-        if (isset($values['target_id'])) {
-          /** @var \Drupal\file\Entity\File $file */
-          $file = $fileManager->load($values['target_id']);
-          $result[$field_key][] = $this->t('File: :image', [
-            ':image' => $file->getFilename(),
-          ]);
-        }
-
-        // Add file id to the comparison.
-        if ($this->configuration['show_id']) {
-          if (isset($values['target_id'])) {
-            $result[$field_key][] = $this->t('File ID: :fid', [
-              ':fid' => $values['target_id'],
-            ]);
-          }
-        }
-
-        // Compare file description fields.
-        if ($this->configuration['compare_description_field']) {
-          if (isset($values['description'])) {
-            $result[$field_key][] = $this->t('Description: @description', [
-              '@description' => $values['description'],
-            ]);
-          }
-        }
-
-        // Compare Enable Display property.
-        if ($this->configuration['compare_display_field']) {
-          if (isset($values['display'])) {
-            if ($values['display'] == 1) {
-              $result[$field_key][] = $this->t('Displayed');
-            }
-            else {
-              $result[$field_key][] = $this->t('Hidden');
-            }
-          }
-        }
-
-        // Add the requested separator between resulted strings.
-        if ($this->configuration['property_separator']) {
-          $separator = $this->configuration['property_separator'] == 'nl' ? "\n" : $this->configuration['property_separator'];
-          $result[$field_key] = implode($separator, $result[$field_key]);
-        }
-      }
-
-    }
-
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['show_id'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Show file ID'),
-      '#default_value' => $this->configuration['show_id'],
-    );
-    $form['compare_description_field'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Compare description field'),
-      '#default_value' => $this->configuration['compare_description_field'],
-      '#description' => $this->t('This is only used if the "Enable <em>Description</em> field" is checked in the instance settings.'),
-    );
-    $form['compare_display_field'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Compare display state field'),
-      '#default_value' => $this->configuration['compare_display_field'],
-      '#description' => $this->t('This is only used if the "Enable <em>Display</em> field" is checked in the field settings.'),
-    );
-    $form['property_separator'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Property separator'),
-      '#default_value' => $this->configuration['property_separator'],
-      '#description' => $this->t('Provides the ability to show properties inline or across multiple lines.'),
-      '#options' => array(
-        ', ' => $this->t('Comma (,)'),
-        '; ' => $this->t('Semicolon (;)'),
-        ' ' => $this->t('Space'),
-        'nl' => $this->t('New line'),
-      ),
-    );
-
-    return parent::buildConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['show_id'] = $form_state->getValue('show_id');
-    $this->configuration['compare_description_field'] = $form_state->getValue('compare_description_field');
-    $this->configuration['compare_display_field'] = $form_state->getValue('compare_display_field');
-    $this->configuration['property_separator'] = $form_state->getValue('property_separator');
-
-    parent::submitConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    $default_configuration = array(
-      'show_id' => 1,
-      'compare_description_field' => 0,
-      'compare_display_field' => 0,
-      'property_separator' => 'nl',
-    );
-    $default_configuration += parent::defaultConfiguration();
-
-    return $default_configuration;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/ImageFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/ImageFieldBuilder.php
deleted file mode 100644
index 72a049f..0000000
--- a/modules/diff/src/Plugin/diff/Field/ImageFieldBuilder.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Field;
-
-use Drupal\diff\FieldDiffBuilderBase;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Plugin to diff image fields.
- *
- * @FieldDiffBuilder(
- *   id = "image_field_diff_builder",
- *   label = @Translation("Image Field Diff"),
- *   field_types = {
- *     "image"
- *   },
- * )
- */
-class ImageFieldBuilder extends FieldDiffBuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(FieldItemListInterface $field_items) {
-    $result = array();
-    $fileManager = $this->entityTypeManager->getStorage('file');
-    // Every item from $field_items is of type FieldItemInterface.
-    foreach ($field_items as $field_key => $field_item) {
-      if (!$field_item->isEmpty()) {
-        $values = $field_item->getValue();
-
-        // Compare file names.
-        if (isset($values['target_id'])) {
-          /** @var \Drupal\file\Entity\File $image */
-          $image = $fileManager->load($values['target_id']);
-          $result[$field_key][] = $this->t('Image: @image', [
-            '@image' => $image->getFilename(),
-          ]);
-        }
-
-        // Compare Alt fields.
-        if ($this->configuration['compare_alt_field']) {
-          if (isset($values['alt'])) {
-            $result[$field_key][] = $this->t('Alt: @alt', [
-              '@alt' => $values['alt'],
-            ]);
-          }
-        }
-
-        // Compare Title fields.
-        if ($this->configuration['compare_title_field']) {
-          if (!empty($values['title'])) {
-            $result[$field_key][] = $this->t('Title: @title', [
-              '@title' => $values['title'],
-            ]);
-          }
-        }
-
-        // Compare file id.
-        if ($this->configuration['show_id']) {
-          if (isset($values['target_id'])) {
-            $result[$field_key][] = $this->t('File ID: @fid', [
-              '@fid' => $values['target_id'],
-            ]);
-          }
-        }
-
-        $separator = $this->configuration['property_separator'] == 'nl' ? "\n" : $this->configuration['property_separator'];
-        $result[$field_key] = implode($separator, $result[$field_key]);
-
-        // EXPERIMENTAL: Attach thumbnail image data.
-        if ($this->configuration['show_thumbnail']) {
-          if (isset($values['target_id'])) {
-            $storage = $this->entityTypeManager->getStorage('entity_form_display');
-            $display = $storage->load($field_items->getFieldDefinition()->getTargetEntityTypeId() . '.' . $field_items->getEntity()->bundle() . '.default');
-            if ($image_field = $display->getComponent($field_item->getFieldDefinition()->getName())) {
-              $image = $fileManager->load($values['target_id']);
-
-              $image_style[$field_key]['#thumbnail'] = array(
-                '#theme' => 'image_style',
-                '#uri' => $image->getFileUri(),
-                '#style_name' => $image_field['settings']['preview_image_style'],
-              );
-              $result = array_merge($result, $image_style);
-            }
-          }
-        }
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['show_id'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Show image ID'),
-      '#default_value' => $this->configuration['show_id'],
-    );
-    $form['compare_alt_field'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Compare <em>Alt</em> field'),
-      '#default_value' => $this->configuration['compare_alt_field'],
-      '#description' => $this->t('This is only used if the "Enable <em>Alt</em> field" is checked in the instance settings.'),
-    );
-    $form['compare_title_field'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Compare <em>Title</em> field'),
-      '#default_value' => $this->configuration['compare_title_field'],
-      '#description' => $this->t('This is only used if the "Enable <em>Title</em> field" is checked in the instance settings.'),
-    );
-    $form['property_separator'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Property separator'),
-      '#default_value' => $this->configuration['property_separator'],
-      '#description' => $this->t('Provides the ability to show properties inline or across multiple lines.'),
-      '#options' => array(
-        ', ' => $this->t('Comma (,)'),
-        '; ' => $this->t('Semicolon (;)'),
-        ' ' => $this->t('Space'),
-        'nl' => $this->t('New line'),
-      ),
-    );
-    $form['show_thumbnail'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Show image thumbnail'),
-      '#default_value' => $this->configuration['show_thumbnail'],
-      '#description' => $this->t('Displays the image field as thumbnail.'),
-    ];
-
-    return parent::buildConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['show_id'] = $form_state->getValue('show_id');
-    $this->configuration['compare_alt_field'] = $form_state->getValue('compare_alt_field');
-    $this->configuration['compare_title_field'] = $form_state->getValue('compare_title_field');
-    $this->configuration['property_separator'] = $form_state->getValue('property_separator');
-    $this->configuration['show_thumbnail'] = $form_state->getValue('show_thumbnail');
-
-    parent::submitConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    $default_configuration = array(
-      'show_id' => 0,
-      'compare_alt_field' => 1,
-      'compare_title_field' => 1,
-      'property_separator' => 'nl',
-      'show_thumbnail' => 1,
-    );
-    $default_configuration += parent::defaultConfiguration();
-
-    return $default_configuration;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/LinkFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/LinkFieldBuilder.php
deleted file mode 100644
index 373bd84..0000000
--- a/modules/diff/src/Plugin/diff/Field/LinkFieldBuilder.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Field;
-
-use Drupal\diff\FieldDiffBuilderBase;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Plugin to compare the title and the uris of two link fields.
- *
- * @FieldDiffBuilder(
- *   id = "link_field_diff_builder",
- *   label = @Translation("Link Field Diff"),
- *   field_types = {
- *     "link"
- *   },
- * )
- */
-class LinkFieldBuilder extends FieldDiffBuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(FieldItemListInterface $field_items) {
-    $result = array();
-
-    // Every item from $field_items is of type FieldItemInterface.
-    foreach ($field_items as $field_key => $field_item) {
-      if (!$field_item->isEmpty()) {
-        $values = $field_item->getValue();
-        // Compare the link title if that plugin options is selected.
-        if ($this->configuration['compare_title']) {
-          if (isset($values['title'])) {
-            $result[$field_key][] = $values['title'];
-          }
-        }
-        // Compare the uri if that plugin options is selected.
-        if ($this->configuration['compare_uri']) {
-          if (isset($values['uri'])) {
-            $result[$field_key][] = $values['uri'];
-          }
-        }
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['compare_title'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Compare link title'),
-      '#default_value' => $this->configuration['compare_title'],
-    );
-    $form['compare_uri'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Compare URI'),
-      '#default_value' => $this->configuration['compare_uri'],
-    );
-
-    return parent::buildConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['compare_title'] = $form_state->getValue('compare_title');
-    $this->configuration['compare_uri'] = $form_state->getValue('compare_uri');
-
-    parent::submitConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    $default_configuration = array(
-      'compare_title' => 0,
-      'compare_uri' => 1,
-    );
-    $default_configuration += parent::defaultConfiguration();
-
-    return $default_configuration;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/ListFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/ListFieldBuilder.php
deleted file mode 100644
index 6ff07b8..0000000
--- a/modules/diff/src/Plugin/diff/Field/ListFieldBuilder.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Field;
-
-use Drupal\diff\FieldDiffBuilderBase;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Plugin to diff list fields.
- *
- * @FieldDiffBuilder(
- *   id = "list_field_diff_builder",
- *   label = @Translation("List Field Diff"),
- *   field_types = {
- *     "list_string",
- *     "list_integer",
- *     "list_float"
- *   },
- * )
- */
-class ListFieldBuilder extends FieldDiffBuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(FieldItemListInterface $field_items) {
-    $result = array();
-
-    // Every item from $field_items is of type FieldItemInterface.
-    foreach ($field_items as $field_key => $field_item) {
-      // Build the array for comparison only if the field is not empty.
-      if (!$field_item->isEmpty()) {
-        $possible_options = $field_item->getPossibleOptions();
-        $values = $field_item->getValue();
-        if ($this->configuration['compare']) {
-          switch ($this->configuration['compare']) {
-            case 'both':
-              $result[$field_key][] = $possible_options[$values['value']] . ' (' . $values['value'] . ')';
-              break;
-
-            case 'label':
-              $result[$field_key][] = $possible_options[$values['value']];
-              break;
-
-            default:
-              $result[$field_key][] = $values['value'];
-              break;
-          }
-        }
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['compare'] = array(
-      '#type' => 'radios',
-      '#title' => $this->t('Comparison method'),
-      '#options' => array(
-        'label' => $this->t('Label'),
-        'key' => $this->t('Key'),
-        'both' => $this->t('Label (key)'),
-      ),
-      '#default_value' => $this->configuration['compare'],
-    );
-
-    return parent::buildConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['compare'] = $form_state->getValue('compare');
-
-    parent::submitConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    $default_configuration = array(
-      'compare' => 'key',
-    );
-    $default_configuration += parent::defaultConfiguration();
-
-    return $default_configuration;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/TextFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/TextFieldBuilder.php
deleted file mode 100644
index aed3efb..0000000
--- a/modules/diff/src/Plugin/diff/Field/TextFieldBuilder.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Field;
-
-use Drupal\diff\FieldDiffBuilderBase;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Plugin to diff text fields.
- *
- * @FieldDiffBuilder(
- *   id = "text_field_diff_builder",
- *   label = @Translation("Text Field Diff"),
- *   field_types = {
- *     "text_with_summary",
- *     "text",
- *     "text_long"
- *   },
- * )
- */
-class TextFieldBuilder extends FieldDiffBuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(FieldItemListInterface $field_items) {
-    $result = array();
-    // Every item from $field_items is of type FieldItemInterface.
-    foreach ($field_items as $field_key => $field_item) {
-      $values = $field_item->getValue();
-      // Compare text formats.
-      if ($this->configuration['compare_format'] == 1) {
-        if (isset($values['format'])) {
-          $controller = $this->entityTypeManager->getStorage('filter_format');
-          $format = $controller->load($values['format']);
-          // The format loaded successfully.
-          $label = $this->t('Format');
-          if ($format != NULL) {
-            $result[$field_key][] = $label . ": " . $format->label();
-          }
-          else {
-            $result[$field_key][] = $label . ": " . $this->t('Missing format @format', array('@format' => $values[$field_key]));
-          }
-        }
-      }
-      // Compare field values.
-      if (isset($values['value'])) {
-        $value_only = TRUE;
-        // Check if summary or text format are included in the diff.
-        if ($this->configuration['compare_format'] == 1) {
-          $value_only = FALSE;
-        }
-        $label = $this->t('Value');
-        if ($value_only) {
-          // Don't display 'value' label.
-          $result[$field_key][] = $values['value'];
-        }
-        else {
-          $result[$field_key][] = $label . ":\n" . $values['value'];
-        }
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['compare_format'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Compare format'),
-      '#default_value' => $this->configuration['compare_format'],
-      '#description' => $this->t('This is only used if the "Text processing" instance settings are set to <em>Filtered text (user selects text format)</em>.'),
-    );
-
-    return parent::buildConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['compare_format'] = $form_state->getValue('compare_format');
-
-    parent::submitConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    $default_configuration = array(
-      'compare_format' => 0,
-    );
-    $default_configuration += parent::defaultConfiguration();
-
-    return $default_configuration;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Field/TextWithSummaryFieldBuilder.php b/modules/diff/src/Plugin/diff/Field/TextWithSummaryFieldBuilder.php
deleted file mode 100644
index 8b357f0..0000000
--- a/modules/diff/src/Plugin/diff/Field/TextWithSummaryFieldBuilder.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Field;
-
-use Drupal\diff\FieldDiffBuilderBase;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Plugin to diff text with summary fields.
- *
- * @FieldDiffBuilder(
- *   id = "text_summary_field_diff_builder",
- *   label = @Translation("Text with Summary Field"),
- *   field_types = {
- *     "text_with_summary"
- *   },
- * )
- */
-class TextWithSummaryFieldBuilder extends FieldDiffBuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(FieldItemListInterface $field_items) {
-    $result = array();
-    // Every item from $field_items is of type FieldItemInterface.
-    foreach ($field_items as $field_key => $field_item) {
-      $values = $field_item->getValue();
-      // Compare text formats.
-      if ($this->configuration['compare_format'] == 1) {
-        if (isset($values['format'])) {
-          $controller = $this->entityTypeManager->getStorage('filter_format');
-          $format = $controller->load($values['format']);
-          // The format loaded successfully.
-          $label = $this->t('Format');
-          if ($format != NULL) {
-            $result[$field_key][] = $label . ": " . $format->name;
-          }
-          else {
-            $result[$field_key][] = $label . ": " . $this->t('Missing format @format', array('@format' => $values[$field_key]));
-          }
-        }
-      }
-      // Handle the text summary.
-      if ($this->configuration['compare_summary'] == 1) {
-        if (isset($values['summary'])) {
-          $label = $this->t('Summary');
-          if ($values['summary'] == '') {
-            $result[$field_key][] = $label . ":\n" . $this->t('Empty');
-          }
-          else {
-            $result[$field_key][] = $label . ":\n" . $values['summary'];
-          }
-        }
-      }
-      // Compare field values.
-      if (isset($values['value'])) {
-        $value_only = TRUE;
-        // Check if summary or text format are included in the diff.
-        if ($this->configuration['compare_format'] == 1 || $this->configuration['compare_summary'] == 1) {
-          $value_only = FALSE;
-        }
-        $label = $this->t('Value');
-        if ($value_only) {
-          // Don't display 'value' label.
-          $result[$field_key][] = $values['value'];
-        }
-        else {
-          $result[$field_key][] = $label . ":\n" . $values['value'];
-        }
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['compare_format'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Compare format'),
-      '#default_value' => $this->configuration['compare_format'],
-      '#description' => $this->t('This is only used if the "Text processing" instance settings are set to <em>Filtered text (user selects text format)</em>.'),
-    );
-    $form['compare_summary'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Compare summary separately'),
-      '#default_value' => $this->configuration['compare_summary'],
-      '#description' => $this->t('This is only used if the "Summary input" option is checked in the instance settings.'),
-    );
-
-    return parent::buildConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['compare_format'] = $form_state->getValue('compare_format');
-    $this->configuration['compare_summary'] = $form_state->getValue('compare_summary');
-
-    parent::submitConfigurationForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    $default_configuration = array(
-      'compare_format' => 0,
-      'compare_summary' => 0,
-    );
-    $default_configuration += parent::defaultConfiguration();
-
-    return $default_configuration;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Layout/SplitFieldsDiffLayout.php b/modules/diff/src/Plugin/diff/Layout/SplitFieldsDiffLayout.php
deleted file mode 100644
index 6316b0a..0000000
--- a/modules/diff/src/Plugin/diff/Layout/SplitFieldsDiffLayout.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Layout;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Datetime\DateFormatter;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Render\RendererInterface;
-use Drupal\diff\DiffEntityComparison;
-use Drupal\diff\DiffEntityParser;
-use Drupal\diff\DiffLayoutBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-/**
- * Provides Split fields diff layout.
- *
- * @DiffLayoutBuilder(
- *   id = "split_fields",
- *   label = @Translation("Split fields"),
- *   description = @Translation("Field based layout, displays revision comparison side by side."),
- * )
- */
-class SplitFieldsDiffLayout extends DiffLayoutBase {
-
-  /**
-   * The renderer.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * The diff entity comparison service.
-   *
-   * @var \Drupal\diff\DiffEntityComparison
-   */
-  protected $entityComparison;
-
-  /**
-   * The request stack.
-   *
-   * @var \Symfony\Component\HttpFoundation\RequestStack
-   */
-  protected $requestStack;
-
-  /**
-   * Constructs a SplitFieldsDiffLayout object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   *   The configuration factory object.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\diff\DiffEntityParser $entity_parser
-   *   The entity parser.
-   * @param \Drupal\Core\DateTime\DateFormatter $date
-   *   The date service.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer.
-   * @param \Drupal\diff\DiffEntityComparison $entity_comparison
-   *   The diff entity comparison service.
-   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *   The request stack.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config, EntityTypeManagerInterface $entity_type_manager, DiffEntityParser $entity_parser, DateFormatter $date, RendererInterface $renderer, DiffEntityComparison $entity_comparison, RequestStack $request_stack) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $config, $entity_type_manager, $entity_parser, $date);
-    $this->renderer = $renderer;
-    $this->entityComparison = $entity_comparison;
-    $this->requestStack = $request_stack;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('config.factory'),
-      $container->get('entity_type.manager'),
-      $container->get('diff.entity_parser'),
-      $container->get('date.formatter'),
-      $container->get('renderer'),
-      $container->get('diff.entity_comparison'),
-      $container->get('request_stack')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(ContentEntityInterface $left_revision, ContentEntityInterface $right_revision, ContentEntityInterface $entity) {
-    // Build the revisions data.
-    $build = $this->buildRevisionsData($left_revision, $right_revision);
-
-    $active_filter = $this->requestStack->getCurrentRequest()->query->get('filter') ?: 'raw';
-    $build['controls']['filter'] = [
-      '#type' => 'item',
-      '#title' => $this->t('Filter'),
-      '#wrapper_attributes' => ['class' => 'diff-controls__item'],
-      'options' => $this->buildFilterNavigation($entity, $left_revision, $right_revision, 'split_fields', $active_filter),
-    ];
-
-    // Build the diff comparison table.
-    $diff_header = $this->buildTableHeader($left_revision, $right_revision);
-    // Perform comparison only if both entity revisions loaded successfully.
-    $fields = $this->entityComparison->compareRevisions($left_revision, $right_revision);
-    // Build the diff rows for each field and append the field rows
-    // to the table rows.
-    $diff_rows = [];
-    $raw_active = $active_filter == 'raw';
-    foreach ($fields as $field) {
-      $field_label_row = '';
-      if (!empty($field['#name'])) {
-        $field_label_row = [
-          'data' => $field['#name'],
-          'colspan' => 8,
-          'class' => ['field-name'],
-        ];
-      }
-
-      if (!$raw_active) {
-        $field_settings = $field['#settings'];
-        if (!empty($field_settings['settings']['markdown'])) {
-          $field['#data']['#left'] = $this->applyMarkdown($field_settings['settings']['markdown'], $field['#data']['#left']);
-          $field['#data']['#right'] = $this->applyMarkdown($field_settings['settings']['markdown'], $field['#data']['#right']);
-        }
-        // In case the settings are not loaded correctly use drupal_html_to_text
-        // to avoid any possible notices when a user clicks on markdown.
-        else {
-          $field['#data']['#left'] = $this->applyMarkdown('drupal_html_to_text', $field['#data']['#left']);
-          $field['#data']['#right'] = $this->applyMarkdown('drupal_html_to_text', $field['#data']['#right']);
-        }
-      }
-      // Process the array (split the strings into single line strings)
-      // and get line counts per field.
-      $this->entityComparison->processStateLine($field);
-
-      $field_diff_rows = $this->entityComparison->getRows(
-        $field['#data']['#left'],
-        $field['#data']['#right']
-      );
-
-      // EXPERIMENTAL: Deal with magic thumbnail image data.
-      if (isset($field['#data']['#left_thumbnail'])) {
-        $field_diff_rows['#thumbnail'][1] = [
-          'data' => $field['#data']['#left_thumbnail'],
-          'class' => '',
-        ];
-      }
-      if (isset($field['#data']['#right_thumbnail'])) {
-        $field_diff_rows['#thumbnail'][3] = [
-          'data' => $field['#data']['#right_thumbnail'],
-          'class' => '',
-        ];
-      }
-
-      $final_diff = [];
-      $row_count_left = NULL;
-      $row_count_right = NULL;
-
-      foreach ($field_diff_rows as $key => $value) {
-        $show_left = FALSE;
-        $show_right = FALSE;
-        if (isset($field_diff_rows[$key][1]['data'])) {
-          $show_left = TRUE;
-          $row_count_left++;
-        }
-        if (isset($field_diff_rows[$key][3]['data'])) {
-          $show_right = TRUE;
-          $row_count_right++;
-        }
-        $final_diff[] = [
-          'left-line-number' => [
-            'data' => $show_left ? $row_count_left : NULL,
-            'class' => [
-              'diff-line-number',
-              isset($field_diff_rows[$key][1]['data']) ? $field_diff_rows[$key][1]['class'] : NULL,
-            ],
-          ],
-          'left-row-sign' => [
-            'data' => isset($field_diff_rows[$key][0]['data']) ? $field_diff_rows[$key][0]['data'] : NULL,
-            'class' => [
-              isset($field_diff_rows[$key][0]['class']) ? $field_diff_rows[$key][0]['class'] : NULL,
-              isset($field_diff_rows[$key][1]['data']) ? $field_diff_rows[$key][1]['class'] : NULL,
-            ],
-          ],
-          'left-row-data' => [
-            'data' => isset($field_diff_rows[$key][1]['data']) ? $field_diff_rows[$key][1]['data'] : NULL,
-            'class' => isset($field_diff_rows[$key][1]['data']) ? $field_diff_rows[$key][1]['class'] : NULL,
-          ],
-          'right-line-number' => [
-            'data' => $show_right ? $row_count_right : NULL,
-            'class' => [
-              'diff-line-number',
-              isset($field_diff_rows[$key][3]['data']) ? $field_diff_rows[$key][3]['class'] : NULL,
-            ],
-          ],
-          'right-row-sign' => [
-            'data' => isset($field_diff_rows[$key][2]['data']) ? $field_diff_rows[$key][2]['data'] : NULL,
-            'class' => [
-              isset($field_diff_rows[$key][2]['class']) ? $field_diff_rows[$key][2]['class'] : NULL,
-              isset($field_diff_rows[$key][3]['data']) ? $field_diff_rows[$key][3]['class'] : NULL,
-            ],
-          ],
-          'right-row-data' => [
-            'data' => isset($field_diff_rows[$key][3]['data']) ? $field_diff_rows[$key][3]['data'] : NULL,
-            'class' => isset($field_diff_rows[$key][3]['data']) ? $field_diff_rows[$key][3]['class'] : NULL,
-          ],
-        ];
-      }
-
-      // Add field label to the table only if there are changes to that field.
-      if (!empty($final_diff) && !empty($field_label_row)) {
-        $diff_rows[] = [$field_label_row];
-      }
-
-      // Add field diff rows to the table rows.
-      $diff_rows = array_merge($diff_rows, $final_diff);
-    }
-
-    if (!$raw_active) {
-      // Remove line numbers.
-      foreach ($diff_rows as $i => $row) {
-        unset($diff_rows[$i]['left-line-number']);
-        unset($diff_rows[$i]['right-line-number']);
-      }
-      // Reduce the colspan.
-      $diff_header[0]['colspan'] = 2;
-    }
-
-    $build['diff'] = [
-      '#type' => 'table',
-      '#header' => $diff_header,
-      '#rows' => $diff_rows,
-      '#weight' => 10,
-      '#empty' => $this->t('No visible changes'),
-      '#attributes' => [
-        'class' => ['diff'],
-      ],
-    ];
-
-    $build['#attached']['library'][] = 'diff/diff.double_column';
-    $build['#attached']['library'][] = 'diff/diff.colors';
-    return $build;
-  }
-
-  /**
-   * Build the header for the diff table.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $left_revision
-   *   Revision from the left hand side.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $right_revision
-   *   Revision from the right hand side.
-   *
-   * @return array
-   *   Header for Diff table.
-   */
-  protected function buildTableHeader(ContentEntityInterface $left_revision, ContentEntityInterface $right_revision) {
-    $header = [];
-    $header[] = [
-      'data' => ['#markup' => $this->buildRevisionLink($left_revision)],
-      'colspan' => 3,
-    ];
-    $header[] = [
-      'data' => ['#markup' => $this->buildRevisionLink($right_revision)],
-      'colspan' => 3,
-    ];
-
-    return $header;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php b/modules/diff/src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php
deleted file mode 100644
index 6db2c32..0000000
--- a/modules/diff/src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Layout;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Datetime\DateFormatter;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Render\RendererInterface;
-use Drupal\diff\DiffEntityComparison;
-use Drupal\diff\DiffEntityParser;
-use Drupal\diff\DiffLayoutBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-/**
- * Provides Unified fields diff layout.
- *
- * @DiffLayoutBuilder(
- *   id = "unified_fields",
- *   label = @Translation("Unified fields"),
- *   description = @Translation("Field based layout, displays revision comparison line by line."),
- * )
- */
-class UnifiedFieldsDiffLayout extends DiffLayoutBase {
-
-  /**
-   * The renderer.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * The diff entity comparison service.
-   *
-   * @var \Drupal\diff\DiffEntityComparison
-   */
-  protected $entityComparison;
-
-  /**
-   * The request stack.
-   *
-   * @var \Symfony\Component\HttpFoundation\RequestStack
-   */
-  protected $requestStack;
-
-  /**
-   * Constructs a UnifiedFieldsDiffLayout object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   *   The configuration factory object.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\diff\DiffEntityParser $entity_parser
-   *   The entity parser.
-   * @param \Drupal\Core\DateTime\DateFormatter $date
-   *   The date service.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer.
-   * @param \Drupal\diff\DiffEntityComparison $entity_comparison
-   *   The diff entity comparison service.
-   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *   The request stack.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config, EntityTypeManagerInterface $entity_type_manager, DiffEntityParser $entity_parser, DateFormatter $date, RendererInterface $renderer, DiffEntityComparison $entity_comparison, RequestStack $request_stack) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $config, $entity_type_manager, $entity_parser, $date);
-    $this->renderer = $renderer;
-    $this->entityComparison = $entity_comparison;
-    $this->requestStack = $request_stack;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('config.factory'),
-      $container->get('entity_type.manager'),
-      $container->get('diff.entity_parser'),
-      $container->get('date.formatter'),
-      $container->get('renderer'),
-      $container->get('diff.entity_comparison'),
-      $container->get('request_stack')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(ContentEntityInterface $left_revision, ContentEntityInterface $right_revision, ContentEntityInterface $entity) {
-    // Build the revisions data.
-    $build = $this->buildRevisionsData($left_revision, $right_revision);
-
-    $active_filter = $this->requestStack->getCurrentRequest()->query->get('filter') ?: 'raw';
-    $raw_active = $active_filter == 'raw';
-
-    $build['controls']['filter'] = [
-      '#type' => 'item',
-      '#title' => $this->t('Filter'),
-      '#wrapper_attributes' => ['class' => 'diff-controls__item'],
-      'options' => $this->buildFilterNavigation($entity, $left_revision, $right_revision, 'unified_fields', $active_filter),
-    ];
-
-    // Build the diff comparison table.
-    $diff_header = $this->buildTableHeader($right_revision);
-    // Perform comparison only if both entity revisions loaded successfully.
-    $fields = $this->entityComparison->compareRevisions($left_revision, $right_revision);
-    // Build the diff rows for each field and append the field rows
-    // to the table rows.
-    $diff_rows = [];
-    foreach ($fields as $field) {
-      $field_label_row = '';
-      if (!empty($field['#name'])) {
-        $field_label_row = [
-          'data' => $field['#name'],
-          'colspan' => 4,
-          'class' => ['field-name'],
-        ];
-      }
-
-      if (!$raw_active) {
-        $field_settings = $field['#settings'];
-        if (!empty($field_settings['settings']['markdown'])) {
-          $field['#data']['#left'] = $this->applyMarkdown($field_settings['settings']['markdown'], $field['#data']['#left']);
-          $field['#data']['#right'] = $this->applyMarkdown($field_settings['settings']['markdown'], $field['#data']['#right']);
-        }
-        // In case the settings are not loaded correctly use drupal_html_to_text
-        // to avoid any possible notices when a user clicks on markdown.
-        else {
-          $field['#data']['#left'] = $this->applyMarkdown('drupal_html_to_text', $field['#data']['#left']);
-          $field['#data']['#right'] = $this->applyMarkdown('drupal_html_to_text', $field['#data']['#right']);
-        }
-      }
-
-      // Process the array (split the strings into single line strings)
-      // and get line counts per field.
-      $this->entityComparison->processStateLine($field);
-
-      $field_diff_rows = $this->entityComparison->getRows(
-        $field['#data']['#left'],
-        $field['#data']['#right']
-      );
-
-      $final_diff = [];
-      $row_count_left = NULL;
-      $row_count_right = NULL;
-      foreach ($field_diff_rows as $key => $value) {
-        $show = FALSE;
-        if (isset($field_diff_rows[$key][1]['data'])) {
-          if ($field_diff_rows[$key][1] == $field_diff_rows[$key][3]) {
-            $show = TRUE;
-            $row_count_right++;
-          }
-          $row_count_left++;
-          $final_diff[] = [
-            'left-line-number' => [
-              'data' => $row_count_left,
-              'class' => ['diff-line-number', $field_diff_rows[$key][1]['class']],
-            ],
-            'right-line-number' => [
-              'data' => $show ? $row_count_right : NULL,
-              'class' => ['diff-line-number', $field_diff_rows[$key][1]['class']],
-            ],
-            'row-sign' => [
-              'data' => isset($field_diff_rows[$key][0]['data']) ? $field_diff_rows[$key][0]['data'] : NULL,
-              'class' => [isset($field_diff_rows[$key][0]['class']) ? $field_diff_rows[$key][0]['class'] : NULL, $field_diff_rows[$key][1]['class']],
-            ],
-            'row-data' => [
-              'data' => $field_diff_rows[$key][1]['data'],
-              'colspan' => 2,
-              'class' => $field_diff_rows[$key][1]['class'],
-            ],
-          ];
-        }
-        if ($field_diff_rows[$key][1] != $field_diff_rows[$key][3]) {
-          if (isset($field_diff_rows[$key][3]['data'])) {
-            $row_count_right++;
-            $final_diff[] = [
-              'left-line-number' => [
-                'data' => NULL,
-                'class' => ['diff-line-number', $field_diff_rows[$key][3]['class']],
-              ],
-              'right-line-number' => [
-                'data' => $row_count_right,
-                'class' => ['diff-line-number', $field_diff_rows[$key][3]['class']],
-              ],
-              'row-sign' => [
-                'data' => isset($field_diff_rows[$key][2]['data']) ? $field_diff_rows[$key][2]['data'] : NULL,
-                'class' => [isset($field_diff_rows[$key][2]['class']) ? $field_diff_rows[$key][2]['class'] : NULL, $field_diff_rows[$key][3]['class']],
-              ],
-              'row-data' => [
-                'data' => $field_diff_rows[$key][3]['data'],
-                'colspan' => 2,
-                'class' => $field_diff_rows[$key][3]['class'],
-              ],
-            ];
-          }
-        }
-      }
-
-      // Add field label to the table only if there are changes to that field.
-      if (!empty($final_diff) && !empty($field_label_row)) {
-        $diff_rows[] = [$field_label_row];
-      }
-
-      // Add field diff rows to the table rows.
-      $diff_rows = array_merge($diff_rows, $final_diff);
-    }
-
-    if (!$raw_active) {
-      // Remove line numbers.
-      foreach ($diff_rows as $i => $row) {
-        unset($diff_rows[$i]['left-line-number']);
-        unset($diff_rows[$i]['right-line-number']);
-      }
-
-      // Reduce the colspan.
-      $diff_header[0]['colspan'] = 2;
-      $diff_rows[0][0]['colspan'] = 2;
-    }
-    $build['diff'] = [
-      '#type' => 'table',
-      '#header' => $diff_header,
-      '#rows' => $diff_rows,
-      '#weight' => 10,
-      '#empty' => $this->t('No visible changes'),
-      '#attributes' => [
-        'class' => ['diff'],
-      ],
-    ];
-
-    $build['#attached']['library'][] = 'diff/diff.single_column';
-    $build['#attached']['library'][] = 'diff/diff.colors';
-    return $build;
-  }
-
-  /**
-   * Build the header for the diff table.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $right_revision
-   *   Revision from the right hand side.
-   *
-   * @return array
-   *   Header for Diff table.
-   */
-  protected function buildTableHeader(EntityInterface $right_revision) {
-    $header = [];
-    $header[] = [
-      'data' => ['#markup' => $this->buildRevisionLink($right_revision)],
-      'colspan' => 4,
-    ];
-
-    return $header;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/diff/Layout/VisualInlineDiffLayout.php b/modules/diff/src/Plugin/diff/Layout/VisualInlineDiffLayout.php
deleted file mode 100644
index 124cc8b..0000000
--- a/modules/diff/src/Plugin/diff/Layout/VisualInlineDiffLayout.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\diff\Layout;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Datetime\DateFormatter;
-use Drupal\Core\Entity\EntityDisplayRepositoryInterface;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\PhpStorage\PhpStorageFactory;
-use Drupal\Core\Render\RendererInterface;
-use Drupal\diff\Controller\PluginRevisionController;
-use Drupal\diff\DiffEntityComparison;
-use Drupal\diff\DiffEntityParser;
-use Drupal\diff\DiffLayoutBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use HtmlDiffAdvancedInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-/**
- * Provides Visual Inline diff layout.
- *
- * @DiffLayoutBuilder(
- *   id = "visual_inline",
- *   label = @Translation("Visual Inline"),
- *   description = @Translation("Visual layout, displays revision comparison using the entity type view mode."),
- * )
- */
-class VisualInlineDiffLayout extends DiffLayoutBase {
-
-  /**
-   * The renderer.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * The diff entity comparison service.
-   *
-   * @var \Drupal\diff\DiffEntityComparison
-   */
-  protected $entityComparison;
-
-  /**
-   * The html diff service.
-   *
-   * @var \HtmlDiffAdvancedInterface
-   */
-  protected $htmlDiff;
-
-  /**
-   * The request stack.
-   *
-   * @var \Symfony\Component\HttpFoundation\RequestStack
-   */
-  protected $requestStack;
-
-  /**
-   * The entity display repository.
-   *
-   * @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface
-   */
-  protected $entityDisplayRepository;
-
-  /**
-   * Constructs a VisualInlineDiffLayout object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   *   The configuration factory object.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\diff\DiffEntityParser $entity_parser
-   *   The entity parser.
-   * @param \Drupal\Core\DateTime\DateFormatter $date
-   *   The date service.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer.
-   * @param \Drupal\diff\DiffEntityComparison $entity_comparison
-   *   The diff entity comparison service.
-   * @param \HtmlDiffAdvancedInterface $html_diff
-   *   The html diff service.
-   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *   The request stack.
-   * @param \Drupal\Core\Entity\EntityDisplayRepositoryInterface $entity_display_repository
-   *   The entity display repository.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config, EntityTypeManagerInterface $entity_type_manager, DiffEntityParser $entity_parser, DateFormatter $date, RendererInterface $renderer, DiffEntityComparison $entity_comparison, HtmlDiffAdvancedInterface $html_diff, RequestStack $request_stack, EntityDisplayRepositoryInterface $entity_display_repository) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $config, $entity_type_manager, $entity_parser, $date);
-    $this->renderer = $renderer;
-    $this->entityComparison = $entity_comparison;
-    $storage = PhpStorageFactory::get('html_purifier_serializer');
-    if (!$storage->exists('cache.php')) {
-      $storage->save('cache.php', 'dummy');
-    }
-    $html_diff->getConfig()->setPurifierCacheLocation(dirname($storage->getFullPath('cache.php')));
-    $this->htmlDiff = $html_diff;
-    $this->requestStack = $request_stack;
-    $this->entityDisplayRepository = $entity_display_repository;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('config.factory'),
-      $container->get('entity_type.manager'),
-      $container->get('diff.entity_parser'),
-      $container->get('date.formatter'),
-      $container->get('renderer'),
-      $container->get('diff.entity_comparison'),
-      $container->get('diff.html_diff'),
-      $container->get('request_stack'),
-      $container->get('entity_display.repository')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(ContentEntityInterface $left_revision, ContentEntityInterface $right_revision, ContentEntityInterface $entity) {
-    // Build the revisions data.
-    $build = $this->buildRevisionsData($left_revision, $right_revision);
-
-    $this->entityTypeManager->getStorage($entity->getEntityTypeId())->resetCache([$entity->id()]);
-    // Build the view modes filter.
-    $options = [];
-    // Get all view modes for entity type.
-    $view_modes = $this->entityDisplayRepository->getViewModeOptionsByBundle($entity->getEntityTypeId(), $entity->bundle());
-    foreach ($view_modes as $view_mode => $view_mode_info) {
-      // Skip view modes that are not used in the front end.
-      if (in_array($view_mode, ['rss', 'search_index'])) {
-        continue;
-      }
-      $options[$view_mode] = [
-        'title' => $view_mode_info,
-        'url' => PluginRevisionController::diffRoute($entity,
-          $left_revision->getRevisionId(),
-          $right_revision->getRevisionId(),
-          'visual_inline',
-          ['view_mode' => $view_mode]
-        ),
-      ];
-    }
-
-    $active_option = array_keys($options);
-    $active_view_mode = $this->requestStack->getCurrentRequest()->query->get('view_mode') ?: reset($active_option);
-
-    $filter = $options[$active_view_mode];
-    unset($options[$active_view_mode]);
-    array_unshift($options, $filter);
-
-    $build['controls']['view_mode'] = [
-      '#type' => 'item',
-      '#title' => $this->t('View mode'),
-      '#wrapper_attributes' => ['class' => 'diff-controls__item'],
-      'filter' => [
-        '#type' => 'operations',
-        '#links' => $options,
-      ],
-    ];
-
-    $view_builder = $this->entityTypeManager->getViewBuilder($entity->getEntityTypeId());
-    // Trigger exclusion of interactive items like on preview.
-    $left_revision->in_preview = TRUE;
-    $right_revision->in_preview = TRUE;
-    $left_view = $view_builder->view($left_revision, $active_view_mode);
-    $right_view = $view_builder->view($right_revision, $active_view_mode);
-
-    // Avoid render cache from being built.
-    unset($left_view['#cache']);
-    unset($right_view['#cache']);
-
-    $html_1 = $this->renderer->render($left_view);
-    $html_2 = $this->renderer->render($right_view);
-
-    $this->htmlDiff->setOldHtml($html_1);
-    $this->htmlDiff->setNewHtml($html_2);
-    $this->htmlDiff->build();
-
-    $build['diff'] = [
-      '#markup' => $this->htmlDiff->getDifference(),
-      '#weight' => 10,
-    ];
-
-    $build['#attached']['library'][] = 'diff/diff.visual_inline';
-    return $build;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/views/field/DiffFrom.php b/modules/diff/src/Plugin/views/field/DiffFrom.php
deleted file mode 100644
index 8af0ecc..0000000
--- a/modules/diff/src/Plugin/views/field/DiffFrom.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\views\field;
-
-use Drupal\Core\Entity\RevisionableInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RedirectDestinationTrait;
-use Drupal\node\NodeInterface;
-
-/**
- * Provides View field diff from plugin.
- *
- * @ViewsField("diff__from")
- */
-class DiffFrom extends DiffPluginBase {
-
-  use RedirectDestinationTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-
-    $options['label']['default'] = t('From');
-    return $options;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function viewsForm(array &$form, FormStateInterface $form_state) {
-    // Replace the form submit button label.
-    $form['actions']['submit']['#value'] = $this->t('Compare');
-    parent::viewsForm($form, $form_state);
-  }
-
-  /**
-   * Returns the diff_to field ID.
-   *
-   * @return string|null
-   *   The diff_to field ID, or null if the field was not found on the view.
-   */
-  protected function getToFieldId() {
-    foreach ($this->view->field as $id => $field) {
-      if ($field instanceof DiffTo) {
-        return $id;
-      }
-    }
-  }
-
-  /**
-   * Submit handler for the bulk form.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
-   *   Thrown when the user tried to access an action without access to it.
-   */
-  public function viewsFormSubmit(array &$form, FormStateInterface $form_state) {
-    if ($form_state->get('step') == 'views_form_views_form') {
-      $diff_from = $form_state->getValue($this->options['id']);
-      $diff_from_entity = $this->loadEntityFromDiffFormKey($diff_from);
-
-      $diff_to = $form_state->getValue($this->getToFieldId());
-      $diff_to_entity = $this->loadEntityFromDiffFormKey($diff_to);
-
-      $options = array(
-        'query' => $this->getDestinationArray(),
-      );
-      $entity_type_id = $diff_from_entity->getEntityTypeId();
-
-      $filter = \Drupal::service('plugin.manager.diff.layout')->getDefaultLayout();
-      if ($diff_from_entity instanceof NodeInterface && $diff_to_entity instanceof NodeInterface) {
-        $form_state->setRedirect('diff.revisions_diff', [
-          $entity_type_id => $diff_from_entity->id(),
-          'left_revision' => $diff_from_entity->getRevisionId(),
-          'right_revision' => $diff_to_entity->getRevisionId(),
-          'filter' => $filter,
-        ], $options);
-      }
-      elseif ($diff_from_entity instanceof RevisionableInterface && $diff_to_entity instanceof RevisionableInterface) {
-        $route_name = 'entity.' . $entity_type_id . '.revisions_diff';
-        $form_state->setRedirect($route_name, [
-          $entity_type_id => $diff_from_entity->id(),
-          'left_revision' => $diff_from_entity->getRevisionId(),
-          'right_revision' => $diff_to_entity->getRevisionId(),
-          'filter' => $filter,
-        ], $options);
-      }
-    }
-  }
-
-}
diff --git a/modules/diff/src/Plugin/views/field/DiffPluginBase.php b/modules/diff/src/Plugin/views/field/DiffPluginBase.php
deleted file mode 100644
index 7ce978a..0000000
--- a/modules/diff/src/Plugin/views/field/DiffPluginBase.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\views\field;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\RevisionableInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\TypedData\TranslatableInterface;
-use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\views\Plugin\views\field\UncacheableFieldHandlerTrait;
-use Drupal\views\ResultRow;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Base class for diff view field plugins.
- */
-class DiffPluginBase extends FieldPluginBase {
-
-  use UncacheableFieldHandlerTrait;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Constructs a DiffPluginBase object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity_type.manager')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function query() {
-    $this->ensureMyTable();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getValue(ResultRow $row, $field = NULL) {
-    return '<!--form-item-' . $this->options['id'] . '--' . $row->index . '-->';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function viewsForm(array &$form, FormStateInterface $form_state) {
-    if (!empty($this->view->result)) {
-      $form[$this->options['id']]['#tree'] = TRUE;
-      foreach ($this->view->result as $row_index => $row) {
-        $entity = $row->_entity;
-        $form[$this->options['id']][$row_index] = [
-          '#type' => 'radio',
-          '#parents' => [$this->options['id']],
-          '#title' => $this->t('Compare this item'),
-          '#title_display' => 'invisible',
-          '#return_value' => $this->calculateEntityDiffFormKey($entity),
-        ];
-      }
-    }
-  }
-
-  /**
-   * Calculates a diff form key.
-   *
-   * This generates a key that is used as the checkbox return value when
-   * submitting a diff form. This key allows the entity for the row to be loaded
-   * totally independently of the executed view row.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to calculate a diff form key for.
-   *
-   * @return string
-   *   The diff form key representing the entity's id, language and revision (if
-   *   applicable) as one string.
-   *
-   * @see self::loadEntityFromDiffFormKey()
-   */
-  protected function calculateEntityDiffFormKey(EntityInterface $entity) {
-    $key_parts = [$entity->language()->getId(), $entity->id()];
-
-    if ($entity instanceof RevisionableInterface) {
-      $key_parts[] = $entity->getRevisionId();
-    }
-
-    // An entity ID could be an arbitrary string (although they are typically
-    // numeric). JSON then Base64 encoding ensures the diff_form_key is
-    // safe to use in HTML, and that the key parts can be retrieved.
-    $key = Json::encode($key_parts);
-    return base64_encode($key);
-  }
-
-  /**
-   * Loads an entity based on a diff form key.
-   *
-   * @param string $diff_form_key
-   *   The diff form key representing the entity's ID, language and revision (if
-   *   applicable) as one string.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface
-   *   The entity loaded in the state (language, optionally revision) specified
-   *   as part of the diff form key.
-   *
-   * @throws \UnexpectedValueException
-   *   If no entity can be found for the given diff form key.
-   */
-  protected function loadEntityFromDiffFormKey($diff_form_key) {
-    $key = base64_decode($diff_form_key);
-    $key_parts = Json::decode($key);
-    $revision_id = NULL;
-
-    // If there are 3 items, vid will be last.
-    if (count($key_parts) === 3) {
-      $revision_id = array_pop($key_parts);
-    }
-
-    // The first two items will always be langcode and ID.
-    $id = array_pop($key_parts);
-    $langcode = array_pop($key_parts);
-
-    // Load the entity or a specific revision depending on the given key.
-    $storage = $this->entityTypeManager->getStorage($this->getEntityType());
-    $entity = $revision_id ? $storage->loadRevision($revision_id) : $storage->load($id);
-
-    if (empty($entity)) {
-      throw new \UnexpectedValueException('Entity not found: ' . $diff_form_key);
-    }
-
-    if ($entity instanceof TranslatableInterface) {
-      $entity = $entity->getTranslation($langcode);
-    }
-
-    return $entity;
-  }
-
-}
diff --git a/modules/diff/src/Plugin/views/field/DiffTo.php b/modules/diff/src/Plugin/views/field/DiffTo.php
deleted file mode 100644
index 3e6b959..0000000
--- a/modules/diff/src/Plugin/views/field/DiffTo.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Drupal\diff\Plugin\views\field;
-
-/**
- * Provides View field diff to plugin.
- *
- * @ViewsField("diff__to")
- */
-class DiffTo extends DiffPluginBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-
-    $options['label']['default'] = t('To');
-    return $options;
-  }
-
-}
diff --git a/modules/diff/src/Routing/DiffRouteProvider.php b/modules/diff/src/Routing/DiffRouteProvider.php
deleted file mode 100644
index ebc4f1e..0000000
--- a/modules/diff/src/Routing/DiffRouteProvider.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\diff\Routing;
-
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\Routing\EntityRouteProviderInterface;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * Contains routes for diff functionality.
- */
-class DiffRouteProvider implements EntityRouteProviderInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRoutes(EntityTypeInterface $entity_type) {
-    $collection = new RouteCollection();
-    if ($route = $this->getDiffRoute($entity_type)) {
-      $collection->add('entity.' . $entity_type->id() . '.revisions_diff', $route);
-    }
-    return $collection;
-  }
-
-  /**
-   * Constructs the diff route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The diff route.
-   */
-  protected function getDiffRoute(EntityTypeInterface $entity_type) {
-    if ($entity_type->hasLinkTemplate('revisions-diff')) {
-      $route = new Route($entity_type->getLinkTemplate('revisions-diff'));
-      $route->addDefaults([
-        '_controller' => '\Drupal\diff\Controller\PluginRevisionController::compareEntityRevisions',
-        'filter' => 'split_fields',
-      ]);
-      $route->addRequirements([
-        '_entity_access' => $entity_type->id() . '.view',
-      ]);
-      $route->setOption('parameters', [
-        $entity_type->id() => ['type' => 'entity:' . $entity_type->id()],
-        'left_revision' => ['type' => 'entity_revision:' . $entity_type->id()],
-        'right_revision' => ['type' => 'entity_revision:' . $entity_type->id()],
-      ]);
-      return $route;
-    }
-  }
-
-}
diff --git a/modules/diff/src/Routing/RouteSubscriber.php b/modules/diff/src/Routing/RouteSubscriber.php
deleted file mode 100644
index 16e6287..0000000
--- a/modules/diff/src/Routing/RouteSubscriber.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\diff\Routing;
-
-use Drupal\Core\Routing\RouteSubscriberBase;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * Listens to the dynamic route events.
- */
-class RouteSubscriber extends RouteSubscriberBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterRoutes(RouteCollection $collection) {
-    // Replace the content from node.revision_overview route with content
-    // generated by revisionOverview method from NodeRevisionController class.
-    $route = $collection->get('entity.node.version_history');
-    if ($route) {
-      $route->addDefaults(
-        array(
-          '_controller' => '\Drupal\diff\Controller\NodeRevisionController::revisionOverview',
-        )
-      );
-    }
-  }
-
-}
diff --git a/modules/diff/src/Tests/DiffAdminFormsTest.php b/modules/diff/src/Tests/DiffAdminFormsTest.php
deleted file mode 100644
index 03e60d5..0000000
--- a/modules/diff/src/Tests/DiffAdminFormsTest.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-namespace Drupal\diff\Tests;
-
-/**
- * Tests the Diff admin forms.
- *
- * @group diff
- */
-class DiffAdminFormsTest extends DiffTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'field_ui',
-    'help',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->drupalLogin($this->rootUser);
-  }
-
-  /**
-   * Run all independent tests.
-   */
-  public function testAll() {
-    $this->doTestSettingsUi();
-    $this->doTestSettingsTab();
-    $this->doTestRequirements();
-    $this->doTestConfigurableFieldsTab();
-    $this->doTestPluginWeight();
-  }
-
-  /**
-   * Tests the descriptions in the Settings UI.
-   */
-  public function doTestSettingsUi() {
-    // Enable the help block.
-    $this->drupalPlaceBlock('help_block', ['region' => 'help']);
-
-    $this->drupalGet('admin/config/content/diff/general');
-    // Check the settings introduction text.
-    $this->assertText('Configurations for the revision comparison functionality and diff layout plugins.');
-    // Check the layout plugins descriptions.
-    $this->assertText('Field based layout, displays revision comparison side by side.');
-    $this->assertText('Field based layout, displays revision comparison line by line.');
-  }
-
-  /**
-   * Tests the Settings tab.
-   */
-  public function doTestSettingsTab() {
-    $edit = [
-      'radio_behavior' => 'linear',
-      'context_lines_leading' => 10,
-      'context_lines_trailing' => 5,
-    ];
-    $this->drupalPostForm('admin/config/content/diff/general', $edit, t('Save configuration'));
-    $this->assertText('The configuration options have been saved.');
-  }
-
-  /**
-   * Tests the module requirements.
-   */
-  public function doTestRequirements() {
-    module_load_install('diff');
-    $requirements = diff_requirements('runtime');
-    $this->assertEqual($requirements['html_diff_advanced']['title'], 'Diff');
-
-    $has_htmlDiffAdvanced = class_exists('\HtmlDiffAdvanced');
-    if (!$has_htmlDiffAdvanced) {
-      // The plugin is disabled dependencies are missing.
-      $this->assertEqual($requirements['html_diff_advanced']['value'], 'Visual inline layout');
-    }
-    else {
-      // The plugin is enabled by default if dependencies are met.
-      $this->assertEqual($requirements['html_diff_advanced']['value'], 'Installed correctly');
-    }
-  }
-
-  /**
-   * Tests the Configurable Fields tab.
-   */
-  public function doTestConfigurableFieldsTab() {
-    $this->drupalGet('admin/config/content/diff/fields');
-
-    // Test changing type without changing settings.
-    $edit = [
-      'fields[node.body][plugin][type]' => 'text_summary_field_diff_builder',
-    ];
-    $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldByName('fields[node.body][plugin][type]', 'text_summary_field_diff_builder');
-    $edit = [
-      'fields[node.body][plugin][type]' => 'text_field_diff_builder',
-    ];
-    $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldByName('fields[node.body][plugin][type]', 'text_field_diff_builder');
-
-    $this->drupalPostAjaxForm(NULL, [], 'node.body_settings_edit');
-    $this->assertText('Plugin settings: Text');
-    $edit = [
-      'fields[node.body][settings_edit_form][settings][show_header]' => TRUE,
-      'fields[node.body][settings_edit_form][settings][compare_format]' => FALSE,
-      'fields[node.body][settings_edit_form][settings][markdown]' => 'filter_xss_all',
-    ];
-    $this->drupalPostAjaxForm(NULL, $edit, 'node.body_plugin_settings_update');
-    $this->drupalPostForm(NULL, [], t('Save'));
-    $this->assertText('Your settings have been saved.');
-
-    // Check the values were saved.
-    $this->drupalPostAjaxForm(NULL, [], 'node.body_settings_edit');
-    $this->assertFieldByName('fields[node.body][settings_edit_form][settings][markdown]', 'filter_xss_all');
-
-    // Edit another field.
-    $this->drupalPostAjaxForm(NULL, [], 'node.title_settings_edit');
-    $edit = [
-      'fields[node.title][settings_edit_form][settings][markdown]' => 'filter_xss_all',
-    ];
-    $this->drupalPostAjaxForm(NULL, $edit, 'node.title_plugin_settings_update');
-    $this->drupalPostForm(NULL, [], t('Save'));
-
-    // Check both fields and their config values.
-    $this->drupalPostAjaxForm(NULL, [], 'node.body_settings_edit');
-    $this->assertFieldByName('fields[node.body][settings_edit_form][settings][markdown]', 'filter_xss_all');
-    $this->drupalPostAjaxForm(NULL, [], 'node.title_settings_edit');
-    $this->assertFieldByName('fields[node.title][settings_edit_form][settings][markdown]', 'filter_xss_all');
-
-    // Save field settings without changing anything and assert the config.
-    $this->drupalPostForm(NULL, [], t('Save'));
-    $this->drupalPostAjaxForm(NULL, [], 'node.body_settings_edit');
-    $this->assertFieldByName('fields[node.body][settings_edit_form][settings][markdown]', 'filter_xss_all');
-    $this->drupalPostAjaxForm(NULL, [], 'node.title_settings_edit');
-    $this->assertFieldByName('fields[node.title][settings_edit_form][settings][markdown]', 'filter_xss_all');
-
-    $edit = [
-      'fields[node.sticky][plugin][type]' => 'hidden',
-    ];
-    $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldByName('fields[node.sticky][plugin][type]', 'hidden');
-  }
-
-  /**
-   * Tests the Compare Revisions vertical tab.
-   */
-  public function doTestPluginWeight() {
-    // Create a node with a revision.
-    $edit = [
-      'title[0][value]' => 'great_title',
-      'body[0][value]' => '<p>great_body</p>',
-    ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
-    $this->clickLink('Edit');
-    $edit = [
-      'title[0][value]' => 'greater_title',
-      'body[0][value]' => '<p>greater_body</p>',
-    ];
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
-
-    // Assert the diff display uses the classic layout.
-    $node = $this->getNodeByTitle('greater_title');
-    $this->drupalGet('node/' . $node->id() . '/revisions');
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-    $this->assertLink('Unified fields');
-    $this->assertLink('Split fields');
-    $this->assertLink('Raw');
-    $this->assertLink('Strip tags');
-    $text = $this->xpath('//tbody/tr[4]/td[3]');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($text[0]->asXML())), '<p>great_body</p>');
-
-    // Change the settings of the layouts, disable the single column.
-    $edit = [
-      'layout_plugins[split_fields][weight]' => '11',
-      'layout_plugins[unified_fields][enabled]' => FALSE,
-    ];
-    $this->drupalPostForm('admin/config/content/diff/general', $edit, t('Save configuration'));
-
-    // Assert the diff display uses the markdown layout.
-    $this->drupalGet('node/' . $node->id() . '/revisions');
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-    $this->assertResponse(200);
-    $this->assertNoLink('Unified fields');
-    $this->assertLink('Split fields');
-    $this->clickLink('Split fields');
-    $this->assertLink('Raw');
-    $this->assertLink('Strip tags');
-    $this->clickLink('Strip tags');
-    $text = $this->xpath('//tbody/tr[4]/td[2]');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($text[0]->asXML())), 'great_body');
-
-    // Change the settings of the layouts, enable single column.
-    $edit = [
-      'layout_plugins[unified_fields][enabled]' => TRUE,
-      'layout_plugins[split_fields][enabled]' => FALSE,
-    ];
-    $this->drupalPostForm('admin/config/content/diff/general', $edit, t('Save configuration'));
-
-    // Test the validation of form.
-    $edit = [
-      'layout_plugins[unified_fields][enabled]' => FALSE,
-      'layout_plugins[split_fields][enabled]' => FALSE,
-    ];
-    $this->drupalPostForm('admin/config/content/diff/general', $edit, t('Save configuration'));
-    $this->assertText('At least one layout plugin needs to be enabled.');
-
-    // Assert the diff display uses the single column layout.
-    $this->drupalGet('node/' . $node->id() . '/revisions');
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-    $this->assertResponse(200);
-    $this->assertLink('Unified fields');
-    $this->assertNoLink('Split fields');
-    $this->assertLink('Raw');
-    $this->assertLink('Strip tags');
-    $text = $this->xpath('//tbody/tr[5]/td[4]');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($text[0]->asXML())), '<p>great_body</p>');
-    $this->clickLink('Strip tags');
-    $text = $this->xpath('//tbody/tr[5]/td[2]');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($text[0]->asXML())), 'great_body');
-  }
-
-}
diff --git a/modules/diff/src/Tests/DiffLocaleTest.php b/modules/diff/src/Tests/DiffLocaleTest.php
deleted file mode 100644
index 15bd871..0000000
--- a/modules/diff/src/Tests/DiffLocaleTest.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-namespace Drupal\diff\Tests;
-
-/**
- * Test diff functionality with localization and translation.
- *
- * @group diff
- */
-class DiffLocaleTest extends DiffTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'locale',
-    'content_translation',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->drupalLogin($this->rootUser);
-
-    // Add French language.
-    $edit = array(
-      'predefined_langcode' => 'fr',
-    );
-    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
-
-    // Enable content translation on articles.
-    $this->drupalGet('admin/config/regional/content-language');
-    $edit = array(
-      'entity_types[node]' => TRUE,
-      'settings[node][article][translatable]' => TRUE,
-      'settings[node][article][settings][language][language_alterable]' => TRUE,
-    );
-    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
-  }
-
-  /**
-   * Run all independent tests.
-   */
-  public function testAll() {
-    $this->doTestTranslationRevisions();
-    $this->doTestUndefinedTranslationFilter();
-    $this->doTestTranslationFilter();
-  }
-
-  /**
-   * Test Diff functionality for the revisions of a translated node.
-   */
-  protected function doTestTranslationRevisions() {
-
-    // Create an article and its translation. Assert aliases.
-    $edit = array(
-      'title[0][value]' => 'English node',
-      'langcode[0][value]' => 'en',
-    );
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
-    $english_node = $this->drupalGetNodeByTitle('English node');
-
-    $this->drupalGet('node/' . $english_node->id() . '/translations');
-    $this->clickLink(t('Add'));
-    $edit = array(
-      'title[0][value]' => 'French node',
-      'revision' => FALSE,
-    );
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published (this translation)'));
-    $this->rebuildContainer();
-    $english_node = $this->drupalGetNodeByTitle('English node');
-    $french_node = $english_node->getTranslation('fr');
-
-    // Create a new revision on both languages.
-    $edit = array(
-      'title[0][value]' => 'Updated title',
-      'revision' => TRUE,
-    );
-    $this->drupalPostForm('node/' . $english_node->id() . '/edit', $edit, t('Save and keep published (this translation)'));
-    $edit = array(
-      'title[0][value]' => 'Le titre',
-      'revision' => TRUE,
-    );
-    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save and keep published (this translation)'));
-
-    // View differences between revisions. Check that they don't mix up.
-    $this->drupalGet('node/' . $english_node->id() . '/revisions');
-    $this->drupalGet('node/' . $english_node->id() . '/revisions/view/1/2/split_fields');
-    $this->assertText('Title');
-    $this->assertText('English node');
-    $this->assertText('Updated title');
-    $this->drupalGet('fr/node/' . $english_node->id() . '/revisions');
-    $this->drupalGet('fr/node/' . $english_node->id() . '/revisions/view/1/3/split_fields');
-    $this->assertText('Title');
-    $this->assertNoText('English node');
-    $this->assertNoText('Updated title');
-    $this->assertText('French node');
-    $this->assertText('Le titre');
-  }
-
-  /**
-   * Tests the translation filtering when navigating trough revisions.
-   */
-  protected function doTestTranslationFilter() {
-    // Create a node in English.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'english_revision_0',
-    ]);
-    $revision1 = $node->getRevisionId();
-
-    // Translate to french.
-    $node->addTranslation('fr', ['title' => 'french_revision_0']);
-    $node->save();
-
-    // Create a revision in English.
-    $english_node = $node->getTranslation('en');
-    $english_node->setTitle('english_revision_1');
-    $english_node->setNewRevision(TRUE);
-    $english_node->save();
-    $revision2 = $node->getRevisionId();
-
-    // Create a revision in French.
-    $french_node = $node->getTranslation('fr');
-    $french_node->setTitle('french_revision_1');
-    $french_node->setNewRevision(TRUE);
-    $french_node->save();
-
-    // Create a new revision in English.
-    $english_node = $node->getTranslation('en');
-    $english_node->setTitle('english_revision_2');
-    $english_node->setNewRevision(TRUE);
-    $english_node->save();
-
-    // Create a new revision in French.
-    $french_node = $node->getTranslation('fr');
-    $french_node->setTitle('french_revision_2');
-    $french_node->setNewRevision(TRUE);
-    $french_node->save();
-
-    // Compare first two revisions.
-    $this->drupalGet('node/' . $node->id() . '/revisions/view/' . $revision1 . '/' . $revision2 . '/split_fields');
-    $diffs = $this->xpath('//span[@class="diffchange"]');
-    $this->assertEqual($diffs[0], 'english_revision_0');
-    $this->assertEqual($diffs[1], 'english_revision_1');
-
-    // Check next difference.
-    $this->clickLink('Next change');
-    $diffs = $this->xpath('//span[@class="diffchange"]');
-    $this->assertEqual($diffs[0], 'english_revision_1');
-    $this->assertEqual($diffs[1], 'english_revision_2');
-
-    // There shouldn't be other differences in the current language.
-    $this->assertNoLink('Next change');
-  }
-
-  /**
-   * Tests the undefined translation filtering when navigating trough revisions.
-   */
-  protected function doTestUndefinedTranslationFilter() {
-    // Create a node in with undefined langcode.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'undefined_language_revision_0',
-      'langcode' => 'und',
-    ]);
-    $revision1 = $node->getRevisionId();
-
-    // Create 3 new revisions of the node.
-    $node->setTitle('undefined_language_revision_1');
-    $node->setNewRevision(TRUE);
-    $node->save();
-    $revision2 = $node->getRevisionId();
-
-    $node->setTitle('undefined_language_revision_2');
-    $node->setNewRevision(TRUE);
-    $node->save();
-
-    $node->setTitle('undefined_language_revision_3');
-    $node->setNewRevision(TRUE);
-    $node->save();
-
-    // Check the amount of revisions displayed.
-    $this->drupalGet('node/' . $node->id() . '/revisions');
-    $element = $this->xpath('//*[@id="edit-node-revisions-table"]/tbody/tr');
-    $this->assertEqual(count($element), 4);
-
-    // Compare the first two revisions.
-    $this->drupalGet('node/' . $node->id() . '/revisions/view/' . $revision1 . '/' . $revision2 . '/split_fields');
-    $diffs = $this->xpath('//span[@class="diffchange"]');
-    $this->assertEqual($diffs[0], 'undefined_language_revision_0');
-    $this->assertEqual($diffs[1], 'undefined_language_revision_1');
-
-    // Compare the next two revisions.
-    $this->clickLink('Next change');
-    $diffs = $this->xpath('//span[@class="diffchange"]');
-    $this->assertEqual($diffs[0], 'undefined_language_revision_1');
-    $this->assertEqual($diffs[1], 'undefined_language_revision_2');
-  }
-
-}
diff --git a/modules/diff/src/Tests/DiffPluginEntityTest.php b/modules/diff/src/Tests/DiffPluginEntityTest.php
deleted file mode 100644
index c9eb4ec..0000000
--- a/modules/diff/src/Tests/DiffPluginEntityTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace Drupal\diff\Tests;
-
-use Drupal\field_ui\Tests\FieldUiTestTrait;
-
-/**
- * Tests the Diff module entity plugins.
- *
- * @group diff
- */
-class DiffPluginEntityTest extends DiffPluginTestBase {
-
-  use FieldUiTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'file',
-    'image',
-    'field_ui',
-  ];
-
-  /**
-   * The file system service.
-   *
-   * @var \Drupal\Core\File\FileSystemInterface
-   */
-  protected $fileSystem;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->fileSystem = \Drupal::service('file_system');
-
-    // FieldUiTestTrait checks the breadcrumb when adding a field, so we need
-    // to show the breadcrumb block.
-    $this->drupalPlaceBlock('system_breadcrumb_block');
-  }
-
-  /**
-   * Tests the EntityReference plugin.
-   *
-   * @see \Drupal\diff\Plugin\diff\Field\EntityReferenceFieldBuilder
-   */
-  public function testEntityReferencePlugin() {
-    // Add an entity reference field to the article content type.
-    $bundle_path = 'admin/structure/types/manage/article';
-    $field_name = 'reference';
-    $storage_edit = $field_edit = array();
-    $storage_edit['settings[target_type]'] = 'node';
-    $field_edit['settings[handler_settings][target_bundles][article]'] = TRUE;
-    $this->fieldUIAddNewField($bundle_path, $field_name, 'Reference', 'entity_reference', $storage_edit, $field_edit);
-
-    // Create three article nodes.
-    $node1 = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Article A',
-    ]);
-    $node2 = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Article B',
-    ]);
-    $node3 = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Article C',
-    ]);
-
-    // Reference article B in article A.
-    $edit = array(
-      'field_reference[0][target_id]' => 'Article B (' . $node2->id() . ')',
-      'revision' => TRUE,
-    );
-    $this->drupalPostForm('node/' . $node1->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Update article A so it points to article C instead of B.
-    $edit = array(
-      'field_reference[0][target_id]' => 'Article C (' . $node3->id() . ')',
-      'revision' => TRUE,
-    );
-    $this->drupalPostForm('node/' . $node1->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Check differences between revisions.
-    $this->clickLink(t('Revisions'));
-    $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
-    $this->assertText('Reference');
-    $this->assertText('Article B');
-    $this->assertText('Article C');
-  }
-
-}
diff --git a/modules/diff/src/Tests/DiffPluginFileTest.php b/modules/diff/src/Tests/DiffPluginFileTest.php
deleted file mode 100644
index 1f41f5b..0000000
--- a/modules/diff/src/Tests/DiffPluginFileTest.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-
-namespace Drupal\diff\Tests;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field_ui\Tests\FieldUiTestTrait;
-
-/**
- * Tests the Diff module entity plugins.
- *
- * @group diff
- */
-class DiffPluginFileTest extends DiffPluginTestBase {
-
-  use FieldUiTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'file',
-    'image',
-    'field_ui',
-  ];
-
-  /**
-   * The file system service.
-   *
-   * @var \Drupal\Core\File\FileSystemInterface
-   */
-  protected $fileSystem;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->fileSystem = \Drupal::service('file_system');
-
-    // FieldUiTestTrait checks the breadcrumb when adding a field, so we need
-    // to show the breadcrumb block.
-    $this->drupalPlaceBlock('system_breadcrumb_block');
-  }
-
-  /**
-   * Tests the File plugin.
-   *
-   * @see \Drupal\diff\Plugin\diff\Field\FileFieldBuilder
-   */
-  public function testFilePlugin() {
-    // Add file field to the article content type.
-    $file_field_name = 'field_file';
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => $file_field_name,
-      'entity_type' => 'node',
-      'type' => 'file',
-    ));
-    $field_storage->save();
-    FieldConfig::create([
-      'entity_type' => 'node',
-      'field_storage' => $field_storage,
-      'bundle' => 'article',
-      'label' => 'File',
-    ])->save();
-
-    // Make the field visible in the form and desfault display.
-    $this->viewDisplay->load('node.article.default')
-      ->setComponent('test_field')
-      ->setComponent($file_field_name)
-      ->save();
-    $this->formDisplay->load('node.article.default')
-      ->setComponent('test_field', ['type' => 'entity_reference_autocomplete'])
-      ->setComponent($file_field_name, ['type' => 'file_generic'])
-      ->save();
-
-    // Create an article.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Test article',
-    ]);
-    $revision1 = $node->getRevisionId();
-
-    // Upload a file to the article.
-    $test_files = $this->drupalGetTestFiles('text');
-    $edit['files[field_file_0]'] = $this->fileSystem->realpath($test_files['0']->uri);
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Upload');
-    $edit['revision'] = TRUE;
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-    $node = $this->drupalGetNodeByTitle('Test article', TRUE);
-    $revision2 = $node->getRevisionId();
-
-    // Replace the file by a different one.
-    $this->drupalPostForm('node/' . $node->id() . '/edit', [], 'Remove');
-    $this->drupalPostForm(NULL, ['revision' => FALSE], t('Save and keep published'));
-    $edit['files[field_file_0]'] = $this->fileSystem->realpath($test_files['1']->uri);
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Upload');
-    $edit['revision'] = TRUE;
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-    $node = $this->drupalGetNodeByTitle('Test article', TRUE);
-    $revision3 = $node->getRevisionId();
-
-    // Check differences between revisions.
-    $this->clickLink(t('Revisions'));
-    $edit = [
-      'radios_left' => $revision1,
-      'radios_right' => $revision3,
-    ];
-    $this->drupalPostForm(NULL, $edit, t('Compare selected revisions'));
-    $this->assertText('File');
-    $this->assertText('File: text-1.txt');
-    $this->assertText('File ID: 4');
-
-    // Use the unified fields layout.
-    $this->clickLink('Unified fields');
-    $this->assertResponse(200);
-    $this->assertText('File');
-    $this->assertText('File: text-1.txt');
-    $this->assertText('File ID: 4');
-  }
-
-  /**
-   * Tests the Image plugin.
-   *
-   * @see \Drupal\diff\Plugin\diff\Field\ImageFieldBuilder
-   */
-  public function testImagePlugin() {
-    // Add image field to the article content type.
-    $image_field_name = 'field_image';
-    FieldStorageConfig::create([
-      'field_name' => $image_field_name,
-      'entity_type' => 'node',
-      'type' => 'image',
-      'settings' => [],
-      'cardinality' => 1,
-    ])->save();
-
-    $field_config = FieldConfig::create([
-      'field_name' => $image_field_name,
-      'label' => 'Image',
-      'entity_type' => 'node',
-      'bundle' => 'article',
-      'required' => FALSE,
-      'settings' => ['alt_field' => 1],
-    ]);
-    $field_config->save();
-
-    $this->formDisplay->load('node.article.default')
-      ->setComponent($image_field_name, [
-        'type' => 'image_image',
-        'settings' => [],
-      ])
-      ->save();
-
-    $this->viewDisplay->load('node.article.default')
-      ->setComponent($image_field_name, [
-        'type' => 'image',
-        'settings' => [],
-      ])
-      ->save();
-
-    // Create an article.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Test article',
-    ]);
-    $revision1 = $node->getRevisionId();
-
-    // Upload an image to the article.
-    $test_files = $this->drupalGetTestFiles('image');
-    $edit = ['files[field_image_0]' => $this->fileSystem->realpath($test_files['1']->uri)];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-    $edit = [
-      'field_image[0][alt]' => 'Image alt',
-      'revision' => TRUE,
-    ];
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
-    $node = $this->drupalGetNodeByTitle('Test article', TRUE);
-    $revision2 = $node->getRevisionId();
-
-    // Replace the image by a different one.
-    $this->drupalPostForm('node/' . $node->id() . '/edit', [], 'Remove');
-    $this->drupalPostForm(NULL, ['revision' => FALSE], t('Save and keep published'));
-    $edit = ['files[field_image_0]' => $this->fileSystem->realpath($test_files['1']->uri)];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-    $edit = [
-      'field_image[0][alt]' => 'Image alt updated',
-      'revision' => TRUE,
-    ];
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
-    $node = $this->drupalGetNodeByTitle('Test article', TRUE);
-    $revision3 = $node->getRevisionId();
-
-    // Check differences between revisions.
-    $this->clickLink(t('Revisions'));
-    $edit = [
-      'radios_left' => $revision1,
-      'radios_right' => $revision3,
-    ];
-    $this->drupalPostForm(NULL, $edit, t('Compare selected revisions'));
-    $this->assertText('Image');
-    $this->assertText('Image: image-test-transparent-indexed.gif');
-    // Image title must be absent since it is not set in previous revisions.
-    $this->assertNoText('Title');
-
-    // Enable Title field in instance settings.
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_image', [
-      'settings[title_field]' => 1,
-    ], 'Save settings');
-
-    // Add image title and alt text.
-    $edit = [
-      'field_image[0][alt]' => 'Image alt updated new',
-      'revision' => TRUE,
-      'field_image[0][title]' => 'Image title updated',
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-    $this->drupalPostForm('node/' . $node->id() . '/revisions', [], t('Compare selected revisions'));
-    $rows = $this->xpath('//tbody/tr');
-    // Image title and alternative text must be shown.
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($rows[2]->td[2]->asXML())), 'Alt: Image alt updated');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($rows[2]->td[5]->asXML())), 'Alt: Image alt updated new');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($rows[3]->td[2]->asXML())), '');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($rows[3]->td[5]->asXML())), 'Title: Image title updated');
-
-    // Show File ID.
-    $this->drupalGet('admin/config/content/diff/fields');
-    $this->drupalPostAjaxForm(NULL, [], 'node.field_image_settings_edit');
-    $edit = [
-      'fields[node.field_image][settings_edit_form][settings][show_id]' => TRUE,
-    ];
-    $this->drupalPostAjaxForm(NULL, $edit, 'node.field_image_plugin_settings_update');
-    $this->drupalPostForm(NULL, [], t('Save'));
-    $this->drupalPostForm('node/' . $node->id() . '/revisions', [], t('Compare selected revisions'));
-    // Alt and title must be hidden.
-    $this->assertText('File ID: 2');
-
-    // Disable alt image fields.
-    $this->drupalGet('admin/config/content/diff/fields');
-    $this->drupalPostAjaxForm(NULL, [], 'node.field_image_settings_edit');
-    $edit = [
-      'fields[node.field_image][settings_edit_form][settings][compare_alt_field]' => FALSE,
-    ];
-    $this->drupalPostAjaxForm(NULL, $edit, 'node.field_image_plugin_settings_update');
-    $this->drupalPostForm(NULL, [], t('Save'));
-    $this->drupalPostForm('node/' . $node->id() . '/revisions', [], t('Compare selected revisions'));
-    // Alt and title must be hidden.
-    $this->assertNoText('Alt: Image alt updated');
-    $this->assertNoText('Alt: Image alt updated new');
-    $this->assertText('Title: Image title updated');
-
-    // Disable title image fields, reenable alt.
-    $this->drupalGet('admin/config/content/diff/fields');
-    $this->drupalPostAjaxForm(NULL, [], 'node.field_image_settings_edit');
-    $edit = [
-      'fields[node.field_image][settings_edit_form][settings][compare_alt_field]' => TRUE,
-      'fields[node.field_image][settings_edit_form][settings][compare_title_field]' => FALSE,
-    ];
-    $this->drupalPostAjaxForm(NULL, $edit, 'node.field_image_plugin_settings_update');
-    $this->drupalPostForm(NULL, [], t('Save'));
-    $this->drupalPostForm('node/' . $node->id() . '/revisions', [], t('Compare selected revisions'));
-    $this->assertText('Alt: Image alt updated');
-    $this->assertText('Alt: Image alt updated new');
-    $this->assertNoText('Title: Image title updated');
-    // Assert the thumbnail is displayed.
-    $img1_url = file_create_url(\Drupal::token()->replace("public://styles/thumbnail/public/[date:custom:Y]-[date:custom:m]/" . $test_files['1']->name));
-    $image_url = file_url_transform_relative($img1_url);
-    $this->assertRaw($image_url);
-
-    // Disable thumbnail image field.
-    $this->drupalPostAjaxForm('admin/config/content/diff/fields', [], 'node.field_image_settings_edit');
-    $edit = [
-      'fields[node.field_image][settings_edit_form][settings][show_thumbnail]' => FALSE,
-    ];
-    $this->drupalPostAjaxForm(NULL, $edit, 'node.field_image_plugin_settings_update');
-    $this->drupalPostForm(NULL, [], t('Save'));
-    $this->drupalPostForm('node/' . $node->id() . '/revisions', [], t('Compare selected revisions'));
-
-    // Assert the thumbnail is not displayed.
-    $img1_url = file_create_url(\Drupal::token()->replace("public://styles/thumbnail/public/[date:custom:Y]-[date:custom:m]/" . $test_files['1']->name));
-    $image_url = file_url_transform_relative($img1_url);
-    $this->assertNoRaw($image_url);
-  }
-
-}
diff --git a/modules/diff/src/Tests/DiffPluginTest.php b/modules/diff/src/Tests/DiffPluginTest.php
deleted file mode 100644
index 67c683b..0000000
--- a/modules/diff/src/Tests/DiffPluginTest.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-
-namespace Drupal\diff\Tests;
-
-use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-
-/**
- * Tests the Diff module plugins.
- *
- * @group diff
- */
-class DiffPluginTest extends DiffPluginTestBase {
-
-  use CommentTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'comment',
-  ];
-
-  /**
-   * Adds a text field.
-   *
-   * @param string $field_name
-   *   The machine field name.
-   * @param string $label
-   *   The field label.
-   * @param string $field_type
-   *   The field type.
-   * @param string $widget_type
-   *   The widget type.
-   */
-  protected function addArticleTextField($field_name, $label, $field_type, $widget_type) {
-    // Create a field.
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'node',
-      'type' => $field_type,
-    ]);
-    $field_storage->save();
-    FieldConfig::create([
-      'field_storage' => $field_storage,
-      'bundle' => 'article',
-      'label' => $label,
-    ])->save();
-    $this->formDisplay->load('node.article.default')
-      ->setComponent($field_name, ['type' => $widget_type])
-      ->save();
-    $this->viewDisplay->load('node.article.default')
-      ->setComponent($field_name)
-      ->save();
-  }
-
-  /**
-   * Runs all independent tests.
-   */
-  public function testAll() {
-    $this->doTestFieldWithNoPlugin();
-    $this->doTestFieldNoAccess();
-    $this->doTestApplicablePlugin();
-    $this->doTestTrimmingField();
-  }
-
-  /**
-   * Tests the changed field without plugins.
-   */
-  public function doTestFieldWithNoPlugin() {
-    // Create an article.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-    ]);
-
-    // Update the article and add a new revision, the "changed" field should be
-    // updated which does not have plugins provided by diff.
-    $edit = array(
-      'revision' => TRUE,
-    );
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Check the difference between the last two revisions.
-    $this->clickLink(t('Revisions'));
-    $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
-
-    // "changed" field is not displayed since there is no plugin for it. This
-    // should not break the revisions comparison display.
-    $this->assertResponse(200);
-    $this->assertLink(t('Split fields'));
-  }
-
-  /**
-   * Tests the access check for a field while comparing revisions.
-   */
-  public function doTestFieldNoAccess() {
-    // Add a text and a text field to article.
-    $this->addArticleTextField('field_diff_deny_access', 'field_diff_deny_access', 'string', 'string_textfield');
-
-    // Create an article.
-    $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Test article access',
-      'field_diff_deny_access' => 'Foo',
-    ]);
-
-    // Create a revision of the article.
-    $node = $this->getNodeByTitle('Test article access');
-    $node->setTitle('Test article no access');
-    $node->set('field_diff_deny_access', 'Fighters');
-    $node->setNewRevision(TRUE);
-    $node->save();
-
-    // Check the "Text Field No Access" field is not displayed.
-    $this->drupalGet('node/' . $node->id() . '/revisions');
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-    $this->assertResponse(200);
-    $this->assertNoText('field_diff_deny_access');
-    $rows = $this->xpath('//tbody/tr');
-    $this->assertEqual(count($rows), 2);
-  }
-
-  /**
-   * Tests plugin applicability and weight relevance.
-   *
-   * @covers \Drupal\diff_test\Plugin\diff\Field\TestHeavierTextPlugin
-   * @covers \Drupal\diff_test\Plugin\diff\Field\TestLighterTextPlugin
-   */
-  public function doTestApplicablePlugin() {
-    // Add three text fields to the article.
-    $this->addArticleTextField('test_field', 'Test Applicable', 'text', 'text_textfield');
-    $this->addArticleTextField('test_field_lighter', 'Test Lighter Applicable', 'text', 'text_textfield');
-    $this->addArticleTextField('test_field_non_applicable', 'Test Not Applicable', 'text', 'text_textfield');
-
-    // Create an article, setting values on fields.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Test article',
-      'test_field' => 'first_nice_applicable',
-      'test_field_lighter' => 'second_nice_applicable',
-      'test_field_non_applicable' => 'not_applicable',
-    ]);
-
-    // Edit the article and update these fields, creating a new revision.
-    $edit = [
-      'test_field[0][value]' => 'first_nicer_applicable',
-      'test_field_lighter[0][value]' => 'second_nicer_applicable',
-      'test_field_non_applicable[0][value]' => 'nicer_not_applicable',
-      'revision' => TRUE,
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Check differences between revisions.
-    $this->clickLink(t('Revisions'));
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-
-    // Check diff for an applicable field of testTextPlugin.
-    $this->assertText('Test Applicable');
-    $this->assertText('first_nice_heavier_test_plugin');
-    $this->assertText('first_nicer_heavier_test_plugin');
-
-    // Check diff for an applicable field of testTextPlugin and
-    // testLighterTextPlugin. The plugin selected for this field should be the
-    // lightest one.
-    $this->assertText('Test Lighter Applicable');
-    $this->assertText('second_nice_lighter_test_plugin');
-    $this->assertText('second_nicer_lighter_test_plugin');
-
-    // Check diff for a non applicable field of both test plugins.
-    $this->assertText('Test Not Applicable');
-    $this->assertText('not_applicable');
-    $this->assertText('nicer_not_applicable');
-  }
-
-  /**
-   * Tests field content trimming.
-   */
-  public function doTestTrimmingField() {
-    // Create a node.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'test_trim',
-      'body' => '<p>body</p>',
-    ]);
-    // Save a second revision.
-    $node->save();
-
-    // Create a revision adding a new empty line to the body.
-    $node = $this->drupalGetNodeByTitle('test_trim');
-    $edit = [
-      'revision' => TRUE,
-      'body[0][value]' => '<p>body</p>
-',
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Assert the revision summary.
-    $this->drupalGet('node/' . $node->id() . '/revisions');
-    $this->assertText('Changes on: Body');
-
-    // Assert the revision comparison.
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-    $this->assertNoText('No visible changes.');
-    $rows = $this->xpath('//tbody/tr');
-    $diff_row = $rows[1]->td;
-    $this->assertEqual(count($rows), 3);
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[2]->asXML())), '<p>body</p>');
-
-    // Create a new revision and update the body.
-    $edit = [
-      'revision' => TRUE,
-      'body[0][value]' => '<p>body</p>
-
-<p>body_new</p>
-',
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-    $this->drupalGet('node/' . $node->id() . '/revisions');
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-    $this->assertNoText('No visible changes.');
-    // Assert that empty rows also show a line number.
-    $rows = $this->xpath('//tbody/tr');
-    $this->assertEqual(count($rows), 5);
-    $diff_row = $rows[4]->td;
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[3]->asXML())), '4');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[0]->asXML())), '2');
-  }
-
-}
diff --git a/modules/diff/src/Tests/DiffPluginTestBase.php b/modules/diff/src/Tests/DiffPluginTestBase.php
deleted file mode 100644
index 1f84fa8..0000000
--- a/modules/diff/src/Tests/DiffPluginTestBase.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Drupal\diff\Tests;
-
-/**
- * Tests the Diff module plugins.
- *
- * @ingroup diff
- */
-abstract class DiffPluginTestBase extends DiffTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'diff_test',
-    'link',
-    'options',
-  ];
-
-  /**
-   * A storage instance for the entity form display.
-   *
-   * @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface
-   */
-  protected $formDisplay;
-
-  /**
-   * A storage instance for the entity view display.
-   *
-   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
-   */
-  protected $viewDisplay;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->formDisplay = \Drupal::entityTypeManager()->getStorage('entity_form_display');
-    $this->viewDisplay = \Drupal::entityTypeManager()->getStorage('entity_view_display');
-
-    $this->drupalLogin($this->rootUser);
-  }
-
-}
diff --git a/modules/diff/src/Tests/DiffPluginVariousTest.php b/modules/diff/src/Tests/DiffPluginVariousTest.php
deleted file mode 100644
index fdbe2bb..0000000
--- a/modules/diff/src/Tests/DiffPluginVariousTest.php
+++ /dev/null
@@ -1,426 +0,0 @@
-<?php
-
-namespace Drupal\diff\Tests;
-
-use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
-use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\link\LinkItemInterface;
-
-/**
- * Tests the Diff module plugins.
- *
- * @group diff
- */
-class DiffPluginVariousTest extends DiffPluginTestBase {
-
-  use CommentTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'comment',
-  ];
-
-  /**
-   * Tests the module plugins.
-   */
-  public function testPlugins() {
-    $this->doTestCommentPlugin();
-    $this->doTestCorePlugin();
-    $this->doTestCorePluginTimestampField();
-    $this->doTestLinkPlugin();
-    $this->doTestListPlugin();
-    $this->doTestTextPlugin();
-    $this->doTestTextWithSummaryPlugin();
-  }
-
-  /**
-   * Adds a text field.
-   *
-   * @param string $field_name
-   *   The machine field name.
-   * @param string $label
-   *   The field label.
-   * @param string $field_type
-   *   The field type.
-   * @param string $widget_type
-   *   The widget type.
-   */
-  protected function addArticleTextField($field_name, $label, $field_type, $widget_type) {
-    // Create a field.
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'node',
-      'type' => $field_type,
-    ]);
-    $field_storage->save();
-    FieldConfig::create([
-      'field_storage' => $field_storage,
-      'bundle' => 'article',
-      'label' => $label,
-    ])->save();
-    $this->formDisplay->load('node.article.default')
-      ->setComponent($field_name, ['type' => $widget_type])
-      ->save();
-    $this->viewDisplay->load('node.article.default')
-      ->setComponent($field_name)
-      ->save();
-  }
-
-  /**
-   * Tests the comment plugin.
-   *
-   * @covers \Drupal\diff\Plugin\diff\Field\CommentFieldBuilder
-   */
-  public function doTestCommentPlugin() {
-    // Add the comment field to articles.
-    $this->addDefaultCommentField('node', 'article');
-
-    // Create an article with comments enabled..
-    $title = 'Sample article';
-    $edit = array(
-      'title[0][value]' => $title,
-      'body[0][value]' => '<p>Revision 1</p>',
-      'comment[0][status]' => CommentItemInterface::OPEN,
-    );
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
-    $node = $this->drupalGetNodeByTitle($title);
-
-    // Edit the article and close its comments.
-    $edit = array(
-      'comment[0][status]' => CommentItemInterface::CLOSED,
-      'revision' => TRUE,
-    );
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Check the difference between the last two revisions.
-    $this->clickLink(t('Revisions'));
-    $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
-    $this->assertText('Comments');
-    $this->assertText('Comments for this entity are open.');
-    $this->assertText('Comments for this entity are closed.');
-  }
-
-  /**
-   * Tests the Core plugin.
-   *
-   * @covers \Drupal\diff\Plugin\diff\Field\CoreFieldBuilder
-   */
-  public function doTestCorePlugin() {
-    // Add an email field (supported by the Diff core plugin) to the Article
-    // content type.
-    $field_name = 'field_email';
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'node',
-      'type' => 'email',
-    ]);
-    $field_storage->save();
-    FieldConfig::create([
-      'field_storage' => $field_storage,
-      'bundle' => 'article',
-      'label' => 'Email',
-    ])->save();
-
-    // Add the email field to the article form.
-    $this->formDisplay->load('node.article.default')
-      ->setComponent($field_name, ['type' => 'email_default'])
-      ->save();
-
-    // Add the email field to the default display.
-    $this->viewDisplay->load('node.article.default')
-      ->setComponent($field_name, ['type' => 'basic_string'])
-      ->save();
-
-    // Create an article with an email.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'field_email' => 'foo@example.com',
-    ]);
-
-    // Edit the article and change the email.
-    $edit = array(
-      'field_email[0][value]' => 'bar@example.com',
-      'revision' => TRUE,
-    );
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Check the difference between the last two revisions.
-    $this->clickLink(t('Revisions'));
-    $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
-    $this->assertText('Email');
-    $this->assertText('foo@example.com');
-    $this->assertText('bar@example.com');
-  }
-
-  /**
-   * Tests the Core plugin with a timestamp field.
-   *
-   * @covers \Drupal\diff\Plugin\diff\Field\CoreFieldBuilder
-   */
-  public function doTestCorePluginTimestampField() {
-    // Add a timestamp field (supported by the Diff core plugin) to the Article
-    // content type.
-    $field_name = 'field_timestamp';
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'node',
-      'type' => 'timestamp',
-    ]);
-    $field_storage->save();
-    FieldConfig::create([
-      'field_storage' => $field_storage,
-      'bundle' => 'article',
-      'label' => 'Timestamp test',
-    ])->save();
-
-    // Add the timestamp field to the article form.
-    $this->formDisplay->load('node.article.default')
-      ->setComponent($field_name, ['type' => 'datetime_timestamp'])
-      ->save();
-
-    // Add the timestamp field to the default display.
-    $this->viewDisplay->load('node.article.default')
-      ->setComponent($field_name, ['type' => 'timestamp'])
-      ->save();
-
-    $old_timestamp = '321321321';
-    $new_timestamp = '123123123';
-
-    // Create an article with an timestamp.
-    $this->drupalCreateNode([
-      'title' => 'timestamp_test',
-      'type' => 'article',
-      'field_timestamp' => $old_timestamp,
-    ]);
-
-    // Create a new revision with an updated timestamp.
-    $node = $this->drupalGetNodeByTitle('timestamp_test');
-    $node->field_timestamp = $new_timestamp;
-    $node->setNewRevision(TRUE);
-    $node->save();
-
-    // Compare the revisions.
-    $this->drupalGet('node/' . $node->id() . '/revisions');
-    $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
-
-    // Assert that the timestamp field does not show a unix time format.
-    $this->assertText('Timestamp test');
-    $date_formatter = \Drupal::service('date.formatter');
-    $this->assertText($date_formatter->format($old_timestamp));
-    $this->assertText($date_formatter->format($new_timestamp));
-  }
-
-  /**
-   * Tests the Link plugin.
-   *
-   * @covers \Drupal\diff\Plugin\diff\Field\LinkFieldBuilder
-   */
-  public function doTestLinkPlugin() {
-    // Add a link field to the article content type.
-    $field_name = 'field_link';
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'node',
-      'type' => 'link',
-    ]);
-    $field_storage->save();
-    FieldConfig::create([
-      'field_storage' => $field_storage,
-      'bundle' => 'article',
-      'label' => 'Link',
-      'settings' => array(
-        'title' => DRUPAL_OPTIONAL,
-        'link_type' => LinkItemInterface::LINK_GENERIC,
-      ),
-    ])->save();
-    $this->formDisplay->load('node.article.default')
-      ->setComponent($field_name, [
-        'type' => 'link_default',
-        'settings' => [
-          'placeholder_url' => 'http://example.com',
-        ],
-      ])
-      ->save();
-    $this->viewDisplay->load('node.article.default')
-      ->setComponent($field_name, ['type' => 'link'])
-      ->save();
-
-    // Enable the comparison of the link's title field.
-    $config = \Drupal::configFactory()->getEditable('diff.plugins');
-    $settings['compare_title'] = TRUE;
-    $config->set('fields.node.field_link.type', 'link_field_diff_builder');
-    $config->set('fields.node.field_link.settings', $settings);
-    $config->save();
-
-    // Create an article, setting values on the link field.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Test article',
-      'field_link' => [
-        'title' => 'Google',
-        'uri' => 'http://www.google.com',
-      ],
-    ]);
-
-    // Update the link field.
-    $edit = [
-      'field_link[0][title]' => 'Guguel',
-      'field_link[0][uri]' => 'http://www.google.es',
-      'revision' => TRUE,
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Check differences between revisions.
-    $this->clickLink(t('Revisions'));
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-    $this->assertText('Link');
-    $this->assertText('Google');
-    $this->assertText('http://www.google.com');
-    $this->assertText('Guguel');
-    $this->assertText('http://www.google.es');
-  }
-
-  /**
-   * Tests the List plugin.
-   *
-   * @covers \Drupal\diff\Plugin\diff\Field\ListFieldBuilder
-   */
-  public function doTestListPlugin() {
-    // Add a list field to the article content type.
-    $field_name = 'field_list';
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'node',
-      'type' => 'list_string',
-      'cardinality' => 1,
-      'settings' => [
-        'allowed_values' => [
-          'value_a' => 'Value A',
-          'value_b' => 'Value B',
-        ],
-      ],
-    ]);
-    $field_storage->save();
-
-    FieldConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'node',
-      'bundle' => 'article',
-      'required' => FALSE,
-      'label' => 'List',
-    ])->save();
-
-    $this->formDisplay->load('node.article.default')
-      ->setComponent($field_name, ['type' => 'options_select'])
-      ->save();
-    $this->viewDisplay->load('node.article.default')
-      ->setComponent($field_name, ['type' => 'list_default'])
-      ->save();
-
-    // Create an article, setting values on the lit field.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Test article',
-      'field_list' => 'value_a',
-    ]);
-
-    // Update the list field.
-    $edit = [
-      'field_list' => 'value_b',
-      'revision' => TRUE,
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Check differences between revisions.
-    $this->clickLink(t('Revisions'));
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-    $this->assertText('List');
-    $this->assertText('value_a');
-    $this->assertText('value_b');
-  }
-
-  /**
-   * Tests the Text plugin.
-   *
-   * @covers \Drupal\diff\Plugin\diff\Field\TextFieldBuilder
-   */
-  public function doTestTextPlugin() {
-    // Add a text and a text long field to the Article content type.
-    $this->addArticleTextField('field_text', 'Text Field', 'string', 'string_textfield');
-    $this->addArticleTextField('field_text_long', 'Text Long Field', 'string_long', 'string_textarea');
-
-    // Create an article, setting values on both fields.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Test article',
-      'field_text' => 'Foo',
-      'field_text_long' => 'Fighters',
-    ]);
-
-    // Edit the article and update these fields, creating a new revision.
-    $edit = [
-      'field_text[0][value]' => 'Bar',
-      'field_text_long[0][value]' => 'Fly',
-      'revision' => TRUE,
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Check differences between revisions.
-    $this->clickLink(t('Revisions'));
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-    $this->assertText('Text Field');
-    $this->assertText('Text Long Field');
-    $this->assertText('Foo');
-    $this->assertText('Fighters');
-    $this->assertText('Bar');
-    $this->assertText('Fly');
-  }
-
-  /**
-   * Tests the TextWithSummary plugin.
-   *
-   * @covers \Drupal\diff\Plugin\diff\Field\TextWithSummaryFieldBuilder
-   */
-  public function doTestTextWithSummaryPlugin() {
-    // Enable the comparison of the summary.
-    $config = \Drupal::configFactory()->getEditable('diff.plugins');
-    $settings['compare_summary'] = TRUE;
-    $config->set('fields.node.body.type', 'text_summary_field_diff_builder');
-    $config->set('fields.node.body.settings', $settings);
-    $config->save();
-
-    // Create an article, setting the body field.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Test article',
-      'body' => [
-        'value' => 'Foo value',
-        'summary' => 'Foo summary',
-      ],
-    ]);
-
-    // Edit the article and update these fields, creating a new revision.
-    $edit = [
-      'body[0][value]' => 'Bar value',
-      'body[0][summary]' => 'Bar summary',
-      'revision' => TRUE,
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Check differences between revisions.
-    $this->clickLink(t('Revisions'));
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-    $this->assertText('Body');
-    $this->assertText('Foo value');
-    $this->assertText('Foo summary');
-    $this->assertText('Bar value');
-    $this->assertText('Bar summary');
-  }
-
-}
diff --git a/modules/diff/src/Tests/DiffRevisionTest.php b/modules/diff/src/Tests/DiffRevisionTest.php
deleted file mode 100644
index 4155402..0000000
--- a/modules/diff/src/Tests/DiffRevisionTest.php
+++ /dev/null
@@ -1,454 +0,0 @@
-<?php
-
-namespace Drupal\diff\Tests;
-
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\system\Tests\Menu\AssertBreadcrumbTrait;
-
-/**
- * Tests the diff revisions overview.
- *
- * @group diff
- */
-class DiffRevisionTest extends DiffTestBase {
-
-  use AssertBreadcrumbTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'diff_test',
-    'content_translation',
-    'field_ui',
-  ];
-
-  /**
-   * Run all test fragments.
-   */
-  public function testAll() {
-    $this->doTestRevisionDiffOverview();
-    $this->doTestOverviewPager();
-    $this->doTestRevisionOverviewErrorMessages();
-    $this->doTestEntityReference();
-  }
-
-  /**
-   * Tests the revision diff overview.
-   */
-  protected function doTestRevisionDiffOverview() {
-    $this->drupalPlaceBlock('system_breadcrumb_block');
-    // Login as admin with the required permission.
-    $this->loginAsAdmin(['delete any article content']);
-
-    // Create an article.
-    $title = 'test_title_a';
-    $edit = array(
-      'title[0][value]' => $title,
-      'body[0][value]' => '<p>Revision 1</p>
-      <p>first_unique_text</p>
-      <p>second_unique_text</p>',
-    );
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
-    $node = $this->drupalGetNodeByTitle($title);
-    $created = $node->getCreatedTime();
-    $this->drupalGet('node/' . $node->id());
-
-    // Make sure the revision tab doesn't exist.
-    $this->assertNoLink('Revisions');
-
-    // Create a second revision, with a revision comment.
-    $this->drupalGet('node/add/article');
-    $edit = array(
-      'body[0][value]' => '<p>Revision 2</p>
-      <p>first_unique_text</p>
-      <p>second_unique_text</p>',
-      'revision' => TRUE,
-      'revision_log[0][value]' => 'Revision 2 comment',
-    );
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-    $this->drupalGet('node/' . $node->id());
-
-    // Check the revisions overview.
-    $this->clickLink(t('Revisions'));
-    $rows = $this->xpath('//tbody/tr');
-    // Make sure only two revisions available.
-    $this->assertEqual(count($rows), 2);
-    // Assert the revision summary.
-    $this->assertUniqueText('Revision 2 comment');
-    $this->assertText('Initial revision.');
-
-    // Compare the revisions in standard mode.
-    $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
-    $this->clickLink('Split fields');
-    // Assert breadcrumbs are properly displayed.
-    $this->assertRaw('<nav class="breadcrumb"');
-    $trail = [
-      '' => 'Home',
-      "node/" . $node->id() => $node->label(),
-      "node/" . $node->id() . "/revisions" => 'Revisions',
-    ];
-    $this->assertBreadcrumb(NULL, $trail);
-    // Extract the changes.
-    $this->assertText('Body');
-    $rows = $this->xpath('//tbody/tr');
-    $head = $this->xpath('//thead/tr');
-    $diff_row = $rows[1]->td;
-    // Assert the revision comment.
-    $this->assertRaw('diff-revision__item-message">Revision 2 comment');
-    // Assert changes made to the body, text 1 changed to 2.
-    $this->assertEqual((string) ($diff_row[0]), '1');
-    $this->assertEqual((string) ($diff_row[1]), '-');
-    $this->assertEqual((string) (($diff_row[2]->span)), '1');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[2]->asXML())), '<p>Revision 1</p>');
-    $this->assertEqual((string) ($diff_row[3]), '1');
-    $this->assertEqual((string) ($diff_row[4]), '+');
-    $this->assertEqual((string) (($diff_row[5]->span)), '2');
-    $this->assertEqual(htmlspecialchars_decode((strip_tags($diff_row[5]->asXML()))), '<p>Revision 2</p>');
-
-    // Compare the revisions in markdown mode.
-    $this->clickLink('Strip tags');
-    $rows = $this->xpath('//tbody/tr');
-    // Assert breadcrumbs are properly displayed.
-    $this->assertRaw('<nav class="breadcrumb"');
-    $trail = [
-      '' => 'Home',
-      "node/" . $node->id() => $node->label(),
-      "node/" . $node->id() . "/revisions" => 'Revisions',
-    ];
-    $this->assertBreadcrumb(NULL, $trail);
-    // Extract the changes.
-    $diff_row = $rows[1]->td;
-    // Assert changes made to the body, text 1 changed to 2.
-    $this->assertEqual((string) ($diff_row[0]), '-');
-    $this->assertEqual((string) (($diff_row[1]->span)), '1');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[1]->asXML())), 'Revision 1');
-    $this->assertEqual((string) (($diff_row[2])), '+');
-    $this->assertEqual((string) (($diff_row[3]->span)), '2');
-    $this->assertEqual(htmlspecialchars_decode((strip_tags($diff_row[3]->asXML()))), 'Revision 2');
-
-    // Compare the revisions in single column mode.
-    $this->clickLink('Unified fields');
-    // Assert breadcrumbs are properly displayed.
-    $this->assertRaw('<nav class="breadcrumb"');
-    $trail = [
-      '' => 'Home',
-      "node/" . $node->id() => $node->label(),
-      "node/" . $node->id() . "/revisions" => 'Revisions',
-    ];
-    $this->assertBreadcrumb(NULL, $trail);
-    // Extract the changes.
-    $rows = $this->xpath('//tbody/tr');
-    $diff_row = $rows[1]->td;
-    // Assert changes made to the body, text 1 changed to 2.
-    $this->assertEqual((string) ($diff_row[0]), '1');
-    $this->assertEqual((string) ($diff_row[1]), '');
-    $this->assertEqual((string) ($diff_row[2]), '-');
-    $this->assertEqual((string) (($diff_row[3]->span)), '1');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[3]->asXML())), '<p>Revision 1</p>');
-    $diff_row = $rows[2]->td;
-    $this->assertEqual((string) ($diff_row[0]), '');
-    $this->assertEqual((string) ($diff_row[1]), '1');
-    $this->assertEqual((string) (($diff_row[2])), '+');
-    $this->assertEqual((string) (($diff_row[3]->span)), '2');
-    $this->assertEqual(htmlspecialchars_decode((strip_tags($diff_row[3]->asXML()))), '<p>Revision 2</p>');
-    $this->assertUniqueText('first_unique_text');
-    $this->assertUniqueText('second_unique_text');
-    $diff_row = $rows[3]->td;
-    $this->assertEqual((string) ($diff_row[0]), '2');
-    $this->assertEqual((string) ($diff_row[1]), '2');
-    $diff_row = $rows[4]->td;
-    $this->assertEqual((string) ($diff_row[0]), '3');
-    $this->assertEqual((string) ($diff_row[1]), '3');
-
-    $this->clickLink('Strip tags');
-    // Extract the changes.
-    $rows = $this->xpath('//tbody/tr');
-    $diff_row = $rows[1]->td;
-
-    // Assert changes made to the body, with strip_tags filter and make sure
-    // there are no line numbers.
-    $this->assertEqual((string) ($diff_row[0]), '-');
-    $this->assertEqual((string) (($diff_row[1]->span)), '1');
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[1]->asXML())), 'Revision 1');
-    $diff_row = $rows[2]->td;
-    $this->assertEqual((string) (($diff_row[0])), '+');
-    $this->assertEqual((string) (($diff_row[1]->span)), '2');
-    $this->assertEqual(htmlspecialchars_decode((strip_tags($diff_row[1]->asXML()))), 'Revision 2');
-
-    $this->drupalGet('node/' . $node->id());
-    $this->clickLink(t('Revisions'));
-    // Revert the revision, confirm.
-    $this->clickLink(t('Revert'));
-    $this->drupalPostForm(NULL, NULL, t('Revert'));
-    $this->assertText('Article ' . $title . ' has been reverted to the revision from');
-
-    // Make sure three revisions are available.
-    $rows = $this->xpath('//tbody/tr');
-    $this->assertEqual(count($rows), 3);
-    // Make sure the reverted comment is there.
-    $this->assertText('Copy of the revision from');
-
-    // Delete the first revision (last entry in table).
-    $this->clickLink(t('Delete'), 0);
-    $this->drupalPostForm(NULL, NULL, t('Delete'));
-    $this->assertText('of Article ' . $title . ' has been deleted.');
-
-    // Make sure two revisions are available.
-    $rows = $this->xpath('//tbody/tr');
-    $this->assertEqual(count($rows), 2);
-
-    // Delete one revision so that we are left with only 1 revision.
-    $this->clickLink(t('Delete'), 0);
-    $this->drupalPostForm(NULL, NULL, t('Delete'));
-    $this->assertText('of Article ' . $title . ' has been deleted.');
-
-    // Make sure we only have 1 revision now.
-    $rows = $this->xpath('//tbody/tr');
-    $this->assertEqual(count($rows), 1);
-
-    // Assert that there are no radio buttons for revision selection.
-    $this->assertNoFieldByXPath('//input[@type="radio"]');
-    // Assert that there is no submit button.
-    $this->assertNoFieldByXPath('//input[@type="submit"]');
-
-    // Create two new revisions of node.
-    $edit = [
-      'title[0][value]' => 'new test title',
-      'body[0][value]' => '<p>new body</p>',
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
-
-    $edit = [
-      'title[0][value]' => 'newer test title',
-      'body[0][value]' => '<p>newer body</p>',
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
-
-    $this->clickLink(t('Revisions'));
-    // Assert the revision summary.
-    $this->assertNoUniqueText('Changes on: Title, Body');
-    $this->assertText('Copy of the revision from');
-    $edit = [
-      'radios_left' => 3,
-      'radios_right' => 4,
-    ];
-    $this->drupalPostForm(NULL, $edit, t('Compare selected revisions'));
-    $this->clickLink('Strip tags');
-    // Check markdown layout is used when navigating between revisions.
-    $rows = $this->xpath('//tbody/tr');
-    $diff_row = $rows[3]->td;
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[3]->asXML())), 'new body');
-    $this->clickLink('Next change');
-    // The filter should be the same as the previous screen.
-    $rows = $this->xpath('//tbody/tr');
-    $diff_row = $rows[3]->td;
-    $this->assertEqual(htmlspecialchars_decode(strip_tags($diff_row[3]->asXML())), 'newer body');
-
-    // Get the node, create a new revision that is not the current one.
-    $node = $this->getNodeByTitle('newer test title');
-    $node->setNewRevision(TRUE);
-    $node->isDefaultRevision(FALSE);
-    $node->save();
-    $this->drupalGet('node/' . $node->id() . '/revisions');
-
-    // Check that the last revision is not the current one.
-    $this->assertLink(t('Set as current revision'));
-    $text = $this->xpath('//tbody/tr[2]/td[4]/em');
-    $this->assertEqual($text[0], 'Current revision');
-
-    // Set the last revision as current.
-    $this->clickLink('Set as current revision');
-    $this->drupalPostForm(NULL, [], t('Revert'));
-
-    // Check the last revision is set as current.
-    $text = $this->xpath('//tbody/tr[1]/td[4]/em');
-    $this->assertEqual($text[0], 'Current revision');
-    $this->assertNoLink(t('Set as current revision'));
-  }
-
-  /**
-   * Tests pager on diff overview.
-   */
-  protected function doTestOverviewPager() {
-    $config = \Drupal::configFactory()->getEditable('diff.settings');
-    $config->set('general_settings.revision_pager_limit', 10)->save();
-
-    $this->loginAsAdmin(['view article revisions']);
-
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-    ]);
-    // Create 11 more revisions in order to trigger paging on the revisions
-    // overview screen.
-    for ($i = 0; $i < 11; $i++) {
-      $node->setNewRevision(TRUE);
-      $node->save();
-    }
-
-    // Check the number of elements on the first page.
-    $this->drupalGet('node/' . $node->id() . '/revisions');
-    $element = $this->xpath('//*[@id="edit-node-revisions-table"]/tbody/tr');
-    $this->assertEqual(count($element), 10);
-    // Check that the pager exists.
-    $this->assertRaw('page=1');
-
-    $this->clickLinkPartialName('Next page');
-    // Check the number of elements on the second page.
-    $element = $this->xpath('//*[@id="edit-node-revisions-table"]/tbody/tr');
-    $this->assertEqual(count($element), 2);
-    $this->assertRaw('page=0');
-    $this->clickLinkPartialName('Previous page');
-  }
-
-  /**
-   * Tests the revisions overview error messages.
-   *
-   * @todo Move to DiffLocaleTest?
-   */
-  protected function doTestRevisionOverviewErrorMessages() {
-    // Enable some languages for this test.
-    $language = ConfigurableLanguage::createFromLangcode('de');
-    $language->save();
-
-    // Login as admin with the required permissions.
-    $this->loginAsAdmin([
-      'administer node form display',
-      'administer languages',
-      'administer content translation',
-      'create content translations',
-      'translate any entity',
-    ]);
-
-    // Make article content translatable.
-    $edit = [
-      'entity_types[node]' => TRUE,
-      'settings[node][article][translatable]' => TRUE,
-      'settings[node][article][settings][language][language_alterable]' => TRUE,
-    ];
-    $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
-
-    // Create an article.
-    $title = 'test_title_b';
-    $edit = [
-      'title[0][value]' => $title,
-      'body[0][value]' => '<p>Revision 1</p>',
-    ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
-    $node = $this->drupalGetNodeByTitle($title);
-    $revision1 = $node->getRevisionId();
-
-    // Create a revision, changing the node language to German.
-    $edit = [
-      'langcode[0][value]' => 'de',
-      'body[0][value]' => '<p>Revision 2</p>',
-      'revision' => TRUE,
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Check the revisions overview, ensure only one revisions is available.
-    $this->clickLink(t('Revisions'));
-    $rows = $this->xpath('//tbody/tr');
-    $this->assertEqual(count($rows), 1);
-
-    // Compare the revisions and assert the first error message.
-    $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
-    $this->assertText('Multiple revisions are needed for comparison.');
-
-    // Create another revision, changing the node language back to English.
-    $edit = [
-      'langcode[0][value]' => 'en',
-      'body[0][value]' => '<p>Revision 3</p>',
-      'revision' => TRUE,
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-    $node = $this->drupalGetNodeByTitle($title, TRUE);
-    $revision3 = $node->getRevisionId();
-
-    // Check the revisions overview, ensure two revisions are available.
-    $this->clickLink(t('Revisions'));
-    $rows = $this->xpath('//tbody/tr');
-    $this->assertEqual(count($rows), 2);
-    $this->assertNoFieldChecked('edit-node-revisions-table-0-select-column-one');
-    $this->assertFieldChecked('edit-node-revisions-table-0-select-column-two');
-    $this->assertNoFieldChecked('edit-node-revisions-table-1-select-column-one');
-    $this->assertNoFieldChecked('edit-node-revisions-table-1-select-column-two');
-
-    // Compare the revisions and assert the second error message.
-    $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
-    $this->assertText('Select two revisions to compare.');
-
-    // Check the same revisions twice and compare.
-    $edit = [
-      'radios_left' => $revision3,
-      'radios_right' => $revision3,
-    ];
-    $this->drupalPostForm('/node/' . $node->id() . '/revisions', $edit, 'Compare selected revisions');
-    // Assert the third error message.
-    $this->assertText('Select different revisions to compare.');
-
-    // Check different revisions and compare. This time should work correctly.
-    $edit = [
-      'radios_left' => $revision3,
-      'radios_right' => $revision1,
-    ];
-    $this->drupalPostForm('/node/' . $node->id() . '/revisions', $edit, 'Compare selected revisions');
-    $this->assertLinkByHref('node/' . $node->id() . '/revisions/view/' . $revision1 . '/' . $revision3);
-  }
-
-  /**
-   * Tests Reference to Deleted Entities.
-   */
-  protected function doTestEntityReference() {
-    // Login as admin with the required permissions.
-    $this->loginAsAdmin([
-      'administer node fields',
-    ]);
-
-    // Adding Entity Reference to Article Content Type.
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/add-field', [
-      'new_storage_type' => 'field_ui:entity_reference:node',
-      'label' => 'Content reference test',
-      'field_name' => 'content',
-    ], t('Save and continue'));
-
-    // Create an first article.
-    $title = 'test_title_c';
-    $edit = [
-      'title[0][value]' => $title,
-      'body[0][value]' => '<p>First article</p>',
-    ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
-    $node_one = $this->drupalGetNodeByTitle($title);
-
-    // Create second article.
-    $title = 'test_title_d';
-    $edit = [
-      'title[0][value]' => $title,
-      'body[0][value]' => '<p>Second article</p>',
-    ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
-    $node_two = $this->drupalGetNodeByTitle($title);
-
-    // Create revision and add entity reference from second node to first.
-    $edit = [
-      'body[0][value]' => '<p>First Revision</p>',
-      'field_content[0][target_id]' => $node_two->getTitle(),
-      'revision' => TRUE,
-    ];
-    $this->drupalPostForm('node/' . $node_one->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Delete referenced node.
-    $node_two->delete();
-
-    // Access revision of first node.
-    $this->drupalGet('/node/' . $node_one->id());
-    $this->clickLink(t('Revisions'));
-    $this->drupalPostForm(NULL, NULL, t('Compare selected revisions'));
-    // Revision section should appear.
-    $this->assertResponse(200);
-  }
-
-}
diff --git a/modules/diff/src/Tests/DiffTestBase.php b/modules/diff/src/Tests/DiffTestBase.php
deleted file mode 100644
index 7a86e3e..0000000
--- a/modules/diff/src/Tests/DiffTestBase.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Drupal\diff\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Base class for Diff web tests.
- */
-abstract class DiffTestBase extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'node',
-    'diff',
-    'block',
-  ];
-
-  /**
-   * Permissions for the admin user.
-   *
-   * @var array
-   */
-  protected $adminPermissions = [
-    'administer site configuration',
-    'administer nodes',
-    'administer content types',
-    'create article content',
-    'edit any article content',
-    'view article revisions',
-  ];
-
-  /**
-   * A user with content administrative permissions.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Create the Article content type.
-    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
-
-    // Place the blocks that Diff module uses.
-    $this->drupalPlaceBlock('local_tasks_block');
-    $this->drupalPlaceBlock('local_actions_block');
-
-    // Make sure HTML Diff is disabled.
-    $config = \Drupal::configFactory()->getEditable('diff.settings');
-    $config->set('general_settings.layout_plugins.visual_inline.enabled', FALSE)->save();
-  }
-
-  /**
-   * Creates an user with admin permissions and log in.
-   *
-   * @param array $additional_permissions
-   *   Additional permissions that will be granted to admin user.
-   * @param bool $reset_permissions
-   *   Flag to determine if default admin permissions will be replaced by
-   *   $additional_permissions.
-   *
-   * @return \Drupal\user\Entity\User|false
-   *   Newly created and logged in user object.
-   */
-  protected function loginAsAdmin(array $additional_permissions = [], $reset_permissions = FALSE) {
-    $permissions = $this->adminPermissions;
-
-    if ($reset_permissions) {
-      $permissions = $additional_permissions;
-    }
-    elseif (!empty($additional_permissions)) {
-      $permissions = array_merge($permissions, $additional_permissions);
-    }
-
-    $this->adminUser = $this->drupalCreateUser($permissions);
-    $this->drupalLogin($this->adminUser);
-    return $this->adminUser;
-  }
-
-}
diff --git a/modules/diff/src/Tests/DiffViewModeTest.php b/modules/diff/src/Tests/DiffViewModeTest.php
deleted file mode 100644
index e07555a..0000000
--- a/modules/diff/src/Tests/DiffViewModeTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Drupal\diff\Tests;
-
-/**
- * Tests field visibility when using a custom view mode.
- *
- * @group diff
- */
-class DiffViewModeTest extends DiffTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['field_ui'];
-
-  /**
-   * Tests field visibility using a cutom view mode.
-   */
-  public function testViewMode() {
-    $this->drupalLogin($this->rootUser);
-
-    // Create a node.
-    $node = $this->drupalCreateNode([
-      'type' => 'article',
-      'title' => 'Sample node',
-      'body' => [
-        'value' => 'Foo',
-      ],
-    ]);
-
-    // Edit the article and change the email.
-    $edit = array(
-      'body[0][value]' => 'Fighters',
-      'revision' => TRUE,
-    );
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-
-    // Set the Body field to hidden in the diff view mode.
-    $edit = [
-      'fields[body][region]' => 'hidden',
-    ];
-    $this->drupalPostForm('admin/structure/types/manage/article/display', $edit, t('Save'));
-    $edit = [
-      'fields[body][region]' => 'hidden',
-    ];
-    $this->drupalPostForm('admin/structure/types/manage/article/display/teaser', $edit, t('Save'));
-
-    // Check the difference between the last two revisions.
-    $this->drupalGet('node/' . $node->id() . '/revisions');
-    $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
-    $this->assertNoText('Body');
-    $this->assertNoText('Foo');
-    $this->assertNoText('Fighters');
-  }
-
-}
diff --git a/modules/diff/src/Tests/DiffViewsTest.php b/modules/diff/src/Tests/DiffViewsTest.php
deleted file mode 100644
index 5461f68..0000000
--- a/modules/diff/src/Tests/DiffViewsTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Drupal\diff\Tests;
-
-use Drupal\Core\Url;
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
-use Drupal\views\Tests\ViewTestBase;
-
-/**
- * Tests the diff views integration.
- *
- * Loads optional config of views.
- *
- * @group diff
- */
-class DiffViewsTest extends ViewTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['node', 'diff', 'user', 'views', 'diff_test'];
-
-  /**
-   * Tests the behavior of a view that uses the diff_from and diff_to fields.
-   */
-  public function testDiffView() {
-    // Make sure HTML Diff is disabled.
-    $config = \Drupal::configFactory()->getEditable('diff.settings');
-    $config->set('general_settings.layout_plugins.visual_inline.enabled', FALSE)->save();
-
-    $node_type = NodeType::create([
-      'type' => 'article',
-      'label' => 'Article',
-    ]);
-    $node_type->save();
-    $node = Node::create([
-      'type' => 'article',
-      'title' => 'Test article: giraffe',
-    ]);
-    $node->save();
-    $revision1 = $node->getRevisionId();
-
-    $node->setNewRevision(TRUE);
-    $node->setTitle('Test article: llama');
-    $node->save();
-    $revision2 = $node->getRevisionId();
-
-    $this->drupalGet("node/{$node->id()}/diff-views");
-    $this->assertResponse(403);
-
-    $user = $this->createUser(['view all revisions']);
-    $this->drupalLogin($user);
-
-    $this->drupalGet("node/{$node->id()}/diff-views");
-    $this->assertResponse(200);
-
-    $from_first = (string) $this->cssSelect('#edit-diff-from--3')[0]->attributes()['value'];
-    $to_second = (string) $this->cssSelect('#edit-diff-to--2')[0]->attributes()['value'];
-
-    $edit = [
-      'diff_from' => $from_first,
-      'diff_to' => $to_second,
-    ];
-    $this->drupalPostForm(NULL, $edit, t('Compare'));
-    $expected_url = Url::fromRoute(
-      'diff.revisions_diff',
-      // Route parameters.
-      [
-        'node' => $node->id(),
-        'left_revision' => $revision1,
-        'right_revision' => $revision2,
-        'filter' => 'split_fields',
-      ],
-      // Additional route options.
-      [
-        'query' => [
-          'destination' => Url::fromUri("internal:/node/{$node->id()}/diff-views")->toString(),
-        ],
-      ]
-    );
-    $this->assertUrl($expected_url);
-    $this->assertRaw('<td class="diff-context diff-deletedline">Test article: <span class="diffchange">giraffe</span></td>');
-    $this->assertRaw('<td class="diff-context diff-addedline">Test article: <span class="diffchange">llama</span></td>');
-  }
-
-}
diff --git a/modules/diff/src/VisualDiffThemeNegotiator.php b/modules/diff/src/VisualDiffThemeNegotiator.php
deleted file mode 100644
index e5678c4..0000000
--- a/modules/diff/src/VisualDiffThemeNegotiator.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Drupal\diff;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Theme\ThemeNegotiatorInterface;
-
-/**
- * Visual inline layout theme negotiator.
- *
- * @package Drupal\diff
- */
-class VisualDiffThemeNegotiator implements ThemeNegotiatorInterface {
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * VisualDiffThemeNegotiator constructor.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory) {
-    $this->configFactory = $config_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies(RouteMatchInterface $routeMatch) {
-    if ($routeMatch->getParameter('filter') !== 'visual_inline') {
-      return FALSE;
-    }
-
-    if (!$this->isDiffRoute($routeMatch)) {
-      return FALSE;
-    }
-
-    if ($this->configFactory->get('diff.settings')->get('general_settings.visual_inline_theme') !== 'default') {
-      return FALSE;
-    }
-
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function determineActiveTheme(RouteMatchInterface $route_match) {
-    return $this->configFactory->get('system.theme')->get('default');
-  }
-
-  /**
-   * Checks if route names for node or other entity are corresponding.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *   Route match object.
-   *
-   * @return bool
-   *   Return TRUE if route name is ok.
-   */
-  protected function isDiffRoute(RouteMatchInterface $route_match) {
-    $regex_pattern = '/^entity\..*\.revisions_diff$/';
-    return $route_match->getRouteName() === 'diff.revisions_diff' ||
-      preg_match($regex_pattern, $route_match->getRouteName());
-  }
-
-}
diff --git a/modules/diff/tests/modules/diff_test/config/install/filter.format.basic_html.yml b/modules/diff/tests/modules/diff_test/config/install/filter.format.basic_html.yml
deleted file mode 100644
index 4d187b7..0000000
--- a/modules/diff/tests/modules/diff_test/config/install/filter.format.basic_html.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-format: basic_html
-name: 'Basic HTML'
-status: true
-weight: 0
-roles:
-  - authenticated
-filters:
-  filter_html:
-    id: filter_html
-    provider: filter
-    status: true
-    weight: -10
-    settings:
-      allowed_html: '<a> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <h4> <h5> <h6> <p> <br> <span> <img>'
-      filter_html_help: false
-      filter_html_nofollow: false
-  filter_align:
-    id: filter_align
-    provider: filter
-    status: true
-    weight: 7
-    settings: {  }
-  filter_caption:
-    id: filter_caption
-    provider: filter
-    status: true
-    weight: 8
-    settings: {  }
-  filter_html_image_secure:
-    id: filter_html_image_secure
-    provider: filter
-    status: true
-    weight: 9
-    settings: {  }
-  filter_htmlcorrector:
-    id: filter_htmlcorrector
-    provider: filter
-    status: true
-    weight: 10
-    settings: {  }
-  editor_file_reference:
-    id: editor_file_reference
-    provider: editor
-    status: true
-    weight: 11
-    settings: {  }
-langcode: en
-dependencies:
-  module:
-    - editor
diff --git a/modules/diff/tests/modules/diff_test/config/optional/views.view.test_diff_view.yml b/modules/diff/tests/modules/diff_test/config/optional/views.view.test_diff_view.yml
deleted file mode 100644
index 0d66de2..0000000
--- a/modules/diff/tests/modules/diff_test/config/optional/views.view.test_diff_view.yml
+++ /dev/null
@@ -1,418 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - diff
-    - node
-    - user
-id: test_diff_view
-label: 'test diff view'
-module: views
-description: ''
-tag: ''
-base_table: node_field_revision
-base_field: vid
-core: 8.x
-display:
-  default:
-    display_plugin: default
-    id: default
-    display_title: Master
-    position: 0
-    display_options:
-      access:
-        type: perm
-        options:
-          perm: 'view all revisions'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: full
-        options:
-          items_per_page: 10
-          offset: 0
-          id: 0
-          total_pages: null
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-            first: '« First'
-            last: 'Last »'
-          quantity: 9
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            changed: changed
-            title: title
-            diff_from: diff_from
-            diff_to: diff_to
-          info:
-            changed:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            title:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            diff_from:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            diff_to:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: false
-      row:
-        type: fields
-        options:
-          inline: {  }
-          separator: ''
-          hide_empty: false
-          default_field_elements: true
-      fields:
-        diff_from:
-          id: diff_from
-          table: node_field_revision
-          field: diff_from
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: false
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          entity_type: node
-          plugin_id: diff__from
-        diff_to:
-          id: diff_to
-          table: node_field_revision
-          field: diff_to
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: '0'
-          element_wrapper_class: ''
-          element_default_classes: false
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          entity_type: node
-          plugin_id: diff__to
-        changed:
-          id: changed
-          table: node_field_revision
-          field: changed
-          entity_type: node
-          entity_field: changed
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            trim: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            html: false
-          hide_empty: false
-          empty_zero: false
-          plugin_id: field
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: ''
-          exclude: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_alter_empty: true
-          click_sort_column: value
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        title:
-          id: title
-          table: node_field_revision
-          field: title
-          entity_type: node
-          entity_field: title
-          label: ''
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            trim: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            html: false
-          hide_empty: false
-          empty_zero: false
-          settings:
-            link_to_entity: false
-          plugin_id: field
-          relationship: none
-          group_type: group
-          admin_label: ''
-          exclude: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        status:
-          value: 'true'
-          table: node_field_revision
-          field: status
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
-          id: status
-          expose:
-            operator: ''
-          group: 1
-      sorts:
-        vid:
-          id: vid
-          table: node_field_revision
-          field: vid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: DESC
-          exposed: false
-          expose:
-            label: ''
-          entity_type: node
-          entity_field: vid
-          plugin_id: standard
-      header: {  }
-      footer: {  }
-      empty: {  }
-      relationships: {  }
-      arguments:
-        nid:
-          id: nid
-          table: node_field_revision
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          default_action: empty
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            items_per_page: 25
-            override: false
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-          entity_type: node
-          entity_field: nid
-          plugin_id: node_nid
-      display_extenders: {  }
-      title: Revisions
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  page_1:
-    display_plugin: page
-    id: page_1
-    display_title: Page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: node/%/diff-views
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/modules/diff/tests/modules/diff_test/diff_test.info.yml b/modules/diff/tests/modules/diff_test/diff_test.info.yml
deleted file mode 100644
index dc7b7be..0000000
--- a/modules/diff/tests/modules/diff_test/diff_test.info.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-description: Supports diff's automated tests.
-# core: 8.x
-dependencies:
-  - diff
-  - filter
-  - editor
-  - entity_test
-  - node
-hidden: true
-name: Diff tests
-package: diff
-type: module
-
-# Information added by Drupal.org packaging script on 2017-01-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'diff'
-datestamp: 1484566687
diff --git a/modules/diff/tests/modules/diff_test/diff_test.module b/modules/diff/tests/modules/diff_test/diff_test.module
deleted file mode 100644
index c9806e0..0000000
--- a/modules/diff/tests/modules/diff_test/diff_test.module
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file
- * Helper module for the diff tests.
- */
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\diff\Routing\DiffRouteProvider;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-
-/**
- * Implements hook_entity_type_alter().
- */
-function diff_test_entity_type_alter(array &$entity_types) {
-  /** @var \Drupal\Core\Entity\EntityType $entity_type */
-  $entity_type = $entity_types['entity_test_rev'];
-  $handlers = $entity_type->get('handlers');
-  $handlers['route_provider']['html_diff'] = DiffRouteProvider::class;
-  $entity_type->set('handlers', $handlers);
-  $entity_type->setLinkTemplate('revisions-diff', "/entity_test_rev/{entity_test_rev}/revision/{left_revision}/{right_revision}");
-}
-
-/**
- * Implements hook_entity_field_access().
- */
-function diff_test_entity_field_access($operation, FieldDefinitionInterface $field_definition, AccountInterface $account, FieldItemListInterface $items = NULL) {
-  if ($field_definition->getName() == 'field_diff_deny_access') {
-    return AccessResult::forbidden();
-  }
-  return AccessResult::allowed();
-}
diff --git a/modules/diff/tests/modules/diff_test/src/Plugin/diff/Field/TestHeavierTextPlugin.php b/modules/diff/tests/modules/diff_test/src/Plugin/diff/Field/TestHeavierTextPlugin.php
deleted file mode 100644
index 970b7d3..0000000
--- a/modules/diff/tests/modules/diff_test/src/Plugin/diff/Field/TestHeavierTextPlugin.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Drupal\diff_test\Plugin\diff\Field;
-
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\diff\FieldDiffBuilderBase;
-use Drupal\Core\Field\FieldItemListInterface;
-
-/**
- * Test diff builder with heavy weight.
- *
- * @FieldDiffBuilder(
- *   id = "test_heavier_text_plugin",
- *   label = @Translation("Test Heavier Text Plugin"),
- *   field_types = {
- *     "text",
- *   },
- *   weight = -10,
- * )
- */
-class TestHeavierTextPlugin extends FieldDiffBuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(FieldItemListInterface $field_items) {
-    $result = [];
-
-    // Every item from $field_items is of type FieldItemInterface.
-    foreach ($field_items as $field_key => $field_item) {
-      if (!$field_item->isEmpty()) {
-        $values = $field_item->getValue();
-        if (isset($values['value'])) {
-          $result[$field_key][] = str_replace('applicable', 'heavier_test_plugin', $values['value']);
-        }
-      }
-    }
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function isApplicable(FieldStorageDefinitionInterface $field_definition) {
-    return ($field_definition->getName() == 'test_field' || $field_definition->getName() == 'test_field_lighter');
-  }
-
-}
diff --git a/modules/diff/tests/modules/diff_test/src/Plugin/diff/Field/TestLighterTextPlugin.php b/modules/diff/tests/modules/diff_test/src/Plugin/diff/Field/TestLighterTextPlugin.php
deleted file mode 100644
index 32fd267..0000000
--- a/modules/diff/tests/modules/diff_test/src/Plugin/diff/Field/TestLighterTextPlugin.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Drupal\diff_test\Plugin\diff\Field;
-
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\diff\FieldDiffBuilderBase;
-use Drupal\Core\Field\FieldItemListInterface;
-
-/**
- * Test diff builder with light weight.
- *
- * @FieldDiffBuilder(
- *   id = "test_lighter_text_plugin",
- *   label = @Translation("Test Lighter Text Plugin"),
- *   field_types = {
- *     "text",
- *   },
- *   weight = -20,
- * )
- */
-class TestLighterTextPlugin extends FieldDiffBuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build(FieldItemListInterface $field_items) {
-    $result = [];
-
-    // Every item from $field_items is of type FieldItemInterface.
-    foreach ($field_items as $field_key => $field_item) {
-      if (!$field_item->isEmpty()) {
-        $values = $field_item->getValue();
-        if (isset($values['value'])) {
-          $result[$field_key][] = str_replace('applicable', 'lighter_test_plugin', $values['value']);
-        }
-      }
-    }
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function isApplicable(FieldStorageDefinitionInterface $field_definition) {
-    return ($field_definition->getName() == 'test_field_lighter');
-  }
-
-}
diff --git a/modules/diff/tests/src/Kernel/DiffControllerTest.php b/modules/diff/tests/src/Kernel/DiffControllerTest.php
deleted file mode 100644
index 5b2af91..0000000
--- a/modules/diff/tests/src/Kernel/DiffControllerTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Drupal\Tests\diff\Kernel;
-
-use Drupal\Core\Url;
-use Drupal\entity_test\Entity\EntityTestRev;
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\user\Entity\Role;
-use Drupal\user\Entity\User;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Tests the diff controller.
- *
- * @group diff
- */
-class DiffControllerTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'diff',
-    'entity_test',
-    'diff_test',
-    'system',
-    'user',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('entity_test_rev');
-    $this->installEntitySchema('user');
-    $this->installSchema('system', ['router', 'sequences']);
-    $this->installSchema('user', 'users_data');
-    \Drupal::service('router.builder')->rebuild();
-
-    $this->installConfig('diff');
-    $config = \Drupal::configFactory()->getEditable('diff.settings');
-    $config->set('entity.entity_test_rev.name', TRUE);
-    $config->save();
-  }
-
-  /**
-   * Tests the Controller.
-   */
-  public function testController() {
-    $entity = EntityTestRev::create([
-      'name' => 'test entity 1',
-      'type' => 'entity_test_rev',
-    ]);
-    $entity->save();
-    $vid1 = $entity->getRevisionId();
-
-    $entity->name->value = 'test entity 2';
-    $entity->setNewRevision(TRUE);
-    $entity->save();
-    $vi2 = $entity->getRevisionId();
-
-    /** @var \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel */
-    $http_kernel = \Drupal::service('http_kernel');
-    $request = Request::create(Url::fromRoute('entity.entity_test_rev.revisions_diff', [
-      'node' => $entity->id(),
-      'entity_test_rev' => $entity->id(),
-      'left_revision' => $vid1,
-      'right_revision' => $vi2,
-    ])->toString(TRUE)->getGeneratedUrl());
-
-    $response = $http_kernel->handle($request);
-    $this->assertEquals(403, $response->getStatusCode());
-
-    $role = Role::create([
-      'id' => 'test_role',
-    ]);
-    $role->grantPermission('administer entity_test content');
-    $role->save();
-    $account = User::create([
-      'name' => 'test user',
-      'roles' => $role->id(),
-    ]);
-    $account->save();
-
-    \Drupal::currentUser()->setAccount($account);
-    $response = $http_kernel->handle($request);
-    $this->assertEquals(200, $response->getStatusCode());
-
-    $output = $response->getContent();
-    $this->assertContains('<td class="diff-context diff-deletedline">test entity <span class="diffchange">1</span></td>', $output);
-    $this->assertContains('<td class="diff-context diff-addedline">test entity <span class="diffchange">2</span></td>', $output);
-  }
-
-}
diff --git a/modules/diff/tests/src/Unit/VisualDiffThemeNegotiatorTest.php b/modules/diff/tests/src/Unit/VisualDiffThemeNegotiatorTest.php
deleted file mode 100644
index f7a6de8..0000000
--- a/modules/diff/tests/src/Unit/VisualDiffThemeNegotiatorTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-namespace Drupal\Tests\diff\Unit;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Config\ImmutableConfig;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\diff\VisualDiffThemeNegotiator;
-use Drupal\Tests\UnitTestCase;
-
-/**
- * Tests theme negotiator.
- *
- * @coversDefaultClass \Drupal\diff\VisualDiffThemeNegotiator
- * @group diff
- */
-class VisualDiffThemeNegotiatorTest extends UnitTestCase {
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The class under test.
-   *
-   * @var \Drupal\diff\VisualDiffThemeNegotiator
-   */
-  protected $themeNegotiator;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->configFactory = $this->prophesize(ConfigFactoryInterface::class);
-    $this->themeNegotiator = new VisualDiffThemeNegotiator($this->configFactory->reveal());
-  }
-
-  /**
-   * @covers ::determineActiveTheme
-   */
-  public function testDetermineActiveTheme() {
-    $config = $this->prophesize(ImmutableConfig::class);
-    $config->get('default')->willReturn('the_default_theme');
-    $this->configFactory->get('system.theme')->willReturn($config->reveal());
-
-    $route_match = $this->prophesize(RouteMatchInterface::class);
-    $result = $this->themeNegotiator->determineActiveTheme($route_match->reveal());
-    $this->assertSame('the_default_theme', $result);
-  }
-
-  /**
-   * Tests if the theme negotiator applies under correct conditions.
-   *
-   * @param string $filter_parameter
-   *   The filter parameter.
-   * @param string $route_name
-   *   The route name.
-   * @param string $config_value
-   *   The configuration value of the element taken from the form values.
-   * @param bool $expected
-   *   The expected result.
-   *
-   * @covers ::applies
-   * @covers ::isDiffRoute
-   *
-   * @dataProvider providerTestApplies
-   */
-  public function testApplies($filter_parameter, $route_name, $config_value, $expected) {
-    $route_match = $this->prophesize(RouteMatchInterface::class);
-    $route_match->getParameter('filter')->willReturn($filter_parameter);
-
-    if ($route_name) {
-      $route_match->getRouteName()->willReturn($route_name);
-    }
-    else {
-      $route_match->getRouteName()->shouldNotBeCalled();
-    }
-
-    if ($config_value) {
-      $diff_config = $this->prophesize(ImmutableConfig::class);
-      $diff_config->get('general_settings.visual_inline_theme')->willReturn($config_value);
-      $this->configFactory->get('diff.settings')->willReturn($diff_config->reveal());
-    }
-    else {
-      $this->configFactory->get('diff.settings')->shouldNotBeCalled();
-    }
-
-    $this->assertSame($expected, $this->themeNegotiator->applies($route_match->reveal()));
-  }
-
-  /**
-   * Provides test data to ::testApplies().
-   */
-  public function providerTestApplies() {
-    $data = [];
-    $data[] = [
-      'unexpected_filter_parameter',
-      NULL,
-      NULL,
-      FALSE,
-    ];
-    $data[] = [
-      'visual_inline',
-      'unexpected_route_name',
-      NULL,
-      FALSE,
-    ];
-    $data[] = [
-      'visual_inline',
-      'diff.revisions_diff',
-      'unexpected_config_value',
-      FALSE,
-    ];
-    $data[] = [
-      'visual_inline',
-      'diff.revisions_diff',
-      'default',
-      TRUE,
-    ];
-    $data[] = [
-      'visual_inline',
-      'entity.foo.revisions_diff',
-      'default',
-      TRUE,
-    ];
-    return $data;
-  }
-
-}
diff --git a/modules/masquerade/LICENSE.txt b/modules/masquerade/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/masquerade/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/masquerade/README.txt b/modules/masquerade/README.txt
deleted file mode 100644
index d2b6550..0000000
--- a/modules/masquerade/README.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-
--- SUMMARY --
-
-The Masquerade module allows users to temporarily switch to another user
-account. It keeps a record of the original user account, so users can easily
-switch back to the previous account.
-
-For a full description of the module, visit the project page:
-  http://drupal.org/project/masquerade
-
-To submit bug reports and feature suggestions, or to track changes:
-  http://drupal.org/project/issues/masquerade
-
-
--- REQUIREMENTS --
-
-None.
-
-
--- INSTALLATION --
-
-* Install as usual, see
-  http://drupal.org/documentation/install/modules-themes/modules-8
-
-* Grant the "Masquerade as another user" permission to the desired roles.
-
-
--- SECURITY --
-
-* Masquerade's built-in access control mechanism has been designed to be simple,
-  smart, and secure by default:
-
-  - Users without the masquerade permission are not allowed to masquerade.
-  - Uid 1 may masquerade as anyone.  No one can masquerade as uid 1.
-  - If you have the identical permissions as the target user (or additional
-    permissions), you are allowed to masquerade.
-  - Otherwise, access to masquerade as the target user is denied.
-
-  This means that Masquerade's built-in access control does not allow any kind
-  of privilege escalation.  It is safe to grant the masquerade permission to
-  user roles.  Users are never able to exceed their privileges by masquerading
-  as someone else.
-
-* More fine-grained access control (e.g., role-per-role, per-user, blacklist)
-  may be supplied by separate add-on modules for Masquerade.
-
-
--- FEATURES AND INTEGRATION --
-
-* The Masquerade module provides and aims for a deep integration with the
-  built-in user interface of Drupal core and popular contributed administration
-  interface modules:
-
-  - Contextual links (core)
-  - Toolbar (core)
-  - Administration menu (http://drupal.org/project/admin_menu)
-
-* Aside from its user permission, the Masquerade module aims for a smart and
-  intuitive integration that does not require any configuration.  Its design and
-  architecture tries to meet the expectations of these user stories:
-
-  - This is helpful. Even though I don't know whether I'll actually need it.
-  - This is secure. 100% test coverage for the limited functionality it provides.
-  - This isn't bloat. Super small, dead simple, focused on the >80% task.
-  - This is friendly. Available when I need it, close to "zero-conf", and has
-    absolutely no other UI implications.
-
-* Masquerading as Anonymous user is intentionally not supported. Likewise, more
-  granular user permissions and other custom plumbing needs to be implemented in
-  separate modules instead.
-
-
--- CONTACT --
-
-Current maintainers:
-* Daniel F. Kudwien (sun) - http://drupal.org/user/54136
-* Andrey Postnikov (andypost) - http://drupal.org/user/118908
-
diff --git a/modules/masquerade/composer.json b/modules/masquerade/composer.json
deleted file mode 100644
index b4be91a..0000000
--- a/modules/masquerade/composer.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "drupal/masquerade",
-  "description": "Allows privileged users to masquerade as another user.",
-  "type": "drupal-module"
-}
diff --git a/modules/masquerade/masquerade.api.php b/modules/masquerade/masquerade.api.php
deleted file mode 100644
index 998f301..0000000
--- a/modules/masquerade/masquerade.api.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * @file
- * Hooks provided by the Masquerade module.
- */
-
-/**
- * @addtogroup hooks
- * @{
- */
-
-/**
- * Control access to masquerade as a certain target user.
- *
- * Modules may implement this hook to control whether a user is allowed to
- * masquerade as a certain target user account.
- *
- * @param \Drupal\user\UserInterface $user
- *   The currently logged-in user.
- * @param \Drupal\user\UserInterface $target_account
- *   The target user account to check for masquerade access.
- *
- * @return bool
- *   Either a Boolean or NULL:
- *   - FALSE to explicitly deny access. If a module denies access, no other
- *     module is able to grant access and access is denied.
- *   - TRUE to grant access. Access is only granted if at least one module
- *     grants access and no module denies access.
- *   - NULL or nothing to not affect the operation. If no module explicitly
- *     grants access, access is denied.
- */
-function hook_masquerade_access(\Drupal\user\UserInterface $user, \Drupal\user\UserInterface $target_account) {
-  // Explicitly deny access for uid 1.
-  if ($target_account->id() == 1) {
-    return FALSE;
-  }
-  // Example: If the target username is 'demo', always grant access for everone.
-  if ($target_account->label() == 'demo') {
-    return TRUE;
-  }
-  // In other cases do not alter access.
-}
-
-/**
- * @} End of "addtogroup hooks".
- */
diff --git a/modules/masquerade/masquerade.info.yml b/modules/masquerade/masquerade.info.yml
deleted file mode 100644
index b955c2e..0000000
--- a/modules/masquerade/masquerade.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Masquerade
-type: module
-description: 'Allows privileged users to masquerade as another user.'
-# core: 8.x
-dependencies:
-  - user
-tags:
-  - admin
-
-# Information added by Drupal.org packaging script on 2016-12-05
-version: '8.x-2.0-beta1'
-core: '8.x'
-project: 'masquerade'
-datestamp: 1480963692
diff --git a/modules/masquerade/masquerade.install b/modules/masquerade/masquerade.install
deleted file mode 100644
index eb61d14..0000000
--- a/modules/masquerade/masquerade.install
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, uninstall, and update hooks for the Masquerade module.
- */
-
-/**
- * Remove the {masquerade} table.
- */
-function masquerade_update_8200() {
-  $schema = \Drupal::database()->schema();
-  if ($schema->tableExists('masquerade')) {
-    $schema->dropTable('masquerade');
-  }
-}
diff --git a/modules/masquerade/masquerade.links.menu.yml b/modules/masquerade/masquerade.links.menu.yml
deleted file mode 100644
index 65a48d0..0000000
--- a/modules/masquerade/masquerade.links.menu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-masquerade.unmasquerade:
-  title: 'Unmasquerade'
-  menu_name: account
-  description: 'Switch back to your user account.'
-  route_name: masquerade.unmasquerade
-  weight: -50
diff --git a/modules/masquerade/masquerade.module b/modules/masquerade/masquerade.module
deleted file mode 100644
index 1d79acf..0000000
--- a/modules/masquerade/masquerade.module
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-
-/**
- * @file
- * Allows privileged users to masquerade as another user.
- */
-
-use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-use Drupal\user\Entity\User;
-use Drupal\user\UserInterface;
-
-/**
- * Implements hook_help().
- */
-function masquerade_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    case 'help.page.masquerade':
-      $output = '';
-      $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Masquerade module allows users to temporarily switch to another user account. It records the original user account, so users can easily switch back.') . '</p>';
-      $output .= '<h3>' . t('Uses') . '</h3>';
-      $output .= '<dl>';
-      $output .= '<dt>' . t('Granting masquerade access') . '</dt>';
-      $output .= '<dd>' . t('Users with the <a href=":permission_link">Masquerade as any user</a> permission are able to masquerade as someone else. Users may only masquerade if they have the same or more permissions as the user they want to switch to. Users are never able to escalate their privileges by masquerading as someone else.', [
-        ':permission_link' => Url::fromRoute('user.admin_permissions', [], ['fragment' => 'module-masquerade'])->toString(),
-      ]) . '</dd>';
-      $output .= '<dt>' . t('Masquerading as another user') . '</dt>';
-      $output .= '<dd>' . t('There are multiple ways to masquerade as another user:');
-      $output .= '<ul>';
-      $output .= '<li>' . t('On the <a href=":admin-people-url">administrative user listing</a>, choose the <em>Masquerade</em> operation of a certain user account.', [
-        ':admin-people-url' => Url::fromRoute('entity.user.collection')->toString(),
-      ]) . '</li>';
-      $output .= '<li>' . t('Masquerade can be used directly from menus provided by the %toolbar module.', [
-        '%toolbar' => t('Toolbar')
-      ]) . '</li>';
-      $output .= '</ul>';
-      $output .= '</dd>';
-      $output .= '<dt>' . t('Switching back') . '</dt>';
-      $output .= '<dd>' . t('To stop masquerading as another user, click the <em>Unmasquerade</em> link in the user account links menu.') . '</dd>';
-      $output .= '</dl>';
-      return $output;
-  }
-}
-
-/**
- * Implements hook_toolbar().
- *
- * @todo Nest this with the "View profile", "Edit profile", and "Log out"
- *   links under the username tab.
- */
-function masquerade_toolbar() {
-  $items = array();
-  if (\Drupal::service('masquerade')->isMasquerading()) {
-    $items['masquerade_switch_back'] = array(
-      '#type' => 'toolbar_item',
-      'tab' => array(
-        '#type' => 'link',
-        '#title' => t('Unmasquerade'),
-        '#url' => Url::fromRoute('masquerade.unmasquerade'),
-      ),
-      // Hopefully shows immediately after the username tab.
-      '#weight' => 101,
-    );
-  }
-  return $items;
-}
-
-/**
- * Returns whether the current user is allowed to masquerade as a certain target user.
- *
- * @param \Drupal\user\UserInterface $target_account
- *   The user account object to masquerade as.
- *
- * @return bool
- *   TRUE if allowed, FALSE otherwise.
- *
- * @see hook_masquerade_access()
- */
-function masquerade_target_user_access(UserInterface $target_account) {
-  $user = \Drupal::currentUser();
-
-  // Deny access if the current user is masquerading already or tries to
-  // masquerade as himself.
-  if (\Drupal::service('masquerade')->isMasquerading() || $user->id() == $target_account->id()) {
-    return FALSE;
-  }
-
-  // Invoke hook_masquerade_access() implementations.
-  $access = NULL;
-  foreach (\Drupal::moduleHandler()->getImplementations('masquerade_access') as $module) {
-    $function = $module . '_masquerade_access';
-    $result = $function($user, $target_account);
-    // If an implementation explicitly denies access, then there is nothing else
-    // to check.
-    if ($result === FALSE) {
-      $access = FALSE;
-      break;
-    }
-    elseif ($result === TRUE) {
-      $access = TRUE;
-    }
-  }
-  // If no module granted access, then access is denied.
-  if (!isset($access) || !$access) {
-    return FALSE;
-  }
-  return TRUE;
-}
-
-/**
- * Implements hook_masquerade_access().
- *
- * This default implementation only returns TRUE and never FALSE, since
- * alternative access implementations could not work otherwise.
- */
-function masquerade_masquerade_access($user, UserInterface $target_account) {
-  // Uid 1 may masquerade as anyone.
-  if ($user->id() == 1) {
-    return TRUE;
-  }
-  // Uid 1 gets special treatment with its own permission.
-  if ($target_account->id() == 1) {
-    if ($user->hasPermission('masquerade as super user')) {
-      return TRUE;
-    }
-    else {
-      return;
-    }
-  }
-  // The current user must be allowed to masquerade.
-  if ($user->hasPermission('masquerade as any user')) {
-    return TRUE;
-  }
-  // Permissions may be granted on a per-role basis.
-  $target_account_roles = $target_account->getRoles();
-  foreach ($target_account_roles as $role_id) {
-    if ($user->hasPermission('masquerade as ' . $role_id)) {
-      if ($role_id === UserInterface::AUTHENTICATED_ROLE) {
-        // Make sure that this is the only role user has to prevent collision
-        // with 'masquerade as any user' permission.
-        if (count($target_account_roles) == 1) {
-          return TRUE;
-        }
-      }
-      else {
-        return TRUE;
-      }
-    }
-  }
-}
-
-/**
- * Implements hook_entity_extra_field_info().
- */
-function masquerade_entity_extra_field_info() {
-  $fields['user']['user']['display']['masquerade'] = array(
-    'label' => t('Masquerade'),
-    'description' => t('Masquerade as user link.'),
-    'weight' => 50,
-  );
-  return $fields;
-}
-
-/**
- * Implements hook_ENTITY_TYPE_view().
- */
-function masquerade_user_view(array &$build, UserInterface $account, EntityViewDisplayInterface $display, $view_mode) {
-  if ($display->getComponent('masquerade')) {
-    // Use post render to allow caching.
-    $build['masquerade'] = [
-      '#lazy_builder' => [
-        'masquerade_render_cache_link', [
-          $account->id(),
-        ],
-      ],
-      '#create_placeholder' => TRUE,
-    ];
-  }
-}
-
-/**
- * #post_render_cache callback; replaces placeholder with masquerade link.
- *
- * @param int $account_id
- *   The account ID.
- *
- * @return array
- *   A renderable array containing the comment form.
- *
- * @todo Move to service.
- */
-function masquerade_render_cache_link($account_id) {
-  /** @var \Drupal\user\UserInterface $account */
-  $account = User::load($account_id);
-  $markup = '';
-  if (masquerade_target_user_access($account)) {
-    // @todo Attaching a CSS class to this would be nice.
-    $markup = [
-      '#type' => 'link',
-      '#title' => t('Masquerade as @name', ['@name' => $account->getDisplayName()]),
-      '#url' => $account->toUrl('masquerade'),
-    ];
-    $markup = \Drupal::service('renderer')->render($markup);
-  }
-  $element['#markup'] = $markup;
-  return $element;
-}
-
-/**
- * Implements hook_entity_type_alter().
- *
- * Adds useful link template to user entity.
- */
-function masquerade_entity_type_alter(array &$entity_types) {
-  /** @var \Drupal\Core\Entity\EntityTypeInterface[] $entity_types */
-  $entity_types['user']->setLinkTemplate('masquerade', '/user/{user}/masquerade');
-}
-
-/**
- * Implements hook_entity_operation().
- */
-function masquerade_entity_operation(EntityInterface $entity) {
-  $operations = array();
-  if ($entity->getEntityTypeId() === 'user') {
-    if (masquerade_target_user_access($entity)) {
-      $operations['masquerade'] = array(
-        'title' => t('Masquerade as'),
-        'weight' => 100,
-        'url' => $entity->toUrl('masquerade'),
-      );
-    }
-  }
-  return $operations;
-}
-
-/**
- * Validates whether the current user can masquerade as a given target user.
- *
- * Use this function to generate user-friendly error messages to show in the
- * user interface.
- *
- * @param \Drupal\user\UserInterface $target_account
- *   The user account object to masquerade as.
- *
- * @return string|null
- *   A string containing a validation error message, or NULL if the current user
- *   can masquerade as $target_account.
- */
-function masquerade_switch_user_validate(UserInterface $target_account) {
-  $user = \Drupal::currentUser();
-
-  if (\Drupal::service('masquerade')->isMasquerading()) {
-    return t('You are masquerading already. Please <a href="@unmasquerade-url">switch back</a> to your account to masquerade as another user.', array(
-      '@unmasquerade-url' => Url::fromRoute('masquerade.unmasquerade')->toString(),
-    ));
-  }
-  if ($target_account->id() == $user->id()) {
-    return t('You cannot masquerade as yourself. Please choose a different user to masquerade as.');
-  }
-  if (\Drupal::config('system.maintenance')->get('enabled') && !$target_account->hasPermission('access site in maintenance mode')) {
-    return t('@user is not permitted to %permission. <a href=":maintenance-url">Disable maintenance mode</a> to masquerade as @user.', array(
-      '%user' => $target_account->getDisplayName(),
-      '%permission' => t('Use the site in maintenance mode'),
-      ':maintenance-url' => Url::fromRoute('system.site_maintenance_mode')->toString(),
-    ));
-  }
-  if (!masquerade_target_user_access($target_account)) {
-    return t('You are not allowed to masquerade as %name.', array(
-      '%name' => $target_account->getDisplayName(),
-    ));
-  }
-}
diff --git a/modules/masquerade/masquerade.permissions.yml b/modules/masquerade/masquerade.permissions.yml
deleted file mode 100644
index 0774364..0000000
--- a/modules/masquerade/masquerade.permissions.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-masquerade as any user:
-  title: 'Masquerade as any user except super user'
-  restrict access: true
-
-masquerade as super user:
-  title: 'Masquerade as super user (UID 1)'
-  restrict access: true
-
-permission_callbacks:
-  - Drupal\masquerade\MasqueradePermissions::permissions
diff --git a/modules/masquerade/masquerade.routing.yml b/modules/masquerade/masquerade.routing.yml
deleted file mode 100644
index 8fe39ee..0000000
--- a/modules/masquerade/masquerade.routing.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-masquerade.block:
-  path: '/masquerade'
-  defaults:
-    _form: '\Drupal\masquerade\Form\MasqueradeForm'
-    _title: 'Masquerade'
-  options:
-    no_cache: TRUE
-  requirements:
-    _masquerade_switch_access: 'TRUE'
-
-entity.user.masquerade:
-  path: '/user/{user}/masquerade'
-  defaults:
-    _controller: '\Drupal\masquerade\Controller\SwitchController::switchTo'
-    _title: 'Masquerade'
-  requirements:
-    _csrf_token: 'TRUE'
-
-masquerade.unmasquerade:
-  path: '/unmasquerade'
-  defaults:
-    _controller: '\Drupal\masquerade\Controller\SwitchController::switchBack'
-    _title: 'Unmasquerade'
-  requirements:
-    _user_is_masquerading: 'TRUE'
-    _csrf_token: 'TRUE'
diff --git a/modules/masquerade/masquerade.services.yml b/modules/masquerade/masquerade.services.yml
deleted file mode 100644
index b54cedf..0000000
--- a/modules/masquerade/masquerade.services.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-services:
-  masquerade:
-    class: Drupal\masquerade\Masquerade
-    arguments: ['@current_user', '@entity_type.manager', '@module_handler', '@session_manager', '@logger.channel.masquerade', '@user.permissions']
-  logger.channel.masquerade:
-    parent: logger.channel_base
-    arguments: ['masquerade']
-  access_check.masquerade.switch:
-    class: Drupal\masquerade\Access\SwitchAccessCheck
-    arguments: ['@masquerade']
-    tags:
-      - { name: access_check, applies_to: _masquerade_switch_access }
-  access_check.masquerade.unmasquerade:
-    class: Drupal\masquerade\Access\UnmasqueradeAccessCheck
-    arguments: ['@masquerade']
-    tags:
-      - { name: access_check, applies_to: _user_is_masquerading }
-  cache_context.session.is_masquerading:
-    class: Drupal\masquerade\Cache\MasqueradeCacheContext
-    arguments: ['@request_stack']
-    tags:
-      - { name: cache.context }
diff --git a/modules/masquerade/src/Access/SwitchAccessCheck.php b/modules/masquerade/src/Access/SwitchAccessCheck.php
deleted file mode 100644
index 76316e5..0000000
--- a/modules/masquerade/src/Access/SwitchAccessCheck.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Drupal\masquerade\Access;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\masquerade\Masquerade;
-
-/**
- * Checks access for any masquerade permissions.
- */
-class SwitchAccessCheck implements AccessInterface {
-
-  /**
-   * The masquerade service.
-   *
-   * @var \Drupal\masquerade\Masquerade
-   */
-  protected $masquerade;
-
-  /**
-   * Constructs a new UnmasqueradeAccessCheck object.
-   *
-   * @param \Drupal\masquerade\Masquerade $masquerade
-   *   The masquerade service.
-   */
-  public function __construct(Masquerade $masquerade) {
-    $this->masquerade = $masquerade;
-  }
-
-  /**
-   * Check to see if user has any permissions to masquerade.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   Run access checks for this account.
-   *
-   * @return \Drupal\Core\Access\AccessResultInterface
-   *   The access result.
-   */
-  public function access(AccountInterface $account) {
-    if ($this->masquerade->isMasquerading()) {
-      // Do now allow to masquerade when already masquerading.
-      $result = AccessResult::forbidden();
-    }
-    elseif ($account->id() == 1) {
-      // Uid 1 may masquerade as anyone.
-      $result = AccessResult::allowed();
-    }
-    else {
-      // Ability to masquerade defined by permissions.
-      $permissions = $this->masquerade->getPermissions();
-      $result = AccessResult::allowedIfHasPermissions($account, $permissions, 'OR');
-    }
-    return $result->addCacheContexts(['session.is_masquerading']);
-  }
-
-}
diff --git a/modules/masquerade/src/Access/UnmasqueradeAccessCheck.php b/modules/masquerade/src/Access/UnmasqueradeAccessCheck.php
deleted file mode 100644
index d9613c5..0000000
--- a/modules/masquerade/src/Access/UnmasqueradeAccessCheck.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Drupal\masquerade\Access;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\masquerade\Masquerade;
-
-/**
- * Checks access based on the masquerade status of the user.
- */
-class UnmasqueradeAccessCheck implements AccessInterface {
-
-  /**
-   * The masquerade service.
-   *
-   * @var \Drupal\masquerade\Masquerade
-   */
-  protected $masquerade;
-
-  /**
-   * Constructs a new UnmasqueradeAccessCheck object.
-   *
-   * @param \Drupal\masquerade\Masquerade $masquerade
-   *   The masquerade service.
-   */
-  public function __construct(Masquerade $masquerade) {
-    $this->masquerade = $masquerade;
-  }
-
-  /**
-   * Check to see if user is masquerading.
-   *
-   * @return \Drupal\Core\Access\AccessResultInterface
-   *   The access result.
-   */
-  public function access() {
-    return AccessResult::allowedIf($this->masquerade->isMasquerading())
-      ->addCacheContexts(['session.is_masquerading']);
-  }
-
-}
diff --git a/modules/masquerade/src/Cache/MasqueradeCacheContext.php b/modules/masquerade/src/Cache/MasqueradeCacheContext.php
deleted file mode 100644
index 8159f01..0000000
--- a/modules/masquerade/src/Cache/MasqueradeCacheContext.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Drupal\masquerade\Cache;
-
-use Drupal\Core\Cache\CacheableMetadata;
-use Drupal\Core\Cache\Context\CacheContextInterface;
-use Drupal\Core\Cache\Context\RequestStackCacheContextBase;
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-
-/**
- * Defines the MasqueradeCacheContext service, for "masquerade" caching.
- *
- * Cache context ID: 'session.is_masquerading'.
- */
-class MasqueradeCacheContext extends RequestStackCacheContextBase implements CacheContextInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getLabel() {
-    return new TranslatableMarkup('User is masquerading');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getContext() {
-    return !empty($_SESSION['masquerading']) ? '1' : '0';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheableMetadata() {
-    return new CacheableMetadata();
-  }
-
-}
diff --git a/modules/masquerade/src/Controller/SwitchController.php b/modules/masquerade/src/Controller/SwitchController.php
deleted file mode 100644
index fc31ddc..0000000
--- a/modules/masquerade/src/Controller/SwitchController.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-namespace Drupal\masquerade\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Url;
-use Drupal\masquerade\Masquerade;
-use Drupal\user\UserInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Controller for switch and back to masquerade as user.
- */
-class SwitchController extends ControllerBase {
-
-  /**
-   * The masquerade service.
-   *
-   * @var \Drupal\masquerade\Masquerade
-   */
-  protected $masquerade;
-
-  /**
-   * Constructs a new SwitchController object.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   The current user
-   * @param \Drupal\masquerade\Masquerade $masquerade
-   *   The masquerade service.
-   */
-  public function __construct(AccountInterface $current_user, Masquerade $masquerade) {
-    $this->currentUser = $current_user;
-    $this->masquerade = $masquerade;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('current_user'),
-      $container->get('masquerade')
-    );
-  }
-
-  /**
-   * Masquerades the current user as a given user.
-   *
-   * Access to masquerade as the target user account has to checked by all callers
-   * via masquerade_target_user_access() already.
-   *
-   * @param \Drupal\user\UserInterface $user
-   *   The user account object to masquerade as.
-   *
-   * @return \Symfony\Component\HttpFoundation\RedirectResponse
-   *   Redirect to previous page.
-   *
-   * @see this::getRedirectResponse()
-   */
-  public function switchTo(UserInterface $user) {
-    // Store current user for messages.
-    $account = $this->currentUser;
-    $error = masquerade_switch_user_validate($user);
-    if (empty($error)) {
-      if ($this->masquerade->switchTo($user)) {
-        drupal_set_message($this->t('You are now masquerading as @user.', array(
-          '@user' => $account->getDisplayName(),
-        )));
-      }
-    }
-    else {
-      drupal_set_message($error, 'error');
-    }
-    return $this->getRedirectResponse();
-  }
-
-  /**
-   * Allows a user who is currently masquerading to become a new user.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request object.
-   *
-   * @return \Symfony\Component\HttpFoundation\RedirectResponse
-   *   Redirect response to previous page.
-   *
-   * @see this::getRedirectResponse()
-   */
-  public function switchBack(Request $request) {
-    // Store current user name for messages.
-    $account_name = $this->currentUser->getDisplayName();
-    if ($this->masquerade->switchBack()) {
-      drupal_set_message($this->t('You are no longer masquerading as @user.', array(
-        '@user' => $account_name,
-      )));
-    }
-    else {
-      drupal_set_message($this->t('Error trying unmasquerading as @user.', array(
-        '@user' => $account_name,
-      )), 'error');
-    }
-    return $this->getRedirectResponse($request);
-  }
-
-  /**
-   * Returns redirect response to previous page.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request|null $request
-   *   (Optional) The request object.
-   *
-   * @return \Symfony\Component\HttpFoundation\RedirectResponse
-   *   The redirect.
-   *
-   * @see \Drupal\Core\EventSubscriber\RedirectResponseSubscriber::checkRedirectUrl()
-   */
-  protected function getRedirectResponse($request = NULL) {
-    if (!isset($request)) {
-      $request = \Drupal::request();
-    }
-    $destination = \Drupal::destination();
-    if ($destination_path = $destination->get()) {
-      // Try destination first.
-      $url = Url::createFromRequest(Request::create($destination_path));
-    }
-    elseif ($redirect_path = $request->server->get('HTTP_REFERER')) {
-      // Parse referer to get route name if any.
-      $url = Url::createFromRequest(Request::create($redirect_path));
-    }
-    else {
-      // Fallback to front page if no referrer.
-      $url = Url::fromRoute('<front>');
-    }
-    // Check access for redirected url.
-    if (!$url->access($this->currentUser)) {
-      // Fallback to front page redirect.
-      $url = Url::fromRoute('<front>');
-    }
-    $url = $url->setAbsolute()->toString();
-    if ($destination_path) {
-      // Override destination because it will take over response.
-      $request->query->set('destination', $url);
-      $destination->set($url);
-    }
-    return new RedirectResponse($url);
-  }
-
-}
diff --git a/modules/masquerade/src/Form/MasqueradeForm.php b/modules/masquerade/src/Form/MasqueradeForm.php
deleted file mode 100644
index a2b4ed3..0000000
--- a/modules/masquerade/src/Form/MasqueradeForm.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-namespace Drupal\masquerade\Form;
-
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\masquerade\Masquerade;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Form builder for the masquerade form.
- */
-class MasqueradeForm extends FormBase {
-
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * The masquerade service.
-   *
-   * @var \Drupal\masquerade\Masquerade
-   */
-  protected $masquerade;
-
-  /**
-   * Constructs a MasqueradeForm object.
-   *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
-   * @param \Drupal\masquerade\Masquerade $masquerade
-   *   The masquerade service.
-   */
-  public function __construct(EntityManagerInterface $entity_manager, Masquerade $masquerade) {
-    $this->entityManager = $entity_manager;
-    $this->masquerade = $masquerade;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.manager'),
-      $container->get('masquerade')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'masquerade_block_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['autocomplete'] = array(
-      '#type' => 'container',
-      '#attributes' => array('class' => array('container-inline')),
-    );
-    $form['autocomplete']['masquerade_as'] = array(
-      '#type' => 'entity_autocomplete',
-      '#target_type' => 'user',
-      '#selection_settings' => ['include_anonymous' => FALSE, 'match_operator' => 'STARTS_WITH'],
-      '#title' => $this->t('Username'),
-      '#title_display' => 'invisible',
-      '#required' => TRUE,
-      '#placeholder' => $this->t('Masquerade as…'),
-      '#size' => '18',
-    );
-    $form['autocomplete']['actions'] = array('#type' => 'actions');
-    $form['autocomplete']['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => $this->t('Switch'),
-    );
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $user_id = $form_state->getValue('masquerade_as');
-    if (empty($user_id)) {
-      $form_state->setErrorByName('masquerade_as', $this->t('The user does not exist. Please enter a valid username.'));
-      return;
-    }
-    $target_account = $this->entityManager
-      ->getStorage('user')
-      ->load($user_id);
-    if ($error = masquerade_switch_user_validate($target_account)) {
-      $form_state->setErrorByName('masquerade_as', $error);
-    }
-    else {
-      $form_state->setValue('masquerade_target_account', $target_account);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->masquerade->switchTo($form_state->getValue('masquerade_target_account'));
-  }
-
-}
diff --git a/modules/masquerade/src/Masquerade.php b/modules/masquerade/src/Masquerade.php
deleted file mode 100644
index a718037..0000000
--- a/modules/masquerade/src/Masquerade.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-namespace Drupal\masquerade;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Routing\LinkGeneratorTrait;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Session\SessionManagerInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\user\PermissionHandlerInterface;
-use Drupal\user\UserInterface;
-use Psr\Log\LoggerInterface;
-
-/**
- * Defines a masquerade service to switch user account.
- */
-class Masquerade {
-  use StringTranslationTrait;
-  use LinkGeneratorTrait;
-
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountProxyInterface
-   */
-  protected $currentUser;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The session manager.
-   *
-   * @var \Drupal\Core\Session\SessionManagerInterface
-   */
-  protected $sessionManager;
-
-  /**
-   * The logger instance.
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  protected $logger;
-
-  /**
-   * The permission handler.
-   *
-   * @var \Drupal\user\PermissionHandlerInterface
-   */
-  protected $permissionHandler;
-
-  /**
-   * Constructs Masquerade object.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   The current user.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   * @param \Drupal\Core\Session\SessionManagerInterface $session_manager
-   *   The session manager.
-   * @param \Psr\Log\LoggerInterface $logger
-   *   The logger instance.
-   * @param \Drupal\user\PermissionHandlerInterface $permission_handler
-   *   The permission handler.
-   */
-  public function __construct(AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler, SessionManagerInterface $session_manager, LoggerInterface $logger, PermissionHandlerInterface $permission_handler) {
-    $this->currentUser = $current_user;
-    $this->entityTypeManager = $entity_type_manager;
-    $this->moduleHandler = $module_handler;
-    $this->sessionManager = $session_manager;
-    $this->logger = $logger;
-    $this->permissionHandler = $permission_handler;
-  }
-
-  /**
-   * Returns whether the current user is masquerading.
-   *
-   * @return bool
-   */
-  public function isMasquerading() {
-    // @todo Check to use some session related service.
-    return !empty($_SESSION['masquerading']);
-  }
-
-  /**
-   * Masquerades the current user as a given user.
-   *
-   * @param \Drupal\user\UserInterface $target_account
-   *   The user account object to masquerade as.
-   *
-   * @return bool
-   *   TRUE when masqueraded, FALSE otherwise.
-   */
-  public function switchTo(UserInterface $target_account) {
-    $account = $this->currentUser->getAccount();
-
-    // Call logout hooks when switching from original user.
-    $this->moduleHandler->invokeAll('user_logout', [$account]);
-
-    // Regenerate the session ID to prevent against session fixation attacks.
-    $this->sessionManager->regenerate();
-
-    $_SESSION['masquerading'] = $account->id();
-
-    // Supposed "safe" user switch method:
-    // https://www.drupal.org/node/218104
-    //$accountSwitcher = Drupal::service('account_switcher');
-    //$accountSwitcher->switchTo(new UserSession(array('uid' => $account->id())));
-    $this->currentUser->setAccount($target_account);
-    \Drupal::service('session')->set('uid', $target_account->id());
-
-    // Call all login hooks when switching to masquerading user.
-    $this->moduleHandler->invokeAll('user_login', [$target_account]);
-
-    $this->logger->info('User %username masqueraded as %target_username.', array(
-      '%username' => $account->getDisplayName(),
-      '%target_username' => $target_account->getDisplayName(),
-      'link' => $this->l($this->t('view'), $target_account->toUrl()),
-    ));
-    return TRUE;
-  }
-
-  /**
-   * Switching back to previous user.
-   *
-   * @return bool
-   *   TRUE when switched back, FALSE otherwise.
-   */
-  public function switchBack() {
-    if (empty($_SESSION['masquerading'])) {
-      return FALSE;
-    }
-    $new_user = $this->entityTypeManager
-      ->getStorage('user')
-      ->load($_SESSION['masquerading']);
-
-    // Ensure the flag is cleared.
-    unset($_SESSION['masquerading']);
-    if (!$new_user) {
-      return FALSE;
-    }
-
-    $account = $this->currentUser->getAccount();
-    // Call logout hooks when switching from masquerading user.
-    $this->moduleHandler->invokeAll('user_logout', [$account]);
-    // Regenerate the session ID to prevent against session fixation attacks.
-    // @todo Maybe session service migrate.
-    $this->sessionManager->regenerate();
-
-    $this->currentUser->setAccount($new_user);
-    \Drupal::service('session')->set('uid', $new_user->id());
-
-    // Call all login hooks when switching back to original user.
-    $this->moduleHandler->invokeAll('user_login', [$new_user]);
-
-    $this->logger->info('User %username stopped masquerading as %old_username.', array(
-      '%username' => $new_user->getDisplayName(),
-      '%old_username' => $account->getDisplayName(),
-      'link' => $this->l($this->t('view'), $new_user->toUrl()),
-    ));
-    return TRUE;
-  }
-
-  /**
-   * Returns module provided permissions.
-   *
-   * @return array
-   *   Array of permission names.
-   */
-  public function getPermissions() {
-    $permissions = [];
-    foreach ($this->permissionHandler->getPermissions() as $name => $permission) {
-      if ($permission['provider'] === 'masquerade') {
-        // Filter only module's permissions.
-        $permissions[] = $name;
-      }
-    }
-    return $permissions;
-  }
-
-}
diff --git a/modules/masquerade/src/MasqueradePermissions.php b/modules/masquerade/src/MasqueradePermissions.php
deleted file mode 100644
index 2732319..0000000
--- a/modules/masquerade/src/MasqueradePermissions.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\masquerade;
-
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\user\Entity\Role;
-use Drupal\user\RoleInterface;
-
-/**
- * Provides dynamic permissions of the masquerade module.
- */
-class MasqueradePermissions {
-
-  use StringTranslationTrait;
-
-  /**
-   * Returns an array of masquerade permissions.
-   *
-   * @todo Allow permissions for each role to masquerade as as subset of roles
-   *   https://drupal.org/node/1171500
-   *
-   * @return array
-   */
-  public function permissions() {
-    $permissions = [];
-
-    // Anonymous was intentionally left out. Logout instead.
-    $roles = $this->getUserRoles();
-    foreach ($roles as $rid => $role) {
-      $permissions['masquerade as ' . $role->id()] = [
-        'title' => $this->t('Masquerade as @role', ['@role' => $role->label()]),
-        'restrict access' => TRUE
-      ];
-    }
-
-    return $permissions;
-  }
-
-  /**
-   * Returns role entities allowed to masquerade as.
-   *
-   * @return \Drupal\user\RoleInterface[]
-   *   An associative array with the role id as the key and the role object as
-   *   value.
-   */
-  protected function getUserRoles() {
-    $roles = Role::loadMultiple();
-    // Do not allow masquerade as anonymous user, use private browsing.
-    unset($roles[RoleInterface::ANONYMOUS_ID]);
-    return $roles;
-  }
-
-}
diff --git a/modules/masquerade/src/Plugin/Block/MasqueradeBlock.php b/modules/masquerade/src/Plugin/Block/MasqueradeBlock.php
deleted file mode 100644
index 4f2c68c..0000000
--- a/modules/masquerade/src/Plugin/Block/MasqueradeBlock.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace Drupal\masquerade\Plugin\Block;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Block\BlockBase;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\masquerade\Masquerade;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a 'Masquerade' block.
- *
- * @Block(
- *   id = "masquerade",
- *   admin_label = @Translation("Masquerade"),
- *   category = @Translation("Forms"),
- * )
- */
-class MasqueradeBlock extends BlockBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The form builder service.
-   *
-   * @var \Drupal\Core\Form\FormBuilderInterface
-   */
-  protected $formBuilder;
-
-  /**
-   * The masquerade service.
-   *
-   * @var \Drupal\masquerade\Masquerade
-   */
-  protected $masquerade;
-
-  /**
-   * Constructs a new MasqueradeBlock object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
-   *   The form builder service.
-   * @param \Drupal\masquerade\Masquerade $masquerade
-   *   The masquerade service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, FormBuilderInterface $form_builder, Masquerade $masquerade) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->formBuilder = $form_builder;
-    $this->masquerade = $masquerade;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('form_builder'),
-      $container->get('masquerade')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function blockAccess(AccountInterface $account) {
-    if ($this->masquerade->isMasquerading()) {
-      return AccessResult::forbidden()->addCacheContexts(['session.is_masquerading']);
-    }
-    // Display block for all users that has any of masquerade permissions.
-    return AccessResult::allowedIfHasPermissions($account, $this->masquerade->getPermissions(), 'OR')
-      ->addCacheContexts(['session.is_masquerading']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheContexts() {
-    return Cache::mergeContexts(parent::getCacheContexts(), ['session.is_masquerading']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build() {
-    return $this->formBuilder->getForm('Drupal\masquerade\Form\MasqueradeForm');
-  }
-
-}
diff --git a/modules/masquerade/src/Tests/MasqueradeAccessTest.php b/modules/masquerade/src/Tests/MasqueradeAccessTest.php
deleted file mode 100644
index 739e92e..0000000
--- a/modules/masquerade/src/Tests/MasqueradeAccessTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace Drupal\masquerade\Tests;
-
-/**
- * Tests masquerade access mechanism.
- *
- * @todo Convert into DUTB. This is essentially a unit test for
- *   masquerade_target_user_access() only.
- *
- * @group masquerade
- */
-class MasqueradeAccessTest extends MasqueradeWebTestBase {
-
-  /**
-   * Tests masquerade access for different source and target users.
-   *
-   * Test plan summary:
-   * - root » admin
-   * - admin » root
-   * - admin » moderator (more roles but less privileges)
-   * - admin » masquerade (different role)
-   * - admin » auth (less roles)
-   * - moderator ! root
-   * - moderator ! admin (less roles but more privileges)
-   * - moderator ! editor (different roles + privileges)
-   * - moderator » masquerade (less roles)
-   * - moderator » auth
-   * - [editor is access-logic-wise equal to moderator, so skipped]
-   * - masquerade ! root
-   * - masquerade ! admin (different role with more privileges)
-   * - masquerade ! moderator (more roles)
-   * - masquerade » auth
-   * - masquerade ! masquerade (self)
-   * - auth ! *
-   */
-  public function testAccess() {
-    $this->drupalLogin($this->rootUser);
-    $this->assertCanMasqueradeAs($this->admin_user);
-
-    $this->drupalLogin($this->admin_user);
-    // Permission 'masquerade as super user' granted by default.
-    $this->assertCanMasqueradeAs($this->rootUser);
-    // Permission 'masquerade as any user' granted by default.
-    $this->assertCanMasqueradeAs($this->moderator_user);
-    $this->assertCanMasqueradeAs($this->editor_user);
-    $this->assertCanMasqueradeAs($this->masquerade_user);
-    $this->assertCanMasqueradeAs($this->auth_user);
-
-    // Test 'masquerade as any user' permission except UID 1.
-    $this->drupalLogin($this->moderator_user);
-    $this->assertCanNotMasqueradeAs($this->rootUser);
-    $this->assertCanMasqueradeAs($this->admin_user);
-    $this->assertCanMasqueradeAs($this->editor_user);
-    $this->assertCanMasqueradeAs($this->masquerade_user);
-    $this->assertCanMasqueradeAs($this->auth_user);
-
-    // Test 'masquerade as @role' permission.
-    $this->drupalLogin($this->editor_user);
-    $this->assertCanNotMasqueradeAs($this->rootUser);
-    $this->assertCanNotMasqueradeAs($this->admin_user);
-    $this->assertCanNotMasqueradeAs($this->moderator_user);
-    $this->assertCanMasqueradeAs($this->masquerade_user);
-    $this->assertCanMasqueradeAs($this->auth_user);
-
-    // Test 'masquerade as authenticated' permission.
-    $this->drupalLogin($this->masquerade_user);
-    $this->assertCanNotMasqueradeAs($this->rootUser);
-    $this->assertCanNotMasqueradeAs($this->admin_user);
-    $this->assertCanNotMasqueradeAs($this->moderator_user);
-    $this->assertCanNotMasqueradeAs($this->editor_user);
-    $this->assertCanMasqueradeAs($this->auth_user);
-
-    // Verify that a user cannot masquerade as himself.
-    $edit = [
-      'masquerade_as' => $this->masquerade_user->getAccountName(),
-    ];
-    $this->drupalPostForm('masquerade', $edit, t('Switch'));
-    $this->assertRaw(t('You cannot masquerade as yourself. Please choose a different user to masquerade as.'));
-    $this->assertNoText(t('Unmasquerade'));
-
-    // Basic 'masquerade' permission check.
-    $this->drupalLogin($this->auth_user);
-    $this->drupalGet('masquerade');
-    $this->assertResponse(403);
-  }
-
-  /**
-   * Asserts that the logged-in user can masquerade as a given target user.
-   *
-   * @param \Drupal\user\UserInterface $target_account
-   *   The user to masquerade to.
-   */
-  protected function assertCanMasqueradeAs($target_account) {
-    $edit = [
-      'masquerade_as' => $target_account->getAccountName(),
-    ];
-    $this->drupalPostForm('masquerade', $edit, t('Switch'));
-    $this->assertNoRaw(t('You are not allowed to masquerade as %name.', [
-      '%name' => $target_account->getDisplayName(),
-    ]));
-    $this->clickLink(t('Unmasquerade'));
-  }
-
-  /**
-   * Asserts that the logged-in user can not masquerade as a given target user.
-   *
-   * @param \Drupal\user\UserInterface $target_account
-   *   The user to masquerade to.
-   */
-  protected function assertCanNotMasqueradeAs($target_account) {
-    $edit = [
-      'masquerade_as' => $target_account->getAccountName(),
-    ];
-    $this->drupalPostForm('masquerade', $edit, t('Switch'));
-    $this->assertRaw(t('You are not allowed to masquerade as %name.', [
-      '%name' => $target_account->getDisplayName(),
-    ]));
-    $this->assertNoText(t('Unmasquerade'));
-  }
-
-}
diff --git a/modules/masquerade/src/Tests/MasqueradeCacheTest.php b/modules/masquerade/src/Tests/MasqueradeCacheTest.php
deleted file mode 100644
index 6d6d7c8..0000000
--- a/modules/masquerade/src/Tests/MasqueradeCacheTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Drupal\masquerade\Tests;
-
-/**
- * Tests caching for masquerade.
- *
- * @group masquerade
- */
-class MasqueradeCacheTest extends MasqueradeWebTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'masquerade',
-    'user',
-    'block',
-    'node',
-    'dynamic_page_cache',
-  ];
-
-  /**
-   * Tests caching for the user switch block.
-   */
-  public function testMasqueradeSwitchBlockCaching() {
-    // Create two masquerade users.
-    $umberto = $this->drupalCreateUser([
-      'masquerade as any user',
-      'access content',
-    ], 'umberto');
-    $nelle = $this->drupalCreateUser([
-      'masquerade as any user',
-      'access content',
-    ], 'nelle');
-
-    // Add the Masquerade block to the sidebar.
-    $masquerade_block = $this->drupalPlaceBlock('masquerade');
-
-    // Login as Umberto.
-    $this->drupalLogin($umberto);
-    $this->drupalGet('<front>');
-    $this->assertBlockAppears($masquerade_block);
-
-    // Masquerade as Nelle.
-    $edit = ['masquerade_as' => $nelle->getAccountName()];
-    $this->drupalPostForm(NULL, $edit, t('Switch'));
-    $this->drupalGet('<front>');
-    $this->assertNoBlockAppears($masquerade_block);
-
-    // Logout, and log in as Nelle.
-    $this->drupalLogout();
-    $this->drupalLogin($nelle);
-    $this->drupalGet('<front>');
-    $this->assertBlockAppears($masquerade_block);
-  }
-
-}
diff --git a/modules/masquerade/src/Tests/MasqueradeTest.php b/modules/masquerade/src/Tests/MasqueradeTest.php
deleted file mode 100644
index af29618..0000000
--- a/modules/masquerade/src/Tests/MasqueradeTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Drupal\masquerade\Tests;
-
-/**
- * Tests form permissions and user switching functionality.
- *
- * @group masquerade
- */
-class MasqueradeTest extends MasqueradeWebTestBase {
-
-  /**
-   * Tests masquerade user links.
-   */
-  public function testMasquerade() {
-    $this->drupalLogin($this->admin_user);
-
-    // Verify that a token is required.
-    $this->drupalGet('user/0/masquerade');
-    $this->assertResponse(403);
-    $this->drupalGet('user/' . $this->auth_user->id() . '/masquerade');
-    $this->assertResponse(403);
-
-    // Verify that the admin user is able to masquerade.
-    $this->assertSessionByUid($this->admin_user->id(), FALSE);
-    $this->masqueradeAs($this->auth_user);
-    $this->assertSessionByUid($this->auth_user->id(), $this->admin_user->id());
-    $this->assertNoSessionByUid($this->admin_user->id());
-
-    // Verify that a token is required to unmasquerade.
-    $this->drupalGet('unmasquerade');
-    $this->assertResponse(403);
-
-    // Verify that the web user cannot masquerade.
-    $this->drupalGet('user/' . $this->admin_user->id() . '/masquerade', [
-      'query' => [
-        'token' => $this->drupalGetToken('user/' . $this->admin_user->id() . '/masquerade'),
-      ],
-    ]);
-    $this->assertResponse(403);
-
-    // Verify that the user can unmasquerade.
-    $this->unmasquerade($this->auth_user);
-    $this->assertNoSessionByUid($this->auth_user->id());
-    $this->assertSessionByUid($this->admin_user->id(), FALSE);
-  }
-
-}
-
diff --git a/modules/masquerade/src/Tests/MasqueradeWebTestBase.php b/modules/masquerade/src/Tests/MasqueradeWebTestBase.php
deleted file mode 100644
index 7f55415..0000000
--- a/modules/masquerade/src/Tests/MasqueradeWebTestBase.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-
-namespace Drupal\masquerade\Tests;
-
-use Drupal\Component\Utility\Crypt;
-use Drupal\Core\Site\Settings;
-use Drupal\simpletest\WebTestBase;
-use Drupal\user\Entity\Role;
-use Drupal\user\UserInterface;
-
-/**
- * Base test class for Masquerade module web tests.
- *
- * @todo Core: $this->session_id is reset to NULL upon every internal browser
- *   request.
- * @see http://drupal.org/node/1555862
- */
-abstract class MasqueradeWebTestBase extends WebTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = ['masquerade', 'user', 'block'];
-
-  /**
-   * Various users for the tests.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $admin_user, $auth_user, $editor_user, $masquerade_user, $moderator_user;
-
-  /**
-   * Various roles for the tests.
-   *
-   * @var \Drupal\user\RoleInterface
-   */
-  protected $admin_role, $editor_role, $masquerade_role, $moderator_role;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Create and configure User module's admin role.
-    $this->admin_role = Role::create([
-      'id' => 'administrator',
-      'label' => 'Administrator',
-    ]);
-    // Users in this role get all permissions assigned by default.
-    $this->admin_role->set('is_admin', TRUE)->save();
-
-    // Create a 'masquerade' role to masquerade as users without roles.
-    $this->masquerade_role = Role::create([
-      'id' => 'masquerade',
-      'label' => 'Masquerade',
-    ]);
-    $this->masquerade_role
-      // Allow only authenticated (without any other roles).
-      ->grantPermission('masquerade as authenticated')
-      ->save();
-
-    // Create an additional 'editor' role to masquerade as basic users.
-    $this->editor_role = Role::create([
-      'id' => 'editor',
-      'label' => 'Editor',
-    ]);
-    $this->editor_role
-      ->grantPermission('masquerade as masquerade')
-      ->grantPermission('masquerade as authenticated')
-      ->save();
-
-    // Create an additional 'moderator' role to check 'masquerade as any user'.
-    $this->moderator_role = Role::create([
-      'id' => 'moderator',
-      'label' => 'Moderator',
-    ]);
-    $this->moderator_role
-      ->grantPermission('masquerade as any user')
-      ->save();
-
-    // Create test users with varying privilege levels.
-
-    // Administrative user with User module's admin role *only*.
-    $this->admin_user = $this->drupalCreateUser();
-    $this->admin_user->setUsername('admin_user');
-    $this->admin_user->addRole($this->admin_role->id());
-    $this->admin_user->save();
-
-    // Moderator user.
-    $this->moderator_user = $this->drupalCreateUser();
-    $this->moderator_user->setUsername('moderator_user');
-    $this->moderator_user->addRole($this->moderator_role->id());
-    $this->moderator_user->save();
-
-    // Editor user.
-    $this->editor_user = $this->drupalCreateUser();
-    $this->editor_user->setUsername('editor_user');
-    $this->editor_user->addRole($this->editor_role->id());
-    $this->editor_user->save();
-
-    // Masquerade user.
-    $this->masquerade_user = $this->drupalCreateUser();
-    $this->masquerade_user->setUsername('masquerade_user');
-    $this->masquerade_user->addRole($this->masquerade_role->id());
-    $this->masquerade_user->save();
-
-    // Authenticated user.
-    $this->auth_user = $this->drupalCreateUser();
-
-    // Place block to allow unmasquerade link accessible.
-    $this->drupalPlaceBlock('system_menu_block:account');
-  }
-
-  /**
-   * Masquerades as another user.
-   *
-   * @param \Drupal\user\UserInterface $account
-   *   The user account to masquerade as.
-   */
-  protected function masqueradeAs(UserInterface $account) {
-    $this->drupalGet('user/' . $account->id());
-    $this->clickLink(t('Masquerade as @name', ['@name' => $account->getDisplayName()]));
-    // @todo Fix when crsfTokenSeed is avalable.
-//    $this->drupalGet('user/' . $account->id() . '/masquerade', array(
-//      'query' => array(
-//        'token' => $this->drupalGetToken('user/' . $account->id() . '/masquerade'),
-//      ),
-//    ));
-    $this->assertResponse(200);
-    $this->assertText('You are now masquerading as ' . $account->label());
-
-    // Update the logged in user account.
-    // @see WebTestBase::drupalLogin()
-    if (isset($this->session_id)) {
-      $this->loggedInUser = $account;
-      $this->loggedInUser->session_id = $this->session_id;
-    }
-  }
-
-  /**
-   * Unmasquerades the current user.
-   *
-   * @param \Drupal\user\UserInterface $account
-   *   The user account to unmasquerade from.
-   */
-  protected function unmasquerade(UserInterface $account) {
-    $this->drupalGet('/user/' . $account->id());
-    $this->clickLink('Unmasquerade');
-    // @todo Fix when crsfTokenSeed is avalable.
-//    $this->drupalGet('unmasquerade', array(
-//      'query' => array(
-//        'token' => $this->drupalGetToken('unmasquerade'),
-//      ),
-//    ));
-    $this->assertResponse(200);
-    $this->assertText('You are no longer masquerading as ' . $account->label());
-
-    // Update the logged in user account.
-    // @see WebTestBase::drupalLogin()
-    if (isset($this->session_id)) {
-      $this->loggedInUser = $account;
-      $this->loggedInUser->session_id = $this->session_id;
-    }
-  }
-
-  /**
-   * Asserts that there is a session for a given user ID.
-   *
-   * @param int $uid
-   *   The user ID for which to find a session record.
-   * @param int|false $expected_masquerading_uid
-   *   (optional) The expected value of the 'masquerading' session data. Pass
-   *   FALSE to assert that the session data is not set.
-   *
-   * @return \stdClass
-   *   The session record from {sessions}, if any.
-   */
-  protected function assertSessionByUid($uid, $expected_masquerading_uid = NULL) {
-    $result = db_query('SELECT * FROM {sessions} WHERE uid = :uid', array(
-      ':uid' => $uid,
-    ))->fetchAll();
-    if (empty($result)) {
-      $this->fail(format_string('No session found for uid @uid', array('@uid' => $uid)));
-    }
-    elseif (count($result) > 1) {
-      // If there is more than one session, then that must be unexpected.
-      $this->fail("Found more than 1 session for uid $uid.");
-    }
-    else {
-      $this->pass("Found session for uid $uid.");
-      $session = reset($result);
-
-      // Decode the session data.
-      if (!empty($session->session)) {
-        // Careful: PHP does not provide a utility function that decodes session
-        // data only. session_decode() merges the input into the global
-        // $_SESSION (but only if it is an array).
-        // @see http://php.net/manual/function.session-decode.php
-        $old_session = isset($_SESSION) ? $_SESSION : NULL;
-        // Furthermore, if this test is executed on the command line, then
-        // Drupal denies to start a session. PHP throws a notice if the session
-        // is attempted to be started more than once.
-        // @see drupal_session_start()
-        @session_start();
-        // In any case, ensure that it is empty.
-        $_SESSION = array();
-
-        if (!session_decode($session->session)) {
-          $this->fail(format_string('Failed to decode session data: @data', array('@data' => $session->session)));
-        }
-        $session->session = isset($_SESSION) ? $_SESSION : array();
-
-        // Restore the original global session.
-        $_SESSION = NULL;
-        if (isset($old_session)) {
-          $_SESSION = $old_session;
-        }
-      }
-      else {
-        $session = new \stdClass();
-        $session->session = array();
-      }
-
-      if (isset($expected_masquerading_uid)) {
-        if ($expected_masquerading_uid !== FALSE) {
-          $this->assertEqual($session->session['masquerading'], $expected_masquerading_uid, format_string('$_SESSION[\'masquerading\'] equals @uid.', array(
-            '@uid' => $expected_masquerading_uid,
-          )));
-        }
-        else {
-          $this->assert(!isset($session->session['masquerading']), '$_SESSION[\'masquerading\'] is not set.');
-        }
-      }
-      return $session;
-    }
-  }
-
-  /**
-   * Asserts that no session exists for a given uid.
-   *
-   * @param int $uid
-   *   The user ID to assert.
-   */
-  protected function assertNoSessionByUid($uid) {
-    $result = db_query('SELECT * FROM {sessions} WHERE uid = :uid', array(
-      ':uid' => $uid,
-    ))->fetchAll();
-    $this->assert(empty($result), "No session for uid $uid found.");
-  }
-
-  /**
-   * Stop-gap fix.
-   *
-   * @see http://drupal.org/node/1555862
-   */
-  protected function drupalGetToken($value = '') {
-    // Use the same code as \Drupal\Core\Access\CsrfTokenGenerator::get().
-    $private_key = $this->container->get('private_key')->get();
-    /** @var \Drupal\Core\Session\MetadataBag $session_metadata */
-    $session_metadata = $this->container->get('session_manager.metadata_bag');
-    // @TODO Try to get seed from testing site, broken now.
-    $seed = $session_metadata->getCsrfTokenSeed();
-    return Crypt::hmacBase64($value, $seed . $private_key . Settings::getHashSalt());
-  }
-
-}
-
diff --git a/modules/pathauto/LICENSE.txt b/modules/pathauto/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/pathauto/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/pathauto/README.md b/modules/pathauto/README.md
deleted file mode 100644
index d21f135..0000000
--- a/modules/pathauto/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-#Pathauto
-
-If you are developing for this module, have a look at pathauto.api.php.
-
-##Description
-
-The Pathauto module provides support functions for other modules to
-automatically generate aliases based on appropriate criteria, with a
-central settings path for site administrators.
-
-Implementations are provided for core entity types: content, taxonomy terms,
-and users (including blogs and forum pages).
-
-Pathauto also provides a way to delete large numbers of aliases.  This feature
-is available at  Administer > Configuration > Search and metadata > URL aliases >
-Delete aliases.
-
-##Benefits
-
-Besides making the page address more reflective of its content than
-"node/138", it's important to know that modern search engines give
-heavy weight to search terms which appear in a page's URL. By
-automatically using keywords based directly on the page content in the URL,
-relevant search engine hits for your page can be significantly
-enhanced.
-
-##Notices
-
-Pathauto just adds URL aliases to content, users, and taxonomy terms.
-Because it's an alias, the standard Drupal URL (for example node/123 or
-taxonomy/term/1) will still function as normal.  If you have external links
-to your site pointing to standard Drupal URLs, or hardcoded links in a module,
-template, content or menu which point to standard Drupal URLs it will bypass
-the alias set by Pathauto.
-
-There are reasons you might not want two URLs for the same content on your
-site. If this applies to you, please note that you will need to update any
-hard coded links in your content or blocks.
-
-If you use the "system path" (i.e. node/10) for menu items and settings like
-that, Drupal will replace it with the url_alias.
-
-For external links, you might want to consider the Path Redirect or
-Global Redirect modules, which allow you to set forwarding either per item or
-across the site to your aliased URLs.
-
-###URLs (not) Getting Replaced With Aliases:
-Please bear in mind that only URLs passed through Drupal's Drupal's URL and
-Link APIs will be replaced with their aliases during page output. If
-a module or your template contains hardcoded links, such as
-'href="node/$node->nid"', those won't get replaced with their corresponding
-aliases.
-
-## Disabling Pathauto for a specific content type (or taxonomy)
-
-When the pattern for a content type is left blank, the default pattern will be
-used. But if the default pattern is also blank, Pathauto will be disabled
-for that content type.
-
-## Installing Pathauto
-1. Install the module as normal, note that there are two dependencies.
-2. Configure the module at admin/config/search/path/patterns - add a new pattern by creating by clicking "Add Pathauto pattern".
-3. Fill out "Path pattern" with fx [node:title], choose which content types this applies to, give it a label (the name) and save it.
-4. When you save new content from now on, it should automatically be assigned an alternative URL
-
-##Credits:
-
-The original module combined the functionality of Mike Ryan's autopath with
-Tommy Sundstrom's path_automatic.
-
-Significant enhancements were contributed by jdmquin @ www.bcdems.net.
-
-Matt England added the tracker support (tracker support has been removed in
-recent changes).
-
-Other suggestions and patches contributed by the Drupal community.
-
-Current maintainers:
-
-- Dave Reid - http://www.davereid.net
-- Greg Knaddison - http://www.knaddison.com
-- Mike Ryan - http://mikeryan.name
-- Frederik 'Freso' S. Olesen - http://freso.dk
diff --git a/modules/pathauto/config/install/pathauto.settings.yml b/modules/pathauto/config/install/pathauto.settings.yml
deleted file mode 100644
index 74a75cd..0000000
--- a/modules/pathauto/config/install/pathauto.settings.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-enabled_entity_types:
-  - user
-punctuation:
-  hyphen: 1
-verbose : FALSE
-separator : '-'
-max_length : 100
-max_component_length: 100
-transliterate : TRUE
-reduce_ascii : FALSE
-case : TRUE
-ignore_words : 'a, an, as, at, before, but, by, for, from, is, in, into, like, of, off, on, onto, per, since, than, the, this, that, to, up, via, with'
-update_action : 2
diff --git a/modules/pathauto/config/optional/system.action.pathauto_update_alias_node.yml b/modules/pathauto/config/optional/system.action.pathauto_update_alias_node.yml
deleted file mode 100644
index 07709b7..0000000
--- a/modules/pathauto/config/optional/system.action.pathauto_update_alias_node.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-id: pathauto_update_alias_node
-label: 'Update URL alias'
-status: true
-langcode: en
-type: node
-plugin: pathauto_update_alias
-dependencies:
-  module:
-    - node
diff --git a/modules/pathauto/config/optional/system.action.pathauto_update_alias_user.yml b/modules/pathauto/config/optional/system.action.pathauto_update_alias_user.yml
deleted file mode 100644
index 891cbf2..0000000
--- a/modules/pathauto/config/optional/system.action.pathauto_update_alias_user.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-id: pathauto_update_alias_user
-label: 'Update URL alias'
-status: true
-langcode: en
-type: user
-plugin: pathauto_update_alias
-dependencies:
-  module:
-    - user
diff --git a/modules/pathauto/config/schema/pathauto.schema.yml b/modules/pathauto/config/schema/pathauto.schema.yml
deleted file mode 100644
index ca04411..0000000
--- a/modules/pathauto/config/schema/pathauto.schema.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-pathauto.settings:
-  type: config_object
-  mapping:
-    enabled_entity_types:
-      label: Enabled entity types
-      type: sequence
-      sequence:
-        type: string
-    punctuation:
-      type: sequence
-      sequence:
-        type: integer
-    verbose:
-      type: boolean
-    separator:
-      type: string
-    max_length:
-      type: integer
-    max_component_length:
-      type: integer
-    transliterate:
-      type: boolean
-    reduce_ascii:
-      type: boolean
-    ignore_words:
-      type: string
-    case:
-      type: boolean
-    ignore_words:
-      type: string
-    update_action:
-      type: integer
-
-action.configuration.pathauto_update_alias:
-  type: action_configuration_default
-  label: 'Update URL alias'
diff --git a/modules/pathauto/config/schema/pathauto_pattern.schema.yml b/modules/pathauto/config/schema/pathauto_pattern.schema.yml
deleted file mode 100644
index 14a1ae7..0000000
--- a/modules/pathauto/config/schema/pathauto_pattern.schema.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-pathauto.pattern.*:
-  type: config_entity
-  label: 'Pathauto pattern config'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-    uuid:
-      type: string
-    type:
-      type: string
-      label: 'Pattern type'
-    pattern:
-      type: string
-      label: 'Pattern'
-    selection_criteria:
-      type: sequence
-      label: 'Selection criteria'
-      sequence:
-        type: condition.plugin.[id]
-        label: 'Selection condition'
-    selection_logic:
-      type: string
-      label: 'Selection logic'
-    weight:
-      type: integer
-      label: 'Weight'
-    relationships:
-      type: sequence
-      label: 'Context definitions'
-      sequence:
-        - type: mapping
-          label: 'Relationship'
-          mapping:
-            label:
-              type: label
-              label: 'Label'
diff --git a/modules/pathauto/pathauto.api.php b/modules/pathauto/pathauto.api.php
deleted file mode 100644
index fc9272f..0000000
--- a/modules/pathauto/pathauto.api.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/**
- * @file
- * Documentation for pathauto API.
- */
-
-use Drupal\Core\Language\Language;
-
-/**
- * @todo Update for 8.x-1.x
- *
- * It may be helpful to review some examples of integration from
- * pathauto.pathauto.inc.
- *
- * Pathauto works by using tokens in path patterns.  Thus the simplest
- * integration is just to provide tokens.  Token support is provided by Drupal
- * core. To provide additional token from your module, implement the following
- * hooks:
- *
- * hook_tokens() - http://api.drupal.org/api/function/hook_tokens
- * hook_token_info() - http://api.drupal.org/api/function/hook_token_info
- *
- * If you wish to provide pathauto integration for custom paths provided by your
- * module, there are a few steps involved.
- *
- * 1. hook_pathauto()
- *    Provide information required by pathauto for the settings form as well as
- *    bulk generation.  See the documentation for hook_pathauto() for more
- *    details.
- *
- * 2. pathauto_create_alias()
- *    At the appropriate time (usually when a new item is being created for
- *    which a generated alias is desired), call pathauto_create_alias() with the
- *    appropriate parameters to generate and create the alias. See the user,
- *    taxonomy, and node hook implementations in pathauto.module for examples.
- *    Also see the documentation for pathauto_create_alias().
- *
- * 3. pathauto_path_delete_all()
- *    At the appropriate time (usually when an item is being deleted), call
- *    pathauto_path_delete_all() to remove any aliases that were created for the
- *    content being removed.  See the documentation for
- *    pathauto_path_delete_all() for more details.
- *
- * 4. hook_path_alias_types()
- *    For modules that create new types of content that can be aliased with
- *    pathauto, a hook implementation is needed to allow the user to delete them
- *    all at once.  See the documentation for hook_path_alias_types() below for
- *    more information.
- *
- * There are other integration points with pathauto, namely alter hooks that
- * allow you to change the data used by pathauto at various points in the
- * process.  See the below hook documentation for details.
- */
-
-/**
- * Alter pathauto alias type definitions.
- *
- * @param array &$definitions
- *   Alias type definitions.
- */
-function hook_path_alias_types_alter(array &$definitions) {
-}
-
-/**
- * Determine if a possible URL alias would conflict with any existing paths.
- *
- * Returning TRUE from this function will trigger pathauto_alias_uniquify() to
- * generate a similar URL alias with a suffix to avoid conflicts.
- *
- * @param string $alias
- *   The potential URL alias.
- * @param string $source
- *   The source path for the alias (e.g. 'node/1').
- * @param string $langcode
- *   The language code for the alias (e.g. 'en').
- *
- * @return bool
- *   TRUE if $alias conflicts with an existing, reserved path, or FALSE/NULL if
- *   it does not match any reserved paths.
- *
- * @see pathauto_alias_uniquify()
- */
-function hook_pathauto_is_alias_reserved($alias, $source, $langcode) {
-  // Check our module's list of paths and return TRUE if $alias matches any of
-  // them.
-  return (bool) \Drupal::database()->query("SELECT 1 FROM {mytable} WHERE path = :path", [':path' => $alias])->fetchField();
-}
-
-/**
- * Alter the pattern to be used before an alias is generated by Pathauto.
- *
- * This hook will only be called if a default pattern is configured (on
- * admin/config/search/path/patterns).
- *
- * @param string $pattern
- *   The alias pattern for Pathauto to pass to token_replace() to generate the
- *   URL alias.
- * @param array $context
- *   An associative array of additional options, with the following elements:
- *   - 'module': The module or entity type being aliased.
- *   - 'op': A string with the operation being performed on the object being
- *     aliased. Can be either 'insert', 'update', 'return', or 'bulkupdate'.
- *   - 'source': A string of the source path for the alias (e.g. 'node/1').
- *   - 'data': An array of keyed objects to pass to token_replace().
- *   - 'type': The sub-type or bundle of the object being aliased.
- *   - 'language': A string of the language code for the alias (e.g. 'en').
- *     This can be altered by reference.
- */
-function hook_pathauto_pattern_alter(&$pattern, array $context) {
-  // Switch out any [node:created:*] tokens with [node:updated:*] on update.
-  if ($context['module'] == 'node' && ($context['op'] == 'update')) {
-    $pattern = preg_replace('/\[node:created(\:[^]]*)?\]/', '[node:updated$1]', $pattern);
-  }
-}
-
-/**
- * Alter Pathauto-generated aliases before saving.
- *
- * @param string $alias
- *   The automatic alias after token replacement and strings cleaned.
- * @param array $context
- *   An associative array of additional options, with the following elements:
- *   - 'module': The module or entity type being aliased.
- *   - 'op': A string with the operation being performed on the object being
- *     aliased. Can be either 'insert', 'update', 'return', or 'bulkupdate'.
- *   - 'source': A string of the source path for the alias (e.g. 'node/1').
- *     This can be altered by reference.
- *   - 'data': An array of keyed objects to pass to token_replace().
- *   - 'type': The sub-type or bundle of the object being aliased.
- *   - 'language': A string of the language code for the alias (e.g. 'en').
- *     This can be altered by reference.
- *   - 'pattern': A string of the pattern used for aliasing the object.
- */
-function hook_pathauto_alias_alter(&$alias, array &$context) {
-  // Add a suffix so that all aliases get saved as 'content/my-title.html'
-  $alias .= '.html';
-
-  // Force all aliases to be saved as language neutral.
-  $context['language'] = Language::LANGCODE_NOT_SPECIFIED;
-}
-
-/**
- * Alter the list of punctuation characters for Pathauto control.
- *
- * @param $punctuation
- *   An array of punctuation to be controlled by Pathauto during replacement
- *   keyed by punctuation name. Each punctuation record should be an array
- *   with the following key/value pairs:
- *   - value: The raw value of the punctuation mark.
- *   - name: The human-readable name of the punctuation mark. This must be
- *     translated using t() already.
- */
-function hook_pathauto_punctuation_chars_alter(array &$punctuation) {
-  // Add the trademark symbol.
-  $punctuation['trademark'] = array('value' => '™', 'name' => t('Trademark symbol'));
-
-  // Remove the dollar sign.
-  unset($punctuation['dollar']);
-}
diff --git a/modules/pathauto/pathauto.info.yml b/modules/pathauto/pathauto.info.yml
deleted file mode 100644
index d34ea43..0000000
--- a/modules/pathauto/pathauto.info.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name : 'Pathauto'
-description : 'Provides a mechanism for modules to automatically generate aliases for the content they manage.'
-# core: 8.x
-type: module
-
-dependencies:
-- ctools:ctools
-- drupal:path
-- token:token
-
-configure: entity.pathauto_pattern.collection
-
-recommends:
-- redirect:redirect
-
-# Information added by Drupal.org packaging script on 2017-04-29
-version: '8.x-1.0'
-core: '8.x'
-project: 'pathauto'
-datestamp: 1493468049
diff --git a/modules/pathauto/pathauto.install b/modules/pathauto/pathauto.install
deleted file mode 100644
index f8de322..0000000
--- a/modules/pathauto/pathauto.install
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, update, and uninstall functions for Pathauto.
- *
- * @ingroup pathauto
- */
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\pathauto\Entity\PathautoPattern;
-
-/**
- * Implements hook_install().
- */
-function pathauto_install() {
-  // Set the weight to 1
-  module_set_weight('pathauto', 1);
-
-  // Ensure the url_alias table exists.
-  _pathauto_ensure_url_alias_table_exists();
-}
-
-/**
- * Helper function to ensure the url_alias table exists.
- *
- * Only necessary on Drupal 8.1.x.
- *
- * @see https://www.drupal.org/node/2704821
- */
-function _pathauto_ensure_url_alias_table_exists() {
-  $alias_storage = \Drupal::service('path.alias_storage');
-  if (method_exists($alias_storage, 'schemaDefinition')) {
-    $database_schema = \Drupal::database()->schema();
-    if (!$database_schema->tableExists($alias_storage::TABLE)) {
-      $schema_definition = $alias_storage->schemaDefinition();
-      $database_schema->createTable($alias_storage::TABLE, $schema_definition);
-    }
-  }
-}
-
-/**
- * Updates pathauto widgets to use the path widget ID.
- */
-function pathauto_update_8001() {
-
-  // Replace values in the 'entity.definitions.installed' keyvalue collection.
-  $collection = \Drupal::service('keyvalue')->get('entity.definitions.installed');
-  foreach ($collection->getAll() as $key => $definitions) {
-    if (!is_array($definitions) || empty($definitions['path'])) {
-      continue;
-    }
-
-    // Retrieve and change path base field definition.
-    $path_definition = $definitions['path'];
-    if (($options = $path_definition->getDisplayOptions('form')) && $options['type'] = 'pathauto') {
-      $options['type'] = 'path';
-      $path_definition->setDisplayOptions('form', $options);
-      // Save the new value.
-      $collection->set($key, $definitions);
-    }
-
-  }
-
-  foreach (EntityFormDisplay::loadMultiple() as $form_display) {
-    if ($component = $form_display->getComponent('path')) {
-      if (isset($component['type']) && $component['type'] == 'pathauto') {
-        $component['type'] = 'path';
-        $form_display->setComponent('path', $component);
-        $form_display->save();
-      }
-    }
-  }
-}
-
-/**
- * Converts patterns from configuration objects to configuration entities.
- */
-function pathauto_update_8100() {
-  \Drupal::service('module_installer')->install(['ctools']);
-
-  $messages = array();
-  /** @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_bundle_info */
-  $entity_bundle_info = \Drupal::service('entity_type.bundle.info');
-  $entity_type_manager = \Drupal::entityTypeManager();
-  $language_manager = \Drupal::languageManager();
-  $entity_type_manager->clearCachedDefinitions();
-  \Drupal::service('plugin.manager.alias_type')->clearCachedDefinitions();
-  $entity_types = $entity_type_manager->getDefinitions();
-
-  // 1. Load all patterns.
-  $config = \Drupal::configFactory()->getEditable('pathauto.pattern');
-  $patterns = $config->get('patterns');
-
-  // 2. Create a configuration entity per pattern.
-  foreach ($patterns as $entity_type => $entity_patterns) {
-    if (!array_key_exists($entity_type, $entity_types)) {
-      // We found an unknown entity type. Report it.
-      $messages[] = t('Entity of type @type was not processed. It defines the following patterns: @patterns', array(
-        '@type' => $entity_type,
-        '@patterns' => print_r($entity_patterns, TRUE),
-      ));
-      continue;
-    }
-    $entity_label = $entity_types[$entity_type]->getLabel();
-
-    if (!empty($entity_patterns['default'])) {
-      // This is a pattern for an entity type, such as "node".
-      $pattern = PathautoPattern::create([
-        'id' => $entity_type,
-        'label' => $entity_label,
-        'type' => 'canonical_entities:' . $entity_type,
-        'pattern' => $entity_patterns['default'],
-        'weight' => 0,
-      ]);
-      $pattern->save();
-    }
-
-    // Loop over bundles and create patterns if they have a value.
-    // Bundle keys may have a language suffix for language-dependant patterns.
-    if (isset($entity_patterns['bundles'])) {
-      $bundle_info = $entity_bundle_info->getBundleInfo($entity_type);
-      foreach ($entity_patterns['bundles'] as $bundle => $bundle_patterns) {
-        if (empty($bundle_patterns['default'])) {
-          // This bundle does not define a pattern. Move on to the next one.
-          continue;
-        }
-
-        if (isset($bundle_info[$bundle])) {
-          // This is a pattern for a bundle, such as "node_article".
-          $pattern = PathautoPattern::create([
-            'id' => $entity_type . '_' . $bundle,
-            'label' => $entity_label . ' ' . $bundle_info[$bundle]['label'],
-            'type' => 'canonical_entities:' . $entity_type,
-            'pattern' => $bundle_patterns['default'],
-            'weight' => -5,
-          ]);
-
-          // Add the bundle condition.
-          $pattern->addSelectionCondition([
-            'id' => 'entity_bundle:' . $entity_type,
-            'bundles' => array($bundle => $bundle),
-            'negate' => FALSE,
-            'context_mapping' => [ $entity_type => $entity_type ],
-          ]);
-
-          $pattern->save();
-        }
-        else {
-          // This is either a language dependent pattern such as "article_es" or
-          // an unknown bundle or langcode. Let's figure it out.
-          $matches = NULL;
-          $langcode = NULL;
-          $extracted_bundle = NULL;
-          $language = NULL;
-          preg_match('/^(.*)_([a-z-]*)$/', $bundle, $matches);
-          if (count($matches) == 3) {
-            list(, $extracted_bundle, $langcode) = $matches;
-            $language = $language_manager->getLanguage($langcode);
-          }
-          // Validate bundle, langcode and language.
-          if (!isset($bundle_info[$extracted_bundle]) || ($langcode == NULL) || ($language == NULL)) {
-            $messages[] = t('Unrecognized entity bundle @entity:@bundle was not processed. It defines the following patterns: @patterns', array(
-              '@entity' => $entity_type,
-              '@bundle' => $bundle,
-              '@patterns' => print_r($entity_patterns, TRUE),
-            ));
-            continue;
-          }
-
-          // This is a pattern for a bundle and a language, such as "node_article_es".
-          $pattern = PathautoPattern::create([
-            'id' => $entity_type . '_' . $extracted_bundle . '_' . str_replace('-', '_', $langcode),
-            'label' => $entity_label . ' ' . $bundle_info[$extracted_bundle]['label'] . ' ' . $language->getName(),
-            'type' => 'canonical_entities:' . $entity_type,
-            'pattern' => $bundle_patterns['default'],
-            'weight' => -10,
-          ]);
-
-          // Add the bundle condition.
-          $pattern->addSelectionCondition([
-            'id' => 'entity_bundle:' . $entity_type,
-            'bundles' => array($extracted_bundle => $extracted_bundle),
-            'negate' => FALSE,
-            'context_mapping' => [ $entity_type => $entity_type ],
-          ]);
-
-          // Add the language condition.
-          $language_mapping = $entity_type . ':' . $entity_type_manager->getDefinition($entity_type)->getKey('langcode') . ':language';
-          $pattern->addSelectionCondition([
-            'id' => 'language',
-            'langcodes' => [ $langcode => $langcode ],
-            'negate' => FALSE,
-            'context_mapping' => [
-              'language' => $language_mapping,
-            ]
-          ]);
-
-          // Add the context relationship for this language.
-          $pattern->addRelationship($language_mapping, 'Language');
-
-          $pattern->save();
-        }
-      }
-    }
-  }
-
-  // 3. Delete the old configuration object that stores patterns.
-  $config->delete();
-
-  // 4. Print out messages.
-  if (!empty($messages)) {
-    return implode('</br>', $messages);
-  }
-}
-
-/**
- * Update relationship storage.
- */
-function pathauto_update_8101() {
-  foreach (\Drupal::configFactory()->listAll('pathauto.pattern.') as $pattern_config_name) {
-    $pattern_config = \Drupal::configFactory()->getEditable($pattern_config_name);
-
-    $relationships = [];
-    foreach ((array) $pattern_config->get('context_definitions') as $context_definition) {
-      $relationships[$context_definition['id']] = ['label' => $context_definition['label']];
-    }
-
-    $pattern_config->clear('context_definitions');
-    $pattern_config->set('relationships', $relationships);
-    $pattern_config->save();
-  }
-}
-
-/**
- * Update node type conditions from entity_bundle to node_type.
- */
-function pathauto_update_8102() {
-  // Load all pattern configuration entities.
-  foreach (\Drupal::configFactory()->listAll('pathauto.pattern.') as $pattern_config_name) {
-    $pattern_config = \Drupal::configFactory()->getEditable($pattern_config_name);
-
-    // Loop patterns and swap the entity_bundle:node plugin by the node_type
-    // plugin.
-    if ($pattern_config->get('type') == 'canonical_entities:node') {
-      $selection_criteria = $pattern_config->get('selection_criteria');
-      foreach ($selection_criteria as $uuid => $condition) {
-        if ($condition['id'] == 'entity_bundle:node') {
-          $selection_criteria[$uuid]['id'] = 'node_type';
-          $pattern_config->set('selection_criteria', $selection_criteria);
-          $pattern_config->save();
-          break;
-        }
-      }
-    }
-  }
-}
-
-/**
- * Fix invalid default value for ignore_words.
- */
-function pathauto_update_8103() {
-  $config_factory = \Drupal::configFactory();
-  $config = $config_factory->getEditable('pathauto.settings');
-  $ignore_words = $config->get('ignore_words');
-  if ($ignore_words === ', in, is,that, the  , this, with, ') {
-    $config->set('ignore_words', 'a, an, as, at, before, but, by, for, from, is, in, into, like, of, off, on, onto, per, since, than, the, this, that, to, up, via, with')->save(TRUE);
-  }
-}
-
-/**
- * Resave patterns so that lookup keys are updated.
- */
-function pathauto_update_8104() {
-  \Drupal::entityTypeManager()->clearCachedDefinitions();
-  // Load all pattern configuration entities and save them, so that the new
-  // status lookup keys are saved.
-  foreach (\Drupal::configFactory()->listAll('pathauto.pattern.') as $pattern_config_name) {
-    $pattern_config = \Drupal::configFactory()->getEditable($pattern_config_name);
-    $pattern_config->save();
-  }
-}
-
-/**
- * Ensure the url_alias table exists.
- */
-function pathauto_update_8105() {
-  _pathauto_ensure_url_alias_table_exists();
-}
-
-/**
- * Update default configuration for enabled entity types.
- */
-function pathauto_update_8106() {
-  $config_factory = \Drupal::configFactory();
-  $config = $config_factory->getEditable('pathauto.settings');
-  $config->set('enabled_entity_types', ['user']);
-  $config->save();
-}
diff --git a/modules/pathauto/pathauto.js b/modules/pathauto/pathauto.js
deleted file mode 100644
index d4e068f..0000000
--- a/modules/pathauto/pathauto.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function ($) {
-  'use strict';
-  Drupal.behaviors.pathFieldsetSummaries = {
-    attach: function (context) {
-      $('fieldset.path-form', context).drupalSetSummary(function (context) {
-        var path = $('.form-item-path-alias input', context).val();
-        var automatic = $('.form-item-path-pathauto input', context).attr('checked');
-
-        if (automatic) {
-          return Drupal.t('Automatic alias');
-        }
-        else if (path) {
-          return Drupal.t('Alias: @alias', {'@alias': path});
-        }
-        else {
-          return Drupal.t('No alias');
-        }
-      });
-    }
-  };
-})(jQuery);
diff --git a/modules/pathauto/pathauto.libraries.yml b/modules/pathauto/pathauto.libraries.yml
deleted file mode 100644
index ae978aa..0000000
--- a/modules/pathauto/pathauto.libraries.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-widget:
-  version: 1.0
-  js:
-    pathauto.js: {}
-  dependencies:
-    - core/jquery
-    - core/drupal
-    - core/drupalSettings
-    - core/drupal.form
diff --git a/modules/pathauto/pathauto.links.action.yml b/modules/pathauto/pathauto.links.action.yml
deleted file mode 100644
index d68b94a..0000000
--- a/modules/pathauto/pathauto.links.action.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-entity.pathauto_pattern.add_form:
-  route_name: 'entity.pathauto_pattern.add_form'
-  title: 'Add Pathauto pattern'
-  appears_on:
-    - entity.pathauto_pattern.collection
-
diff --git a/modules/pathauto/pathauto.links.task.yml b/modules/pathauto/pathauto.links.task.yml
deleted file mode 100644
index d6fa0bc..0000000
--- a/modules/pathauto/pathauto.links.task.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-pathauto.patterns.form:
-  route_name: entity.pathauto_pattern.collection
-  base_route: path.admin_overview
-  title: 'Patterns'
-  weight: 10
-
-pathauto.settings.form:
-  route_name: pathauto.settings.form
-  base_route: path.admin_overview
-  title: 'Settings'
-  weight: 20
-
-pathauto.bulk.update.form:
-  route_name: pathauto.bulk.update.form
-  base_route: path.admin_overview
-  title: 'Bulk generate'
-  weight: 30
-
-pathauto.admin.delete:
-  route_name: pathauto.admin.delete
-  base_route: path.admin_overview
-  title: 'Delete aliases'
-  weight: 40
diff --git a/modules/pathauto/pathauto.module b/modules/pathauto/pathauto.module
deleted file mode 100644
index d0763fa..0000000
--- a/modules/pathauto/pathauto.module
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/**
- * @file
- * @defgroup pathauto Pathauto: Automatically generates aliases for content
- *
- * The Pathauto module automatically generates path aliases for various kinds of
- * content (nodes, categories, users) without requiring the user to manually
- * specify the path alias. This allows you to get aliases like
- * /category/my-node-title.html instead of /node/123. The aliases are based upon
- * a "pattern" system which the administrator can control.
- */
-
-/**
- * @file
- * Main file for the Pathauto module, which automatically generates aliases for content.
- *
- * @ingroup pathauto
- */
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-use Drupal\pathauto\PathautoState;
-
-/**
- * The default ignore word list.
- */
-define('PATHAUTO_IGNORE_WORDS', 'a, an, as, at, before, but, by, for, from, is, in, into, like, of, off, on, onto, per, since, than, the, this, that, to, up, via, with');
-
-/**
- * Implements hook_hook_info().
- */
-function pathauto_hook_info() {
-  $hooks = array(
-    'pathauto_pattern_alter',
-    'pathauto_alias_alter',
-    'pathauto_is_alias_reserved',
-  );
-  return array_fill_keys($hooks, array('group' => 'pathauto'));
-}
-
-/**
- * Implements hook_help().
- */
-function pathauto_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    case 'help.page.pathauto':
-      $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Pathauto module provides a mechanism to automate the creation of <a href="path">path</a> aliases. This makes URLs more readable and helps search engines index content more effectively.  For more information, see the <a href=":online">online documentation for Pathauto</a>.', [':online' => 'https://www.drupal.org/documentation/modules/pathauto']) . '</p>';
-      $output .= '<dl>';
-      $output .= '<h3>' . t('Uses') . '</h3>';
-      $output .= '<dd>' . t('Pathauto is accessed from the tabs it adds to the list of <a href=":aliases">URL aliases</a>.', [':aliases' => Url::fromRoute('path.admin_overview')->toString()]) . '</dd>';
-      $output .= '<dt>' . t('Creating Pathauto Patterns') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":pathauto_pattern">"Patterns"</a> page is used to configure automatic path aliasing.  New patterns are created here using the <a href=":add_form">Add Pathauto pattern</a> button which presents a form to simplify pattern creation thru the use of <a href="token">available tokens</a>. The patterns page provides a list of all patterns on the site and allows you to edit and reorder them. An alias is generated for the first pattern that applies.', [':pathauto_pattern' => Url::fromRoute('entity.pathauto_pattern.collection')->toString(), ':add_form' => Url::fromRoute('entity.pathauto_pattern.add_form')->toString()]) . '</dd>';
-      $output .= '<dt>' . t('Pathauto Settings') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":settings">"Settings"</a> page is used to customize global Pathauto settings for automated pattern creation.', [':settings' => Url::fromRoute('pathauto.settings.form')->toString()]) . '</dd>';
-      $output .= '<dd>' . t('The <strong>maximum alias length</strong> and <strong>maximum component length</strong> values default to 100 and have a limit of @max from Pathauto. You should enter a value that is the length of the "alias" column of the url_alias database table minus the length of any strings that might get added to the end of the URL. The recommended and default value is 100.', array('@max' => \Drupal::service('pathauto.alias_storage_helper')->getAliasSchemaMaxlength())) . '</dd>';
-      $output .= '<dt>' . t('Bulk Generation') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":pathauto_bulk">"Bulk Generate"</a> page allows you to create URL aliases for items that currently have no aliases. This is typically used when installing Pathauto on a site that has existing un-aliased content that needs to be aliased in bulk.', [':pathauto_bulk' => Url::fromRoute('pathauto.bulk.update.form')->toString()]) . '</dd>';
-      $output .= '<dt>' . t('Delete Aliases') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":pathauto_delete">"Delete Aliases"</a> page allows you to remove URL aliases from items that have previously been assigned aliases using pathauto.', [':pathauto_delete' => Url::fromRoute('pathauto.admin.delete')->toString()]) . '</dd>';
-      $output .= '</dl>';
-      return $output;
-
-    case 'entity.pathauto_pattern.collection':
-      $output = '<p>' . t('This page provides a list of all patterns on the site and allows you to edit and reorder them.') . '</p>';
-      return $output;
-
-    case 'entity.pathauto_pattern.add_form':
-      $output = '<p>' . t('You need to select a pattern type, then a pattern and filter, and a label. Additional types can be enabled on the <a href=":settings">Settings</a> page.', [':settings' => Url::fromRoute('pathauto.settings.form')->toString()]) . '</p>';
-      return $output;
-
-    case 'pathauto.bulk.update.form':
-      $output = '<p>' . t('Bulk generation can be used to generate URL aliases for items that currently have no aliases. This is typically used when installing Pathauto on a site that has existing un-aliased content that needs to be aliased in bulk.') . '<br>';
-      $output .= t('It can also be used to regenerate URL aliases for items that have an old alias and for which the Pathauto pattern has been changed.') . '</p>';
-      $output .= '<p>' . t('Note that this will only affect items which are configured to have their URL alias automatically set. Items whose URL alias is manually set are not affected.') . '</p>';
-      return $output;
-  }
-}
-
-/**
- * Implements hook_entity_insert().
- */
-function pathauto_entity_insert(EntityInterface $entity) {
-  \Drupal::service('pathauto.generator')->updateEntityAlias($entity, 'insert');
-}
-
-/**
- * Implements hook_entity_update().
- */
-function pathauto_entity_update(EntityInterface $entity) {
-  \Drupal::service('pathauto.generator')->updateEntityAlias($entity, 'update');
-}
-
-/**
- * Implements hook_entity_update().
- */
-function pathauto_entity_delete(EntityInterface $entity) {
-  if ($entity->hasLinkTemplate('canonical') && $entity instanceof ContentEntityInterface && $entity->hasField('path')) {
-    \Drupal::service('pathauto.alias_storage_helper')->deleteEntityPathAll($entity);
-    $entity->path->first()->get('pathauto')->purge();
-  }
-}
-
-/**
- * Implements hook_field_info_alter().
- */
-function pathauto_field_info_alter(&$info) {
-  $info['path']['class'] = '\Drupal\pathauto\PathautoItem';
-}
-
-/**
- * Implements hook_field_widget_info_alter().
- */
-function pathauto_field_widget_info_alter(&$widgets) {
-  $widgets['path']['class'] = 'Drupal\pathauto\PathautoWidget';
-}
-
-/**
- * Implements hook_entity_base_field_info().
- */
-function pathauto_entity_base_field_info(EntityTypeInterface $entity_type) {
-  $config = \Drupal::config('pathauto.settings');
-  // Verify that the configuration data isn't null (as is the case before the
-  // module's initialization, in tests), so that in_array() won't fail.
-  if ($enabled_entity_types = $config->get('enabled_entity_types')) {
-    if (in_array($entity_type->id(), $enabled_entity_types)) {
-      $fields['path'] = BaseFieldDefinition::create('path')
-        ->setCustomStorage(TRUE)
-        ->setLabel(t('URL alias'))
-        ->setTranslatable(TRUE)
-        ->setComputed(TRUE)
-        ->setDisplayOptions('form', array(
-          'type' => 'path',
-          'weight' => 30,
-        ))
-        ->setDisplayConfigurable('form', TRUE);
-
-      return $fields;
-    }
-  }
-}
-
-/**
- * Implements hook_entity_base_field_info_alter().
- */
-function pathauto_entity_base_field_info_alter(&$fields, EntityTypeInterface $entity_type) {
-  if (isset($fields['path'])) {
-    // Path fields need to be computed so that the pathauto state can be
-    // accessed even if there is no alias being set.
-    $fields['path']->setComputed(TRUE);
-  }
-}
-
-/**
- * Validate the pattern field, to ensure it doesn't contain any characters that
- * are invalid in URLs.
- */
-function pathauto_pattern_validate($element, FormStateInterface $form_state) {
-
-  if (isset($element['#value'])) {
-    $title = empty($element['#title']) ? $element['#parents'][0] : $element['#title'];
-    $invalid_characters = ['#', '?', '&'];
-    $invalid_characters_used = [];
-
-    foreach ($invalid_characters as $invalid_character) {
-      if (strpos($element['#value'], $invalid_character) !== FALSE) {
-        $invalid_characters_used[] = $invalid_character;
-      }
-    }
-
-    if (!empty($invalid_characters_used)) {
-      $form_state->setError($element, t('The %element-title is using the following invalid characters: @invalid-characters.', array('%element-title' => $title, '@invalid-characters' => implode(', ', $invalid_characters_used))));
-    }
-
-    if (preg_match('/(\s$)+/', $element['#value'])) {
-      $form_state->setError($element, t('The %element-title doesn\'t allow the patterns ending with whitespace.', array('%element-title' => $title)));
-    }
-  }
-
-  return $element;
-
-}
diff --git a/modules/pathauto/pathauto.permissions.yml b/modules/pathauto/pathauto.permissions.yml
deleted file mode 100644
index ede9f28..0000000
--- a/modules/pathauto/pathauto.permissions.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-administer pathauto:
-  title: 'Administer pathauto'
-  description: 'Allows a user to configure patterns for automated aliases and bulk delete URL-aliases.'
-notify of path changes:
-  title: 'Notify of Path Changes'
-  description: 'Determines whether or not users are notified.'
diff --git a/modules/pathauto/pathauto.routing.yml b/modules/pathauto/pathauto.routing.yml
deleted file mode 100644
index e55063c..0000000
--- a/modules/pathauto/pathauto.routing.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-entity.pathauto_pattern.collection:
-  path: '/admin/config/search/path/patterns'
-  defaults:
-    _entity_list: 'pathauto_pattern'
-    _title: 'Patterns'
-  requirements:
-    _permission: 'administer pathauto'
-
-entity.pathauto_pattern.add_form:
-  path: '/admin/config/search/path/patterns/add'
-  defaults:
-    _entity_form: 'pathauto_pattern.default'
-    _title: 'Add Pathauto pattern'
-    tempstore_id: 'pathauto.pattern'
-  requirements:
-    _permission: 'administer pathauto'
-
-pathauto.settings.form:
-  path: '/admin/config/search/path/settings'
-  defaults:
-    _form: '\Drupal\pathauto\Form\PathautoSettingsForm'
-    _title: 'Settings'
-  requirements:
-    _permission: 'administer pathauto'
-
-entity.pathauto_pattern.enable:
-  path: '/admin/config/search/path/patterns/{pathauto_pattern}/enable'
-  defaults:
-    _entity_form: 'pathauto_pattern.enable'
-  requirements:
-    _entity_access: 'pathauto_pattern.update'
-
-entity.pathauto_pattern.disable:
-  path: '/admin/config/search/path/patterns/{pathauto_pattern}/disable'
-  defaults:
-    _entity_form: 'pathauto_pattern.disable'
-  requirements:
-    _entity_access: 'pathauto_pattern.update'
-
-pathauto.bulk.update.form:
-  path: '/admin/config/search/path/update_bulk'
-  defaults:
-    _form: '\Drupal\pathauto\Form\PathautoBulkUpdateForm'
-    _title: 'Bulk generate'
-  requirements:
-    _permission: 'administer url aliases'
-
-pathauto.admin.delete:
-  path: '/admin/config/search/path/delete_bulk'
-  defaults:
-    _form: '\Drupal\pathauto\Form\PathautoAdminDelete'
-    _title: 'Delete aliases'
-  requirements:
-    _permission: 'administer url aliases'
diff --git a/modules/pathauto/pathauto.services.yml b/modules/pathauto/pathauto.services.yml
deleted file mode 100644
index 3ce704e..0000000
--- a/modules/pathauto/pathauto.services.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-services:
-  pathauto.generator:
-    class: Drupal\pathauto\PathautoGenerator
-    arguments: ['@config.factory', '@module_handler', '@token', '@pathauto.alias_cleaner', '@pathauto.alias_storage_helper', '@pathauto.alias_uniquifier', '@pathauto.verbose_messenger', '@string_translation', '@token.entity_mapper', '@entity_type.manager']
-  pathauto.alias_cleaner:
-    class: Drupal\pathauto\AliasCleaner
-    arguments: ['@config.factory', '@pathauto.alias_storage_helper', '@language_manager', '@cache.discovery', '@transliteration', '@module_handler']
-  pathauto.alias_storage_helper:
-    class: Drupal\pathauto\AliasStorageHelper
-    arguments: ['@config.factory', '@path.alias_storage', '@database','@pathauto.verbose_messenger', '@string_translation']
-    tags:
-      - { name: backend_overridable }
-  pathauto.alias_uniquifier:
-    class: Drupal\pathauto\AliasUniquifier
-    arguments: ['@config.factory', '@pathauto.alias_storage_helper','@module_handler', '@router.route_provider', '@path.alias_manager']
-  pathauto.verbose_messenger:
-    class: Drupal\pathauto\VerboseMessenger
-    arguments: ['@config.factory', '@current_user']
-  plugin.manager.alias_type:
-    class: Drupal\pathauto\AliasTypeManager
-    parent: default_plugin_manager
-  pathauto.settings_cache_tag:
-    class: Drupal\pathauto\EventSubscriber\PathautoSettingsCacheTag
-    arguments: ['@entity_field.manager', '@plugin.manager.alias_type']
-    tags:
-      - { name: event_subscriber }
diff --git a/modules/pathauto/pathauto.tokens.inc b/modules/pathauto/pathauto.tokens.inc
deleted file mode 100644
index 626ff09..0000000
--- a/modules/pathauto/pathauto.tokens.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * @file
- * Token integration for the Pathauto module.
- */
-
-use Drupal\Core\Render\BubbleableMetadata;
-
-/**
- * Implements hook_token_info().
- */
-function pathauto_token_info() {
-  $info = array();
-
-  $info['tokens']['array']['join-path'] = array(
-    'name' => t('Joined path'),
-    'description' => t('The array values each cleaned by Pathauto and then joined with the slash into a string that resembles an URL.'),
-  );
-
-  return $info;
-}
-
-/**
- * Implements hook_tokens().
- */
-function pathauto_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
-  $replacements = array();
-
-  if ($type == 'array' && !empty($data['array'])) {
-    $array = $data['array'];
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'join-path':
-          $values = array();
-          foreach (token_element_children($array) as $key) {
-            $value = is_array($array[$key]) ? render($array[$key]) : (string) $array[$key];
-            $value = \Drupal::service('pathauto.alias_cleaner')->cleanString($value, $options);
-            $values[] = $value;
-          }
-          $replacements[$original] = implode('/', $values);
-          break;
-      }
-    }
-  }
-
-  return $replacements;
-}
diff --git a/modules/pathauto/src/AliasCleaner.php b/modules/pathauto/src/AliasCleaner.php
deleted file mode 100644
index 340a266..0000000
--- a/modules/pathauto/src/AliasCleaner.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Component\Render\PlainTextOutput;
-use Drupal\Component\Transliteration\TransliterationInterface;
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-
-/**
- * Provides an alias cleaner.
- */
-class AliasCleaner implements AliasCleanerInterface {
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The alias storage helper.
-   *
-   * @var AliasStorageHelperInterface
-   */
-  protected $aliasStorageHelper;
-
-  /**
-   * Language manager.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
-   * Cache backend.
-   *
-   * @var \Drupal\Core\Cache\CacheBackendInterface
-   */
-  protected $cacheBackend;
-
-  /**
-   * Calculated settings cache.
-   *
-   * @todo Split this up into separate properties.
-   *
-   * @var array
-   */
-  protected $cleanStringCache = array();
-
-  /**
-   * Transliteration service.
-   *
-   * @var \Drupal\Component\Transliteration\TransliterationInterface
-   */
-  protected $transliteration;
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * Creates a new AliasCleaner.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   * @param \Drupal\pathauto\AliasStorageHelperInterface $alias_storage_helper
-   *   The alias storage helper.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The language manager.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   The cache backend.
-   * @param \Drupal\Component\Transliteration\TransliterationInterface $transliteration
-   *   The transliteration service.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, AliasStorageHelperInterface $alias_storage_helper, LanguageManagerInterface $language_manager, CacheBackendInterface $cache_backend, TransliterationInterface $transliteration, ModuleHandlerInterface $module_handler) {
-    $this->configFactory = $config_factory;
-    $this->aliasStorageHelper = $alias_storage_helper;
-    $this->languageManager = $language_manager;
-    $this->cacheBackend = $cache_backend;
-    $this->transliteration = $transliteration;
-    $this->moduleHandler = $module_handler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function cleanAlias($alias) {
-    $config = $this->configFactory->get('pathauto.settings');
-    $alias_max_length = min($config->get('max_length'), $this->aliasStorageHelper->getAliasSchemaMaxLength());
-
-    $output = $alias;
-
-    // Trim duplicate, leading, and trailing separators. Do this before cleaning
-    // backslashes since a pattern like "[token1]/[token2]-[token3]/[token4]"
-    // could end up like "value1/-/value2" and if backslashes were cleaned first
-    // this would result in a duplicate blackslash.
-    $output = $this->getCleanSeparators($output);
-
-    // Trim duplicate, leading, and trailing backslashes.
-    $output = $this->getCleanSeparators($output, '/');
-
-    // Shorten to a logical place based on word boundaries.
-    $output = Unicode::truncate($output, $alias_max_length, TRUE);
-
-    return $output;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCleanSeparators($string, $separator = NULL) {
-    $config = $this->configFactory->get('pathauto.settings');
-
-    if (!isset($separator)) {
-      $separator = $config->get('separator');
-    }
-
-    $output = $string;
-
-    if (strlen($separator)) {
-      // Trim any leading or trailing separators.
-      $output = trim($output, $separator);
-
-      // Escape the separator for use in regular expressions.
-      $seppattern = preg_quote($separator, '/');
-
-      // Replace multiple separators with a single one.
-      $output = preg_replace("/$seppattern+/", $separator, $output);
-
-      // Replace trailing separators around slashes.
-      if ($separator !== '/') {
-        $output = preg_replace("/\/+$seppattern\/+|$seppattern\/+|\/+$seppattern/", "/", $output);
-      }
-      else {
-        // If the separator is a slash, we need to re-add the leading slash
-        // dropped by the trim function.
-        $output = '/' . $output;
-      }
-    }
-
-    return $output;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function cleanString($string, array $options = array()) {
-    if (empty($this->cleanStringCache)) {
-      // Generate and cache variables used in this method.
-      $config = $this->configFactory->get('pathauto.settings');
-      $this->cleanStringCache = array(
-        'separator' => $config->get('separator'),
-        'strings' => array(),
-        'transliterate' => $config->get('transliterate'),
-        'punctuation' => array(),
-        'reduce_ascii' => (bool) $config->get('reduce_ascii'),
-        'ignore_words_regex' => FALSE,
-        'lowercase' => (bool) $config->get('case'),
-        'maxlength' => min($config->get('max_component_length'), $this->aliasStorageHelper->getAliasSchemaMaxLength()),
-      );
-
-      // Generate and cache the punctuation replacements for strtr().
-      $punctuation = $this->getPunctuationCharacters();
-      foreach ($punctuation as $name => $details) {
-        $action = $config->get('punctuation.' . $name);
-        switch ($action) {
-          case PathautoGeneratorInterface::PUNCTUATION_REMOVE:
-            $this->cleanStringCache['punctuation'][$details['value']] = '';
-            break;
-
-          case PathautoGeneratorInterface::PUNCTUATION_REPLACE:
-            $this->cleanStringCache['punctuation'][$details['value']] = $this->cleanStringCache['separator'];
-            break;
-
-          case PathautoGeneratorInterface::PUNCTUATION_DO_NOTHING:
-            // Literally do nothing.
-            break;
-        }
-      }
-
-      // Generate and cache the ignored words regular expression.
-      $ignore_words = $config->get('ignore_words');
-      $ignore_words_regex = preg_replace(array('/^[,\s]+|[,\s]+$/', '/[,\s]+/'), array('', '\b|\b'), $ignore_words);
-      if ($ignore_words_regex) {
-        $this->cleanStringCache['ignore_words_regex'] = '\b' . $ignore_words_regex . '\b';
-        if (function_exists('mb_eregi_replace')) {
-          mb_regex_encoding('UTF-8');
-          $this->cleanStringCache['ignore_words_callback'] = 'mb_eregi_replace';
-        }
-        else {
-          $this->cleanStringCache['ignore_words_callback'] = 'preg_replace';
-          $this->cleanStringCache['ignore_words_regex'] = '/' . $this->cleanStringCache['ignore_words_regex'] . '/i';
-        }
-      }
-    }
-
-    // Empty strings do not need any processing.
-    if ($string === '' || $string === NULL) {
-      return '';
-    }
-
-    $langcode = NULL;
-    if (!empty($options['language'])) {
-      $langcode = $options['language']->getId();
-    }
-    elseif (!empty($options['langcode'])) {
-      $langcode = $options['langcode'];
-    }
-
-    // Check if the string has already been processed, and if so return the
-    // cached result.
-    if (isset($this->cleanStringCache['strings'][$langcode][(string) $string])) {
-      return $this->cleanStringCache['strings'][$langcode][(string) $string];
-    }
-
-    // Remove all HTML tags from the string.
-    $output = Html::decodeEntities($string);
-    $output = PlainTextOutput::renderFromHtml($output);
-
-    // Optionally transliterate.
-    if ($this->cleanStringCache['transliterate']) {
-      // If the reduce strings to letters and numbers is enabled, don't bother
-      // replacing unknown characters with a question mark. Use an empty string
-      // instead.
-      $output = $this->transliteration->transliterate($output, $langcode, $this->cleanStringCache['reduce_ascii'] ? '' : '?');
-    }
-
-    // Replace or drop punctuation based on user settings.
-    $output = strtr($output, $this->cleanStringCache['punctuation']);
-
-    // Reduce strings to letters and numbers.
-    if ($this->cleanStringCache['reduce_ascii']) {
-      $output = preg_replace('/[^a-zA-Z0-9\/]+/', $this->cleanStringCache['separator'], $output);
-    }
-
-    // Get rid of words that are on the ignore list.
-    if ($this->cleanStringCache['ignore_words_regex']) {
-      $words_removed = $this->cleanStringCache['ignore_words_callback']($this->cleanStringCache['ignore_words_regex'], '', $output);
-      if (Unicode::strlen(trim($words_removed)) > 0) {
-        $output = $words_removed;
-      }
-    }
-
-    // Always replace whitespace with the separator.
-    $output = preg_replace('/\s+/', $this->cleanStringCache['separator'], $output);
-
-    // Trim duplicates and remove trailing and leading separators.
-    $output = $this->getCleanSeparators($this->getCleanSeparators($output, $this->cleanStringCache['separator']));
-
-    // Optionally convert to lower case.
-    if ($this->cleanStringCache['lowercase']) {
-      $output = Unicode::strtolower($output);
-    }
-
-    // Shorten to a logical place based on word boundaries.
-    $output = Unicode::truncate($output, $this->cleanStringCache['maxlength'], TRUE);
-
-    // Cache this result in the static array.
-    $this->cleanStringCache['strings'][$langcode][(string) $string] = $output;
-
-    return $output;
-  }
-
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPunctuationCharacters() {
-    if (empty($this->punctuationCharacters)) {
-      $langcode = $this->languageManager->getCurrentLanguage()->getId();
-
-      $cid = 'pathauto:punctuation:' . $langcode;
-      if ($cache = $this->cacheBackend->get($cid)) {
-        $this->punctuationCharacters = $cache->data;
-      }
-      else {
-        $punctuation = array();
-        $punctuation['double_quotes']      = array('value' => '"', 'name' => t('Double quotation marks'));
-        $punctuation['quotes']             = array('value' => '\'', 'name' => t("Single quotation marks (apostrophe)"));
-        $punctuation['backtick']           = array('value' => '`', 'name' => t('Back tick'));
-        $punctuation['comma']              = array('value' => ',', 'name' => t('Comma'));
-        $punctuation['period']             = array('value' => '.', 'name' => t('Period'));
-        $punctuation['hyphen']             = array('value' => '-', 'name' => t('Hyphen'));
-        $punctuation['underscore']         = array('value' => '_', 'name' => t('Underscore'));
-        $punctuation['colon']              = array('value' => ':', 'name' => t('Colon'));
-        $punctuation['semicolon']          = array('value' => ';', 'name' => t('Semicolon'));
-        $punctuation['pipe']               = array('value' => '|', 'name' => t('Vertical bar (pipe)'));
-        $punctuation['left_curly']         = array('value' => '{', 'name' => t('Left curly bracket'));
-        $punctuation['left_square']        = array('value' => '[', 'name' => t('Left square bracket'));
-        $punctuation['right_curly']        = array('value' => '}', 'name' => t('Right curly bracket'));
-        $punctuation['right_square']       = array('value' => ']', 'name' => t('Right square bracket'));
-        $punctuation['plus']               = array('value' => '+', 'name' => t('Plus sign'));
-        $punctuation['equal']              = array('value' => '=', 'name' => t('Equal sign'));
-        $punctuation['asterisk']           = array('value' => '*', 'name' => t('Asterisk'));
-        $punctuation['ampersand']          = array('value' => '&', 'name' => t('Ampersand'));
-        $punctuation['percent']            = array('value' => '%', 'name' => t('Percent sign'));
-        $punctuation['caret']              = array('value' => '^', 'name' => t('Caret'));
-        $punctuation['dollar']             = array('value' => '$', 'name' => t('Dollar sign'));
-        $punctuation['hash']               = array('value' => '#', 'name' => t('Number sign (pound sign, hash)'));
-        $punctuation['at']                 = array('value' => '@', 'name' => t('At sign'));
-        $punctuation['exclamation']        = array('value' => '!', 'name' => t('Exclamation mark'));
-        $punctuation['tilde']              = array('value' => '~', 'name' => t('Tilde'));
-        $punctuation['left_parenthesis']   = array('value' => '(', 'name' => t('Left parenthesis'));
-        $punctuation['right_parenthesis']  = array('value' => ')', 'name' => t('Right parenthesis'));
-        $punctuation['question_mark']      = array('value' => '?', 'name' => t('Question mark'));
-        $punctuation['less_than']          = array('value' => '<', 'name' => t('Less-than sign'));
-        $punctuation['greater_than']       = array('value' => '>', 'name' => t('Greater-than sign'));
-        $punctuation['slash']              = array('value' => '/', 'name' => t('Slash'));
-        $punctuation['back_slash']         = array('value' => '\\', 'name' => t('Backslash'));
-
-        // Allow modules to alter the punctuation list and cache the result.
-        $this->moduleHandler->alter('pathauto_punctuation_chars', $punctuation);
-        $this->cacheBackend->set($cid, $punctuation);
-        $this->punctuationCharacters = $punctuation;
-      }
-    }
-
-    return $this->punctuationCharacters;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function cleanTokenValues(&$replacements, $data = array(), $options = array()) {
-    foreach ($replacements as $token => $value) {
-      // Only clean non-path tokens.
-      if (!preg_match('/(path|alias|url|url-brief)\]$/', $token)) {
-        $replacements[$token] = $this->cleanString($value, $options);
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resetCaches() {
-    $this->cleanStringCache = array();
-  }
-
-}
diff --git a/modules/pathauto/src/AliasCleanerInterface.php b/modules/pathauto/src/AliasCleanerInterface.php
deleted file mode 100644
index 87cc27e..0000000
--- a/modules/pathauto/src/AliasCleanerInterface.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-/**
- * @todo add class comment.
- */
-interface AliasCleanerInterface {
-
-  /**
-   * Clean up an URL alias.
-   *
-   * Performs the following alterations:
-   * - Trim duplicate, leading, and trailing back-slashes.
-   * - Trim duplicate, leading, and trailing separators.
-   * - Shorten to a desired length and logical position based on word boundaries.
-   *
-   * @param string $alias
-   *   A string with the URL alias to clean up.
-   *
-   * @return string
-   *   The cleaned URL alias.
-   */
-  public function cleanAlias($alias);
-
-  /**
-   * Trims duplicate, leading, and trailing separators from a string.
-   *
-   * @param string $string
-   *   The string to clean path separators from.
-   * @param string $separator
-   *   The path separator to use when cleaning.
-   *
-   * @return string
-   *   The cleaned version of the string.
-   *
-   * @see pathauto_cleanstring()
-   * @see pathauto_clean_alias()
-   */
-  public function getCleanSeparators($string, $separator = NULL);
-
-  /**
-   * Clean up a string segment to be used in an URL alias.
-   *
-   * Performs the following possible alterations:
-   * - Remove all HTML tags.
-   * - Process the string through the transliteration module.
-   * - Replace or remove punctuation with the separator character.
-   * - Remove back-slashes.
-   * - Replace non-ascii and non-numeric characters with the separator.
-   * - Remove common words.
-   * - Replace whitespace with the separator character.
-   * - Trim duplicate, leading, and trailing separators.
-   * - Convert to lower-case.
-   * - Shorten to a desired length and logical position based on word boundaries.
-   *
-   * This function should *not* be called on URL alias or path strings
-   * because it is assumed that they are already clean.
-   *
-   * @param string $string
-   *   A string to clean.
-   * @param array $options
-   *   (optional) A keyed array of settings and flags to control the Pathauto
-   *   clean string replacement process. Supported options are:
-   *   - langcode: A language code to be used when translating strings.
-   *
-   * @return string
-   *   The cleaned string.
-   */
-  public function cleanString($string, array $options = array());
-
-  /**
-   * Return an array of arrays for punctuation values.
-   *
-   * Returns an array of arrays for punctuation values keyed by a name, including
-   * the value and a textual description.
-   * Can and should be expanded to include "all" non text punctuation values.
-   *
-   * @return array
-   *   An array of arrays for punctuation values keyed by a name, including the
-   *   value and a textual description.
-   */
-  public function getPunctuationCharacters();
-
-  /**
-   * Clean tokens so they are URL friendly.
-   *
-   * @param array $replacements
-   *   An array of token replacements
-   *   that need to be "cleaned" for use in the URL.
-   * @param array $data
-   *   An array of objects used to generate the replacements.
-   * @param array $options
-   *   An array of options used to generate the replacements.
-   */
-  public function cleanTokenValues(&$replacements, $data = array(), $options = array());
-
-  /**
-   * Resets internal caches.
-   */
-  public function resetCaches();
-
-}
diff --git a/modules/pathauto/src/AliasStorageHelper.php b/modules/pathauto/src/AliasStorageHelper.php
deleted file mode 100644
index ac635c3..0000000
--- a/modules/pathauto/src/AliasStorageHelper.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Path\AliasStorageInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-
-/**
- * Provides helper methods for accessing alias storage.
- */
-class AliasStorageHelper implements AliasStorageHelperInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * Alias schema max length.
-   *
-   * @var int
-   */
-  protected $aliasSchemaMaxLength = 255;
-
-  /**
-   * Config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The alias storage.
-   *
-   * @var \Drupal\Core\Path\AliasStorageInterface
-   */
-  protected $aliasStorage;
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * The messenger.
-   *
-   * @var \Drupal\pathauto\MessengerInterface
-   */
-  protected $messenger;
-
-  /**
-   * The config factory.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   * @param \Drupal\Core\Path\AliasStorageInterface $alias_storage
-   *   The alias storage.
-   * @param \Drupal\Core\Database\Connection $database
-   *   The database connection.
-   * @param MessengerInterface $messenger
-   *   The messenger.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, AliasStorageInterface $alias_storage, Connection $database, MessengerInterface $messenger, TranslationInterface $string_translation) {
-    $this->configFactory = $config_factory;
-    $this->aliasStorage = $alias_storage;
-    $this->database = $database;
-    $this->messenger = $messenger;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAliasSchemaMaxLength() {
-    return $this->aliasSchemaMaxLength;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $path, $existing_alias = NULL, $op = NULL) {
-    $config = $this->configFactory->get('pathauto.settings');
-
-    // Alert users if they are trying to create an alias that is the same as the
-    // internal path.
-    if ($path['source'] == $path['alias']) {
-      $this->messenger->addMessage($this->t('Ignoring alias %alias because it is the same as the internal path.', array('%alias' => $path['alias'])));
-      return NULL;
-    }
-
-    // Skip replacing the current alias with an identical alias.
-    if (empty($existing_alias) || $existing_alias['alias'] != $path['alias']) {
-      $path += array(
-        'pathauto' => TRUE,
-        'original' => $existing_alias,
-        'pid' => NULL,
-      );
-
-      // If there is already an alias, respect some update actions.
-      if (!empty($existing_alias)) {
-        switch ($config->get('update_action')) {
-          case PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW:
-            // Do not create the alias.
-            return NULL;
-
-          case PathautoGeneratorInterface::UPDATE_ACTION_LEAVE:
-            // Create a new alias instead of overwriting the existing by leaving
-            // $path['pid'] empty.
-            break;
-
-          case PathautoGeneratorInterface::UPDATE_ACTION_DELETE:
-            // The delete actions should overwrite the existing alias.
-            $path['pid'] = $existing_alias['pid'];
-            break;
-        }
-      }
-
-      // Save the path array.
-      $this->aliasStorage->save($path['source'], $path['alias'], $path['language'], $path['pid']);
-
-      if (!empty($existing_alias['pid'])) {
-        $this->messenger->addMessage($this->t(
-            'Created new alias %alias for %source, replacing %old_alias.',
-            array(
-              '%alias' => $path['alias'],
-              '%source' => $path['source'],
-              '%old_alias' => $existing_alias['alias'],
-            )
-          )
-        );
-      }
-      else {
-        $this->messenger->addMessage($this->t('Created new alias %alias for %source.', array(
-          '%alias' => $path['alias'],
-          '%source' => $path['source'],
-        )));
-      }
-
-      return $path;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function loadBySource($source, $language = LanguageInterface::LANGCODE_NOT_SPECIFIED) {
-    $alias = $this->aliasStorage->load([
-      'source' => $source,
-      'langcode' => $language,
-    ]);
-    // If no alias was fetched and if a language was specified, fallbacks to
-    // undefined language.
-    if (!$alias && ($language !== LanguageInterface::LANGCODE_NOT_SPECIFIED)) {
-      $alias = $this->aliasStorage->load([
-        'source' => $source,
-        'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      ]);
-    }
-    return $alias;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteBySourcePrefix($source) {
-    $pids = $this->loadBySourcePrefix($source);
-    if ($pids) {
-      $this->deleteMultiple($pids);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteAll() {
-    $this->database->truncate('url_alias')->execute();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteEntityPathAll(EntityInterface $entity, $default_uri = NULL) {
-    $this->deleteBySourcePrefix('/' . $entity->toUrl('canonical')->getInternalPath());
-    if (isset($default_uri) && $entity->toUrl('canonical')->toString() != $default_uri) {
-      $this->deleteBySourcePrefix($default_uri);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function loadBySourcePrefix($source) {
-    $select = $this->database->select('url_alias', 'u')
-      ->fields('u', array('pid'));
-
-    $or_group = $select->orConditionGroup()
-      ->condition('source', $source)
-      ->condition('source', rtrim($source, '/') . '/%', 'LIKE');
-
-    return $select
-      ->condition($or_group)
-      ->execute()
-      ->fetchCol();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function countBySourcePrefix($source) {
-    $select = $this->database->select('url_alias', 'u')
-      ->fields('u', array('pid'));
-
-    $or_group = $select->orConditionGroup()
-      ->condition('source', $source)
-      ->condition('source', rtrim($source, '/') . '/%', 'LIKE');
-
-    return $select
-      ->condition($or_group)
-      ->countQuery()
-      ->execute()
-      ->fetchField();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function countAll() {
-    return $this->database->select('url_alias')
-      ->countQuery()
-      ->execute()
-      ->fetchField();
-  }
-
-  /**
-   * Delete multiple URL aliases.
-   *
-   * Intent of this is to abstract a potential path_delete_multiple() function
-   * for Drupal 7 or 8.
-   *
-   * @param int[] $pids
-   *   An array of path IDs to delete.
-   */
-  public function deleteMultiple($pids) {
-    foreach ($pids as $pid) {
-      $this->aliasStorage->delete(array('pid' => $pid));
-    }
-  }
-
-}
diff --git a/modules/pathauto/src/AliasStorageHelperInterface.php b/modules/pathauto/src/AliasStorageHelperInterface.php
deleted file mode 100644
index 4f17880..0000000
--- a/modules/pathauto/src/AliasStorageHelperInterface.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Language\LanguageInterface;
-
-/**
- * Provides helper methods for accessing alias storage.
- */
-interface AliasStorageHelperInterface {
-
-  /**
-   * Fetch the maximum length of the {url_alias}.alias field from the schema.
-   *
-   * @return int
-   *   An integer of the maximum URL alias length allowed by the database.
-   */
-  public function getAliasSchemaMaxLength();
-
-  /**
-   * Private function for Pathauto to create an alias.
-   *
-   * @param array $path
-   *   An associative array containing the following keys:
-   *   - source: The internal system path.
-   *   - alias: The URL alias.
-   *   - pid: (optional) Unique path alias identifier.
-   *   - language: (optional) The language of the alias.
-   * @param array|bool|null $existing_alias
-   *   (optional) An associative array of the existing path alias.
-   * @param string $op
-   *   An optional string with the operation being performed.
-   *
-   * @return array|bool
-   *   The saved path or NULL if the path was not saved.
-   */
-  public function save(array $path, $existing_alias = NULL, $op = NULL);
-
-  /**
-   * Fetches an existing URL alias given a path and optional language.
-   *
-   * @param string $source
-   *   An internal Drupal path.
-   * @param string $language
-   *   An optional language code to look up the path in.
-   *
-   * @return bool|array
-   *   FALSE if no alias was found or an associative array containing the
-   *   following keys:
-   *   - source (string): The internal system path with a starting slash.
-   *   - alias (string): The URL alias with a starting slash.
-   *   - pid (int): Unique path alias identifier.
-   *   - langcode (string): The language code of the alias.
-   */
-  public function loadBySource($source, $language = LanguageInterface::LANGCODE_NOT_SPECIFIED);
-
-  /**
-   * Delete all aliases by source url.
-   *
-   * @param string $source
-   *   An internal Drupal path.
-   *
-   * @return bool
-   *   The URL alias source.
-   */
-  public function deleteBySourcePrefix($source);
-
-  /**
-   * Delete all aliases (truncate the url_alias table).
-   */
-  public function deleteAll();
-
-  /**
-   * Delete an entity URL alias and any of its sub-paths.
-   *
-   * This function also checks to see if the default entity URI is different
-   * from the current entity URI and will delete any of the default aliases.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   An entity object.
-   * @param string $default_uri
-   *   The optional default uri path for the entity.
-   */
-  public function deleteEntityPathAll(EntityInterface $entity, $default_uri = NULL);
-
-  /**
-   * Fetches an existing URL alias given a path prefix.
-   *
-   * @param string $source
-   *   An internal Drupal path prefix.
-   *
-   * @return integer[]
-   *   An array of PIDs.
-   */
-  public function loadBySourcePrefix($source);
-
-
-  /**
-   * Returns the count of url aliases for the source.
-   *
-   * @param $source
-   *   An internal Drupal path prefix.
-   *
-   * @return int
-   *   Number of url aliases for the source.
-   */
-  public function countBySourcePrefix($source);
-
-  /**
-   * Returns the total count of the url aliases.
-   *
-   * @return int
-   *   Total number of aliases.
-   */
-  public function countAll();
-
-}
diff --git a/modules/pathauto/src/AliasTypeBatchUpdateInterface.php b/modules/pathauto/src/AliasTypeBatchUpdateInterface.php
deleted file mode 100644
index 03f3929..0000000
--- a/modules/pathauto/src/AliasTypeBatchUpdateInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-/**
- * Alias types that support batch updates and deletions.
- */
-interface AliasTypeBatchUpdateInterface extends AliasTypeInterface {
-
-  /**
-   * Gets called to batch update all entries.
-   *
-   * @param string $action
-   *   One of:
-   *   - 'create' to generate a URL alias for paths having none.
-   *   - 'update' to recreate the URL alias for paths already having one, useful if the pattern changed.
-   *   - 'all' to do both actions above at the same time.
-   * @param array $context
-   *   Batch context.
-   */
-  public function batchUpdate($action, &$context);
-
-  /**
-   * Gets called to batch delete all aliases created by pathauto.
-   *
-   * @param array $context
-   *   Batch context.
-   */
-  public function batchDelete(&$context);
-
-}
diff --git a/modules/pathauto/src/AliasTypeInterface.php b/modules/pathauto/src/AliasTypeInterface.php
deleted file mode 100644
index e5086b2..0000000
--- a/modules/pathauto/src/AliasTypeInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Component\Plugin\DerivativeInspectionInterface;
-use Drupal\Core\Plugin\ContextAwarePluginInterface;
-
-/**
- * Provides an interface for pathauto alias types.
- */
-interface AliasTypeInterface extends ContextAwarePluginInterface, DerivativeInspectionInterface {
-
-  /**
-   * Get the label.
-   *
-   * @return string
-   *   The label.
-   */
-  public function getLabel();
-
-  /**
-   * Get the token types.
-   *
-   * @return string[]
-   *   The token types.
-   */
-  public function getTokenTypes();
-
-  /**
-   * Returns the source prefix; used for bulk delete.
-   *
-   * @return string
-   *   The source path prefix.
-   */
-  public function getSourcePrefix();
-
-  /**
-   * Determines if this plugin type can apply a given object.
-   *
-   * @param object $object
-   *   The object used to determine if this plugin can apply.
-   *
-   * @return bool
-   *   Whether this plugin applies to the given object.
-   */
-  public function applies($object);
-
-}
diff --git a/modules/pathauto/src/AliasTypeManager.php b/modules/pathauto/src/AliasTypeManager.php
deleted file mode 100644
index 5e760b0..0000000
--- a/modules/pathauto/src/AliasTypeManager.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\Component\Plugin\FallbackPluginManagerInterface;
-
-/**
- * Manages pathauto alias type plugins.
- */
-class AliasTypeManager extends DefaultPluginManager implements FallbackPluginManagerInterface {
-
-  /**
-   * Constructs a new AliasType manager instance.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   Cache backend instance to use.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler to invoke the alter hook with.
-   */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    parent::__construct('Plugin/pathauto/AliasType', $namespaces, $module_handler, 'Drupal\pathauto\AliasTypeInterface', 'Drupal\pathauto\Annotation\AliasType');
-    $this->alterInfo('pathauto_alias_types');
-    $this->setCacheBackend($cache_backend, 'pathauto_alias_types');
-  }
-
-  /**
-   * Returns plugin definitions that support a given token type.
-   *
-   * @param string $type
-   *   The type of token plugin must support to be useful.
-   *
-   * @return array
-   *   Plugin definitions.
-   */
-  public function getPluginDefinitionByType($type) {
-    $definitions = array_filter($this->getDefinitions(), function ($definition) use ($type) {
-      if (!empty($definition['types']) && in_array($type, $definition['types'])) {
-        return TRUE;
-      }
-      return FALSE;
-    });
-    return $definitions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFallbackPluginId($plugin_id, array $configuration = array()) {
-    return 'broken';
-  }
-
-  /**
-   * Gets the definition of all visible plugins for this type.
-   *
-   * @return array
-   *   An array of plugin definitions (empty array if no definitions were
-   *   found). Keys are plugin IDs.
-   */
-  public function getVisibleDefinitions() {
-    $definitions = $this->getDefinitions();
-    unset($definitions['broken']);
-    return $definitions;
-  }
-
-}
diff --git a/modules/pathauto/src/AliasUniquifier.php b/modules/pathauto/src/AliasUniquifier.php
deleted file mode 100644
index 43fc5fa..0000000
--- a/modules/pathauto/src/AliasUniquifier.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Path\AliasManagerInterface;
-use Drupal\Core\Routing\RouteProviderInterface;
-
-/**
- * Provides a utility for creating a unique path alias.
- */
-class AliasUniquifier implements AliasUniquifierInterface {
-
-  /**
-   * Config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The alias storage helper.
-   *
-   * @var \Drupal\pathauto\AliasStorageHelperInterface
-   */
-  protected $aliasStorageHelper;
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The route provider service.
-   *
-   * @var \Drupal\Core\Routing\RouteProviderInterface.
-   */
-  protected $routeProvider;
-
-  /**
-   * The alias manager.
-   *
-   * @var \Drupal\Core\Path\AliasManagerInterface
-   */
-  protected $aliasManager;
-
-  /**
-   * Creates a new AliasUniquifier.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   * @param \Drupal\pathauto\AliasStorageHelperInterface $alias_storage_helper
-   *   The alias storage helper.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   * @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
-   *   The route provider service.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, AliasStorageHelperInterface $alias_storage_helper, ModuleHandlerInterface $module_handler, RouteProviderInterface $route_provider, AliasManagerInterface $alias_manager) {
-    $this->configFactory = $config_factory;
-    $this->aliasStorageHelper = $alias_storage_helper;
-    $this->moduleHandler = $module_handler;
-    $this->routeProvider = $route_provider;
-    $this->aliasManager = $alias_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function uniquify(&$alias, $source, $langcode) {
-    $config = $this->configFactory->get('pathauto.settings');
-
-    if (!$this->isReserved($alias, $source, $langcode)) {
-      return;
-    }
-
-    // If the alias already exists, generate a new, hopefully unique, variant.
-    $maxlength = min($config->get('max_length'), $this->aliasStorageHelper->getAliasSchemaMaxlength());
-    $separator = $config->get('separator');
-    $original_alias = $alias;
-
-    $i = 0;
-    do {
-      // Append an incrementing numeric suffix until we find a unique alias.
-      $unique_suffix = $separator . $i;
-      $alias = Unicode::truncate($original_alias, $maxlength - Unicode::strlen($unique_suffix), TRUE) . $unique_suffix;
-      $i++;
-    } while ($this->isReserved($alias, $source, $langcode));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isReserved($alias, $source, $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED) {
-    // Check if this alias already exists.
-    if ($existing_source = $this->aliasManager->getPathByAlias($alias, $langcode)) {
-      if ($existing_source != $alias) {
-        // If it is an alias for the provided source, it is allowed to keep using
-        // it. If not, then it is reserved.
-        return $existing_source != $source;
-      }
-
-    }
-
-    // Then check if there is a route with the same path.
-    if ($this->isRoute($alias)) {
-      return TRUE;
-    }
-    // Finally check if any other modules have reserved the alias.
-    $args = array(
-      $alias,
-      $source,
-      $langcode,
-    );
-    $implementations = $this->moduleHandler->getImplementations('pathauto_is_alias_reserved');
-    foreach ($implementations as $module) {
-
-      $result = $this->moduleHandler->invoke($module, 'pathauto_is_alias_reserved', $args);
-
-      if (!empty($result)) {
-        // As soon as the first module says that an alias is in fact reserved,
-        // then there is no point in checking the rest of the modules.
-        return TRUE;
-      }
-    }
-
-    return FALSE;
-  }
-
-  /**
-   * Verify if the given path is a valid route.
-   *
-   * @param string $path
-   *   A string containing a relative path.
-   *
-   * @return bool
-   *   TRUE if the path already exists.
-   *
-   * @throws \InvalidArgumentException
-   */
-  public function isRoute($path) {
-    if (is_file(DRUPAL_ROOT . '/' . $path) || is_dir(DRUPAL_ROOT . '/' . $path)) {
-      // Do not allow existing files or directories to get assigned an automatic
-      // alias. Note that we do not need to use is_link() to check for symbolic
-      // links since this returns TRUE for either is_file() or is_dir() already.
-      return TRUE;
-    }
-
-    $routes = $this->routeProvider->getRoutesByPattern($path);
-
-    // Only return true for an exact match, ignore placeholders.
-    foreach ($routes as $route) {
-      if ($route->getPath() == $path) {
-        return TRUE;
-      }
-    }
-
-    return FALSE;
-
-  }
-
-}
diff --git a/modules/pathauto/src/AliasUniquifierInterface.php b/modules/pathauto/src/AliasUniquifierInterface.php
deleted file mode 100644
index 2da4ba2..0000000
--- a/modules/pathauto/src/AliasUniquifierInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-use Drupal\Core\Language\LanguageInterface;
-
-/**
- * Provides an interface for alias uniquifiers.
- */
-interface AliasUniquifierInterface {
-
-  /**
-   * Check to ensure a path alias is unique and add suffix variants if necessary.
-   *
-   * Given an alias 'content/test' if a path alias with the exact alias already
-   * exists, the function will change the alias to 'content/test-0' and will
-   * increase the number suffix until it finds a unique alias.
-   *
-   * @param string $alias
-   *   A string with the alias. Can be altered by reference.
-   * @param string $source
-   *   A string with the path source.
-   * @param string $langcode
-   *   A string with a language code.
-   */
-  public function uniquify(&$alias, $source, $langcode);
-
-  /**
-   * Checks if an alias is reserved.
-   *
-   * @param string $alias
-   *   The alias.
-   * @param string $source
-   *   The source.
-   * @param string $langcode
-   *   (optional) The language code.
-   *
-   * @return bool
-   *   Returns TRUE if the alias is reserved.
-   */
-  public function isReserved($alias, $source, $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED);
-
-}
diff --git a/modules/pathauto/src/Annotation/AliasType.php b/modules/pathauto/src/Annotation/AliasType.php
deleted file mode 100644
index d5081a7..0000000
--- a/modules/pathauto/src/Annotation/AliasType.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines an AliasType annotation.
- *
- * @Annotation
- */
-class AliasType extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the action plugin.
-   *
-   * @ingroup plugin_translatable
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $label;
-
-  /**
-   * The token types.
-   *
-   * @var string[]
-   */
-  public $types = array();
-
-}
diff --git a/modules/pathauto/src/Entity/PathautoPattern.php b/modules/pathauto/src/Entity/PathautoPattern.php
deleted file mode 100644
index 3a1d23e..0000000
--- a/modules/pathauto/src/Entity/PathautoPattern.php
+++ /dev/null
@@ -1,370 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Entity;
-
-use Drupal\Component\Plugin\Exception\ContextException;
-use Drupal\Core\Condition\ConditionPluginCollection;
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Plugin\ContextAwarePluginInterface;
-use Drupal\Core\Plugin\DefaultSingleLazyPluginCollection;
-use Drupal\pathauto\PathautoPatternInterface;
-
-/**
- * Defines the Pathauto pattern entity.
- *
- * @ConfigEntityType(
- *   id = "pathauto_pattern",
- *   label = @Translation("Pathauto pattern"),
- *   handlers = {
- *     "list_builder" = "Drupal\pathauto\PathautoPatternListBuilder",
- *     "form" = {
- *       "default" = "Drupal\pathauto\Form\PatternEditForm",
- *       "delete" = "Drupal\Core\Entity\EntityDeleteForm",
- *       "enable" = "Drupal\pathauto\Form\PatternEnableForm",
- *       "disable" = "Drupal\pathauto\Form\PatternDisableForm"
- *     },
- *     "route_provider" = {
- *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
- *     },
- *   },
- *   config_prefix = "pattern",
- *   admin_permission = "administer pathauto",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *     "uuid" = "uuid",
- *     "weight" = "weight",
- *     "status" = "status"
- *   },
- *   config_export = {
- *     "id",
- *     "label",
- *     "type",
- *     "pattern",
- *     "selection_criteria",
- *     "selection_logic",
- *     "weight",
- *     "relationships"
- *   },
- *   lookup_keys = {
- *     "type",
- *     "status",
- *   },
- *   links = {
- *     "collection" = "/admin/config/search/path/patterns",
- *     "edit-form" = "/admin/config/search/path/patterns/{pathauto_pattern}",
- *     "delete-form" = "/admin/config/search/path/patterns/{pathauto_pattern}/delete",
- *     "enable" = "/admin/config/search/path/patterns/{pathauto_pattern}/enable",
- *     "disable" = "/admin/config/search/path/patterns/{pathauto_pattern}/disable"
- *   }
- * )
- */
-class PathautoPattern extends ConfigEntityBase implements PathautoPatternInterface {
-
-  /**
-   * The Pathauto pattern ID.
-   *
-   * @var string
-   */
-  protected $id;
-
-  /**
-   * The Pathauto pattern label.
-   *
-   * @var string
-   */
-  protected $label;
-
-  /**
-   * The pattern type.
-   *
-   * A string denoting the type of pathauto pattern this is. For a node path
-   * this would be 'node', for users it would be 'user', and so on. This allows
-   * for arbitrary non-entity patterns to be possible if applicable.
-   *
-   * @var string
-   */
-  protected $type;
-
-  /**
-   * @var \Drupal\Core\Plugin\DefaultSingleLazyPluginCollection
-   */
-  protected $aliasTypeCollection;
-
-  /**
-   * A tokenized string for alias generation.
-   *
-   * @var string
-   */
-  protected $pattern;
-
-  /**
-   * The plugin configuration for the selection criteria condition plugins.
-   *
-   * @var array
-   */
-  protected $selection_criteria = [];
-
-  /**
-   * The selection logic for this pattern entity (either 'and' or 'or').
-   *
-   * @var string
-   */
-  protected $selection_logic = 'and';
-
-  /**
-   * @var int
-   */
-  protected $weight = 0;
-
-  /**
-   * @var array[]
-   *   Keys are context tokens, and values are arrays with the following keys:
-   *   - label (string|null, optional): The human-readable label of this
-   *     relationship.
-   */
-  protected $relationships = [];
-
-  /**
-   * The plugin collection that holds the selection criteria condition plugins.
-   *
-   * @var \Drupal\Component\Plugin\LazyPluginCollection
-   */
-  protected $selectionConditionCollection;
-
-  /**
-   * {@inheritdoc}
-   *
-   * Not using core's default logic around ConditionPluginCollection since it
-   * incorrectly assumes no condition will ever be applied twice.
-   */
-  public function preSave(EntityStorageInterface $storage) {
-    parent::preSave($storage);
-    $criteria = [];
-    foreach ($this->getSelectionConditions() as $id => $condition) {
-      $criteria[$id] = $condition->getConfiguration();
-    }
-    $this->selection_criteria = $criteria;
-
-    // Invalidate the static caches.
-    \Drupal::service('pathauto.generator')->resetCaches();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function postDelete(EntityStorageInterface $storage, array $entities) {
-    parent::postDelete($storage, $entities);
-    // Invalidate the static caches.
-    \Drupal::service('pathauto.generator')->resetCaches();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    parent::calculateDependencies();
-
-    $this->calculatePluginDependencies($this->getAliasType());
-
-    foreach ($this->getSelectionConditions() as $instance) {
-      $this->calculatePluginDependencies($instance);
-    }
-
-    return $this->getDependencies();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPattern() {
-    return $this->pattern;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setPattern($pattern) {
-    $this->pattern = $pattern;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getType() {
-    return $this->type;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAliasType() {
-    if (!$this->aliasTypeCollection) {
-      $this->aliasTypeCollection = new DefaultSingleLazyPluginCollection(\Drupal::service('plugin.manager.alias_type'), $this->getType(), ['default' => $this->getPattern()]);
-    }
-    return $this->aliasTypeCollection->get($this->getType());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWeight() {
-    return $this->weight;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setWeight($weight) {
-    $this->weight = $weight;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getContexts() {
-    $contexts = $this->getAliasType()->getContexts();
-    foreach ($this->getRelationships() as $token => $definition) {
-      /** @var \Drupal\ctools\TypedDataResolver $resolver */
-      $resolver = \Drupal::service('ctools.typed_data.resolver');
-      $context = $resolver->convertTokenToContext($token, $contexts);
-      $context_definition = $context->getContextDefinition();
-      if (!empty($definition['label'])) {
-        $context_definition->setLabel($definition['label']);
-      }
-      $contexts[$token] = $context;
-    }
-    return $contexts;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasRelationship($token) {
-    return isset($this->relationships[$token]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addRelationship($token, $label = NULL) {
-    if (!$this->hasRelationship($token)) {
-      $this->relationships[$token] = [
-        'label' => $label,
-      ];
-    }
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function replaceRelationship($token, $label) {
-    if ($this->hasRelationship($token)) {
-      $this->relationships[$token] = [
-        'label' => $label,
-      ];
-    }
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function removeRelationship($token) {
-    unset($this->relationships[$token]);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRelationships() {
-    return $this->relationships;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSelectionConditions() {
-    if (!$this->selectionConditionCollection) {
-      $this->selectionConditionCollection = new ConditionPluginCollection(\Drupal::service('plugin.manager.condition'), $this->get('selection_criteria'));
-    }
-    return $this->selectionConditionCollection;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addSelectionCondition(array $configuration) {
-    $configuration['uuid'] = $this->uuidGenerator()->generate();
-    $this->getSelectionConditions()->addInstanceId($configuration['uuid'], $configuration);
-    return $configuration['uuid'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSelectionCondition($condition_id) {
-    return $this->getSelectionConditions()->get($condition_id);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function removeSelectionCondition($condition_id) {
-    $this->getSelectionConditions()->removeInstanceId($condition_id);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSelectionLogic() {
-    return $this->selection_logic;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies($object) {
-    if ($this->getAliasType()->applies($object)) {
-      $definitions = $this->getAliasType()->getContextDefinitions();
-      if (count($definitions) > 1) {
-        throw new \Exception("Alias types do not support more than one context.");
-      }
-      $keys = array_keys($definitions);
-      // Set the context object on our Alias plugin before retrieving contexts.
-      $this->getAliasType()->setContextValue($keys[0], $object);
-      /** @var \Drupal\Core\Plugin\Context\ContextInterface[] $base_contexts */
-      $contexts = $this->getContexts();
-      /** @var \Drupal\Core\Plugin\Context\ContextHandler $context_handler */
-      $context_handler = \Drupal::service('context.handler');
-      $conditions = $this->getSelectionConditions();
-      foreach ($conditions as $condition) {
-        if ($condition instanceof ContextAwarePluginInterface) {
-          try {
-            $context_handler->applyContextMapping($condition, $contexts);
-          }
-          catch (ContextException $e) {
-            watchdog_exception('pathauto', $e);
-            return FALSE;
-          }
-        }
-        $result = $condition->execute();
-        if ($this->getSelectionLogic() == 'and' && !$result) {
-          return FALSE;
-        }
-        elseif ($this->getSelectionLogic() == 'or' && $result) {
-          return TRUE;
-        }
-      }
-      return TRUE;
-    }
-    return FALSE;
-  }
-
-}
diff --git a/modules/pathauto/src/EventSubscriber/PathautoSettingsCacheTag.php b/modules/pathauto/src/EventSubscriber/PathautoSettingsCacheTag.php
deleted file mode 100644
index 371fe2e..0000000
--- a/modules/pathauto/src/EventSubscriber/PathautoSettingsCacheTag.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\EventSubscriber;
-
-use Drupal\Core\Config\ConfigCrudEvent;
-use Drupal\Core\Config\ConfigEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\pathauto\AliasTypeManager;
-
-/**
- * A subscriber to clear fielddefinition cache when saving pathauto settings.
- */
-class PathautoSettingsCacheTag implements EventSubscriberInterface {
-
-  protected $entityFieldManager;
-  protected $aliasTypeManager;
-
-  /**
-   * Constructs a PathautoSettingsCacheTag object.
-   */
-  public function __construct(EntityFieldManagerInterface $entity_field_manager, AliasTypeManager $alias_type_manager) {
-    $this->entityFieldManager = $entity_field_manager;
-    $this->aliasTypeManager = $alias_type_manager;
-  }
-
-  /**
-   * Invalidate the 'rendered' cache tag whenever the settings are modified.
-   *
-   * @param \Drupal\Core\Config\ConfigCrudEvent $event
-   *   The Event to process.
-   */
-  public function onSave(ConfigCrudEvent $event) {
-    if ($event->getConfig()->getName() === 'pathauto.settings') {
-      $config = $event->getConfig();
-      $original_entity_types = $config->getOriginal('enabled_entity_types');
-
-      // Clear cached field definitions if the values are changed.
-      if ($original_entity_types != $config->get('enabled_entity_types')) {
-        $this->entityFieldManager->clearCachedFieldDefinitions();
-        $this->aliasTypeManager->clearCachedDefinitions();
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    $events[ConfigEvents::SAVE][] = ['onSave'];
-    return $events;
-  }
-
-}
diff --git a/modules/pathauto/src/Form/PathautoAdminDelete.php b/modules/pathauto/src/Form/PathautoAdminDelete.php
deleted file mode 100644
index a230525..0000000
--- a/modules/pathauto/src/Form/PathautoAdminDelete.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Form;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\pathauto\AliasTypeManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Alias mass delete form.
- */
-class PathautoAdminDelete extends FormBase {
-
-  /**
-   * The alias type manager.
-   *
-   * @var \Drupal\pathauto\AliasTypeManager
-   */
-  protected $aliasTypeManager;
-
-  /**
-   * Constructs a PathautoAdminDelete object.
-   *
-   * @param \Drupal\pathauto\AliasTypeManager $alias_type_manager
-   *   The alias type manager.
-   */
-  public function __construct(AliasTypeManager $alias_type_manager) {
-    $this->aliasTypeManager = $alias_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.alias_type')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'pathauto_admin_delete';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['delete'] = [
-      '#type' => 'fieldset',
-      '#title' => $this->t('Choose aliases to delete'),
-      '#tree' => TRUE,
-    ];
-
-    // First we do the "all" case.
-    $storage_helper = \Drupal::service('pathauto.alias_storage_helper');
-    $total_count = $storage_helper->countAll();
-    $form['delete']['all_aliases'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('All aliases'),
-      '#default_value' => FALSE,
-      '#description' => $this->t('Delete all aliases. Number of aliases which will be deleted: %count.', ['%count' => $total_count]),
-    ];
-
-    // Next, iterate over all visible alias types.
-    $definitions = $this->aliasTypeManager->getVisibleDefinitions();
-
-    foreach ($definitions as $id => $definition) {
-      /** @var \Drupal\pathauto\AliasTypeInterface $alias_type */
-      $alias_type = $this->aliasTypeManager->createInstance($id);
-      $count = $storage_helper->countBySourcePrefix($alias_type->getSourcePrefix());
-      $form['delete']['plugins'][$id] = [
-        '#type' => 'checkbox',
-        '#title' => (string) $definition['label'],
-        '#default_value' => FALSE,
-        '#description' => $this->t('Delete aliases for all @label. Number of aliases which will be deleted: %count.', ['@label' => (string) $definition['label'], '%count' => $count]),
-      ];
-    }
-
-    $form['options'] = [
-      '#type' => 'fieldset',
-      '#title' => $this->t('Delete options'),
-      '#tree' => TRUE,
-    ];
-
-    // Provide checkbox for not deleting custom aliases.
-    $form['options']['keep_custom_aliases'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Only delete automatically generated aliases'),
-      '#default_value' => TRUE,
-      '#description' => $this->t('When checked, aliases which have been manually set are not affected by this mass-deletion.'),
-    ];
-
-    // Warn them and give a button that shows we mean business.
-    $form['warning'] = ['#value' => '<p>' . $this->t('<strong>Note:</strong> there is no confirmation. Be sure of your action before clicking the "Delete aliases now!" button.<br />You may want to make a backup of the database and/or the url_alias table prior to using this feature.') . '</p>'];
-    $form['buttons']['submit'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Delete aliases now!'),
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $delete_all = $form_state->getValue(['delete', 'all_aliases']);
-    // Keeping custom aliases forces us to go the slow way to correctly check
-    // the automatic/manual flag.
-    if ($form_state->getValue(['options', 'keep_custom_aliases'])) {
-      $batch = [
-        'title' => $this->t('Bulk deleting URL aliases'),
-        'operations' => [['Drupal\pathauto\Form\PathautoAdminDelete::batchStart', [$delete_all]]],
-        'finished' => 'Drupal\pathauto\Form\PathautoAdminDelete::batchFinished',
-      ];
-
-      if ($delete_all) {
-        foreach (array_keys($form_state->getValue(['delete', 'plugins'])) as $id) {
-          $batch['operations'][] = ['Drupal\pathauto\Form\PathautoAdminDelete::batchProcess', [$id]];
-        }
-      }
-      else {
-        foreach (array_keys(array_filter($form_state->getValue(['delete', 'plugins']))) as $id) {
-          $batch['operations'][] = ['Drupal\pathauto\Form\PathautoAdminDelete::batchProcess', [$id]];
-        }
-      }
-
-      batch_set($batch);
-    }
-    else if ($delete_all) {
-      \Drupal::service('pathauto.alias_storage_helper')->deleteAll();
-      drupal_set_message($this->t('All of your path aliases have been deleted.'));
-    }
-    else {
-      $storage_helper = \Drupal::service('pathauto.alias_storage_helper');
-      foreach (array_keys(array_filter($form_state->getValue(['delete', 'plugins']))) as $id) {
-        $alias_type = $this->aliasTypeManager->createInstance($id);
-        $storage_helper->deleteBySourcePrefix((string) $alias_type->getSourcePrefix());
-        drupal_set_message($this->t('All of your %label path aliases have been deleted.', ['%label' => $alias_type->getLabel()]));
-      }
-    }
-  }
-
-  /**
-   * Batch callback; record if aliases of all types must be deleted.
-   */
-  public static function batchStart($delete_all, &$context) {
-    $context['results']['delete_all'] = $delete_all;
-    $context['results']['deletions'] = [];
-  }
-
-  /**
-   * Common batch processing callback for all operations.
-   */
-  public static function batchProcess($id, &$context) {
-    /** @var \Drupal\pathauto\AliasTypeBatchUpdateInterface $alias_type */
-    $alias_type = \Drupal::service('plugin.manager.alias_type')->createInstance($id);
-    $alias_type->batchDelete($context);
-  }
-
-  /**
-   * Batch finished callback.
-   */
-  public static function batchFinished($success, $results, $operations) {
-    if ($success) {
-      if ($results['delete_all']) {
-        drupal_set_message(t('All of your automatically generated path aliases have been deleted.'));
-      }
-      else if (isset($results['deletions'])) {
-        foreach (array_values($results['deletions']) as $label) {
-          drupal_set_message(t('All of your automatically generated %label path aliases have been deleted.', ['%label' => $label]));
-        }
-      }
-    }
-    else {
-      $error_operation = reset($operations);
-      drupal_set_message(t('An error occurred while processing @operation with arguments : @args', array('@operation' => $error_operation[0], '@args' => print_r($error_operation[0], TRUE))));
-    }
-  }
-
-}
diff --git a/modules/pathauto/src/Form/PathautoBulkUpdateForm.php b/modules/pathauto/src/Form/PathautoBulkUpdateForm.php
deleted file mode 100644
index e66cd9d..0000000
--- a/modules/pathauto/src/Form/PathautoBulkUpdateForm.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Form;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\pathauto\AliasTypeBatchUpdateInterface;
-use Drupal\pathauto\AliasTypeManager;
-use Drupal\pathauto\PathautoGeneratorInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Configure file system settings for this site.
- */
-class PathautoBulkUpdateForm extends FormBase {
-
-  /**
-   * The alias type manager.
-   *
-   * @var \Drupal\pathauto\AliasTypeManager
-   */
-  protected $aliasTypeManager;
-
-  /**
-   * Constructs a PathautoBulkUpdateForm object.
-   *
-   * @param \Drupal\pathauto\AliasTypeManager $alias_type_manager
-   *   The alias type manager.
-   */
-  public function __construct(AliasTypeManager $alias_type_manager) {
-    $this->aliasTypeManager = $alias_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.alias_type')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'pathauto_bulk_update_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-
-    $form = array();
-
-    $form['#update_callbacks'] = array();
-
-    $form['update'] = array(
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Select the types of paths for which to generate URL aliases'),
-      '#options' => array(),
-      '#default_value' => array(),
-    );
-
-    $definitions = $this->aliasTypeManager->getVisibleDefinitions();
-
-    foreach ($definitions as $id => $definition) {
-      $alias_type = $this->aliasTypeManager->createInstance($id);
-      if ($alias_type instanceof AliasTypeBatchUpdateInterface) {
-        $form['update']['#options'][$id] = $alias_type->getLabel();
-      }
-    }
-
-    $form['action'] = array(
-      '#type' => 'radios',
-      '#title' => $this->t('Select which URL aliases to generate'),
-      '#options' => ['create' => $this->t('Generate a URL alias for un-aliased paths only')],
-      '#default_value' => 'create',
-    );
-
-    $config = $this->config('pathauto.settings');
-
-    if ($config->get('update_action') == PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW) {
-      // Existing aliases should not be updated.
-      $form['warning'] = array(
-        '#markup' => $this->t('<a href=":url">Pathauto settings</a> are set to ignore paths which already have a URL alias. You can only create URL aliases for paths having none.', [':url' => Url::fromRoute('pathauto.settings.form')->toString()]),
-      );
-    }
-    else {
-      $form['action']['#options']['update'] = $this->t('Update the URL alias for paths having an old URL alias');
-      $form['action']['#options']['all'] = $this->t('Regenerate URL aliases for all paths');
-    }
-
-    $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => $this->t('Update'),
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $batch = array(
-      'title' => $this->t('Bulk updating URL aliases'),
-      'operations' => array(
-        array('Drupal\pathauto\Form\PathautoBulkUpdateForm::batchStart', array()),
-      ),
-      'finished' => 'Drupal\pathauto\Form\PathautoBulkUpdateForm::batchFinished',
-    );
-
-    $action = $form_state->getValue('action');
-
-    foreach ($form_state->getValue('update') as $id) {
-      if (!empty($id)) {
-        $batch['operations'][] = array('Drupal\pathauto\Form\PathautoBulkUpdateForm::batchProcess', [$id, $action]);
-      }
-    }
-
-    batch_set($batch);
-  }
-
-  /**
-   * Batch callback; initialize the number of updated aliases.
-   */
-  public static function batchStart(&$context) {
-    $context['results']['updates'] = 0;
-  }
-
-  /**
-   * Common batch processing callback for all operations.
-   *
-   * Required to load our include the proper batch file.
-   */
-  public static function batchProcess($id, $action, &$context) {
-    /** @var \Drupal\pathauto\AliasTypeBatchUpdateInterface $alias_type */
-    $alias_type = \Drupal::service('plugin.manager.alias_type')->createInstance($id);
-    $alias_type->batchUpdate($action, $context);
-  }
-
-  /**
-   * Batch finished callback.
-   */
-  public static function batchFinished($success, $results, $operations) {
-    if ($success) {
-      if ($results['updates']) {
-        drupal_set_message(\Drupal::translation()->formatPlural($results['updates'], 'Generated 1 URL alias.', 'Generated @count URL aliases.'));
-      }
-      else {
-        drupal_set_message(t('No new URL aliases to generate.'));
-      }
-    }
-    else {
-      $error_operation = reset($operations);
-      drupal_set_message(t('An error occurred while processing @operation with arguments : @args', array('@operation' => $error_operation[0], '@args' => print_r($error_operation[0], TRUE))));
-    }
-  }
-
-}
diff --git a/modules/pathauto/src/Form/PathautoSettingsForm.php b/modules/pathauto/src/Form/PathautoSettingsForm.php
deleted file mode 100644
index 281edb2..0000000
--- a/modules/pathauto/src/Form/PathautoSettingsForm.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Form;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Url;
-use Drupal\pathauto\AliasTypeManager;
-use Drupal\pathauto\PathautoGeneratorInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Configure file system settings for this site.
- */
-class PathautoSettingsForm extends ConfigFormBase {
-
-  /**
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
-   */
-  protected $entityFieldManager;
-
-  /**
-   * @var \Drupal\pathauto\AliasTypeManager
-   */
-  protected $aliasTypeManager;
-
-  /**
-   * {@inheritDoc}
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, AliasTypeManager $alias_type_manager) {
-    parent::__construct($config_factory);
-    $this->entityTypeManager = $entity_type_manager;
-    $this->entityFieldManager = $entity_field_manager;
-    $this->aliasTypeManager = $alias_type_manager;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('entity_type.manager'),
-      $container->get('entity_field.manager'),
-      $container->get('plugin.manager.alias_type')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'pathauto_settings_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return ['pathauto.settings'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $config = $this->config('pathauto.settings');
-
-    $form['enabled_entity_types'] = [
-      '#type' => 'details',
-      '#open' => TRUE,
-      '#title' => $this->t('Enabled entity types'),
-      '#description' => $this->t('Enable to add a path field and allow to define alias patterns for the given type. Disabled types already define a path field themselves or currently have a pattern.'),
-      '#tree' => TRUE,
-    ];
-
-    // Get all applicable entity types.
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      // Disable a checkbox if it already exists and if the entity type has
-      // patterns currently defined or if it isn't defined by us.
-      $patterns_count = \Drupal::entityQuery('pathauto_pattern')
-        ->condition('type', 'canonical_entities:' . $entity_type_id)
-        ->count()
-        ->execute();
-
-      if (is_subclass_of($entity_type->getClass(), FieldableEntityInterface::class) && $entity_type->hasLinkTemplate('canonical')) {
-        $field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
-        $form['enabled_entity_types'][$entity_type_id] = [
-          '#type' => 'checkbox',
-          '#title' => $entity_type->getLabel(),
-          '#default_value' => isset($field_definitions['path']) || in_array($entity_type_id, $config->get('enabled_entity_types')),
-          '#disabled' => isset($field_definitions['path']) && ($field_definitions['path']->getProvider() != 'pathauto' || $patterns_count),
-        ];
-      }
-    }
-
-    $form['verbose'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Verbose'),
-      '#default_value' => $config->get('verbose'),
-      '#description' => $this->t('Display alias changes (except during bulk updates).'),
-    );
-
-    $form['separator'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Separator'),
-      '#size' => 1,
-      '#maxlength' => 1,
-      '#default_value' => $config->get('separator'),
-      '#description' => $this->t('Character used to separate words in titles. This will replace any spaces and punctuation characters. Using a space or + character can cause unexpected results.'),
-    );
-
-    $form['case'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Character case'),
-      '#default_value' => $config->get('case'),
-      '#description' => $this->t('Convert token values to lowercase.'),
-    );
-
-    $max_length = \Drupal::service('pathauto.alias_storage_helper')->getAliasSchemaMaxlength();
-
-    $help_link = '';
-    if (\Drupal::moduleHandler()->moduleExists('help')) {
-      $help_link = ' ' . $this->t('See <a href=":pathauto-help">Pathauto help</a> for details.', [':pathauto-help' => Url::fromRoute('help.page', ['name' => 'pathauto'])->toString()]);
-    }
-
-    $form['max_length'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('Maximum alias length'),
-      '#size' => 3,
-      '#maxlength' => 3,
-      '#default_value' => $config->get('max_length'),
-      '#min' => 1,
-      '#max' => $max_length,
-      '#description' => $this->t('Maximum length of aliases to generate. 100 is the recommended length. @max is the maximum possible length.', array('@max' => $max_length)) . $help_link,
-    );
-
-    $form['max_component_length'] = array(
-      '#type' => 'number',
-      '#title' => $this->t('Maximum component length'),
-      '#size' => 3,
-      '#maxlength' => 3,
-      '#default_value' => $config->get('max_component_length'),
-      '#min' => 1,
-      '#max' => $max_length,
-      '#description' => $this->t('Maximum text length of any component in the alias (e.g., [title]). 100 is the recommended length. @max is the maximum possible length.', ['@max' => $max_length]) . $help_link,
-    );
-
-    $description = $this->t('What should Pathauto do when updating an existing content item which already has an alias?');
-    if (\Drupal::moduleHandler()->moduleExists('redirect')) {
-      $description .= ' ' . $this->t('The <a href=":url">Redirect module settings</a> affect whether a redirect is created when an alias is deleted.', array(':url' => Url::fromRoute('redirect.settings')->toString()));
-    }
-    else {
-      $description .= ' ' . $this->t('Considering installing the <a href=":url">Redirect module</a> to get redirects when your aliases change.', array(':url' => 'http://drupal.org/project/redirect'));
-    }
-
-    $form['update_action'] = array(
-      '#type' => 'radios',
-      '#title' => $this->t('Update action'),
-      '#default_value' => $config->get('update_action'),
-      '#options' => array(
-        PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW => $this->t('Do nothing. Leave the old alias intact.'),
-        PathautoGeneratorInterface::UPDATE_ACTION_LEAVE => $this->t('Create a new alias. Leave the existing alias functioning.'),
-        PathautoGeneratorInterface::UPDATE_ACTION_DELETE => $this->t('Create a new alias. Delete the old alias.'),
-      ),
-      '#description' => $description,
-    );
-
-    $form['transliterate'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Transliterate prior to creating alias'),
-      '#default_value' => $config->get('transliterate'),
-      '#description' => $this->t('When a pattern includes certain characters (such as those with accents) should Pathauto attempt to transliterate them into the US-ASCII alphabet?'),
-    );
-
-    $form['reduce_ascii'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Reduce strings to letters and numbers'),
-      '#default_value' => $config->get('reduce_ascii'),
-      '#description' => $this->t('Filters the new alias to only letters and numbers found in the ASCII-96 set.'),
-    );
-
-    $form['ignore_words'] = array(
-      '#type' => 'textarea',
-      '#title' => $this->t('Strings to Remove'),
-      '#default_value' => $config->get('ignore_words'),
-      '#description' => $this->t('Words to strip out of the URL alias, separated by commas. Do not use this to remove punctuation.'),
-      '#wysiwyg' => FALSE,
-    );
-
-    $form['punctuation'] = array(
-      '#type' => 'fieldset',
-      '#title' => $this->t('Punctuation'),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
-      '#tree' => TRUE,
-    );
-
-    $punctuation = \Drupal::service('pathauto.alias_cleaner')->getPunctuationCharacters();
-
-    foreach ($punctuation as $name => $details) {
-      // Use the value from config if it exists.
-      if ($config->get('punctuation.' . $name) !== NULL) {
-        $details['default'] = $config->get('punctuation.' . $name);
-      }
-      else {
-        // Otherwise use the correct default.
-        $details['default'] = $details['value'] == $config->get('separator') ? PathautoGeneratorInterface::PUNCTUATION_REPLACE : PathautoGeneratorInterface::PUNCTUATION_REMOVE;
-      }
-      $form['punctuation'][$name] = array(
-        '#type' => 'select',
-        '#title' => $details['name'] . ' (<code>' . Html::escape($details['value']) . '</code>)',
-        '#default_value' => $details['default'],
-        '#options' => array(
-          PathautoGeneratorInterface::PUNCTUATION_REMOVE => $this->t('Remove'),
-          PathautoGeneratorInterface::PUNCTUATION_REPLACE => $this->t('Replace by separator'),
-          PathautoGeneratorInterface::PUNCTUATION_DO_NOTHING => $this->t('No action (do not replace)'),
-        ),
-      );
-    }
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-
-    $config = $this->config('pathauto.settings');
-
-    $form_state->cleanValues();
-
-    $original_entity_types = $config->get('enabled_entity_types');
-    foreach ($form_state->getValues() as $key => $value) {
-      if ($key == 'enabled_entity_types') {
-        $enabled_entity_types = [];
-        foreach ($value as $entity_type_id => $enabled) {
-          $field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
-          // Verify that the entity type is enabled and that it is not defined
-          // or defined by us before adding it to the configuration, so that
-          // we do not store an entity type that cannot be enabled or disabled.
-          if ($enabled && (!isset($field_definitions['path']) || ($field_definitions['path']->getProvider() === 'pathauto'))) {
-            $enabled_entity_types[] = $entity_type_id;
-          }
-        }
-        $value = $enabled_entity_types;
-      }
-      $config->set($key, $value);
-    }
-    $config->save();
-
-    parent::submitForm($form, $form_state);
-  }
-
-}
diff --git a/modules/pathauto/src/Form/PatternDisableForm.php b/modules/pathauto/src/Form/PatternDisableForm.php
deleted file mode 100644
index c87b88b..0000000
--- a/modules/pathauto/src/Form/PatternDisableForm.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Form;
-
-use Drupal\Core\Entity\EntityConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Provides the pathauto pattern disable disable form.
- */
-class PatternDisableForm extends EntityConfirmFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return $this->t('Are you sure you want to disable the pattern %label?', array('%label' => $this->entity->label()));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('entity.pathauto_pattern.collection');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Disable');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return $this->t('Disabled patterns are ignored when generating aliases.');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->entity->disable()->save();
-    drupal_set_message($this->t('Disabled pattern %label.', array('%label' => $this->entity->label())));
-
-    $form_state->setRedirectUrl($this->getCancelUrl());
-  }
-
-}
diff --git a/modules/pathauto/src/Form/PatternEditForm.php b/modules/pathauto/src/Form/PatternEditForm.php
deleted file mode 100644
index 49efc7e..0000000
--- a/modules/pathauto/src/Form/PatternEditForm.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Form;
-
-use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\pathauto\AliasTypeManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Edit form for pathauto patterns.
- */
-class PatternEditForm extends EntityForm {
-
-  /**
-   * @var \Drupal\pathauto\AliasTypeManager
-   */
-  protected $manager;
-
-  /**
-   * @var \Drupal\pathauto\PathautoPatternInterface
-   */
-  protected $entity;
-
-  /**
-   * The entity type bundle info service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
-   */
-  protected $entityTypeBundleInfo;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.alias_type'),
-      $container->get('entity_type.bundle.info'),
-      $container->get('entity_type.manager'),
-      $container->get('language_manager')
-    );
-  }
-
-  /**
-   * PatternEditForm constructor.
-   *
-   * @param \Drupal\pathauto\AliasTypeManager $manager
-   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   */
-  function __construct(AliasTypeManager $manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, EntityTypeManagerInterface $entity_type_manager, LanguageManagerInterface $language_manager) {
-    $this->manager = $manager;
-    $this->entityTypeBundleInfo = $entity_type_bundle_info;
-    $this->entityTypeManager = $entity_type_manager;
-    $this->languageManager = $language_manager;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-
-    $options = [];
-    foreach ($this->manager->getVisibleDefinitions() as $plugin_id => $plugin_definition) {
-      $options[$plugin_id] = $plugin_definition['label'];
-    }
-    $form['type'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Pattern type'),
-      '#default_value' => $this->entity->getType(),
-      '#options' => $options,
-      '#required' => TRUE,
-      '#limit_validation_errors' => array(array('type')),
-      '#submit' => array('::submitSelectType'),
-      '#executes_submit_callback' => TRUE,
-      '#ajax' => array(
-        'callback' => '::ajaxReplacePatternForm',
-        'wrapper' => 'pathauto-pattern',
-        'method' => 'replace',
-      ),
-    ];
-
-    $form['pattern_container'] = [
-      '#type' => 'container',
-      '#prefix' => '<div id="pathauto-pattern">',
-      '#suffix' => '</div>',
-    ];
-
-    // if there is no type yet, stop here.
-    if ($this->entity->getType()) {
-
-      $alias_type = $this->entity->getAliasType();
-
-      $form['pattern_container']['pattern'] = array(
-        '#type' => 'textfield',
-        '#title' => 'Path pattern',
-        '#default_value' => $this->entity->getPattern(),
-        '#size' => 65,
-        '#maxlength' => 1280,
-        '#element_validate' => array('token_element_validate', 'pathauto_pattern_validate'),
-        '#after_build' => array('token_element_validate'),
-        '#token_types' => $alias_type->getTokenTypes(),
-        '#min_tokens' => 1,
-        '#required' => TRUE,
-      );
-
-      // Show the token help relevant to this pattern type.
-      $form['pattern_container']['token_help'] = array(
-        '#theme' => 'token_tree_link',
-        '#token_types' => $alias_type->getTokenTypes(),
-      );
-
-      // Expose bundle and language conditions.
-      if ($alias_type->getDerivativeId() && $entity_type = $this->entityTypeManager->getDefinition($alias_type->getDerivativeId())) {
-
-        $default_bundles = [];
-        $default_languages = [];
-        foreach ($this->entity->getSelectionConditions() as $condition_id => $condition) {
-          if (in_array($condition->getPluginId(), ['entity_bundle:' . $entity_type->id(), 'node_type'])) {
-            $default_bundles = $condition->getConfiguration()['bundles'];
-          }
-          elseif ($condition->getPluginId() == 'language') {
-            $default_languages = $condition->getConfiguration()['langcodes'];
-          }
-        }
-
-        if ($entity_type->hasKey('bundle') && $bundles = $this->entityTypeBundleInfo->getBundleInfo($entity_type->id())) {
-          $bundle_options = [];
-          foreach ($bundles as $id => $info) {
-            $bundle_options[$id] = $info['label'];
-          }
-          $form['pattern_container']['bundles'] = array(
-            '#title' => $entity_type->getBundleLabel(),
-            '#type' => 'checkboxes',
-            '#options' => $bundle_options,
-            '#default_value' => $default_bundles,
-            '#description' => $this->t('Check to which types this pattern should be applied. Leave empty to allow any.'),
-          );
-        }
-
-        if ($this->languageManager->isMultilingual() && $entity_type->isTranslatable()) {
-          $language_options = [];
-          foreach ($this->languageManager->getLanguages() as $id => $language) {
-            $language_options[$id] = $language->getName();
-          }
-          $form['pattern_container']['languages'] = array(
-            '#title' => $this->t('Languages'),
-            '#type' => 'checkboxes',
-            '#options' => $language_options,
-            '#default_value' => $default_languages,
-            '#description' => $this->t('Check to which languages this pattern should be applied. Leave empty to allow any.'),
-          );
-        }
-      }
-    }
-
-    $form['label'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Label'),
-      '#maxlength' => 255,
-      '#default_value' => $this->entity->label(),
-      '#required' => TRUE,
-      '#description' => $this->t('A short name to help you identify this pattern in the patterns list.'),
-    );
-
-    $form['id'] = array(
-      '#type' => 'machine_name',
-      '#title' => $this->t('ID'),
-      '#maxlength' => 255,
-      '#default_value' => $this->entity->id(),
-      '#required' => TRUE,
-      '#disabled' => !$this->entity->isNew(),
-      '#machine_name' => array(
-        'exists' => 'Drupal\pathauto\Entity\PathautoPattern::load',
-      ),
-    );
-
-    $form['status'] = [
-      '#title' => $this->t('Enabled'),
-      '#type' => 'checkbox',
-      '#default_value' => $this->entity->status(),
-    ];
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public function buildEntity(array $form, FormStateInterface $form_state) {
-    /** @var \Drupal\pathauto\PathautoPatternInterface $entity */
-    $entity = parent::buildEntity($form, $form_state);
-
-    // Will only be used for new patterns.
-    $default_weight = 0;
-
-    $alias_type = $entity->getAliasType();
-    if ($alias_type->getDerivativeId() && $this->entityTypeManager->hasDefinition($alias_type->getDerivativeId())) {
-      $entity_type = $alias_type->getDerivativeId();
-      // First, remove bundle and language conditions.
-      foreach ($entity->getSelectionConditions() as $condition_id => $condition) {
-        if (in_array($condition->getPluginId(), ['entity_bundle:' . $entity_type, 'node_type', 'language'])) {
-          $entity->removeSelectionCondition($condition_id);
-        }
-      }
-
-      if ($bundles = array_filter((array) $form_state->getValue('bundles'))) {
-        $default_weight -= 5;
-        $plugin_id = $entity_type == 'node' ? 'node_type' : 'entity_bundle:' . $entity_type;
-        $entity->addSelectionCondition(
-          [
-            'id' => $plugin_id,
-            'bundles' => $bundles,
-            'negate' => FALSE,
-            'context_mapping' => [
-              $entity_type => $entity_type,
-            ]
-          ]
-        );
-      }
-
-      if ($languages = array_filter((array) $form_state->getValue('languages'))) {
-        $default_weight -= 5;
-        $language_mapping = $entity_type . ':' . $this->entityTypeManager->getDefinition($entity_type)->getKey('langcode') . ':language';
-        $entity->addSelectionCondition(
-          [
-            'id' => 'language',
-            'langcodes' => array_combine($languages, $languages),
-            'negate' => FALSE,
-            'context_mapping' => [
-              'language' => $language_mapping,
-            ]
-          ]
-        );
-        $entity->addRelationship($language_mapping, t('Language'));
-      }
-
-    }
-
-    if ($entity->isNew()) {
-      $entity->setWeight($default_weight);
-    }
-
-    return $entity;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    parent::save($form, $form_state);
-    drupal_set_message($this->t('Pattern @label saved.', ['@label' => $this->entity->label()]));
-    $form_state->setRedirectUrl($this->entity->toUrl('collection'));
-  }
-
-  /**
-   * Handles switching the type selector.
-   */
-  public function ajaxReplacePatternForm($form, FormStateInterface $form_state) {
-    return $form['pattern_container'];
-  }
-
-  /**
-   * Handles submit call when alias type is selected.
-   */
-  public function submitSelectType(array $form, FormStateInterface $form_state) {
-    $this->entity = $this->buildEntity($form, $form_state);
-    $form_state->setRebuild();
-  }
-
-}
diff --git a/modules/pathauto/src/Form/PatternEnableForm.php b/modules/pathauto/src/Form/PatternEnableForm.php
deleted file mode 100644
index 253ca31..0000000
--- a/modules/pathauto/src/Form/PatternEnableForm.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Form;
-
-use Drupal\Core\Entity\EntityConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Provides the pathauto pattern disable disable form.
- */
-class PatternEnableForm extends EntityConfirmFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return $this->t('Are you sure you want to enable the pattern %label?', array('%label' => $this->entity->label()));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('entity.pathauto_pattern.collection');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Enable');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return '';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->entity->enable()->save();
-    drupal_set_message($this->t('Enabled pattern %label.', array('%label' => $this->entity->label())));
-
-    $form_state->setRedirectUrl($this->getCancelUrl());
-  }
-
-}
diff --git a/modules/pathauto/src/MessengerInterface.php b/modules/pathauto/src/MessengerInterface.php
deleted file mode 100644
index e31f48f..0000000
--- a/modules/pathauto/src/MessengerInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-/**
- * Provides an interface for Messengers.
- */
-interface MessengerInterface {
-
-  /**
-   * Adds a message.
-   *
-   * @param string $message
-   *   The message to add.
-   * @param string $op
-   *   (optional) The operation being performed.
-   */
-  public function addMessage($message, $op = NULL);
-
-}
diff --git a/modules/pathauto/src/PathautoGenerator.php b/modules/pathauto/src/PathautoGenerator.php
deleted file mode 100644
index 6c56a5c..0000000
--- a/modules/pathauto/src/PathautoGenerator.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\RevisionableInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\Core\Utility\Token;
-use Drupal\token\TokenEntityMapperInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-
-/**
- * Provides methods for generating path aliases.
- */
-class PathautoGenerator implements PathautoGeneratorInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * Config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * Module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * Token service.
-   *
-   * @var \Drupal\Core\Utility\Token
-   */
-  protected $token;
-
-  /**
-   * Calculated pattern for a specific entity.
-   *
-   * @var array
-   */
-  protected $patterns = array();
-
-  /**
-   * Available patterns per entity type ID.
-   *
-   * @var array
-   */
-  protected $patternsByEntityType = array();
-
-  /**
-   * The alias cleaner.
-   *
-   * @var \Drupal\pathauto\AliasCleanerInterface
-   */
-  protected $aliasCleaner;
-
-  /**
-   * The alias storage helper.
-   *
-   * @var \Drupal\pathauto\AliasStorageHelperInterface
-   */
-  protected $aliasStorageHelper;
-
-  /**
-   * The alias uniquifier.
-   *
-   * @var \Drupal\pathauto\AliasUniquifierInterface
-   */
-  protected $aliasUniquifier;
-
-  /**
-   * The messenger service.
-   *
-   * @var \Drupal\pathauto\MessengerInterface
-   */
-  protected $messenger;
-
-  /**
-   * @var \Drupal\token\TokenEntityMapperInterface
-   */
-  protected $tokenEntityMapper;
-
-  /**
-   * @var Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Creates a new Pathauto manager.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   * @param \Drupal\Core\Utility\Token $token
-   *   The token utility.
-   * @param \Drupal\pathauto\AliasCleanerInterface $alias_cleaner
-   *   The alias cleaner.
-   * @param \Drupal\pathauto\AliasStorageHelperInterface $alias_storage_helper
-   *   The alias storage helper.
-   * @param AliasUniquifierInterface $alias_uniquifier
-   *   The alias uniquifier.
-   * @param MessengerInterface $messenger
-   *   The messenger service.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   * @param Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler, Token $token, AliasCleanerInterface $alias_cleaner, AliasStorageHelperInterface $alias_storage_helper, AliasUniquifierInterface $alias_uniquifier, MessengerInterface $messenger, TranslationInterface $string_translation, TokenEntityMapperInterface $token_entity_mappper, EntityTypeManagerInterface $entity_type_manager) {
-    $this->configFactory = $config_factory;
-    $this->moduleHandler = $module_handler;
-    $this->token = $token;
-    $this->aliasCleaner = $alias_cleaner;
-    $this->aliasStorageHelper = $alias_storage_helper;
-    $this->aliasUniquifier = $alias_uniquifier;
-    $this->messenger = $messenger;
-    $this->stringTranslation = $string_translation;
-    $this->tokenEntityMapper = $token_entity_mappper;
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createEntityAlias(EntityInterface $entity, $op) {
-    // Retrieve and apply the pattern for this content type.
-    $pattern = $this->getPatternByEntity($entity);
-    if (empty($pattern)) {
-      // No pattern? Do nothing (otherwise we may blow away existing aliases...)
-      return NULL;
-    }
-
-    $source = '/' . $entity->toUrl()->getInternalPath();
-    $config = $this->configFactory->get('pathauto.settings');
-    $langcode = $entity->language()->getId();
-
-    // Core does not handle aliases with language Not Applicable.
-    if ($langcode == LanguageInterface::LANGCODE_NOT_APPLICABLE) {
-      $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED;
-    }
-
-    // Build token data.
-    $data = [
-      $this->tokenEntityMapper->getTokenTypeForEntityType($entity->getEntityTypeId()) => $entity,
-    ];
-
-    // Allow other modules to alter the pattern.
-    $context = array(
-      'module' => $entity->getEntityType()->getProvider(),
-      'op' => $op,
-      'source' => $source,
-      'data' => $data,
-      'bundle' => $entity->bundle(),
-      'language' => &$langcode,
-    );
-    // @todo Is still hook still useful?
-    $this->moduleHandler->alter('pathauto_pattern', $pattern, $context);
-
-    // Special handling when updating an item which is already aliased.
-    $existing_alias = NULL;
-    if ($op == 'update' || $op == 'bulkupdate') {
-      if ($existing_alias = $this->aliasStorageHelper->loadBySource($source, $langcode)) {
-        switch ($config->get('update_action')) {
-          case PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW:
-            // If an alias already exists,
-            // and the update action is set to do nothing,
-            // then gosh-darn it, do nothing.
-            return NULL;
-        }
-      }
-    }
-
-    // Replace any tokens in the pattern.
-    // Uses callback option to clean replacements. No sanitization.
-    // Pass empty BubbleableMetadata object to explicitly ignore cacheablity,
-    // as the result is never rendered.
-    $alias = $this->token->replace($pattern->getPattern(), $data, array(
-      'clear' => TRUE,
-      'callback' => array($this->aliasCleaner, 'cleanTokenValues'),
-      'langcode' => $langcode,
-      'pathauto' => TRUE,
-    ), new BubbleableMetadata());
-
-    // Check if the token replacement has not actually replaced any values. If
-    // that is the case, then stop because we should not generate an alias.
-    // @see token_scan()
-    $pattern_tokens_removed = preg_replace('/\[[^\s\]:]*:[^\s\]]*\]/', '', $pattern->getPattern());
-    if ($alias === $pattern_tokens_removed) {
-      return NULL;
-    }
-
-    $alias = $this->aliasCleaner->cleanAlias($alias);
-
-    // Allow other modules to alter the alias.
-    $context['source'] = &$source;
-    $context['pattern'] = $pattern;
-    $this->moduleHandler->alter('pathauto_alias', $alias, $context);
-
-    // If we have arrived at an empty string, discontinue.
-    if (!Unicode::strlen($alias)) {
-      return NULL;
-    }
-
-    // If the alias already exists, generate a new, hopefully unique, variant.
-    $original_alias = $alias;
-    $this->aliasUniquifier->uniquify($alias, $source, $langcode);
-    if ($original_alias != $alias) {
-      // Alert the user why this happened.
-      $this->messenger->addMessage($this->t('The automatically generated alias %original_alias conflicted with an existing alias. Alias changed to %alias.', array(
-        '%original_alias' => $original_alias,
-        '%alias' => $alias,
-      )), $op);
-    }
-
-    // Return the generated alias if requested.
-    if ($op == 'return') {
-      return $alias;
-    }
-
-    // Build the new path alias array and send it off to be created.
-    $path = array(
-      'source' => $source,
-      'alias' => $alias,
-      'language' => $langcode,
-    );
-
-    return $this->aliasStorageHelper->save($path, $existing_alias, $op);
-  }
-
-  /**
-   * Loads pathauto patterns for a given entity type ID
-   *
-   * @param string $entity_type_id
-   *   An entity type ID.
-   *
-   * @return \Drupal\pathauto\PathautoPatternInterface[]
-   *   A list of patterns, sorted by weight.
-   */
-  protected function getPatternByEntityType($entity_type_id) {
-    if (!isset($this->patternsByEntityType[$entity_type_id])) {
-      $ids = \Drupal::entityQuery('pathauto_pattern')
-        ->condition('type', array_keys(\Drupal::service('plugin.manager.alias_type')
-          ->getPluginDefinitionByType($this->tokenEntityMapper->getTokenTypeForEntityType($entity_type_id))))
-        ->condition('status', 1)
-        ->sort('weight')
-        ->execute();
-
-      $this->patternsByEntityType[$entity_type_id] = \Drupal::entityTypeManager()
-        ->getStorage('pathauto_pattern')
-        ->loadMultiple($ids);
-    }
-
-    return $this->patternsByEntityType[$entity_type_id];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPatternByEntity(EntityInterface $entity) {
-    $langcode = $entity->language()->getId();
-    if (!isset($this->patterns[$entity->getEntityTypeId()][$entity->id()][$langcode])) {
-      foreach ($this->getPatternByEntityType($entity->getEntityTypeId()) as $pattern) {
-        if ($pattern->applies($entity)) {
-          $this->patterns[$entity->getEntityTypeId()][$entity->id()][$langcode] = $pattern;
-          break;
-        }
-      }
-      // If still not set.
-      if (!isset($this->patterns[$entity->getEntityTypeId()][$entity->id()][$langcode])) {
-        $this->patterns[$entity->getEntityTypeId()][$entity->id()][$langcode] = NULL;
-      }
-    }
-    return $this->patterns[$entity->getEntityTypeId()][$entity->id()][$langcode];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resetCaches() {
-    $this->patterns = [];
-    $this->patternsByEntityType = [];
-    $this->aliasCleaner->resetCaches();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function updateEntityAlias(EntityInterface $entity, $op, array $options = array()) {
-    // Skip if the entity does not have the path field.
-    if (!($entity instanceof ContentEntityInterface) || !$entity->hasField('path')) {
-      return NULL;
-    }
-
-    // Skip if pathauto processing is disabled.
-    if ($entity->path->pathauto != PathautoState::CREATE && empty($options['force'])) {
-      return NULL;
-    }
-
-    // Only act if this is the default revision.
-    if ($entity instanceof RevisionableInterface && !$entity->isDefaultRevision()) {
-      return NULL;
-    }
-
-    $options += array('language' => $entity->language()->getId());
-    $type = $entity->getEntityTypeId();
-
-    // Skip processing if the entity has no pattern.
-    if (!$this->getPatternByEntity($entity)) {
-      return NULL;
-    }
-
-    // Deal with taxonomy specific logic.
-    // @todo Update and test forum related code.
-    if ($type == 'taxonomy_term') {
-
-      $config_forum = $this->configFactory->get('forum.settings');
-      if ($entity->getVocabularyId() == $config_forum->get('vocabulary')) {
-        $type = 'forum';
-      }
-    }
-
-    try {
-      $result = $this->createEntityAlias($entity, $op);
-    }
-    catch (\InvalidArgumentException $e) {
-      drupal_set_message($e->getMessage(), 'error');
-      return NULL;
-    }
-
-    // @todo Move this to a method on the pattern plugin.
-    if ($type == 'taxonomy_term') {
-      foreach ($this->loadTermChildren($entity->id()) as $subterm) {
-        $this->updateEntityAlias($subterm, $op, $options);
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * Finds all children of a term ID.
-   *
-   * @param int $tid
-   *   Term ID to retrieve parents for.
-   *
-   * @return \Drupal\taxonomy\TermInterface[]
-   *   An array of term objects that are the children of the term $tid.
-   */
-  protected function loadTermChildren($tid) {
-    return $this->entityTypeManager->getStorage('taxonomy_term')->loadChildren($tid);
-  }
-
-}
diff --git a/modules/pathauto/src/PathautoGeneratorInterface.php b/modules/pathauto/src/PathautoGeneratorInterface.php
deleted file mode 100644
index 5880adb..0000000
--- a/modules/pathauto/src/PathautoGeneratorInterface.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Core\Entity\EntityInterface;
-
-/**
- * Provides and interface for PathautoGenerator.
- */
-interface PathautoGeneratorInterface {
-
-  /**
-   * "Do nothing. Leave the old alias intact."
-   */
-  const UPDATE_ACTION_NO_NEW = 0;
-
-  /**
-   * "Create a new alias. Leave the existing alias functioning."
-   */
-  const UPDATE_ACTION_LEAVE = 1;
-
-  /**
-   * "Create a new alias. Delete the old alias."
-   */
-  const UPDATE_ACTION_DELETE = 2;
-
-  /**
-   * Remove the punctuation from the alias.
-   */
-  const PUNCTUATION_REMOVE = 0;
-
-  /**
-   * Replace the punctuation with the separator in the alias.
-   */
-  const PUNCTUATION_REPLACE = 1;
-
-  /**
-   * Leave the punctuation as it is in the alias.
-   */
-  const PUNCTUATION_DO_NOTHING = 2;
-
-  /**
-   * Resets internal caches.
-   */
-  public function resetCaches();
-
-  /**
-   * Load an alias pattern entity by entity, bundle, and language.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   An entity.
-   * @return \Drupal\pathauto\PathautoPatternInterface|null
-   */
-  public function getPatternByEntity(EntityInterface $entity);
-
-  /**
-   * Apply patterns to create an alias.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity.
-   * @param string $op
-   *   Operation being performed on the content being aliased
-   *   ('insert', 'update', 'return', or 'bulkupdate').
-   *
-   * @return array|string
-   *   The alias that was created.
-   *
-   * @see _pathauto_set_alias()
-   */
-  public function createEntityAlias(EntityInterface $entity, $op);
-
-  /**
-   * Creates or updates an alias for the given entity.
-   *
-   * @param EntityInterface $entity
-   *   Entity for which to update the alias.
-   * @param string $op
-   *   The operation performed (insert, update)
-   * @param array $options
-   *   - force: will force updating the path
-   *   - language: the language for which to create the alias
-   *
-   * @return array|null
-   *   - An array with alias data in case the alias has been created or updated.
-   *   - NULL if no operation performed.
-   */
-  public function updateEntityAlias(EntityInterface $entity, $op, array $options = array());
-
-}
diff --git a/modules/pathauto/src/PathautoItem.php b/modules/pathauto/src/PathautoItem.php
deleted file mode 100644
index cababe6..0000000
--- a/modules/pathauto/src/PathautoItem.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\path\Plugin\Field\FieldType\PathItem;
-
-/**
- * Extends the default PathItem implementation to generate aliases.
- */
-class PathautoItem extends PathItem {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
-    $properties = parent::propertyDefinitions($field_definition);
-    $properties['pathauto'] = DataDefinition::create('integer')
-      ->setLabel(t('Pathauto state'))
-      ->setDescription(t('Whether an automated alias should be created or not.'))
-      ->setComputed(TRUE)
-      ->setClass('\Drupal\pathauto\PathautoState');
-    return $properties;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function postSave($update) {
-    // Only allow the parent implementation to act if pathauto will not create
-    // an alias.
-    if ($this->pathauto == PathautoState::SKIP) {
-      parent::postSave($update);
-    }
-    $this->get('pathauto')->persist();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isEmpty() {
-    // Make sure that the pathauto state flag does not get lost if just that is
-    // changed.
-    return !$this->alias && !$this->get('pathauto')->hasValue();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applyDefaultValue($notify = TRUE) {
-    parent::applyDefaultValue($notify);
-    // Created fields default creating a new alias.
-    $this->setValue(array('pathauto' => PathautoState::CREATE), $notify);
-    return $this;
-  }
-
-}
diff --git a/modules/pathauto/src/PathautoPatternInterface.php b/modules/pathauto/src/PathautoPatternInterface.php
deleted file mode 100644
index 9782f2e..0000000
--- a/modules/pathauto/src/PathautoPatternInterface.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-
-/**
- * Provides an interface for defining Pathauto pattern entities.
- */
-interface PathautoPatternInterface extends ConfigEntityInterface {
-
-  /**
-   * Get the tokenized pattern used during alias generation.
-   *
-   * @return string
-   */
-  public function getPattern();
-
-  /**
-   * Set the tokenized pattern to use during alias generation.
-   *
-   * @param string $pattern
-   *
-   * @return $this
-   */
-  public function setPattern($pattern);
-
-  /**
-   * Gets the type of this pattern.
-   *
-   * @return string
-   */
-  public function getType();
-
-  /**
-   * @return \Drupal\pathauto\AliasTypeInterface
-   */
-  public function getAliasType();
-
-  /**
-   * Gets the weight of this pattern (compared to other patterns of this type).
-   *
-   * @return int
-   */
-  public function getWeight();
-
-  /**
-   * Sets the weight of this pattern (compared to other patterns of this type).
-   *
-   * @param int $weight
-   *   The weight of the variant.
-   *
-   * @return $this
-   */
-  public function setWeight($weight);
-
-  /**
-   * Returns the contexts of this pattern.
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
-   */
-  public function getContexts();
-
-  /**
-   * Returns whether a relationship exists.
-   *
-   * @param string $token
-   *   Relationship identifier.
-   *
-   * @return bool
-   *   TRUE if the relationship exists, FALSE otherwise.
-   */
-  public function hasRelationship($token);
-
-  /**
-   * Adds a relationship.
-   *
-   * The relationship will not be changed if it already exists.
-   *
-   * @param string $token
-   *   Relationship identifier.
-   * @param string|null $label
-   *   (optional) A label, will use the label of the referenced context if not
-   *   provided.
-   *
-   * @return $this
-   */
-  public function addRelationship($token, $label = NULL);
-
-  /**
-   * Replaces a relationship.
-   *
-   * Only already existing relationships are updated.
-   *
-   * @param string $token
-   *   Relationship identifier.
-   * @param string|null $label
-   *   (optional) A label, will use the label of the referenced context if not
-   *   provided.
-   *
-   * @return $this
-   */
-  public function replaceRelationship($token, $label);
-
-  /**
-   * Removes a relationship.
-   *
-   * @param string $token
-   *   Relationship identifier.
-   *
-   * @return $this
-   */
-  public function removeRelationship($token);
-
-  /**
-   * Returns a list of relationships.
-   *
-   * @return array[]
-   *   Keys are context tokens, and values are arrays with the following keys:
-   *   - label (string|null, optional): The human-readable label of this
-   *     relationship.
-   */
-  public function getRelationships();
-
-  /**
-   * Gets the selection condition collection.
-   *
-   * @return \Drupal\Core\Condition\ConditionInterface[]|\Drupal\Core\Condition\ConditionPluginCollection
-   */
-  public function getSelectionConditions();
-
-  /**
-   * Adds selection criteria.
-   *
-   * @param array $configuration
-   *   Configuration of the selection criteria.
-   *
-   * @return string
-   *   The condition id of the new criteria.
-   */
-  public function addSelectionCondition(array $configuration);
-
-  /**
-   * Gets selection criteria by condition id.
-   *
-   * @param string $condition_id
-   *   The id of the condition.
-   *
-   * @return \Drupal\Core\Condition\ConditionInterface
-   */
-  public function getSelectionCondition($condition_id);
-
-  /**
-   * Removes selection criteria by condition id.
-   *
-   * @param string $condition_id
-   *   The id of the condition.
-   *
-   * @return $this
-   */
-  public function removeSelectionCondition($condition_id);
-
-  /**
-   * Gets the selection logic used by the criteria (ie. "and" or "or").
-   *
-   * @return string
-   *   Either "and" or "or"; represents how the selection criteria are combined.
-   */
-  public function getSelectionLogic();
-
-  /**
-   * Determines if this pattern can apply a given object.
-   *
-   * @param $object
-   *   The object used to determine if this plugin can apply.
-   *
-   * @return bool
-   */
-  public function applies($object);
-
-}
diff --git a/modules/pathauto/src/PathautoPatternListBuilder.php b/modules/pathauto/src/PathautoPatternListBuilder.php
deleted file mode 100644
index 85c9533..0000000
--- a/modules/pathauto/src/PathautoPatternListBuilder.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Core\Config\Entity\DraggableListBuilder;
-use Drupal\Core\Entity\EntityInterface;
-
-/**
- * Provides a listing of Pathauto pattern entities.
- */
-class PathautoPatternListBuilder extends DraggableListBuilder {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $limit = FALSE;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'pathauto_pattern_list';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildHeader() {
-    $header['label'] = $this->t('Label');
-    $header['pattern'] = $this->t('Pattern');
-    $header['type'] = $this->t('Pattern type');
-    $header['conditions'] = $this->t('Conditions');
-    return $header + parent::buildHeader();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    /* @var \Drupal\pathauto\PathautoPatternInterface $entity */
-    $row['label'] = $entity->label();
-    $row['patern']['#markup'] = $entity->getPattern();
-    $row['type']['#markup'] = $entity->getAliasType()->getLabel();
-    $row['conditions']['#theme'] = 'item_list';
-    foreach ($entity->getSelectionConditions() as $condition) {
-      $row['conditions']['#items'][] = $condition->summary();
-    }
-    return $row + parent::buildRow($entity);
-  }
-
-}
diff --git a/modules/pathauto/src/PathautoState.php b/modules/pathauto/src/PathautoState.php
deleted file mode 100644
index 6415252..0000000
--- a/modules/pathauto/src/PathautoState.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-namespace Drupal\pathauto;
-
-use Drupal\Core\TypedData\TypedData;
-
-/**
- * A property that stores in keyvalue whether an entity should receive an alias.
- */
-class PathautoState extends TypedData {
-
-  /**
-   * An automatic alias should not be created.
-   */
-  const SKIP = 0;
-
-  /**
-   * An automatic alias should be created.
-   */
-  const CREATE = 1;
-
-  /**
-   * Pathauto state.
-   *
-   * @var int
-   */
-  protected $value;
-
-  /**
-   * @var \Drupal\Core\Field\FieldItemInterface
-   */
-  protected $parent;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getValue() {
-    if ($this->value === NULL) {
-      // If no value has been set or loaded yet, try to load a value if this
-      // entity has already been saved.
-      $this->value = \Drupal::keyValue($this->getCollection())
-        ->get($this->parent->getEntity()->id());
-      // If it was not yet saved or no value was found, then set the flag to
-      // create the alias if there is a matching pattern.
-      if ($this->value === NULL) {
-        $entity = $this->parent->getEntity();
-        $pattern = \Drupal::service('pathauto.generator')->getPatternByEntity($entity);
-        $this->value = !empty($pattern) ? static::CREATE : static::SKIP;
-      }
-    }
-    return $this->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setValue($value, $notify = TRUE) {
-    $this->value = $value;
-    // Notify the parent of any changes.
-    if ($notify && isset($this->parent)) {
-      $this->parent->onChange($this->name);
-    }
-  }
-
-  /**
-   * Returns TRUE if a value was set.
-   */
-  public function hasValue() {
-    return $this->value !== NULL;
-  }
-
-  /**
-   * Persists the state.
-   */
-  public function persist() {
-    \Drupal::keyValue($this->getCollection())->set(
-      $this->parent->getEntity()
-        ->id(), $this->value
-    );
-  }
-
-  /**
-   * Deletes the stored state.
-   */
-  public function purge() {
-    \Drupal::keyValue($this->getCollection())
-      ->delete($this->parent->getEntity()->id());
-  }
-
-  /**
-   * Returns the key value collection that should be used for the given entity.
-   * @return string
-   */
-  protected function getCollection() {
-    return 'pathauto_state.' . $this->parent->getEntity()->getEntityTypeId();
-  }
-
-}
diff --git a/modules/pathauto/src/PathautoWidget.php b/modules/pathauto/src/PathautoWidget.php
deleted file mode 100644
index 3ca0490..0000000
--- a/modules/pathauto/src/PathautoWidget.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\path\Plugin\Field\FieldWidget\PathWidget;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Extends the core path widget.
- */
-class PathautoWidget extends PathWidget {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element = parent::formElement($items, $delta, $element, $form, $form_state);
-    $entity = $items->getEntity();
-
-    // Taxonomy terms do not have an actual fieldset for path settings.
-    // Merge in the defaults.
-    // @todo Impossible to do this in widget, use another solution
-    /*
-    $form['path'] += array(
-      '#type' => 'fieldset',
-      '#title' => $this->t('URL path settings'),
-      '#collapsible' => TRUE,
-      '#collapsed' => empty($form['path']['alias']),
-      '#group' => 'additional_settings',
-      '#attributes' => array(
-        'class' => array('path-form'),
-      ),
-      '#access' => \Drupal::currentUser()->hasPermission('create url aliases') || \Drupal::currentUser()->hasPermission('administer url aliases'),
-      '#weight' => 30,
-      '#tree' => TRUE,
-      '#element_validate' => array('path_form_element_validate'),
-    );*/
-
-    $pattern = \Drupal::service('pathauto.generator')->getPatternByEntity($entity);
-    if (empty($pattern)) {
-      return $element;
-    }
-
-    if (\Drupal::currentUser()->hasPermission('administer pathauto')) {
-      $description = $this->t('Uncheck this to create a custom alias below. <a href="@admin_link">Configure URL alias patterns.</a>', ['@admin_link' => Url::fromRoute('entity.pathauto_pattern.collection')->toString()]);
-    }
-    else {
-      $description = $this->t('Uncheck this to create a custom alias below.');
-    }
-
-    $element['pathauto'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Generate automatic URL alias'),
-      '#default_value' => $entity->path->pathauto,
-      '#description' => $description,
-      '#weight' => -1,
-    );
-
-    // Add JavaScript that will disable the path textfield when the automatic
-    // alias checkbox is checked.
-    $element['alias']['#states']['disabled']['input[name="path[' . $delta . '][pathauto]"]'] = array('checked' => TRUE);
-
-    // Override path.module's vertical tabs summary.
-    $element['alias']['#attached']['library'] = ['pathauto/widget'];
-
-    return $element;
-  }
-
-}
diff --git a/modules/pathauto/src/Plugin/Action/UpdateAction.php b/modules/pathauto/src/Plugin/Action/UpdateAction.php
deleted file mode 100644
index bfe0f48..0000000
--- a/modules/pathauto/src/Plugin/Action/UpdateAction.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Plugin\Action;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Action\ActionBase;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\pathauto\PathautoState;
-
-/**
- * Pathauto entity update action.
- *
- * @Action(
- *   id = "pathauto_update_alias",
- *   label = @Translation("Update URL alias of an entity"),
- * )
- */
-class UpdateAction extends ActionBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function execute($entity = NULL) {
-    $entity->path->pathauto = PathautoState::CREATE;
-    \Drupal::service('pathauto.generator')->updateEntityAlias($entity, 'bulkupdate', array('message' => TRUE));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
-    $result = AccessResult::allowedIfHasPermission($account, 'create url aliases');
-    return $return_as_object ? $result : $result->isAllowed();
-  }
-
-}
diff --git a/modules/pathauto/src/Plugin/Deriver/EntityAliasTypeDeriver.php b/modules/pathauto/src/Plugin/Deriver/EntityAliasTypeDeriver.php
deleted file mode 100644
index cf7b4a2..0000000
--- a/modules/pathauto/src/Plugin/Deriver/EntityAliasTypeDeriver.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Plugin\Deriver;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\token\TokenEntityMapperInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Deriver that exposes content entities as alias type plugins.
- */
-class EntityAliasTypeDeriver extends DeriverBase implements ContainerDeriverInterface {
-
-  use StringTranslationTrait;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
-   */
-  protected $entityFieldManager;
-
-  /**
-   * @var \Drupal\token\TokenEntityMapperInterface
-   */
-  protected $tokenEntityMapper;
-
-  /**
-   * Constructs new EntityAliasTypeDeriver.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
-   *   The entity field manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   * @apram \Drupal\Token\TokenEntityMapperInterface $token_entity_mapper
-   *   The token entity mapper.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, TranslationInterface $string_translation, TokenEntityMapperInterface $token_entity_mapper) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->entityFieldManager = $entity_field_manager;
-    $this->stringTranslation = $string_translation;
-    $this->tokenEntityMapper = $token_entity_mapper;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static(
-      $container->get('entity_type.manager'),
-      $container->get('entity_field.manager'),
-      $container->get('string_translation'),
-      $container->get('token.entity_mapper')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      // An entity type must have a canonical link template and support fields.
-      if ($entity_type->hasLinkTemplate('canonical') && is_subclass_of($entity_type->getClass(), FieldableEntityInterface::class)) {
-        $base_fields = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
-        if (!isset($base_fields['path'])) {
-          // The entity type does not have a path field and is therefore not
-          // supported.
-          continue;
-        }
-        $this->derivatives[$entity_type_id] = $base_plugin_definition;
-        $this->derivatives[$entity_type_id]['label'] = $entity_type->getLabel();
-        $this->derivatives[$entity_type_id]['types'] = [$this->tokenEntityMapper->getTokenTypeForEntityType($entity_type_id)];
-        $this->derivatives[$entity_type_id]['provider'] = $entity_type->getProvider();
-        $this->derivatives[$entity_type_id]['context'] = [
-          $entity_type_id => new ContextDefinition("entity:$entity_type_id", $this->t('@label being aliased', ['@label' => $entity_type->getLabel()]))
-        ];
-      }
-    }
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/pathauto/src/Plugin/pathauto/AliasType/Broken.php b/modules/pathauto/src/Plugin/pathauto/AliasType/Broken.php
deleted file mode 100644
index cc48771..0000000
--- a/modules/pathauto/src/Plugin/pathauto/AliasType/Broken.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Plugin\pathauto\AliasType;
-
-/**
- * Defines a fallback plugin for missing block plugins.
- *
- * @AliasType(
- *   id = "broken",
- *   label = @Translation("Broken"),
- *   admin_label = @Translation("Broken/Missing"),
- *   category = @Translation("AliasType"),
- * )
- */
-class Broken extends EntityAliasTypeBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLabel() {
-    return $this->t('Broken type');
-  }
-
-}
diff --git a/modules/pathauto/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php b/modules/pathauto/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php
deleted file mode 100644
index 121f04b..0000000
--- a/modules/pathauto/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php
+++ /dev/null
@@ -1,342 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Plugin\pathauto\AliasType;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\Plugin\ContextAwarePluginBase;
-use Drupal\pathauto\AliasTypeBatchUpdateInterface;
-use Drupal\pathauto\AliasTypeInterface;
-use Drupal\pathauto\PathautoState;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * A pathauto alias type plugin for entities with canonical links.
- *
- * @AliasType(
- *   id = "canonical_entities",
- *   deriver = "\Drupal\pathauto\Plugin\Deriver\EntityAliasTypeDeriver"
- * )
- */
-class EntityAliasTypeBase extends ContextAwarePluginBase implements AliasTypeInterface, AliasTypeBatchUpdateInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * The module handler service.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The language manager service.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
-   * The entity manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The key/value manager service.
-   *
-   * @var \Drupal\Core\KeyValueStore\KeyValueFactoryInterface
-   */
-  protected $keyValue;
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * The path prefix for this entity type.
-   *
-   * @var string
-   */
-  protected $prefix;
-
-  /**
-   * Constructs a EntityAliasTypeBase instance.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler service.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The language manager service.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity manager service.
-   * @param \Drupal\Core\KeyValueStore\KeyValueFactoryInterface $key_value
-   *   The key/value manager service.
-   * @param \Drupal\Core\Database\Connection $database
-   *   The database connection.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ModuleHandlerInterface $module_handler, LanguageManagerInterface $language_manager, EntityTypeManagerInterface $entity_type_manager, KeyValueFactoryInterface $key_value, Connection $database) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->moduleHandler = $module_handler;
-    $this->languageManager = $language_manager;
-    $this->entityTypeManager = $entity_type_manager;
-    $this->keyValue = $key_value;
-    $this->database = $database;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('module_handler'),
-      $container->get('language_manager'),
-      $container->get('entity_type.manager'),
-      $container->get('keyvalue'),
-      $container->get('database')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLabel() {
-    $definition = $this->getPluginDefinition();
-    // Cast the admin label to a string since it is an object.
-    // @see \Drupal\Core\StringTranslation\TranslationWrapper
-    return (string) $definition['label'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTokenTypes() {
-    $definition = $this->getPluginDefinition();
-    return $definition['types'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function batchUpdate($action, &$context) {
-    if (!isset($context['sandbox']['current'])) {
-      $context['sandbox']['count'] = 0;
-      $context['sandbox']['current'] = 0;
-    }
-
-    $entity_type = $this->entityTypeManager->getDefinition($this->getEntityTypeId());
-    $id_key = $entity_type->getKey('id');
-
-    $query = $this->database->select($entity_type->get('base_table'), 'base_table');
-    $query->leftJoin('url_alias', 'ua', "CONCAT('" . $this->getSourcePrefix() . "' , base_table.$id_key) = ua.source");
-    $query->addField('base_table', $id_key, 'id');
-
-    switch ($action) {
-      case 'create':
-        $query->isNull('ua.source');
-        break;
-      case 'update':
-        $query->isNotNull('ua.source');
-        break;
-      case 'all':
-        // Nothing to do. We want all paths.
-        break;
-      default:
-        // Unknown action. Abort!
-        return;
-    }
-    $query->condition('base_table.' . $id_key, $context['sandbox']['current'], '>');
-    $query->orderBy('base_table.' . $id_key);
-    $query->addTag('pathauto_bulk_update');
-    $query->addMetaData('entity', $this->getEntityTypeId());
-
-    // Get the total amount of items to process.
-    if (!isset($context['sandbox']['total'])) {
-      $context['sandbox']['total'] = $query->countQuery()->execute()->fetchField();
-
-      // If there are no entities to update, then stop immediately.
-      if (!$context['sandbox']['total']) {
-        $context['finished'] = 1;
-        return;
-      }
-    }
-
-    $query->range(0, 25);
-    $ids = $query->execute()->fetchCol();
-
-    $updates = $this->bulkUpdate($ids);
-    $context['sandbox']['count'] += count($ids);
-    $context['sandbox']['current'] = max($ids);
-    $context['results']['updates'] += $updates;
-    $context['message'] = $this->t('Updated alias for %label @id.', array('%label' => $entity_type->getLabel(), '@id' => end($ids)));
-
-    if ($context['sandbox']['count'] != $context['sandbox']['total']) {
-      $context['finished'] = $context['sandbox']['count'] / $context['sandbox']['total'];
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function batchDelete(&$context) {
-    if (!isset($context['sandbox']['current'])) {
-      $context['sandbox']['count'] = 0;
-      $context['sandbox']['current'] = 0;
-    }
-
-    $entity_type = $this->entityTypeManager->getDefinition($this->getEntityTypeId());
-    $id_key = $entity_type->getKey('id');
-
-    $query = $this->database->select($entity_type->get('base_table'), 'base_table');
-    $query->innerJoin('url_alias', 'ua', "CONCAT('" . $this->getSourcePrefix() . "' , base_table.$id_key) = ua.source");
-    $query->addField('base_table', $id_key, 'id');
-    $query->addField('ua', 'pid');
-    $query->condition('ua.pid', $context['sandbox']['current'], '>');
-    $query->orderBy('ua.pid');
-    $query->addTag('pathauto_bulk_delete');
-    $query->addMetaData('entity', $this->getEntityTypeId());
-
-    // Get the total amount of items to process.
-    if (!isset($context['sandbox']['total'])) {
-      $context['sandbox']['total'] = $query->countQuery()->execute()->fetchField();
-
-      // If there are no entities to delete, then stop immediately.
-      if (!$context['sandbox']['total']) {
-        $context['finished'] = 1;
-        return;
-      }
-    }
-
-    $query->range(0, 100);
-    $pids_by_id = $query->execute()->fetchAllKeyed();
-
-    $this->bulkDelete($pids_by_id);
-    $context['sandbox']['count'] += count($pids_by_id);
-    $context['sandbox']['current'] = max($pids_by_id);
-    $context['results']['deletions'][] = $this->getLabel();
-
-    if ($context['sandbox']['count'] != $context['sandbox']['total']) {
-      $context['finished'] = $context['sandbox']['count'] / $context['sandbox']['total'];
-    }
-  }
-
-  /**
-   * Returns the entity type ID.
-   *
-   * @return string
-   *   The entity type ID.
-   */
-  protected function getEntityTypeId() {
-    return $this->getDerivativeId();
-  }
-
-  /**
-   * Update the URL aliases for multiple entities.
-   *
-   * @param array $ids
-   *   An array of entity IDs.
-   * @param array $options
-   *   An optional array of additional options.
-   *
-   * @return int
-   *  The number of updated URL aliases.
-   */
-  protected function bulkUpdate(array $ids, array $options = array()) {
-    $options += array('message' => FALSE);
-    $updates = 0;
-
-    $entities = $this->entityTypeManager->getStorage($this->getEntityTypeId())->loadMultiple($ids);
-    foreach ($entities as $entity) {
-      // Update aliases for the entity's default language and its translations.
-      foreach ($entity->getTranslationLanguages() as $langcode => $language) {
-        $translated_entity = $entity->getTranslation($langcode);
-        $result = \Drupal::service('pathauto.generator')->updateEntityAlias($translated_entity, 'bulkupdate', $options);
-        if ($result) {
-          $updates++;
-        }
-      }
-    }
-
-    if (!empty($options['message'])) {
-      drupal_set_message(\Drupal::translation()->formatPlural(count($ids), 'Updated 1 %label URL alias.', 'Updated @count %label URL aliases.'), array('%label' => $this->getLabel()));
-    }
-
-    return $updates;
-  }
-
-  /**
-   * Deletes the URL aliases for multiple entities.
-   *
-   * @param int[] $pids_by_id
-   *   A list of path IDs keyed by entity ID.
-   */
-  protected function bulkDelete(array $pids_by_id) {
-    $collection = 'pathauto_state.' . $this->getEntityTypeId();
-    $states = $this->keyValue->get($collection)->getMultiple(array_keys($pids_by_id));
-
-    $pids = [];
-    foreach ($pids_by_id as $id => $pid) {
-      // Only delete aliases that were created by this module.
-      if (isset($states[$id]) && $states[$id] == PathautoState::CREATE) {
-        $pids[] = $pid;
-      }
-    }
-    \Drupal::service('pathauto.alias_storage_helper')->deleteMultiple($pids);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    $dependencies = [];
-    $dependencies['module'][] = $this->entityTypeManager->getDefinition($this->getEntityTypeId())->getProvider();
-    return $dependencies;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies($object) {
-    return $object instanceof FieldableEntityInterface && $object->getEntityTypeId() == $this->getEntityTypeId();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSourcePrefix() {
-    if (empty($this->prefix)) {
-      $entity_type = $this->entityTypeManager->getDefinition($this->getEntityTypeId());
-      $path = $entity_type->getLinkTemplate('canonical');
-      $this->prefix = substr($path, 0, strpos($path, '{'));
-    }
-    return $this->prefix;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setContextValue($name, $value) {
-    // Overridden to avoid merging existing cacheability metadata, which is not
-    // relevant for alias type plugins.
-    $this->context[$name] = new Context($this->getContextDefinition($name), $value);
-    return $this;
-  }
-
-
-}
diff --git a/modules/pathauto/src/Plugin/pathauto/AliasType/ForumAliasType.php b/modules/pathauto/src/Plugin/pathauto/AliasType/ForumAliasType.php
deleted file mode 100644
index a572593..0000000
--- a/modules/pathauto/src/Plugin/pathauto/AliasType/ForumAliasType.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Plugin\pathauto\AliasType;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * A pathauto alias type plugin for forum terms.
- *
- * @AliasType(
- *   id = "forum",
- *   label = @Translation("Forum"),
- *   types = {"term"},
- *   provider = "forum",
- *   context = {
- *     "taxonomy_term" = @ContextDefinition("entity:taxonomy_term")
- *   }
- * )
- */
-class ForumAliasType extends EntityAliasTypeBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * Constructs a ForumAliasType instance.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler service.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The language manager service.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity manager service.
-   * @param \Drupal\Core\KeyValueStore\KeyValueFactoryInterface $key_value
-   *   The key/value manager service.
-   * @param \Drupal\Core\Database\Connection $database
-   *   The database service.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ModuleHandlerInterface $module_handler, LanguageManagerInterface $language_manager, EntityTypeManagerInterface $entity_type_manager, KeyValueFactoryInterface $key_value, Connection $database, ConfigFactoryInterface $config_factory) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $module_handler, $language_manager, $entity_type_manager, $key_value, $database);
-    $this->configFactory = $config_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('module_handler'),
-      $container->get('language_manager'),
-      $container->get('entity_type.manager'),
-      $container->get('keyvalue'),
-      $container->get('database'),
-      $container->get('config.factory')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEntityTypeId() {
-    return 'taxonomy_term';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSourcePrefix() {
-    return '/forum/';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies($object) {
-    if (parent::applies($object)) {
-      /** @var \Drupal\taxonomy\TermInterface $object */
-      $vid = $this->configFactory->get('forum.settings')->get('vocabulary');
-      return $object->getVocabularyId() == $vid;
-    }
-    return FALSE;
-  }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoBulkUpdateTest.php b/modules/pathauto/src/Tests/PathautoBulkUpdateTest.php
deleted file mode 100644
index 2fa2194..0000000
--- a/modules/pathauto/src/Tests/PathautoBulkUpdateTest.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Tests;
-
-use Drupal\pathauto\PathautoGeneratorInterface;
-use Drupal\pathauto\PathautoState;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Bulk update functionality tests.
- *
- * @group pathauto
- */
-class PathautoBulkUpdateTest extends WebTestBase {
-
-  use PathautoTestHelperTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'pathauto', 'forum');
-
-  /**
-   * Admin user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * The created nodes.
-   *
-   * @var \Drupal\node\NodeInterface
-   */
-  protected $nodes;
-
-  /**
-   * The created patterns.
-   *
-   * @var \Drupal\pathauto\PathautoPatternInterface
-   */
-  protected $patterns;
-
-  /**
-   * {inheritdoc}
-   */
-  function setUp() {
-    parent::setUp();
-
-    // Allow other modules to add additional permissions for the admin user.
-    $permissions = array(
-      'administer pathauto',
-      'administer url aliases',
-      'create url aliases',
-      'administer forums',
-    );
-    $this->adminUser = $this->drupalCreateUser($permissions);
-    $this->drupalLogin($this->adminUser);
-
-    $this->patterns = array();
-    $this->patterns['node'] = $this->createPattern('node', '/content/[node:title]');
-    $this->patterns['user'] = $this->createPattern('user', '/users/[user:name]');
-    $this->patterns['forum'] = $this->createPattern('forum', '/forums/[term:name]');
-  }
-
-  function testBulkUpdate() {
-    // Create some nodes.
-    $this->nodes = array();
-    for ($i = 1; $i <= 5; $i++) {
-      $node = $this->drupalCreateNode();
-      $this->nodes[$node->id()] = $node;
-    }
-
-    // Clear out all aliases.
-    $this->deleteAllAliases();
-
-    // Bulk create aliases.
-    $edit = array(
-      'update[canonical_entities:node]' => TRUE,
-      'update[canonical_entities:user]' => TRUE,
-      'update[forum]' => TRUE,
-    );
-    $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
-
-    // This has generated 8 aliases: 5 nodes, 2 users and 1 forum.
-    $this->assertText('Generated 8 URL aliases.');
-
-    // Check that aliases have actually been created.
-    foreach ($this->nodes as $node) {
-      $this->assertEntityAliasExists($node);
-    }
-    $this->assertEntityAliasExists($this->adminUser);
-    // This is the default "General discussion" forum.
-    $this->assertAliasExists(['source' => '/taxonomy/term/1']);
-
-    // Add a new node.
-    $new_node = $this->drupalCreateNode(array('path' => array('alias' => '', 'pathauto' => PathautoState::SKIP)));
-
-    // Run the update again which should not run against any nodes.
-    $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
-    $this->assertText('No new URL aliases to generate.');
-    $this->assertNoEntityAliasExists($new_node);
-
-    // Make sure existing aliases can be overriden.
-    $this->drupalPostForm('admin/config/search/path/settings', ['update_action' => PathautoGeneratorInterface::UPDATE_ACTION_DELETE], t('Save configuration'));
-
-    // Patterns did not change, so no aliases should be regenerated.
-    $edit['action'] = 'all';
-    $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
-    $this->assertText('No new URL aliases to generate.');
-
-    // Update the node pattern, and leave other patterns alone. Existing nodes should get a new alias,
-    // except the node above whose alias is manually set. Other aliases must be left alone.
-    $this->patterns['node']->delete();
-    $this->patterns['node'] = $this->createPattern('node', '/archive/node-[node:nid]');
-
-    $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
-    $this->assertText('Generated 5 URL aliases.');
-
-    // Prevent existing aliases to be overriden. The bulk generate page should only offer
-    // to create an alias for paths which have none.
-    $this->drupalPostForm('admin/config/search/path/settings', ['update_action' => PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW], t('Save configuration'));
-
-    $this->drupalGet('admin/config/search/path/update_bulk');
-    $this->assertFieldByName('action', 'create');
-    $this->assertText('Pathauto settings are set to ignore paths which already have a URL alias.');
-    $this->assertNoFieldByName('action', 'update');
-    $this->assertNoFieldByName('action', 'all');
-  }
-
-  /**
-   * Tests alias generation for nodes that existed before installing Pathauto.
-   */
-  function testBulkUpdateExistingContent() {
-    // Create a node.
-    $node = $this->drupalCreateNode();
-
-    // Delete its alias and Pathauto metadata.
-    \Drupal::service('pathauto.alias_storage_helper')->deleteEntityPathAll($node);
-    $node->path->first()->get('pathauto')->purge();
-    \Drupal::entityTypeManager()->getStorage('node')->resetCache(array($node->id()));
-
-    // Execute bulk generation.
-    // Bulk create aliases.
-    $edit = array(
-      'update[canonical_entities:node]' => TRUE,
-    );
-    $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
-
-    // Verify that the alias was created for the node.
-    $this->assertText('Generated 1 URL alias.');
-  }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoEnablingEntityTypesTest.php b/modules/pathauto/src/Tests/PathautoEnablingEntityTypesTest.php
deleted file mode 100644
index c8cc1ff..0000000
--- a/modules/pathauto/src/Tests/PathautoEnablingEntityTypesTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Tests;
-
-use Drupal\simpletest\WebTestBase;
-use Drupal\comment\Tests\CommentTestTrait;
-
-/**
- * Tests pathauto settings form.
- *
- * @group pathauto
- */
-class PathautoEnablingEntityTypesTest extends WebTestBase {
-
-  use PathautoTestHelperTrait;
-  use CommentTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'pathauto', 'comment');
-
-  /**
-   * Admin user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * {inheritdoc}
-   */
-  function setUp() {
-    parent::setUp();
-
-    $this->drupalCreateContentType(array('type' => 'article'));
-    $this->addDefaultCommentField('node', 'article');
-
-    $permissions = array(
-      'administer pathauto',
-      'administer url aliases',
-      'create url aliases',
-      'administer nodes',
-      'post comments',
-    );
-    $this->adminUser = $this->drupalCreateUser($permissions);
-    $this->drupalLogin($this->adminUser);
-  }
-
-  /**
-   * A suite of tests to verify if the feature to enable and disable the
-   * ability to define alias patterns for a given entity type works. Test with
-   * the comment module, as it is not enabled by default.
-   */
-  function testEnablingEntityTypes() {
-    // Verify that the comment entity type is not available when trying to add
-    // a new pattern, nor "broken".
-    $this->drupalGet('/admin/config/search/path/patterns/add');
-    $this->assertEqual(count($this->cssSelect('option[value = "canonical_entities:comment"]:contains(Comment)')), 0);
-    $this->assertEqual(count($this->cssSelect('option:contains(Broken)')), 0);
-
-    // Enable the entity type and create a pattern for it.
-    $this->drupalGet('/admin/config/search/path/settings');
-    $edit = [
-      'enabled_entity_types[comment]' => TRUE,
-    ];
-    $this->drupalPostForm(NULL, $edit, 'Save configuration');
-    $this->createPattern('comment', '/comment/[comment:body]');
-
-    // Create a node, a comment type and a comment entity.
-    $node = $this->drupalCreateNode(['type' => 'article']);
-    $this->drupalGet('/node/' . $node->id());
-    $edit = [
-      'comment_body[0][value]' => 'test-body',
-    ];
-    $this->drupalPostForm(NULL, $edit, 'Save');
-
-    // Verify that an alias has been generated and that the type can no longer
-    // be disabled.
-    $this->assertAliasExists(['alias' => '/comment/test-body']);
-    $this->drupalGet('/admin/config/search/path/settings');
-    $this->assertEqual(count($this->cssSelect('input[name = "enabled_entity_types[comment]"][disabled = "disabled"]')), 1);
-  }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoLocaleTest.php b/modules/pathauto/src/Tests/PathautoLocaleTest.php
deleted file mode 100644
index dd271ef..0000000
--- a/modules/pathauto/src/Tests/PathautoLocaleTest.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Tests;
-
-use Drupal\Core\Language\Language;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\pathauto\PathautoState;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Test pathauto functionality with localization and translation.
- *
- * @group pathauto
- */
-class PathautoLocaleTest extends WebTestBase {
-
-  use PathautoTestHelperTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'pathauto', 'locale', 'content_translation');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Create Article node type.
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
-  }
-
-  /**
-   * Test that when an English node is updated, its old English alias is
-   * updated and its newer French alias is left intact.
-   */
-  function testLanguageAliases() {
-
-    $this->createPattern('node', '/content/[node:title]');
-
-    // Add predefined French language.
-    ConfigurableLanguage::createFromLangcode('fr')->save();
-
-    $node = array(
-      'title' => 'English node',
-      'langcode' => 'en',
-      'path' => array(array(
-        'alias' => '/english-node',
-        'pathauto' => FALSE,
-      )),
-    );
-    $node = $this->drupalCreateNode($node);
-    $english_alias = \Drupal::service('path.alias_storage')->load(array('alias' => '/english-node', 'langcode' => 'en'));
-    $this->assertTrue($english_alias, 'Alias created with proper language.');
-
-    // Also save a French alias that should not be left alone, even though
-    // it is the newer alias.
-    $this->saveEntityAlias($node, '/french-node', 'fr');
-
-    // Add an alias with the soon-to-be generated alias, causing the upcoming
-    // alias update to generate a unique alias with the '-0' suffix.
-    $this->saveAlias('/node/invalid', '/content/english-node', Language::LANGCODE_NOT_SPECIFIED);
-
-    // Update the node, triggering a change in the English alias.
-    $node->path->pathauto = PathautoState::CREATE;
-    $node->save();
-
-    // Check that the new English alias replaced the old one.
-    $this->assertEntityAlias($node, '/content/english-node-0', 'en');
-    $this->assertEntityAlias($node, '/french-node', 'fr');
-    $this->assertAliasExists(array('pid' => $english_alias['pid'], 'alias' => '/content/english-node-0'));
-
-    // Create a new node with the same title as before but without
-    // specifying a language.
-    $node = $this->drupalCreateNode(array('title' => 'English node', 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED));
-
-    // Check that the new node had a unique alias generated with the '-0'
-    // suffix.
-    $this->assertEntityAlias($node, '/content/english-node-0', LanguageInterface::LANGCODE_NOT_SPECIFIED);
-  }
-
-  /**
-   * Test that patterns work on multilingual content.
-   */
-  function testLanguagePatterns() {
-    $this->drupalLogin($this->rootUser);
-
-    // Add French language.
-    $edit = array(
-      'predefined_langcode' => 'fr',
-    );
-    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
-
-    $this->enableArticleTranslation();
-
-    // Create a pattern for English articles.
-    $this->drupalGet('admin/config/search/path/patterns/add');
-    $edit = array(
-      'type' => 'canonical_entities:node',
-    );
-    $this->drupalPostAjaxForm(NULL, $edit, 'type');
-    $edit += array(
-      'pattern' => '/the-articles/[node:title]',
-      'label' => 'English articles',
-      'id' => 'english_articles',
-      'bundles[article]' => TRUE,
-      'languages[en]' => TRUE,
-    );
-    $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText('Pattern English articles saved.');
-
-    // Create a pattern for French articles.
-    $this->drupalGet('admin/config/search/path/patterns/add');
-    $edit = array(
-      'type' => 'canonical_entities:node',
-    );
-    $this->drupalPostAjaxForm(NULL, $edit, 'type');
-    $edit += array(
-      'pattern' => '/les-articles/[node:title]',
-      'label' => 'French articles',
-      'id' => 'french_articles',
-      'bundles[article]' => TRUE,
-      'languages[fr]' => TRUE,
-    );
-    $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText('Pattern French articles saved.');
-
-    // Create a node and its translation. Assert aliases.
-    $edit = array(
-      'title[0][value]' => 'English node',
-      'langcode[0][value]' => 'en',
-    );
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
-    $english_node = $this->drupalGetNodeByTitle('English node');
-    $this->assertAlias('/node/' . $english_node->id(), '/the-articles/english-node', 'en');
-
-    $this->drupalGet('node/' . $english_node->id() . '/translations');
-    $this->clickLink(t('Add'));
-    $edit = array(
-      'title[0][value]' => 'French node',
-    );
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published (this translation)'));
-    $this->rebuildContainer();
-    $english_node = $this->drupalGetNodeByTitle('English node');
-    $french_node = $english_node->getTranslation('fr');
-    $this->assertAlias('/node/' . $french_node->id(), '/les-articles/french-node', 'fr');
-
-    // Bulk delete and Bulk generate patterns. Assert aliases.
-    $this->deleteAllAliases();
-    // Bulk create aliases.
-    $edit = array(
-      'update[canonical_entities:node]' => TRUE,
-    );
-    $this->drupalPostForm('admin/config/search/path/update_bulk', $edit, t('Update'));
-    $this->assertText(t('Generated 2 URL aliases.'));
-    $this->assertAlias('/node/' . $english_node->id(), '/the-articles/english-node', 'en');
-    $this->assertAlias('/node/' . $french_node->id(), '/les-articles/french-node', 'fr');
-  }
-
-  /**
-   * Tests the alias created for a node with language Not Applicable.
-   */
-  public function testLanguageNotApplicable() {
-    $this->drupalLogin($this->rootUser);
-    $this->enableArticleTranslation();
-
-    // Create a pattern for nodes.
-    $pattern = $this->createPattern('node', '/content/[node:title]', -1);
-    $pattern->save();
-
-    // Create a node with language Not Applicable.
-    $node = $this->createNode(['type' => 'article', 'title' => 'Test node', 'langcode' => LanguageInterface::LANGCODE_NOT_APPLICABLE]);
-
-    // Check that the generated alias has language Not Specified.
-    $alias = \Drupal::service('pathauto.alias_storage_helper')->loadBySource('/node/' . $node->id());
-    $this->assertEqual($alias['langcode'], LanguageInterface::LANGCODE_NOT_SPECIFIED, 'PathautoGenerator::createEntityAlias() adjusts the alias langcode from Not Applicable to Not Specified.');
-
-    // Check that the alias works.
-    $this->drupalGet('content/test-node');
-    $this->assertResponse(200);
-  }
-
-  /**
-   * Enables content translation on articles.
-   */
-  protected function enableArticleTranslation() {
-    // Enable content translation on articles.
-    $this->drupalGet('admin/config/regional/content-language');
-    $edit = array(
-      'entity_types[node]' => TRUE,
-      'settings[node][article][translatable]' => TRUE,
-      'settings[node][article][settings][language][language_alterable]' => TRUE,
-    );
-    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
-  }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoMassDeleteTest.php b/modules/pathauto/src/Tests/PathautoMassDeleteTest.php
deleted file mode 100644
index 93f4ca3..0000000
--- a/modules/pathauto/src/Tests/PathautoMassDeleteTest.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Tests;
-
-use Drupal\pathauto\PathautoState;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Mass delete functionality tests.
- *
- * @group pathauto
- */
-class PathautoMassDeleteTest extends WebTestBase {
-
-  use PathautoTestHelperTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'taxonomy', 'pathauto');
-
-  /**
-   * Admin user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * The test nodes.
-   *
-   * @var \Drupal\node\NodeInterface
-   */
-  protected $nodes;
-
-  /**
-   * The test accounts.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $accounts;
-
-  /**
-   * The test terms.
-   *
-   * @var \Drupal\taxonomy\TermInterface
-   */
-  protected $terms;
-
-
-  /**
-   * {inheritdoc}
-   */
-  function setUp() {
-    parent::setUp();
-
-    $permissions = array(
-      'administer pathauto',
-      'administer url aliases',
-      'create url aliases',
-    );
-    $this->adminUser = $this->drupalCreateUser($permissions);
-    $this->drupalLogin($this->adminUser);
-
-    $this->createPattern('node', '/content/[node:title]');
-    $this->createPattern('user', '/users/[user:name]');
-    $this->createPattern('taxonomy_term', '/[term:vocabulary]/[term:name]');
-  }
-
-  /**
-   * Tests the deletion of all the aliases.
-   */
-  function testDeleteAll() {
-    // 1. Test that deleting all the aliases, of any type, works.
-    $this->generateAliases();
-    $edit = array(
-      'delete[all_aliases]' => TRUE,
-      'options[keep_custom_aliases]' => FALSE,
-    );
-    $this->drupalPostForm('admin/config/search/path/delete_bulk', $edit, t('Delete aliases now!'));
-    $this->assertText(t('All of your path aliases have been deleted.'));
-    $this->assertUrl('admin/config/search/path/delete_bulk');
-
-    // Make sure that all of them are actually deleted.
-    $aliases = \Drupal::database()->select('url_alias', 'ua')->fields('ua', array())->execute()->fetchAll();
-    $this->assertEqual($aliases, array(), "All the aliases have been deleted.");
-
-    // 2. Test deleting only specific (entity type) aliases.
-    $manager = $this->container->get('plugin.manager.alias_type');
-    $pathauto_plugins = array('canonical_entities:node' => 'nodes', 'canonical_entities:taxonomy_term' => 'terms', 'canonical_entities:user' => 'accounts');
-    foreach ($pathauto_plugins as $pathauto_plugin => $attribute) {
-      $this->generateAliases();
-      $edit = array(
-        'delete[plugins][' . $pathauto_plugin . ']' => TRUE,
-        'options[keep_custom_aliases]' => FALSE,
-      );
-      $this->drupalPostForm('admin/config/search/path/delete_bulk', $edit, t('Delete aliases now!'));
-      $alias_type = $manager->createInstance($pathauto_plugin);
-      $this->assertRaw(t('All of your %label path aliases have been deleted.', array('%label' => $alias_type->getLabel())));
-      // Check that the aliases were actually deleted.
-      foreach ($this->{$attribute} as $entity) {
-        $this->assertNoEntityAlias($entity);
-      }
-
-      // Check that the other aliases are not deleted.
-      foreach ($pathauto_plugins as $_pathauto_plugin => $_attribute) {
-        // Skip the aliases that should be deleted.
-        if ($_pathauto_plugin == $pathauto_plugin) {
-          continue;
-        }
-        foreach ($this->{$_attribute} as $entity) {
-          $this->assertEntityAliasExists($entity);
-        }
-      }
-    }
-
-    // 3. Test deleting automatically generated aliases only.
-    $this->generateAliases();
-    $edit = array(
-      'delete[all_aliases]' => TRUE,
-      'options[keep_custom_aliases]' => TRUE,
-    );
-    $this->drupalPostForm('admin/config/search/path/delete_bulk', $edit, t('Delete aliases now!'));
-    $this->assertText(t('All of your automatically generated path aliases have been deleted.'));
-    $this->assertUrl('admin/config/search/path/delete_bulk');
-
-    // Make sure that only custom aliases and aliases with no information about
-    // their state still exist.
-    $aliases = \Drupal::database()->select('url_alias', 'ua')->fields('ua', ['source'])->execute()->fetchCol();
-    $this->assertEqual($aliases, ['/node/101', '/node/104', '/node/105'], 'Custom aliases still exist.');
-  }
-
-  /**
-   * Helper function to generate aliases.
-   */
-  function generateAliases() {
-    // Delete all aliases to avoid duplicated aliases. They will be recreated below.
-    $this->deleteAllAliases();
-
-    // We generate a bunch of aliases for nodes, users and taxonomy terms. If
-    // the entities are already created we just update them, otherwise we create
-    // them.
-    if (empty($this->nodes)) {
-      // Create a large number of nodes (100+) to make sure that the batch code works.
-      for ($i = 1; $i <= 105; $i++) {
-        // Set the alias of two nodes manually.
-        $settings = ($i > 103) ? ['path' => ['alias' => "/custom_alias_$i", 'pathauto' => PathautoState::SKIP]] : [];
-        $node = $this->drupalCreateNode($settings);
-        $this->nodes[$node->id()] = $node;
-      }
-    }
-    else {
-      foreach ($this->nodes as $node) {
-        if ($node->id() > 103) {
-          // The alias is set manually.
-          $node->set('path', ['alias' => '/custom_alias_' . $node->id()]);
-        }
-        $node->save();
-      }
-    }
-    // Delete information about the state of an alias to make sure that aliases
-    // with no such data are left alone by default.
-    \Drupal::keyValue('pathauto_state.node')->delete(101);
-
-    if (empty($this->accounts)) {
-      for ($i = 1; $i <= 5; $i++) {
-        $account = $this->drupalCreateUser();
-        $this->accounts[$account->id()] = $account;
-      }
-    }
-    else {
-      foreach ($this->accounts as $id => $account) {
-        $account->save();
-      }
-    }
-
-    if (empty($this->terms)) {
-      $vocabulary = $this->addVocabulary(array('name' => 'test vocabulary', 'vid' => 'test_vocabulary'));
-      for ($i = 1; $i <= 5; $i++) {
-        $term = $this->addTerm($vocabulary);
-        $this->terms[$term->id()] = $term;
-      }
-    }
-    else {
-      foreach ($this->terms as $term) {
-        $term->save();
-      }
-    }
-
-    // Check that we have aliases for the entities.
-    foreach (array('nodes', 'accounts', 'terms') as $attribute) {
-      foreach ($this->{$attribute} as $entity) {
-        $this->assertEntityAliasExists($entity);
-      }
-    }
-  }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoNodeWebTest.php b/modules/pathauto/src/Tests/PathautoNodeWebTest.php
deleted file mode 100644
index 95f5eb5..0000000
--- a/modules/pathauto/src/Tests/PathautoNodeWebTest.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Tests;
-use Drupal\pathauto\Entity\PathautoPattern;
-use Drupal\node\Entity\Node;
-use Drupal\pathauto\PathautoState;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests pathauto node UI integration.
- *
- * @group pathauto
- */
-class PathautoNodeWebTest extends WebTestBase {
-
-  use PathautoTestHelperTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'pathauto', 'views', 'taxonomy', 'pathauto_views_test');
-
-  /**
-   * Admin user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * {inheritdoc}
-   */
-  function setUp() {
-    parent::setUp();
-
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-    $this->drupalCreateContentType(array('type' => 'article'));
-
-    // Allow other modules to add additional permissions for the admin user.
-    $permissions = array(
-      'administer pathauto',
-      'administer url aliases',
-      'create url aliases',
-      'administer nodes',
-      'bypass node access',
-      'access content overview',
-    );
-    $this->adminUser = $this->drupalCreateUser($permissions);
-    $this->drupalLogin($this->adminUser);
-
-    $this->createPattern('node', '/content/[node:title]');
-  }
-
-  /**
-   * Tests editing nodes with different settings.
-   */
-  function testNodeEditing() {
-    // Ensure that the Pathauto checkbox is checked by default on the node add form.
-    $this->drupalGet('node/add/page');
-    $this->assertFieldChecked('edit-path-0-pathauto');
-
-    // Create a node by saving the node form.
-    $title = ' Testing: node title [';
-    $automatic_alias = '/content/testing-node-title';
-    $this->drupalPostForm(NULL, array('title[0][value]' => $title), t('Save and publish'));
-    $node = $this->drupalGetNodeByTitle($title);
-
-    // Look for alias generated in the form.
-    $this->drupalGet("node/{$node->id()}/edit");
-    $this->assertFieldChecked('edit-path-0-pathauto');
-    $this->assertFieldByName('path[0][alias]', $automatic_alias, 'Generated alias visible in the path alias field.');
-
-    // Check whether the alias actually works.
-    $this->drupalGet($automatic_alias);
-    $this->assertText($title, 'Node accessible through automatic alias.');
-
-    // Manually set the node's alias.
-    $manual_alias = '/content/' . $node->id();
-    $edit = array(
-      'path[0][pathauto]' => FALSE,
-      'path[0][alias]' => $manual_alias,
-    );
-    $this->drupalPostForm($node->toUrl('edit-form'), $edit, t('Save and keep published'));
-    $this->assertText(t('@type @title has been updated.', array('@type' => 'page', '@title' => $title)));
-
-    // Check that the automatic alias checkbox is now unchecked by default.
-    $this->drupalGet("node/{$node->id()}/edit");
-    $this->assertNoFieldChecked('edit-path-0-pathauto');
-    $this->assertFieldByName('path[0][alias]', $manual_alias);
-
-    // Submit the node form with the default values.
-    $this->drupalPostForm(NULL, array('path[0][pathauto]' => FALSE), t('Save and keep published'));
-    $this->assertText(t('@type @title has been updated.', array('@type' => 'page', '@title' => $title)));
-
-    // Test that the old (automatic) alias has been deleted and only accessible
-    // through the new (manual) alias.
-    $this->drupalGet($automatic_alias);
-    $this->assertResponse(404, 'Node not accessible through automatic alias.');
-    $this->drupalGet($manual_alias);
-    $this->assertText($title, 'Node accessible through manual alias.');
-
-    // Test that the manual alias is not kept for new nodes when the pathauto
-    // checkbox is ticked.
-    $title = 'Automatic Title';
-    $edit = array(
-      'title[0][value]' => $title,
-      'path[0][pathauto]' => TRUE,
-      'path[0][alias]' => '/should-not-get-created',
-    );
-    $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
-    $this->assertNoAliasExists(array('alias' => 'should-not-get-created'));
-    $node = $this->drupalGetNodeByTitle($title);
-    $this->assertEntityAlias($node, '/content/automatic-title');
-
-    // Remove the pattern for nodes, the pathauto checkbox should not be
-    // displayed.
-    $ids = \Drupal::entityQuery('pathauto_pattern')
-      ->condition('type', 'canonical_entities:node')
-      ->execute();
-    foreach (PathautoPattern::loadMultiple($ids) as $pattern) {
-      $pattern->delete();
-    }
-
-    $this->drupalGet('node/add/article');
-    $this->assertNoFieldById('edit-path-0-pathauto');
-    $this->assertFieldByName('path[0][alias]', '');
-
-    $edit = array();
-    $edit['title'] = 'My test article';
-    $this->drupalCreateNode($edit);
-    //$this->drupalPostForm(NULL, $edit, t('Save and keep published'));
-    $node = $this->drupalGetNodeByTitle($edit['title']);
-
-    // Pathauto checkbox should still not exist.
-    $this->drupalGet($node->toUrl('edit-form'));
-    $this->assertNoFieldById('edit-path-0-pathauto');
-    $this->assertFieldByName('path[0][alias]', '');
-    $this->assertNoEntityAlias($node);
-  }
-
-  /**
-   * Test node operations.
-   */
-  function testNodeOperations() {
-    $node1 = $this->drupalCreateNode(array('title' => 'node1'));
-    $node2 = $this->drupalCreateNode(array('title' => 'node2'));
-
-    // Delete all current URL aliases.
-    $this->deleteAllAliases();
-
-    $this->drupalGet('admin/content');
-
-    // Check which of the two nodes is first.
-    if (strpos($this->getTextContent(), 'node1') < strpos($this->getTextContent(), 'node2')) {
-      $index = 0;
-    }
-    else {
-      $index = 1;
-    }
-
-    $edit = array(
-      'action' => 'pathauto_update_alias_node',
-      'node_bulk_form[' . $index . ']' => TRUE,
-    );
-    $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
-    $this->assertText('Update URL alias was applied to 1 item.');
-
-    $this->assertEntityAlias($node1, '/content/' . $node1->getTitle());
-    $this->assertEntityAlias($node2, '/node/' . $node2->id());
-  }
-
-  /**
-   * @todo Merge this with existing node test methods?
-   */
-  public function testNodeState() {
-    $nodeNoAliasUser = $this->drupalCreateUser(array('bypass node access'));
-    $nodeAliasUser = $this->drupalCreateUser(array('bypass node access', 'create url aliases'));
-
-    $node = $this->drupalCreateNode(array(
-      'title' => 'Node version one',
-      'type' => 'page',
-      'path' => array(
-        'pathauto' => PathautoState::SKIP,
-      ),
-    ));
-
-    $this->assertNoEntityAlias($node);
-
-    // Set a manual path alias for the node.
-    $node->path->alias = '/test-alias';
-    $node->save();
-
-    // Ensure that the pathauto field was saved to the database.
-    \Drupal::entityTypeManager()->getStorage('node')->resetCache();
-    $node = Node::load($node->id());
-    $this->assertIdentical($node->path->pathauto, PathautoState::SKIP);
-
-    // Ensure that the manual path alias was saved and an automatic alias was not generated.
-    $this->assertEntityAlias($node, '/test-alias');
-    $this->assertNoEntityAliasExists($node, '/content/node-version-one');
-
-    // Save the node as a user who does not have access to path fieldset.
-    $this->drupalLogin($nodeNoAliasUser);
-    $this->drupalGet('node/' . $node->id() . '/edit');
-    $this->assertNoFieldByName('path[0][pathauto]');
-
-    $edit = array('title[0][value]' => 'Node version two');
-    $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText('Basic page Node version two has been updated.');
-
-    $this->assertEntityAlias($node, '/test-alias');
-    $this->assertNoEntityAliasExists($node, '/content/node-version-one');
-    $this->assertNoEntityAliasExists($node, '/content/node-version-two');
-
-    // Load the edit node page and check that the Pathauto checkbox is unchecked.
-    $this->drupalLogin($nodeAliasUser);
-    $this->drupalGet('node/' . $node->id() . '/edit');
-    $this->assertNoFieldChecked('edit-path-0-pathauto');
-
-    // Edit the manual alias and save the node.
-    $edit = array(
-      'title[0][value]' => 'Node version three',
-      'path[0][alias]' => '/manually-edited-alias',
-    );
-    $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText('Basic page Node version three has been updated.');
-
-    $this->assertEntityAlias($node, '/manually-edited-alias');
-    $this->assertNoEntityAliasExists($node, '/test-alias');
-    $this->assertNoEntityAliasExists($node, '/content/node-version-one');
-    $this->assertNoEntityAliasExists($node, '/content/node-version-two');
-    $this->assertNoEntityAliasExists($node, '/content/node-version-three');
-
-    // Programatically save the node with an automatic alias.
-    \Drupal::entityTypeManager()->getStorage('node')->resetCache();
-    $node = Node::load($node->id());
-    $node->path->pathauto = PathautoState::CREATE;
-    $node->save();
-
-    // Ensure that the pathauto field was saved to the database.
-    \Drupal::entityTypeManager()->getStorage('node')->resetCache();
-    $node = Node::load($node->id());
-    $this->assertIdentical($node->path->pathauto, PathautoState::CREATE);
-
-    $this->assertEntityAlias($node, '/content/node-version-three');
-    $this->assertNoEntityAliasExists($node, '/manually-edited-alias');
-    $this->assertNoEntityAliasExists($node, '/test-alias');
-    $this->assertNoEntityAliasExists($node, '/content/node-version-one');
-    $this->assertNoEntityAliasExists($node, '/content/node-version-two');
-
-    $node->delete();
-    $this->assertNull(\Drupal::keyValue('pathauto_state.node')->get($node->id()), 'Pathauto state was deleted');
-  }
-
-
-  /**
-   * Tests that nodes without a Pathauto pattern can set custom aliases.
-   */
-  public function testCustomAliasWithoutPattern() {
-    // First, delete all patterns to be sure that there will be no match.
-    $entity_ids = \Drupal::entityQuery('pathauto_pattern')->execute();
-    $entities = PathautoPattern::loadMultiple($entity_ids);
-    foreach ($entities as $entity) {
-      $entity->delete();
-    }
-
-    // Next, create a node with a custom alias.
-    $edit = [
-      'title[0][value]' => 'Sample article',
-      'path[0][alias]' => '/sample-article',
-    ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
-    $this->assertText(t('article Sample article has been created.'));
-
-    // Test the alias.
-    $this->assertAliasExists(array('alias' => '/sample-article'));
-    $this->drupalGet('sample-article');
-    $this->assertResponse(200, 'A node without a pattern can have a custom alias.');
-
-    // Now create a node through the API.
-    $node = Node::create(['type' => 'article', 'title' => 'Sample article API', 'path' => ['alias' => '/sample-article-api']]);
-    $node->save();
-
-    // Test the alias.
-    $this->assertAliasExists(['alias' => '/sample-article-api']);
-    $this->drupalGet('sample-article-api');
-    $this->assertResponse(200);
-  }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoSettingsFormWebTest.php b/modules/pathauto/src/Tests/PathautoSettingsFormWebTest.php
deleted file mode 100644
index 9a4a690..0000000
--- a/modules/pathauto/src/Tests/PathautoSettingsFormWebTest.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Tests;
-
-use Drupal\pathauto\PathautoGeneratorInterface;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests pathauto settings form.
- *
- * @group pathauto
- */
-class PathautoSettingsFormWebTest extends WebTestBase {
-
-  use PathautoTestHelperTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'pathauto');
-
-  /**
-   * Admin user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * Form values that are set by default.
-   *
-   * @var array
-   */
-  protected $defaultFormValues = array(
-    'verbose' => FALSE,
-    'separator' => '-',
-    'case' => '1',
-    'max_length' => '100',
-    'max_component_length' => '100',
-    'update_action' => '2',
-    'transliterate' => '1',
-    'reduce_ascii' => FALSE,
-    'ignore_words' => 'a, an, as, at, before, but, by, for, from, is, in, into, like, of, off, on, onto, per, since, than, the, this, that, to, up, via, with',
-  );
-
-  /**
-   * Punctuation form items with default values.
-   *
-   * @var array
-   */
-  protected $defaultPunctuations = array(
-    'punctuation[double_quotes]' => '0',
-    'punctuation[quotes]' => '0',
-    'punctuation[backtick]' => '0',
-    'punctuation[comma]' => '0',
-    'punctuation[period]' => '0',
-    'punctuation[hyphen]' => '1',
-    'punctuation[underscore]' => '0',
-    'punctuation[colon]' => '0',
-    'punctuation[semicolon]' => '0',
-    'punctuation[pipe]' => '0',
-    'punctuation[left_curly]' => '0',
-    'punctuation[left_square]' => '0',
-    'punctuation[right_curly]' => '0',
-    'punctuation[right_square]' => '0',
-    'punctuation[plus]' => '0',
-    'punctuation[equal]' => '0',
-    'punctuation[asterisk]' => '0',
-    'punctuation[ampersand]' => '0',
-    'punctuation[percent]' => '0',
-    'punctuation[caret]' => '0',
-    'punctuation[dollar]' => '0',
-    'punctuation[hash]' => '0',
-    'punctuation[exclamation]' => '0',
-    'punctuation[tilde]' => '0',
-    'punctuation[left_parenthesis]' => '0',
-    'punctuation[right_parenthesis]' => '0',
-    'punctuation[question_mark]' => '0',
-    'punctuation[less_than]' => '0',
-    'punctuation[greater_than]' => '0',
-    'punctuation[slash]' => '0',
-    'punctuation[back_slash]' => '0',
-  );
-
-  /**
-   * {inheritdoc}
-   */
-  function setUp() {
-    parent::setUp();
-
-    $this->drupalCreateContentType(array('type' => 'article'));
-
-    $permissions = array(
-      'administer pathauto',
-      'notify of path changes',
-      'administer url aliases',
-      'create url aliases',
-      'administer nodes',
-      'bypass node access',
-    );
-    $this->adminUser = $this->drupalCreateUser($permissions);
-    $this->drupalLogin($this->adminUser);
-    $this->createPattern('node', '/content/[node:title]');
-  }
-
-  /**
-   * Test if the default values are shown correctly in the form.
-   */
-  function testDefaultFormValues() {
-    $this->drupalGet('/admin/config/search/path/settings');
-    $this->assertNoFieldChecked('edit-verbose');
-    $this->assertField('edit-separator', $this->defaultFormValues['separator']);
-    $this->assertFieldChecked('edit-case');
-    $this->assertField('edit-max-length', $this->defaultFormValues['max_length']);
-    $this->assertField('edit-max-component-length', $this->defaultFormValues['max_component_length']);
-    $this->assertFieldChecked('edit-update-action-2');
-    $this->assertFieldChecked('edit-transliterate');
-    $this->assertNoFieldChecked('edit-reduce-ascii');
-    $this->assertField('edit-ignore-words', $this->defaultFormValues['ignore_words']);
-  }
-
-  /**
-   * Test the verbose option.
-   */
-  function testVerboseOption() {
-    $edit = array('verbose' => '1');
-    $this->drupalPostForm('/admin/config/search/path/settings', $edit, t('Save configuration'));
-    $this->assertText(t('The configuration options have been saved.'));
-    $this->assertFieldChecked('edit-verbose');
-
-    $title = 'Verbose settings test';
-    $this->drupalGet('/node/add/article');
-    $this->assertFieldChecked('edit-path-0-pathauto');
-    $this->drupalPostForm(NULL, array('title[0][value]' => $title), t('Save and publish'));
-    $this->assertText('Created new alias /content/verbose-settings-test for');
-
-    $node = $this->drupalGetNodeByTitle($title);
-    $this->drupalPostForm('/node/' . $node->id() . '/edit', array('title[0][value]' => 'Updated title'), t('Save and keep published'));
-    $this->assertText('Created new alias /content/updated-title for');
-    $this->assertText('replacing /content/verbose-settings-test.');
-  }
-
-  /**
-   * Tests generating aliases with different settings.
-   */
-  function testSettingsForm() {
-    // Ensure the separator settings apply correctly.
-    $this->checkAlias('My awesome content', '/content/my.awesome.content', array('separator' => '.'));
-
-    // Ensure the character case setting works correctly.
-    // Leave case the same as source token values.
-    $this->checkAlias('My awesome Content', '/content/My-awesome-Content', array('case' => FALSE));
-    $this->checkAlias('Change Lower', '/content/change-lower', array('case' => '1'));
-
-    // Ensure the maximum alias length is working.
-    $this->checkAlias('My awesome Content', '/content/my-awesome', array('max_length' => '23'));
-
-    // Ensure the maximum component length is working.
-    $this->checkAlias('My awesome Content', '/content/my', array('max_component_length' => '2'));
-
-    // Ensure transliteration option is working.
-    $this->checkAlias('è é àl ö äl ü', '/content/e-e-al-o-al-u', array('transliterate' => '1'));
-    $this->checkAlias('è é àl äl ö ü', '/content/è-é-àl-äl-ö-ü', array('transliterate' => FALSE));
-
-    $ignore_words = 'a, new, very, should';
-    $this->checkAlias('a very new alias to test', '/content/alias-to-test', array('ignore_words' => $ignore_words));
-  }
-
-  /**
-   * Test the punctuation setting form items.
-   */
-  function testPunctuationSettings() {
-    // Test the replacement of punctuations.
-    $settings = [];
-    foreach ($this->defaultPunctuations as $key => $punctuation) {
-      $settings[$key] = PathautoGeneratorInterface::PUNCTUATION_REPLACE;
-    }
-
-    $title = 'aa"b`c,d.e-f_g:h;i|j{k[l}m]n+o=p*q%r^s$t#u!v~w(x)y?z>1/2\3';
-    $alias = '/content/aa-b-c-d-e-f-g-h-i-j-k-l-m-n-o-p-q-r-s-t-u-v-w-x-y-z-1-2-3';
-    $this->checkAlias($title, $alias, $settings);
-
-    // Test the removal of punctuations.
-    $settings = [];
-    foreach ($this->defaultPunctuations as $key => $punctuation) {
-      $settings[$key] = PathautoGeneratorInterface::PUNCTUATION_REMOVE;
-    }
-
-    $title = 'a"b`c,d.e-f_g:h;i|j{k[l}m]n+o=p*q%r^s$t#u!v~w(x)y?z>1/2\3';
-    $alias = '/content/abcdefghijklmnopqrstuvwxyz123';
-    $this->checkAlias($title, $alias, $settings);
-
-    // Keep all punctuations in alias.
-    $settings = [];
-    foreach ($this->defaultPunctuations as $key => $punctuation) {
-      $settings[$key] = PathautoGeneratorInterface::PUNCTUATION_DO_NOTHING;
-    }
-
-    $title = 'al"b`c,d.e-f_g:h;i|j{k[l}m]n+o=p*q%r^s$t#u!v~w(x)y?z>1/2\3';
-    $alias = '/content/al"b`c,d.e-f_g:h;i|j{k[l}m]n+o=p*q%r^s$t#u!v~w(x)y?z>1/2\3';
-    $this->checkAlias($title, $alias, $settings);
-  }
-
-  /**
-   * Helper method to check the an aliases.
-   *
-   * @param string $title
-   *   The node title to build the aliases from.
-   * @param string $alias
-   *   The expected alias.
-   * @param array $settings
-   *   The form values the alias should be generated with.
-   */
-  protected function checkAlias($title, $alias, $settings = array()) {
-    // Submit the settings form.
-    $edit = array_merge($this->defaultFormValues + $this->defaultPunctuations, $settings);
-    $this->drupalPostForm('/admin/config/search/path/settings', $edit, t('Save configuration'));
-    $this->assertText(t('The configuration options have been saved.'));
-
-    // If we do not clear the caches here, AliasCleaner will use its
-    // cleanStringCache instance variable. Due to that the creation of aliases
-    // with $this->createNode() will only work correctly on the first call.
-    \Drupal::service('pathauto.generator')->resetCaches();
-
-    // Create a node and check if the settings applied.
-    $node = $this->createNode(
-      array(
-        'title' => $title,
-        'type' => 'article',
-      )
-    );
-
-    $this->drupalGet($alias);
-    $this->assertResponse(200);
-    $this->assertEntityAlias($node, $alias);
-  }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoTaxonomyWebTest.php b/modules/pathauto/src/Tests/PathautoTaxonomyWebTest.php
deleted file mode 100644
index e1a7e88..0000000
--- a/modules/pathauto/src/Tests/PathautoTaxonomyWebTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Tests;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests pathauto taxonomy UI integration.
- *
- * @group pathauto
- */
-class PathautoTaxonomyWebTest extends WebTestBase {
-
-  use PathautoTestHelperTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('taxonomy', 'pathauto', 'views');
-
-  /**
-   * Admin user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * {inheritdoc}
-   */
-  function setUp() {
-    parent::setUp();
-
-    // Allow other modules to add additional permissions for the admin user.
-    $permissions = array(
-      'administer pathauto',
-      'administer url aliases',
-      'create url aliases',
-      'administer taxonomy',
-    );
-    $this->adminUser = $this->drupalCreateUser($permissions);
-    $this->drupalLogin($this->adminUser);
-
-    $this->createPattern('taxonomy_term', '/[term:vocabulary]/[term:name]');
-  }
-
-
-  /**
-   * Basic functional testing of Pathauto with taxonomy terms.
-   */
-  function testTermEditing() {
-    $this->drupalGet('admin/structure');
-    $this->drupalGet('admin/structure/taxonomy');
-
-    // Add vocabulary "tags".
-    $vocabulary = $this->addVocabulary(array('name' => 'tags', 'vid' => 'tags'));
-
-    // Create term for testing.
-    $name = 'Testing: term name [';
-    $automatic_alias = '/tags/testing-term-name';
-    $this->drupalPostForm('admin/structure/taxonomy/manage/tags/add', array('name[0][value]' => $name), 'Save');
-    $name = trim($name);
-    $this->assertText("Created new term $name.");
-    $term = $this->drupalGetTermByName($name);
-
-    // Look for alias generated in the form.
-    $this->drupalGet("taxonomy/term/{$term->id()}/edit");
-    $this->assertFieldChecked('edit-path-0-pathauto');
-    $this->assertFieldByName('path[0][alias]', $automatic_alias, 'Generated alias visible in the path alias field.');
-
-    // Check whether the alias actually works.
-    $this->drupalGet($automatic_alias);
-    $this->assertText($name, 'Term accessible through automatic alias.');
-
-    // Manually set the term's alias.
-    $manual_alias = '/tags/' . $term->id();
-    $edit = array(
-      'path[0][pathauto]' => FALSE,
-      'path[0][alias]' => $manual_alias,
-    );
-    $this->drupalPostForm("taxonomy/term/{$term->id()}/edit", $edit, t('Save'));
-    $this->assertText("Updated term $name.");
-
-    // Check that the automatic alias checkbox is now unchecked by default.
-    $this->drupalGet("taxonomy/term/{$term->id()}/edit");
-    $this->assertNoFieldChecked('edit-path-0-pathauto');
-    $this->assertFieldByName('path[0][alias]', $manual_alias);
-
-    // Submit the term form with the default values.
-    $this->drupalPostForm(NULL, array('path[0][pathauto]' => FALSE), t('Save'));
-    $this->assertText("Updated term $name.");
-
-    // Test that the old (automatic) alias has been deleted and only accessible
-    // through the new (manual) alias.
-    $this->drupalGet($automatic_alias);
-    $this->assertResponse(404, 'Term not accessible through automatic alias.');
-    $this->drupalGet($manual_alias);
-    $this->assertText($name, 'Term accessible through manual alias.');
-  }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoTestHelperTrait.php b/modules/pathauto/src/Tests/PathautoTestHelperTrait.php
deleted file mode 100644
index 5fc6b40..0000000
--- a/modules/pathauto/src/Tests/PathautoTestHelperTrait.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Tests;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Language\Language;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\pathauto\Entity\PathautoPattern;
-use Drupal\pathauto\PathautoPatternInterface;
-use Drupal\taxonomy\VocabularyInterface;
-use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\taxonomy\Entity\Term;
-
-/**
- * Helper test class with some added functions for testing.
- */
-trait PathautoTestHelperTrait {
-
-  /**
-   * Creates a pathauto pattern.
-   *
-   * @param string $entity_type_id
-   *   The entity type.
-   * @param string $pattern
-   *   The path pattern.
-   * @param int $weight
-   *   (optional) The pattern weight.
-   *
-   * @return \Drupal\pathauto\PathautoPatternInterface
-   *   The created pattern.
-   */
-  protected function createPattern($entity_type_id, $pattern, $weight = 10) {
-    $type = ($entity_type_id == 'forum') ? 'forum' : 'canonical_entities:' . $entity_type_id;
-
-    $pattern = PathautoPattern::create([
-      'id' => Unicode::strtolower($this->randomMachineName()),
-      'type' => $type,
-      'pattern' => $pattern,
-      'weight' => $weight,
-    ]);
-    $pattern->save();
-    return $pattern;
-  }
-
-  /**
-   * Add a bundle condition to a pathauto pattern.
-   *
-   * @param \Drupal\pathauto\PathautoPatternInterface $pattern
-   *   The pattern.
-   * @param string $entity_type
-   *   The entity type ID.
-   * @param string $bundle
-   *   The bundle
-   */
-  protected function addBundleCondition(PathautoPatternInterface $pattern, $entity_type, $bundle) {
-    $plugin_id = $entity_type == 'node' ? 'node_type' : 'entity_bundle:' . $entity_type;
-
-    $pattern->addSelectionCondition(
-      [
-        'id' => $plugin_id,
-        'bundles' => [
-          $bundle => $bundle,
-        ],
-        'negate' => FALSE,
-        'context_mapping' => [
-          $entity_type => $entity_type,
-        ]
-      ]
-    );
-  }
-
-  public function assertToken($type, $object, $token, $expected) {
-    $bubbleable_metadata = new BubbleableMetadata();
-    $tokens = \Drupal::token()->generate($type, array($token => $token), array($type => $object), [], $bubbleable_metadata);
-    $tokens += array($token => '');
-    $this->assertIdentical($tokens[$token], $expected, t("Token value for [@type:@token] was '@actual', expected value '@expected'.", array('@type' => $type, '@token' => $token, '@actual' => $tokens[$token], '@expected' => $expected)));
-  }
-
-  public function saveAlias($source, $alias, $langcode = Language::LANGCODE_NOT_SPECIFIED) {
-    \Drupal::service('path.alias_storage')->delete(array('source' => $source, 'language', 'langcode' => $langcode));
-    return \Drupal::service('path.alias_storage')->save($source, $alias, $langcode);
-  }
-
-  public function saveEntityAlias(EntityInterface $entity, $alias, $langcode = NULL) {
-    // By default, use the entity language.
-    if (!$langcode) {
-      $langcode = $entity->language()->getId();
-    }
-    return $this->saveAlias('/' . $entity->toUrl()->getInternalPath(), $alias, $langcode);
-  }
-
-  public function assertEntityAlias(EntityInterface $entity, $expected_alias, $langcode = NULL) {
-    // By default, use the entity language.
-    if (!$langcode) {
-      $langcode = $entity->language()->getId();
-    }
-    $this->assertAlias('/' . $entity->toUrl()->getInternalPath(), $expected_alias, $langcode);
-  }
-
-  public function assertEntityAliasExists(EntityInterface $entity) {
-    return $this->assertAliasExists(array('source' => '/' . $entity->toUrl()->getInternalPath()));
-  }
-
-  public function assertNoEntityAlias(EntityInterface $entity, $langcode = NULL) {
-    // By default, use the entity language.
-    if (!$langcode) {
-      $langcode = $entity->language()->getId();
-    }
-    $this->assertEntityAlias($entity, '/' . $entity->toUrl()->getInternalPath(), $langcode);
-  }
-
-  public function assertNoEntityAliasExists(EntityInterface $entity, $alias = NULL) {
-    $path = array('source' => '/' . $entity->toUrl()->getInternalPath());
-    if (!empty($alias)) {
-      $path['alias'] = $alias;
-    }
-    $this->assertNoAliasExists($path);
-  }
-
-  public function assertAlias($source, $expected_alias, $langcode = Language::LANGCODE_NOT_SPECIFIED) {
-    \Drupal::service('path.alias_manager')->cacheClear($source);
-    $this->assertEqual($expected_alias, \Drupal::service('path.alias_manager')->getAliasByPath($source, $langcode), t("Alias for %source with language '@language' is correct.",
-      array('%source' => $source, '@language' => $langcode)));
-  }
-
-  public function assertAliasExists($conditions) {
-    $path = \Drupal::service('path.alias_storage')->load($conditions);
-    $this->assertTrue($path, t('Alias with conditions @conditions found.', array('@conditions' => var_export($conditions, TRUE))));
-    return $path;
-  }
-
-  public function assertNoAliasExists($conditions) {
-    $alias = \Drupal::service('path.alias_storage')->load($conditions);
-    $this->assertFalse($alias, t('Alias with conditions @conditions not found.', array('@conditions' => var_export($conditions, TRUE))));
-  }
-
-  public function deleteAllAliases() {
-    \Drupal::database()->delete('url_alias')->execute();
-    \Drupal::service('path.alias_manager')->cacheClear();
-  }
-
-  /**
-   * @param array $values
-   * @return \Drupal\taxonomy\VocabularyInterface
-   */
-  public function addVocabulary(array $values = array()) {
-    $name = Unicode::strtolower($this->randomMachineName(5));
-    $values += array(
-      'name' => $name,
-      'vid' => $name,
-    );
-    $vocabulary = Vocabulary::create($values);
-    $vocabulary->save();
-
-    return $vocabulary;
-  }
-
-  public function addTerm(VocabularyInterface $vocabulary, array $values = array()) {
-    $values += array(
-      'name' => Unicode::strtolower($this->randomMachineName(5)),
-      'vid' => $vocabulary->id(),
-    );
-
-    $term = Term::create($values);
-    $term->save();
-    return $term;
-  }
-
-  public function assertEntityPattern($entity_type, $bundle, $langcode = Language::LANGCODE_NOT_SPECIFIED, $expected) {
-
-    $values = [
-      'langcode' => $langcode,
-      \Drupal::entityTypeManager()->getDefinition($entity_type)->getKey('bundle') => $bundle,
-    ];
-    $entity = \Drupal::entityTypeManager()->getStorage($entity_type)->create($values);
-
-    $pattern = \Drupal::service('pathauto.generator')->getPatternByEntity($entity);
-    $this->assertIdentical($expected, $pattern->getPattern());
-  }
-
-  public function drupalGetTermByName($name, $reset = FALSE) {
-    if ($reset) {
-      // @todo - implement cache reset.
-    }
-    $terms = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->loadByProperties(array('name' => $name));
-    return !empty($terms) ? reset($terms) : FALSE;
-  }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoUiTest.php b/modules/pathauto/src/Tests/PathautoUiTest.php
deleted file mode 100644
index a0bb436..0000000
--- a/modules/pathauto/src/Tests/PathautoUiTest.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Tests;
-
-use Drupal\simpletest\WebTestBase;
-use Drupal\pathauto\Entity\PathautoPattern;
-
-/**
- * Test basic pathauto functionality.
- *
- * @group pathauto
- */
-class PathautoUiTest extends WebTestBase {
-
-  use PathautoTestHelperTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('pathauto', 'node');
-
-  /**
-   * Admin user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * {inheritdoc}
-   */
-  function setUp() {
-    parent::setUp();
-
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-    $this->drupalCreateContentType(array('type' => 'article'));
-
-    // Allow other modules to add additional permissions for the admin user.
-    $permissions = array(
-      'administer pathauto',
-      'administer url aliases',
-      'create url aliases',
-      'administer nodes',
-      'bypass node access',
-      'access content overview',
-    );
-    $this->adminUser = $this->drupalCreateUser($permissions);
-    $this->drupalLogin($this->adminUser);
-  }
-
-  function testSettingsValidation() {
-    $edit = array();
-    $edit['max_length'] = 'abc';
-    $edit['max_component_length'] = 'abc';
-    $this->drupalPostForm('admin/config/search/path/settings', $edit, 'Save configuration');
-    /*$this->assertText('The field Maximum alias length is not a valid number.');
-    $this->assertText('The field Maximum component length is not a valid number.');*/
-    $this->assertNoText('The configuration options have been saved.');
-
-    $edit['max_length'] = '0';
-    $edit['max_component_length'] = '0';
-    $this->drupalPostForm('admin/config/search/path/settings', $edit, 'Save configuration');
-    /*$this->assertText('The field Maximum alias length cannot be less than 1.');
-    $this->assertText('The field Maximum component length cannot be less than 1.');*/
-    $this->assertNoText('The configuration options have been saved.');
-
-    $edit['max_length'] = '999';
-    $edit['max_component_length'] = '999';
-    $this->drupalPostForm('admin/config/search/path/settings', $edit, 'Save configuration');
-    /*$this->assertText('The field Maximum alias length cannot be greater than 255.');
-    $this->assertText('The field Maximum component length cannot be greater than 255.');*/
-    $this->assertNoText('The configuration options have been saved.');
-
-    $edit['max_length'] = '50';
-    $edit['max_component_length'] = '50';
-    $this->drupalPostForm('admin/config/search/path/settings', $edit, 'Save configuration');
-    $this->assertText('The configuration options have been saved.');
-  }
-
-  function testPatternsWorkflow() {
-    // Try to save an empty pattern, should not be allowed.
-    $this->drupalGet('admin/config/search/path/patterns/add');
-    $edit = array(
-      'type' => 'canonical_entities:node',
-    );
-    $this->drupalPostAjaxForm(NULL, $edit, 'type');
-    $edit += array(
-      'bundles[page]' => TRUE,
-      'label' => 'Page pattern',
-      'id' => 'page_pattern',
-    );
-    $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText('Path pattern field is required.');
-    $this->assertNoText('The configuration options have been saved.');
-
-    // Try to save an invalid pattern.
-    $edit += array(
-      'pattern' => '[node:title]/[user:name]/[term:name]',
-    );
-    $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText('Path pattern is using the following invalid tokens: [user:name], [term:name].');
-    $this->assertNoText('The configuration options have been saved.');
-
-    $edit['pattern'] = '#[node:title]';
-    $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText('The Path pattern is using the following invalid characters: #.');
-    $this->assertNoText('The configuration options have been saved.');
-
-    // Checking whitespace ending of the string.
-    $edit['pattern'] = '[node:title] ';
-    $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText('The Path pattern doesn\'t allow the patterns ending with whitespace.');
-    $this->assertNoText('The configuration options have been saved.');
-
-    // Fix the pattern, then check that it gets saved successfully.
-    $edit['pattern'] = '[node:title]';
-    $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText('Pattern Page pattern saved.');
-
-    \Drupal::service('pathauto.generator')->resetCaches();
-
-    // Create a node with pattern enabled and check if the pattern applies.
-    $title = 'Page Pattern enabled';
-    $alias = '/page-pattern-enabled';
-    $node = $this->createNode(['title' => $title, 'type' => 'page']);
-    $this->drupalGet($alias);
-    $this->assertResponse(200);
-    $this->assertEntityAlias($node, $alias);
-
-    // Edit workflow, set a new label and weight for the pattern.
-    $this->drupalPostForm('/admin/config/search/path/patterns', ['entities[page_pattern][weight]' => '4'], t('Save'));
-    $this->clickLink(t('Edit'));
-    $this->assertUrl('/admin/config/search/path/patterns/page_pattern');
-    $this->assertFieldByName('pattern', '[node:title]');
-    $this->assertFieldByName('label', 'Page pattern');
-    $this->assertFieldChecked('edit-status');
-    $this->assertLink(t('Delete'));
-
-    $edit = array('label' => 'Test');
-    $this->drupalPostForm('/admin/config/search/path/patterns/page_pattern', $edit, t('Save'));
-    $this->assertText('Pattern Test saved.');
-    // Check that the pattern weight did not change.
-    $this->assertOptionSelected('edit-entities-page-pattern-weight', '4');
-
-    // Disable workflow.
-    $this->drupalGet('/admin/config/search/path/patterns');
-    $this->assertNoLink(t('Enable'));
-    $this->clickLink(t('Disable'));
-    $this->assertUrl('/admin/config/search/path/patterns/page_pattern/disable');
-    $this->drupalPostForm(NULL, [], t('Disable'));
-    $this->assertText('Disabled pattern Test.');
-
-    // Load the pattern from storage and check if its disabled.
-    $pattern = PathautoPattern::load('page_pattern');
-    $this->assertFalse($pattern->status());
-
-    \Drupal::service('pathauto.generator')->resetCaches();
-
-    // Create a node with pattern disabled and check that we have no new alias.
-    $title = 'Page Pattern disabled';
-    $node = $this->createNode(['title' => $title, 'type' => 'page']);
-    $this->assertNoEntityAlias($node);
-
-    // Enable workflow.
-    $this->drupalGet('/admin/config/search/path/patterns');
-    $this->assertNoLink(t('Disable'));
-    $this->clickLink(t('Enable'));
-    $this->assertUrl('/admin/config/search/path/patterns/page_pattern/enable');
-    $this->drupalPostForm(NULL, [], t('Enable'));
-    $this->assertText('Enabled pattern Test.');
-
-    // Reload pattern from storage and check if its enabled.
-    $pattern = PathautoPattern::load('page_pattern');
-    $this->assertTrue($pattern->status());
-
-    // Delete workflow.
-    $this->drupalGet('/admin/config/search/path/patterns');
-    $this->clickLink(t('Delete'));
-    $this->assertUrl('/admin/config/search/path/patterns/page_pattern/delete');
-    $this->assertText(t('This action cannot be undone.'));
-    $this->drupalPostForm(NULL, [], t('Delete'));
-    $this->assertText('The pathauto pattern Test has been deleted.');
-
-    $this->assertFalse(PathautoPattern::load('page_pattern'));
-  }
-
-}
diff --git a/modules/pathauto/src/Tests/PathautoUserWebTest.php b/modules/pathauto/src/Tests/PathautoUserWebTest.php
deleted file mode 100644
index 54832df..0000000
--- a/modules/pathauto/src/Tests/PathautoUserWebTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-namespace Drupal\pathauto\Tests;
-use Drupal\Component\Utility\Unicode;
-use Drupal\simpletest\WebTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests pathauto user UI integration.
- *
- * @group pathauto
- */
-class PathautoUserWebTest extends WebTestBase {
-
-  use PathautoTestHelperTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('pathauto', 'views');
-
-  /**
-   * Admin user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * {inheritdoc}
-   */
-  function setUp() {
-    parent::setUp();
-
-    // Allow other modules to add additional permissions for the admin user.
-    $permissions = array(
-      'administer pathauto',
-      'administer url aliases',
-      'create url aliases',
-      'administer users',
-    );
-    $this->adminUser = $this->drupalCreateUser($permissions);
-    $this->drupalLogin($this->adminUser);
-
-    $this->createPattern('user', '/users/[user:name]');
-  }
-
-
-  /**
-   * Basic functional testing of Pathauto with users.
-   */
-  function testUserEditing() {
-    // There should be no Pathauto checkbox on user forms.
-    $this->drupalGet('user/' . $this->adminUser->id() . '/edit');
-    $this->assertNoFieldById('path[0][pathauto]');
-  }
-
-  /**
-   * Test user operations.
-   */
-  function testUserOperations() {
-    $account = $this->drupalCreateUser();
-
-    // Delete all current URL aliases.
-    $this->deleteAllAliases();
-
-    // Find the position of just created account in the user_admin_people view.
-    $view = Views::getView('user_admin_people');
-    $view->initDisplay();
-    $view->preview('page_1');
-
-
-    foreach ($view->result as $key => $row) {
-      if ($view->field['name']->getValue($row) == $account->getUsername()) {
-        break;
-      }
-    }
-
-    $edit = array(
-      'action' => 'pathauto_update_alias_user',
-      "user_bulk_form[$key]" => TRUE,
-    );
-    $this->drupalPostForm('admin/people', $edit, t('Apply to selected items'));
-    $this->assertText('Update URL alias was applied to 1 item.');
-
-    $this->assertEntityAlias($account, '/users/' . Unicode::strtolower($account->getUsername()));
-    $this->assertEntityAlias($this->adminUser, '/user/' . $this->adminUser->id());
-  }
-
-}
diff --git a/modules/pathauto/src/VerboseMessenger.php b/modules/pathauto/src/VerboseMessenger.php
deleted file mode 100644
index bc60b5c..0000000
--- a/modules/pathauto/src/VerboseMessenger.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Drupal\pathauto;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Provides a verbose messenger.
- */
-class VerboseMessenger implements MessengerInterface {
-
-  /**
-   * The verbose flag.
-   *
-   * @var bool
-   */
-  protected $isVerbose;
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The current user account.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $account;
-
-  /**
-   * Creates a verbose messenger.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, AccountInterface $account) {
-    $this->configFactory = $config_factory;
-    $this->account = $account;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addMessage($message, $op = NULL) {
-
-    if (!isset($this->isVerbose)) {
-      $config = $this->configFactory->get('pathauto.settings');
-      $this->isVerbose = $config->get('verbose') && $this->account->hasPermission('notify of path changes');
-    }
-
-    if (!$this->isVerbose || (isset($op) && in_array($op, array('bulkupdate', 'return')))) {
-      return FALSE;
-    }
-
-    if ($message) {
-      drupal_set_message($message);
-    }
-
-    return TRUE;
-  }
-
-}
diff --git a/modules/pathauto/tests/modules/pathauto_views_test/config/install/views.view.articles.yml b/modules/pathauto/tests/modules/pathauto_views_test/config/install/views.view.articles.yml
deleted file mode 100644
index 249516f..0000000
--- a/modules/pathauto/tests/modules/pathauto_views_test/config/install/views.view.articles.yml
+++ /dev/null
@@ -1,231 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - taxonomy
-    - user
-id: articles
-label: articles
-module: pathauto_views_test
-description: ''
-tag: ''
-base_table: node_field_data
-base_field: nid
-core: 8.x
-display:
-  default:
-    display_plugin: default
-    id: default
-    display_title: Master
-    position: 0
-    display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: full
-        options:
-          items_per_page: 10
-          offset: 0
-          id: 0
-          total_pages: null
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-            first: '« First'
-            last: 'Last »'
-          quantity: 9
-      style:
-        type: default
-      row:
-        type: 'entity:node'
-        options:
-          view_mode: teaser
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          entity_type: node
-          entity_field: title
-          label: ''
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            trim: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            html: false
-          hide_empty: false
-          empty_zero: false
-          settings:
-            link_to_entity: true
-          plugin_id: field
-          relationship: none
-          group_type: group
-          admin_label: ''
-          exclude: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        status:
-          value: '1'
-          table: node_field_data
-          field: status
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
-          id: status
-          expose:
-            operator: ''
-          group: 1
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          value:
-            article: article
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-      sorts:
-        created:
-          id: created
-          table: node_field_data
-          field: created
-          order: DESC
-          entity_type: node
-          entity_field: created
-          plugin_id: date
-          relationship: none
-          group_type: group
-          admin_label: ''
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-      title: articles
-      header: {  }
-      footer: {  }
-      empty: {  }
-      relationships: {  }
-      arguments:
-        tid:
-          id: tid
-          table: taxonomy_index
-          field: tid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          default_action: ignore
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            items_per_page: 25
-            override: false
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          add_table: false
-          require_value: false
-          reduce_duplicates: false
-          plugin_id: taxonomy_index_tid
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  page_1:
-    display_plugin: page
-    id: page_1
-    display_title: Page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: articles
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/modules/pathauto/tests/modules/pathauto_views_test/pathauto_views_test.info.yml b/modules/pathauto/tests/modules/pathauto_views_test/pathauto_views_test.info.yml
deleted file mode 100644
index ad051ce..0000000
--- a/modules/pathauto/tests/modules/pathauto_views_test/pathauto_views_test.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: 'Views Test Config'
-type: module
-description: 'Provides default views for tests.'
-package: Testing
-# version: VERSION
-# core: 8.x
-dependencies:
-  - views
-
-# Information added by Drupal.org packaging script on 2017-04-29
-version: '8.x-1.0'
-core: '8.x'
-project: 'pathauto'
-datestamp: 1493468049
diff --git a/modules/pathauto/tests/src/Kernel/PathautoKernelTest.php b/modules/pathauto/tests/src/Kernel/PathautoKernelTest.php
deleted file mode 100644
index b69d437..0000000
--- a/modules/pathauto/tests/src/Kernel/PathautoKernelTest.php
+++ /dev/null
@@ -1,572 +0,0 @@
-<?php
-
-namespace Drupal\Tests\pathauto\Kernel;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Language\Language;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\node\Entity\NodeType;
-use Drupal\pathauto\PathautoGeneratorInterface;
-use Drupal\pathauto\PathautoState;
-use Drupal\pathauto\Tests\PathautoTestHelperTrait;
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\taxonomy\Entity\Term;
-use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\node\Entity\Node;
-use Drupal\user\Entity\User;
-
-/**
- * Unit tests for Pathauto functions.
- *
- * @group pathauto
- */
-class PathautoKernelTest extends KernelTestBase {
-
-  use PathautoTestHelperTrait;
-
-  public static $modules = array('system', 'field', 'text', 'user', 'node', 'path', 'pathauto', 'taxonomy', 'token', 'filter', 'ctools', 'language');
-
-  protected $currentUser;
-
-  /**
-   * @var \Drupal\pathauto\PathautoPatternInterface
-   */
-  protected $nodePattern;
-
-  /**
-   * @var \Drupal\pathauto\PathautoPatternInterface
-   */
-  protected $userPattern;
-
-  public function setUp() {
-    parent::setup();
-
-    $this->installConfig(array('pathauto', 'taxonomy', 'system', 'node'));
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('taxonomy_term');
-
-    ConfigurableLanguage::createFromLangcode('fr')->save();
-
-    $this->installSchema('node', array('node_access'));
-    $this->installSchema('system', array('url_alias', 'sequences', 'router'));
-
-    $type = NodeType::create(['type' => 'page']);
-    $type->save();
-    node_add_body_field($type);
-
-    $this->nodePattern = $this->createPattern('node', '/content/[node:title]');
-    $this->userPattern = $this->createPattern('user', '/users/[user:name]');
-
-    \Drupal::service('router.builder')->rebuild();
-
-    $this->currentUser = User::create(array('name' => $this->randomMachineName()));
-    $this->currentUser->save();
-  }
-
-  /**
-   * Test _pathauto_get_schema_alias_maxlength().
-   */
-  public function testGetSchemaAliasMaxLength() {
-    $this->assertIdentical(\Drupal::service('pathauto.alias_storage_helper')->getAliasSchemaMaxlength(), 255);
-  }
-
-  /**
-   * Test pathauto_pattern_load_by_entity().
-   */
-  public function testPatternLoadByEntity() {
-    $pattern = $this->createPattern('node', '/article/[node:title]', -1);
-    $this->addBundleCondition($pattern, 'node', 'article');
-    $pattern->save();
-
-    $pattern = $this->createPattern('node', '/article/en/[node:title]', -2);
-    $this->addBundleCondition($pattern, 'node', 'article');
-    $pattern->addSelectionCondition(
-      [
-        'id' => 'language',
-        'langcodes' => [
-          'en' => 'en',
-        ],
-        'negate' => FALSE,
-        'context_mapping' => [
-          'language' => 'node:langcode:language',
-        ]
-      ]
-    );
-
-    $pattern->addRelationship('node:langcode:language');
-    $pattern->save();
-
-    $pattern = $this->createPattern('node', '/[node:title]', -1);
-    $this->addBundleCondition($pattern, 'node', 'page');
-    $pattern->save();
-
-    $tests = array(
-      array(
-        'entity' => 'node',
-        'values' => [
-          'title' => 'Article fr',
-          'type' => 'article',
-          'langcode' => 'fr',
-        ],
-        'expected' => '/article/[node:title]',
-      ),
-      array(
-        'entity' => 'node',
-        'values' => [
-          'title' => 'Article en',
-          'type' => 'article',
-          'langcode' => 'en',
-        ],
-        'expected' => '/article/en/[node:title]',
-      ),
-      array(
-        'entity' => 'node',
-        'values' => [
-          'title' => 'Article und',
-          'type' => 'article',
-          'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-        ],
-        'expected' => '/article/[node:title]',
-      ),
-      array(
-        'entity' => 'node',
-        'values' => [
-          'title' => 'Page',
-          'type' => 'page',
-        ],
-        'expected' => '/[node:title]',
-      ),
-      array(
-        'entity' => 'user',
-        'values' => [
-          'name' => 'User',
-        ],
-        'expected' => '/users/[user:name]',
-      ),
-    );
-    foreach ($tests as $test) {
-      $entity = \Drupal::entityTypeManager()->getStorage($test['entity'])->create($test['values']);
-      $entity->save();
-      $actual = \Drupal::service('pathauto.generator')->getPatternByEntity($entity);
-      $this->assertIdentical($actual->getPattern(), $test['expected'], t("Correct pattern returned for @entity_type with @values", array(
-        '@entity' => $test['entity'],
-        '@values' => print_r($test['values'], TRUE),
-      )));
-    }
-  }
-
-  /**
-   * Test potential conflicts with the same alias in different languages.
-   */
-  public function testSameTitleDifferentLanguages() {
-    // Create two English articles with the same title.
-    $edit = [
-      'title' => 'Sample page',
-      'type' => 'page',
-      'langcode' => 'en',
-    ];
-    $node1 = $this->drupalCreateNode($edit);
-    $this->assertEntityAlias($node1, '/content/sample-page', 'en');
-
-    $node2 = $this->drupalCreateNode($edit);
-    $this->assertEntityAlias($node2, '/content/sample-page-0', 'en');
-
-    // Now, create a French article with the same title, and verify that it gets
-    // the basic alias with the correct langcode.
-    $edit['langcode'] = 'fr';
-    $node3 = $this->drupalCreateNode($edit);
-    $this->assertEntityAlias($node3, '/content/sample-page', 'fr');
-  }
-
-  /**
-   * Test pathauto_cleanstring().
-   */
-  public function testCleanString() {
-
-    // Test with default settings defined in pathauto.settings.yml.
-    $this->installConfig(array('pathauto'));
-    \Drupal::service('pathauto.generator')->resetCaches();
-
-    $tests = array();
-
-    // Test the 'ignored words' removal.
-    $tests['this'] = 'this';
-    $tests['this with that'] = 'this-with-that';
-    $tests['this thing with that thing'] = 'thing-thing';
-
-    // Test 'ignored words' removal and duplicate separator removal.
-    $tests[' - Pathauto is the greatest - module ever - '] = 'pathauto-greatest-module-ever';
-
-    // Test length truncation and lowering of strings.
-    $long_string = $this->randomMachineName(120);
-    $tests[$long_string] = strtolower(substr($long_string, 0, 100));
-
-    // Test that HTML tags are removed.
-    $tests['This <span class="text">text</span> has <br /><a href="http://example.com"><strong>HTML tags</strong></a>.'] = 'text-has-html-tags';
-    $tests[Html::escape('This <span class="text">text</span> has <br /><a href="http://example.com"><strong>HTML tags</strong></a>.')] = 'text-has-html-tags';
-
-    // Transliteration.
-    $tests['ľščťžýáíéňô'] = 'lsctzyaieno';
-
-    foreach ($tests as $input => $expected) {
-      $output = \Drupal::service('pathauto.alias_cleaner')->cleanString($input);
-      $this->assertEqual($output, $expected, t("Drupal::service('pathauto.alias_cleaner')->cleanString('@input') expected '@expected', actual '@output'", array(
-        '@input' => $input,
-        '@expected' => $expected,
-        '@output' => $output,
-      )));
-    }
-  }
-
-  /**
-   * Test pathauto_clean_alias().
-   */
-  public function testCleanAlias() {
-    $tests = array();
-    $tests['one/two/three'] = '/one/two/three';
-    $tests['/one/two/three/'] = '/one/two/three';
-    $tests['one//two///three'] = '/one/two/three';
-    $tests['one/two--three/-/--/-/--/four---five'] = '/one/two-three/four-five';
-    $tests['one/-//three--/four'] = '/one/three/four';
-
-    foreach ($tests as $input => $expected) {
-      $output = \Drupal::service('pathauto.alias_cleaner')->cleanAlias($input);
-      $this->assertEqual($output, $expected, t("Drupal::service('pathauto.generator')->cleanAlias('@input') expected '@expected', actual '@output'", array(
-        '@input' => $input,
-        '@expected' => $expected,
-        '@output' => $output,
-      )));
-    }
-  }
-
-  /**
-   * Test pathauto_path_delete_multiple().
-   */
-  public function testPathDeleteMultiple() {
-    $this->saveAlias('/node/1', '/node-1-alias');
-    $this->saveAlias('/node/1/view', '/node-1-alias/view');
-    $this->saveAlias('/node/1', '/node-1-alias-en', 'en');
-    $this->saveAlias('/node/1', '/node-1-alias-fr', 'fr');
-    $this->saveAlias('/node/2', '/node-2-alias');
-    $this->saveAlias('/node/10', '/node-10-alias');
-
-    \Drupal::service('pathauto.alias_storage_helper')->deleteBySourcePrefix('/node/1');
-    $this->assertNoAliasExists(array('source' => "/node/1"));
-    $this->assertNoAliasExists(array('source' => "/node/1/view"));
-    $this->assertAliasExists(array('source' => "/node/2"));
-    $this->assertAliasExists(array('source' => "/node/10"));
-  }
-
-  /**
-   * Test the different update actions in \Drupal::service('pathauto.generator')->createEntityAlias().
-   */
-  public function testUpdateActions() {
-    $config = $this->config('pathauto.settings');
-
-    // Test PATHAUTO_UPDATE_ACTION_NO_NEW with unaliased node and 'insert'.
-    $config->set('update_action', PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW);
-    $config->save();
-    $node = $this->drupalCreateNode(array('title' => 'First title'));
-    $this->assertEntityAlias($node, '/content/first-title');
-
-    $node->path->pathauto = PathautoState::CREATE;
-
-    // Default action is PATHAUTO_UPDATE_ACTION_DELETE.
-    $config->set('update_action', PathautoGeneratorInterface::UPDATE_ACTION_DELETE);
-    $config->save();
-    $node->setTitle('Second title');
-    $node->save();
-    $this->assertEntityAlias($node, '/content/second-title');
-    $this->assertNoAliasExists(array('alias' => '/content/first-title'));
-
-    // Test PATHAUTO_UPDATE_ACTION_LEAVE
-    $config->set('update_action', PathautoGeneratorInterface::UPDATE_ACTION_LEAVE);
-    $config->save();
-    $node->setTitle('Third title');
-    $node->save();
-    $this->assertEntityAlias($node, '/content/third-title');
-    $this->assertAliasExists(array('source' => '/' . $node->toUrl()->getInternalPath(), 'alias' => '/content/second-title'));
-
-    $config->set('update_action', PathautoGeneratorInterface::UPDATE_ACTION_DELETE);
-    $config->save();
-    $node->setTitle('Fourth title');
-    $node->save();
-    $this->assertEntityAlias($node, '/content/fourth-title');
-    $this->assertNoAliasExists(array('alias' => '/content/third-title'));
-    // The older second alias is not deleted yet.
-    $older_path = $this->assertAliasExists(array('source' => '/' . $node->toUrl()->getInternalPath(), 'alias' => '/content/second-title'));
-    \Drupal::service('path.alias_storage')->delete($older_path);
-
-    $config->set('update_action', PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW);
-    $config->save();
-    $node->setTitle('Fifth title');
-    $node->save();
-    $this->assertEntityAlias($node, '/content/fourth-title');
-    $this->assertNoAliasExists(array('alias' => '/content/fifth-title'));
-
-    // Test PATHAUTO_UPDATE_ACTION_NO_NEW with unaliased node and 'update'.
-    $this->deleteAllAliases();
-    $node->save();
-    $this->assertEntityAlias($node, '/content/fifth-title');
-
-    // Test PATHAUTO_UPDATE_ACTION_NO_NEW with unaliased node and 'bulkupdate'.
-    $this->deleteAllAliases();
-    $node->setTitle('Sixth title');
-    \Drupal::service('pathauto.generator')->updateEntityAlias($node, 'bulkupdate');
-    $this->assertEntityAlias($node, '/content/sixth-title');
-  }
-
-  /**
-   * Test that \Drupal::service('pathauto.generator')->createEntityAlias() will not create an alias for a pattern
-   * that does not get any tokens replaced.
-   */
-  public function testNoTokensNoAlias() {
-    $this->installConfig(['filter']);
-    $this->nodePattern
-      ->setPattern('/content/[node:body]')
-      ->save();
-
-    $node = $this->drupalCreateNode();
-    $this->assertNoEntityAliasExists($node);
-
-    $node->body->value = 'hello';
-    $node->save();
-    $this->assertEntityAlias($node, '/content/hello');
-  }
-
-  /**
-   * Test the handling of path vs non-path tokens in pathauto_clean_token_values().
-   */
-  public function testPathTokens() {
-    $this->createPattern('taxonomy_term', '/[term:parent:url:path]/[term:name]');
-
-    $vocab = $this->addVocabulary();
-
-    $term1 = $this->addTerm($vocab, array('name' => 'Parent term'));
-    $this->assertEntityAlias($term1, '/parent-term');
-
-    $term2 = $this->addTerm($vocab, array('name' => 'Child term', 'parent' => $term1->id()));
-    $this->assertEntityAlias($term2, '/parent-term/child-term');
-
-    $this->saveEntityAlias($term1, '/My Crazy/Alias/');
-    $term2->save();
-    $this->assertEntityAlias($term2, '/My Crazy/Alias/child-term');
-  }
-
-  /**
-   * Test using fields for path structures.
-   */
-  function testParentChildPathTokens() {
-    // First create a field which will be used to create the path. It must
-    // begin with a letter.
-
-    $this->installEntitySchema('taxonomy_term');
-
-    Vocabulary::create(['vid' => 'tags'])->save();
-
-    $fieldname = 'a' . Unicode::strtolower($this->randomMachineName());
-    $field_storage = FieldStorageConfig::create(['entity_type' => 'taxonomy_term', 'field_name' => $fieldname, 'type' => 'string']);
-    $field_storage->save();
-    $field = FieldConfig::create(['field_storage' => $field_storage, 'bundle' => 'tags']);
-    $field->save();
-
-    $display = entity_get_display('taxonomy_term', 'tags', 'default');
-    $display->setComponent($fieldname, ['type' => 'string']);
-    $display->save();
-
-    // Make the path pattern of a field use the value of this field appended
-    // to the parent taxonomy term's pattern if there is one.
-    $this->createPattern('taxonomy_term', '/[term:parents:join-path]/[term:' . $fieldname . ']');
-
-    // Start by creating a parent term.
-    $parent = Term::create(['vid' => 'tags', $fieldname => $this->randomMachineName(), 'name' => $this->randomMachineName()]);
-    $parent->save();
-
-    // Create the child term.
-    $child = Term::create(['vid' => 'tags', $fieldname => $this->randomMachineName(), 'parent' => $parent, 'name' => $this->randomMachineName()]);
-    $child->save();
-    $this->assertEntityAlias($child, '/' . Unicode::strtolower($parent->getName() . '/' . $child->$fieldname->value));
-
-    // Re-saving the parent term should not modify the child term's alias.
-    $parent->save();
-    $this->assertEntityAlias($child, '/' . Unicode::strtolower($parent->getName() . '/' . $child->$fieldname->value));
-  }
-
-  /**
-   * Tests aliases on taxonomy terms.
-   */
-  public function testTaxonomyPattern() {
-    // Create a vocabulary and test that it's pattern variable works.
-    $vocab = $this->addVocabulary(array('vid' => 'name'));
-    $this->createPattern('taxonomy_term', 'base');
-    $pattern = $this->createPattern('taxonomy_term', 'bundle', -1);
-    $this->addBundleCondition($pattern, 'taxonomy_term', 'name');
-    $pattern->save();
-    $this->assertEntityPattern('taxonomy_term', 'name', Language::LANGCODE_NOT_SPECIFIED, 'bundle');
-  }
-
-  function testNoExistingPathAliases() {
-    $this->config('pathauto.settings')
-      ->set('punctuation.period', PathautoGeneratorInterface::PUNCTUATION_DO_NOTHING)
-      ->save();
-
-    $this->nodePattern
-      ->setPattern('[node:title]')
-      ->save();
-
-    // Check that Pathauto does not create an alias of '/admin'.
-    $node = $this->drupalCreateNode(array('title' => 'Admin', 'type' => 'page'));
-    $this->assertEntityAlias($node, '/admin-0');
-
-    // Check that Pathauto does not create an alias of '/modules'.
-    $node->setTitle('Modules');
-    $node->save();
-    $this->assertEntityAlias($node, '/modules-0');
-
-    // Check that Pathauto does not create an alias of '/index.php'.
-    $node->setTitle('index.php');
-    $node->save();
-    $this->assertEntityAlias($node, '/index.php-0');
-
-    // Check that a safe value gets an automatic alias. This is also a control
-    // to ensure the above tests work properly.
-    $node->setTitle('Safe value');
-    $node->save();
-    $this->assertEntityAlias($node, '/safe-value');
-  }
-
-  /**
-   * Test programmatic entity creation for aliases.
-   */
-  function testProgrammaticEntityCreation() {
-    $this->createPattern('taxonomy_term', '/[term:vocabulary]/[term:name]');
-    $node = $this->drupalCreateNode(array('title' => 'Test node', 'path' => array('pathauto' => TRUE)));
-    $this->assertEntityAlias($node, '/content/test-node');
-
-    $vocabulary = $this->addVocabulary(array('name' => 'Tags'));
-    $term = $this->addTerm($vocabulary, array('name' => 'Test term', 'path' => array('pathauto' => TRUE)));
-    $this->assertEntityAlias($term, '/tags/test-term');
-
-    $edit['name'] = 'Test user';
-    $edit['mail'] = 'test-user@example.com';
-    $edit['pass']   = user_password();
-    $edit['path'] = array('pathauto' => TRUE);
-    $edit['status'] = 1;
-    $account = User::create($edit);
-    $account->save();
-    $this->assertEntityAlias($account, '/users/test-user');
-  }
-
-  /**
-   * Tests word safe alias truncating.
-   */
-  function testPathAliasUniquifyWordsafe() {
-    $this->config('pathauto.settings')
-      ->set('max_length', 26)
-      ->save();
-
-    $node_1 = $this->drupalCreateNode(array('title' => 'thequick brownfox jumpedover thelazydog', 'type' => 'page'));
-    $node_2 = $this->drupalCreateNode(array('title' => 'thequick brownfox jumpedover thelazydog', 'type' => 'page'));
-
-    // Check that alias uniquifying is truncating with $wordsafe param set to
-    // TRUE.
-    // If it doesn't path alias result would be content/thequick-brownf-0
-    $this->assertEntityAlias($node_1, '/content/thequick-brownfox');
-    $this->assertEntityAlias($node_2, '/content/thequick-0');
-  }
-
-  /**
-   * Test if aliases are (not) generated with enabled/disabled patterns.
-   */
-  function testPatternStatus() {
-    // Create a node to get an alias for.
-    $title = 'Pattern enabled';
-    $alias = '/content/pattern-enabled';
-    $node1 = $this->drupalCreateNode(['title' => $title, 'type' => 'page']);
-    $this->assertEntityAlias($node1, $alias);
-
-    // Disable the pattern, save the node again and make sure the alias is still
-    // working.
-    $this->nodePattern->setStatus(FALSE)->save();
-
-    $node1->save();
-    $this->assertEntityAlias($node1, $alias);
-
-    // Create a new node with disabled pattern and make sure there is no new
-    // alias created.
-    $title = 'Pattern disabled';
-    $node2 = $this->drupalCreateNode(['title' => $title, 'type' => 'page']);
-    $this->assertNoEntityAlias($node2);
-  }
-
-  /**
-   * Tests that enabled entity types genrates the necessary fields and plugins.
-   */
-  public function testSettingChangeInvalidatesCache() {
-
-    $this->installConfig(['pathauto']);
-
-    $this->enableModules(['entity_test']);
-
-    $definitions = \Drupal::service('plugin.manager.alias_type')->getDefinitions();
-    $this->assertFalse(isset($definitions['canonical_entities:entity_test']));
-
-    $fields = \Drupal::service('entity_field.manager')->getBaseFieldDefinitions('entity_test');
-    $this->assertFalse(isset($fields['path']));
-
-    $this->config('pathauto.settings')
-      ->set('enabled_entity_types', ['user', 'entity_test'])
-      ->save();
-
-    $definitions = \Drupal::service('plugin.manager.alias_type')->getDefinitions();
-    $this->assertTrue(isset($definitions['canonical_entities:entity_test']));
-
-    $fields = \Drupal::service('entity_field.manager')->getBaseFieldDefinitions('entity_test');
-    $this->assertTrue(isset($fields['path']));
-
-  }
-
-  /**
-   * Tests that aliases are only generated for default revisions.
-   */
-  public function testDefaultRevision() {
-    $node1 = $this->drupalCreateNode(['title' => 'Default revision', 'type' => 'page']);
-    $this->assertEntityAlias($node1, '/content/default-revision');
-
-    $node1->setNewRevision(TRUE);
-    $node1->isDefaultRevision(FALSE);
-    $node1->setTitle('New non-default-revision');
-    $node1->save();
-
-    $this->assertEntityAlias($node1, '/content/default-revision');
-  }
-
-  /**
-   * Creates a node programmatically.
-   *
-   * @param array $settings
-   *   The array of values for the node.
-   *
-   * @return \Drupal\node\Entity\Node
-   *   The created node.
-   */
-  protected function drupalCreateNode(array $settings = array()) {
-    // Populate defaults array.
-    $settings += array(
-      'title'     => $this->randomMachineName(8),
-      'type'      => 'page',
-    );
-
-    $node = Node::create($settings);
-    $node->save();
-
-    return $node;
-  }
-
-}
diff --git a/modules/pathauto/tests/src/Kernel/PathautoTokenTest.php b/modules/pathauto/tests/src/Kernel/PathautoTokenTest.php
deleted file mode 100644
index 30c5ad1..0000000
--- a/modules/pathauto/tests/src/Kernel/PathautoTokenTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Drupal\Tests\pathauto\Kernel;
-
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests tokens provided by Pathauto.
- *
- * @group pathauto
- */
-class PathautoTokenTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'token', 'pathauto');
-
-  public function testPathautoTokens() {
-
-    $this->installConfig(array('pathauto'));
-
-    $array = array(
-      'test first arg',
-      'The Array / value',
-    );
-
-    $tokens = array(
-      'join-path' => 'test-first-arg/array-value',
-    );
-    $data['array'] = $array;
-    $replacements = $this->assertTokens('array', $data, $tokens);
-
-    // Ensure that the cleanTokenValues() method does not alter this token value.
-    /* @var \Drupal\pathauto\AliasCleanerInterface $alias_cleaner */
-    $alias_cleaner = \Drupal::service('pathauto.alias_cleaner');
-    $alias_cleaner->cleanTokenValues($replacements, $data, array());
-    $this->assertEqual($replacements['[array:join-path]'], 'test-first-arg/array-value');
-  }
-
-  /**
-   * Function copied from TokenTestHelper::assertTokens().
-   */
-  public function assertTokens($type, array $data, array $tokens, array $options = array()) {
-    $input = $this->mapTokenNames($type, array_keys($tokens));
-    $bubbleable_metadata = new BubbleableMetadata();
-    $replacements = \Drupal::token()->generate($type, $input, $data, $options, $bubbleable_metadata);
-    foreach ($tokens as $name => $expected) {
-      $token = $input[$name];
-      if (!isset($expected)) {
-        $this->assertTrue(!isset($values[$token]), t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
-      }
-      elseif (!isset($replacements[$token])) {
-        $this->fail(t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
-      }
-      elseif (!empty($options['regex'])) {
-        $this->assertTrue(preg_match('/^' . $expected . '$/', $replacements[$token]), t("Token value for @token was '@actual', matching regular expression pattern '@expected'.", array('@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected)));
-      }
-      else {
-        $this->assertIdentical($replacements[$token], $expected, t("Token value for @token was '@actual', expected value '@expected'.", array('@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected)));
-      }
-    }
-
-    return $replacements;
-  }
-
-  public function mapTokenNames($type, array $tokens = array()) {
-    $return = array();
-    foreach ($tokens as $token) {
-      $return[$token] = "[$type:$token]";
-    }
-    return $return;
-  }
-
-}
diff --git a/modules/pathauto/tests/src/Unit/VerboseMessengerTest.php b/modules/pathauto/tests/src/Unit/VerboseMessengerTest.php
deleted file mode 100644
index 9567dd5..0000000
--- a/modules/pathauto/tests/src/Unit/VerboseMessengerTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Drupal\Tests\pathauto\Unit {
-
-  use Drupal\pathauto\VerboseMessenger;
-  use Drupal\Tests\UnitTestCase;
-
-  /**
-   * @coversDefaultClass \Drupal\pathauto\VerboseMessenger
-   * @group pathauto
-   */
-  class VerboseMessengerTest extends UnitTestCase {
-
-    /**
-     * The messenger under test.
-     *
-     * @var \Drupal\pathauto\VerboseMessenger
-     */
-    protected $messenger;
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function setUp() {
-      $config_factory = $this->getConfigFactoryStub(array('pathauto.settings' => array('verbose' => TRUE)));
-      $account = $this->getMock('\Drupal\Core\Session\AccountInterface');
-      $account->expects($this->once())
-        ->method('hasPermission')
-        ->withAnyParameters()
-        ->willReturn(TRUE);
-
-      $this->messenger = new VerboseMessenger($config_factory, $account);
-    }
-
-    /**
-     * Tests add messages.
-     * @covers ::addMessage
-     */
-    public function testAddMessage() {
-      $this->assertTrue($this->messenger->addMessage("Test message"), "The message was added");
-    }
-
-    /**
-     * @covers ::addMessage
-     */
-    public function testDoNotAddMessageWhileBulkupdate() {
-      $this->assertFalse($this->messenger->addMessage("Test message", "bulkupdate"), "The message was NOT added");
-    }
-
-}
-
-}
-namespace {
-  // @todo Delete after https://drupal.org/node/1858196 is in.
-  if (!function_exists('drupal_set_message')) {
-    function drupal_set_message() {
-    }
-  }
-}
diff --git a/modules/rules/.gitignore b/modules/rules/.gitignore
deleted file mode 100644
index 61ead86..0000000
--- a/modules/rules/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/vendor
diff --git a/modules/rules/.travis.yml b/modules/rules/.travis.yml
deleted file mode 100644
index 51b6a89..0000000
--- a/modules/rules/.travis.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-language: php
-# The Travis CI container mode has random functional test fails, so we must use
-# sudo here.
-sudo: true
-
-php:
-  - 5.5
-  - 5.6
-  - 7
-
-env:
-  global:
-    # Make the script re-usable for other modules.
-    - MODULE=rules
-  matrix:
-    - DRUPAL_CORE=8.3.x
-    - DRUPAL_CORE=8.4.x
-    - DRUPAL_CORE=8.5.x
-
-matrix:
-  fast_finish: true
-
-mysql:
-  database: $MODULE
-  username: root
-  encoding: utf8
-
-# Be sure to cache composer downloads.
-cache:
-  directories:
-    - $HOME/.composer
-
-before_script:
-  - echo $MODULE
-
-  # Remove Xdebug as we don't need it and it causes
-  # PHP Fatal error:  Maximum function nesting level of '256' reached.
-  # We also don't care if that file exists or not on PHP 7.
-  - phpenv config-rm xdebug.ini || true
-
-  # Remember the current $MODULE test directory for later use in the Drupal
-  # installation.
-  - TESTDIR=$(pwd)
-  # Navigate out of module directory to prevent blown stack by recursive module
-  # lookup.
-  - cd ..
-
-  # Create database.
-  - mysql -e "create database $MODULE"
-  # Export database variable for kernel tests.
-  - export SIMPLETEST_DB=mysql://root:@127.0.0.1/$MODULE
-  # Download Drupal 8 core from the Github mirror because it is faster.
-  - travis_retry git clone --branch $DRUPAL_CORE --depth 1 https://github.com/drupal/drupal.git
-  - cd drupal
-
-  # Reference $MODULE in build site.
-  - ln -s $TESTDIR modules/$MODULE
-  # Install dependencies.
-  - travis_retry git clone --branch 8.x-1.x --depth 1 https://github.com/fago/typed_data.git modules/typed_data
-
-  # Run composer install for Drupal 8.1 and up. We need an up-to-date composer
-  # when installing Drupal 8.1.
-  - travis_retry composer self-update && travis_retry composer install
-  # Run composer install in the module directory in order to fetch dev
-  # dependencies there. This includes phpcs & coder for checking coding style.
-  - travis_retry composer -d=$TESTDIR install
-
-  # Start a web server on port 8888, run in the background.
-  - php -S localhost:8888 &
-
-  # Export web server URL for browser tests.
-  - export SIMPLETEST_BASE_URL=http://localhost:8888
-
-script:
-  # Run the PHPUnit tests which also include the kernel tests.
-  - ./vendor/bin/phpunit -c ./core/phpunit.xml.dist ./modules/$MODULE/tests/
-  # Check for coding standards.
-  - cd modules/$MODULE && ./vendor/bin/phpcs --colors --report-width=130
diff --git a/modules/rules/LICENSE.txt b/modules/rules/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/rules/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/rules/README.md b/modules/rules/README.md
deleted file mode 100644
index 2c5abdf..0000000
--- a/modules/rules/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Rules for Drupal 8
-
-[![Build Status](https://travis-ci.org/fago/rules.svg?branch=8.x-3.x)](https://travis-ci.org/fago/rules)
-
-The Rules module allows site administrators to define conditionally executed
-actions based on occurring events (ECA-rules).
-
-* Project homepage: https://www.drupal.org/project/rules
-* #d8rules initiative: http://d8rules.org/
-* Documentation: http://docs.d8rules.org
-
-## Contributing
-
-Link to [Rules 8.x-3.x contributing tasks](https://www.drupal.org/node/2245015#contributing).
-
-For some time, development will happen on GitHub using the pull request model:
-in case you are not familiar with that, please take a few minutes to read the
-[GitHub article](https://help.github.com/articles/using-pull-requests) on using
-pull requests.
-
-There are a few conventions that should be followed when contributing:
-
-* Always create an issue in the [drupal.org Rules issue queue](https://www.drupal.org/project/issues/rules)
-  for every pull request you are working on.
-* Always cross-reference the Issue in the Pull Request and the Pull Request in
-  the issue.
-* Always create a new branch for every pull request: its name should contain a
-  brief summary of the ticket and its issue id, e.g **readme-2276369**.
-* Try to keep the history of your pull request as clean as possible by squashing
-  your commits: you can look at the [Symfony documentation](http://symfony.com/doc/current/cmf/contributing/commits.html)
-  or at the [Git book](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages)
-  for more information on how to do that.
-
-For further information on how to contribute please refer to
-[our documentation](https://thefubhy.gitbooks.io/rules/content/).
-
-## Checking coding style
-
-The module comes with a phpcs setup that is verifying a correct coding style.
-To run the check just execute the following command from the rules module
-directory:
-
-      # Install phpcs as local dev dependency, then run it:
-      composer install
-      ./vendor/bin/phpcs
-
-      # If there are some coding style violations that can be fixed
-      # automatically, use the code beautifier:
-      ./vendor/bin/phpcbf
-
-## Executing the automated tests
-
-This module comes with PHPUnit tests. You need a working Drupal 8 installation
-and a checkout of the Rules module in the modules folder.
-
-#### Unit tests only
-
-    cd /path/to/drupal-8/core
-    ../vendor/bin/phpunit ../modules/rules/tests/src/Unit
-    ../vendor/bin/phpunit ../modules/rules/tests/src/Integration
-
-#### Unit tests and kernel/web tests
-
-Make sure to use your DB connection details for the SIMPLETEST_DB and the URL to
-your local Drupal installation for SIMPLETEST_BASE_URL.
-
-    cd /path/to/drupal-8/core
-    export SIMPLETEST_DB=mysql://drupal-8:password@localhost/drupal-8
-    export SIMPLETEST_BASE_URL=http://drupal-8.localhost
-    ../vendor/bin/phpunit ../modules/rules
-
-Example for executing one single test file during development:
-
-    ../vendor/bin/phpunit ../modules/rules/tests/src/Unit/ActionSetTest.php
-
-You can also execute the test cases from the web interface at
-``/admin/config/development/testing``.
diff --git a/modules/rules/composer.json b/modules/rules/composer.json
deleted file mode 100644
index f4d6142..0000000
--- a/modules/rules/composer.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "drupal/rules",
-  "description": "React on events and conditionally evaluate actions.",
-  "type": "drupal-module",
-  "license": "GPL-2.0+",
-  "minimum-stability": "dev",
-  "require": {
-  },
-  "require-dev": {
-    "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-    "drupal/coder": "8.2.*",
-    "squizlabs/php_codesniffer": "2.9.*"
-  }
-}
diff --git a/modules/rules/composer.lock b/modules/rules/composer.lock
deleted file mode 100644
index 7dbb22d..0000000
--- a/modules/rules/composer.lock
+++ /dev/null
@@ -1,261 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "847660445cbbc4e833514bf85332d9c1",
-    "packages": [],
-    "packages-dev": [
-        {
-            "name": "dealerdirect/phpcodesniffer-composer-installer",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/DealerDirect/phpcodesniffer-composer-installer.git",
-                "reference": "63c0ec0ac286d31651d3c70e5bf76ad87db3ba23"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/DealerDirect/phpcodesniffer-composer-installer/zipball/63c0ec0ac286d31651d3c70e5bf76ad87db3ba23",
-                "reference": "63c0ec0ac286d31651d3c70e5bf76ad87db3ba23",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0",
-                "php": "^5.3|^7",
-                "squizlabs/php_codesniffer": "*"
-            },
-            "require-dev": {
-                "composer/composer": "*",
-                "wimg/php-compatibility": "^8.0"
-            },
-            "suggest": {
-                "dealerdirect/qa-tools": "All the PHP QA tools you'll need"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Franck Nijhof",
-                    "email": "f.nijhof@dealerdirect.nl",
-                    "homepage": "http://workingatdealerdirect.eu",
-                    "role": "Developer"
-                }
-            ],
-            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
-            "homepage": "http://workingatdealerdirect.eu",
-            "keywords": [
-                "PHPCodeSniffer",
-                "PHP_CodeSniffer",
-                "code quality",
-                "codesniffer",
-                "composer",
-                "installer",
-                "phpcs",
-                "plugin",
-                "qa",
-                "quality",
-                "standard",
-                "standards",
-                "style guide",
-                "stylecheck",
-                "tests"
-            ],
-            "time": "2017-09-18T07:49:36+00:00"
-        },
-        {
-            "name": "drupal/coder",
-            "version": "8.2.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/klausi/coder.git",
-                "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/klausi/coder/zipball/984c54a7b1e8f27ff1c32348df69712afd86b17f",
-                "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "php": ">=5.4.0",
-                "squizlabs/php_codesniffer": ">=2.8.1 <3.0",
-                "symfony/yaml": ">=2.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": ">=3.7 <6"
-            },
-            "type": "phpcodesniffer-standard",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0+"
-            ],
-            "description": "Coder is a library to review Drupal code.",
-            "homepage": "https://www.drupal.org/project/coder",
-            "keywords": [
-                "code review",
-                "phpcs",
-                "standards"
-            ],
-            "time": "2017-03-18T10:28:49+00:00"
-        },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "2.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62",
-                "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62",
-                "shasum": ""
-            },
-            "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "bin": [
-                "scripts/phpcs",
-                "scripts/phpcbf"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "CodeSniffer.php",
-                    "CodeSniffer/CLI.php",
-                    "CodeSniffer/Exception.php",
-                    "CodeSniffer/File.php",
-                    "CodeSniffer/Fixer.php",
-                    "CodeSniffer/Report.php",
-                    "CodeSniffer/Reporting.php",
-                    "CodeSniffer/Sniff.php",
-                    "CodeSniffer/Tokens.php",
-                    "CodeSniffer/Reports/",
-                    "CodeSniffer/Tokenizers/",
-                    "CodeSniffer/DocGenerators/",
-                    "CodeSniffer/Standards/AbstractPatternSniff.php",
-                    "CodeSniffer/Standards/AbstractScopeSniff.php",
-                    "CodeSniffer/Standards/AbstractVariableSniff.php",
-                    "CodeSniffer/Standards/IncorrectPatternException.php",
-                    "CodeSniffer/Standards/Generic/Sniffs/",
-                    "CodeSniffer/Standards/MySource/Sniffs/",
-                    "CodeSniffer/Standards/PEAR/Sniffs/",
-                    "CodeSniffer/Standards/PSR1/Sniffs/",
-                    "CodeSniffer/Standards/PSR2/Sniffs/",
-                    "CodeSniffer/Standards/Squiz/Sniffs/",
-                    "CodeSniffer/Standards/Zend/Sniffs/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "http://www.squizlabs.com/php-codesniffer",
-            "keywords": [
-                "phpcs",
-                "standards"
-            ],
-            "time": "2017-05-22T02:43:20+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "3.4.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "0ae79584f89fee567f21868ddd4ca4d580aba607"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/0ae79584f89fee567f21868ddd4ca4d580aba607",
-                "reference": "0ae79584f89fee567f21868ddd4ca4d580aba607",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-09-28T15:24:12+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "dev",
-    "stability-flags": {
-        "dealerdirect/phpcodesniffer-composer-installer": 20
-    },
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": []
-}
diff --git a/modules/rules/config/install/rules.settings.yml b/modules/rules/config/install/rules.settings.yml
deleted file mode 100644
index 7e27287..0000000
--- a/modules/rules/config/install/rules.settings.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-log: false
-debug_screen: false
-log_level_system: warning
-log_level_screen: warning
diff --git a/modules/rules/config/schema/rules.action.schema.yml b/modules/rules/config/schema/rules.action.schema.yml
deleted file mode 100644
index 89a3dba..0000000
--- a/modules/rules/config/schema/rules.action.schema.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Per default the schema of arbitrary context values of an action cannot be
-# typed. Actions that need translatability or other features of the config
-# system must specify their context value schema explicitly, see examples below.
-rules.action.context_values.*:
-  type: ignore
-  label: Context values
-
-rules.action.context_values.rules_system_message:
-  type: mapping
-  label: Message action context values
-  mapping:
-    message:
-      type: text
-    type:
-      type: string
-    repeat:
-      type: boolean
-
-rules.action.context_values.rules_send_email:
-  type: mapping
-  label: Send e-mail action context values
-  mapping:
-    to:
-      type: sequence
-      sequence:
-        type: email
-    subject:
-      type: text
-    message:
-      type: text
-    reply:
-      type: email
-    language:
-      type: string
diff --git a/modules/rules/config/schema/rules.condition.schema.yml b/modules/rules/config/schema/rules.condition.schema.yml
deleted file mode 100644
index fe45a66..0000000
--- a/modules/rules/config/schema/rules.condition.schema.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Per default the schema of arbitrary context values of a condition cannot be
-# typed. Conditions that need translatability or other features of the config
-# system must specify their context value schema explicitly, see examples below.
-rules.condition.context_values.*:
-  type: ignore
-  label: Context values
-
-rules.condition.context_values.rules_entity_is_new:
-  type: mapping
-  label: Entity is new context values
-  mapping:
-    entity:
-      type: string
diff --git a/modules/rules/config/schema/rules.context.schema.yml b/modules/rules/config/schema/rules.context.schema.yml
deleted file mode 100644
index 9e2169e..0000000
--- a/modules/rules/config/schema/rules.context.schema.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-rules.context.definition:
-  type: mapping
-  label: 'Context definition'
-  mapping:
-    type:
-      type: string
-      label: 'Type'
-    label:
-      type: text
-      label: 'Label'
-    description:
-      type: text
-      label: 'Description'
-
-rules.context.mapping:
-  type: sequence
-  label: 'Context mapping'
-  sequence:
-    - type: string
-
-rules.context.values:
-  type: mapping
-  label: 'Context values'
-  mapping:
-  # The entries depend on the plugin here. Plugins have to extend this and
-  # provide a suiting schema.
-
-rules.context.processors:
-  type: ignore
-  label: 'Context processors'
diff --git a/modules/rules/config/schema/rules.data_types.schema.yml b/modules/rules/config/schema/rules.data_types.schema.yml
deleted file mode 100644
index bbc9c35..0000000
--- a/modules/rules/config/schema/rules.data_types.schema.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-rules_component:
-  type: mapping
-  label: 'Rules component (embedded)'
-  mapping:
-    context_definitions:
-      type: sequence
-      label: 'Context definitions'
-      sequence:
-        - type: rules.context.definition
-    provided_context_definitions:
-      type: sequence
-      label: 'Provided context definitions'
-      sequence:
-        - type: rules.context.definition
-    expression:
-      type: rules_expression.[id]
-      label: 'Expression configuration'
diff --git a/modules/rules/config/schema/rules.expression.schema.yml b/modules/rules/config/schema/rules.expression.schema.yml
deleted file mode 100644
index ab6d406..0000000
--- a/modules/rules/config/schema/rules.expression.schema.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-rules_expression:
-  type: mapping
-  label: 'Rules expression'
-  id:
-    type: string
-    label: 'Plugin ID'
-  uuid:
-    type: string
-    label: 'UUID'
-
-rules_expression.rules_condition:
-  type: rules_expression
-  label: "Rules condition configuration"
-  mapping:
-    id:
-      type: string
-      label: 'Plugin ID'
-    uuid:
-      type: string
-      label: 'UUID'
-    condition_id:
-      type: string
-      label: 'Condition plugin ID'
-    negate:
-      type: boolean
-      label: 'Negated'
-    context_values:
-      type: rules.condition.context_values.[%parent.condition_id]
-      label: 'Context values'
-    context_mapping:
-      type: rules.context.mapping
-      label: 'Context mapping'
-    context_processors:
-      type: rules.context.processors
-      label: 'Context processors'
-    provides_mapping:
-      type: rules.context.mapping
-      label: 'Provided context mapping'
-
-rules_expression.rules_action:
-  type: rules_expression
-  label: "Rules action configuration"
-  mapping:
-    id:
-      type: string
-      label: 'Plugin ID'
-    uuid:
-      type: string
-      label: 'UUID'
-    action_id:
-      type: string
-      label: 'Action plugin ID'
-    context_values:
-      type: rules.action.context_values.[%parent.action_id]
-      label: 'Context values'
-    context_mapping:
-      type: rules.context.mapping
-      label: 'Context mapping'
-    context_processors:
-      type: rules.context.processors
-      label: 'Context processors'
-    provides_mapping:
-      type: rules.context.mapping
-      label: 'Provided context mapping'
-
-rules_expression.rules_and:
-  type: rules_expression
-  label: 'Rules And'
-  mapping:
-    id:
-      type: string
-      label: 'Plugin ID'
-    uuid:
-      type: string
-      label: 'UUID'
-    negate:
-      type: boolean
-      label: 'Negate'
-    conditions:
-      type: sequence
-      label: 'Conditions'
-      sequence:
-        - type: rules_expression.[id]
-
-rules_expression.rules_action_set:
-  type: rules_expression
-  label: 'Action set'
-  mapping:
-    id:
-      type: string
-      label: 'Plugin ID'
-    uuid:
-      type: string
-      label: 'UUID'
-    actions:
-      type: sequence
-      label: 'Actions'
-      sequence:
-        - type: rules_expression.[id]
-
-rules_expression.rules_rule:
-  type: rules_expression
-  label: "Rule"
-  mapping:
-    id:
-      type: string
-      label: 'Plugin ID'
-    uuid:
-      type: string
-      label: 'UUID'
-    conditions:
-      type: rules_expression.[id]
-      label: 'Conditions'
-    actions:
-      type: rules_expression.[id]
-      label: 'Actions'
diff --git a/modules/rules/config/schema/rules.schema.yml b/modules/rules/config/schema/rules.schema.yml
deleted file mode 100644
index 1faf488..0000000
--- a/modules/rules/config/schema/rules.schema.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-# Schema for the configuration files of the Rules module.
-
-rules.component.*:
-  type: config_entity
-  label: 'Rules component'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-    description:
-      type: text
-      label: 'Administrative description'
-    tags:
-      type: sequence
-      label: Tags
-      sequence:
-        type: string
-        label: 'Tag'
-    config_version:
-      type: string
-      label: 'Configuration schema version'
-    component:
-      type: rules_component
-
-rules.reaction.*:
-  type: config_entity
-  label: 'Reaction rule'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-    events:
-      type: sequence
-      label: 'Events'
-      sequence:
-        type: mapping
-        label: 'Event'
-        mapping:
-          event_name:
-            type: string
-            label: 'Name'
-          configuration:
-            type: sequence
-            label: 'Configuration'
-            sequence:
-              type: mapping
-    description:
-      type: text
-      label: 'Administrative description'
-    tags:
-      type: sequence
-      label: Tags
-      sequence:
-        type: string
-        label: 'Tag'
-    config_version:
-      type: string
-      label: 'Configuration schema version'
-    expression:
-      type: rules_expression.[id]
-      label: 'Expression configuration'
-
-rules.settings:
-  type: config_object
-  label: 'Rules settings'
-  mapping:
-    log:
-      type: boolean
-      label: 'Log debug information'
-    log_level_system:
-      type: string
-      label: 'Log level'
-    debug_screen:
-      type: boolean
-      label: 'Show debug information on screen (in the HTML response)'
-    log_level_screen:
-      type: string
-      label: 'Log level'
diff --git a/modules/rules/d7-tests/rules.test b/modules/rules/d7-tests/rules.test
deleted file mode 100644
index 0e76161..0000000
--- a/modules/rules/d7-tests/rules.test
+++ /dev/null
@@ -1,2107 +0,0 @@
-<?php
-
-/**
- * @file
- * Rules 7.x tests.
- *
- * This files is here for keeping track which tests have been ported to Drupal
- * 8 and which not. Any tests covered can be removed, so everything that's
- * left in this file still needs to be ported.
- */
-
-// @codingStandardsIgnoreStart
-
-class RulesTestCase extends DrupalWebTestCase {
-
-  static function getInfo() {
-    return array(
-      'name' => 'Rules Engine tests',
-      'description' => 'Test using the rules API to create and evaluate rules.',
-      'group' => 'Rules',
-    );
-  }
-
-  function setUp() {
-    parent::setUp('rules', 'rules_test');
-    RulesLog::logger()->clear();
-    variable_set('rules_debug_log', 1);
-  }
-
-  /**
-   * Calculates the output of t() given an array of placeholders to replace.
-   */
-  static function t($text, $strings) {
-    $placeholders = array();
-    foreach ($strings as $key => $string) {
-      $key = !is_numeric($key) ? $key : $string;
-      $placeholders['%' . $key] = drupal_placeholder($string);
-    }
-    return strtr($text, $placeholders);
-  }
-
-  protected function createTestRule() {
-    $rule = rule();
-    $rule->condition('rules_test_condition_true')
-         ->condition('rules_test_condition_true')
-         ->condition(rules_or()
-           ->condition(rules_condition('rules_test_condition_true')->negate())
-           ->condition('rules_test_condition_false')
-           ->condition(rules_and()
-             ->condition('rules_test_condition_false')
-             ->condition('rules_test_condition_true')
-             ->negate()
-           )
-         );
-    $rule->action('rules_test_action');
-    return $rule;
-  }
-
-  /**
-   * Tests creating a rule and iterating over the rule elements.
-   */
-  function testRuleCreation() {
-    $rule = $this->createTestRule();
-    $rule->integrityCheck();
-    $rule->execute();
-    $log = RulesLog::logger()->get();
-    $last = array_pop($log);
-    $last = array_pop($log);
-    $last = array_pop($log);
-    $this->assertEqual($last[0], 'action called', 'Action called');
-    RulesLog::logger()->checkLog();
-
-    // Make sure condition and action iterators are working.
-    $it = new RecursiveIteratorIterator($rule->conditions(), RecursiveIteratorIterator::SELF_FIRST);
-    $this->assertEqual(iterator_count($it), 8, 'Iterated over all conditions and condition containers');
-    $it = new RecursiveIteratorIterator($rule->conditions());
-    $this->assertEqual(iterator_count($it), 6, 'Iterated over all conditions');
-    $this->assertEqual(iterator_count($rule->actions()), 1, 'Iterated over all actions');
-    $this->assertEqual(iterator_count($rule->elements()), 10, 'Iterated over all rule elements.');
-
-    // Test getting dependencies and the integrity check.
-    $rule->integrityCheck();
-    $this->assertTrue($rule->dependencies() === array('rules_test'), 'Dependencies correctly returned.');
-  }
-
-  /**
-   * Test handling dependencies.
-   */
-  function testdependencies() {
-    $action = rules_action('rules_node_publish_action');
-    $this->assertEqual($action->dependencies(), array('rules_test'), 'Providing module is returned as dependency.');
-
-    $container = new RulesTestContainer();
-    $this->assertEqual($container->dependencies(), array('rules_test'), 'Providing module for container plugin is returned as dependency.');
-
-    // Test handling unmet dependencies.
-    $rule = rules_config_load('rules_export_test');
-    $this->assertTrue(in_array('comment', $rule->dependencies) && !$rule->dirty, 'Dependencies have been imported.');
-
-    // Remove the required comment module and make sure the rule is dirty then.
-    module_disable(array('comment'));
-    rules_clear_cache();
-    $rule = rules_config_load('rules_export_test');
-    $this->assertTrue($rule->dirty, 'Rule has been marked as dirty');
-
-    // Now try re-enabling.
-    module_enable(array('comment'));
-    rules_clear_cache();
-    $rule = rules_config_load('rules_export_test');
-    $this->assertTrue(!$rule->dirty, 'Rule has been marked as not dirty again.');
-
-    // Test it with components.
-    module_enable(array('path'));
-    $action_set = rules_action_set(array('node' => array('type' => 'node')));
-    $action_set->action('node_path_alias');
-    $action_set->save('rules_test_alias');
-
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->action('component_rules_test_alias');
-    $rule->integrityCheck();
-    $rule->save('rules_test_rule');
-
-    $rule = rules_config_load('rules_test_rule');
-    $component = rules_config_load('rules_test_alias');
-    $this->assertTrue(in_array('path', $component->dependencies) && !$rule->dirty && !$component->dirty, 'Component has path module dependency.');
-
-    // Now disable path module and make sure both configs are marked as dirty.
-    module_disable(array('path'));
-    rules_clear_cache();
-    $rule = rules_config_load('rules_test_rule');
-    $component = rules_config_load('rules_test_alias');
-
-    $this->assertTrue($component->dirty, 'Component has been marked as dirty');
-    $node = $this->drupalCreateNode();
-    $result = rules_invoke_component('rules_test_alias', $node);
-    $this->assertTrue($result === FALSE, 'Unable to execute a dirty component.');
-
-    // When the rule is evaluated, the broken component is detected and the
-    // rule should be marked as dirty too.
-    $rule->execute($node);
-    $this->assertTrue($rule->dirty, 'Rule has been marked as dirty');
-
-    module_enable(array('path'));
-    rules_clear_cache();
-
-    // Trigger rebuilding the cache, so configs are checked again.
-    rules_get_cache();
-
-    $rule = rules_config_load('rules_test_rule');
-    $component = rules_config_load('rules_test_alias');
-    $this->assertTrue(!$component->dirty, 'Component has been marked as not dirty again.');
-    $this->assertTrue(!$rule->dirty, 'Rule has been marked as not dirty again.');
-  }
-
-  /**
-   * Test setting up an action with some action_info and serializing and
-   * executing it.
-   */
-  function testActionSetup() {
-    $action = rules_action('rules_node_publish_action');
-
-    $s = serialize($action);
-    $action2 = unserialize($s);
-    $node = (object) array('status' => 0, 'type' => 'page');
-    $node->title = 'test';
-
-    $action2->execute($node);
-    $this->assertEqual($node->status, 1, 'Action executed correctly');
-
-    $this->assertTrue(in_array('node', array_keys($action2->parameterInfo())), 'Parameter info returned.');
-
-    $node->status = 0;
-    $action2->integrityCheck();
-    $action2->executeByArgs(array('node' => $node));
-    $this->assertEqual($node->status, 1, 'Action executed correctly');
-
-    // Test calling an extended + overriden method.
-    $this->assertEqual($action2->help(), 'custom', 'Using custom help callback.');
-
-    // Inspect the cache
-    //$this->pass(serialize(rules_get_cache()));
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Test executing with wrong arguments.
-   */
-  function testActionExecutionFails() {
-    $action = rules_action('rules_node_publish_action');
-    try {
-      $action->execute();
-      $this->fail("Execution hasn't created an exception.");
-    }
-    catch (RulesEvaluationException $e) {
-      $this->pass("RulesEvaluationException was thrown: ". $e);
-    }
-  }
-
-  /**
-   * Test setting up a rule and mapping variables.
-   */
-  function testVariableMapping() {
-    $rule = rule(array(
-      'node' => array('type' => 'node'),
-      'node_unchanged' => array('type' => 'node'),
-    ));
-    $rule->condition(rules_condition('rules_condition_content_is_published')->negate())
-         ->condition('rules_condition_content_is_type', array('type' => array('page', 'story')))
-         ->action('rules_node_publish_action', array('node:select' => 'node_unchanged'));
-
-    $node1 = $this->drupalCreateNode(array('status' => 0, 'type' => 'page'));
-    $node2 = $this->drupalCreateNode(array('status' => 0, 'type' => 'page'));
-    $rule->integrityCheck();
-    $rule->execute($node1, $node2);
-    $this->assertEqual($node2->status, 1, 'Action executed correctly on node2.');
-    $this->assertEqual($node1->status, 0, 'Action not executed on node1.');
-
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Tests making use of class based actions.
-   */
-  function testClassBasedActions() {
-    $cache = rules_get_cache();
-    $this->assertTrue(!empty($cache['action_info']['rules_test_class_action']), 'Action has been discovered.');
-    $action = rules_action('rules_test_class_action');
-
-    $parameters = $action->parameterInfo();
-    $this->assertTrue($parameters['node'], 'Action parameter needs a value.');
-
-    $node = $this->drupalCreateNode();
-    $action->execute($node);
-    $log = RulesLog::logger()->get();
-    $last = array_pop($log);
-    $last = array_pop($log);
-    $this->assertEqual($last[0], 'Action called with node ' . $node->nid, 'Action called');
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Tests CRUD functionality.
-   */
-  function testRulesCRUD() {
-    $rule = $this->createTestRule();
-    $rule->integrityCheck()->save('test');
-
-    $this->assertEqual(TRUE, $rule->active, 'Rule is active.');
-    $this->assertEqual(0, $rule->weight, 'Rule weight is zero.');
-
-    $results = entity_load('rules_config', array('test'));
-    $rule2 = array_pop($results);
-    $this->assertEqual($rule->id, $rule2->id, 'Rule created and loaded');
-    $this->assertEqual(get_class($rule2), get_class($rule), 'Class properly instantiated.');
-    $rule2->execute();
-    // Update.
-    $rule2->save();
-
-    // Make sure all rule elements are still here.
-    $it = new RecursiveIteratorIterator($rule2->conditions(), RecursiveIteratorIterator::SELF_FIRST);
-    $this->assertEqual(iterator_count($it), 8, 'Iterated over all conditions and condition containers');
-    $it = new RecursiveIteratorIterator($rule2->conditions());
-    $this->assertEqual(iterator_count($it), 6, 'Iterated over all conditions');
-    $this->assertEqual(iterator_count($rule2->actions()), 1, 'Iterated over all actions');
-
-    // Delete.
-    $rule2->delete();
-    $this->assertEqual(entity_load('rules_config', FALSE, array('id' => $rule->id)), array(), 'Deleted.');
-
-    // Tests CRUD for tags - making sure the tags are stored properly..
-    $rule = $this->createTestRule();
-    $tag = $this->randomString();
-    $rule->tags = array($tag);
-    $rule->save();
-    $result = db_select('rules_tags')
-      ->fields('rules_tags', array('tag'))
-      ->condition('id', $rule->id)
-      ->execute();
-    $this->assertEqual($result->fetchField(), $tag, 'Associated tag has been saved.');
-    // Try updating.
-    $rule->tags = array($this->randomName(), $this->randomName());
-    $rule->integrityCheck()->save();
-    $result = db_select('rules_tags')
-      ->fields('rules_tags', array('tag'))
-      ->condition('id', $rule->id)
-      ->execute()
-      ->fetchCol();
-    $this->assertTrue(in_array($rule->tags[0], $result) && in_array($rule->tags[1], $result), 'Updated associated tags.');
-    // Try loading multiple rules by tags.
-    $rule2 = $this->createTestRule();
-    $rule2->tags = array($this->randomName());
-    $rule2->save();
-    $loaded = entity_load('rules_config', FALSE, array('tags' => array($rule->tags[0], $rule2->tags[0])));
-    $this->assertTrue($loaded[$rule->id]->id == $rule->id && $loaded[$rule2->id]->id == $rule2->id, 'Loading configs by tags');
-    // Try deleting.
-    $rule->delete();
-    $result = db_select('rules_tags')
-      ->fields('rules_tags', array('tag'))
-      ->condition('id', $rule->id)
-      ->execute();
-    $this->assertEqual($result->fetchField(), FALSE, 'Deleted associated tags.');
-  }
-
-  /**
-   * Test automatic saving of variables.
-   */
-  function testActionSaving() {
-    // Test saving a parameter.
-    $action = rules_action('rules_node_publish_action_save');
-    $node = $this->drupalCreateNode(array('status' => 0, 'type' => 'page'));
-    $action->executeByArgs(array('node' => $node));
-
-    $this->assertEqual($node->status, 1, 'Action executed correctly on node.');
-    // Sync node_load cache with node_save
-    entity_get_controller('node')->resetCache();
-
-    $node = node_load($node->nid);
-    $this->assertEqual($node->status, 1, 'Node has been saved.');
-
-    // Now test saving a provided variable, which is renamed and modified before
-    // it is saved.
-    $title = $this->randomName();
-    $rule = rule();
-    $rule->action('entity_create', array(
-      'type' => 'node',
-      'param_type' => 'article',
-      'param_author:select' => 'site:current-user',
-      'param_title' => $title,
-      'entity_created:var' => 'node',
-    ));
-    $rule->action('data_set', array(
-      'data:select' => 'node:body',
-      'value' => array('value' => 'body'),
-    ));
-    $rule->integrityCheck();
-    $rule->execute();
-
-    $node = $this->drupalGetNodeByTitle($title);
-    $this->assertTrue(!empty($node) && $node->body[LANGUAGE_NONE][0]['value'] == 'body', 'Saved a provided variable');
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Test adding a variable and optional parameters.
-   */
-  function testVariableAdding() {
-    $node = $this->drupalCreateNode();
-    $rule = rule(array('nid' => array('type' => 'integer')));
-    $rule->condition('rules_test_condition_true')
-         ->action('rules_action_load_node')
-         ->action('rules_action_delete_node', array('node:select' => 'node_loaded'))
-         ->execute($node->nid);
-
-    $this->assertEqual(FALSE, node_load($node->nid), 'Variable added and skipped optional parameter.');
-    RulesLog::logger()->checkLog();
-
-    $vars = $rule->conditions()->offsetGet(0)->availableVariables();
-    $this->assertEqual(!isset($vars['node_loaded']), 'Loaded variable is not available to conditions.');
-
-
-    // Test adding a variable with a custom variable name.
-    $node = $this->drupalCreateNode();
-    $rule = rule(array('nid' => array('type' => 'integer')));
-    $rule->action('rules_action_load_node', array('node_loaded:var' => 'node'))
-         ->action('rules_action_delete_node')
-         ->execute($node->nid);
-
-    $this->assertEqual(FALSE, node_load($node->nid), 'Variable with custom name added.');
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Test custom access for using component actions/conditions.
-   */
-  function testRuleComponentAccess() {
-    // Create a normal user.
-    $normal_user = $this->drupalCreateUser();
-    // Create a role for granting access to the rule component.
-    $this->normal_role = $this->drupalCreateRole(array(), 'test_role');
-    $normal_user->roles[$this->normal_role] = 'test_role';
-    user_save($normal_user, array('roles' => $normal_user->roles));
-    // Create an 'action set' rule component making use of a permission.
-    $action_set = rules_action_set(array('node' => array('type' => 'node')));
-    $action_set->access_exposed = TRUE;
-    $action_set->save('rules_test_roles');
-
-    // Set the global user to be the current one as access is checked for the
-    // global user.
-    global $user;
-    $user = user_load($normal_user->uid);
-    $this->assertFalse(rules_action('component_rules_test_roles')->access(), 'Authenticated user without the correct role can\'t use the rule component.');
-
-    // Assign the role that will have permissions for the rule component.
-    user_role_change_permissions($this->normal_role, array('use Rules component rules_test_roles' => TRUE));
-    $this->assertTrue(rules_action('component_rules_test_roles')->access(), 'Authenticated user with the correct role can use the rule component.');
-
-    // Reset global user to anonyous.
-    $user = user_load(0);
-    $this->assertFalse(rules_action('component_rules_test_roles')->access(), 'Anonymous user can\'t use the rule component.');
-  }
-
-  /**
-   * Test passing arguments by reference to an action.
-   */
-  function testPassingByReference() {
-    // Keeping references of variables is unsupported, though the
-    // EntityMetadataArrayObject may be used to achieve that.
-    $array = array('foo' => 'bar');
-    $data = new EntityMetadataArrayObject($array);
-    rules_action('rules_action_test_reference')->execute($data);
-    $this->assertTrue($data['changed'], 'Parameter has been passed by reference');
-  }
-
-  /**
-   * Test sorting rule elements.
-   */
-  function testSorting() {
-    $rule = $this->createTestRule();
-    $conditions = $rule->conditions();
-    $conditions[0]->weight = 10;
-    $conditions[2]->weight = 10;
-    $id[0] = $conditions[0]->elementId();
-    $id[1] = $conditions[1]->elementId();
-    $id[2] = $conditions[2]->elementId();
-    // For testing use a deep sort, even if not necessary here.
-    $rule->sortChildren(TRUE);
-    $conditions = $rule->conditions();
-    $this->assertEqual($conditions[0]->elementId(), $id[1], 'Condition sorted correctly.');
-    $this->assertEqual($conditions[1]->elementId(), $id[0], 'Condition sorted correctly.');
-    $this->assertEqual($conditions[2]->elementId(), $id[2], 'Condition sorted correctly.');
-  }
-
-  /**
-   * Tests using data selectors.
-   */
-  function testDataSelectors() {
-    $body[LANGUAGE_NONE][0] = array('value' => '<b>The body & nothing.</b>');
-    $node = $this->drupalCreateNode(array('body' => $body, 'type' => 'page', 'summary' => ''));
-
-    $rule = rule(array('nid' => array('type' => 'integer')));
-    $rule->action('rules_action_load_node')
-         ->action('drupal_message', array('message:select' => 'node_loaded:body:value'))
-         ->execute($node->nid);
-
-    RulesLog::logger()->checkLog();
-    $msg = drupal_get_messages('status');
-    $last_msg = array_pop($msg['status']);
-    $wrapper = entity_metadata_wrapper('node', $node);
-    $this->assertEqual($last_msg, $wrapper->body->value->value(array('sanitize' => TRUE)), 'Data selector for getting parameter applied.');
-
-    // Get a "reference" on the same object as returned by node_load().
-    $node = node_load($node->nid);
-    $rule = rule(array('nid' => array('type' => 'integer')));
-    $rule->action('rules_action_load_node')
-         ->action('data_set', array('data:select' => 'node_loaded:title', 'value' => 'Test title'))
-         // Use two actions and make sure the node get saved only once.
-         ->action('data_set', array('data:select' => 'node_loaded:title', 'value' => 'Test title2'))
-         ->execute($node->nid);
-
-    $wrapper = entity_metadata_wrapper('node', $node);
-    $this->assertEqual('Test title2', $wrapper->title->value(), 'Data has been modified and saved.');
-
-    RulesLog::logger()->checkLog();
-    $text = RulesLog::logger()->render();
-    $msg = RulesTestCase::t('Saved %node_loaded of type %node.', array('node_loaded', 'node'));
-    if ($pos1 = strpos($text, $msg)) {
-      $pos2 = strpos($text, $msg, $pos1 + 1);
-    }
-    $this->assertTrue($pos1 && $pos2 === FALSE, 'Data has been saved only once.');
-
-    // Test validation.
-    try {
-      rules_action('data_set', array('data' => 'no-selector', 'value' => ''))->integrityCheck();
-      $this->fail("Validation hasn't created an exception.");
-    }
-    catch (RulesIntegrityException $e) {
-      $this->pass("Validation error correctly detected: ". $e);
-    }
-
-    // Test auto creation of nested data structures, like the node body field.
-    // I.e. if $node->body is not set, it is automatically initialized to an
-    // empty array, so that the nested value can be set and the wrappers do not
-    // complain about missing parent data structures.
-    $rule = rule();
-    $rule->action('entity_create', array(
-      'type' => 'node',
-      'param_type' => 'page',
-      'param_title' => 'foo',
-      'param_author' => $GLOBALS['user'],
-    ));
-    $rule->action('data_set', array('data:select' => 'entity_created:body:value', 'value' => 'test content'))
-         ->execute();
-    try {
-      RulesLog::logger()->checkLog();
-      $this->pass('Auto creation of nested data structures.');
-    }
-    catch (Exception $e) {
-      $this->fail('Auto creation of nested data structures.');
-    }
-
-    // Make sure variables that are passed wrapped work.
-    $result = rules_condition('rules_test_condition_node_wrapped')->execute($node->nid);
-    $this->assertTrue($result, 'Condition receiving wrapped parameter.');
-
-    // Make sure wrapped parameters are checked for containing NULL values.
-    $rule = rule(array('node' => array('type' => 'node', 'optional' => TRUE)));
-    $rule->condition('rules_test_condition_node_wrapped', array('node:select' => 'node'));
-    $rule->execute(entity_metadata_wrapper('node'));
-    $text = RulesLog::logger()->render();
-    $msg = RulesTestCase::t('The variable or parameter %node is empty.', array('node'));
-    $this->assertTrue(strpos($text, $msg) !== FALSE, 'Evaluation aborted due to an empty argument value.');
-  }
-
-  /**
-   * Tests making use of rule sets.
-   */
-  function testRuleSets() {
-    $set = rules_rule_set(array(
-      'node' => array('type' => 'node', 'label' => 'node'),
-    ));
-    $set->rule(rule()->action('drupal_message', array('message:select' => 'node:title')))
-        ->rule(rule()->condition('rules_condition_content_is_published')
-                     ->action('drupal_message', array('message' => 'Node is published.'))
-               );
-    $set->integrityCheck()->save('rules_test_set_1');
-
-    $node = $this->drupalCreateNode(array('title' => 'The title.', 'status' => 1));
-    // Execute.
-    rules_invoke_component('rules_test_set_1', $node);
-
-    $msg = drupal_get_messages();
-    $this->assertEqual($msg['status'][0], 'The title.', 'First rule evaluated.');
-    $this->assertEqual($msg['status'][1], 'Node is published.', 'Second rule evaluated.');
-
-    // Test a condition set.
-    $set = rules_or(array(
-      'node' => array('type' => 'node', 'label' => 'node'),
-    ));
-    $set->condition('data_is', array('data:select' => 'node:author:name', 'value' => 'notthename'))
-        ->condition('data_is', array('data:select' => 'node:nid', 'value' => $node->nid))
-        ->integrityCheck()
-        ->save('test', 'rules_test');
-    // Load and execute condition set.
-    $set = rules_config_load('test');
-    $this->assertTrue($set->execute($node), 'Set has been correctly evaluated.');
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Tests invoking components from the action.
-   */
-  function testComponentInvocations() {
-    $set = rules_rule_set(array(
-      'node1' => array('type' => 'node', 'label' => 'node'),
-    ));
-    $set->rule(rule()->condition('node_is_published', array('node:select' => 'node1'))
-                     ->action('node_unpublish', array('node:select' => 'node1'))
-               );
-    $set->integrityCheck()->save('rules_test_set_2');
-
-    // Use different names for the variables to ensure they are properly mapped
-    // when taking over the variables to be saved.
-    $rule = rule(array(
-      'node2' => array('type' => 'node', 'label' => 'node'),
-    ));
-    $rule->action('component_rules_test_set_2', array('node1:select' => 'node2'));
-    $rule->action('node_make_sticky', array('node:select' => 'node2'));
-
-    $node = $this->drupalCreateNode(array('title' => 'The title.', 'status' => 1, 'sticky' => 0));
-    $rule->execute($node);
-
-    $node = node_load($node->nid, NULL, TRUE);
-    $this->assertFalse($node->status, 'The component changes have been saved correctly.');
-    $this->assertTrue($node->sticky, 'The action changes have been saved correctly.');
-
-    // Check that we have saved the changes only once.
-    $text = RulesLog::logger()->render();
-    // Make sure both saves are handled in one save operation.
-    $this->assertEqual(substr_count($text, 'Saved'), 1, 'Changes have been saved in one save operation.');
-    RulesLog::logger()->checkLog();
-
-    // Test recursion prevention on components by invoking the component from
-    // itself, what should be prevented.
-    $set->action('component_rules_test_set_2', array('node1:select' => 'node1'))
-        ->save();
-
-    $rule->execute($node);
-    $text1 = RulesLog::logger()->render();
-    $text2 = RulesTestCase::t('Not evaluating rule set %rules_test_set_2 to prevent recursion.', array('rules_test_set_2'));
-    $this->assertTrue((strpos($text1, $text2) !== FALSE), "Recursion of component invocation prevented.");
-
-    // Test executing the component provided in code via the action. This makes
-    // sure the component in code has been properly picked up.
-    $node->status = 0;
-    node_save($node);
-    rules_action('component_rules_test_action_set')->execute($node);
-    $this->assertTrue($node->status == 1, 'Component provided in code has been executed.');
-  }
-
-
-  /**
-   * Test asserting metadata, customizing action info and make sure integrity
-   * is checked.
-   */
-  function testMetadataAssertion() {
-    $action = rules_action('rules_node_make_sticky_action');
-
-    // Test failing integrity check.
-    try {
-      $rule = rule(array('node' => array('type' => 'entity')));
-      $rule->action($action);
-      // Fails due to the 'node' variable not matching the node type.
-      $rule->integrityCheck();
-      $this->fail('Integrity check has not thrown an exception.');
-    }
-    catch (RulesIntegrityException $e) {
-      $this->pass('Integrity check has thrown exception: ' . $e->getMessage());
-    }
-
-    // Test asserting additional metadata.
-    $rule = rule(array('node' => array('type' => 'node')));
-    // Customize action info using the settings.
-    $rule->condition('data_is', array('data:select'   => 'node:type', 'value' => 'page'))
-         // Configure an condition using the body. As the body is a field,
-         // tis requires the bundle to be correctly asserted.
-         ->condition(rules_condition('data_is', array('data:select' => 'node:body:value', 'value' => 'foo'))->negate())
-         // The action also requires the page bundle in order to work.
-         ->action($action);
-    // Make sure the integrity check doesn't throw an exception.
-    $rule->integrityCheck();
-    // Test the rule.
-    $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0));
-    $rule->execute($node);
-    $this->assertTrue($node->sticky, 'Rule with asserted metadata executed.');
-
-
-    // Test asserting metadata on a derived property, i.e. not a variable.
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->condition('entity_is_of_type', array('entity:select' => 'node:reference', 'type' => 'node'))
-         ->condition('data_is', array('data:select' => 'node:reference:type', 'value' => 'page'))
-         ->action('rules_node_page_make_sticky_action', array('node:select' => 'node:reference'));
-    $rule->integrityCheck();
-    $rule->execute($node);
-
-    // Test asserting an entity field.
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->condition('entity_has_field', array('entity:select' => 'node:reference', 'field' => 'field_tags'))
-         ->action('data_set', array('data:select' => 'node:reference:field-tags', 'value' => array()));
-    $rule->integrityCheck();
-    $rule->execute($node);
-
-    // Make sure an asserted bundle can be used as argument.
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->condition('entity_is_of_type', array('entity:select' => 'node:reference', 'type' => 'node'))
-         ->condition('node_is_of_type', array('node:select' => 'node:reference', 'type' => array('page')))
-         ->action('rules_node_page_make_sticky_action', array('node:select' => 'node:reference'));
-    $rule->integrityCheck();
-    $rule->execute($node);
-
-    // Test asserting metadata on a derived property being a list item.
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->condition('node_is_of_type', array('node:select' => 'node:ref-nodes:0', 'type' => array('article')))
-         ->action('data_set', array('data:select' => 'node:ref-nodes:0:field-tags', 'value' => array()));
-    $rule->integrityCheck();
-    $rule->execute($node);
-
-    // Give green lights if there were no exceptions and check rules-log errors.
-    $this->pass('Rules asserting metadata on a derived property pass integrity checks.');
-    RulesLog::logger()->checkLog();
-
-    // Make sure assertions of a one list item are not valid for another item.
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->condition('node_is_of_type', array('node:select' => 'node:ref-nodes:0', 'type' => array('article')))
-         ->action('data_set', array('data:select' => 'node:ref-nodes:1:field-tags', 'value' => array()));
-    try {
-      $rule->integrityCheck();
-      $this->fail('Assertion of a list item is not valid for another item.');
-    }
-    catch (RulesException $e) {
-      $this->pass('Assertion of a list item is not valid for another item.');
-    }
-  }
-
-  /**
-   * Test using loops.
-   */
-  function testLoops() {
-    // Test passing the list parameter as argument to ensure that is working
-    // generally for plugin container too.
-    drupal_get_messages(NULL, TRUE);
-    $loop = rules_loop();
-    $loop->action('drupal_message', array('message' => 'test'));
-    $arg_info = $loop->parameterInfo();
-    $this->assert($arg_info['list']['type'] == 'list', 'Argument info contains list.');
-    $loop->execute(array(1, 2));
-
-    // Ensure the action has been executed twice, once for each list item.
-    $msg = drupal_get_messages();
-    $this->assert($msg['status'][0] == 'test' && $msg['status'][1], 'Loop has been properly executed');
-
-    // Now test looping over nodes.
-    $node1 = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0));
-    $node2 = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0));
-    $node3 = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0));
-
-    $rule = rule(array(
-      'list' => array(
-        'type' => 'list<node>',
-        'label' => 'A list of nodes',
-      )
-    ));
-    $loop = rules_loop(array('list:select' => 'list', 'item:var' => 'node'));
-    $loop->action('data_set', array('data:select' => 'node:sticky', 'value' => TRUE));
-    $rule->action($loop);
-    // Test using a list with data selectors, just output the last nodes type.
-    $rule->action('drupal_message', array('message:select' => 'list:2:type'));
-
-    $rule->execute(array($node1->nid, $node2->nid, $node3->nid));
-    $text = RulesLog::logger()->render();
-    $save_msg = RulesTestCase::t('Saved %node of type %node.', array('node', 'node'));
-    $this->assertTrue(substr_count($text, $save_msg) == 3, 'List item variables have been saved.');
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Test access checks.
-   */
-  function testAccessCheck() {
-    $rule = rule();
-    // Try to set a property which is provided by the test module and is not
-    // accessible, so the access check has to return FALSE.
-    $rule->action('data_set', array('data:select' => 'site:no-access-user', 'value' => 'foo'));
-    $this->assertTrue($rule->access() === FALSE, 'Access check is working.');
-  }
-
-  /**
-   * Test returning provided variables.
-   */
-  function testReturningVariables() {
-    $node = $this->drupalCreateNode();
-    $action = rules_action('entity_fetch', array('type' => 'node', 'id' => $node->nid));
-    list($node2) = $action->execute();
-    $this->assertTrue($node2->nid == $node->nid, 'Action returned a variable.');
-
-    // Create a simple set that just passed through the given node.
-    $set = rules_rule_set(array('node' => array('type' => 'node')), array('node'));
-    $set->integrityCheck()->save('rules_test_set_1');
-
-    $provides = $set->providesVariables();
-    $this->assertTrue($provides['node']['type'] == 'node', 'Rule set correctly passed through the node.');
-
-    list($node2) = $set->execute($node);
-    $this->assertTrue($node2->nid == $node->nid, 'Rule set returned a variable.');
-
-    // Create an action set returning a variable that is no parameter.
-    $set = rules_action_set(array(
-      'node' => array(
-        'type' => 'node',
-        'parameter' => FALSE,
-      )), array('node'));
-    $set->action('entity_fetch', array('type' => 'node', 'id' => $node->nid))
-        ->action('data_set', array('data:select' => 'node', 'value:select' => 'entity_fetched'));
-    $set->integrityCheck();
-    list($node3) = $set->execute();
-    $this->assertTrue($node3->nid == $node->nid, 'Action set returned a variable that has not been passed as parameter.');
-
-    // Test the same again with a variable holding a not wrapped data type.
-    $set = rules_action_set(array(
-      'number' => array(
-        'type' => 'integer',
-        'parameter' => FALSE,
-      )), array('number'));
-    $set->action('data_set', array('data:select' => 'number', 'value' => 3));
-    $set->integrityCheck();
-    list($number) = $set->execute();
-    $this->assertTrue($number == 3, 'Actions set returned a number.');
-  }
-
-  /**
-   * Tests using input evaluators.
-   */
-  function testInputEvaluators() {
-    $node = $this->drupalCreateNode(array('title' => '<b>The body & nothing.</b>', 'type' => 'page'));
-
-    $rule = rule(array('nid' => array('type' => 'integer')));
-    $rule->action('rules_action_load_node')
-         ->action('drupal_message', array('message' => 'Title: [node_loaded:title]'))
-         ->execute($node->nid);
-
-    RulesLog::logger()->checkLog();
-    $msg = drupal_get_messages();
-    $this->assertEqual(array_pop($msg['status']), 'Title: ' . check_plain('<b>The body & nothing.</b>'), 'Token input evaluator applied.');
-
-    // Test token replacements on a list of text values.
-    $component = rules_action_set(array('var' => array('type' => 'list<text>', 'label' => 'var')), array('var'));
-    $component->save('rules_test_input');
-
-    $action = rules_action('component_rules_test_input', array('var' => array('uid: [site:current-user:uid]')));
-    list($var) = $action->execute();
-    $uid = $GLOBALS['user']->uid;
-    $this->assertEqual(array("uid: $uid"), $var, 'Token replacements on a list of values applied.');
-  }
-
-  /**
-   * Test importing and exporting a rule.
-   */
-  function testRuleImportExport() {
-    $rule = rule(array('nid' => array('type' => 'integer')));
-    $rule->name = "rules_export_test";
-    $rule->action('rules_action_load_node')
-         ->action('drupal_message', array('message' => 'Title: [node_loaded:title]'));
-
-    $export =
-'{ "rules_export_test" : {
-    "PLUGIN" : "rule",
-    "REQUIRES" : [ "rules_test", "rules" ],
-    "USES VARIABLES" : { "nid" : { "type" : "integer" } },
-    "DO" : [
-      { "rules_action_load_node" : { "PROVIDE" : { "node_loaded" : { "node_loaded" : "Loaded content" } } } },
-      { "drupal_message" : { "message" : "Title: [node_loaded:title]" } }
-    ]
-  }
-}';
-    $this->assertEqual($export, $rule->export(), 'Rule has been exported correctly.');
-
-    // Test importing a rule which makes use of almost all features.
-    $export = _rules_export_get_test_export();
-    $rule = rules_import($export);
-    $this->assertTrue(!empty($rule) && $rule->integrityCheck(), 'Rule has been imported.');
-
-    // Test loading the same export provided as default rule.
-    $rule = rules_config_load('rules_export_test');
-    $this->assertTrue(!empty($rule) && $rule->integrityCheck(), 'Export has been provided in code.');
-
-    // Export it and make sure the same export is generated again.
-    $this->assertEqual($export, $rule->export(), 'Export of imported rule equals original export.');
-
-    // Now try importing a rule set.
-    $export =
-'{ "rules_test_set" : {
-    "LABEL" : "Test set",
-    "PLUGIN" : "rule set",
-    "REQUIRES" : [ "rules" ],
-    "USES VARIABLES" : { "node" : { "label" : "Test node", "type" : "node" } },
-    "RULES" : [
-      { "RULE" : {
-          "IF" : [ { "NOT data_is" : { "data" : [ "node:title" ], "value" : "test" } } ],
-          "DO" : [ { "data_set" : { "data" : [ "node:title" ], "value" : "test" } } ],
-          "LABEL" : "Test Rule"
-        }
-      },
-      { "RULE" : {
-          "DO" : [ { "drupal_message" : { "message" : "hi" } } ],
-          "LABEL" : "Test Rule 2"
-        }
-      }
-    ]
-  }
-}';
-    $set = rules_import($export);
-    $this->assertTrue(!empty($set) && $set->integrityCheck(), 'Rule set has been imported.');
-    // Export it and make sure the same export is generated again.
-    $this->assertEqual($export, $set->export(), 'Export of imported rule set equals original export.');
-
-    // Try executing the imported rule set.
-    $node = $this->drupalCreateNode();
-    $set->execute($node);
-    $this->assertEqual($node->title, 'test', 'Imported rule set has been executed.');
-    RulesLog::logger()->checkLog();
-
-    // Try import / export for a rule component providing a variable.
-    $rule = rule(array(
-      'number' => array(
-        'type' => 'integer',
-        'label' => 'Number',
-        'parameter' => FALSE,
-      )), array('number'));
-    $rule->action('data_set', array('data:select' => 'number', 'value' => 3));
-    $rule->name = 'rules_test_provides';
-
-    $export = '{ "rules_test_provides" : {
-    "PLUGIN" : "rule",
-    "REQUIRES" : [ "rules" ],
-    "USES VARIABLES" : { "number" : { "type" : "integer", "label" : "Number", "parameter" : false } },
-    "DO" : [ { "data_set" : { "data" : [ "number" ], "value" : 3 } } ],
-    "PROVIDES VARIABLES" : [ "number" ]
-  }
-}';
-    $this->assertEqual($export, $rule->export(), 'Rule 2 has been exported correctly.');
-    $imported_rule = rules_import($rule->export());
-
-    $this->assertTrue(!empty($imported_rule) && $imported_rule->integrityCheck(), 'Rule 2 has been imported.');
-    $this->assertEqual($export, $imported_rule->export(), 'Export of imported rule 2 equals original export.');
-
-    // Test importing a negated condition component.
-    $export = '{ "rules_negated_component" : {
-    "LABEL" : "negated_component",
-    "PLUGIN" : "or",
-    "REQUIRES" : [ "rules" ],
-    "NOT OR" : [ { "data_is_empty" : { "data" : [ "site:slogan" ] } } ]
-  }
-}';
-    $or = rules_import($export);
-    $this->assertTrue($or->integrityCheck() && $or->isNegated(), 'Negated condition component imported.');
-  }
-
-  /**
-   * Test the named parameter mode.
-   */
-  function testNamedParameters() {
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->action('rules_action_node_set_title', array('title' => 'foo'));
-    $rule->integrityCheck();
-
-    // Test the rule.
-    $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0));
-    $rule->execute($node);
-    $this->assertTrue($node->title == 'foo', 'Action with named parameters has been correctly executed.');
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Make sure Rules aborts when NULL values are used.
-   */
-  function testAbortOnNULLValues() {
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->action('drupal_message', array('message:select' => 'node:log'));
-    $rule->integrityCheck();
-
-    // Test the rule.
-    $node = $this->drupalCreateNode();
-    $node->log = NULL;
-    $rule->execute($node);
-
-    $text = RulesLog::logger()->render();
-    $msg = RulesTestCase::t('The variable or parameter %message is empty.', array('message'));
-    $this->assertTrue(strpos($text, $msg) !== FALSE, 'Evaluation aborted due to an empty argument value.');
-  }
-}
-
-/**
- * Test rules data wrappers.
- */
-class RulesTestDataCase extends DrupalWebTestCase {
-
-  static function getInfo() {
-    return array(
-      'name' => 'Rules Data tests',
-      'description' => 'Tests rules data saving and type matching.',
-      'group' => 'Rules',
-    );
-  }
-
-  function setUp() {
-    parent::setUp('rules', 'rules_test');
-    variable_set('rules_debug_log', 1);
-    // Make sure we don't ran over issues with the node_load static cache.
-    entity_get_controller('node')->resetCache();
-  }
-
-  /**
-   * Tests intelligently saving data.
-   */
-  function testDataSaving() {
-    $node = $this->drupalCreateNode();
-    $state = new RulesState(rule());
-    $state->addVariable('node', $node, array('type' => 'node'));
-    $wrapper = $state->get('node');
-    $node->title = 'test';
-    $wrapper->set($node);
-    $state->saveChanges('node', $wrapper, FALSE);
-
-    $this->assertFalse($this->drupalGetNodeByTitle('test'), 'Changes have not been saved.');
-    $state->saveChanges('node', $wrapper, TRUE);
-    $this->assertTrue($this->drupalGetNodeByTitle('test'), 'Changes have been saved.');
-
-    // Test skipping saving.
-    $state->addVariable('node2', $node, array(
-      'type' => 'node',
-      'skip save' => TRUE,
-    ));
-    $wrapper = $state->get('node2');
-    $node->title = 'test2';
-    $wrapper->set($node);
-    $state->saveChanges('node2', $wrapper, TRUE);
-    $this->assertFalse($this->drupalGetNodeByTitle('test2'), 'Changes have not been saved.');
-
-    // Try saving a non-entity wrapper, which should result in saving the
-    // parent entity containing the property.
-    $wrapper = $state->get('node');
-    $wrapper->title->set('test3');
-    $state->saveChanges('node:title', $wrapper, TRUE);
-    $this->assertTrue($this->drupalGetNodeByTitle('test3'), 'Parent entity has been saved.');
-  }
-
-  /**
-   * Test type matching
-   */
-  function testTypeMatching() {
-    $entity = array('type' => 'entity');
-    $node = array('type' => 'node');
-    $this->assertTrue(RulesData::typesMatch($node, $entity), 'Types match.');
-    $this->assertFalse(RulesData::typesMatch($entity, $node), 'Types don\'t match.');
-
-    $this->assertTrue(RulesData::typesMatch($node + array('bundle' => 'page'), $node), 'Types match.');
-    $this->assertTrue(RulesData::typesMatch($node + array('bundle' => 'page'), $entity), 'Types match.');
-    $this->assertTrue(RulesData::typesMatch(array('type' => 'list<node>'), array('type' => 'list')), 'Types match.');
-    $this->assertTrue(RulesData::typesMatch($node + array('bundle' => 'page'), $node + array('bundles' => array('page', 'story'))), 'Types match.');
-    $this->assertFalse(RulesData::typesMatch($node, $node + array('bundles' => array('page', 'story'))), 'Types don\'t match.');
-
-    // Test that a type matches its grand-parent type (text > decimal > integer)
-    $this->assertTrue(RulesData::typesMatch(array('type' => 'integer'), array('type' => 'text')), 'Types match.');
-    $this->assertFalse(RulesData::typesMatch(array('type' => 'text'), array('type' => 'integer')), 'Types don\'t match.');
-  }
-
-  /**
-   * Tests making use of custom wrapper classes.
-   */
-  function testCustomWrapperClasses() {
-    // Test loading a vocabulary by name, which is done by a custom wrapper.
-    $set = rules_action_set(array('vocab' => array('type' => 'taxonomy_vocabulary')), array('vocab'));
-    $set->action('drupal_message', array('message:select' => 'vocab:name'));
-    $set->integrityCheck();
-    list($vocab) = $set->execute('tags');
-    $this->assertTrue($vocab->machine_name == 'tags', 'Loaded vocabulary by name.');
-
-    // Now test wrapper creation for a direct input argument value.
-    $set = rules_action_set(array('term' => array('type' => 'taxonomy_term')));
-    $set->action('data_set', array('data:select' => 'term:vocabulary', 'value' => 'tags'));
-    $set->integrityCheck();
-
-    $vocab = entity_create('taxonomy_vocabulary', array(
-      'name' => 'foo',
-      'machine_name' => 'foo',
-    ));
-    entity_save('taxonomy_vocabulary', $vocab);
-    $term_wrapped = entity_property_values_create_entity('taxonomy_term', array(
-      'name' => $this->randomName(),
-      'vocabulary' => $vocab,
-    ))->save();
-    $set->execute($term_wrapped);
-    $this->assertEqual($term_wrapped->vocabulary->machine_name->value(), 'tags', 'Vocabulary name used as direct input value.');
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Makes sure the RulesIdentifiableDataWrapper is working correctly.
-   */
-  function testRulesIdentifiableDataWrapper() {
-    $node = $this->drupalCreateNode();
-    $wrapper = new RulesTestTypeWrapper('rules_test_type', $node);
-    $this->assertTrue($wrapper->value() == $node, 'Data correctly wrapped.');
-
-    // Test serializing and make sure only the id is stored.
-    $this->assertTrue(strpos(serialize($wrapper), $node->title) === FALSE, 'Data has been correctly serialized.');
-    $this->assertEqual(unserialize(serialize($wrapper))->value()->title, $node->title, 'Serializing works right.');
-
-    $wrapper2 = unserialize(serialize($wrapper));
-    // Test serializing the unloaded wrapper.
-    $this->assertEqual(unserialize(serialize($wrapper2))->value()->title, $node->title, 'Serializing works right.');
-
-    // Test loading a not more existing node.
-    $s = serialize($wrapper2);
-    node_delete($node->nid);
-    $this->assertFalse(node_load($node->nid), 'Node deleted.');
-    try {
-      unserialize($s)->value();
-      $this->fail("Loading hasn't created an exception.");
-    }
-    catch (EntityMetadataWrapperException $e) {
-      $this->pass("Exception was thrown: ". $e->getMessage());
-    }
-
-    // Test saving a savable custom, identifiable wrapper.
-    $action = rules_action('test_type_save');
-    $node = $this->drupalCreateNode(array('status' => 0, 'type' => 'page'));
-    $node->status = 1;
-    $action->execute($node);
-
-    // Load the node fresh from the db.
-    $node = node_load($node->nid, NULL, TRUE);
-    $this->assertEqual($node->status, 1, 'Savable non-entity has been saved.');
-  }
-}
-
-/**
- * Test triggering rules.
- */
-class RulesTriggerTestCase extends DrupalWebTestCase {
-
-  static function getInfo() {
-    return array(
-      'name' => 'Reaction Rules',
-      'description' => 'Tests triggering reactive rules.',
-      'group' => 'Rules',
-    );
-  }
-
-  function setUp() {
-    parent::setUp('rules', 'rules_test');
-    RulesLog::logger()->clear();
-    variable_set('rules_debug_log', 1);
-  }
-
-  protected function createTestRule($action = TRUE, $event = 'node_presave') {
-    $rule = rules_reaction_rule();
-    $rule->event($event)
-         ->condition(rules_condition('data_is', array('data:select' => 'node:status', 'value' => TRUE))->negate())
-         ->condition('data_is', array('data:select' => 'node:type', 'value' => 'page'));
-    if ($action) {
-      $rule->action('rules_action_delete_node');
-    }
-    return $rule;
-  }
-
-  /**
-   * Tests CRUD for reaction rules - making sure the events are stored properly.
-   */
-  function testReactiveRuleCreation() {
-    $rule = $this->createTestRule();
-    $rule->save();
-    $result = db_query("SELECT event FROM {rules_trigger} WHERE id = :id", array(':id' => $rule->id));
-    $this->assertEqual($result->fetchField(), 'node_presave', 'Associated event has been saved.');
-    // Try updating.
-    $rule->removeEvent('node_presave');
-    $rule->event('node_insert');
-    $rule->event('node_update');
-    $rule->active = FALSE;
-    $rule->integrityCheck()->save();
-    $result = db_query("SELECT event FROM {rules_trigger} WHERE id = :id", array(':id' => $rule->id));
-    $this->assertEqual($result->fetchCol(), array_values($rule->events()), 'Updated associated events.');
-    // Try deleting.
-    $rule->delete();
-    $result = db_query("SELECT event FROM {rules_trigger} WHERE id = :id", array(':id' => $rule->id));
-    $this->assertEqual($result->fetchField(), FALSE, 'Deleted associated events.');
-  }
-
-  /**
-   * Tests creating and triggering a basic reaction rule.
-   */
-  function testBasicReactionRule() {
-    $node = $this->drupalCreateNode(array('type' => 'page'));
-    $rule = $this->createTestRule();
-    $rule->integrityCheck()->save();
-    // Test the basics of the event set work right.
-    $event = rules_get_cache('event_node_presave');
-    $this->assertEqual(array_keys($event->parameterInfo()), array('node'), 'EventSet returns correct argument info.');
-
-    // Trigger the rule by updating the node.
-    $nid = $node->nid;
-    $node->status = 0;
-    node_save($node);
-
-    RulesLog::logger()->checkLog();
-    $this->assertFalse(node_load($nid), 'Rule successfully triggered and executed');
-    //debug(RulesLog::logger()->render());
-  }
-
-  /**
-   * Test a rule using a handler to load a variable.
-   */
-  function testVariableHandler() {
-    $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
-    $rule = $this->createTestRule(FALSE, 'node_update');
-    $rule->action('rules_node_publish_action_save', array('node:select' => 'node_unchanged'));
-    // Test without recursion prevention to make sure recursive invocations
-    // work right too. This rule won't ran in an infinite loop anyway.
-    $rule->recursion = TRUE;
-    $rule->label = 'rule 1';
-    $rule->integrityCheck()->save();
-
-    $node->status = 0;
-    $node->sticky = 1;
-    node_save($node);
-
-    RulesLog::logger()->checkLog();
-    entity_get_controller('node')->resetCache();
-    $node = node_load($node->nid);
-
-    $this->assertFalse($node->sticky, 'Parameter has been loaded and saved.');
-    $this->assertTrue($node->status, 'Action has been executed.');
-
-    // Ensure the rule was evaluated a second time
-    $text = RulesLog::logger()->render();
-    $msg = RulesTestCase::t('Evaluating conditions of rule %rule 1', array('rule 1'));
-    $pos = strpos($text, $msg);
-    $pos = ($pos !== FALSE) ? strpos($text, $msg, $pos) : FALSE;
-    $this->assertTrue($pos !== FALSE, "Recursion prevented.");
-    //debug(RulesLog::logger()->render());
-  }
-
-  /**
-   * Test aborting silently when handlers are not able to load.
-   */
-  function testVariableHandlerFailing() {
-    $rule = $this->createTestRule(FALSE, 'node_presave');
-    $rule->action('rules_node_publish_action_save', array('node:select' => 'node_unchanged'));
-    $rule->integrityCheck()->save();
-
-    // On insert it's not possible to get the unchanged node during presave.
-    $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
-
-    //debug(RulesLog::logger()->render());
-    $text = RulesTestCase::t('Unable to load variable %node_unchanged, aborting.', array('node_unchanged'));
-    $this->assertTrue(strpos(RulesLog::logger()->render(), $text) !== FALSE, "Aborted evaluation.");
-  }
-
-  /**
-   * Tests preventing recursive rule invocations by creating a rule that reacts
-   * on node-update and generates a node update that would trigger it itself.
-   */
-  function testRecursionPrevention() {
-    $rule = $this->createTestRule(FALSE, 'node_update');
-    $rule->action('rules_node_make_sticky_action');
-    $rule->integrityCheck()->save();
-
-    // Now trigger the rule.
-    $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
-    node_save($node);
-
-    $text = RulesTestCase::t('Not evaluating reaction rule %label to prevent recursion.', array('label' => $rule->name));
-    //debug(RulesLog::logger()->render());
-    $this->assertTrue((strpos(RulesLog::logger()->render(), $text) !== FALSE), "Recursion prevented.");
-    //debug(RulesLog::logger()->render());
-  }
-
-  /**
-   * Ensure the recursion prevention still allows to let the rule trigger again
-   * during evaluation of the same event set, if the event isn't caused by the
-   * rule itself - thus we won't run in an infinte loop.
-   */
-  function testRecursionOnDifferentArguments() {
-    // Create rule1 - which might recurse.
-    $rule = $this->createTestRule(FALSE, 'node_update');
-    $rule->action('rules_node_make_sticky_action');
-    $rule->label = 'rule 1';
-    $rule->integrityCheck()->save();
-
-    // Create rule2 - which triggers rule1 on another node.
-    $node2 = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
-    $rule2 = $this->createTestRule(FALSE, 'node_update');
-    $rule2->action('rules_action_load_node', array('nid' => $node2->nid))
-          ->action('rules_node_make_sticky_action', array('node:select' => 'node_loaded'));
-    $rule2->label = 'rule 2';
-    $rule2->save();
-
-    // Now trigger both rules by generating the event.
-    $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
-    node_save($node);
-
-    //debug(RulesLog::logger()->render());
-    $text = RulesLog::logger()->render();
-    $pos = strpos($text, RulesTestCase::t('Evaluating conditions of rule %rule 1', array('rule 1')));
-    $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Evaluating conditions of rule %rule 2', array('rule 2')), $pos) : FALSE;
-    $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Saved %node_loaded of type %node.', array('node_loaded', 'node')), $pos) : FALSE;
-    $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Evaluating conditions of rule %rule 1', array('rule 1')), $pos) : FALSE;
-    $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Not evaluating reaction rule %rule 2 to prevent recursion', array('rule 2')), $pos) : FALSE;
-    $this->assertTrue($pos !== FALSE, 'Rule1 was triggered on the event caused by Rule2.');
-  }
-
-  /**
-   * Tests the provided default rule 'rules_test_default_1'.
-   */
-  function testDefaultRule() {
-    $rule = rules_config_load('rules_test_default_1');
-    $this->assertTrue($rule->status & ENTITY_IN_CODE && !($rule->status & ENTITY_IN_DB), 'Default rule can be loaded and has the right status.');
-    // Enable.
-    $rule->active = TRUE;
-    $rule->save();
-
-    // Create a node that triggers the rule.
-    $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
-    // Clear messages.
-    drupal_get_messages();
-    // Let event node_update occur.
-    node_save($node);
-
-    $msg = drupal_get_messages();
-    $this->assertEqual($msg['status'][0], 'A node has been updated.', 'Default rule has been triggered.');
-  }
-
-  /**
-   * Tests creating and triggering a reaction rule with event settings.
-   */
-  function testEventSettings() {
-    $rule = rules_reaction_rule();
-    $rule->event('node_presave', array('bundle' => 'article'))
-      ->condition('data_is_empty', array('data:select' => 'node:field-tags'))
-      ->action('node_publish', array('node:select' => 'node'));
-    $rule->integrityCheck()->save();
-
-    $node = $this->drupalCreateNode(array('type' => 'page', 'status' => 0));
-    $this->assertEqual($node->status, 0, 'Rule has not been triggered.');
-    $node = $this->drupalCreateNode(array('type' => 'article', 'status' => 0));
-    $this->assertEqual($node->status, 1, 'Rule has been triggered.');
-    RulesLog::logger()->checkLog();
-
-    // Make sure an invalid bundle raises integrity problems.
-    $rule->event('node_presave', array('bundle' => 'invalid'));
-    try {
-      $rule->integrityCheck();
-      $this->fail('Integrity check failed.');
-    }
-    catch (RulesIntegrityException $e) {
-      $this->pass('Integrity check failed: ' . $e);
-    }
-  }
-}
-
-/**
- * Tests provided module integration.
- */
-class RulesIntegrationTestCase extends DrupalWebTestCase {
-
-  static function getInfo() {
-    return array(
-      'name' => 'Rules Core Integration',
-      'description' => 'Tests provided integration for drupal core.',
-      'group' => 'Rules',
-    );
-  }
-
-  function setUp() {
-    parent::setUp('rules', 'rules_test', 'php', 'path');
-    RulesLog::logger()->clear();
-    variable_set('rules_debug_log', 1);
-  }
-
-  /**
-   * Just make sure the access callback run without errors.
-   */
-  function testAccessCallbacks() {
-    $cache = rules_get_cache();
-    foreach (array('action', 'condition', 'event') as $type) {
-      foreach (rules_fetch_data($type . '_info') as $name => $info) {
-        if (isset($info['access callback'])) {
-          $info['access callback']($type, $name);
-        }
-      }
-    }
-  }
-
-  /**
-   * Test data integration.
-   */
-  function testDataIntegration() {
-    // Test data_create action.
-    $action = rules_action('data_create', array(
-      'type' => 'log_entry',
-      'param_type' => 'rules_test',
-      'param_message' => 'Rules test log message',
-      'param_severity' => WATCHDOG_WARNING,
-      'param_request_uri' => 'http://example.com',
-      'param_link' => '',
-    ));
-    $action->access();
-    $action->execute();
-    $text = RulesLog::logger()->render();
-    $pos = strpos($text, RulesTestCase::t('Added the provided variable %data_created of type %log_entry', array('data_created', 'log_entry')));
-    $this->assertTrue($pos !== FALSE, 'Data of type log entry has been created.');
-
-
-    // Test variable_add action.
-    $action = rules_action('variable_add', array(
-      'type' => 'text_formatted',
-      'value' => array(
-        'value' => 'test text',
-        'format' => 1,
-      )
-    ));
-    $action->access();
-    $action->execute();
-    $text = RulesLog::logger()->render();
-    $pos = strpos($text, RulesTestCase::t('Added the provided variable %variable_added of type %text_formatted', array('variable_added', 'text_formatted')));
-    $this->assertTrue($pos !== FALSE, 'Data of type text formatted has been created.');
-
-
-    // Test using the list actions.
-    $rule = rule(array(
-      'list' => array(
-        'type' => 'list<text>',
-        'label' => 'A list of text',
-      )
-    ));
-    $rule->action('list_add', array('list:select' => 'list', 'item' => 'bar2'));
-    $rule->action('list_add', array('list:select' => 'list', 'item' => 'bar', 'pos' => 'start'));
-    $rule->action('list_add', array('list:select' => 'list', 'item' => 'bar', 'unique' => TRUE));
-    $rule->action('list_remove', array('list:select' => 'list', 'item' => 'bar2'));
-    $list = entity_metadata_wrapper('list', array('foo', 'foo2'));
-    $rule->execute($list);
-    RulesLog::logger()->checkLog();
-    $this->assertEqual($list->value(), array('bar', 'foo', 'foo2'), 'List items removed and added.');
-    $this->assertFalse(rules_condition('list_contains')->execute($list, 'foo-bar'), 'Condition "List item contains" evaluates to FALSE');
-    $this->assertTrue(rules_condition('list_contains')->execute($list, 'foo'), 'Condition "List item contains" evaluates to TRUE');
-    //debug(RulesLog::logger()->render());
-
-    // Test data_is condition with IN operation.
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->condition('data_is', array('data:select' => 'node:title', 'op' => 'IN', 'value' => array('foo', 'bar')));
-    $rule->action('data_set', array('data:select' => 'node:title', 'value' => 'bar'));
-    $rule->integrityCheck();
-
-    $node = $this->drupalCreateNode(array('title' => 'foo'));
-    $rule->execute($node);
-    $this->assertEqual($node->title, 'bar', "Data comparison using IN operation evaluates to TRUE.");
-
-
-    // Test Condition: Data is empty.
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->condition('data_is_empty', array('data:select' => 'node:title'));
-    $rule->action('data_set', array('data:select' => 'node:title', 'value' => 'bar'));
-    $rule->integrityCheck();
-
-    // Data is empty condition evaluates to TRUE
-    // for node with empty title, action sets title to 'bar'.
-    $node = $this->drupalCreateNode(array('title' => '', 'type' => 'article'));
-    $rule->execute($node);
-    $this->assertEqual($node->title, 'bar', "Data is empty condition evaluates to TRUE for node with empty title, action sets title to 'bar'.");
-
-    // Data is empty condition evaluates to FALSE
-    // for node with title 'foo', action is not executed.
-    $node = $this->drupalCreateNode(array('title' => 'foo', 'type' => 'article'));
-    $rule->execute($node);
-    $this->assertEqual($node->title, 'foo', "Data is empty condition evaluates to FALSE for node with title 'foo', action is not executed.");
-
-    // Data is empty condition evaluates to TRUE for the parent of a
-    // not existing term in the tags field of the node.
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->condition('node_is_of_type', array('type' => array('article')));
-    $rule->condition('data_is_empty', array('data:select' => 'node:field-tags:0:parent'));
-    $rule->action('data_set', array('data:select' => 'node:title', 'value' => 'bar'));
-    $rule->integrityCheck();
-    $node = $this->drupalCreateNode(array('title' => 'foo', 'type' => 'article'));
-    $rule->execute($node);
-    $this->assertEqual($node->title, 'bar', "Data is empty condition evaluates to TRUE for not existing data structures");
-
-    // Test Action: Calculate a value.
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->action('data_calc', array('input_1:select' => 'node:nid', 'op' => '*', 'input_2' => 2));
-    $rule->action('data_set', array('data:select' => 'node:title', 'value:select' => 'result'));
-    $rule->integrityCheck();
-    $rule->execute($node);
-    $this->assertEqual($node->title, $node->nid * 2, "Value has been calculated.");
-
-    // Test moving a date.
-    $action_set = rules_action_set(array('date' => array('type' => 'date')), array('date'));
-    $action_set->action('data_calc', array('input_1:select' => 'date', 'op' => '+', 'input_2' => 3600))
-               ->action('data_set', array('data:select' => 'date', 'value:select' => 'result'));
-    $action_set->integrityCheck();
-    list($result) = $action_set->execute(REQUEST_TIME);
-    $this->assertEqual($result, REQUEST_TIME + 3600, 'Used data calculation action to move a date by an hour.');
-
-    // Test data type conversion action.
-    $set = rules_action_set(array('result' => array('type' => 'text', 'parameter' => FALSE)), array('result'));
-    $set->action('data_convert', array('type' => 'text', 'value:select' => 'site:login-url'));
-    $set->action('data_set', array('data:select' => 'result', 'value:select' => 'conversion_result'));
-    list($result) = $set->execute();
-    $set->integrityCheck();
-    $this->assertEqual($result, url('user', array('absolute' => TRUE)), 'Converted URI to text.');
-
-    $set = rules_action_set(array(
-      'result' => array('type' => 'integer', 'parameter' => FALSE),
-      'source' => array('type' => 'text'),
-    ), array('result'));
-    $set->action('data_convert', array('type' => 'integer', 'value:select' => 'source'));
-    $set->action('data_set', array('data:select' => 'result', 'value:select' => 'conversion_result'));
-    list($result) = $set->execute('9.4');
-    $this->assertEqual($result, 9, 'Converted decimal to integer using rounding.');
-
-    $set = rules_action_set(array(
-      'result' => array('type' => 'integer', 'parameter' => FALSE),
-      'source' => array('type' => 'text'),
-    ), array('result'));
-    $set->action('data_convert', array('type' => 'integer', 'value:select' => 'source', 'rounding_behavior' => 'down'));
-    $set->action('data_set', array('data:select' => 'result', 'value:select' => 'conversion_result'));
-    list($result) = $set->execute('9.6');
-    $this->assertEqual($result, 9, 'Converted decimal to integer using roundin behavio down.');
-
-    $set = rules_action_set(array(
-      'result' => array('type' => 'integer', 'parameter' => FALSE),
-      'source' => array('type' => 'text'),
-    ), array('result'));
-    $set->action('data_convert', array('type' => 'integer', 'value:select' => 'source', 'rounding_behavior' => 'up'));
-    $set->action('data_set', array('data:select' => 'result', 'value:select' => 'conversion_result'));
-    list($result) = $set->execute('9.4');
-    $this->assertEqual($result, 10, 'Converted decimal to integer using rounding behavior up.');
-
-    // Test text matching condition.
-    $result = rules_condition('text_matches')->execute('my-text', 'text', 'contains');
-    $result2 = rules_condition('text_matches')->execute('my-text', 'tex2t', 'contains');
-    $this->assertTrue($result && !$result2, 'Text matching condition using operation contain evaluated.');
-
-    $result = rules_condition('text_matches')->execute('my-text', 'my', 'starts');
-    $result2 = rules_condition('text_matches')->execute('my-text', 'text', 'starts');
-    $this->assertTrue($result && !$result2, 'Text matching condition using operation starts evaluated.');
-
-    $result = rules_condition('text_matches')->execute('my-text', 'text', 'ends');
-    $result2 = rules_condition('text_matches')->execute('my-text', 'my', 'ends');
-    $this->assertTrue($result && !$result2, 'Text matching condition using operation ends evaluated.');
-
-    $result = rules_condition('text_matches')->execute('my-text', 'me?y-texx?t', 'regex');
-    $result2 = rules_condition('text_matches')->execute('my-text', 'me+y-texx?t', 'regex');
-    $this->assertTrue($result && !$result2, 'Text matching condition using operation regex evaluated.');
-  }
-
-  /**
-   * Tests entity related integration.
-   */
-  function testEntityIntegration() {
-    global $user;
-
-    $page = $this->drupalCreateNode(array('type' => 'page'));
-    $article = $this->drupalCreateNode(array('type' => 'article'));
-
-    $result = rules_condition('entity_field_access')
-      ->execute(entity_metadata_wrapper('node', $article), 'field_tags');
-    $this->assertTrue($result);
-
-    // Test entiy_is_of_bundle condition.
-    $result = rules_condition('entity_is_of_bundle', array(
-      'type' => 'node',
-      'bundle' => array('article'),
-    ))->execute(entity_metadata_wrapper('node', $page));
-    $this->assertFalse($result, 'Entity is of bundle condition has not been met.');
-    $result = rules_condition('entity_is_of_bundle', array(
-      'type' => 'node',
-      'bundle' => array('article'),
-    ))->execute(entity_metadata_wrapper('node', $article));
-    $this->assertTrue($result, 'Entity is of bundle condition has been met.');
-
-    // Also test a full rule so the integrity check must work.
-    $term_wrapped = entity_property_values_create_entity('taxonomy_term', array(
-      'name' => $this->randomName(),
-      'vocabulary' => 1,
-    ))->save();
-    $rule = rule(array(
-      'node' => array('type' => 'node'),
-    ));
-    $rule->condition('entity_is_of_bundle', array(
-      'entity:select' => 'node',
-      'bundle' => array('article'),
-    ));
-    $rule->action('data_set', array('data:select' => 'node:field_tags', 'value' => array($term_wrapped->getIdentifier())));
-    $rule->integrityCheck();
-    $rule->execute($article);
-    $this->assertEqual($term_wrapped->getIdentifier(), $article->field_tags[LANGUAGE_NONE][0]['tid'], 'Entity is of bundle condition has been met.');
-
-    // Test again using an entity variable.
-    $article = $this->drupalCreateNode(array('type' => 'article'));
-    $rule = rule(array(
-      'entity' => array('type' => 'entity'),
-    ));
-    $rule->condition('entity_is_of_bundle', array(
-      'entity:select' => 'entity',
-      'type' => 'node',
-      'bundle' => array('article'),
-    ));
-    $rule->action('data_set', array('data:select' => 'entity:field_tags', 'value' => array($term_wrapped->getIdentifier())));
-    $rule->integrityCheck();
-    $rule->execute(entity_metadata_wrapper('node', $article));
-    $this->assertEqual($term_wrapped->getIdentifier(), $article->field_tags[LANGUAGE_NONE][0]['tid'], 'Entity is of bundle condition has been met.');
-
-    // Test CRUD actions.
-    $action = rules_action('entity_create', array(
-      'type' => 'node',
-      'param_type' => 'page',
-      'param_title' => 'foo',
-      'param_author' => $GLOBALS['user'],
-    ));
-    $action->access();
-    $action->execute();
-    $text = RulesLog::logger()->render();
-    $pos = strpos($text, RulesTestCase::t('Added the provided variable %entity_created of type %node', array('entity_created', 'node')));
-    $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Saved %entity_created of type %node.', array('entity_created', 'node')), $pos) : FALSE;
-    $this->assertTrue($pos !== FALSE, 'Data has been created and saved.');
-
-    $node = $this->drupalCreateNode(array('type' => 'page', 'sticky' => 0, 'status' => 0));
-    $rule = rule();
-    $rule->action('entity_fetch', array('type' => 'node', 'id' => $node->nid, 'entity_fetched:var' => 'node'));
-    $rule->action('entity_save', array('data:select' => 'node', 'immediate' => TRUE));
-    $rule->action('entity_delete', array('data:select' => 'node'));
-    $rule->access();
-    $rule->integrityCheck()->execute();
-
-    $text = RulesLog::logger()->render();
-    $pos = strpos($text, RulesTestCase::t('Evaluating the action %entity_fetch.', array('entity_fetch')));
-    $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Added the provided variable %node of type %node', array('node')), $pos) : FALSE;
-    $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Saved %node of type %node.', array('node')), $pos) : FALSE;
-    $pos = ($pos !== FALSE) ? strpos($text, RulesTestCase::t('Evaluating the action %entity_delete.', array('entity_delete')), $pos) : FALSE;
-    $this->assertTrue($pos !== FALSE, 'Data has been fetched, saved and deleted.');
-    //debug(RulesLog::logger()->render());
-
-
-
-    $node = entity_property_values_create_entity('node', array(
-      'type' => 'article',
-      'author' => $user,
-      'title' => 'foo',
-    ))->value();
-    $term_wrapped = entity_property_values_create_entity('taxonomy_term', array(
-      'name' => $this->randomName(),
-      'vocabulary' => 1,
-    ))->save();
-
-    // Test asserting the field and using it afterwards.
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->condition('entity_has_field', array('entity:select' => 'node', 'field' => 'field_tags'));
-    $rule->condition('entity_is_new', array('entity:select' => 'node'));
-    $rule->action('list_add', array('list:select' => 'node:field-tags', 'item' => $term_wrapped));
-    $rule->integrityCheck();
-    $rule->execute($node);
-
-    $tid = $term_wrapped->getIdentifier();
-    $this->assertEqual(array_values($node->field_tags[LANGUAGE_NONE]), array(0 => array('tid' => $tid)), 'Entity has field conditions evaluted.');
-
-    // Test loading a non-node entity.
-    $action = rules_action('entity_fetch', array('type' => 'taxonomy_term', 'id' => $tid));
-    list($term) = $action->execute();
-    $this->assertEqual($term->tid, $tid, 'Fetched a taxonomy term using "entity_fetch".');
-
-    // Test the entity is of type condition.
-    $rule = rule(array('entity' => array('type' => 'entity', 'label' => 'entity')));
-    $rule->condition('entity_is_of_type', array('type' => 'node'));
-    $rule->action('data_set', array('data:select' => 'entity:title', 'value' => 'bar'));
-    $rule->integrityCheck();
-    $rule->execute(entity_metadata_wrapper('node', $node));
-
-    $this->assertEqual(entity_metadata_wrapper('node', $node->nid)->title->value(), 'bar', 'Entity is of type condition correctly asserts the entity type.');
-
-
-    // Test the entity_query action.
-    $node = $this->drupalCreateNode(array('type' => 'page', 'title' => 'foo2'));
-    $rule = rule();
-    $rule->action('entity_query', array('type' => 'node', 'property' => 'title', 'value' => 'foo2'))
-         ->action('data_set', array('data:select' => 'entity_fetched:0:title', 'value' => 'bar'));
-    $rule->access();
-    $rule->integrityCheck();
-    $rule->execute();
-    $node = node_load($node->nid);
-    $this->assertEqual('bar', $node->title, 'Fetched a node by title and modified it.');
-
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Test integration for the taxonomy module.
-   */
-  function testTaxonomyIntegration() {
-    $term = entity_property_values_create_entity('taxonomy_term', array(
-      'name' => $this->randomName(),
-      'vocabulary' => 1,
-    ))->value();
-    $term2 = clone $term;
-    taxonomy_term_save($term);
-    taxonomy_term_save($term2);
-
-    $tags[LANGUAGE_NONE][0]['tid'] = $term->tid;
-    $node = $this->drupalCreateNode(array('title' => 'foo', 'type' => 'article', 'field_tags' => $tags));
-
-    // Test assigning and remove a term from an article.
-    $rule = rule(array('node' => array('type' => 'node', 'bundle' => 'article')));
-    $term_wrapped = rules_wrap_data($term->tid, array('type' => 'taxonomy_term'));
-    $term_wrapped2 = rules_wrap_data($term2->tid, array('type' => 'taxonomy_term'));
-    $rule->action('list_add', array('list:select' => 'node:field-tags', 'item' => $term_wrapped2));
-    $rule->action('list_remove', array('list:select' => 'node:field-tags', 'item' => $term_wrapped));
-    $rule->execute($node);
-    RulesLog::logger()->checkLog();
-    $this->assertEqual(array_values($node->field_tags[LANGUAGE_NONE]), array(0 => array('tid' => $term2->tid)), 'Term removed and added from a node.');
-
-    // Test using the taxonomy term reference field on a term object.
-    $field_name = drupal_strtolower($this->randomName() . '_field_name');
-    $field = field_create_field(array(
-      'field_name' => $field_name,
-      'type' => 'taxonomy_term_reference',
-      // Set cardinality to unlimited for tagging.
-      'cardinality' => FIELD_CARDINALITY_UNLIMITED,
-      'settings' => array(
-        'allowed_values' => array(
-          array(
-            'vocabulary' => 'tags',
-            'parent' => 0,
-          ),
-        ),
-      ),
-    ));
-    $instance = array(
-      'field_name' => $field_name,
-      'entity_type' => 'taxonomy_term',
-      'bundle' => 'tags', // Machine name of vocabulary.
-      'label' => $this->randomName() . '_label',
-      'description' => $this->randomName() . '_description',
-      'weight' => mt_rand(0, 127),
-      'widget' => array(
-        'type' => 'taxonomy_autocomplete',
-        'weight' => -4,
-      ),
-      'display' => array(
-        'default' => array(
-          'type' => 'taxonomy_term_reference_link',
-          'weight' => 10,
-        ),
-      ),
-    );
-    field_create_instance($instance);
-
-    $term1 = entity_property_values_create_entity('taxonomy_term', array(
-      'name' => $this->randomName(),
-      'vocabulary' => 1,
-    ))->save();
-    $term2 = entity_property_values_create_entity('taxonomy_term', array(
-      'name' => $this->randomName(),
-      'vocabulary' => 1,
-    ))->save();
-
-    // Test asserting the term reference field and using it afterwards.
-    $rule = rule(array('taxonomy_term' => array('type' => 'taxonomy_term')));
-    $rule->condition('entity_has_field', array('entity:select' => 'taxonomy-term', 'field' => $field_name));
-    // Add $term2 to $term1 using the term reference field.
-    $selector = str_replace('_', '-', 'taxonomy_term:' . $field_name);
-    $rule->action('list_add', array('list:select' => $selector, 'item' => $term2));
-    $rule->integrityCheck();
-    $rule->execute($term1);
-
-    RulesLog::logger()->checkLog();
-    $this->assertEqual($term1->{$field_name}[0]->getIdentifier(), $term2->getIdentifier(), 'Rule appended a term to the term reference field on a term.');
-
-    // Test an action set for merging term parents, which is provided as default
-    // config.
-    $term = entity_property_values_create_entity('taxonomy_term', array(
-      'name' => $this->randomName(),
-      'vocabulary' => 1,
-      'parent' => array($term1->value()),
-    ))->save();
-
-    $action = rules_action('component_rules_retrieve_term_parents');
-    list($parents) = $action->execute(array($term->getIdentifier()));
-    $this->assertTrue($parents[0]->tid == $term1->getIdentifier(), 'Invoked component to retrieve term parents.');
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Test integration for the node module.
-   */
-  function testNodeIntegration() {
-    $tests = array(
-      array('node_unpublish', 'node_is_published', 'node_publish', 'status'),
-      array('node_make_unsticky', 'node_is_sticky', 'node_make_sticky', 'sticky'),
-      array('node_unpromote', 'node_is_promoted', 'node_promote', 'promote'),
-    );
-    $node = $this->drupalCreateNode(array('type' => 'page', 'status' => 1, 'sticky' => 1, 'promote' => 1));
-
-    foreach ($tests as $info) {
-      list($action1, $condition, $action2, $property) = $info;
-      rules_action($action1)->execute($node);
-
-      $node = node_load($node->nid, NULL, TRUE);
-      $this->assertFalse($node->$property, 'Action has permanently disabled node '. $property);
-      $return = rules_condition($condition)->execute($node);
-      $this->assertFalse($return, 'Condition determines node '. $property . ' is disabled.');
-
-      rules_action($action2)->execute($node);
-      $node = node_load($node->nid, NULL, TRUE);
-      $this->assertTrue($node->$property, 'Action has permanently enabled node '. $property);
-      $return = rules_condition($condition)->execute($node);
-      $this->assertTrue($return, 'Condition determines node '. $property . ' is enabled.');
-    }
-
-    $return = rules_condition('node_is_of_type', array('type' => array('page', 'article')))->execute($node);
-    $this->assertTrue($return, 'Condition determines node is of type page.');
-    $return = rules_condition('node_is_of_type', array('type' => array('article')))->execute($node);
-    $this->assertFalse($return, 'Condition determines node is not of type article.');
-
-
-    // Test auto saving of a new node after it has been inserted into the DB.
-    $rule = rules_reaction_rule();
-    $rand = $this->randomName();
-    $rule->event('node_insert')
-         ->action('data_set', array('data:select' => 'node:title', 'value' => $rand));
-    $rule->save('test');
-    $node = $this->drupalCreateNode();
-    $node = node_load($node->nid);
-    $this->assertEqual($node->title, $rand, 'Node title is correct.');
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Test integration for the user module.
-   */
-  function testUserIntegration() {
-    $rid = $this->drupalCreateRole(array('administer nodes'), 'foo');
-    $user = $this->drupalCreateUser();
-
-    // Test assigning a role with the list_add action.
-    $rule = rule(array('user' => array('type' => 'user')));
-    $rule->action('list_add', array('list:select' => 'user:roles', 'item' => $rid));
-    $rule->execute($user);
-    $this->assertTrue(isset($user->roles[$rid]), 'Role assigned to user.');
-
-    // Test removing a role with the list_remove action.
-    $rule = rule(array('user' => array('type' => 'user')));
-    $rule->action('list_remove', array('list:select' => 'user:roles', 'item' => $rid));
-    $rule->execute($user);
-    $this->assertTrue(!isset($user->roles[$rid]), 'Role removed from user.');
-
-    // Test assigning a role with user_add_role action.
-    $rule = rule(array('user' => array('type' => 'user')));
-    $rule->action('user_add_role', array('account:select' => 'user', 'roles' => array($rid)));
-    $rule->execute($user);
-
-    $user = user_load($user->uid, TRUE);
-    $result = rules_condition('user_has_role', array('roles' => array($rid)))->execute($user);
-    $this->assertTrue($result, 'Role assigned to user.');
-
-    // Test removing a role with the user_remove_role action.
-    $rule = rule(array('user' => array('type' => 'user')));
-    $rule->action('user_remove_role', array('account:select' => 'user', 'roles' => array($rid)));
-    $rule->execute($user);
-
-    $user = user_load($user->uid, TRUE);
-    $result = rules_condition('user_has_role', array('roles' => array($rid)))->execute($user);
-    $this->assertFalse($result, 'Role removed from user.');
-
-    // Test user blocking.
-    rules_action('user_block')->execute($user);
-    $user = user_load($user->uid, TRUE);
-    $this->assertTrue(rules_condition('user_is_blocked')->execute($user), 'User has been blocked.');
-
-    rules_action('user_unblock')->execute($user);
-    $user = user_load($user->uid, TRUE);
-    $this->assertFalse(rules_condition('user_is_blocked')->execute($user), 'User has been unblocked.');
-
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Test integration for the php module.
-   */
-  function testPHPIntegration() {
-    $node = $this->drupalCreateNode(array('title' => 'foo'));
-    $rule = rule(array('var_name' => array('type' => 'node')));
-    $rule->condition('php_eval', array('code' => 'return TRUE;'))
-         ->action('php_eval', array('code' => 'drupal_set_message("Executed-" . $var_name->title);'))
-         ->action('drupal_message', array('message' => 'Title: <?php echo $var_name->title; ?> Token: [var_name:title]'));
-
-    $rule->execute($node);
-    $rule->access();
-    RulesLog::logger()->checkLog();
-    $msg = drupal_get_messages();
-    $this->assertEqual(array_pop($msg['status']), "Title: foo Token: foo", 'PHP input evaluation has been applied.');
-    $this->assertEqual(array_pop($msg['status']), "Executed-foo", 'PHP code condition and action have been evaluated.');
-
-    // Test PHP data processor
-    $rule = rule(array('var_name' => array('type' => 'node')));
-    $rule->action('drupal_message', array(
-      'message:select' => 'var_name:title',
-      'message:process' => array(
-        'php' => array('code' => 'return "Title: $value";')
-      ),
-    ));
-    $rule->execute($node);
-    $rule->access();
-    RulesLog::logger()->checkLog();
-    $msg = drupal_get_messages();
-    $this->assertEqual(array_pop($msg['status']), "Title: foo", 'PHP data processor has been applied.');
-  }
-
-  /**
-   * Test the "rules_core" integration.
-   */
-  function testRulesCoreIntegration() {
-    // Make sure the date input evaluator evaluates properly using strtotime().
-    $node = $this->drupalCreateNode(array('title' => 'foo'));
-    $rule = rule(array('node' => array('type' => 'node')));
-    $rule->action('data_set', array('data:select' => 'node:created', 'value' => '+1 day'));
-
-    $rule->execute($node);
-    RulesLog::logger()->checkLog();
-    $node = node_load($node->nid, NULL, TRUE);
-    $now = RulesDateInputEvaluator::gmstrtotime('now');
-    // Tolerate a difference of a second.
-    $this->assertTrue(abs($node->created - $now - 86400) <= 1, 'Date input has been evaluated.');
-
-    // Test using a numeric offset.
-    $rule = rule(array('number' => array('type' => 'decimal')), array('number'));
-    $rule->action('data_set', array(
-      'data:select' => 'number',
-      'value:select' => 'number',
-      'value:process' => array(
-        'num_offset' => array('value' => 1),
-      ),
-    ));
-    $rule->integrityCheck();
-    list($result) = $rule->execute(10);
-    $this->assertTrue($result == 11, 'Numeric offset has been applied');
-
-    // Test using a date offset.
-    $set = rules_action_set(array('date' => array('type' => 'date')), array('date'));
-    $set->action('data_set', array(
-      'data:select' => 'date',
-      'value:select' => 'date',
-      'value:process' => array(
-        'date_offset' => array('value' => 1000),
-      ),
-    ));
-    $date = date_create("14 Mar 1984 10:19:23 +01:00")->format('U');
-    list($result) = $set->execute($date);
-    $this->assertEqual($result, $date + 1000, 'Date offset in seconds has been added.');
-
-    // Test using a negative offset of 2 months.
-    $set = rules_action_set(array('date' => array('type' => 'date')), array('date'));
-    $set->action('data_set', array(
-      'data:select' => 'date',
-      'value:select' => 'date',
-      'value:process' => array(
-        'date_offset' => array('value' => - 86400 * 30 * 2),
-      ),
-    ));
-    $date = date_create("14 Mar 1984 10:19:23 +01:00")->format('U');
-    list($result) = $set->execute($date);
-    $this->assertEqual($result, date_create("14 Jan 1984 10:19:23 +01:00")->format('U'), 'Date offset of -2 months has been added.');
-
-    // Test using a positive offset of 1 year 6 months and 30 minutes.
-    $set = rules_action_set(array('date' => array('type' => 'date')), array('date'));
-    $set->action('data_set', array(
-      'data:select' => 'date',
-      'value:select' => 'date',
-      'value:process' => array(
-        'date_offset' => array('value' => 86400 * 30 * 18 + 30 * 60),
-      ),
-    ));
-    $date = date_create("14 Mar 1984 10:19:23 +01:00")->format('U');
-    list($result) = $set->execute($date);
-    $this->assertEqual($result, date_create("14 Sep 1985 10:49:23 +01:00")->format('U'), 'Date offset of 1 year 6 months and 30 minutes has been added.');
-
-    RulesLog::logger()->checkLog();
-  }
-
-  /**
-   * Test site/system integration.
-   */
-  function testSystemIntegration() {
-    // Test using the 'site' variable.
-    $condition = rules_condition('data_is', array('data:select' => 'site:current-user:name', 'value' => $GLOBALS['user']->name));
-    $this->assertTrue($condition->execute(), 'Retrieved the current user\'s name.');
-    // Another test using a token replacement.
-    $condition = rules_condition('data_is', array('data:select' => 'site:current-user:name', 'value' => '[site:current-user:name]'));
-    $this->assertTrue($condition->execute(), 'Replaced the token for the current user\'s name.');
-
-    // Test breadcrumbs and drupal set message.
-    $rule = rules_reaction_rule();
-    $rule->event('init')
-         ->action('breadcrumb_set', array('titles' => array('foo'), 'paths' => array('bar')))
-         ->action('drupal_message', array('message' => 'A message.'));
-    $rule->save('test');
-
-    $this->drupalGet('node');
-    $this->assertLink('foo', 0, 'Breadcrumb has been set.');
-    $this->assertText('A message.', 'Drupal message has been shown.');
-
-    // Test the page redirect.
-    $node = $this->drupalCreateNode();
-    $rule = rules_reaction_rule();
-    $rule->event('node_view')
-         ->action('redirect', array('url' => 'user'));
-    $rule->save('test2');
-
-    $this->drupalGet('node/' . $node->nid);
-    $this->assertEqual($this->getUrl(), url('user', array('absolute' => TRUE)), 'Redirect has been issued.');
-
-    // Also test using a url including a fragment.
-    $actions = $rule->actions();
-    $actions[0]->settings['url'] = 'user#fragment';
-    $rule->save();
-
-    $this->drupalGet('node/' . $node->nid);
-    $this->assertEqual($this->getUrl(), url('user', array('absolute' => TRUE, 'fragment' => 'fragment')), 'Redirect has been issued.');
-
-
-    // Test sending mail.
-    $settings = array('to' => 'mail@example.com', 'subject' => 'subject', 'message' => 'hello.');
-    rules_action('mail', $settings)->execute();
-    $this->assertMail('to', 'mail@example.com', 'Mail has been sent.');
-    $this->assertMail('from', variable_get('site_mail', ini_get('sendmail_from')), 'Default from address has been used');
-
-    rules_action('mail', $settings + array('from' => 'sender@example.com'))->execute();
-    $this->assertMail('from', 'sender@example.com', 'Specified from address has been used');
-
-    // Test sending mail to all users of a role. First make sure there is a
-    // custom role and a user for it.
-    $user = $this->drupalCreateUser(array('administer nodes'));
-    $roles = $user->roles;
-    // Remove the authenticate role so we only use the new role created by
-    // drupalCreateUser().
-    unset($roles[DRUPAL_AUTHENTICATED_RID]);
-    rules_action('mail_to_users_of_role', $settings + array('roles' => array_keys($roles)))->execute();
-    $this->assertMail('to', $user->mail, 'Mail to users of a role has been sent.');
-
-    // Test reacting on new log entries and make sure the log entry is usable.
-    $rule = rules_reaction_rule();
-    $rule->event('watchdog');
-    $rule->action('drupal_message', array('message:select' => 'log_entry:message'));
-    $rule->integrityCheck()->save('test_watchdog');
-
-    watchdog('php', 'test %message', array('%message' => 'message'));
-    $msg = drupal_get_messages();
-    $this->assertEqual(array_pop($msg['status']), t('test %message', array('%message' => 'message')), 'Watchdog event occurred and log entry properties can be used.');
-  }
-
-  /**
-   * Tests the path module integration.
-   */
-  function testPathIntegration() {
-    rules_action('path_alias')->execute('foo', 'bar');
-    $path = path_load('foo');
-    $this->assertTrue($path['alias'] == 'bar', 'URL alias has been created.');
-
-    $alias_exists = rules_condition('path_alias_exists', array('alias' => 'bar'))->execute();
-    $this->assertTrue($alias_exists, 'Created URL alias exists.');
-
-    $has_alias = rules_condition('path_has_alias', array('source' => 'foo'))->execute();
-    $this->assertTrue($has_alias, 'System path has an alias.');
-
-    // Test node alias action.
-    $node = $this->drupalCreateNode();
-    rules_action('node_path_alias')->execute($node, 'test');
-    $path = path_load("node/$node->nid");
-    $this->assertTrue($path['alias'] == 'test', 'Node URL alias has been created.');
-
-    // Test term alias action.
-    $term = entity_property_values_create_entity('taxonomy_term', array(
-      'name' => $this->randomName(),
-      'vocabulary' => 1,
-    ))->value();
-    rules_action('taxonomy_term_path_alias')->execute($term, 'term-test');
-    $path = path_load("taxonomy/term/$term->tid");
-    $this->assertTrue($path['alias'] == 'term-test', 'Term URL alias has been created.');
-
-    RulesLog::logger()->checkLog();
-  }
-}
-
-/**
- * Test event dispatcher functionality.
- */
-class RulesEventDispatcherTestCase extends DrupalWebTestCase {
-
-  static function getInfo() {
-    return array(
-      'name' => 'Rules event dispatchers',
-      'description' => 'Tests event dispatcher functionality.',
-      'group' => 'Rules',
-    );
-  }
-
-  function setUp() {
-    parent::setUp('rules', 'rules_test');
-  }
-
-  /**
-   * Tests start and stop functionality.
-   */
-  public function testStartAndStop() {
-    $handler = rules_get_event_handler('rules_test_event');
-    $rule = rules_reaction_rule();
-    $rule->event('rules_test_event');
-
-    // The handler should not yet be watching.
-    $this->assertFalse($handler->isWatching());
-
-    // Once saved, the event cache rebuild should start the watcher.
-    $rule->save();
-    RulesEventSet::rebuildEventCache();
-    $this->assertTrue($handler->isWatching());
-
-    // Deleting should stop the watcher.
-    $rule->delete();
-    $this->assertFalse($handler->isWatching());
-  }
-
-  /**
-   * Tests start and stop functionality when used with multiple events.
-   */
-  public function testStartAndStopMultiple() {
-    $handler = rules_get_event_handler('rules_test_event');
-
-    // Initially, the task handler should not be watching.
-    $this->assertFalse($handler->isWatching());
-
-    // Set up five rules that all use the same event.
-    $rules = array();
-    foreach (array(1, 2, 3, 4, 5) as $key) {
-      $rules[$key] = rules_reaction_rule();
-      $rules[$key]->event('rules_test_event');
-      $rules[$key]->save();
-    }
-
-    // Once saved, the event cache rebuild should start the watcher.
-    RulesEventSet::rebuildEventCache();
-    $this->assertTrue($handler->isWatching());
-
-    // It should continue watching until all events are deleted.
-    foreach ($rules as $key => $rule) {
-      $rule->delete();
-      $this->assertEqual($key !== 5, $handler->isWatching());
-    }
-  }
-}
diff --git a/modules/rules/js/autocomplete.js b/modules/rules/js/autocomplete.js
deleted file mode 100644
index a521f62..0000000
--- a/modules/rules/js/autocomplete.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * @file
- * Forked from core's autocomplete.
- */
-
-(function ($, Drupal) {
-
-  'use strict';
-
-  var autocomplete;
-
-  /**
-   * JQuery UI autocomplete source callback.
-   *
-   * @param {object} request
-   *   The request object.
-   * @param {function} response
-   *   The function to call with the response.
-   */
-  function sourceData(request, response) {
-    var elementId = this.element.attr('id');
-
-    if (!(elementId in autocomplete.cache)) {
-      autocomplete.cache[elementId] = {};
-    }
-
-    /**
-     * Transforms the data object into an array and update autocomplete results.
-     *
-     * @param {object} data
-     *   The data sent back from the server.
-     */
-    function sourceCallbackHandler(data) {
-      autocomplete.cache[elementId][term] = data;
-
-      response(data);
-    }
-
-    // Get the desired term and construct the autocomplete URL for it.
-    var term = request.term;
-
-    // Check if the term is already cached.
-    if (autocomplete.cache[elementId].hasOwnProperty(term)) {
-      response(autocomplete.cache[elementId][term]);
-    }
-    else {
-      var options = $.extend({success: sourceCallbackHandler, data: {q: term}}, autocomplete.ajax);
-      $.ajax(this.element.attr('data-autocomplete-path'), options);
-    }
-  }
-
-  /**
-   * Handles an autocompletefocus event.
-   *
-   * @return {bool}
-   *   Always returns false.
-   */
-  function focusHandler() {
-    return false;
-  }
-
-  /**
-   * Handles the autocomplete selection event.
-   *
-   * Restarts autocompleting when the selection ends in a dot, for nested data
-   * selectors.
-   *
-   * @param {object} event
-   *   The event object.
-   * @param {object} ui
-   *   The UI object holding the selected value.
-   */
-  function selectHandler(event, ui) {
-    var input_value = ui.item.value;
-    if (input_value.substr(input_value.length - 1) === '.') {
-      $(event.target).trigger('keydown');
-    }
-  }
-
-  /**
-   * Override jQuery UI _renderItem function to output HTML by default.
-   *
-   * @param {jQuery} ul
-   *   jQuery collection of the ul element.
-   * @param {object} item
-   *   The list item to append.
-   *
-   * @return {jQuery}
-   *   jQuery collection of the ul element.
-   */
-  function renderItem(ul, item) {
-    return $('<li>')
-      .append($('<a>').html(item.label))
-      .appendTo(ul);
-  }
-
-  /**
-   * Attaches the autocomplete behavior to all required fields.
-   *
-   * @type {Drupal~behavior}
-   *
-   * @prop {Drupal~behaviorAttach} attach
-   *   Attaches the autocomplete behaviors.
-   * @prop {Drupal~behaviorDetach} detach
-   *   Detaches the autocomplete behaviors.
-   */
-  Drupal.behaviors.rules_autocomplete = {
-    attach: function (context) {
-      // Act on textfields with the "rules-autocomplete" class.
-      var $autocomplete = $(context).find('input.rules-autocomplete').once('autocomplete');
-      if ($autocomplete.length) {
-
-        var closing = false;
-
-        $.extend(autocomplete.options, {
-          close: function() {
-            // Avoid double-pop-up issue.
-            closing = true;
-            setTimeout(function() {
-              closing = false;
-            }, 300);
-          }
-        });
-        // Use jQuery UI Autocomplete on the textfield.
-        $autocomplete.autocomplete(autocomplete.options)
-          .each(function() {
-            $(this).data('ui-autocomplete')._renderItem = autocomplete.options.renderItem;
-            // Immediately pop out the autocomplete when the field gets focus.
-            $(this).focus(function() {
-              if (!closing) {
-                $(this).autocomplete('search');
-              }
-            });
-          });
-      }
-    },
-    detach: function (context, settings, trigger) {
-      if (trigger === 'unload') {
-        $(context).find('input.rules-autocomplete')
-          .removeOnce('autocomplete')
-          .autocomplete('destroy');
-      }
-    }
-  };
-
-  /**
-   * Autocomplete object implementation.
-   *
-   * @namespace Drupal.autocomplete
-   */
-  autocomplete = {
-    cache: {},
-
-    /**
-     * JQuery UI option object.
-     *
-     * @name Drupal.autocomplete.options
-     */
-    options: {
-      source: sourceData,
-      focus: focusHandler,
-      select: selectHandler,
-      renderItem: renderItem,
-      minLength: 0
-    },
-    ajax: {
-      dataType: 'json'
-    }
-  };
-
-})(jQuery, Drupal);
diff --git a/modules/rules/phpcs.xml.dist b/modules/rules/phpcs.xml.dist
deleted file mode 100644
index 9760f2c..0000000
--- a/modules/rules/phpcs.xml.dist
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset name="rules">
-  <description>Default PHP CodeSniffer configuration for Rules.</description>
-  <file>.</file>
-
-  <exclude-pattern>./d7-tests/</exclude-pattern>
-  <exclude-pattern>./vendor/</exclude-pattern>
-  <exclude-pattern>./config/</exclude-pattern>
-
-  <arg name="extensions" value="inc,install,module,php,profile,test,theme,yml"/>
-  <arg value="s"/>
-
-  <rule ref="Drupal.NamingConventions.ValidVariableName.LowerCamelName">
-    <!-- Annotations must use the same property names as in the configuration. -->
-    <exclude-pattern>src/Annotation</exclude-pattern>
-    <exclude-pattern>src/Core/Annotation</exclude-pattern>
-    <exclude-pattern>src/Ui/RulesUiDefinition.php</exclude-pattern>
-  </rule>
-
-  <rule ref="Drupal.Files.TxtFileLineLength.TooLong">
-    <!-- Do not run this sniff on README.md as the file has long markup lines.
-     -->
-    <exclude-pattern>README.md</exclude-pattern>
-  </rule>
-
-  <!-- The method is overridden with a reason - for better PHPdoc! -->
-  <rule ref="Generic.CodeAnalysis.UselessOverridingMethod.Found">
-    <exclude-pattern>./src/Core/ConditionManager.php</exclude-pattern>
-   </rule>
-
-  <!--Blacklist of coding standard rules that are not yet fixed. -->
-  <rule ref="Drupal">
-    <exclude name="Drupal.Commenting.DocComment.MissingShort"/>
-  </rule>
-
-  <rule ref="DrupalPractice">
-    <!-- Allow empty lines after comments, we don't care. -->
-    <exclude name="DrupalPractice.Commenting.CommentEmptyLine"/>
-  </rule>
-
-  <!-- We always want short array syntax only. -->
-  <rule ref="Generic.Arrays.DisallowLongArraySyntax" />
-</ruleset>
diff --git a/modules/rules/rules.info.yml b/modules/rules/rules.info.yml
deleted file mode 100644
index 467730a..0000000
--- a/modules/rules/rules.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Rules
-type: module
-description: 'React on events and conditionally evaluate actions.'
-package: Rules
-# core: 8.x
-configure: entity.rules_reaction_rule.collection
-dependencies:
- - typed_data:typed_data
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-3.0-alpha3+28-dev'
-core: '8.x'
-project: 'rules'
-datestamp: 1508417995
diff --git a/modules/rules/rules.libraries.yml b/modules/rules/rules.libraries.yml
deleted file mode 100644
index c61e6d7..0000000
--- a/modules/rules/rules.libraries.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-rules.autocomplete:
-  js:
-    js/autocomplete.js: { weight: -1 }
-  dependencies:
-    - core/jquery
-    - core/drupal
-    - core/drupalSettings
-    - core/drupal.ajax
-    - core/jquery.ui.autocomplete
diff --git a/modules/rules/rules.links.action.yml b/modules/rules/rules.links.action.yml
deleted file mode 100644
index 9307b2e..0000000
--- a/modules/rules/rules.links.action.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Action links for Rules.
-
-# Rules reaction related actions.
-rules_reaction_rule_add_action:
-  route_name: entity.rules_reaction_rule.add_form
-  title: 'Add reaction rule'
-  appears_on:
-    - entity.rules_reaction_rule.collection
-
-# Rules component related actions.
-rules_component_add_action:
-  route_name: entity.rules_component.add_form.rule
-  title: 'Add rule'
-  appears_on:
-    - entity.rules_component.collection
diff --git a/modules/rules/rules.links.menu.yml b/modules/rules/rules.links.menu.yml
deleted file mode 100644
index 569de90..0000000
--- a/modules/rules/rules.links.menu.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Menu links for Rules.
-
-rules.reactions:
-  title: 'Rules'
-  route_name: entity.rules_reaction_rule.collection
-  parent: system.admin_config_workflow
-  description: 'Reaction rules administration overview.'
diff --git a/modules/rules/rules.links.task.yml b/modules/rules/rules.links.task.yml
deleted file mode 100644
index db7ad07..0000000
--- a/modules/rules/rules.links.task.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Menu tasks for Rules.
-
-rules.reactions:
-  title: 'Reaction rules'
-  route_name: entity.rules_reaction_rule.collection
-  base_route: entity.rules_reaction_rule.collection
-  weight: 1
-
-rules.components:
-  title: 'Components'
-  route_name: entity.rules_component.collection
-  base_route: entity.rules_reaction_rule.collection
-  weight: 2
-
-rules.settings:
-  title: 'Settings'
-  route_name: rules.settings
-  base_route: entity.rules_reaction_rule.collection
-  weight: 3
diff --git a/modules/rules/rules.module b/modules/rules/rules.module
deleted file mode 100644
index ec2ed2d..0000000
--- a/modules/rules/rules.module
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-/**
- * @file
- * Hook implementations for the Rules module.
- */
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-use Drupal\rules\Event\EntityEvent;
-use Drupal\rules\Event\UserLoginEvent;
-use Drupal\rules\Event\UserLogoutEvent;
-use Drupal\rules\Event\SystemCronEvent;
-
-/**
- * Implements hook_help().
- */
-function rules_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    case 'entity.rules_reaction_rule.collection':
-      $output = t('Reaction rules, listed below, react on selected events on the site. Each reaction rule may fire any number of <em>actions</em>, and may have any number of <em>conditions</em> that must be met for the actions to be executed. You can also set up <a href=":url1">components</a> – stand-alone sets of Rules configuration that can be used in Rules and other parts of your site. See <a href=":url2">the online documentation</a> for an introduction on how to use Rules.', [
-        ':url1' => Url::fromRoute('entity.rules_component.collection')->toString(),
-        ':url2' => 'https://www.drupal.org/node/298480',
-      ]);
-      return $output;
-
-    case 'help.page.rules':
-      $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>';
-      $output .= t('The Rules module allows site administrators to define conditionally executed actions based on occurring events (ECA-rules). For more information, see the <a href=":url1" target="_blank">online documentation for the Rules module</a> and the current <a href=":url2" target="_blank">Rules documentation for Drupal 8 on Gitbooks</a>.', [
-        ':url1' => 'https://www.drupal.org/project/rules',
-        ':url2' => 'https://thefubhy.gitbooks.io/rules/content/',
-      ]);
-      $output .= '</p>';
-      $output .= '<h3>' . t('Uses') . '</h3>';
-      $output .= '<dl>';
-      $output .= '<dt>' . t('Reaction rules') . '</dt>';
-      $output .= '<dd>' . t('Reaction rules associate one or more reactions to one or more specific site events. Execution of a reaction rule actions can optionnally be tied to one or more conditions. To list and update existing reaction rules and to create a new one, visit the <a href=":url">reaction rules overview page</a>.', [':url' => Url::fromRoute('entity.rules_reaction_rule.collection')->toString()]) . '</dd>';
-      $output .= '<dt>' . t('Components') . '</dt>';
-      $output .= '<dd>' . t('Rule components allows to define reusable combined actions which can optionnaly be tied to one or more conditions. Components are useable as actions in reaction rules or in other components. To list and update existing rule components and to create a new one, visit the <a href=":url">components overview pages</a>.', [':url' => Url::fromRoute('entity.rules_component.collection')->toString()]) . '</dd>';
-      $output .= '<dt>' . t('General settings') . '</dt>';
-      $output .= '<dd>' . t('The Rules modules allows to set global settings settings, such as logging. Visit the <a href=":url">rules settings page</a> to view and update current settings.', [':url' => Url::fromRoute('rules.settings')->toString()]) . '</dd>';
-      $output .= '</dl>';
-      return $output;
-  }
-}
-
-/**
- * Implements hook_user_login().
- */
-function rules_user_login($account) {
-  // Set the account twice on the event: as the main subject but also in the
-  // list of arguments.
-  $event = new UserLoginEvent($account);
-  $event_dispatcher = \Drupal::service('event_dispatcher');
-  $event_dispatcher->dispatch(UserLoginEvent::EVENT_NAME, $event);
-}
-
-/**
- * Implements hook_user_logout().
- */
-function rules_user_logout($account) {
-  // Set the account twice on the event: as the main subject but also in the
-  // list of arguments.
-  $event = new UserLogoutEvent($account, ['account' => $account]);
-  $event_dispatcher = \Drupal::service('event_dispatcher');
-  $event_dispatcher->dispatch(UserLogoutEvent::EVENT_NAME, $event);
-}
-
-/**
- * Implements hook_entity_view().
- */
-function rules_entity_view(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode) {
-  // Only handle content entities and ignore config entities.
-  if ($entity instanceof ContentEntityInterface) {
-    $entity_type_id = $entity->getEntityTypeId();
-    $event = new EntityEvent($entity, [$entity_type_id => $entity]);
-    $event_dispatcher = \Drupal::service('event_dispatcher');
-    $event_dispatcher->dispatch("rules_entity_view:$entity_type_id", $event);
-  }
-}
-
-/**
- * Implements hook_entity_presave().
- */
-function rules_entity_presave(EntityInterface $entity) {
-  // Only handle content entities and ignore config entities.
-  if ($entity instanceof ContentEntityInterface) {
-    $entity_type_id = $entity->getEntityTypeId();
-    $event = new EntityEvent($entity, [
-      $entity_type_id => $entity,
-      $entity_type_id . '_unchanged' => $entity->original,
-    ]);
-    $event_dispatcher = \Drupal::service('event_dispatcher');
-    $event_dispatcher->dispatch("rules_entity_presave:$entity_type_id", $event);
-  }
-}
-
-/**
- * Implements hook_entity_delete().
- */
-function rules_entity_delete(EntityInterface $entity) {
-  // Only handle content entities and ignore config entities.
-  if ($entity instanceof ContentEntityInterface) {
-    $entity_type_id = $entity->getEntityTypeId();
-    $event = new EntityEvent($entity, [$entity_type_id => $entity]);
-    $event_dispatcher = \Drupal::service('event_dispatcher');
-    $event_dispatcher->dispatch("rules_entity_delete:$entity_type_id", $event);
-  }
-}
-
-/**
- * Implements hook_entity_insert().
- */
-function rules_entity_insert(EntityInterface $entity) {
-  // Only handle content entities and ignore config entities.
-  if ($entity instanceof ContentEntityInterface) {
-    $entity_type_id = $entity->getEntityTypeId();
-    $event = new EntityEvent($entity, [$entity_type_id => $entity]);
-    $event_dispatcher = \Drupal::service('event_dispatcher');
-    $event_dispatcher->dispatch("rules_entity_insert:$entity_type_id", $event);
-  }
-}
-
-/**
- * Implements hook_entity_update().
- */
-function rules_entity_update(EntityInterface $entity) {
-  // Only handle content entities and ignore config entities.
-  if ($entity instanceof ContentEntityInterface) {
-    $entity_type_id = $entity->getEntityTypeId();
-    $event = new EntityEvent($entity, [
-      $entity_type_id => $entity,
-      $entity_type_id . '_unchanged' => $entity->original,
-    ]);
-    $event_dispatcher = \Drupal::service('event_dispatcher');
-    $event_dispatcher->dispatch("rules_entity_update:$entity_type_id", $event);
-  }
-}
-
-/**
- * Implements hook_cron().
- */
-function rules_cron() {
-  $event = new SystemCronEvent();
-  $event_dispatcher = \Drupal::service('event_dispatcher');
-  $event_dispatcher->dispatch(SystemCronEvent::EVENT_NAME, $event);
-}
-
-/**
- * Implements hook_mail().
- */
-function rules_mail($key, &$message, $params) {
-  $message['subject'] .= str_replace(["\r", "\n"], '', $params['subject']);
-  $message['body'][] = $params['message'];
-}
diff --git a/modules/rules/rules.permissions.yml b/modules/rules/rules.permissions.yml
deleted file mode 100644
index 0c61381..0000000
--- a/modules/rules/rules.permissions.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Most of the time administrators will be able to administer both reactions,
-# components and settings. But permissions are split up in such a way it
-# should be possible to have 'light' and 'root' rules administrators.
-administer rules:
-  title: 'Administer Rules'
-  description: 'Administer all Rules configurations and settings.'
-administer rules reactions:
-  title: 'Administer Rules reactions'
-  description: 'Administer Rules reaction configurations and settings.'
-administer rules components:
-  title: 'Administer Rules components'
-  description: 'Administer Rules component configurations and settings.'
-bypass rules access:
-  title: 'Bypass Rules access control'
-  description: 'Control all configurations regardless of permission restrictions of events, conditions or actions.'
-  restrict access: true
-access rules debug:
-  title: 'View Rules debug log'
-  description: 'Access the Rules debug log.'
diff --git a/modules/rules/rules.routing.yml b/modules/rules/rules.routing.yml
deleted file mode 100644
index ce2b86c..0000000
--- a/modules/rules/rules.routing.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-# Declaration of Rules routings.
-
-
-### Rules settings form
-rules.settings:
-  path: '/admin/config/workflow/rules/settings'
-  defaults:
-    _form: '\Drupal\rules\Form\RulesSettingsForm'
-    _title: 'Rules settings'
-  requirements:
-    _permission: 'administer rules'
-
-
-### Rules Reactions
-entity.rules_reaction_rule.collection:
-  path: '/admin/config/workflow/rules'
-  defaults:
-    _entity_list: 'rules_reaction_rule'
-    _title: 'Rules'
-  requirements:
-    _permission: 'administer rules+administer rules reactions'
-
-entity.rules_reaction_rule.add_form:
-  path: '/admin/config/workflow/rules/reactions/add'
-  defaults:
-    _entity_form: 'rules_reaction_rule.add'
-    _title: 'Add reaction rule'
-  options:
-    _rules_ui: rules.reaction_rules
-  requirements:
-    _permission: 'administer rules+administer rules reactions'
-
-entity.rules_reaction_rule.edit_form:
-  path: '/admin/config/workflow/rules/reactions/edit/{rules_reaction_rule}'
-  defaults:
-    _entity_form: 'rules_reaction_rule.edit'
-    _title_callback: '\Drupal\rules\Form\ReactionRuleEditForm::getTitle'
-  options:
-    _rules_ui: rules.reaction_rules
-  requirements:
-    _permission: 'administer rules+administer rules reactions'
-
-entity.rules_reaction_rule.delete_form:
-  path: '/admin/config/workflow/rules/reactions/delete/{rules_reaction_rule}'
-  defaults:
-    _entity_form: 'rules_reaction_rule.delete'
-  options:
-    _rules_ui: rules.reaction_rules
-  requirements:
-    _permission: 'administer rules+administer rules reactions'
-
-### Rules Components
-entity.rules_component.collection:
-  path: '/admin/config/workflow/rules/components'
-  defaults:
-  # Calls the list controller, defined in the annotation of the rules component entity.
-    _entity_list: 'rules_component'
-    _title: 'Rules components'
-  requirements:
-    _permission: 'administer rules+administer rules components'
-
-entity.rules_component.add_form.rule:
-  path: '/admin/config/workflow/rules/components/add/rule'
-  defaults:
-    _entity_form: 'rules_component.add'
-    _title: 'Add rule'
-  options:
-    _rules_ui: rules.components
-  requirements:
-    _permission: 'administer rules+administer rules components'
-
-entity.rules_component.edit_form:
-  path: '/admin/config/workflow/rules/components/edit/{rules_component}'
-  defaults:
-    _entity_form: 'rules_component.edit'
-    _title_callback: '\Drupal\rules\Form\RulesComponentEditForm::getTitle'
-  options:
-    _rules_ui: rules.components
-  requirements:
-    _permission: 'administer rules+administer rules components'
-
-entity.rules_component.delete_form:
-  path: '/admin/config/workflow/rules/components/delete/{rules_component}'
-  defaults:
-    _entity_form: 'rules_component.delete'
-  options:
-    _rules_ui: rules.components
-  requirements:
-    _permission: 'administer rules+administer rules components'
diff --git a/modules/rules/rules.rules.events.yml b/modules/rules/rules.rules.events.yml
deleted file mode 100644
index ee4081e..0000000
--- a/modules/rules/rules.rules.events.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-rules_user_login:
-  label: 'User has logged in'
-  category: 'User'
-  context:
-    account:
-      type: 'entity:user'
-      label: 'Logged in user'
-rules_user_logout:
-  label: 'User has logged out'
-  category: 'User'
-  context:
-    account:
-      type: 'entity:user'
-      label: 'Logged out user'
-kernel.request:
-  label: 'Drupal is initializing'
-  category: 'System'
-  # @todo Should this event have the request as context? Should we define a
-  # request data type?
-  help: "Be aware that some actions might initialize the theme system. After that, it's impossible for any module to change the used theme."
-rules_entity_presave:
-  label: 'Before saving an entity'
-  deriver: '\Drupal\rules\Plugin\RulesEvent\EntityPresaveDeriver'
-  class: '\Drupal\rules\EventHandler\ConfigurableEventHandlerEntityBundle'
-rules_entity_delete:
-  label: 'After deleting an entity'
-  deriver: '\Drupal\rules\Plugin\RulesEvent\EntityDeleteDeriver'
-  class: '\Drupal\rules\EventHandler\ConfigurableEventHandlerEntityBundle'
-rules_entity_insert:
-  label: 'After saving a new entity'
-  deriver: '\Drupal\rules\Plugin\RulesEvent\EntityInsertDeriver'
-  class: '\Drupal\rules\EventHandler\ConfigurableEventHandlerEntityBundle'
-rules_entity_update:
-  label: 'After updating an entity'
-  deriver: '\Drupal\rules\Plugin\RulesEvent\EntityUpdateDeriver'
-  class: '\Drupal\rules\EventHandler\ConfigurableEventHandlerEntityBundle'
-rules_entity_view:
-  label: 'Viewing an entity'
-  deriver: '\Drupal\rules\Plugin\RulesEvent\EntityViewDeriver'
-  class: '\Drupal\rules\EventHandler\ConfigurableEventHandlerEntityBundle'
-rules_system_cron:
-  label: 'Cron maintenance tasks are performed'
-  category: 'System'
-rules_system_logger_event:
-  label: 'System log entry is created'
-  category: 'System'
-  context:
-    # @todo: create a TypedData logger-entry object: https://www.drupal.org/node/2625238
-    logger_entry:
-      type: 'any'
-      label: 'Logger entry'
diff --git a/modules/rules/rules.rules_ui.yml b/modules/rules/rules.rules_ui.yml
deleted file mode 100644
index e7b235e..0000000
--- a/modules/rules/rules.rules_ui.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-rules.reaction_rules:
-  label: 'Manage reaction rules.'
-  base_route: entity.rules_reaction_rule.edit_form
-  component_type_label: rule
-  settings:
-    config_parameter: rules_reaction_rule
-rules.components:
-  label: 'Manage re-usabe components.'
-  base_route: entity.rules_component.edit_form
-  component_type_label: rule
-  settings:
-    config_parameter: rules_component
diff --git a/modules/rules/rules.services.yml b/modules/rules/rules.services.yml
deleted file mode 100644
index 7812afc..0000000
--- a/modules/rules/rules.services.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-services:
-  plugin.manager.rules_expression:
-    class: Drupal\rules\Engine\ExpressionManager
-    arguments: ['@container.namespaces', '@module_handler', '@uuid']
-  plugin.manager.rules_action:
-    class: Drupal\rules\Core\RulesActionManager
-    parent: default_plugin_manager
-  plugin.manager.rules_event:
-    class: Drupal\rules\Core\RulesEventManager
-    arguments: ['@module_handler']
-  plugin.manager.rules_data_processor:
-    class: Drupal\rules\Context\DataProcessorManager
-    arguments: ['@container.namespaces', '@module_handler']
-  plugin.manager.rules_ui:
-    class: Drupal\rules\Ui\RulesUiManager
-    arguments: ['@module_handler']
-  logger.channel.rules:
-    class: Drupal\rules\Logger\RulesLoggerChannel
-    arguments: ['@config.factory']
-  logger.ruleslog:
-    class: Drupal\rules\Logger\RulesLog
-    tags:
-      - { name: logger }
-    arguments: ['@event_dispatcher', '@logger.log_message_parser']
-  rules.event_subscriber:
-    class: Drupal\rules\EventSubscriber\GenericEventSubscriber
-    arguments: ['@entity_type.manager', '@plugin.manager.rules_event', '@rules.component_repository']
-    tags:
-      - { name: 'event_subscriber' }
-  rules.redirect_event_subscriber:
-    class: Drupal\rules\EventSubscriber\RedirectEventSubscriber
-    tags:
-      - { name: 'event_subscriber' }
-  rules.cache:
-    class: Drupal\Core\Cache\CacheBackendInterface
-    tags:
-      - { name: cache.bin }
-    factory: cache_factory:get
-    arguments: [rules]
-  rules.component_repository:
-    class: Drupal\rules\Engine\RulesComponentRepository
-    arguments: ['@rules.cache', '@language_manager']
-    tags:
-      - { name: service_collector, tag: 'rules.component_resolver', call: addComponentResolver }
-  rules.component_resolver.component_config:
-    class: Drupal\rules\ComponentResolver\ComponentConfigResolver
-    arguments: ['@entity_type.manager']
-    tags:
-      - { name: rules.component_resolver, resolver_name: rules_component }
-  rules.component_resolver.event_component:
-    class: Drupal\rules\ComponentResolver\EventComponentResolver
-    arguments: ['@entity_type.manager', '@plugin.manager.rules_expression']
-    tags:
-      - { name: rules.component_resolver, resolver_name: rules_event }
-  rules.ui_route_enhancer:
-    class: Drupal\rules\Routing\RulesUiRouteEnhancer
-    arguments: ['@plugin.manager.rules_ui']
-    tags:
-      - { name: route_enhancer }
-  rules.ui_route_subscriber:
-    class: Drupal\rules\Routing\RulesUiRouteSubscriber
-    arguments: ['@plugin.manager.rules_ui']
-    tags:
-      - { name: 'event_subscriber' }
diff --git a/modules/rules/src/Annotation/RulesDataProcessor.php b/modules/rules/src/Annotation/RulesDataProcessor.php
deleted file mode 100644
index f55f757..0000000
--- a/modules/rules/src/Annotation/RulesDataProcessor.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\rules\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines the RulesDataProcessor annotation class.
- *
- * This annotation is used to identify plugins that want to alter variables
- * before they are passed on during Rules execution.
- *
- * @Annotation
- */
-class RulesDataProcessor extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the rules plugin.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   *
-   * @ingroup plugin_translatable
-   */
-  public $label;
-
-  /**
-   * The data types this data processor can be applied to.
-   *
-   * @var array
-   */
-  public $types;
-
-}
diff --git a/modules/rules/src/Annotation/RulesExpression.php b/modules/rules/src/Annotation/RulesExpression.php
deleted file mode 100644
index 4585219..0000000
--- a/modules/rules/src/Annotation/RulesExpression.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\rules\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines the RulesExpression annotation class.
- *
- * @Annotation
- */
-class RulesExpression extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the rules plugin.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   *
-   * @ingroup plugin_translatable
-   */
-  public $label;
-
-  /**
-   * The rules type, either "action" or "condition".
-   *
-   * @var string
-   */
-  public $type = '';
-
-  /**
-   * The class name of the form for displaying/editing this expression.
-   *
-   * @var string
-   */
-  public $form_class;
-
-}
diff --git a/modules/rules/src/ComponentResolver/ComponentConfigResolver.php b/modules/rules/src/ComponentResolver/ComponentConfigResolver.php
deleted file mode 100644
index 82db17d..0000000
--- a/modules/rules/src/ComponentResolver/ComponentConfigResolver.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\rules\ComponentResolver;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\rules\Engine\RulesComponentResolverInterface;
-use Drupal\rules\Entity\RulesComponentConfig;
-
-/**
- * Resolves Rules component configs.
- */
-class ComponentConfigResolver implements RulesComponentResolverInterface {
-
-  /**
-   * The rules component entity storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $entityStorage;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
-    $this->entityStorage = $entity_type_manager->getStorage('rules_component');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMultiple(array $ids) {
-    return array_map(function (RulesComponentConfig $config) {
-      return $config->getComponent();
-    }, $this->entityStorage->loadMultiple($ids));
-  }
-
-}
diff --git a/modules/rules/src/ComponentResolver/EventComponentResolver.php b/modules/rules/src/ComponentResolver/EventComponentResolver.php
deleted file mode 100644
index 7d7fe9f..0000000
--- a/modules/rules/src/ComponentResolver/EventComponentResolver.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace Drupal\rules\ComponentResolver;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\rules\Engine\ExpressionManagerInterface;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\rules\Engine\RulesComponentResolverInterface;
-
-/**
- * Resolves components that hold all reaction rules for a given event.
- */
-class EventComponentResolver implements RulesComponentResolverInterface {
-
-  /**
-   * The rules component entity storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $entityStorage;
-
-  /**
-   * The Rules expression manager.
-   *
-   * @var \Drupal\rules\Engine\ExpressionManagerInterface
-   */
-  protected $expressionManager;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\rules\Engine\ExpressionManagerInterface $expression_manager
-   *   The rules expression plugin manager.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, ExpressionManagerInterface $expression_manager) {
-    $this->entityStorage = $entity_type_manager->getStorage('rules_reaction_rule');
-    $this->expressionManager = $expression_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMultiple(array $event_ids) {
-    // @todo: Improve this by adding a custom expression plugin that clones
-    // the state after each rule, such that added variables added by one rule
-    // are not interfering with the variables of another rule.
-    $results = [];
-    foreach ($event_ids as $event_id) {
-      $action_set = $this->expressionManager->createActionSet();
-      // @todo Only load active reaction rules here.
-      $configs = $this->entityStorage->loadByProperties(['events.*.event_name' => $event_id]);
-      foreach ($configs as $config) {
-        $action_set->addExpressionObject($config->getExpression());
-      }
-      $results[$event_id] = RulesComponent::create($action_set);
-    }
-    return $results;
-  }
-
-}
diff --git a/modules/rules/src/Context/AnnotatedClassDiscovery.php b/modules/rules/src/Context/AnnotatedClassDiscovery.php
deleted file mode 100644
index 81fdff2..0000000
--- a/modules/rules/src/Context/AnnotatedClassDiscovery.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-use Doctrine\Common\Annotations\SimpleAnnotationReader;
-use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery as CoreAnnotatedClassDiscovery;
-
-/**
- * Extends the annotation class discovery for usage with Rules context.
- *
- * We modify the annotations classes for ContextDefinition and for Condition.
- * This class makes sure that our plugin managers apply these.
- */
-class AnnotatedClassDiscovery extends CoreAnnotatedClassDiscovery {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getAnnotationReader() {
-    if (!isset($this->annotationReader)) {
-      // Do not call out the parent, but re-configure the simple annotation
-      // reader on our own, so we can control the order of namespaces.
-      $this->annotationReader = new SimpleAnnotationReader();
-
-      // Make sure to add our namespace first, so our ContextDefinition and
-      // Condition annotations gets picked.
-      $this->annotationReader->addNamespace('Drupal\rules\Context\Annotation');
-      $this->annotationReader->addNamespace('Drupal\rules\Core\Annotation');
-      // Add the namespaces from the main plugin annotation, like @EntityType.
-      $namespace = substr($this->pluginDefinitionAnnotationName, 0, strrpos($this->pluginDefinitionAnnotationName, '\\'));
-      $this->annotationReader->addNamespace($namespace);
-      // Add general core annotations like @Translation.
-      $this->annotationReader->addNamespace('Drupal\Core\Annotation');
-    }
-    return $this->annotationReader;
-  }
-
-}
diff --git a/modules/rules/src/Context/Annotation/ContextDefinition.php b/modules/rules/src/Context/Annotation/ContextDefinition.php
deleted file mode 100644
index 54b6df6..0000000
--- a/modules/rules/src/Context/Annotation/ContextDefinition.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context\Annotation;
-
-use Drupal\Core\Annotation\ContextDefinition as CoreContextDefinition;
-use Drupal\Core\Annotation\Translation;
-use Drupal\rules\Context\ContextDefinition as RulesContextDefinition;
-
-/**
- * Extends the core context definition annotation object for Rules.
- *
- * Ensures context definitions use
- * \Drupal\rules\Context\ContextDefinitionInterface.
- *
- * @Annotation
- *
- * @ingroup plugin_context
- */
-class ContextDefinition extends CoreContextDefinition {
-
-  /**
-   * The ContextDefinitionInterface object.
-   *
-   * @var \Drupal\rules\Context\ContextDefinitionInterface
-   */
-  protected $definition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $values) {
-    // Filter out any @Translation annotation objects.
-    foreach ($values as $key => $value) {
-      if ($value instanceof Translation) {
-        $values[$key] = $value->get();
-      }
-    }
-    $this->definition = RulesContextDefinition::createFromArray($values);
-  }
-
-  /**
-   * Returns the value of an annotation.
-   *
-   * @return \Drupal\rules\Context\ContextDefinitionInterface
-   *   Return the Rules version of the ContextDefinitionInterface.
-   */
-  public function get() {
-    return $this->definition;
-  }
-
-}
diff --git a/modules/rules/src/Context/ContextAwarePluginInterface.php b/modules/rules/src/Context/ContextAwarePluginInterface.php
deleted file mode 100644
index 0cfb0b4..0000000
--- a/modules/rules/src/Context/ContextAwarePluginInterface.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-use Drupal\Core\Plugin\ContextAwarePluginInterface as CoreContextAwarePluginInterface;
-
-/**
- * Rules extension of ContextAwarePluginInterface.
- */
-interface ContextAwarePluginInterface extends CoreContextAwarePluginInterface {
-
-  /**
-   * Refines used and provided context definitions based upon context values.
-   *
-   * When a plugin is configured half-way or even fully, some context values are
-   * already available upon which the definition of subsequent or provided
-   * context can be refined.
-   *
-   * Implement this method, when the plugin's context definitions need to be
-   * refined. When the selected data definitions should be refined, implement
-   * ::assertMetadata() instead.
-   *
-   * Note that context gets refined at configuration and execution time of the
-   * plugin.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface[] $selected_data
-   *   An array of data definitions for context that is mapped using a data
-   *   selector, keyed by context name.
-   */
-  public function refineContextDefinitions(array $selected_data);
-
-  /**
-   * Asserts additional metadata for the selected data.
-   *
-   * Allows the plugin to assert additional metadata that is in place when the
-   * plugin has been successfully executed. A typical use-case would be
-   * asserting the node type for a "Node is of type" condition. By doing so,
-   * sub-sequent executed plugins are aware of the metadata and can build upon
-   * it.
-   *
-   * Implement this method, when the selected data definitions need to be
-   * refined. When the plugin's context definitions should be refined, implement
-   * ::refineContextDefinitions() instead.
-   *
-   * Note that metadata is only asserted on configuration time. The plugin has
-   * to ensure that the run-time data matches the asserted configuration if it
-   * has been executed successfully.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface[] $selected_data
-   *   An array of data definitions for context that is mapped using a data
-   *   selector, keyed by context name.
-   *
-   * @return \Drupal\Core\TypedData\DataDefinitionInterface[]
-   *   An array of modified data definitions, keyed as the passed array. Note
-   *   data definitions need to be cloned *before* they are modified, such that
-   *   the changes do not propagate unintentionally.
-   */
-  public function assertMetadata(array $selected_data);
-
-}
diff --git a/modules/rules/src/Context/ContextConfig.php b/modules/rules/src/Context/ContextConfig.php
deleted file mode 100644
index 0c4db0e..0000000
--- a/modules/rules/src/Context/ContextConfig.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-use Drupal\Core\Plugin\ContextAwarePluginInterface as CoreContextAwarePluginInterface;
-use Drupal\rules\Exception\LogicException;
-
-/**
- * Class for value objects helping with context configuration.
- *
- * @see \Drupal\rules\Context\ContextHandlerTrait
- */
-class ContextConfig {
-
-  /**
-   * The config array.
-   *
-   * @var array
-   */
-  protected $config = [
-    'context_values' => [],
-    'context_mapping' => [],
-    'context_processors' => [],
-    'provides_mapping' => [],
-  ];
-
-  /**
-   * Creates a context config object.
-   *
-   * @param array $values
-   *   (optional) Some initial values to set. In the same format as returned
-   *   from static::toArray().
-   *
-   * @return $this
-   */
-  public static function create(array $values = []) {
-    return new static($values);
-  }
-
-  /**
-   * Constructs the object.
-   *
-   * @param array $values
-   *   Some initial values to set. In the same format as returned from
-   *   static::toArray().
-   */
-  protected function __construct(array $values) {
-    $this->config = $values + $this->config;
-  }
-
-  /**
-   * Maps the data specified by the selector to the given context.
-   *
-   * @param string $context_name
-   *   The name of the context.
-   * @param string $property_path
-   *   A valid property path; e.g., "node.uid.target_id".
-   *
-   * @throws \Drupal\rules\Exception\LogicException
-   *   Thrown if a context value and map are set for a given context at the same
-   *   time.
-   *
-   * @return $this
-   */
-  public function map($context_name, $property_path) {
-    if (isset($this->config['context_values'][$context_name])) {
-      throw new LogicException("Cannot map a context value and pre-define it at the same time.");
-    }
-    $this->config['context_mapping'][$context_name] = $property_path;
-    return $this;
-  }
-
-  /**
-   * Sets a pre-defined value for the given context.
-   *
-   * @param string $context_name
-   *   The name of the context.
-   * @param mixed $value
-   *   The value to set for the context. The value must he a valid value for the
-   *   context's data type, unless a data processor takes care of processing it
-   *   to a valid value.
-   *
-   * @throws \Drupal\rules\Exception\LogicException
-   *   Thrown if a context value and map are set for a given context at the same
-   *   time.
-   *
-   * @return $this
-   */
-  public function setValue($context_name, $value) {
-    if (isset($this->config['context_mapping'][$context_name])) {
-      throw new LogicException("Cannot map a context value and pre-define it at the same time.");
-    }
-    $this->config['context_values'][$context_name] = $value;
-    return $this;
-  }
-
-  /**
-   * Maps the name of a provided context.
-   *
-   * @param string $provided_context_name
-   *   The name of the provided context.
-   * @param string $context_name
-   *   The context name under which the provided context should be registered.
-   *
-   * @return $this
-   */
-  public function provideAs($provided_context_name, $context_name) {
-    $this->config['provides_mapping'][$provided_context_name] = $context_name;
-    return $this;
-  }
-
-  /**
-   * Sets an arbitrary configuration value under the given key.
-   *
-   * This may be used for setting any configuration options that are not making
-   * use of the context system.
-   *
-   * @param string $key
-   *   The config key to set.
-   * @param mixed $value
-   *   The value to set for the config key.
-   *
-   * @return $this
-   */
-  public function setConfigKey($key, $value) {
-    $this->config[$key] = $value;
-    return $this;
-  }
-
-  /**
-   * Configures a data processor for the given context.
-   *
-   * @param string $context_name
-   *   The name of the context.
-   * @param string $plugin_id
-   *   The id of the data processor plugin to use.
-   * @param array $options
-   *   (optional) An array of plugin configuration, as used by the plugin.
-   *
-   * @return $this
-   */
-  public function process($context_name, $plugin_id, array $options = []) {
-    $this->config['context_processors'][$context_name][$plugin_id] = $options;
-    return $this;
-  }
-
-  /**
-   * Negates the result of the plugin (or not).
-   *
-   * Only applicable to condition plugins.
-   *
-   * @param bool $bool
-   *   Whether to negate the result.
-   *
-   * @return $this
-   */
-  public function negateResult($bool = TRUE) {
-    return $this->setConfigKey('negate', $bool);
-  }
-
-  /**
-   * Exports the configuration to an array.
-   *
-   * @return array
-   *   The config array, with the following keys set:
-   *   - context_map: An array of data selectors, keyed by context name.
-   *   - context An array of context values, keyed by context.
-   *   - context_processors: An array of data processor config, keyed by context
-   *     name and process plugin id.
-   *   - provides_mapping: An array of context names to use for provided
-   *     context, keyed by provided context name.
-   *   - Any other other config keys that have been set.
-   */
-  public function toArray() {
-    return $this->config;
-  }
-
-  /**
-   * Checks the config for the given plugin.
-   *
-   * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
-   *   An instance of the plugin for which the config has been created.
-   *
-   * @todo: Implement.
-   */
-  public function checkConfig(CoreContextAwarePluginInterface $plugin) {
-    // @todo.
-  }
-
-}
diff --git a/modules/rules/src/Context/ContextDefinition.php b/modules/rules/src/Context/ContextDefinition.php
deleted file mode 100644
index 7122d6e..0000000
--- a/modules/rules/src/Context/ContextDefinition.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-use Drupal\Core\Plugin\Context\ContextDefinition as ContextDefinitionCore;
-use Drupal\Component\Plugin\Exception\ContextException;
-
-/**
- * Extends the core context definition class with useful methods.
- */
-class ContextDefinition extends ContextDefinitionCore implements ContextDefinitionInterface {
-
-  /**
-   * The mapping of config export keys to internal properties.
-   *
-   * @var array
-   */
-  protected static $nameMap = [
-    'type' => 'dataType',
-    'label' => 'label',
-    'description' => 'description',
-    'multiple' => 'isMultiple',
-    'required' => 'isRequired',
-    'default_value' => 'defaultValue',
-    'constraints' => 'constraints',
-    'allow_null' => 'allowNull',
-    'assignment_restriction' => 'assignmentRestriction',
-  ];
-
-  /**
-   * Whether the context value is allowed to be NULL or not.
-   *
-   * @var bool
-   */
-  protected $allowNull = FALSE;
-
-  /**
-   * The assignment restriction of this context.
-   *
-   * @var string|null
-   *
-   * @see \Drupal\rules\Context\ContextDefinitionInterface::getAssignmentRestriction()
-   */
-  protected $assignmentRestriction = NULL;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function toArray() {
-    $values = [];
-    $defaults = get_class_vars(__CLASS__);
-    foreach (static::$nameMap as $key => $property_name) {
-      // Only export values for non-default properties.
-      if ($this->$property_name !== $defaults[$property_name]) {
-        $values[$key] = $this->$property_name;
-      }
-    }
-    return $values;
-  }
-
-  /**
-   * Creates a definition object from an exported array of values.
-   *
-   * @param array $values
-   *   The array of values, as returned by toArray().
-   *
-   * @return static
-   *   The created definition.
-   *
-   * @throws \Drupal\Component\Plugin\Exception\ContextException
-   *   If the required classes are not implemented.
-   */
-  public static function createFromArray(array $values) {
-    if (isset($values['class']) && !in_array(ContextDefinitionInterface::class, class_implements($values['class']))) {
-      throw new ContextException('ContextDefinition class must implement ' . ContextDefinitionInterface::class . '.');
-    }
-    // Default to Rules context definition class.
-    $values['class'] = isset($values['class']) ? $values['class'] : ContextDefinition::class;
-    if (!isset($values['value'])) {
-      $values['value'] = 'any';
-    }
-
-    $definition = $values['class']::create($values['value']);
-    foreach (array_intersect_key(static::$nameMap, $values) as $key => $name) {
-      $definition->$name = $values[$key];
-    }
-    return $definition;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isAllowedNull() {
-    return $this->allowNull;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setAllowNull($null_allowed) {
-    $this->allowNull = $null_allowed;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAssignmentRestriction() {
-    return $this->assignmentRestriction;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setAssignmentRestriction($restriction) {
-    $this->assignmentRestriction = $restriction;
-    return $this;
-  }
-
-}
diff --git a/modules/rules/src/Context/ContextDefinitionInterface.php b/modules/rules/src/Context/ContextDefinitionInterface.php
deleted file mode 100644
index 118627c..0000000
--- a/modules/rules/src/Context/ContextDefinitionInterface.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-use Drupal\Core\Plugin\Context\ContextDefinitionInterface as ContextDefinitionInterfaceCore;
-
-/**
- * Context definition information required by Rules.
- *
- * The core interface is extended to add properties that are necessary for
- * Rules.
- */
-interface ContextDefinitionInterface extends ContextDefinitionInterfaceCore {
-
-  /**
-   * Constants for the context assignment restriction mode.
-   *
-   * @see ::getAssignmentRestriction()
-   */
-  const ASSIGNMENT_RESTRICTION_INPUT = 'input';
-  const ASSIGNMENT_RESTRICTION_SELECTOR = 'selector';
-
-  /**
-   * Determines if the context value is allowed to be NULL.
-   *
-   * @return bool
-   *   TRUE if NULL values are allowed, FALSE otherwise.
-   */
-  public function isAllowedNull();
-
-  /**
-   * Sets the "allow NULL value" behavior.
-   *
-   * @param bool $null_allowed
-   *   TRUE if NULL values should be allowed, FALSE otherwise.
-   *
-   * @return $this
-   */
-  public function setAllowNull($null_allowed);
-
-  /**
-   * Determines if this context has an assignment restriction.
-   *
-   * @return string|null
-   *   Either ASSIGNMENT_RESTRICTION_INPUT for contexts that are only allowed to
-   *   be provided as input values, ASSIGNMENT_RESTRICTION_SELECTOR for contexts
-   *   that must be provided as data selectors or NULL if there is no
-   *   restriction for this context.
-   */
-  public function getAssignmentRestriction();
-
-  /**
-   * Sets the assignment restriction mode for this context.
-   *
-   * @param string|null $restriction
-   *   Either ASSIGNMENT_RESTRICTION_INPUT for contexts that are only allowed to
-   *   be provided as input values, ASSIGNMENT_RESTRICTION_SELECTOR for contexts
-   *   that must be provided as data selectors or NULL if there is no
-   *   restriction for this context.
-   */
-  public function setAssignmentRestriction($restriction);
-
-  /**
-   * Exports the definition as an array.
-   *
-   * @return array
-   *   An array with values for all definition keys.
-   */
-  public function toArray();
-
-}
diff --git a/modules/rules/src/Context/ContextHandlerIntegrityTrait.php b/modules/rules/src/Context/ContextHandlerIntegrityTrait.php
deleted file mode 100644
index 31ec7ef..0000000
--- a/modules/rules/src/Context/ContextHandlerIntegrityTrait.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-use Drupal\Core\Plugin\Context\ContextDefinitionInterface as CoreContextDefinitionInterface;
-use Drupal\Core\Plugin\ContextAwarePluginInterface as CoreContextAwarePluginInterface;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-//@codingStandardsIgnoreStart
-use Drupal\rules\Context\ContextDefinitionInterface as RulesContextDefinitionInterface;
-use Drupal\rules\Context\ContextProviderInterface;
-use Drupal\rules\Exception\IntegrityException;
-//@codingStandardsIgnoreEnd
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
-use Drupal\rules\Engine\IntegrityViolation;
-use Drupal\rules\Engine\IntegrityViolationList;
-
-/**
- * Extends the context handler trait with support for checking integrity.
- */
-trait ContextHandlerIntegrityTrait {
-
-  use ContextHandlerTrait;
-
-  /**
-   * Performs the integrity check.
-   *
-   * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
-   *   The plugin with its defined context.
-   * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
-   *   The current configuration state with all defined variables that are
-   *   available.
-   *
-   * @return \Drupal\rules\Engine\IntegrityViolationList
-   *   The list of integrity violations.
-   */
-  protected function checkContextConfigIntegrity(CoreContextAwarePluginInterface $plugin, ExecutionMetadataStateInterface $metadata_state) {
-    $violation_list = new IntegrityViolationList();
-    $context_definitions = $plugin->getContextDefinitions();
-
-    // Make sure that all provided variables by this plugin are added to the
-    // execution metadata state.
-    $this->addProvidedContextDefinitions($plugin, $metadata_state);
-
-    foreach ($context_definitions as $name => $context_definition) {
-      // Check if a data selector is configured that maps to the state.
-      if (isset($this->configuration['context_mapping'][$name])) {
-        try {
-          $data_definition = $this->getMappedDefinition($name, $metadata_state);
-          $this->checkDataTypeCompatible($context_definition, $data_definition, $name, $violation_list);
-        }
-        catch (IntegrityException $e) {
-          $violation = new IntegrityViolation();
-          $violation->setMessage($this->t('Data selector %selector for context %context_name is invalid. @message', [
-            '%selector' => $this->configuration['context_mapping'][$name],
-            '%context_name' => $context_definition->getLabel(),
-            '@message' => $e->getMessage(),
-          ]));
-          $violation->setContextName($name);
-          $violation->setUuid($this->getUuid());
-          $violation_list->add($violation);
-        }
-
-        if ($context_definition instanceof RulesContextDefinitionInterface
-          && $context_definition->getAssignmentRestriction() === RulesContextDefinitionInterface::ASSIGNMENT_RESTRICTION_INPUT
-        ) {
-          $violation = new IntegrityViolation();
-          $violation->setMessage($this->t('The context %context_name may not be configured using a selector.', [
-            '%context_name' => $context_definition->getLabel(),
-          ]));
-          $violation->setContextName($name);
-          $violation->setUuid($this->getUuid());
-          $violation_list->add($violation);
-        }
-      }
-      elseif (isset($this->configuration['context_values'][$name])) {
-        if ($context_definition instanceof RulesContextDefinitionInterface
-          && $context_definition->getAssignmentRestriction() === RulesContextDefinitionInterface::ASSIGNMENT_RESTRICTION_SELECTOR
-        ) {
-          $violation = new IntegrityViolation();
-          $violation->setMessage($this->t('The context %context_name may only be configured using a selector.', [
-            '%context_name' => $context_definition->getLabel(),
-          ]));
-          $violation->setContextName($name);
-          $violation->setUuid($this->getUuid());
-          $violation_list->add($violation);
-        }
-      }
-      elseif ($context_definition->isRequired() && $context_definition->getDefaultValue() === NULL) {
-        $violation = new IntegrityViolation();
-        $violation->setMessage($this->t('The required context %context_name is missing.', [
-          '%context_name' => $context_definition->getLabel(),
-        ]));
-        $violation->setContextName($name);
-        $violation->setUuid($this->getUuid());
-        $violation_list->add($violation);
-      }
-    }
-
-    if ($plugin instanceof ContextProviderInterface) {
-      $provided_context_definitions = $plugin->getProvidedContextDefinitions();
-
-      foreach ($provided_context_definitions as $name => $context_definition) {
-        if (isset($this->configuration['provides_mapping'][$name])
-          && !preg_match('/^[0-9a-zA-Z_]*$/', $this->configuration['provides_mapping'][$name])
-        ) {
-          $violation = new IntegrityViolation();
-          $violation->setMessage($this->t('Provided variable name %name contains not allowed characters.', [
-            '%name' => $this->configuration['provides_mapping'][$name],
-          ]));
-          $violation->setContextName($name);
-          $violation->setUuid($this->getUuid());
-          $violation_list->add($violation);
-        }
-      }
-    }
-
-    return $violation_list;
-  }
-
-  /**
-   * Checks that the data type of a mapped variable matches the expectation.
-   *
-   * @param \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context_definition
-   *   The context definition of the context on the plugin.
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $provided
-   *   The data definition of the mapped variable to the context.
-   * @param string $context_name
-   *   The name of the context on the plugin.
-   * @param \Drupal\rules\Engine\IntegrityViolationList $violation_list
-   *   The list of violations where new ones will be added.
-   */
-  protected function checkDataTypeCompatible(CoreContextDefinitionInterface $context_definition, DataDefinitionInterface $provided, $context_name, IntegrityViolationList $violation_list) {
-    // Compare data types. For now, fail if they are not equal.
-    // @todo: Add support for matching based upon type-inheritance.
-    $target_type = $context_definition->getDataDefinition()->getDataType();
-
-    // Special case any and entity target types for now.
-    if ($target_type == 'any' || ($target_type == 'entity' && strpos($provided->getDataType(), 'entity:') !== FALSE)) {
-      return;
-    }
-    if ($target_type != $provided->getDataType()) {
-      $expected_type_problem = $context_definition->getDataDefinition()->getDataType();
-      $violation = new IntegrityViolation();
-      $violation->setMessage($this->t('Expected a @expected_type data type for context %context_name but got a @provided_type data type instead.', [
-        '@expected_type' => $expected_type_problem,
-        '%context_name' => $context_definition->getLabel(),
-        '@provided_type' => $provided->getDataType(),
-      ]));
-      $violation->setContextName($context_name);
-      $violation->setUuid($this->getUuid());
-      $violation_list->add($violation);
-    }
-  }
-
-}
diff --git a/modules/rules/src/Context/ContextHandlerTrait.php b/modules/rules/src/Context/ContextHandlerTrait.php
deleted file mode 100644
index 6e617a4..0000000
--- a/modules/rules/src/Context/ContextHandlerTrait.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-use Drupal\Component\Plugin\Exception\ContextException;
-use Drupal\Core\Plugin\ContextAwarePluginInterface as CoreContextAwarePluginInterface;
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\rules\Exception\EvaluationException;
-use Drupal\rules\Exception\IntegrityException;
-
-/**
- * Provides methods for handling context based on the plugin configuration.
- *
- * The trait requires the plugin to use configuration as defined by the
- * ContextConfig class.
- *
- * @see \Drupal\rules\Context\ContextConfig
- */
-trait ContextHandlerTrait {
-
-  /**
-   * The data processor plugin manager used to process context variables.
-   *
-   * @var \Drupal\rules\Context\DataProcessorManager
-   */
-  protected $processorManager;
-
-  /**
-   * Prepares plugin context based upon the set context configuration.
-   *
-   * The plugin is prepared for execution by mapping the variables from the
-   * execution state into the plugin context and applying data processors.
-   * In addition, it is ensured that all required context is basically
-   * available as defined. This include the following checks:
-   *  - Required context must have a value set.
-   *  - Context may not have NULL values unless the plugin allows it.
-   *
-   * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
-   *   The plugin that is populated with context values.
-   * @param \Drupal\rules\Engine\ExecutionStateInterface $state
-   *   The execution state containing available variables.
-   *
-   * @throws \Drupal\rules\Exception\EvaluationException
-   *   Thrown if some context is not satisfied; e.g. a required context is
-   *   missing.
-   *
-   * @see ::prepareContextWithMetadata()
-   */
-  protected function prepareContext(CoreContextAwarePluginInterface $plugin, ExecutionStateInterface $state) {
-    if (isset($this->configuration['context_values'])) {
-      foreach ($this->configuration['context_values'] as $name => $value) {
-        $plugin->setContextValue($name, $value);
-      }
-    }
-
-    $selected_data = [];
-    // Map context by applying data selectors and collected the definitions of
-    // selected data for refining context definitions later. Note, that we must
-    // refine context definitions on execution time also, such that provided
-    // context gets the right metadata attached.
-    if (isset($this->configuration['context_mapping'])) {
-      foreach ($this->configuration['context_mapping'] as $name => $selector) {
-        $typed_data = $state->fetchDataByPropertyPath($selector);
-        $plugin->setContextValue($name, $typed_data);
-        $selected_data[$name] = $typed_data->getDataDefinition();
-      }
-    }
-
-    if ($plugin instanceof ContextAwarePluginInterface) {
-      // Getting context values may lead to undocumented exceptions if context
-      // is not set right now. So catch those exceptions.
-      // @todo: Remove ones https://www.drupal.org/node/2677162 got fixed.
-      try {
-        $plugin->refineContextDefinitions($selected_data);
-      }
-      catch (ContextException $e) {
-        if (strpos($e->getMessage(), 'context is required') === FALSE) {
-          throw new EvaluationException($e->getMessage());
-        }
-      }
-    }
-
-    // Apply data processors.
-    $this->processData($plugin, $state);
-
-    // Finally, ensure all contexts are set as expected now.
-    foreach ($plugin->getContextDefinitions() as $name => $definition) {
-      if ($plugin->getContextValue($name) === NULL && $definition->isRequired()) {
-        // If a context mapping has been specified, the value might end up NULL
-        // but valid (e.g. a reference on an empty property). In that case
-        // isAllowedNull determines whether the context is conform.
-        if (!isset($this->configuration['context_mapping'][$name])) {
-          throw new EvaluationException("Required context $name is missing for plugin "
-            . $plugin->getPluginId() . '.');
-        }
-        elseif (!$definition->isAllowedNull()) {
-          throw new EvaluationException("The context for $name is NULL, but the context $name in "
-            . $plugin->getPluginId() . ' requires a value.');
-        }
-      }
-    }
-  }
-
-  /**
-   * Prepares plugin context based upon the set context configuration.
-   *
-   * The configuration is applied as far as possible without having execution
-   * time data. That means, the configured context values are set and context is
-   * refined while leveraging the definitions of selected data.
-   *
-   * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
-   *   The plugin that is prepared.
-   * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
-   *   The metadata state, prepared for the current expression.
-   *
-   * @throws \Drupal\Component\Plugin\Exception\ContextException
-   *   Thrown if the plugin tries to access some not-defined context. As this is
-   *   a developer error, this should not be caught.
-   *
-   * @see ::prepareContext()
-   */
-  protected function prepareContextWithMetadata(CoreContextAwarePluginInterface $plugin, ExecutionMetadataStateInterface $metadata_state) {
-    if (isset($this->configuration['context_values'])) {
-      foreach ($this->configuration['context_values'] as $name => $value) {
-        $plugin->setContextValue($name, $value);
-      }
-    }
-
-    if ($plugin instanceof ContextAwarePluginInterface) {
-      $selected_data = $this->getSelectedData($metadata_state);
-      // Getting context values may lead to undocumented exceptions if context
-      // is not set right now. So catch those exceptions.
-      // @todo: Remove ones https://www.drupal.org/node/2677162 got fixed.
-      try {
-        $plugin->refineContextDefinitions($selected_data);
-      }
-      catch (ContextException $e) {
-        if (strpos($e->getMessage(), 'context is required') === FALSE) {
-          throw $e;
-        }
-      }
-    }
-  }
-
-  /**
-   * Gets definitions of all selected data at configuration time.
-   *
-   * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
-   *   The metadata state.
-   *
-   * @return \Drupal\Core\TypedData\DataDefinitionInterface[]
-   *   An array of data definitions for context that is mapped using a data
-   *   selector, keyed by context name.
-   */
-  protected function getSelectedData(ExecutionMetadataStateInterface $metadata_state) {
-    $selected_data = [];
-    // Collected the definitions of selected data for refining context
-    // definitions.
-    if (isset($this->configuration['context_mapping'])) {
-      // If no state is available, we need to fetch at least the definitions of
-      // selected data for refining context.
-      foreach ($this->configuration['context_mapping'] as $name => $selector) {
-        try {
-          $selected_data[$name] = $this->getMappedDefinition($name, $metadata_state);
-        }
-        catch (IntegrityException $e) {
-          // Ignore invalid data selectors here, such that context gets refined
-          // as far as possible still and can be respected by the UI when fixing
-          // broken selectors.
-        }
-      }
-    }
-    return $selected_data;
-  }
-
-  /**
-   * Gets the definition of the data that is mapped to the given context.
-   *
-   * @param string $context_name
-   *   The name of the context.
-   * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
-   *   The metadata state containing metadata about available variables.
-   *
-   * @return \Drupal\Core\TypedData\DataDefinitionInterface|null
-   *   A data definition if the property path could be applied, or NULL if the
-   *   context is not mapped.
-   *
-   * @throws \Drupal\rules\Exception\IntegrityException
-   *   Thrown if the data selector that is configured for the context is
-   *   invalid.
-   */
-  protected function getMappedDefinition($context_name, ExecutionMetadataStateInterface $metadata_state) {
-    if (isset($this->configuration['context_mapping'][$context_name])) {
-      return $metadata_state->fetchDefinitionByPropertyPath($this->configuration['context_mapping'][$context_name]);
-    }
-  }
-
-  /**
-   * Adds provided context values from the plugin to the execution state.
-   *
-   * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
-   *   The context aware plugin of which to add provided context.
-   * @param \Drupal\rules\Engine\ExecutionStateInterface $state
-   *   The Rules state where the context variables are added.
-   */
-  protected function addProvidedContext(CoreContextAwarePluginInterface $plugin, ExecutionStateInterface $state) {
-    // If the plugin does not support providing context, there is nothing to do.
-    if (!$plugin instanceof ContextProviderInterface) {
-      return;
-    }
-    $provides = $plugin->getProvidedContextDefinitions();
-    foreach ($provides as $name => $provided_definition) {
-      // Avoid name collisions in the rules state: provided variables can be
-      // renamed.
-      if (isset($this->configuration['provides_mapping'][$name])) {
-        $state->setVariableData($this->configuration['provides_mapping'][$name], $plugin->getProvidedContext($name)->getContextData());
-      }
-      else {
-        $state->setVariableData($name, $plugin->getProvidedContext($name)->getContextData());
-      }
-    }
-  }
-
-  /**
-   * Adds the definitions of provided context to the execution metadata state.
-   *
-   * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
-   *   The context aware plugin of which to add provided context.
-   * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
-   *   The execution metadata state to add variables to.
-   */
-  protected function addProvidedContextDefinitions(CoreContextAwarePluginInterface $plugin, ExecutionMetadataStateInterface $metadata_state) {
-    // If the plugin does not support providing context, there is nothing to do.
-    if (!$plugin instanceof ContextProviderInterface) {
-      return;
-    }
-
-    foreach ($plugin->getProvidedContextDefinitions() as $name => $context_definition) {
-      if (isset($this->configuration['provides_mapping'][$name])) {
-        // Populate the state with the new variable that is provided by this
-        // plugin. That is necessary so that the integrity check in subsequent
-        // actions knows about the variable and does not throw violations.
-        $metadata_state->setDataDefinition(
-          $this->configuration['provides_mapping'][$name],
-          $context_definition->getDataDefinition()
-        );
-      }
-      else {
-        $metadata_state->setDataDefinition($name, $context_definition->getDataDefinition());
-      }
-    }
-  }
-
-  /**
-   * Asserts additional metadata.
-   *
-   * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
-   *   The context aware plugin.
-   * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
-   *   The execution metadata state.
-   */
-  protected function assertMetadata(CoreContextAwarePluginInterface $plugin, ExecutionMetadataStateInterface $metadata_state) {
-    // If the plugin does not implement the Rules-enhanced interface, skip this.
-    if (!$plugin instanceof ContextAwarePluginInterface) {
-      return;
-    }
-    $changed_definitions = $plugin->assertMetadata($this->getSelectedData($metadata_state));
-
-    // Reverse the mapping and apply the changes.
-    foreach ($changed_definitions as $context_name => $definition) {
-      $selector = $this->configuration['context_mapping'][$context_name];
-      // @todo: Deal with selectors matching not a context name.
-      if (strpos($selector, '.') === FALSE) {
-        $metadata_state->setDataDefinition($selector, $definition);
-      }
-    }
-  }
-
-  /**
-   * Process data context on the plugin, usually before it gets executed.
-   *
-   * @param \Drupal\Core\Plugin\ContextAwarePluginInterface $plugin
-   *   The plugin to process the context data on.
-   * @param \Drupal\rules\Engine\ExecutionStateInterface $rules_state
-   *   The current Rules execution state with context variables.
-   */
-  protected function processData(CoreContextAwarePluginInterface $plugin, ExecutionStateInterface $rules_state) {
-    if (isset($this->configuration['context_processors'])) {
-      foreach ($this->configuration['context_processors'] as $context_name => $processors) {
-        $definition = $plugin->getContextDefinition($context_name);
-        $value = $plugin->getContextValue($context_name);
-        if ($definition->isMultiple()) {
-          foreach ($value as &$current) {
-            $current = $this->processValue($current, $processors, $rules_state);
-          }
-        }
-        else {
-          $value = $this->processValue($value, $processors, $rules_state);
-        }
-        $plugin->setContextValue($context_name, $value);
-      }
-    }
-  }
-
-  /**
-   * Processes a single value.
-   *
-   * @param mixed $value
-   *   The current value.
-   * @param array $processors
-   *   An array mapping processor plugin IDs to their configuration.
-   * @param \Drupal\rules\Engine\ExecutionStateInterface $rules_state
-   *   The current Rules execution state with context variables.
-   *
-   * @return mixed
-   *   THe processed value.
-   */
-  protected function processValue($value, array $processors, ExecutionStateInterface $rules_state) {
-    foreach ($processors as $processor_plugin_id => $configuration) {
-      $data_processor = $this->processorManager->createInstance($processor_plugin_id, $configuration);
-      $value = $data_processor->process($value, $rules_state);
-    }
-    return $value;
-  }
-
-}
diff --git a/modules/rules/src/Context/ContextProviderInterface.php b/modules/rules/src/Context/ContextProviderInterface.php
deleted file mode 100644
index 610459a..0000000
--- a/modules/rules/src/Context/ContextProviderInterface.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-/**
- * Interface for plugins that provide context.
- *
- * This interface allows plugins to provide new context; e.g., an action plugin
- * that loads a user would provide the user entity.
- *
- * The plugin has to specify an array of context definitions for the provided
- * context under the "provides" key at the plugin definition, keyed by provided
- * context name.
- */
-interface ContextProviderInterface {
-
-  /**
-   * Sets the value for a provided context.
-   *
-   * @param string $name
-   *   The name of the provided context in the plugin definition.
-   * @param mixed $value
-   *   The value to set the provided context to.
-   *
-   * @return $this
-   */
-  public function setProvidedValue($name, $value);
-
-  /**
-   * Gets a defined provided context.
-   *
-   * @param string $name
-   *   The name of the provided context in the plugin definition.
-   *
-   * @throws \Drupal\Component\Plugin\Exception\PluginException
-   *   If the requested provided context is not set.
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextInterface
-   *   The context object.
-   */
-  public function getProvidedContext($name);
-
-  /**
-   * Gets a specific provided context definition of the plugin.
-   *
-   * @param string $name
-   *   The name of the provided context in the plugin definition.
-   *
-   * @throws \Drupal\Component\Plugin\Exception\PluginException
-   *   If the requested provided context is not defined.
-   *
-   * @return \Drupal\Component\Plugin\Context\ContextDefinitionInterface
-   *   The definition of the provided context.
-   */
-  public function getProvidedContextDefinition($name);
-
-  /**
-   * Gets the provided context definitions of the plugin.
-   *
-   * @return \Drupal\Component\Plugin\Context\ContextDefinitionInterface[]
-   *   The array of provided context definitions, keyed by context name.
-   */
-  public function getProvidedContextDefinitions();
-
-}
diff --git a/modules/rules/src/Context/ContextProviderTrait.php b/modules/rules/src/Context/ContextProviderTrait.php
deleted file mode 100644
index 42c9822..0000000
--- a/modules/rules/src/Context/ContextProviderTrait.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-use Drupal\Component\Plugin\Exception\ContextException;
-use Drupal\Core\Plugin\Context\Context;
-
-/**
- * A trait implementing the ContextProviderInterface.
- *
- * This trait is intended for context aware plugins that want to provide
- * context.
- *
- * The trait requires the plugin to use configuration as defined by the
- * ContextConfig class.
- *
- * @see \Drupal\rules\Context\ContextProviderInterface
- */
-trait ContextProviderTrait {
-
-  /**
-   * The data objects that are provided by this plugin.
-   *
-   * @var \Drupal\Component\Plugin\Context\ContextInterface[]
-   */
-  protected $providedContext;
-
-  /**
-   * @see \Drupal\rules\Context\ContextProviderInterface
-   */
-  public function setProvidedValue($name, $value) {
-    $context = $this->getProvidedContext($name);
-    $new_context = Context::createFromContext($context, $value);
-    $this->providedContext[$name] = $new_context;
-    return $this;
-  }
-
-  /**
-   * @see \Drupal\rules\Context\ContextProviderInterface
-   */
-  public function getProvidedContext($name) {
-    // Check for a valid context value.
-    if (!isset($this->providedContext[$name])) {
-      $this->providedContext[$name] = new Context($this->getProvidedContextDefinition($name));
-    }
-    return $this->providedContext[$name];
-  }
-
-  /**
-   * @see \Drupal\rules\Context\ContextProviderInterface
-   */
-  public function getProvidedContextDefinition($name) {
-    $definition = $this->getPluginDefinition();
-    if (empty($definition['provides'][$name])) {
-      throw new ContextException(sprintf("The %s provided context is not valid.", $name));
-    }
-    return $definition['provides'][$name];
-  }
-
-  /**
-   * @see \Drupal\rules\Context\ContextProviderInterface
-   */
-  public function getProvidedContextDefinitions() {
-    $definition = $this->getPluginDefinition();
-    return !empty($definition['provides']) ? $definition['provides'] : [];
-  }
-
-}
diff --git a/modules/rules/src/Context/DataProcessorInterface.php b/modules/rules/src/Context/DataProcessorInterface.php
deleted file mode 100644
index 0fab75a..0000000
--- a/modules/rules/src/Context/DataProcessorInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-use Drupal\rules\Engine\ExecutionStateInterface;
-
-/**
- * Interface for Rules data processor plugins.
- */
-interface DataProcessorInterface {
-
-  /**
-   * Process the given value.
-   *
-   * @param mixed $value
-   *   The value to process.
-   * @param \Drupal\rules\Engine\ExecutionStateInterface $rules_state
-   *   The current Rules execution state containing all context variables.
-   *
-   * @return mixed
-   *   The processed value. Since the value can also be a primitive data type
-   *   (a string for example) this function must return the value.
-   *
-   * @throws \Drupal\rules\Exception\EvaluationException
-   *   Thrown when the data cannot be processed.
-   */
-  public function process($value, ExecutionStateInterface $rules_state);
-
-}
diff --git a/modules/rules/src/Context/DataProcessorManager.php b/modules/rules/src/Context/DataProcessorManager.php
deleted file mode 100644
index 06664fc..0000000
--- a/modules/rules/src/Context/DataProcessorManager.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\rules\Annotation\RulesDataProcessor;
-
-/**
- * Plugin manager for Rules data processors.
- *
- * @see \Drupal\rules\Context\DataProcessorInterface
- */
-class DataProcessorManager extends DefaultPluginManager {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(\Traversable $namespaces, ModuleHandlerInterface $module_handler, $plugin_definition_annotation_name = RulesDataProcessor::class) {
-    $this->alterInfo('rules_data_processor');
-    parent::__construct('Plugin/RulesDataProcessor', $namespaces, $module_handler, DataProcessorInterface::class, $plugin_definition_annotation_name);
-  }
-
-}
diff --git a/modules/rules/src/Context/DataProcessorManagerTrait.php b/modules/rules/src/Context/DataProcessorManagerTrait.php
deleted file mode 100644
index ffda469..0000000
--- a/modules/rules/src/Context/DataProcessorManagerTrait.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-/**
- * Trait for easily using the data processor service.
- *
- * @see \Drupal\rules\Context\DataProcessorManager
- */
-trait DataProcessorManagerTrait {
-
-  /**
-   * The data processor manager.
-   *
-   * @var \Drupal\rules\Context\DataProcessorManager
-   */
-  protected $dataProcessorManager;
-
-  /**
-   * Sets the data processor manager.
-   *
-   * @param \Drupal\rules\Context\DataProcessorManager $dataProcessorManager
-   *   The data processor manager.
-   *
-   * @return $this
-   */
-  public function setDataProcessorManager(DataProcessorManager $dataProcessorManager) {
-    $this->dataProcessorManager = $dataProcessorManager;
-    return $this;
-  }
-
-  /**
-   * Gets the data processor manager.
-   *
-   * @return \Drupal\rules\Context\DataProcessorManager
-   *   The data processor manager.
-   */
-  public function getDataProcessorManager() {
-    if (empty($this->dataProcessorManager)) {
-      $this->dataProcessorManager = \Drupal::service('plugin.manager.rules_data_processor');
-    }
-    return $this->dataProcessorManager;
-  }
-
-}
diff --git a/modules/rules/src/Context/GlobalContextRepositoryTrait.php b/modules/rules/src/Context/GlobalContextRepositoryTrait.php
deleted file mode 100644
index 5a45c2f..0000000
--- a/modules/rules/src/Context/GlobalContextRepositoryTrait.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Drupal\rules\Context;
-
-use Drupal\Core\Plugin\Context\ContextRepositoryInterface;
-
-/**
- * Trait for classes that depend on the global context repository.
- */
-trait GlobalContextRepositoryTrait {
-
-  /**
-   * The global context repository.
-   *
-   * @var \Drupal\Core\Plugin\Context\ContextRepositoryInterface
-   */
-  protected $contextRepository;
-
-  /**
-   * Sets the global context repository.
-   *
-   * @param \Drupal\Core\Plugin\Context\ContextRepositoryInterface $context_repository
-   *   The global context repository.
-   *
-   * @return $this
-   */
-  public function setGlobalContextRepository(ContextRepositoryInterface $context_repository) {
-    $this->contextRepository = $context_repository;
-    return $this;
-  }
-
-  /**
-   * Gets the global context repository.
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextRepositoryInterface
-   *   The context repository.
-   */
-  public function getGlobalContextRepository() {
-    if (empty($this->contextRepository)) {
-      $this->contextRepository = \Drupal::service('context.repository');
-    }
-    return $this->contextRepository;
-  }
-
-}
diff --git a/modules/rules/src/Controller/AutocompleteController.php b/modules/rules/src/Controller/AutocompleteController.php
deleted file mode 100644
index badc654..0000000
--- a/modules/rules/src/Controller/AutocompleteController.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\rules\Controller;
-
-use Drupal\rules\Ui\RulesUiHandlerInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Handles autocompletion of data selectors.
- */
-class AutocompleteController {
-
-  /**
-   * Returns a JSON list of autocomplete suggestions for data selectors.
-   *
-   * @param \Drupal\rules\Ui\RulesUiHandlerInterface $rules_ui_handler
-   *   The UI handler.
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request object providing the autocomplete query parameter.
-   * @param string $uuid
-   *   The UUID of the expression in which the autocomplete is triggered. If the
-   *   UUID is not provided all available variables from the end of the
-   *   expression will be shown.
-   *
-   * @return \Symfony\Component\HttpFoundation\JsonResponse
-   *   The JSON results.
-   */
-  public function autocomplete(RulesUiHandlerInterface $rules_ui_handler, Request $request, $uuid = NULL) {
-    $component = $rules_ui_handler->getComponent();
-    $nested_expression = $component->getExpression()->getExpression($uuid);
-    if ($nested_expression === FALSE) {
-      // @todo We don't have a UUID when an expression is added. Just show all
-      // variables available in that case. The correct solution would be to get
-      // the form state of the expression form currently being added. That is
-      // very complicated so we don't do it for now.
-      $nested_expression = NULL;
-    }
-
-    $string = $request->query->get('q');
-    $results = $component->autocomplete($string, $nested_expression);
-
-    return new JsonResponse($results);
-  }
-
-}
diff --git a/modules/rules/src/Controller/RulesComponentListBuilder.php b/modules/rules/src/Controller/RulesComponentListBuilder.php
deleted file mode 100644
index cbdbdbf..0000000
--- a/modules/rules/src/Controller/RulesComponentListBuilder.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Drupal\rules\Controller;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
-
-/**
- * Defines a class to build a listing of RulesComponentConfig entities.
- *
- * @see \Drupal\rules\Entity\RulesComponent
- */
-class RulesComponentListBuilder extends ConfigEntityListBuilder {
-
-  /**
-   * {@inheritdoc}
-   *
-   * Building the header and content lines for the contact list.
-   *
-   * Calling the parent::buildHeader() adds a column for the possible actions
-   * and inserts the 'edit' and 'delete' links as defined for the entity type.
-   */
-  public function buildHeader() {
-    $header['id'] = $this->t('ID');
-    $header['label'] = $this->t('Label');
-    $header['description'] = $this->t('Description');
-    $header['tags'] = $this->t('Tag');
-    return $header + parent::buildHeader();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    /* @var $entity \Drupal\rules\Entity\RulesComponentConfig */
-    $row['id'] = $entity->id();
-    $row['label'] = $this->getLabel($entity);
-    $row['description'] = $entity->getDescription();
-    $row['tags'] = implode(', ', $entity->getTags());
-    return $row + parent::buildRow($entity);
-  }
-
-}
diff --git a/modules/rules/src/Controller/RulesReactionListBuilder.php b/modules/rules/src/Controller/RulesReactionListBuilder.php
deleted file mode 100644
index a474e51..0000000
--- a/modules/rules/src/Controller/RulesReactionListBuilder.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Drupal\rules\Controller;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
-
-/**
- * Defines a class to build a listing of ReactionRuleConfig entities.
- *
- * @see \Drupal\rules\Entity\ReactionRuleConfig
- */
-class RulesReactionListBuilder extends ConfigEntityListBuilder {
-
-  /**
-   * {@inheritdoc}
-   *
-   * Building the header and content lines for the contact list.
-   *
-   * Calling the parent::buildHeader() adds a column for the possible actions
-   * and inserts the 'edit' and 'delete' links as defined for the entity type.
-   */
-  public function buildHeader() {
-    $header['id'] = $this->t('ID');
-    $header['label'] = $this->t('Label');
-    $header['description'] = $this->t('Description');
-    $header['tags'] = $this->t('Tags');
-    return $header + parent::buildHeader();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    /* @var $entity \Drupal\rules\Entity\ReactionRuleConfig */
-    $row['id'] = $entity->id();
-    $row['label'] = $this->getLabel($entity);
-    $row['description'] = $entity->getDescription();
-    $row['tags'] = implode(', ', $entity->getTags());
-    return $row + parent::buildRow($entity);
-  }
-
-}
diff --git a/modules/rules/src/Core/Annotation/Condition.php b/modules/rules/src/Core/Annotation/Condition.php
deleted file mode 100644
index c882e46..0000000
--- a/modules/rules/src/Core/Annotation/Condition.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core\Annotation;
-
-use Drupal\Core\Condition\Annotation\Condition as CoreConditionAnnotation;
-
-/**
- * Extension of the Condition annotation class.
- *
- * @Annotation
- *
- * This class adds a configuration access parameter to the Condition
- * annotation.
- */
-class Condition extends CoreConditionAnnotation {
-
-  /**
-   * The permissions allowed to access the configuration UI for this plugin.
-   *
-   * @var string[]
-   *   Array of permission strings as declared in a *.permissions.yml file. If
-   *   any one of these permissions apply for the relevant user, we allow
-   *   access.
-   *
-   *   The key should be used as follows. Note that we add a space between "@"
-   *   and "Condition", since we do not want to trigger the annotation parser
-   *   here; you should remove that space in your actual annotation:
-   *
-   *   @ Condition(
-   *     id = "my_module_user_is_blocked",
-   *     label = @Translation("My User is blocked"),
-   *     category = @Translation("User"),
-   *     context = {
-   *       "user" = @ContextDefinition("entity:user",
-   *         label = @Translation("User")
-   *      ),
-   *      configure_permissions = {
-   *        "administer users",
-   *        "block users"
-   *      }
-   *   }
-   * )
-   */
-  public $configure_permissions;
-
-}
diff --git a/modules/rules/src/Core/Annotation/RulesAction.php b/modules/rules/src/Core/Annotation/RulesAction.php
deleted file mode 100644
index 1196707..0000000
--- a/modules/rules/src/Core/Annotation/RulesAction.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a Rules Action annotation object.
- *
- * Plugin Namespace: Plugin\RulesAction.
- *
- * For a working example, see \Drupal\rules\Plugin\RulesAction\BanIP
- *
- * @see \Drupal\rules\Core\RulesActionInterface
- * @see \Drupal\rules\Core\RulesActionManagerInterface
- * @see \Drupal\rules\Core\RulesActionBase
- * @see plugin_api
- *
- * @Annotation
- */
-class RulesAction extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the action plugin.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   *
-   * @ingroup plugin_translatable
-   */
-  public $label;
-
-  /**
-   * The category under which the action should be listed in the UI.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   *
-   * @ingroup plugin_translatable
-   */
-  public $category;
-
-  /**
-   * The permission required to access the configuration UI for this plugin.
-   *
-   * @var string[]
-   *   Array of permission string as declared in a *.permissions.yml file.
-   */
-  public $configure_permission;
-
-  /**
-   * Defines the used context of the action plugin.
-   *
-   * Array keys are the names of the contexts and values context definitions.
-   *
-   * @var \Drupal\Core\Annotation\ContextDefinition[]
-   */
-  public $context = [];
-
-  /**
-   * Defines the provided context of the action plugin.
-   *
-   * Array keys are the names of the contexts and values context definitions.
-   *
-   * @var \Drupal\Core\Annotation\ContextDefinition[]
-   */
-  public $provides = [];
-
-}
diff --git a/modules/rules/src/Core/ConditionManager.php b/modules/rules/src/Core/ConditionManager.php
deleted file mode 100644
index 0d755f0..0000000
--- a/modules/rules/src/Core/ConditionManager.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Core\Condition\ConditionManager as CoreConditionManager;
-use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
-use Drupal\rules\Context\AnnotatedClassDiscovery;
-
-/**
- * Extends the core condition manager to add in Rules' context improvements.
- */
-class ConditionManager extends CoreConditionManager {
-
-  /**
-   * {@inheritdoc}
-   *
-   * @return \Drupal\rules\Core\RulesConditionInterface|\Drupal\Core\Condition\ConditionInterface
-   *   A fully configured plugin instance.
-   */
-  public function createInstance($plugin_id, array $configuration = []) {
-    return parent::createInstance($plugin_id, $configuration);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getDiscovery() {
-    if (!$this->discovery) {
-      // Swap out the annotated class discovery used, so we can control the
-      // annotation classes picked.
-      $discovery = new AnnotatedClassDiscovery($this->subdir, $this->namespaces, $this->pluginDefinitionAnnotationName);
-      $this->discovery = new ContainerDerivativeDiscoveryDecorator($discovery);
-    }
-    return $this->discovery;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefinitions() {
-    $definitions = parent::getDefinitions();
-    // Make sure that all definitions have a category to avoid PHP notices in
-    // CategorizingPluginManagerTrait.
-    // @todo fix this in core in CategorizingPluginManagerTrait.
-    foreach ($definitions as &$definition) {
-      if (!isset($definition['category'])) {
-        $definition['category'] = $this->t('Other');
-      }
-    }
-    return $definitions;
-  }
-
-}
diff --git a/modules/rules/src/Core/ConfigurationAccessControlInterface.php b/modules/rules/src/Core/ConfigurationAccessControlInterface.php
deleted file mode 100644
index 02b8b80..0000000
--- a/modules/rules/src/Core/ConfigurationAccessControlInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Defines a configuration permission control interface.
- *
- * @see \Drupal\rules\Core\ConfigurationAccessControlTrait.
- */
-interface ConfigurationAccessControlInterface {
-
-  /**
-   * Check configuration access.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   (optional) The user for which to check access, or NULL to check access
-   *   for the current user. Defaults to NULL.
-   * @param bool $return_as_object
-   *   (optional) Defaults to FALSE.
-   *
-   * @return bool|\Drupal\Core\Access\AccessResultInterface
-   *   The access result. Returns a boolean if $return_as_object is FALSE (this
-   *   is the default) and otherwise an AccessResultInterface object.
-   *   When a boolean is returned, the result of AccessInterface::isAllowed() is
-   *   returned, i.e. TRUE means access is explicitly allowed, FALSE means
-   *   access is either explicitly forbidden or "no opinion".
-   */
-  public function checkConfigurationAccess(AccountInterface $account = NULL, $return_as_object = FALSE);
-
-}
diff --git a/modules/rules/src/Core/ConfigurationAccessControlTrait.php b/modules/rules/src/Core/ConfigurationAccessControlTrait.php
deleted file mode 100644
index 5eda1bd..0000000
--- a/modules/rules/src/Core/ConfigurationAccessControlTrait.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Implements access related functions for plugins.
- */
-trait ConfigurationAccessControlTrait {
-
-  /**
-   * Checks configuration permission.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   (optional) The user for which to check access, or NULL to check access
-   *   for the current user. Defaults to NULL.
-   * @param bool $return_as_object
-   *   (optional) Defaults to FALSE.
-   *
-   * @return bool|\Drupal\Core\Access\AccessResultInterface
-   *   The access result. Returns a boolean if $return_as_object is FALSE (this
-   *   is the default) and otherwise an AccessResultInterface object.
-   *   When a boolean is returned, the result of AccessInterface::isAllowed() is
-   *   returned, i.e. TRUE means access is explicitly allowed, FALSE means
-   *   access is either explicitly forbidden or "no opinion".
-   */
-  public function checkConfigurationAccess(AccountInterface $account = NULL, $return_as_object = FALSE) {
-    if (!$account) {
-      $account = \Drupal::currentUser();
-    }
-    // We treat these as our "super-user" accesses.  We let the reaction
-    // rule and component permissions control the main admin UI.
-    $admin_perms = [
-      'administer rules',
-      'bypass rules access',
-    ];
-
-    $access = FALSE;
-    foreach ($admin_perms as $perm) {
-      if ($account->hasPermission($perm)) {
-        $access = TRUE;
-        break;
-      }
-    }
-
-    if (!$access) {
-      // See if the plugin has a configuration_access annotation.
-      $definition = $this->getPluginDefinition();
-      if (!empty($definition['configure_permissions']) && is_array($definition['configure_permissions'])) {
-        foreach ($definition['configure_permissions'] as $perm) {
-          if ($account->hasPermission($perm)) {
-            $access = TRUE;
-            break;
-          }
-        }
-      }
-    }
-
-    if ($return_as_object) {
-      return $access ? AccessResult::allowed() : AccessResult::neutral();
-    }
-    return $access;
-  }
-
-}
diff --git a/modules/rules/src/Core/ExecutablePluginTrait.php b/modules/rules/src/Core/ExecutablePluginTrait.php
deleted file mode 100644
index d0c5c17..0000000
--- a/modules/rules/src/Core/ExecutablePluginTrait.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
-
-/**
- * Offers common methods for executable plugins.
- */
-trait ExecutablePluginTrait {
-
-  /**
-   * Get the translated label from the plugin definition.
-   *
-   * @return string
-   *   The label of the plugin.
-   *
-   * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
-   *   Thrown if the label is not defined for the plugin.
-   */
-  protected function getLabelValue() {
-    $definition = $this->getPluginDefinition();
-    if (empty($definition['label'])) {
-      throw new InvalidPluginDefinitionException('The label is not defined for plugin ' . $this->getPluginId() . ' (' . __CLASS__ . ').');
-    }
-    // The label can be an instance of
-    // \Drupal\Core\StringTranslation\TranslationWrapper here, so make sure to
-    // always return a primitive string representation here.
-    return (string) $definition['label'];
-  }
-
-  /**
-   * Get the translated summary from the label annotation.
-   *
-   * @return string
-   *   The summary of the plugin.
-   *
-   * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
-   *   Thrown if a summary was not set.
-   */
-  public function summary() {
-    return $this->getLabelValue();
-  }
-
-}
diff --git a/modules/rules/src/Core/RulesActionBase.php b/modules/rules/src/Core/RulesActionBase.php
deleted file mode 100644
index 1abb893..0000000
--- a/modules/rules/src/Core/RulesActionBase.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Component\Plugin\Exception\ContextException;
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Plugin\ContextAwarePluginBase;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\rules\Context\ContextProviderTrait;
-
-/**
- * Base class for rules actions.
- */
-abstract class RulesActionBase extends ContextAwarePluginBase implements RulesActionInterface {
-
-  use ContextProviderTrait;
-  use ExecutablePluginTrait;
-  use ConfigurationAccessControlTrait;
-
-  /**
-   * The plugin configuration.
-   *
-   * @var array
-   */
-  protected $configuration;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getContextValue($name) {
-    try {
-      return parent::getContextValue($name);
-    }
-    catch (ContextException $e) {
-      // Catch the undocumented exception thrown when no context value is set
-      // for a required context.
-      // @todo: Remove once https://www.drupal.org/node/2677162 is fixed.
-      if (strpos($e->getMessage(), 'context is required') === FALSE) {
-        throw $e;
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function refineContextDefinitions(array $selected_data) {
-    // Do not refine anything by default.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assertMetadata(array $selected_data) {
-    // Nothing to assert by default.
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfiguration() {
-    return [
-      'id' => $this->getPluginId(),
-    ] + $this->configuration;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConfiguration(array $configuration) {
-    $this->configuration = $configuration + $this->defaultConfiguration();
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function executeMultiple(array $objects) {
-    // @todo: Remove this once it is removed from the interface.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autoSaveContext() {
-    // Per default no context parameters will be auto saved.
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
-    // Just deny access per default for now.
-    if ($return_as_object) {
-      return AccessResult::forbidden();
-    }
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function execute() {
-    // Provide a reasonable default implementation that calls doExecute() while
-    // passing the defined context as arguments.
-    $args = [];
-    foreach ($this->getContextDefinitions() as $name => $definition) {
-      $args[$name] = $this->getContextValue($name);
-    }
-    call_user_func_array([$this, 'doExecute'], $args);
-  }
-
-}
diff --git a/modules/rules/src/Core/RulesActionInterface.php b/modules/rules/src/Core/RulesActionInterface.php
deleted file mode 100644
index eb77f84..0000000
--- a/modules/rules/src/Core/RulesActionInterface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Core\Executable\ExecutableInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\rules\Context\ContextAwarePluginInterface;
-use Drupal\rules\Context\ContextProviderInterface;
-
-/**
- * Extends the core ActionInterface to provide context.
- */
-interface RulesActionInterface extends ExecutableInterface, ContextAwarePluginInterface, ContextProviderInterface, ConfigurationAccessControlInterface {
-
-  /**
-   * Returns a list of context names that should be auto-saved after execution.
-   *
-   * @return array
-   *   A subset of context names as specified in the context definition of this
-   *   action.
-   */
-  public function autoSaveContext();
-
-  /**
-   * Checks object access.
-   *
-   * @param mixed $object
-   *   The object to execute the action on.
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   (optional) The user for which to check access, or NULL to check access
-   *   for the current user. Defaults to NULL.
-   * @param bool $return_as_object
-   *   (optional) Defaults to FALSE.
-   *
-   * @return bool|\Drupal\Core\Access\AccessResultInterface
-   *   The access result. Returns a boolean if $return_as_object is FALSE (this
-   *   is the default) and otherwise an AccessResultInterface object.
-   *   When a boolean is returned, the result of AccessInterface::isAllowed() is
-   *   returned, i.e. TRUE means access is explicitly allowed, FALSE means
-   *   access is either explicitly forbidden or "no opinion".
-   */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE);
-
-}
diff --git a/modules/rules/src/Core/RulesActionManager.php b/modules/rules/src/Core/RulesActionManager.php
deleted file mode 100644
index 5f92ad7..0000000
--- a/modules/rules/src/Core/RulesActionManager.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\CategorizingPluginManagerTrait;
-use Drupal\Core\Plugin\Context\ContextAwarePluginManagerTrait;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
-use Drupal\rules\Context\AnnotatedClassDiscovery;
-use Drupal\rules\Core\Annotation\RulesAction;
-
-/**
- * Provides an Action plugin manager for the Rules actions API.
- *
- * @see \Drupal\Core\Annotation\Action
- * @see \Drupal\Core\Action\ActionInterface
- * @see \Drupal\Core\Action\ActionBase
- * @see plugin_api
- */
-class RulesActionManager extends DefaultPluginManager implements RulesActionManagerInterface {
-
-  use CategorizingPluginManagerTrait;
-  use ContextAwarePluginManagerTrait;
-
-  /**
-   * Constructs a new class instance.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   Cache backend instance to use.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler to invoke the alter hook with.
-   */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    parent::__construct('Plugin/RulesAction', $namespaces, $module_handler, RulesActionInterface::class, RulesAction::class);
-    $this->alterInfo('rules_action_info');
-    $this->setCacheBackend($cache_backend, 'rules_action_info');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getDiscovery() {
-    if (!$this->discovery) {
-      // Swap out the annotated class discovery used, so we can control the
-      // annotation classes picked.
-      $discovery = new AnnotatedClassDiscovery($this->subdir, $this->namespaces, $this->pluginDefinitionAnnotationName);
-      $this->discovery = new ContainerDerivativeDiscoveryDecorator($discovery);
-    }
-    return $this->discovery;
-  }
-
-}
diff --git a/modules/rules/src/Core/RulesActionManagerInterface.php b/modules/rules/src/Core/RulesActionManagerInterface.php
deleted file mode 100644
index 4b1d08c..0000000
--- a/modules/rules/src/Core/RulesActionManagerInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Component\Plugin\CategorizingPluginManagerInterface;
-use Drupal\Core\Plugin\Context\ContextAwarePluginManagerInterface;
-
-/**
- * Interface the Rules Action plugin manager of the Rules actions API.
- *
- * @see \Drupal\Core\Annotation\Action
- * @see \Drupal\Core\Action\ActionInterface
- * @see \Drupal\Core\Action\ActionBase
- * @see plugin_api
- */
-interface RulesActionManagerInterface extends CategorizingPluginManagerInterface, ContextAwarePluginManagerInterface {
-
-  /**
-   * {@inheritdoc}
-   *
-   * @return \Drupal\rules\Core\RulesActionInterface
-   *   A fully configured plugin instance.
-   */
-  public function createInstance($plugin_id, array $configuration = []);
-
-}
diff --git a/modules/rules/src/Core/RulesConditionBase.php b/modules/rules/src/Core/RulesConditionBase.php
deleted file mode 100644
index 9deaa9a..0000000
--- a/modules/rules/src/Core/RulesConditionBase.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Core\Condition\ConditionPluginBase;
-use Drupal\rules\Context\ContextProviderTrait;
-
-/**
- * Base class for rules conditions.
- *
- * @todo Figure out whether buildConfigurationForm() is useful to Rules somehow.
- */
-abstract class RulesConditionBase extends ConditionPluginBase implements RulesConditionInterface {
-
-  use ContextProviderTrait;
-  use ExecutablePluginTrait;
-  use ConfigurationAccessControlTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function refineContextDefinitions(array $selected_data) {
-    // Do not refine anything by default.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assertMetadata(array $selected_data) {
-    // Nothing to assert by default.
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getContextValue($name) {
-    try {
-      return parent::getContextValue($name);
-    }
-    catch (ContextException $e) {
-      // Catch the undocumented exception thrown when no context value is set
-      // for a required context.
-      // @todo: Remove once https://www.drupal.org/node/2677162 is fixed.
-      if (strpos($e->getMessage(), 'context is required') === FALSE) {
-        throw $e;
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function negate($negate = TRUE) {
-    $this->configuration['negate'] = $negate;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function evaluate() {
-    // Provide a reasonable default implementation that calls doEvaluate() while
-    // passing the defined context as arguments.
-    $args = [];
-    foreach ($this->getContextDefinitions() as $name => $definition) {
-      $args[$name] = $this->getContextValue($name);
-    }
-    return call_user_func_array([$this, 'doEvaluate'], $args);
-  }
-
-}
diff --git a/modules/rules/src/Core/RulesConditionInterface.php b/modules/rules/src/Core/RulesConditionInterface.php
deleted file mode 100644
index bc565bb..0000000
--- a/modules/rules/src/Core/RulesConditionInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\rules\Context\ContextAwarePluginInterface;
-use Drupal\Core\Condition\ConditionInterface;
-use Drupal\rules\Context\ContextProviderInterface;
-
-/**
- * Extends the core ConditionInterface to provide a negate() method.
- */
-interface RulesConditionInterface extends ConditionInterface, ContextAwarePluginInterface, ContextProviderInterface, ConfigurationAccessControlInterface {
-
-  /**
-   * Negates the result after evaluating this condition.
-   *
-   * @param bool $negate
-   *   TRUE to indicate that the condition should be negated, FALSE otherwise.
-   *
-   * @return $this
-   */
-  public function negate($negate = TRUE);
-
-}
diff --git a/modules/rules/src/Core/RulesConfigurableEventHandlerInterface.php b/modules/rules/src/Core/RulesConfigurableEventHandlerInterface.php
deleted file mode 100644
index 261ad81..0000000
--- a/modules/rules/src/Core/RulesConfigurableEventHandlerInterface.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Component\Plugin\ConfigurablePluginInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * Interface for handling configurable rules events.
- *
- * Configurable events have a custom event suffix, which gets appended to the
- * base event name (= the plugin id), forming the fully-qualified event name,
- * which is used for triggering reaction rules.
- *
- * For example, the fully-qualified event name of an event for viewing an
- * article node would be "rules_entity_view:node--article", whereas
- * "rules_entity_view:node" is the base event name and "article" the event
- * suffix as returned from ::getEventNameSuffix().
- *
- * The event name suffix must be generated from the event data at run-time,
- * while the configured plugin has to determine it based upon the event
- * configuration.
- *
- * @see \Drupal\rules\Core\RulesDefaultEventHandler
- */
-interface RulesConfigurableEventHandlerInterface extends RulesEventHandlerInterface, ConfigurablePluginInterface {
-
-  /**
-   * Determines the qualified event names for the dispatched event.
-   *
-   * @param \Symfony\Component\EventDispatcher\Event $event
-   *   The event data of the event being dispatched.
-   * @param string $event_name
-   *   The event base name.
-   * @param array $event_definition
-   *   The event definition. If necessary for the event, the contained context
-   *   definitions may be refined as suiting for the event data.
-   *
-   * @return string[]
-   *   The array of qualified event name suffixes to add; e.g, 'article' if
-   *   the fully-qualified event "rules_entity_view:node--article" should be
-   *   triggered in addition to base event "rules_entity_view:node".
-   */
-  public static function determineQualifiedEvents(Event $event, $event_name, array &$event_definition);
-
-  /**
-   * Provides a human readable summary of the event's configuration.
-   *
-   * @return string|\Drupal\Component\Render\MarkupInterface
-   *   The human readable summary.
-   */
-  public function summary();
-
-  /**
-   * Builds the event configuration form.
-   *
-   * @param array $form
-   *   An associative array containing the initial structure of the plugin form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the complete form.
-   *
-   * @return array
-   *   The form structure.
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state);
-
-  /**
-   * Extract the form values and update the event configuration.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the plugin form as built
-   *   by static::buildConfigurationForm().
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the complete form.
-   */
-  public function extractConfigurationFormValues(array &$form, FormStateInterface $form_state);
-
-  /**
-   * Validates that this event is configured correctly.
-   *
-   * @return \Drupal\rules\Engine\IntegrityViolationList
-   *   A list object containing \Drupal\rules\Engine\IntegrityViolation objects.
-   */
-  public function validate();
-
-  /**
-   * Provides the event name suffix based upon the plugin configuration.
-   *
-   * If the event is configured and a suffix is provided, the event name Rules
-   * uses for the configured event is {EVENT_NAME}--{SUFFIX}.
-   *
-   * @return string|false
-   *   The suffix string, for FALSE if no suffix should be appended.
-   */
-  public function getEventNameSuffix();
-
-  /**
-   * Refines provided context definitions based upon plugin configuration.
-   */
-  public function refineContextDefinitions();
-
-}
diff --git a/modules/rules/src/Core/RulesDefaultEventHandler.php b/modules/rules/src/Core/RulesDefaultEventHandler.php
deleted file mode 100644
index eea8115..0000000
--- a/modules/rules/src/Core/RulesDefaultEventHandler.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Component\Plugin\Exception\ContextException;
-use Drupal\Core\Plugin\PluginBase;
-
-/**
- * Default event handler class.
- */
-class RulesDefaultEventHandler extends PluginBase implements RulesEventHandlerInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getContextDefinitions() {
-    $definition = $this->getPluginDefinition();
-    if ($this instanceof RulesConfigurableEventHandlerInterface) {
-      $this->refineContextDefinitions();
-    }
-    return !empty($definition['context']) ? $definition['context'] : [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getContextDefinition($name) {
-    $definitions = $this->getContextDefinitions();
-    if (empty($definitions[$name])) {
-      throw new ContextException(sprintf("The %s context is not a valid context.", $name));
-    }
-    return $definitions[$name];
-  }
-
-}
diff --git a/modules/rules/src/Core/RulesEventHandlerInterface.php b/modules/rules/src/Core/RulesEventHandlerInterface.php
deleted file mode 100644
index 3769bd1..0000000
--- a/modules/rules/src/Core/RulesEventHandlerInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Component\Plugin\DerivativeInspectionInterface;
-use Drupal\Component\Plugin\PluginInspectionInterface;
-
-/**
- * Interface for Rules event handlers.
- *
- * Event handlers provide access to the metadata of events.
- *
- * @see \Drupal\rules\Core\RulesDefaultEventHandler
- */
-interface RulesEventHandlerInterface extends PluginInspectionInterface, DerivativeInspectionInterface {
-
-  /**
-   * Gets the context definitions of the event.
-   *
-   * @return \Drupal\rules\Context\ContextDefinitionInterface[]
-   *   The array of context definitions, keyed by context name.
-   */
-  public function getContextDefinitions();
-
-  /**
-   * Gets a specific context definition of the plugin.
-   *
-   * @param string $name
-   *   The name of the context in the plugin definition.
-   *
-   * @return \Drupal\rules\Context\ContextDefinitionInterface
-   *   The definition against which the context value must validate.
-   *
-   * @throws \Drupal\Component\Plugin\Exception\PluginException
-   *   If the requested context is not defined.
-   */
-  public function getContextDefinition($name);
-
-}
diff --git a/modules/rules/src/Core/RulesEventManager.php b/modules/rules/src/Core/RulesEventManager.php
deleted file mode 100644
index 4912375..0000000
--- a/modules/rules/src/Core/RulesEventManager.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Drupal\rules\Core;
-
-use Drupal\Component\Plugin\CategorizingPluginManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\CategorizingPluginManagerTrait;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
-use Drupal\Core\Plugin\Discovery\YamlDiscovery;
-use Drupal\Core\Plugin\Factory\ContainerFactory;
-use Drupal\rules\Context\ContextDefinition;
-
-/**
- * Plugin manager for Rules events that can be triggered.
- *
- * Rules events are primarily defined in *.rules.events.yml files.
- *
- * @see \Drupal\rules\Core\RulesEventInterface
- */
-class RulesEventManager extends DefaultPluginManager implements CategorizingPluginManagerInterface {
-
-  use CategorizingPluginManagerTrait;
-
-  /**
-   * Provides some default values for the definition of all Rules event plugins.
-   *
-   * @var array
-   */
-  protected $defaults = [
-    'class' => RulesDefaultEventHandler::class,
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(ModuleHandlerInterface $module_handler) {
-    $this->alterInfo('rules_event');
-    $this->discovery = new ContainerDerivativeDiscoveryDecorator(new YamlDiscovery('rules.events', $module_handler->getModuleDirectories()));
-    $this->factory = new ContainerFactory($this, RulesEventHandlerInterface::class);
-    $this->moduleHandler = $module_handler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createInstance($plugin_id, array $configuration = []) {
-    // If a fully qualified event name is passed, be sure to get the base name
-    // first.
-    $plugin_id = $this->getEventBaseName($plugin_id);
-    return parent::createInstance($plugin_id, $configuration);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefinition($plugin_id, $exception_on_invalid = TRUE) {
-    // If a fully qualified event name is passed, be sure to get the base name
-    // first.
-    $plugin_id = $this->getEventBaseName($plugin_id);
-    return parent::getDefinition($plugin_id, $exception_on_invalid);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processDefinition(&$definition, $plugin_id) {
-    parent::processDefinition($definition, $plugin_id);
-    if (!isset($definition['context'])) {
-      $definition['context'] = [];
-    }
-    // Convert the flat context arrays into ContextDefinition objects.
-    foreach ($definition['context'] as $context_name => $values) {
-      $definition['context'][$context_name] = ContextDefinition::createFromArray($values);
-    }
-  }
-
-  /**
-   * Gets the base name of a configured event name.
-   *
-   * For a configured event name like {EVENT_NAME}--{SUFFIX}, the base event
-   * name {EVENT_NAME} is returned.
-   *
-   * @return string
-   *   The event base name.
-   *
-   * @see \Drupal\rules\Core\RulesConfigurableEventHandlerInterface::getEventNameSuffix()
-   */
-  public function getEventBaseName($event_name) {
-    // Cut off any suffix from a configured event name.
-    if (strpos($event_name, '--') !== FALSE) {
-      $parts = explode('--', $event_name, 2);
-      return $parts[0];
-    }
-    return $event_name;
-  }
-
-}
diff --git a/modules/rules/src/Engine/ActionExpressionContainer.php b/modules/rules/src/Engine/ActionExpressionContainer.php
deleted file mode 100644
index 0bfc195..0000000
--- a/modules/rules/src/Engine/ActionExpressionContainer.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Exception\InvalidExpressionException;
-
-/**
- * Container for actions.
- */
-abstract class ActionExpressionContainer extends ExpressionContainerBase implements ActionExpressionContainerInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * List of actions that will be executed.
-   *
-   * @var \Drupal\rules\Engine\ActionExpressionInterface[]
-   */
-  protected $actions = [];
-
-  /**
-   * Constructor.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param array $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\rules\Engine\ExpressionManagerInterface $expression_manager
-   *   The rules expression plugin manager.
-   */
-  public function __construct(array $configuration, $plugin_id, array $plugin_definition, ExpressionManagerInterface $expression_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->expressionManager = $expression_manager;
-
-    $configuration += ['actions' => []];
-    foreach ($configuration['actions'] as $action_config) {
-      $action = $expression_manager->createInstance($action_config['id'], $action_config);
-      $this->actions[] = $action;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addExpressionObject(ExpressionInterface $expression) {
-    if (!$expression instanceof ActionExpressionInterface) {
-      throw new InvalidExpressionException('Only action expressions can be added to an action container.');
-    }
-    if ($this->getExpression($expression->getUuid())) {
-      throw new InvalidExpressionException('An action with the same UUID already exists in the container.');
-    }
-    $this->actions[] = $expression;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addAction($action_id, ContextConfig $config = NULL) {
-    return $this->addExpressionObject(
-      $this->expressionManager
-        ->createAction($action_id)
-        ->setConfiguration($config ? $config->toArray() : [])
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfiguration() {
-    $configuration = parent::getConfiguration();
-    // We need to update the configuration in case actions have been added or
-    // changed.
-    $configuration['actions'] = [];
-    foreach ($this->actions as $action) {
-      $configuration['actions'][] = $action->getConfiguration();
-    }
-    return $configuration;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIterator() {
-    return new \ArrayIterator($this->actions);
-  }
-
-  /**
-   * PHP magic __clone function.
-   */
-  public function __clone() {
-    // Implement a deep clone.
-    foreach ($this->actions as &$action) {
-      $action = clone $action;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getExpression($uuid) {
-    foreach ($this->actions as $action) {
-      if ($action->getUuid() === $uuid) {
-        return $action;
-      }
-      if ($action instanceof ExpressionContainerInterface) {
-        $nested_action = $action->getExpression($uuid);
-        if ($nested_action) {
-          return $nested_action;
-        }
-      }
-    }
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteExpression($uuid) {
-    foreach ($this->actions as $index => $action) {
-      if ($action->getUuid() === $uuid) {
-        unset($this->actions[$index]);
-        return TRUE;
-      }
-      if ($action instanceof ExpressionContainerInterface
-        && $action->deleteExpression($uuid)
-      ) {
-        return TRUE;
-      }
-    }
-    return FALSE;
-  }
-
-}
diff --git a/modules/rules/src/Engine/ActionExpressionContainerInterface.php b/modules/rules/src/Engine/ActionExpressionContainerInterface.php
deleted file mode 100644
index 1abbeaa..0000000
--- a/modules/rules/src/Engine/ActionExpressionContainerInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\rules\Context\ContextConfig;
-
-/**
- * Contains action expressions.
- */
-interface ActionExpressionContainerInterface extends ActionExpressionInterface, ExpressionContainerInterface {
-
-  /**
-   * Creates an action expression and adds it to the container.
-   *
-   * @param string $action_id
-   *   The action plugin id.
-   * @param \Drupal\rules\Context\ContextConfig $config
-   *   (optional) The configuration for the specified plugin.
-   *
-   * @return $this
-   */
-  public function addAction($action_id, ContextConfig $config = NULL);
-
-}
diff --git a/modules/rules/src/Engine/ActionExpressionInterface.php b/modules/rules/src/Engine/ActionExpressionInterface.php
deleted file mode 100644
index 67dc5fa..0000000
--- a/modules/rules/src/Engine/ActionExpressionInterface.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-/**
- * Defines the interface for Rules expressions that can be used as actions.
- */
-interface ActionExpressionInterface extends ExpressionInterface {
-
-}
diff --git a/modules/rules/src/Engine/ConditionExpressionContainer.php b/modules/rules/src/Engine/ConditionExpressionContainer.php
deleted file mode 100644
index 25a6e74..0000000
--- a/modules/rules/src/Engine/ConditionExpressionContainer.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Exception\InvalidExpressionException;
-
-/**
- * Container for conditions.
- */
-abstract class ConditionExpressionContainer extends ExpressionContainerBase implements ConditionExpressionContainerInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * List of conditions that are evaluated.
-   *
-   * @var \Drupal\rules\Engine\ConditionExpressionInterface[]
-   */
-  protected $conditions = [];
-
-  /**
-   * Constructs a new class instance.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param array $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\rules\Engine\ExpressionManagerInterface $expression_manager
-   *   The rules expression plugin manager.
-   */
-  public function __construct(array $configuration, $plugin_id, array $plugin_definition, ExpressionManagerInterface $expression_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->expressionManager = $expression_manager;
-
-    $configuration += ['conditions' => []];
-    foreach ($configuration['conditions'] as $condition_config) {
-      $condition = $this->expressionManager->createInstance($condition_config['id'], $condition_config);
-      $this->conditions[] = $condition;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addExpressionObject(ExpressionInterface $expression) {
-    if (!$expression instanceof ConditionExpressionInterface) {
-      throw new InvalidExpressionException('Only condition expressions can be added to a condition container.');
-    }
-    if ($this->getExpression($expression->getUuid())) {
-      throw new InvalidExpressionException('A condition with the same UUID already exists in the container.');
-    }
-    $this->conditions[] = $expression;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addCondition($condition_id, ContextConfig $config = NULL) {
-    return $this->addExpressionObject(
-      $this->expressionManager
-        ->createCondition($condition_id)
-        ->setConfiguration($config ? $config->toArray() : [])
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function executeWithState(ExecutionStateInterface $rules_state) {
-    $result = $this->evaluate($rules_state);
-    return $this->isNegated() ? !$result : $result;
-  }
-
-  /**
-   * Returns the final result after executing the conditions.
-   */
-  abstract public function evaluate(ExecutionStateInterface $rules_state);
-
-  /**
-   * {@inheritdoc}
-   */
-  public function negate($negate = TRUE) {
-    $this->configuration['negate'] = $negate;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isNegated() {
-    return !empty($this->configuration['negate']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfiguration() {
-    $configuration = parent::getConfiguration();
-    // We need to update the configuration in case conditions have been added or
-    // changed.
-    $configuration['conditions'] = [];
-    foreach ($this->conditions as $condition) {
-      $configuration['conditions'][] = $condition->getConfiguration();
-    }
-    return $configuration;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIterator() {
-    return new \ArrayIterator($this->conditions);
-  }
-
-  /**
-   * PHP magic __clone function.
-   */
-  public function __clone() {
-    // Implement a deep clone.
-    foreach ($this->conditions as &$condition) {
-      $condition = clone $condition;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getExpression($uuid) {
-    foreach ($this->conditions as $condition) {
-      if ($condition->getUuid() === $uuid) {
-        return $condition;
-      }
-      if ($condition instanceof ExpressionContainerInterface) {
-        $nested_condition = $condition->getExpression($uuid);
-        if ($nested_condition) {
-          return $nested_condition;
-        }
-      }
-    }
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteExpression($uuid) {
-    foreach ($this->conditions as $index => $condition) {
-      if ($condition->getUuid() === $uuid) {
-        unset($this->conditions[$index]);
-        return TRUE;
-      }
-      if ($condition instanceof ExpressionContainerInterface
-        && $condition->deleteExpression($uuid)
-      ) {
-        return TRUE;
-      }
-    }
-    return FALSE;
-  }
-
-}
diff --git a/modules/rules/src/Engine/ConditionExpressionContainerInterface.php b/modules/rules/src/Engine/ConditionExpressionContainerInterface.php
deleted file mode 100644
index 63b05d3..0000000
--- a/modules/rules/src/Engine/ConditionExpressionContainerInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\rules\Context\ContextConfig;
-
-/**
- * Contains condition expressions.
- */
-interface ConditionExpressionContainerInterface extends ConditionExpressionInterface, ExpressionContainerInterface {
-
-  /**
-   * Creates a condition expression and adds it to the container.
-   *
-   * @param string $condition_id
-   *   The condition plugin id.
-   * @param \Drupal\rules\Context\ContextConfig $config
-   *   (optional) The configuration for the specified plugin.
-   *
-   * @return \Drupal\rules\Core\RulesConditionInterface
-   *   The created condition.
-   */
-  public function addCondition($condition_id, ContextConfig $config = NULL);
-
-}
diff --git a/modules/rules/src/Engine/ConditionExpressionInterface.php b/modules/rules/src/Engine/ConditionExpressionInterface.php
deleted file mode 100644
index c47ce1e..0000000
--- a/modules/rules/src/Engine/ConditionExpressionInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-/**
- * Defines the interface for Rules expressions that can be used as conditions.
- */
-interface ConditionExpressionInterface extends ExpressionInterface {
-
-  /**
-   * Negates the result after evaluating this condition.
-   *
-   * @param bool $negate
-   *   TRUE to indicate that the condition should be negated, FALSE otherwise.
-   *
-   * @return $this
-   */
-  public function negate($negate = TRUE);
-
-  /**
-   * Determines whether condition result will be negated.
-   *
-   * @return bool
-   *   Whether the condition result will be negated.
-   */
-  public function isNegated();
-
-}
diff --git a/modules/rules/src/Engine/ExecutionMetadataState.php b/modules/rules/src/Engine/ExecutionMetadataState.php
deleted file mode 100644
index 740e6fb..0000000
--- a/modules/rules/src/Engine/ExecutionMetadataState.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\rules\Context\GlobalContextRepositoryTrait;
-use Drupal\rules\Exception\IntegrityException;
-use Drupal\typed_data\DataFetcherTrait;
-use Drupal\typed_data\Exception\TypedDataException;
-
-/**
- * The state used during configuration time holding data definitions.
- */
-class ExecutionMetadataState implements ExecutionMetadataStateInterface {
-
-  use DataFetcherTrait;
-  use GlobalContextRepositoryTrait;
-
-  /**
-   * The known data definitions.
-   *
-   * @var \Drupal\Core\TypedData\DataDefinitionInterface
-   */
-  protected $dataDefinitions = [];
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(array $data_definitions = []) {
-    return new static($data_definitions);
-  }
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface[] $data_definitions
-   *   (optional) Data definitions to initialize this state with.
-   */
-  protected function __construct(array $data_definitions) {
-    $this->dataDefinitions = $data_definitions;
-    // Add definitions of all global contexts.
-    $contexts = $this->getGlobalContextRepository()->getAvailableContexts();
-    foreach ($contexts as $name => $context) {
-      $this->setDataDefinition($name, $context
-        ->getContextDefinition()
-        ->getDataDefinition()
-      );
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setDataDefinition($name, DataDefinitionInterface $definition) {
-    $this->dataDefinitions[$name] = $definition;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDataDefinition($name) {
-    if (!array_key_exists($name, $this->dataDefinitions)) {
-      throw new IntegrityException("Unable to get variable $name, it is not defined.");
-    }
-    return $this->dataDefinitions[$name];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasDataDefinition($name) {
-    return array_key_exists($name, $this->dataDefinitions);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function removeDataDefinition($name) {
-    if (array_key_exists($name, $this->dataDefinitions)) {
-      unset($this->dataDefinitions[$name]);
-    }
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function fetchDefinitionByPropertyPath($property_path, $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED) {
-    try {
-      // Support global context names as variable name by ignoring points in
-      // the service name; e.g. @user.current_user_context:current_user.name.
-      if (isset($property_path[0]) && $property_path[0] == '@') {
-        list($service, $property_path) = explode(':', $property_path, 2);
-      }
-      $parts = explode('.', $property_path);
-      $var_name = array_shift($parts);
-      if (isset($service)) {
-        $var_name = $service . ':' . $var_name;
-      }
-      return $this
-        ->getDataFetcher()
-        ->fetchDefinitionBySubPaths($this->getDataDefinition($var_name), $parts, $langcode);
-    }
-    catch (TypedDataException $e) {
-      // Pass on the original exception in the exception trace.
-      throw new IntegrityException($e->getMessage(), 0, $e);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autocomplete($partial_property_path) {
-    return $this
-      ->getDataFetcher()
-      ->autocompletePropertyPath($this->dataDefinitions, $partial_property_path);
-  }
-
-}
diff --git a/modules/rules/src/Engine/ExecutionMetadataStateInterface.php b/modules/rules/src/Engine/ExecutionMetadataStateInterface.php
deleted file mode 100644
index 350a49e..0000000
--- a/modules/rules/src/Engine/ExecutionMetadataStateInterface.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-
-/**
- * The state used during configuration time holding data definitions.
- *
- * This is mostly used for integrity checks to validate the configuration of a
- * rule. The metadata state is passed down the expression tree where data
- * definitions can be modified or added. Nested expression in the tree then get
- * the updated metadata state and can make use of the updated variable data
- * definitions.
- */
-interface ExecutionMetadataStateInterface {
-
-  /**
-   * Creates the object.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface[] $data_definitions
-   *   (optional) Data definitions to initialize this state with.
-   *
-   * @return static
-   */
-  public static function create(array $data_definitions = []);
-
-  /**
-   * Sets a data definition in the execution metadata state.
-   *
-   * @param string $name
-   *   Variable name of the data definition.
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $definition
-   *   The data definition that represents the variable.
-   */
-  public function setDataDefinition($name, DataDefinitionInterface $definition);
-
-  /**
-   * Retrieve a data definition in this execution metadata state.
-   *
-   * @param string $name
-   *   The variable name to get the data definition for.
-   *
-   * @return \Drupal\Core\TypedData\DataDefinitionInterface
-   *   The data definition.
-   */
-  public function getDataDefinition($name);
-
-  /**
-   * Checks if the variable with the given name is present in the state.
-   *
-   * @param string $name
-   *   The variable name.
-   *
-   * @return bool
-   *   TRUE if the state has that variable, FALSE otherwise.
-   */
-  public function hasDataDefinition($name);
-
-  /**
-   * Removes a data definition from the metadata state.
-   *
-   * @param string $name
-   *   Variable name of the data definition to be removed.
-   *
-   * @return $this
-   */
-  public function removeDataDefinition($name);
-
-  /**
-   * Applies a data selector and returns the corresponding data definition.
-   *
-   * @param string $property_path
-   *   The property path, example: "node:title:value".
-   * @param string $langcode
-   *   The language code.
-   *
-   * @return \Drupal\Core\TypedData\DataDefinitionInterface
-   *   A data definition if the property path could be applied.
-   *
-   * @throws \Drupal\rules\Exception\IntegrityException
-   *   Thrown if the property path is invalid.
-   */
-  public function fetchDefinitionByPropertyPath($property_path, $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED);
-
-}
diff --git a/modules/rules/src/Engine/ExecutionState.php b/modules/rules/src/Engine/ExecutionState.php
deleted file mode 100644
index 41352a0..0000000
--- a/modules/rules/src/Engine/ExecutionState.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\TypedData\Exception\MissingDataException;
-use Drupal\Core\TypedData\TypedDataInterface;
-use Drupal\Core\TypedData\TypedDataTrait;
-use Drupal\rules\Context\ContextDefinitionInterface;
-use Drupal\rules\Context\GlobalContextRepositoryTrait;
-use Drupal\rules\Exception\EvaluationException;
-use Drupal\rules\Exception\InvalidArgumentException;
-use Drupal\typed_data\DataFetcherTrait;
-
-/**
- * The rules execution state.
- *
- * A rule element may clone the state, so any added variables are only visible
- * for elements in the current PHP-variable-scope.
- */
-class ExecutionState implements ExecutionStateInterface {
-
-  use DataFetcherTrait;
-  use GlobalContextRepositoryTrait;
-  use TypedDataTrait;
-
-  /**
-   * Globally keeps the ids of rules blocked due to recursion prevention.
-   *
-   * @var array
-   *
-   * @todo Implement recursion prevention from D7.
-   */
-  static protected $blocked = [];
-
-  /**
-   * The known variables.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataInterface[]
-   */
-  protected $variables = [];
-
-  /**
-   * Holds variables for auto-saving later.
-   *
-   * @var array
-   */
-  protected $saveLater = [];
-
-  /**
-   * Variable for saving currently blocked configs for serialization.
-   *
-   * @var array
-   */
-  protected $currentlyBlocked;
-
-  /**
-   * Creates the object.
-   *
-   * @param \Drupal\Core\TypedData\TypedDataInterface[] $variables
-   *   (optional) Variables to initialize this state with.
-   *
-   * @return static
-   */
-  public static function create(array $variables = []) {
-    return new static($variables);
-  }
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\Core\TypedData\TypedDataInterface[] $variables
-   *   (optional) Variables to initialize this state with.
-   */
-  protected function __construct(array $variables) {
-    $this->variables = $variables;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setVariable($name, ContextDefinitionInterface $definition, $value) {
-    $data = $this->getTypedDataManager()->create(
-      $definition->getDataDefinition(),
-      $value
-    );
-    $this->setVariableData($name, $data);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setVariableData($name, TypedDataInterface $data) {
-    $this->variables[$name] = $data;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getVariable($name) {
-    if (!$this->hasVariable($name)) {
-      throw new EvaluationException("Unable to get variable $name, it is not defined.");
-    }
-    return $this->variables[$name];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getVariableValue($name) {
-    return $this->getVariable($name)->getValue();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasVariable($name) {
-    if (!array_key_exists($name, $this->variables)) {
-      // If there is no such variable, lazy-add global context variables. That
-      // way can safe time fetching global context if its not needed.
-      if (!($name[0] === '@' && strpos($name, ':') !== FALSE)) {
-        return FALSE;
-      }
-      $contexts = $this->getGlobalContextRepository()->getRuntimeContexts([$name]);
-      if (!array_key_exists($name, $contexts)) {
-        return FALSE;
-      }
-      $this->setVariableData($name, $contexts[$name]->getContextData());
-    }
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function removeVariable($name) {
-    if (array_key_exists($name, $this->variables)) {
-      unset($this->variables[$name]);
-    }
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function fetchDataByPropertyPath($property_path, $langcode = NULL) {
-    try {
-      // Support global context names as variable name by ignoring points in
-      // the service name; e.g. @user.current_user_context:current_user.name.
-      if ($property_path[0] == '@') {
-        list($service, $property_path) = explode(':', $property_path, 2);
-      }
-      $parts = explode('.', $property_path);
-      $var_name = array_shift($parts);
-      if (isset($service)) {
-        $var_name = $service . ':' . $var_name;
-      }
-      return $this
-        ->getDataFetcher()
-        ->fetchDataBySubPaths($this->getVariable($var_name), $parts, $langcode);
-    }
-    catch (InvalidArgumentException $e) {
-      // Pass on the original exception in the exception trace.
-      throw new EvaluationException($e->getMessage(), 0, $e);
-    }
-    catch (MissingDataException $e) {
-      // Pass on the original exception in the exception trace.
-      throw new EvaluationException($e->getMessage(), 0, $e);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function saveChangesLater($selector) {
-    $this->saveLater[$selector] = TRUE;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAutoSaveSelectors() {
-    return array_keys($this->saveLater);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autoSave() {
-    // Make changes permanent.
-    foreach ($this->saveLater as $selector => $flag) {
-      $typed_data = $this->fetchDataByPropertyPath($selector);
-      // Things that can be saved must have a save() method, right?
-      // Saving is always done at the root of the typed data tree, for example
-      // on the entity level.
-      $typed_data->getRoot()->getValue()->save();
-    }
-    return $this;
-  }
-
-}
diff --git a/modules/rules/src/Engine/ExecutionStateInterface.php b/modules/rules/src/Engine/ExecutionStateInterface.php
deleted file mode 100644
index 5a2d411..0000000
--- a/modules/rules/src/Engine/ExecutionStateInterface.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\TypedData\TypedDataInterface;
-use Drupal\rules\Context\ContextDefinitionInterface;
-
-/**
- * Defines an interface for the rules state.
- */
-interface ExecutionStateInterface {
-
-  /**
-   * Sets a state variable based on its definition and value.
-   *
-   * @param string $name
-   *   The context variable name.
-   * @param \Drupal\rules\Context\ContextDefinitionInterface $definition
-   *   The context definition of the variable.
-   * @param mixed $value
-   *   The variable value.
-   *
-   * @return $this
-   */
-  public function setVariable($name, ContextDefinitionInterface $definition, $value);
-
-  /**
-   * Sets a state variable with some typed data object.
-   *
-   * @param string $name
-   *   The variable name.
-   * @param \Drupal\Core\TypedData\TypedDataInterface $data
-   *   The variable wrapped as typed data.
-   *
-   * @return $this
-   */
-  public function setVariableData($name, TypedDataInterface $data);
-
-  /**
-   * Gets a variable.
-   *
-   * @param string $name
-   *   The name of the variable to return.
-   *
-   * @return \Drupal\Core\TypedData\TypedDataInterface
-   *   The variable wrapped as typed data.
-   *
-   * @throws \Drupal\rules\Exception\EvaluationException
-   *   Throws an EvaluationException if the variable does not exist in the
-   *   state.
-   */
-  public function getVariable($name);
-
-  /**
-   * Gets the value of a variable.
-   *
-   * @param string $name
-   *   The name of the variable to return the value for.
-   *
-   * @return mixed
-   *   The variable value.
-   *
-   * @throws \Drupal\rules\Exception\EvaluationException
-   *   Throws an EvaluationException if the variable does not exist in the
-   *   state.
-   */
-  public function getVariableValue($name);
-
-  /**
-   * Checks if a variable exists by name in the Rules state.
-   *
-   * @param string $name
-   *   The variable name.
-   *
-   * @return bool
-   *   TRUE if the variable exists, FALSE otherwise.
-   */
-  public function hasVariable($name);
-
-  /**
-   * Removes a variable from the state if it is set.
-   *
-   * @param string $name
-   *   The name of the variable to remove.
-   *
-   * @return $this
-   */
-  public function removeVariable($name);
-
-  /**
-   * Returns a value as specified in the selector.
-   *
-   * @param string $property_path
-   *   The property path string starting with a variable name; e.g.,
-   *   "node.uid.entity.mail.value".
-   * @param string $langcode
-   *   (optional) The language code used to get the argument value if the
-   *   argument value should be translated. Defaults to NULL.
-   *
-   * @return \Drupal\Core\TypedData\TypedDataInterface
-   *   The variable wrapped as typed data.
-   *
-   * @throws \Drupal\rules\Exception\EvaluationException
-   *   Throws an EvaluationException in case the selector cannot be applied.
-   */
-  public function fetchDataByPropertyPath($property_path, $langcode = NULL);
-
-  /**
-   * Mark a variable to be saved later when the execution is finished.
-   *
-   * @param string $selector
-   *   The data selector that specifies the target object to be saved. Example:
-   *   node:uid:entity.
-   *
-   * @return $this
-   */
-  public function saveChangesLater($selector);
-
-  /**
-   * Returns the list of variables that should be auto-saved after execution.
-   *
-   * @return string[]
-   *   The list of data selectors that specify the target object to be saved.
-   *   Example: node.uid.entity.
-   */
-  public function getAutoSaveSelectors();
-
-  /**
-   * Saves all variables that have been marked for auto saving.
-   *
-   * @return $this
-   */
-  public function autoSave();
-
-}
diff --git a/modules/rules/src/Engine/ExpressionBase.php b/modules/rules/src/Engine/ExpressionBase.php
deleted file mode 100644
index 7eb6d29..0000000
--- a/modules/rules/src/Engine/ExpressionBase.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\Plugin\PluginBase;
-
-/**
- * Base class for rules expressions.
- */
-abstract class ExpressionBase extends PluginBase implements ExpressionInterface {
-
-  /**
-   * The plugin configuration.
-   *
-   * @var array
-   */
-  protected $configuration;
-
-  /**
-   * The root expression if this object is nested.
-   *
-   * @var \Drupal\rules\Engine\ExpressionInterface
-   */
-  protected $root;
-
-  /**
-   * The config entity this expression is associated with, if any.
-   *
-   * @var string
-   */
-  protected $configEntityId;
-
-  /**
-   * The UUID of this expression.
-   *
-   * @var string
-   */
-  protected $uuid;
-
-  /**
-   * Constructor.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->setConfiguration($configuration);
-  }
-
-  /**
-   * Executes a rules expression.
-   */
-  public function execute() {
-    // If there is no state given, we have to assume no required context.
-    $state = ExecutionState::create();
-    $result = $this->executeWithState($state);
-    // Save specifically registered variables in the end after execution.
-    $state->autoSave();
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfiguration() {
-    return [
-      'id' => $this->getPluginId(),
-      'uuid' => $this->uuid,
-    ] + $this->configuration;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConfiguration(array $configuration) {
-    $this->configuration = $configuration + $this->defaultConfiguration();
-    if (isset($configuration['uuid'])) {
-      $this->uuid = $configuration['uuid'];
-    }
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormHandler() {
-    if (isset($this->pluginDefinition['form_class'])) {
-      $class_name = $this->pluginDefinition['form_class'];
-      return new $class_name($this);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRoot() {
-    if (isset($this->root)) {
-      // @todo: This seems to be the parent, not root.
-      return $this->root->getRoot();
-    }
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setRoot(ExpressionInterface $root) {
-    $this->root = $root;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLabel() {
-    return $this->pluginDefinition['label'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getUuid() {
-    return $this->uuid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUuid($uuid) {
-    $this->uuid = $uuid;
-  }
-
-}
diff --git a/modules/rules/src/Engine/ExpressionContainerBase.php b/modules/rules/src/Engine/ExpressionContainerBase.php
deleted file mode 100644
index 3486b33..0000000
--- a/modules/rules/src/Engine/ExpressionContainerBase.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\rules\Context\ContextConfig;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Common base class for action and condition expression containers.
- */
-abstract class ExpressionContainerBase extends ExpressionBase implements ExpressionContainerInterface {
-
-  /**
-   * The expression manager.
-   *
-   * @var \Drupal\rules\Engine\ExpressionManagerInterface
-   */
-  protected $expressionManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('plugin.manager.rules_expression')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addExpression($plugin_id, ContextConfig $config = NULL) {
-    return $this->addExpressionObject(
-      $this->expressionManager->createInstance($plugin_id, $config ? $config->toArray() : [])
-    );
-  }
-
-  /**
-   * Determines whether child-expressions are allowed to assert metadata.
-   *
-   * @return bool
-   *   Whether child-expressions are allowed to assert metadata.
-   *
-   * @see \Drupal\rules\Engine\ExpressionInterface::prepareExecutionMetadataState()
-   */
-  abstract protected function allowsMetadataAssertions();
-
-  /**
-   * {@inheritdoc}
-   */
-  public function checkIntegrity(ExecutionMetadataStateInterface $metadata_state, $apply_assertions = TRUE) {
-    $violation_list = new IntegrityViolationList();
-    $this->prepareExecutionMetadataStateBeforeTraversal($metadata_state);
-    $apply_assertions = $apply_assertions && $this->allowsMetadataAssertions();
-    foreach ($this as $child_expression) {
-      $child_violations = $child_expression->checkIntegrity($metadata_state, $apply_assertions);
-      $violation_list->addAll($child_violations);
-    }
-    $this->prepareExecutionMetadataStateAfterTraversal($metadata_state);
-    return $violation_list;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function prepareExecutionMetadataState(ExecutionMetadataStateInterface $metadata_state, ExpressionInterface $until = NULL, $apply_assertions = TRUE) {
-    if ($until && $this->getUuid() === $until->getUuid()) {
-      return TRUE;
-    }
-    $this->prepareExecutionMetadataStateBeforeTraversal($metadata_state);
-    $apply_assertions = $apply_assertions && $this->allowsMetadataAssertions();
-    foreach ($this as $child_expression) {
-      $found = $child_expression->prepareExecutionMetadataState($metadata_state, $until, $apply_assertions);
-      // If the expression was found, we need to stop.
-      if ($found) {
-        return TRUE;
-      }
-    }
-    $this->prepareExecutionMetadataStateAfterTraversal($metadata_state);
-  }
-
-  /**
-   * Prepares execution metadata state before traversing through children.
-   *
-   * @see ::prepareExecutionMetadataState()
-   * @see ::checkIntegrity()
-   */
-  protected function prepareExecutionMetadataStateBeforeTraversal(ExecutionMetadataStateInterface $metadata_state) {
-    // Any pre-traversal preparations need to be added here.
-  }
-
-  /**
-   * Prepares execution metadata state after traversing through children.
-   *
-   * @see ::prepareExecutionMetadataState()
-   * @see ::checkIntegrity()
-   */
-  protected function prepareExecutionMetadataStateAfterTraversal(ExecutionMetadataStateInterface $metadata_state) {
-    // Any post-traversal preparations need to be added here.
-  }
-
-}
diff --git a/modules/rules/src/Engine/ExpressionContainerInterface.php b/modules/rules/src/Engine/ExpressionContainerInterface.php
deleted file mode 100644
index 56b4101..0000000
--- a/modules/rules/src/Engine/ExpressionContainerInterface.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\rules\Context\ContextConfig;
-
-/**
- * Defines a common interface for expressions containing other expressions.
- *
- * Usually expression containers also implement the
- * ActionExpressionContainerInterface or ConditionExpressionContainerInterface
- * in order to denote whether it contains action or condition expressions.
- */
-interface ExpressionContainerInterface extends ExpressionInterface, \IteratorAggregate {
-
-  /**
-   * Creates and adds an expression.
-   *
-   * @param string $plugin_id
-   *   The id of the expression plugin to add.
-   * @param \Drupal\rules\Context\ContextConfig $config
-   *   (optional) The configuration for the specified plugin.
-   *
-   * @throws \Drupal\rules\Exception\InvalidExpressionException
-   *   Thrown if the wrong expression is passed; e.g. if a condition expression
-   *   is added to an action expression container.
-   *
-   * @return $this
-   */
-  public function addExpression($plugin_id, ContextConfig $config = NULL);
-
-  /**
-   * Adds an expression object.
-   *
-   * @param \Drupal\rules\Engine\ExpressionInterface $expression
-   *   The expression object.
-   *
-   * @throws \Drupal\rules\Exception\InvalidExpressionException
-   *   Thrown if the wrong expression is passed; e.g. if a condition expression
-   *   is added to an action expression container.
-   *
-   * @return $this
-   */
-  public function addExpressionObject(ExpressionInterface $expression);
-
-  /**
-   * Looks up the expression by UUID in this container.
-   *
-   * @param string $uuid
-   *   The UUID of the expression.
-   *
-   * @return \Drupal\rules\Engine\ExpressionInterface|false
-   *   The expression object or FALSE if not expression object with that UUID
-   *   could be found.
-   */
-  public function getExpression($uuid);
-
-  /**
-   * Deletes an expression indentified by the specified UUID in the container.
-   *
-   * @param string $uuid
-   *   The UUID of the expression.
-   *
-   * @return bool
-   *   TRUE if an expression was deleted, FALSE if no expression with that UUID
-   *   was found.
-   */
-  public function deleteExpression($uuid);
-
-}
diff --git a/modules/rules/src/Engine/ExpressionInterface.php b/modules/rules/src/Engine/ExpressionInterface.php
deleted file mode 100644
index a3c43b6..0000000
--- a/modules/rules/src/Engine/ExpressionInterface.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Component\Plugin\ConfigurablePluginInterface;
-use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\Core\Executable\ExecutableInterface;
-
-/**
- * Defines the interface for Rules expressions.
- *
- * @see \Drupal\rules\Engine\ExpressionManager
- */
-interface ExpressionInterface extends ExecutableInterface, ConfigurablePluginInterface, PluginInspectionInterface {
-
-  /**
-   * Execute the expression with a given Rules state.
-   *
-   * Note that this does not auto-save any changes.
-   *
-   * @param \Drupal\rules\Engine\ExecutionStateInterface $state
-   *   The state with all the execution variables in it.
-   *
-   * @return null|bool
-   *   The expression may return a boolean value after execution, this is used
-   *   by conditions that return their evaluation result.
-   *
-   * @throws \Drupal\rules\Exception\EvaluationException
-   *   Thrown if the Rules expression triggers errors during execution.
-   */
-  public function executeWithState(ExecutionStateInterface $state);
-
-  /**
-   * Returns the form handling class for this expression.
-   *
-   * @return \Drupal\rules\Form\Expression\ExpressionFormInterface|null
-   *   The form handling object if there is one, NULL otherwise.
-   */
-  public function getFormHandler();
-
-  /**
-   * Returns the root expression if this expression is nested.
-   *
-   * @return \Drupal\rules\Engine\ExpressionInterface
-   *   The root expression or $this if the expression is the root element
-   *   itself.
-   */
-  public function getRoot();
-
-  /**
-   * Set the root expression for this expression if it is nested.
-   *
-   * @param \Drupal\rules\Engine\ExpressionInterface $root
-   *   The root expression object.
-   */
-  public function setRoot(ExpressionInterface $root);
-
-  /**
-   * The label of this expression element that can be shown in the UI.
-   *
-   * @return string
-   *   The label for display.
-   */
-  public function getLabel();
-
-  /**
-   * Returns the UUID of this expression if it is nested in another expression.
-   *
-   * @return string|null
-   *   The UUID if this expression is nested or NULL if it does not have a UUID.
-   */
-  public function getUuid();
-
-  /**
-   * Sets the UUID of this expression in an expression tree.
-   *
-   * @param string $uuid
-   *   The UUID to set.
-   */
-  public function setUuid($uuid);
-
-  /**
-   * Verifies that this expression is configured correctly.
-   *
-   * Example: All configured data selectors must be valid.
-   *
-   * Note that for checking integrity the execution metadata state must be
-   * passed prepared as achieved by ::prepareExecutionMetadataState() and the
-   * expression must apply all metadata state preparations during its integrity
-   * check as it does in ::prepareExecutionMetadataState().
-   * This allows for efficient integrity checks of expression trees; e.g. see
-   * \Drupal\rules\Engine\ActionExpressionContainer::checkIntegrity().
-   *
-   * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
-   *   The execution metadata state, prepared until right before this
-   *   expression.
-   * @param bool $apply_assertions
-   *   (optional) Whether to apply metadata assertions while preparing the
-   *   execution metadata state. Defaults to TRUE.
-   *
-   * @return \Drupal\rules\Engine\IntegrityViolationList
-   *   A list object containing \Drupal\rules\Engine\IntegrityViolation objects.
-   *
-   * @see ::prepareExecutionMetadataState()
-   */
-  public function checkIntegrity(ExecutionMetadataStateInterface $metadata_state, $apply_assertions = TRUE);
-
-  /**
-   * Prepares the execution metadata state by adding metadata to it.
-   *
-   * If this expression contains other expressions then the metadata state is
-   * set up recursively. If a $until expression is specified then the setup will
-   * stop right before that expression to calculate the state at this execution
-   * point.
-   * This is useful for inspecting the state at a certain point in the
-   * expression tree as needed during configuration, for example to do
-   * autocompletion of available variables in the state.
-   *
-   * The difference to fully preparing the state is that not necessarily all
-   * variables are available in the middle of the expression tree, as for
-   * example variables being added later are not added yet. Preparing with
-   * $until = NULL reflects the execution metadata state at the end of the
-   * expression execution.
-   *
-   * @param \Drupal\rules\Engine\ExecutionMetadataStateInterface $metadata_state
-   *   The execution metadata state, prepared until right before this
-   *   expression.
-   * @param \Drupal\rules\Engine\ExpressionInterface $until
-   *   (optional) The expression at which metadata preparation should be
-   *   stopped. The preparation of the state will be stopped right before that
-   *   expression.
-   * @param bool $apply_assertions
-   *   (optional) Whether to apply metadata assertions while preparing the
-   *   execution metadata state. Defaults to TRUE. Metadata assertions should
-   *   be only applied if the expression's execution is required for sub-sequent
-   *   expressions being executed. For example, if a condition is optional as
-   *   it is part of a logical OR expression, its assertions may not be applied.
-   *   Defaults to TRUE.
-   *
-   * @return true|null
-   *   True if the metadata has been prepared and the $until expression was
-   *   found in the tree. Null otherwise.
-   */
-  public function prepareExecutionMetadataState(ExecutionMetadataStateInterface $metadata_state, ExpressionInterface $until = NULL, $apply_assertions = TRUE);
-
-}
diff --git a/modules/rules/src/Engine/ExpressionManager.php b/modules/rules/src/Engine/ExpressionManager.php
deleted file mode 100644
index e1d46bd..0000000
--- a/modules/rules/src/Engine/ExpressionManager.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Component\Uuid\UuidInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\rules\Annotation\RulesExpression;
-
-/**
- * Plugin manager for all Rules expressions.
- *
- * @see \Drupal\rules\Engine\ExpressionInterface
- */
-class ExpressionManager extends DefaultPluginManager implements ExpressionManagerInterface {
-
-  /**
-   * The UUID generating service.
-   *
-   * @var \Drupal\Component\Uuid\UuidInterface
-   */
-  protected $uuidService;
-
-  /**
-   * Constructor.
-   */
-  public function __construct(\Traversable $namespaces, ModuleHandlerInterface $module_handler, UuidInterface $uuid_service, $plugin_definition_annotation_name = RulesExpression::class) {
-    $this->alterInfo('rules_expression');
-    parent::__construct('Plugin/RulesExpression', $namespaces, $module_handler, ExpressionInterface::class, $plugin_definition_annotation_name);
-    $this->uuidService = $uuid_service;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createInstance($plugin_id, array $configuration = []) {
-    $instance = parent::createInstance($plugin_id, $configuration);
-
-    // Make sure that the instance has a UUID and generate one if necessary.
-    if (!$instance->getUuid()) {
-      $instance->setUuid($this->uuidService->generate());
-    }
-    return $instance;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createRule(array $configuration = []) {
-    return $this->createInstance('rules_rule', $configuration);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createActionSet(array $configuration = []) {
-    return $this->createInstance('rules_action_set', $configuration);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createAction($id, array $configuration = []) {
-    return $this->createInstance('rules_action', [
-      'action_id' => $id,
-    ] + $configuration);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createCondition($id, array $configuration = []) {
-    return $this->createInstance('rules_condition', [
-      'condition_id' => $id,
-    ] + $configuration);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createAnd() {
-    return $this->createInstance('rules_and');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createOr() {
-    return $this->createInstance('rules_or');
-  }
-
-}
diff --git a/modules/rules/src/Engine/ExpressionManagerInterface.php b/modules/rules/src/Engine/ExpressionManagerInterface.php
deleted file mode 100644
index 8b95ff9..0000000
--- a/modules/rules/src/Engine/ExpressionManagerInterface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-
-/**
- * Defines an interface for the expression plugin manager.
- */
-interface ExpressionManagerInterface extends PluginManagerInterface {
-
-  /**
-   * {@inheritdoc}
-   *
-   * @return \Drupal\rules\Engine\ExpressionInterface
-   *   A fully configured plugin instance.
-   */
-  public function createInstance($plugin_id, array $configuration = []);
-
-  /**
-   * Creates a new rule.
-   *
-   * @param array $configuration
-   *   The configuration array to create the plugin instance with.
-   *
-   * @return \Drupal\rules\Plugin\RulesExpression\RuleInterface
-   *   The created rule.
-   */
-  public function createRule(array $configuration = []);
-
-  /**
-   * Creates a new action set.
-   *
-   * @param array $configuration
-   *   The configuration array to create the plugin instance with.
-   *
-   * @return \Drupal\rules\Plugin\RulesExpression\ActionSet
-   *   The created action set.
-   */
-  public function createActionSet(array $configuration = []);
-
-  /**
-   * Creates a new action expression.
-   *
-   * @param string $id
-   *   The action plugin id.
-   * @param array $configuration
-   *   Optional configuration settings.
-   *
-   * @return \Drupal\rules\Engine\ActionExpressionInterface
-   *   The created action expression.
-   */
-  public function createAction($id, array $configuration = []);
-
-  /**
-   * Creates a new condition expression.
-   *
-   * @param string $id
-   *   The condition plugin id.
-   * @param array $configuration
-   *   Optional configuration settings.
-   *
-   * @return \Drupal\rules\Engine\ConditionExpressionInterface
-   *   The created condition expression.
-   */
-  public function createCondition($id, array $configuration = []);
-
-  /**
-   * Creates a new 'and' condition container.
-   *
-   * @return \Drupal\rules\Engine\ConditionExpressionContainerInterface
-   *   The created 'and' condition container.
-   */
-  public function createAnd();
-
-  /**
-   * Creates a new 'or' condition container.
-   *
-   * @return \Drupal\rules\Engine\ConditionExpressionContainerInterface
-   *   The created 'or' condition container.
-   */
-  public function createOr();
-
-}
diff --git a/modules/rules/src/Engine/IntegrityViolation.php b/modules/rules/src/Engine/IntegrityViolation.php
deleted file mode 100644
index 3e3d483..0000000
--- a/modules/rules/src/Engine/IntegrityViolation.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-
-/**
- * Holds information about an integrity violation in a Rules expression.
- */
-class IntegrityViolation implements IntegrityViolationInterface {
-
-  /**
-   * The user facing message of this violation.
-   *
-   * @var \Drupal\Core\StringTranslation\TranslatableMarkup
-   */
-  protected $message;
-
-  /**
-   * The associated context name (optional).
-   *
-   * @var string
-   */
-  protected $contextName;
-
-  /**
-   * The UUID of the expression where the violation occurred.
-   *
-   * @var string
-   */
-  protected $uuid;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setMessage(TranslatableMarkup $message) {
-    $this->message = $message;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMessage() {
-    return $this->message;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setContextName($context_name) {
-    $this->contextName = $context_name;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getContextName() {
-    return $this->contextName;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUuid($uuid) {
-    $this->uuid = $uuid;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getUuid() {
-    return $this->uuid;
-  }
-
-}
diff --git a/modules/rules/src/Engine/IntegrityViolationInterface.php b/modules/rules/src/Engine/IntegrityViolationInterface.php
deleted file mode 100644
index b619f73..0000000
--- a/modules/rules/src/Engine/IntegrityViolationInterface.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-
-/**
- * Describes a violation of the integrity of a rule.
- *
- * Example: if the data selector node:field_example is used in an action but
- * there is no "node" variable available in the context of the rule then a
- * violation is raised during the integrity check of the rule.
- */
-interface IntegrityViolationInterface {
-
-  /**
-   * Sets the user facing message that can be displayed for this violation.
-   *
-   * @param \Drupal\Core\StringTranslation\TranslatableMarkup $message
-   *   The message.
-   *
-   * @return $this
-   */
-  public function setMessage(TranslatableMarkup $message);
-
-  /**
-   * Returns the translated message of this violation.
-   *
-   * @return \Drupal\Core\StringTranslation\TranslatableMarkup
-   *   The message.
-   */
-  public function getMessage();
-
-  /**
-   * Sets the context name when this violation should be associated to one.
-   *
-   * @param string $context_name
-   *   The context name.
-   *
-   * @return $this
-   */
-  public function setContextName($context_name);
-
-  /**
-   * Returns the associated context name, if there is one.
-   *
-   * A violation can relate to a specific context that is used in the
-   * expression.
-   *
-   * @return string|null
-   *   The context name or NULL if the violation is not specific to a context.
-   */
-  public function getContextName();
-
-  /**
-   * Sets the UUID of the nested expression where this violation occurred.
-   *
-   * @param string $uuid
-   *   The UUID.
-   *
-   * @return $this
-   */
-  public function setUuid($uuid);
-
-  /**
-   * Returns the UUID of the expression this violation belongs to.
-   *
-   * @return string
-   *   The UUID.
-   */
-  public function getUuid();
-
-}
diff --git a/modules/rules/src/Engine/IntegrityViolationList.php b/modules/rules/src/Engine/IntegrityViolationList.php
deleted file mode 100644
index e08cf89..0000000
--- a/modules/rules/src/Engine/IntegrityViolationList.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\rules\Exception\OutOfBoundsException;
-
-/**
- * Collection of integrity violations.
- */
-class IntegrityViolationList extends \ArrayIterator {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function add(IntegrityViolation $violation) {
-    $this[] = $violation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addAll(IntegrityViolationList $other_list) {
-    foreach ($other_list as $violation) {
-      $this[] = $violation;
-    }
-  }
-
-  /**
-   * Returns the violation at a given offset.
-   *
-   * @param int $offset
-   *   The offset of the violation.
-   *
-   * @return \Drupal\rules\Engine\IntegrityViolationInterface
-   *   The violation.
-   *
-   * @throws \Drupal\rules\Exception\OutOfBoundsException
-   *   Thrown if the offset does not exist.
-   */
-  public function get($offset) {
-    try {
-      return $this->offsetGet($offset);
-    }
-    catch (\OutOfBoundsException $e) {
-      throw new OutOfBoundsException();
-    }
-  }
-
-  /**
-   * Returns whether the given offset exists.
-   *
-   * @param int $offset
-   *   The violation offset.
-   *
-   * @return bool
-   *   Whether the offset exists.
-   */
-  public function has($offset) {
-    return $this->offsetExists($offset);
-  }
-
-  /**
-   * Creates a new violation with the message and adds it to this list.
-   *
-   * @param \Drupal\Core\StringTranslation\TranslatableMarkup $message
-   *   The violation message.
-   * @param string $uuid
-   *   (Optional) UUID of the expression where the violation occurred.
-   */
-  public function addViolationWithMessage(TranslatableMarkup $message, $uuid = NULL) {
-    $violation = new IntegrityViolation();
-    $violation->setMessage($message);
-    $violation->setUuid($uuid);
-    $this[] = $violation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFor($uuid) {
-    $uuid_violations = [];
-    foreach ($this as $violation) {
-      if ($violation->getUuid() === $uuid) {
-        $uuid_violations[] = $violation;
-      }
-    }
-    return $uuid_violations;
-  }
-
-}
diff --git a/modules/rules/src/Engine/RulesComponent.php b/modules/rules/src/Engine/RulesComponent.php
deleted file mode 100644
index aed6dd1..0000000
--- a/modules/rules/src/Engine/RulesComponent.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\Entity\DependencyTrait;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Context\ContextDefinitionInterface;
-use Drupal\rules\Exception\LogicException;
-
-/**
- * Handles executable Rules components.
- */
-class RulesComponent {
-
-  use DependencyTrait;
-
-  /**
-   * The rules execution state.
-   *
-   * @var \Drupal\rules\Engine\ExecutionStateInterface
-   */
-  protected $state;
-
-  /**
-   * Definitions for the context used by the component.
-   *
-   * @var \Drupal\rules\Context\ContextDefinitionInterface[]
-   */
-  protected $contextDefinitions = [];
-
-  /**
-   * List of context names that is provided back to the caller.
-   *
-   * @var string[]
-   */
-  protected $providedContext = [];
-
-  /**
-   * The expression.
-   *
-   * @var \Drupal\rules\Engine\ExpressionInterface
-   */
-  protected $expression;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\rules\Engine\ExpressionInterface $expression
-   *   The expression of the component.
-   *
-   * @return static
-   */
-  public static function create(ExpressionInterface $expression) {
-    return new static($expression);
-  }
-
-  /**
-   * Creates a component based on the given configuration array.
-   *
-   * @param array $configuration
-   *   The component configuration, as returned from ::getConfiguration().
-   *
-   * @return static
-   */
-  public static function createFromConfiguration(array $configuration) {
-    $configuration += [
-      'context_definitions' => [],
-      'provided_context_definitions' => [],
-    ];
-    // @todo: Can we improve this use dependency injection somehow?
-    $expression_manager = \Drupal::service('plugin.manager.rules_expression');
-    $expression = $expression_manager->createInstance($configuration['expression']['id'], $configuration['expression']);
-    $component = static::create($expression);
-    foreach ($configuration['context_definitions'] as $name => $definition) {
-      $component->addContextDefinition($name, ContextDefinition::createFromArray($definition));
-    }
-    foreach ($configuration['provided_context_definitions'] as $name => $definition) {
-      $component->provideContext($name);
-    }
-    return $component;
-  }
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\rules\Engine\ExpressionInterface $expression
-   *   The expression of the component.
-   */
-  protected function __construct(ExpressionInterface $expression) {
-    $this->state = ExecutionState::create();
-    $this->expression = $expression;
-  }
-
-  /**
-   * Gets the expression of the component.
-   *
-   * @return \Drupal\rules\Engine\ExpressionInterface
-   *   The expression.
-   */
-  public function getExpression() {
-    return $this->expression;
-  }
-
-  /**
-   * Gets the configuration array of this component.
-   *
-   * @return array
-   *   The configuration of this component. It contains the following keys:
-   *   - expression: The configuration of the contained expression, including a
-   *     nested 'id' key.
-   *   - context_definitions: Array of context definition arrays, keyed by
-   *     context name.
-   *   - provided_context: The names of the context that is provided back.
-   */
-  public function getConfiguration() {
-    return [
-      'expression' => $this->expression->getConfiguration(),
-      'context_definitions' => array_map(function (ContextDefinitionInterface $definition) {
-        return $definition->toArray();
-      }, $this->contextDefinitions),
-      'provided_context_definitions' => $this->providedContext,
-    ];
-  }
-
-  /**
-   * Gets the execution state.
-   *
-   * @return \Drupal\rules\Engine\ExecutionStateInterface
-   *   The execution state for this component.
-   */
-  public function getState() {
-    return $this->state;
-  }
-
-  /**
-   * Adds a context definition.
-   *
-   * @param string $name
-   *   The name of the context to add.
-   * @param \Drupal\rules\Context\ContextDefinitionInterface $definition
-   *   The definition to add.
-   *
-   * @return $this
-   */
-  public function addContextDefinition($name, ContextDefinitionInterface $definition) {
-    $this->contextDefinitions[$name] = $definition;
-    return $this;
-  }
-
-  /**
-   * Gets definitions for the context used by this component.
-   *
-   * @return \Drupal\rules\Context\ContextDefinitionInterface[]
-   *   The array of context definitions, keyed by context name.
-   */
-  public function getContextDefinitions() {
-    return $this->contextDefinitions;
-  }
-
-  /**
-   * Adds the available event context for the given events.
-   *
-   * @param string[] $event_names
-   *   The (fully qualified) event names; e.g., as configured for a reaction
-   *   rule.
-   *
-   * @return $this
-   */
-  public function addContextDefinitionsForEvents(array $event_names) {
-    foreach ($event_names as $event_name) {
-      // @todo: Correctly handle multiple events to intersect available context.
-      // @todo Use setter injection for the service.
-      $event_definition = \Drupal::service('plugin.manager.rules_event')->getDefinition($event_name);
-      foreach ($event_definition['context'] as $context_name => $context_definition) {
-        $this->addContextDefinition($context_name, $context_definition);
-      }
-    }
-    return $this;
-  }
-
-  /**
-   * Marks the given context to be provided back to the caller.
-   *
-   * @param string $name
-   *   The name of the context to provide.
-   *
-   * @return $this
-   */
-  public function provideContext($name) {
-    $this->providedContext[] = $name;
-    return $this;
-  }
-
-  /**
-   * Returns the names of context that is provided back to the caller.
-   *
-   * @return string[]
-   *   The names of the context that is provided back.
-   */
-  public function getProvidedContext() {
-    return $this->providedContext;
-  }
-
-  /**
-   * Sets the value of a context.
-   *
-   * @param string $name
-   *   The name.
-   * @param mixed $value
-   *   The context value.
-   *
-   * @return $this
-   *
-   * @throws \Drupal\rules\Exception\LogicException
-   *   Thrown if the passed context is not defined.
-   */
-  public function setContextValue($name, $value) {
-    if (!isset($this->contextDefinitions[$name])) {
-      throw new LogicException("The specified context '$name' is not defined.");
-    }
-    $this->state->setVariable($name, $this->contextDefinitions[$name], $value);
-    return $this;
-  }
-
-  /**
-   * Executes the component with the previously set context.
-   *
-   * @return mixed[]
-   *   The array of provided context values, keyed by context name.
-   *
-   * @throws \Drupal\rules\Exception\EvaluationException
-   *   Thrown if the Rules expression triggers errors during execution.
-   */
-  public function execute() {
-    $this->expression->executeWithState($this->state);
-    $this->state->autoSave();
-    $result = [];
-    foreach ($this->providedContext as $name) {
-      $result[$name] = $this->state->getVariableValue($name);
-    }
-    return $result;
-  }
-
-  /**
-   * Executes the component with the given values.
-   *
-   * @param mixed[] $arguments
-   *   The array of arguments; i.e., an array keyed by name of the defined
-   *   context and the context value as argument.
-   *
-   * @return mixed[]
-   *   The array of provided context values, keyed by context name.
-   *
-   * @throws \Drupal\rules\Exception\LogicException
-   *   Thrown if the context is not defined.
-   * @throws \Drupal\rules\Exception\EvaluationException
-   *   Thrown if the Rules expression triggers errors during execution.
-   */
-  public function executeWithArguments(array $arguments) {
-    $this->state = ExecutionState::create();
-    foreach ($arguments as $name => $value) {
-      $this->setContextValue($name, $value);
-    }
-    return $this->execute();
-  }
-
-  /**
-   * Verifies that the given expression is valid with the defined context.
-   *
-   * @return \Drupal\rules\Engine\IntegrityViolationList
-   *   A list object containing \Drupal\rules\Engine\IntegrityViolation objects.
-   */
-  public function checkIntegrity() {
-    $metadata_state = $this->getMetadataState();
-    return $this->expression->checkIntegrity($metadata_state);
-  }
-
-  /**
-   * Gets the metadata state with all context definitions as variables in it.
-   *
-   * Describes the metadata state before execution - only context definitions
-   * are set as variables.
-   *
-   * @return \Drupal\rules\Engine\ExecutionMetadataStateInterface
-   *   The execution metadata state populated with context definitions.
-   */
-  public function getMetadataState() {
-    $data_definitions = [];
-    foreach ($this->contextDefinitions as $name => $context_definition) {
-      $data_definitions[$name] = $context_definition->getDataDefinition();
-    }
-
-    return ExecutionMetadataState::create($data_definitions);
-  }
-
-  /**
-   * Calculates dependencies for the component.
-   *
-   * @return array
-   *   An array of dependencies grouped by type (config, content, module,
-   *   theme).
-   *
-   * @see \Drupal\Component\Plugin\DependentPluginInterface::calculateDependencies()
-   */
-  public function calculateDependencies() {
-    // @todo: Complete implementation and add test coverage.
-    $this->addDependency('module', 'rules');
-    $this->addDependencies($this->getExpression()->calculateDependencies());
-    return $this->dependencies;
-  }
-
-  /**
-   * PHP magic __clone function.
-   */
-  public function __clone() {
-    // Implement a deep clone.
-    $this->state = clone $this->state;
-    $this->expression = clone $this->expression;
-  }
-
-  /**
-   * Returns autocomplete results for the given partial selector.
-   *
-   * Example: "node.uid.e" will return ["node.uid.entity"].
-   *
-   * @param string $partial_selector
-   *   The partial data selector.
-   * @param \Drupal\rules\Engine\ExpressionInterface $until
-   *   The expression in which the autocompletion will be executed. All
-   *   variables in the exection metadata state up to that point are available.
-   *
-   * @return array[]
-   *   A list of autocomplete suggestions - valid property paths for one of the
-   *   provided data definitions. Each entry is an array with the following
-   *   keys:
-   *   - value: the data selecor property path.
-   *   - label: the human readable label suggestion.
-   */
-  public function autocomplete($partial_selector, ExpressionInterface $until = NULL) {
-    // We use the integrity check to populate the execution metadata state with
-    // available variables.
-    $metadata_state = $this->getMetadataState();
-    $this->expression->prepareExecutionMetadataState($metadata_state, $until);
-
-    return $metadata_state->autocomplete($partial_selector);
-  }
-
-}
diff --git a/modules/rules/src/Engine/RulesComponentRepository.php b/modules/rules/src/Engine/RulesComponentRepository.php
deleted file mode 100644
index f89a851..0000000
--- a/modules/rules/src/Engine/RulesComponentRepository.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\rules\Exception\InvalidArgumentException;
-
-/**
- * Implements the component repository interface.
- */
-class RulesComponentRepository implements RulesComponentRepositoryInterface {
-
-  /**
-   * Array of component resolvers, keyed by provider.
-   *
-   * @var \Drupal\rules\Engine\RulesComponentResolverInterface[]
-   */
-  protected $resolvers = [];
-
-  /**
-   * Static cache of loaded components.
-   *
-   * The array is keyed by cache ID.
-   *
-   * @var \Drupal\rules\Engine\RulesComponent[]
-   */
-  protected $components = [];
-
-  /**
-   * Cache backend instance.
-   *
-   * @var \Drupal\Core\Cache\CacheBackendInterface
-   */
-  protected $cacheBackend;
-
-  /**
-   * The language manager.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
-   * The current language code.
-   *
-   * @var string
-   */
-  protected $langcode;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   The cache backend.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The language manager.
-   */
-  public function __construct(CacheBackendInterface $cache_backend, LanguageManagerInterface $language_manager) {
-    $this->cacheBackend = $cache_backend;
-    $this->languageManager = $language_manager;
-    $this->langcode = $this->languageManager->getCurrentLanguage()->getId();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addComponentResolver(RulesComponentResolverInterface $resolver, $resolver_name) {
-    $this->resolvers[$resolver_name] = $resolver;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function get($id, $provider = 'rules_component') {
-    $result = $this->getMultiple([$id], $provider);
-    return reset($result) ?: NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMultiple(array $ids, $provider = 'rules_component') {
-    if (!isset($this->resolvers[$provider])) {
-      throw new InvalidArgumentException("Invalid component provider $provider given.");
-    }
-    $cids = [];
-    foreach ($ids as $id) {
-      $cids[$id] = "$provider:$id:$this->langcode";
-    }
-    $results = array_intersect_key($this->components, array_flip($cids));
-    $cids_missing = array_diff_assoc($cids, array_keys($results));
-
-    if ($cids_missing) {
-      // Note that the cache backend removes resolved IDs.
-      $cache_results = $this->cacheBackend->getMultiple($cids_missing);
-      foreach ($cache_results as $cid => $cache_result) {
-        $this->components[$cid] = $cache_result->data;
-        $results[$cid] = $cache_result->data;
-      }
-      if ($cids_missing) {
-        $resolved_results = $this->resolvers[$provider]->getMultiple(array_keys($cids_missing));
-        $cache_items = [];
-        foreach ($resolved_results as $id => $component) {
-          $cid = $cids[$id];
-          $this->components[$cid] = $component;
-          $results[$cid] = $component;
-          $cache_items[$cid]['data'] = $component;
-        }
-        // Cache entries to speed up future lookups.
-        $this->cacheBackend->setMultiple($cache_items);
-      }
-    }
-    return $results;
-  }
-
-}
diff --git a/modules/rules/src/Engine/RulesComponentRepositoryInterface.php b/modules/rules/src/Engine/RulesComponentRepositoryInterface.php
deleted file mode 100644
index 7f21f1a..0000000
--- a/modules/rules/src/Engine/RulesComponentRepositoryInterface.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-/**
- * Interface for the component repository.
- *
- * The component repository provides the API for fetching executable Rules
- * components from cache.
- */
-interface RulesComponentRepositoryInterface {
-
-  /**
-   * Adds a component resolver.
-   *
-   * @param \Drupal\rules\Engine\RulesComponentResolverInterface $resolver
-   *   The resolver.
-   * @param string $resolver_name
-   *   The name under which to add the resolver.
-   *
-   * @return $this
-   */
-  public function addComponentResolver(RulesComponentResolverInterface $resolver, $resolver_name);
-
-  /**
-   * Gets the component for the given ID.
-   *
-   * @param string $id
-   *   The ID of the component to get. The supported IDs depend on the given
-   *   provider. For the default provider 'rules' the entity IDs of component
-   *   configs may be passed.
-   * @param string $resolver
-   *   The resolver of the component. Supported values are:
-   *   - rules_component: (Default) The component configs identified by their
-   *     ID.
-   *   - rules_event: The aggregated components of all reaction rules configured
-   *     for an event, identified by the event name; e.g.,
-   *     'rules_entity_presave'.
-   *   Note, that modules may add further resolvers via tagged services. Check
-   *   the rules.services.yml for an example.
-   *
-   * @return \Drupal\rules\Engine\RulesComponent|null
-   *   The component, or NULL if it is not existing.
-   *
-   * @throws \Drupal\rules\Exception\InvalidArgumentException
-   *   Thrown if an unsupported provider is given.
-   */
-  public function get($id, $resolver = 'rules_component');
-
-  /**
-   * Gets the components for the given IDs.
-   *
-   * @param string[] $ids
-   *   The IDs of the components to get. The supported IDs depend on the given
-   *   provider. For the default provider 'rules' the entity IDs of component
-   *   configs may be passed.
-   * @param string $resolver
-   *   The resolver of the component. See ::get() for a list of supported
-   *   resolvers.
-   *
-   * @return \Drupal\rules\Engine\RulesComponent[]
-   *   An array of components, keyed by component ID.
-   *
-   * @throws \Drupal\rules\Exception\InvalidArgumentException
-   *   Thrown if an unsupported provider is given.
-   */
-  public function getMultiple(array $ids, $resolver = 'rules_component');
-
-}
diff --git a/modules/rules/src/Engine/RulesComponentResolverInterface.php b/modules/rules/src/Engine/RulesComponentResolverInterface.php
deleted file mode 100644
index 334591b..0000000
--- a/modules/rules/src/Engine/RulesComponentResolverInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\rules\Engine;
-
-/**
- * Interface for rules component resolvers.
- *
- * A resolver is responsible for getting components for a certain provider. The
- * component resolvers are added to the repository via tagged services and
- * provider name is determined.
- */
-interface RulesComponentResolverInterface {
-
-  /**
-   * Gets multiple components.
-   *
-   * @param string[] $ids
-   *   The list of IDs of the components to get.
-   *
-   * @return \Drupal\rules\Engine\RulesComponent[]
-   *   The array of components that could be resolved, keyed by ID.
-   */
-  public function getMultiple(array $ids);
-
-}
diff --git a/modules/rules/src/Entity/ReactionRuleConfig.php b/modules/rules/src/Entity/ReactionRuleConfig.php
deleted file mode 100644
index 2047564..0000000
--- a/modules/rules/src/Entity/ReactionRuleConfig.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-
-namespace Drupal\rules\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\rules\Rules;
-use Drupal\rules\Ui\RulesUiComponentProviderInterface;
-use Drupal\rules\Engine\ExpressionInterface;
-use Drupal\rules\Engine\RulesComponent;
-
-/**
- * Reaction rule configuration entity to persistently store configuration.
- *
- * @ConfigEntityType(
- *   id = "rules_reaction_rule",
- *   label = @Translation("Reaction Rule"),
- *   handlers = {
- *     "storage" = "Drupal\rules\Entity\ReactionRuleStorage",
- *     "list_builder" = "Drupal\rules\Controller\RulesReactionListBuilder",
- *     "form" = {
- *        "add" = "\Drupal\rules\Form\ReactionRuleAddForm",
- *        "edit" = "\Drupal\rules\Form\ReactionRuleEditForm",
- *        "delete" = "\Drupal\Core\Entity\EntityDeleteForm"
- *      }
- *   },
- *   admin_permission = "administer rules",
- *   config_prefix = "reaction",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *     "status" = "status"
- *   },
- *   config_export = {
- *     "id",
- *     "label",
- *     "events",
- *     "description",
- *     "tags",
- *     "config_version",
- *     "expression",
- *   },
- *   links = {
- *     "collection" = "/admin/config/workflow/rules",
- *     "edit-form" = "/admin/config/workflow/rules/reactions/edit/{rules_reaction_rule}",
- *     "delete-form" = "/admin/config/workflow/rules/reactions/delete/{rules_reaction_rule}",
- *     "break-lock-form" = "/admin/config/workflow/rules/reactions/edit/break-lock/{rules_reaction_rule}"
- *   }
- * )
- */
-class ReactionRuleConfig extends ConfigEntityBase implements RulesUiComponentProviderInterface {
-
-  /**
-   * The unique ID of the Reaction Rule.
-   *
-   * @var string
-   */
-  public $id = NULL;
-
-  /**
-   * The label of the Reaction rule.
-   *
-   * @var string
-   */
-  protected $label;
-
-  /**
-   * The description of the rule, which is used only in the interface.
-   *
-   * @var string
-   */
-  protected $description = '';
-
-  /**
-   * The "tags" of a Reaction rule.
-   *
-   * @var string[]
-   */
-  protected $tags = [];
-
-  /**
-   * The version the Reaction rule was created for.
-   *
-   * @var int
-   */
-  protected $config_version = Rules::CONFIG_VERSION;
-
-  /**
-   * The expression plugin specific configuration as nested array.
-   *
-   * @var array
-   */
-  protected $expression = [
-    'id' => 'rules_rule',
-  ];
-
-  /**
-   * Stores a reference to the executable expression version of this component.
-   *
-   * @var \Drupal\rules\Engine\ExpressionInterface
-   */
-  protected $expressionObject;
-
-  /**
-   * The events this reaction rule is reacting on.
-   *
-   * Events array. The array is numerically indexed and contains arrays with the
-   * following structure:
-   *   - event_name: String with the event machine name.
-   *   - configuration: An array containing the event configuration.
-   *
-   * @var array
-   */
-  protected $events = [];
-
-  /**
-   * Sets a Rules expression instance for this Reaction rule.
-   *
-   * @param \Drupal\rules\Engine\ExpressionInterface $expression
-   *   The expression to set.
-   *
-   * @return $this
-   */
-  public function setExpression(ExpressionInterface $expression) {
-    $this->expressionObject = $expression;
-    $this->expression = $expression->getConfiguration();
-    return $this;
-  }
-
-  /**
-   * Gets a Rules expression instance for this Reaction rule.
-   *
-   * @return \Drupal\rules\Engine\ExpressionInterface
-   *   A Rules expression instance.
-   */
-  public function getExpression() {
-    // Ensure that an executable Rules expression is available.
-    if (!isset($this->expressionObject)) {
-      $this->expressionObject = $this->getExpressionManager()->createInstance($this->expression['id'], $this->expression);
-    }
-    return $this->expressionObject;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Gets the Rules component that is invoked when the events are dispatched.
-   * The returned component has the definitions of the available event context
-   * set.
-   */
-  public function getComponent() {
-    $component = RulesComponent::create($this->getExpression());
-    $component->addContextDefinitionsForEvents($this->getEventNames());
-    return $component;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function updateFromComponent(RulesComponent $component) {
-    // Note that the available context definitions stem from the configured
-    // events, which are handled separately.
-    $this->setExpression($component->getExpression());
-    return $this;
-  }
-
-  /**
-   * Returns the Rules expression manager.
-   *
-   * @todo Actually we should use dependency injection here, but is that even
-   *   possible with config entities? How?
-   *
-   * @return \Drupal\rules\Engine\ExpressionManager
-   *   The Rules expression manager.
-   */
-  protected function getExpressionManager() {
-    return \Drupal::service('plugin.manager.rules_expression');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createDuplicate() {
-    $duplicate = parent::createDuplicate();
-    unset($duplicate->expressionObject);
-    return $duplicate;
-  }
-
-  /**
-   * Overrides \Drupal\Core\Entity\Entity::label().
-   *
-   * When a certain component does not have a label return the ID.
-   */
-  public function label() {
-    if (!$label = $this->get('label')) {
-      $label = $this->id();
-    }
-    return $label;
-  }
-
-  /**
-   * Returns the description.
-   */
-  public function getDescription() {
-    return $this->description;
-  }
-
-  /**
-   * Returns the tags associated with this config.
-   *
-   * @return string[]
-   *   The numerically indexed array of tag names.
-   */
-  public function getTags() {
-    return $this->tags;
-  }
-
-  /**
-   * Gets configuration of all events the rule is reacting on.
-   *
-   * @return array
-   *   The events array. The array is numerically indexed and contains arrays
-   *   with the following structure:
-   *     - event_name: String with the event machine name.
-   *     - configuration: An array containing the event configuration.
-   */
-  public function getEvents() {
-    return $this->events;
-  }
-
-  /**
-   * Gets fully qualified names of all events the rule is reacting on.
-   *
-   * @return string[]
-   *   The array of fully qualified event names of the rule.
-   */
-  public function getEventNames() {
-    $names = [];
-    foreach ($this->events as $event) {
-      $names[] = $event['event_name'];
-    }
-    return $names;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    parent::calculateDependencies();
-    $this->addDependencies($this->getComponent()->calculateDependencies());
-    return $this->dependencies;
-  }
-
-  /**
-   * Magic clone method.
-   */
-  public function __clone() {
-    // Remove the reference to the expression object in the clone so that the
-    // expression object tree is created from scratch.
-    unset($this->expressionObject);
-  }
-
-}
diff --git a/modules/rules/src/Entity/ReactionRuleStorage.php b/modules/rules/src/Entity/ReactionRuleStorage.php
deleted file mode 100644
index b931bba..0000000
--- a/modules/rules/src/Entity/ReactionRuleStorage.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-namespace Drupal\rules\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityStorage;
-use Drupal\Core\DrupalKernelInterface;
-use Drupal\Core\State\StateInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Component\Uuid\UuidInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\rules\Core\RulesEventManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Storage handler for reaction rule config entities.
- *
- * @todo Create an interface for this.
- */
-class ReactionRuleStorage extends ConfigEntityStorage {
-
-  /**
-   * The state service.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $stateService;
-
-  /**
-   * The Drupal kernel.
-   *
-   * @var \Drupal\Core\DrupalKernelInterface
-   */
-  protected $drupalKernel;
-
-  /**
-   * The event manager.
-   *
-   * @var \Drupal\rules\Core\RulesEventManager
-   */
-  protected $eventManager;
-
-  /**
-   * Constructs a ReactionRuleStorage object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory service.
-   * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
-   *   The UUID service.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The language manager.
-   * @param \Drupal\Core\State\StateInterface $state_service
-   *   The state service.
-   * @param \Drupal\Core\DrupalKernelInterface $drupal_kernel
-   *   The drupal kernel.
-   * @param \Drupal\rules\Core\RulesEventManager $event_manager
-   *   The Rules event manager.
-   */
-  public function __construct(EntityTypeInterface $entity_type, ConfigFactoryInterface $config_factory, UuidInterface $uuid_service, LanguageManagerInterface $language_manager, StateInterface $state_service, DrupalKernelInterface $drupal_kernel, RulesEventManager $event_manager) {
-    parent::__construct($entity_type, $config_factory, $uuid_service, $language_manager);
-
-    $this->stateService = $state_service;
-    $this->drupalKernel = $drupal_kernel;
-    $this->eventManager = $event_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
-      $entity_type,
-      $container->get('config.factory'),
-      $container->get('uuid'),
-      $container->get('language_manager'),
-      $container->get('state'),
-      $container->get('kernel'),
-      $container->get('plugin.manager.rules_event')
-    );
-  }
-
-  /**
-   * Returns a list of event names that are used by active reaction rules.
-   *
-   * @return string[]
-   *   The list of event names keyed by event name.
-   */
-  protected function getRegisteredEvents() {
-    $events = [];
-    foreach ($this->loadMultiple() as $rules_config) {
-      foreach ($rules_config->getEventNames() as $event_name) {
-        $event_name = $this->eventManager->getEventBaseName($event_name);
-        if (!isset($events[$event_name])) {
-          $events[$event_name] = $event_name;
-        }
-      }
-    }
-    return $events;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(EntityInterface $entity) {
-    // We need to get the registered events before the rule is saved, in order
-    // to be able to check afterwards if we need to rebuild the container or
-    // not.
-    $events_before = $this->getRegisteredEvents();
-    $return = parent::save($entity);
-
-    // Update the state of registered events.
-    $this->stateService->set('rules.registered_events', $this->getRegisteredEvents());
-
-    // After the reaction rule is saved, we need to rebuild the container,
-    // otherwise the reaction rule will not fire. However, we can do an
-    // optimization: if every event was already registered before, we do not
-    // have to rebuild the container.
-    foreach ($entity->getEventNames() as $event_name) {
-      if (empty($events_before[$event_name])) {
-        $this->drupalKernel->rebuildContainer();
-        break;
-      }
-    }
-
-    return $return;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function delete(array $entities) {
-    // After deleting a set of reaction rules, sometimes we may need to rebuild
-    // the container, to clean it up, so that the generic subscriber is not
-    // registered in the container for the rule events which we do not use
-    // anymore. So we do that if there is any change in the registered events,
-    // after the reaction rules are deleted.
-    $events_before = $this->getRegisteredEvents();
-    $return = parent::delete($entities);
-    $events_after = $this->getRegisteredEvents();
-
-    // Update the state of registered events and rebuild the container.
-    if ($events_before != $events_after) {
-      $this->stateService->set('rules.registered_events', $events_after);
-      $this->drupalKernel->rebuildContainer();
-    }
-
-    return $return;
-  }
-
-}
diff --git a/modules/rules/src/Entity/RulesComponentConfig.php b/modules/rules/src/Entity/RulesComponentConfig.php
deleted file mode 100644
index dd4921a..0000000
--- a/modules/rules/src/Entity/RulesComponentConfig.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-
-namespace Drupal\rules\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Rules;
-use Drupal\rules\Ui\RulesUiComponentProviderInterface;
-use Drupal\rules\Engine\ExpressionInterface;
-use Drupal\rules\Engine\RulesComponent;
-
-/**
- * Rules component configuration entity to persistently store configuration.
- *
- * @ConfigEntityType(
- *   id = "rules_component",
- *   label = @Translation("Rules component"),
- *   handlers = {
- *     "list_builder" = "Drupal\rules\Controller\RulesComponentListBuilder",
- *     "form" = {
- *        "add" = "\Drupal\rules\Form\RulesComponentAddForm",
- *        "edit" = "\Drupal\rules\Form\RulesComponentEditForm",
- *        "delete" = "\Drupal\Core\Entity\EntityDeleteForm"
- *      }
- *   },
- *   admin_permission = "administer rules",
- *   config_prefix = "component",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *     "status" = "status"
- *   },
- *   config_export = {
- *     "id",
- *     "label",
- *     "description",
- *     "tags",
- *     "config_version",
- *     "component",
- *   },
- *   links = {
- *     "collection" = "/admin/config/workflow/rules/components",
- *     "edit-form" = "/admin/config/workflow/rules/components/edit/{rules_component}",
- *     "delete-form" = "/admin/config/workflow/rules/components/delete/{rules_component}",
- *   }
- * )
- */
-class RulesComponentConfig extends ConfigEntityBase implements RulesUiComponentProviderInterface {
-
-  /**
-   * The unique ID of the Rules component.
-   *
-   * @var string
-   */
-  public $id = NULL;
-
-  /**
-   * The label of the Rules component.
-   *
-   * @var string
-   */
-  protected $label;
-
-  /**
-   * The description of the rule, which is used only in the interface.
-   *
-   * @var string
-   */
-  protected $description = '';
-
-  /**
-   * The "tags" of a Rules component.
-   *
-   * @var string[]
-   */
-  protected $tags = [];
-
-  /**
-   * The config version the Rules component was created for.
-   *
-   * @var int
-   */
-  protected $config_version = Rules::CONFIG_VERSION;
-
-  /**
-   * The component configuration as nested array.
-   *
-   * See \Drupal\rules\Engine\RulesComponent::getConfiguration()
-   *
-   * @var array
-   */
-  protected $component = [];
-
-  /**
-   * Stores a reference to the component object.
-   *
-   * @var \Drupal\rules\Engine\RulesComponent
-   */
-  protected $componentObject;
-
-  /**
-   * Gets a Rules expression instance for this Rules component.
-   *
-   * @return \Drupal\rules\Engine\ExpressionInterface
-   *   A Rules expression instance.
-   */
-  public function getExpression() {
-    return $this->getComponent()->getExpression();
-  }
-
-  /**
-   * Sets a Rules expression instance for this Rules component.
-   *
-   * @param \Drupal\rules\Engine\ExpressionInterface $expression
-   *   The expression to set.
-   *
-   * @return $this
-   */
-  public function setExpression(ExpressionInterface $expression) {
-    $this->component['expression'] = $expression->getConfiguration();
-    unset($this->componentObject);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getComponent() {
-    if (!isset($this->componentObject)) {
-      $this->componentObject = RulesComponent::createFromConfiguration($this->component);
-    }
-    return $this->componentObject;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function updateFromComponent(RulesComponent $component) {
-    $this->component = $component->getConfiguration();
-    $this->componentObject = $component;
-    return $this;
-  }
-
-  /**
-   * Gets the definitions of the used context.
-   *
-   * @return \Drupal\rules\Context\ContextDefinitionInterface[]
-   *   The array of context definition, keyed by context name.
-   */
-  public function getContextDefinitions() {
-    $definitions = [];
-    if (!empty($this->component['context_definitions'])) {
-      foreach ($this->component['context_definitions'] as $name => $definition) {
-        $definitions[$name] = ContextDefinition::createFromArray($definition);
-      }
-    }
-    return $definitions;
-  }
-
-  /**
-   * Sets the definitions of the used context.
-   *
-   * @param \Drupal\rules\Context\ContextDefinitionInterface[] $definitions
-   *   The array of context definitions, keyed by context name.
-   *
-   * @return $this
-   */
-  public function setContextDefinitions(array $definitions) {
-    $this->component['context_definitions'] = [];
-    foreach ($definitions as $name => $definition) {
-      $this->component['context_definitions'][$name] = $definition->toArray();
-    }
-    return $this;
-  }
-
-  /**
-   * Gets the definitions of the provided context.
-   *
-   * @return \Drupal\rules\Context\ContextDefinitionInterface[]
-   *   The array of context definition, keyed by context name.
-   */
-  public function getProvidedContextDefinitions() {
-    $definitions = [];
-    if (!empty($this->component['provided_context_definitions'])) {
-      foreach ($this->component['provided_context_definitions'] as $name => $definition) {
-        $definitions[$name] = ContextDefinition::createFromArray($definition);
-      }
-    }
-    return $definitions;
-  }
-
-  /**
-   * Sets the definitions of the provided context.
-   *
-   * @param \Drupal\rules\Context\ContextDefinitionInterface[] $definitions
-   *   The array of context definitions, keyed by context name.
-   *
-   * @return $this
-   */
-  public function setProvidedContextDefinitions(array $definitions) {
-    $this->component['provided_context_definitions'] = [];
-    foreach ($definitions as $name => $definition) {
-      $this->component['provided_context_definitions'][$name] = $definition->toArray();
-    }
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createDuplicate() {
-    $duplicate = parent::createDuplicate();
-    unset($duplicate->componentObject);
-    return $duplicate;
-  }
-
-  /**
-   * Overrides \Drupal\Core\Entity\Entity::label().
-   *
-   * When a certain component does not have a label return the ID.
-   */
-  public function label() {
-    if (!$label = $this->get('label')) {
-      $label = $this->id();
-    }
-    return $label;
-  }
-
-  /**
-   * Returns the description.
-   */
-  public function getDescription() {
-    return $this->description;
-  }
-
-  /**
-   * Returns the tags associated with this config.
-   *
-   * @return string[]
-   *   The numerically indexed array of tag names.
-   */
-  public function getTags() {
-    return $this->tags;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    parent::calculateDependencies();
-    $this->addDependencies($this->getComponent()->calculateDependencies());
-    return $this->dependencies;
-  }
-
-  /**
-   * Magic clone method.
-   */
-  public function __clone() {
-    // Remove the reference to the expression object in the clone so that the
-    // expression object tree is created from scratch.
-    unset($this->expression);
-  }
-
-}
diff --git a/modules/rules/src/Event/EntityEvent.php b/modules/rules/src/Event/EntityEvent.php
deleted file mode 100644
index 67ed8a9..0000000
--- a/modules/rules/src/Event/EntityEvent.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Drupal\rules\Event;
-
-use Symfony\Component\EventDispatcher\GenericEvent;
-
-/**
- * Represent various entity events.
- *
- * @see rules_entity_presave()
- */
-class EntityEvent extends GenericEvent {
-
-}
diff --git a/modules/rules/src/Event/SystemCronEvent.php b/modules/rules/src/Event/SystemCronEvent.php
deleted file mode 100644
index 173a16b..0000000
--- a/modules/rules/src/Event/SystemCronEvent.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Drupal\rules\Event;
-
-use Symfony\Component\EventDispatcher\GenericEvent;
-
-/**
- * Event that is fired when cron maintenance tasks are performed.
- *
- * @see rules_cron()
- */
-class SystemCronEvent extends GenericEvent {
-
-  const EVENT_NAME = 'rules_system_cron';
-
-}
diff --git a/modules/rules/src/Event/SystemLoggerEvent.php b/modules/rules/src/Event/SystemLoggerEvent.php
deleted file mode 100644
index 1b7194d..0000000
--- a/modules/rules/src/Event/SystemLoggerEvent.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Drupal\rules\Event;
-
-use Symfony\Component\EventDispatcher\GenericEvent;
-
-/**
- * Event that is fired when a logger-item is created.
- */
-class SystemLoggerEvent extends GenericEvent {
-
-  const EVENT_NAME = 'rules_system_logger_event';
-
-}
diff --git a/modules/rules/src/Event/UserLoginEvent.php b/modules/rules/src/Event/UserLoginEvent.php
deleted file mode 100644
index d4b07ef..0000000
--- a/modules/rules/src/Event/UserLoginEvent.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\rules\Event;
-
-use Drupal\user\UserInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * Event that is fired when a user logs in.
- *
- * @see rules_user_login()
- */
-class UserLoginEvent extends Event {
-
-  const EVENT_NAME = 'rules_user_login';
-
-  /**
-   * The user account.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  public $account;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\user\UserInterface $account
-   *   The account of the user logged in.
-   */
-  public function __construct(UserInterface $account) {
-    $this->account = $account;
-  }
-
-}
diff --git a/modules/rules/src/Event/UserLogoutEvent.php b/modules/rules/src/Event/UserLogoutEvent.php
deleted file mode 100644
index a056df1..0000000
--- a/modules/rules/src/Event/UserLogoutEvent.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Drupal\rules\Event;
-
-use Symfony\Component\EventDispatcher\GenericEvent;
-
-/**
- * Event that is fired when a user logs out.
- *
- * @see rules_user_logout()
- */
-class UserLogoutEvent extends GenericEvent {
-
-  const EVENT_NAME = 'rules_user_logout';
-
-}
diff --git a/modules/rules/src/EventHandler/ConfigurableEventHandlerBase.php b/modules/rules/src/EventHandler/ConfigurableEventHandlerBase.php
deleted file mode 100644
index 45a0fa3..0000000
--- a/modules/rules/src/EventHandler/ConfigurableEventHandlerBase.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\rules\EventHandler;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Core\RulesConfigurableEventHandlerInterface;
-use Drupal\rules\Core\RulesDefaultEventHandler;
-
-/**
- * Base class for event handler.
- */
-abstract class ConfigurableEventHandlerBase extends RulesDefaultEventHandler implements RulesConfigurableEventHandlerInterface {
-
-  /**
-   * The event configuration.
-   *
-   * @var array
-   */
-  protected $configuration = [];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function extractConfigurationFormValues(array &$form, FormStateInterface $form_state) {
-    foreach ($this->defaultConfiguration() as $key => $configuration) {
-      $this->configuration[$key] = $form_state->hasValue($key) ? $form_state->getValue($key) : $configuration;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfiguration() {
-    return $this->configuration;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConfiguration(array $configuration) {
-    $this->configuration = $configuration + $this->defaultConfiguration();
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return [];
-  }
-
-}
diff --git a/modules/rules/src/EventHandler/ConfigurableEventHandlerEntityBundle.php b/modules/rules/src/EventHandler/ConfigurableEventHandlerEntityBundle.php
deleted file mode 100644
index e479042..0000000
--- a/modules/rules/src/EventHandler/ConfigurableEventHandlerEntityBundle.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Drupal\rules\EventHandler;
-
-use Drupal\rules\Event\EntityEvent;
-use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * Exposes the bundle of an entity as event setting.
- */
-class ConfigurableEventHandlerEntityBundle extends ConfigurableEventHandlerBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function determineQualifiedEvents(Event $event, $event_name, array &$event_definition) {
-    $events_suffixes = [];
-    if ($event instanceof EntityEvent) {
-      $events_suffixes[] = $event->getSubject()->bundle();
-    }
-    return $events_suffixes;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function summary() {
-    // Nothing to do by default.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    // Nothing to do by default.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validate() {
-    // Nothing to check by default.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEventNameSuffix() {
-    // Nothing to do by default.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function refineContextDefinitions() {
-    // Nothing to refine by default.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    // Nothing to calculate by default.
-  }
-
-}
diff --git a/modules/rules/src/EventSubscriber/GenericEventSubscriber.php b/modules/rules/src/EventSubscriber/GenericEventSubscriber.php
deleted file mode 100644
index c0e5b3f..0000000
--- a/modules/rules/src/EventSubscriber/GenericEventSubscriber.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-namespace Drupal\rules\EventSubscriber;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\rules\Core\RulesConfigurableEventHandlerInterface;
-use Drupal\rules\Core\RulesEventManager;
-use Drupal\rules\Engine\ExecutionState;
-use Drupal\rules\Engine\RulesComponentRepositoryInterface;
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
-
-/**
- * Subscribes to Symfony events and maps them to Rules events.
- */
-class GenericEventSubscriber implements EventSubscriberInterface {
-
-  /**
-   * The entity manager used for loading reaction rule config entities.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The Rules event manager.
-   *
-   * @var \Drupal\rules\Core\RulesEventManager
-   */
-  protected $eventManager;
-
-  /**
-   * The component repository.
-   *
-   * @var \Drupal\rules\Engine\RulesComponentRepositoryInterface
-   */
-  protected $componentRepository;
-
-  /**
-   * Constructor.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\rules\Core\RulesEventManager $event_manager
-   *   The Rules event manager.
-   * @param \Drupal\rules\Engine\RulesComponentRepositoryInterface $component_repository
-   *   The component repository.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, RulesEventManager $event_manager, RulesComponentRepositoryInterface $component_repository) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->eventManager = $event_manager;
-    $this->componentRepository = $component_repository;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    // Register this listener for every event that is used by a reaction rule.
-    $events = [];
-    $callback = ['onRulesEvent', 100];
-
-    // If there is no state service there is nothing we can do here. This static
-    // method could be called early when the container is built, so the state
-    // service might no always be available.
-    if (!\Drupal::hasService('state')) {
-      return [];
-    }
-
-    // Since we cannot access the reaction rule config storage here we have to
-    // use the state system to provide registered Rules events. The Reaction
-    // Rule storage is responsible for keeping the registered events up to date
-    // in the state system.
-    // @see \Drupal\rules\Entity\ReactionRuleStorage
-    $state = \Drupal::state();
-    $registered_event_names = $state->get('rules.registered_events');
-    if (!empty($registered_event_names)) {
-      foreach ($registered_event_names as $event_name) {
-        $events[$event_name][] = $callback;
-      }
-    }
-    return $events;
-  }
-
-  /**
-   * Reacts on the given event and invokes configured reaction rules.
-   *
-   * @param \Symfony\Component\EventDispatcher\Event $event
-   *   The event object containing context for the event.
-   * @param string $event_name
-   *   The event name.
-   */
-  public function onRulesEvent(Event $event, $event_name) {
-    // Get event metadata and the to be triggered events.
-    $event_definition = $this->eventManager->getDefinition($event_name);
-    $handler_class = $event_definition['class'];
-    $triggered_events = [$event_name];
-    if (is_subclass_of($handler_class, RulesConfigurableEventHandlerInterface::class)) {
-      $qualified_event_suffixes = $handler_class::determineQualifiedEvents($event, $event_name, $event_definition);
-      foreach ($qualified_event_suffixes as $qualified_event_suffix) {
-        $triggered_events[] = "$event_name--$qualified_event_suffix";
-      }
-    }
-
-    // Setup the execution state.
-    $state = ExecutionState::create();
-    foreach ($event_definition['context'] as $context_name => $context_definition) {
-      // If this is a GenericEvent get the context for the rule from the event
-      // arguments.
-      if ($event instanceof GenericEvent) {
-        $value = $event->getArgument($context_name);
-      }
-      // Else there must be a getter method or public property.
-      // @todo: Add support for the getter method.
-      else {
-        $value = $event->$context_name;
-      }
-      $state->setVariable(
-        $context_name,
-        $context_definition,
-        $value
-      );
-    }
-
-    $components = $this->componentRepository
-      ->getMultiple($triggered_events, 'rules_event');
-
-    foreach ($components as $component) {
-      $component->getExpression()
-        ->executeWithState($state);
-    }
-    $state->autoSave();
-  }
-
-}
diff --git a/modules/rules/src/EventSubscriber/RedirectEventSubscriber.php b/modules/rules/src/EventSubscriber/RedirectEventSubscriber.php
deleted file mode 100644
index e3a48cc..0000000
--- a/modules/rules/src/EventSubscriber/RedirectEventSubscriber.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Drupal\rules\EventSubscriber;
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-/**
- * Changes the response to a redirect, if a redirect rules action was executed .
- */
-class RedirectEventSubscriber implements EventSubscriberInterface {
-
-  /**
-   * Checks if a redirect rules action was executed.
-   *
-   * Redirects to the provided url if there is one.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
-   *   The response event.
-   */
-  public function checkRedirectIssued(FilterResponseEvent $event) {
-    $request = $event->getRequest();
-    $redirect_url = $request->attributes->get('_rules_redirect_action_url');
-    if (isset($redirect_url)) {
-      $event->setResponse(new RedirectResponse($redirect_url));
-    }
-  }
-
-  /**
-   * Registers the methods in this class that should be listeners.
-   *
-   * @return array
-   *   An array of event listener definitions.
-   */
-  public static function getSubscribedEvents() {
-    $events[KernelEvents::RESPONSE][] = ['checkRedirectIssued'];
-    return $events;
-  }
-
-}
diff --git a/modules/rules/src/Exception/EvaluationException.php b/modules/rules/src/Exception/EvaluationException.php
deleted file mode 100644
index 50adc71..0000000
--- a/modules/rules/src/Exception/EvaluationException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\rules\Exception;
-
-/**
- * An exception that is thrown during evaluation.
- */
-class EvaluationException extends RulesException {
-
-}
diff --git a/modules/rules/src/Exception/IntegrityException.php b/modules/rules/src/Exception/IntegrityException.php
deleted file mode 100644
index 64f0d16..0000000
--- a/modules/rules/src/Exception/IntegrityException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\rules\Exception;
-
-/**
- * An exception that is thrown during integrity checks at configuration time.
- */
-class IntegrityException extends RulesException {
-
-}
diff --git a/modules/rules/src/Exception/InvalidArgumentException.php b/modules/rules/src/Exception/InvalidArgumentException.php
deleted file mode 100644
index 6c8b7df..0000000
--- a/modules/rules/src/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\rules\Exception;
-
-/**
- * An exception that is thrown if an argument is invalid.
- */
-class InvalidArgumentException extends RulesException {
-
-}
diff --git a/modules/rules/src/Exception/InvalidExpressionException.php b/modules/rules/src/Exception/InvalidExpressionException.php
deleted file mode 100644
index 0600928..0000000
--- a/modules/rules/src/Exception/InvalidExpressionException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\rules\Exception;
-
-/**
- * An exception thrown when the wrong expression has been given.
- */
-class InvalidExpressionException extends RulesException {
-
-}
diff --git a/modules/rules/src/Exception/LogicException.php b/modules/rules/src/Exception/LogicException.php
deleted file mode 100644
index 06954f5..0000000
--- a/modules/rules/src/Exception/LogicException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\rules\Exception;
-
-/**
- * An exception that is thrown when there is an error in program logic.
- */
-class LogicException extends RulesException {
-
-}
diff --git a/modules/rules/src/Exception/OutOfBoundsException.php b/modules/rules/src/Exception/OutOfBoundsException.php
deleted file mode 100644
index c118b4e..0000000
--- a/modules/rules/src/Exception/OutOfBoundsException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\rules\Exception;
-
-/**
- * An Exception that is thrown if a value is not a valid key.
- */
-class OutOfBoundsException extends RulesException {
-
-}
diff --git a/modules/rules/src/Exception/RulesException.php b/modules/rules/src/Exception/RulesException.php
deleted file mode 100644
index b033052..0000000
--- a/modules/rules/src/Exception/RulesException.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Drupal\rules\Exception;
-
-/**
- * A common exception for Rules.
- *
- * This class can be used to catch all exceptions thrown by Rules.
- */
-abstract class RulesException extends \Exception {
-
-}
diff --git a/modules/rules/src/Form/AddExpressionForm.php b/modules/rules/src/Form/AddExpressionForm.php
deleted file mode 100644
index dc9c8b2..0000000
--- a/modules/rules/src/Form/AddExpressionForm.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Ui\RulesUiHandlerInterface;
-use Drupal\rules\Engine\ExpressionContainerInterface;
-use Drupal\rules\Engine\ExpressionManagerInterface;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\rules\Exception\LogicException;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * UI form to add an expression like a condition or action to a rule.
- */
-class AddExpressionForm extends EditExpressionForm {
-
-  /**
-   * The Rules expression manager to get expression plugins.
-   *
-   * @var \Drupal\rules\Engine\ExpressionManagerInterface
-   */
-  protected $expressionManager;
-
-  /**
-   * The expression ID that is added, example: 'rules_action'.
-   *
-   * @var string
-   */
-  protected $expressionId;
-
-  /**
-   * Creates a new object of this class.
-   */
-  public function __construct(ExpressionManagerInterface $expression_manager) {
-    $this->expressionManager = $expression_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('plugin.manager.rules_expression'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, RulesUiHandlerInterface $rules_ui_handler = NULL, $uuid = NULL, $expression_id = NULL) {
-    $this->expressionId = $expression_id;
-    $this->uuid = $uuid;
-
-    // When initially adding the expression, we have to initialize the object
-    // and add the expression.
-    if (!$this->uuid) {
-      // Before we add our edited expression to the component's expression,
-      // we clone it such that we do not change the source component until
-      // the form has been successfully submitted.
-      $component = clone $rules_ui_handler->getComponent();
-      $this->uuid = $this->getEditedExpression($component)->getUuid();
-      $form_state->set('component', $component);
-      $form_state->set('uuid', $this->uuid);
-    }
-
-    return parent::buildForm($form, $form_state, $rules_ui_handler, $this->uuid);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditedExpression(RulesComponent $component) {
-    $component_expression = $component->getExpression();
-    if (!$component_expression instanceof ExpressionContainerInterface) {
-      throw new LogicException('Cannot add expression to expression of type ' . $component_expression->getPluginId());
-    }
-    if ($this->uuid && $expression = $component_expression->getExpression($this->uuid)) {
-      return $expression;
-    }
-    else {
-      $expression = $this->expressionManager->createInstance($this->expressionId);
-      $rule_expression = $component->getExpression();
-      $rule_expression->addExpressionObject($expression);
-      return $expression;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    parent::submitForm($form, $form_state);
-    $form_state->setRedirectUrl($this->rulesUiHandler->getBaseRouteUrl());
-  }
-
-  /**
-   * Provides the page title on the form.
-   */
-  public function getTitle(RulesUiHandlerInterface $rules_ui_handler, $expression_id) {
-    $this->expressionId = $expression_id;
-    $expression = $this->expressionManager->createInstance($this->expressionId);
-    return $this->t('Add @expression', ['@expression' => $expression->getLabel()]);
-  }
-
-}
diff --git a/modules/rules/src/Form/BreakLockForm.php b/modules/rules/src/Form/BreakLockForm.php
deleted file mode 100644
index 2a559d2..0000000
--- a/modules/rules/src/Form/BreakLockForm.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\RendererInterface;
-use Drupal\rules\Ui\RulesUiHandlerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Builds the form to break the lock of an edited rule.
- */
-class BreakLockForm extends ConfirmFormBase {
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The rendering service.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * The RulesUI handler of the currently active UI.
-   *
-   * @var \Drupal\rules\Ui\RulesUiHandlerInterface
-   */
-  protected $rulesUiHandler;
-
-  /**
-   * Constructor.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, RendererInterface $renderer) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->renderer = $renderer;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity_type.manager'),
-      $container->get('renderer')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'rules_break_lock_confirm';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return $this->t('Do you want to break the lock on %label?', ['%label' => $this->rulesUiHandler->getComponentLabel()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    $locked = $this->rulesUiHandler->getLockMetaData();
-    $account = $this->entityTypeManager->getStorage('user')->load($locked->owner);
-    $username = [
-      '#theme' => 'username',
-      '#account' => $account,
-    ];
-    return $this->t('By breaking this lock, any unsaved changes made by @user will be lost.', [
-      '@user' => $this->renderer->render($username),
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return $this->rulesUiHandler->getBaseRouteUrl();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Break lock');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, RulesUiHandlerInterface $rules_ui_handler = NULL) {
-    $this->rulesUiHandler = $rules_ui_handler;
-    if (!$rules_ui_handler->isLocked()) {
-      $form['message']['#markup'] = $this->t('There is no lock on %label to break.', ['%label' => $rules_ui_handler->getComponentLabel()]);
-      return $form;
-    }
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->rulesUiHandler->clearTemporaryStorage();
-    $form_state->setRedirectUrl($this->rulesUiHandler->getBaseRouteUrl());
-    drupal_set_message($this->t('The lock has been broken and you may now edit this @component_type.', [
-      '@component_type' => $this->rulesUiHandler->getPluginDefinition()->component_type_label,
-    ]));
-  }
-
-}
diff --git a/modules/rules/src/Form/DeleteExpressionForm.php b/modules/rules/src/Form/DeleteExpressionForm.php
deleted file mode 100644
index 3bcb754..0000000
--- a/modules/rules/src/Form/DeleteExpressionForm.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Ui\RulesUiHandlerInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Removes an expression from a rule.
- */
-class DeleteExpressionForm extends ConfirmFormBase {
-
-  /**
-   * The UUID of the expression in the rule.
-   *
-   * @var string
-   */
-  protected $uuid;
-
-  /**
-   * The RulesUI handler of the currently active UI.
-   *
-   * @var \Drupal\rules\Ui\RulesUiHandlerInterface
-   */
-  protected $rulesUiHandler;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'rules_delete_expression';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, RulesUiHandlerInterface $rules_ui_handler = NULL, $uuid = NULL) {
-    $this->rulesUiHandler = $rules_ui_handler;
-    $this->uuid = $uuid;
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    $rule_expression = $this->rulesUiHandler->getComponent()->getExpression();
-    $expression_inside = $rule_expression->getExpression($this->uuid);
-    if (!$expression_inside) {
-      throw new NotFoundHttpException();
-    }
-
-    return $this->t('Are you sure you want to delete %title from %rule?', [
-      '%title' => $expression_inside->getLabel(),
-      '%rule' => $this->rulesUiHandler->getComponentLabel(),
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return $this->rulesUiHandler->getBaseRouteUrl();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $component = $this->rulesUiHandler->getComponent();
-    $component->getExpression()->deleteExpression($this->uuid);
-    $this->rulesUiHandler->updateComponent($component);
-    $form_state->setRedirectUrl($this->getCancelUrl());
-  }
-
-}
diff --git a/modules/rules/src/Form/EditExpressionForm.php b/modules/rules/src/Form/EditExpressionForm.php
deleted file mode 100644
index f754b46..0000000
--- a/modules/rules/src/Form/EditExpressionForm.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Ui\RulesUiHandlerInterface;
-use Drupal\rules\Engine\RulesComponent;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * UI form to edit an expression like a condition or action in a rule.
- */
-class EditExpressionForm extends FormBase {
-
-  /**
-   * The edited component.
-   *
-   * @var \Drupal\rules\Engine\RulesComponent
-   */
-  protected $component;
-
-  /**
-   * The RulesUI handler of the currently active UI.
-   *
-   * @var \Drupal\rules\Ui\RulesUiHandlerInterface
-   */
-  protected $rulesUiHandler;
-
-  /**
-   * The UUID of the edited expression in the rule.
-   *
-   * @var string
-   */
-  protected $uuid;
-
-  /**
-   * Gets the currently edited expression from the given component.
-   *
-   * @param \Drupal\rules\Engine\RulesComponent $component
-   *   The component from which to get the expression.
-   *
-   * @return \Drupal\rules\Engine\ExpressionInterface|null
-   *   The expression object.
-   */
-  protected function getEditedExpression(RulesComponent $component) {
-    $rule_expression = $component->getExpression();
-    return $rule_expression->getExpression($this->uuid);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, RulesUiHandlerInterface $rules_ui_handler = NULL, $uuid = NULL) {
-    $this->rulesUiHandler = $rules_ui_handler;
-    $this->component = is_object($form_state->get('component')) ? $form_state->get('component') : $this->rulesUiHandler->getComponent();
-    $this->uuid = $form_state->get('uuid') ?: $uuid;
-
-    // During form rebuilds, keep track of changes using form state.
-    $form_state->set('rules_ui_handler', $this->rulesUiHandler);
-    $form_state->set('component', $this->component);
-    $form_state->set('uuid', $this->uuid);
-
-    $expression = $this->getEditedExpression($this->component, $form_state);
-
-    if (!$expression) {
-      throw new NotFoundHttpException();
-    }
-    $form_handler = $expression->getFormHandler();
-    $form = $form_handler->form($form, $form_state);
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'rules_expression_edit';
-  }
-
-  /**
-   * Builds an updated component object based upon the submitted form values.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return \Drupal\rules\Engine\RulesComponent
-   *   The updated component.
-   */
-  protected function buildComponent(array $form, FormStateInterface $form_state) {
-    $component = clone $this->component;
-
-    // In order to update the whole component we need to invoke the submission
-    // handler of the expression form. That way the expression gets changed
-    // accordingly.
-    $expression = $this->getEditedExpression($component);
-    $form_handler = $expression->getFormHandler();
-    $form_handler->submitForm($form, $form_state);
-    return $component;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    // Ensure the object properties are initialized, see
-    // https://www.drupal.org/node/2669032.
-    $this->rulesUiHandler = $form_state->get('rules_ui_handler');
-    $this->component = is_object($form_state->get('component')) ? $form_state->get('component') : $this->rulesUiHandler->getComponent();
-    $this->uuid = $form_state->get('uuid');
-
-    $this->rulesUiHandler->validateLock($form, $form_state);
-
-    // @todo: This ignores ExpressionFormInterface::validateForm().
-
-    $component = $this->buildComponent($form, $form_state);
-    $violations = $component->checkIntegrity();
-
-    // Only show the violations caused by the edited expression.
-    foreach ($violations->getFor($this->uuid) as $violation) {
-      $form_state->setError($form, $violation->getMessage());
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->component = $this->buildComponent($form, $form_state);
-    $this->rulesUiHandler->updateComponent($this->component);
-    $form_state->setRedirectUrl($this->rulesUiHandler->getBaseRouteUrl());
-  }
-
-  /**
-   * Provides the page title on the form.
-   */
-  public function getTitle(RulesUiHandlerInterface $rules_ui_handler, $uuid) {
-    $this->uuid = $uuid;
-    $expression = $this->getEditedExpression($rules_ui_handler->getComponent());
-    return $this->t('Edit @expression', ['@expression' => $expression->getLabel()]);
-  }
-
-}
diff --git a/modules/rules/src/Form/EmbeddedComponentForm.php b/modules/rules/src/Form/EmbeddedComponentForm.php
deleted file mode 100644
index 328d660..0000000
--- a/modules/rules/src/Form/EmbeddedComponentForm.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form;
-
-use Drupal\Core\Form\FormInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Ui\RulesUiHandlerInterface;
-
-/**
- * Components form, ready to be embedded in some other form.
- *
- * Note, that there is no SubformInterface or such in core (yet), thus we
- * implement FormInterface instead.
- */
-class EmbeddedComponentForm implements FormInterface {
-
-  /**
-   * The RulesUI handler of the currently active UI.
-   *
-   * @var \Drupal\rules\Ui\RulesUiHandlerInterface
-   */
-  protected $rulesUiHandler;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\rules\Ui\RulesUiHandlerInterface $rules_ui_handler
-   *   The UI handler of the edited component.
-   */
-  public function __construct(RulesUiHandlerInterface $rules_ui_handler) {
-    $this->rulesUiHandler = $rules_ui_handler;
-  }
-
-  /**
-   * Gets the form handler for the component's expression.
-   *
-   * @return \Drupal\rules\Form\Expression\ExpressionFormInterface|null
-   *   The form handling object if there is one, NULL otherwise.
-   */
-  protected function getFormHandler() {
-    return $this->rulesUiHandler
-      ->getComponent()
-      ->getExpression()
-      ->getFormHandler();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'rules_embedded_component_' . $this->rulesUiHandler->getPluginId();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['locked'] = $this->rulesUiHandler->addLockInformation();
-    return $this->getFormHandler()->form($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $this->rulesUiHandler->validateLock($form, $form_state);
-    $this->getFormHandler()->validateForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->getFormHandler()->submitForm($form, $form_state);
-  }
-
-}
diff --git a/modules/rules/src/Form/Expression/ActionContainerForm.php b/modules/rules/src/Form/Expression/ActionContainerForm.php
deleted file mode 100644
index eb0b934..0000000
--- a/modules/rules/src/Form/Expression/ActionContainerForm.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form\Expression;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\rules\Ui\RulesUiHandlerTrait;
-use Drupal\rules\Engine\ActionExpressionContainerInterface;
-
-/**
- * Form handler for action containers.
- */
-class ActionContainerForm implements ExpressionFormInterface {
-
-  use StringTranslationTrait;
-  use RulesUiHandlerTrait;
-  use ExpressionFormTrait;
-
-  /**
-   * The rule expression object this form is for.
-   *
-   * @var \Drupal\rules\Engine\ActionExpressionContainerInterface
-   */
-  protected $actionSet;
-
-  /**
-   * Creates a new object of this class.
-   */
-  public function __construct(ActionExpressionContainerInterface $action_set) {
-    $this->actionSet = $action_set;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $form['action_table'] = [
-      '#type' => 'container',
-    ];
-
-    $form['action_table']['table'] = [
-      '#theme' => 'table',
-      '#caption' => $this->t('Actions'),
-      '#header' => [$this->t('Elements'), $this->t('Operations')],
-      '#empty' => t('None'),
-    ];
-
-    foreach ($this->actionSet as $action) {
-      $form['action_table']['table']['#rows'][] = [
-        'element' => $action->getLabel(),
-        'operations' => [
-          'data' => [
-            '#type' => 'dropbutton',
-            '#links' => [
-              'edit' => [
-                'title' => $this->t('Edit'),
-                'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.edit', [
-                  'uuid' => $action->getUuid(),
-                ]),
-              ],
-              'delete' => [
-                'title' => $this->t('Delete'),
-                'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.delete', [
-                  'uuid' => $action->getUuid(),
-                ]),
-              ],
-            ],
-          ],
-        ],
-      ];
-    }
-
-    // @todo Put this into the table as last row and style it like it was in
-    // Drupal 7 Rules.
-    $form['add_action'] = [
-      '#attributes' => ['class' => ['action-links']],
-      '#theme' => 'menu_local_action',
-      '#link' => [
-        'title' => $this->t('Add action'),
-        'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.add', [
-          'expression_id' => 'rules_action',
-        ]),
-      ],
-    ];
-
-    return $form;
-  }
-
-}
diff --git a/modules/rules/src/Form/Expression/ActionForm.php b/modules/rules/src/Form/Expression/ActionForm.php
deleted file mode 100644
index e93e6a0..0000000
--- a/modules/rules/src/Form/Expression/ActionForm.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form\Expression;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\rules\Core\RulesActionManagerInterface;
-use Drupal\rules\Engine\ActionExpressionInterface;
-use Drupal\rules\Ui\RulesUiHandlerTrait;
-
-/**
- * UI form for adding/editing a Rules action.
- */
-class ActionForm implements ExpressionFormInterface {
-
-  use ContextFormTrait;
-  use StringTranslationTrait;
-  use RulesUiHandlerTrait;
-
-  /**
-   * The action plugin manager.
-   *
-   * @var \Drupal\rules\Core\RulesActionManagerInterface
-   */
-  protected $actionManager;
-
-  /**
-   * The action expression that is edited in the form.
-   *
-   * @var \Drupal\rules\Engine\ActionExpressionInterface
-   */
-  protected $actionExpression;
-
-  /**
-   * Creates a new object of this class.
-   */
-  public function __construct(ActionExpressionInterface $action_expression, RulesActionManagerInterface $action_manager) {
-    $this->actionManager = $action_manager;
-    $this->actionExpression = $action_expression;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $action_id = $form_state->get('action_id');
-    $configuration = $this->actionExpression->getConfiguration();
-    if (empty($action_id) && !empty($configuration['action_id'])) {
-      $action_id = $configuration['action_id'];
-      $form_state->set('action_id', $action_id);
-    }
-
-    // Step 1 of the multistep form.
-    if (!$action_id) {
-      $action_definitions = $this->actionManager->getGroupedDefinitions();
-      $options = [];
-      foreach ($action_definitions as $group => $definitions) {
-        foreach ($definitions as $id => $definition) {
-          $options[$group][$id] = $definition['label'];
-        }
-      }
-
-      $form['action_id'] = [
-        '#type' => 'select',
-        '#title' => $this->t('Action'),
-        '#options' => $options,
-        '#required' => TRUE,
-      ];
-      $form['continue'] = [
-        '#type' => 'submit',
-        '#value' => $this->t('Continue'),
-        '#name' => 'continue',
-        // Only validate the selected action in the first step.
-        '#limit_validation_errors' => [['action_id']],
-        '#submit' => [static::class . '::submitFirstStep'],
-      ];
-
-      return $form;
-    }
-
-    // Step 2 of the form.
-    $action = $this->actionManager->createInstance($action_id);
-
-    $form['summary'] = [
-      '#markup' => $action->summary(),
-    ];
-
-    $context_definitions = $action->getContextDefinitions();
-
-    $form['context']['#tree'] = TRUE;
-    foreach ($context_definitions as $context_name => $context_definition) {
-      $form = $this->buildContextForm($form, $form_state, $context_name, $context_definition, $configuration);
-    }
-
-    $form['save'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-      '#name' => 'save',
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array $form, FormStateInterface $form_state) {
-    // Only if there is an action selected already we can validate something.
-    if ($form_state->get('action_id')) {
-      // Invoke the submission handler which will setup the expression being
-      // edited in the form. That way the expression is ready for other
-      // validation handlers.
-      $this->submitForm($form, $form_state);
-    }
-  }
-
-  /**
-   * Submit callback: save the selected action in the first step.
-   */
-  public static function submitFirstStep(array &$form, FormStateInterface $form_state) {
-    $form_state->set('action_id', $form_state->getValue('action_id'));
-    $form_state->setRebuild();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $action_id = $form_state->get('action_id');
-    // Nothing todo as long as the first step is not completed.
-    if (!$action_id) {
-      return;
-    }
-
-    $action_definition = $this->actionManager->getDefinition($action_id);
-    $context_config = $this->getContextConfigFromFormValues($form_state, $action_definition['context']);
-
-    $configuration = $context_config->toArray();
-    $configuration['action_id'] = $action_id;
-    $this->actionExpression->setConfiguration($configuration);
-  }
-
-}
diff --git a/modules/rules/src/Form/Expression/ConditionContainerForm.php b/modules/rules/src/Form/Expression/ConditionContainerForm.php
deleted file mode 100644
index 58d0347..0000000
--- a/modules/rules/src/Form/Expression/ConditionContainerForm.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form\Expression;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\rules\Ui\RulesUiHandlerTrait;
-use Drupal\rules\Engine\ConditionExpressionContainerInterface;
-
-/**
- * Form view structure for Rules condition containers.
- */
-class ConditionContainerForm implements ExpressionFormInterface {
-
-  use ExpressionFormTrait;
-  use RulesUiHandlerTrait;
-  use StringTranslationTrait;
-
-  /**
-   * The rule expression object this form is for.
-   *
-   * @var \Drupal\rules\Engine\ConditionExpressionContainerInterface
-   */
-  protected $conditionContainer;
-
-  /**
-   * Creates a new object of this class.
-   */
-  public function __construct(ConditionExpressionContainerInterface $condition_container) {
-    $this->conditionContainer = $condition_container;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $form['conditions'] = [
-      '#type' => 'container',
-    ];
-
-    $form['conditions']['table'] = [
-      '#theme' => 'table',
-      '#caption' => $this->t('Conditions'),
-      '#header' => [$this->t('Elements'), $this->t('Operations')],
-      '#empty' => t('None'),
-    ];
-
-    foreach ($this->conditionContainer as $condition) {
-      $form['conditions']['table']['#rows'][] = [
-        'element' => $condition->getLabel(),
-        'operations' => [
-          'data' => [
-            '#type' => 'dropbutton',
-            '#links' => [
-              'edit' => [
-                'title' => $this->t('Edit'),
-                'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.edit', [
-                  'uuid' => $condition->getUuid(),
-                ]),
-              ],
-              'delete' => [
-                'title' => $this->t('Delete'),
-                'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.delete', [
-                  'uuid' => $condition->getUuid(),
-                ]),
-              ],
-            ],
-          ],
-        ],
-      ];
-    }
-
-    // @todo Put this into the table as last row and style it like it was in
-    // Drupal 7 Rules.
-    $form['add_condition'] = [
-      '#attributes' => ['class' => ['action-links']],
-      '#theme' => 'menu_local_action',
-      '#link' => [
-        'title' => $this->t('Add condition'),
-        'url' => $this->getRulesUiHandler()->getUrlFromRoute('expression.add', [
-          'expression_id' => 'rules_condition',
-        ]),
-      ],
-    ];
-
-    return $form;
-  }
-
-}
diff --git a/modules/rules/src/Form/Expression/ConditionForm.php b/modules/rules/src/Form/Expression/ConditionForm.php
deleted file mode 100644
index c6ed139..0000000
--- a/modules/rules/src/Form/Expression/ConditionForm.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form\Expression;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\rules\Core\ConditionManager;
-use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Ui\RulesUiHandlerTrait;
-
-/**
- * UI form for adding/editing a Rules condition.
- */
-class ConditionForm implements ExpressionFormInterface {
-
-  use ContextFormTrait;
-  use StringTranslationTrait;
-  use RulesUiHandlerTrait;
-
-  /**
-   * The condition plugin manager.
-   *
-   * @var \Drupal\rules\Core\ConditionManager
-   */
-  protected $conditionManager;
-
-  /**
-   * The condition expression that is edited in the form.
-   *
-   * @var \Drupal\rules\Engine\ConditionExpressionInterface
-   */
-  protected $conditionExpression;
-
-  /**
-   * Creates a new object of this class.
-   */
-  public function __construct(ConditionExpressionInterface $condition_expression, ConditionManager $condition_manager) {
-    $this->conditionManager = $condition_manager;
-    $this->conditionExpression = $condition_expression;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $condition_id = $form_state->get('condition_id');
-
-    $configuration = $this->conditionExpression->getConfiguration();
-    if (empty($condition_id) && !empty($configuration['condition_id'])) {
-      $condition_id = $configuration['condition_id'];
-      $form_state->set('condition_id', $condition_id);
-    }
-
-    // Step 1 of the multistep form.
-    if (!$condition_id) {
-      $condition_definitions = $this->conditionManager->getGroupedDefinitions();
-      $options = [];
-      foreach ($condition_definitions as $group => $definitions) {
-        foreach ($definitions as $id => $definition) {
-          $options[$group][$id] = $definition['label'];
-        }
-      }
-
-      $form['condition_id'] = [
-        '#type' => 'select',
-        '#title' => $this->t('Condition'),
-        '#options' => $options,
-        '#required' => TRUE,
-      ];
-      $form['continue'] = [
-        '#type' => 'submit',
-        '#value' => $this->t('Continue'),
-        '#name' => 'continue',
-        // Only validate the selected condition in the first step.
-        '#limit_validation_errors' => [['condition_id']],
-        '#submit' => [static::class . '::submitFirstStep'],
-      ];
-
-      return $form;
-    }
-
-    // Step 2 of the form.
-    /** @var \Drupal\rules\Core\RulesConditionInterface $condition */
-    $condition = $this->conditionManager->createInstance($condition_id);
-
-    $form['summary'] = [
-      '#markup' => $condition->summary(),
-    ];
-
-    $context_definitions = $condition->getContextDefinitions();
-
-    $form['context']['#tree'] = TRUE;
-    foreach ($context_definitions as $context_name => $context_definition) {
-      $form = $this->buildContextForm($form, $form_state, $context_name, $context_definition, $configuration);
-    }
-
-    $form['negate_wrapper'] = [
-      '#type' => 'fieldset',
-      '#title' => $this->t('Negate'),
-    ];
-
-    $form['negate_wrapper']['negate'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Negate this condition'),
-      '#default_value' => $configuration['negate'] ?: 0,
-      '#description' => $this->t('If checked, the condition result is negated such that it returns TRUE if it evaluates to FALSE.'),
-    ];
-
-    $form['save'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-      '#name' => 'save',
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array $form, FormStateInterface $form_state) {
-    // Only if there is a condition selected already we can validate something.
-    if ($form_state->get('condition_id')) {
-      // Invoke the submission handler which will setup the expression being
-      // edited in the form. That way the expression is ready for other
-      // validation handlers.
-      $this->submitForm($form, $form_state);
-    }
-  }
-
-  /**
-   * Submit callback: save the selected condition in the first step.
-   */
-  public static function submitFirstStep(array &$form, FormStateInterface $form_state) {
-    $form_state->set('condition_id', $form_state->getValue('condition_id'));
-    $form_state->setRebuild();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $condition_id = $form_state->get('condition_id');
-    // Nothing todo as long as the first step is not completed.
-    if (!$condition_id) {
-      return;
-    }
-
-    $condition_definition = $this->conditionManager->getDefinition($condition_id);
-    $context_config = $this->getContextConfigFromFormValues($form_state, $condition_definition['context']);
-
-    $configuration = $context_config->toArray();
-    $configuration['condition_id'] = $form_state->get('condition_id');
-    $configuration['negate'] = $form_state->getValue('negate');
-    $this->conditionExpression->setConfiguration($configuration);
-  }
-
-}
diff --git a/modules/rules/src/Form/Expression/ContextFormTrait.php b/modules/rules/src/Form/Expression/ContextFormTrait.php
deleted file mode 100644
index 65aeacc..0000000
--- a/modules/rules/src/Form/Expression/ContextFormTrait.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form\Expression;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\Core\Plugin\Context\ContextDefinitionInterface;
-use Drupal\rules\Context\DataProcessorManagerTrait;
-
-/**
- * Provides form logic for handling contexts when configuring an expression.
- */
-trait ContextFormTrait {
-
-  use DataProcessorManagerTrait;
-
-  /**
-   * Provides the form part for a context parameter.
-   */
-  public function buildContextForm(array $form, FormStateInterface $form_state, $context_name, ContextDefinitionInterface $context_definition, array $configuration) {
-    $form['context'][$context_name] = [
-      '#type' => 'fieldset',
-      '#title' => $context_definition->getLabel(),
-    ];
-    $form['context'][$context_name]['description'] = [
-      '#markup' => $context_definition->getDescription(),
-    ];
-
-    // If the form has been submitted already take the mode from the submitted
-    // values, otherwise default to existing configuration. And if that does not
-    // exist default to the "input" mode.
-    $mode = $form_state->get('context_' . $context_name);
-    if (!$mode) {
-      if (isset($configuration['context_mapping'][$context_name])) {
-        $mode = 'selector';
-      }
-      else {
-        $mode = 'input';
-      }
-      $form_state->set('context_' . $context_name, $mode);
-    }
-
-    $title = $mode == 'selector' ? $this->t('Data selector') : $this->t('Value');
-
-    if (isset($configuration['context_values'][$context_name])) {
-      $default_value = $configuration['context_values'][$context_name];
-    }
-    elseif (isset($configuration['context_mapping'][$context_name])) {
-      $default_value = $configuration['context_mapping'][$context_name];
-    }
-    else {
-      $default_value = $context_definition->getDefaultValue();
-    }
-    $form['context'][$context_name]['setting'] = [
-      '#type' => 'textfield',
-      '#title' => $title,
-      '#required' => $context_definition->isRequired(),
-      '#default_value' => $default_value,
-    ];
-
-    $element = &$form['context'][$context_name]['setting'];
-
-    if ($mode == 'selector') {
-      $element['#description'] = $this->t("The data selector helps you drill down into the data available to Rules. <em>To make entity fields appear in the data selector, you may have to use the condition 'entity has field' (or 'content is of type').</em> More useful tips about data selection is available in <a href=':url'>the online documentation</a>.", [
-        ':url' => 'https://www.drupal.org/node/1300042',
-      ]);
-
-      $url = $this->getRulesUiHandler()->getUrlFromRoute('autocomplete', []);
-      $element['#attributes']['class'][] = 'rules-autocomplete';
-      $element['#attributes']['data-autocomplete-path'] = $url->toString();
-      $element['#attached']['library'][] = 'rules/rules.autocomplete';
-    }
-    elseif ($context_definition->isMultiple()) {
-      $element['#type'] = 'textarea';
-      // @todo get a description for possible values that can be filled in.
-      $element['#description'] = $this->t('Enter one value per line for this multi-valued context.');
-
-      // Glue the list of values together as one item per line in the text area.
-      if (is_array($default_value)) {
-        $element['#default_value'] = implode("\n", $default_value);
-      }
-    }
-
-    $value = $mode == 'selector' ? $this->t('Switch to the direct input mode') : $this->t('Switch to data selection');
-    $form['context'][$context_name]['switch_button'] = [
-      '#type' => 'submit',
-      '#name' => 'context_' . $context_name,
-      '#attributes' => ['class' => ['rules-switch-button']],
-      '#parameter' => $context_name,
-      '#value' => $value,
-      '#submit' => [static::class . '::switchContextMode'],
-      // Do not validate!
-      '#limit_validation_errors' => [],
-    ];
-    return $form;
-  }
-
-  /**
-   * Creates a context config object from the submitted form values.
-   *
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The form state containing the submitted values.
-   * @param \Drupal\Core\Plugin\Context\ContextDefinitionInterface[] $context_definitions
-   *   The context definitions of the plugin.
-   *
-   * @return \Drupal\rules\Context\ContextConfig
-   *   The context config object populated with context mappings/values.
-   */
-  protected function getContextConfigFromFormValues(FormStateInterface $form_state, array $context_definitions) {
-    $context_config = ContextConfig::create();
-    foreach ($form_state->getValue('context') as $context_name => $value) {
-      if ($form_state->get("context_$context_name") == 'selector') {
-        $context_config->map($context_name, $value['setting']);
-      }
-      else {
-        // Each line of the textarea is one value for multiple contexts.
-        if ($context_definitions[$context_name]->isMultiple()) {
-          $values = explode("\n", $value['setting']);
-          $context_config->setValue($context_name, $values);
-        }
-        else {
-          $context_config->setValue($context_name, $value['setting']);
-        }
-        // For now, always add in the token context processor - if it's present.
-        // @todo: Improve this in https://www.drupal.org/node/2804035.
-        if ($this->getDataProcessorManager()->getDefinition('rules_tokens')) {
-          $context_config->process($context_name, 'rules_tokens');
-        }
-      }
-    }
-
-    return $context_config;
-  }
-
-  /**
-   * Submit callback: switch a context to data selecor or direct input mode.
-   */
-  public static function switchContextMode(array &$form, FormStateInterface $form_state) {
-    $element_name = $form_state->getTriggeringElement()['#name'];
-    $mode = $form_state->get($element_name);
-    $switched_mode = $mode == 'selector' ? 'input' : 'selector';
-    $form_state->set($element_name, $switched_mode);
-
-    $form_state->setRebuild();
-  }
-
-}
diff --git a/modules/rules/src/Form/Expression/ExpressionFormInterface.php b/modules/rules/src/Form/Expression/ExpressionFormInterface.php
deleted file mode 100644
index 5b5064c..0000000
--- a/modules/rules/src/Form/Expression/ExpressionFormInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form\Expression;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Defines methods for expression forms.
- */
-interface ExpressionFormInterface {
-
-  /**
-   * Adds elements specific to the expression to the form.
-   *
-   * @param array $form
-   *   The form array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current form state.
-   */
-  public function form(array $form, FormStateInterface $form_state);
-
-  /**
-   * Form validation callback to validate expression elements.
-   *
-   * @param array $form
-   *   The form array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current form state.
-   */
-  public function validateForm(array $form, FormStateInterface $form_state);
-
-  /**
-   * Form submission callback to save changes for the expression.
-   *
-   * @param array $form
-   *   The form array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current form state.
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state);
-
-}
diff --git a/modules/rules/src/Form/Expression/ExpressionFormTrait.php b/modules/rules/src/Form/Expression/ExpressionFormTrait.php
deleted file mode 100644
index fb860bf..0000000
--- a/modules/rules/src/Form/Expression/ExpressionFormTrait.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form\Expression;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Provides base methods for expression forms.
- */
-trait ExpressionFormTrait {
-
-  /**
-   * Implements ExpressionFormInterface::submitForm().
-   *
-   * Empty default implementation.
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * Implements ExpressionFormInterface::validateForm().
-   *
-   * Empty default implementation.
-   */
-  public function validateForm(array $form, FormStateInterface $form_state) {
-  }
-
-}
diff --git a/modules/rules/src/Form/Expression/RuleForm.php b/modules/rules/src/Form/Expression/RuleForm.php
deleted file mode 100644
index 49c1635..0000000
--- a/modules/rules/src/Form/Expression/RuleForm.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form\Expression;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Plugin\RulesExpression\RuleInterface;
-
-/**
- * Form view structure for rule expressions.
- *
- * @see \Drupal\rules\Plugin\RulesExpression\Rule
- */
-class RuleForm implements ExpressionFormInterface {
-
-  use ExpressionFormTrait;
-
-  /**
-   * The rule expression object this form is for.
-   *
-   * @var \Drupal\rules\Plugin\RulesExpression\RuleInterface
-   */
-  protected $rule;
-
-  /**
-   * Creates a new object of this class.
-   */
-  public function __construct(RuleInterface $rule) {
-    $this->rule = $rule;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $conditions_form_handler = $this->rule->getConditions()->getFormHandler();
-    $form = $conditions_form_handler->form($form, $form_state);
-
-    $actions_form_handler = $this->rule->getActions()->getFormHandler();
-    $form = $actions_form_handler->form($form, $form_state);
-
-    return $form;
-  }
-
-}
diff --git a/modules/rules/src/Form/ReactionRuleAddForm.php b/modules/rules/src/Form/ReactionRuleAddForm.php
deleted file mode 100644
index 0293e44..0000000
--- a/modules/rules/src/Form/ReactionRuleAddForm.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Core\RulesEventManager;
-use Drupal\rules\Engine\ExpressionManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a form to add a reaction rule.
- */
-class ReactionRuleAddForm extends RulesComponentFormBase {
-
-  /**
-   * The Rules event manager.
-   *
-   * @var \Drupal\rules\Core\RulesEventManager
-   */
-  protected $eventManager;
-
-  /**
-   * Constructs a new reaction rule form.
-   *
-   * @param \Drupal\rules\Engine\ExpressionManagerInterface $expression_manager
-   *   The expression manager.
-   * @param \Drupal\rules\Core\RulesEventManager $event_manager
-   *   The Rules event manager.
-   */
-  public function __construct(ExpressionManagerInterface $expression_manager, RulesEventManager $event_manager) {
-    parent::__construct($expression_manager);
-    $this->eventManager = $event_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('plugin.manager.rules_expression'), $container->get('plugin.manager.rules_event'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    $actions = parent::actions($form, $form_state);
-    $actions['submit']['#value'] = $this->t('Save');
-    return $actions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $form = parent::form($form, $form_state);
-
-    $event_definitions = $this->eventManager->getGroupedDefinitions();
-    $options = [];
-    foreach ($event_definitions as $group => $definitions) {
-      foreach ($definitions as $id => $definition) {
-        $options[$group][$id] = $definition['label'];
-      }
-    }
-
-    $form['events']['#tree'] = TRUE;
-    $form['events'][]['event_name'] = [
-      '#type' => 'select',
-      '#title' => $this->t('React on event'),
-      '#options' => $options,
-      '#required' => TRUE,
-      '#description' => $this->t('Whenever the event occurs, rule evaluation is triggered.'),
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    parent::save($form, $form_state);
-
-    drupal_set_message($this->t('Reaction rule %label has been created.', ['%label' => $this->entity->label()]));
-    $form_state->setRedirect('entity.rules_reaction_rule.edit_form', ['rules_reaction_rule' => $this->entity->id()]);
-  }
-
-}
diff --git a/modules/rules/src/Form/ReactionRuleEditForm.php b/modules/rules/src/Form/ReactionRuleEditForm.php
deleted file mode 100644
index 1ef7235..0000000
--- a/modules/rules/src/Form/ReactionRuleEditForm.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Core\RulesEventManager;
-use Drupal\rules\Engine\ExpressionManagerInterface;
-use Drupal\rules\Ui\RulesUiConfigHandler;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a form to edit a reaction rule.
- */
-class ReactionRuleEditForm extends RulesComponentFormBase {
-
-  /**
-   * The event plugin manager.
-   *
-   * @var \Drupal\rules\Core\RulesEventManager
-   */
-  protected $eventManager;
-
-  /**
-   * The RulesUI handler of the currently active UI.
-   *
-   * @var \Drupal\rules\Ui\RulesUiConfigHandler
-   */
-  protected $rulesUiHandler;
-
-  /**
-   * Constructs a new object of this class.
-   *
-   * @param \Drupal\rules\Engine\ExpressionManagerInterface $expression_manager
-   *   The expression manager.
-   * @param \Drupal\rules\Core\RulesEventManager $event_manager
-   *   The event plugin manager.
-   */
-  public function __construct(ExpressionManagerInterface $expression_manager, RulesEventManager $event_manager) {
-    parent::__construct($expression_manager);
-    $this->eventManager = $event_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('plugin.manager.rules_expression'), $container->get('plugin.manager.rules_event'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, RulesUiConfigHandler $rules_ui_handler = NULL) {
-    // Overridden such we can receive further route parameters.
-    $this->rulesUiHandler = $rules_ui_handler;
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function prepareEntity() {
-    parent::prepareEntity();
-    // Replace the config entity with the latest entity from temp store, so any
-    // interim changes are picked up.
-    $this->entity = $this->rulesUiHandler->getConfig();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    foreach ($this->entity->getEventNames() as $key => $event_name) {
-      $event_definition = $this->eventManager->getDefinition($event_name);
-      $form['event'][$key] = [
-        '#type' => 'item',
-        '#title' => $this->t('Events:'),
-        '#markup' => $this->t('@label (@name)', [
-          '@label' => $event_definition['label'],
-          '@name' => $event_name,
-        ]),
-      ];
-    }
-    $form = $this->rulesUiHandler->getForm()->buildForm($form, $form_state);
-    return parent::form($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    parent::validateForm($form, $form_state);
-    $this->rulesUiHandler->getForm()->validateForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    $actions = parent::actions($form, $form_state);
-    $actions['submit']['#value'] = $this->t('Save');
-    $actions['cancel'] = [
-      '#type' => 'submit',
-      '#limit_validation_errors' => [['locked']],
-      '#value' => $this->t('Cancel'),
-      '#submit' => ['::cancel'],
-    ];
-    return $actions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    $this->rulesUiHandler->getForm()->submitForm($form, $form_state);
-
-    // Persist changes by saving the entity.
-    parent::save($form, $form_state);
-
-    // Also remove the temporarily stored component, it has been persisted now.
-    $this->rulesUiHandler->clearTemporaryStorage();
-
-    drupal_set_message($this->t('Reaction rule %label has been updated.', ['%label' => $this->entity->label()]));
-  }
-
-  /**
-   * Form submission handler for the 'cancel' action.
-   */
-  public function cancel(array $form, FormStateInterface $form_state) {
-    $this->rulesUiHandler->clearTemporaryStorage();
-    drupal_set_message($this->t('Canceled.'));
-    $form_state->setRedirect('entity.rules_reaction_rule.collection');
-  }
-
-  /**
-   * Title callback: also display the rule label.
-   */
-  public function getTitle($rules_reaction_rule) {
-    return $this->t('Edit reaction rule "@label"', ['@label' => $rules_reaction_rule->label()]);
-  }
-
-}
diff --git a/modules/rules/src/Form/RulesComponentAddForm.php b/modules/rules/src/Form/RulesComponentAddForm.php
deleted file mode 100644
index 29ca665..0000000
--- a/modules/rules/src/Form/RulesComponentAddForm.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Provides a form to add a component.
- */
-class RulesComponentAddForm extends RulesComponentFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntityFromRouteMatch(RouteMatchInterface $route_match, $entity_type_id) {
-    // Overridden to customize creation of new entities.
-    if ($route_match->getRawParameter($entity_type_id) !== NULL) {
-      $entity = $route_match->getParameter($entity_type_id);
-    }
-    else {
-      $values = [];
-      // @todo: Create the right expression depending on the route.
-      $entity = $this->entityTypeManager->getStorage($entity_type_id)->create($values);
-      $entity->setExpression($this->expressionManager->createRule());
-
-    }
-    return $entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    $actions = parent::actions($form, $form_state);
-    $actions['submit']['#value'] = $this->t('Save');
-    return $actions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    parent::save($form, $form_state);
-
-    drupal_set_message($this->t('Component %label has been created.', ['%label' => $this->entity->label()]));
-    $form_state->setRedirect('entity.rules_component.edit_form', ['rules_component' => $this->entity->id()]);
-  }
-
-}
diff --git a/modules/rules/src/Form/RulesComponentEditForm.php b/modules/rules/src/Form/RulesComponentEditForm.php
deleted file mode 100644
index 8ffd615..0000000
--- a/modules/rules/src/Form/RulesComponentEditForm.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Ui\RulesUiConfigHandler;
-
-/**
- * Provides a form to edit a component.
- */
-class RulesComponentEditForm extends RulesComponentFormBase {
-
-  /**
-   * The RulesUI handler of the currently active UI.
-   *
-   * @var \Drupal\rules\Ui\RulesUiConfigHandler
-   */
-  protected $rulesUiHandler;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, RulesUiConfigHandler $rules_ui_handler = NULL) {
-    // Overridden such we can receive further route parameters.
-    $this->rulesUiHandler = $rules_ui_handler;
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function prepareEntity() {
-    parent::prepareEntity();
-    // Replace the config entity with the latest entity from temp store, so any
-    // interim changes are picked up.
-    $this->entity = $this->rulesUiHandler->getConfig();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $form = $this->rulesUiHandler->getForm()->buildForm($form, $form_state);
-    return parent::form($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    parent::validateForm($form, $form_state);
-    $this->rulesUiHandler->getForm()->validateForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    $actions = parent::actions($form, $form_state);
-    $actions['submit']['#value'] = $this->t('Save');
-    $actions['cancel'] = [
-      '#type' => 'submit',
-      '#limit_validation_errors' => [['locked']],
-      '#value' => $this->t('Cancel'),
-      '#submit' => ['::cancel'],
-    ];
-    return $actions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    $this->rulesUiHandler->getForm()->submitForm($form, $form_state);
-
-    // Persist changes by saving the entity.
-    parent::save($form, $form_state);
-
-    // Also remove the temporarily stored component, it has been persisted now.
-    $this->rulesUiHandler->clearTemporaryStorage();
-
-    drupal_set_message($this->t('Rule component %label has been updated.', ['%label' => $this->entity->label()]));
-  }
-
-  /**
-   * Form submission handler for the 'cancel' action.
-   */
-  public function cancel(array $form, FormStateInterface $form_state) {
-    $this->rulesUiHandler->clearTemporaryStorage();
-    drupal_set_message($this->t('Canceled.'));
-    $form_state->setRedirect('entity.rules_component.collection');
-  }
-
-  /**
-   * Title callback: also display the rule label.
-   */
-  public function getTitle($rules_component) {
-    return $this->t('Edit rules component "@label"', ['@label' => $rules_component->label()]);
-  }
-
-}
diff --git a/modules/rules/src/Form/RulesComponentFormBase.php b/modules/rules/src/Form/RulesComponentFormBase.php
deleted file mode 100644
index 590ea21..0000000
--- a/modules/rules/src/Form/RulesComponentFormBase.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form;
-
-use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Engine\ExpressionManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides the base form for rules add and edit forms.
- */
-abstract class RulesComponentFormBase extends EntityForm {
-
-  /**
-   * The Rules expression manager to get expression plugins.
-   *
-   * @var \Drupal\rules\Engine\ExpressionManagerInterface
-   */
-  protected $expressionManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('plugin.manager.rules_expression'));
-  }
-
-  /**
-   * Creates a new object of this class.
-   *
-   * @param \Drupal\rules\Engine\ExpressionManagerInterface $expression_manager
-   *   The expression manager.
-   */
-  public function __construct(ExpressionManagerInterface $expression_manager) {
-    $this->expressionManager = $expression_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $form['settings'] = [
-      '#type' => 'details',
-      '#title' => $this->t('Settings'),
-      '#open' => $this->entity->isNew(),
-    ];
-
-    $form['settings']['label'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Label'),
-      '#default_value' => $this->entity->label(),
-      '#required' => TRUE,
-    ];
-
-    $form['settings']['id'] = [
-      '#type' => 'machine_name',
-      '#description' => $this->t('A unique machine-readable name. Can only contain lowercase letters, numbers, and underscores.'),
-      '#disabled' => !$this->entity->isNew(),
-      '#default_value' => $this->entity->id(),
-      '#machine_name' => [
-        'exists' => [$this, 'exists'],
-        'replace_pattern' => '([^a-z0-9_]+)|(^custom$)',
-        'source' => ['settings', 'label'],
-        'error' => $this->t('The machine-readable name must be unique, and can only contain lowercase letters, numbers, and underscores. Additionally, it can not be the reserved word "custom".'),
-      ],
-    ];
-
-    // @todo enter a real tag field here.
-    $form['settings']['tags'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Tags'),
-      '#default_value' => implode(', ', $this->entity->getTags()),
-      '#description' => $this->t('Enter a list of comma-separated tags here; e.g., "notification, publishing".'),
-      '#required' => FALSE,
-    ];
-
-    $form['settings']['description'] = [
-      '#type' => 'textarea',
-      '#default_value' => $this->entity->getDescription(),
-      '#description' => $this->t('Enter a description for this component.'),
-      '#title' => $this->t('Description'),
-    ];
-
-    return parent::form($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildEntity(array $form, FormStateInterface $form_state) {
-    $entity = parent::buildEntity($form, $form_state);
-    $tags = array_map('trim', explode(',', $entity->get('tags')));
-    $entity->set('tags', $tags);
-    return $entity;
-  }
-
-  /**
-   * Machine name exists callback.
-   *
-   * @param string $id
-   *   The machine name ID.
-   *
-   * @return bool
-   *   TRUE if an entity with the same name already exists, FALSE otherwise.
-   */
-  public function exists($id) {
-    $type = $this->entity->getEntityTypeId();
-    return (bool) $this->entityTypeManager->getStorage($type)->load($id);
-  }
-
-}
diff --git a/modules/rules/src/Form/RulesSettingsForm.php b/modules/rules/src/Form/RulesSettingsForm.php
deleted file mode 100644
index 6e3345e..0000000
--- a/modules/rules/src/Form/RulesSettingsForm.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace Drupal\rules\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Psr\Log\LogLevel;
-
-/**
- * Provides rules settings form.
- */
-class RulesSettingsForm extends ConfigFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'rules_settings_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return ['rules.settings'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $config = $this->config('rules.settings');
-    $form['log'] = [
-      '#type' => 'fieldset',
-      '#title' => $this->t('System log'),
-    ];
-    $form['log']['log'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Log debug information'),
-      '#default_value' => $config->get('log'),
-    ];
-    $form['log']['log_level_system'] = [
-      '#type' => 'radios',
-      '#title' => $this->t('Log level'),
-      '#options' => [
-        LogLevel::WARNING => $this->t('Log all warnings and errors'),
-        LogLevel::ERROR => $this->t('Log errors only'),
-      ],
-      '#default_value' => $config->get('log_level_system') ? $config->get('log_level_system') : LogLevel::WARNING,
-      '#description' => $this->t('Evaluations errors are logged to available loggers.'),
-      '#states' => [
-        // Hide the log_level radios when the debug log is disabled.
-        'invisible' => [
-          'input[name="log"]' => ['checked' => FALSE],
-        ],
-      ],
-    ];
-    $form['debug_screen_log'] = [
-      '#type' => 'fieldset',
-      '#title' => $this->t('Screen log'),
-    ];
-    $form['debug_screen_log']['debug_screen'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Show debug information on screen (in the HTML response)'),
-      '#default_value' => $config->get('debug_screen'),
-    ];
-    $form['debug_screen_log']['log_level_screen'] = [
-      '#type' => 'radios',
-      '#title' => $this->t('Log level'),
-      '#options' => [
-        LogLevel::WARNING => $this->t('Log all warnings and errors'),
-        LogLevel::ERROR => $this->t('Log errors only'),
-      ],
-      '#default_value' => $config->get('log_level_screen') ? $config->get('log_level_screen') : LogLevel::WARNING,
-      '#description' => $this->t('Level of log messages shown on screen.'),
-      '#states' => [
-        // Hide the log_level radios when the debug log is disabled.
-        'invisible' => [
-          'input[name="debug_screen"]' => ['checked' => FALSE],
-        ],
-      ],
-    ];
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->config('rules.settings')
-      ->set('log', $form_state->getValue('log'))
-      ->set('debug_screen', $form_state->getValue('debug_screen'))
-      ->set('log_level_system', $form_state->getValue('log_level_system'))
-      ->set('log_level_screen', $form_state->getValue('log_level_screen'))
-      ->save();
-
-    parent::submitForm($form, $form_state);
-  }
-
-}
diff --git a/modules/rules/src/Logger/RulesLog.php b/modules/rules/src/Logger/RulesLog.php
deleted file mode 100644
index e61bebb..0000000
--- a/modules/rules/src/Logger/RulesLog.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Drupal\rules\Logger;
-
-use Drupal\Core\Logger\LogMessageParserInterface;
-use Drupal\Core\Logger\RfcLoggerTrait;
-use Drupal\rules\Event\SystemLoggerEvent;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * Dispatches new logger-items as SystemLoggerEvent.
- */
-class RulesLog implements LoggerInterface {
-  use RfcLoggerTrait;
-
-  /**
-   * The dispatcher.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-   */
-  protected $dispatcher;
-
-  /**
-   * The message's placeholders parser.
-   *
-   * @var \Drupal\Core\Logger\LogMessageParserInterface
-   */
-  protected $parser;
-
-  /**
-   * Constructs a new instance.
-   *
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
-   *   An EventDispatcherInterface instance.
-   * @param \Drupal\Core\Logger\LogMessageParserInterface $parser
-   *   The parser to use when extracting message variables.
-   */
-  public function __construct(EventDispatcherInterface $dispatcher, LogMessageParserInterface $parser) {
-    $this->dispatcher = $dispatcher;
-    $this->parser = $parser;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @todo: create a TypedData logger-entry object: https://www.drupal.org/node/2625238
-   */
-  public function log($level, $message, array $context = []) {
-    // Remove any backtraces since they may contain an unserializable variable.
-    unset($context['backtrace']);
-
-    // Convert PSR3-style messages to SafeMarkup::format() style, so they can be
-    // translated too in runtime.
-    $message_placeholders = $this->parser->parseMessagePlaceholders($message, $context);
-
-    $logger_entry = [
-      'uid' => $context['uid'],
-      'type' => $context['channel'],
-      'message' => $message,
-      'variables' => $message_placeholders,
-      'severity' => $level,
-      'link' => $context['link'],
-      'location' => $context['request_uri'],
-      'referer' => $context['referer'],
-      'hostname' => $context['ip'],
-      'timestamp' => $context['timestamp'],
-    ];
-
-    // Dispatch logger_entry event.
-    $event = new SystemLoggerEvent($logger_entry, ['logger_entry' => $logger_entry]);
-    $this->dispatcher->dispatch(SystemLoggerEvent::EVENT_NAME, $event);
-  }
-
-}
diff --git a/modules/rules/src/Logger/RulesLoggerChannel.php b/modules/rules/src/Logger/RulesLoggerChannel.php
deleted file mode 100644
index ce2ab98..0000000
--- a/modules/rules/src/Logger/RulesLoggerChannel.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace Drupal\rules\Logger;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Logger\LoggerChannel;
-use Psr\Log\LoggerTrait;
-
-/**
- * Logs rules log entries in the available loggers.
- */
-class RulesLoggerChannel extends LoggerChannel {
-  use LoggerTrait;
-
-  /**
-   * A configuration object with rules settings.
-   *
-   * @var ImmutableConfig
-   */
-  protected $config;
-
-  /**
-   * Static storage of log entries.
-   *
-   * @var array
-   */
-  protected $logs = [];
-
-  /**
-   * Creates RulesLoggerChannel object.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   Config factory instance.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory) {
-    parent::__construct('rules');
-    $this->config = $config_factory->get('rules.settings');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function log($level, $message, array $context = []) {
-    $this->logs[] = [
-      'level' => $level,
-      'message' => $message,
-      'context' => $context,
-    ];
-
-    // Log message only if rules logging setting is enabled.
-    if ($this->config->get('log')) {
-      if ($this->levelTranslation[$this->config->get('log_level_system')] >= $this->levelTranslation[$level]) {
-        parent::log($level, $message, $context);
-      }
-    }
-    if ($this->config->get('debug_screen')) {
-      if ($this->levelTranslation[$this->config->get('log_level_screen')] >= $this->levelTranslation[$level]) {
-        drupal_set_message($message, $level);
-      }
-    }
-  }
-
-  /**
-   * Returns the structured array of entries.
-   *
-   * @return array
-   *   Array of stored log entries.
-   */
-  public function getLogs() {
-    return $this->logs;
-  }
-
-  /**
-   * Clears the static logs entries cache.
-   */
-  public function clearLogs() {
-    $this->logs = [];
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/DataComparison.php b/modules/rules/src/Plugin/Condition/DataComparison.php
deleted file mode 100644
index 3354d6b..0000000
--- a/modules/rules/src/Plugin/Condition/DataComparison.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides a 'Data comparison' condition.
- *
- * @Condition(
- *   id = "rules_data_comparison",
- *   label = @Translation("Data comparison"),
- *   category = @Translation("Data"),
- *   context = {
- *     "data" = @ContextDefinition("any",
- *       label = @Translation("Data to compare"),
- *       description = @Translation("The data to be compared, specified by using a data selector, e.g. 'node.uid.entity.name.value'.")
- *     ),
- *     "operation" = @ContextDefinition("string",
- *       label = @Translation("Operator"),
- *       description = @Translation("The comparison operator. Valid values are == (default), <, >, CONTAINS (for strings or arrays) and IN (for arrays or lists)."),
- *       default_value = "==",
- *     ),
- *     "value" = @ContextDefinition("any",
- *        label = @Translation("Data value"),
- *        description = @Translation("The value to compare the data with.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- * @todo: Find a way to port rules_condition_data_is_operator_options() from Drupal 7.
- */
-class DataComparison extends RulesConditionBase {
-
-  /**
-   * Evaluate the data comparison.
-   *
-   * @param mixed $data
-   *   Supplied data to test.
-   * @param string $operation
-   *   Data comparison operation. Typically one of:
-   *     - "=="
-   *     - "<"
-   *     - ">"
-   *     - "contains" (for strings or arrays)
-   *     - "IN" (for arrays or lists).
-   * @param mixed $value
-   *   The value to be compared against $data.
-   *
-   * @return bool
-   *   The evaluation of the condition.
-   */
-  protected function doEvaluate($data, $operation, $value) {
-    $operation = $operation ? strtolower($operation) : '==';
-    switch ($operation) {
-      case '<':
-        return $data < $value;
-
-      case '>':
-        return $data > $value;
-
-      case 'contains':
-        return is_string($data) && strpos($data, $value) !== FALSE || is_array($data) && in_array($value, $data);
-
-      case 'in':
-        return is_array($value) && in_array($data, $value);
-
-      case '==':
-      default:
-        // In case both values evaluate to FALSE, further differentiate between
-        // NULL values and values evaluating to FALSE.
-        if (!$data && !$value) {
-          return (isset($data) && isset($value)) || (!isset($data) && !isset($value));
-        }
-        return $data == $value;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function refineContextDefinitions(array $selected_data) {
-    if (isset($selected_data['data'])) {
-      $this->pluginDefinition['context']['value']->setDataType($selected_data['data']->getDataType());
-      if ($this->getContextValue('operation') == 'IN') {
-        $this->pluginDefinition['context']['value']->setMultiple();
-      }
-    }
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/DataIsEmpty.php b/modules/rules/src/Plugin/Condition/DataIsEmpty.php
deleted file mode 100644
index 7c6a8f6..0000000
--- a/modules/rules/src/Plugin/Condition/DataIsEmpty.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\Core\TypedData\ComplexDataInterface;
-use Drupal\Core\TypedData\ListInterface;
-use Drupal\Core\TypedData\Type\BooleanInterface;
-use Drupal\Core\TypedData\Type\IntegerInterface;
-use Drupal\Core\TypedData\Type\StringInterface;
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides a 'Data value is empty' condition.
- *
- * @Condition(
- *   id = "rules_data_is_empty",
- *   label = @Translation("Data value is empty"),
- *   category = @Translation("Data"),
- *   context = {
- *     "data" = @ContextDefinition("any",
- *       label = @Translation("Data to check"),
- *       description = @Translation("The data to be checked to be empty, specified by using a data selector, e.g. 'node:uid:entity:name:value'.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class DataIsEmpty extends RulesConditionBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function evaluate() {
-    $data = $this->getContext('data')->getContextData();
-    if ($data instanceof ComplexDataInterface || $data instanceof ListInterface) {
-      return $data->isEmpty();
-    }
-    $value = $data->getValue();
-    // For some primitives we can rely on PHP's type casting to boolean.
-    if ($data instanceof StringInterface || $data instanceof IntegerInterface || $data instanceof BooleanInterface) {
-      return !isset($value) || !$value;
-    }
-    return !isset($value);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/DataListContains.php b/modules/rules/src/Plugin/Condition/DataListContains.php
deleted file mode 100644
index 8e56a49..0000000
--- a/modules/rules/src/Plugin/Condition/DataListContains.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-use Drupal\Core\Entity\EntityInterface;
-
-/**
- * Provides a 'List contains' condition.
- *
- * @Condition(
- *   id = "rules_list_contains",
- *   label = @Translation("List contains item"),
- *   category = @Translation("Data"),
- *   context = {
- *     "list" = @ContextDefinition("list",
- *       label = @Translation("List"),
- *       description = @Translation("The list to be checked.")
- *     ),
- *     "item" = @ContextDefinition("any",
- *       label = @Translation("Item"),
- *       description = @Translation("The item to check for.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7?
- * @todo: Add group information from Drupal 7?
- * @todo: set ContextDefinition restriction
- * @todo: Add info alter
- */
-class DataListContains extends RulesConditionBase {
-
-  /**
-   * Evaluate whether the list has the item.
-   *
-   * @param array|ListInterface $list
-   *   List to be searched.
-   * @param mixed $item
-   *   Item to be found in list.
-   */
-  protected function doEvaluate($list, $item) {
-    if ($item instanceof EntityInterface && $id = $item->id()) {
-      // Check for equal items using the identifier if there is one.
-      foreach ($list as $list_item) {
-        if ($list_item->id() == $id) {
-          return TRUE;
-        }
-      }
-      return FALSE;
-    }
-
-    return in_array($item, $list);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/DataListCountIs.php b/modules/rules/src/Plugin/Condition/DataListCountIs.php
deleted file mode 100644
index d8f98cc..0000000
--- a/modules/rules/src/Plugin/Condition/DataListCountIs.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides a 'List count comparison' condition.
- *
- * @Condition(
- *   id = "rules_list_count_is",
- *   label = @Translation("List Count Comparison"),
- *   category = @Translation("Data"),
- *   context = {
- *     "list" = @ContextDefinition("list",
- *       label = @Translation("List"),
- *       description = @Translation("A multi value data element to have its count compared, specified by using a data selector, eg 'node:uid:entity:roles'.")
- *     ),
- *     "operator" = @ContextDefinition("string",
- *       label = @Translation("Operator"),
- *       description = @Translation("The comparison operator.")
- *     ),
- *     "value" = @ContextDefinition("integer",
- *       label = @Translation("Count"),
- *       description = @Translation("The count to compare the data count with.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7?
- * @todo: set ContextDefinition default value
- * @todo: set ContextDefinition options list
- * @todo: set ContextDefinition restriction
- */
-class DataListCountIs extends RulesConditionBase {
-
-  /**
-   * Compare the value to the count of the list.
-   *
-   * @param array $list
-   *   The list to compare the value to.
-   * @param string $operator
-   *   The type of comparison to do, may be one of '==', '<', or '>'.
-   * @param int $value
-   *   The value of that the count is to compare to.
-   *
-   * @return bool
-   *   TRUE if the comparison returns true.
-   */
-  protected function doEvaluate(array $list, $operator, $value) {
-    switch ($operator) {
-      case '==':
-        return count($list) == $value;
-
-      case '<';
-        return count($list) < $value;
-
-      case '>';
-        return count($list) > $value;
-
-    }
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/EntityHasField.php b/modules/rules/src/Plugin/Condition/EntityHasField.php
deleted file mode 100644
index dfb5dbe..0000000
--- a/modules/rules/src/Plugin/Condition/EntityHasField.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides a 'Entity has field' condition.
- *
- * @Condition(
- *   id = "rules_entity_has_field",
- *   label = @Translation("Entity has field"),
- *   category = @Translation("Entity"),
- *   context = {
- *     "entity" = @ContextDefinition("entity",
- *       label = @Translation("Entity"),
- *       description = @Translation("Specifies the entity for which to evaluate the condition.")
- *     ),
- *     "field" = @ContextDefinition("string",
- *       label = @Translation("Field"),
- *       description = @Translation("The name of the field to check for.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class EntityHasField extends RulesConditionBase {
-
-  /**
-   * Checks if a given entity has a given field.
-   *
-   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
-   *   The entity to check for the provided field.
-   * @param string $field
-   *   The field to check for on the entity.
-   *
-   * @return bool
-   *   TRUE if the provided entity has the provided field.
-   */
-  protected function doEvaluate(FieldableEntityInterface $entity, $field) {
-    return $entity->hasField($field);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/EntityIsNew.php b/modules/rules/src/Plugin/Condition/EntityIsNew.php
deleted file mode 100644
index 4255b84..0000000
--- a/modules/rules/src/Plugin/Condition/EntityIsNew.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides an 'Entity is new' condition.
- *
- * @Condition(
- *   id = "rules_entity_is_new",
- *   label = @Translation("Entity is new"),
- *   category = @Translation("Entity"),
- *   context = {
- *     "entity" = @ContextDefinition("entity",
- *       label = @Translation("Entity"),
- *       description = @Translation("Specifies the entity for which to evaluate the condition.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7?
- */
-class EntityIsNew extends RulesConditionBase {
-
-  /**
-   * Check if the provided entity is new.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to check.
-   *
-   * @return bool
-   *   TRUE if the provided entity is new.
-   */
-  protected function doEvaluate(EntityInterface $entity) {
-    return $entity->isNew();
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/EntityIsOfBundle.php b/modules/rules/src/Plugin/Condition/EntityIsOfBundle.php
deleted file mode 100644
index 449b4e8..0000000
--- a/modules/rules/src/Plugin/Condition/EntityIsOfBundle.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides an 'Entity is of bundle' condition.
- *
- * @Condition(
- *   id = "rules_entity_is_of_bundle",
- *   label = @Translation("Entity is of bundle"),
- *   category = @Translation("Entity"),
- *   context = {
- *     "entity" = @ContextDefinition("entity",
- *       label = @Translation("Entity"),
- *       description = @Translation("Specifies the entity for which to evaluate the condition."),
- *       assignment_restriction = "selector",
- *     ),
- *     "type" = @ContextDefinition("string",
- *       label = @Translation("Type"),
- *       description = @Translation("The type of the evaluated entity.")
- *     ),
- *     "bundle" = @ContextDefinition("string",
- *       label = @Translation("Bundle"),
- *       description = @Translation("The bundle of the evaluated entity.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7?
- */
-class EntityIsOfBundle extends RulesConditionBase {
-
-  /**
-   * Check if a provided entity is of a specific type and bundle.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to check the bundle and type of.
-   * @param string $type
-   *   The type to check for.
-   * @param string $bundle
-   *   The bundle to check for.
-   *
-   * @return bool
-   *   TRUE if the provided entity is of the provided type and bundle.
-   */
-  protected function doEvaluate(EntityInterface $entity, $type, $bundle) {
-    $entity_type = $entity->getEntityTypeId();
-    $entity_bundle = $entity->bundle();
-
-    // Check to see whether the entity's bundle and type match the specified
-    // values.
-    return $entity_bundle == $bundle && $entity_type == $type;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function assertMetadata(array $selected_data) {
-    // Assert the checked bundle.
-    $changed_definitions = [];
-    if (isset($selected_data['entity']) && $bundle = $this->getContextValue('bundle')) {
-      $changed_definitions['entity'] = clone $selected_data['entity'];
-      $bundles = is_array($bundle) ? $bundle : [$bundle];
-      $changed_definitions['entity']->setBundles($bundles);
-    }
-    return $changed_definitions;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/EntityIsOfType.php b/modules/rules/src/Plugin/Condition/EntityIsOfType.php
deleted file mode 100644
index f915172..0000000
--- a/modules/rules/src/Plugin/Condition/EntityIsOfType.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides an 'Entity is of type' condition.
- *
- * @Condition(
- *   id = "rules_entity_is_of_type",
- *   label = @Translation("Entity is of type"),
- *   category = @Translation("Entity"),
- *   context = {
- *     "entity" = @ContextDefinition("entity",
- *       label = @Translation("Entity"),
- *       description = @Translation("Specifies the entity for which to evaluate the condition.")
- *     ),
- *     "type" = @ContextDefinition("string",
- *       label = @Translation("Type"),
- *       description = @Translation("The entity type specified by the condition.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7?
- */
-class EntityIsOfType extends RulesConditionBase {
-
-  /**
-   * Check if the provided entity is of a specific type.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to check for a type.
-   * @param string $type
-   *   The type to check for.
-   *
-   * @return bool
-   *   TRUE if the entity is of the provided type.
-   */
-  protected function doEvaluate(EntityInterface $entity, $type) {
-    $entity_type = $entity->getEntityTypeId();
-
-    // Check to see whether the entity's type matches the specified value.
-    return $entity_type == $type;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/NodeIsOfType.php b/modules/rules/src/Plugin/Condition/NodeIsOfType.php
deleted file mode 100644
index 9ee4ab8..0000000
--- a/modules/rules/src/Plugin/Condition/NodeIsOfType.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\node\NodeInterface;
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides a 'Node is of type' condition.
- *
- * @Condition(
- *   id = "rules_node_is_of_type",
- *   label = @Translation("Node is of type"),
- *   category = @Translation("Node"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("Node")
- *     ),
- *     "types" = @ContextDefinition("string",
- *       label = @Translation("Content types"),
- *       description = @Translation("Check for the the allowed node types."),
- *       multiple = TRUE
- *     )
- *   }
- * )
- */
-class NodeIsOfType extends RulesConditionBase {
-
-  /**
-   * Check if a node is of a specific set of types.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node to check for a type.
-   * @param string[] $types
-   *   An array of type names as strings.
-   *
-   * @return bool
-   *   TRUE if the node type is in the array of types.
-   */
-  protected function doEvaluate(NodeInterface $node, array $types) {
-    return in_array($node->getType(), $types);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/NodeIsPromoted.php b/modules/rules/src/Plugin/Condition/NodeIsPromoted.php
deleted file mode 100644
index c5038c4..0000000
--- a/modules/rules/src/Plugin/Condition/NodeIsPromoted.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\node\NodeInterface;
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides a 'Node is promoted' condition.
- *
- * @Condition(
- *   id = "rules_node_is_promoted",
- *   label = @Translation("Node is promoted"),
- *   category = @Translation("Node"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("Node")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class NodeIsPromoted extends RulesConditionBase {
-
-  /**
-   * Checks if a node is promoted.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node to check.
-   *
-   * @return bool
-   *   TRUE if the node is promoted.
-   */
-  protected function doEvaluate(NodeInterface $node) {
-    return $node->isPromoted();
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/NodeIsPublished.php b/modules/rules/src/Plugin/Condition/NodeIsPublished.php
deleted file mode 100644
index 6ccd572..0000000
--- a/modules/rules/src/Plugin/Condition/NodeIsPublished.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\node\NodeInterface;
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides a 'Node is published' condition.
- *
- * @Condition(
- *   id = "rules_node_is_published",
- *   label = @Translation("Node is published"),
- *   category = @Translation("Node"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("Node")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class NodeIsPublished extends RulesConditionBase {
-
-  /**
-   * Checks if a node is published.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node to check.
-   *
-   * @return bool
-   *   TRUE if the node is published.
-   */
-  protected function doEvaluate(NodeInterface $node) {
-    return $node->isPublished();
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/NodeIsSticky.php b/modules/rules/src/Plugin/Condition/NodeIsSticky.php
deleted file mode 100644
index 1bb4985..0000000
--- a/modules/rules/src/Plugin/Condition/NodeIsSticky.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\node\NodeInterface;
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides a 'Node is sticky' condition.
- *
- * @Condition(
- *   id = "rules_node_is_sticky",
- *   label = @Translation("Node is sticky"),
- *   category = @Translation("Node"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("Node")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class NodeIsSticky extends RulesConditionBase {
-
-  /**
-   * Check if the given node is sticky.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node to check.
-   *
-   * @return bool
-   *   TRUE if the node is sticky.
-   */
-  protected function doEvaluate(NodeInterface $node) {
-    return $node->isSticky();
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/PathAliasExists.php b/modules/rules/src/Plugin/Condition/PathAliasExists.php
deleted file mode 100644
index db2c16d..0000000
--- a/modules/rules/src/Plugin/Condition/PathAliasExists.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Path\AliasManagerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesConditionBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a 'Path alias exists' condition.
- *
- * @Condition(
- *   id = "rules_path_alias_exists",
- *   label = @Translation("Path alias exists"),
- *   category = @Translation("Path"),
- *   context = {
- *     "alias" = @ContextDefinition("string",
- *       label = @Translation("Path alias"),
- *       description = @Translation("Specify the path alias to check for. For example, 'about' for an about page.")
- *     ),
- *     "language" = @ContextDefinition("language",
- *       label = @Translation("Language"),
- *       description = @Translation("If specified, the language for which the URL alias applies."),
- *       default_value = NULL,
- *       required = FALSE
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class PathAliasExists extends RulesConditionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The alias manager service.
-   *
-   * @var \Drupal\Core\Path\AliasManagerInterface
-   */
-  protected $aliasManager;
-
-  /**
-   * Constructs a PathAliasExists object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
-   *   The alias manager service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, AliasManagerInterface $alias_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->aliasManager = $alias_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('path.alias_manager')
-    );
-  }
-
-  /**
-   * Check if a path alias exists.
-   *
-   * @param string $alias
-   *   The alias to see if exists.
-   * @param \Drupal\Core\Language\LanguageInterface|null $language
-   *   The language to use.
-   *
-   * @return bool
-   *   TRUE if the system path does not match the given alias (ie: the alias
-   *   exists).
-   */
-  protected function doEvaluate($alias, LanguageInterface $language = NULL) {
-    $lang_code = is_null($language) ? NULL : $language->getId();
-    $path = $this->aliasManager->getPathByAlias($alias, $lang_code);
-    return $path != $alias;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/PathHasAlias.php b/modules/rules/src/Plugin/Condition/PathHasAlias.php
deleted file mode 100644
index bd94913..0000000
--- a/modules/rules/src/Plugin/Condition/PathHasAlias.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Path\AliasManagerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesConditionBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a 'Path has alias' condition.
- *
- * @Condition(
- *   id = "rules_path_has_alias",
- *   label = @Translation("Path has alias"),
- *   category = @Translation("Path"),
- *   context = {
- *     "path" = @ContextDefinition("string",
- *       label = @Translation("Path")
- *     ),
- *     "language" = @ContextDefinition("language",
- *       label = @Translation("Language"),
- *       description = @Translation("If specified, the language for which the URL alias applies."),
- *       default_value = NULL,
- *       required = FALSE
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class PathHasAlias extends RulesConditionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The alias manager service.
-   *
-   * @var \Drupal\Core\Path\AliasManagerInterface
-   */
-  protected $aliasManager;
-
-  /**
-   * Constructs a PathHasAlias object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
-   *   The alias manager service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, AliasManagerInterface $alias_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->aliasManager = $alias_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('path.alias_manager')
-    );
-  }
-
-  /**
-   * Check if a URL path has a URL alias.
-   *
-   * @param string $path
-   *   The path to check.
-   * @param \Drupal\Core\Language\LanguageInterface|null $language
-   *   An optional language to look up the path in.
-   *
-   * @return bool
-   *   TRUE if the path has an alias in the given language.
-   */
-  protected function doEvaluate($path, LanguageInterface $language = NULL) {
-    $langcode = is_null($language) ? NULL : $language->getId();
-    $alias = $this->aliasManager->getAliasByPath($path, $langcode);
-    return $alias != $path;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/UserHasEntityFieldAccess.php b/modules/rules/src/Plugin/Condition/UserHasEntityFieldAccess.php
deleted file mode 100644
index a0bdf2e..0000000
--- a/modules/rules/src/Plugin/Condition/UserHasEntityFieldAccess.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesConditionBase;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a 'User has entity field access' condition.
- *
- * @Condition(
- *   id = "rules_entity_field_access",
- *   label = @Translation("User has entity field access"),
- *   category = @Translation("User"),
- *   context = {
- *     "entity" = @ContextDefinition("entity",
- *       label = @Translation("Entity")
- *     ),
- *     "field" = @ContextDefinition("string",
- *       label = @Translation("Field")
- *     ),
- *     "operation" = @ContextDefinition("string",
- *       label = @Translation("Operation")
- *     ),
- *     "user" = @ContextDefinition("entity:user",
- *       label = @Translation("User")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class UserHasEntityFieldAccess extends RulesConditionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Constructs a UserHasEntityFieldAccess object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity_type.manager')
-    );
-  }
-
-  /**
-   * Evaluate if the user has access to the field of an entity.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity to check access on.
-   * @param string $field
-   *   The name of the field to check access on.
-   * @param string $operation
-   *   The operation access should be checked for. Usually one of "view" or
-   *   "edit".
-   * @param \Drupal\Core\Session\AccountInterface $user
-   *   The user account to test access against.
-   *
-   * @return bool
-   *   TRUE if the user has access to the field on the entity, FALSE otherwise.
-   */
-  protected function doEvaluate(ContentEntityInterface $entity, $field, $operation, AccountInterface $user) {
-    if (!$entity->hasField($field)) {
-      return FALSE;
-    }
-
-    $access = $this->entityTypeManager->getAccessControlHandler($entity->getEntityTypeId());
-    if (!$access->access($entity, $operation, $user)) {
-      return FALSE;
-    }
-
-    $definition = $entity->getFieldDefinition($field);
-    $items = $entity->get($field);
-    return $access->fieldAccess($operation, $definition, $user, $items);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/UserHasRole.php b/modules/rules/src/Plugin/Condition/UserHasRole.php
deleted file mode 100644
index 46c1166..0000000
--- a/modules/rules/src/Plugin/Condition/UserHasRole.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-use Drupal\rules\Exception\InvalidArgumentException;
-use Drupal\user\UserInterface;
-
-/**
- * Provides a 'User has roles(s)' condition.
- *
- * @Condition(
- *   id = "rules_user_has_role",
- *   label = @Translation("User has role(s)"),
- *   category = @Translation("User"),
- *   context = {
- *     "user" = @ContextDefinition("entity:user",
- *       label = @Translation("User")
- *     ),
- *     "roles" = @ContextDefinition("entity:user_role",
- *       label = @Translation("Roles"),
- *       multiple = TRUE
- *     ),
- *     "operation" = @ContextDefinition("string",
- *       label = @Translation("Match roles"),
- *       description = @Translation("If matching against all selected roles, the user must have <em>all</em> the roles selected."),
- *       default_value = "AND",
- *       required = FALSE
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class UserHasRole extends RulesConditionBase {
-
-  /**
-   * Evaluate if user has role(s).
-   *
-   * @param \Drupal\user\UserInterface $account
-   *   The account to check.
-   * @param \Drupal\user\RoleInterface[] $roles
-   *   Array of user roles.
-   * @param string $operation
-   *   Either "AND": user has all of roles.
-   *   Or "OR": user has at least one of all roles.
-   *   Defaults to "AND".
-   *
-   * @return bool
-   *   TRUE if the user has the role(s).
-   */
-  protected function doEvaluate(UserInterface $account, array $roles, $operation = 'AND') {
-
-    $rids = array_map(function ($role) {
-      return $role->id();
-    }, $roles);
-
-    switch ($operation) {
-      case 'OR':
-        return (bool) array_intersect($rids, $account->getRoles());
-
-      case 'AND':
-        return (bool) !array_diff($rids, $account->getRoles());
-
-      default:
-        throw new InvalidArgumentException('Either use "AND" or "OR". Leave empty for default "AND" behavior.');
-    }
-  }
-
-}
diff --git a/modules/rules/src/Plugin/Condition/UserIsBlocked.php b/modules/rules/src/Plugin/Condition/UserIsBlocked.php
deleted file mode 100644
index 7244f58..0000000
--- a/modules/rules/src/Plugin/Condition/UserIsBlocked.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-use Drupal\user\UserInterface;
-
-/**
- * Provides a 'User is blocked' condition.
- *
- * @Condition(
- *   id = "rules_user_is_blocked",
- *   label = @Translation("User is blocked"),
- *   category = @Translation("User"),
- *   context = {
- *     "user" = @ContextDefinition("entity:user",
- *       label = @Translation("User")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class UserIsBlocked extends RulesConditionBase {
-
-  /**
-   * Check if user is blocked.
-   *
-   * @param \Drupal\user\UserInterface $account
-   *   The account to check.
-   *
-   * @return bool
-   *   TRUE if the account is blocked.
-   */
-  protected function doEvaluate(UserInterface $account) {
-    return $account->isBlocked();
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/BanIP.php b/modules/rules/src/Plugin/RulesAction/BanIP.php
deleted file mode 100644
index bf54cc4..0000000
--- a/modules/rules/src/Plugin/RulesAction/BanIP.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\ban\BanIpManagerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides the 'Ban IP' action.
- *
- * @RulesAction(
- *   id = "rules_ban_ip",
- *   label = @Translation("Ban an IP address"),
- *   category = @Translation("Ban"),
- *   context = {
- *     "ip" = @ContextDefinition("string",
- *       label = @Translation("IP Address"),
- *       description = @Translation("Ban an IP using the Ban Module. If no IP is provided, the current user IP is used."),
- *       default_value = NULL,
- *       required = false
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- * @todo: We should maybe use a dedicated data type for the ip address, as we
- * do in Drupal 7.
- * @todo: This action depends on the ban module. We need to have a way to
- * specify this.
- */
-class BanIP extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The ban manager used to ban the IP.
-   *
-   * @var \Drupal\ban\BanIpManagerInterface
-   */
-  protected $banManager;
-
-  /**
-   * The corresponding request.
-   *
-   * @var \Symfony\Component\HttpFoundation\Request
-   */
-  protected $request;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('ban.ip_manager'),
-      $container->get('request')
-    );
-  }
-
-  /**
-   * Constructs the BanIP object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\ban\BanIpManagerInterface $ban_manager
-   *   The ban manager.
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The corresponding request.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, BanIpManagerInterface $ban_manager, Request $request) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->banManager = $ban_manager;
-    $this->request = $request;
-  }
-
-  /**
-   * Executes the action with the given context.
-   *
-   * @param string $ip
-   *   (optional) The IP address that should be banned.
-   */
-  protected function doExecute($ip = NULL) {
-    if (!isset($ip)) {
-      $ip = $this->request->getClientIp();
-    }
-
-    $this->banManager->banIp($ip);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/DataCalculateValue.php b/modules/rules/src/Plugin/RulesAction/DataCalculateValue.php
deleted file mode 100644
index 4e40966..0000000
--- a/modules/rules/src/Plugin/RulesAction/DataCalculateValue.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides a 'numeric calculation' action.
- *
- * @RulesAction(
- *   id = "rules_data_calculate_value",
- *   label = @Translation("Calculates a numeric value"),
- *   category = @Translation("Data"),
- *   context = {
- *     "input_1" = @ContextDefinition("float",
- *       label = @Translation("Input value 1"),
- *       description = @Translation("The first input value for the calculation.")
- *     ),
- *     "operator" = @ContextDefinition("string",
- *       label = @Translation("Operator"),
- *       description = @Translation("The calculation operator.")
- *     ),
- *     "input_2" = @ContextDefinition("float",
- *       label = @Translation("Input value 2"),
- *       description = @Translation("The second input value for the calculation.")
- *     )
- *   },
- *   provides = {
- *     "result" = @ContextDefinition("float",
- *       label = @Translation("Calculated result")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- * @todo: Add defined operation options from Drupal 7.
- * @todo: If context args are integers, ensure that integers are returned.
- */
-class DataCalculateValue extends RulesActionBase {
-
-  /**
-   * Executes the action with the given context.
-   *
-   * @param float $input_1
-   *   The first input value.
-   * @param string $operator
-   *   The operator that should be applied.
-   * @param float $input_2
-   *   The second input value.
-   */
-  protected function doExecute($input_1, $operator, $input_2) {
-    switch ($operator) {
-      case '+':
-        $result = $input_1 + $input_2;
-        break;
-
-      case '-':
-        $result = $input_1 - $input_2;
-        break;
-
-      case '*':
-        $result = $input_1 * $input_2;
-        break;
-
-      case '/':
-        $result = $input_1 / $input_2;
-        break;
-
-      case 'min':
-        $result = min($input_1, $input_2);
-        break;
-
-      case 'max':
-        $result = max($input_1, $input_2);
-        break;
-    }
-
-    if (isset($result)) {
-      $this->setProvidedValue('result', $result);
-    }
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/DataConvert.php b/modules/rules/src/Plugin/RulesAction/DataConvert.php
deleted file mode 100644
index 28cf2dc..0000000
--- a/modules/rules/src/Plugin/RulesAction/DataConvert.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\rules\Exception\InvalidArgumentException;
-
-/**
- * @RulesAction(
- *   id = "rules_data_convert",
- *   label = @Translation("Convert data"),
- *   category = @Translation("Data"),
- *   context = {
- *     "value" = @ContextDefinition("any",
- *       label = @Translation("Value")
- *     ),
- *     "target_type" = @ContextDefinition("string",
- *       label = @Translation("Target type")
- *     ),
- *     "rounding_behavior" = @ContextDefinition("string",
- *       label = @Translation("Rounding behavior"),
- *       default_value = NULL,
- *       required = false
- *     )
- *   },
- *   provides = {
- *     "conversion_result" = @ContextDefinition("any",
- *        label = @Translation("Conversion result")
- *      )
- *   }
- * )
- * @todo Add rounding_behaviour default value "round".
- * @todo Add various input restrictions.
- * @todo Add options_list for target type.
- * @todo Specify the right data type for the provided result.
- * @todo Alter context definition based on the target type.
- */
-class DataConvert extends RulesActionBase {
-
-  /**
-   * Executes the plugin.
-   *
-   * @param mixed $value
-   *   The input value.
-   * @param string $target_type
-   *   The target type the value should be converted into.
-   * @param string $rounding_behavior
-   *   The behaviour for rounding.
-   */
-  protected function doExecute($value, $target_type, $rounding_behavior) {
-    // @todo: Add support for objects implementing __toString().
-    if (!is_scalar($value)) {
-      throw new InvalidArgumentException('Only scalar values are supported.');
-    }
-
-    // Ensure valid contexts have been provided.
-    if (isset($rounding_behavior) && $target_type != 'integer') {
-      throw new InvalidArgumentException('A rounding behavior only makes sense with an integer target type.');
-    }
-
-    // First apply the rounding behavior if given.
-    if (!empty($rounding_behavior)) {
-      switch ($rounding_behavior) {
-        case 'up':
-          $value = ceil($value);
-          break;
-
-        case 'down':
-          $value = floor($value);
-          break;
-
-        case 'round':
-          $value = round($value);
-          break;
-
-        default:
-          throw new InvalidArgumentException("Unknown rounding behavior: $rounding_behavior");
-      }
-    }
-
-    switch ($target_type) {
-      case 'float':
-        $result = floatval($value);
-        break;
-
-      case 'integer':
-        $result = intval($value);
-        break;
-
-      case 'string':
-        $result = strval($value);
-        break;
-
-      default:
-        throw new InvalidArgumentException("Unknown target type: $target_type");
-    }
-
-    $this->setProvidedValue('conversion_result', $result);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/DataListItemAdd.php b/modules/rules/src/Plugin/RulesAction/DataListItemAdd.php
deleted file mode 100644
index 044a504..0000000
--- a/modules/rules/src/Plugin/RulesAction/DataListItemAdd.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides an 'Add list item' action.
- *
- * @RulesAction(
- *   id = "rules_list_item_add",
- *   label = @Translation("Add list item"),
- *   category = @Translation("Data"),
- *   context = {
- *     "list" = @ContextDefinition("list",
- *       label = @Translation("List"),
- *       description = @Translation("The data list, to which an item is to be added.")
- *     ),
- *     "item" = @ContextDefinition("any",
- *       label = @Translation("Item"),
- *       description = @Translation("Item to add.")
- *     ),
- *     "unique" = @ContextDefinition("boolean",
- *       label = @Translation("Enforce uniqueness"),
- *       description = @Translation("Only add the item to the list if it is not yet contained."),
- *       default_value = FALSE,
- *       required = FALSE
- *     ),
- *     "pos" = @ContextDefinition("string",
- *       label = @Translation("Insert position"),
- *       description = @Translation("Position to insert the item."),
- *       default_value = "end",
- *       required = FALSE
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7?
- * @todo: set ContextDefinition restriction
- */
-class DataListItemAdd extends RulesActionBase {
-
-  /**
-   * Add an item to a list.
-   *
-   * @param array $list
-   *   A list to which an item is added.
-   * @param mixed $item
-   *   An item being added to the list.
-   * @param bool $unique
-   *   (optional) Whether or not we can add duplicate items.
-   * @param string $position
-   *   (optional) Determines if item will be added at beginning or end.
-   *   Allowed values:
-   *   - "start": Add to beginning of the list.
-   *   - "end": Add to end of the list.
-   */
-  protected function doExecute(array $list, $item, $unique = FALSE, $position = 'end') {
-    // Optionally, only add the list item if it is not yet contained.
-    if (!((bool) $unique && in_array($item, $list))) {
-      if ($position === 'start') {
-        array_unshift($list, $item);
-      }
-      else {
-        $list[] = $item;
-      }
-    }
-
-    $this->setContextValue('list', $list);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/DataListItemRemove.php b/modules/rules/src/Plugin/RulesAction/DataListItemRemove.php
deleted file mode 100644
index ecba633..0000000
--- a/modules/rules/src/Plugin/RulesAction/DataListItemRemove.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides a 'Remove item from list' action.
- *
- * @RulesAction(
- *   id = "rules_list_item_remove",
- *   label = @Translation("Remove item from list"),
- *   category = @Translation("Data"),
- *   context = {
- *    "list" = @ContextDefinition("list",
- *      label = @Translation("List"),
- *      description = @Translation("The data list for which an item is to be removed.")
- *    ),
- *    "item" = @ContextDefinition("any",
- *      label = @Translation("Item"),
- *      description = @Translation("Item to remove.")
- *    ),
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class DataListItemRemove extends RulesActionBase {
-
-  /**
-   * Removes an item from a list.
-   *
-   * @param array $list
-   *   An array to remove an item from.
-   * @param mixed $item
-   *   An item to remove from the array.
-   */
-  protected function doExecute(array $list, $item) {
-    foreach (array_keys($list, $item) as $key) {
-      unset($list[$key]);
-    }
-
-    $this->setContextValue('list', $list);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/DataSet.php b/modules/rules/src/Plugin/RulesAction/DataSet.php
deleted file mode 100644
index 84ed3a6..0000000
--- a/modules/rules/src/Plugin/RulesAction/DataSet.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides a 'Data set' action.
- *
- * @RulesAction(
- *   id = "rules_data_set",
- *   label = @Translation("Set a data value"),
- *   category = @Translation("Data"),
- *   context = {
- *     "data" = @ContextDefinition("any",
- *       label = @Translation("Data"),
- *       description = @Translation("Specifies the data to be modified using a data selector, e.g. 'node:author:name'."),
- *       allow_null = TRUE,
- *       assignment_restriction = "selector"
- *     ),
- *     "value" = @ContextDefinition("any",
- *       label = @Translation("Value"),
- *       description = @Translation("The new value to set for the specified data."),
- *       default_value = NULL,
- *       required = FALSE
- *     )
- *   }
- * )
- *
- * @todo Add various input restrictions: selector on 'data'.
- * @todo 'allow NULL' for both 'data' and 'value'?
- */
-class DataSet extends RulesActionBase {
-
-  /**
-   * Executes the Plugin.
-   *
-   * @param mixed $data
-   *   Original value of an element which is being updated.
-   * @param mixed $value
-   *   A new value which is being set to an element identified by data selector.
-   */
-  protected function doExecute($data, $value) {
-    $typed_data = $this->getContext('data')->getContextData();
-    $typed_data->setValue($value);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autoSaveContext() {
-    // Saving is done at the root of the typed data tree, for example on the
-    // entity level.
-    $typed_data = $this->getContext('data')->getContextData();
-    $root = $typed_data->getRoot();
-    $value = $root->getValue();
-    // Only save things that are objects and have a save() method.
-    if (is_object($value) && method_exists($value, 'save')) {
-      return ['data'];
-    }
-    return [];
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityCreate.php b/modules/rules/src/Plugin/RulesAction/EntityCreate.php
deleted file mode 100644
index fdc9c9f..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityCreate.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a generic 'Create a new entity' action.
- *
- * @RulesAction(
- *   id = "rules_entity_create",
- *   deriver = "Drupal\rules\Plugin\RulesAction\EntityCreateDeriver",
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class EntityCreate extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The entity storage service.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * The entity type id.
-   *
-   * @var string
-   */
-  protected $entityTypeId;
-
-  /**
-   * The entity bundle key used for the entity type.
-   *
-   * @var string
-   */
-  protected $bundleKey;
-
-  /**
-   * Constructs an EntityCreate object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
-   *   The entity storage service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityStorageInterface $storage) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->storage = $storage;
-    $this->entityTypeId = $plugin_definition['entity_type_id'];
-    $this->bundleKey = $plugin_definition['bundle_key'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity_type.manager')->getStorage($plugin_definition['entity_type_id'])
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function refineContextDefinitions(array $selected_data) {
-    if ($type = $this->entityTypeId) {
-      $data_type = "entity:$type";
-
-      if ($this->bundleKey && $bundle = $this->getContextValue($this->bundleKey)) {
-        $data_type .= ":$bundle";
-      }
-
-      $this->pluginDefinition['provides']['entity']->setDataType($data_type);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function execute() {
-    $values = $this->getContextValues();
-    $entity = $this->storage->create($values);
-    $this->setProvidedValue('entity', $entity);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityCreateDeriver.php b/modules/rules/src/Plugin/RulesAction/EntityCreateDeriver.php
deleted file mode 100644
index 7e3cb12..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityCreateDeriver.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\Core\TypedData\DataReferenceDefinitionInterface;
-use Drupal\rules\Context\ContextDefinition;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Derives entity create plugin definitions based on content entity types.
- *
- * @see \Drupal\rules\Plugin\RulesAction\EntityCreate
- */
-class EntityCreateDeriver extends DeriverBase implements ContainerDeriverInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-  /**
-   * The entity field manager.
-   *
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
-   */
-  protected $entityFieldManager;
-
-  /**
-   * Creates a new EntityCreateDeriver object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
-   *   The entity field manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, TranslationInterface $string_translation) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->entityFieldManager = $entity_field_manager;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static($container->get('entity_type.manager'), $container->get('entity_field.manager'), $container->get('string_translation'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      // Only allow content entities and ignore configuration entities.
-      if (!$entity_type instanceof ContentEntityTypeInterface) {
-        continue;
-      }
-
-      $this->derivatives[$entity_type_id] = [
-        'label' => $this->t('Create a new @entity_type', ['@entity_type' => $entity_type->getLowercaseLabel()]),
-        'category' => $entity_type->getLabel(),
-        'entity_type_id' => $entity_type_id,
-        'context' => [],
-        'provides' => [
-          'entity' => ContextDefinition::create("entity:$entity_type_id")
-            ->setLabel($entity_type->getLabel())
-            ->setRequired(TRUE),
-        ],
-      ] + $base_plugin_definition;
-      // Add a required context for the bundle key, and optional contexts for
-      // other required base fields. This matches the storage create() behavior,
-      // where only the bundle requirement is enforced.
-      $bundle_key = $entity_type->getKey('bundle');
-      $this->derivatives[$entity_type_id]['bundle_key'] = $bundle_key;
-
-      $base_field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
-      foreach ($base_field_definitions as $field_name => $definition) {
-        if ($field_name != $bundle_key && !$definition->isRequired()) {
-          continue;
-        }
-
-        $item_definition = $definition->getItemDefinition();
-        $type_definition = $item_definition->getPropertyDefinition($item_definition->getMainPropertyName());
-
-        // If this is an entity reference then we expect the target type as
-        // context.
-        if ($type_definition instanceof DataReferenceDefinitionInterface) {
-          $type_definition->getTargetDefinition();
-        }
-        $type = $type_definition->getDataType();
-
-        $is_bundle = ($field_name == $bundle_key);
-        $multiple = ($definition->getCardinality() === 1) ? FALSE : TRUE;
-
-        $context_definition = ContextDefinition::create($type)
-          ->setLabel($definition->getLabel())
-          ->setRequired($is_bundle)
-          ->setMultiple($multiple)
-          ->setDescription($definition->getDescription());
-
-        if ($is_bundle) {
-          $context_definition->setAssignmentRestriction(ContextDefinition::ASSIGNMENT_RESTRICTION_INPUT);
-        }
-
-        $this->derivatives[$entity_type_id]['context'][$field_name] = $context_definition;
-      }
-    }
-
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityDelete.php b/modules/rules/src/Plugin/RulesAction/EntityDelete.php
deleted file mode 100644
index b6869b4..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityDelete.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides a 'Delete entity' action.
- *
- * @RulesAction(
- *   id = "rules_entity_delete",
- *   label = @Translation("Delete entity"),
- *   category = @Translation("Entity"),
- *   context = {
- *     "entity" = @ContextDefinition("entity",
- *       label = @Translation("Entity"),
- *       description = @Translation("Specifies the entity, which should be deleted permanently.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class EntityDelete extends RulesActionBase {
-
-  /**
-   * Deletes the Entity.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to be deleted.
-   */
-  protected function doExecute(EntityInterface $entity) {
-    $entity->delete();
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityFetchByField.php b/modules/rules/src/Plugin/RulesAction/EntityFetchByField.php
deleted file mode 100644
index 8c5aa7c..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityFetchByField.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a 'Fetch entities by field' action.
- *
- * @RulesAction(
- *   id = "rules_entity_fetch_by_field",
- *   label = @Translation("Fetch entities by field"),
- *   category = @Translation("Entity"),
- *   context = {
- *     "type" = @ContextDefinition("string",
- *       label = @Translation("Entity type"),
- *       description = @Translation("Specifies the type of the entity that should be fetched."),
- *     ),
- *     "field_name" = @ContextDefinition("string",
- *       label = @Translation("Field name"),
- *       description = @Translation("Name of the field by which the entity is to be selected.."),
- *     ),
- *     "field_value" = @ContextDefinition("any",
- *       label = @Translation("Field value"),
- *       description = @Translation("The field value of the entity to be fetched."),
- *     ),
- *     "limit" = @ContextDefinition("integer",
- *       label = @Translation("Limit"),
- *       description = @Translation("Limit the maximum number of fetched entities."),
- *       default_value = NULL,
- *       required = FALSE,
- *     ),
- *   },
- *   provides = {
- *      "entity_fetched" = @ContextDefinition("entity",
- *        label = @Translation("Fetched entity"),
- *        multiple = TRUE,
- *      )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class EntityFetchByField extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Constructs a EntityFetchByField object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity_type.manager')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function refineContextDefinitions(array $selected_data) {
-    if ($type = $this->getContextValue('type')) {
-      $this->pluginDefinition['provides']['entity_fetched']->setDataType("entity:$type");
-    }
-  }
-
-  /**
-   * Execute the action within the given context.
-   */
-  protected function doExecute($entity_type, $field_name, $field_value, $limit = NULL) {
-    $storage = $this->entityTypeManager->getStorage($entity_type);
-
-    // When retrieving entities, if $limit is not set there is no need to use
-    // the query object directly.
-    if (is_null($limit)) {
-      $entities = $storage->loadByProperties([$field_name => $field_value]);
-    }
-    else {
-      $query = $storage->getQuery();
-      $entity_ids = $query
-        ->condition($field_name, $field_value, '=')
-        ->range(0, $limit)
-        ->execute();
-      $entities = $storage->loadMultiple($entity_ids);
-    }
-
-    // Set provided value.
-    // @todo Ensure that the provided context has the correct entity type.
-    $this->setProvidedValue('entity_fetched', $entities);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityFetchById.php b/modules/rules/src/Plugin/RulesAction/EntityFetchById.php
deleted file mode 100644
index 9ff05ad..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityFetchById.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a 'Fetch entity by id' action.
- *
- * @RulesAction(
- *   id = "rules_entity_fetch_by_id",
- *   label = @Translation("Fetch entity by id"),
- *   category = @Translation("Entity"),
- *   context = {
- *     "type" = @ContextDefinition("string",
- *       label = @Translation("Entity type"),
- *       description = @Translation("Specifies the type of the entity that should be fetched."),
- *       assignment_restriction = "input"
- *     ),
- *     "entity_id" = @ContextDefinition("integer",
- *       label = @Translation("Identifier"),
- *       description = @Translation("The id of the entity that should be fetched.")
- *     )
- *   },
- *   provides = {
- *     "entity_fetched" = @ContextDefinition("entity",
- *       label = @Translation("Fetched entity")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- * @todo: port for rules_entity_action_type_options.
- */
-class EntityFetchById extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The entity type manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Constructs a EntityFetchById object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity_type.manager')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function refineContextDefinitions(array $selected_data) {
-    if ($type = $this->getContextValue('type')) {
-      $this->pluginDefinition['provides']['entity_fetched']->setDataType("entity:$type");
-    }
-  }
-
-  /**
-   * Executes the action with the given context.
-   *
-   * @param string $entity_type
-   *   The entity type id.
-   * @param int $entity_id
-   *   The entity id.
-   */
-  protected function doExecute($entity_type, $entity_id) {
-    $storage = $this->entityTypeManager->getStorage($entity_type);
-    $entity = $storage->load($entity_id);
-
-    $this->setProvidedValue('entity_fetched', $entity);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreate.php b/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreate.php
deleted file mode 100644
index a9db98f..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreate.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Path\AliasStorageInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a generic 'Create entity path alias' action.
- *
- * @RulesAction(
- *   id = "rules_entity_path_alias_create",
- *   deriver = "Drupal\rules\Plugin\RulesAction\EntityPathAliasCreateDeriver",
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class EntityPathAliasCreate extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The alias storage service.
-   *
-   * @var \Drupal\Core\Path\AliasStorageInterface
-   */
-  protected $aliasStorage;
-
-  /**
-   * The entity type id.
-   *
-   * @var string
-   */
-  protected $entityTypeId;
-
-  /**
-   * Constructs an EntityPathAliasCreate object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Path\AliasStorageInterface $alias_storage
-   *   The alias storage service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, AliasStorageInterface $alias_storage) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->aliasStorage = $alias_storage;
-    $this->entityTypeId = $plugin_definition['entity_type_id'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('path.alias_storage')
-    );
-  }
-
-  /**
-   * Creates entity path alias.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity that should get an alias.
-   * @param string $alias
-   *   The alias to be created.
-   */
-  protected function doExecute(EntityInterface $entity, $alias) {
-    // We need to save the entity before we can get its internal path.
-    if ($entity->isNew()) {
-      $entity->save();
-    }
-
-    $path = $entity->urlInfo()->getInternalPath();
-    $langcode = $entity->language()->getId();
-    $this->aliasStorage->save($path, $alias, $langcode);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreateDeriver.php b/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreateDeriver.php
deleted file mode 100644
index 03dd31e..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntityPathAliasCreateDeriver.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Derives entity create plugin definitions based on content entity types.
- *
- * @see \Drupal\rules\Plugin\RulesAction\EntityPathAliasCreate
- */
-class EntityPathAliasCreateDeriver extends DeriverBase implements ContainerDeriverInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Creates a new EntityPathAliasCreateDeriver object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, TranslationInterface $string_translation) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static($container->get('entity_type.manager'), $container->get('string_translation'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      // Only allow content entities and ignore configuration entities.
-      if (!$entity_type instanceof ContentEntityTypeInterface) {
-        continue;
-      }
-
-      $this->derivatives["entity:$entity_type_id"] = [
-        'label' => $this->t('Create @entity_type path alias', ['@entity_type' => $entity_type->getLowercaseLabel()]),
-        'category' => $this->t('Path'),
-        'entity_type_id' => $entity_type_id,
-        'context' => [
-          'entity' => ContextDefinition::create("entity:$entity_type_id")
-            ->setLabel($entity_type->getLabel())
-            ->setRequired(TRUE)
-            ->setDescription($this->t('The @entity_type for which to create a path alias.', ['@entity_type' => $entity_type->getLowercaseLabel()])),
-          'alias' => ContextDefinition::create('string')
-            ->setLabel($this->t('Path alias'))
-            ->setRequired(TRUE)
-            ->setDescription($this->t("Specify an alternative path by which the content can be accessed. For example, 'about' for an about page. Use a relative path and do not add a trailing slash.")),
-        ],
-        'provides' => [],
-      ] + $base_plugin_definition;
-    }
-
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/EntitySave.php b/modules/rules/src/Plugin/RulesAction/EntitySave.php
deleted file mode 100644
index 3479a57..0000000
--- a/modules/rules/src/Plugin/RulesAction/EntitySave.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides a 'Save entity' action.
- *
- * @RulesAction(
- *   id = "rules_entity_save",
- *   label = @Translation("Save entity"),
- *   category = @Translation("Entity"),
- *   context = {
- *     "entity" = @ContextDefinition("entity",
- *       label = @Translation("Entity"),
- *       description = @Translation("Specifies the entity, which should be saved permanently.")
- *     ),
- *     "immediate" = @ContextDefinition("boolean",
- *       label = @Translation("Force saving immediately"),
- *       description = @Translation("Usually saving is postponed till the end of the evaluation, so that multiple saves can be fold into one. If this set, saving is forced to happen immediately."),
- *       default_value = FALSE,
- *       required = FALSE
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class EntitySave extends RulesActionBase {
-
-  /**
-   * Flag that indicates if the entity should be auto-saved later.
-   *
-   * @var bool
-   */
-  protected $saveLater = TRUE;
-
-  /**
-   * Saves the Entity.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to be saved.
-   * @param bool $immediate
-   *   (optional) Save the entity immediately.
-   */
-  protected function doExecute(EntityInterface $entity, $immediate) {
-    // We only need to do something here if the immediate flag is set, otherwise
-    // the entity will be auto-saved after the execution.
-    if ((bool) $immediate) {
-      $entity->save();
-      $this->saveLater = FALSE;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autoSaveContext() {
-    if ($this->saveLater) {
-      return ['entity'];
-    }
-    return [];
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/PathAliasCreate.php b/modules/rules/src/Plugin/RulesAction/PathAliasCreate.php
deleted file mode 100644
index 03d0ac4..0000000
--- a/modules/rules/src/Plugin/RulesAction/PathAliasCreate.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Path\AliasStorageInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a 'Create any path alias' action.
- *
- * @RulesAction(
- *   id = "rules_path_alias_create",
- *   label = @Translation("Create any path alias"),
- *   category = @Translation("Path"),
- *   context = {
- *     "source" = @ContextDefinition("string",
- *       label = @Translation("Existing system path"),
- *       description = @Translation("Specifies the existing path you wish to alias. For example: node/28, forum/1, taxonomy/term/1+2.")
- *     ),
- *     "alias" = @ContextDefinition("string",
- *       label = @Translation("Path alias"),
- *       description = @Translation("Specify an alternative path by which this data can be accessed. For example, 'about' for an about page. Use a relative path and do not add a trailing slash.")
- *     ),
- *     "language" = @ContextDefinition("language",
- *       label = @Translation("Language"),
- *       description = @Translation("If specified, the language for which the path alias applies."),
- *       default_value = NULL,
- *       required = FALSE
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class PathAliasCreate extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The alias storage service.
-   *
-   * @var \Drupal\Core\Path\AliasStorageInterface
-   */
-  protected $aliasStorage;
-
-  /**
-   * Constructs a PathAliasCreate object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Path\AliasStorageInterface $alias_storage
-   *   The alias storage service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, AliasStorageInterface $alias_storage) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->aliasStorage = $alias_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('path.alias_storage')
-    );
-  }
-
-  /**
-   * Creates an alias for an existing path.
-   *
-   * @param string $source
-   *   The existing path that should be aliased.
-   * @param string $alias
-   *   The alias path that should be created.
-   * @param \Drupal\Core\Language\LanguageInterface $language
-   *   (optional) The language.
-   */
-  protected function doExecute($source, $alias, LanguageInterface $language = NULL) {
-    $langcode = isset($language) ? $language->getId() : LanguageInterface::LANGCODE_NOT_SPECIFIED;
-    $this->aliasStorage->save($source, $alias, $langcode);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByAlias.php b/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByAlias.php
deleted file mode 100644
index 54f6715..0000000
--- a/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByAlias.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Path\AliasStorageInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a 'Delete any path alias' action.
- *
- * @RulesAction(
- *   id = "rules_path_alias_delete_by_alias",
- *   label = @Translation("Delete path alias"),
- *   category = @Translation("Path"),
- *   context = {
- *     "alias" = @ContextDefinition("string",
- *       label = @Translation("Existing system path alias"),
- *       description = @Translation("Specifies the existing path alias you wish to delete, for example 'about/team'. Use a relative path and do not add a trailing slash.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class PathAliasDeleteByAlias extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The alias storage service.
-   *
-   * @var \Drupal\Core\Path\AliasStorageInterface
-   */
-  protected $aliasStorage;
-
-  /**
-   * Constructs a PathAliasDeleteByAlias object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Path\AliasStorageInterface $alias_storage
-   *   The alias storage service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, AliasStorageInterface $alias_storage) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->aliasStorage = $alias_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('path.alias_storage')
-    );
-  }
-
-  /**
-   * Delete an existing alias.
-   *
-   * @param string $alias
-   *   Alias to be deleted.
-   */
-  protected function doExecute($alias) {
-    $this->aliasStorage->delete(['alias' => $alias]);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByPath.php b/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByPath.php
deleted file mode 100644
index c2310e1..0000000
--- a/modules/rules/src/Plugin/RulesAction/PathAliasDeleteByPath.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Path\AliasStorageInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a 'Delete alias for a path' action.
- *
- * @RulesAction(
- *   id = "rules_path_alias_delete_by_path",
- *   label = @Translation("Delete all aliases for a path"),
- *   category = @Translation("Path"),
- *   context = {
- *     "path" = @ContextDefinition("string",
- *       label = @Translation("Existing system path"),
- *       description = @Translation("Specifies the existing path you wish to delete the alias of, for example 'node/1'. Use a relative path and do not add a trailing slash.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class PathAliasDeleteByPath extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The alias storage service.
-   *
-   * @var \Drupal\Core\Path\AliasStorageInterface
-   */
-  protected $aliasStorage;
-
-  /**
-   * Constructs a PathAliasDeleteByPath object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Path\AliasStorageInterface $alias_storage
-   *   The alias storage service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, AliasStorageInterface $alias_storage) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->aliasStorage = $alias_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('path.alias_storage')
-    );
-  }
-
-  /**
-   * Delete an existing alias by a given path.
-   *
-   * @param string $path
-   *   Existing system path.
-   */
-  protected function doExecute($path) {
-    $this->aliasStorage->delete(['path' => $path]);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/RulesComponentAction.php b/modules/rules/src/Plugin/RulesAction/RulesComponentAction.php
deleted file mode 100644
index 8b9c9b7..0000000
--- a/modules/rules/src/Plugin/RulesAction/RulesComponentAction.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a generic 'Execute Rules component' action.
- *
- * @RulesAction(
- *   id = "rules_component",
- *   deriver = "Drupal\rules\Plugin\RulesAction\RulesComponentActionDeriver"
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class RulesComponentAction extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The storage of rules components.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * The ID of the rules component config entity.
-   *
-   * @var string
-   */
-  protected $componentId;
-
-  /**
-   * List of context names that should be saved later.
-   *
-   * @var string[]
-   */
-  protected $saveLater = [];
-
-  /**
-   * Constructs an EntityCreate object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
-   *   The entity storage service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityStorageInterface $storage) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->storage = $storage;
-    $this->componentId = $plugin_definition['component_id'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity_type.manager')->getStorage('rules_component')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function execute() {
-    $rules_config = $this->storage->load($this->componentId);
-
-    // Setup an isolated execution state for this expression and pass on the
-    // necessary context.
-    $rules_component = $rules_config->getComponent();
-    foreach ($this->getContexts() as $context_name => $context) {
-      // Pass through the already existing typed data objects to avoid creating
-      // them from scratch.
-      $rules_component->getState()->setVariableData($context_name, $context->getContextData());
-    }
-
-    // We don't use RulesComponent::execute() here since we don't want to
-    // auto-save immediately.
-    $state = $rules_component->getState();
-    $expression = $rules_component->getExpression();
-    $expression->executeWithState($state);
-
-    // Postpone auto-saving to the parent expression triggering this action.
-    foreach ($state->getAutoSaveSelectors() as $selector) {
-      $parts = explode('.', $selector);
-      $context_name = reset($parts);
-      if (array_key_exists($context_name, $this->context)) {
-        $this->saveLater[] = $context_name;
-      }
-      else {
-        // Otherwise we need to save here since it will not happen in the parent
-        // execution.
-        $typed_data = $state->fetchDataByPropertyPath($selector);
-        // Things that can be saved must have a save() method, right?
-        // Saving is always done at the root of the typed data tree, for example
-        // on the entity level.
-        $typed_data->getRoot()->getValue()->save();
-      }
-    }
-
-    foreach ($this->getProvidedContextDefinitions() as $name => $definition) {
-      $this->setProvidedValue($name, $state->getVariable($name));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autoSaveContext() {
-    return $this->saveLater;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/RulesComponentActionDeriver.php b/modules/rules/src/Plugin/RulesAction/RulesComponentActionDeriver.php
deleted file mode 100644
index 88950f2..0000000
--- a/modules/rules/src/Plugin/RulesAction/RulesComponentActionDeriver.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\rules\Engine\ExpressionManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Derives Rules component action plugin definitions from config entities.
- *
- * @see RulesComponentAction
- */
-class RulesComponentActionDeriver extends DeriverBase implements ContainerDeriverInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The config entity storage that holds Rules components.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * The Rules expression manager.
-   *
-   * @var \Drupal\rules\Engine\ExpressionManagerInterface
-   */
-  protected $expressionManager;
-
-  /**
-   * Contructor.
-   */
-  public function __construct(EntityStorageInterface $storage, ExpressionManagerInterface $expression_manager) {
-    $this->storage = $storage;
-    $this->expressionManager = $expression_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static(
-      $container->get('entity_type.manager')->getStorage('rules_component'),
-      $container->get('plugin.manager.rules_expression')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    $rules_components = $this->storage->loadMultiple();
-    foreach ($rules_components as $rules_component) {
-
-      $component_config = $rules_component->get('component');
-      $expression_definition = $this->expressionManager->getDefinition($component_config['expression']['id']);
-
-      $this->derivatives[$rules_component->id()] = [
-        'label' => $this->t('@expression_type: @label', [
-          '@expression_type' => $expression_definition['label'],
-          '@label' => $rules_component->label(),
-        ]),
-        'category' => $this->t('Components'),
-        'component_id' => $rules_component->id(),
-        'context' => $rules_component->getContextDefinitions(),
-        'provides' => $rules_component->getProvidedContextDefinitions(),
-      ] + $base_plugin_definition;
-    }
-
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/SendAccountEmail.php b/modules/rules/src/Plugin/RulesAction/SendAccountEmail.php
deleted file mode 100644
index fa7f8d1..0000000
--- a/modules/rules/src/Plugin/RulesAction/SendAccountEmail.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\user\UserInterface;
-
-/**
- * Provides a 'Send account e-mail' action.
- *
- * @RulesAction(
- *   id = "rules_send_account_email",
- *   label = @Translation("Send account e-mail"),
- *   category = @Translation("User"),
- *   context = {
- *     "user" = @ContextDefinition("entity:user",
- *       label = @Translation("User"),
- *       description = @Translation("The user to whom we send the e-mail.")
- *     ),
- *     "email_type" = @ContextDefinition("string",
- *       label = @Translation("E-mail type"),
- *       description = @Translation("The type of the e-mail to send."),
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class SendAccountEmail extends RulesActionBase {
-
-  /**
-   * Send account email.
-   *
-   * @param \Drupal\user\UserInterface $user
-   *   User who should receive the notification.
-   * @param string $email_type
-   *   Type of email to be sent.
-   */
-  protected function doExecute(UserInterface $user, $email_type) {
-    _user_mail_notify($email_type, $user);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/SystemMessage.php b/modules/rules/src/Plugin/RulesAction/SystemMessage.php
deleted file mode 100644
index 0c13e6a..0000000
--- a/modules/rules/src/Plugin/RulesAction/SystemMessage.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides a 'Show a message on the site' action.
- *
- * @RulesAction(
- *   id = "rules_system_message",
- *   label = @Translation("Show a message on the site"),
- *   category = @Translation("System"),
- *   context = {
- *     "message" = @ContextDefinition("string",
- *       label = @Translation("Message")
- *     ),
- *     "type" = @ContextDefinition("string",
- *       label = @Translation("Message type")
- *     ),
- *     "repeat" = @ContextDefinition("boolean",
- *       label = @Translation("Repeat message"),
- *       description = @Translation("If disabled and the message has been already shown, then the message won't be repeated."),
- *       default_value = NULL,
- *       required = FALSE
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class SystemMessage extends RulesActionBase {
-
-  /**
-   * Set a system message.
-   *
-   * @param string $message
-   *   Message string that should be set.
-   * @param string $type
-   *   Type of the message.
-   * @param bool $repeat
-   *   (optional) TRUE if the message should be repeated.
-   */
-  protected function doExecute($message, $type, $repeat) {
-    // @todo Should we do the sanitization somewhere else? D7 had the sanitize
-    // flag in the context definition.
-    $message = SafeMarkup::checkPlain($message);
-    $repeat = (bool) $repeat;
-    drupal_set_message($message, $type, $repeat);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/SystemPageRedirect.php b/modules/rules/src/Plugin/RulesAction/SystemPageRedirect.php
deleted file mode 100644
index 20adf8b..0000000
--- a/modules/rules/src/Plugin/RulesAction/SystemPageRedirect.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Logger\LoggerChannelFactoryInterface;
-use Drupal\Core\Path\CurrentPathStack;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-/**
- * Provides "Page redirect" rules action.
- *
- * @RulesAction(
- *   id = "rules_page_redirect",
- *   label = @Translation("Page redirect"),
- *   category = @Translation("System"),
- *   context = {
- *     "url" = @ContextDefinition("string",
- *       label = @Translation("URL"),
- *       description = @Translation("A Drupal path, path alias, or external URL to redirect to. Enter (optional) queries after ? and (optional) anchor after #."),
- *     ),
- *   }
- * )
- */
-class SystemPageRedirect extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The logger for the rules channel.
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  protected $logger;
-
-  /**
-   * The current path service.
-   *
-   * @var \Drupal\Core\Path\CurrentPathStack
-   */
-  protected $currentPathStack;
-
-  /**
-   * The current request.
-   *
-   * @var null|\Symfony\Component\HttpFoundation\Request
-   */
-  protected $request;
-
-  /**
-   * Constructs a PageRedirect object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Logger\LoggerChannelFactoryInterface $logger_factory
-   *   The logger factory service.
-   * @param \Drupal\Core\Path\CurrentPathStack $current_path_stack
-   *   The current path stack service.
-   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *   The request stack service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, LoggerChannelFactoryInterface $logger_factory, CurrentPathStack $current_path_stack, RequestStack $request_stack) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->logger = $logger_factory->get('rules');
-    $this->currentPathStack = $current_path_stack;
-    $this->request = $request_stack->getCurrentRequest();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('logger.factory'),
-      $container->get('path.current'),
-      $container->get('request_stack')
-    );
-  }
-
-  /**
-   * Redirect to a provided url at the end of the request.
-   *
-   * @param string $url
-   *   Redirect destination url.
-   */
-  protected function doExecute($url) {
-    $current_path = $this->currentPathStack->getPath();
-    $is_rules_admin_page = strpos($current_path, 'admin/config/workflow/rules') !== FALSE;
-
-    // Make sure we do not redirect away from the rules admin pages.
-    if ($is_rules_admin_page) {
-      $this->logger->warning('Skipped page redirect on a rules admin page.');
-      return;
-    }
-
-    // Make sure we do not redirect during batch processing.
-    $batch = batch_get();
-    if (isset($batch['current_set'])) {
-      $this->logger->warning('Skipped page redirect during batch processing.');
-      return;
-    }
-
-    $this->request->attributes->set('_rules_redirect_action_url', $url);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/SystemSendEmail.php b/modules/rules/src/Plugin/RulesAction/SystemSendEmail.php
deleted file mode 100644
index f0f6d9b..0000000
--- a/modules/rules/src/Plugin/RulesAction/SystemSendEmail.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Mail\MailManagerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides "Send email" rules action.
- *
- * @RulesAction(
- *   id = "rules_send_email",
- *   label = @Translation("Send email"),
- *   category = @Translation("System"),
- *   context = {
- *     "to" = @ContextDefinition("email",
- *       label = @Translation("Send to"),
- *       description = @Translation("Email address(es) drupal will send an email to."),
- *       multiple = TRUE,
- *     ),
- *     "subject" = @ContextDefinition("string",
- *       label = @Translation("Subject"),
- *       description = @Translation("The email's subject."),
- *     ),
- *     "message" = @ContextDefinition("string",
- *       label = @Translation("Message"),
- *       description = @Translation("The email's message body."),
- *     ),
- *     "reply" = @ContextDefinition("email",
- *       label = @Translation("Reply to"),
- *       description = @Translation("The mail's reply-to address. Leave it empty to use the site-wide configured address."),
- *       default_value = NULL,
- *       required = FALSE,
- *     ),
- *     "language" = @ContextDefinition("language",
- *       label = @Translation("Language"),
- *       description = @Translation("If specified, the language used for getting the mail message and subject."),
- *       default_value = NULL,
- *       required = FALSE,
- *     ),
- *   }
- * )
- *
- * @todo: Define that message Context should be textarea comparing with textfield Subject
- * @todo: Add access callback information from Drupal 7.
- */
-class SystemSendEmail extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The logger channel the action will write log messages to.
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  protected $logger;
-
-  /**
-   * @var \Drupal\Core\Mail\MailManagerInterface
-   */
-  protected $mailManager;
-
-  /**
-   * Constructs a SendEmail object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Psr\Log\LoggerInterface $logger
-   *   The alias storage service.
-   * @param \Drupal\Core\Mail\MailManagerInterface $mail_manager
-   *   The mail manager service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, LoggerInterface $logger, MailManagerInterface $mail_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->logger = $logger;
-    $this->mailManager = $mail_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('logger.factory')->get('rules'),
-      $container->get('plugin.manager.mail')
-    );
-  }
-
-  /**
-   * Send a system email.
-   *
-   * @param string[] $to
-   *   Email addresses of the recipients.
-   * @param string $subject
-   *   Subject of the email.
-   * @param string $message
-   *   Email message text.
-   * @param string|null $reply
-   *   (optional) Reply to email address.
-   * @param \Drupal\Core\Language\LanguageInterface|null $language
-   *   (optional) Language code.
-   */
-  protected function doExecute(array $to, $subject, $message, $reply = NULL, LanguageInterface $language = NULL) {
-    $langcode = isset($language) ? $language->getId() : LanguageInterface::LANGCODE_SITE_DEFAULT;
-    $params = [
-      'subject' => $subject,
-      'message' => $message,
-    ];
-    // Set a unique key for this mail.
-    $key = 'rules_action_mail_' . $this->getPluginId();
-
-    $recipients = implode(', ', $to);
-    $message = $this->mailManager->mail('rules', $key, $recipients, $langcode, $params, $reply);
-    if ($message['result']) {
-      $this->logger->notice('Successfully sent email to %recipient', ['%recipient' => $recipients]);
-    }
-
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/UserBlock.php b/modules/rules/src/Plugin/RulesAction/UserBlock.php
deleted file mode 100644
index f215483..0000000
--- a/modules/rules/src/Plugin/RulesAction/UserBlock.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\Core\Session\SessionManagerInterface;
-use Drupal\user\UserInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides "Block User" action.
- *
- * @RulesAction(
- *   id = "rules_user_block",
- *   label = @Translation("Block a user"),
- *   category = @Translation("User"),
- *   context = {
- *     "user" = @ContextDefinition("entity:user",
- *       label = @Translation("User"),
- *       description = @Translation("Specifies the user, that should be blocked.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class UserBlock extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * Session manager.
-   *
-   * @var \Drupal\Core\Session\SessionManagerInterface
-   */
-  protected $sessionManager;
-
-  /**
-   * Constructs a UserBlock object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Session\SessionManagerInterface $session_manager
-   *   The session manager service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, SessionManagerInterface $session_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->sessionManager = $session_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('session_manager')
-    );
-  }
-
-  /**
-   * Flag that indicates if the entity should be auto-saved later.
-   *
-   * @var bool
-   */
-  protected $saveLater = FALSE;
-
-  /**
-   * Block a user.
-   *
-   * @param \Drupal\user\UserInterface $user
-   *   The user object.
-   */
-  protected function doExecute(UserInterface $user) {
-    // Do nothing if user is anonymous or already blocked.
-    if ($user->isAuthenticated() && $user->isActive()) {
-      $user->block();
-      $this->sessionManager->delete($user->id());
-      // Set flag that indicates if the entity should be auto-saved later.
-      $this->saveLater = TRUE;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autoSaveContext() {
-    if ($this->saveLater) {
-      return ['user'];
-    }
-    return [];
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/UserRoleAdd.php b/modules/rules/src/Plugin/RulesAction/UserRoleAdd.php
deleted file mode 100644
index 7cfc0a1..0000000
--- a/modules/rules/src/Plugin/RulesAction/UserRoleAdd.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\rules\Exception\InvalidArgumentException;
-use Drupal\user\UserInterface;
-
-/**
- * Provides a 'Add user role' action.
- *
- * @RulesAction(
- *   id = "rules_user_role_add",
- *   label = @Translation("Add user role"),
- *   category = @Translation("User"),
- *   context = {
- *     "user" = @ContextDefinition("entity:user",
- *       label = @Translation("User")
- *     ),
- *     "roles" = @ContextDefinition("entity:user_role",
- *       label = @Translation("Roles"),
- *       multiple = TRUE
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- * @todo: Add port for rules_user_roles_options_list.
- */
-class UserRoleAdd extends RulesActionBase {
-
-  /**
-   * Flag that indicates if the entity should be auto-saved later.
-   *
-   * @var bool
-   */
-  protected $saveLater = FALSE;
-
-  /**
-   * Assign role to a user.
-   *
-   * @param \Drupal\user\UserInterface $account
-   *   User object.
-   * @param \Drupal\user\RoleInterface[] $roles
-   *   Array of UserRoles to assign.
-   *
-   * @throws \Drupal\rules\Exception\InvalidArgumentException
-   */
-  protected function doExecute(UserInterface $account, array $roles) {
-    foreach ($roles as $role) {
-      // Skip adding the role to the user if they already have it.
-      if (!$account->hasRole($role->id())) {
-        // If you try to add anonymous or authenticated role to user, Drupal
-        // will throw an \InvalidArgumentException. Anonymous or authenticated
-        // role ID must not be assigned manually.
-        try {
-          $account->addRole($role->id());
-        }
-        catch (\InvalidArgumentException $e) {
-          throw new InvalidArgumentException($e->getMessage());
-        }
-        // Set flag that indicates if the entity should be auto-saved later.
-        $this->saveLater = TRUE;
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autoSaveContext() {
-    if ($this->saveLater) {
-      return ['user'];
-    }
-    return [];
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/UserRoleRemove.php b/modules/rules/src/Plugin/RulesAction/UserRoleRemove.php
deleted file mode 100644
index aa03ffe..0000000
--- a/modules/rules/src/Plugin/RulesAction/UserRoleRemove.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\user\UserInterface;
-use Drupal\rules\Exception\InvalidArgumentException;
-
-/**
- * Provides a 'Remove user role' action.
- *
- * @RulesAction(
- *   id = "rules_user_role_remove",
- *   label = @Translation("Remove user role"),
- *   category = @Translation("User"),
- *   context = {
- *     "user" = @ContextDefinition("entity:user",
- *       label = @Translation("User")
- *     ),
- *     "roles" = @ContextDefinition("entity:user_role",
- *       label = @Translation("Roles"),
- *       multiple = TRUE
- *     )
- *   }
- * )
- */
-class UserRoleRemove extends RulesActionBase {
-
-  /**
-   * Flag that indicates if the entity should be auto-saved later.
-   *
-   * @var bool
-   */
-  protected $saveLater = FALSE;
-
-  /**
-   * Remove role from a user.
-   *
-   * @param \Drupal\user\UserInterface $account
-   *   User object the roles should be removed from.
-   * @param \Drupal\user\RoleInterface[] $roles
-   *   Array of user roles.
-   *
-   * @throws \Drupal\rules\Exception\InvalidArgumentException
-   */
-  protected function doExecute(UserInterface $account, array $roles) {
-    foreach ($roles as $role) {
-      // Check if user has role.
-      if ($account->hasRole($role->id())) {
-        // If you try to add anonymous or authenticated role to user, Drupal
-        // will throw an \InvalidArgumentException. Anonymous or authenticated
-        // role ID must not be assigned manually.
-        try {
-          $account->removeRole($role->id());
-        }
-        catch (\InvalidArgumentException $e) {
-          throw new InvalidArgumentException($e->getMessage());
-        }
-        // Set flag that indicates if the entity should be auto-saved later.
-        $this->saveLater = TRUE;
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autoSaveContext() {
-    if ($this->saveLater) {
-      return ['user'];
-    }
-    return [];
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/UserUnblock.php b/modules/rules/src/Plugin/RulesAction/UserUnblock.php
deleted file mode 100644
index a95998f..0000000
--- a/modules/rules/src/Plugin/RulesAction/UserUnblock.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\user\UserInterface;
-
-/**
- * Provides "Unblock User" action.
- *
- * @RulesAction(
- *   id = "rules_user_unblock",
- *   label = @Translation("Unblock a user"),
- *   category = @Translation("User"),
- *   context = {
- *     "user" = @ContextDefinition("entity:user",
- *       label = @Translation("User"),
- *       description = @Translation("Specifies the user, that should be unblocked.")
- *     )
- *   }
- * )
- *
- * @todo: Add access callback information from Drupal 7.
- */
-class UserUnblock extends RulesActionBase {
-  /**
-   * Flag that indicates if the entity should be auto-saved later.
-   *
-   * @var bool
-   */
-  protected $saveLater = FALSE;
-
-  /**
-   * Unblock a user.
-   *
-   * @param \Drupal\user\UserInterface $user
-   *   The user to unblock.
-   */
-  protected function doExecute(UserInterface $user) {
-    // Do nothing if user is anonymous or isn't blocked.
-    if ($user->isAuthenticated() && $user->isBlocked()) {
-      $user->activate();
-      // Set flag that indicates if the entity should be auto-saved later.
-      $this->saveLater = TRUE;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autoSaveContext() {
-    if ($this->saveLater) {
-      return ['user'];
-    }
-    return [];
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesAction/VariableAdd.php b/modules/rules/src/Plugin/RulesAction/VariableAdd.php
deleted file mode 100644
index eae680f..0000000
--- a/modules/rules/src/Plugin/RulesAction/VariableAdd.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides an 'Add a variable' action.
- *
- * @RulesAction(
- *   id = "rules_variable_add",
- *   label = @Translation("Add a variable"),
- *   category = @Translation("Variable"),
- *   context = {
- *     "type" = @ContextDefinition("string",
- *       label = @Translation("Type"),
- *       assignment_restriction = "input"
- *     ),
- *     "value" = @ContextDefinition("any",
- *       label = @Translation("Value")
- *     ),
- *   },
- *   provides = {
- *     "variable_added" = @ContextDefinition("any",
- *        label = @Translation("Added variable")
- *      )
- *    }
- * )
- */
-class VariableAdd extends RulesActionBase {
-
-  /**
-   * Add a variable.
-   *
-   * @param string $type
-   *   The data type the new variable is of.
-   * @param mixed $value
-   *   The variable to add.
-   */
-  protected function doExecute($type, $value) {
-    $this->setProvidedValue('variable_added', $value);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function refineContextDefinitions(array $selected_data) {
-    if ($type = $this->getContextValue('type')) {
-      $this->pluginDefinition['context']['value']->setDataType($type);
-      $this->pluginDefinition['provides']['variable_added']->setDataType($type);
-    }
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesDataProcessor/NumericOffset.php b/modules/rules/src/Plugin/RulesDataProcessor/NumericOffset.php
deleted file mode 100644
index b6c97d2..0000000
--- a/modules/rules/src/Plugin/RulesDataProcessor/NumericOffset.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesDataProcessor;
-
-use Drupal\Core\Plugin\PluginBase;
-use Drupal\rules\Context\DataProcessorInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-
-/**
- * A data processor for applying numerical offsets.
- *
- * The plugin configuration must contain the following entry:
- * - offset: the value that should be added.
- *
- * @RulesDataProcessor(
- *   id = "rules_numeric_offset",
- *   label = @Translation("Apply numeric offset")
- * )
- */
-class NumericOffset extends PluginBase implements DataProcessorInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function process($value, ExecutionStateInterface $rules_state) {
-    return $value + $this->configuration['offset'];
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesDataProcessor/TokenProcessor.php b/modules/rules/src/Plugin/RulesDataProcessor/TokenProcessor.php
deleted file mode 100644
index f0898c0..0000000
--- a/modules/rules/src/Plugin/RulesDataProcessor/TokenProcessor.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesDataProcessor;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Plugin\PluginBase;
-use Drupal\rules\Context\DataProcessorInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\typed_data\PlaceholderResolverInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * A data processor for placeholder token replacements.
- *
- * @RulesDataProcessor(
- *   id = "rules_tokens",
- *   label = @Translation("Placeholder token replacements")
- * )
- */
-class TokenProcessor extends PluginBase implements DataProcessorInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * The placeholder resolver.
-   *
-   * @var \Drupal\typed_data\PlaceholderResolverInterface
-   */
-  protected $placeholderResovler;
-
-  /**
-   * Constructs a TokenProcessor object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\typed_data\PlaceholderResolverInterface $placeholder_resolver
-   *   The placeholder resolver.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, PlaceholderResolverInterface $placeholder_resolver) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->placeholderResovler = $placeholder_resolver;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('typed_data.placeholder_resolver')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function process($value, ExecutionStateInterface $rules_state) {
-    $data = [];
-    $placeholders_by_data = $this->placeholderResovler->scan($value);
-    foreach ($placeholders_by_data as $variable_name => $placeholders) {
-      // Note that accessing an unavailable variable will throw an evaluation
-      // exception. That's exactly what needs to happen. Invalid tokens must
-      // be checked when checking integrity.
-      $data[$variable_name] = $rules_state->getVariable($variable_name);
-    }
-    return $this->placeholderResovler->replacePlaceHolders($value, $data);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesEvent/EntityDeleteDeriver.php b/modules/rules/src/Plugin/RulesEvent/EntityDeleteDeriver.php
deleted file mode 100644
index 490f1f3..0000000
--- a/modules/rules/src/Plugin/RulesEvent/EntityDeleteDeriver.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesEvent;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Derives entity delete plugin definitions based on content entity types.
- */
-class EntityDeleteDeriver extends DeriverBase implements ContainerDeriverInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Creates a new EntityDeleteDeriver object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, TranslationInterface $string_translation) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static($container->get('entity_type.manager'), $container->get('string_translation'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      // Only allow content entities and ignore configuration entities.
-      if (!$entity_type instanceof ContentEntityTypeInterface) {
-        continue;
-      }
-
-      $this->derivatives[$entity_type_id] = [
-        'label' => $this->t('After deleting @entity_type', ['@entity_type' => $entity_type->getLowercaseLabel()]),
-        'category' => $entity_type->getLabel(),
-        'entity_type_id' => $entity_type_id,
-        'context' => [
-          $entity_type_id => [
-            'type' => "entity:$entity_type_id",
-            'label' => $entity_type->getLabel(),
-          ],
-        ],
-      ] + $base_plugin_definition;
-    }
-
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesEvent/EntityInsertDeriver.php b/modules/rules/src/Plugin/RulesEvent/EntityInsertDeriver.php
deleted file mode 100644
index 2aa7893..0000000
--- a/modules/rules/src/Plugin/RulesEvent/EntityInsertDeriver.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesEvent;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Derives entity insert plugin definitions based on content entity types.
- */
-class EntityInsertDeriver extends DeriverBase implements ContainerDeriverInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Creates a new EntityInsertDeriver object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, TranslationInterface $string_translation) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static($container->get('entity_type.manager'), $container->get('string_translation'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      // Only allow content entities and ignore configuration entities.
-      if (!$entity_type instanceof ContentEntityTypeInterface) {
-        continue;
-      }
-
-      $this->derivatives[$entity_type_id] = [
-        'label' => $this->t('After saving new @entity_type', ['@entity_type' => $entity_type->getLowercaseLabel()]),
-        'category' => $entity_type->getLabel(),
-        'entity_type_id' => $entity_type_id,
-        'context' => [
-          $entity_type_id => [
-            'type' => "entity:$entity_type_id",
-            'label' => $entity_type->getLabel(),
-          ],
-        ],
-      ] + $base_plugin_definition;
-    }
-
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesEvent/EntityPresaveDeriver.php b/modules/rules/src/Plugin/RulesEvent/EntityPresaveDeriver.php
deleted file mode 100644
index 1dd3a3d..0000000
--- a/modules/rules/src/Plugin/RulesEvent/EntityPresaveDeriver.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesEvent;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Derives entity presave plugin definitions based on content entity types.
- */
-class EntityPresaveDeriver extends DeriverBase implements ContainerDeriverInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Creates a new EntityPresaveDeriver object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, TranslationInterface $string_translation) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static($container->get('entity_type.manager'), $container->get('string_translation'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      // Only allow content entities and ignore configuration entities.
-      if (!$entity_type instanceof ContentEntityTypeInterface) {
-        continue;
-      }
-
-      $this->derivatives[$entity_type_id] = [
-        'label' => $this->t('Before saving @entity_type', ['@entity_type' => $entity_type->getLowercaseLabel()]),
-        'category' => $entity_type->getLabel(),
-        'entity_type_id' => $entity_type_id,
-        'context' => [
-          $entity_type_id => [
-            'type' => "entity:$entity_type_id",
-            'label' => $entity_type->getLabel(),
-          ],
-          $entity_type_id . '_unchanged' => [
-            'type' => "entity:$entity_type_id",
-            'label' => $this->t('Unchanged @entity_type', ['@entity_type' => $entity_type->getLabel()]),
-          ],
-        ],
-      ] + $base_plugin_definition;
-    }
-
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesEvent/EntityUpdateDeriver.php b/modules/rules/src/Plugin/RulesEvent/EntityUpdateDeriver.php
deleted file mode 100644
index 7bbc574..0000000
--- a/modules/rules/src/Plugin/RulesEvent/EntityUpdateDeriver.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesEvent;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Derives entity update plugin definitions based on content entity types.
- */
-class EntityUpdateDeriver extends DeriverBase implements ContainerDeriverInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Creates a new EntityUpdateDeriver object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, TranslationInterface $string_translation) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static($container->get('entity_type.manager'), $container->get('string_translation'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      // Only allow content entities and ignore configuration entities.
-      if (!$entity_type instanceof ContentEntityTypeInterface) {
-        continue;
-      }
-
-      $this->derivatives[$entity_type_id] = [
-        'label' => $this->t('After updating @entity_type', ['@entity_type' => $entity_type->getLowercaseLabel()]),
-        'category' => $entity_type->getLabel(),
-        'entity_type_id' => $entity_type_id,
-        'context' => [
-          $entity_type_id => [
-            'type' => "entity:$entity_type_id",
-            'label' => $entity_type->getLabel(),
-          ],
-          $entity_type_id . '_unchanged' => [
-            'type' => "entity:$entity_type_id",
-            'label' => $this->t('Unchanged @entity_type', ['@entity_type' => $entity_type->getLabel()]),
-          ],
-        ],
-      ] + $base_plugin_definition;
-    }
-
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesEvent/EntityViewDeriver.php b/modules/rules/src/Plugin/RulesEvent/EntityViewDeriver.php
deleted file mode 100644
index 0a63d32..0000000
--- a/modules/rules/src/Plugin/RulesEvent/EntityViewDeriver.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesEvent;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Derives entity view plugin definitions based on content entity types.
- */
-class EntityViewDeriver extends DeriverBase implements ContainerDeriverInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Creates a new EntityViewDeriver object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, TranslationInterface $string_translation) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static($container->get('entity_type.manager'), $container->get('string_translation'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      // Only allow content entities and ignore configuration entities.
-      if (!$entity_type instanceof ContentEntityTypeInterface) {
-        continue;
-      }
-
-      $this->derivatives[$entity_type_id] = [
-        'label' => $this->t('@entity_type is viewed', ['@entity_type' => $entity_type->getLabel()]),
-        'category' => $entity_type->getLabel(),
-        'entity_type_id' => $entity_type_id,
-        'context' => [
-          $entity_type_id => [
-            'type' => "entity:$entity_type_id",
-            'label' => $entity_type->getLabel(),
-          ],
-        ],
-      ] + $base_plugin_definition;
-    }
-
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/ActionSet.php b/modules/rules/src/Plugin/RulesExpression/ActionSet.php
deleted file mode 100644
index 3284fa9..0000000
--- a/modules/rules/src/Plugin/RulesExpression/ActionSet.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesExpression;
-
-use Drupal\rules\Engine\ActionExpressionContainer;
-use Drupal\rules\Engine\ExecutionStateInterface;
-
-/**
- * Holds a set of actions and executes all of them.
- *
- * @RulesExpression(
- *   id = "rules_action_set",
- *   label = @Translation("Action set"),
- *   form_class = "\Drupal\rules\Form\Expression\ActionContainerForm"
- * )
- */
-class ActionSet extends ActionExpressionContainer {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function allowsMetadataAssertions() {
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function executeWithState(ExecutionStateInterface $state) {
-    foreach ($this->actions as $action) {
-      $action->executeWithState($state);
-    }
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/Rule.php b/modules/rules/src/Plugin/RulesExpression/Rule.php
deleted file mode 100644
index bf8ed4e..0000000
--- a/modules/rules/src/Plugin/RulesExpression/Rule.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesExpression;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Engine\ActionExpressionContainerInterface;
-use Drupal\rules\Engine\ActionExpressionInterface;
-use Drupal\rules\Engine\ConditionExpressionContainerInterface;
-use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\rules\Engine\ExpressionBase;
-use Drupal\rules\Engine\ExpressionInterface;
-use Drupal\rules\Engine\ExpressionManagerInterface;
-use Drupal\rules\Exception\InvalidExpressionException;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a rule, executing actions when conditions are met.
- *
- * Actions added to a rule can also be rules themselves, so it is possible to
- * nest several rules into one rule. This is the functionality of so called
- * "rule sets" in Drupal 7.
- *
- * @RulesExpression(
- *   id = "rules_rule",
- *   label = @Translation("Rule"),
- *   form_class = "\Drupal\rules\Form\Expression\RuleForm"
- * )
- */
-class Rule extends ExpressionBase implements RuleInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * List of conditions that must be met before actions are executed.
-   *
-   * @var \Drupal\rules\Engine\ConditionExpressionContainerInterface
-   */
-  protected $conditions;
-
-  /**
-   * List of actions that get executed if the conditions are met.
-   *
-   * @var \Drupal\rules\Engine\ActionExpressionContainerInterface
-   */
-  protected $actions;
-
-  /**
-   * Constructs a new class instance.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param array $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\rules\Engine\ExpressionManagerInterface $expression_manager
-   *   The rules expression plugin manager.
-   */
-  public function __construct(array $configuration, $plugin_id, array $plugin_definition, ExpressionManagerInterface $expression_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $configuration += ['conditions' => [], 'actions' => []];
-    // Per default the outer condition container of a rule is initialized as
-    // conjunction (AND), meaning that all conditions in it must evaluate to
-    // TRUE to fire the actions.
-    $this->conditions = $expression_manager->createInstance('rules_and', $configuration['conditions']);
-    $this->conditions->setRoot($this->getRoot());
-    $this->actions = $expression_manager->createInstance('rules_action_set', $configuration['actions']);
-    $this->actions->setRoot($this->getRoot());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('plugin.manager.rules_expression')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function executeWithState(ExecutionStateInterface $state) {
-    // Evaluate the rule's conditions.
-    if (!$this->conditions->isEmpty() && !$this->conditions->executeWithState($state)) {
-      // Do not run the actions if the conditions are not met.
-      return;
-    }
-    $this->actions->executeWithState($state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addCondition($condition_id, ContextConfig $config = NULL) {
-    return $this->conditions->addCondition($condition_id, $config);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConditions() {
-    return $this->conditions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConditions(ConditionExpressionContainerInterface $conditions) {
-    $this->conditions = $conditions;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addAction($action_id, ContextConfig $config = NULL) {
-    return $this->actions->addAction($action_id, $config);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getActions() {
-    return $this->actions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setActions(ActionExpressionContainerInterface $actions) {
-    $this->actions = $actions;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addExpressionObject(ExpressionInterface $expression) {
-    if ($expression instanceof ConditionExpressionInterface) {
-      $this->conditions->addExpressionObject($expression);
-    }
-    elseif ($expression instanceof ActionExpressionInterface) {
-      $this->actions->addExpressionObject($expression);
-    }
-    else {
-      throw new InvalidExpressionException();
-    }
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addExpression($plugin_id, ContextConfig $config = NULL) {
-    return $this->addExpressionObject(
-      $this->expressionManager->createInstance($plugin_id, $config ? $config->toArray() : [])
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfiguration() {
-    $configuration = parent::getConfiguration();
-    // We need to update the configuration in case actions/conditions have been
-    // added or changed.
-    $configuration['conditions'] = $this->conditions->getConfiguration();
-    $configuration['actions'] = $this->actions->getConfiguration();
-    return $configuration;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIterator() {
-    // Just pass up the actions for iterating over.
-    return $this->actions->getIterator();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getExpression($uuid) {
-    $condition = $this->conditions->getExpression($uuid);
-    if ($condition) {
-      return $condition;
-    }
-    return $this->actions->getExpression($uuid);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteExpression($uuid) {
-    $deleted = $this->conditions->deleteExpression($uuid);
-    if (!$deleted) {
-      $deleted = $this->actions->deleteExpression($uuid);
-    }
-    return $deleted;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function checkIntegrity(ExecutionMetadataStateInterface $metadata_state, $apply_assertions = TRUE) {
-    $violation_list = $this->conditions->checkIntegrity($metadata_state, $apply_assertions);
-    $violation_list->addAll($this->actions->checkIntegrity($metadata_state, $apply_assertions));
-    return $violation_list;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function prepareExecutionMetadataState(ExecutionMetadataStateInterface $metadata_state, ExpressionInterface $until = NULL, $apply_assertions = TRUE) {
-    // @todo: If the rule is nested, we may not pass assertions to following
-    // expressions as we do not know whether the rule fires at all. Should we
-    // clone the metadata state to ensure modifications stay local?
-    $found = $this->conditions->prepareExecutionMetadataState($metadata_state, $until, $apply_assertions);
-    if ($found) {
-      return TRUE;
-    }
-    return $this->actions->prepareExecutionMetadataState($metadata_state, $until, $apply_assertions);
-  }
-
-  /**
-   * PHP magic __clone function.
-   */
-  public function __clone() {
-    $this->actions = clone $this->actions;
-    $this->actions->setRoot($this->getRoot());
-    $this->conditions = clone $this->conditions;
-    $this->conditions->setRoot($this->getRoot());
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/RuleInterface.php b/modules/rules/src/Plugin/RulesExpression/RuleInterface.php
deleted file mode 100644
index 6c0e045..0000000
--- a/modules/rules/src/Plugin/RulesExpression/RuleInterface.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesExpression;
-
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Engine\ActionExpressionContainerInterface;
-use Drupal\rules\Engine\ConditionExpressionContainerInterface;
-use Drupal\rules\Engine\ActionExpressionInterface;
-use Drupal\rules\Engine\ExpressionContainerInterface;
-
-/**
- * Defines a rule.
- */
-interface RuleInterface extends ExpressionContainerInterface, ActionExpressionInterface {
-
-  /**
-   * Creates a condition expression and adds it to the container.
-   *
-   * @param string $condition_id
-   *   The condition plugin id.
-   * @param \Drupal\rules\Context\ContextConfig $config
-   *   (optional) The configuration for the specified plugin.
-   *
-   * @return \Drupal\rules\Core\RulesConditionInterface
-   *   The created condition.
-   */
-  public function addCondition($condition_id, ContextConfig $config = NULL);
-
-  /**
-   * Returns the conditions container of this rule.
-   *
-   * @return \Drupal\rules\Engine\ConditionExpressionContainerInterface
-   *   The condition container of this rule.
-   */
-  public function getConditions();
-
-  /**
-   * Sets the condition container.
-   *
-   * @param \Drupal\rules\Engine\ConditionExpressionContainerInterface $conditions
-   *   The condition container to set.
-   *
-   * @return $this
-   */
-  public function setConditions(ConditionExpressionContainerInterface $conditions);
-
-  /**
-   * Creates an action expression and adds it to the container.
-   *
-   * @param string $action_id
-   *   The action plugin id.
-   * @param \Drupal\rules\Context\ContextConfig $config
-   *   (optional) The configuration for the specified plugin.
-   *
-   * @return $this
-   */
-  public function addAction($action_id, ContextConfig $config = NULL);
-
-  /**
-   * Returns the actions of this rule.
-   *
-   * @return \Drupal\rules\Engine\ActionExpressionContainerInterface
-   *   The action container of this rule.
-   */
-  public function getActions();
-
-  /**
-   * Sets the action container.
-   *
-   * @param \Drupal\rules\Engine\ActionExpressionContainerInterface $actions
-   *   The action container to set.
-   *
-   * @return $this
-   */
-  public function setActions(ActionExpressionContainerInterface $actions);
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/RulesAction.php b/modules/rules/src/Plugin/RulesExpression/RulesAction.php
deleted file mode 100644
index 60be429..0000000
--- a/modules/rules/src/Plugin/RulesExpression/RulesAction.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesExpression;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Context\DataProcessorManager;
-use Drupal\rules\Core\RulesActionManagerInterface;
-use Drupal\rules\Engine\ActionExpressionInterface;
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\rules\Engine\ExpressionBase;
-use Drupal\rules\Engine\ExpressionInterface;
-use Drupal\rules\Context\ContextHandlerIntegrityTrait;
-use Drupal\rules\Engine\IntegrityViolationList;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides an executable action expression.
- *
- * This plugin is used to wrap action plugins and is responsible to setup all
- * the context necessary, instantiate the action plugin and to execute it.
- *
- * @RulesExpression(
- *   id = "rules_action",
- *   label = @Translation("Action"),
- *   form_class = "\Drupal\rules\Form\Expression\ActionForm"
- * )
- */
-class RulesAction extends ExpressionBase implements ContainerFactoryPluginInterface, ActionExpressionInterface {
-
-  use ContextHandlerIntegrityTrait;
-
-  /**
-   * The action manager used to instantiate the action plugin.
-   *
-   * @var \Drupal\rules\Core\RulesActionManagerInterface
-   */
-  protected $actionManager;
-
-  /**
-   * Constructs a new class instance.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   *   Contains the following entries:
-   *   - action_id: The action plugin ID.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\rules\Core\RulesActionManagerInterface $action_manager
-   *   The Rules action manager.
-   * @param \Drupal\rules\Context\DataProcessorManager $processor_manager
-   *   The data processor plugin manager.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, RulesActionManagerInterface $action_manager, DataProcessorManager $processor_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->actionManager = $action_manager;
-    $this->processorManager = $processor_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static($configuration, $plugin_id, $plugin_definition,
-      $container->get('plugin.manager.rules_action'),
-      $container->get('plugin.manager.rules_data_processor')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConfiguration(array $configuration) {
-    // If the plugin id has been set already, keep it if not specified.
-    if (isset($this->configuration['action_id'])) {
-      $configuration += [
-        'action_id' => $this->configuration['action_id'],
-      ];
-    }
-    return parent::setConfiguration($configuration);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function executeWithState(ExecutionStateInterface $state) {
-    $action = $this->actionManager->createInstance($this->configuration['action_id']);
-
-    $this->prepareContext($action, $state);
-    $action->execute();
-
-    $auto_saves = $action->autoSaveContext();
-    foreach ($auto_saves as $context_name) {
-      // Mark parameter contexts for auto saving in the Rules state.
-      $state->saveChangesLater($this->configuration['context_mapping'][$context_name]);
-    }
-
-    // Now that the action has been executed it can provide additional
-    // context which we will have to pass back in the evaluation state.
-    $this->addProvidedContext($action, $state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLabel() {
-    if (!empty($this->configuration['action_id'])) {
-      $definition = $this->actionManager->getDefinition($this->configuration['action_id']);
-      return $this->t('Action: @label', ['@label' => $definition['label']]);
-    }
-    return parent::getLabel();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormHandler() {
-    if (isset($this->pluginDefinition['form_class'])) {
-      $class_name = $this->pluginDefinition['form_class'];
-      return new $class_name($this, $this->actionManager);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function checkIntegrity(ExecutionMetadataStateInterface $metadata_state, $apply_assertions = TRUE) {
-    $violation_list = new IntegrityViolationList();
-    if (empty($this->configuration['action_id'])) {
-      $violation_list->addViolationWithMessage($this->t('Action plugin ID is missing'), $this->getUuid());
-      return $violation_list;
-    }
-    if (!$this->actionManager->hasDefinition($this->configuration['action_id'])) {
-      $violation_list->addViolationWithMessage($this->t('Action plugin %plugin_id does not exist', [
-        '%plugin_id' => $this->configuration['action_id'],
-      ]), $this->getUuid());
-      return $violation_list;
-    }
-
-    $action = $this->actionManager->createInstance($this->configuration['action_id']);
-
-    // Prepare and refine the context before checking integrity, such that any
-    // context definition changes are respected while checking.
-    $this->prepareContextWithMetadata($action, $metadata_state);
-    $result = $this->checkContextConfigIntegrity($action, $metadata_state);
-    $this->prepareExecutionMetadataState($metadata_state, NULL, $apply_assertions);
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function prepareExecutionMetadataState(ExecutionMetadataStateInterface $metadata_state, ExpressionInterface $until = NULL, $apply_assertions = TRUE) {
-    if ($until && $this->getUuid() === $until->getUuid()) {
-      return TRUE;
-    }
-    $action = $this->actionManager->createInstance($this->configuration['action_id']);
-    // Make sure to refine context first, such that possibly refined definitions
-    // of provided context are respected.
-    $this->prepareContextWithMetadata($action, $metadata_state);
-    $this->addProvidedContextDefinitions($action, $metadata_state);
-    if ($apply_assertions) {
-      $this->assertMetadata($action, $metadata_state);
-    }
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/RulesAnd.php b/modules/rules/src/Plugin/RulesExpression/RulesAnd.php
deleted file mode 100644
index f1e5b61..0000000
--- a/modules/rules/src/Plugin/RulesExpression/RulesAnd.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesExpression;
-
-use Drupal\rules\Engine\ConditionExpressionContainer;
-use Drupal\rules\Engine\ExecutionStateInterface;
-
-/**
- * Evaluates a group of conditions with a logical AND.
- *
- * @RulesExpression(
- *   id = "rules_and",
- *   label = @Translation("Condition set (AND)"),
- *   form_class = "\Drupal\rules\Form\Expression\ConditionContainerForm"
- * )
- */
-class RulesAnd extends ConditionExpressionContainer {
-
-  /**
-   * Returns whether there is a configured condition.
-   *
-   * @todo: Remove this once we added the API to access configured conditions.
-   *
-   * @return bool
-   *   TRUE if there are no conditions, FALSE otherwise.
-   */
-  public function isEmpty() {
-    return empty($this->conditions);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function evaluate(ExecutionStateInterface $state) {
-    foreach ($this->conditions as $condition) {
-      if (!$condition->executeWithState($state)) {
-        return FALSE;
-      }
-    }
-    // An empty AND should return FALSE, otherwise all conditions evaluated to
-    // TRUE and we return TRUE.
-    return !empty($this->conditions);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function allowsMetadataAssertions() {
-    // If the AND is not negated, all child-expressions must be executed - thus
-    // assertions can be added it.
-    return !$this->isNegated();
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/RulesCondition.php b/modules/rules/src/Plugin/RulesExpression/RulesCondition.php
deleted file mode 100644
index 050707b..0000000
--- a/modules/rules/src/Plugin/RulesExpression/RulesCondition.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesExpression;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Context\DataProcessorManager;
-use Drupal\rules\Core\ConditionManager;
-use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\rules\Engine\ExpressionBase;
-use Drupal\rules\Engine\ExpressionInterface;
-use Drupal\rules\Context\ContextHandlerIntegrityTrait;
-use Drupal\rules\Engine\IntegrityViolationList;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Defines an executable condition expression.
- *
- * This plugin is used to wrap condition plugins and is responsible to setup all
- * the context necessary, instantiate the condition plugin and to execute it.
- *
- * @RulesExpression(
- *   id = "rules_condition",
- *   label = @Translation("Condition"),
- *   form_class = "\Drupal\rules\Form\Expression\ConditionForm"
- * )
- */
-class RulesCondition extends ExpressionBase implements ConditionExpressionInterface, ContainerFactoryPluginInterface {
-
-  use ContextHandlerIntegrityTrait;
-
-  /**
-   * The condition manager used to instantiate the condition plugin.
-   *
-   * @var \Drupal\rules\Core\ConditionManager
-   */
-  protected $conditionManager;
-
-  /**
-   * Constructs a new class instance.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   *   Contains the following entries:
-   *   - condition_id: The condition plugin ID.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\rules\Core\ConditionManager $condition_manager
-   *   The condition manager.
-   * @param \Drupal\rules\Context\DataProcessorManager $processor_manager
-   *   The data processor plugin manager.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConditionManager $condition_manager, DataProcessorManager $processor_manager) {
-    // Make sure defaults are applied.
-    $configuration += $this->defaultConfiguration();
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->conditionManager = $condition_manager;
-    $this->processorManager = $processor_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('plugin.manager.condition'),
-      $container->get('plugin.manager.rules_data_processor')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return [
-      // Per default the result of this expression is not negated.
-      'negate' => FALSE,
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConfiguration(array $configuration) {
-    // If the plugin id has been set already, keep it if not specified.
-    if (isset($this->configuration['condition_id'])) {
-      $configuration += [
-        'condition_id' => $this->configuration['condition_id'],
-      ];
-    }
-    return parent::setConfiguration($configuration);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function executeWithState(ExecutionStateInterface $state) {
-    $condition = $this->conditionManager->createInstance($this->configuration['condition_id'], [
-      'negate' => $this->configuration['negate'],
-    ]);
-
-    $this->prepareContext($condition, $state);
-    $result = $condition->evaluate();
-
-    // Now that the condition has been executed it can provide additional
-    // context which we will have to pass back in the evaluation state.
-    $this->addProvidedContext($condition, $state);
-
-    if ($this->isNegated()) {
-      $result = !$result;
-    }
-
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function negate($negate = TRUE) {
-    $this->configuration['negate'] = $negate;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isNegated() {
-    return !empty($this->configuration['negate']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLabel() {
-    if (!empty($this->configuration['condition_id'])) {
-      $definition = $this->conditionManager->getDefinition($this->configuration['condition_id']);
-      return $this->t('Condition: @label', ['@label' => $definition['label']]);
-    }
-    return parent::getLabel();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormHandler() {
-    if (isset($this->pluginDefinition['form_class'])) {
-      $class_name = $this->pluginDefinition['form_class'];
-      return new $class_name($this, $this->conditionManager);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function checkIntegrity(ExecutionMetadataStateInterface $metadata_state, $apply_assertions = TRUE) {
-    $violation_list = new IntegrityViolationList();
-    if (empty($this->configuration['condition_id'])) {
-      $violation_list->addViolationWithMessage($this->t('Condition plugin ID is missing'), $this->getUuid());
-      return $violation_list;
-    }
-    if (!$this->conditionManager->hasDefinition($this->configuration['condition_id'])) {
-      $violation_list->addViolationWithMessage($this->t('Condition plugin %plugin_id does not exist', [
-        '%plugin_id' => $this->configuration['condition_id'],
-      ]), $this->getUuid());
-      return $violation_list;
-    }
-
-    $condition = $this->conditionManager->createInstance($this->configuration['condition_id'], [
-      'negate' => $this->configuration['negate'],
-    ]);
-    // Prepare and refine the context before checking integrity, such that any
-    // context definition changes are respected while checking.
-    $this->prepareContextWithMetadata($condition, $metadata_state);
-    $result = $this->checkContextConfigIntegrity($condition, $metadata_state);
-    $this->prepareExecutionMetadataState($metadata_state, NULL, $apply_assertions);
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function prepareExecutionMetadataState(ExecutionMetadataStateInterface $metadata_state, ExpressionInterface $until = NULL, $apply_assertions = TRUE) {
-    if ($until && $this->getUuid() === $until->getUuid()) {
-      return TRUE;
-    }
-    $condition = $this->conditionManager->createInstance($this->configuration['condition_id'], [
-      'negate' => $this->configuration['negate'],
-    ]);
-    // Make sure to refine context first, such that possibly refined definitions
-    // of provided context are respected.
-    $this->prepareContextWithMetadata($condition, $metadata_state);
-    $this->addProvidedContextDefinitions($condition, $metadata_state);
-    if ($apply_assertions && !$this->isNegated()) {
-      $this->assertMetadata($condition, $metadata_state);
-    }
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/RulesLoop.php b/modules/rules/src/Plugin/RulesExpression/RulesLoop.php
deleted file mode 100644
index 892eb86..0000000
--- a/modules/rules/src/Plugin/RulesExpression/RulesLoop.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesExpression;
-
-use Drupal\Core\TypedData\ListDataDefinitionInterface;
-use Drupal\rules\Engine\ActionExpressionContainer;
-use Drupal\rules\Engine\ExecutionMetadataStateInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\rules\Engine\IntegrityViolationList;
-use Drupal\rules\Exception\IntegrityException;
-
-/**
- * Holds a set of actions that are executed over the iteration of a list.
- *
- * @RulesExpression(
- *   id = "rules_loop",
- *   label = @Translation("Loop")
- * )
- */
-class RulesLoop extends ActionExpressionContainer {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return [
-      // Default to 'list_item' as variable name for the list item.
-      'list_item' => 'list_item',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function executeWithState(ExecutionStateInterface $state) {
-    $list_data = $state->fetchDataByPropertyPath($this->configuration['list']);
-    $list_item_name = $this->configuration['list_item'];
-
-    foreach ($list_data as $item) {
-      $state->setVariableData($list_item_name, $item);
-      foreach ($this->actions as $action) {
-        $action->executeWithState($state);
-      }
-    }
-    // After the loop the list item is out of scope and cannot be used by any
-    // following actions.
-    $state->removeVariable($list_item_name);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function checkIntegrity(ExecutionMetadataStateInterface $metadata_state, $apply_assertions = TRUE) {
-    $violation_list = new IntegrityViolationList();
-
-    if (empty($this->configuration['list'])) {
-      $violation_list->addViolationWithMessage($this->t('List variable is missing.'));
-      return $violation_list;
-    }
-
-    try {
-      $list_definition = $metadata_state->fetchDefinitionByPropertyPath($this->configuration['list']);
-    }
-    catch (IntegrityException $e) {
-      $violation_list->addViolationWithMessage($this->t('List variable %list does not exist. @message', [
-        '%list' => $this->configuration['list'],
-        '@message' => $e->getMessage(),
-      ]));
-      return $violation_list;
-    }
-
-    $list_item_name = isset($this->configuration['list_item']) ? $this->configuration['list_item'] : 'list_item';
-    if ($metadata_state->hasDataDefinition($list_item_name)) {
-      $violation_list->addViolationWithMessage($this->t('List item name %name conflicts with an existing variable.', [
-        '%name' => $list_item_name,
-      ]));
-      return $violation_list;
-    }
-
-    if (!$list_definition instanceof ListDataDefinitionInterface) {
-      $violation_list->addViolationWithMessage($this->t('The data type of list variable %list is not a list.', [
-        '%list' => $this->configuration['list'],
-      ]));
-      return $violation_list;
-    }
-
-    // So far all ok, so continue with checking integrity in contained actions.
-    // The parent implementation will take care of invoking pre/post traversal
-    // metadata state preparations.
-    $violation_list = parent::checkIntegrity($metadata_state, $apply_assertions);
-    return $violation_list;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function allowsMetadataAssertions() {
-    // As the list can be empty, we cannot ensure child expressions are
-    // executed at all - thus no assertions can be added.
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function prepareExecutionMetadataStateBeforeTraversal(ExecutionMetadataStateInterface $metadata_state) {
-    try {
-      $list_definition = $metadata_state->fetchDefinitionByPropertyPath($this->configuration['list']);
-      $list_item_definition = $list_definition->getItemDefinition();
-      $metadata_state->setDataDefinition($this->configuration['list_item'], $list_item_definition);
-    }
-    catch (IntegrityException $e) {
-      // Silently eat the exception: we just continue without adding the list
-      // item definition to the state.
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function prepareExecutionMetadataStateAfterTraversal(ExecutionMetadataStateInterface $metadata_state) {
-    // Remove the list item variable after the loop, it is out of scope now.
-    $metadata_state->removeDataDefinition($this->configuration['list_item']);
-  }
-
-}
diff --git a/modules/rules/src/Plugin/RulesExpression/RulesOr.php b/modules/rules/src/Plugin/RulesExpression/RulesOr.php
deleted file mode 100644
index a599161..0000000
--- a/modules/rules/src/Plugin/RulesExpression/RulesOr.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\rules\Plugin\RulesExpression;
-
-use Drupal\rules\Engine\ConditionExpressionContainer;
-use Drupal\rules\Engine\ExecutionStateInterface;
-
-/**
- * Evaluates a group of conditions with a logical OR.
- *
- * @RulesExpression(
- *   id = "rules_or",
- *   label = @Translation("Condition set (OR)")
- * )
- */
-class RulesOr extends ConditionExpressionContainer {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function evaluate(ExecutionStateInterface $state) {
-    foreach ($this->conditions as $condition) {
-      if ($condition->executeWithState($state)) {
-        return TRUE;
-      }
-    }
-    // An empty OR should return TRUE, otherwise all conditions evaluated to
-    // FALSE and we return FALSE.
-    return empty($this->conditions);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function allowsMetadataAssertions() {
-    // We cannot garantuee child expressions are executed, thus we cannot allow
-    // metadata assertions.
-    return FALSE;
-  }
-
-}
diff --git a/modules/rules/src/Routing/RulesUiRouteEnhancer.php b/modules/rules/src/Routing/RulesUiRouteEnhancer.php
deleted file mode 100644
index b075455..0000000
--- a/modules/rules/src/Routing/RulesUiRouteEnhancer.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Drupal\rules\Routing;
-
-use Drupal\Core\Routing\Enhancer\RouteEnhancerInterface;
-use Drupal\rules\Ui\RulesUiManagerInterface;
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Route;
-
-/**
- * Enhances routes with the specified RulesUI.
- *
- * Routes have the plugin ID of the active RulesUI instance set on the _rules_ui
- * option. Based upon that information, this enhances adds the following
- * parameters to the routes:
- * - rules_ui_handler: The RulesUI handler, as specified by the plugin.
- * - rules_component: The rules component being edited, as provided by the
- *   handler.
- */
-class RulesUiRouteEnhancer implements RouteEnhancerInterface {
-
-  /**
-   * The rules_ui plugin manager.
-   *
-   * @var \Drupal\rules\Ui\RulesUiManagerInterface
-   */
-  protected $rulesUiManager;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\rules\Ui\RulesUiManagerInterface $rules_ui_manager
-   *   The rules_ui plugin manager.
-   */
-  public function __construct(RulesUiManagerInterface $rules_ui_manager) {
-    $this->rulesUiManager = $rules_ui_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function enhance(array $defaults, Request $request) {
-    // @var $route \Symfony\Component\Routing\Route
-    $route = $defaults[RouteObjectInterface::ROUTE_OBJECT];
-    $plugin_id = $route->getOption('_rules_ui');
-    $defaults['rules_ui_handler'] = $this->rulesUiManager->createInstance($plugin_id);
-    return $defaults;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies(Route $route) {
-    return ($route->hasOption('_rules_ui'));
-  }
-
-}
diff --git a/modules/rules/src/Routing/RulesUiRouteSubscriber.php b/modules/rules/src/Routing/RulesUiRouteSubscriber.php
deleted file mode 100644
index 9cdf0e8..0000000
--- a/modules/rules/src/Routing/RulesUiRouteSubscriber.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-namespace Drupal\rules\Routing;
-
-use Drupal\Core\Routing\RouteSubscriberBase;
-use Drupal\Core\Routing\RoutingEvents;
-use Drupal\rules\Ui\RulesUiDefinition;
-use Drupal\rules\Ui\RulesUiManagerInterface;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * Adds routes generated by the rules UI handlers.
- */
-class RulesUiRouteSubscriber extends RouteSubscriberBase {
-
-  /**
-   * The rules UI manager.
-   *
-   * @var \Drupal\rules\Ui\RulesUiManagerInterface
-   */
-  protected $rulesUiManager;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\rules\Ui\RulesUiManagerInterface $rules_ui_manager
-   *   The rules UI manager.
-   */
-  public function __construct(RulesUiManagerInterface $rules_ui_manager) {
-    $this->rulesUiManager = $rules_ui_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function alterRoutes(RouteCollection $collection) {
-    foreach ($this->rulesUiManager->getDefinitions() as $name => $definition) {
-      $ui_definition = $this->rulesUiManager->getDefinition($name);
-      $this->registerRoutes($ui_definition, $collection);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    $events = parent::getSubscribedEvents();
-    // Should run after AdminRouteSubscriber so the routes can inherit admin
-    // status of the edit routes on entities. Therefore priority -210.
-    $events[RoutingEvents::ALTER] = ['onAlterRoutes', -210];
-    return $events;
-  }
-
-  /**
-   * Registers the routes as needed for the UI.
-   *
-   * @param \Drupal\rules\Ui\RulesUiDefinition $ui_definition
-   *   The definition of the RulesUI for which to register the routes.
-   * @param \Symfony\Component\Routing\RouteCollection $collection
-   *   The route collection to which to add the routes.
-   */
-  protected function registerRoutes(RulesUiDefinition $ui_definition, RouteCollection $collection) {
-    $base_route = $collection->get($ui_definition->base_route);
-
-    $options = [
-      'parameters' => ($base_route->getOption('parameters') ?: []),
-      '_admin_route' => $base_route->getOption('_admin_route') ?: FALSE,
-      '_rules_ui' => $ui_definition->id,
-    ];
-    $requirements = [
-      '_permission' => $ui_definition->permissions ?: $base_route->getRequirement('_permission'),
-    ];
-
-    $route = (new Route($base_route->getPath() . '/add/{expression_id}'))
-      ->addDefaults([
-        '_form' => '\Drupal\rules\Form\AddExpressionForm',
-        '_title_callback' => '\Drupal\rules\Form\AddExpressionForm::getTitle',
-      ])
-      ->addOptions($options)
-      ->addRequirements($requirements);
-    $collection->add($ui_definition->base_route . '.expression.add', $route);
-
-    $route = (new Route($base_route->getPath() . '/edit/{uuid}'))
-      ->addDefaults([
-        '_form' => '\Drupal\rules\Form\EditExpressionForm',
-        '_title_callback' => '\Drupal\rules\Form\EditExpressionForm::getTitle',
-      ])
-      ->addOptions($options)
-      ->addRequirements($requirements);
-    $collection->add($ui_definition->base_route . '.expression.edit', $route);
-
-    $route = (new Route($base_route->getPath() . '/delete/{uuid}'))
-      ->addDefaults([
-        '_form' => '\Drupal\rules\Form\DeleteExpressionForm',
-        '_title' => 'Delete expression',
-      ])
-      ->addOptions($options)
-      ->addRequirements($requirements);
-    $collection->add($ui_definition->base_route . '.expression.delete', $route);
-
-    $route = (new Route($base_route->getPath() . '/break-lock'))
-      ->addDefaults([
-        '_form' => '\Drupal\rules\Form\BreakLockForm',
-        '_title' => 'Break lock',
-      ])
-      ->addOptions($options)
-      ->addRequirements($requirements);
-    $collection->add($ui_definition->base_route . '.break_lock', $route);
-
-    $route = (new Route($base_route->getPath() . '/autocomplete/{uuid}'))
-      ->addDefaults([
-        '_controller' => '\Drupal\rules\Controller\AutocompleteController::autocomplete',
-        'uuid' => '',
-      ])
-      ->addOptions($options)
-      ->addRequirements($requirements);
-    $collection->add($ui_definition->base_route . '.autocomplete', $route);
-  }
-
-}
diff --git a/modules/rules/src/Rules.php b/modules/rules/src/Rules.php
deleted file mode 100644
index 20ea2dd..0000000
--- a/modules/rules/src/Rules.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\rules;
-
-/**
- * Class containing shortcuts for procedural code.
- *
- * This helpers should only be used in situations where dependencies cannot be
- * injected; e.g., in hook implementations or static methods.
- *
- * @see \Drupal
- */
-class Rules {
-
-  /**
-   * The current configuration schema version.
-   */
-  const CONFIG_VERSION = 3.0;
-
-  /**
-   * Returns the Rules expression manager service.
-   *
-   * @return \Drupal\rules\Engine\ExpressionManager
-   *   The Rules expression manager service.
-   */
-  public static function expressionManager() {
-    return \Drupal::service('plugin.manager.rules_expression');
-  }
-
-}
diff --git a/modules/rules/src/RulesServiceProvider.php b/modules/rules/src/RulesServiceProvider.php
deleted file mode 100644
index 1d9046b..0000000
--- a/modules/rules/src/RulesServiceProvider.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Drupal\rules;
-
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\DependencyInjection\ServiceProviderBase;
-use Drupal\rules\Core\ConditionManager;
-
-/**
- * Swaps out the core condition manager.
- */
-class RulesServiceProvider extends ServiceProviderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alter(ContainerBuilder $container) {
-    // Overrides the core condition plugin manager service with our own.
-    $definition = $container->getDefinition('plugin.manager.condition');
-    $definition->setClass(ConditionManager::class);
-  }
-
-}
diff --git a/modules/rules/src/Ui/RulesUiComponentProviderInterface.php b/modules/rules/src/Ui/RulesUiComponentProviderInterface.php
deleted file mode 100644
index c69729a..0000000
--- a/modules/rules/src/Ui/RulesUiComponentProviderInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\rules\Ui;
-
-use Drupal\rules\Engine\RulesComponent;
-
-/**
- * Interface for objects providing components for editing.
- *
- * Usually, this would be implemented by a config entity storing the component.
- */
-interface RulesUiComponentProviderInterface {
-
-  /**
-   * Gets the Rules component to be edited.
-   *
-   * @return \Drupal\rules\Engine\RulesComponent
-   *   The Rules component.
-   */
-  public function getComponent();
-
-  /**
-   * Updates the configuration based upon the given component.
-   *
-   * @param \Drupal\rules\Engine\RulesComponent $component
-   *   The component containing the configuration to set.
-   *
-   * @return $this
-   */
-  public function updateFromComponent(RulesComponent $component);
-
-}
diff --git a/modules/rules/src/Ui/RulesUiConfigHandler.php b/modules/rules/src/Ui/RulesUiConfigHandler.php
deleted file mode 100644
index 5932e1c..0000000
--- a/modules/rules/src/Ui/RulesUiConfigHandler.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-namespace Drupal\rules\Ui;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Plugin\PluginBase;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\rules\Form\EmbeddedComponentForm;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * The default handler for RulesUi plugins that store to config.
- *
- * It follows a list of supported settings. Note that settings that are not
- * marked as optional are required.
- * - config_parameter: The name of the routing parameter holding a config
- *   object providing the edited component. The parameter object must implement
- *   \Drupal\rules\Ui\RulesUiComponentProviderInterface. Required, unless
- *   config_name and config_key are provided.
- * - config_name: The name of a (simple) configuration object containing the
- *   configuration data of the edited component. For example,
- *   'your_module.your_config'. Required if 'config_parameter' is omitted.
- * - config_key: The key used to get/set the configuration of the edited
- *   component. For example, 'conditions' or 'foo.conditions'. Required if
- *   'config_parameter' is omitted.
- *
- * @see RulesUiDefinition::settings
- */
-class RulesUiConfigHandler extends PluginBase implements RulesUiHandlerInterface, ContainerFactoryPluginInterface {
-
-  use TempStoreTrait;
-
-  /**
-   * The rules UI (plugin) definition.
-   *
-   * @var \Drupal\rules\Ui\RulesUiDefinition
-   */
-  protected $pluginDefinition;
-
-  /**
-   * The current route match.
-   *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
-   */
-  protected $currentRouteMatch;
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static($configuration, $plugin_id, $plugin_definition, $container->get('current_route_match'), $container->get('config.factory'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteMatchInterface $route_match, ConfigFactoryInterface $config_factory) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->currentRouteMatch = $route_match;
-    $this->configFactory = $config_factory;
-  }
-
-  /**
-   * Gets the edited config object.
-   *
-   * @return \Drupal\rules\Ui\RulesUiComponentProviderInterface|\Drupal\Core\Config\Config
-   *   The component provider object (usually a config entity) or the editable
-   *   config object.
-   */
-  public function getConfig() {
-    $config = $this->fetchFromTempStore();
-    if (!$config) {
-      if (isset($this->pluginDefinition->settings['config_parameter'])) {
-        $config = $this->currentRouteMatch->getParameter($this->pluginDefinition->settings['config_parameter']);
-      }
-      else {
-        $config = $this->configFactory->getEditable($this->pluginDefinition->settings['config_name']);
-      }
-    }
-    return $config;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getComponentLabel() {
-    if (isset($this->pluginDefinition->component_label)) {
-      return $this->pluginDefinition->component_label;
-    }
-    elseif ($this->getConfig() instanceof EntityInterface) {
-      return $this->getConfig()->label();
-    }
-    else {
-      return $this->pluginDefinition->component_type_label;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getComponent() {
-    $config = $this->getConfig();
-    if ($config instanceof RulesUiComponentProviderInterface) {
-      return $config->getComponent();
-    }
-    else {
-      $configuration = $config->get($this->pluginDefinition->settings['config_key']);
-      return RulesComponent::createFromConfiguration($configuration);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function updateComponent(RulesComponent $component) {
-    $config = $this->getConfig();
-    if ($config instanceof RulesUiComponentProviderInterface) {
-      $config->updateFromComponent($component);
-    }
-    else {
-      $config->set($this->pluginDefinition->settings['config_key'], $component->getConfiguration());
-    }
-    $this->storeToTempStore($config);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getBaseRouteUrl(array $options = []) {
-    // See Url::fromRouteMatch()
-    return Url::fromRoute(
-      $this->pluginDefinition->base_route,
-      $this->currentRouteMatch->getRawParameters()->all(),
-      $options
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getUrlFromRoute($route_suffix, array $route_parameters, array $options = []) {
-    // See Url::fromRouteMatch()
-    return Url::fromRoute(
-      $this->pluginDefinition->base_route . '.' . $route_suffix,
-      $route_parameters + $this->currentRouteMatch->getRawParameters()->all(),
-      $options
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getForm() {
-    return new EmbeddedComponentForm($this);
-  }
-
-}
diff --git a/modules/rules/src/Ui/RulesUiDefinition.php b/modules/rules/src/Ui/RulesUiDefinition.php
deleted file mode 100644
index a724634..0000000
--- a/modules/rules/src/Ui/RulesUiDefinition.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-namespace Drupal\rules\Ui;
-
-use Drupal\Component\Plugin\Definition\PluginDefinitionInterface;
-use Drupal\rules\Exception\LogicException;
-
-/**
- * Class for rules_ui plugin definitions.
- *
- * Note that the class is treated as value object. Thus, there is no special
- * interface for it.
- *
- * @see \Drupal\rules\Ui\RulesUiManagerInterface
- */
-class RulesUiDefinition implements PluginDefinitionInterface {
-
-  /**
-   * Constructs the object.
-   *
-   * @param array $values
-   *   (optional) Array of initial property values to set.
-   */
-  public function __construct(array $values = []) {
-    foreach ($values as $key => $value) {
-      $this->$key = $value;
-    }
-  }
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the plugin.
-   *
-   * @var string
-   *
-   * @ingroup plugin_translatable
-   */
-  public $label;
-
-  /**
-   * The rules UI handler class.
-   *
-   * The class must implement \Drupal\rules\Ui\RulesUiHandlerInterface.
-   *
-   * @var string
-   */
-  public $class = RulesUiConfigHandler::class;
-
-  /**
-   * Array of handler-specific settings.
-   *
-   * Check the documentation of the ui handler for further details.
-   *
-   * @var array
-   */
-  public $settings = [];
-
-  /**
-   * The plugin provider; e.g., the module.
-   *
-   * @var string
-   */
-  public $provider;
-
-  /**
-   * The name of the base route.
-   *
-   * Generated routes are added below this route.
-   *
-   * @var string
-   */
-  public $base_route;
-
-  /**
-   * The permission string to use for the generated routes.
-   *
-   * If omitted, the permission string is inherited from the base route.
-   *
-   * @var string|null
-   */
-  public $permissions;
-
-  /**
-   * The label used for referring to the component (optional).
-   *
-   * If omitted, a handler-specific fallback logic is applied. For example,
-   * the RulesUiConfigHandler assumes a config entity and uses its label()
-   * method.
-   *
-   * @var string|null
-   *
-   * @ingroup plugin_translatable
-   */
-  public $component_label;
-
-  /**
-   * The label used for referring to the component type.
-   *
-   * @var string|null
-   *
-   * @ingroup plugin_translatable
-   */
-  public $component_type_label = 'component';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function id() {
-    return $this->id;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getProvider() {
-    return $this->provider;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setClass($class) {
-    $this->class = $class;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getClass() {
-    return $this->class;
-  }
-
-  /**
-   * Validates the set property values.
-   *
-   * @throws \Drupal\rules\Exception\LogicException
-   *   Thrown if the set object properties are not valid.
-   */
-  public function validate() {
-    if (!isset($this->id)) {
-      throw new LogicException("Missing the required property 'id'.");
-    }
-    foreach (['label', 'class', 'provider', 'base_route'] as $required) {
-      if (!isset($this->$required)) {
-        throw new LogicException("Plugin {$this->id} misses the required property $required.");
-      }
-    }
-    if (!is_subclass_of($this->class, RulesUiHandlerInterface::class)) {
-      throw new LogicException("The provided class does not implement the RulesUiHandlerInterface.");
-    }
-  }
-
-}
diff --git a/modules/rules/src/Ui/RulesUiHandlerInterface.php b/modules/rules/src/Ui/RulesUiHandlerInterface.php
deleted file mode 100644
index 7ea5167..0000000
--- a/modules/rules/src/Ui/RulesUiHandlerInterface.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-namespace Drupal\rules\Ui;
-
-use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Engine\RulesComponent;
-
-/**
- * Interface for Rules UI handlers.
- *
- * Rules UI handlers define where RulesUI instances are embedded and are
- * responsible for generating the appropriate routes.
- */
-interface RulesUiHandlerInterface extends PluginInspectionInterface {
-
-  /**
-   * {@inheritdoc}
-   *
-   * @return \Drupal\rules\Ui\RulesUiDefinition
-   *   The rules_ui plugin definition.
-   */
-  public function getPluginDefinition();
-
-  /**
-   * Gets the human-readable label of the component.
-   *
-   * The human-readable label used when referring to the whole component. This
-   * can be a fixed string, or the label of a config entity.
-   *
-   * @return string
-   *   The label.
-   */
-  public function getComponentLabel();
-
-  /**
-   * Gets the currently edited component.
-   *
-   * @return \Drupal\rules\Engine\RulesComponent
-   *   The edited component.
-   */
-  public function getComponent();
-
-  /**
-   * Updates the edited component.
-   *
-   * @param \Drupal\rules\Engine\RulesComponent $component
-   *   The updated, edited component.
-   */
-  public function updateComponent(RulesComponent $component);
-
-  /**
-   * Gets the component form, ready to be embedded in some other form.
-   *
-   * @return \Drupal\Core\Form\FormInterface
-   *   The form object.
-   */
-  public function getForm();
-
-  /**
-   * Clears any temporary storage.
-   *
-   * Note that after clearing the temporary storage any unsaved changes are
-   * lost.
-   */
-  public function clearTemporaryStorage();
-
-  /**
-   * Returns the URL of the base route, based on the current URL.
-   *
-   * @param array $options
-   *   (optional) Options for generating the URL, as supported by
-   *   \Drupal\Core\Url::fromRoute().
-   *
-   * @return \Drupal\Core\Url
-   *   The URL of the base route.
-   */
-  public function getBaseRouteUrl(array $options = []);
-
-  /**
-   * Gets an URL for a Rules UI route.
-   *
-   * @param string $route_suffix
-   *   The Rules UI route suffix that is appended to the base route. Supported
-   *   routes are:
-   *   - expression.add: The add expression form.
-   *   - expression.edit: The edit expression form.
-   *   - expression.delete: The delete expression form.
-   *   - break.lock: The break lock form.
-   * @param array $route_parameters
-   *   (optional) An associative array of route parameter names and values.
-   *   Depending on the route, the required parameters are:
-   *   - expression-id: The expression plugin to add on expression.add.
-   *   - uuid: The UUID of the expression to be edited or deleted.
-   * @param array $options
-   *   (optional) Options for generating the URL, as supported by
-   *   \Drupal\Core\Url::fromRoute().
-   *
-   * @return \Drupal\Core\Url
-   *   The URL of the given route.
-   *
-   * @see \Drupal\rules\Routing\RulesUiRouteSubscriber::registerRoutes()
-   */
-  public function getUrlFromRoute($route_suffix, array $route_parameters, array $options = []);
-
-  /**
-   * Determines if the component is locked for the current user.
-   *
-   * @return bool
-   *   TRUE if locked, FALSE otherwise.
-   */
-  public function isLocked();
-
-  /**
-   * Checks if the rule has been modified and is present in the storage.
-   *
-   * @return bool
-   *   TRUE if the rule has been modified, FALSE otherwise.
-   */
-  public function isEdited();
-
-  /**
-   * Provides information which user at which time locked the rule for editing.
-   *
-   * @return object
-   *   StdClass object as provided by \Drupal\user\SharedTempStore.
-   */
-  public function getLockMetaData();
-
-  /**
-   * Renders a message if the rule component is locked/modified.
-   *
-   * @return array
-   *   The render array, showing the message when applicable.
-   */
-  public function addLockInformation();
-
-  /**
-   * Validation callback that prevents editing locked rule components.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function validateLock(array &$form, FormStateInterface $form_state);
-
-}
diff --git a/modules/rules/src/Ui/RulesUiHandlerTrait.php b/modules/rules/src/Ui/RulesUiHandlerTrait.php
deleted file mode 100644
index a625420..0000000
--- a/modules/rules/src/Ui/RulesUiHandlerTrait.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\rules\Ui;
-
-/**
- * Trait for getting the rules_ui handler of the current request.
- *
- * Note that the current route must have the _rules_ui option set for the
- * handler being available. This is done automatically for routes generated for
- * the rules_ui (via \Drupal\rules\Routing\RulesUiRouteSubscriber).
- */
-trait RulesUiHandlerTrait {
-
-  /**
-   * The rules UI handler.
-   *
-   * @var \Drupal\rules\Ui\RulesUiHandlerInterface
-   */
-  protected $rulesUiHandler;
-
-  /**
-   * Gets the rules UI handler of the current route.
-   *
-   * @return \Drupal\rules\Ui\RulesUiHandlerInterface|null
-   *   The handler, or NULL if this is no rules_ui enabled route.
-   */
-  public function getRulesUiHandler() {
-    if (!isset($this->rulesUiHandler)) {
-      $this->rulesUiHandler = \Drupal::request()->attributes->get('rules_ui_handler');
-    }
-    return $this->rulesUiHandler;
-  }
-
-  /**
-   * Sets the Rules UI handler.
-   *
-   * @param \Drupal\rules\Ui\RulesUiHandlerInterface $rules_ui_handler
-   *   The Rules UI handler to set.
-   */
-  public function setRulesUiHandler(RulesUiHandlerInterface $rules_ui_handler) {
-    $this->rulesUiHandler = $rules_ui_handler;
-  }
-
-}
diff --git a/modules/rules/src/Ui/RulesUiManager.php b/modules/rules/src/Ui/RulesUiManager.php
deleted file mode 100644
index 42ed944..0000000
--- a/modules/rules/src/Ui/RulesUiManager.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\rules\Ui;
-
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
-use Drupal\Core\Plugin\Discovery\YamlDiscovery;
-use Drupal\Core\Plugin\Factory\ContainerFactory;
-
-/**
- * Plugin manager for Rules Ui instances.
- *
- * Rules UIs are primarily defined in *.rules_ui.yml files. Usually, there is
- * no need to specify a 'class' as there is a suiting default handler class in
- * place. However, if done see the class must implement
- * \Drupal\rules\Ui\RulesUiHandlerInterface.
- *
- * @see \Drupal\rules\Ui\RulesUiHandlerInterface
- */
-class RulesUiManager extends DefaultPluginManager implements RulesUiManagerInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(ModuleHandlerInterface $module_handler) {
-    $this->alterInfo('rules_ui');
-    $this->discovery = new ContainerDerivativeDiscoveryDecorator(new YamlDiscovery('rules_ui', $module_handler->getModuleDirectories()));
-    $this->factory = new ContainerFactory($this, RulesUiHandlerInterface::class);
-    $this->moduleHandler = $module_handler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processDefinition(&$definition, $plugin_id) {
-    $definition = new RulesUiDefinition($definition);
-    $definition->validate();
-  }
-
-}
diff --git a/modules/rules/src/Ui/RulesUiManagerInterface.php b/modules/rules/src/Ui/RulesUiManagerInterface.php
deleted file mode 100644
index f8c3ccc..0000000
--- a/modules/rules/src/Ui/RulesUiManagerInterface.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Drupal\rules\Ui;
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-
-/**
- * Interface for the 'rules_ui' plugin manager.
- *
- * RulesUI plugins allow the definition of multiple RulesUIs instances, possibly
- * being included in some other UI.
- */
-interface RulesUiManagerInterface extends PluginManagerInterface {
-
-  /**
-   * Creates a pre-configured instance of a plugin.
-   *
-   * @param string $plugin_id
-   *   The ID of the plugin being instantiated.
-   * @param array $configuration
-   *   An array of configuration relevant to the plugin instance.
-   *
-   * @return \Drupal\rules\Ui\RulesUiHandlerInterface
-   *   A fully configured plugin instance.
-   *
-   * @throws \Drupal\Component\Plugin\Exception\PluginException
-   *   If the instance cannot be created, such as if the ID is invalid.
-   */
-  public function createInstance($plugin_id, array $configuration = []);
-
-  /**
-   * {@inheritdoc}
-   *
-   * @return \Drupal\rules\Ui\RulesUiDefinition|null
-   *   A plugin definition, or NULL if the plugin ID is invalid and
-   *   $exception_on_invalid is FALSE.
-   */
-  public function getDefinition($plugin_id, $exception_on_invalid = TRUE);
-
-  /**
-   * {@inheritdoc}
-   *
-   * @return \Drupal\rules\Ui\RulesUiDefinition[]
-   *   An array of plugin definitions (empty array if no definitions were
-   *   found). Keys are plugin IDs.
-   */
-  public function getDefinitions();
-
-}
diff --git a/modules/rules/src/Ui/TempStoreTrait.php b/modules/rules/src/Ui/TempStoreTrait.php
deleted file mode 100644
index b78ee44..0000000
--- a/modules/rules/src/Ui/TempStoreTrait.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-namespace Drupal\rules\Ui;
-
-use Drupal\Core\Datetime\DateFormatterInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\user\SharedTempStoreFactory;
-
-/**
- * Provides methods for modified rules components in temporary storage.
- *
- * Note that this implements the lock-related methods of
- * \Drupal\rules\Ui\RulesUiHandlerInterface.
- *
- * @see \Drupal\rules\Ui\RulesUiHandlerInterface
- * @see \Drupal\rules\Ui\RulesUiConfigHandler
- */
-trait TempStoreTrait {
-
-  /**
-   * The tempstore factory.
-   *
-   * @var \Drupal\user\SharedTempStoreFactory
-   */
-  protected $tempStoreFactory;
-
-  /**
-   * The temporary store for the rules component.
-   *
-   * @var \Drupal\user\SharedTempStore
-   */
-  protected $tempStore;
-
-  /**
-   * The currently active rules UI handler.
-   *
-   * @var \Drupal\rules\Ui\RulesUiHandlerInterface
-   */
-  protected $rulesUiHandler;
-
-  /**
-   * The date formatter service.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatterInterface
-   */
-  protected $dateFormatter;
-
-  /**
-   * The renderer service.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * Retrieves the renderer service if not already present.
-   *
-   * @return \Drupal\Core\Render\RendererInterface
-   *   The renderer service.
-   */
-  public function getRenderer() {
-    if (!isset($this->renderer)) {
-      $this->renderer = \Drupal::service('renderer');
-    }
-    return $this->renderer;
-  }
-
-  /**
-   * Retrieves the temporary storage service if not already present.
-   *
-   * @return \Drupal\user\SharedTempStoreFactory
-   *   The factory.
-   */
-  protected function getTempStoreFactory() {
-    if (!isset($this->tempStoreFactory)) {
-      $this->tempStoreFactory = \Drupal::service('user.shared_tempstore');
-    }
-    return $this->tempStoreFactory;
-  }
-
-  /**
-   * Setter injection for the temporary storage factory.
-   *
-   * @param \Drupal\user\SharedTempStoreFactory $temp_store_factory
-   *   The factory.
-   */
-  public function setTempStoreFactory(SharedTempStoreFactory $temp_store_factory) {
-    $this->tempStoreFactory = $temp_store_factory;
-  }
-
-  /**
-   * Retrieves the date formatter service if not already present.
-   *
-   * @return \Drupal\Core\Datetime\DateFormatterInterface
-   *   The service.
-   */
-  protected function getDateFormatter() {
-    if (!isset($this->dateFormatter)) {
-      $this->dateFormatter = \Drupal::service('date.formatter');
-    }
-    return $this->dateFormatter;
-  }
-
-  /**
-   * Setter injection for the date formatter service.
-   *
-   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
-   *   The service.
-   */
-  public function setDateFormatter(DateFormatterInterface $date_formatter) {
-    $this->dateFormatter = $date_formatter;
-  }
-
-  /**
-   * Retrieves the entity type manager service if not already present.
-   *
-   * @return \Drupal\Core\Entity\EntityTypeManagerInterface
-   *   The entity type manager.
-   */
-  protected function getEntityTypeManager() {
-    if (!isset($this->entityTypeManager)) {
-      $this->entityTypeManager = \Drupal::service('entity_type.manager');
-    }
-    return $this->entityTypeManager;
-  }
-
-  /**
-   * Gets the currently active RulesUI's handler.
-   *
-   * @return \Drupal\rules\Ui\RulesUiHandlerInterface
-   *   The RulesUI handler.
-   */
-  protected function getRulesUiHandler() {
-    // Usually the trait is used on the RulesUI handler.
-    return $this;
-  }
-
-  /**
-   * Fetches the stored data from the temporary storage.
-   *
-   * @return mixed|null
-   *   The stored data or NULL if the temp store is empty.
-   */
-  protected function fetchFromTempStore() {
-    return $this->getTempStore()->get($this->getTempStoreItemId());
-  }
-
-  /**
-   * Stores some data in the temporary storage.
-   *
-   * @param mixed $data
-   *   The data to store.
-   */
-  protected function storeToTempStore($data) {
-    $this->getTempStore()->set($this->getTempStoreItemId(), $data);
-  }
-
-  /**
-   * @see \Drupal\rules\Ui\RulesUiHandlerInterface::clearTemporaryStorage()
-   */
-  public function clearTemporaryStorage() {
-    $this->getTempStore()->delete($this->getTempStoreItemId());
-  }
-
-  /**
-   * @see \Drupal\rules\Ui\RulesUiHandlerInterface::isLocked()
-   */
-  public function isLocked() {
-    // If there is an object in the temporary storage from another user then
-    // this component is locked.
-    if ($this->getTempStore()->get($this->getTempStoreItemId()) && !$this->getTempStore()->getIfOwner($this->getTempStoreItemId())
-    ) {
-      return TRUE;
-    }
-    return FALSE;
-  }
-
-  /**
-   * Generates the temp store item's ID to use for the edited component.
-   *
-   * @return string
-   *   The temp store ID.
-   */
-  private function getTempStoreItemId() {
-    // The internal path is unique for the currently edited component.
-    return $this->getRulesUiHandler()->getBaseRouteUrl()->getInternalPath();
-  }
-
-  /**
-   * Gets the temporary storage repository from the factory.
-   *
-   * @return \Drupal\user\SharedTempStore
-   *   The shareds storage.
-   */
-  private function getTempStore() {
-    if (!isset($this->tempStore)) {
-      $this->tempStore = $this->getTempStoreFactory()->get($this->getRulesUiHandler()->getPluginId());
-    }
-    return $this->tempStore;
-  }
-
-  /**
-   * @see \Drupal\rules\Ui\RulesUiHandlerInterface::getLockMetaData()
-   */
-  public function getLockMetaData() {
-    return $this->getTempStore()->getMetadata($this->getTempStoreItemId());
-  }
-
-  /**
-   * @see \Drupal\rules\Ui\RulesUiHandlerInterface::isEdited()
-   */
-  public function isEdited() {
-    if ($this->getTempStore()->get($this->getTempStoreItemId())) {
-      return TRUE;
-    }
-    return FALSE;
-  }
-
-  /**
-   * @see \Drupal\rules\Ui\RulesUiHandlerInterface::addLockInformation()
-   */
-  public function addLockInformation() {
-    $build = [];
-    if ($this->isLocked()) {
-      $build['locked'] = [
-        '#type' => 'container',
-        '#attributes' => [
-          'class' => ['rules-locked', 'messages', 'messages--warning'],
-        ],
-        '#children' => $this->lockInformationMessage(),
-        '#weight' => -10,
-      ];
-    }
-    else {
-      $build['changed'] = [
-        '#type' => 'container',
-        '#attributes' => [
-          'class' => ['rules-changed', 'messages', 'messages--warning'],
-        ],
-        '#children' => $this->t('You have unsaved changes.'),
-        '#weight' => -10,
-      ];
-      if (!$this->isEdited()) {
-        $build['changed']['#attributes']['class'][] = 'js-hide';
-      }
-    }
-    return $build;
-  }
-
-  /**
-   * @see \Drupal\rules\Ui\RulesUiHandlerInterface::validateLock()
-   */
-  public function validateLock(array &$form, FormStateInterface $form_state) {
-    if ($this->isLocked()) {
-      $form_state->setErrorByName('locked', $this->lockInformationMessage());
-    }
-  }
-
-  /**
-   * Provides a lock info message.
-   *
-   * @return \Drupal\Core\StringTranslation\TranslatableMarkup
-   *   The message suitable to be shown in the UI.
-   */
-  private function lockInformationMessage() {
-    $lock = $this->getLockMetaData();
-    $username = [
-      '#theme' => 'username',
-      '#account' => $this->getEntityTypeManager()->getStorage('user')->load($lock->owner),
-    ];
-    $lock_message_substitutions = [
-      '@user' => $this->getRenderer()->render($username),
-      '@age' => $this->getDateFormatter()->formatTimeDiffSince($lock->updated),
-      '@component_type' => $this->getRulesUiHandler()->getPluginDefinition()->component_type_label,
-      ':url' => Url::fromRoute($this->getRulesUiHandler()->getPluginDefinition()->base_route . '.break_lock', \Drupal::routeMatch()->getRawParameters()->all())->toString(),
-    ];
-    return $this->t('This @component_type is being edited by user @user, and is therefore locked from editing by others. This lock is @age old. Click here to <a href=":url">break this lock</a>.', $lock_message_substitutions);
-  }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/config/schema/rules_test.action.schema.yml b/modules/rules/tests/modules/rules_test/config/schema/rules_test.action.schema.yml
deleted file mode 100644
index 4a7c733..0000000
--- a/modules/rules/tests/modules/rules_test/config/schema/rules_test.action.schema.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-rules.action.context_values.rules_test_log:
-  type: mapping
-  label: Test log context values
-  mapping:
-    message:
-      type: text
diff --git a/modules/rules/tests/modules/rules_test/rules_test.info.yml b/modules/rules/tests/modules/rules_test/rules_test.info.yml
deleted file mode 100644
index cab6f14..0000000
--- a/modules/rules/tests/modules/rules_test/rules_test.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Rules test
-type: module
-description: 'Support module for the Rules tests.'
-package: Rules
-# core: 8.x
-dependencies:
-  - rules:rules
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-3.0-alpha3+28-dev'
-core: '8.x'
-project: 'rules'
-datestamp: 1508417995
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionFalse.php b/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionFalse.php
deleted file mode 100644
index ed218a8..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionFalse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\rules_test\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides an always FALSE test condition.
- *
- * @Condition(
- *   id = "rules_test_false",
- *   label = @Translation("Test condition returning false")
- * )
- */
-class TestConditionFalse extends RulesConditionBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function evaluate() {
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function summary() {
-    // We don't care about summaries for test condition plugins.
-    return '';
-  }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionProvider.php b/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionProvider.php
deleted file mode 100644
index 1e83478..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionProvider.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Drupal\rules_test\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Test condition that adds a variable with the provided context.
- *
- * @Condition(
- *   id = "rules_test_provider",
- *   label = @Translation("Test condition provider"),
- *   provides = {
- *     "provided_text" = @ContextDefinition("string",
- *       label = @Translation("Provided text")
- *     )
- *   }
- * )
- */
-class TestConditionProvider extends RulesConditionBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function evaluate() {
-    $this->setProvidedValue('provided_text', 'test value');
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function summary() {
-    // We don't care about summaries for test condition plugins.
-    return '';
-  }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionTrue.php b/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionTrue.php
deleted file mode 100644
index 0648253..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestConditionTrue.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\rules_test\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides an always TRUE test condition.
- *
- * @Condition(
- *   id = "rules_test_true",
- *   label = @Translation("Test condition returning true")
- * )
- */
-class TestConditionTrue extends RulesConditionBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function evaluate() {
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function summary() {
-    // We don't care about summaries for test condition plugins.
-    return '';
-  }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestTextCondition.php b/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestTextCondition.php
deleted file mode 100644
index df5c735..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/Condition/TestTextCondition.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\rules_test\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Returns TRUE if the test parameter equals 'test value'.
- *
- * @Condition(
- *   id = "rules_test_string_condition",
- *   label = @Translation("Test condition using a string"),
- *   context = {
- *     "text" = @ContextDefinition("string",
- *       label = @Translation("Text to compare")
- *     )
- *   },
- *   configure_permissions = { "access test configuration" }
- * )
- */
-class TestTextCondition extends RulesConditionBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function evaluate() {
-    $text = $this->getContextValue('text');
-    return $text == 'test value';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function summary() {
-    // We don't care about summaries for test condition plugins.
-    return '';
-  }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestLogAction.php b/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestLogAction.php
deleted file mode 100644
index 76e4f29..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestLogAction.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace Drupal\rules_test\Plugin\RulesAction;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\rules\Logger\RulesLoggerChannel;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides an action writing something to the Rules log.
- *
- * @RulesAction(
- *   id = "rules_test_log",
- *   label = @Translation("Test action logging."),
- *   context = {
- *     "message" = @ContextDefinition("string",
- *       label = @Translation("Message to log"),
- *       required = false
- *     )
- *   }
- * )
- */
-class TestLogAction extends RulesActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * Rules logger instance.
-   *
-   * @var \Drupal\rules\Logger\RulesLoggerChannel
-   */
-  protected $logger;
-
-  /**
-   * Constructs a TestLogAction object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\rules\Logger\RulesLoggerChannel $logger
-   *   Rules logger object.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, RulesLoggerChannel $logger) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->logger = $logger;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('logger.channel.rules')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function execute() {
-    $message = $this->getContextValue('message');
-    if (empty($message)) {
-      $message = 'action called';
-    }
-    $this->logger->info($message);
-  }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestNodeAction.php b/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestNodeAction.php
deleted file mode 100644
index 8b05962..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestNodeAction.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Drupal\rules_test\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides a test action that sets a node title.
- *
- * @RulesAction(
- *   id = "rules_test_node",
- *   label = @Translation("Test action string."),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("Node to det the title on")
- *     ),
- *     "title" = @ContextDefinition("string",
- *       label = @Translation("New title that should be set")
- *     )
- *   }
- * )
- */
-class TestNodeAction extends RulesActionBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function execute() {
-    $node = $this->getContextValue('node');
-    $title = $this->getContextValue('title');
-    $node->setTitle($title);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autoSaveContext() {
-    // The node where we changed the title should be auto-saved after the
-    // execution.
-    return ['node'];
-  }
-
-}
diff --git a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestStringAction.php b/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestStringAction.php
deleted file mode 100644
index 798d88f..0000000
--- a/modules/rules/tests/modules/rules_test/src/Plugin/RulesAction/TestStringAction.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\rules_test\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides a test action that concatenates a string to itself.
- *
- * @RulesAction(
- *   id = "rules_test_string",
- *   label = @Translation("Test action string."),
- *   context = {
- *     "text" = @ContextDefinition("string",
- *       label = @Translation("Text to concatenate")
- *     )
- *   },
- *   configure_permissions = { "access test configuration" },
- *   provides = {
- *     "concatenated" = @ContextDefinition("string",
- *       label = @Translation("Concatenated result")
- *     )
- *   }
- * )
- */
-class TestStringAction extends RulesActionBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function execute() {
-    $text = $this->getContextValue('text');
-    $this->setProvidedValue('concatenated', $text . $text);
-  }
-
-}
diff --git a/modules/rules/tests/modules/rules_test_default_component/config/install/rules.component.rules_test_default_component.yml b/modules/rules/tests/modules/rules_test_default_component/config/install/rules.component.rules_test_default_component.yml
deleted file mode 100644
index 8095fe2..0000000
--- a/modules/rules/tests/modules/rules_test_default_component/config/install/rules.component.rules_test_default_component.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-langcode: en
-status: true
-dependencies: {}
-id: rules_test_default_component
-label: Rules test default component
-description: 'Tests adding Rules component by default.'
-tags:
-  - 'test'
-config_version: '3.0'
-component:
-  context_definitions:
-    user:
-      type: 'entity:user'
-      label: User
-      description: 'The user whose mail address to print.'
-  provided_context_definitions:
-    concatenated:
-      type: 'string'
-      label: Concatenated text
-      description: 'The concatenated text.'
-  expression:
-    id: rules_rule
-    conditions:
-      id: rules_and
-      conditions: {}
-    actions:
-      id: rules_action_set
-      actions:
-        - id: rules_action
-          action_id: rules_system_message
-          context_values:
-            type: 'status'
-          context_mapping:
-            message: 'user.mail.value'
-          context_processors: {  }
-          provides_mapping: {  }
-        - id: rules_action
-          action_id: rules_test_string
-          context_mapping:
-            text: 'user.mail.value'
-          context_processors: {  }
-          provides_mapping: {  }
diff --git a/modules/rules/tests/modules/rules_test_default_component/rules_test_default_component.info.yml b/modules/rules/tests/modules/rules_test_default_component/rules_test_default_component.info.yml
deleted file mode 100644
index adcff36..0000000
--- a/modules/rules/tests/modules/rules_test_default_component/rules_test_default_component.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Rules test default component
-type: module
-description: 'Support module for testing Rules config defaults.'
-package: Rules
-# core: 8.x
-dependencies:
-  - rules:rules
-  - rules:rules_test
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-3.0-alpha3+28-dev'
-core: '8.x'
-project: 'rules'
-datestamp: 1508417995
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/config/install/rules_test_ui_embed.settings.yml b/modules/rules/tests/modules/rules_test_ui_embed/config/install/rules_test_ui_embed.settings.yml
deleted file mode 100644
index b5b3afa..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/config/install/rules_test_ui_embed.settings.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-conditions:
-  expression:
-    id: rules_and
-  context_definitions:
-    css_file:
-      type: 'string'
-      label: CSS file
-      description: 'The CSS file for which to evaluate the conditions.'
-css:
-  - module: rulest_test_ui_embed
-    file: css/test.css
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/config/schema/rules_test_ui_embed.schema.yml b/modules/rules/tests/modules/rules_test_ui_embed/config/schema/rules_test_ui_embed.schema.yml
deleted file mode 100644
index 01dbd2d..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/config/schema/rules_test_ui_embed.schema.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-rules_test_ui_embed.settings:
-  type: config_object
-  label: 'Rules Test UI embedding settings'
-  mapping:
-    conditions:
-      type: rules_component
-      label: Rules Conditions
-    css:
-      type: sequence
-      sequence:
-        type: mapping
-        label: CSS files
-        mapping:
-          module:
-            type: string
-          file:
-            type: string
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/css/test.css b/modules/rules/tests/modules/rules_test_ui_embed/css/test.css
deleted file mode 100644
index adc68fa..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/css/test.css
+++ /dev/null
@@ -1,3 +0,0 @@
-h1 {
-  color: red;
-}
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.info.yml b/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.info.yml
deleted file mode 100644
index 9b0f6bb..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Rules UI embedding test
-type: module
-description: 'A module testing embedding the Rules UI.'
-package: Rules
-# core: 8.x
-dependencies:
-  - rules:rules
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-3.0-alpha3+28-dev'
-core: '8.x'
-project: 'rules'
-datestamp: 1508417995
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.links.menu.yml b/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.links.menu.yml
deleted file mode 100644
index 228833f..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.links.menu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-rules_test_ui_embed.settings:
-  title: 'CSS rules'
-  parent: system.admin_config_ui
-  description: 'Configure CSS to be active based on certain conditions met.'
-  route_name: rules_test_ui_embed.settings
-  weight: 10
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.routing.yml b/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.routing.yml
deleted file mode 100644
index c72535d..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.routing.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-rules_test_ui_embed.settings:
-  path: '/admin/config/user-interface/css'
-  defaults:
-    _form: 'Drupal\rules_test_ui_embed\Form\SettingsForm'
-    _title: 'CSS rules'
-  requirements:
-    _permission: 'administer rules'
-  options:
-    _rules_ui: rules_test_ui_embed.settings_conditions
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.rules_ui.yml b/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.rules_ui.yml
deleted file mode 100644
index 72d64bf..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/rules_test_ui_embed.rules_ui.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-rules_test_ui_embed.settings_conditions:
-  label: 'Conditions embedded in Rules-test-UI-embed module settings'
-  base_route: rules_test_ui_embed.settings
-  settings:
-    config_name: rules_test_ui_embed.settings
-    config_key: conditions
diff --git a/modules/rules/tests/modules/rules_test_ui_embed/src/Form/SettingsForm.php b/modules/rules/tests/modules/rules_test_ui_embed/src/Form/SettingsForm.php
deleted file mode 100644
index 56142bf..0000000
--- a/modules/rules/tests/modules/rules_test_ui_embed/src/Form/SettingsForm.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace Drupal\rules_test_ui_embed\Form;
-
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\rules\Ui\RulesUiConfigHandler;
-
-/**
- * Implements the settings form.
- */
-class SettingsForm extends ConfigFormBase {
-
-  /**
-   * The RulesUI handler of the currently active UI.
-   *
-   * @var \Drupal\rules\Ui\RulesUiConfigHandler
-   */
-  protected $rulesUiHandler;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return ['rules_test_ui_embed.settings'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'rules_test_ui_embed_settings';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function config($name) {
-    // Get the editable config from the Rules UI handlers, such that any
-    // interim changes to the contained Rules component are picked up.
-    $config = $this->rulesUiHandler ? $this->rulesUiHandler->getConfig() : NULL;
-    if ($config->getName() == $name && in_array($name, $this->getEditableConfigNames())) {
-      return $config;
-    }
-    return parent::config($name);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, RulesUiConfigHandler $rules_ui_handler = NULL) {
-    $form = parent::buildForm($form, $form_state);
-    $this->rulesUiHandler = $rules_ui_handler;
-    $config = $this->config('rules_test_ui_embed.settings');
-
-    $form['css_file'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('CSS file'),
-      '#default_value' => $config->get('css.0.file'),
-      '#required' => TRUE,
-    ];
-
-    $form['conditions'] = $this->rulesUiHandler->getForm()
-      ->buildForm([], $form_state);
-
-    $form['actions']['cancel'] = [
-      '#type' => 'submit',
-      '#limit_validation_errors' => [['locked']],
-      '#value' => $this->t('Cancel'),
-      '#submit' => ['::cancel'],
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    parent::validateForm($form, $form_state);
-    $this->rulesUiHandler->getForm()
-      ->validateForm($form['conditions'], $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->rulesUiHandler->getForm()
-      ->submitForm($form['conditions'], $form_state);
-
-    $this->config('rules_test_ui_embed.settings')
-      ->set('css.0.file', $form_state->getValue('css_file'))
-      ->save();
-
-    // Also remove the temporarily stored component, it has been persisted now.
-    $this->rulesUiHandler->clearTemporaryStorage();
-
-    parent::submitForm($form, $form_state);
-  }
-
-  /**
-   * Form submission handler for the 'cancel' action.
-   */
-  public function cancel(array $form, FormStateInterface $form_state) {
-    $this->rulesUiHandler->clearTemporaryStorage();
-    drupal_set_message($this->t('Canceled.'));
-    $form_state->setRedirectUrl($this->rulesUiHandler->getBaseRouteUrl());
-  }
-
-}
diff --git a/modules/rules/tests/src/Functional/ConfigureAndExecuteTest.php b/modules/rules/tests/src/Functional/ConfigureAndExecuteTest.php
deleted file mode 100644
index 9c1edb9..0000000
--- a/modules/rules/tests/src/Functional/ConfigureAndExecuteTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Functional;
-
-/**
- * Tests that a rule can be configured and triggered when a node is edited.
- *
- * @group RulesUi
- */
-class ConfigureAndExecuteTest extends RulesBrowserTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node', 'rules'];
-
-  /**
-   * We use the minimal profile because we want to test local action links.
-   *
-   * @var string
-   */
-  protected $profile = 'minimal';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Create an article content type that we will use for testing.
-    $type = $this->container->get('entity_type.manager')->getStorage('node_type')
-      ->create([
-        'type' => 'article',
-        'name' => 'Article',
-      ]);
-    $type->save();
-    $this->container->get('router.builder')->rebuild();
-
-  }
-
-  /**
-   * Tests creation of a rule and then triggering its execution.
-   */
-  public function testConfigureAndExecute() {
-    $account = $this->drupalCreateUser([
-      'create article content',
-      'administer rules',
-      'administer site configuration',
-    ]);
-    $this->drupalLogin($account);
-
-    $this->drupalGet('admin/config/workflow/rules');
-
-    // Set up a rule that will show a system message if the title of a node
-    // matches "Test title".
-    $this->clickLink('Add reaction rule');
-
-    $this->fillField('Label', 'Test rule');
-    $this->fillField('Machine-readable name', 'test_rule');
-    $this->fillField('React on event', 'rules_entity_presave:node');
-    $this->pressButton('Save');
-
-    $this->clickLink('Add condition');
-
-    $this->fillField('Condition', 'rules_data_comparison');
-    $this->pressButton('Continue');
-
-    // @todo this should not be necessary once the data context is set to
-    // selector by default anyway.
-    $this->pressButton('Switch to data selection');
-    $this->fillField('context[data][setting]', 'node.title.0.value');
-
-    $this->fillField('context[value][setting]', 'Test title');
-    $this->pressButton('Save');
-
-    $this->clickLink('Add action');
-    $this->fillField('Action', 'rules_system_message');
-    $this->pressButton('Continue');
-
-    $this->fillField('context[message][setting]', 'Title matched "Test title"!');
-    $this->fillField('context[type][setting]', 'status');
-    $this->pressButton('Save');
-
-    // One more save to permanently store the rule.
-    $this->pressButton('Save');
-
-    // Add a node now and check if our rule triggers.
-    $this->drupalGet('node/add/article');
-    $this->fillField('Title', 'Test title');
-    $this->pressButton('Save');
-
-    $this->assertSession()->pageTextContains('Title matched "Test title"!');
-
-    // Edit the rule and negate the condition.
-    $this->drupalGet('admin/config/workflow/rules/reactions/edit/test_rule');
-    $this->clickLink('Edit', 0);
-    $this->getSession()->getPage()->checkField('negate');
-    $this->pressButton('Save');
-    // One more save to permanently store the rule.
-    $this->pressButton('Save');
-
-    // Need to clear cache so that the edited version will be used.
-    drupal_flush_all_caches();
-    // Create node with same title and check that the message is not shown.
-    $this->drupalGet('node/add/article');
-    $this->fillField('Title', 'Test title');
-    $this->pressButton('Save');
-    $this->assertSession()->pageTextNotContains('Title matched "Test title"!');
-  }
-
-}
diff --git a/modules/rules/tests/src/Functional/RulesBrowserTestBase.php b/modules/rules/tests/src/Functional/RulesBrowserTestBase.php
deleted file mode 100644
index 9e8b577..0000000
--- a/modules/rules/tests/src/Functional/RulesBrowserTestBase.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Has some additional helper methods to make test code more readable.
- */
-abstract class RulesBrowserTestBase extends BrowserTestBase {
-
-  /**
-   * Finds link with specified locator.
-   *
-   * @param string $locator
-   *   Link id, title, text or image alt.
-   *
-   * @return \Behat\Mink\Element\NodeElement|null
-   *   The link node element.
-   */
-  public function findLink($locator) {
-    return $this->getSession()->getPage()->findLink($locator);
-  }
-
-  /**
-   * Finds field (input, textarea, select) with specified locator.
-   *
-   * @param string $locator
-   *   Input id, name or label.
-   *
-   * @return \Behat\Mink\Element\NodeElement|null
-   *   The input field element.
-   */
-  public function findField($locator) {
-    return $this->getSession()->getPage()->findField($locator);
-  }
-
-  /**
-   * Finds button with specified locator.
-   *
-   * @param string $locator
-   *   Button id, value or alt.
-   *
-   * @return \Behat\Mink\Element\NodeElement|null
-   *   The button node element.
-   */
-  public function findButton($locator) {
-    return $this->getSession()->getPage()->findButton($locator);
-  }
-
-  /**
-   * Presses button with specified locator.
-   *
-   * @param string $locator
-   *   Button id, value or alt.
-   *
-   * @throws \Behat\Mink\Exception\ElementNotFoundException
-   */
-  public function pressButton($locator) {
-    $this->getSession()->getPage()->pressButton($locator);
-  }
-
-  /**
-   * Fills in field (input, textarea, select) with specified locator.
-   *
-   * @param string $locator
-   *   Input id, name or label.
-   * @param string $value
-   *   Value.
-   *
-   * @throws \Behat\Mink\Exception\ElementNotFoundException
-   *
-   * @see \Behat\Mink\Element\NodeElement::setValue
-   */
-  public function fillField($locator, $value) {
-    $this->getSession()->getPage()->fillField($locator, $value);
-  }
-
-}
diff --git a/modules/rules/tests/src/Functional/RulesUiEmbedTest.php b/modules/rules/tests/src/Functional/RulesUiEmbedTest.php
deleted file mode 100644
index ee0f2f2..0000000
--- a/modules/rules/tests/src/Functional/RulesUiEmbedTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Functional;
-
-/**
- * Functional test for the embedded Rules example implementation.
- *
- * @group RulesUi
- */
-class RulesUiEmbedTest extends RulesBrowserTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['rules_test_ui_embed'];
-
-  /**
-   * @cover \Drupal\rules_test_ui_embed\Form\SettingsForm
-   */
-  public function testExampleUi() {
-    $account = $this->drupalCreateUser([
-      'administer rules',
-      'access administration pages',
-    ]);
-    $this->drupalLogin($account);
-    $this->drupalGet('admin/config/user-interface');
-
-    $this->drupalGet('admin/config/user-interface/css');
-    $this->clickLink('Add condition');
-    $this->fillField('Condition', 'rules_data_comparison');
-    $this->pressButton('Continue');
-    $this->fillField('context[data][setting]', '123');
-    $this->fillField('context[value][setting]', '234');
-    $this->pressButton('Save');
-
-    // Now the condition should be listed. Try editing it.
-    $this->assertSession()->pageTextContains('Data comparison');
-    $this->clickLink('Edit');
-    $this->assertSession()->fieldValueEquals('context[data][setting]', '123');
-    $this->assertSession()->fieldValueEquals('context[value][setting]', '234');
-    $this->fillField('context[value][setting]', '123');
-    $this->pressButton('Save');
-    $this->assertSession()->pageTextContains('Data comparison');
-    // One more save to permanently store the changes.
-    $this->fillField('css_file', 'css/test2.css');
-    $this->pressButton('Save configuration');
-    $this->assertSession()->pageTextContains('The configuration options have been saved.');
-
-    // Reload and ensure data is still there.
-    $this->drupalGet('admin/config/user-interface/css');
-    $this->assertSession()->fieldValueEquals('css_file', 'css/test2.css');
-    $this->assertSession()->pageTextContains('Data comparison');
-
-    // Delete condition and save.
-    $this->clickLink('Delete');
-    $this->pressButton('Delete');
-    $this->pressButton('Save configuration');
-    $this->assertSession()->pageTextContains('The configuration options have been saved.');
-    $this->assertSession()->pageTextNotContains('Data comparison');
-  }
-
-}
diff --git a/modules/rules/tests/src/Functional/TempStorageTest.php b/modules/rules/tests/src/Functional/TempStorageTest.php
deleted file mode 100644
index 3175462..0000000
--- a/modules/rules/tests/src/Functional/TempStorageTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Functional;
-
-/**
- * Tests that editing a rule locks it for another user.
- *
- * @group RulesUi
- */
-class TempStorageTest extends RulesBrowserTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['rules'];
-
-  /**
-   * We use the minimal profile because we want to test local action links.
-   *
-   * @var string
-   */
-  protected $profile = 'minimal';
-
-  /**
-   * Tests that editing a rule locks it for another user.
-   */
-  public function testLocking() {
-    // Create a rule with the first user.
-    $account_1 = $this->drupalCreateUser(['administer rules']);
-    $this->drupalLogin($account_1);
-
-    $this->drupalGet('admin/config/workflow/rules');
-    $this->clickLink('Add reaction rule');
-
-    $this->fillField('Label', 'Test rule');
-    $this->fillField('Machine-readable name', 'test_rule');
-    $this->fillField('React on event', 'rules_entity_insert:node');
-    $this->pressButton('Save');
-
-    $this->clickLink('Add condition');
-    $this->fillField('Condition', 'rules_node_is_promoted');
-    $this->pressButton('Continue');
-
-    $this->fillField('context[node][setting]', '1');
-    $this->pressButton('Save');
-
-    $this->assertSession()->pageTextContains('You have unsaved changes.');
-
-    // Now check with the second user that the rule is being edited and locked.
-    $account_2 = $this->drupalCreateUser(['administer rules']);
-    $this->drupalLogin($account_2);
-
-    $this->drupalGet('admin/config/workflow/rules/reactions/edit/test_rule');
-    $this->assertSession()->pageTextContains('This rule is being edited by user ' . $account_1->getUsername() . ', and is therefore locked from editing by others.');
-
-    $this->pressButton('Cancel');
-    $this->assertSession()->pageTextNotContains('Canceled.');
-    $this->assertSession()->pageTextContains('This rule is being edited by user ' . $account_1->getUsername() . ', and is therefore locked from editing by others.');
-
-    $this->pressButton('Save');
-    $this->assertSession()->pageTextNotContains('Reaction rule Test rule has been updated.');
-    $this->assertSession()->pageTextContains('This rule is being edited by user ' . $account_1->getUsername() . ', and is therefore locked from editing by others.');
-
-    $this->clickLink('Edit');
-    $current_url = $this->getSession()->getCurrentUrl();
-    $this->pressButton('Save');
-
-    $this->assertEquals($current_url, $this->getSession()->getCurrentUrl());
-    $this->assertSession()->pageTextContains('This rule is being edited by user ' . $account_1->getUsername() . ', and is therefore locked from editing by others.');
-
-    // Try breaking the lock to edit the rule.
-    $this->clickLink('break this lock');
-
-    $this->assertSession()->pageTextContains('By breaking this lock, any unsaved changes made by ' . $account_1->getUsername() . ' will be lost.');
-    $this->pressButton('Break lock');
-
-    $this->assertSession()->pageTextContains('The lock has been broken and you may now edit this rule.');
-    // The link to edit the condition is now gone because the changes have been
-    // reverted.
-    $this->assertFalse($this->getSession()->getPage()->hasLink('Edit'));
-  }
-
-}
diff --git a/modules/rules/tests/src/Functional/UiPageTest.php b/modules/rules/tests/src/Functional/UiPageTest.php
deleted file mode 100644
index 0cb22c2..0000000
--- a/modules/rules/tests/src/Functional/UiPageTest.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Functional;
-
-/**
- * Tests that the Rules UI pages are reachable.
- *
- * @group RulesUi
- */
-class UiPageTest extends RulesBrowserTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['rules'];
-
-  /**
-   * We use the minimal profile because we want to test local action links.
-   *
-   * @var string
-   */
-  protected $profile = 'minimal';
-
-  /**
-   * Tests that the reaction rule listing page works.
-   */
-  public function testReactionRulePage() {
-    $account = $this->drupalCreateUser(['administer rules']);
-    $this->drupalLogin($account);
-
-    $this->drupalGet('admin/config/workflow/rules');
-    $this->assertSession()->statusCodeEquals(200);
-
-    // Test that there is an empty reaction rule listing.
-    $this->assertSession()->pageTextContains('There is no Reaction Rule yet.');
-  }
-
-  /**
-   * Tests that creating a reaction rule works.
-   */
-  public function testCreateReactionRule() {
-    $account = $this->drupalCreateUser(['administer rules']);
-    $this->drupalLogin($account);
-
-    $this->drupalGet('admin/config/workflow/rules');
-    $this->clickLink('Add reaction rule');
-
-    $this->fillField('Label', 'Test rule');
-    $this->fillField('Machine-readable name', 'test_rule');
-    $this->fillField('React on event', 'rules_entity_insert:node');
-
-    $this->pressButton('Save');
-
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('Reaction rule Test rule has been created.');
-
-    $this->clickLink('Add condition');
-
-    $this->fillField('Condition', 'rules_node_is_promoted');
-    $this->pressButton('Continue');
-
-    $this->fillField('context[node][setting]', '1');
-    $this->pressButton('Save');
-
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('You have unsaved changes.');
-
-    $this->pressButton('Save');
-    $this->assertSession()->pageTextContains('Reaction rule Test rule has been updated. ');
-  }
-
-  /**
-   * Tests that cancelling an expression from a rule works.
-   */
-  public function testCancelExpressionInRule() {
-    // Setup a rule with one condition.
-    $this->testCreateReactionRule();
-
-    $this->clickLink('Add condition');
-    $this->fillField('Condition', 'rules_node_is_promoted');
-    $this->pressButton('Continue');
-
-    $this->fillField('context[node][setting]', '1');
-    $this->pressButton('Save');
-
-    $this->assertSession()->pageTextContains('You have unsaved changes.');
-
-    // Edit and cancel.
-    $this->pressButton('Cancel');
-    $this->assertSession()->pageTextContains('Canceled.');
-
-    // Make sure that we are back at the overview listing page.
-    $this->assertEquals(1, preg_match('#/admin/config/workflow/rules$#', $this->getSession()->getCurrentUrl()));
-  }
-
-  /**
-   * Tests that deleting an expression from a rule works.
-   */
-  public function testDeleteExpressionInRule() {
-    // Setup a rule with one condition.
-    $this->testCreateReactionRule();
-
-    $this->clickLink('Delete');
-    $this->assertSession()->pageTextContains('Are you sure you want to delete Condition: Node is promoted from Test rule?');
-
-    $this->pressButton('Delete');
-    $this->assertSession()->pageTextContains('You have unsaved changes.');
-
-    $this->pressButton('Save');
-    $this->assertSession()->pageTextContains('Reaction rule Test rule has been updated. ');
-  }
-
-  /**
-   * Tests that an action with a multiple context can be confugured.
-   */
-  public function testMultipleContextAction() {
-    $account = $this->drupalCreateUser(['administer rules']);
-    $this->drupalLogin($account);
-
-    $this->drupalGet('admin/config/workflow/rules');
-    $this->clickLink('Add reaction rule');
-
-    $this->fillField('Label', 'Test rule');
-    $this->fillField('Machine-readable name', 'test_rule');
-    $this->fillField('React on event', 'rules_entity_insert:node');
-
-    $this->pressButton('Save');
-
-    $this->clickLink('Add action');
-    $this->fillField('Action', 'rules_send_email');
-    $this->pressButton('Continue');
-
-    // Push the data selection switch 2 times to make sure that also works and
-    // does not throw PHP notices.
-    $this->pressButton('Switch to data selection');
-    $this->pressButton('Switch to data selection');
-
-    $this->fillField('context[to][setting]', 'klausi@example.com');
-    $this->fillField('context[subject][setting]', 'subject');
-    $this->fillField('context[message][setting]', 'message');
-    $this->pressButton('Save');
-
-    $this->assertSession()->statusCodeEquals(200);
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/ConfigEntityDefaultsTest.php b/modules/rules/tests/src/Kernel/ConfigEntityDefaultsTest.php
deleted file mode 100644
index 48f8b89..0000000
--- a/modules/rules/tests/src/Kernel/ConfigEntityDefaultsTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-/**
- * Tests default config.
- *
- * @group Rules
- */
-class ConfigEntityDefaultsTest extends RulesDrupalTestBase {
-
-  /**
-   * The entity storage for Rules config entities.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['rules', 'rules_test',
-    'rules_test_default_component', 'user', 'system',
-  ];
-
-  /**
-   * Disable strict config schema checking for now.
-   *
-   * @var bool
-   */
-  protected $strictConfigSchema = TRUE;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->entityTypeManager = $this->container->get('entity_type.manager');
-    $this->storage = $this->entityTypeManager->getStorage('rules_component');
-    $this->installConfig(['rules_test_default_component']);
-  }
-
-  /**
-   * Tests Rules default components.
-   */
-  public function testDefaultComponents() {
-    $config_entity = $this->storage->load('rules_test_default_component');
-
-    $user = $this->entityTypeManager->getStorage('user')
-      ->create(['mail' => 'test@example.com']);
-
-    $result = $config_entity
-      ->getComponent()
-      ->setContextValue('user', $user)
-      ->execute();
-
-    // Test that the action was executed correctly.
-    $messages = drupal_get_messages();
-    $message_string = isset($messages['status'][0]) ? (string) $messages['status'][0] : NULL;
-    $this->assertEquals($message_string, 'test@example.com');
-
-    $this->assertEquals('test@example.comtest@example.com', $result['concatenated']);
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/ConfigEntityTest.php b/modules/rules/tests/src/Kernel/ConfigEntityTest.php
deleted file mode 100644
index 7263c86..0000000
--- a/modules/rules/tests/src/Kernel/ConfigEntityTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\rules\Plugin\RulesExpression\Rule;
-
-/**
- * Tests storage and loading of Rules config entities.
- *
- * @group Rules
- */
-class ConfigEntityTest extends RulesDrupalTestBase {
-
-  /**
-   * The entity storage for Rules config entities.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->storage = $this->container->get('entity_type.manager')->getStorage('rules_component');
-  }
-
-  /**
-   * Tests that an empty rule configuration can be saved.
-   */
-  public function testSavingEmptyRule() {
-    $rule = $this->expressionManager->createRule();
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-    ])->setExpression($rule);
-    $config_entity->save();
-  }
-
-  /**
-   * Tests saving the configuration of an action and then loading it again.
-   */
-  public function testConfigAction() {
-    $action = $this->expressionManager->createAction('rules_test_log');
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-    ])->setExpression($action);
-    $config_entity->save();
-
-    $loaded_entity = $this->storage->load('test_rule');
-    $this->assertEquals($action->getConfiguration(), $loaded_entity->get('component')['expression'], 'Action configuration is the same after loading the config.');
-
-    // Create the Rules expression object from the configuration.
-    $expression = $loaded_entity->getExpression();
-    $expression->execute();
-
-    // Test that the action logged something.
-    $this->assertRulesLogEntryExists('action called');
-  }
-
-  /**
-   * Tests saving the nested config of a rule and then loading it again.
-   */
-  public function testConfigRule() {
-    // Create a simple rule with one action and one condition.
-    $rule = $this->expressionManager
-      ->createRule();
-    $rule->addCondition('rules_test_true');
-    $rule->addAction('rules_test_log');
-
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-    ])->setExpression($rule);
-    $config_entity->save();
-
-    $loaded_entity = $this->storage->load('test_rule');
-    // Create the Rules expression object from the configuration.
-    $expression = $loaded_entity->getExpression();
-    $expression->execute();
-
-    // Test that the action logged something.
-    $this->assertRulesLogEntryExists('action called');
-  }
-
-  /**
-   * Make sure that expressions using context definitions can be exported.
-   */
-  public function testContextDefinitionExport() {
-    $component = RulesComponent::create($this->expressionManager->createRule())
-      ->addContextDefinition('test', ContextDefinition::create('string')
-        ->setLabel('Test string')
-      );
-
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-    ])->updateFromComponent($component);
-    $config_entity->save();
-
-    $loaded_entity = $this->storage->load('test_rule');
-    // Create the Rules expression object from the configuration.
-    $expression = $loaded_entity->getExpression();
-    $this->assertInstanceOf(Rule::class, $expression);
-    $context_definitions = $loaded_entity->getContextDefinitions();
-    $this->assertEquals($context_definitions['test']->getDataType(), 'string', 'Data type of context definition is correct.');
-    $this->assertEquals($context_definitions['test']->getLabel(), 'Test string', 'Label of context definition is correct.');
-  }
-
-  /**
-   * Tests that a reaction rule config entity can be saved.
-   */
-  public function testReactionRuleSaving() {
-    $rule = $this->expressionManager->createRule();
-    $storage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
-    $config_entity = $storage->create([
-      'id' => 'test_rule',
-    ])->setExpression($rule);
-    $config_entity->save();
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/ConfigSchemaTest.php b/modules/rules/tests/src/Kernel/ConfigSchemaTest.php
deleted file mode 100644
index faa5335..0000000
--- a/modules/rules/tests/src/Kernel/ConfigSchemaTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Drupal\rules\Context\ContextConfig;
-
-/**
- * Tests that action specfic config schema works.
- *
- * @group Rules
- */
-class ConfigSchemaTest extends RulesDrupalTestBase {
-
-  /**
-   * The entity storage for Rules config entities.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->storage = $this->container->get('entity_type.manager')->getStorage('rules_component');
-  }
-
-  /**
-   * Make sure the system send email config schema works on saving.
-   */
-  public function testMailActionContextSchema() {
-    $rule = $this->expressionManager
-      ->createRule();
-    $rule->addAction('rules_send_email', ContextConfig::create()
-      ->setValue('to', ['test@exmaple.com'])
-      ->setValue('message', 'mail body')
-      ->setValue('subject', 'test subject')
-    );
-
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-    ])->setExpression($rule);
-    $config_entity->save();
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/ConfigurableEventHandlerTest.php b/modules/rules/tests/src/Kernel/ConfigurableEventHandlerTest.php
deleted file mode 100644
index dac52d5..0000000
--- a/modules/rules/tests/src/Kernel/ConfigurableEventHandlerTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Event\EntityEvent;
-
-/**
- * Tests events with qualified name.
- *
- * @group Rules
- */
-class ConfigurableEventHandlerTest extends RulesDrupalTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['rules', 'system', 'node', 'field', 'user'];
-
-  /**
-   * The entity storage for Rules config entities.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * A node used for testing.
-   *
-   * @var \Drupal\node\NodeInterface
-   */
-  protected $node;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', ['sequences']);
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-    $this->installConfig(['field']);
-
-    $this->storage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
-
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    FieldStorageConfig::create([
-      'field_name' => 'field_integer',
-      'type' => 'integer',
-      'entity_type' => 'node',
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ])->save();
-    FieldConfig::create([
-      'field_name' => 'field_integer',
-      'entity_type' => 'node',
-      'bundle' => 'page',
-    ])->save();
-
-    $this->node = $entity_type_manager->getStorage('node')
-      ->create([
-        'title' => 'test',
-        'type' => 'page',
-      ]);
-  }
-
-  /**
-   * Tests ConfigurableEventHandlerEntityBundle.
-   *
-   * Test that rules are triggered correctly based upon the fully qualified
-   * event name as well as the base event name.
-   *
-   * @todo Add integrity check that node.field_integer is detected by Rules.
-   */
-  public function testConfigurableEventHandler() {
-    // Create rule1 with the 'rules_entity_presave:node--page' event.
-    $rule1 = $this->expressionManager->createRule();
-    $rule1->addAction('rules_test_log',
-      ContextConfig::create()
-        ->map('message', 'node.field_integer.0.value')
-    );
-    $config_entity1 = $this->storage->create([
-      'id' => 'test_rule1',
-    ]);
-    $config_entity1->set('events', [
-      ['event_name' => 'rules_entity_presave:node--page'],
-    ]);
-    $config_entity1->set('expression', $rule1->getConfiguration());
-    $config_entity1->save();
-
-    // Create rule2 with the 'rules_entity_presave:node' event.
-    $rule2 = $this->expressionManager->createRule();
-    $rule2->addAction('rules_test_log',
-      ContextConfig::create()
-        ->map('message', 'node.field_integer.1.value')
-    );
-    $config_entity2 = $this->storage->create([
-      'id' => 'test_rule2',
-    ]);
-    $config_entity2->set('events', [
-      ['event_name' => 'rules_entity_presave:node'],
-    ]);
-    $config_entity2->set('expression', $rule2->getConfiguration());
-    $config_entity2->save();
-
-    // The logger instance has changed, refresh it.
-    $this->logger = $this->container->get('logger.channel.rules');
-
-    // Add node.field_integer.0.value to rules log message, read result.
-    $this->node->field_integer->setValue(['0' => 11, '1' => 22]);
-
-    // Trigger node save.
-    $entity_type_id = $this->node->getEntityTypeId();
-    $event = new EntityEvent($this->node, [
-      $entity_type_id => $this->node,
-      $entity_type_id . '_unchanged' => $this->node,
-    ]);
-    $event_dispatcher = \Drupal::service('event_dispatcher');
-    $event_dispatcher->dispatch("rules_entity_presave:$entity_type_id", $event);
-
-    // Test that the action in the rule1 logged node value.
-    $this->assertRulesLogEntryExists(11, 1);
-    // Test that the action in the rule2 logged node value.
-    $this->assertRulesLogEntryExists(22, 0);
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/ContextIntegrationTest.php b/modules/rules/tests/src/Kernel/ContextIntegrationTest.php
deleted file mode 100644
index b0b7b3c..0000000
--- a/modules/rules/tests/src/Kernel/ContextIntegrationTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\rules\Exception\EvaluationException;
-
-/**
- * Tests the the extended core context API with Rules.
- *
- * @group Rules
- */
-class ContextIntegrationTest extends RulesDrupalTestBase {
-
-  /**
-   * Tests that a required context mapping that is NULL throws an exception.
-   */
-  public function testRequiredNullMapping() {
-    // Configure a simple rule with one action.
-    $action = $this->expressionManager->createInstance('rules_action',
-      ContextConfig::create()
-        ->setConfigKey('action_id', 'rules_test_string')
-        ->map('text', 'null_context')
-        ->toArray()
-    );
-
-    $rule = $this->expressionManager->createRule()
-      ->addExpressionObject($action);
-
-    $component = RulesComponent::create($rule)
-      ->addContextDefinition('null_context', ContextDefinition::create('string'))
-      ->setContextValue('null_context', NULL);
-
-    try {
-      $component->execute();
-      $this->fail('No exception thrown when required context value is NULL');
-    }
-    catch (EvaluationException $e) {
-      $this->pass('Exception thrown as expected when a required context is NULL');
-    }
-  }
-
-  /**
-   * Tests that a required context value that is NULL throws an exception.
-   */
-  public function testRequiredNullValue() {
-    // Configure a simple rule with one action. The required 'text' context is
-    // set to be NULL.
-    $action = $this->expressionManager->createInstance('rules_action',
-      ContextConfig::create()
-        ->setConfigKey('action_id', 'rules_test_string')
-        ->setValue('text', NULL)
-        ->toArray()
-    );
-
-    $rule = $this->expressionManager->createRule([]);
-    $rule->addExpressionObject($action);
-    try {
-      $rule->execute();
-      $this->fail('No exception thrown when required context value is NULL');
-    }
-    catch (EvaluationException $e) {
-      $this->pass('Exception thrown as expected when a required context is NULL');
-    }
-  }
-
-  /**
-   * Tests that NULL values for contexts are allowed if specified.
-   */
-  public function testAllowNullValue() {
-    // Configure a simple rule with the data set action which allows NULL
-    // values.
-    $action = $this->expressionManager->createInstance('rules_action',
-      ContextConfig::create()
-        ->setConfigKey('action_id', 'rules_data_set')
-        ->map('data', 'null_variable')
-        ->map('value', 'new_value')
-        ->toArray()
-    );
-
-    $rule = $this->expressionManager->createRule()
-      ->addExpressionObject($action);
-
-    $component = RulesComponent::create($rule)
-      ->addContextDefinition('null_variable', ContextDefinition::create('string'))
-      ->addContextDefinition('new_value', ContextDefinition::create('string'))
-      ->setContextValue('null_variable', NULL)
-      ->setContextValue('new_value', 'new value');
-
-    $component->execute();
-
-    $this->assertEquals('new value', $component->getState()->getVariableValue('null_variable'));
-  }
-
-  /**
-   * Tests the assignment restriction on context definitions.
-   */
-  public function testAssignmentRestriction() {
-    $action_manager = $this->container->get('plugin.manager.rules_action');
-
-    // Test the assignment restriction on the entity fetch action as an example.
-    $entity_fetch_action = $action_manager->createInstance('rules_entity_fetch_by_id');
-    $context_definition = $entity_fetch_action->getContextDefinition('type');
-    $this->assertEquals($context_definition->getAssignmentRestriction(), 'input');
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/CoreIntegrationTest.php b/modules/rules/tests/src/Kernel/CoreIntegrationTest.php
deleted file mode 100644
index a350e24..0000000
--- a/modules/rules/tests/src/Kernel/CoreIntegrationTest.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Drupal\node\Entity\Node;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\rules\Entity\RulesComponentConfig;
-use Drupal\user\Entity\User;
-
-/**
- * Test using Drupal core integration of Rules API.
- *
- * @group Rules
- */
-class CoreIntegrationTest extends RulesDrupalTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node', 'field', 'text', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', ['sequences']);
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-  }
-
-  /**
-   * Tests that a complex data selector can be applied to entities.
-   */
-  public function testEntityPropertyPath() {
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    $node = $entity_type_manager->getStorage('node')
-      ->create([
-        'title' => 'test',
-        'type' => 'page',
-      ]);
-
-    $user = $entity_type_manager->getStorage('user')
-      ->create([
-        'name' => 'test value',
-      ]);
-
-    $user->save();
-    $node->setOwner($user);
-
-    $rule = $this->expressionManager->createRule();
-
-    // Test that the long detailed data selector works.
-    $rule->addCondition('rules_test_string_condition', ContextConfig::create()
-      ->map('text', 'node.uid.0.entity.name.0.value')
-    );
-
-    // Test that the shortened data selector without list indices.
-    $rule->addCondition('rules_test_string_condition', ContextConfig::create()
-      ->map('text', 'node.uid.entity.name.value')
-    );
-
-    $rule->addAction('rules_test_log');
-
-    RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->setContextValue('node', $node)
-      ->execute();
-  }
-
-  /**
-   * Tests that an entity is automatically saved after being changed.
-   */
-  public function testEntityAutoSave() {
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    $node = $entity_type_manager->getStorage('node')
-      ->create([
-        'title' => 'test',
-        'type' => 'page',
-      ]);
-
-    // We use the rules_test_node action plugin which marks its node context for
-    // auto saving.
-    // @see \Drupal\rules_test\Plugin\RulesAction\TestNodeAction
-    $action = $this->expressionManager->createAction('rules_test_node')
-      ->setConfiguration(ContextConfig::create()
-        ->map('node', 'node')
-        ->map('title', 'title')
-        ->toArray()
-      );
-
-    RulesComponent::create($action)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->addContextDefinition('title', ContextDefinition::create('string'))
-      ->setContextValue('node', $node)
-      ->setContextValue('title', 'new title')
-      ->execute();
-    $this->assertNotNull($node->id(), 'Node ID is set, which means that the node has been saved.');
-  }
-
-  /**
-   * Tests that tokens in action parameters get replaced.
-   */
-  public function testTokenReplacements() {
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    $node = $entity_type_manager->getStorage('node')
-      ->create([
-        'title' => 'test',
-        'type' => 'page',
-      ]);
-
-    $user = $entity_type_manager->getStorage('user')
-      ->create([
-        'name' => 'klausi',
-      ]);
-
-    $user->save();
-    $node->setOwner($user);
-
-    // Configure a simple rule with one action.
-    $action = $this->expressionManager->createInstance('rules_action',
-      ContextConfig::create()
-        ->map('message', 'message')
-        ->map('type', 'type')
-        ->process('message', 'rules_tokens')
-        ->setConfigKey('action_id', 'rules_system_message')
-        ->toArray()
-    );
-
-    $rule = $this->expressionManager->createRule()
-      ->addExpressionObject($action);
-
-    RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->addContextDefinition('message', ContextDefinition::create('string'))
-      ->addContextDefinition('type', ContextDefinition::create('string'))
-      ->setContextValue('node', $node)
-      ->setContextValue('message', 'Hello {{ node.uid.entity.name.value }}!')
-      ->setContextValue('type', 'status')
-      ->execute();
-
-    $messages = drupal_set_message();
-    $this->assertEquals((string) $messages['status'][0], 'Hello klausi!');
-  }
-
-  /**
-   * Tests that tokens used to format entity fields get replaced.
-   */
-  public function testTokenFormattingReplacements() {
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    $node = $entity_type_manager->getStorage('node')
-      ->create([
-        'title' => 'test',
-        'type' => 'page',
-        // Set the created date to the first second in 1970.
-        'created' => 1,
-      ]);
-
-    // Configure a simple rule with one action.
-    $action = $this->expressionManager->createInstance('rules_action',
-      ContextConfig::create()
-        ->map('message', 'message')
-        ->map('type', 'type')
-        ->process('message', 'rules_tokens')
-        ->setConfigKey('action_id', 'rules_system_message')
-        ->toArray()
-    );
-
-    $rule = $this->expressionManager->createRule()
-      ->addExpressionObject($action);
-
-    RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->addContextDefinition('message', ContextDefinition::create('string'))
-      ->addContextDefinition('type', ContextDefinition::create('string'))
-      ->setContextValue('node', $node)
-      ->setContextValue('message', "The node was created in the year {{ node.created.value | format_date('custom', 'Y') }}")
-      ->setContextValue('type', 'status')
-      ->execute();
-
-    $messages = drupal_set_message();
-    $this->assertEquals((string) $messages['status'][0], 'The node was created in the year 1970');
-  }
-
-  /**
-   * Tests that the data set action works on entities.
-   */
-  public function testDataSetEntities() {
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    $node = $entity_type_manager->getStorage('node')
-      ->create([
-        'title' => 'test',
-        'type' => 'page',
-      ]);
-
-    // Configure a simple rule with one action.
-    $action = $this->expressionManager->createInstance('rules_action',
-      ContextConfig::create()
-        ->setConfigKey('action_id', 'rules_data_set')
-        ->map('data', 'node.title')
-        ->map('value', 'new_title')
-        ->toArray()
-    );
-
-    $rule = $this->expressionManager->createRule()
-      ->addExpressionObject($action);
-
-    RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->addContextDefinition('new_title', ContextDefinition::create('string'))
-      ->setContextValue('node', $node)
-      ->setContextValue('new_title', 'new title')
-      ->execute();
-
-    $this->assertEquals('new title', $node->getTitle());
-    $this->assertNotNull($node->id(), 'Node ID is set, which means that the node has been auto-saved.');
-  }
-
-  /**
-   * Tests that auto saving in a component executed as action works.
-   */
-  public function testComponentActionAutoSave() {
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    $nested_rule = $this->expressionManager->createRule();
-    // Create a node entity with the action.
-    $nested_rule->addAction('rules_entity_create:node', ContextConfig::create()
-      ->setValue('type', 'page')
-    );
-    // Set the title of the new node so that it is marked for auto-saving.
-    $nested_rule->addAction('rules_data_set', ContextConfig::create()
-      ->map('data', 'entity.title')
-      ->setValue('value', 'new title')
-    );
-
-    $rules_config = new RulesComponentConfig([
-      'id' => 'test_rule',
-      'label' => 'Test rule',
-    ], 'rules_component');
-    $rules_config->setExpression($nested_rule);
-    $rules_config->save();
-
-    // Invoke the rules component in another rule.
-    $rule = $this->expressionManager->createRule();
-    $rule->addAction('rules_component:test_rule');
-
-    RulesComponent::create($rule)->execute();
-
-    $nodes = Node::loadMultiple();
-    $node = reset($nodes);
-    $this->assertEquals('new title', $node->getTitle());
-    $this->assertNotNull($node->id(), 'Node ID is set, which means that the node has been auto-saved.');
-  }
-
-  /**
-   * Tests using global context.
-   */
-  public function testGlobalContext() {
-    $account = User::create([
-      'name' => 'hubert',
-    ]);
-    $account->save();
-    $this->container->get('current_user')->setAccount($account);
-
-    $rule = $this->expressionManager->createRule()
-      ->addAction('rules_system_message', ContextConfig::create()
-        ->map('message', '@user.current_user_context:current_user.name.value')
-        ->setValue('type', 'status')
-      );
-    $component = RulesComponent::create($rule);
-    $this->assertEquals(0, $component->checkIntegrity()->count());
-
-    // Ensure the execution-state is aware of global context.
-    $result = $component->getState()
-      ->hasVariable('@user.current_user_context:current_user');
-    $this->assertTrue($result);
-    // Test asking for non-existing variables.
-    $this->assertFalse($component->getState()
-      ->hasVariable('@user.current_user_context:invalid'));
-    $this->assertFalse($component->getState()
-      ->hasVariable('@user.invalid_service'));
-    $this->assertFalse($component->getState()
-      ->hasVariable('invalid-var'));
-
-    // Test using global context during execution.
-    $component->execute();
-    $messages = drupal_set_message();
-    $this->assertEquals((string) $messages['status'][0], 'hubert');
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/DataProcessorTest.php b/modules/rules/tests/src/Kernel/DataProcessorTest.php
deleted file mode 100644
index 9f71b48..0000000
--- a/modules/rules/tests/src/Kernel/DataProcessorTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Engine\RulesComponent;
-
-/**
- * Test the data processor plugins during Rules evaluation.
- *
- * @group Rules
- */
-class DataProcessorTest extends RulesDrupalTestBase {
-
-  /**
-   * Tests that the numeric offset plugin works.
-   */
-  public function testNumericOffset() {
-    // Configure a simple rule with one action.
-    $action = $this->expressionManager->createInstance('rules_action',
-      // @todo Actually the data processor plugin only applies to numbers, so is
-      // kind of an invalid configuration. Since the configuration is not
-      // validated during execution this works for now.
-      ContextConfig::create()
-        ->map('message', 'message')
-        ->map('type', 'type')
-        ->process('message', 'rules_numeric_offset', [
-          'offset' => 1,
-        ])
-        ->setConfigKey('action_id', 'rules_system_message')
-        ->toArray()
-    );
-
-    $component = RulesComponent::create($this->expressionManager->createRule())
-      ->addContextDefinition('message', ContextDefinition::create('string'))
-      ->addContextDefinition('type', ContextDefinition::create('string'))
-      ->setContextValue('message', 1)
-      ->setContextValue('type', 'status');
-
-    $component->getExpression()
-      ->addExpressionObject($action);
-
-    $component->execute();
-
-    $messages = drupal_set_message();
-    // The original value was 1 and the processor adds 1, so the result should
-    // be 2.
-    $this->assertEquals((string) $messages['status'][0], '2');
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/Engine/AutocompleteTest.php b/modules/rules/tests/src/Kernel/Engine/AutocompleteTest.php
deleted file mode 100644
index c3bed6a..0000000
--- a/modules/rules/tests/src/Kernel/Engine/AutocompleteTest.php
+++ /dev/null
@@ -1,366 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel\Engine;
-
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\Tests\rules\Kernel\RulesDrupalTestBase;
-
-/**
- * Tests that data selector autocomplete results work correctly.
- *
- * @group Rules
- */
-class AutocompleteTest extends RulesDrupalTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['field', 'rules', 'node', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('user');
-
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    // Create a multi-value integer field for testing.
-    FieldStorageConfig::create([
-      'field_name' => 'field_integer',
-      'type' => 'integer',
-      'entity_type' => 'node',
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ])->save();
-    FieldConfig::create([
-      'field_name' => 'field_integer',
-      'entity_type' => 'node',
-      'bundle' => 'page',
-    ])->save();
-  }
-
-  /**
-   * Tests autocompletion works for a variable in the metadata state.
-   */
-  public function testAutocomplete() {
-    $rule = $this->expressionManager->createRule();
-    $action = $this->expressionManager->createAction('rules_data_set');
-    $rule->addExpressionObject($action);
-
-    $results = RulesComponent::create($rule)
-      ->addContextDefinition('entity', ContextDefinition::create('entity'))
-      ->autocomplete('e', $action);
-
-    $this->assertSame([
-      [
-        'value' => 'entity',
-        'label' => 'entity',
-      ],
-      [
-        'value' => 'entity.',
-        'label' => 'entity...',
-      ],
-    ], $results);
-  }
-
-  /**
-   * Test various node example data selectors.
-   */
-  public function testNodeAutocomplete() {
-    $rule = $this->expressionManager->createRule();
-    $rule->addAction('rules_data_set');
-
-    $component = RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node:page'));
-
-    // Tests that "node.uid.en" returns the suggestion "node.uid.entity".
-    $results = $component->autocomplete('node.uid.en');
-    $this->assertSame([
-      [
-        'value' => 'node.uid.entity',
-        'label' => 'node.uid.entity (User)',
-      ],
-      [
-        'value' => 'node.uid.entity.',
-        'label' => 'node.uid.entity... (User)',
-      ],
-    ], $results);
-
-    // Tests that "node." returns all available fields on a node.
-    $results = $component->autocomplete('node.');
-    $expected = [
-      [
-        'value' => 'node.changed',
-        'label' => 'node.changed (Changed)',
-      ],
-      [
-        'value' => 'node.changed.',
-        'label' => 'node.changed... (Changed)',
-      ],
-      [
-        'value' => 'node.created',
-        'label' => 'node.created (Authored on)',
-      ],
-      [
-        'value' => 'node.created.',
-        'label' => 'node.created... (Authored on)',
-      ],
-      [
-        'value' => 'node.default_langcode',
-        'label' => 'node.default_langcode (Default translation)',
-      ],
-      [
-        'value' => 'node.default_langcode.',
-        'label' => 'node.default_langcode... (Default translation)',
-      ],
-      [
-        'value' => 'node.field_integer',
-        'label' => 'node.field_integer (field_integer)',
-      ],
-      [
-        'value' => 'node.field_integer.',
-        'label' => 'node.field_integer... (field_integer)',
-      ],
-      [
-        'value' => 'node.langcode',
-        'label' => 'node.langcode (Language)',
-      ],
-      [
-        'value' => 'node.langcode.',
-        'label' => 'node.langcode... (Language)',
-      ],
-      [
-        'value' => 'node.nid',
-        // @todo Remove this once Drupal 8.0.x is unsupported.
-        'label' => version_compare(substr(\Drupal::VERSION, 0, 5), '8.1.0') === -1 ? 'node.nid (Node ID)' : 'node.nid (ID)',
-      ],
-      [
-        'value' => 'node.nid.',
-        // @todo Remove this once Drupal 8.0.x is unsupported.
-        'label' => version_compare(substr(\Drupal::VERSION, 0, 5), '8.1.0') === -1 ? 'node.nid... (Node ID)' : 'node.nid... (ID)',
-      ],
-      [
-        'value' => 'node.promote',
-        'label' => 'node.promote (Promoted to front page)',
-      ],
-      [
-        'value' => 'node.promote.',
-        'label' => 'node.promote... (Promoted to front page)',
-      ],
-      [
-        'value' => 'node.revision_log',
-        'label' => 'node.revision_log (Revision log message)',
-      ],
-      [
-        'value' => 'node.revision_log.',
-        'label' => 'node.revision_log... (Revision log message)',
-      ],
-      [
-        'value' => 'node.revision_timestamp',
-        // @todo In Drupal 8.4.x the text changed from (Revision timestamp) to
-        // (Revision create time). Remove this once 8.3.x is unsupported.
-        'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.revision_timestamp (Revision create time)' : 'node.revision_timestamp (Revision timestamp)',
-      ],
-      [
-        'value' => 'node.revision_timestamp.',
-        // @todo In Drupal 8.4.x the text changed from (Revision timestamp) to
-        // (Revision create time). Remove this once 8.3.x is unsupported.
-        'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.revision_timestamp... (Revision create time)' : 'node.revision_timestamp... (Revision timestamp)',
-      ],
-      [
-        'value' => 'node.revision_translation_affected',
-        'label' => 'node.revision_translation_affected (Revision translation affected)',
-      ],
-      [
-        'value' => 'node.revision_translation_affected.',
-        'label' => 'node.revision_translation_affected... (Revision translation affected)',
-      ],
-      [
-        'value' => 'node.revision_uid',
-        // @todo In Drupal 8.4.x the text changed from (Revision user ID) to
-        // (Revision user). Remove this once 8.3.x is unsupported.
-        'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.revision_uid (Revision user)' : 'node.revision_uid (Revision user ID)',
-      ],
-      [
-        'value' => 'node.revision_uid.',
-        // @todo In Drupal 8.4.x the text changed from (Revision user ID) to
-        // (Revision user). Remove this once 8.3.x is unsupported.
-        'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.revision_uid... (Revision user)' : 'node.revision_uid... (Revision user ID)',
-      ],
-      [
-        'value' => 'node.status',
-        // In Core 8.4 the text has changed from Publishing Status to Published.
-        // @todo Remove this version checking when 8.3.x is unsupported.
-        'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.status (Published)' : 'node.status (Publishing status)',
-      ],
-      [
-        'value' => 'node.status.',
-        // In Core 8.4 the text has changed from Publishing Status to Published.
-        // @todo Remove this version checking when 8.3.x is unsupported.
-        'label' => version_compare(substr(\Drupal::VERSION, 0, 3), '8.4', '>=') ? 'node.status... (Published)' : 'node.status... (Publishing status)',
-      ],
-      [
-        'value' => 'node.sticky',
-        'label' => 'node.sticky (Sticky at top of lists)',
-      ],
-      [
-        'value' => 'node.sticky.',
-        'label' => 'node.sticky... (Sticky at top of lists)',
-      ],
-      [
-        'value' => 'node.title',
-        'label' => 'node.title (Title)',
-      ],
-      [
-        'value' => 'node.title.',
-        'label' => 'node.title... (Title)',
-      ],
-      [
-        'value' => 'node.type',
-        // @todo Remove this once Drupal 8.0.x is unsupported.
-        'label' => version_compare(substr(\Drupal::VERSION, 0, 5), '8.1.0') === -1 ? 'node.type (Type)' : 'node.type (Content type)',
-      ],
-      [
-        'value' => 'node.type.',
-        // @todo Remove this once Drupal 8.0.x is unsupported.
-        'label' => version_compare(substr(\Drupal::VERSION, 0, 5), '8.1.0') === -1 ? 'node.type... (Type)' : 'node.type... (Content type)',
-      ],
-      [
-        'value' => 'node.uid',
-        'label' => 'node.uid (Authored by)',
-      ],
-      [
-        'value' => 'node.uid.',
-        'label' => 'node.uid... (Authored by)',
-      ],
-      [
-        'value' => 'node.uuid',
-        'label' => 'node.uuid (UUID)',
-      ],
-      [
-        'value' => 'node.uuid.',
-        'label' => 'node.uuid... (UUID)',
-      ],
-      [
-        'value' => 'node.vid',
-        'label' => 'node.vid (Revision ID)',
-      ],
-      [
-        'value' => 'node.vid.',
-        'label' => 'node.vid... (Revision ID)',
-      ],
-    ];
-    // Because this is a huge array run the assertion per entry because that is
-    // easier for debugging.
-    foreach ($expected as $index => $entry) {
-      $this->assertSame($entry, $results[$index]);
-    }
-
-    // Tests that "node.uid.entity.na" returns "node.uid.entity.name".
-    $results = $component->autocomplete('node.uid.entity.na');
-    $this->assertSame([
-      [
-        'value' => 'node.uid.entity.name',
-        'label' => 'node.uid.entity.name (Name)',
-      ],
-      [
-        'value' => 'node.uid.entity.name.',
-        'label' => 'node.uid.entity.name... (Name)',
-      ],
-    ], $results);
-
-    // A multi-valued field should show numeric indices suggestions.
-    $results = $component->autocomplete('node.field_integer.');
-    $this->assertSame([
-      [
-        'value' => 'node.field_integer.0',
-        'label' => 'node.field_integer.0',
-      ],
-      [
-        'value' => 'node.field_integer.0.',
-        'label' => 'node.field_integer.0...',
-      ],
-      [
-        'value' => 'node.field_integer.1',
-        'label' => 'node.field_integer.1',
-      ],
-      [
-        'value' => 'node.field_integer.1.',
-        'label' => 'node.field_integer.1...',
-      ],
-      [
-        'value' => 'node.field_integer.2',
-        'label' => 'node.field_integer.2',
-      ],
-      [
-        'value' => 'node.field_integer.2.',
-        'label' => 'node.field_integer.2...',
-      ],
-      [
-        'value' => 'node.field_integer.value',
-        'label' => 'node.field_integer.value (Integer value)',
-      ],
-    ], $results);
-
-    // A single-valued field should not show numeric indices suggestions.
-    $results = $component->autocomplete('node.title.');
-    $this->assertSame([
-      [
-        'value' => 'node.title.value',
-        'label' => 'node.title.value (Text value)',
-      ],
-    ], $results);
-
-    // A single-valued field should not show numeric indices suggestions.
-    $results = $component->autocomplete('n');
-    $this->assertSame([
-      [
-        'value' => 'node',
-        'label' => 'node',
-      ],
-      [
-        'value' => 'node.',
-        'label' => 'node...',
-      ],
-    ], $results);
-  }
-
-  /**
-   * Tests that autocomplete results for a flat list are correct.
-   */
-  public function testListAutocomplete() {
-    $rule = $this->expressionManager->createRule();
-    $rule->addAction('rules_data_set');
-
-    $context_definition = ContextDefinition::create('integer');
-    $context_definition->setMultiple();
-    $component = RulesComponent::create($rule)
-      ->addContextDefinition('list', $context_definition);
-
-    $results = $component->autocomplete('list.');
-    $this->assertSame([
-      [
-        'value' => 'list.0',
-        'label' => 'list.0',
-      ],
-      [
-        'value' => 'list.1',
-        'label' => 'list.1',
-      ],
-      [
-        'value' => 'list.2',
-        'label' => 'list.2',
-      ],
-    ], $results);
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/Engine/MetadataAssertionTest.php b/modules/rules/tests/src/Kernel/Engine/MetadataAssertionTest.php
deleted file mode 100644
index ad0fac1..0000000
--- a/modules/rules/tests/src/Kernel/Engine/MetadataAssertionTest.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel\Engine;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\Tests\rules\Kernel\RulesDrupalTestBase;
-
-/**
- * Tests asserting metadata works correctly.
- *
- * @group Rules
- */
-class MetadataAssertionTest extends RulesDrupalTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'rules',
-    'typed_data',
-    'system',
-    'node',
-    'field',
-    'user',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', ['sequences']);
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-    $this->installConfig(['field']);
-
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    FieldStorageConfig::create([
-      'field_name' => 'field_text',
-      'type' => 'string',
-      'entity_type' => 'node',
-      'cardinality' => 1,
-    ])->save();
-    FieldConfig::create([
-      'field_name' => 'field_text',
-      'entity_type' => 'node',
-      'bundle' => 'page',
-    ])->save();
-  }
-
-  /**
-   * Tests asserting metadata using the EntityIfOfBundle condition.
-   */
-  public function testAssertingEntityBundle() {
-    // When trying to use the field_text field without knowledge of the bundle,
-    // the field is not available.
-    $rule = $this->expressionManager->createRule();
-    $rule->addAction('rules_system_message', ContextConfig::create()
-      ->map('message', 'node.field_text.value')
-      ->setValue('type', 'status')
-    );
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-    $this->assertEquals(
-      'Data selector %selector for context %context_name is invalid. @message',
-      $violation_list->get(0)->getMessage()->getUntranslatedString()
-    );
-
-    // Now add the EntityIsOfBundle condition and try again.
-    $rule->addCondition('rules_entity_is_of_bundle', ContextConfig::create()
-      ->map('entity', 'node')
-      ->setValue('type', 'node')
-      ->setValue('bundle', 'page')
-    );
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->checkIntegrity();
-    $this->assertEquals(0, iterator_count($violation_list));
-  }
-
-  /**
-   * Tests asserted metadata is handled correctly in OR and AND containers.
-   */
-  public function testAssertingWithLogicalOperations() {
-    // Add an nested AND and make sure it keeps working.
-    $rule = $this->expressionManager->createRule();
-    $and = $this->expressionManager->createAnd();
-    $and->addCondition('rules_entity_is_of_bundle', ContextConfig::create()
-      ->map('entity', 'node')
-      ->setValue('type', 'node')
-      ->setValue('bundle', 'page')
-    );
-    $rule->addExpressionObject($and);
-    $rule->addAction('rules_system_message', ContextConfig::create()
-      ->map('message', 'node.field_text.value')
-      ->setValue('type', 'status')
-    );
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->checkIntegrity();
-    $this->assertEquals(0, iterator_count($violation_list));
-
-    // Add an nested OR and make sure it is ignored.
-    $rule = $this->expressionManager->createRule();
-    $or = $this->expressionManager->createOr();
-    $or->addCondition('rules_entity_is_of_bundle', ContextConfig::create()
-      ->map('entity', 'node')
-      ->setValue('type', 'node')
-      ->setValue('bundle', 'page')
-    );
-    $rule->addExpressionObject($or);
-    $rule->addAction('rules_system_message', ContextConfig::create()
-      ->map('message', 'node.field_text.value')
-      ->setValue('type', 'status')
-    );
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-  }
-
-  /**
-   * Tests asserted metadata of negated conditions is ignored.
-   */
-  public function testAssertingOfNegatedConditions() {
-    // Negate the condition only and make sure it is ignored.
-    $rule = $this->expressionManager->createRule();
-    $rule->addCondition('rules_entity_is_of_bundle', ContextConfig::create()
-      ->map('entity', 'node')
-      ->setValue('type', 'node')
-      ->setValue('bundle', 'page')
-    )->negate(TRUE);
-    $rule->addAction('rules_system_message', ContextConfig::create()
-      ->map('message', 'node.field_text.value')
-      ->setValue('type', 'status')
-    );
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-
-    // Add an negated AND and make sure it is ignored.
-    $rule = $this->expressionManager->createRule();
-    $and = $this->expressionManager->createAnd();
-    $and->addCondition('rules_entity_is_of_bundle', ContextConfig::create()
-      ->map('entity', 'node')
-      ->setValue('type', 'node')
-      ->setValue('bundle', 'page')
-    );
-    $and->negate(TRUE);
-    $rule->addExpressionObject($and);
-    $rule->addAction('rules_system_message', ContextConfig::create()
-      ->map('message', 'node.field_text.value')
-      ->setValue('type', 'status')
-    );
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/EntityViewTest.php b/modules/rules/tests/src/Kernel/EntityViewTest.php
deleted file mode 100644
index 41ace4b..0000000
--- a/modules/rules/tests/src/Kernel/EntityViewTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-/**
- * Tests that rules_entity_view() does not throw fatal errors.
- *
- * @group Rules
- */
-class EntityViewTest extends RulesDrupalTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['field', 'node', 'text', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->installConfig(['system']);
-    $this->installConfig(['field']);
-    $this->installConfig(['node']);
-    $this->installSchema('system', ['sequences']);
-
-    // Drupal 8.0.x needs the router table installed which is done automatically
-    // in Drupal 8.1.x. Remove this once Drupal 8.0.x is unsupported.
-    if (!empty(drupal_get_module_schema('system', 'router'))) {
-      $this->installSchema('system', ['router']);
-    }
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-
-    // Make sure that the node routes get picked when used during rendering.
-    $this->container->get('router.builder')->rebuild();
-  }
-
-  /**
-   * Tests that rules_entity_view() can be invoked correctly.
-   */
-  public function testEntityViewHook() {
-    // Create a node.
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create([
-        'type' => 'page',
-        'display_submitted' => FALSE,
-      ])
-      ->save();
-
-    $node = $entity_type_manager->getStorage('node')
-      ->create([
-        'title' => 'test',
-        'type' => 'page',
-      ]);
-    $node->save();
-
-    // Build the node render array and render it, so that hook_entity_view() is
-    // invoked.
-    $view_builder = $entity_type_manager->getViewBuilder('node');
-    $build = $view_builder->view($node);
-    $this->container->get('renderer')->renderPlain($build);
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/EventIntegrationTest.php b/modules/rules/tests/src/Kernel/EventIntegrationTest.php
deleted file mode 100644
index 5f7b4ff..0000000
--- a/modules/rules/tests/src/Kernel/EventIntegrationTest.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Drupal\rules\Context\ContextConfig;
-use Drupal\user\Entity\User;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-/**
- * Test for the Symfony event mapping to Rules events.
- *
- * @group RulesEvent
- */
-class EventIntegrationTest extends RulesDrupalTestBase {
-
-  /**
-   * The entity storage for Rules config entities.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['field', 'node', 'text', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->storage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
-
-    $this->installConfig(['system']);
-    $this->installConfig(['field']);
-    $this->installConfig(['node']);
-    $this->installSchema('node', ['node_access']);
-    $this->installSchema('system', ['sequences']);
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-  }
-
-  /**
-   * Test that the user login hook triggers the Rules event listener.
-   */
-  public function testUserLoginEvent() {
-    $rule = $this->expressionManager->createRule();
-    $rule->addCondition('rules_test_true');
-    $rule->addAction('rules_test_log',
-      ContextConfig::create()
-        ->map('message', 'account.name.0.value')
-    );
-
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-      'events' => [['event_name' => 'rules_user_login']],
-      'expression' => $rule->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // The logger instance has changed, refresh it.
-    $this->logger = $this->container->get('logger.channel.rules');
-
-    $account = User::create(['name' => 'test_user']);
-    // Invoke the hook manually which should trigger the rule.
-    rules_user_login($account);
-
-    // Test that the action in the rule logged something.
-    $this->assertRulesLogEntryExists('test_user');
-  }
-
-  /**
-   * Test that the user logout hook triggers the Rules event listener.
-   */
-  public function testUserLogoutEvent() {
-    $rule = $this->expressionManager->createRule();
-    $rule->addCondition('rules_test_true');
-    $rule->addAction('rules_test_log');
-
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-      'events' => [['event_name' => 'rules_user_logout']],
-      'expression' => $rule->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // The logger instance has changed, refresh it.
-    $this->logger = $this->container->get('logger.channel.rules');
-
-    $account = $this->container->get('current_user');
-    // Invoke the hook manually which should trigger the rule.
-    rules_user_logout($account);
-
-    // Test that the action in the rule logged something.
-    $this->assertRulesLogEntryExists('action called');
-  }
-
-  /**
-   * Test that the cron hook triggers the Rules event listener.
-   */
-  public function testCronEvent() {
-    $rule = $this->expressionManager->createRule();
-    $rule->addCondition('rules_test_true');
-    $rule->addAction('rules_test_log');
-
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-      'events' => [['event_name' => 'rules_system_cron']],
-      'expression' => $rule->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // The logger instance has changed, refresh it.
-    $this->logger = $this->container->get('logger.channel.rules');
-
-    // Run cron.
-    $this->container->get('cron')->run();
-
-    // Test that the action in the rule logged something.
-    $this->assertRulesLogEntryExists('action called');
-  }
-
-  /**
-   * Test that a Logger message trigger the Rules logger listener.
-   */
-  public function testSystemLoggerEvent() {
-    $rule = $this->expressionManager->createRule();
-    $rule->addCondition('rules_test_true');
-    $rule->addAction('rules_test_log');
-
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-      'events' => [['event_name' => 'rules_system_logger_event']],
-      'expression' => $rule->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // The logger instance has changed, refresh it.
-    $this->logger = $this->container->get('logger.channel.rules');
-
-    // Creates a logger-item, that must be dispatched as event.
-    $this->container->get('logger.factory')->get('rules_test')
-      ->notice("This message must get logged and dispatched as rules_system_logger_event");
-
-    // Test that the action in the rule logged something.
-    $this->assertRulesLogEntryExists('action called');
-  }
-
-  /**
-   * Test that Drupal initializing triggers the Rules logger listener.
-   */
-  public function testInitEvent() {
-    $rule = $this->expressionManager->createRule();
-    $rule->addCondition('rules_test_true');
-    $rule->addAction('rules_test_log');
-
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-      'events' => [['event_name' => KernelEvents::REQUEST]],
-      'expression' => $rule->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // The logger instance has changed, refresh it.
-    $this->logger = $this->container->get('logger.channel.rules');
-
-    $dispatcher = $this->container->get('event_dispatcher');
-
-    // Remove all the listeners except Rules before triggering an event.
-    $listeners = $dispatcher->getListeners(KernelEvents::REQUEST);
-    foreach ($listeners as $listener) {
-      if (empty($listener[1]) || $listener[1] != 'onRulesEvent') {
-        $dispatcher->removeListener(KernelEvents::REQUEST, $listener);
-      }
-    }
-    // Manually trigger the initialization event.
-    $dispatcher->dispatch(KernelEvents::REQUEST);
-
-    // Test that the action in the rule logged something.
-    $this->assertRulesLogEntryExists('action called');
-  }
-
-  /**
-   * Test that rules config supports multiple events.
-   */
-  public function testMultipleEvents() {
-    $rule = $this->expressionManager->createRule();
-    $rule->addCondition('rules_test_true');
-    $rule->addAction('rules_test_log');
-
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-    ]);
-    $config_entity->set('events', [
-      ['event_name' => 'rules_user_login'],
-      ['event_name' => 'rules_user_logout'],
-    ]);
-    $config_entity->set('expression', $rule->getConfiguration());
-    $config_entity->save();
-
-    // The logger instance has changed, refresh it.
-    $this->logger = $this->container->get('logger.channel.rules');
-
-    $account = User::create(['name' => 'test_user']);
-    // Invoke the hook manually which should trigger the rules_user_login event.
-    rules_user_login($account);
-    // Invoke the hook manually which should trigger the rules_user_logout
-    // event.
-    rules_user_logout($account);
-
-    // Test that the action in the rule logged something.
-    $this->assertRulesLogEntryExists('action called');
-    $this->assertRulesLogEntryExists('action called', 1);
-  }
-
-  /**
-   * Tests that the entity presave/update events work with original entities.
-   *
-   * @param string $event_name
-   *   The event name that should be configured in the test rule.
-   *
-   * @dataProvider providerTestEntityOriginal
-   */
-  public function testEntityOriginal($event_name) {
-    // Create a node that we will change and save later.
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create([
-        'type' => 'page',
-        'display_submitted' => FALSE,
-      ])
-      ->save();
-
-    $node = $entity_type_manager->getStorage('node')
-      ->create([
-        'title' => 'test',
-        'type' => 'page',
-      ]);
-    $node->save();
-
-    // Create a rule with a condition to compare the changed node title. If the
-    // title has changed the action is executed.
-    $rule = $this->expressionManager->createRule();
-    $rule->addCondition('rules_data_comparison', ContextConfig::create()
-      ->map('data', 'node.title.value')
-      ->map('value', 'node_unchanged.title.value')
-      ->negateResult()
-    );
-    $rule->addAction('rules_test_log');
-
-    $config_entity = $this->storage->create([
-      'id' => 'test_rule',
-      'events' => [['event_name' => $event_name]],
-      'expression' => $rule->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // The logger instance has changed, refresh it.
-    $this->logger = $this->container->get('logger.channel.rules');
-
-    // Now change the title and trigger the presave event by savoing the node.
-    $node->setTitle('new title');
-    $node->save();
-
-    $this->assertRulesLogEntryExists('action called');
-  }
-
-  /**
-   * Provides test data for testentityOrigfinal().
-   */
-  public function providerTestEntityOriginal() {
-    return [
-      ['rules_entity_presave:node'],
-      ['rules_entity_update:node'],
-    ];
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/RedirectEventSubscriberTest.php b/modules/rules/tests/src/Kernel/RedirectEventSubscriberTest.php
deleted file mode 100644
index 65db584..0000000
--- a/modules/rules/tests/src/Kernel/RedirectEventSubscriberTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Tests rules redirect action event subscriber.
- *
- * @coversDefaultClass \Drupal\rules\EventSubscriber\RedirectEventSubscriber
- *
- * @group RulesEvent
- */
-class RedirectEventSubscriberTest extends RulesDrupalTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Drupal 8.0.x needs the router table installed which is done automatically
-    // in Drupal 8.1.x. Remove this once Drupal 8.0.x is unsupported.
-    if (!empty(drupal_get_module_schema('system', 'router'))) {
-      $this->installSchema('system', ['router']);
-      $this->container->get('router.builder')->rebuild();
-    }
-  }
-
-  /**
-   * Test the response is a redirect if a redirect url is added to the request.
-   *
-   * @covers ::checkRedirectIssued
-   */
-  public function testCheckRedirectIssued() {
-    /** @var \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel */
-    $http_kernel = $this->container->get('http_kernel');
-
-    $request = Request::create('/');
-    $request->attributes->set('_rules_redirect_action_url', '/test/redirect/url');
-
-    $response = $http_kernel->handle($request);
-
-    $this->assertInstanceOf(RedirectResponse::class, $response, "The response is a redirect.");
-    $this->assertEquals('/test/redirect/url', $response->getTargetUrl(), "The redirect target is the provided url.");
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/RulesDrupalTestBase.php b/modules/rules/tests/src/Kernel/RulesDrupalTestBase.php
deleted file mode 100644
index fb14451..0000000
--- a/modules/rules/tests/src/Kernel/RulesDrupalTestBase.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Base class for Rules Drupal unit tests.
- */
-abstract class RulesDrupalTestBase extends KernelTestBase {
-
-  /**
-   * The expression plugin manager.
-   *
-   * @var \Drupal\rules\Engine\ExpressionManager
-   */
-  protected $expressionManager;
-
-  /**
-   * The condition plugin manager.
-   *
-   * @var \Drupal\Core\Condition\ConditionManager
-   */
-  protected $conditionManager;
-
-  /**
-   * The typed data manager.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManager
-   */
-  protected $typedDataManager;
-
-  /**
-   * Rules logger.
-   *
-   * @var \Drupal\rules\Logger\RulesLoggerChannel
-   */
-  protected $logger;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'rules',
-    'rules_test',
-    'system',
-    'typed_data',
-    'user',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->logger = $this->container->get('logger.channel.rules');
-    // Clear the log from any stale entries that are bleeding over from previous
-    // tests.
-    $this->logger->clearLogs();
-
-    $this->expressionManager = $this->container->get('plugin.manager.rules_expression');
-    $this->conditionManager = $this->container->get('plugin.manager.condition');
-    $this->typedDataManager = $this->container->get('typed_data_manager');
-  }
-
-  /**
-   * Creates a new condition.
-   *
-   * @param string $id
-   *   The condition plugin id.
-   *
-   * @return \Drupal\rules\Core\RulesConditionInterface
-   *   The created condition plugin.
-   */
-  protected function createCondition($id) {
-    $condition = $this->expressionManager->createInstance('rules_condition', [
-      'condition_id' => $id,
-    ]);
-    return $condition;
-  }
-
-  /**
-   * Checks if particular message is in the log with given delta.
-   *
-   * @param string $message
-   *   Log message.
-   * @param int $log_item_index
-   *   Log item's index in log entries stack.
-   */
-  protected function assertRulesLogEntryExists($message, $log_item_index = 0) {
-    // Test that the action has logged something.
-    $logs = $this->logger->getLogs();
-    $this->assertEqual($logs[$log_item_index]['message'], $message);
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/RulesEngineTest.php b/modules/rules/tests/src/Kernel/RulesEngineTest.php
deleted file mode 100644
index 5ff207c..0000000
--- a/modules/rules/tests/src/Kernel/RulesEngineTest.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Drupal\rules\Core\ConditionManager;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\rules\Engine\ExecutionState;
-
-/**
- * Test using the Rules API to create and evaluate rules.
- *
- * @group Rules
- */
-class RulesEngineTest extends RulesDrupalTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('user');
-  }
-
-  /**
-   * Tests creating a rule and iterating over the rule elements.
-   */
-  public function testRuleCreation() {
-    // Create an 'and' condition container and add conditions to it.
-    $and = $this->expressionManager->createAnd()
-      ->addCondition('rules_test_false')
-      ->addCondition('rules_test_true', ContextConfig::create()->negateResult())
-      ->negate();
-
-    // Test that the 'and' condition container evaluates to TRUE.
-    $this->assertTrue($and->execute());
-
-    // Create an 'or' condition container and add conditions to it, including
-    // the previously created 'and' condition container.
-    $or = $this->expressionManager->createOr()
-      ->addCondition('rules_test_true', ContextConfig::create()->negateResult())
-      ->addCondition('rules_test_false')
-      ->addExpressionObject($and);
-
-    // Test that the 'or' condition container evaluates to TRUE.
-    $this->assertTrue($or->execute());
-
-    // Create a rule and add conditions to it, including the previously created
-    // 'or' condition container.
-    $rule = $this->expressionManager->createRule();
-    $rule->addCondition('rules_test_true')
-      ->addCondition('rules_test_true')
-      ->addExpressionObject($or);
-
-    // Test that the rule's condition container evaluates to TRUE.
-    $this->assertTrue($rule->getConditions()->execute());
-
-    // Add an action to it and execute the rule.
-    $rule->addAction('rules_test_log');
-    $rule->execute();
-
-    // Test that the action logged something.
-    $this->assertRulesLogEntryExists('action called');
-  }
-
-  /**
-   * Tests passing a string context to a condition.
-   */
-  public function testContextPassing() {
-    $rule = $this->expressionManager->createRule();
-
-    $rule->addCondition('rules_test_string_condition', ContextConfig::create()
-      ->map('text', 'test')
-    );
-    $rule->addAction('rules_test_log');
-
-    RulesComponent::create($rule)
-      ->addContextDefinition('test', ContextDefinition::create('string'))
-      ->setContextValue('test', 'test value')
-      ->execute();
-
-    // Test that the action logged something.
-    $this->assertRulesLogEntryExists('action called');
-  }
-
-  /**
-   * Tests that a condition can provide a value and another one can consume it.
-   */
-  public function testProvidedVariables() {
-    $rule = $this->expressionManager->createRule();
-
-    // The first condition provides a "provided_text" variable.
-    $rule->addCondition('rules_test_provider');
-    // The second condition consumes the variable.
-    $rule->addCondition('rules_test_string_condition', ContextConfig::create()
-      ->map('text', 'provided_text')
-    );
-
-    $rule->addAction('rules_test_log');
-
-    $component = RulesComponent::create($rule);
-
-    $violations = $component->checkIntegrity();
-    $this->assertEquals(0, iterator_count($violations));
-
-    $component->execute();
-    // Test that the action logged something.
-    $this->assertRulesLogEntryExists('action called');
-  }
-
-  /**
-   * Tests that provided variables can be renamed with configuration.
-   */
-  public function testRenamingOfProvidedVariables() {
-    $rule = $this->expressionManager->createRule();
-
-    // The condition provides a "provided_text" variable.
-    $rule->addCondition('rules_test_provider', ContextConfig::create()
-      ->provideAs('provided_text', 'newname')
-    );
-
-    $state = ExecutionState::create();
-    $rule->executeWithState($state);
-
-    // Check that the newly named variable exists and has the provided value.
-    $variable = $state->getVariable('newname');
-    $this->assertEqual($variable->getValue(), 'test value');
-  }
-
-  /**
-   * Tests that multiple actions can consume and provide context variables.
-   */
-  public function testActionProvidedContext() {
-    // @todo: Convert the test to make use of actions instead of conditions.
-    $rule = $this->expressionManager->createRule();
-
-    // The condition provides a "provided_text" variable.
-    $rule->addCondition('rules_test_provider');
-
-    // The action provides a "concatenated" variable.
-    $rule->addAction('rules_test_string', ContextConfig::create()
-      ->map('text', 'provided_text')
-    );
-
-    // Add the same action again which will provide a "concatenated2" variable
-    // now.
-    $rule->addAction('rules_test_string', ContextConfig::create()
-      ->map('text', 'concatenated')
-      ->provideAs('concatenated', 'concatenated2')
-    );
-
-    $state = ExecutionState::create();
-    $rule->executeWithState($state);
-
-    // Check that the created variables exists and have the provided values.
-    $concatenated = $state->getVariable('concatenated');
-    $this->assertEqual($concatenated->getValue(), 'test valuetest value');
-    $concatenated2 = $state->getVariable('concatenated2');
-    $this->assertEqual($concatenated2->getValue(), 'test valuetest valuetest valuetest value');
-  }
-
-  /**
-   * Verifies swapping out core services works.
-   */
-  public function testSwappedCoreServices() {
-    $condition_manager = $this->container->get('plugin.manager.condition');
-    $this->assertTrue($condition_manager instanceof ConditionManager);
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/RulesMailTest.php b/modules/rules/tests/src/Kernel/RulesMailTest.php
deleted file mode 100644
index 7452c9b..0000000
--- a/modules/rules/tests/src/Kernel/RulesMailTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-/**
- * Tests that mails actually go out twith send email action.
- *
- * @group Rules
- */
-class RulesMailTest extends RulesDrupalTestBase {
-
-  /**
-   * The action manager used to instantiate the action plugin.
-   *
-   * @var \Drupal\rules\Core\RulesActionManagerInterface
-   */
-  protected $actionManager;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['rules'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    // Use the state system collector mail backend.
-    $this->container->get('config.factory')->getEditable('system.mail')
-      ->set('interface.default', 'test_mail_collector')
-      ->save();
-
-    // Reset the state variable that holds sent messages.
-    $this->container->get('state')->set('system.test_mail_collector', []);
-
-    $this->actionManager = $this->container->get('plugin.manager.rules_action');
-  }
-
-  /**
-   * Checks the From: and Reply-to: headers.
-   */
-  public function testSubjectAndBody() {
-    // Create action to send email.
-    $action = $this->actionManager->createInstance('rules_send_email');
-
-    // Add context values to action.
-    $action->setContextValue('to', ['mail@example.com'])
-      ->setContextValue('subject', 'subject')
-      ->setContextValue('message', 'hello');
-
-    // Send email.
-    $action->execute();
-
-    // Retrieve sent message.
-    $captured_emails = $this->container->get('state')->get('system.test_mail_collector');
-    $sent_message = end($captured_emails);
-
-    // Check to make sure that our subject and body are as expected.
-    $this->assertEquals($sent_message['to'], 'mail@example.com');
-    $this->assertEquals($sent_message['subject'], 'subject');
-    // Need to trim the email body to get rid of newline at end.
-    $this->assertEquals(trim($sent_message['body']), 'hello');
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/RulesUiEmbedTest.php b/modules/rules/tests/src/Kernel/RulesUiEmbedTest.php
deleted file mode 100644
index 738120c..0000000
--- a/modules/rules/tests/src/Kernel/RulesUiEmbedTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Drupal\rules\Ui\RulesUiConfigHandler;
-use Drupal\rules\Ui\RulesUiDefinition;
-
-/**
- * Tests embedding the Rules UI.
- *
- * @group RulesUi
- */
-class RulesUiEmbedTest extends RulesDrupalTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['rules', 'rules_test_ui_embed', 'system', 'user'];
-
-  /**
-   * The rules UI manager.
-   *
-   * @var \Drupal\rules\Ui\RulesUiManagerInterface
-   */
-  protected $rulesUiManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->rulesUiManager = $this->container->get('plugin.manager.rules_ui');
-
-    $this->installConfig(['system']);
-    $this->installConfig(['rules_test_ui_embed']);
-    $this->installSchema('system', ['sequences']);
-  }
-
-  /**
-   * @cover \Drupal\rules\Ui\RulesUiManager
-   */
-  public function testUiManager() {
-    $definition = $this->rulesUiManager->getDefinitions();
-    $this->assertTrue(isset($definition['rules_test_ui_embed.settings_conditions']));
-    $this->assertInstanceOf(RulesUiDefinition::class, $definition['rules_test_ui_embed.settings_conditions']);
-    $this->assertTrue(!empty($definition['rules_test_ui_embed.settings_conditions']->label));
-    $this->assertEquals(RulesUiConfigHandler::class, $definition['rules_test_ui_embed.settings_conditions']->getClass());
-  }
-
-}
diff --git a/modules/rules/tests/src/Kernel/TokenIntegrationTest.php b/modules/rules/tests/src/Kernel/TokenIntegrationTest.php
deleted file mode 100644
index e2db1b3..0000000
--- a/modules/rules/tests/src/Kernel/TokenIntegrationTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Kernel;
-
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-
-/**
- * Test using the Rules API with the placeholder token replacement system.
- *
- * @group Rules
- */
-class TokenIntegrationTest extends RulesDrupalTestBase {
-
-  /**
-   * Tests that date tokens are formatted correctly.
-   */
-  public function testSystemDateToken() {
-    // Configure a simple rule with one action. and token replacements enabled.
-    $action = $this->expressionManager->createInstance('rules_action',
-      ContextConfig::create()
-        ->setValue('message', "The date is {{ date | format_date('custom', 'Y-m') }}!")
-        ->setValue('type', 'status')
-        ->process('message', 'rules_tokens')
-        ->setConfigKey('action_id', 'rules_system_message')
-        ->toArray()
-    );
-
-    $rule = $this->expressionManager->createRule();
-    $rule->addExpressionObject($action);
-    RulesComponent::create($rule)
-      ->addContextDefinition('date', ContextDefinition::create('timestamp'))
-      ->setContextValue('date', REQUEST_TIME)
-      ->execute();
-
-    $messages = drupal_set_message();
-    /** @var \Drupal\Core\Datetime\DateFormatterInterface $date_formatter */
-    $date_formatter = $this->container->get('date.formatter');
-    $date = $date_formatter->format(REQUEST_TIME, 'custom', 'Y-m');
-    $this->assertEquals("The date is $date!", (string) $messages['status'][0]);
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/ActionSetTest.php b/modules/rules/tests/src/Unit/ActionSetTest.php
deleted file mode 100644
index 3577491..0000000
--- a/modules/rules/tests/src/Unit/ActionSetTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit;
-
-use Drupal\rules\Engine\ActionExpressionInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\rules\Plugin\RulesExpression\ActionSet;
-use Drupal\rules\Plugin\RulesExpression\RulesAction;
-use Prophecy\Argument;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesExpression\ActionSet
- * @group Rules
- */
-class ActionSetTest extends RulesUnitTestBase {
-
-  /**
-   * The action set being tested.
-   *
-   * @var \Drupal\rules\Plugin\RulesExpression\ActionSet
-   */
-  protected $actionSet;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->actionSet = new ActionSet([], '', [], $this->expressionManager->reveal());
-  }
-
-  /**
-   * Tests that an action in the set fires.
-   */
-  public function testActionExecution() {
-    // The method on the test action must be called once.
-    $this->testActionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
-    $this->actionSet->addExpressionObject($this->testActionExpression->reveal())->execute();
-  }
-
-  /**
-   * Tests that two actions in the set fire both.
-   */
-  public function testTwoActionExecution() {
-    // The method on the test action must be called twice.
-    $this->testActionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
-    $second_action = $this->prophesize(ActionExpressionInterface::class);
-    $second_action->executeWithState(Argument::type(ExecutionStateInterface::class))
-      ->shouldBeCalledTimes(1);
-    $second_action->getUuid()->willReturn('uuid2');
-
-    $this->actionSet->addExpressionObject($this->testActionExpression->reveal())
-      ->addExpressionObject($second_action->reveal())
-      ->execute();
-  }
-
-  /**
-   * Tests that nested action sets work.
-   */
-  public function testNestedActionExecution() {
-    // The method on the test action must be called twice.
-    $this->testActionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(2);
-
-    $inner = new ActionSet([], '', [], $this->expressionManager->reveal());
-    $inner->addExpressionObject($this->testActionExpression->reveal());
-
-    $this->actionSet->addExpressionObject($this->testActionExpression->reveal())
-      ->addExpressionObject($inner)
-      ->execute();
-  }
-
-  /**
-   * Tests that a nested action can be retrieved by UUID.
-   */
-  public function testLookupAction() {
-    $this->actionSet->addExpressionObject($this->testActionExpression->reveal());
-    $uuid = $this->testActionExpression->reveal()->getUuid();
-    $lookup_action = $this->actionSet->getExpression($uuid);
-    $this->assertSame($this->testActionExpression->reveal(), $lookup_action);
-    $this->assertFalse($this->actionSet->getExpression('invalid UUID'));
-  }
-
-  /**
-   * Tests deleting an action from the container.
-   */
-  public function testDeletingAction() {
-    $this->actionSet->addExpressionObject($this->testActionExpression->reveal());
-    $second_action = $this->prophesize(RulesAction::class);
-    $this->actionSet->addExpressionObject($second_action->reveal());
-
-    // Get the UUID of the first action added.
-    $uuid = $this->testActionExpression->reveal()->getUuid();
-    $this->assertTrue($this->actionSet->deleteExpression($uuid));
-
-    // Now only the second action remains.
-    foreach ($this->actionSet as $action) {
-      $this->assertSame($second_action->reveal(), $action);
-    }
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/ContextHandlerTraitTest.php b/modules/rules/tests/src/Unit/ContextHandlerTraitTest.php
deleted file mode 100644
index e1039b7..0000000
--- a/modules/rules/tests/src/Unit/ContextHandlerTraitTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit;
-
-use Drupal\Core\Plugin\ContextAwarePluginInterface;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinitionInterface;
-use Drupal\rules\Context\ContextHandlerTrait;
-use Drupal\rules\Engine\ExecutionStateInterface;
-
-/**
- * @coversDefaultClass \Drupal\rules\Context\ContextHandlerTrait
- * @group Rules
- */
-class ContextHandlerTraitTest extends RulesUnitTestBase {
-
-  /**
-   * Tests that a missing required context triggers an exception.
-   *
-   * @covers ::prepareContext
-   */
-  public function testMissingContext() {
-    // Set the expected exception class and message.
-    $this->setExpectedException('\Drupal\rules\Exception\EvaluationException', 'Required context test is missing for plugin testplugin');
-
-    // Set 'getContextValue' as mocked method.
-    $trait = $this->getMockForTrait(ContextHandlerTrait::class, [], '', TRUE, TRUE, TRUE, ['getContextValue']);
-    $context_definition = $this->prophesize(ContextDefinitionInterface::class);
-
-    // Let the trait work with an empty configuration.
-    $trait->configuration = ContextConfig::create()->toArray();
-
-    // Make the context required in the definition.
-    $context_definition->isRequired()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
-    $plugin = $this->prophesize(ContextAwarePluginInterface::class);
-    $plugin->getContextDefinitions()
-      ->willReturn(['test' => $context_definition->reveal()])
-      ->shouldBeCalled(1);
-    $plugin->getContextValue('test')
-      ->willReturn(NULL)
-      ->shouldBeCalled(1);
-    $plugin->getPluginId()->willReturn('testplugin')->shouldBeCalledTimes(1);
-
-    $state = $this->prophesize(ExecutionStateInterface::class);
-
-    // Make the 'mapContext' method visible.
-    $reflection = new \ReflectionClass($trait);
-    $method = $reflection->getMethod('prepareContext');
-    $method->setAccessible(TRUE);
-    $method->invokeArgs($trait, [$plugin->reveal(), $state->reveal()]);
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/BanIPTest.php b/modules/rules/tests/src/Unit/Integration/Action/BanIPTest.php
deleted file mode 100644
index 4a7dd68..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/BanIPTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\ban\BanIpManagerInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\BanIP
- * @group RulesAction
- */
-class BanIPTest extends RulesIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * @var \Drupal\ban\BanIpManagerInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $banManager;
-
-  /**
-   * @var \Symfony\Component\HttpFoundation\Request|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $request;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    // We need the ban module.
-    $this->enableModule('ban');
-    $this->banManager = $this->prophesize(BanIpManagerInterface::class);
-    $this->container->set('ban.ip_manager', $this->banManager->reveal());
-
-    $this->request = $this->prophesize(Request::class);
-    $this->container->set('request', $this->request->reveal());
-
-    $this->action = $this->actionManager->createInstance('rules_ban_ip');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Ban an IP address', $this->action->summary());
-  }
-
-  /**
-   * Tests the action execution with Context IPv4.
-   *
-   * See http://en.wikipedia.org/wiki/Reserved_IP_addresses
-   * See https://tools.ietf.org/html/rfc3330 : "192.0.2.0/24 - This block is
-   * assigned as "TEST-NET" for use in documentation and example code. It is
-   * often used in conjunction with domain names example.com or example.net in
-   * vendor and protocol documentation. Addresses within this block should not
-   * appear on the public Internet."
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionWithContextIpv4() {
-    // TEST-NET-1 IPv4.
-    $ipv4 = '192.0.2.0';
-    $this->action->setContextValue('ip', $ipv4);
-
-    $this->banManager->banIp($ipv4)->shouldBeCalledTimes(1);
-
-    $this->action->execute();
-
-  }
-
-  /**
-   * Tests the action execution with Context IPv6.
-   *
-   * See http://en.wikipedia.org/wiki/Reserved_IP_addresses
-   * See https://tools.ietf.org/html/rfc3330 : "192.0.2.0/24 - This block is
-   * assigned as "TEST-NET" for use in documentation and example code. It is
-   * often used in conjunction with domain names example.com or example.net in
-   * vendor and protocol documentation. Addresses within this block should not
-   * appear on the public Internet."
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionWithContextIpv6() {
-    // TEST-NET-1 IPv4 '192.0.2.0' converted to IPv6.
-    $ipv6 = '2002:0:0:0:0:0:c000:200';
-    $this->action->setContextValue('ip', $ipv6);
-
-    $this->banManager->banIp($ipv6)->shouldBeCalledTimes(1);
-
-    $this->action->execute();
-
-  }
-
-  /**
-   * Tests the action execution without Context IP set.
-   *
-   * Should fallback to the current IP of the request.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionWithoutContextIp() {
-    // TEST-NET-1 IPv4.
-    $ip = '192.0.2.0';
-
-    $this->request->getClientIp()->willReturn($ip)->shouldBeCalledTimes(1);
-
-    $this->banManager->banIp($ip)->shouldBeCalledTimes(1);
-
-    $this->action->execute();
-
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/DataCalculateValueTest.php b/modules/rules/tests/src/Unit/Integration/Action/DataCalculateValueTest.php
deleted file mode 100644
index 4cb0001..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/DataCalculateValueTest.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\DataCalculateValue
- * @group RulesAction
- */
-class DataCalculateValueTest extends RulesIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->action = $this->actionManager->createInstance('rules_data_calculate_value');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Calculates a numeric value', $this->action->summary());
-  }
-
-  /**
-   * Tests the addition of two numeric values.
-   *
-   * @covers ::execute
-   */
-  public function testAdditionAction() {
-    $input_1 = mt_rand();
-    $input_2 = mt_rand();
-    $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
-      ->setContextValue('operator', $this->getTypedData('string', '+'))
-      ->setContextValue('input_2', $this->getTypedData('float', $input_2));
-    $this->action->execute();
-    $result = $this->action->getProvidedContext('result')->getContextValue();
-    $this->assertEquals($input_1 + $input_2, $result, "Addition calculation correct");
-  }
-
-  /**
-   * Tests the subtraction of one numeric value from another.
-   *
-   * @covers ::execute
-   */
-  public function testSubtractionAction() {
-    $input_1 = mt_rand();
-    $input_2 = mt_rand();
-    $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
-      ->setContextValue('operator', $this->getTypedData('string', '-'))
-      ->setContextValue('input_2', $this->getTypedData('float', $input_2));
-    $this->action->execute();
-    $result = $this->action->getProvidedContext('result')->getContextValue();
-    $this->assertEquals($input_1 - $input_2, $result, "Subtraction calculation correct");
-  }
-
-  /**
-   * Tests the multiplication of one numeric by another.
-   *
-   * @covers ::execute
-   */
-  public function testMultiplicationAction() {
-    $input_1 = mt_rand();
-    $input_2 = mt_rand();
-    $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
-      ->setContextValue('operator', $this->getTypedData('string', '*'))
-      ->setContextValue('input_2', $this->getTypedData('float', $input_2));
-    $this->action->execute();
-    $result = $this->action->getProvidedContext('result')->getContextValue();
-    $this->assertEquals($input_1 * $input_2, $result, "Subtraction calculation correct");
-  }
-
-  /**
-   * Tests the division of one numeric by another.
-   *
-   * @covers ::execute
-   */
-  public function testDivisionAction() {
-    $input_1 = mt_rand();
-    $input_2 = mt_rand();
-    $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
-      ->setContextValue('operator', $this->getTypedData('string', '/'))
-      ->setContextValue('input_2', $this->getTypedData('float', $input_2));
-    $this->action->execute();
-    $result = $this->action->getProvidedContext('result')->getContextValue();
-    $this->assertEquals($input_1 / $input_2, $result, "Subtraction calculation correct");
-  }
-
-  /**
-   * Tests the use of min operator for 2 input values.
-   *
-   * @covers ::execute
-   */
-  public function testMinimumAction() {
-    $input_1 = mt_rand();
-    $input_2 = mt_rand();
-    $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
-      ->setContextValue('operator', $this->getTypedData('string', 'min'))
-      ->setContextValue('input_2', $this->getTypedData('float', $input_2));
-    $this->action->execute();
-    $result = $this->action->getProvidedContext('result')->getContextValue();
-    $this->assertEquals(min($input_1, $input_2), $result, "Min calculation correct");
-  }
-
-  /**
-   * Tests the use of max operator for 2 input values.
-   *
-   * @covers ::execute
-   */
-  public function testMaximumAction() {
-    $input_1 = mt_rand();
-    $input_2 = mt_rand();
-    $this->action->setContextValue('input_1', $this->getTypedData('float', $input_1))
-      ->setContextValue('operator', $this->getTypedData('string', 'max'))
-      ->setContextValue('input_2', $this->getTypedData('float', $input_2));
-    $this->action->execute();
-    $result = $this->action->getProvidedContext('result')->getContextValue();
-    $this->assertEquals(max($input_1, $input_2), $result, "Max calculation correct");
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/DataConvertTest.php b/modules/rules/tests/src/Unit/Integration/Action/DataConvertTest.php
deleted file mode 100644
index 7d4bc61..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/DataConvertTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\DataConvert
- * @group RulesAction
- */
-class DataConvertTest extends RulesIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * Test the conversion and rounding to integer.
-   *
-   * @covers ::execute
-   */
-  public function testConvertToInteger() {
-    $value = 1.5;
-
-    // Test the conversion to integer.
-    $converted = $this->executeAction($value, 'integer');
-    $this->assertInternalType('integer', $converted);
-
-    // Test the conversion to integer and floor down.
-    $converted = $this->executeAction($value, 'integer', 'down');
-    $this->assertInternalType('integer', $converted);
-    $this->assertEquals(1, $converted);
-
-    // Test the conversion to integer and ceil up.
-    $converted = $this->executeAction($value, 'integer', 'up');
-    $this->assertInternalType('integer', $converted);
-    $this->assertEquals(2, $converted);
-
-    // Test the conversion to integer and round.
-    $converted = $this->executeAction($value, 'integer', 'round');
-    $this->assertInternalType('integer', $converted);
-    $this->assertEquals(2, $converted);
-
-    $converted = $this->executeAction('+123', 'integer');
-    $this->assertInternalType('integer', $converted);
-    $this->assertEquals(123, $converted);
-  }
-
-  /**
-   * Test the conversion to float.
-   *
-   * @covers ::execute
-   */
-  public function testConvertToFloat() {
-    $value = '1.5';
-
-    $converted = $this->executeAction($value, 'float');
-    $this->assertInternalType('float', $converted);
-    $this->assertEquals(1.5, $converted);
-
-    $converted = $this->executeAction('+1.5', 'float');
-    $this->assertInternalType('float', $converted);
-    $this->assertEquals(1.5, $converted);
-  }
-
-  /**
-   * Test the conversion to text.
-   *
-   * @covers ::execute
-   */
-  public function testConvertToString() {
-    // Test the conversion to test/string.
-    $value = 1.5;
-
-    $converted = $this->executeAction($value, 'string');
-    $this->assertInternalType('string', $converted);
-    $this->assertEquals('1.5', $converted);
-  }
-
-  /**
-   * Test the behavior if nonsense context values is set.
-   *
-   * @covers ::execute
-   */
-  public function testInvalidValueException() {
-    // Set the expected exception class and message.
-    $this->setExpectedException('\Drupal\rules\Exception\InvalidArgumentException', 'Only scalar values are supported.');
-
-    $this->executeAction(['some-array'], 'integer');
-  }
-
-  /**
-   * Test the behavior if rounding behavior is used with non integers.
-   *
-   * @covers ::execute
-   */
-  public function testInvalidRoundingBehavior() {
-    // Set the expected exception class and message.
-    $this->setExpectedException('\Drupal\rules\Exception\InvalidArgumentException', 'A rounding behavior only makes sense with an integer target type.');
-
-    $converted = $this->executeAction('some', 'decimal', 'down');
-    $this->assertInternalType('float', $converted);
-  }
-
-  /**
-   * Test the behavior if nonsense rounding_behaviors is set.
-   *
-   * @covers ::execute
-   */
-  public function testInvalidRoundingBehaviorException() {
-    // Set the expected exception class and message.
-    $this->setExpectedException('\Drupal\rules\Exception\InvalidArgumentException', 'Unknown rounding behavior: invalid rounding');
-
-    $value = 5.5;
-    $rounding_behavior = 'invalid rounding';
-    $this->executeAction($value, 'integer', $rounding_behavior);
-  }
-
-  /**
-   * Test the behavior if nonsense target_type is set.
-   *
-   * @covers ::execute
-   */
-  public function testInvalidTargetTypeException() {
-    // Set the expected exception class and message.
-    $this->setExpectedException('\Drupal\rules\Exception\InvalidArgumentException', 'Unknown target type: invalid type');
-    $value = 5.5;
-    $target_type = 'invalid type';
-    $this->executeAction($value, $target_type);
-  }
-
-  /**
-   * Shortcut method to execute the convert action and to avoid duplicate code.
-   *
-   * @param mixed $value
-   *   The value to be converted.
-   * @param string $target_type
-   *   The target type $value should be converted to.
-   * @param null|string $rounding_behavior
-   *   Definition for the rounding direction.
-   *
-   * @return mixed
-   *   The raw conversion result as a scalar value.
-   */
-  protected function executeAction($value, $target_type, $rounding_behavior = NULL) {
-
-    $action = $this->actionManager->createInstance('rules_data_convert');
-
-    $action->setContextValue('value', $value);
-    $action->setContextValue('target_type', $target_type);
-
-    if (!empty($rounding_behavior)) {
-      $action->setContextValue('rounding_behavior', $rounding_behavior);
-    }
-
-    $action->execute();
-    $result = $action->getProvidedContext('conversion_result');
-    return $result->getContextValue();
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/DataListItemAddTest.php b/modules/rules/tests/src/Unit/Integration/Action/DataListItemAddTest.php
deleted file mode 100644
index 429f95b..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/DataListItemAddTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\DataListItemAdd
- * @group RulesAction
- */
-class DataListItemAddTest extends RulesIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->action = $this->actionManager->createInstance('rules_list_item_add');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Add list item', $this->action->summary());
-  }
-
-  /**
-   * Tests the action execution with default values.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionWithDefaults() {
-    // Test adding a value at the end (default position).
-    $list = ['One', 'Two', 'Three'];
-
-    $this->action
-      ->setContextValue('list', $list)
-      ->setContextValue('item', 'Four');
-
-    $this->action->execute();
-
-    // The list should contain four items, with the new item at the end.
-    $this->assertArrayEquals([
-      'One',
-      'Two',
-      'Three',
-      'Four',
-    ], $this->action->getContextValue('list'));
-  }
-
-  /**
-   * Tests the action execution - item append.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionItemAppend() {
-    // Test adding a value at the end.
-    $list = ['One', 'Two', 'Three'];
-
-    $this->action
-      ->setContextValue('list', $list)
-      ->setContextValue('item', 'Four')
-      ->setContextValue('pos', 'end');
-
-    $this->action->execute();
-
-    // The list should contain four items, with the new item added at the end.
-    $this->assertArrayEquals([
-      'One',
-      'Two',
-      'Three',
-      'Four',
-    ], $this->action->getContextValue('list'));
-  }
-
-  /**
-   * Tests the action execution - item prepend.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionItemPrepend() {
-    // Test adding a value at the start.
-    $list = ['One', 'Two', 'Three'];
-
-    $this->action
-      ->setContextValue('list', $list)
-      ->setContextValue('item', 'Zero')
-      ->setContextValue('pos', 'start');
-
-    $this->action->execute();
-
-    // The list should contain four items, with the new item added at the start.
-    $this->assertArrayEquals([
-      'Zero',
-      'One',
-      'Two',
-      'Three',
-    ], $this->action->getContextValue('list'));
-  }
-
-  /**
-   * Tests the action execution - enforce unique items.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionEnforceUnique() {
-    // Test unique.
-    $list = ['One', 'Two', 'Three', 'Four'];
-
-    $this->action
-      ->setContextValue('list', $list)
-      ->setContextValue('item', 'Four')
-      ->setContextValue('unique', TRUE);
-
-    $this->action->execute();
-
-    // The list should remain the same.
-    $this->assertArrayEquals([
-      'One',
-      'Two',
-      'Three',
-      'Four',
-    ], $this->action->getContextValue('list'));
-  }
-
-  /**
-   * Tests the action execution - add non-unique items.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionNonUnique() {
-    // Test non-unique.
-    $list = ['One', 'Two', 'Three', 'Four'];
-
-    $this->action
-      ->setContextValue('list', $list)
-      ->setContextValue('item', 'Four')
-      ->setContextValue('unique', FALSE)
-      ->setContextValue('pos', 'end');
-
-    $this->action->execute();
-
-    // The list should contain five items, with the new item added at the end.
-    $this->assertArrayEquals(['One', 'Two', 'Three', 'Four', 'Four'], $this->action->getContextValue('list'));
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/DataListItemRemoveTest.php b/modules/rules/tests/src/Unit/Integration/Action/DataListItemRemoveTest.php
deleted file mode 100644
index b6f79e3..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/DataListItemRemoveTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\DataListItemRemove
- * @group RulesAction
- */
-class DataListItemRemoveTest extends RulesIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->action = $this->actionManager->createInstance('rules_list_item_remove');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Remove item from list', $this->action->summary());
-  }
-
-  /**
-   * Tests the action execution.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecution() {
-    $list = ['One', 'Two', 'Three'];
-
-    $this->action
-      ->setContextValue('list', $list)
-      ->setContextValue('item', 'Two');
-
-    $this->action->execute();
-
-    // The second item should be removed from the list.
-    $this->assertArrayEquals(['One', 'Three'], array_values($this->action->getContextValue('list')));
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/DataSetTest.php b/modules/rules/tests/src/Unit/Integration/Action/DataSetTest.php
deleted file mode 100644
index 7cf10a2..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/DataSetTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\DataSet
- * @group RulesAction
- */
-class DataSetTest extends RulesIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->action = $this->actionManager->createInstance('rules_data_set');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Set a data value', $this->action->summary());
-  }
-
-  /**
-   * Tests that primitive values can be set.
-   *
-   * @covers ::execute
-   */
-  public function testPrimitiveValues() {
-    $this->action->setContextValue('data', 'original')
-      ->setContextValue('value', 'replacement');
-    $this->action->execute();
-
-    $this->assertSame('replacement', $this->action->getContextValue('data'));
-    $this->assertSame([], $this->action->autoSaveContext());
-  }
-
-  /**
-   * Tests that a variable can be set to NULL.
-   */
-  public function testSetToNull() {
-    // We don't need to set the 'value' context, it is NULL by default.
-    $this->action->setContextValue('data', 'original');
-    $this->action->execute();
-
-    $this->assertNull($this->action->getContextValue('data'));
-    $this->assertSame([], $this->action->autoSaveContext());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntityCreateTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntityCreateTest.php
deleted file mode 100644
index eec6522..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntityCreateTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Entity\EntityStorageBase;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\TypedData\FieldItemDataDefinition;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-use Prophecy\Argument;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\EntityCreate
- * @group RulesAction
- */
-class EntityCreateTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * A constant that will be used instead of an entity.
-   */
-  const ENTITY_REPLACEMENT = 'This is a fake entity';
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Prepare some mocked bundle field definitions. This is needed because
-    // EntityCreateDeriver adds required contexts for required fields, and
-    // assumes that the bundle field is required.
-    $bundle_field_definition = $this->prophesize(BaseFieldDefinition::class);
-    $bundle_field_definition_optional = $this->prophesize(BaseFieldDefinition::class);
-    $bundle_field_definition_required = $this->prophesize(BaseFieldDefinition::class);
-
-    $property_definition = $this->prophesize(DataDefinitionInterface::class);
-    $property_definition->getDataType()->willReturn('string');
-
-    $item_definition = $this->prophesize(FieldItemDataDefinition::class);
-    $item_definition->getPropertyDefinition(Argument::any())
-      ->willReturn($property_definition->reveal());
-    $item_definition->getMainPropertyName()->willReturn('value');
-
-    // The next methods are mocked because EntityCreateDeriver executes them,
-    // and the mocked field definition is instantiated without the necessary
-    // information.
-    $bundle_field_definition->getItemDefinition()
-      ->willReturn($item_definition->reveal());
-    $bundle_field_definition->getCardinality()->willReturn(1)
-      ->shouldBeCalledTimes(1);
-    $bundle_field_definition->getType()->willReturn('string');
-    $bundle_field_definition->getLabel()->willReturn('Bundle')
-      ->shouldBeCalledTimes(1);
-    $bundle_field_definition->getDescription()
-      ->willReturn('Bundle mock description')
-      ->shouldBeCalledTimes(1);
-
-    $bundle_field_definition_required->getItemDefinition()
-      ->willReturn($item_definition->reveal());
-    $bundle_field_definition_required->getCardinality()->willReturn(1)
-      ->shouldBeCalledTimes(1);
-    $bundle_field_definition_required->getType()->willReturn('string');
-    $bundle_field_definition_required->getLabel()->willReturn('Required field')
-      ->shouldBeCalledTimes(1);
-    $bundle_field_definition_required->getDescription()
-      ->willReturn('Required field mock description')
-      ->shouldBeCalledTimes(1);
-    $bundle_field_definition_required->isRequired()
-      ->willReturn(TRUE)
-      ->shouldBeCalledTimes(1);
-
-    $bundle_field_definition_optional->isRequired()
-      ->willReturn(FALSE)
-      ->shouldBeCalledTimes(1);
-
-    // Prepare mocked entity storage.
-    $entity_type_storage = $this->prophesize(EntityStorageBase::class);
-    $entity_type_storage->create(['bundle' => 'test', 'field_required' => NULL])
-      ->willReturn(self::ENTITY_REPLACEMENT);
-
-    // Return the mocked storage controller.
-    $this->entityTypeManager->getStorage('test')
-      ->willReturn($entity_type_storage->reveal());
-
-    // Return a mocked list of base fields definitions.
-    $this->entityFieldManager->getBaseFieldDefinitions('test')
-      ->willReturn([
-        'bundle' => $bundle_field_definition->reveal(),
-        'field_required' => $bundle_field_definition_required->reveal(),
-        'field_optional' => $bundle_field_definition_optional->reveal(),
-      ]);
-
-    // Instantiate the action we are testing.
-    $this->action = $this->actionManager->createInstance('rules_entity_create:test');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Create a new test', $this->action->summary());
-  }
-
-  /**
-   * Tests the action execution.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecution() {
-    $this->action->setContextValue('bundle', 'test');
-    $this->action->execute();
-    $entity = $this->action->getProvidedContext('entity')->getContextValue();
-    $this->assertEquals(self::ENTITY_REPLACEMENT, $entity);
-  }
-
-  /**
-   * Tests context definitions for the bundle and required fields.
-   *
-   * @covers \Drupal\rules\Plugin\RulesAction\EntityCreateDeriver::getDerivativeDefinitions
-   */
-  public function testRequiredContexts() {
-    $context_definitions = $this->action->getContextDefinitions();
-    $this->assertCount(2, $context_definitions);
-
-    $this->assertArrayHasKey('bundle', $context_definitions);
-    $this->assertEquals(ContextDefinition::ASSIGNMENT_RESTRICTION_INPUT, $context_definitions['bundle']->getAssignmentRestriction());
-    $this->assertTrue($context_definitions['bundle']->isRequired());
-
-    $this->assertArrayHasKey('field_required', $context_definitions);
-    $this->assertNull($context_definitions['field_required']->getAssignmentRestriction());
-    $this->assertFalse($context_definitions['field_required']->isRequired());
-  }
-
-  /**
-   * Tests the context refining.
-   *
-   * @covers ::refineContextDefinitions
-   */
-  public function testRefiningContextDefinitions() {
-    $this->action->setContextValue('bundle', 'bundle_test');
-    $this->action->refineContextDefinitions([]);
-    $this->assertEquals(
-      $this->action->getProvidedContextDefinition('entity')
-        ->getDataType(), 'entity:test:bundle_test'
-    );
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntityDeleteTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntityDeleteTest.php
deleted file mode 100644
index c59f0c1..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntityDeleteTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\EntityDelete
- * @group RulesAction
- */
-class EntityDeleteTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->action = $this->actionManager->createInstance('rules_entity_delete');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Delete entity', $this->action->summary());
-  }
-
-  /**
-   * Tests the action execution.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecution() {
-    $entity = $this->prophesizeEntity(EntityInterface::class);
-    $entity->delete()->shouldBeCalledTimes(1);
-
-    $this->action->setContextValue('entity', $entity->reveal());
-    $this->action->execute();
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByFieldTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByFieldTest.php
deleted file mode 100644
index c994926..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByFieldTest.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Entity\Query\QueryInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\EntityFetchByField
- * @group RulesAction
- */
-class EntityFetchByFieldTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->action = $this->actionManager->createInstance('rules_entity_fetch_by_field');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Fetch entities by field', $this->action->summary());
-  }
-
-  /**
-   * Tests action execution when no value for limit is provided.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionWithNoLimit() {
-    // Create variables for action context values.
-    $entity_type = 'entity_test';
-    $field_name = 'test_field';
-    $field_value = 'llama';
-
-    // Create an array of dummy entities.
-    $entities = [];
-    for ($i = 0; $i < 2; $i++) {
-      $entity = $this->prophesize(EntityInterface::class);
-      $entities[] = $entity->reveal();
-    }
-
-    // Create dummy entity storage object.
-    $entity_storage = $this->prophesize(EntityStorageInterface::class);
-    $entity_storage->loadByProperties([$field_name => $field_value])
-      ->willReturn($entities);
-    $this->entityTypeManager->getStorage($entity_type)
-      ->willReturn($entity_storage->reveal());
-
-    // Set context values for EntityFetchByField action and execute.
-    $this->action->setContextValue('type', $entity_type)
-      ->setContextValue('field_name', $field_name)
-      ->setContextValue('field_value', $field_value)
-      ->execute();
-
-    // Test that executing action without a value for limit returns the dummy
-    // entities array.
-    $this->assertEquals($entities, $this->action->getProvidedContext('entity_fetched')->getContextValue('entity_fetched'));
-  }
-
-  /**
-   * Tests action execution when a value for limit is provided.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionWithLimit() {
-    $entity_type = 'entity_test';
-    $field_name = 'test_field';
-    $field_value = 'llama';
-    $limit = 2;
-
-    // Create an array of dummy entities.
-    $entities = array_map(function () {
-      return $this->prophesize(EntityInterface::class)->reveal();
-    }, range(1, $limit));
-
-    // Creates entity ids for new dummy array of entities.
-    $entity_ids = range(1, $limit);
-
-    // Create dummy query object.
-    $query = $this->prophesize(QueryInterface::class);
-    $query->condition($field_name, $field_value, '=')
-      ->willReturn($query->reveal())
-      ->shouldBeCalledTimes(1);
-    $query->range(0, $limit)
-      ->willReturn($query->reveal())
-      ->shouldBeCalledTimes(1);
-    $query->execute()
-      ->willReturn($entity_ids)
-      ->shouldBeCalledTimes(1);
-
-    // Create dummy entity storage object.
-    $entity_storage = $this->prophesize(EntityStorageInterface::class);
-    $entity_storage->loadMultiple($entity_ids)
-      ->willReturn($entities)
-      ->shouldBeCalledTimes(1);
-    $entity_storage->getQuery()
-      ->willReturn($query)
-      ->shouldBeCalledTimes(1);
-    $this->entityTypeManager->getStorage($entity_type)
-      ->willReturn($entity_storage->reveal())
-      ->shouldBeCalledTimes(1);
-
-    // Set context values for EntityFetchByField action and execute.
-    $this->action->setContextValue('type', $entity_type)
-      ->setContextValue('field_name', $field_name)
-      ->setContextValue('field_value', $field_value)
-      ->setContextValue('limit', $limit)
-      ->execute();
-
-    // Test that executing action with a value for limit returns the dummy
-    // entities array.
-    $this->assertEquals($entities, $this->action->getProvidedContext('entity_fetched')->getContextValue('entity_fetched'));
-  }
-
-  /**
-   * Tests that the action execution loads the entity from storage.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionProvidedContextEntityType() {
-    // Create variables for action context values.
-    $entity_type = 'entity_test';
-    $field_name = 'test_field';
-    $field_value = 'llama';
-
-    // Create an array of dummy entities.
-    $entities = [];
-    for ($i = 0; $i < 2; $i++) {
-      $entity = $this->prophesize(EntityInterface::class)->reveal();
-      $entities[] = $entity;
-    }
-
-    // Create dummy entity storage object.
-    $entity_storage = $this->prophesize(EntityStorageInterface::class);
-    $entity_storage->loadByProperties([$field_name => $field_value])
-      ->willReturn($entities);
-    $this->entityTypeManager->getStorage($entity_type)
-      ->willReturn($entity_storage->reveal())
-      ->shouldBeCalledTimes(1);
-
-    // Set context values for EntityFetchByField action and execute.
-    $this->action->setContextValue('type', $entity_type)
-      ->setContextValue('field_name', $field_name)
-      ->setContextValue('field_value', $field_value)
-      ->execute();
-  }
-
-  /**
-   * @covers ::refineContextDefinitions
-   */
-  public function testRefiningContextDefinitions() {
-    $this->action->setContextValue('type', 'entity_test');
-    $this->action->refineContextDefinitions([]);
-    $this->assertEquals(
-      $this->action->getProvidedContextDefinition('entity_fetched')
-        ->getDataType(), 'entity:entity_test'
-    );
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByIdTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByIdTest.php
deleted file mode 100644
index daf222d..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntityFetchByIdTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\EntityFetchById
- * @group RulesAction
- */
-class EntityFetchByIdTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->action = $this->actionManager->createInstance('rules_entity_fetch_by_id');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Fetch entity by id', $this->action->summary());
-  }
-
-  /**
-   * Tests the action execution.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecution() {
-    $entity_type = 'entity_test';
-
-    // Prepare entity storage to return dummy entity on the 'load' execution.
-    $entity = $this->prophesize(EntityInterface::class);
-    $entity_storage = $this->prophesize(EntityStorageInterface::class);
-    $entity_storage->load(1)->willReturn($entity->reveal())
-      ->shouldBeCalledTimes(1);
-    $this->entityTypeManager->getStorage($entity_type)
-      ->willReturn($entity_storage->reveal())
-      ->shouldBeCalledTimes(1);
-
-    // Set context values for EntityFetchByField action and execute.
-    $this->action
-      ->setContextValue('type', $entity_type)
-      ->setContextValue('entity_id', 1)
-      ->execute();
-    // Test that entity load with type 'test' and id '1' should return the
-    // dummy entity.
-    $this->assertEquals($entity->reveal(), $this->action->getProvidedContext('entity_fetched')->getContextValue('entity_fetched'), 'Action returns the loaded entity for fetching entity by id.');
-  }
-
-  /**
-   * @covers ::refineContextDefinitions
-   */
-  public function testRefiningContextDefinitions() {
-    $this->action->setContextValue('type', 'entity_test');
-    $this->action->refineContextDefinitions([]);
-    $this->assertEquals(
-      $this->action->getProvidedContextDefinition('entity_fetched')
-        ->getDataType(), 'entity:entity_test'
-    );
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntityPathAliasCreateTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntityPathAliasCreateTest.php
deleted file mode 100644
index c37d143..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntityPathAliasCreateTest.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Path\AliasStorageInterface;
-use Drupal\Core\Url;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-use Prophecy\Argument;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\EntityPathAliasCreate
- * @group RulesAction
- */
-class EntityPathAliasCreateTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * The mocked alias storage service.
-   *
-   * @var \Drupal\Core\Path\AliasStorageInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $aliasStorage;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Prepare mocked AliasStorageInterface.
-    $this->aliasStorage = $this->prophesize(AliasStorageInterface::class);
-
-    $this->container->set('path.alias_storage', $this->aliasStorage->reveal());
-
-    // Instantiate the action we are testing.
-    $this->action = $this->actionManager->createInstance('rules_entity_path_alias_create:entity:test');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Create test path alias', $this->action->summary());
-  }
-
-  /**
-   * Tests the action execution with an unsaved entity.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionWithUnsavedEntity() {
-    // Test that the alias is only saved once.
-    $this->aliasStorage->save('test/1', 'about', 'en')->shouldBeCalledTimes(1);
-
-    $entity = $this->getMockEntity();
-    $entity->isNew()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
-    // Test that new entities are saved first.
-    $entity->save()->shouldBeCalledTimes(1);
-
-    $this->action->setContextValue('entity', $entity->reveal())
-      ->setContextValue('alias', 'about');
-
-    $this->action->execute();
-  }
-
-  /**
-   * Tests the action execution with a saved entity.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionWithSavedEntity() {
-    // Test that the alias is only saved once.
-    $this->aliasStorage->save('test/1', 'about', 'en')->shouldBeCalledTimes(1);
-
-    $entity = $this->getMockEntity();
-    $entity->isNew()->willReturn(FALSE)->shouldBeCalledTimes(1);
-
-    // Test that existing entities are not saved again.
-    $entity->save()->shouldNotBeCalled();
-
-    $this->action->setContextValue('entity', $entity->reveal())
-      ->setContextValue('alias', 'about');
-
-    $this->action->execute();
-  }
-
-  /**
-   * Creates a mock entity.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface|\Prophecy\Prophecy\ProphecyInterface
-   *   The mocked entity object.
-   */
-  protected function getMockEntity() {
-    $language = $this->languageManager->reveal()->getCurrentLanguage();
-
-    $entity = $this->prophesizeEntity(EntityInterface::class);
-    $entity->language()->willReturn($language)->shouldBeCalledTimes(1);
-
-    $url = $this->prophesize(Url::class);
-    $url->getInternalPath()->willReturn('test/1')->shouldBeCalledTimes(1);
-
-    $entity->urlInfo(Argument::any())->willReturn($url->reveal())
-      ->shouldBeCalledTimes(1);
-
-    return $entity;
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/EntitySaveTest.php b/modules/rules/tests/src/Unit/Integration/Action/EntitySaveTest.php
deleted file mode 100644
index 12e6a06..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/EntitySaveTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\EntitySave
- * @group RulesAction
- */
-class EntitySaveTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * The mocked entity used for testing.
-   *
-   * @var \Drupal\Core\Entity\EntityInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->entity = $this->prophesizeEntity(EntityInterface::class);
-
-    $this->action = $this->actionManager->createInstance('rules_entity_save');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Save entity', $this->action->summary());
-  }
-
-  /**
-   * Tests the action execution when saving immediately.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionImmediately() {
-    $this->entity->save()->shouldBeCalledTimes(1);
-
-    $this->action->setContextValue('entity', $this->entity->reveal())
-      ->setContextValue('immediate', TRUE);
-
-    $this->action->execute();
-    $this->assertEquals($this->action->autoSaveContext(), [], 'Action returns nothing for auto saving since the entity has been saved already.');
-  }
-
-  /**
-   * Tests the action execution when saving is postponed.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionPostponed() {
-    $this->entity->save()->shouldNotBeCalled();
-
-    $this->action->setContextValue('entity', $this->entity->reveal());
-    $this->action->execute();
-
-    $this->assertEquals($this->action->autoSaveContext(), ['entity'], 'Action returns the entity context name for auto saving.');
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/PathAliasCreateTest.php b/modules/rules/tests/src/Unit/Integration/Action/PathAliasCreateTest.php
deleted file mode 100644
index 0d50a99..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/PathAliasCreateTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Path\AliasStorageInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\PathAliasCreate
- * @group RulesAction
- */
-class PathAliasCreateTest extends RulesIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * The mocked alias storage service.
-   *
-   * @var \Drupal\Core\Path\AliasStorageInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $aliasStorage;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->aliasStorage = $this->prophesize(AliasStorageInterface::class);
-    $this->container->set('path.alias_storage', $this->aliasStorage->reveal());
-
-    $this->action = $this->actionManager->createInstance('rules_path_alias_create');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Create any path alias', $this->action->summary());
-  }
-
-  /**
-   * Tests the action execution when no language is specified.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionWithoutLanguage() {
-    $this->aliasStorage->save('node/1', 'about', LanguageInterface::LANGCODE_NOT_SPECIFIED)
-      ->shouldBeCalledTimes(1);
-
-    $this->action->setContextValue('source', 'node/1')
-      ->setContextValue('alias', 'about');
-
-    $this->action->execute();
-  }
-
-  /**
-   * Tests the action execution when a language is specified.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecutionWithLanguage() {
-    $language = $this->prophesize(LanguageInterface::class);
-    $language->getId()->willReturn('en');
-
-    $this->aliasStorage->save('node/1', 'about', 'en')
-      ->shouldBeCalledTimes(1);
-
-    $this->action->setContextValue('source', 'node/1')
-      ->setContextValue('alias', 'about')
-      ->setContextValue('language', $language->reveal());
-
-    $this->action->execute();
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByAliasTest.php b/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByAliasTest.php
deleted file mode 100644
index 1215c3e..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByAliasTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Path\AliasStorageInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\PathAliasDeleteByAlias
- * @group RulesAction
- */
-class PathAliasDeleteByAliasTest extends RulesIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * The mocked alias storage service.
-   *
-   * @var \Drupal\Core\Path\AliasStorageInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $aliasStorage;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->aliasStorage = $this->prophesize(AliasStorageInterface::class);
-    $this->container->set('path.alias_storage', $this->aliasStorage->reveal());
-
-    $this->action = $this->actionManager->createInstance('rules_path_alias_delete_by_alias');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Delete path alias', $this->action->summary());
-  }
-
-  /**
-   * Tests the action execution.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecution() {
-    $alias = 'about/team';
-
-    $this->aliasStorage->delete(['alias' => $alias])->shouldBeCalledTimes(1);
-
-    $this->action->setContextValue('alias', $alias);
-
-    $this->action->execute();
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByPathTest.php b/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByPathTest.php
deleted file mode 100644
index be8e35f..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/PathAliasDeleteByPathTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Path\AliasStorageInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\PathAliasDeleteByPath
- * @group RulesAction
- */
-class PathAliasDeleteByPathTest extends RulesIntegrationTestBase {
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * The mocked alias storage service.
-   *
-   * @var \Drupal\Core\Path\AliasStorageInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $aliasStorage;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->aliasStorage = $this->prophesize(AliasStorageInterface::class);
-
-    $this->container->set('path.alias_storage', $this->aliasStorage->reveal());
-
-    $this->action = $this->actionManager->createInstance('rules_path_alias_delete_by_path');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Delete all aliases for a path', $this->action->summary());
-  }
-
-  /**
-   * Tests the action execution.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecution() {
-
-    $path = 'node/1';
-
-    $this->aliasStorage->delete(['path' => $path])->shouldBeCalledTimes(1);
-
-    $this->action
-      ->setContextValue('path', $path);
-
-    $this->action->execute();
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/RulesActionAccessTest.php b/modules/rules/tests/src/Unit/Integration/Action/RulesActionAccessTest.php
deleted file mode 100644
index 0e7c867..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/RulesActionAccessTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-use Drupal\Core\Session\AccountInterface;
-use Prophecy\Argument;
-
-/**
- * Tests configuration access control for Rules Actions.
- *
- * @group RulesAction
- */
-class RulesActionAccessTest extends RulesIntegrationTestBase {
-
-  /**
-   * Confirm that a condition plugin respects configure permission.
-   */
-  public function testHasConfigurationAccessInfo() {
-    $plugin = $this->actionManager->createInstance('rules_test_string');
-    $definition = $plugin->getPluginDefinition();
-    $this->assertNotEmpty($definition['configure_permissions'], "Plugin has configuration permission info.");
-    $perms = $definition['configure_permissions'];
-    $this->assertTrue(is_array($perms), "configure_permissions is an array");
-    $this->assertContains("access test configuration", $perms, "Expected permission found in configure_permissions.");
-
-    // Now see if the permission is actually used.
-    $user_with_perm = $this->prophesize(AccountInterface::class);
-    $user_with_perm
-      ->hasPermission("access test configuration")
-      ->willReturn(TRUE)
-      ->shouldBeCalledTimes(2);
-    $user_with_perm
-      ->hasPermission(Argument::type('string'))
-      ->willReturn(FALSE);
-
-    $this->container->set('current_user', $user_with_perm->reveal());
-    $this->assertTrue($plugin->checkConfigurationAccess(), "User with permission has configuration access.");
-
-    $object_result = $plugin->checkConfigurationAccess($user_with_perm->reveal(), TRUE);
-    $this->assertTrue($object_result->isAllowed(), "AccessResult in allowed state if an object is requested.");
-
-    $user_without_perm = $this->prophesize(AccountInterface::class);
-    $user_without_perm
-      ->hasPermission("access test configuration")
-      ->willReturn(FALSE)
-      ->shouldBeCalledTimes(2);
-    $user_without_perm
-      ->hasPermission(Argument::type('string'))
-      ->willReturn(FALSE);
-
-    $this->assertFalse($plugin->checkConfigurationAccess($user_without_perm->reveal()),
-                       "User without permission does not have configuration access.");
-    $object_result = $plugin->checkConfigurationAccess($user_without_perm->reveal(), TRUE);
-    $this->assertTrue($object_result->isNeutral(), "an AccessResultNeutral object is returned on not allowed if an object is requested.");
-
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/RulesComponentActionTest.php b/modules/rules/tests/src/Unit/Integration/Action/RulesComponentActionTest.php
deleted file mode 100644
index 386b578..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/RulesComponentActionTest.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Config\Entity\ConfigEntityStorageInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\rules\Entity\RulesComponentConfig;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * Tests for exposing Rules components as action plugins.
- *
- * @group RulesAction
- */
-class RulesComponentActionTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * Tests that a rule can be used as action.
-   */
-  public function testActionAvailable() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $rules_config = new RulesComponentConfig([
-      'id' => 'test_rule',
-      'label' => 'Test rule',
-    ], 'rules_component');
-    $rules_config->setExpression($rule);
-
-    $this->prophesizeStorage([$rules_config]);
-
-    $definition = $this->actionManager->getDefinition('rules_component:test_rule');
-    $this->assertEquals('Components', $definition['category']);
-    $this->assertEquals('Rule: Test rule', (string) $definition['label']);
-  }
-
-  /**
-   * Tests that the execution of the action invokes the Rules component.
-   */
-  public function testExecute() {
-    // Set up a rules component that will just save an entity.
-    $nested_rule = $this->rulesExpressionManager->createRule();
-    $nested_rule->addAction('rules_entity_save', ContextConfig::create()
-      ->map('entity', 'entity')
-    );
-
-    $rules_config = new RulesComponentConfig([
-      'id' => 'test_rule',
-      'label' => 'Test rule',
-    ], 'rules_component');
-    $rules_config->setExpression($nested_rule);
-    $rules_config->setContextDefinitions(['entity' => ContextDefinition::create('entity')]);
-
-    $this->prophesizeStorage([$rules_config]);
-
-    // Invoke the rules component in another rule.
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule->addAction('rules_component:test_rule', ContextConfig::create()
-      ->map('entity', 'entity')
-    );
-
-    // The call to save the entity means that the action was executed.
-    $entity = $this->prophesizeEntity(EntityInterface::class);
-    $entity->save()->shouldBeCalledTimes(1);
-
-    RulesComponent::create($rule)
-      ->addContextDefinition('entity', ContextDefinition::create('entity'))
-      ->setContextValue('entity', $entity->reveal())
-      ->execute();
-  }
-
-  /**
-   * Tests that context definitions are available on the derived action.
-   */
-  public function testContextDefinitions() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule
-      ->addAction('rules_entity_save', ContextConfig::create()
-        ->map('entity', 'entity')
-      )
-      ->addAction('rules_test_string', ContextConfig::create()
-        ->setValue('text', 'x')
-      );
-
-    $rules_config = new RulesComponentConfig([
-      'id' => 'test_rule',
-      'label' => 'Test rule',
-    ], 'rules_component');
-    $rules_config->setExpression($rule);
-
-    $context_definitions = ['entity' => ContextDefinition::create('entity')];
-    $rules_config->setContextDefinitions($context_definitions);
-    $provided_definitions = ['concatenated' => ContextDefinition::create('string')];
-    $rules_config->setProvidedContextDefinitions($provided_definitions);
-
-    $this->prophesizeStorage([$rules_config]);
-
-    $definition = $this->actionManager->getDefinition('rules_component:test_rule');
-    $this->assertEquals($context_definitions, $definition['context']);
-    $this->assertEquals($provided_definitions, $definition['provides']);
-  }
-
-  /**
-   * Tests that a rules component in an action can also provide variables.
-   */
-  public function testExecutionProvidedVariables() {
-    // Create a rule that produces a provided string variable.
-    $nested_rule = $this->rulesExpressionManager->createRule();
-    $nested_rule->addAction('rules_test_string', ContextConfig::create()
-      ->setValue('text', 'x')
-    );
-
-    $rules_config = new RulesComponentConfig([
-      'id' => 'test_rule',
-      'label' => 'Test rule',
-    ], 'rules_component');
-    $rules_config->setExpression($nested_rule);
-    $rules_config->setProvidedContextDefinitions(['concatenated' => ContextDefinition::create('string')]);
-
-    $this->prophesizeStorage([$rules_config]);
-
-    // Invoke the rules component in another rule.
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule->addAction('rules_component:test_rule');
-
-    $result = RulesComponent::create($rule)
-      ->provideContext('concatenated')
-      ->execute();
-
-    $this->assertEquals('xx', $result['concatenated']);
-  }
-
-  /**
-   * Tests that auto saving is only triggered once with nested components.
-   */
-  public function testAutosaveOnlyOnce() {
-    $entity = $this->prophesizeEntity(EntityInterface::class);
-
-    $nested_rule = $this->rulesExpressionManager->createRule();
-    $nested_rule->addAction('rules_entity_save', ContextConfig::create()
-      ->map('entity', 'entity')
-    );
-
-    $rules_config = new RulesComponentConfig([
-      'id' => 'test_rule',
-      'label' => 'Test rule',
-    ], 'rules_component');
-    $rules_config->setExpression($nested_rule);
-    $rules_config->setContextDefinitions(['entity' => ContextDefinition::create('entity')]);
-
-    $this->prophesizeStorage([$rules_config]);
-
-    // Create a rule with a nested rule. Overall there are 2 actions to set the
-    // entity then.
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule->addAction('rules_component:test_rule', ContextConfig::create()
-      ->map('entity', 'entity')
-    );
-    $rule->addAction('rules_entity_save', ContextConfig::create()
-      ->map('entity', 'entity')
-    );
-
-    // Auto-saving should only be triggered once on the entity.
-    $entity->save()->shouldBeCalledTimes(1);
-
-    RulesComponent::create($rule)
-      ->addContextDefinition('entity', ContextDefinition::create('entity'))
-      ->setContextValue('entity', $entity->reveal())
-      ->execute();
-  }
-
-  /**
-   * Prepares a mocked entity storage that returns the provided Rules configs.
-   *
-   * @param \Drupal\rules\Engine\RulesComponentConfig[] $rules_configs
-   *   The Rules componentn config entities that should be returned.
-   */
-  protected function prophesizeStorage(array $rules_configs) {
-    $storage = $this->prophesize(ConfigEntityStorageInterface::class);
-    $keyed_configs = [];
-
-    foreach ($rules_configs as $rules_config) {
-      $keyed_configs[$rules_config->id()] = $rules_config;
-      $storage->load($rules_config->id())->willReturn($rules_config);
-    }
-
-    $storage->loadMultiple(NULL)->willReturn($keyed_configs);
-    $this->entityTypeManager->getStorage('rules_component')->willReturn($storage->reveal());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/SendAccountEmailTest.php b/modules/rules/tests/src/Unit/Integration/Action/SendAccountEmailTest.php
deleted file mode 100644
index d9a24ef..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/SendAccountEmailTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action {
-
-  use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-  use Drupal\user\UserInterface;
-
-  /**
-   * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\SendAccountEmail
-   * @group RulesAction
-   */
-  class SendAccountEmailTest extends RulesEntityIntegrationTestBase {
-
-    /**
-     * The action to be tested.
-     *
-     * @var \Drupal\rules\Core\RulesActionInterface
-     */
-    protected $action;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setUp() {
-      parent::setUp();
-
-      $this->enableModule('user');
-      $this->action = $this->actionManager->createInstance('rules_send_account_email');
-    }
-
-    /**
-     * Tests the summary.
-     *
-     * @covers ::summary
-     */
-    public function testSummary() {
-      $this->assertEquals('Send account e-mail', $this->action->summary());
-    }
-
-    /**
-     * Tests the action execution.
-     *
-     * @covers ::execute
-     */
-    public function testActionExecution() {
-      $account = $this->prophesizeEntity(UserInterface::class);
-      $mail_type = 'test_mail_type';
-      $this->action->setContextValue('user', $account->reveal())
-        ->setContextValue('email_type', $mail_type);
-
-      $this->action->execute();
-
-      // To ge the notifications that were sent, we call the _user_mail_notify()
-      // with no parameters.
-      $notifications = _user_mail_notify();
-      $this->assertSame([$mail_type => 1], $notifications);
-    }
-
-  }
-
-}
-
-namespace {
-
-  /*
-   * We fake the _user_mail_notify() when using unit tests and we adapt it so
-   * that we can get how many times the function was called with a specific $op.
-   */
-  if (!function_exists('_user_mail_notify')) {
-
-    /**
-     * Dummy replacement for testing.
-     */
-    function _user_mail_notify($op = NULL, $account = NULL, $langcode = NULL) {
-      static $notifications_sent;
-      if (!empty($op)) {
-        if (!isset($notifications_sent[$op])) {
-          $notifications_sent[$op] = 0;
-        }
-        $notifications_sent[$op]++;
-      }
-      return $notifications_sent;
-    }
-
-  }
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/SystemMessageTest.php b/modules/rules/tests/src/Unit/Integration/Action/SystemMessageTest.php
deleted file mode 100644
index 37a41c6..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/SystemMessageTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action {
-
-  use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-  /**
-   * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\SystemMessage
-   * @group RulesAction
-   */
-  class SystemMessageTest extends RulesIntegrationTestBase {
-
-    /**
-     * The action to be tested.
-     *
-     * @var \Drupal\rules\Core\RulesActionInterface
-     */
-    protected $action;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setUp() {
-      parent::setUp();
-
-      $this->action = $this->actionManager->createInstance('rules_system_message');
-
-      // Clear the statically stored messages before every test run.
-      $this->clearMessages();
-    }
-
-    /**
-     * Tests the summary.
-     *
-     * @covers ::summary
-     */
-    public function testSummary() {
-      $this->assertEquals('Show a message on the site', $this->action->summary());
-    }
-
-    /**
-     * Tests the action execution.
-     *
-     * @covers ::execute
-     */
-    public function testActionExecution() {
-      $this->action->setContextValue('message', 'test message')
-        ->setContextValue('type', 'status')
-        ->setContextValue('repeat', FALSE);
-
-      // Execute the action multiple times. The message should still only
-      // be stored once (repeat is set to FALSE).
-      $this->action->execute();
-      $this->action->execute();
-      $this->action->execute();
-
-      $messages = $this->getMessages('status');
-      $this->assertNotNull($messages);
-      $this->assertArrayEquals(['test message'], $messages);
-
-      // Set the 'repeat' context to TRUE and execute the action again.
-      $this->action->setContextValue('repeat', TRUE);
-      $this->action->execute();
-
-      // The message should be repeated now.
-      $messages = $this->getMessages('status');
-      $this->assertNotNull($messages);
-      $this->assertArrayEquals(['test message', 'test message'], $messages);
-    }
-
-    /**
-     * Tests that the action works if the optional repeat flag is not set.
-     *
-     * @covers ::execute
-     */
-    public function testOptionalRepeat() {
-      $this->action->setContextValue('message', 'test message')
-        ->setContextValue('type', 'status');
-
-      $this->action->execute();
-
-      $messages = $this->getMessages('status');
-      $this->assertNotNull($messages);
-      $this->assertArrayEquals(['test message'], $messages);
-    }
-
-    /**
-     * Clears the statically stored messages.
-     *
-     * @param null|string $type
-     *   (optional) The type of messages to clear. Defaults to NULL which causes
-     *   all messages to be cleared.
-     *
-     * @return $this
-     */
-    protected function clearMessages($type = NULL) {
-      $messages = &drupal_set_message();
-      if (isset($type)) {
-        unset($messages[$type]);
-      }
-      else {
-        $messages = NULL;
-      }
-      return $this;
-    }
-
-    /**
-     * Retrieves the stored messages.
-     *
-     * @param null|string $type
-     *   (optional) The type of messages to return. Defaults to NULL which
-     *   causes all messages to be returned.
-     *
-     * @return array|null
-     *   A multidimensional array with keys corresponding to the set message
-     *   types. The indexed array values of each contain the set messages for
-     *   that type. The messages returned are limited to the type specified in
-     *   the $type parameter. If there are no messages of the specified type,
-     *   an empty array is returned.
-     */
-    protected function getMessages($type = NULL) {
-      $messages = drupal_set_message();
-      if (isset($type)) {
-        return isset($messages[$type]) ? $messages[$type] : NULL;
-      }
-      return $messages;
-    }
-
-  }
-}
-
-namespace {
-
-  if (!function_exists('drupal_set_message')) {
-
-    /**
-     * Dummy replacement for testing.
-     */
-    function &drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE) {
-      static $messages = NULL;
-
-      if (!empty($message)) {
-        $messages[$type] = isset($messages[$type]) ? $messages[$type] : [];
-        if ($repeat || !in_array($message, $messages[$type])) {
-          $messages[$type][] = $message;
-        }
-      }
-
-      return $messages;
-    }
-
-  }
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/SystemPageRedirectTest.php b/modules/rules/tests/src/Unit/Integration/Action/SystemPageRedirectTest.php
deleted file mode 100644
index 05c30ff..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/SystemPageRedirectTest.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action {
-
-  use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-  use Drupal\Core\Logger\LoggerChannelFactoryInterface;
-  use Psr\Log\LoggerInterface;
-  use Symfony\Component\HttpFoundation\ParameterBag;
-  use Symfony\Component\HttpFoundation\Request;
-  use Symfony\Component\HttpFoundation\RequestStack;
-  use Drupal\Core\Path\CurrentPathStack;
-
-  /**
-   * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\SystemPageRedirect
-   * @group RulesAction
-   */
-  class SystemPageRedirectTest extends RulesIntegrationTestBase {
-
-    /**
-     * A mocked logger.
-     *
-     * @var \Psr\Log\LoggerInterface|\Prophecy\Prophecy\ProphecyInterface
-     */
-    protected $logger;
-
-    /**
-     * The mocked logger factory service.
-     *
-     * @var \Drupal\Core\Logger\LoggerChannelFactoryInterface|\Prophecy\Prophecy\ProphecyInterface
-     */
-    protected $loggerFactory;
-
-    /**
-     * The mocked request stack service.
-     *
-     * @var \Symfony\Component\HttpFoundation\RequestStack|\Prophecy\Prophecy\ProphecyInterface
-     */
-    protected $requestStack;
-
-    /**
-     * The mocked current path stack service.
-     *
-     * @var \Drupal\Core\Path\CurrentPathStack|\Prophecy\Prophecy\ProphecyInterface
-     */
-    protected $currentPathStack;
-
-    /**
-     * A mocked request.
-     *
-     * @var \Symfony\Component\HttpFoundation\Request|\Prophecy\Prophecy\ProphecyInterface
-     */
-    protected $currentRequest;
-
-    /**
-     * A mocked parameter bag.
-     *
-     * @var \Symfony\Component\HttpFoundation\ParameterBag|\Prophecy\Prophecy\ProphecyInterface
-     */
-    protected $parameterBag;
-
-    /**
-     * The action to be tested.
-     *
-     * @var \Drupal\rules\Plugin\RulesAction\SystemPageRedirect
-     */
-    protected $action;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setUp() {
-      parent::setUp();
-
-      // Mock a logger.
-      $this->logger = $this->prophesize(LoggerInterface::class);
-
-      // Mock the logger service, make it return our mocked logger, and register
-      // it in the container.
-      $this->loggerFactory = $this->prophesize(LoggerChannelFactoryInterface::class);
-      $this->loggerFactory->get('rules')->willReturn($this->logger->reveal());
-      $this->container->set('logger.factory', $this->loggerFactory->reveal());
-
-      // Mock a parameter bag.
-      $this->parameterBag = $this->prophesize(ParameterBag::class);
-
-      // Mock a request, and set our mocked parameter bag as it attributes
-      // property.
-      $this->currentRequest = $this->prophesize(Request::class);
-      $this->currentRequest->attributes = $this->parameterBag->reveal();
-
-      // Mock the request stack, make it return our mocked request when the
-      // current request is requested, and register it in the container.
-      $this->requestStack = $this->prophesize(RequestStack::class);
-      $this->requestStack->getCurrentRequest()->willReturn($this->currentRequest);
-      $this->container->set('request_stack', $this->requestStack->reveal());
-
-      // Mock the current path stack.
-      $this->currentPathStack = $this->prophesize(CurrentPathStack::class);
-      $this->container->set('path.current', $this->currentPathStack->reveal());
-
-      // Instantiate the redirect action.
-      $this->action = $this->actionManager->createInstance('rules_page_redirect');
-    }
-
-    /**
-     * Tests redirection.
-     *
-     * @covers ::execute
-     */
-    public function testRedirect() {
-      $this->currentPathStack->getPath()->willReturn('some/random/test/path');
-
-      $this->action->setContextValue('url', '/test/url');
-      $this->action->execute();
-
-      $this->parameterBag->set('_rules_redirect_action_url', '/test/url')->shouldHaveBeenCalled();
-    }
-
-    /**
-     * Tests unsuccessful redirection due to ongoing batch process.
-     *
-     * @covers ::execute
-     */
-    public function testRedirectBatch() {
-      $this->currentPathStack->getPath()->willReturn('some/random/test/path');
-      batch_set('Test batch!');
-
-      $this->action->setContextValue('url', '/test/url');
-      $this->action->execute();
-
-      $this->logger->warning('Skipped page redirect during batch processing.')->shouldHaveBeenCalled();
-    }
-
-    /**
-     * Tests unsuccessful redirection due to rules admin page location.
-     *
-     * @covers ::execute
-     */
-    public function testRedirectRulesAdminPage() {
-      $this->currentPathStack->getPath()->willReturn('admin/config/workflow/rules');
-
-      $this->action->setContextValue('url', '/test/url');
-      $this->action->execute();
-
-      $this->logger->warning('Skipped page redirect on a rules admin page.')->shouldHaveBeenCalled();
-    }
-
-  }
-}
-
-namespace {
-
-  if (!function_exists('batch_get')) {
-
-    /**
-     * Mock the batch_set() function.
-     */
-    function batch_set($batch_definition) {
-      if ($batch_definition) {
-        $batch = &batch_get();
-        // Nothing more then current_set should be mocked for testing purposes.
-        $batch['current_set'] = $batch_definition;
-      }
-    }
-
-    /**
-     * Mock the batch_get() function.
-     */
-    function &batch_get() {
-      static $batch = [];
-      return $batch;
-    }
-
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/SystemSendEmailTest.php b/modules/rules/tests/src/Unit/Integration/Action/SystemSendEmailTest.php
deleted file mode 100644
index d01b29c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/SystemSendEmailTest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Logger\LoggerChannelFactoryInterface;
-use Drupal\Core\Mail\MailManagerInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-use Prophecy\Argument;
-use Psr\Log\LoggerInterface;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\SystemSendEmail
- * @group RulesAction
- */
-class SystemSendEmailTest extends RulesIntegrationTestBase {
-
-  /**
-   * @var \Psr\Log\LoggerInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $logger;
-
-  /**
-   * @var \Drupal\Core\Mail\MailManagerInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $mailManager;
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Plugin\RulesAction\SystemSendEmail
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->logger = $this->prophesize(LoggerInterface::class);
-    $logger_factory = $this->prophesize(LoggerChannelFactoryInterface::class);
-    $logger_factory->get('rules')->willReturn($this->logger->reveal());
-
-    $this->mailManager = $this->prophesize(MailManagerInterface::class);
-
-    // @todo this is wrong, the logger is no factory.
-    $this->container->set('logger.factory', $logger_factory->reveal());
-    $this->container->set('plugin.manager.mail', $this->mailManager->reveal());
-
-    $this->action = $this->actionManager->createInstance('rules_send_email');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Send email', $this->action->summary());
-  }
-
-  /**
-   * Tests sending a mail to one recipient.
-   *
-   * @covers ::execute
-   */
-  public function testSendMailToOneRecipient() {
-    $to = ['mail@example.com'];
-    $this->action->setContextValue('to', $to)
-      ->setContextValue('subject', 'subject')
-      ->setContextValue('message', 'hello');
-
-    $params = [
-      'subject' => 'subject',
-      'message' => 'hello',
-    ];
-
-    $this->mailManager->mail(
-      'rules', 'rules_action_mail_' . $this->action->getPluginId(),
-      implode(', ', $to),
-      LanguageInterface::LANGCODE_SITE_DEFAULT,
-      $params,
-      NULL
-    )
-      ->willReturn(['result' => TRUE])
-      ->shouldBeCalledTimes(1);
-
-    $this->logger->notice(
-      // @todo assert the actual message here, but PHPunit goes into an endless
-      // loop with that.
-      Argument::any(), Argument::any()
-    )->shouldBeCalledTimes(1);
-
-    $this->action->execute();
-  }
-
-  /**
-   * Tests sending a mail to two recipients.
-   *
-   * @covers ::execute
-   */
-  public function testSendMailToTwoRecipients() {
-    $to = ['mail@example.com', 'mail2@example.com'];
-    $this->action->setContextValue('to', $to)
-      ->setContextValue('subject', 'subject')
-      ->setContextValue('message', 'hello');
-
-    $params = [
-      'subject' => 'subject',
-      'message' => 'hello',
-    ];
-
-    $this->mailManager->mail(
-      'rules', 'rules_action_mail_' . $this->action->getPluginId(),
-      implode(', ', $to),
-      LanguageInterface::LANGCODE_SITE_DEFAULT,
-      $params,
-      NULL
-    )
-      ->willReturn(['result' => TRUE])
-      ->shouldBeCalledTimes(1);
-
-    $this->logger->notice(
-      // @todo assert the actual message here, but PHPunit goes into an endless
-      // with that.
-      Argument::any(), Argument::any()
-    )->shouldBeCalledTimes(1);
-
-    $this->action->execute();
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/UserBlockTest.php b/modules/rules/tests/src/Unit/Integration/Action/UserBlockTest.php
deleted file mode 100644
index 9591013..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/UserBlockTest.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Core\Session\SessionManagerInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-use Drupal\user\UserInterface;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\UserBlock
- * @group RulesAction
- */
-class UserBlockTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * Constant used for authenticated test when mocking a user.
-   */
-  const AUTHENTICATED = TRUE;
-
-  /**
-   * Constant used for authenticated test when mocking a user.
-   */
-  const ANONYMOUS = FALSE;
-
-  /**
-   * Constant used for active test when mocking a user.
-   */
-  const ACTIVE = TRUE;
-
-  /**
-   * Constant used for active test when mocking a user.
-   */
-  const BLOCKED = FALSE;
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Engine\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * The mocked session manager.
-   *
-   * @var \Drupal\Core\Session\SessionManagerInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $sessionManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->enableModule('user');
-
-    $this->sessionManager = $this->prophesize(SessionManagerInterface::class);
-    $this->container->set('session_manager', $this->sessionManager->reveal());
-    $this->action = $this->actionManager->createInstance('rules_user_block');
-  }
-
-  /**
-   * Test the summary method.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Block a user', $this->action->summary());
-  }
-
-  /**
-   * Test execute() method for active and authenticated users.
-   *
-   * @covers ::execute
-   */
-  public function testBlockUserWithValidUser() {
-    $user = $this->getUserMock(self::ACTIVE, self::AUTHENTICATED);
-
-    $user->block()->shouldBeCalledTimes(1);
-
-    $user->id()->willReturn('123')->shouldBeCalledTimes(1);
-
-    $this->sessionManager->delete('123')->shouldBeCalledTimes(1);
-
-    $this->action->setContextValue('user', $user->reveal());
-
-    $this->action->execute();
-
-    $this->assertEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
-  }
-
-  /**
-   * Test execute() method for active and anonymous users.
-   *
-   * @covers ::execute
-   */
-  public function testBlockUserWithActiveAnonymousUser() {
-    $user = $this->getUserMock(self::ACTIVE, self::ANONYMOUS);
-
-    $user->block()->shouldNotBeCalled();
-
-    $this->sessionManager->delete()->shouldNotBeCalled();
-
-    $this->action->setContextValue('user', $user->reveal());
-
-    $this->action->execute();
-
-    $this->assertEquals($this->action->autoSaveContext(), [], 'Action returns nothing for auto saving since the user has not been altered.');
-  }
-
-  /**
-   * Test execute() method for blocked and authenticated users.
-   *
-   * @covers ::execute
-   */
-  public function testBlockUserWithBlockedAuthenticatedUser() {
-    $user = $this->getUserMock(self::BLOCKED, self::AUTHENTICATED);
-
-    $user->block()->shouldNotBeCalled();
-
-    $this->sessionManager->delete()->shouldNotBeCalled();
-
-    $this->action->setContextValue('user', $user->reveal());
-
-    $this->action->execute();
-
-    $this->assertEquals($this->action->autoSaveContext(), [], 'Action returns nothing for auto saving since the user has not been altered.');
-  }
-
-  /**
-   * Test execute() method for blocked and anonymous users.
-   *
-   * @covers ::execute
-   */
-  public function testBlockUserWithBlockedAnonymousUser() {
-    $user = $this->getUserMock(self::BLOCKED, self::ANONYMOUS);
-
-    $user->block()->shouldNotBeCalled();
-
-    $this->sessionManager->delete()->shouldNotBeCalled();
-
-    $this->action->setContextValue('user', $user->reveal());
-
-    $this->action->execute();
-
-    $this->assertEquals($this->action->autoSaveContext(), [], 'Action returns nothing for auto saving since the user has not been altered.');
-  }
-
-  /**
-   * Creates a mock user.
-   *
-   * @param bool $active
-   *   Is user activated.
-   * @param bool $authenticated
-   *   Is user authenticated.
-   *
-   * @return \Drupal\user\UserInterface|\Prophecy\Prophecy\ProphecyInterface
-   *   The mocked user object.
-   */
-  protected function getUserMock($active, $authenticated) {
-    $user = $this->prophesizeEntity(UserInterface::class);
-
-    $user->isActive()->willReturn($active);
-    $user->isAuthenticated()->willReturn($authenticated);
-
-    return $user;
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/UserRoleAddTest.php b/modules/rules/tests/src/Unit/Integration/Action/UserRoleAddTest.php
deleted file mode 100644
index 2a94205..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/UserRoleAddTest.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-use Drupal\user\RoleInterface;
-use Drupal\user\UserInterface;
-use Prophecy\Argument;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\UserRoleAdd
- * @group RulesAction
- */
-class UserRoleAddTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The action that is being tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->enableModule('user');
-    $this->action = $this->actionManager->createInstance('rules_user_role_add');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Add user role', $this->action->summary());
-  }
-
-  /**
-   * Tests adding of one role to user. User should not be saved.
-   *
-   * @covers ::execute
-   */
-  public function testAddOneRoleNoSave() {
-    // Set-up a mock user.
-    $account = $this->prophesizeEntity(UserInterface::class);
-
-    $account->hasRole('administrator')->willReturn(FALSE);
-    $account->addRole('administrator')->shouldBeCalledTimes(1);
-    // We do noe expect call of the 'save' method because user should be
-    // auto-saved later.
-    $account->save()->shouldNotBeCalled();
-
-    // Mock the 'administrator' user role.
-    $administrator = $this->prophesize(RoleInterface::class);
-    $administrator->id()->willReturn('administrator');
-
-    // Test adding of one role.
-    $this->action
-      ->setContextValue('user', $account->reveal())
-      ->setContextValue('roles', [$administrator->reveal()])
-      ->execute();
-
-    $this->assertEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
-  }
-
-  /**
-   * Tests adding of three roles to user.
-   *
-   * @covers ::execute
-   */
-  public function testAddThreeRoles() {
-    // Set-up a mock user.
-    $account = $this->prophesizeEntity(UserInterface::class);
-    // Mock hasRole.
-    $account->hasRole('manager')->willReturn(FALSE)->shouldBeCalledTimes(1);
-    $account->hasRole('editor')->willReturn(FALSE)->shouldBeCalledTimes(1);
-    $account->hasRole('administrator')->willReturn(FALSE)->shouldBeCalledTimes(1);
-
-    // Mock addRole.
-    $account->addRole('manager')->shouldBeCalledTimes(1);
-    $account->addRole('editor')->shouldBeCalledTimes(1);
-    $account->addRole('administrator')->shouldBeCalledTimes(1);
-
-    // Mock user roles.
-    $manager = $this->prophesize(RoleInterface::class);
-    $manager->id()->willReturn('manager');
-    $editor = $this->prophesize(RoleInterface::class);
-    $editor->id()->willReturn('editor');
-    $administrator = $this->prophesize(RoleInterface::class);
-    $administrator->id()->willReturn('administrator');
-
-    // Test adding of three roles role.
-    $this->action
-      ->setContextValue('user', $account->reveal())
-      ->setContextValue('roles', [
-        $manager->reveal(),
-        $editor->reveal(),
-        $administrator->reveal(),
-      ])
-      ->execute();
-
-    $this->assertEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
-  }
-
-  /**
-   * Tests adding of existing role to user.
-   *
-   * @covers ::execute
-   */
-  public function testAddExistingRole() {
-    // Set-up a mock user with role 'administrator'.
-    $account = $this->prophesizeEntity(UserInterface::class);
-    $account->hasRole('administrator')->willReturn(TRUE);
-
-    // We do not expect a call of the 'addRole' method.
-    $account->addRole(Argument::any())->shouldNotBeCalled();
-
-    // Mock the 'administrator' user role.
-    $administrator = $this->prophesize(RoleInterface::class);
-    $administrator->id()->willReturn('administrator');
-
-    // Test adding one role.
-    $this->action
-      ->setContextValue('user', $account->reveal())
-      ->setContextValue('roles', [$administrator->reveal()])
-      ->execute();
-
-    $this->assertEquals($this->action->autoSaveContext(), [], 'Action returns nothing for auto saving since the user has the role already.');
-  }
-
-  /**
-   * Tests adding of one existing and one nonexistent role to user.
-   *
-   * @covers ::execute
-   */
-  public function testAddExistingAndNonexistentRole() {
-    // Set-up a mock user with role 'administrator' but without 'editor'.
-    $account = $this->prophesizeEntity(UserInterface::class);
-    $account->hasRole('administrator')->willReturn(TRUE)
-      ->shouldBeCalledTimes(1);
-    $account->hasRole('editor')->willReturn(FALSE)
-      ->shouldBeCalledTimes(1);
-
-    // We expect only one call of the 'addRole' method.
-    $account->addRole('editor')->shouldBeCalledTimes(1);
-
-    // Mock user roles.
-    $editor = $this->prophesize(RoleInterface::class);
-    $editor->id()->willReturn('editor');
-    $administrator = $this->prophesize(RoleInterface::class);
-    $administrator->id()->willReturn('administrator');
-
-    // Test adding one role.
-    $this->action
-      ->setContextValue('user', $account->reveal())
-      ->setContextValue('roles', [$administrator->reveal(), $editor->reveal()])
-      ->execute();
-
-    $this->assertEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/UserRoleRemoveTest.php b/modules/rules/tests/src/Unit/Integration/Action/UserRoleRemoveTest.php
deleted file mode 100644
index 23e1a8b..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/UserRoleRemoveTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-use Drupal\user\RoleInterface;
-use Drupal\user\UserInterface;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\UserRoleRemove
- * @group RulesAction
- */
-class UserRoleRemoveTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The action that is being tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->enableModule('user');
-    $this->action = $this->actionManager->createInstance('rules_user_role_remove');
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Remove user role', $this->action->summary());
-  }
-
-  /**
-   * Tests removing role from user. User should not be saved.
-   *
-   * @covers ::execute
-   */
-  public function testRemoveExistingRoleNoSave() {
-
-    // Set-up a mock user with role 'editor'.
-    $account = $this->prophesizeEntity(UserInterface::class);
-    $account->hasRole('editor')->willReturn(TRUE);
-    $account->removeRole('editor')->shouldBeCalledTimes(1);
-
-    // We do not expect call of the 'save' method because user should be
-    // auto-saved later.
-    $account->save()->shouldNotBeCalled();
-
-    // Mock the 'editor' user role.
-    $editor = $this->prophesize(RoleInterface::class);
-    $editor->id()->willReturn('editor');
-
-    // Test removing of one role.
-    $this->action
-      ->setContextValue('user', $account->reveal())
-      ->setContextValue('roles', [$editor->reveal()])
-      ->execute();
-
-    $this->assertEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
-  }
-
-  /**
-   * Tests removing non-existing role from user.
-   *
-   * @covers ::execute
-   */
-  public function testRemoveNonExistingRole() {
-
-    // Set-up a mock user with role 'editor'.
-    $account = $this->prophesizeEntity(UserInterface::class);
-    $account->hasRole('editor')->willReturn(FALSE);
-    $account->removeRole('editor')->shouldNotBeCalled();
-
-    // Mock the 'editor' user role.
-    $editor = $this->prophesize(RoleInterface::class);
-    $editor->id()->willReturn('editor');
-
-    // Test removing of one role.
-    $this->action
-      ->setContextValue('user', $account->reveal())
-      ->setContextValue('roles', [$editor->reveal()])
-      ->execute();
-
-    $this->assertNotEquals($this->action->autoSaveContext(), ['user'], 'Action returns the user context name for auto saving.');
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/UserUnblockTest.php b/modules/rules/tests/src/Unit/Integration/Action/UserUnblockTest.php
deleted file mode 100644
index eb6d80f..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/UserUnblockTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-use Drupal\user\UserInterface;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\UserUnblock
- * @group RulesAction
- */
-class UserUnblockTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * Constant used for authenticated test when mocking a user.
-   */
-  const AUTHENTICATED = TRUE;
-
-  /**
-   * Constant used for authenticated test when mocking a user.
-   */
-  const ANONYMOUS = FALSE;
-
-  /**
-   * Constant used for active test when mocking a user.
-   */
-  const ACTIVE = TRUE;
-
-  /**
-   * Constant used for active test when mocking a user.
-   */
-  const BLOCKED = FALSE;
-
-  /**
-   * The action to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesActionInterface
-   */
-  protected $action;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->enableModule('user');
-    $this->action = $this->actionManager->createInstance('rules_user_unblock');
-  }
-
-  /**
-   * Test the summary method.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Unblock a user', $this->action->summary());
-  }
-
-  /**
-   * Test execute() method for users with different status.
-   *
-   * @dataProvider userProvider
-   *
-   * @covers ::execute
-   */
-  public function testUnblockUser($active, $authenticated, $expects, $autosave_names) {
-    // Set-up a mock user.
-    $account = $this->prophesizeEntity(UserInterface::class);
-    // Mock isBlocked.
-    $account->isBlocked()->willReturn(!$active);
-    // Mock isAuthenticated.
-    $account->isAuthenticated()->willReturn($authenticated);
-    // Mock activate.
-    $account->activate()->shouldBeCalledTimes($expects);
-    // We do noe expect call of the 'save' method because user should be
-    // auto-saved later.
-    $account->save()->shouldNotBeCalled();
-    // Test unblocking the user.
-    $this->action
-      ->setContextValue('user', $account->reveal())
-      ->execute();
-
-    $this->assertEquals($this->action->autoSaveContext(), $autosave_names, 'Action returns correct context name for auto saving.');
-  }
-
-  /**
-   * Data provider for ::testUnblockUser.
-   */
-  public function userProvider() {
-    return [
-      // Test blocked authenticated user.
-      [self::BLOCKED, self::AUTHENTICATED, 1, ['user']],
-      // Test active anonymous user.
-      [self::ACTIVE, self::ANONYMOUS, 0, []],
-      // Test active authenticated user.
-      [self::ACTIVE, self::AUTHENTICATED, 0, []],
-      // Test blocked anonymous user.
-      [self::BLOCKED, self::ANONYMOUS, 0, []],
-    ];
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Action/VariableAddTest.php b/modules/rules/tests/src/Unit/Integration/Action/VariableAddTest.php
deleted file mode 100644
index b6eed9e..0000000
--- a/modules/rules/tests/src/Unit/Integration/Action/VariableAddTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Action;
-
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesAction\VariableAdd
- * @group RulesAction
- */
-class VariableAddTest extends RulesIntegrationTestBase {
-
-  /**
-   * Test the action execution.
-   *
-   * @covers ::execute
-   */
-  public function testExecute() {
-    $variable = 'test string';
-
-    /** @var \Drupal\rules\Plugin\RulesAction\VariableAdd $action */
-    $action = $this->actionManager->createInstance('rules_variable_add');
-    $action->setContextValue('type', 'string');
-    $action->setContextValue('value', $variable);
-    $action->refineContextDefinitions([]);
-    $action->execute();
-
-    $result = $action->getProvidedContext('variable_added');
-    $this->assertEquals($variable, $result->getContextValue());
-    $this->assertEquals('string', $result->getContextDefinition()->getDataType());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/ConditionAccessTest.php b/modules/rules/tests/src/Unit/Integration/Condition/ConditionAccessTest.php
deleted file mode 100644
index 2a6b39c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/ConditionAccessTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-use Drupal\Core\Session\AccountInterface;
-use Prophecy\Argument;
-
-/**
- * Test of access control features for Rules Conditions.
- *
- * @group RulesCondition
- */
-class ConditionAccessTest extends RulesIntegrationTestBase {
-
-  /**
-   * Confirm that a condition plugin respects configure_permissions.
-   */
-  public function testHasConfigurationAccessInfo() {
-    $plugin = $this->conditionManager->createInstance('rules_test_string_condition');
-    $this->assertNotNull($plugin, "The rules_test condition was found.");
-    $definition = $plugin->getPluginDefinition();
-    $this->assertNotEmpty($definition['configure_permissions'], "Plugin has configure permission info.");
-    $perms = $definition['configure_permissions'];
-    $this->assertTrue(is_array($perms), "configure_permissions is an array");
-    $this->assertContains("access test configuration", $perms, "Expected permission found in configure_permissions.");
-
-    // Now see if the permission is actually used.
-    $user_with_perm = $this->prophesize(AccountInterface::class);
-    $user_with_perm
-      ->hasPermission("access test configuration")
-      ->willReturn(TRUE)
-      ->shouldBeCalledTimes(2);
-    $user_with_perm
-      ->hasPermission(Argument::type('string'))
-      ->willReturn(FALSE);
-
-    $this->container->set('current_user', $user_with_perm->reveal());
-    $this->assertTrue($plugin->checkConfigurationAccess(),
-                      "User with permission has configure permission.");
-    $this->assertTrue($plugin->checkConfigurationAccess($user_with_perm->reveal(), TRUE)->isAllowed(),
-                      "Condition returns isAllowed()");
-
-    $user_without_perm = $this->prophesize(AccountInterface::class);
-    $user_without_perm
-      ->hasPermission("access test configuration")
-      ->willReturn(FALSE)
-      ->shouldBeCalledTimes(2);
-    $user_without_perm
-      ->hasPermission(Argument::type('string'))
-      ->willReturn(FALSE);
-
-    $this->assertFalse($plugin->checkConfigurationAccess($user_without_perm->reveal()),
-                       "User without permission does not have configure permission.");
-    $this->assertTrue($plugin->checkConfigurationAccess($user_without_perm->reveal(), TRUE)->isNeutral(),
-                       "User without permission gets isNeutral().");
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/ConditionManagerTest.php b/modules/rules/tests/src/Unit/Integration/Condition/ConditionManagerTest.php
deleted file mode 100644
index 3b99a2c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/ConditionManagerTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\rules\Context\ContextDefinitionInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * Tests the Rules condition manager.
- *
- * @group RulesCondition
- */
-class ConditionManagerTest extends RulesIntegrationTestBase {
-
-  /**
-   * @cover getDiscovery()
-   */
-  public function testContextDefinitionAnnotations() {
-    $definitions = $this->conditionManager->getDefinitions();
-    // Make sure all context definitions are using the class provided by Rules.
-    foreach ($definitions as $definition) {
-      if (!empty($definition['context'])) {
-        foreach ($definition['context'] as $context_definition) {
-          $this->assertInstanceOf(ContextDefinitionInterface::class, $context_definition);
-        }
-      }
-    }
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/DataComparisonTest.php b/modules/rules/tests/src/Unit/Integration/Condition/DataComparisonTest.php
deleted file mode 100644
index 6afae54..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/DataComparisonTest.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\DataComparison
- * @group RulesCondition
- */
-class DataComparisonTest extends RulesIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->condition = $this->conditionManager->createInstance('rules_data_comparison');
-  }
-
-  /**
-   * Tests evaluating the condition with the "equals" operator.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluationOperatorEquals() {
-    // Test that when a boolean data does not equal a boolean value
-    // and the operator is not set - should fallback to '=='.
-    $this->condition
-      ->setContextValue('data', TRUE)
-      ->setContextValue('value', FALSE);
-    $this->assertFalse($this->condition->evaluate());
-
-    // Test that when both data and value are false booleans
-    // and the operator is not set - should fallback to '=='.
-    $this->condition
-      ->setContextValue('data', FALSE)
-      ->setContextValue('value', FALSE);
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that when the data string equals the value string and the operator
-    // is '==', TRUE is returned.
-    $this->condition
-      ->setContextValue('data', 'Llama')
-      ->setContextValue('operation', '==')
-      ->setContextValue('value', 'Llama');
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that when the data string does not equal the value string and the
-    // operation is '==', FALSE is returned.
-    $this->condition
-      ->setContextValue('data', 'Kitten')
-      ->setContextValue('operation', '==')
-      ->setContextValue('value', 'Llama');
-    $this->assertFalse($this->condition->evaluate());
-
-    // Test that when both data and value are false booleans and the operation
-    // is '==', TRUE is returned.
-    $this->condition
-      ->setContextValue('data', FALSE)
-      ->setContextValue('operation', '==')
-      ->setContextValue('value', FALSE);
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that when a boolean data does not equal a boolean value
-    // and the operation is '==', FALSE is returned.
-    $this->condition
-      ->setContextValue('data', TRUE)
-      ->setContextValue('operation', '==')
-      ->setContextValue('value', FALSE);
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-  /**
-   * Tests evaluating the condition with the "contains" operation.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluationOperatorContains() {
-    // Test that when the data string contains the value string, and the
-    // operation is 'CONTAINS', TRUE is returned.
-    $this->condition
-      ->setContextValue('data', 'Big Llama')
-      ->setContextValue('operation', 'contains')
-      ->setContextValue('value', 'Llama');
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that when the data string does not contain the value string, and
-    // the operation is 'contains', TRUE is returned.
-    $this->condition
-      ->setContextValue('data', 'Big Kitten')
-      ->setContextValue('operation', 'contains')
-      ->setContextValue('value', 'Big Kitten');
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that when a data array contains the value string, and the operation
-    // is 'CONTAINS', TRUE is returned.
-    $this->condition
-      ->setContextValue('data', ['Llama', 'Kitten'])
-      ->setContextValue('operation', 'contains')
-      ->setContextValue('value', 'Llama');
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that when a data array does not contain the value array, and the
-    // operation is 'CONTAINS', TRUE is returned.
-    $this->condition
-      ->setContextValue('data', ['Kitten'])
-      ->setContextValue('operation', 'contains')
-      ->setContextValue('value', ['Llama']);
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-  /**
-   * Tests evaluating the condition with the "IN" operation.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluationOperatorIn() {
-    // Test that when the data string is 'IN' the value array, TRUE is returned.
-    $this->condition
-      ->setContextValue('data', 'Llama')
-      ->setContextValue('operation', 'IN')
-      ->setContextValue('value', ['Llama', 'Kitten']);
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that when the data array is not in the value array, and the
-    // operation is 'IN', FALSE is returned.
-    $this->condition
-      ->setContextValue('data', ['Llama'])
-      ->setContextValue('operation', 'IN')
-      ->setContextValue('value', ['Kitten']);
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-  /**
-   * Tests evaluating the condition with the "is less than" operation.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluationOperatorLessThan() {
-    // Test that when data is less than value and operation is '<',
-    // TRUE is returned.
-    $this->condition
-      ->setContextValue('data', 1)
-      ->setContextValue('operation', '<')
-      ->setContextValue('value', 2);
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that when data is greater than value and operation is '<',
-    // FALSE is returned.
-    $this->condition
-      ->setContextValue('data', 2)
-      ->setContextValue('operation', '<')
-      ->setContextValue('value', 1);
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-  /**
-   * Tests evaluating the condition with the "is greater than" operation.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluationOperatorGreaterThan() {
-    // Test that when data is greater than value and operation is '>',
-    // TRUE is returned.
-    $this->condition
-      ->setContextValue('data', 2)
-      ->setContextValue('operation', '>')
-      ->setContextValue('value', 1);
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that when data is less than value and operation is '>',
-    // FALSE is returned.
-    $this->condition
-      ->setContextValue('data', 1)
-      ->setContextValue('operation', '>')
-      ->setContextValue('value', 2);
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-  /**
-   * Tests the summary.
-   *
-   * @covers ::summary
-   */
-  public function testSummary() {
-    $this->assertEquals('Data comparison', $this->condition->summary());
-  }
-
-  /**
-   * @covers ::refineContextDefinitions
-   */
-  public function testRefineContextDefinitions() {
-    // When a string is selected for comparison, the value must be string also.
-    $this->condition->refineContextDefinitions([
-      'data' => DataDefinition::create('string'),
-    ]);
-    $this->assertEquals('string', $this->condition->getContextDefinition('value')->getDataType());
-
-    // IN operation requires a list of strings as value.
-    $this->condition->setContextValue('operation', 'IN');
-    $this->condition->refineContextDefinitions([
-      'data' => DataDefinition::create('string'),
-    ]);
-    $this->assertEquals('string', $this->condition->getContextDefinition('value')->getDataType());
-    $this->assertTrue($this->condition->getContextDefinition('value')->isMultiple());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/DataIsEmptyTest.php b/modules/rules/tests/src/Unit/Integration/Condition/DataIsEmptyTest.php
deleted file mode 100644
index 7286576..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/DataIsEmptyTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Core\Plugin\Context\Context;
-use Drupal\Core\TypedData\ComplexDataInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\DataIsEmpty
- * @group RulesCondition
- */
-class DataIsEmptyTest extends RulesIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->condition = $this->conditionManager->createInstance('rules_data_is_empty');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    // Test a ComplexDataInterface object.
-    $entity_adapter_empty = $this->prophesize(ComplexDataInterface::class);
-    $entity_adapter_empty->isEmpty()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
-    $context = $this->condition->getContext('data');
-    $context = Context::createFromContext($context, $entity_adapter_empty->reveal());
-    $this->condition->setContext('data', $context);
-    $this->assertTrue($this->condition->evaluate());
-
-    $entity_adapter_full = $this->prophesize(ComplexDataInterface::class);
-    $entity_adapter_full->isEmpty()->willReturn(FALSE)->shouldBeCalledTimes(1);
-
-    $context = Context::createFromContext($context, $entity_adapter_full->reveal());
-    $this->condition->setContext('data', $context);
-    $this->assertFalse($this->condition->evaluate());
-
-    // These should all return FALSE.
-    // A non-empty array.
-    $context = Context::createFromContext(
-      $context,
-      $this->getTypedData('list', [1, 2, 3])
-    );
-    $this->condition->setContext('data', $context);
-    $this->assertFalse($this->condition->evaluate());
-
-    // An array containing an empty list.
-    $context = Context::createFromContext($context, $this->getTypedData('list', [[]]));
-    $this->condition->setContext('data', $context);
-    $this->assertFalse($this->condition->evaluate());
-
-    // An array with a zero-value element.
-    $context = Context::createFromContext($context, $this->getTypedData('list', [0]));
-    $this->condition->setContext('data', $context);
-    $this->assertFalse($this->condition->evaluate());
-
-    // A scalar value.
-    $context = Context::createFromContext($context, $this->getTypedData('integer', 1));
-    $this->condition->setContext('data', $context);
-    $this->assertFalse($this->condition->evaluate());
-
-    $context = Context::createFromContext($context, $this->getTypedData('string', 'short string'));
-    $this->condition->setContext('data', $context);
-    $this->assertFalse($this->condition->evaluate());
-
-    // These should all return TRUE.
-    // An empty array.
-    $context = Context::createFromContext($context, $this->getTypedData('list', []));
-    $this->condition->setContext('data', $context);
-    $this->assertTrue($this->condition->evaluate());
-
-    // The false/zero/NULL values.
-    $context = Context::createFromContext($context, $this->getTypedData('boolean', FALSE));
-    $this->condition->setContext('data', $context);
-    $this->assertTrue($this->condition->evaluate());
-
-    $context = Context::createFromContext($context, $this->getTypedData('integer', 0));
-    $this->condition->setContext('data', $context);
-    $this->assertTrue($this->condition->evaluate());
-
-    $context = Context::createFromContext($context, $this->getTypedData('string', NULL));
-    $this->condition->setContext('data', $context);
-    $this->assertTrue($this->condition->evaluate());
-
-    // An empty string.
-    $context = Context::createFromContext($context, $this->getTypedData('string', ''));
-    $this->condition->setContext('data', $context);
-    $this->assertTrue($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/EntityHasFieldTest.php b/modules/rules/tests/src/Unit/Integration/Condition/EntityHasFieldTest.php
deleted file mode 100644
index ace166c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/EntityHasFieldTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\EntityHasField
- * @group RulesCondition
- */
-class EntityHasFieldTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->condition = $this->conditionManager->createInstance('rules_entity_has_field');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    $entity = $this->prophesizeEntity(ContentEntityInterface::class);
-    $entity->hasField('existing-field')->willReturn(TRUE)
-      ->shouldBeCalledTimes(1);
-    $entity->hasField('non-existing-field')->willReturn(FALSE)
-      ->shouldBeCalledTimes(1);
-
-    $this->condition->setContextValue('entity', $entity->reveal());
-
-    // Test with an existing field.
-    $this->condition->setContextValue('field', 'existing-field');
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test with a non-existing field.
-    $this->condition->setContextValue('field', 'non-existing-field');
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsNewTest.php b/modules/rules/tests/src/Unit/Integration/Condition/EntityIsNewTest.php
deleted file mode 100644
index cbe768f..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsNewTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\EntityIsNew
- * @group RulesCondition
- */
-class EntityIsNewTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->condition = $this->conditionManager->createInstance('rules_entity_is_new');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    $entity = $this->prophesizeEntity(EntityInterface::class);
-    $entity->isNew()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
-    // Add the test node to our context as the evaluated entity.
-    $this->condition->setContextValue('entity', $entity->reveal());
-    $this->assertTrue($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfBundleTest.php b/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfBundleTest.php
deleted file mode 100644
index 2d1b0e6..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfBundleTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\EntityIsOfBundle
- * @group RulesCondition
- */
-class EntityIsOfBundleTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->condition = $this->conditionManager->createInstance('rules_entity_is_of_bundle');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    $entity = $this->prophesizeEntity(EntityInterface::class);
-
-    $entity->getEntityTypeId()->willReturn('node')->shouldBeCalledTimes(3);
-    $entity->bundle()->willReturn('page')->shouldBeCalledTimes(3);
-
-    // Add the test node to our context as the evaluated entity, along with
-    // explicit entity type and bundle strings.
-    // First, test with values that should evaluate TRUE.
-    $this->condition->setContextValue('entity', $entity->reveal())
-      ->setContextValue('type', 'node')
-      ->setContextValue('bundle', 'page');
-
-    $this->assertTrue($this->condition->evaluate());
-
-    // Then test with values that should evaluate FALSE.
-    $this->condition->setContextValue('bundle', 'article');
-    $this->assertFalse($this->condition->evaluate());
-
-    $this->condition->setContextValue('type', 'taxonomy_term')
-      ->setContextValue('bundle', 'page');
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfTypeTest.php b/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfTypeTest.php
deleted file mode 100644
index fb2c42c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/EntityIsOfTypeTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\EntityIsOfType
- * @group RulesCondition
- */
-class EntityIsOfTypeTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->condition = $this->conditionManager->createInstance('rules_entity_is_of_type');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    $entity = $this->prophesizeEntity(EntityInterface::class);
-    $entity->getEntityTypeId()->willReturn('node')->shouldBeCalledTimes(2);
-
-    // Add the test node to our context as the evaluated entity, along with an
-    // explicit entity type string.
-    // First, test with a value that should evaluate TRUE.
-    $this->condition->setContextValue('entity', $entity->reveal())
-      ->setContextValue('type', 'node');
-    $this->assertTrue($this->condition->evaluate());
-
-    // Then test with values that should evaluate FALSE.
-    $this->condition->setContextValue('type', 'taxonomy_term');
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/ListContainsTest.php b/modules/rules/tests/src/Unit/Integration/Condition/ListContainsTest.php
deleted file mode 100644
index b0e43a0..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/ListContainsTest.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\DataListContains
- * @group RulesCondition
- */
-class ListContainsTest extends RulesIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->condition = $this->conditionManager->createInstance('rules_list_contains');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-
-    // Test array of string values.
-    $list = ['One', 'Two', 'Three'];
-
-    // Test that the list doesn't contain 'Zero'.
-    $this->condition
-      ->setContextValue('list', $list)
-      ->setContextValue('item', 'Zero');
-    $this->assertFalse($this->condition->evaluate());
-
-    // Test that the list contains 'One'.
-    $this->condition
-      ->setContextValue('list', $list)
-      ->setContextValue('item', 'One');
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that the list contains 'Two'.
-    $this->condition
-      ->setContextValue('list', $list)
-      ->setContextValue('item', 'Two');
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that the list contains 'Three'.
-    $this->condition
-      ->setContextValue('list', $list)
-      ->setContextValue('item', 'Three');
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that the list doesn't contain 'Four'.
-    $this->condition
-      ->setContextValue('list', $list)
-      ->setContextValue('item', 'Four');
-    $this->assertFalse($this->condition->evaluate());
-
-    // Create array of mock entities.
-    $entity_zero = $this->prophesizeEntity(EntityInterface::class);
-    $entity_zero->id()->willReturn('entity_zero_id');
-
-    $entity_one = $this->prophesizeEntity(EntityInterface::class);
-    $entity_one->id()->willReturn('entity_one_id');
-
-    $entity_two = $this->prophesizeEntity(EntityInterface::class);
-    $entity_two->id()->willReturn('entity_two_id');
-
-    $entity_three = $this->prophesizeEntity(EntityInterface::class);
-    $entity_three->id()->willReturn('entity_three_id');
-
-    $entity_four = $this->prophesizeEntity(EntityInterface::class);
-    $entity_four->id()->willReturn('entity_four_id');
-
-    // Test array of entities.
-    $entity_list = [
-      $entity_one->reveal(),
-      $entity_two->reveal(),
-      $entity_three->reveal(),
-    ];
-
-    // Test that the list of entities doesn't contain entity 'entity_zero'.
-    $this->condition
-      ->setContextValue('list', $entity_list)
-      ->setContextValue('item', $entity_zero->reveal());
-    $this->assertFalse($this->condition->evaluate());
-
-    // Test that the list of entities contains entity 'entity_one'.
-    $this->condition
-      ->setContextValue('list', $entity_list)
-      ->setContextValue('item', $entity_one->reveal());
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that the list of entities contains entity 'entity_two'.
-    $this->condition
-      ->setContextValue('list', $entity_list)
-      ->setContextValue('item', $entity_two->reveal());
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that the list of entities contains entity 'entity_three'.
-    $this->condition
-      ->setContextValue('list', $entity_list)
-      ->setContextValue('item', $entity_three->reveal());
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test that the list of entities doesn't contain entity 'entity_four'.
-    $this->condition
-      ->setContextValue('list', $entity_list)
-      ->setContextValue('item', $entity_four->reveal());
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/ListCountIsTest.php b/modules/rules/tests/src/Unit/Integration/Condition/ListCountIsTest.php
deleted file mode 100644
index 6c7e988..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/ListCountIsTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\DataListCountIs
- * @group RulesCondition
- */
-class ListCountIsTest extends RulesIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->condition = $this->conditionManager->createInstance('rules_list_count_is');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    // Test that the list count is greater than 2.
-    $condition = $this->condition
-      ->setContextValue('list', [1, 2, 3, 4])
-      ->setContextValue('operator', '>')
-      ->setContextValue('value', '2');
-    $this->assertTrue($condition->evaluate());
-
-    // Test that the list count is less than 4.
-    $condition = $this->condition
-      ->setContextValue('list', [1, 2, 3])
-      ->setContextValue('operator', '<')
-      ->setContextValue('value', '4');
-    $this->assertTrue($condition->evaluate());
-
-    // Test that the list count is equal to 3.
-    $condition = $this->condition
-      ->setContextValue('list', [1, 2, 3])
-      ->setContextValue('operator', '==')
-      ->setContextValue('value', '3');
-    $this->assertTrue($condition->evaluate());
-
-    // Test that the list count is equal to 0.
-    $condition = $this->condition
-      ->setContextValue('list', [])
-      ->setContextValue('operator', '==')
-      ->setContextValue('value', '0');
-    $this->assertTrue($condition->evaluate());
-
-    // Test that the list count is not less than 2.
-    $condition = $this->condition
-      ->setContextValue('list', [1, 2])
-      ->setContextValue('operator', '<')
-      ->setContextValue('value', '2');
-    $this->assertFalse($condition->evaluate());
-
-    // Test that list count is not greater than 5.
-    $condition = $this->condition
-      ->setContextValue('list', [1, 2, 3])
-      ->setContextValue('operator', '>')
-      ->setContextValue('value', '5');
-    $this->assertFalse($condition->evaluate());
-
-    // Test that the list count is not equal to 0.
-    $condition = $this->condition
-      ->setContextValue('list', [1, 2, 3])
-      ->setContextValue('operator', '==')
-      ->setContextValue('value', '0');
-    $this->assertFalse($condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsOfTypeTest.php b/modules/rules/tests/src/Unit/Integration/Condition/NodeIsOfTypeTest.php
deleted file mode 100644
index fab998e..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsOfTypeTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\node\NodeInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\NodeIsOfType
- * @group RulesCondition
- */
-class NodeIsOfTypeTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->enableModule('node');
-    $this->condition = $this->conditionManager->createInstance('rules_node_is_of_type');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    $node = $this->prophesizeEntity(NodeInterface::class);
-    $node->getType()->willReturn('page');
-
-    // Set the node context value.
-    $this->condition->setContextValue('node', $node->reveal());
-
-    // Test evaluation with a list that contains the actual node type.
-    $this->condition->setContextValue('types', ['page', 'article']);
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test with a list that does not contain the actual node type.
-    $this->condition->setContextValue('types', ['apple', 'banana']);
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPromotedTest.php b/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPromotedTest.php
deleted file mode 100644
index 1e3e88f..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPromotedTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\node\NodeInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\NodeIsPromoted
- * @group RulesCondition
- */
-class NodeIsPromotedTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->enableModule('node');
-    $this->condition = $this->conditionManager->createInstance('rules_node_is_promoted');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    $promoted_node = $this->prophesizeEntity(NodeInterface::class);
-
-    $promoted_node->isPromoted()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
-    // Set the node context value.
-    $this->condition->setContextValue('node', $promoted_node->reveal());
-
-    $this->assertTrue($this->condition->evaluate());
-
-    $unpromoted_node = $this->prophesizeEntity(NodeInterface::class);
-
-    $unpromoted_node->isPromoted()->willReturn(FALSE)->shouldBeCalledTimes(1);
-
-    // Set the node context value.
-    $this->condition->setContextValue('node', $unpromoted_node->reveal());
-
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPublishedTest.php b/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPublishedTest.php
deleted file mode 100644
index 2c8a493..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsPublishedTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\node\NodeInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\NodeIsPublished
- * @group RulesCondition
- */
-class NodeIsPublishedTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->enableModule('node');
-    $this->condition = $this->conditionManager->createInstance('rules_node_is_published');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    $published_node = $this->prophesizeEntity(NodeInterface::class);
-
-    $published_node->isPublished()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
-    // Set the node context value.
-    $this->condition->setContextValue('node', $published_node->reveal());
-
-    $this->assertTrue($this->condition->evaluate());
-
-    $unpublished_node = $this->prophesizeEntity(NodeInterface::class);
-
-    $unpublished_node->isPublished()->willReturn(FALSE)->shouldBeCalledTimes(1);
-
-    // Set the node context value.
-    $this->condition->setContextValue('node', $unpublished_node->reveal());
-
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsStickyTest.php b/modules/rules/tests/src/Unit/Integration/Condition/NodeIsStickyTest.php
deleted file mode 100644
index 5d8d189..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/NodeIsStickyTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\node\NodeInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\NodeIsSticky
- * @group RulesCondition
- */
-class NodeIsStickyTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->enableModule('node');
-    $this->condition = $this->conditionManager->createInstance('rules_node_is_sticky');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    $sticky_node = $this->prophesizeEntity(NodeInterface::class);
-
-    $sticky_node->isSticky()->willReturn(TRUE)->shouldBeCalledTimes(1);
-
-    // Set the node context value.
-    $this->condition->setContextValue('node', $sticky_node->reveal());
-
-    $this->assertTrue($this->condition->evaluate());
-
-    $unsticky_node = $this->prophesizeEntity(NodeInterface::class);
-
-    $unsticky_node->isSticky()->willReturn(FALSE)->shouldBeCalledTimes(1);
-
-    // Set the node context value.
-    $this->condition->setContextValue('node', $unsticky_node->reveal());
-
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/PathAliasExistsTest.php b/modules/rules/tests/src/Unit/Integration/Condition/PathAliasExistsTest.php
deleted file mode 100644
index 212d212..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/PathAliasExistsTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\PathAliasExists
- * @group RulesCondition
- */
-class PathAliasExistsTest extends RulesIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * A mocked language object (english).
-   *
-   * @var \Drupal\Core\Language\LanguageInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $englishLanguage;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->condition = $this->conditionManager->createInstance('rules_path_alias_exists');
-
-    $this->englishLanguage = $this->prophesize(LanguageInterface::class);
-    $this->englishLanguage->getId()->willReturn('en');
-  }
-
-  /**
-   * Tests that the dependencies are properly set in the constructor.
-   *
-   * @covers ::__construct
-   */
-  public function testConstructor() {
-    $property = new \ReflectionProperty($this->condition, 'aliasManager');
-    $property->setAccessible(TRUE);
-
-    $this->assertSame($this->aliasManager->reveal(), $property->getValue($this->condition));
-  }
-
-  /**
-   * Tests evaluating the condition for an alias that can be resolved.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluationAliasWithPath() {
-    $this->aliasManager->getPathByAlias('alias-for-path', NULL)
-      ->willReturn('path-with-alias')
-      ->shouldBeCalledTimes(1);
-
-    $this->aliasManager->getPathByAlias('alias-for-path', 'en')
-      ->willReturn('path-with-alias')
-      ->shouldBeCalledTimes(1);
-
-    // First, only set the path context.
-    $this->condition->setContextValue('alias', 'alias-for-path');
-
-    // Test without language context set.
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test with language context set.
-    $this->condition->setContextValue('language', $this->englishLanguage->reveal());
-    $this->assertTrue($this->condition->evaluate());
-  }
-
-  /**
-   * Tests evaluating the condition for an alias that can not be resolved.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluationAliasWithoutPath() {
-    $this->aliasManager->getPathByAlias('alias-for-path-that-does-not-exist', NULL)
-      ->willReturn('alias-for-path-that-does-not-exist')
-      ->shouldBeCalledTimes(1);
-
-    $this->aliasManager->getPathByAlias('alias-for-path-that-does-not-exist', 'en')
-      ->willReturn('alias-for-path-that-does-not-exist')
-      ->shouldBeCalledTimes(1);
-
-    // First, only set the path context.
-    $this->condition->setContextValue('alias', 'alias-for-path-that-does-not-exist');
-
-    // Test without language context set.
-    $this->assertFalse($this->condition->evaluate());
-
-    // Test with language context set.
-    $this->condition->setContextValue('language', $this->englishLanguage->reveal());
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/PathHasAliasTest.php b/modules/rules/tests/src/Unit/Integration/Condition/PathHasAliasTest.php
deleted file mode 100644
index c066703..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/PathHasAliasTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\PathHasAlias
- * @group RulesCondition
- */
-class PathHasAliasTest extends RulesIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * A mocked language object (english).
-   *
-   * @var \Drupal\Core\Language\LanguageInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $englishLanguage;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->condition = $this->conditionManager->createInstance('rules_path_has_alias');
-
-    $this->englishLanguage = $this->prophesize(LanguageInterface::class);
-    $this->englishLanguage->getId()->willReturn('en');
-  }
-
-  /**
-   * Tests that the dependencies are properly set in the constructor.
-   *
-   * @covers ::__construct
-   */
-  public function testConstructor() {
-    $property = new \ReflectionProperty($this->condition, 'aliasManager');
-    $property->setAccessible(TRUE);
-
-    $this->assertSame($this->aliasManager->reveal(), $property->getValue($this->condition));
-  }
-
-  /**
-   * Tests evaluating the condition for a path with an alias.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluationPathWithAlias() {
-    $this->aliasManager->getAliasByPath('path-with-alias', NULL)
-      ->willReturn('alias-for-path')
-      ->shouldBeCalledTimes(1);
-
-    $this->aliasManager->getAliasByPath('path-with-alias', 'en')
-      ->willReturn('alias-for-path')
-      ->shouldBeCalledTimes(1);
-
-    // First, only set the path context.
-    $this->condition->setContextValue('path', 'path-with-alias');
-
-    // Test without language context set.
-    $this->assertTrue($this->condition->evaluate());
-
-    // Test with language context set.
-    $this->condition->setContextValue('language', $this->englishLanguage->reveal());
-    $this->assertTrue($this->condition->evaluate());
-  }
-
-  /**
-   * Tests evaluating the condition for path without an alias.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluationPathWithoutAlias() {
-    $this->aliasManager->getAliasByPath('path-without-alias', NULL)
-      ->willReturn('path-without-alias')
-      ->shouldBeCalledTimes(1);
-
-    $this->aliasManager->getAliasByPath('path-without-alias', 'en')
-      ->willReturn('path-without-alias')
-      ->shouldBeCalledTimes(1);
-
-    // First, only set the path context.
-    $this->condition->setContextValue('path', 'path-without-alias');
-
-    // Test without language context set.
-    $this->assertFalse($this->condition->evaluate());
-
-    // Test with language context set.
-    $this->condition->setContextValue('language', $this->englishLanguage->reveal());
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/UserHasEntityFieldAccessTest.php b/modules/rules/tests/src/Unit/Integration/Condition/UserHasEntityFieldAccessTest.php
deleted file mode 100644
index 0f391d9..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/UserHasEntityFieldAccessTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-use Drupal\user\UserInterface;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\UserHasEntityFieldAccess
- * @group RulesCondition
- */
-class UserHasEntityFieldAccessTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->enableModule('user');
-    $this->condition = $this->conditionManager->createInstance('rules_entity_field_access');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    $account = $this->prophesizeEntity(UserInterface::class);
-    $entity = $this->prophesizeEntity(ContentEntityInterface::class);
-    $items = $this->prophesize(FieldItemListInterface::class);
-
-    $entity->getEntityTypeId()->willReturn('user');
-    $entity->hasField('potato-field')->willReturn(TRUE)
-      ->shouldBeCalledTimes(3);
-
-    $definition = $this->prophesize(FieldDefinitionInterface::class);
-    $entity->getFieldDefinition('potato-field')
-      ->willReturn($definition->reveal())
-      ->shouldBeCalledTimes(2);
-
-    $entity->get('potato-field')->willReturn($items->reveal())
-      ->shouldBeCalledTimes(2);
-
-    $this->condition->setContextValue('entity', $entity->reveal())
-      ->setContextValue('field', 'potato-field')
-      ->setContextValue('user', $account->reveal());
-
-    $this->entityAccess->access($entity->reveal(), 'view', $account->reveal())
-      ->willReturn(TRUE)
-      ->shouldBeCalledTimes(1);
-    $this->entityAccess->access($entity->reveal(), 'edit', $account->reveal())
-      ->willReturn(TRUE)
-      ->shouldBeCalledTimes(1);
-    $this->entityAccess->access($entity->reveal(), 'delete', $account->reveal())
-      ->willReturn(FALSE)
-      ->shouldBeCalledTimes(1);
-
-    $this->entityAccess->fieldAccess('view', $definition->reveal(), $account->reveal(), $items->reveal())
-      ->willReturn(TRUE)
-      ->shouldBeCalledTimes(1);
-    $this->entityAccess->fieldAccess('edit', $definition->reveal(), $account->reveal(), $items->reveal())
-      ->willReturn(FALSE)
-      ->shouldBeCalledTimes(1);
-
-    // Test with 'view', 'edit' and 'delete'. Both 'view' and 'edit' will have
-    // general entity access, but the 'potato-field' should deny access for the
-    // 'edit' operation. Hence, 'edit' and 'delete' should return FALSE.
-    $this->condition->setContextValue('operation', 'view');
-    $this->assertTrue($this->condition->evaluate());
-    $this->condition->setContextValue('operation', 'edit');
-    $this->assertFalse($this->condition->evaluate());
-    $this->condition->setContextValue('operation', 'delete');
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/UserHasRoleTest.php b/modules/rules/tests/src/Unit/Integration/Condition/UserHasRoleTest.php
deleted file mode 100644
index b5ca4ba..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/UserHasRoleTest.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-use Drupal\user\RoleInterface;
-use Drupal\user\UserInterface;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\UserHasRole
- * @group RulesCondition
- */
-class UserHasRoleTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The condition that is being tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->enableModule('user');
-    $this->condition = $this->conditionManager->createInstance('rules_user_has_role');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    // Set-up a mock object with roles 'authenticated' and 'editor', but not
-    // 'administrator'.
-    $account = $this->prophesizeEntity(UserInterface::class);
-    $account->getRoles()->willReturn(['authenticated', 'editor'])
-      ->shouldBeCalledTimes(7);
-
-    $this->condition->setContextValue('user', $account->reveal());
-
-    $authenticated = $this->prophesize(RoleInterface::class);
-    $authenticated->id()->willReturn('authenticated');
-    $editor = $this->prophesize(RoleInterface::class);
-    $editor->id()->willReturn('editor');
-    $administrator = $this->prophesize(RoleInterface::class);
-    $administrator->id()->willReturn('administrator');
-
-    // First test the default AND condition with both roles the user has.
-    $this->condition->setContextValue('roles', [$authenticated->reveal(), $editor->reveal()]);
-    $this->assertTrue($this->condition->evaluate());
-
-    // User doesn't have the administrator role, this should fail.
-    $this->condition->setContextValue('roles', [$authenticated->reveal(), $administrator->reveal()]);
-    $this->assertFalse($this->condition->evaluate());
-
-    // Only one role, should succeed.
-    $this->condition->setContextValue('roles', [$authenticated->reveal()]);
-    $this->assertTrue($this->condition->evaluate());
-
-    // A role the user doesn't have.
-    $this->condition->setContextValue('roles', [$administrator->reveal()]);
-    $this->assertFalse($this->condition->evaluate());
-
-    // Only one role, the user has with OR condition, should succeed.
-    $this->condition->setContextValue('roles', [$authenticated->reveal()]);
-    $this->condition->setContextValue('operation', 'OR');
-    $this->assertTrue($this->condition->evaluate());
-
-    // User doesn't have the administrator role, but has the authenticated,
-    // should succeed.
-    $this->condition->setContextValue('roles', [$authenticated->reveal(), $administrator->reveal()]);
-    $this->condition->setContextValue('operation', 'OR');
-    $this->assertTrue($this->condition->evaluate());
-
-    // User doesn't have the administrator role. This should fail.
-    $this->condition->setContextValue('roles', [$administrator->reveal()]);
-    $this->condition->setContextValue('operation', 'OR');
-    $this->assertFalse($this->condition->evaluate());
-  }
-
-  /**
-   * Test the behavior with unsupported operations.
-   *
-   * @covers ::execute
-   */
-  public function testInvalidOperationException() {
-    // Set the expected exception class and message.
-    $this->setExpectedException('\Drupal\rules\Exception\InvalidArgumentException', 'Either use "AND" or "OR". Leave empty for default "AND" behavior.');
-
-    // Set-up a mock object with roles 'authenticated' and 'editor', but not
-    // 'administrator'.
-    $account = $this->prophesizeEntity(UserInterface::class);
-    $account->getRoles()->willReturn(['authenticated', 'editor']);
-
-    $this->condition->setContextValue('user', $account->reveal());
-
-    $authenticated = $this->prophesize(RoleInterface::class);
-    $authenticated->id()->willReturn('authenticated');
-
-    // Now test INVALID as operation. An exception must be thrown.
-    $this->condition->setContextValue('roles', [$authenticated->reveal()]);
-    $this->condition->setContextValue('operation', 'INVALID');
-    $this->condition->evaluate();
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Condition/UserIsBlockedTest.php b/modules/rules/tests/src/Unit/Integration/Condition/UserIsBlockedTest.php
deleted file mode 100644
index 31664fb..0000000
--- a/modules/rules/tests/src/Unit/Integration/Condition/UserIsBlockedTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Condition;
-
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-use Drupal\user\UserInterface;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\Condition\UserIsBlocked
- * @group RulesCondition
- */
-class UserIsBlockedTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The condition to be tested.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface
-   */
-  protected $condition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->enableModule('user');
-    $this->condition = $this->conditionManager->createInstance('rules_user_is_blocked');
-  }
-
-  /**
-   * Tests evaluating the condition.
-   *
-   * @covers ::evaluate
-   */
-  public function testConditionEvaluation() {
-    $blocked_user = $this->prophesizeEntity(UserInterface::class);
-    $blocked_user->isBlocked()->willReturn(TRUE)->shouldbeCalledTimes(1);
-
-    // Set the user context value.
-    $this->condition->setContextValue('user', $blocked_user->reveal());
-
-    $this->assertTrue($this->condition->evaluate());
-
-    $active_user = $this->prophesizeEntity(UserInterface::class);
-    $active_user->isBlocked()->willReturn(FALSE)->shouldbeCalledTimes(1);
-
-    // Set the user context value.
-    $this->condition->setContextValue('user', $active_user->reveal());
-
-    $this->assertFalse($this->condition->evaluate());;
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/AnnotationProcessingTest.php b/modules/rules/tests/src/Unit/Integration/Engine/AnnotationProcessingTest.php
deleted file mode 100644
index a6ba554..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/AnnotationProcessingTest.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Engine;
-
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Session\SessionManagerInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * Tests processing of the ContextDefinition annotation.
- *
- * @group Rules
- */
-class AnnotationProcessingTest extends RulesIntegrationTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->enableModule('user');
-    // Some of our plugins assume sessions exist:
-    $session_manager = $this->prophesize(SessionManagerInterface::class);
-    $this->container->set('session_manager', $session_manager->reveal());
-  }
-
-  /**
-   * Make sure @ Translation annotations do not leak out into the wild.
-   */
-  public function testTranslationSquelching() {
-    // Get a sample Rules plugin.
-    $plugin = $this->conditionManager->createInstance('rules_list_contains');
-    $context = $plugin->getContext('list');
-    $definition = $context->getContextDefinition();
-
-    // These can reasonable be string or TranslatableMarkup, but never
-    // a Translation object.
-    $label = $definition->getLabel();
-    $description = $definition->getDescription();
-    $this->assertFalse($label instanceof Translation, 'Label is not a Translation object');
-    $this->assertFalse($description instanceof Translation, 'Description is not a Translation object');
-
-    // Check also the toArray() path.
-    $definition = $context->getContextDefinition();
-    $values = $definition->toArray();
-    $label = $values['label'];
-    $description = $values['description'];
-    $this->assertFalse($label instanceof Translation, "\$values['label'] is not a Translation object");
-    $this->assertFalse($description instanceof Translation, "\$values['description'] is not a Translation object");
-  }
-
-  /**
-   * Tests if our ContextDefinition annotations are correctly processed.
-   *
-   * @param string $plugin_type
-   *   Type of rules plugin to test (for now, 'action' or 'condition').
-   * @param string $plugin_id
-   *   Plugin ID for the plugin to be tested.
-   * @param string $context_name
-   *   The name of the plugin's context to test.
-   * @param string $expected
-   *   The type of context as defined in the plugin's annotation.
-   *
-   * @dataProvider provideRulesPlugins
-   */
-  public function testCheckConfiguration($plugin_type, $plugin_id, $context_name, $expected) {
-    $plugin = NULL;
-
-    switch ($plugin_type) {
-      case 'action':
-        $plugin = $this->actionManager->createInstance($plugin_id);
-        break;
-
-      case 'condition':
-        $plugin = $this->conditionManager->createInstance($plugin_id);
-        break;
-    }
-
-    $this->assertNotNull($plugin, "{$plugin_type} plugin {$plugin_id} loads");
-
-    $context = $plugin->getContext($context_name);
-
-    $this->assertNotNull($context, "Plugin {$plugin_id} has context {$context_name}");
-
-    $context_def = $context->getContextDefinition();
-    $type = $context_def->getDataType();
-
-    $this->assertSame($type, $expected, "Context type for {$context_name} is $expected");
-  }
-
-  /**
-   * Provider for plugins to test.
-   *
-   * Passes $plugin_type, $plugin_id, $context_name, and $expected.
-   *
-   * @return array
-   *   Array of array of values to be passed to our test.
-   */
-  public function provideRulesPlugins() {
-    return [
-      [
-        'action',
-        'rules_user_block',
-        'user',
-        'entity:user',
-      ],
-      [
-        'condition',
-        'rules_entity_is_of_bundle',
-        'entity',
-        'entity',
-      ],
-      [
-        'condition',
-        'rules_node_is_promoted',
-        'node',
-        'entity:node',
-      ],
-      [
-        'action',
-        'rules_list_item_add',
-        'list',
-        'list',
-      ],
-      [
-        'action',
-        'rules_list_item_add',
-        'item',
-        'any',
-      ],
-      [
-        'action',
-        'rules_list_item_add',
-        'unique',
-        'boolean',
-      ],
-      [
-        'action',
-        'rules_list_item_add',
-        'pos',
-        'string',
-      ],
-    ];
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/AutoSaveTest.php b/modules/rules/tests/src/Unit/Integration/Engine/AutoSaveTest.php
deleted file mode 100644
index a06f1d5..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/AutoSaveTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Engine;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * Test auto saving of variables after Rules execution.
- *
- * @group Rules
- */
-class AutoSaveTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * Tests auto saving after an action execution.
-   */
-  public function testActionAutoSave() {
-    $rule = $this->rulesExpressionManager->createRule();
-    // Just leverage the entity save action, which by default uses auto-saving.
-    $rule->addAction('rules_entity_save', ContextConfig::create()
-      ->map('entity', 'entity')
-    );
-
-    $entity = $this->prophesizeEntity(EntityInterface::class);
-    $entity->save()->shouldBeCalledTimes(1);
-
-    RulesComponent::create($rule)
-      ->addContextDefinition('entity', ContextDefinition::create('entity'))
-      ->setContextValue('entity', $entity->reveal())
-      ->execute();
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/ExpressionSerializationTest.php b/modules/rules/tests/src/Unit/Integration/Engine/ExpressionSerializationTest.php
deleted file mode 100644
index 712acb1..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/ExpressionSerializationTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Engine;
-
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * Tests serializing expression objects.
- *
- * @group Rules
- */
-class ExpressionSerializationTest extends RulesIntegrationTestBase {
-
-  /**
-   * Tests serializing action expressions.
-   */
-  public function testActionExpressionSerialization() {
-    $action = $this->rulesExpressionManager
-      ->createAction('rules_test_string', ContextConfig::create()
-        ->setValue('text', 'test')->toArray()
-      );
-    $serialized_expression = serialize($action);
-    $action = unserialize($serialized_expression);
-    $result = RulesComponent::create($action)
-      ->provideContext('concatenated')
-      ->execute();
-    $this->assertSame('testtest', $result['concatenated']);
-  }
-
-  /**
-   * Tests serializing condition expressions.
-   */
-  public function testConditionExpressionSerialization() {
-    $condition = $this->rulesExpressionManager
-      ->createCondition('rules_test_false', []);
-    $serialized_expression = serialize($condition);
-    $condition = unserialize($serialized_expression);
-    $result = $condition->execute();
-    $this->assertFalse($result);
-  }
-
-  /**
-   * Tests condition container base class serialization.
-   */
-  public function testConditionContainerExpressionSerialization() {
-    $expression = $this->rulesExpressionManager
-      ->createAnd();
-    $expression->addCondition('rules_test_false');
-    $serialized_expression = serialize($expression);
-    $expression = unserialize($serialized_expression);
-    $result = $expression->execute();
-    $this->assertFalse($result);
-  }
-
-  /**
-   * Tests action container base class serialization.
-   */
-  public function testActionContainerExpressionSerialization() {
-    $expression = $this->rulesExpressionManager
-      ->createInstance('rules_action_set');
-    $expression->addAction('rules_test_string', ContextConfig::create()
-      ->setValue('text', 'test'));
-    $serialized_expression = serialize($expression);
-    $expression = unserialize($serialized_expression);
-    $result = RulesComponent::create($expression)
-      ->provideContext('concatenated')
-      ->execute();
-    $this->assertSame('testtest', $result['concatenated']);
-  }
-
-  /**
-   * Tests rule serialization.
-   */
-  public function testRuleExpressionSerialization() {
-    $expression = $this->rulesExpressionManager
-      ->createRule();
-    $expression->addAction('rules_test_string', ContextConfig::create()
-      ->setValue('text', 'test'));
-    $condition = $this->rulesExpressionManager
-      ->createCondition('rules_test_false', []);
-    $condition->negate(TRUE);
-    $expression->addExpressionObject($condition);
-
-    $serialized_expression = serialize($expression);
-    $expression = unserialize($serialized_expression);
-    $result = RulesComponent::create($expression)
-      ->provideContext('concatenated')
-      ->execute();
-    $this->assertSame('testtest', $result['concatenated']);
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/IntegrityCheckTest.php b/modules/rules/tests/src/Unit/Integration/Engine/IntegrityCheckTest.php
deleted file mode 100644
index 2990d90..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/IntegrityCheckTest.php
+++ /dev/null
@@ -1,420 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Engine;
-
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * Test the integrity check functionality during configuration time.
- *
- * @group Rules
- */
-class IntegrityCheckTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * Tests that the integrity check can be invoked.
-   */
-  public function testIntegrityCheck() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule->addAction('rules_entity_save', ContextConfig::create()
-      ->map('entity', 'entity')
-    );
-
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('entity', ContextDefinition::create('entity'))
-      ->checkIntegrity();
-    $this->assertEquals(0, iterator_count($violation_list));
-  }
-
-  /**
-   * Tests that a wrongly configured variable name triggers a violation.
-   */
-  public function testUnknownVariable() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $action = $this->rulesExpressionManager->createAction('rules_entity_save', ContextConfig::create()
-      ->map('entity', 'unknown_variable')
-      ->toArray()
-    );
-    $rule->addExpressionObject($action);
-
-    $violation_list = RulesComponent::create($rule)
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-    $violation = $violation_list[0];
-    $this->assertEquals(
-      'Data selector <em class="placeholder">unknown_variable</em> for context <em class="placeholder">Entity</em> is invalid. Unable to get variable unknown_variable, it is not defined.',
-      (string) $violation->getMessage()
-    );
-    $this->assertEquals($action->getUuid(), $violation->getUuid());
-  }
-
-  /**
-   * Tests that the integrity check with UUID works.
-   */
-  public function testCheckUuid() {
-    $rule = $this->rulesExpressionManager->createRule();
-    // Just use a rule with 2 dummy actions.
-    $rule->addAction('rules_entity_save', ContextConfig::create()
-      ->map('entity', 'unknown_variable_1'));
-    $second_action = $this->rulesExpressionManager->createAction('rules_entity_save', ContextConfig::create()
-      ->map('entity', 'unknown_variable_2')
-      ->toArray()
-    );
-    $rule->addExpressionObject($second_action);
-
-    $all_violations = RulesComponent::create($rule)
-      ->addContextDefinition('entity', ContextDefinition::create('entity'))
-      ->checkIntegrity();
-
-    $this->assertEquals(2, iterator_count($all_violations));
-
-    $uuid_violations = $all_violations->getFor($second_action->getUuid());
-    $this->assertEquals(1, count($uuid_violations));
-    $violation = $uuid_violations[0];
-    $this->assertEquals(
-      'Data selector <em class="placeholder">unknown_variable_2</em> for context <em class="placeholder">Entity</em> is invalid. Unable to get variable unknown_variable_2, it is not defined.',
-      (string) $violation->getMessage()
-    );
-    $this->assertEquals($second_action->getUuid(), $violation->getUuid());
-  }
-
-  /**
-   * Tests that an invalid condition plugin ID results in a violation.
-   */
-  public function testInvalidCondition() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $condition = $this->rulesExpressionManager->createCondition('invalid_condition_id');
-    $rule->addExpressionObject($condition);
-
-    $violations = RulesComponent::create($rule)->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violations));
-    $this->assertEquals('Condition plugin <em class="placeholder">invalid_condition_id</em> does not exist', (string) $violations[0]->getMessage());
-    $this->assertEquals($condition->getUuid(), $violations[0]->getUuid());
-  }
-
-  /**
-   * Tests that a missing condition plugin ID results in a violation.
-   */
-  public function testMissingCondition() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $condition = $this->rulesExpressionManager->createCondition('');
-    $rule->addExpressionObject($condition);
-
-    $violations = RulesComponent::create($rule)->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violations));
-    $this->assertEquals('Condition plugin ID is missing', (string) $violations[0]->getMessage());
-    $this->assertEquals($condition->getUuid(), $violations[0]->getUuid());
-  }
-
-  /**
-   * Tests that an invalid action plugin ID results in a violation.
-   */
-  public function testInvalidAction() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $action = $this->rulesExpressionManager->createAction('invalid_action_id');
-    $rule->addExpressionObject($action);
-
-    $violations = RulesComponent::create($rule)->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violations));
-    $this->assertEquals('Action plugin <em class="placeholder">invalid_action_id</em> does not exist', (string) $violations[0]->getMessage());
-    $this->assertEquals($action->getUuid(), $violations[0]->getUuid());
-  }
-
-  /**
-   * Tests that a missing action plugin ID results in a violation.
-   */
-  public function testMissingAction() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $action = $this->rulesExpressionManager->createAction('');
-    $rule->addExpressionObject($action);
-
-    $violations = RulesComponent::create($rule)->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violations));
-    $this->assertEquals('Action plugin ID is missing', (string) $violations[0]->getMessage());
-    $this->assertEquals($action->getUuid(), $violations[0]->getUuid());
-  }
-
-  /**
-   * Tests invalid characters in provided variables.
-   */
-  public function testInvalidProvidedName() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    // The condition provides a "provided_text" variable.
-    $condition = $this->rulesExpressionManager->createCondition('rules_test_provider', ContextConfig::create()
-      ->provideAs('provided_text', 'invalid_näme')
-      ->toArray()
-    );
-    $rule->addExpressionObject($condition);
-
-    $violation_list = RulesComponent::create($rule)
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-    $this->assertEquals(
-      'Provided variable name <em class="placeholder">invalid_näme</em> contains not allowed characters.',
-      (string) $violation_list[0]->getMessage()
-    );
-    $this->assertEquals($condition->getUuid(), $violation_list[0]->getUuid());
-  }
-
-  /**
-   * Tests the input restriction on contexts.
-   */
-  public function testInputRestriction() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $action = $this->rulesExpressionManager->createAction('rules_entity_fetch_by_id', ContextConfig::create()
-      // The entity type must be configured as value, so this provokes the
-      // violation.
-      ->map('type', 'variable_1')
-      ->setValue('entity_id', 1)
-      ->toArray()
-    );
-    $rule->addExpressionObject($action);
-
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('variable_1', ContextDefinition::create('string'))
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-    $this->assertEquals(
-      'The context <em class="placeholder">Entity type</em> may not be configured using a selector.',
-      (string) $violation_list[0]->getMessage()
-    );
-    $this->assertEquals($action->getUuid(), $violation_list[0]->getUuid());
-  }
-
-  /**
-   * Tests the data selector restriction on contexts.
-   */
-  public function testSelectorRestriction() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $action = $this->rulesExpressionManager->createAction('rules_data_set', ContextConfig::create()
-      // Setting a data value is only possible with a selector, this will
-      // trigger the violation.
-      ->setValue('data', 'some value')
-      ->setValue('value', 'some new value')
-      ->toArray()
-    );
-    $rule->addExpressionObject($action);
-
-    $violation_list = RulesComponent::create($rule)
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-    $this->assertEquals(
-      'The context <em class="placeholder">Data</em> may only be configured using a selector.',
-      (string) $violation_list[0]->getMessage()
-    );
-    $this->assertEquals($action->getUuid(), $violation_list[0]->getUuid());
-  }
-
-  /**
-   * Tests that a primitive context is assigned something that matches.
-   */
-  public function testPrimitiveTypeViolation() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    // The condition expects a string but we pass a list, which will trigger the
-    // violation.
-    $condition = $this->rulesExpressionManager->createCondition('rules_test_string_condition', ContextConfig::create()
-      ->map('text', 'list_variable')
-      ->toArray()
-    );
-    $rule->addExpressionObject($condition);
-
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('list_variable', ContextDefinition::create('list'))
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-    $this->assertEquals(
-      'Expected a string data type for context <em class="placeholder">Text to compare</em> but got a list data type instead.',
-      (string) $violation_list[0]->getMessage()
-    );
-    $this->assertEquals($condition->getUuid(), $violation_list[0]->getUuid());
-  }
-
-  /**
-   * Tests that a list context is assigned something that matches.
-   */
-  public function testListTypeViolation() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    // The condition expects a list for the type context but we pass a node
-    // which will trigger the violation.
-    $condition = $this->rulesExpressionManager->createCondition('rules_node_is_of_type', ContextConfig::create()
-      ->map('node', 'node')
-      ->map('types', 'node')
-      ->toArray()
-    );
-    $rule->addExpressionObject($condition);
-
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('node', ContextDefinition::create('entity:node'))
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-    $this->assertEquals(
-      'Expected a list data type for context <em class="placeholder">Content types</em> but got a entity:node data type instead.',
-      (string) $violation_list[0]->getMessage()
-    );
-    $this->assertEquals($condition->getUuid(), $violation_list[0]->getUuid());
-  }
-
-  /**
-   * Tests that a complex data context is assigned something that matches.
-   */
-  public function testComplexTypeViolation() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    // The condition expects a node context but gets a list instead which cause
-    // the violation.
-    $condition = $this->rulesExpressionManager->createCondition('rules_node_is_of_type', ContextConfig::create()
-      ->map('node', 'list_variable')
-      ->map('types', 'list_variable')
-      ->toArray()
-    );
-    $rule->addExpressionObject($condition);
-
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('list_variable', ContextDefinition::create('list'))
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-    $this->assertEquals(
-      'Expected a entity:node data type for context <em class="placeholder">Node</em> but got a list data type instead.',
-      (string) $violation_list[0]->getMessage()
-    );
-    $this->assertEquals($condition->getUuid(), $violation_list[0]->getUuid());
-  }
-
-  /**
-   * Tests that an absent required context triggers a violation.
-   */
-  public function testMissingRequiredContext() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    // The condition is completely un-configured, missing 2 required contexts.
-    $condition = $this->rulesExpressionManager->createCondition('rules_node_is_of_type');
-    $rule->addExpressionObject($condition);
-
-    $violation_list = RulesComponent::create($rule)
-      ->checkIntegrity();
-    $this->assertEquals(2, iterator_count($violation_list));
-    $this->assertEquals(
-      'The required context <em class="placeholder">Node</em> is missing.',
-      (string) $violation_list[0]->getMessage()
-    );
-    $this->assertEquals(
-      'The required context <em class="placeholder">Content types</em> is missing.',
-      (string) $violation_list[1]->getMessage()
-    );
-    $this->assertEquals($condition->getUuid(), $violation_list[0]->getUuid());
-    $this->assertEquals($condition->getUuid(), $violation_list[1]->getUuid());
-  }
-
-  /**
-   * Make sure that nested expression violations have the correct UUID.
-   */
-  public function testNestedExpressionUuids() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $action_set = $this->rulesExpressionManager->createInstance('rules_action_set');
-    // The most inner action will trigger a violation for an unknown variable.
-    $action = $this->rulesExpressionManager->createAction('rules_entity_save', ContextConfig::create()
-      ->map('entity', 'unknown_variable')
-      ->toArray()
-    );
-    $action_set->addExpressionObject($action);
-    $rule->addExpressionObject($action_set);
-
-    $violation_list = RulesComponent::create($rule)
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-    // UUID must be that of the most inner action.
-    $this->assertEquals($action->getUuid(), $violation_list[0]->getUuid());
-  }
-
-  /**
-   * Tests using provided variables in sub-sequent actions passes checks.
-   */
-  public function testUsingProvidedVariables() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $rule->addAction('rules_variable_add', ContextConfig::create()
-      ->setValue('type', 'any')
-      ->setValue('value', 'foo')
-    );
-    $rule->addAction('rules_variable_add', ContextConfig::create()
-      ->setValue('type', 'any')
-      ->map('value', 'variable_added')
-    );
-
-    $violation_list = RulesComponent::create($rule)
-      ->checkIntegrity();
-    $this->assertEquals(0, iterator_count($violation_list));
-  }
-
-  /**
-   * Tests that refined context is respected when checking context.
-   */
-  public function testRefinedContextViolation() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule->addAction('rules_variable_add', ContextConfig::create()
-      ->setValue('type', 'integer')
-      ->map('value', 'text')
-    );
-
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('text', ContextDefinition::create('string'))
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-  }
-
-  /**
-   * Tests context can be refined based upon mapped context.
-   */
-  public function testRefiningContextBasedonMappedContext() {
-    // DataComparision condition refines context based on selected data. Thus
-    // it for the test and ensure checking integrity passes when the comparison
-    // value is of a compatible type and fails else.
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule->addCondition('rules_data_comparison', ContextConfig::create()
-      ->map('data', 'text')
-      ->map('value', 'text2')
-    );
-
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('text', ContextDefinition::create('string'))
-      ->addContextDefinition('text2', ContextDefinition::create('string'))
-      ->checkIntegrity();
-    $this->assertEquals(0, iterator_count($violation_list));
-
-    $violation_list = RulesComponent::create($rule)
-      ->addContextDefinition('text', ContextDefinition::create('string'))
-      ->addContextDefinition('text2', ContextDefinition::create('integer'))
-      ->checkIntegrity();
-    $this->assertEquals(1, iterator_count($violation_list));
-  }
-
-  /**
-   * Tests using provided variables with refined context.
-   */
-  public function testUsingRefinedProvidedVariables() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $rule->addAction('rules_variable_add', ContextConfig::create()
-      ->setValue('type', 'string')
-      ->setValue('value', 'foo')
-    );
-    $rule->addAction('rules_system_message', ContextConfig::create()
-      ->map('message', 'variable_added')
-      ->setValue('type', 'status')
-    );
-    // The message action requires a string, thus if the context is not refined
-    // it will end up as "any" and integrity check would fail.
-    $violation_list = RulesComponent::create($rule)
-      ->checkIntegrity();
-    $this->assertEquals(0, iterator_count($violation_list));
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/LoopTest.php b/modules/rules/tests/src/Unit/Integration/Engine/LoopTest.php
deleted file mode 100644
index 7c05771..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/LoopTest.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Engine;
-
-use Drupal\Core\Entity\TypedData\EntityDataDefinition;
-use Drupal\Core\Field\FieldItemList;
-use Drupal\node\NodeInterface;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * Test Rules execution with the loop plugin.
- *
- * @group Rules
- */
-class LoopTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->enableModule('node');
-  }
-
-  /**
-   * Tests that list items in the loop can be used during execution.
-   */
-  public function testListItemUsage() {
-    // The rule contains a list of strings that will be concatenated into one
-    // variable.
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule->addAction('rules_variable_add', ContextConfig::create()
-      ->setValue('type', 'string')
-      ->setValue('value', '')
-      ->provideAs('variable_added', 'result')
-    );
-
-    $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
-    $loop->addAction('rules_data_set', ContextConfig::create()
-      ->map('data', 'result')
-      ->setValue('value', '{{result}} {{list_item}}')
-      ->process('value', 'rules_tokens')
-    );
-
-    $rule->addExpressionObject($loop);
-
-    $result = RulesComponent::create($rule)
-      ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
-      ->provideContext('result')
-      ->setContextValue('string_list', ['Hello', 'world', 'this', 'is', 'the',
-        'loop',
-      ])
-      ->execute();
-
-    $this->assertEquals(' Hello world this is the loop', $result['result']);
-  }
-
-  /**
-   * Tests that list items can be renamed for usage in nested loops.
-   */
-  public function testListItemRenaming() {
-    // The rule contains a list of strings that will be concatenated into one
-    // variable.
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule->addAction('rules_variable_add', ContextConfig::create()
-      ->setValue('type', 'string')
-      ->setValue('value', '')
-      ->provideAs('variable_added', 'result')
-    );
-
-    $outer_loop = $this->rulesExpressionManager->createInstance('rules_loop', [
-      'list' => 'outer_list',
-      'list_item' => 'outer_item',
-    ]);
-    $outer_loop->addAction('rules_data_set', ContextConfig::create()
-      ->map('data', 'result')
-      ->setValue('value', '{{result}} {{outer_item}}')
-      ->process('value', 'rules_tokens')
-    );
-
-    $inner_loop = $this->rulesExpressionManager->createInstance('rules_loop', [
-      'list' => 'inner_list',
-      'list_item' => 'inner_item',
-    ]);
-    $inner_loop->addAction('rules_data_set', ContextConfig::create()
-      ->map('data', 'result')
-      ->setValue('value', '{{result}} {{inner_item}}')
-      ->process('value', 'rules_tokens')
-    );
-
-    $outer_loop->addExpressionObject($inner_loop);
-    $rule->addExpressionObject($outer_loop);
-
-    $result = RulesComponent::create($rule)
-      ->addContextDefinition('outer_list', ContextDefinition::create('string')->setMultiple())
-      ->addContextDefinition('inner_list', ContextDefinition::create('string')->setMultiple())
-      ->provideContext('result')
-      ->setContextValue('outer_list', ['Outer 1', 'Outer 2'])
-      ->setContextValue('inner_list', ['Inner 1', 'Inner 2', 'Inner 3'])
-      ->execute();
-
-    $this->assertEquals(' Outer 1 Inner 1 Inner 2 Inner 3 Outer 2 Inner 1 Inner 2 Inner 3', $result['result']);
-  }
-
-  /**
-   * Tests that a list can be chosen with a property path selector.
-   */
-  public function testPropertyPathList() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule->addAction('rules_variable_add', ContextConfig::create()
-      ->setValue('type', 'string')
-      ->setValue('value', '')
-      ->provideAs('variable_added', 'result')
-    );
-
-    $loop = $this->rulesExpressionManager->createInstance('rules_loop', [
-      'list' => 'node.field_text',
-    ]);
-    $loop->addAction('rules_data_set', ContextConfig::create()
-      ->map('data', 'result')
-      ->setValue('value', '{{result}} {{list_item}}')
-      ->process('value', 'rules_tokens')
-    );
-
-    $rule->addExpressionObject($loop);
-
-    // Create a fake field for the fake node for testing.
-    $list_definition = $this->typedDataManager->createListDataDefinition('string');
-    $field_text = new FieldItemList($list_definition);
-    $field_text->setValue(['Hello', 'world', 'this', 'is', 'the', 'loop']);
-
-    $node = $this->prophesizeEntity(NodeInterface::class);
-    $node->get('field_text')->willReturn($field_text);
-
-    // We cannot use EntityDataDefinitionInterface here because the context
-    // system in core violates the interface and relies on the actuoal class.
-    // @see https://www.drupal.org/node/2660216
-    $node_definition = $this->prophesize(EntityDataDefinition::class);
-    $node_definition->getPropertyDefinition("field_text")->willReturn($list_definition);
-
-    $context_definition = $this->getContextDefinitionFor('entity:node', $node_definition);
-
-    $component = RulesComponent::create($rule)
-      ->addContextDefinition('node', $context_definition)
-      ->provideContext('result')
-      ->setContextValue('node', $node->reveal());
-
-    $violations = $component->checkIntegrity();
-    $this->assertEquals(0, iterator_count($violations));
-
-    $result = $component->execute();
-
-    $this->assertEquals(' Hello world this is the loop', $result['result']);
-  }
-
-  /**
-   * Test the integrity check for loop item names that conflict with others.
-   */
-  public function testItemNameConflict() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $loop = $this->rulesExpressionManager->createInstance('rules_loop', [
-      'list' => 'string_list',
-      'list_item' => 'existing_name',
-    ]);
-
-    $rule->addExpressionObject($loop);
-
-    $violations = RulesComponent::create($rule)
-      ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
-      ->addContextDefinition('existing_name', ContextDefinition::create('string'))
-      ->checkIntegrity();
-
-    $this->assertEquals(1, iterator_count($violations));
-    $this->assertEquals(
-      'List item name <em class="placeholder">existing_name</em> conflicts with an existing variable.',
-      (string) $violations[0]->getMessage()
-    );
-  }
-
-  /**
-   * Tests that the specified list variable exists in the execution state.
-   */
-  public function testListExists() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $loop = $this->rulesExpressionManager->createInstance('rules_loop', [
-      'list' => 'unknown_list',
-    ]);
-
-    $rule->addExpressionObject($loop);
-
-    $violations = RulesComponent::create($rule)
-      ->checkIntegrity();
-
-    $this->assertEquals(1, iterator_count($violations));
-    $this->assertEquals(
-      'List variable <em class="placeholder">unknown_list</em> does not exist. Unable to get variable unknown_list, it is not defined.',
-      (string) $violations[0]->getMessage()
-    );
-  }
-
-  /**
-   * Tests that a loop must have a list configured.
-   */
-  public function testMissingList() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    // Empty loop configuration, 'list' is missing.
-    $loop = $this->rulesExpressionManager->createInstance('rules_loop', []);
-    $rule->addExpressionObject($loop);
-
-    $violations = RulesComponent::create($rule)
-      ->checkIntegrity();
-
-    $this->assertEquals(1, iterator_count($violations));
-    $this->assertEquals(
-      'List variable is missing.',
-      (string) $violations[0]->getMessage()
-    );
-  }
-
-  /**
-   * Tests that a variable used in an action within the loop exists.
-   */
-  public function testWrongVariableInAction() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
-    $loop->addAction('rules_test_string', ContextConfig::create()
-      ->map('text', 'unknown_variable')
-    );
-
-    $rule->addExpressionObject($loop);
-
-    $violations = RulesComponent::create($rule)
-      ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
-      ->checkIntegrity();
-
-    $this->assertEquals(1, iterator_count($violations));
-    $this->assertEquals(
-      'Data selector <em class="placeholder">unknown_variable</em> for context <em class="placeholder">Text to concatenate</em> is invalid. Unable to get variable unknown_variable, it is not defined.',
-      (string) $violations[0]->getMessage()
-    );
-  }
-
-  /**
-   * Tests that the data type used to loop over is a list.
-   */
-  public function testInvalidListType() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $loop = $this->rulesExpressionManager->createInstance('rules_loop', [
-      'list' => 'string_variable',
-    ]);
-
-    $rule->addExpressionObject($loop);
-
-    $violations = RulesComponent::create($rule)
-      ->addContextDefinition('string_variable', ContextDefinition::create('string'))
-      ->checkIntegrity();
-
-    $this->assertEquals(1, iterator_count($violations));
-    $this->assertEquals(
-      'The data type of list variable <em class="placeholder">string_variable</em> is not a list.',
-      (string) $violations[0]->getMessage()
-    );
-  }
-
-  /**
-   * Tests that the loop list item variable is not available after the loop.
-   */
-  public function testOutOfScopeVariable() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
-
-    $rule->addExpressionObject($loop);
-    $rule->addAction('rules_test_string', ContextConfig::create()
-      ->map('text', 'list_item')
-    );
-
-    $violations = RulesComponent::create($rule)
-      ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
-      ->checkIntegrity();
-
-    $this->assertEquals(1, iterator_count($violations));
-    $this->assertEquals(
-      'Data selector <em class="placeholder">list_item</em> for context <em class="placeholder">Text to concatenate</em> is invalid. Unable to get variable list_item, it is not defined.',
-      (string) $violations[0]->getMessage()
-    );
-  }
-
-  /**
-   * Tests that the loop list item variable is not available after the loop.
-   */
-  public function testOutOfScopeVariableExecution() {
-    // Set the expected exception class and message.
-    $this->setExpectedException('\Drupal\rules\Exception\EvaluationException', 'Unable to get variable list_item, it is not defined.');
-
-    $rule = $this->rulesExpressionManager->createRule();
-    $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
-
-    $rule->addExpressionObject($loop);
-    $rule->addAction('rules_test_string', ContextConfig::create()
-      ->map('text', 'list_item')
-    );
-
-    RulesComponent::create($rule)
-      ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
-      ->setContextValue('string_list', ['one', 'two'])
-      ->execute();
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/PrepareExecutionMetadataStateTest.php b/modules/rules/tests/src/Unit/Integration/Engine/PrepareExecutionMetadataStateTest.php
deleted file mode 100644
index 3a9a809..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/PrepareExecutionMetadataStateTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Engine;
-
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\ExecutionMetadataState;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * Tests that the setup of the execution metadata state for an expression works.
- *
- * @group Rules
- */
-class PrepareExecutionMetadataStateTest extends RulesEntityIntegrationTestBase {
-
-  /**
-   * Tests that a variable can be added by an action and is then available.
-   */
-  public function testAddingVariable() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule->addAction('rules_variable_add', ContextConfig::create()
-      ->setValue('type', 'string')
-      ->setValue('value', '')
-      ->provideAs('variable_added', 'result')
-    );
-
-    $state = ExecutionMetadataState::create();
-    $found = $rule->prepareExecutionMetadataState($state);
-    $this->assertTrue($state->hasDataDefinition('result'));
-    $this->assertNull($found);
-  }
-
-  /**
-   * Tests partial state setup until an expression is reached in the tree.
-   */
-  public function testPreparingUntil() {
-    // Setup a rule with 2 actions.
-    $rule = $this->rulesExpressionManager->createRule();
-    $rule->addAction('rules_variable_add', ContextConfig::create()
-      ->setValue('type', 'string')
-      ->setValue('value', '')
-      ->provideAs('variable_added', 'result1')
-    );
-    $second_action = $this->rulesExpressionManager->createAction('rules_variable_add')
-      ->setConfiguration(ContextConfig::create()
-        ->setValue('type', 'string')
-        ->setValue('value', '')
-        ->provideAs('variable_added', 'result2')
-        ->toArray()
-      );
-    $rule->addExpressionObject($second_action);
-
-    $state = ExecutionMetadataState::create();
-    // Preparing the state until the second action means the variable of the
-    // first action is available, but the second is not yet.
-    $found = $rule->prepareExecutionMetadataState($state, $second_action);
-    $this->assertTrue($state->hasDataDefinition('result1'));
-    $this->assertFalse($state->hasDataDefinition('result2'));
-    $this->assertTrue($found);
-  }
-
-  /**
-   * Tests that state preparation also works for actions in a loop.
-   */
-  public function testPrepareInLoop() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
-    $action = $this->rulesExpressionManager->createAction('rules_test_string')
-      ->setConfiguration(ContextConfig::create()
-        ->setValue('text', 'x')
-        ->toArray()
-      );
-    $loop->addExpressionObject($action);
-
-    $rule->addExpressionObject($loop);
-
-    $state = RulesComponent::create($rule)
-      ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
-      ->getMetadataState();
-
-    $found = $rule->prepareExecutionMetadataState($state, $action);
-    $this->assertTrue($state->hasDataDefinition('list_item'));
-    $this->assertTrue($found);
-  }
-
-  /**
-   * Tests that the loop list item is removed after the loop.
-   */
-  public function testPrepareAfterLoop() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $loop = $this->rulesExpressionManager->createInstance('rules_loop', ['list' => 'string_list']);
-    $action = $this->rulesExpressionManager->createAction('rules_test_string')
-      ->setConfiguration(ContextConfig::create()
-        ->setValue('text', 'x')
-        ->toArray()
-      );
-    $loop->addExpressionObject($action);
-
-    $rule->addExpressionObject($loop);
-
-    $state = RulesComponent::create($rule)
-      ->addContextDefinition('string_list', ContextDefinition::create('string')->setMultiple())
-      ->getMetadataState();
-
-    $found = $rule->prepareExecutionMetadataState($state);
-    $this->assertFalse($state->hasDataDefinition('list_item'));
-    $this->assertNull($found);
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Engine/RulesComponentTest.php b/modules/rules/tests/src/Unit/Integration/Engine/RulesComponentTest.php
deleted file mode 100644
index c4beb7c..0000000
--- a/modules/rules/tests/src/Unit/Integration/Engine/RulesComponentTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Engine;
-
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\rules\Engine\RulesComponent;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * Tests the Rules component class.
- *
- * @group Rules
- *
- * @cover RulesComponent
- */
-class RulesComponentTest extends RulesIntegrationTestBase {
-
-  /**
-   * Tests executing a rule providing context based upon given context.
-   */
-  public function testRuleExecutionWithContext() {
-    $rule = $this->rulesExpressionManager->createRule();
-
-    $rule->addAction('rules_test_string',
-      ContextConfig::create()->map('text', 'text')
-    );
-
-    $result = RulesComponent::create($rule)
-      ->addContextDefinition('text', ContextDefinition::create('string'))
-      ->provideContext('concatenated')
-      ->setContextValue('text', 'foo')
-      ->execute();
-
-    // Ensure the provided context is returned.
-    $this->assertTrue(isset($result['concatenated']) && $result['concatenated'] == 'foofoo');
-  }
-
-  /**
-   * @cover ::getExpression()
-   */
-  public function testGetExpression() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $this->assertSame(RulesComponent::create($rule)->getExpression(), $rule);
-  }
-
-  /**
-   * @cover ::getContextDefinitions()
-   */
-  public function testGetContextDefinitions() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $definition = ContextDefinition::create('string');
-    $component = RulesComponent::create($rule)
-      ->addContextDefinition('test', $definition);
-
-    $this->assertEquals(array_keys($component->getContextDefinitions()), ['test']);
-    $this->assertSame($component->getContextDefinitions()['test'], $definition);
-  }
-
-  /**
-   * @cover ::getProvidedContext()
-   */
-  public function testGetProvidedContext() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $component = RulesComponent::create($rule)
-      ->provideContext('test');
-
-    $this->assertEquals($component->getProvidedContext(), ['test']);
-  }
-
-  /**
-   * @cover ::getState()
-   */
-  public function testGetState() {
-    $rule = $this->rulesExpressionManager->createRule();
-    $component = RulesComponent::create($rule);
-    $this->assertInstanceOf(ExecutionStateInterface::class, $component->getState());
-
-    // Test that set context values are available in the state.
-    $component
-      ->addContextDefinition('foo', ContextDefinition::create('string'))
-      ->setContextValue('foo', 'bar');
-
-    $this->assertEquals($component->getState()->getVariableValue('foo'), 'bar');
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EntityDeleteTest.php b/modules/rules/tests/src/Unit/Integration/Event/EntityDeleteTest.php
deleted file mode 100644
index 6e6918e..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EntityDeleteTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Event;
-
-/**
- * Checks that the entity delete events are defined.
- *
- * @coversDefaultClass \Drupal\rules\Plugin\RulesEvent\EntityDeleteDeriver
- *
- * @group RulesEvent
- */
-class EntityDeleteTest extends EventTestBase {
-
-  /**
-   * Tests the event metadata.
-   */
-  public function testEventMetadata() {
-    $plugin_definition = $this->eventManager->getDefinition('rules_entity_delete:test');
-    $this->assertSame('After deleting test', (string) $plugin_definition['label']);
-    $context_definition = $plugin_definition['context']['test'];
-    $this->assertSame('entity:test', $context_definition->getDataType());
-    $this->assertSame('Test', $context_definition->getLabel());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EntityInsertTest.php b/modules/rules/tests/src/Unit/Integration/Event/EntityInsertTest.php
deleted file mode 100644
index 55b94fa..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EntityInsertTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Event;
-
-/**
- * Checks that the entity insert events are defined.
- *
- * @coversDefaultClass \Drupal\rules\Plugin\RulesEvent\EntityInsertDeriver
- *
- * @group RulesEvent
- */
-class EntityInsertTest extends EventTestBase {
-
-  /**
-   * Tests the event metadata.
-   */
-  public function testEventMetadata() {
-    $plugin_definition = $this->eventManager->getDefinition('rules_entity_insert:test');
-    $this->assertSame('After saving new test', (string) $plugin_definition['label']);
-    $context_definition = $plugin_definition['context']['test'];
-    $this->assertSame('entity:test', $context_definition->getDataType());
-    $this->assertSame('Test', $context_definition->getLabel());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EntityPresaveTest.php b/modules/rules/tests/src/Unit/Integration/Event/EntityPresaveTest.php
deleted file mode 100644
index 38ce7d2..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EntityPresaveTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Event;
-
-/**
- * Checks that the entity presave events are defined.
- *
- * @coversDefaultClass \Drupal\rules\Plugin\RulesEvent\EntityPresaveDeriver
- *
- * @group RulesEvent
- */
-class EntityPresaveTest extends EventTestBase {
-
-  /**
-   * Tests the event metadata.
-   */
-  public function testEventMetadata() {
-    $plugin_definition = $this->eventManager->getDefinition('rules_entity_presave:test');
-    $this->assertSame('Before saving test', (string) $plugin_definition['label']);
-    $context_definition = $plugin_definition['context']['test'];
-    $this->assertSame('entity:test', $context_definition->getDataType());
-    $this->assertSame('Test', $context_definition->getLabel());
-
-    // Also check that there is a context for the orginal entity.
-    $context_definition = $plugin_definition['context']['test_unchanged'];
-    $this->assertSame('entity:test', $context_definition->getDataType());
-    $this->assertSame('Unchanged Test', (string) $context_definition->getLabel());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EntityUpdateTest.php b/modules/rules/tests/src/Unit/Integration/Event/EntityUpdateTest.php
deleted file mode 100644
index b6133af..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EntityUpdateTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Event;
-
-/**
- * Checks that the entity update events are defined.
- *
- * @coversDefaultClass \Drupal\rules\Plugin\RulesEvent\EntityUpdateDeriver
- *
- * @group RulesEvent
- */
-class EntityUpdateTest extends EventTestBase {
-
-  /**
-   * Tests the event metadata.
-   */
-  public function testEventMetadata() {
-    $plugin_definition = $this->eventManager->getDefinition('rules_entity_update:test');
-    $this->assertSame('After updating test', (string) $plugin_definition['label']);
-    $context_definition = $plugin_definition['context']['test'];
-    $this->assertSame('entity:test', $context_definition->getDataType());
-    $this->assertSame('Test', $context_definition->getLabel());
-
-    // Also check that there is a context for the orginal entity.
-    $context_definition = $plugin_definition['context']['test_unchanged'];
-    $this->assertSame('entity:test', $context_definition->getDataType());
-    $this->assertSame('Unchanged Test', (string) $context_definition->getLabel());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EntityViewTest.php b/modules/rules/tests/src/Unit/Integration/Event/EntityViewTest.php
deleted file mode 100644
index 14376e4..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EntityViewTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Event;
-
-/**
- * Checks that the entity view events are defined.
- *
- * @coversDefaultClass \Drupal\rules\Plugin\RulesEvent\EntityViewDeriver
- *
- * @group RulesEvent
- */
-class EntityViewTest extends EventTestBase {
-
-  /**
-   * Tests the event metadata.
-   */
-  public function testEventMetadata() {
-    $plugin_definition = $this->eventManager->getDefinition('rules_entity_view:test');
-    $this->assertSame('Test is viewed', (string) $plugin_definition['label']);
-    $context_definition = $plugin_definition['context']['test'];
-    $this->assertSame('entity:test', $context_definition->getDataType());
-    $this->assertSame('Test', $context_definition->getLabel());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/EventTestBase.php b/modules/rules/tests/src/Unit/Integration/Event/EventTestBase.php
deleted file mode 100644
index c1b56fd..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/EventTestBase.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Event;
-
-use Drupal\rules\Core\RulesEventManager;
-use Drupal\Tests\rules\Unit\Integration\RulesEntityIntegrationTestBase;
-
-/**
- * Base class for testing Rules Event definitions.
- *
- * @group RulesEvent
- */
-abstract class EventTestBase extends RulesEntityIntegrationTestBase {
-
-  /**
-   * The Rules event plugin manager.
-   *
-   * @var \Drupal\rules\Core\RulesEventManager
-   */
-  protected $eventManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->moduleHandler->getModuleDirectories()
-      ->willReturn(['rules' => __DIR__ . '/../../../../../']);
-    $this->eventManager = new RulesEventManager($this->moduleHandler->reveal());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/SystemLoggerEventTest.php b/modules/rules/tests/src/Unit/Integration/Event/SystemLoggerEventTest.php
deleted file mode 100644
index 9a3a4ba..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/SystemLoggerEventTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Event;
-
-/**
- * Checks that the event "rules_system_logger_event" is correctly defined.
- *
- * @group RulesEvent
- */
-class SystemLoggerEventTest extends EventTestBase {
-
-  /**
-   * Tests the event metadata.
-   */
-  public function testSystemLoggerEvent() {
-    $event = $this->eventManager->createInstance('rules_system_logger_event');
-    $logger_entry = $event->getContextDefinition('logger_entry');
-
-    // @todo: create a TypedData logger-entry object: https://www.drupal.org/node/2625238
-    $this->assertSame('any', $logger_entry->getDataType());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/UserLoginTest.php b/modules/rules/tests/src/Unit/Integration/Event/UserLoginTest.php
deleted file mode 100644
index 9322800..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/UserLoginTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Event;
-
-/**
- * Checks that the event "rules_user_login" is correctly defined.
- *
- * @group RulesEvent
- */
-class UserLoginTest extends EventTestBase {
-
-  /**
-   * Tests the event metadata.
-   */
-  public function testUserLoginEvent() {
-    $event = $this->eventManager->createInstance('rules_user_login');
-    $user_context_definition = $event->getContextDefinition('account');
-    $this->assertSame('entity:user', $user_context_definition->getDataType());
-    $this->assertSame('Logged in user', $user_context_definition->getLabel());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/Event/UserLogoutTest.php b/modules/rules/tests/src/Unit/Integration/Event/UserLogoutTest.php
deleted file mode 100644
index 8fece37..0000000
--- a/modules/rules/tests/src/Unit/Integration/Event/UserLogoutTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\Event;
-
-/**
- * Checks that the event "rules_user_logout" is correctly defined.
- *
- * @group RulesEvent
- */
-class UserLogoutTest extends EventTestBase {
-
-  /**
-   * Tests the event metadata.
-   */
-  public function testUserLogoutEvent() {
-    $event = $this->eventManager->createInstance('rules_user_logout');
-    $user_context_definition = $event->getContextDefinition('account');
-    $this->assertSame('entity:user', $user_context_definition->getDataType());
-    $this->assertSame('Logged out user', $user_context_definition->getLabel());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/RulesAction/RulesActionManagerTest.php b/modules/rules/tests/src/Unit/Integration/RulesAction/RulesActionManagerTest.php
deleted file mode 100644
index f451475..0000000
--- a/modules/rules/tests/src/Unit/Integration/RulesAction/RulesActionManagerTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\RulesAction;
-
-use Drupal\rules\Context\ContextDefinitionInterface;
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-
-/**
- * Tests the Rules action manager.
- *
- * @group Rules
- */
-class RulesActionManagerTest extends RulesIntegrationTestBase {
-
-  /**
-   * @cover getDiscovery()
-   */
-  public function testContextDefinitionAnnotations() {
-    $definitions = $this->actionManager->getDefinitions();
-    // Make sure all context definitions are using the class provided by Rules.
-    foreach ($definitions as $definition) {
-      if (!empty($definition['context'])) {
-        foreach ($definition['context'] as $context_definition) {
-          $this->assertInstanceOf(ContextDefinitionInterface::class, $context_definition);
-        }
-      }
-    }
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/RulesAction/RulesAdminAccessTest.php b/modules/rules/tests/src/Unit/Integration/RulesAction/RulesAdminAccessTest.php
deleted file mode 100644
index ef1b1c2..0000000
--- a/modules/rules/tests/src/Unit/Integration/RulesAction/RulesAdminAccessTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration\RulesAction;
-
-use Drupal\Tests\rules\Unit\Integration\RulesIntegrationTestBase;
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\Core\Session\AccountInterface;
-use Prophecy\Argument;
-
-/**
- * Tests access control for the configuration interface of Rules plugins.
- *
- * @group Rules
- */
-class RulesAdminAccessTest extends RulesIntegrationTestBase {
-
-  /**
-   * Test administrative access to plugin configuration UI.
-   */
-  public function testRespectsAdminPermissions() {
-    // 3 user classes to test.
-    $super_admin = $this->prophesize(AccountInterface::class);
-    $super_admin->hasPermission(Argument::any())->willReturn(TRUE);
-
-    $power_user = $this->prophesize(AccountInterface::class);
-    $power_user->hasPermission('admin this plugin')->willReturn(TRUE);
-    $power_user->hasPermission(Argument::any())->willReturn(FALSE);
-
-    $joe_user = $this->prophesize(AccountInterface::class);
-    $joe_user->hasPermission(Argument::any())->willReturn(FALSE);
-
-    // Our plug-in will behave as if it has the annotation property
-    // 'configuration_access'. getPluginDefinition should be called only
-    // twice, since the super admin should get approval before it is called.
-    // I use getMockBuilder since I need the actual code from the
-    // RulesActionBase class for the test.
-    $action = $this->getMockBuilder(RulesActionBase::class)
-      ->disableOriginalConstructor()
-      ->setMethods(['getPluginDefinition'])
-      ->getMockForAbstractClass();
-
-    $action
-      ->expects($this->exactly(2))
-      ->method('getPluginDefinition')
-      ->willReturn([
-        'plugin_id' => 'some_action',
-        'configure_permissions' => ['admin this plugin'],
-      ]);
-
-    $user = $super_admin->reveal();
-    $this->assertTrue($action->checkConfigurationAccess($user), "Super-user has admin access");
-
-    $user = $power_user->reveal();
-    $this->assertTrue($action->checkConfigurationAccess($user), "Power-user has admin access");
-
-    $user = $joe_user->reveal();
-    $this->assertFalse($action->checkConfigurationAccess($user), "Ordinary user lacks admin access");
-
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/RulesEntityIntegrationTestBase.php b/modules/rules/tests/src/Unit/Integration/RulesEntityIntegrationTestBase.php
deleted file mode 100644
index 85a06d0..0000000
--- a/modules/rules/tests/src/Unit/Integration/RulesEntityIntegrationTestBase.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration;
-
-use Drupal\Core\Config\Entity\ConfigEntityType;
-use Drupal\Core\Entity\ContentEntityType;
-use Drupal\Core\Entity\EntityAccessControlHandlerInterface;
-use Drupal\Core\Field\FieldTypePluginManager;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\TypedData\TypedDataManagerInterface;
-use Drupal\rules\Context\ContextDefinition;
-use Prophecy\Argument;
-use Prophecy\Prophecy\ProphecyInterface;
-
-/**
- * Base class for Rules integration tests with entities.
- *
- * This base class makes sure the base-entity system is available and its data
- * types are registered. It enables entity_test module, such that some test
- * entity types are available.
- */
-abstract class RulesEntityIntegrationTestBase extends RulesIntegrationTestBase {
-
-  /**
-   * The language manager mock.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $languageManager;
-
-  /**
-   * The mocked entity access handler.
-   *
-   * @var \Drupal\Core\Entity\EntityAccessControlHandlerInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $entityAccess;
-
-  /**
-   * The field type manager.
-   *
-   * @var \Drupal\Core\Field\FieldTypePluginManager
-   */
-  protected $fieldTypeManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setup();
-
-    require_once $this->root . '/core/includes/entity.inc';
-
-    $this->namespaces['Drupal\\Core\\Entity'] = $this->root . '/core/lib/Drupal/Core/Entity';
-
-    $language = $this->prophesize(LanguageInterface::class);
-    $language->getId()->willReturn('en');
-
-    $this->languageManager = $this->prophesize(LanguageManagerInterface::class);
-    $this->languageManager->getCurrentLanguage()->willReturn($language->reveal());
-    $this->languageManager->getLanguages()->willReturn([$language->reveal()]);
-
-    // We need to support multiple entity types, including a test type:
-    $type_info = [
-      'test' => [
-        'id' => 'test',
-        'label' => 'Test',
-        'entity_keys' => [
-          'bundle' => 'bundle',
-        ],
-      ],
-      'user' => [
-        'id' => 'user',
-        'label' => 'Test User',
-        'entity_keys' => [
-          'bundle' => 'user',
-        ],
-      ],
-      'node' => [
-        'id' => 'node',
-        'label' => 'Test Node',
-        'entity_keys' => [
-          'bundle' => 'dummy',
-        ],
-      ],
-    ];
-
-    $type_array = [];
-
-    foreach ($type_info as $type => $info) {
-      $entity_type = new ContentEntityType($info);
-      $type_array[$type] = $entity_type;
-
-      $this->entityTypeManager->getDefinition($type)
-        ->willReturn($entity_type);
-      $this->entityManager->getDefinition($type)
-        ->willReturn($entity_type);
-    }
-
-    // We need a user_role mock as well.
-    $role_entity_info = [
-      'id' => 'user_role',
-      'label' => 'Test Role',
-    ];
-    $role_type = new ConfigEntityType($role_entity_info);
-    $type_array['user_role'] = $role_type;
-
-    $this->entityTypeManager->getDefinitions()
-      ->willReturn($type_array);
-    $this->entityManager->getDefinitions()
-      ->willReturn($type_array);
-
-    $this->entityAccess = $this->prophesize(EntityAccessControlHandlerInterface::class);
-
-    $this->entityTypeManager->getAccessControlHandler(Argument::any())
-      ->willReturn($this->entityAccess->reveal());
-
-    // The base field definitions for our test entity aren't used, and would
-    // require additional mocking. It doesn't appear that any of our tests rely
-    // on this for any other entity type that we are mocking.
-    $this->entityFieldManager->getBaseFieldDefinitions(Argument::any())->willReturn([]);
-    $this->entityManager->getBaseFieldDefinitions(Argument::any())->willReturn([]);
-
-    // Return some dummy bundle information for now, so that the entity manager
-    // does not call out to the config entity system to get bundle information.
-    $this->entityTypeBundleInfo->getBundleInfo(Argument::any())
-      ->willReturn(['test' => ['label' => 'Test']]);
-
-    $this->entityManager->getBundleInfo(Argument::any())
-      ->willReturn(['test' => ['label' => 'Test']]);
-
-    $this->moduleHandler->getImplementations('entity_type_build')
-      ->willReturn([]);
-
-    $this->fieldTypeManager = new FieldTypePluginManager(
-      $this->namespaces, $this->cacheBackend, $this->moduleHandler->reveal(), $this->typedDataManager
-    );
-    $this->container->set('plugin.manager.field.field_type', $this->fieldTypeManager);
-  }
-
-  /**
-   * Helper to mock a context definition with a mocked data definition.
-   *
-   * @param string $data_type
-   *   The data type, example "entity:node".
-   * @param \Prophecy\Prophecy\ProphecyInterface $data_definition
-   *   A prophecy that represents a data definition object.
-   *
-   * @return \Drupal\rules\Context\ContextDefinition
-   *   The context definition with the data definition prophecy in it.
-   */
-  protected function getContextDefinitionFor($data_type, ProphecyInterface $data_definition) {
-    // Mock all the setter calls on the data definition that can be ignored.
-    $data_definition->setLabel(Argument::any())->willReturn($data_definition->reveal());
-    $data_definition->setDescription(Argument::any())->willReturn($data_definition->reveal());
-    $data_definition->setRequired(Argument::any())->willReturn($data_definition->reveal());
-    $data_definition->setLabel(Argument::any())->willReturn($data_definition->reveal());
-    $data_definition->setConstraints(Argument::any())->willReturn($data_definition->reveal());
-
-    $data_definition->getConstraints()->willReturn([]);
-    $data_definition->getDataType()->willReturn($data_type);
-
-    $original_definition = $this->typedDataManager->getDefinition($data_type);
-    $data_definition->getClass()->willReturn($original_definition['class']);
-
-    $context_definition = ContextDefinition::create($data_type);
-
-    // Inject a fake typed data manger that will return our data definition
-    // prophecy if asked for it in the ContextDefinition class.
-    $typed_data_manager = $this->prophesize(TypedDataManagerInterface::class);
-    $typed_data_manager->createDataDefinition($data_type)->willReturn($data_definition->reveal());
-    $context_definition->setTypedDataManager($typed_data_manager->reveal());
-
-    return $context_definition;
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/Integration/RulesIntegrationTestBase.php b/modules/rules/tests/src/Unit/Integration/RulesIntegrationTestBase.php
deleted file mode 100644
index 3cf226e..0000000
--- a/modules/rules/tests/src/Unit/Integration/RulesIntegrationTestBase.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit\Integration;
-
-use Drupal\Component\Uuid\Php;
-use Drupal\Core\Cache\NullBackend;
-use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Config\Entity\ConfigEntityStorageInterface;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Path\AliasManagerInterface;
-use Drupal\Core\Plugin\Context\LazyContextRepository;
-use Drupal\Core\TypedData\TypedDataManager;
-use Drupal\rules\Core\ConditionManager;
-use Drupal\rules\Context\DataProcessorManager;
-use Drupal\rules\Core\RulesActionManager;
-use Drupal\rules\Engine\ExpressionManager;
-use Drupal\typed_data\DataFetcher;
-use Drupal\typed_data\DataFilterManager;
-use Drupal\typed_data\PlaceholderResolver;
-use Drupal\Tests\UnitTestCase;
-use Prophecy\Argument;
-
-/**
- * Base class for Rules integration tests.
- *
- * Rules integration tests leverage the services (plugin managers) of the Rules
- * module to test the integration of an action or condition. Dependencies on
- * other 3rd party modules or APIs can and should be mocked; e.g. the action
- * to delete an entity would mock the call to the entity API.
- */
-abstract class RulesIntegrationTestBase extends UnitTestCase {
-
-  /**
-   * @var \Drupal\Core\Entity\EntityManagerInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $entityManager;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $entityFieldManager;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $entityTypeBundledInfo;
-
-  /**
-   * @var \Drupal\Core\TypedData\TypedDataManagerInterface
-   */
-  protected $typedDataManager;
-
-  /**
-   * @var \Drupal\rules\Core\RulesActionManagerInterface
-   */
-  protected $actionManager;
-
-  /**
-   * @var \Drupal\Core\Path\AliasManager|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $aliasManager;
-
-  /**
-   * @var \Drupal\rules\Core\ConditionManager
-   */
-  protected $conditionManager;
-
-  /**
-   * @var \Drupal\rules\Engine\ExpressionManager
-   */
-  protected $rulesExpressionManager;
-
-  /**
-   * @var \Drupal\rules\Context\DataProcessorManager
-   */
-  protected $rulesDataProcessorManager;
-
-  /**
-   * All setup'ed namespaces.
-   *
-   * @var \ArrayObject
-   */
-  protected $namespaces;
-
-  /**
-   * @var \Drupal\Core\Cache\NullBackend
-   */
-  protected $cacheBackend;
-
-  /**
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface||\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * Array object keyed with module names and TRUE as value.
-   *
-   * @var \ArrayObject
-   */
-  protected $enabledModules;
-
-  /**
-   * @var \Drupal\Core\DependencyInjection\Container
-   */
-  protected $container;
-
-  /**
-   * The class resolver mock for the typed data manager.
-   *
-   * @var \Drupal\Core\DependencyInjection\ClassResolverInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $classResolver;
-
-  /**
-   * The data fetcher service.
-   *
-   * @var \Drupal\typed_data\DataFetcher
-   */
-  protected $dataFetcher;
-
-  /**
-   * The placeholder resolver service.
-   *
-   * @var \Drupal\typed_data\PlaceholderResolver
-   */
-  protected $placeholderResolver;
-
-  /**
-   * The data filter manager.
-   *
-   * @var \Drupal\typed_data\DataFilterManager
-   */
-  protected $dataFilterManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $container = new ContainerBuilder();
-    // Register plugin managers used by Rules, but mock some unwanted
-    // dependencies requiring more stuff to loaded.
-    $this->moduleHandler = $this->prophesize(ModuleHandlerInterface::class);
-
-    // Set all the modules as being existent.
-    $this->enabledModules = new \ArrayObject();
-    $this->enabledModules['rules'] = TRUE;
-    $this->enabledModules['rules_test'] = TRUE;
-    $enabled_modules = $this->enabledModules;
-    $this->moduleHandler->moduleExists(Argument::type('string'))
-      ->will(function ($arguments) use ($enabled_modules) {
-        return [$arguments[0], $enabled_modules[$arguments[0]]];
-      });
-
-    // Wed don't care about alter() calls on the module handler.
-    $this->moduleHandler->alter(Argument::any(), Argument::any(), Argument::any(), Argument::any())
-      ->willReturn(NULL);
-
-    $this->cacheBackend = new NullBackend('rules');
-    $rules_directory = __DIR__ . '/../../../..';
-    $this->namespaces = new \ArrayObject([
-      'Drupal\\rules' => $rules_directory . '/src',
-      'Drupal\\rules_test' => $rules_directory . '/tests/modules/rules_test/src',
-      'Drupal\\Core\\TypedData' => $this->root . '/core/lib/Drupal/Core/TypedData',
-      'Drupal\\Core\\Validation' => $this->root . '/core/lib/Drupal/Core/Validation',
-    ]);
-
-    $this->actionManager = new RulesActionManager($this->namespaces, $this->cacheBackend, $this->moduleHandler->reveal());
-    $this->conditionManager = new ConditionManager($this->namespaces, $this->cacheBackend, $this->moduleHandler->reveal());
-
-    $uuid_service = new Php();
-    $this->rulesExpressionManager = new ExpressionManager($this->namespaces, $this->moduleHandler->reveal(), $uuid_service);
-
-    $this->classResolver = $this->prophesize(ClassResolverInterface::class);
-
-    $this->typedDataManager = new TypedDataManager(
-      $this->namespaces,
-      $this->cacheBackend,
-      $this->moduleHandler->reveal(),
-      $this->classResolver->reveal()
-    );
-    $this->rulesDataProcessorManager = new DataProcessorManager($this->namespaces, $this->moduleHandler->reveal());
-
-    $this->aliasManager = $this->prophesize(AliasManagerInterface::class);
-
-    // Keep the deprecated entity manager around because it is still used in a
-    // few places.
-    $this->entityManager = $this->prophesize(EntityManagerInterface::class);
-
-    $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class);
-    $this->entityTypeManager->getDefinitions()->willReturn([]);
-
-    // Setup a rules_component storage mock which returns nothing by default.
-    $storage = $this->prophesize(ConfigEntityStorageInterface::class);
-    $storage->loadMultiple(NULL)->willReturn([]);
-    $this->entityTypeManager->getStorage('rules_component')->willReturn($storage->reveal());
-
-    $this->entityFieldManager = $this->prophesize(EntityFieldManagerInterface::class);
-    $this->entityFieldManager->getBaseFieldDefinitions()->willReturn([]);
-
-    $this->entityTypeBundleInfo = $this->prophesize(EntityTypeBundleInfoInterface::class);
-    $this->entityTypeBundleInfo->getBundleInfo()->willReturn([]);
-
-    $this->dataFetcher = new DataFetcher();
-
-    $this->dataFilterManager = new DataFilterManager($this->namespaces, $this->moduleHandler->reveal());
-    $this->placeholderResolver = new PlaceholderResolver($this->dataFetcher, $this->dataFilterManager);
-
-    $container->set('entity.manager', $this->entityManager->reveal());
-    $container->set('entity_type.manager', $this->entityTypeManager->reveal());
-    $container->set('entity_field.manager', $this->entityFieldManager->reveal());
-    $container->set('entity_type.bundle.info', $this->entityTypeBundleInfo->reveal());
-    $container->set('context.repository', new LazyContextRepository($container, []));
-    $container->set('path.alias_manager', $this->aliasManager->reveal());
-    $container->set('plugin.manager.rules_action', $this->actionManager);
-    $container->set('plugin.manager.condition', $this->conditionManager);
-    $container->set('plugin.manager.rules_expression', $this->rulesExpressionManager);
-    $container->set('plugin.manager.rules_data_processor', $this->rulesDataProcessorManager);
-    $container->set('typed_data_manager', $this->typedDataManager);
-    $container->set('string_translation', $this->getStringTranslationStub());
-    $container->set('uuid', $uuid_service);
-    $container->set('typed_data.data_fetcher', $this->dataFetcher);
-    $container->set('typed_data.placeholder_resolver', $this->placeholderResolver);
-
-    \Drupal::setContainer($container);
-    $this->container = $container;
-  }
-
-  /**
-   * Fakes the enabling of a module and adds its namespace for plugin loading.
-   *
-   * Default behaviour works fine for core modules.
-   *
-   * @param string $name
-   *   The name of the module that's gonna be enabled.
-   * @param array $namespaces
-   *   Map of the association between module's namespaces and filesystem paths.
-   */
-  protected function enableModule($name, array $namespaces = []) {
-    $this->enabledModules[$name] = TRUE;
-
-    if (empty($namespaces)) {
-      $namespaces = ['Drupal\\' . $name => $this->root . '/core/modules/' . $name . '/src'];
-    }
-    foreach ($namespaces as $namespace => $path) {
-      $this->namespaces[$namespace] = $path;
-    }
-  }
-
-  /**
-   * Returns a typed data object.
-   *
-   * This helper for quick creation of typed data objects.
-   *
-   * @param string $data_type
-   *   The data type to create an object for.
-   * @param mixed $value
-   *   The value to set.
-   *
-   * @return \Drupal\Core\TypedData\TypedDataInterface
-   *   The created object.
-   */
-  protected function getTypedData($data_type, $value) {
-    $definition = $this->typedDataManager->createDataDefinition($data_type);
-    $data = $this->typedDataManager->create($definition);
-    $data->setValue($value);
-    return $data;
-  }
-
-  /**
-   * Helper method to mock irrelevant cache methods on entities.
-   *
-   * @param string $interface
-   *   The interface that should be mocked, example: EntityInterface::class.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface|\Prophecy\Prophecy\ProphecyInterface
-   *   The mocked entity.
-   */
-  protected function prophesizeEntity($interface) {
-    $entity = $this->prophesize($interface);
-    // Cache methods are irrelevant for the tests but might be called.
-    $entity->getCacheContexts()->willReturn([]);
-    $entity->getCacheTags()->willReturn([]);
-    $entity->getCacheMaxAge()->willReturn(0);
-    return $entity;
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/RuleTest.php b/modules/rules/tests/src/Unit/RuleTest.php
deleted file mode 100644
index 6ec8957..0000000
--- a/modules/rules/tests/src/Unit/RuleTest.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit;
-
-use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\rules\Engine\ExpressionManagerInterface;
-use Drupal\rules\Plugin\RulesExpression\ActionSet;
-use Drupal\rules\Plugin\RulesExpression\Rule;
-use Drupal\rules\Plugin\RulesExpression\RulesAction;
-use Drupal\rules\Plugin\RulesExpression\RulesAnd;
-use Drupal\rules\Plugin\RulesExpression\RulesOr;
-use Prophecy\Argument;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesExpression\Rule
- * @group Rules
- */
-class RuleTest extends RulesUnitTestBase {
-
-  /**
-   * The rules expression plugin manager.
-   *
-   * @var \Drupal\rules\Engine\ExpressionManagerInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $expressionManager;
-
-  /**
-   * The rule being tested.
-   *
-   * @var \Drupal\rules\Plugin\RulesExpression\RuleInterface
-   */
-  protected $rule;
-
-  /**
-   * The primary condition container of the rule.
-   *
-   * @var \Drupal\rules\Engine\ConditionExpressionContainerInterface
-   */
-  protected $conditions;
-
-  /**
-   * The primary action container of the rule.
-   *
-   * @var \Drupal\rules\Engine\ActionExpressionContainerInterface
-   */
-  protected $actions;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->expressionManager = $this->prophesize(ExpressionManagerInterface::class);
-
-    $this->conditions = new RulesAnd([], 'rules_and', [], $this->expressionManager->reveal());
-    $this->expressionManager->createInstance('rules_and', [])->willReturn($this->conditions);
-
-    $this->actions = new ActionSet([], 'rules_action_set', [], $this->expressionManager->reveal());
-    $this->expressionManager->createInstance('rules_action_set', [])->willReturn($this->actions);
-
-    $this->rule = new Rule([], 'rules_rule', [], $this->expressionManager->reveal());
-  }
-
-  /**
-   * Tests that a rule is constructed with condition and action containers.
-   *
-   * @covers ::__construct
-   */
-  public function testContainersOnConstruct() {
-    $this->assertSame($this->conditions, $this->rule->getConditions());
-    $this->assertSame($this->actions, $this->rule->getActions());
-  }
-
-  /**
-   * Tests the condition container setter and getter.
-   *
-   * @covers ::setConditions
-   * @covers ::getConditions
-   */
-  public function testSetConditionsGetConditions() {
-    $or = new RulesOr([], 'rules_or', [], $this->expressionManager->reveal());
-    $this->rule->setConditions($or);
-    $this->assertSame($or, $this->rule->getConditions());
-
-    $and = new RulesAnd([], 'rules_and', [], $this->expressionManager->reveal());
-    $this->rule->setConditions($and);
-    $this->assertSame($and, $this->rule->getConditions());
-  }
-
-  /**
-   * Tests the condition container setter and getter.
-   *
-   * @covers ::setActions
-   * @covers ::getActions
-   */
-  public function testSetActionsGetActions() {
-    $action_set = new ActionSet([], '', [], $this->expressionManager->reveal());
-    $this->rule->setActions($action_set);
-    $this->assertSame($action_set, $this->rule->getActions());
-  }
-
-  /**
-   * Tests that an action fires if a condition passes.
-   *
-   * @covers ::execute
-   */
-  public function testActionExecution() {
-    // The method on the test action must be called once.
-    $this->testActionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
-    $this->rule
-      ->addExpressionObject($this->trueConditionExpression->reveal())
-      ->addExpressionObject($this->testActionExpression->reveal())
-      ->execute();
-  }
-
-  /**
-   * Tests that an action does not fire if a condition fails.
-   *
-   * @covers ::execute
-   */
-  public function testConditionFails() {
-    // The execute method on the action must never be called.
-    $this->testActionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldNotBeCalled();
-
-    $this->rule
-      ->addExpressionObject($this->falseConditionExpression->reveal())
-      ->addExpressionObject($this->testActionExpression->reveal())
-      ->execute();
-  }
-
-  /**
-   * Tests that an action fires if a condition passes.
-   *
-   * @covers ::execute
-   */
-  public function testTwoConditionsTrue() {
-    // The method on the test action must be called once.
-    $this->testActionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
-    $second_condition = $this->prophesize(ConditionExpressionInterface::class);
-    $second_condition->getUuid()->willReturn('true_uuid2');
-
-    $second_condition->executeWithState(Argument::type(ExecutionStateInterface::class))
-      ->willReturn(TRUE);
-
-    $this->rule
-      ->addExpressionObject($this->trueConditionExpression->reveal())
-      ->addExpressionObject($second_condition->reveal())
-      ->addExpressionObject($this->testActionExpression->reveal())
-      ->execute();
-  }
-
-  /**
-   * Tests that an action does not fire if a condition fails.
-   *
-   * @covers ::execute
-   */
-  public function testTwoConditionsFalse() {
-    // The execute method on the action must never be called.
-    $this->testActionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldNotBeCalled();
-
-    $this->rule
-      ->addExpressionObject($this->trueConditionExpression->reveal())
-      ->addExpressionObject($this->falseConditionExpression->reveal())
-      ->addExpressionObject($this->testActionExpression->reveal())
-      ->execute();
-  }
-
-  /**
-   * Tests that nested rules are properly executed.
-   *
-   * @covers ::execute
-   */
-  public function testNestedRules() {
-    $this->testActionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
-    $nested = new Rule([], 'rules_rule', [], $this->expressionManager->reveal());
-    // We need to replace the action and conditon container to not have the same
-    // instances as in the outer rule.
-    $nested->setConditions(new RulesAnd([], 'rules_and', [], $this->expressionManager->reveal()));
-    $nested->setActions(new ActionSet([], 'rules_action_set', [], $this->expressionManager->reveal()));
-
-    $nested->addExpressionObject($this->trueConditionExpression->reveal())
-      ->addExpressionObject($this->testActionExpression->reveal());
-
-    $this->rule
-      ->addExpressionObject($this->trueConditionExpression->reveal())
-      ->addExpressionObject($nested)
-      ->execute();
-  }
-
-  /**
-   * Tests that a nested expression can be retrieved by UUID.
-   */
-  public function testLookupExpression() {
-    // Test Conditions.
-    $this->rule->addExpressionObject($this->trueConditionExpression->reveal());
-    $uuid = $this->trueConditionExpression->reveal()->getUuid();
-    $this->assertSame($this->trueConditionExpression->reveal(), $this->rule->getExpression($uuid));
-
-    // Test actions.
-    $this->rule->addExpressionObject($this->testActionExpression->reveal());
-    $uuid = $this->testActionExpression->reveal()->getUuid();
-    $this->assertSame($this->testActionExpression->reveal(), $this->rule->getExpression($uuid));
-
-    $this->assertFalse($this->rule->getExpression('invalid UUID'));
-  }
-
-  /**
-   * Tests that removing expressions by indices works.
-   */
-  public function testDeletingExpressions() {
-    // Create a rule with 2 conditions and 2 actions.
-    $this->rule->addExpressionObject($this->trueConditionExpression->reveal());
-    $this->rule->addExpressionObject($this->falseConditionExpression->reveal());
-    $this->rule->addExpressionObject($this->testActionExpression->reveal());
-    $second_action = $this->prophesize(RulesAction::class);
-    $second_action->getUuid()->willReturn('action_uuid2');
-    $this->rule->addExpressionObject($second_action->reveal());
-
-    // Delete the first action.
-    $uuid = $this->testActionExpression->reveal()->getUuid();
-    $this->rule->deleteExpression($uuid);
-    $this->assertEquals(2, count($this->rule->getConditions()->getIterator()));
-    $this->assertEquals(1, count($this->rule->getActions()->getIterator()));
-
-    // Delete the second condition.
-    $uuid = $this->falseConditionExpression->reveal()->getUuid();
-    $this->rule->deleteExpression($uuid);
-    $this->assertEquals(1, count($this->rule->getConditions()->getIterator()));
-    $this->assertEquals(1, count($this->rule->getActions()->getIterator()));
-
-    // Delete the remaining action.
-    $uuid = $second_action->reveal()->getUuid();
-    $this->rule->deleteExpression($uuid);
-    $this->assertEquals(1, count($this->rule->getConditions()->getIterator()));
-    $this->assertEquals(0, count($this->rule->getActions()->getIterator()));
-
-    // Delete the remaining condition, rule should be empty now.
-    $uuid = $this->trueConditionExpression->reveal()->getUuid();
-    $this->rule->deleteExpression($uuid);
-    $this->assertEquals(0, count($this->rule->getConditions()->getIterator()));
-    $this->assertEquals(0, count($this->rule->getActions()->getIterator()));
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesActionBaseTest.php b/modules/rules/tests/src/Unit/RulesActionBaseTest.php
deleted file mode 100644
index eb59a76..0000000
--- a/modules/rules/tests/src/Unit/RulesActionBaseTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit;
-
-use Drupal\Core\StringTranslation\TranslationWrapper;
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * @coversDefaultClass \Drupal\rules\Core\RulesActionBase
- * @group Rules
- */
-class RulesActionBaseTest extends RulesUnitTestBase {
-
-  /**
-   * Tests that a missing label throwa an exception.
-   *
-   * @covers ::summary
-   */
-  public function testSummaryThrowingException() {
-    // Set the expected exception class. There is no message to check for.
-    $this->setExpectedException('\Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException');
-
-    $rules_action_base = $this->getMockForAbstractClass(
-      RulesActionBase::class,
-      [[], '', '']
-    );
-    $rules_action_base->summary();
-  }
-
-  /**
-   * Tests that the summary is being parsed from the label annotation.
-   *
-   * @covers ::summary
-   */
-  public function testSummaryParsingTheLabelAnnotation() {
-    $rules_action_base = $this->getMockForAbstractClass(
-      RulesActionBase::class,
-      [[], '', ['label' => 'something']]
-    );
-    $this->assertEquals('something', $rules_action_base->summary());
-  }
-
-  /**
-   * Tests that a translation wrapper label is correctly parsed.
-   *
-   * @covers ::summary
-   */
-  public function testTranslatedLabel() {
-    $translation_wrapper = $this->prophesize(TranslationWrapper::class);
-    $translation_wrapper->__toString()->willReturn('something');
-    $rules_action_base = $this->getMockForAbstractClass(
-      RulesActionBase::class,
-      [[], '', ['label' => $translation_wrapper->reveal()]]
-    );
-    $this->assertEquals('something', $rules_action_base->summary());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesAndTest.php b/modules/rules/tests/src/Unit/RulesAndTest.php
deleted file mode 100644
index e791573..0000000
--- a/modules/rules/tests/src/Unit/RulesAndTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit;
-
-use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\rules\Plugin\RulesExpression\RulesAnd;
-use Prophecy\Argument;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesExpression\RulesAnd
- * @group Rules
- */
-class RulesAndTest extends RulesUnitTestBase {
-
-  /**
-   * The 'and' condition container being tested.
-   *
-   * @var \Drupal\rules\Engine\ConditionExpressionContainerInterface
-   */
-  protected $and;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->and = new RulesAnd([], '', [], $this->expressionManager->reveal());
-  }
-
-  /**
-   * Tests one condition.
-   */
-  public function testOneCondition() {
-    // The method on the test condition must be called once.
-    $this->trueConditionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-    $this->and->addExpressionObject($this->trueConditionExpression->reveal());
-    $this->assertTrue($this->and->execute(), 'Single condition returns TRUE.');
-  }
-
-  /**
-   * Tests an empty AND.
-   */
-  public function testEmptyAnd() {
-    $property = new \ReflectionProperty($this->and, 'conditions');
-    $property->setAccessible(TRUE);
-
-    $this->assertEmpty($property->getValue($this->and));
-    $this->assertFalse($this->and->execute(), 'Empty AND returns FALSE.');
-  }
-
-  /**
-   * Tests two true conditions.
-   */
-  public function testTwoConditions() {
-    // The method on the test condition must be called twice.
-    $this->trueConditionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
-    $second_condition = $this->prophesize(ConditionExpressionInterface::class);
-    $second_condition->getUuid()->willReturn('true_uuid2');
-
-    $second_condition->executeWithState(Argument::type(ExecutionStateInterface::class))
-      ->willReturn(TRUE)
-      ->shouldBeCalledTimes(1);
-
-    $this->and
-      ->addExpressionObject($this->trueConditionExpression->reveal())
-      ->addExpressionObject($second_condition->reveal());
-
-    $this->assertTrue($this->and->execute(), 'Two conditions returns TRUE.');
-  }
-
-  /**
-   * Tests two false conditions.
-   */
-  public function testTwoFalseConditions() {
-    // The method on the test condition must be called once.
-    $this->falseConditionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
-    $second_condition = $this->prophesize(ConditionExpressionInterface::class);
-    $second_condition->getUuid()->willReturn('false_uuid2');
-
-    $second_condition->executeWithState(Argument::type(ExecutionStateInterface::class))
-      ->willReturn(FALSE)
-      ->shouldNotBeCalled();
-
-    $this->and
-      ->addExpressionObject($this->falseConditionExpression->reveal())
-      ->addExpressionObject($second_condition->reveal());
-
-    $this->assertFalse($this->and->execute(), 'Two false conditions return FALSE.');
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesConditionContainerTest.php b/modules/rules/tests/src/Unit/RulesConditionContainerTest.php
deleted file mode 100644
index 0c7158e..0000000
--- a/modules/rules/tests/src/Unit/RulesConditionContainerTest.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit;
-
-use Drupal\rules\Engine\ConditionExpressionContainer;
-use Drupal\rules\Engine\ExpressionManagerInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-
-/**
- * @coversDefaultClass \Drupal\rules\Engine\ConditionExpressionContainer
- * @group Rules
- */
-class RulesConditionContainerTest extends RulesUnitTestBase {
-
-  /**
-   * Creates a mocked condition container.
-   *
-   * @param array $methods
-   *   The methods to mock.
-   * @param string $class
-   *   The name of the created mock class.
-   *
-   * @return \Drupal\rules\Engine\ConditionExpressionContainerInterface
-   *   The mocked condition container.
-   */
-  protected function getMockConditionContainer(array $methods = [], $class = 'RulesConditionContainerMock') {
-    return $this->getMockForAbstractClass(
-      ConditionExpressionContainer::class, [
-        [],
-        'test_id',
-        [],
-        $this->prophesize(ExpressionManagerInterface::class)->reveal(),
-      ], $class, TRUE, TRUE, TRUE, $methods
-    );
-  }
-
-  /**
-   * Tests adding conditions to the condition container.
-   *
-   * @covers ::addExpressionObject
-   */
-  public function testAddExpressionObject() {
-    $container = $this->getMockConditionContainer();
-    $container->addExpressionObject($this->trueConditionExpression->reveal());
-
-    $property = new \ReflectionProperty($container, 'conditions');
-    $property->setAccessible(TRUE);
-
-    $this->assertArrayEquals([$this->trueConditionExpression->reveal()], array_values($property->getValue($container)));
-  }
-
-  /**
-   * Tests negating the result of the condition container.
-   *
-   * @covers ::negate
-   * @covers ::isNegated
-   */
-  public function testNegate() {
-    $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [], '', FALSE);
-
-    $this->assertFalse($container->isNegated());
-    $this->assertTrue($container->execute());
-
-    $container->negate(TRUE);
-    $this->assertTrue($container->isNegated());
-    $this->assertFalse($container->execute());
-  }
-
-  /**
-   * Tests executing the condition container.
-   *
-   * @covers ::execute
-   */
-  public function testExecute() {
-    $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [], '', FALSE);
-    $this->assertTrue($container->execute());
-  }
-
-  /**
-   * Tests that an expression can be retrieved by UUID.
-   */
-  public function testLookupExpression() {
-    $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
-      [],
-      'test_id',
-      [],
-      $this->prophesize(ExpressionManagerInterface::class)->reveal(),
-    ], '', TRUE);
-    $container->addExpressionObject($this->trueConditionExpression->reveal());
-    $uuid = $this->trueConditionExpression->reveal()->getUuid();
-    $this->assertSame($this->trueConditionExpression->reveal(), $container->getExpression($uuid));
-    $this->assertFalse($container->getExpression('invalid UUID'));
-  }
-
-  /**
-   * Tests that a nested expression can be retrieved by UUID.
-   */
-  public function testLookupNestedExpression() {
-    $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
-      [],
-      'test_id',
-      [],
-      $this->prophesize(ExpressionManagerInterface::class)->reveal(),
-    ], '', TRUE);
-    $container->addExpressionObject($this->trueConditionExpression->reveal());
-
-    $nested_container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
-      [],
-      'test_id',
-      [],
-      $this->prophesize(ExpressionManagerInterface::class)->reveal(),
-    ], '', TRUE);
-    $nested_container->addExpressionObject($this->falseConditionExpression->reveal());
-
-    $container->addExpressionObject($nested_container);
-
-    $uuid = $this->falseConditionExpression->reveal()->getUuid();
-    $this->assertSame($this->falseConditionExpression->reveal(), $container->getExpression($uuid));
-  }
-
-  /**
-   * Tests deleting a condition from the container.
-   */
-  public function testDeletingCondition() {
-    $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
-      [],
-      'test_id',
-      [],
-      $this->prophesize(ExpressionManagerInterface::class)->reveal(),
-    ], '', TRUE);
-    $container->addExpressionObject($this->trueConditionExpression->reveal());
-    $container->addExpressionObject($this->falseConditionExpression->reveal());
-
-    // Delete the first condition.
-    $uuid = $this->trueConditionExpression->reveal()->getUuid();
-    $this->assertTrue($container->deleteExpression($uuid));
-    foreach ($container as $condition) {
-      $this->assertSame($this->falseConditionExpression->reveal(), $condition);
-    }
-
-    $this->assertFalse($container->deleteExpression('invalid UUID'));
-  }
-
-  /**
-   * Tests deleting a nested condition from the container.
-   */
-  public function testDeletingNestedCondition() {
-    $container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
-      [],
-      'test_id',
-      [],
-      $this->prophesize(ExpressionManagerInterface::class)->reveal(),
-    ], '', TRUE);
-    $container->addExpressionObject($this->trueConditionExpression->reveal());
-
-    $nested_container = $this->getMockForAbstractClass(RulesConditionContainerTestStub::class, [
-      [],
-      'test_id',
-      [],
-      $this->prophesize(ExpressionManagerInterface::class)->reveal(),
-    ], '', TRUE);
-    $nested_container->addExpressionObject($this->falseConditionExpression->reveal());
-
-    $container->addExpressionObject($nested_container);
-
-    $uuid = $this->falseConditionExpression->reveal()->getUuid();
-    $this->assertTrue($container->deleteExpression($uuid));
-    $this->assertEquals(0, count($nested_container->getIterator()));
-  }
-
-}
-
-/**
- * Class used for overriding evalute() as this does not work with PHPunit.
- */
-abstract class RulesConditionContainerTestStub extends ConditionExpressionContainer {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function evaluate(ExecutionStateInterface $state) {
-    return TRUE;
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesConditionTest.php b/modules/rules/tests/src/Unit/RulesConditionTest.php
deleted file mode 100644
index 6ca3273..0000000
--- a/modules/rules/tests/src/Unit/RulesConditionTest.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit;
-
-use Drupal\rules\Core\ConditionManager;
-use Drupal\Core\Plugin\Context\ContextDefinitionInterface;
-use Drupal\rules\Context\DataProcessorInterface;
-use Drupal\rules\Context\ContextConfig;
-use Drupal\rules\Context\DataProcessorManager;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\rules\Plugin\RulesExpression\RulesCondition;
-use Drupal\rules\Core\RulesConditionInterface;
-use Drupal\Tests\UnitTestCase;
-use Prophecy\Argument;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesExpression\RulesCondition
- * @group Rules
- */
-class RulesConditionTest extends UnitTestCase {
-
-  /**
-   * The mocked condition manager.
-   *
-   * @var \Drupal\rules\Core\ConditionManager|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $conditionManager;
-
-  /**
-   * The mocked data processor manager.
-   *
-   * @var \Drupal\rules\Context\DataProcessorManager|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $processorManager;
-
-  /**
-   * The condition object being tested.
-   *
-   * @var \Drupal\rules\Plugin\RulesExpression\RulesCondition
-   */
-  protected $conditionExpression;
-
-  /**
-   * A condition plugin that always evaluates to TRUE.
-   *
-   * @var \Drupal\rules\Core\RulesConditionInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $trueCondition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Create a test condition plugin that always evaluates to TRUE.
-    $this->trueCondition = $this->prophesize(RulesConditionInterface::class);
-    $this->trueCondition->execute()->willReturn(TRUE);
-    $this->trueCondition->evaluate()->willReturn(TRUE);
-
-    $this->conditionManager = $this->prophesize(ConditionManager::class);
-
-    $this->processorManager = $this->prophesize(DataProcessorManager::class);
-
-    $this->conditionExpression = new RulesCondition(
-      ['condition_id' => 'test_condition'], '', [],
-      $this->conditionManager->reveal(), $this->processorManager->reveal());
-  }
-
-  /**
-   * Tests that context values get data processed with processor mappings.
-   */
-  public function testDataProcessor() {
-    $this->conditionManager->createInstance('test_condition', ['negate' => FALSE])
-      ->willReturn($this->trueCondition->reveal())
-      ->shouldBeCalledTimes(1);
-
-    $condition = new RulesCondition([
-      'condition_id' => 'test_condition',
-    ] + ContextConfig::create()
-      // We don't care about the data processor plugin name and
-      // configuration since we will use a mock anyway.
-      ->process('test', 'foo', [])
-      ->toArray(),
-    '', [], $this->conditionManager->reveal(), $this->processorManager->reveal());
-
-    $this->trueCondition->getContextDefinitions()->willReturn([
-      'test' => $this->prophesize(ContextDefinitionInterface::class)->reveal(),
-    ])->shouldBeCalledTimes(1);
-
-    $this->trueCondition->getContextDefinition('test')->willReturn(
-      $this->prophesize(ContextDefinitionInterface::class)->reveal()
-    )->shouldBeCalledTimes(1);
-
-    $this->trueCondition->getProvidedContextDefinitions()
-      ->willReturn([])
-      ->shouldBeCalledTimes(1);
-
-    // Mock some original old value that will be replaced by the data processor.
-    $this->trueCondition->getContextValue('test')
-      ->willReturn('old_value')
-      ->shouldBeCalled();
-
-    // The outcome of the data processor needs to get set on the condition.
-    $this->trueCondition->setContextValue('test', 'new_value')->shouldBeCalledTimes(1);
-    $this->trueCondition->refineContextDefinitions([])->shouldBeCalledTimes(1);
-
-    $data_processor = $this->prophesize(DataProcessorInterface::class);
-    $data_processor->process('old_value', Argument::any())
-      ->willReturn('new_value')
-      ->shouldBeCalledTimes(1);
-
-    $this->processorManager->createInstance('foo', [])
-      ->willReturn($data_processor->reveal())
-      ->shouldBeCalledTimes(1);
-
-    // Build some mocked execution state.
-    $state = $this->prophesize(ExecutionStateInterface::class);
-    $prophecy = $state->getVariable('test');
-    /** @var \Prophecy\Prophecy\MethodProphecy $prophecy */
-    $prophecy->willReturn('old_value');
-
-    $this->assertTrue($condition->executeWithState($state->reveal()));
-  }
-
-  /**
-   * Tests that negating a condition works.
-   */
-  public function testNegation() {
-    $this->trueCondition->getContextDefinitions()->willReturn([]);
-    $this->trueCondition->refineContextDefinitions([])->shouldBeCalledTimes(1);
-    $this->trueCondition->getProvidedContextDefinitions()
-      ->willReturn([])
-      ->shouldBeCalledTimes(1);
-
-    $this->conditionManager->createInstance('test_condition', ['negate' => TRUE])
-      ->willReturn($this->trueCondition->reveal())
-      ->shouldBeCalledTimes(1);
-
-    // Create a condition which is negated.
-    $condition_expression = new RulesCondition([
-      'condition_id' => 'test_condition',
-      'negate' => TRUE,
-    ], '', [], $this->conditionManager->reveal(), $this->processorManager->reveal());
-
-    $this->assertFalse($condition_expression->execute());
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesLoggerChannelTest.php b/modules/rules/tests/src/Unit/RulesLoggerChannelTest.php
deleted file mode 100644
index 602c81c..0000000
--- a/modules/rules/tests/src/Unit/RulesLoggerChannelTest.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit {
-
-  use Drupal\Core\Logger\RfcLogLevel;
-  use Drupal\rules\Logger\RulesLoggerChannel;
-  use Drupal\Tests\UnitTestCase;
-  use Prophecy\Argument;
-  use Psr\Log\LoggerInterface;
-  use Psr\Log\LogLevel;
-
-  /**
-   * @coversDefaultClass \Drupal\rules\Logger\RulesLoggerChannel
-   * @group Rules
-   */
-  class RulesLoggerChannelTest extends UnitTestCase {
-
-    /**
-     * Tests LoggerChannel::log().
-     *
-     * @param string $psr3_message_level
-     *   Expected PSR3 log level.
-     * @param int $rfc_message_level
-     *   Expected RFC 5424 log level.
-     * @param int $log
-     *   Is system logging enabled.
-     * @param int $debug_screen
-     *   Is screen logging enabled.
-     * @param string $psr3_log_error_level
-     *   Minimum required PSR3 log level at which to log.
-     * @param int $expect_system_log
-     *   Amount of logs to be created.
-     * @param int $expect_screen_log
-     *   Amount of messages to be created.
-     * @param string $message
-     *   Log message.
-     *
-     * @dataProvider providerTestLog
-     *
-     * @covers ::log
-     */
-    public function testLog($psr3_message_level, $rfc_message_level, $log, $debug_screen, $psr3_log_error_level, $expect_system_log, $expect_screen_log, $message) {
-      $this->clearMessages();
-
-      $config = $this->getConfigFactoryStub([
-        'rules.settings' => [
-          'log' => $log,
-          'debug_screen' => $debug_screen,
-          'log_level_system' => $psr3_log_error_level,
-          'log_level_screen' => $psr3_log_error_level,
-        ],
-      ]);
-      $channel = new RulesLoggerChannel($config);
-      $logger = $this->prophesize(LoggerInterface::class);
-      $logger->log($rfc_message_level, $message, Argument::type('array'))
-        ->shouldBeCalledTimes($expect_system_log);
-
-      $channel->addLogger($logger->reveal());
-
-      $channel->log($psr3_message_level, $message);
-
-      $messages = drupal_set_message();
-      if ($expect_screen_log > 0) {
-        $this->assertNotNull($messages);
-        $this->assertArrayEquals([$psr3_message_level => [$message]], $messages);
-      }
-      else {
-        $this->assertNull($messages);
-      }
-    }
-
-    /**
-     * Clears the statically stored messages.
-     *
-     * @param null|string $type
-     *   (optional) The type of messages to clear. Defaults to NULL which causes
-     *   all messages to be cleared.
-     *
-     * @return $this
-     */
-    protected function clearMessages($type = NULL) {
-      $messages = &drupal_set_message();
-      if (isset($type)) {
-        unset($messages[$type]);
-      }
-      else {
-        $messages = NULL;
-      }
-      return $this;
-    }
-
-    /**
-     * Data provider for self::testLog().
-     */
-    public function providerTestLog() {
-      return [
-        [
-          'psr3_message_level' => LogLevel::DEBUG,
-          'rfc_message_level' => RfcLogLevel::DEBUG,
-          'system_log_enabled' => 0,
-          'screen_log_enabled' => 0,
-          'min_psr3_level' => LogLevel::DEBUG,
-          'expected_system_logs' => 0,
-          'expected_screen_logs' => 0,
-          'message' => 'apple',
-        ],
-        [
-          'psr3_message_level' => LogLevel::DEBUG,
-          'rfc_message_level' => RfcLogLevel::DEBUG,
-          'system_log_enabled' => 0,
-          'screen_log_enabled' => 1,
-          'min_psr3_level' => LogLevel::DEBUG,
-          'expected_system_logs' => 0,
-          'expected_screen_logs' => 1,
-          'message' => 'pear',
-        ],
-        [
-          'psr3_message_level' => LogLevel::CRITICAL,
-          'rfc_message_level' => RfcLogLevel::CRITICAL,
-          'system_log_enabled' => 1,
-          'screen_log_enabled' => 0,
-          'min_psr3_level' => LogLevel::DEBUG,
-          'expected_system_logs' => 1,
-          'expected_screen_logs' => 0,
-          'message' => 'banana',
-        ],
-        [
-          'psr3_message_level' => LogLevel::CRITICAL,
-          'rfc_message_level' => RfcLogLevel::CRITICAL,
-          'system_log_enabled' => 1,
-          'screen_log_enabled' => 1,
-          'min_psr3_level' => LogLevel::DEBUG,
-          'expected_system_logs' => 1,
-          'expected_screen_logs' => 1,
-          'message' => 'carrot',
-        ],
-        [
-          'psr3_message_level' => LogLevel::CRITICAL,
-          'rfc_message_level' => RfcLogLevel::CRITICAL,
-          'system_log_enabled' => 1,
-          'screen_log_enabled' => 0,
-          'min_psr3_level' => LogLevel::DEBUG,
-          'expected_system_logs' => 1,
-          'expected_screen_logs' => 0,
-          'message' => 'orange',
-        ],
-        [
-          'psr3_message_level' => LogLevel::CRITICAL,
-          'rfc_message_level' => RfcLogLevel::CRITICAL,
-          'system_log_enabled' => 1,
-          'screen_log_enabled' => 1,
-          'min_psr3_level' => LogLevel::DEBUG,
-          'expected_system_logs' => 1,
-          'expected_screen_logs' => 1,
-          'message' => 'kumkwat',
-        ],
-        [
-          'psr3_message_level' => LogLevel::INFO,
-          'rfc_message_level' => RfcLogLevel::INFO,
-          'system_log_enabled' => 1,
-          'screen_log_enabled' => 0,
-          'min_psr3_level' => LogLevel::CRITICAL,
-          'expected_system_logs' => 0,
-          'expected_screen_logs' => 0,
-          'message' => 'cucumber',
-        ],
-        [
-          'psr3_message_level' => LogLevel::INFO,
-          'rfc_message_level' => RfcLogLevel::INFO,
-          'system_log_enabled' => 1,
-          'screen_log_enabled' => 1,
-          'min_psr3_level' => LogLevel::CRITICAL,
-          'expected_system_logs' => 0,
-          'expected_screen_logs' => 0,
-          'message' => 'dragonfruit',
-        ],
-      ];
-    }
-
-  }
-}
-
-namespace {
-
-  if (!function_exists('drupal_set_message')) {
-
-    /**
-     * Dummy replacement for testing.
-     */
-    function &drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE) {
-      static $messages = NULL;
-
-      if (!empty($message)) {
-        $messages[$type] = isset($messages[$type]) ? $messages[$type] : [];
-        if ($repeat || !in_array($message, $messages[$type])) {
-          $messages[$type][] = $message;
-        }
-      }
-
-      return $messages;
-    }
-
-  }
-}
diff --git a/modules/rules/tests/src/Unit/RulesOrTest.php b/modules/rules/tests/src/Unit/RulesOrTest.php
deleted file mode 100644
index 2dd4247..0000000
--- a/modules/rules/tests/src/Unit/RulesOrTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit;
-
-use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\rules\Plugin\RulesExpression\RulesOr;
-use Prophecy\Argument;
-
-/**
- * @coversDefaultClass \Drupal\rules\Plugin\RulesExpression\RulesOr
- * @group Rules
- */
-class RulesOrTest extends RulesUnitTestBase {
-
-  /**
-   * The 'or' condition container being tested.
-   *
-   * @var \Drupal\rules\Engine\ConditionExpressionContainerInterface
-   */
-  protected $or;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->or = new RulesOr([], '', [], $this->expressionManager->reveal());
-  }
-
-  /**
-   * Tests one condition.
-   */
-  public function testOneCondition() {
-    // The method on the test condition must be called once.
-    $this->trueConditionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
-    $this->or->addExpressionObject($this->trueConditionExpression->reveal());
-    $this->assertTrue($this->or->execute(), 'Single condition returns TRUE.');
-  }
-
-  /**
-   * Tests an empty OR.
-   */
-  public function testEmptyOr() {
-    $property = new \ReflectionProperty($this->or, 'conditions');
-    $property->setAccessible(TRUE);
-
-    $this->assertEmpty($property->getValue($this->or));
-    $this->assertTrue($this->or->execute(), 'Empty OR returns TRUE.');
-  }
-
-  /**
-   * Tests two true condition.
-   */
-  public function testTwoConditions() {
-    // The method on the test condition must be called once.
-    $this->trueConditionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
-    $second_condition = $this->prophesize(ConditionExpressionInterface::class);
-    $second_condition->getUuid()->willReturn('true_uuid2');
-
-    $second_condition->executeWithState(Argument::type(ExecutionStateInterface::class))
-      ->willReturn(TRUE)
-      ->shouldNotBeCalled();
-
-    $this->or
-      ->addExpressionObject($this->trueConditionExpression->reveal())
-      ->addExpressionObject($second_condition->reveal());
-
-    $this->assertTrue($this->or->execute(), 'Two conditions returns TRUE.');
-  }
-
-  /**
-   * Tests two false conditions.
-   */
-  public function testTwoFalseConditions() {
-    $this->falseConditionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->shouldBeCalledTimes(1);
-
-    $second_condition = $this->prophesize(ConditionExpressionInterface::class);
-    $second_condition->getUuid()->willReturn('false_uuid2');
-
-    $second_condition->executeWithState(Argument::type(ExecutionStateInterface::class))
-      ->willReturn(FALSE)
-      ->shouldBeCalledTimes(1);
-
-    $this->or
-      ->addExpressionObject($this->falseConditionExpression->reveal())
-      ->addExpressionObject($second_condition->reveal());
-
-    $this->assertFalse($this->or->execute(), 'Two false conditions return FALSE.');
-  }
-
-}
diff --git a/modules/rules/tests/src/Unit/RulesUnitTestBase.php b/modules/rules/tests/src/Unit/RulesUnitTestBase.php
deleted file mode 100644
index fa519ff..0000000
--- a/modules/rules/tests/src/Unit/RulesUnitTestBase.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rules\Unit;
-
-use Drupal\rules\Engine\ActionExpressionInterface;
-use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\rules\Engine\ExecutionStateInterface;
-use Drupal\rules\Engine\ExpressionManagerInterface;
-use Drupal\Tests\UnitTestCase;
-use Prophecy\Argument;
-
-/**
- * Helper class with mock objects.
- */
-abstract class RulesUnitTestBase extends UnitTestCase {
-
-  /**
-   * A mocked condition that always evaluates to TRUE.
-   *
-   * @var \Drupal\rules\Engine\ConditionExpressionInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $trueConditionExpression;
-
-  /**
-   * A mocked condition that always evaluates to FALSE.
-   *
-   * @var \Drupal\rules\Engine\ConditionExpressionInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $falseConditionExpression;
-
-  /**
-   * A mocked dummy action object.
-   *
-   * @var \Drupal\rules\Engine\ActionExpressionInterface|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $testActionExpression;
-
-  /**
-   * The mocked expression manager object.
-   *
-   * @var \Drupal\rules\Engine\ExpressionPluginManager|\Prophecy\Prophecy\ProphecyInterface
-   */
-  protected $expressionManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->trueConditionExpression = $this->prophesize(ConditionExpressionInterface::class);
-    $this->trueConditionExpression->getUuid()->willReturn('true_uuid1');
-
-    $this->trueConditionExpression->execute()->willReturn(TRUE);
-    $this->trueConditionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->willReturn(TRUE);
-
-    $this->falseConditionExpression = $this->prophesize(ConditionExpressionInterface::class);
-    $this->falseConditionExpression->getUuid()->willReturn('false_uuid1');
-
-    $this->falseConditionExpression->execute()->willReturn(FALSE);
-    $this->falseConditionExpression->executeWithState(
-      Argument::type(ExecutionStateInterface::class))->willReturn(FALSE);
-
-    $this->testActionExpression = $this->prophesize(ActionExpressionInterface::class);
-    $this->testActionExpression->getUuid()->willReturn('action_uuid1');
-
-    $this->expressionManager = $this->prophesize(ExpressionManagerInterface::class);
-  }
-
-}
diff --git a/modules/scheduler/.travis.yml b/modules/scheduler/.travis.yml
deleted file mode 100644
index 19c0dac..0000000
--- a/modules/scheduler/.travis.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-language: php
-# The Travis CI container mode has random functional test fails, so we must use
-# sudo here.
-sudo: true
-
-php:
-  - 5.5
-  - 5.6
-  - 7.0
-
-env:
-  global:
-    # Make the script re-usable for other modules.
-    - MODULE=scheduler
-  matrix:
-    - DRUPAL_CORE=8.3.x
-    - DRUPAL_CORE=8.4.x
-    - DRUPAL_CORE=8.5.x
-
-matrix:
-  fast_finish: true
-
-# Be sure to cache composer downloads.
-cache:
-  directories:
-    - $HOME/.composer
-
-before_script:
-  - echo $MODULE
-
-  # Remove Xdebug as we don't need it and it causes
-  # PHP Fatal error:  Maximum function nesting level of '256' reached.
-  # We also don't care if that file exists or not on PHP 7.
-  - phpenv config-rm xdebug.ini || true
-
-  # Navigate out of module directory to prevent blown stack by recursive module
-  # lookup.
-  - cd ..
-
-  # Create database.
-  - mysql -e "create database $MODULE"
-  # Export database variable for kernel tests.
-  - export SIMPLETEST_DB=mysql://root:@127.0.0.1/$MODULE
-
-  # Download Drupal 8 core from the Github mirror because it is faster.
-  - travis_retry git clone --branch $DRUPAL_CORE --depth 1 https://github.com/drupal/drupal.git
-  - cd drupal
-  # Store the path to Drupal root.
-  - DRUPAL_ROOT=$(pwd)
-  - echo $DRUPAL_ROOT
-
-  # Make a directory for module and copy the built source into it.
-  - mkdir $DRUPAL_ROOT/modules/$MODULE
-  - cp -R $TRAVIS_BUILD_DIR/* $DRUPAL_ROOT/modules/$MODULE/
-
-  # Install dependencies.
-  - travis_retry git clone --branch 8.x-3.x --depth 1 https://github.com/fago/rules.git modules/rules
-  - travis_retry git clone --branch 8.x-1.x --depth 1 http://git.drupal.org/project/devel.git modules/devel
-  - travis_retry git clone --branch 8.x-1.x --depth 1 http://git.drupal.org/project/typed_data.git modules/typed_data
-
-  # Run composer install for Drupal 8.1 and up. We need an up-to-date composer
-  # when installing Drupal 8.1.
-  - travis_retry composer self-update && travis_retry composer install
-
-  # Coder is already installed as part of composer install. We just need to set
-  # the installed_paths to pick up the Drupal standards.
-  - $DRUPAL_ROOT/vendor/bin/phpcs --config-set installed_paths $DRUPAL_ROOT/vendor/drupal/coder/coder_sniffer
-
-  # Start a web server on port 8888, run in the background.
-  - php -S localhost:8888 &
-
-  # Export web server URL for browser tests.
-  - export SIMPLETEST_BASE_URL=http://localhost:8888
-
-script:
-  # Run the PHPUnit tests.
-  - ./vendor/bin/phpunit -c ./core/phpunit.xml.dist ./modules/$MODULE/tests/
-
-  # Change directory to our module.
-  - cd $DRUPAL_ROOT/modules/$MODULE
-
-  # Check for coding standards. First list all the sniffs to be used.
-  - $DRUPAL_ROOT/vendor/bin/phpcs -e
-
-  # Show the coding standards violations in detail.
-  - $DRUPAL_ROOT/vendor/bin/phpcs --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1
-
-  # Run again to give a summary and total count.
-  - $DRUPAL_ROOT/vendor/bin/phpcs --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 --report=summary
diff --git a/modules/scheduler/LICENSE.txt b/modules/scheduler/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/scheduler/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/scheduler/README.md b/modules/scheduler/README.md
deleted file mode 100644
index 5849071..0000000
--- a/modules/scheduler/README.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# Scheduler
-
-[![Build Status](https://travis-ci.org/jonathan1055/scheduler.svg?branch=8.x-1.x)](https://travis-ci.org/jonathan1055/scheduler)
-
-Scheduler gives content editors the ability to schedule nodes to be published
-and unpublished at specified dates and times in the future.
-
-Scheduler provides hooks and events for third-party modules to interact with
-the processing during node edit and during cron publishing and unpublishing.
-
-For a fuller description of the module, visit the [project page on Drupal.org](https://drupal.org/project/scheduler)
-
-## Requirements
-
- * Scheduler uses the following Drupal 8 Core components:
-     Actions, Datetime, Field, Node, Text, Filter, User, System, Views.
-
- * There are no special requirements outside core.
-
-## Integration with other modules
-
- * Rules (https://www.drupal.org/project/rules):
-     Scheduler provides actions, conditions and events which can be used in
-     Rules to build additional functionality.
-
- * Token (https://www.drupal.org/project/token):
-     Scheduler provides tokens for the two scheduling dates.
-
- * Devel (https://www.drupal.org/project/devel):
-     When generating new test content via Devel Generate, Scheduler can add
-     publishing dates automatically.
-
-## Installation
-
- * Install as you would normally install a contributed Drupal module. See:
-     https://drupal.org/documentation/install/modules-themes/modules-8
-     for further information.
-
-## Configuration
-
- * Configure user permissions via url /admin/people/permissions#module-scheduler
-   or Administration » People » Permissions
-
-   - View scheduled content list
-
-     Users can always see their own scheduled content, via a tab on their user
-     page. This permissions grants additional authority to see the full list of
-     scheduled content by any author, providing the user also has the core
-     permission 'access content overview'.
-
-   - Schedule content publication
-
-     Users with this permission can enter dates and times for publishing and/or
-     unpublishing, when editing nodes of types which are Scheduler-enabled.
-
-   - Administer scheduler
-
-     This permission allows the user to alter all Scheduler settings. It should
-     therefore only be given to trusted admin roles.
-
- * Configure the Scheduler global options via /admin/config/content/scheduler
-   or Administration » Configuration » Content Authoring
-
-   - Basic settings for date format, allowing date only, setting default time.
-
-   - Lightweight Cron, which gives sites admins the granularity to run
-     Scheduler's functions only, on more frequent crontab jobs.
-
- * Configure the Scheduler settings per content type via /admin/structure/types
-     or Administration » Structure » Content Types » Edit
-
-## Troubleshooting
-
- * To submit bug reports and feature requests use
-     https://drupal.org/project/issues/scheduler
-
- * To get help with crontab jobs, see https://drupal.org/cron
-
-## Maintainers
-
-Current maintainers:
-- Pieter Frenssen  2014(6.x)-           https://www.drupal.org/u/pfrenssen
-- Jonathan Smith   2013(6.x)-           https://www.drupal.org/u/jonathan1055
-
-Previous maintainers:
-- Rick Manelius    2013(6.x)-2014(7.x)  https://www.drupal.org/u/rickmanelius
-- Eric Schaefer    2008(5.x)-2013(7.x)  https://www.drupal.org/u/eric-schaefer
-- Sami Kimini      2008(5.x)            https://www.drupal.org/u/skiminki
-- Ted Serbinski    2007(4.7)            https://www.drupal.org/u/m3avrck
-- Andy Kirkham     2006(4.7)-2008(6.x)  https://www.drupal.org/u/ajk
-- David Norman     2006(4.x)            https://www.drupal.org/u/deekayen
-- Tom Dobes        2004(4.x)            https://www.drupal.org/user/4179
-- Gábor Hojtsy	   2003(4.3)-2005(5.x)  https://www.drupal.org/u/gábor-hojtsy
-- Moshe Weitzman   2003(4.2)-2006(4.6)  https://www.drupal.org/u/moshe-weitzman
diff --git a/modules/scheduler/composer.json b/modules/scheduler/composer.json
deleted file mode 100644
index 0085b59..0000000
--- a/modules/scheduler/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "drupal/scheduler",
-  "description": "Automatically publish and unpublish content at specified dates and times.",
-  "type": "drupal-module",
-  "homepage": "https://drupal.org/project/scheduler",
-  "authors": [
-    {
-      "name": "Eric Schaefer (Eric Schaefer)",
-      "homepage": "https://www.drupal.org/u/eric-schaefer",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Jonathan Smith (jonathan1055)",
-      "homepage": "https://www.drupal.org/u/jonathan1055",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Pieter Frenssen (pfrenssen)",
-      "homepage": "https://www.drupal.org/u/pfrenssen",
-      "role": "Maintainer"
-    },
-    {
-      "name": "Rick Manelius (rickmanelius)",
-      "homepage": "https://www.drupal.org/u/rickmanelius",
-      "role": "Maintainer"
-    }
-  ],
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/scheduler",
-    "source": "http://cgit.drupalcode.org/scheduler"
-  },
-  "license": "GPL-2.0+"
-}
diff --git a/modules/scheduler/config/install/scheduler.settings.yml b/modules/scheduler/config/install/scheduler.settings.yml
deleted file mode 100644
index 4c82158..0000000
--- a/modules/scheduler/config/install/scheduler.settings.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-allow_date_only: false
-date_format: 'Y-m-d H:i:s'
-date_letters: 'djmnFMyY'
-date_only_format: 'Y-m-d'
-default_expand_fieldset: 'when_required'
-default_fields_display_mode: 'vertical_tab'
-default_publish_enable: false
-default_publish_past_date: 'error'
-default_publish_required: false
-default_publish_revision: false
-default_publish_touch: false
-default_time: '00:00:00'
-default_unpublish_enable: false
-default_unpublish_required: false
-default_unpublish_revision: false
-lightweight_cron_access_key: ''
-log: true
-time_letters: 'hHgGisaA'
-time_only_format: 'H:i:s'
diff --git a/modules/scheduler/config/install/views.view.scheduler_scheduled_content.yml b/modules/scheduler/config/install/views.view.scheduler_scheduled_content.yml
deleted file mode 100644
index 2b1c39d..0000000
--- a/modules/scheduler/config/install/views.view.scheduler_scheduled_content.yml
+++ /dev/null
@@ -1,852 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - scheduler
-    - user
-id: scheduler_scheduled_content
-label: 'Scheduled content'
-module: node
-description: 'Find and manage scheduled content.'
-tag: default
-base_table: node_field_data
-base_field: nid
-core: 8.x
-display:
-  default:
-    display_options:
-      access:
-        type: scheduler
-      cache:
-        type: tag
-      query:
-        type: views_query
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: full
-        options:
-          items_per_page: 50
-          tags:
-            previous: '‹ previous'
-            next: 'next ›'
-            first: '« first'
-            last: 'last »'
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: true
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            node_bulk_form: node_bulk_form
-            title: title
-            type: type
-            name: name
-            status: status
-            publish_on: publish_on
-            unpublish_on: unpublish_on
-            operations: operations
-          info:
-            node_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            title:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            publish_on:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            unpublish_on:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            operations:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: true
-      row:
-        type: fields
-      fields:
-        node_bulk_form:
-          id: node_bulk_form
-          table: node
-          field: node_bulk_form
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-          element_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          plugin_id: node_bulk_form
-          entity_type: node
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-          element_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          entity_type: node
-          entity_field: title
-          type: string
-          settings:
-            link_to_entity: true
-          plugin_id: field
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Content Type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          entity_type: node
-          entity_field: type
-          plugin_id: field
-        name:
-          id: name
-          table: users_field_data
-          field: name
-          relationship: uid
-          label: Author
-          exclude: false
-          alter:
-            alter_text: false
-          element_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          plugin_id: field
-          type: user_name
-          entity_type: user
-          entity_field: name
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          label: Status
-          exclude: false
-          alter:
-            alter_text: false
-          element_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: boolean
-          settings:
-            format: custom
-            format_custom_true: Published
-            format_custom_false: Unpublished
-          plugin_id: field
-          entity_type: node
-          entity_field: status
-        publish_on:
-          id: publish_on
-          table: node_field_data
-          field: publish_on
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Publish on'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          date_format: short
-          custom_date_format: ''
-          timezone: ''
-          entity_type: node
-          entity_field: publish_on
-          plugin_id: date
-        unpublish_on:
-          id: unpublish_on
-          table: node_field_data
-          field: unpublish_on
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Unpublish on'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          date_format: short
-          custom_date_format: ''
-          timezone: ''
-          entity_type: node
-          entity_field: unpublish_on
-          plugin_id: date
-        operations:
-          id: operations
-          table: node
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-          plugin_id: entity_operations
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: true
-          expose:
-            operator_id: ''
-            label: Status
-            description: ''
-            use_operator: false
-            operator: status_op
-            identifier: status
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: true
-          group_info:
-            label: 'Published status'
-            description: ''
-            identifier: status
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1:
-                title: Published
-                operator: '='
-                value: '1'
-              2:
-                title: Unpublished
-                operator: '='
-                value: '0'
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: type_op
-            label: Type
-            description: ''
-            use_operator: false
-            operator: type_op
-            identifier: type
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          plugin_id: bundle
-          entity_type: node
-          entity_field: type
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: title_op
-            label: Title
-            description: ''
-            use_operator: false
-            operator: title_op
-            identifier: title
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          plugin_id: string
-          entity_type: node
-          entity_field: title
-        langcode:
-          id: langcode
-          table: node_field_data
-          field: langcode
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: langcode_op
-            label: Language
-            description: ''
-            use_operator: false
-            operator: langcode_op
-            identifier: langcode
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          plugin_id: language
-          entity_type: node
-          entity_field: langcode
-        publish_on:
-          id: publish_on
-          table: node_field_data
-          field: publish_on
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: 'not empty'
-          value:
-            min: ''
-            max: ''
-            value: ''
-            type: date
-          group: 2
-          exposed: false
-          expose:
-            operator_id: publish_on_op
-            label: 'Publish on'
-            description: ''
-            use_operator: true
-            operator: publish_on_op
-            identifier: publish_on
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: 'Publish on'
-            description: null
-            identifier: publish_on
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1: {  }
-              2: {  }
-              3: {  }
-          entity_type: node
-          entity_field: publish_on
-          plugin_id: date
-        unpublish_on:
-          id: unpublish_on
-          table: node_field_data
-          field: unpublish_on
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: 'not empty'
-          value:
-            min: ''
-            max: ''
-            value: ''
-            type: date
-          group: 2
-          exposed: false
-          expose:
-            operator_id: unpublish_on_op
-            label: 'Unpublish on'
-            description: ''
-            use_operator: false
-            operator: unpublish_on_op
-            identifier: unpublish_on
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          entity_type: node
-          entity_field: unpublish_on
-          plugin_id: date
-      sorts: {  }
-      title: 'Scheduled Content'
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content: 'No scheduled content.'
-          plugin_id: text_custom
-      arguments: {  }
-      relationships:
-        uid:
-          id: uid
-          table: node_field_data
-          field: uid
-          admin_label: author
-          required: true
-          plugin_id: standard
-      show_admin_links: false
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-          2: OR
-      display_extenders: {  }
-    display_plugin: default
-    display_title: Master
-    id: default
-    position: 0
-    cache_metadata:
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-      cacheable: false
-      max-age: 0
-      tags: {  }
-  overview:
-    display_options:
-      path: admin/content/scheduled
-      menu:
-        type: tab
-        title: Scheduled
-        description: ''
-        parent: system.admin_content
-        weight: -10
-        context: '0'
-        menu_name: admin
-      tab_options:
-        type: normal
-        title: Content
-        description: 'Find and manage scheduled content'
-        menu_name: admin
-        weight: -10
-      display_extenders: {  }
-      display_description: 'Overview of all scheduled content, as a tab on main ''content admin'' page'
-    display_plugin: page
-    display_title: 'Content Overview'
-    id: overview
-    position: 1
-    cache_metadata:
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-      cacheable: false
-      max-age: 0
-      tags: {  }
-  user_page:
-    display_options:
-      path: user/%user/scheduled
-      menu:
-        type: tab
-        title: Scheduled
-        description: ''
-        parent: system.admin_content
-        weight: -10
-        context: '0'
-        menu_name: admin
-      tab_options:
-        type: normal
-        title: Content
-        description: 'Find and manage scheduled content'
-        menu_name: admin
-        weight: -10
-      display_extenders: {  }
-      display_description: 'Scheduled content tab on user profile, showing just that user''s scheduled content'
-      defaults:
-        filters: true
-        filter_groups: true
-        arguments: false
-        access: true
-        empty: false
-      arguments:
-        uid:
-          id: uid
-          table: node_field_data
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          default_action: empty
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            items_per_page: 25
-            override: false
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-          entity_type: node
-          entity_field: uid
-          plugin_id: numeric
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: true
-          content: 'No scheduled content for user {{ arguments.uid }}'
-          plugin_id: text_custom
-    display_plugin: page
-    display_title: 'User profile tab'
-    id: user_page
-    position: 2
-    cache_metadata:
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-      cacheable: false
-      max-age: 0
-      tags: {  }
diff --git a/modules/scheduler/config/schema/scheduler.schema.yml b/modules/scheduler/config/schema/scheduler.schema.yml
deleted file mode 100644
index 10ee7b0..0000000
--- a/modules/scheduler/config/schema/scheduler.schema.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-# Schema for Scheduler module configuration.
-
-scheduler.settings:
-  type: config_object
-  label: 'Scheduler settings'
-  mapping:
-    allow_date_only:
-      type: boolean
-      label: 'Allow date-only input with time taken from default time setting'
-    date_format:
-      type: string
-      label: 'Full date and time format'
-    date_letters:
-      type: string
-      label: 'The set of PHP date letters allowed in the Scheduler date format'
-    date_only_format:
-      type: string
-      label: 'Date part of the full format'
-    default_expand_fieldset:
-      type: string
-      label: 'Default value for nodetype setting expand_fieldset'
-    default_fields_display_mode:
-      type: string
-      label: 'Default value for nodetype setting fields_display_mode'
-    default_publish_enable:
-      type: boolean
-      label: 'Default value for nodetype setting publish_enable'
-    default_publish_past_date:
-      type: string
-      label: 'Default value for nodetype setting publish_past_date'
-    default_publish_required:
-      type: boolean
-      label: 'Default value for nodetype setting publish_required'
-    default_publish_revision:
-      type: boolean
-      label: 'Default value for nodetype setting publish_revision'
-    default_publish_touch:
-      type: boolean
-      label: 'Default value for nodetype setting publish_touch'
-    default_time:
-      type: string
-      label: 'Default Scheduling Time. This is used with the option to allow date only'
-    default_unpublish_enable:
-      type: boolean
-      label: 'Default value for nodetype setting unpublish_enable'
-    default_unpublish_required:
-      type: boolean
-      label: 'Default value for nodetype setting unpublish_required'
-    default_unpublish_revision:
-      type: boolean
-      label: 'Default value for nodetype setting unpublish_revision'
-    lightweight_cron_access_key:
-      type: string
-      label: 'Lightweight cron access key'
-    log:
-      type: boolean
-      label: 'Log every Scheduler lightweight cron activation and completion message'
-    time_letters:
-      type: string
-      label: 'The set of PHP time letters allowed in the Scheduler time format'
-    time_only_format:
-      type: string
-      label: 'Time part of the full format'
-
-node.type.*.third_party.scheduler:
-  type: mapping
-  label: 'Scheduler content type settings'
-  mapping:
-    expand_fieldset:
-      type: string
-      label: 'Conditions under which to expand the date input fieldset or vertical tab'
-    fields_display_mode:
-      type: string
-      label: 'The way the scheduling fields are displayed in the node form'
-    publish_enable:
-      type: boolean
-      label: 'Enable scheduled publishing'
-    publish_past_date:
-      type: string
-      label: 'Action to be taken for publication dates in the past'
-    publish_required:
-      type: boolean
-      label: 'Require scheduled publishing'
-    publish_revision:
-      type: boolean
-      label: 'Create a new revision on publishing'
-    publish_touch:
-      type: boolean
-      label: 'Change content creation time to match the scheduled publish time'
-    unpublish_enable:
-      type: boolean
-      label: 'Enable scheduled unpublishing'
-    unpublish_required:
-      type: boolean
-      label: 'Require scheduled unpublishing'
-    unpublish_revision:
-      type: boolean
-      label: 'Create a new revision on unpublishing'
diff --git a/modules/scheduler/js/scheduler_vertical_tabs.js b/modules/scheduler/js/scheduler_vertical_tabs.js
deleted file mode 100644
index d090182..0000000
--- a/modules/scheduler/js/scheduler_vertical_tabs.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file
- * jQuery to provide summary information inside vertical tabs.
- */
-
-(function ($) {
-
-  'use strict';
-
-  /**
-   * Provide summary information for vertical tabs.
-   */
-  Drupal.behaviors.scheduler_settings = {
-    attach: function (context) {
-
-      // Provide summary when editing a node.
-      $('details#edit-scheduler-settings', context).drupalSetSummary(function (context) {
-        var vals = [];
-        if ($('#edit-publish-on-0-value-date').val()) {
-          vals.push(Drupal.t('Scheduled for publishing'));
-        }
-        if ($('#edit-unpublish-on-0-value-date').val()) {
-          vals.push(Drupal.t('Scheduled for unpublishing'));
-        }
-        if (!vals.length) {
-          vals.push(Drupal.t('Not scheduled'));
-        }
-        return vals.join('<br/>');
-      });
-
-      // Provide summary during content type configuration.
-      $('#edit-scheduler', context).drupalSetSummary(function (context) {
-        var vals = [];
-        if ($('#edit-scheduler-publish-enable', context).is(':checked')) {
-          vals.push(Drupal.t('Publishing enabled'));
-        }
-        if ($('#edit-scheduler-unpublish-enable', context).is(':checked')) {
-          vals.push(Drupal.t('Unpublishing enabled'));
-        }
-        return vals.join('<br/>');
-      });
-    }
-  };
-
-})(jQuery);
diff --git a/modules/scheduler/phpcs.xml.dist b/modules/scheduler/phpcs.xml.dist
deleted file mode 100644
index 5d0aea3..0000000
--- a/modules/scheduler/phpcs.xml.dist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset name="scheduler">
-  <description>Default PHP CodeSniffer configuration for Scheduler.</description>
-  <file>.</file>
-
-  <!-- Initially include all Drupal and DrupalPractice sniffs. -->
-  <rule ref="Drupal"/>
-  <rule ref="DrupalPractice"/>
-
-  <!-- Use 's' to print the full sniff name in the report. -->
-  <arg value="s"/>
-  <arg value="-colors"/>
-  <arg name="report-width" value="130"/>
-
-  <rule ref="Drupal.Files.TxtFileLineLength.TooLong">
-    <!-- Do not run this sniff on README.md as the file has long markup lines.
-         @todo These are now allowed in the latest dev version of Coder, and
-         this exclusion can be removed when Coder 8.x-2.13 is released. -->
-    <exclude-pattern>README.md</exclude-pattern>
-  </rule>
-
-  <rule ref="DrupalPractice">
-    <!-- Allow empty lines after comments, we don't like this rule. -->
-    <exclude name="DrupalPractice.Commenting.CommentEmptyLine"/>
-  </rule>
-
-</ruleset>
diff --git a/modules/scheduler/plugins/content_types/scheduler_form_pane.inc b/modules/scheduler/plugins/content_types/scheduler_form_pane.inc
deleted file mode 100644
index 73fa135..0000000
--- a/modules/scheduler/plugins/content_types/scheduler_form_pane.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * @file
- * Scheduling options for node forms.
- *
- * This content type contains the publish and unpublish scheduling date fields.
- */
-
-use Drupal\Core\Form\FormStateInterface;
-
-$plugin = [
-  'single' => TRUE,
-  'edit form' => 'scheduler_form_pane_node_form_menu_content_type_edit_form',
-  'render callback' => 'scheduler_form_pane_content_type_render',
-  'title' => t('Node form scheduler'),
-  'icon' => drupal_get_path('module', 'ctools') . '/plugins/content_types/node_form/icon_node_form.png',
-  'description' => t('Scheduler date options on the Node form.'),
-  'required context' => new ctools_context_required(t('Form'), 'node_form'),
-  'category' => t('Form'),
-];
-
-/**
- * Content type render callback.
- */
-function scheduler_form_pane_content_type_render($subtype, $conf, $panel_args, &$context) {
-  $block = new stdClass();
-  $block->module = 'node_form';
-  $block->title = t('Scheduler options');
-  $block->delta = 'scheduler-options';
-
-  if (isset($context->form)) {
-    if (isset($context->form['scheduler_settings'])) {
-      // Lift the form elements from the original form and make sure it renders.
-      $block->content['scheduler_settings'] = $context->form['scheduler_settings'];
-      unset($block->content['scheduler_settings']['#pre_render']);
-      unset($block->content['scheduler_settings']['#theme_wrappers']);
-      $block->content['scheduler_settings']['#type'] = '';
-
-      // Deny access on the original form element rather than removing so that
-      // vertical tabs doesn't clone it. I think this is due to references.
-      $context->form['scheduler_settings']['#access'] = FALSE;
-    }
-  }
-  else {
-    // Display placeholder information.
-    $block->content = t('Scheduler options');
-  }
-  return $block;
-}
-
-/**
- * Content type form callback.
- */
-function scheduler_form_pane_node_form_menu_content_type_edit_form(array $form, FormStateInterface $form_state) {
-  return $form;
-}
diff --git a/modules/scheduler/scheduler.admin.inc b/modules/scheduler/scheduler.admin.inc
deleted file mode 100644
index 94fb146..0000000
--- a/modules/scheduler/scheduler.admin.inc
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-/**
- * @file
- * Administration forms for the Scheduler module.
- */
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\node\NodeTypeInterface;
-
-/**
- * Helper function for the real hook_form_node_type_form_alter().
- *
- * @see scheduler_form_node_type_form_alter()
- */
-function _scheduler_form_node_type_form_alter(array &$form, FormStateInterface $form_state) {
-  $config = \Drupal::config('scheduler.settings');
-
-  /** @var \Drupal\node\NodeTypeInterface $type */
-  $type = $form_state->getFormObject()->getEntity();
-
-  $form['#attached']['library'][] = 'scheduler/admin';
-  $form['#attached']['library'][] = 'scheduler/vertical-tabs';
-
-  $form['scheduler'] = [
-    '#type' => 'details',
-    '#title' => t('Scheduler'),
-    '#weight' => 35,
-    '#group' => 'additional_settings',
-  ];
-
-  // Publishing options.
-  $form['scheduler']['publish'] = [
-    '#type' => 'details',
-    '#title' => t('Publishing'),
-    '#weight' => 1,
-    '#group' => 'scheduler',
-    '#open' => TRUE,
-  ];
-  $form['scheduler']['publish']['scheduler_publish_enable'] = [
-    '#type' => 'checkbox',
-    '#title' => t('Enable scheduled publishing for this content type'),
-    '#default_value' => $type->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable')),
-  ];
-  $form['scheduler']['publish']['scheduler_publish_touch'] = [
-    '#type' => 'checkbox',
-    '#title' => t('Change content creation time to match the scheduled publish time'),
-    '#default_value' => $type->getThirdPartySetting('scheduler', 'publish_touch', $config->get('default_publish_touch')),
-    '#states' => [
-      'visible' => [
-        ':input[name="scheduler_publish_enable"]' => ['checked' => TRUE],
-      ],
-    ],
-  ];
-  $form['scheduler']['publish']['scheduler_publish_required'] = [
-    '#type' => 'checkbox',
-    '#title' => t('Require scheduled publishing'),
-    '#default_value' => $type->getThirdPartySetting('scheduler', 'publish_required', $config->get('default_publish_required')),
-    '#states' => [
-      'visible' => [
-        ':input[name="scheduler_publish_enable"]' => ['checked' => TRUE],
-      ],
-    ],
-  ];
-  $form['scheduler']['publish']['scheduler_publish_revision'] = [
-    '#type' => 'checkbox',
-    '#title' => t('Create a new revision on publishing'),
-    '#default_value' => $type->getThirdPartySetting('scheduler', 'publish_revision', $config->get('default_publish_revision')),
-    '#states' => [
-      'visible' => [
-        ':input[name="scheduler_publish_enable"]' => ['checked' => TRUE],
-      ],
-    ],
-  ];
-  $form['scheduler']['publish']['advanced'] = [
-    '#type' => 'details',
-    '#title' => t('Advanced options'),
-    '#open' => FALSE,
-    '#states' => [
-      'visible' => [
-        ':input[name="scheduler_publish_enable"]' => ['checked' => TRUE],
-      ],
-    ],
-  ];
-  $form['scheduler']['publish']['advanced']['scheduler_publish_past_date'] = [
-    '#type' => 'radios',
-    '#title' => t('Action to be taken for publication dates in the past'),
-    '#default_value' => $type->getThirdPartySetting('scheduler', 'publish_past_date', $config->get('default_publish_past_date')),
-    '#options' => [
-      'error' => t('Display an error message - do not allow dates in the past'),
-      'publish' => t('Publish the content immediately after saving'),
-      'schedule' => t('Schedule the content for publication on the next cron run'),
-    ],
-  ];
-
-  // Unpublishing options.
-  $form['scheduler']['unpublish'] = [
-    '#type' => 'details',
-    '#title' => t('Unpublishing'),
-    '#weight' => 2,
-    '#group' => 'scheduler',
-    '#open' => TRUE,
-  ];
-  $form['scheduler']['unpublish']['scheduler_unpublish_enable'] = [
-    '#type' => 'checkbox',
-    '#title' => t('Enable scheduled unpublishing for this content type'),
-    '#default_value' => $type->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable')),
-  ];
-  $form['scheduler']['unpublish']['scheduler_unpublish_required'] = [
-    '#type' => 'checkbox',
-    '#title' => t('Require scheduled unpublishing'),
-    '#default_value' => $type->getThirdPartySetting('scheduler', 'unpublish_required', $config->get('default_unpublish_required')),
-    '#states' => [
-      'visible' => [
-        ':input[name="scheduler_unpublish_enable"]' => ['checked' => TRUE],
-      ],
-    ],
-  ];
-  $form['scheduler']['unpublish']['scheduler_unpublish_revision'] = [
-    '#type' => 'checkbox',
-    '#title' => t('Create a new revision on unpublishing'),
-    '#default_value' => $type->getThirdPartySetting('scheduler', 'unpublish_revision', $config->get('default_unpublish_revision')),
-    '#states' => [
-      'visible' => [
-        ':input[name="scheduler_unpublish_enable"]' => ['checked' => TRUE],
-      ],
-    ],
-  ];
-
-  // The 'node_edit_layout' fieldset contains options to alter the layout of
-  // node edit pages.
-  $form['scheduler']['node_edit_layout'] = [
-    '#type' => 'details',
-    '#title' => t('Node edit page layout'),
-    '#weight' => 3,
-    '#group' => 'scheduler',
-    // The #states processing only caters for AND and does not do OR. So to set
-    // the state to visible if either of the boxes are ticked we use the fact
-    // that logical 'X = A or B' is equivalent to 'not X = not A and not B'.
-    '#states' => [
-      '!visible' => [
-        ':input[name="scheduler_publish_enable"]' => ['!checked' => TRUE],
-        ':input[name="scheduler_unpublish_enable"]' => ['!checked' => TRUE],
-      ],
-    ],
-  ];
-  // @todo Worthwhile to port this to D8 now form displays are configurable?
-  $form['scheduler']['node_edit_layout']['scheduler_fields_display_mode'] = [
-    '#type' => 'radios',
-    '#title' => t('Display scheduling options as'),
-    '#default_value' => $type->getThirdPartySetting('scheduler', 'fields_display_mode', $config->get('default_fields_display_mode')),
-    '#options' => [
-      'vertical_tab' => t('Vertical tab'),
-      'fieldset' => t('Separate fieldset'),
-    ],
-    '#description' => t('Use this option to specify how the scheduling options will be displayed when editing a node.'),
-  ];
-  $form['scheduler']['node_edit_layout']['scheduler_expand_fieldset'] = [
-    '#type' => 'radios',
-    '#title' => t('Expand fieldset or vertical tab'),
-    '#default_value' => $type->getThirdPartySetting('scheduler', 'expand_fieldset', $config->get('default_expand_fieldset')),
-    '#options' => [
-      'when_required' => t('Expand only when a scheduled date exists or when a date is required'),
-      'always' => t('Always open the fieldset or vertical tab'),
-    ],
-  ];
-
-  $form['#entity_builders'][] = 'scheduler_form_node_type_form_builder';
-}
-
-/**
- * Entity builder for the node type form with scheduler options.
- */
-function scheduler_form_node_type_form_builder($entity_type, NodeTypeInterface $type, &$form, FormStateInterface $form_state) {
-  $type->setThirdPartySetting('scheduler', 'expand_fieldset', $form_state->getValue('scheduler_expand_fieldset'));
-  $type->setThirdPartySetting('scheduler', 'fields_display_mode', $form_state->getValue('scheduler_fields_display_mode'));
-  $type->setThirdPartySetting('scheduler', 'publish_enable', $form_state->getValue('scheduler_publish_enable'));
-  $type->setThirdPartySetting('scheduler', 'publish_past_date', $form_state->getValue('scheduler_publish_past_date'));
-  $type->setThirdPartySetting('scheduler', 'publish_required', $form_state->getValue('scheduler_publish_required'));
-  $type->setThirdPartySetting('scheduler', 'publish_revision', $form_state->getValue('scheduler_publish_revision'));
-  $type->setThirdPartySetting('scheduler', 'publish_touch', $form_state->getValue('scheduler_publish_touch'));
-  $type->setThirdPartySetting('scheduler', 'unpublish_enable', $form_state->getValue('scheduler_unpublish_enable'));
-  $type->setThirdPartySetting('scheduler', 'unpublish_required', $form_state->getValue('scheduler_unpublish_required'));
-  $type->setThirdPartySetting('scheduler', 'unpublish_revision', $form_state->getValue('scheduler_unpublish_revision'));
-}
diff --git a/modules/scheduler/scheduler.api.php b/modules/scheduler/scheduler.api.php
deleted file mode 100644
index e55004c..0000000
--- a/modules/scheduler/scheduler.api.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * @file
- * API documentation for the Scheduler module.
- */
-
-/**
- * @addtogroup hooks
- * @{
- */
-
-/**
- * Hook function to add node ids to the list being processed.
- *
- * This hook allows modules to add more node ids into the list being processed
- * in the current cron run. It is invoked during cron runs only. This function
- * is retained for backwards compatibility but is superceded by the more
- * flexible hook_scheduler_nid_list_alter().
- *
- * @param string $action
- *   The action being done to the node - 'publish' or 'unpublish'.
- *
- * @return array
- *   Array of node ids to add to the existing list of nodes to be processed.
- */
-function hook_scheduler_nid_list($action) {
-  $nids = [];
-  // Do some processing to add new node ids into $nids.
-  return $nids;
-}
-
-/**
- * Hook function to manipulate the list of nodes being processed.
- *
- * This hook allows modules to add or remove node ids from the list being
- * processed in the current cron run. It is invoked during cron runs only. It
- * can do everything that hook_scheduler_nid_list() does, plus more.
- *
- * @param array $nids
- *   An array of node ids being processed.
- * @param string $action
- *   The action being done to the node - 'publish' or 'unpublish'.
- *
- * @return array
- *   The full array of node ids to process, adjusted as required.
- */
-function hook_scheduler_nid_list_alter(array &$nids, $action) {
-  // Do some processing to add or remove node ids.
-  return $nids;
-}
-
-/**
- * Hook function to deny or allow a node to be published.
- *
- * This hook gives modules the ability to prevent publication of a node at the
- * scheduled time. The node may be scheduled, and an attempt to publish it will
- * be made during the first cron run after the publishing time. If this hook
- * returns FALSE the node will not be published. Attempts at publishing will
- * continue on each subsequent cron run until this hook returns TRUE.
- *
- * @param \Drupal\node\NodeInterface $node
- *   The scheduled node that is about to be published.
- *
- * @return bool
- *   TRUE if the node can be published, FALSE if it should not be published.
- */
-function hook_scheduler_allow_publishing(NodeInterface $node) {
-  // If there is no 'approved' field do nothing to change the result.
-  if (!isset($node->field_approved)) {
-    $allowed = TRUE;
-  }
-  else {
-    // Prevent publication of nodes that do not have the 'Approved for
-    // publication by the CEO' checkbox ticked.
-    $allowed = !empty($node->field_approved->value);
-
-    // If publication is denied then inform the user why. This message will be
-    // displayed during node edit and save.
-    if (!$allowed) {
-      drupal_set_message(t('The content will only be published after approval by the CEO.'), 'status', FALSE);
-    }
-  }
-
-  return $allowed;
-}
-
-/**
- * Hook function to deny or allow a node to be unpublished.
- *
- * This hook gives modules the ability to prevent unpblication of a node at the
- * scheduled time. The node may be scheduled, and an attempt to unpublish it
- * will be made during the first cron run after the unpublishing time. If this
- * hook returns FALSE the node will not be unpublished. Attempts at unpublishing
- * will continue on each subsequent cron run until this hook returns TRUE.
- *
- * @param \Drupal\node\NodeInterface $node
- *   The scheduled node that is about to be unpublished.
- *
- * @return bool
- *   TRUE if the node can be unpublished, FALSE if it should not be unpublished.
- */
-function hook_scheduler_allow_unpublishing(NodeInterface $node) {
-  $allowed = TRUE;
-
-  // Prevent unpublication of competition entries if not all prizes have been
-  // claimed.
-  if ($node->getType() == 'competition' && $items = $node->field_competition_prizes->getValue()) {
-    $allowed = (bool) count($items);
-
-    // If unpublication is denied then inform the user why. This message will be
-    // displayed during node edit and save.
-    if (!$allowed) {
-      drupal_set_message(t('The competition will only be unpublished after all prizes have been claimed by the winners.'));
-    }
-  }
-
-  return $allowed;
-}
-
-/**
- * @} End of "addtogroup hooks".
- */
diff --git a/modules/scheduler/scheduler.drush.inc b/modules/scheduler/scheduler.drush.inc
deleted file mode 100644
index cba3f47..0000000
--- a/modules/scheduler/scheduler.drush.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file
- * Drush commands for Scheduler.
- */
-
-/**
- * Implements hook_drush_command().
- */
-function scheduler_drush_command() {
-  $items = [];
-
-  $items['scheduler-cron'] = [
-    'description' => 'Lighweight cron to process scheduler tasks.',
-    'core' => ['8+'],
-    'aliases' => ['sch-cron'],
-    'category' => 'scheduler',
-    'options' => [
-      'nomsg' => 'to avoid the "cron completed" message being written to the terminal.',
-    ],
-  ];
-
-  return $items;
-}
-
-/**
- * Run lighweight scheduler cron.
- */
-function drush_scheduler_cron() {
-  \Drupal::service('scheduler.manager')->runLightweightCron();
-  $nomsg = drush_get_option('nomsg', NULL);
-  $nomsg ? NULL : drupal_set_message(t('Scheduler lightweight cron completed'));
-}
diff --git a/modules/scheduler/scheduler.info.yml b/modules/scheduler/scheduler.info.yml
deleted file mode 100644
index f034a76..0000000
--- a/modules/scheduler/scheduler.info.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Scheduler
-type: module
-description: 'Publish and unpublish content automatically on specified dates and times.'
-# core: 8.x
-configure: scheduler.admin_form
-dependencies:
-  - drupal:datetime
-  - drupal:field
-  - drupal:node
-  - drupal:views
-test_dependencies:
-  - devel:devel_generate
-libraries:
-  - scheduler/admin
-  - vertical-tabs
-
-# Information added by Drupal.org packaging script on 2017-11-14
-version: '8.x-1.0'
-core: '8.x'
-project: 'scheduler'
-datestamp: 1510690392
diff --git a/modules/scheduler/scheduler.install b/modules/scheduler/scheduler.install
deleted file mode 100644
index 2e4982b..0000000
--- a/modules/scheduler/scheduler.install
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/**
- * @file
- * Installation file for Scheduler module.
- */
-
-use Drupal\Core\Url;
-
-/**
- * Implements hook_requirements().
- */
-function scheduler_requirements($phase) {
-  $requirements = [];
-
-  // Report server internal clock.
-  if ($phase === 'runtime') {
-    $user = \Drupal::currentUser();
-
-    $now = REQUEST_TIME;
-    $system_date = \Drupal::config('system.date');
-    $date_default_timezone = $system_date->get('timezone.default') ?: date_default_timezone_get();
-    $date_formatter = \Drupal::service('date.formatter');
-
-    $t_options = [
-      // For %utc specify 'GMT' as the timezone (4th parameter) so that no
-      // timezone offset is returned.
-      '%utc' => $date_formatter->format($now, 'custom', 'jS F Y, H:i:s P', 'GMT'),
-      // For %localtime do not specify any timezone parameter so that the user
-      // or site default setting is returned.
-      '%localtime' => $date_formatter->format($now, 'custom', 'jS F Y, H:i:s P T e'),
-      '%daylight_saving' => $date_formatter->format($now, 'custom', 'I') ? t('currently in daylight saving mode') : t('not in daylight saving mode'),
-      '%date_default_timezone' => $date_default_timezone,
-      '%date_default_offset' => $date_formatter->format($now, 'custom', 'P', $date_default_timezone),
-      '%date_default_code' => $date_formatter->format($now, 'custom', 'T', $date_default_timezone),
-      '@account_edit' => Url::fromRoute('entity.user.edit_form', ['user' => $user->id()])->toString(),
-      '@admin_regional_settings' => Url::fromRoute('system.regional_settings')->toString(),
-    ];
-
-    $descriptions = [
-      t('In most cases the server time should match Coordinated Universal Time (UTC) / Greenwich Mean Time (GMT).', $t_options),
-      t('Default timezone: %date_default_timezone (%date_default_code), offset from UTC/GMT by %date_default_offset hours. This timezone can be <a href="@admin_regional_settings">changed by admin users</a> with the appropriate access.', $t_options),
-    ];
-    if ($system_date->get('timezone.user.configurable')) {
-      $descriptions[] = t('Local time: %localtime (%daylight_saving). You can change this via your <a href="@account_edit">user account</a>.', $t_options);
-      if (!$user->getTimezone()) {
-        $descriptions[] = t('Note: The user timezone has not been stored, so defaulting to the website timezone.');
-      }
-    }
-    else {
-      $descriptions[] = t('Your local time is %localtime (%daylight_saving). This is not configurable by you.', $t_options);
-    }
-
-    $requirements['scheduler_timecheck'] = [
-      'title' => t('Scheduler Time Check'),
-      'value' => t('Server time: @utc', [
-        '@utc' => $date_formatter->format($now, 'custom', 'jS F Y, H:i:s P', 'GMT'),
-      ]),
-      'description' => [
-        '#type' => 'inline_template',
-        '#template' => '{{ description|raw }}',
-        '#context' => ['description' => implode('<br />', $descriptions)],
-      ],
-    ];
-  }
-
-  return $requirements;
-}
-
-/**
- * Implements hook_install().
- */
-function scheduler_install() {
-  // Add our base fields to the schema.
-  \Drupal::service('entity.definition_update_manager')->applyUpdates();
-  // Set cron access key value, as this is now required in SchedulerCronForm.
-  $config = \Drupal::service('config.factory')->getEditable('scheduler.settings');
-  $config->set('lightweight_cron_access_key', substr(md5(rand()), 0, 20))
-    ->save();
-}
-
-/**
- * Implements hook_uninstall().
- */
-function scheduler_uninstall() {
-  // Remove our base fields from the schema.
-  \Drupal::service('entity.definition_update_manager')->applyUpdates();
-  // Delete the scheduled content view.
-  \Drupal::configFactory()->getEditable('views.view.scheduler_scheduled_content')->delete();
-}
-
-/**
- * Reset date and time formats to default.
- *
- * @see https://www.drupal.org/node/2799869
- */
-function scheduler_update_8001() {
-  $config = \Drupal::configFactory()->getEditable('scheduler.settings');
-  $config
-    ->set('date_format', 'Y-m-d H:i:s')
-    ->set('date_only_format', 'Y-m-d')
-    ->set('time_only_format', 'H:i:s')
-    ->save();
-  return t('The date and time format has been reset.');
-}
diff --git a/modules/scheduler/scheduler.libraries.yml b/modules/scheduler/scheduler.libraries.yml
deleted file mode 100644
index 87143ee..0000000
--- a/modules/scheduler/scheduler.libraries.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-vertical-tabs:
-  js:
-    js/scheduler_vertical_tabs.js: {}
-  dependencies:
-      - core/jquery
-      - core/drupal.ajax
diff --git a/modules/scheduler/scheduler.links.menu.yml b/modules/scheduler/scheduler.links.menu.yml
deleted file mode 100644
index 59df965..0000000
--- a/modules/scheduler/scheduler.links.menu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-scheduler.admin:
-  route_name: scheduler.admin_form
-  title: Scheduler
-  description: 'Configure settings for scheduled publishing and unpublishing.'
-  parent: system.admin_config_content
diff --git a/modules/scheduler/scheduler.links.task.yml b/modules/scheduler/scheduler.links.task.yml
deleted file mode 100644
index cc7ad74..0000000
--- a/modules/scheduler/scheduler.links.task.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-scheduler.settings_tab:
-  route_name: scheduler.admin_form
-  title: Settings
-  weight: 5
-  base_route: scheduler.admin_form
-
-scheduler.cron_tab:
-  route_name: scheduler.cron_form
-  title: Lightweight cron
-  weight: 10
-  base_route: scheduler.admin_form
diff --git a/modules/scheduler/scheduler.module b/modules/scheduler/scheduler.module
deleted file mode 100644
index 9f86b4d..0000000
--- a/modules/scheduler/scheduler.module
+++ /dev/null
@@ -1,587 +0,0 @@
-<?php
-
-/**
- * @file
- * Scheduler publishes and unpublishes nodes on dates specified by the user.
- */
-
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-use Drupal\node\Entity\NodeType;
-use Drupal\scheduler\SchedulerEvent;
-use Drupal\scheduler\SchedulerEvents;
-
-/**
- * Implements hook_help().
- */
-function scheduler_help($route_name, RouteMatchInterface $route_match) {
-  $output = '';
-  switch ($route_name) {
-    case 'help.page.scheduler':
-      $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Scheduler module provides the functionality for automatic publishing and unpublishing of nodes at specified future dates.') . '</p>';
-      $output .= '<p>' . t('You can read more in the <a href="@readme">readme</a> file or our <a href="@project">project page on Drupal.org</a>.', [
-        '@readme' => $GLOBALS['base_url'] . '/' . drupal_get_path('module', 'scheduler') . '/README.md',
-        '@project' => 'https://drupal.org/project/scheduler',
-      ]) . '</p>';
-      break;
-
-    case 'scheduler.admin_form':
-      $output = '<p>' . t('Some Scheduler options are set for each different content type, and are accessed via the <a href="@link">admin content type</a> list.', ['@link' => Url::fromRoute('entity.node_type.collection')->toString()]) . '</br>';
-      $output .= t('The options and settings below are common to all content types.') . '</p>';
-      break;
-
-    case 'scheduler.cron_form':
-      $base_url = $GLOBALS['base_url'];
-      $access_key = \Drupal::config('scheduler.settings')->get('lightweight_cron_access_key');
-      $cron_url = $base_url . '/scheduler/cron/' . $access_key;
-      $output = '<p>' . t("When you have set up Drupal's standard crontab job cron.php then Scheduler will be executed during each cron run. However, if you would like finer granularity to scheduler, but don't want to run Drupal's cron more often then you can use the lightweight cron handler provided by Scheduler. This is an independent cron job which only runs the scheduler process and does not execute any cron tasks defined by Drupal core or any other modules.") . '</p>';
-      $output .= '<p>' . t("Scheduler's cron is at /scheduler/cron/{access-key} and a sample crontab entry to run scheduler every minute might look like:") . '</p>';
-      $output .= '<code>* * * * * wget -q -O /dev/null "' . $cron_url . '"</code>';
-      $output .= '<p>' . t('or') . '</p>';
-      $output .= '<code>* * * * * curl -s -o /dev/null "' . $cron_url . '"</code><br/><br/>';
-      break;
-
-    default:
-  }
-  return $output;
-}
-
-/**
- * Implements hook_form_FORM_ID_alter() for node_type_form().
- */
-function scheduler_form_node_type_form_alter(array &$form, FormStateInterface $form_state) {
-  // Load the real code only when needed.
-  module_load_include('inc', 'scheduler', 'scheduler.admin');
-  _scheduler_form_node_type_form_alter($form, $form_state);
-}
-
-/**
- * Implements hook_form_FORM_ID_alter() for node_form().
- */
-function scheduler_form_node_form_alter(&$form, FormStateInterface $form_state) {
-  $config = \Drupal::config('scheduler.settings');
-  /** @var \Drupal\node\NodeTypeInterface $type */
-  $type = $form_state->getFormObject()->getEntity()->type->entity;
-  $publishing_enabled = $type->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable'));
-  $unpublishing_enabled = $type->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable'));
-
-  // If neither publishing nor unpublishing are enabled for this node type then
-  // the only thing to do is remove the fields from the form, then exit.
-  if (!$publishing_enabled && !$unpublishing_enabled) {
-    unset($form['publish_on']);
-    unset($form['unpublish_on']);
-    return;
-  }
-
-  $date_only_allowed = $config->get('allow_date_only');
-
-  /* @var $node \Drupal\node\NodeInterface */
-  $node = $form_state->getFormObject()->getEntity();
-
-  // A publish_on date is required if the content type option is set and the
-  // node is being created or it currently has a scheduled publishing date.
-  $publishing_required = $type->getThirdPartySetting('scheduler', 'publish_required', $config->get('default_publish_required'))
-    && ($node->isNew() || (!$node->isPublished() && !empty($node->publish_on->value)));
-
-  // An unpublish_on date is required if the content type option is set and the
-  // node is being created or the current status is published or the node is
-  // scheduled to be published.
-  $unpublishing_required = $type->getThirdPartySetting('scheduler', 'unpublish_required', $config->get('default_unpublish_required')) && ($node->isNew() || $node->isPublished() || !empty($node->publish_on->value));
-
-  // Create a 'details' field group to wrap the scheduling fields, and expand it
-  // if publishing or unpublishing is required, if a date already exists or the
-  // fieldset is configured to be always expanded.
-  $has_data = !empty($node->publish_on->value) || !empty($node->unpublish_on->value);
-  $always_expand = $type->getThirdPartySetting('scheduler', 'expand_fieldset', $config->get('default_expand_fieldset')) === 'always';
-  $expand_details = $publishing_required || $unpublishing_required || $has_data || $always_expand;
-
-  // Create the group for the fields.
-  $form['scheduler_settings'] = [
-    '#type' => 'details',
-    '#title' => t('Scheduling options'),
-    '#open' => $expand_details,
-    '#weight' => 35,
-    '#attributes' => ['class' => ['scheduler-form']],
-    '#optional' => FALSE,
-  ];
-
-  // Attach the fields to group.
-  $form['unpublish_on']['#group'] = 'scheduler_settings';
-  $form['publish_on']['#group'] = 'scheduler_settings';
-
-  // Show the field group as a vertical tab if this option is enabled.
-  $use_vertical_tabs = $type->getThirdPartySetting('scheduler', 'fields_display_mode', $config->get('default_fields_display_mode')) === 'vertical_tab';
-  if ($use_vertical_tabs) {
-    $form['scheduler_settings']['#group'] = 'advanced';
-
-    // Attach the javascript for the vertical tabs.
-    $form['scheduler_settings']['#attached']['library'][] = 'scheduler/vertical-tabs';
-  }
-
-  // Define the descriptions depending on whether the time can be skipped.
-  $date_formatter = \Drupal::service('date.formatter');
-  $descriptions = [];
-  if ($date_only_allowed) {
-    $descriptions['format'] = t('Enter a date. The time part is optional.');
-    // Show the default time so users know what they will get if they do not
-    // enter a time.
-    $default_time = strtotime($config->get('default_time'));
-    $descriptions['default'] = t('The default time is @default_time.', [
-      '@default_time' => $date_formatter->format($default_time, 'custom', 'H:i:s'),
-    ]);
-  }
-  else {
-    $descriptions['format'] = t('Enter a date and time.');
-  }
-
-  if (!$publishing_required) {
-    $descriptions['blank'] = t('Leave the date blank for no scheduled publishing.');
-  }
-
-  $form['publish_on']['#access'] = $publishing_enabled;
-  $form['publish_on']['widget'][0]['value']['#required'] = $publishing_required;
-  $form['publish_on']['widget'][0]['value']['#description'] = Xss::filter(implode(' ', $descriptions));
-
-  if (!$unpublishing_required) {
-    $descriptions['blank'] = t('Leave the date blank for no scheduled unpublishing.');
-  }
-  else {
-    unset($descriptions['blank']);
-  }
-
-  $form['unpublish_on']['#access'] = $unpublishing_enabled;
-  $form['unpublish_on']['widget'][0]['value']['#required'] = $unpublishing_required;
-  $form['unpublish_on']['widget'][0]['value']['#description'] = Xss::filter(implode(' ', $descriptions));
-
-  if (!\Drupal::currentUser()->hasPermission('schedule publishing of nodes')) {
-    // Do not show the scheduler fields for users who do not have permission.
-    $form['scheduler_settings']['#access'] = FALSE;
-
-    // @todo Find a more elegant solution for bypassing the validation of
-    // scheduler fields when the user does not have permission.
-    // @see https://www.drupal.org/node/2651448
-    $form['publish_on']['widget'][0]['value']['#required'] = FALSE;
-    $form['unpublish_on']['widget'][0]['value']['#required'] = FALSE;
-  }
-
-  // Check which widget type is set for the scheduler fields, and give a warning
-  // if the wrong one has been set and provide a hint and link to fix it.
-  $storage_form_display = $form_state->getStorage()['form_display'];
-  $content = $storage_form_display->get('content');
-  $pluginDefinitions = $storage_form_display->get('pluginManager')->getDefinitions();
-  $correct_widget_id = 'datetime_timestamp_no_default';
-  foreach (['publish_on' => $publishing_enabled, 'unpublish_on' => $unpublishing_enabled] as $field => $enabled) {
-    $actual_widget_id = $content[$field]['type'];
-    if ($enabled && $actual_widget_id != $correct_widget_id) {
-      drupal_set_message(t('The widget for field %field is incorrectly set to %wrong. This should be changed to %correct by an admin user via Field UI <a href="@link">content type form display</a> :not_available', [
-        '%field' => (string) $form[$field]['widget']['#title'],
-        '%correct' => (string) $pluginDefinitions[$correct_widget_id]['label'],
-        '%wrong' => (string) $pluginDefinitions[$actual_widget_id]['label'],
-        '@link' => \Drupal::moduleHandler()->moduleExists('field_ui') ? Url::fromRoute('entity.entity_form_display.node.default', ['node_type' => $type->get('type')])->toString() : '#',
-        ':not_available' => \Drupal::moduleHandler()->moduleExists('field_ui') ? '' : ('(' . t('not available') . ')'),
-      ]), 'warning', FALSE);
-    }
-  }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter() for devel_generate_form_content.
- */
-function scheduler_form_devel_generate_form_content_alter(array &$form, FormStateInterface $form_state) {
-  // Add an extra column to the node_types table to show which type are enabled
-  // for scheduled publishing and unpublishing.
-  $publishing_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types('publish'));
-  $unpublishing_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types('unpublish'));
-
-  $form['node_types']['#header']['scheduler'] = t('Scheduler settings');
-
-  foreach (array_keys($form['node_types']['#options']) as $type) {
-    $items = [];
-    if (in_array($type, $publishing_enabled_types)) {
-      $items[] = t('Enabled for publishing');
-    }
-    if (in_array($type, $unpublishing_enabled_types)) {
-      $items[] = t('Enabled for unpublishing');
-    }
-    if (empty($items)) {
-      $scheduler_settings = t('None');
-    }
-    else {
-      $scheduler_settings = [
-        'data' => [
-          '#theme' => 'item_list',
-          '#items' => $items,
-        ],
-      ];
-    }
-    $form['node_types']['#options'][$type]['scheduler'] = $scheduler_settings;
-  }
-
-  // Add form items to specify what proportion of generated nodes should have a
-  // publish-on and unpublish-on date assigned. See hook_node_presave() for the
-  // code which sets the node values.
-  $form['scheduler_publishing'] = [
-    '#type' => 'number',
-    '#title' => t('Publishing date for Scheduler'),
-    '#description' => t('Enter the percentage of randomly selected Scheduler-enabled nodes to be given a publish-on date. Enter 0 for none, 100 for all. The date and time will be random within the range starting at node creation date, up to a time in the future matching the same span as selected above for node creation date.'),
-    '#default_value' => 50,
-    '#required' => TRUE,
-    '#min' => 0,
-    '#max' => 100,
-  ];
-  $form['scheduler_unpublishing'] = [
-    '#type' => 'number',
-    '#title' => t('Unpublishing date for Scheduler'),
-    '#description' => t('Enter the percentage of randomly selected Scheduler-enabled nodes to be given an unpublish-on date. Enter 0 for none, 100 for all. The date and time will be random within the range starting at the later of node creation date and publish-on date, up to a time in the future matching the same span as selected above for node creation date.'),
-    '#default_value' => 50,
-    '#required' => TRUE,
-    '#min' => 0,
-    '#max' => 100,
-  ];
-}
-
-/**
- * Implements hook_entity_base_field_info().
- */
-function scheduler_entity_base_field_info(EntityTypeInterface $entity_type) {
-  if ($entity_type->id() === 'node') {
-    $fields['publish_on'] = BaseFieldDefinition::create('timestamp')
-      ->setLabel(t('Publish on'))
-      ->setDisplayOptions('form', [
-        'type' => 'datetime_timestamp_no_default',
-        'weight' => 30,
-      ])
-      ->setDisplayConfigurable('form', TRUE)
-      ->setTranslatable(TRUE)
-      ->setRevisionable(TRUE)
-      ->addConstraint('SchedulerPublishOn');
-
-    $fields['unpublish_on'] = BaseFieldDefinition::create('timestamp')
-      ->setLabel(t('Unpublish on'))
-      ->setDisplayOptions('form', [
-        'type' => 'datetime_timestamp_no_default',
-        'weight' => 30,
-      ])
-      ->setDisplayConfigurable('form', TRUE)
-      ->setTranslatable(TRUE)
-      ->setRevisionable(TRUE)
-      ->addConstraint('SchedulerUnpublishOn');
-
-    return $fields;
-  }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_view() for node entities.
- */
-function scheduler_node_view(array &$build, EntityInterface $node, EntityViewDisplayInterface $display, $view_mode) {
-  // If the node is going to be unpublished, then add this information to the
-  // header for search engines. Only do this when the current page is the
-  // full-page view of the node.
-  // @see https://googleblog.blogspot.be/2007/07/robots-exclusion-protocol-now-with-even.html
-  if (!empty($node->unpublish_on->value) && node_is_page($node)) {
-    $unavailable_after = date(DATE_RFC850, $node->unpublish_on->value);
-    $build['#attached']['http_header'][] = ['X-Robots-Tag', 'unavailable_after: ' . $unavailable_after];
-  }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_presave() for node entities.
- */
-function scheduler_node_presave(EntityInterface $node) {
-  $config = \Drupal::config('scheduler.settings');
-  $entity = $node->type->entity;
-
-  // If there is no entity object or the class is incorrect then stop here. This
-  // should not really happen but it has been observed, so better to be safe.
-  // @see https://www.drupal.org/node/2902512
-  if (is_null($entity) || !get_class($entity) == 'Drupal\node\Entity\NodeType') {
-    return;
-  };
-
-  // If this node is being created via Devel Generate then set values for the
-  // publish_on and unpublish_on dates as specified in the devel_generate form.
-  if (isset($node->devel_generate)) {
-    static $publishing_enabled_types;
-    static $unpublishing_enabled_types;
-    static $publishing_percent;
-    static $unpublishing_percent;
-    static $time_range;
-
-    if (!isset($publishing_enabled_types)) {
-      $publishing_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types('publish'));
-      $unpublishing_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types('unpublish'));
-      $publishing_percent = $node->devel_generate['scheduler_publishing'];
-      $unpublishing_percent = $node->devel_generate['scheduler_unpublishing'];
-      // Reuse the selected 'node creation' time range for our future date span.
-      $time_range = $node->devel_generate['time_range'];
-    }
-    if ($publishing_percent && in_array($node->getType(), $publishing_enabled_types)) {
-      if (rand(1, 100) <= $publishing_percent) {
-        // Randomly assign a publish_on value in the range starting with the
-        // created date and up to the selected time range in the future.
-        $node->set('publish_on', rand($node->created->value + 1, REQUEST_TIME + $time_range));
-      }
-    }
-    if ($unpublishing_percent && in_array($node->getType(), $unpublishing_enabled_types)) {
-      if (rand(1, 100) <= $unpublishing_percent) {
-        // Randomly assign an unpublish_on value in the range from the later of
-        // created date/publish_on date up to the time range in the future.
-        $node->set('unpublish_on', rand(max($node->created->value, $node->publish_on->value), REQUEST_TIME + $time_range));
-      }
-    }
-  }
-
-  // If the node type is enabled for scheduled publishing and has a publish_on
-  // date then check if publishing is allowed and if the content needs to be
-  // published immediately.
-  if ($entity->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable')) && !empty($node->publish_on->value)) {
-    // Check that other modules allow the action on this node.
-    $publication_allowed = \Drupal::service('scheduler.manager')->isAllowed($node, 'publish');
-
-    // Publish the node immediately if the publication date is in the past.
-    $publish_immediately = $entity->getThirdPartySetting('scheduler', 'publish_past_date', $config->get('default_publish_past_date')) == 'publish';
-
-    if ($publication_allowed && $publish_immediately && $node->publish_on->value <= REQUEST_TIME) {
-      // Trigger the PRE_PUBLISH_INMEDIATELY event so that modules can react
-      // before the node has been published.
-      $event = new SchedulerEvent($node);
-      \Drupal::service('event_dispatcher')->dispatch(SchedulerEvents::PRE_PUBLISH_IMMEDIATELY, $event);
-      $node = $event->getNode();
-
-      // If required, set the created date to match published date.
-      if ($entity->getThirdPartySetting('scheduler', 'publish_touch', $config->get('default_publish_touch'))) {
-        $node->setCreatedTime($node->publish_on->value);
-      }
-      $node->publish_on->value = NULL;
-      $node->setPublished(TRUE);
-
-      // Trigger the PUBLISH_IMMEDIATELY event so that modules can react after
-      // the node has been published.
-      $event = new SchedulerEvent($node);
-      \Drupal::service('event_dispatcher')->dispatch(SchedulerEvents::PUBLISH_IMMEDIATELY, $event);
-      $node = $event->getNode();
-    }
-    else {
-      // Ensure the node is unpublished as it will be published by cron later.
-      $node->setPublished(FALSE);
-
-      // Only inform the user that the node is scheduled if publication has not
-      // been prevented by other modules. Those modules have to display a
-      // message themselves explaining why publication is denied.
-      if ($publication_allowed) {
-        $date_formatter = \Drupal::service('date.formatter');
-        drupal_set_message(t('This post is unpublished and will be published @publish_time.', [
-          '@publish_time' => $date_formatter->format($node->publish_on->value, 'long'),
-        ]), 'status', FALSE);
-      }
-    }
-  }
-
-  if ($entity->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable')) && !empty($node->unpublish_on->value)) {
-    // Scheduler does not do the same 'immediate' processing for unpublishing.
-    // However, the api hook should still be called during presave as there may
-    // be messages to be displayed if the unpublishing will be disallowed later.
-    \Drupal::service('scheduler.manager')->isAllowed($node, 'unpublish');
-  }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_insert() for node entities.
- */
-function scheduler_node_insert(EntityInterface $node) {
-  // Removed RULES code but keep the function. There may be code to add here.
-  // @TODO remove this comment when done. JSS Sep 2016.
-}
-
-/**
- * Implements hook_ENTITY_TYPE_update() for node entities.
- */
-function scheduler_node_update(EntityInterface $node) {
-  // Removed RULES code but keep the function. There may be code to add here.
-  // This function is currently called by actions SetPublishingDate and
-  // SetUnpublishingDate.
-  // @TODO remove this comment when done. JSS Sep 2016.
-}
-
-/**
- * Implements hook_cron().
- */
-function scheduler_cron() {
-  // Use drupal_static so that any function can find out if we are running
-  // Scheduler cron. Set the default value to FALSE, then turn on the flag.
-  // @see scheduler_cron_is_running()
-  $scheduler_cron = &drupal_static(__FUNCTION__, FALSE);
-  $scheduler_cron = TRUE;
-
-  /** @var \Drupal\scheduler\SchedulerManager $scheduler_manager */
-  $scheduler_manager = \Drupal::service('scheduler.manager');
-  $scheduler_manager->publish();
-  $scheduler_manager->unpublish();
-
-  // Scheduler 7.x provided hook_scheduler_api() which has been replaced by
-  // event dispatching in 8.x. Display a warning in the log if any of these
-  // hooks still exist, so that admins and developers are informed.
-  foreach (Drupal::moduleHandler()->getImplementations('scheduler_api') as $module) {
-    \Drupal::logger('scheduler')->warning('Function %function has not been executed. In Drupal 8, implementations of hook_scheduler_api() should be replaced by Scheduler event listeners.', [
-      '%function' => $module . '_scheduler_api',
-    ]);
-  }
-
-  // Reset the static scheduler_cron flag.
-  drupal_static_reset(__FUNCTION__);
-}
-
-/**
- * Return whether Scheduler cron is running.
- *
- * This function can be called from any Scheduler function, from any contrib
- * module or from custom PHP in a view or rule.
- *
- * @return bool
- *   TRUE if scheduler_cron is currently running. FALSE if not.
- */
-function scheduler_cron_is_running() {
-  return drupal_static('scheduler_cron');
-}
-
-/**
- * Implements hook_entity_extra_field_info().
- */
-function scheduler_entity_extra_field_info() {
-  $config = \Drupal::config('scheduler.settings');
-
-  // Expose the Scheduler group on the 'Manage Form Display' tab when editing a
-  // content type. This allows admins to adjust the weight of the group, and it
-  // works for vertical tabs and separate fieldsets.
-  $fields = [];
-  foreach (node_type_get_types() as $type) {
-    $publishing_enabled = $type->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable'));
-    $unpublishing_enabled = $type->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable'));
-
-    if ($publishing_enabled || $unpublishing_enabled) {
-      // Weight 20 puts this below the core fields by default.
-      $fields['node'][$type->get('type')]['form']['scheduler_settings'] = [
-        'label' => t('Scheduler Dates'),
-        'description' => t('Fieldset containing Scheduler Publish-on and Unpublish-on date input fields'),
-        'weight' => 20,
-      ];
-    }
-  }
-  return $fields;
-}
-
-/**
- * Prepares variables for node templates.
- *
- * Makes the publish_on and unpublish_on data available as theme variables.
- *
- * @see template_preprocess_node()
- */
-function scheduler_preprocess_node(&$variables) {
-  $date_formatter = \Drupal::service('date.formatter');
-  /* @var $node \Drupal\node\NodeInterface */
-  $node = $variables['node'];
-  if (!empty($node->publish_on->value) && $node->publish_on->value && is_numeric($node->publish_on->value)) {
-    $variables['publish_on'] = $date_formatter->format($node->publish_on->value, 'long');
-  }
-  if (!empty($node->unpublish_on->value) && $node->unpublish_on->value && is_numeric($node->unpublish_on->value)) {
-    $variables['unpublish_on'] = $date_formatter->format($node->unpublish_on->value, 'long');
-  }
-}
-
-/**
- * Implements hook_feeds_processor_targets_alter().
- *
- * This function exposes publish_on and unpublish_on as mappable targets to the
- * Feeds module.
- *
- * @todo Port to Drupal 8.
- *
- * @see https://www.drupal.org/node/2651354
- */
-function scheduler_feeds_processor_targets_alter(&$targets, $entity_type, $bundle_name) {
-  $config = \Drupal::config('scheduler.settings');
-
-  // Scheduler module only works on nodes.
-  if ($entity_type == 'node') {
-    $publishing_enabled = $entity_type->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable'));
-    $unpublishing_enabled = $entity_type->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable'));
-
-    if ($publishing_enabled) {
-      $targets['publish_on'] = [
-        'name' => t('Scheduler: publish on'),
-        'description' => t('The date when the Scheduler module will publish the node.'),
-        'callback' => 'scheduler_feeds_set_target',
-      ];
-    }
-    if ($unpublishing_enabled) {
-      $targets['unpublish_on'] = [
-        'name' => t('Scheduler: unpublish on'),
-        'description' => t('The date when the Scheduler module will unpublish the node.'),
-        'callback' => 'scheduler_feeds_set_target',
-      ];
-    }
-  }
-}
-
-/**
- * Mapping callback for the Feeds module.
- *
- * @todo Port to Drupal 8.
- *
- * @see https://www.drupal.org/node/2651354
- */
-function scheduler_feeds_set_target($source, $entity, $target, $value, $mapping) {
-  // We expect a string or integer, but can accomodate an array, by taking the
-  // first item. Use trim() so that a string of blanks is reduced to empty.
-  $value = is_array($value) ? trim(reset($value)) : trim($value);
-
-  // Convert input from parser to timestamp form. If $value is empty or blank
-  // then strtotime() must not be used, otherwise it returns the current time.
-  if (!empty($value) && !is_numeric($value)) {
-    if (!$timestamp = strtotime($value)) {
-      throw new FeedsValidationException(
-        // Throw an exception if the date format was not recognized.
-        t('Value %value for @source could not be converted to a valid %target date.', [
-          '@source' => $mapping['source'],
-          '%value' => $value,
-          '%target' => $target,
-        ])
-      );
-    }
-  }
-  else {
-    $timestamp = $value;
-  }
-
-  // If the timestamp is valid then use it to set the target field in the node.
-  if (is_numeric($timestamp) && $timestamp > 0) {
-    $entity->$target = $timestamp;
-  }
-}
-
-/**
- * Returns all content types for which scheduler has been enabled.
- *
- * @param string $action
- *   The action that needs to be checked. Can be 'publish' or 'unpublish'.
- *
- * @return \Drupal\node\NodeTypeInterface[]
- *   Array of NodeTypeInterface objects
- */
-function _scheduler_get_scheduler_enabled_node_types($action) {
-  $config = \Drupal::config('scheduler.settings');
-  $node_types = NodeType::loadMultiple();
-  return array_filter($node_types, function ($bundle) use ($action, $config) {
-    /* @var \Drupal\node\NodeTypeInterface $bundle */
-    return $bundle->getThirdPartySetting('scheduler', $action . '_enable', $config->get('default_' . $action . '_enable'));
-  });
-}
diff --git a/modules/scheduler/scheduler.permissions.yml b/modules/scheduler/scheduler.permissions.yml
deleted file mode 100644
index 5e36688..0000000
--- a/modules/scheduler/scheduler.permissions.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-'administer scheduler':
-  title: 'Administer scheduler'
-  description: 'Configure scheduler date formats, pop-up calendar, default times, lightweight cron'
-'schedule publishing of nodes':
-  title: 'Schedule content publication'
-  description: 'Allows users to set a start and end time for content publication'
-'view scheduled content':
-  title: 'View scheduled content list'
-  description: 'Allows users to see all content which is scheduled.'
diff --git a/modules/scheduler/scheduler.routing.yml b/modules/scheduler/scheduler.routing.yml
deleted file mode 100644
index 33774ef..0000000
--- a/modules/scheduler/scheduler.routing.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-scheduler.admin_form:
-  path: '/admin/config/content/scheduler'
-  defaults:
-    _title: 'Scheduler'
-    _form: '\Drupal\scheduler\Form\SchedulerAdminForm'
-  requirements:
-    _permission: 'administer scheduler'
-
-scheduler.cron_form:
-  path: '/admin/config/content/scheduler/cron'
-  defaults:
-    _title: 'Lightweight cron'
-    _description: 'Configuration form for the lightweight cron.'
-    _form: '\Drupal\scheduler\Form\SchedulerCronForm'
-  requirements:
-    _permission: 'administer scheduler'
-
-scheduler.lightweight_cron:
-  path: '/scheduler/cron/{cron_key}'
-  defaults:
-    _controller: '\Drupal\scheduler\Controller\LightweightCronController::index'
-    _description: 'Run the lightweight cron process'
-    _title: 'Lightweight cron'
-  options:
-    no_cache: TRUE
-  requirements:
-    _custom_access: '\Drupal\scheduler\Controller\LightweightCronController::access'
diff --git a/modules/scheduler/scheduler.services.yml b/modules/scheduler/scheduler.services.yml
deleted file mode 100644
index 00ab742..0000000
--- a/modules/scheduler/scheduler.services.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-services:
-  scheduler.manager:
-    class: Drupal\scheduler\SchedulerManager
-    arguments: ['@date.formatter', '@logger.channel.scheduler', '@module_handler', '@entity.manager', '@config.factory' ]
-  logger.channel.scheduler:
-    class: Drupal\Core\Logger\LoggerChannel
-    factory: logger.factory:get
-    arguments: ['scheduler']
-  access_checker.scheduler_content:
-    class: Drupal\scheduler\Access\ScheduledListAccess
-    arguments: ['@current_route_match']
-    tags:
-      - { name: access_check }
diff --git a/modules/scheduler/scheduler.tokens.inc b/modules/scheduler/scheduler.tokens.inc
deleted file mode 100644
index 550ff60..0000000
--- a/modules/scheduler/scheduler.tokens.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * @file
- * Builds placeholder replacement tokens for node scheduler data.
- */
-
-use Drupal\Core\Render\BubbleableMetadata;
-
-/**
- * Implements hook_token_info().
- */
-function scheduler_token_info() {
-  $info['tokens']['node']['scheduler-publish'] = [
-    'name' => t('Publish on date'),
-    'description' => t("The date the node will be published."),
-    'type' => 'date',
-  ];
-  $info['tokens']['node']['scheduler-unpublish'] = [
-    'name' => t('Unpublish on date'),
-    'description' => t("The date the node will be unpublished."),
-    'type' => 'date',
-  ];
-
-  return $info;
-}
-
-/**
- * Implements hook_tokens().
- */
-function scheduler_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
-  $token_service = \Drupal::token();
-  $date_formatter = \Drupal::service('date.formatter');
-  $language_code = isset($options['language']) ? $options['language']->language : NULL;
-  $replacements = [];
-
-  if ($type == 'node' && !empty($data['node'])) {
-    $node = $data['node'];
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'scheduler-publish':
-          if (isset($node->publish_on->value)) {
-            $replacements[$original] = $date_formatter->format($node->publish_on->value, 'medium', '', NULL, $language_code);
-          }
-          break;
-
-        case 'scheduler-unpublish':
-          if (isset($node->unpublish_on->value)) {
-            $replacements[$original] = $date_formatter->format($node->unpublish_on->value, 'medium', '', NULL, $language_code);
-          }
-          break;
-      }
-    }
-
-    // Chained token replacement.
-    if (isset($node->publish_on->value) && $publish_tokens = $token_service->findWithPrefix($tokens, 'scheduler-publish')) {
-      $replacements += $token_service->generate('date', $publish_tokens, ['date' => $node->publish_on->value], $options, $bubbleable_metadata);
-    }
-    if (isset($node->unpublish_on->value) && $unpublish_tokens = $token_service->findWithPrefix($tokens, 'scheduler-unpublish')) {
-      $replacements += $token_service->generate('date', $unpublish_tokens, ['date' => $node->unpublish_on->value], $options, $bubbleable_metadata);
-    }
-  }
-
-  return $replacements;
-}
diff --git a/modules/scheduler/scheduler_handler_field_scheduler_countdown.inc b/modules/scheduler/scheduler_handler_field_scheduler_countdown.inc
deleted file mode 100644
index 9794a58..0000000
--- a/modules/scheduler/scheduler_handler_field_scheduler_countdown.inc
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-namespace Drupal\scheduler;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Display scheduled dates in 'countdown' format for use in Views.
- *
- * Field handler to display a countdown until a scheduled action.
- *
- * @TODO Is this file actually used and/or needed in Drupal 8?
- *
- * @see scheduler.views.inc
- * @see http://www.ericschaefer.org/blog/2011/01/09/custom-field-handlers-for-views-2-drupal
- */
-class SchedulerHandlerFieldSchedulerCountdown extends views_handler_field {
-  const SECOND_SCALE = 1;
-  const MINUTE_SCALE = 60;
-  const HOUR_SCALE = 3600;
-  const DAY_SCALE = 86400;
-  const WEEK_SCALE = 604800;
-
-  /**
-   * Add the timestamp_field into the SQL query.
-   *
-   * It is calculated as publish_on - REQUEST_TIME so the result is the number
-   * of seconds from now until publishing. If publish_on is in the past then
-   * NULL is returned.
-   */
-  public function query() {
-    $this->ensure_my_table();
-    $this->node_table = $this->query->ensure_table('node', $this->relationship);
-    $time_field = $this->definition['timestamp_field'];
-    $this->field_alias = $this->query->add_field(NULL, 'CASE WHEN (' . $time_field . ' > ' . REQUEST_TIME . ') THEN (' . $time_field . ' - ' . REQUEST_TIME . ') ELSE NULL END', $this->table_alias . '_' . $this->field);
-  }
-
-  /**
-   * Define our display options and provide defaults.
-   *
-   * @return array
-   *   An associative array containing the options.
-   */
-  public function optionDefinition() {
-    $options = parent::option_definition();
-    $options['countdown_display'] = ['default' => 'smart'];
-    $options['units_display'] = ['default' => 'long'];
-    return $options;
-  }
-
-  /**
-   * Defines the form for the user to select the display options.
-   */
-  public function optionsForm(array &$form, FormStateInterface $form_state) {
-    parent::options_form($form, $form_state);
-    $form['countdown_display'] = [
-      '#title' => t('Display countdown as'),
-      '#type' => 'radios',
-      '#options' => [
-        'smart' => t('Smart mode'),
-        'seconds' => t('Seconds'),
-        'minutes' => t('Minutes'),
-        'hours' => t('Hours'),
-        'days' => t('Days'),
-        'weeks' => t('Weeks'),
-      ],
-      '#default_value' => $this->options['countdown_display'],
-    ];
-    $form['units_display'] = [
-      '#title' => t('Display time units'),
-      '#type' => 'radios',
-      '#options' => [
-        'long' => t('Long (for example 3 days)'),
-        'short' => t('Short (for example 3d)'),
-        'none' => t('No units at all'),
-      ],
-      '#default_value' => $this->options['units_display'],
-    ];
-  }
-
-  /**
-   * Callback function to filter out unwanted values.
-   *
-   * Keep only the array scale values which are smaller than the countdown value
-   * being displayed.
-   */
-  public function scaleFilterCallback($array_value) {
-    return ($this->raw_value >= $array_value);
-  }
-
-  /**
-   * Renders the countdown value in the units required.
-   */
-  public function render($values) {
-    $countdown_display = $this->options['countdown_display'];
-    $this->raw_value = $values->{$this->field_alias};
-
-    $scales = [
-      'weeks' => self::WEEK_SCALE,
-      'days' => self::DAY_SCALE,
-      'hours' => self::HOUR_SCALE,
-      'minutes' => self::MINUTE_SCALE,
-      'seconds' => self::SECOND_SCALE,
-    ];
-    // If the field has been set to 'Smart', determine the right timescale.
-    if ($countdown_display == 'smart') {
-      $scales = array_filter($scales, [$this, 'scale_filter_callback']);
-      $scale = empty($scales) ? self::SECOND_SCALE : reset($scales);
-    }
-    // Otherwise use the fixed display requested.
-    else {
-      $scale = $scales[$countdown_display];
-    }
-
-    // Get the display value by dividing the original value by the scale.
-    $scaled_value = round($this->raw_value / $scale);
-
-    switch ($scale) {
-      case self::SECOND_SCALE:
-        $long = \Drupal::translation()->formatPlural($scaled_value, '1 second', '@count seconds', ['@count' => $scaled_value]);
-        $short = t('@counts', ['@count' => $scaled_value]);
-        break;
-
-      case self::MINUTE_SCALE:
-        $long = \Drupal::translation()->formatPlural($scaled_value, '1 minute', '@count minutes', ['@count' => $scaled_value]);
-        $short = t('@countm', ['@count' => $scaled_value]);
-        break;
-
-      case self::HOUR_SCALE:
-        $long = \Drupal::translation()->formatPlural($scaled_value, '1 hour', '@count hours', ['@count' => $scaled_value]);
-        $short = t('@counth', ['@count' => $scaled_value]);
-        break;
-
-      case self::DAY_SCALE:
-        $long = \Drupal::translation()->formatPlural($scaled_value, '1 day', '@count days', ['@count' => $scaled_value]);
-        $short = t('@countd', ['@count' => $scaled_value]);
-        break;
-
-      case self::WEEK_SCALE:
-        $long = \Drupal::translation()->formatPlural($scaled_value, '1 week', '@count weeks', ['@count' => $scaled_value]);
-        $short = t('@countw', ['@count' => $scaled_value]);
-        break;
-    }
-
-    switch ($this->options['units_display']) {
-      case 'long':
-        return $long;
-
-      case 'short':
-        return $short;
-
-      default:
-        return $scaled_value;
-    }
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.info.yml b/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.info.yml
deleted file mode 100644
index 973d9ed..0000000
--- a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Scheduler Rules Integration
-type: module
-description: 'Scheduler sub-module providing conditions, actions and events for use with the Rules module.'
-# core: 8.x
-dependencies:
-  - rules:rules
-  - scheduler:scheduler
-
-# Information added by Drupal.org packaging script on 2017-11-14
-version: '8.x-1.0'
-core: '8.x'
-project: 'scheduler'
-datestamp: 1510690392
diff --git a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.module b/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.module
deleted file mode 100644
index beb0615..0000000
--- a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.module
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * @file
- * Scheduler Rules Integration.
- *
- * This sub-module provides actions, conditions and events for use with the
- * Rules module. All rules code is now moved into this sub-module so that the
- * main Scheduler module does not need Rules as a pre-requisite.
- * @see https://www.drupal.org/node/2790459
- */
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\scheduler_rules_integration\Event\NewNodeIsScheduledForPublishingEvent;
-use Drupal\scheduler_rules_integration\Event\NewNodeIsScheduledForUnpublishingEvent;
-use Drupal\scheduler_rules_integration\Event\ExistingNodeIsScheduledForPublishingEvent;
-use Drupal\scheduler_rules_integration\Event\ExistingNodeIsScheduledForUnpublishingEvent;
-use Drupal\scheduler_rules_integration\Event\SchedulerHasPublishedThisNodeEvent;
-use Drupal\scheduler_rules_integration\Event\SchedulerHasUnpublishedThisNodeEvent;
-
-/**
- * Implements hook_ENTITY_TYPE_insert() for node entities.
- */
-function scheduler_rules_integration_node_insert(EntityInterface $node) {
-  // Invoke the Rules events to indicate that a new node has been scheduled.
-  $event_dispatcher = \Drupal::service('event_dispatcher');
-  if (!empty($node->publish_on->value)) {
-    // @todo: In 7.x we had the dates as parameters. These are available in Rules via node.publish_on.value so maybe we do not need the parms?
-    $event = new NewNodeIsScheduledForPublishingEvent($node);
-    $event_dispatcher->dispatch(NewNodeIsScheduledForPublishingEvent::EVENT_NAME, $event);
-  }
-  if (!empty($node->unpublish_on->value)) {
-    $event = new NewNodeIsScheduledForUnpublishingEvent($node);
-    $event_dispatcher->dispatch(NewNodeIsScheduledForUnpublishingEvent::EVENT_NAME, $event);
-  }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_update() for node entities.
- */
-function scheduler_rules_integration_node_update(EntityInterface $node) {
-  // Invoke Rules events to indicate that an existing node has been scheduled.
-  $event_dispatcher = \Drupal::service('event_dispatcher');
-  if (!empty($node->publish_on->value)) {
-    $event = new ExistingNodeIsScheduledForPublishingEvent($node, ['node' => $node]);
-    $event_dispatcher->dispatch(ExistingNodeIsScheduledForPublishingEvent::EVENT_NAME, $event);
-  }
-  if (!empty($node->unpublish_on->value)) {
-    $event = new ExistingNodeIsScheduledForUnpublishingEvent($node);
-    $event_dispatcher->dispatch(ExistingNodeIsScheduledForUnpublishingEvent::EVENT_NAME, $event);
-  }
-}
-
-/**
- * Trigger Rules events during cron.
- *
- * This function is called from the main Scheduler module publish() and
- * unpublish() functions in the SchedulerManager class.
- */
-function _scheduler_rules_integration_dispatch_cron_event(EntityInterface $node, $event_type) {
-  $event_dispatcher = \Drupal::service('event_dispatcher');
-  if ($event_type == 'publish') {
-    // Invoke the event to tell Rules that Scheduler has published this node.
-    // @todo 2nd param $publish_on may be needed as the date will no longer be on the node
-    $event = new SchedulerHasPublishedThisNodeEvent($node);
-    $event_dispatcher->dispatch(SchedulerHasPublishedThisNodeEvent::EVENT_NAME, $event);
-  }
-  elseif ($event_type == 'unpublish') {
-    // Invoke the event to tell Rules that Scheduler has unpublished this node.
-    // @todo 2nd param $publish_on may be needed as the date will no longer be on the node
-    $event = new SchedulerHasUnpublishedThisNodeEvent($node);
-    $event_dispatcher->dispatch(SchedulerHasUnpublishedThisNodeEvent::EVENT_NAME, $event);
-  }
-}
diff --git a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules.events.yml b/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules.events.yml
deleted file mode 100644
index c49a780..0000000
--- a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules.events.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-scheduler_new_node_is_scheduled_for_publishing_event:
-  label: 'After saving new content that is scheduled for publishing'
-  category: 'Scheduler'
-  context:
-    node:
-      type: 'entity:node'
-      label: 'Scheduled Content Node'
-      description: 'The node object representing the scheduled content'
-# These parameters were in the 7.x version. May not be needed, but left here
-# for reference until decision is made.
-# @TODO Add the parameters or remove these commented lines. Sep 2016
-#    publish_on:
-#      type: 'integer'
-#      label: 'Scheduler Publish On date'
-#      description: 'Date and time that the node will be published by Scheduler'
-#    unpublish_on:
-#      type: 'integer'
-#      label: 'Scheduler Unpublish On date'
-#      description: 'Date and time that the node will be unpublished by Scheduler'
-
-scheduler_existing_node_is_scheduled_for_publishing_event:
-  label: 'After updating existing content that is scheduled for publishing'
-  category: 'Scheduler'
-  context:
-    node:
-      type: 'entity:node'
-      label: 'Scheduled Content Node'
-      description: 'The node object representing the scheduled content'
-
-scheduler_new_node_is_scheduled_for_unpublishing_event:
-  label: 'After saving new content that is scheduled for unpublishing'
-  category: 'Scheduler'
-  context:
-    node:
-      type: 'entity:node'
-      label: 'Scheduled Content Node'
-      description: 'The node object representing the scheduled content'
-
-scheduler_existing_node_is_scheduled_for_unpublishing_event:
-  label: 'After updating existing content that is scheduled for unpublishing'
-  category: 'Scheduler'
-  context:
-    node:
-      type: 'entity:node'
-      label: 'Scheduled Content Node'
-      description: 'The node object representing the scheduled content'
-
-scheduler_has_published_this_node_event:
-  label: 'After a node has been published by Scheduler'
-  category: 'Scheduler'
-  context:
-    node:
-      type: 'entity:node'
-      label: 'Scheduled Content Node'
-      description: 'The node object representing the scheduled content'
-
-scheduler_has_unpublished_this_node_event:
-  label: 'After a node has been unpublished by Scheduler'
-  category: 'Scheduler'
-  context:
-    node:
-      type: 'entity:node'
-      label: 'Scheduled Content Node'
-      description: 'The node object representing the scheduled content'
diff --git a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules_defaults.inc b/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules_defaults.inc
deleted file mode 100644
index 6ff1dfc..0000000
--- a/modules/scheduler/scheduler_rules_integration/scheduler_rules_integration.rules_defaults.inc
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * @file
- * Scheduler functions to provide default rules and components.
- */
-
-/**
- * Implements hook_default_rules_configuration().
- *
- * This functions returns an array of rules configurations with the
- * configuration names as keys.
- *
- * @TODO Convert to 8.x, this is stil 7.x code
- */
-function scheduler_rules_integration_default_rules_configuration() {
-  // Define two reaction rules which will be displayed on the 'Rules' tab. These
-  // are initially inactive, but the user can enable them, and then modify the
-  // values and/or add more conditions and actions.
-  // 1. Reaction rule to send an email when Scheduler publishes content.
-  $rule = rules_reaction_rule();
-  $rule->label = t('Send e-mail when content is published by Scheduler');
-  $rule->active = FALSE;
-  $rule->event('scheduler_node_has_been_published_event')
-    ->condition(rules_condition('data_is_empty', ['data:select' => 'node:author:mail', 'value' => TRUE])->negate())
-    ->action('mail', [
-      'to' => '[node:author:mail]',
-      'subject' => t("'[node:title]' has been published on [site:name]"),
-      // Needs double quotes for the newlines to be evaluated.
-      'message' => t("Dear [node:author:name],\r\nYour [node:type] '[node:title]' has been published on [site:name].\r\nThe link is [node:url]\r\n"),
-    ]);
-  $rule->tags = ['Scheduler'];
-  $configs['scheduler_send_email_after_publishing_node'] = $rule;
-
-  // 2. Reaction rule to send an email when Scheduler unpublishes content.
-  $rule = rules_reaction_rule();
-  $rule->label = t('Send e-mail when content is unpublished by Scheduler');
-  $rule->active = FALSE;
-  $rule->event('scheduler_node_has_been_unpublished_event')
-    ->condition(rules_condition('data_is_empty', ['data:select' => 'node:author:mail', 'value' => TRUE])->negate())
-    ->action('mail', [
-      'to' => '[node:author:mail]',
-      'subject' => t("'[node:title]' has been unpublished on [site:name]"),
-      'message' => t("Dear [node:author:name],\r\nYour [node:type] '[node:title]' has been unpublished on [site:name].\r\nThe link is [node:url]\r\n"),
-    ]);
-  $rule->tags = ['Scheduler'];
-  $configs['scheduler_send_email_after_unpublishing_node'] = $rule;
-
-  // Define four components which will be available in the 'Components' tab in
-  // Rules admin. These are also available in Views Bulk Operations, to allow
-  // a user to set or remove scheduling dates in bulk.
-  // 1. Component to set the publishing date on a node.
-  $rule = rule([
-    'scheduler_node' => [
-      'type' => 'node',
-      'label' => t('Node'),
-      'description' => t('The node for publishing via Scheduler.'),
-    ],
-    'scheduler_publish_on_date' => [
-      'type' => 'date',
-      'label' => t('Publish-on Date'),
-      'description' => t('The publishing date to be used by Scheduler.'),
-    ],
-  ]);
-  $rule->label = t('Set scheduled publishing date');
-  $rule
-    ->condition('scheduler_condition_publishing_is_enabled', [
-      'node:select' => 'scheduler-node',
-    ])
-    // The keys required below are 'node:select' and 'date:select'. This is made
-    // up of the key names defined in scheduler_rules_action_info() followed by
-    // :select to specify data selection instead of plain text values.
-    ->action('scheduler_set_publish_date_action', [
-      'node:select' => 'scheduler-node',
-      'date:select' => 'scheduler-publish-on-date',
-    ]);
-  $rule->tags = ['Scheduler'];
-  $configs['scheduler_set_publish_date_component'] = $rule;
-
-  // 2. Component to set the unpublishing date on a node.
-  $rule = rule([
-    'scheduler_node' => [
-      'type' => 'node',
-      'label' => t('Node'),
-      'description' => t('The node for unpublishing via Scheduler.'),
-    ],
-    'scheduler_unpublish_on_date' => [
-      'type' => 'date',
-      'label' => t('Unpublish-on Date'),
-      'description' => t('The unpublishing date to be used by Scheduler.'),
-    ],
-  ]);
-  $rule->label = t('Set scheduled unpublishing date');
-  $rule
-    ->condition('scheduler_condition_unpublishing_is_enabled', [
-      'node:select' => 'scheduler-node',
-    ])
-    ->action('scheduler_set_unpublish_date_action', [
-      'node:select' => 'scheduler-node',
-      'date:select' => 'scheduler-unpublish-on-date',
-    ]);
-  $rule->tags = ['Scheduler'];
-  $configs['scheduler_set_unpublish_date_component'] = $rule;
-
-  // 3. Component to remove the publishing date from a node.
-  $rule = rule([
-    'scheduler_node' => [
-      'type' => 'node',
-      'label' => t('The scheduled node'),
-      'description' => t('The node scheduled for publishing via Scheduler.'),
-    ],
-  ]);
-  $rule->label = t('Remove scheduled publishing date');
-  $rule
-    ->condition('scheduler_condition_node_is_scheduled_for_publishing', [
-      'node:select' => 'scheduler-node',
-    ])
-    ->action('scheduler_remove_publish_date_action', [
-      'node:select' => 'scheduler-node',
-    ]);
-  $rule->tags = ['Scheduler'];
-  $configs['scheduler_remove_publish_date_component'] = $rule;
-
-  // 4. Component to remove the unpublishing date from a node.
-  $rule = rule([
-    'scheduler_node' => [
-      'type' => 'node',
-      'label' => t('The scheduled node'),
-      'description' => t('The node scheduled for unpublishing via Scheduler.'),
-    ],
-  ]);
-  $rule->label = t('Remove scheduled unpublishing date');
-  $rule
-    ->condition('scheduler_condition_node_is_scheduled_for_unpublishing', [
-      'node:select' => 'scheduler-node',
-    ])
-    ->action('scheduler_remove_unpublish_date_action', [
-      'node:select' => 'scheduler-node',
-    ]);
-  $rule->tags = ['Scheduler'];
-  $configs['scheduler_remove_unpublish_date_component'] = $rule;
-
-  return $configs;
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForPublishingEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForPublishingEvent.php
deleted file mode 100644
index d1c7a02..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForPublishingEvent.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Event;
-
-use Drupal\node\NodeInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * An existing node is scheduled for publishing.
- *
- * This event is fired when an existing node is updated/saved and it has a
- * scheduled publishing date.
- */
-class ExistingNodeIsScheduledForPublishingEvent extends Event {
-
-  const EVENT_NAME = 'scheduler_existing_node_is_scheduled_for_publishing_event';
-
-  /**
-   * The node which is being scheduled and saved.
-   *
-   * @var Drupal\node\NodeInterface
-   */
-  public $node;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node which is being scheduled and saved.
-   */
-  public function __construct(NodeInterface $node) {
-    $this->node = $node;
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForUnpublishingEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForUnpublishingEvent.php
deleted file mode 100644
index b51a412..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/ExistingNodeIsScheduledForUnpublishingEvent.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Event;
-
-use Drupal\node\NodeInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * An existing node is scheduled for unpublishing.
- *
- * This event is fired when an existing node is updated/saved and it has a
- * scheduled unpublishing date.
- */
-class ExistingNodeIsScheduledForUnpublishingEvent extends Event {
-
-  const EVENT_NAME = 'scheduler_existing_node_is_scheduled_for_unpublishing_event';
-
-  /**
-   * The node which is being scheduled and saved.
-   *
-   * @var Drupal\node\NodeInterface
-   */
-  public $node;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node which is being scheduled and saved.
-   */
-  public function __construct(NodeInterface $node) {
-    $this->node = $node;
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForPublishingEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForPublishingEvent.php
deleted file mode 100644
index 4bafa01..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForPublishingEvent.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Event;
-
-use Drupal\node\NodeInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * A new node is scheduled for publishing.
- *
- * This event is fired when a newly created node is saved for the first time
- * and it has a scheduled publishing date.
- */
-class NewNodeIsScheduledForPublishingEvent extends Event {
-
-  const EVENT_NAME = 'scheduler_new_node_is_scheduled_for_publishing_event';
-
-  /**
-   * The node which is being scheduled and saved.
-   *
-   * @var Drupal\node\NodeInterface
-   */
-  public $node;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node which is being scheduled and saved.
-   */
-  public function __construct(NodeInterface $node) {
-    $this->node = $node;
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForUnpublishingEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForUnpublishingEvent.php
deleted file mode 100644
index d002da6..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/NewNodeIsScheduledForUnpublishingEvent.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Event;
-
-use Drupal\node\NodeInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * A new node is scheduled for unpublishing.
- *
- * This event is fired when a newly created node is saved for the first time
- * and it has a scheduled unpublishing date.
- */
-class NewNodeIsScheduledForUnpublishingEvent extends Event {
-
-  const EVENT_NAME = 'scheduler_new_node_is_scheduled_for_unpublishing_event';
-
-  /**
-   * The node which is being scheduled and saved.
-   *
-   * @var Drupal\node\NodeInterface
-   */
-  public $node;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node which is being scheduled and saved.
-   */
-  public function __construct(NodeInterface $node) {
-    $this->node = $node;
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasPublishedThisNodeEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasPublishedThisNodeEvent.php
deleted file mode 100644
index 266b765..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasPublishedThisNodeEvent.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Event;
-
-use Drupal\node\NodeInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * A node is published by Scheduler.
- *
- * This event is fired when Scheduler publishes a node via cron.
- */
-class SchedulerHasPublishedThisNodeEvent extends Event {
-
-  const EVENT_NAME = 'scheduler_has_published_this_node_event';
-
-  /**
-   * The node which has been processed.
-   *
-   * @var Drupal\node\NodeInterface
-   */
-  public $node;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node which has been published by Scheduler.
-   */
-  public function __construct(NodeInterface $node) {
-    $this->node = $node;
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasUnpublishedThisNodeEvent.php b/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasUnpublishedThisNodeEvent.php
deleted file mode 100644
index 2ba1309..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Event/SchedulerHasUnpublishedThisNodeEvent.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Event;
-
-use Drupal\node\NodeInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * A node is unpublished by Scheduler.
- *
- * This event is fired when Scheduler unpublishes a node via cron.
- */
-class SchedulerHasUnpublishedThisNodeEvent extends Event {
-
-  const EVENT_NAME = 'scheduler_has_unpublished_this_node_event';
-
-  /**
-   * The node which has been processed..
-   *
-   * @var Drupal\node\NodeInterface
-   */
-  public $node;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node which has been unpublished by Scheduler.
-   */
-  public function __construct(NodeInterface $node) {
-    $this->node = $node;
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForPublishing.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForPublishing.php
deleted file mode 100644
index b281a81..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForPublishing.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides 'Node is scheduled for publishing' condition.
- *
- * @Condition(
- *   id = "scheduler_condition_node_scheduled_for_publishing",
- *   label = @Translation("Node is scheduled for publishing"),
- *   category = @Translation("Scheduler"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("The node to test for having a scheduled publishing date."),
- *       description = @Translation("Enter 'node' for the node being processed, or use data selection.")
- *     )
- *   }
- * )
- */
-class NodeIsScheduledForPublishing extends RulesConditionBase {
-
-  /**
-   * Determines whether a node is scheduled for publishing.
-   *
-   * @return bool
-   *   TRUE if the node is scheduled for publishing, FALSE if not.
-   */
-  protected function doEvaluate() {
-    $node = $this->getContextValue('node');
-    return !empty($node->publish_on->value);
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForUnpublishing.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForUnpublishing.php
deleted file mode 100644
index 6c2d390..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/NodeIsScheduledForUnpublishing.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides 'Node is scheduled for unpublishing' condition.
- *
- * @Condition(
- *   id = "scheduler_condition_node_scheduled_for_unpublishing",
- *   label = @Translation("Node is scheduled for unpublishing"),
- *   category = @Translation("Scheduler"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("The node to test for having a scheduled unpublishing date."),
- *       description = @Translation("Enter 'node' for the node being processed, or use data selection.")
- *     )
- *   }
- * )
- */
-class NodeIsScheduledForUnpublishing extends RulesConditionBase {
-
-  /**
-   * Determines whether a node is scheduled for unpublishing.
-   *
-   * @return bool
-   *   TRUE if the node is scheduled for unpublishing, FALSE if not.
-   */
-  protected function doEvaluate() {
-    $node = $this->getContextValue('node');
-    return !empty($node->unpublish_on->value);
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/PublishingIsEnabled.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/PublishingIsEnabled.php
deleted file mode 100644
index 4c9b11a..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/PublishingIsEnabled.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides a 'Publishing is enabled' condition.
- *
- * @Condition(
- *   id = "scheduler_condition_publishing_is_enabled",
- *   label = @Translation("Node type is enabled for scheduled publishing"),
- *   category = @Translation("Scheduler"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("The node to use for scheduled publishing enabled"),
- *       description = @Translation("Enter 'node' for the node being processed, or use data selection.")
- *     )
- *   }
- * )
- */
-class PublishingIsEnabled extends RulesConditionBase {
-
-  /**
-   * Determines whether scheduled publishing is enabled for this node type.
-   *
-   * @return bool
-   *   TRUE if scheduled publishing is enabled for the content type of this
-   *   node.
-   */
-  public function evaluate() {
-    $node = $this->getContextValue('node');
-    $config = \Drupal::config('scheduler.settings');
-    return ($node->type->entity->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable')));
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/UnpublishingIsEnabled.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/UnpublishingIsEnabled.php
deleted file mode 100644
index e4e3856..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/Condition/UnpublishingIsEnabled.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Plugin\Condition;
-
-use Drupal\rules\Core\RulesConditionBase;
-
-/**
- * Provides 'Unpublishing is enabled' condition.
- *
- * @Condition(
- *   id = "scheduler_condition_unpublishing_is_enabled",
- *   label = @Translation("Node type is enabled for scheduled unpublishing"),
- *   category = @Translation("Scheduler"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("The node to use for scheduling properties"),
- *       description = @Translation("Enter 'node' for the node being processed, or use data selection.")
- *     )
- *   }
- * )
- */
-class UnpublishingIsEnabled extends RulesConditionBase {
-
-  /**
-   * Determines whether scheduled unpublishing is enabled for this node type.
-   *
-   * @return bool
-   *   TRUE if scheduled unpublishing is enabled for the content type of this
-   *   node.
-   */
-  public function evaluate() {
-    $node = $this->getContextValue('node');
-    $config = \Drupal::config('scheduler.settings');
-    return ($node->type->entity->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable')));
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/PublishNow.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/PublishNow.php
deleted file mode 100644
index 3727a96..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/PublishNow.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides a 'Publish the node immediately' action.
- *
- * @RulesAction(
- *   id = "scheduler_publish_now_action",
- *   label = @Translation("Publish the content immediately"),
- *   category = @Translation("Scheduler"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("Node"),
- *       description = @Translation("The node to be published now"),
- *     ),
- *   }
- * )
- */
-class PublishNow extends RulesActionBase {
-
-  /**
-   * Set the node status to Published.
-   *
-   * This action should really be provided by Rules or by Core, but it is not
-   * yet done (as of Aug 2016). Scheduler users need this action so we provide
-   * it here. It could be removed later when Rules or Core includes it.
-   */
-  public function doExecute() {
-    $node = $this->getContextValue('node');
-    $node->setPublished(TRUE);
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemovePublishingDate.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemovePublishingDate.php
deleted file mode 100644
index 7969a8e..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemovePublishingDate.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\Core\Url;
-
-/**
- * Provides a 'Remove date for scheduled publishing' action.
- *
- * @RulesAction(
- *   id = "scheduler_remove_publishing_date_action",
- *   label = @Translation("Remove date for scheduled publishing"),
- *   category = @Translation("Scheduler"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("Node"),
- *       description = @Translation("The node from which to remove the scheduled publishing date"),
- *     ),
- *   }
- * )
- */
-class RemovePublishingDate extends RulesActionBase {
-
-  /**
-   * Remove the publish_on date from the node.
-   */
-  public function doExecute() {
-    $node = $this->getContextValue('node');
-    $config = \Drupal::config('scheduler.settings');
-    if ($node->type->entity->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable'))) {
-      $node->set('publish_on', NULL);
-      scheduler_node_presave($node);
-      scheduler_node_update($node);
-    }
-    else {
-      $type_name = node_get_type_label($node);
-      $arguments = [
-        '%type' => $type_name,
-        'link' => \Drupal::l(t('@type settings', ['@type' => $type_name]), new Url('entity.node_type.edit_form', ['node_type' => $node->getType()])),
-      ];
-      \Drupal::logger('scheduler')->warning('Scheduler rules action "Remove publishing date" - Scheduled publishing is not enabled for %type content. To prevent this message add the condition "Scheduled publishing is enabled" to your Rule, or enable the Scheduler options via the %type content type settings.', $arguments);
-    }
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemoveUnpublishingDate.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemoveUnpublishingDate.php
deleted file mode 100644
index 2d48c8c..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/RemoveUnpublishingDate.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\Core\Url;
-
-/**
- * Provides a 'Remove date for scheduled unpublishing' action.
- *
- * @RulesAction(
- *   id = "scheduler_remove_unpublishing_date_action",
- *   label = @Translation("Remove date for scheduled unpublishing"),
- *   category = @Translation("Scheduler"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("Node"),
- *       description = @Translation("The node from which to remove the scheduled unpublishing date"),
- *     ),
- *   }
- * )
- */
-class RemoveUnpublishingDate extends RulesActionBase {
-
-  /**
-   * Remove the unpublish_on date from the node.
-   */
-  public function doExecute() {
-    $node = $this->getContextValue('node');
-    $config = \Drupal::config('scheduler.settings');
-    if ($node->type->entity->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable'))) {
-      $node->set('unpublish_on', NULL);
-      scheduler_node_presave($node);
-      scheduler_node_update($node);
-    }
-    else {
-      $type_name = node_get_type_label($node);
-      $arguments = [
-        '%type' => $type_name,
-        'link' => \Drupal::l(t('@type settings', ['@type' => $type_name]), new Url('entity.node_type.edit_form', ['node_type' => $node->getType()])),
-      ];
-      \Drupal::logger('scheduler')->warning('Scheduler rules action "Remove unpublishing date" -  Scheduled unpublishing is not enabled for %type content. To prevent this message add the condition "Scheduled unpublishing is enabled" to your Rule, or enable the Scheduler options via the %type content type settings.', $arguments);
-    }
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetPublishingDate.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetPublishingDate.php
deleted file mode 100644
index 6d3d676..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetPublishingDate.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\Core\Url;
-
-/**
- * Provides a 'Set date for scheduled publishing' action.
- *
- * @RulesAction(
- *   id = "scheduler_set_publishing_date_action",
- *   label = @Translation("Set date for scheduled publishing"),
- *   category = @Translation("Scheduler"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("Node for scheduling"),
- *       description = @Translation("The node which is to have a scheduled publishing date set"),
- *     ),
- *     "date" = @ContextDefinition("timestamp",
- *       label = @Translation("The date for publishing"),
- *       description = @Translation("The date when Scheduler will publish the node"),
- *     )
- *   }
- * )
- */
-class SetPublishingDate extends RulesActionBase {
-
-  /**
-   * Set the publish_on date for the node.
-   */
-  public function doExecute() {
-    $node = $this->getContextValue('node');
-    $date = $this->getContextValue('date');
-    $config = \Drupal::config('scheduler.settings');
-    if ($node->type->entity->getThirdPartySetting('scheduler', 'publish_enable', $config->get('default_publish_enable'))) {
-      $node->set('publish_on', $date);
-      // When this action is invoked and it operates on the node being editted
-      // then hook_node_presave() and hook_node_update() will be executed
-      // automatically. But if this action is being used to schedule a different
-      // node then we need to call the functions directly here.
-      scheduler_node_presave($node);
-      scheduler_node_update($node);
-    }
-    else {
-      $type_name = node_get_type_label($node);
-      $arguments = [
-        '%type' => $type_name,
-        'link' => \Drupal::l(t('@type settings', ['@type' => $type_name]), new Url('entity.node_type.edit_form', ['node_type' => $node->getType()])),
-      ];
-      \Drupal::logger('scheduler')->warning('Scheduler rules action "Set publishing date" - Scheduled publishing is not enabled for %type content. To prevent this message add the condition "Scheduled publishing is enabled" to your Rule, or enable the Scheduler options via the %type content type settings.', $arguments);
-    }
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetUnpublishingDate.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetUnpublishingDate.php
deleted file mode 100644
index 5bfc93f..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/SetUnpublishingDate.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-use Drupal\Core\Url;
-
-/**
- * Provides a 'Set date for scheduled unpublishing' action.
- *
- * @RulesAction(
- *   id = "scheduler_set_unpublishing_date_action",
- *   label = @Translation("Set date for scheduled unpublishing"),
- *   category = @Translation("Scheduler"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("Node for scheduling"),
- *       description = @Translation("The node which is to have a scheduled unpublishing date set"),
- *     ),
- *     "date" = @ContextDefinition("timestamp",
- *       label = @Translation("The date for unpublishing"),
- *       description = @Translation("The date when Scheduler will unpublish the node"),
- *     )
- *   }
- * )
- */
-class SetUnpublishingDate extends RulesActionBase {
-
-  /**
-   * Set the unpublish_on date for the node.
-   */
-  public function doExecute() {
-    $node = $this->getContextValue('node');
-    $date = $this->getContextValue('date');
-    $config = \Drupal::config('scheduler.settings');
-    if ($node->type->entity->getThirdPartySetting('scheduler', 'unpublish_enable', $config->get('default_unpublish_enable'))) {
-      $node->set('unpublish_on', $date);
-      // When this action is invoked and it operates on the node being editted
-      // then hook_node_presave() and hook_node_update() will be executed
-      // automatically. But if this action is being used to schedule a different
-      // node then we need to call the functions directly here.
-      scheduler_node_presave($node);
-      scheduler_node_update($node);
-    }
-    else {
-      $type_name = node_get_type_label($node);
-      $arguments = [
-        '%type' => $type_name,
-        'link' => \Drupal::l(t('@type settings', ['@type' => $type_name]), new Url('entity.node_type.edit_form', ['node_type' => $node->getType()])),
-      ];
-      \Drupal::logger('scheduler')->warning('Scheduler rules action "Set unpublishing date" - Scheduled unpublishing is not enabled for %type content. To prevent this message add the condition "Scheduled unpublishing is enabled" to your Rule, or enable the Scheduler options via the %type content type settings.', $arguments);
-    }
-  }
-
-}
diff --git a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/UnpublishNow.php b/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/UnpublishNow.php
deleted file mode 100644
index 2be4278..0000000
--- a/modules/scheduler/scheduler_rules_integration/src/Plugin/RulesAction/UnpublishNow.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_rules_integration\Plugin\RulesAction;
-
-use Drupal\rules\Core\RulesActionBase;
-
-/**
- * Provides an 'Unpublish the node immediately' action.
- *
- * @RulesAction(
- *   id = "scheduler_unpublish_now_action",
- *   label = @Translation("Unpublish the content immediately"),
- *   category = @Translation("Scheduler"),
- *   context = {
- *     "node" = @ContextDefinition("entity:node",
- *       label = @Translation("Node"),
- *       description = @Translation("The node to be unpublished now"),
- *     ),
- *   }
- * )
- */
-class UnpublishNow extends RulesActionBase {
-
-  /**
-   * Set the node status to Unpublished.
-   *
-   * This action should really be provided by Rules or by Core, but it is not
-   * yet done (as of Aug 2016). Scheduler users need this action so we provide
-   * it here. It could be removed later when Rules or Core includes it.
-   */
-  public function doExecute() {
-    $node = $this->getContextValue('node');
-    $node->setPublished(FALSE);
-  }
-
-}
diff --git a/modules/scheduler/src/Access/ScheduledListAccess.php b/modules/scheduler/src/Access/ScheduledListAccess.php
deleted file mode 100644
index f5cac5e..0000000
--- a/modules/scheduler/src/Access/ScheduledListAccess.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Access;
-
-use Drupal\Core\Access\AccessCheckInterface;
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Session\AccountInterface;
-use Symfony\Component\Routing\Route;
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Checks access for displaying the scheduler list of scheduled nodes.
- */
-class ScheduledListAccess implements AccessCheckInterface {
-
-  /**
-   * The current route match.
-   *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
-   */
-  protected $routeMatch;
-
-  /**
-   * Constructs a ScheduledListAccess object.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *   The current route match.
-   */
-  public function __construct(RouteMatchInterface $route_match) {
-    $this->routeMatch = $route_match;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies(Route $route) {
-    return $route->hasRequirement('_access_scheduler_content');
-  }
-
-  /**
-   * Determine if the $account has access to the scheduled content list.
-   *
-   * The result will vary depending on whether the page being viewed is the user
-   * profile page or the scheduled content admin overview.
-   */
-  public function access(AccountInterface $account) {
-    // When viewing a user profile page routeMatch->getRawParameter('user')
-    // returns the user's id. If not on a user page it returns NULL silently.
-    $viewing_own_tab = $this->routeMatch->getRawParameter('user') == $account->id();
-
-    // Users with 'schedule publishing of nodes' can see their own scheduled
-    // content via a tab on their user page. Users with 'view scheduled content'
-    // will be able to access the 'scheduled' tab for any user, and also access
-    // the scheduled content overview page.
-    $allowed = $account->hasPermission('view scheduled content')
-      || ($viewing_own_tab && $account->hasPermission('schedule publishing of nodes'));
-    return $allowed ? AccessResult::allowed() : AccessResult::forbidden();
-  }
-
-}
diff --git a/modules/scheduler/src/Controller/LightweightCronController.php b/modules/scheduler/src/Controller/LightweightCronController.php
deleted file mode 100644
index 44d5c0b..0000000
--- a/modules/scheduler/src/Controller/LightweightCronController.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Controller;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Controller\ControllerBase;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Class LightweightCronController.
- *
- * @package Drupal\scheduler\Controller
- */
-class LightweightCronController extends ControllerBase {
-
-  /**
-   * Index.
-   *
-   * @return \Symfony\Component\HttpFoundation\RedirectResponse
-   *   RedirectResponse.
-   */
-  public function index() {
-    // @TODO: \Drupal calls should be avoided in classes.
-    // Replace \Drupal::service with dependency injection?
-    \Drupal::service('scheduler.manager')->runLightweightCron();
-
-    return new Response('', 204);
-  }
-
-  /**
-   * Checks access.
-   *
-   * @param string $cron_key
-   *   The cron key.
-   *
-   * @return \Drupal\Core\Access\AccessResultInterface
-   *   The access result.
-   */
-  public function access($cron_key) {
-    // @TODO: \Drupal calls should be avoided in classes.
-    // Replace \Drupal::config with dependency injection?
-    $valid_cron_key = \Drupal::config('scheduler.settings')
-      ->get('lightweight_cron_access_key');
-    return AccessResult::allowedIf($valid_cron_key == $cron_key);
-  }
-
-}
diff --git a/modules/scheduler/src/Exception/SchedulerMissingDateException.php b/modules/scheduler/src/Exception/SchedulerMissingDateException.php
deleted file mode 100644
index eda12bc..0000000
--- a/modules/scheduler/src/Exception/SchedulerMissingDateException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Exception;
-
-/**
- * Defines an exception when the scheduled date is missing.
- *
- * This exception is thrown when Scheduler attempts to publish or unpublish a
- * node during cron but the date is missing.
- *
- * @see \Drupal\scheduler\SchedulerManager::publish()
- * @see \Drupal\scheduler\SchedulerManager::unpublish()
- */
-class SchedulerMissingDateException extends \Exception {}
diff --git a/modules/scheduler/src/Exception/SchedulerNodeTypeNotEnabledException.php b/modules/scheduler/src/Exception/SchedulerNodeTypeNotEnabledException.php
deleted file mode 100644
index f26b4a2..0000000
--- a/modules/scheduler/src/Exception/SchedulerNodeTypeNotEnabledException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Exception;
-
-/**
- * Defines an exception when the node type is not enabled for Scheduler.
- *
- * This exception is thrown when Scheduler attempts to publish or unpublish a
- * node during cron but the node type is not enabled for Scheduler.
- *
- * @see \Drupal\scheduler\SchedulerManager::publish()
- * @see \Drupal\scheduler\SchedulerManager::unpublish()
- */
-class SchedulerNodeTypeNotEnabledException extends \Exception {}
diff --git a/modules/scheduler/src/Form/SchedulerAdminForm.php b/modules/scheduler/src/Form/SchedulerAdminForm.php
deleted file mode 100644
index 5ae7061..0000000
--- a/modules/scheduler/src/Form/SchedulerAdminForm.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Form;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Datetime\DateFormatterInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Main administration form for the Scheduler module.
- */
-class SchedulerAdminForm extends ConfigFormBase {
-
-  /**
-   * The date formatter service.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatterInterface
-   */
-  protected $dateFormatter;
-
-  /**
-   * The configuration factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * Creates instance of SchedulerAdminForm.
-   *
-   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
-   *   The date formatter service.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The configuration factory.
-   */
-  public function __construct(DateFormatterInterface $date_formatter, ConfigFactoryInterface $config_factory) {
-    parent::__construct($config_factory);
-
-    $this->dateFormatter = $date_formatter;
-    $this->configFactory = $config_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('date.formatter'),
-      $container->get('config.factory')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'scheduler_admin_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return ['scheduler.settings'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['date_format_placeholder'] = [
-      '#type' => 'fieldset',
-      '#title' => $this->t('Date format'),
-      // Show this placeholder for info. Could remove after 8.x-1.0 release.
-      // @see https://www.drupal.org/node/2799869
-      '#description' => $this->t('The Scheduler date format is no longer used and is not configurable. For more details see <a href=":url">Scheduler issue 2799869</a>', [':url' => 'https://www.drupal.org/node/2799869']),
-      '#collapsible' => FALSE,
-    ];
-
-    // Options for setting date-only with default time.
-    $form['date_only_fieldset'] = [
-      '#type' => 'fieldset',
-      '#title' => $this->t('Date only'),
-      '#collapsible' => FALSE,
-    ];
-    $form['date_only_fieldset']['allow_date_only'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Allow users to enter only a date and provide a default time.'),
-      '#default_value' => $this->setting('allow_date_only'),
-      '#description' => $this->t('When only a date is entered the time will default to a specified value, but the user can change this if required.'),
-    ];
-    $form['date_only_fieldset']['default_time'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Default time'),
-      '#default_value' => $this->setting('default_time'),
-      '#size' => 20,
-      '#maxlength' => 20,
-      '#description' => $this->t('This is the time that will be used if the user does not enter a value. Format: HH:MM:SS.'),
-      '#states' => [
-        'visible' => [
-          ':input[name="scheduler_allow_date_only"]' => ['checked' => TRUE],
-        ],
-      ],
-    ];
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    // If date-only is enabled then check if a valid default time was entered.
-    // Leading zeros and seconds can be omitted, eg. 6:30 is considered valid.
-    if ($form_state->getValue(['allow_date_only'])) {
-      $default_time = date_parse($form_state->getValue(['default_time']));
-      if ($default_time['error_count']) {
-        $form_state->setErrorByName('default_time', $this->t('The default time should be in the format HH:MM:SS'));
-      }
-      else {
-        // Insert any possibly omitted leading zeroes.
-        $unix_time = mktime($default_time['hour'], $default_time['minute'], $default_time['second']);
-        $form_state->setValue(['default_time'], $this->dateFormatter->format($unix_time, 'custom', 'H:i:s'));
-      }
-    }
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->config('scheduler.settings')
-      ->set('allow_date_only', $form_state->getValue(['allow_date_only']))
-      ->set('default_time', $form_state->getValue('default_time'))
-      ->save();
-
-    parent::submitForm($form, $form_state);
-  }
-
-  /**
-   * Helper method to access the settings of this module.
-   *
-   * @param string $key
-   *   The key of the configuration.
-   *
-   * @return \Drupal\Core\Config\ImmutableConfig
-   *   The value of the config setting equested.
-   */
-  protected function setting($key) {
-    return $this->configFactory->get('scheduler.settings')->get($key);
-  }
-
-}
diff --git a/modules/scheduler/src/Form/SchedulerCronForm.php b/modules/scheduler/src/Form/SchedulerCronForm.php
deleted file mode 100644
index f9abb55..0000000
--- a/modules/scheduler/src/Form/SchedulerCronForm.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Form;
-
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\scheduler\SchedulerManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Scheduler Lightweight Cron form.
- */
-class SchedulerCronForm extends ConfigFormBase {
-
-  /**
-   * The module handler service.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The scheduler manager service.
-   *
-   * @var Drupal\scheduler\SchedulerManager
-   */
-  protected $schedulerManager;
-
-  /**
-   * Creates a SchedulerCronForm instance.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler service.
-   * @var Drupal\scheduler\SchedulerManager $scheduler_manager
-   *   The scheduler manager service.
-   */
-  public function __construct(ModuleHandlerInterface $module_handler, SchedulerManager $scheduler_manager) {
-    $this->moduleHandler = $module_handler;
-    $this->schedulerManager = $scheduler_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('module_handler'), $container->get('scheduler.manager'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'scheduler_cron_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return ['scheduler.settings'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $config = $this->config('scheduler.settings');
-
-    $form['cron_settings'] = [
-      '#type' => 'fieldset',
-      '#title' => $this->t('Lightweight cron settings'),
-    ];
-    $form['cron_settings']['lightweight_log'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Log every activation and completion message.'),
-      '#default_value' => $config->get('log'),
-      '#description' => $this->t('When this option is checked, Scheduler will write an entry to the log every time the lightweight cron process is started and completed. This is useful during set up and testing, but can result in a large number of log entries. Any actions performed during the lightweight cron run will always be logged regardless of this setting.'),
-    ];
-    $form['cron_settings']['lightweight_access_key'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Lightweight cron access key'),
-      '#default_value' => $config->get('lightweight_cron_access_key'),
-      '#required' => TRUE,
-      '#size' => 25,
-      '#description' => $this->t("Similar to Drupal's cron key this acts as a security token to prevent unauthorised calls to scheduler/cron. The key should be passed as scheduler/cron/{access key}"),
-    ];
-    // Add a submit handler function for the key generation.
-    $form['cron_settings']['create_key'][] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Generate new random key'),
-      '#submit' => ['::generateRandomKey'],
-      // No validation at all is required in the equivocate case, so
-      // we include this here to make it skip the form-level validator.
-      '#validate' => [],
-    ];
-    // Add a submit handler function for the form.
-    $form['buttons']['submit_cron'][] = [
-      '#type' => 'submit',
-      '#prefix' => $this->t("You can test Scheduler's lightweight cron process interactively"),
-      '#value' => $this->t("Run Scheduler's lightweight cron now"),
-      '#submit' => ['::runLightweightCron'],
-      // No validation at all is required in the equivocate case, so
-      // we include this here to make it skip the form-level validator.
-      '#validate' => [],
-    ];
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $config = $this->config('scheduler.settings');
-    $config->set('log', $form_state->getValue('lightweight_log'));
-    $config->set('lightweight_cron_access_key', $form_state->getValue('lightweight_access_key'));
-    $config->save();
-    parent::submitForm($form, $form_state);
-  }
-
-  /**
-   * Form submission handler for the random key generation.
-   *
-   * This only fires when the 'Generate new random key' button is clicked.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function generateRandomKey(array &$form, FormStateInterface $form_state) {
-    $config = $this->config('scheduler.settings');
-    $config->set('lightweight_cron_access_key', substr(md5(rand()), 0, 20));
-    $config->save();
-    parent::submitForm($form, $form_state);
-  }
-
-  /**
-   * Form submission handler to run the lightweight cron.
-   *
-   * This only fires when "Run Scheduler's lightweight cron now" is clicked.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function runLightweightCron(array &$form, FormStateInterface $form_state) {
-    $this->schedulerManager->runLightweightCron();
-
-    if ($this->moduleHandler->moduleExists('dblog')) {
-      $url = Url::fromRoute('dblog.overview')->toString();
-      $message = $this->t('Lightweight cron run completed. See the <a href="@url">log</a> for details.', ['@url' => $url]);
-    }
-    else {
-      // If the Database Logging module is not enabled the route to the log
-      // overview does not exist. Show a simple status message.
-      $message = $this->t('Lightweight cron run completed.');
-    }
-    // @todo Replace drupal_set_message() with an injectable service in 8.1.x.
-    // @see https://www.drupal.org/node/2278383
-    drupal_set_message($message);
-  }
-
-}
diff --git a/modules/scheduler/src/Plugin/Field/FieldWidget/TimestampDatetimeNoDefaultWidget.php b/modules/scheduler/src/Plugin/Field/FieldWidget/TimestampDatetimeNoDefaultWidget.php
deleted file mode 100644
index 5127ede..0000000
--- a/modules/scheduler/src/Plugin/Field/FieldWidget/TimestampDatetimeNoDefaultWidget.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Plugin\Field\FieldWidget;
-
-use Drupal\Core\Datetime\DrupalDateTime;
-use Drupal\Core\Datetime\Element\Datetime;
-use Drupal\Core\Datetime\Entity\DateFormat;
-use Drupal\Core\Datetime\Plugin\Field\FieldWidget\TimestampDatetimeWidget;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Plugin implementation of the 'datetime timestamp' widget.
- *
- * @FieldWidget(
- *   id = "datetime_timestamp_no_default",
- *   label = @Translation("Datetime Timestamp for Scheduler"),
- *   description = @Translation("An optional datetime field. Does not provide a default time if left blank. Defined by Scheduler module."),
- *   field_types = {
- *     "timestamp",
- *   }
- * )
- */
-class TimestampDatetimeNoDefaultWidget extends TimestampDatetimeWidget {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element = parent::formElement($items, $delta, $element, $form, $form_state);
-    // Remove 'Leave blank to use the time of form submission' which is in the
-    // #description inherited from TimestampDatetimeWidget. The text here is not
-    // used because it is entirely replaced in scheduler_form_node_form_alter()
-    // However the widget is generic and may be used elsewhere in future.
-    $date_format = DateFormat::load('html_date')->getPattern();
-    $time_format = DateFormat::load('html_time')->getPattern();
-    $element['value']['#description'] = $this->t('Format: %format. Leave blank for no date.', ['%format' => Datetime::formatExample($date_format . ' ' . $time_format)]);
-
-    // Set the callback function to allow interception of the submitted user
-    // input and add the default time if needed. It is too late to try this in
-    // function massageFormValues as the validation has already been done.
-    $element['value']['#value_callback'] = [$this, 'valueCallback'];
-    return $element;
-  }
-
-  /**
-   * Callback function to add default time to the input date if needed.
-   *
-   * This will intercept the user input before form validation is processed.
-   */
-  public static function valueCallback(&$element, $input, FormStateInterface $form_state) {
-    if ($input !== FALSE) {
-      $date_input = $element['#date_date_element'] != 'none' && !empty($input['date']) ? $input['date'] : '';
-      $time_input = $element['#date_time_element'] != 'none' && !empty($input['time']) ? $input['time'] : '';
-      // If there is an input date but no time and the date-only option is on
-      // then set the input time to the default specified by scheduler options.
-      $config = \Drupal::config('scheduler.settings');
-      if (!empty($date_input) && empty($time_input) && $config->get('allow_date_only')) {
-        $input['time'] = $config->get('default_time');
-      }
-    }
-    // Chain on to the standard valueCallback for Datetime as we do not want to
-    // duplicate that core code here.
-    return Datetime::valueCallback($element, $input, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function massageFormValues(array $values, array $form, FormStateInterface $form_state) {
-    foreach ($values as &$item) {
-      // @todo The structure is different whether access is denied or not, to
-      //   be fixed in https://www.drupal.org/node/2326533.
-      $date = NULL;
-      if (isset($item['value']) && $item['value'] instanceof DrupalDateTime) {
-        $date = $item['value'];
-      }
-      elseif (isset($item['value']['object']) && $item['value']['object'] instanceof DrupalDateTime) {
-        $date = $item['value']['object'];
-      }
-
-      $item['value'] = $date ? $date->getTimestamp() : NULL;
-    }
-    return $values;
-  }
-
-}
diff --git a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerPublishOnConstraint.php b/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerPublishOnConstraint.php
deleted file mode 100644
index a7eafe7..0000000
--- a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerPublishOnConstraint.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Plugin\Validation\Constraint;
-
-use Drupal\Core\Entity\Plugin\Validation\Constraint\CompositeConstraintBase;
-
-/**
- * Validates publish on values.
- *
- * @Constraint(
- *   id = "SchedulerPublishOn",
- *   label = @Translation("Scheduler publish on", context = "Validation"),
- *   type = "entity:node"
- * )
- */
-class SchedulerPublishOnConstraint extends CompositeConstraintBase {
-
-  /**
-   * Message shown when publish_on is not the future.
-   *
-   * @var string
-   */
-  public $messagePublishOnDateNotInFuture = "The 'publish on' date must be in the future.";
-
-  /**
-   * {@inheritdoc}
-   */
-  public function coversFields() {
-    return ['publish_on'];
-  }
-
-}
diff --git a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerPublishOnConstraintValidator.php b/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerPublishOnConstraintValidator.php
deleted file mode 100644
index 51ccff9..0000000
--- a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerPublishOnConstraintValidator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Plugin\Validation\Constraint;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-
-/**
- * Validates the SchedulerPublishOn constraint.
- */
-class SchedulerPublishOnConstraintValidator extends ConstraintValidator {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validate($entity, Constraint $constraint) {
-    $publish_on = $entity->value;
-    $default_publish_past_date = \Drupal::config('scheduler.settings')->get('default_publish_past_date');
-    $scheduler_publish_past_date = $entity->getEntity()->type->entity->getThirdPartySetting('scheduler', 'publish_past_date', $default_publish_past_date);
-
-    if ($publish_on && $scheduler_publish_past_date == 'error' && $publish_on < REQUEST_TIME) {
-      $this->context->buildViolation($constraint->messagePublishOnDateNotInFuture)
-        ->atPath('publish_on')
-        ->addViolation();
-    }
-  }
-
-}
diff --git a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerUnpublishOnConstraint.php b/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerUnpublishOnConstraint.php
deleted file mode 100644
index 8523034..0000000
--- a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerUnpublishOnConstraint.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Plugin\Validation\Constraint;
-
-use Drupal\Core\Entity\Plugin\Validation\Constraint\CompositeConstraintBase;
-
-/**
- * Validates unpublish on values.
- *
- * @Constraint(
- *   id = "SchedulerUnpublishOn",
- *   label = @Translation("Scheduler unpublish on", context = "Validation"),
- *   type = "entity:node"
- * )
- */
-class SchedulerUnpublishOnConstraint extends CompositeConstraintBase {
-
-  /**
-   * Message shown when unpublish_on is missing but publish_on has been entered.
-   *
-   * @var string
-   */
-  public $messageUnpublishOnRequiredIfPublishOnEntered = "If you set a 'publish on' date then you must also set an 'unpublish on' date.";
-
-  /**
-   * Message shown when unpublish_on is missing but node is published directly.
-   *
-   * @var string
-   */
-  public $messageUnpublishOnRequiredIfPublishing = "Either you must set an 'unpublish on' date or save this node as unpublished.";
-
-  /**
-   * Message shown when unpublish_on is not in the future.
-   *
-   * @var string
-   */
-  public $messageUnpublishOnDateNotInFuture = "The 'unpublish on' date must be in the future.";
-
-  /**
-   * Message shown when unpublish date is not later than the publish date.
-   *
-   * @var string
-   */
-  public $messageUnpublishOnTooEarly = "The 'unpublish on' date must be later than the 'publish on' date.";
-
-  /**
-   * {@inheritdoc}
-   */
-  public function coversFields() {
-    return ['unpublish_on'];
-  }
-
-}
diff --git a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerUnpublishOnConstraintValidator.php b/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerUnpublishOnConstraintValidator.php
deleted file mode 100644
index 05da801..0000000
--- a/modules/scheduler/src/Plugin/Validation/Constraint/SchedulerUnpublishOnConstraintValidator.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Plugin\Validation\Constraint;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-
-/**
- * Validates the SchedulerUnpublishOn constraint.
- */
-class SchedulerUnpublishOnConstraintValidator extends ConstraintValidator {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validate($entity, Constraint $constraint) {
-    $default_unpublish_required = \Drupal::config('scheduler.settings')->get('default_unpublish_required');
-    $scheduler_unpublish_required = $entity->getEntity()->type->entity->getThirdPartySetting('scheduler', 'unpublish_required', $default_unpublish_required);
-    $publish_on = $entity->getEntity()->publish_on->value;
-    $unpublish_on = $entity->value;
-    $status = $entity->getEntity()->status->value;
-
-    // When the 'required unpublishing' option is enabled the #required form
-    // attribute cannot set in every case. However a value must be entered if
-    // also setting a publish-on date.
-    if ($scheduler_unpublish_required && !empty($publish_on) && empty($unpublish_on)) {
-      $this->context->buildViolation($constraint->messageUnpublishOnRequiredIfPublishOnEntered)
-        ->atPath('unpublish_on')
-        ->addViolation();
-    }
-
-    // Similar to the above scenario, the unpublish-on date must be entered if
-    // the content is being published directly.
-    if ($scheduler_unpublish_required && $status && empty($unpublish_on)) {
-      $this->context->buildViolation($constraint->messageUnpublishOnRequiredIfPublishing)
-        ->atPath('unpublish_on')
-        ->addViolation();
-    }
-
-    // Check that the unpublish-on date is in the future. Unlike the publish-on
-    // field, there is no option to use a past date, as this is not relevant for
-    // unpublshing. The date must ALWAYS be in the future if it is entered.
-    if ($unpublish_on && $unpublish_on < REQUEST_TIME) {
-      $this->context->buildViolation($constraint->messageUnpublishOnDateNotInFuture)
-        ->atPath('unpublish_on')
-        ->addViolation();
-    }
-
-    // If both dates are entered then the unpublish-on date must be later than
-    // the publish-on date.
-    if (!empty($publish_on) && !empty($unpublish_on) && $unpublish_on < $publish_on) {
-      $this->context->buildViolation($constraint->messageUnpublishOnTooEarly)
-        ->atPath('unpublish_on')
-        ->addViolation();
-    }
-  }
-
-}
diff --git a/modules/scheduler/src/Plugin/views/access/Scheduler.php b/modules/scheduler/src/Plugin/views/access/Scheduler.php
deleted file mode 100644
index 4255a7f..0000000
--- a/modules/scheduler/src/Plugin/views/access/Scheduler.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Drupal\scheduler\Plugin\views\access;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableDependencyInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\views\Plugin\views\access\AccessPluginBase;
-use Symfony\Component\Routing\Route;
-
-/**
- * Access plugin that provides access control for Scheduler.
- *
- * @ingroup views_access_plugins
- *
- * @ViewsAccess(
- *   id = "scheduler",
- *   title = @Translation("Scheduled content access"),
- *   help = @Translation("All Scheduler users can see their own scheduled content via their user page. In addition, if they have 'view scheduled content' permission they will be able to see all scheduled content by all authors."),
- * )
- */
-class Scheduler extends AccessPluginBase implements CacheableDependencyInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function access(AccountInterface $account) {
-    return \Drupal::service('access_checker.scheduler_content')->access($account);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterRouteDefinition(Route $route) {
-    $route->setRequirement('_access_scheduler_content', 'TRUE');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheContexts() {
-    return ['user'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheMaxAge() {
-    return Cache::PERMANENT;
-  }
-
-}
diff --git a/modules/scheduler/src/SchedulerEvent.php b/modules/scheduler/src/SchedulerEvent.php
deleted file mode 100644
index ca857e4..0000000
--- a/modules/scheduler/src/SchedulerEvent.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Drupal\scheduler;
-
-use Drupal\Core\Entity\EntityInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * Wraps a scheduler event for event listeners.
- */
-class SchedulerEvent extends Event {
-
-  /**
-   * Node object.
-   *
-   * @var Drupal\Core\Entity\EntityInterface
-   */
-  protected $node;
-
-  /**
-   * Constructs a scheduler event object.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $node
-   *   The node object that caused the event to fire.
-   */
-  public function __construct(EntityInterface $node) {
-    $this->node = $node;
-  }
-
-  /**
-   * Gets node object.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface
-   *   The node object that caused the event to fire.
-   */
-  public function getNode() {
-    return $this->node;
-  }
-
-  /**
-   * Sets the node object.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $node
-   *   The node object that caused the event to fire.
-   */
-  public function setNode(EntityInterface $node) {
-    $this->node = $node;
-  }
-
-}
diff --git a/modules/scheduler/src/SchedulerEvents.php b/modules/scheduler/src/SchedulerEvents.php
deleted file mode 100644
index 404d535..0000000
--- a/modules/scheduler/src/SchedulerEvents.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Drupal\scheduler;
-
-/**
- * Contains all events dispatched by Scheduler.
- */
-final class SchedulerEvents {
-
-  /**
-   * The event triggered after a node is published immediately.
-   *
-   * This event allows modules to react after a node is published immediately.
-   * The event listener method receives a \Drupal\Core\Entity\EntityInterface
-   * instance.
-   *
-   * @Event
-   *
-   * @see \Drupal\scheduler\SchedulerEvent
-   *
-   * @var string
-   */
-  const PUBLISH_IMMEDIATELY = 'scheduler.publish_immediately';
-
-  /**
-   * The event triggered after a node is published via cron.
-   *
-   * This event allows modules to react after a node is published. The event
-   * listener method receives a \Drupal\Core\Entity\EntityInterface instance.
-   *
-   * @Event
-   *
-   * @see \Drupal\scheduler\SchedulerEvent
-   *
-   * @var string
-   */
-  const PUBLISH = 'scheduler.publish';
-
-  /**
-   * The event triggered before a node is published immediately.
-   *
-   * This event allows modules to react before a node is published immediately.
-   * The event listener method receives a \Drupal\Core\Entity\EntityInterface
-   * instance.
-   *
-   * @Event
-   *
-   * @see \Drupal\scheduler\SchedulerEvent
-   *
-   * @var string
-   */
-  const PRE_PUBLISH_IMMEDIATELY = 'scheduler.pre_publish_immediately';
-
-  /**
-   * The event triggered before a node is published via cron.
-   *
-   * This event allows modules to react before a node is published. The event
-   * listener method receives a \Drupal\Core\Entity\EntityInterface
-   * instance.
-   *
-   * @Event
-   *
-   * @see \Drupal\scheduler\SchedulerEvent
-   *
-   * @var string
-   */
-  const PRE_PUBLISH = 'scheduler.pre_publish';
-
-  /**
-   * The event triggered before a node is unpublished via cron.
-   *
-   * This event allows modules to react before a node is unpublished. The
-   * event listener method receives a \Drupal\Core\Entity\EntityInterface
-   * instance.
-   *
-   * @Event
-   *
-   * @see \Drupal\scheduler\SchedulerEvent
-   *
-   * @var string
-   */
-  const PRE_UNPUBLISH = 'scheduler.pre_unpublish';
-
-  /**
-   * The event triggered after a node is unpublished via cron.
-   *
-   * This event allows modules to react after a node is unpublished. The event
-   * listener method receives a \Drupal\Core\Entity\EntityInterface instance.
-   *
-   * @Event
-   *
-   * @see \Drupal\scheduler\SchedulerEvent
-   *
-   * @var string
-   */
-  const UNPUBLISH = 'scheduler.unpublish';
-
-}
diff --git a/modules/scheduler/src/SchedulerManager.php b/modules/scheduler/src/SchedulerManager.php
deleted file mode 100644
index de17b18..0000000
--- a/modules/scheduler/src/SchedulerManager.php
+++ /dev/null
@@ -1,462 +0,0 @@
-<?php
-
-namespace Drupal\scheduler;
-
-use Drupal\Core\Config\ConfigFactory;
-use Drupal\Core\Datetime\DateFormatter;
-use Drupal\Core\Entity\EntityManager;
-use Drupal\Core\Url;
-use Drupal\Core\Extension\ModuleHandler;
-use Drupal\node\Entity\Node;
-use Drupal\node\NodeInterface;
-use Drupal\scheduler\Exception\SchedulerMissingDateException;
-use Drupal\scheduler\Exception\SchedulerNodeTypeNotEnabledException;
-use Psr\Log\LoggerInterface;
-
-/**
- * Defines a scheduler manager.
- */
-class SchedulerManager {
-
-  /**
-   * Date formatter service object.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatter
-   */
-  protected $dateFormatter;
-
-  /**
-   * Scheduler Logger service object.
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  protected $logger;
-
-  /**
-   * Module handler service object.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandler
-   */
-  protected $moduleHandler;
-
-  /**
-   * Entity Manager service object.
-   *
-   * @var \Drupal\Core\Entity\EntityManager
-   */
-  protected $entityManager;
-
-  /**
-   * Config Factory service object.
-   *
-   * @var \Drupal\Core\Config\ConfigFactory
-   */
-  protected $configFactory;
-
-  /**
-   * Constructs a SchedulerManager object.
-   */
-  public function __construct(DateFormatter $dateFormatter, LoggerInterface $logger, ModuleHandler $moduleHandler, EntityManager $entityManager, ConfigFactory $configFactory) {
-    $this->dateFormatter = $dateFormatter;
-    $this->logger = $logger;
-    $this->moduleHandler = $moduleHandler;
-    $this->entityManager = $entityManager;
-    $this->configFactory = $configFactory;
-  }
-
-  /**
-   * Publish scheduled nodes.
-   *
-   * @return bool
-   *   TRUE if any node has been published, FALSE otherwise.
-   *
-   * @throws \Drupal\scheduler\Exception\SchedulerMissingDateException
-   * @throws \Drupal\scheduler\Exception\SchedulerNodeTypeNotEnabledException
-   */
-  public function publish() {
-    // @TODO: \Drupal calls should be avoided in classes.
-    // Replace \Drupal::service with dependency injection?
-    /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher */
-    $dispatcher = \Drupal::service('event_dispatcher');
-
-    $result = FALSE;
-    $action = 'publish';
-
-    // Select all nodes of the types that are enabled for scheduled publishing
-    // and where publish_on is less than or equal to the current time.
-    $nids = [];
-    $scheduler_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types($action));
-    if (!empty($scheduler_enabled_types)) {
-      // @TODO: \Drupal calls should be avoided in classes.
-      // Replace \Drupal::entityQuery with dependency injection?
-      $query = \Drupal::entityQuery('node')
-        ->exists('publish_on')
-        ->condition('publish_on', REQUEST_TIME, '<=')
-        ->condition('type', $scheduler_enabled_types, 'IN')
-        ->sort('publish_on')
-        ->sort('nid');
-      // Disable access checks for this query.
-      // @see https://www.drupal.org/node/2700209
-      $query->accessCheck(FALSE);
-      $nids = $query->execute();
-    }
-
-    // Allow other modules to add to the list of nodes to be published.
-    $nids = array_unique(array_merge($nids, $this->nidList($action)));
-
-    // Allow other modules to alter the list of nodes to be published.
-    $this->moduleHandler->alter('scheduler_nid_list', $nids, $action);
-
-    // In 8.x the entity translations are all associated with one node id
-    // unlike 7.x where each translation was a separate node. This means that
-    // the list of node ids returned above may have some translations that need
-    // processing now and others that do not.
-    $nodes = Node::loadMultiple($nids);
-    // @TODO: Node::loadMultiple calls should be avoided in classes.
-    // Replace with dependency injection?
-    foreach ($nodes as $node_multilingual) {
-
-      // The API calls could return nodes of types which are not enabled for
-      // scheduled publishing, so do not process these. This check can be done
-      // once, here, as the setting will be the same for all translations.
-      if (!$node_multilingual->type->entity->getThirdPartySetting('scheduler', 'publish_enable', $this->setting('default_publish_enable'))) {
-        throw new SchedulerNodeTypeNotEnabledException(sprintf("Node %d '%s' will not be published because node type '%s' is not enabled for scheduled publishing", $node_multilingual->id(), $node_multilingual->getTitle(), node_get_type_label($node_multilingual)));
-      }
-
-      $languages = $node_multilingual->getTranslationLanguages();
-      foreach ($languages as $language) {
-        // The object returned by getTranslation() behaves the same as a $node.
-        $node = $node_multilingual->getTranslation($language->getId());
-
-        // If the current translation does not have a publish on value, or it is
-        // later than the date we are processing then move on to the next.
-        $publish_on = $node->publish_on->value;
-        if (empty($publish_on) || $publish_on > REQUEST_TIME) {
-          continue;
-        }
-
-        // Check that other modules allow the action on this node.
-        if (!$this->isAllowed($node, $action)) {
-          continue;
-        }
-
-        // $node->set('changed', $publish_on) will fail badly if an API call has
-        // removed the date. Trap this as an exception here and give a
-        // meaningful message.
-        // @TODO This will now never be thrown due to the empty(publish_on)
-        // check above to cater for translations. Remove this exception?
-        if (empty($node->publish_on->value)) {
-          $field_definitions = $this->entityManager->getFieldDefinitions('node', $node->getType());
-          $field = (string) $field_definitions['publish_on']->getLabel();
-          throw new SchedulerMissingDateException(sprintf("Node %d '%s' will not be published because field '%s' has no value", $node->id(), $node->getTitle(), $field));
-        }
-
-        // Trigger the PRE_PUBLISH event so that modules can react before the
-        // node is published.
-        $event = new SchedulerEvent($node);
-        $dispatcher->dispatch(SchedulerEvents::PRE_PUBLISH, $event);
-        $node = $event->getNode();
-
-        // Update timestamps.
-        $node->set('changed', $publish_on);
-        $old_creation_date = $node->getCreatedTime();
-        if ($node->type->entity->getThirdPartySetting('scheduler', 'publish_touch', $this->setting('default_publish_touch'))) {
-          $node->setCreatedTime($publish_on);
-        }
-
-        $create_publishing_revision = $node->type->entity->getThirdPartySetting('scheduler', 'publish_revision', $this->setting('default_publish_revision'));
-        if ($create_publishing_revision) {
-          $node->setNewRevision();
-          // Use a core date format to guarantee a time is included.
-          // @TODO: 't' calls should be avoided in classes.
-          // Replace with dependency injection?
-          $node->revision_log = t('Node published by Scheduler on @now. Previous creation date was @date.', [
-            '@now' => $this->dateFormatter->format(REQUEST_TIME, 'short'),
-            '@date' => $this->dateFormatter->format($old_creation_date, 'short'),
-          ]);
-        }
-        // Unset publish_on so the node will not get rescheduled by subsequent
-        // calls to $node->save().
-        $node->publish_on->value = NULL;
-
-        // Log the fact that a scheduled publication is about to take place.
-        $view_link = $node->link(t('View node'));
-        $nodetype_url = Url::fromRoute('entity.node_type.edit_form', ['node_type' => $node->getType()]);
-        // @TODO: \Drupal calls should be avoided in classes.
-        // Replace \Drupal::l with dependency injection?
-        $nodetype_link = \Drupal::l(node_get_type_label($node) . ' ' . t('settings'), $nodetype_url);
-        $logger_variables = [
-          '@type' => node_get_type_label($node),
-          '%title' => $node->getTitle(),
-          'link' => $nodetype_link . ' ' . $view_link,
-        ];
-        $this->logger->notice('@type: scheduled publishing of %title.', $logger_variables);
-
-        // Use the actions system to publish the node.
-        $this->entityManager->getStorage('action')->load('node_publish_action')->getPlugin()->execute($node);
-
-        // Invoke the event to tell Rules that Scheduler has published the node.
-        if ($this->moduleHandler->moduleExists('scheduler_rules_integration')) {
-          _scheduler_rules_integration_dispatch_cron_event($node, 'publish');
-        }
-
-        // Trigger the PUBLISH event so that modules can react after the node is
-        // published.
-        $event = new SchedulerEvent($node);
-        $dispatcher->dispatch(SchedulerEvents::PUBLISH, $event);
-        $event->getNode()->save();
-
-        $result = TRUE;
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * Unpublish scheduled nodes.
-   *
-   * @return bool
-   *   TRUE if any node has been unpublished, FALSE otherwise.
-   *
-   * @throws \Drupal\scheduler\Exception\SchedulerMissingDateException
-   * @throws \Drupal\scheduler\Exception\SchedulerNodeTypeNotEnabledException
-   */
-  public function unpublish() {
-    // @TODO: \Drupal calls should be avoided in classes.
-    // Replace \Drupal::service with dependency injection?
-    /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher */
-    $dispatcher = \Drupal::service('event_dispatcher');
-
-    $result = FALSE;
-    $action = 'unpublish';
-
-    // Select all nodes of the types that are enabled for scheduled unpublishing
-    // and where unpublish_on is less than or equal to the current time.
-    $nids = [];
-    $scheduler_enabled_types = array_keys(_scheduler_get_scheduler_enabled_node_types($action));
-    if (!empty($scheduler_enabled_types)) {
-      // @TODO: \Drupal calls should be avoided in classes.
-      // Replace \Drupal::entityQuery with dependency injection?
-      $query = \Drupal::entityQuery('node')
-        ->exists('unpublish_on')
-        ->condition('unpublish_on', REQUEST_TIME, '<=')
-        ->condition('type', $scheduler_enabled_types, 'IN')
-        ->sort('unpublish_on')
-        ->sort('nid');
-      // Disable access checks for this query.
-      // @see https://www.drupal.org/node/2700209
-      $query->accessCheck(FALSE);
-      $nids = $query->execute();
-    }
-
-    // Allow other modules to add to the list of nodes to be unpublished.
-    $nids = array_unique(array_merge($nids, $this->nidList($action)));
-
-    // Allow other modules to alter the list of nodes to be unpublished.
-    $this->moduleHandler->alter('scheduler_nid_list', $nids, $action);
-
-    // @TODO: Node::loadMultiple calls should be avoided in classes.
-    // Replace with dependency injection?
-    $nodes = Node::loadMultiple($nids);
-    foreach ($nodes as $node_multilingual) {
-      // The API calls could return nodes of types which are not enabled for
-      // scheduled unpublishing. Do not process these.
-      if (!$node_multilingual->type->entity->getThirdPartySetting('scheduler', 'unpublish_enable', $this->setting('default_unpublish_enable'))) {
-        throw new SchedulerNodeTypeNotEnabledException(sprintf("Node %d '%s' will not be unpublished because node type '%s' is not enabled for scheduled unpublishing", $node_multilingual->id(), $node_multilingual->getTitle(), node_get_type_label($node_multilingual)));
-      }
-
-      $languages = $node_multilingual->getTranslationLanguages();
-      foreach ($languages as $language) {
-        // The object returned by getTranslation() behaves the same as a $node.
-        $node = $node_multilingual->getTranslation($language->getId());
-
-        // If the current translation does not have an unpublish on value, or it
-        // is later than the date we are processing then move on to the next.
-        $unpublish_on = $node->unpublish_on->value;
-        if (empty($unpublish_on) || $unpublish_on > REQUEST_TIME) {
-          continue;
-        }
-
-        // Do not process the node if it still has a publish_on time which is in
-        // the past, as this implies that scheduled publishing has been blocked
-        // by one of the hook functions we provide, and is still being blocked
-        // now that the unpublishing time has been reached.
-        $publish_on = $node->publish_on->value;
-        if (!empty($publish_on) && $publish_on <= REQUEST_TIME) {
-          continue;
-        }
-
-        // Check that other modules allow the action on this node.
-        if (!$this->isAllowed($node, $action)) {
-          continue;
-        }
-
-        // $node->set('changed', $unpublish_on) will fail badly if an API call
-        // has removed the date. Trap this as an exception here and give a
-        // meaningful message.
-        // @TODO This will now never be thrown due to the empty(unpublish_on)
-        // check above to cater for translations. Remove this exception?
-        if (empty($unpublish_on)) {
-          $field_definitions = $this->entityManager->getFieldDefinitions('node', $node->getType());
-          $field = (string) $field_definitions['unpublish_on']->getLabel();
-          throw new SchedulerMissingDateException(sprintf("Node %d '%s' will not be unpublished because field '%s' has no value", $node->id(), $node->getTitle(), $field));
-        }
-
-        // Trigger the PRE_UNPUBLISH event so that modules can react before the
-        // node is unpublished.
-        $event = new SchedulerEvent($node);
-        $dispatcher->dispatch(SchedulerEvents::PRE_UNPUBLISH, $event);
-        $node = $event->getNode();
-
-        // Update timestamps.
-        $old_change_date = $node->getChangedTime();
-        $node->set('changed', $unpublish_on);
-
-        $create_unpublishing_revision = $node->type->entity->getThirdPartySetting('scheduler', 'unpublish_revision', $this->setting('default_unpublish_revision'));
-        if ($create_unpublishing_revision) {
-          $node->setNewRevision();
-          // Use a core date format to guarantee a time is included.
-          // @TODO: 't' calls should be avoided in classes.
-          // Replace with dependency injection?
-          $node->revision_log = t('Node unpublished by Scheduler on @now. Previous change date was @date.', [
-            '@now' => $this->dateFormatter->format(REQUEST_TIME, 'short'),
-            '@date' => $this->dateFormatter->format($old_change_date, 'short'),
-          ]);
-        }
-        // Unset unpublish_on so the node will not get rescheduled by subsequent
-        // calls to $node->save(). Save the value for use when calling Rules.
-        $node->unpublish_on->value = NULL;
-
-        // Log the fact that a scheduled unpublication is about to take place.
-        $view_link = $node->link(t('View node'));
-        $nodetype_url = Url::fromRoute('entity.node_type.edit_form', ['node_type' => $node->getType()]);
-        // @TODO: \Drupal calls should be avoided in classes.
-        // Replace \Drupal::l with dependency injection?
-        $nodetype_link = \Drupal::l(node_get_type_label($node) . ' ' . t('settings'), $nodetype_url);
-        $logger_variables = [
-          '@type' => node_get_type_label($node),
-          '%title' => $node->getTitle(),
-          'link' => $nodetype_link . ' ' . $view_link,
-        ];
-        $this->logger->notice('@type: scheduled unpublishing of %title.', $logger_variables);
-
-        // Use the actions system to publish the node.
-        $this->entityManager->getStorage('action')->load('node_unpublish_action')->getPlugin()->execute($node);
-
-        // Invoke event to tell Rules that Scheduler has unpublished this node.
-        if ($this->moduleHandler->moduleExists('scheduler_rules_integration')) {
-          _scheduler_rules_integration_dispatch_cron_event($node, 'unpublish');
-        }
-
-        // Trigger the UNPUBLISH event so that modules can react before the node
-        // is unpublished.
-        $event = new SchedulerEvent($node);
-        $dispatcher->dispatch(SchedulerEvents::UNPUBLISH, $event);
-        $event->getNode()->save();
-
-        $result = TRUE;
-      }
-    }
-
-    return $result;
-  }
-
-  /**
-   * Checks whether a scheduled action on a node is allowed.
-   *
-   * This provides a way for other modules to prevent scheduled publishing or
-   * unpublishing, by implementing hook_scheduler_allow_publishing() or
-   * hook_scheduler_allow_unpublishing().
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node on which the action is to be performed.
-   * @param string $action
-   *   The action that needs to be checked. Can be 'publish' or 'unpublish'.
-   *
-   * @return bool
-   *   TRUE if the action is allowed, FALSE if not.
-   *
-   * @see hook_scheduler_allow_publishing()
-   * @see hook_scheduler_allow_unpublishing()
-   */
-  public function isAllowed(NodeInterface $node, $action) {
-    // Default to TRUE.
-    $result = TRUE;
-    // Check that other modules allow the action.
-    $hook = 'scheduler_allow_' . $action . 'ing';
-    foreach ($this->moduleHandler->getImplementations($hook) as $module) {
-      $function = $module . '_' . $hook;
-      $result &= $function($node);
-    }
-
-    return $result;
-  }
-
-  /**
-   * Gather node IDs for all nodes that need to be $action'ed.
-   *
-   * Modules can implement hook_scheduler_nid_list($action) and return an array
-   * of node ids which will be added to the existing list.
-   *
-   * @param string $action
-   *   The action being performed, either "publish" or "unpublish".
-   *
-   * @return array
-   *   An array of node ids.
-   */
-  public function nidList($action) {
-    $nids = [];
-
-    foreach ($this->moduleHandler->getImplementations('scheduler_nid_list') as $module) {
-      $function = $module . '_scheduler_nid_list';
-      $nids = array_merge($nids, $function($action));
-    }
-
-    return $nids;
-  }
-
-  /**
-   * Run the lightweight cron.
-   *
-   * The Scheduler part of the processing performed here is the same as in the
-   * normal Drupal cron run. The difference is that only scheduler_cron() is
-   * executed, no other modules hook_cron() functions are called.
-   *
-   * This function is called from the external crontab job via url
-   * /scheduler/cron/{access key} or it can be run interactively from the
-   * Scheduler configuration page at /admin/config/content/scheduler/cron.
-   */
-  public function runLightweightCron() {
-    $log = $this->setting('log');
-    if ($log) {
-      $this->logger->notice('Lightweight cron run activated.');
-    }
-    scheduler_cron();
-    if (ob_get_level() > 0) {
-      $handlers = ob_list_handlers();
-      if (isset($handlers[0]) && $handlers[0] == 'default output handler') {
-        ob_clean();
-      }
-    }
-    if ($log) {
-      // @TODO: \Drupal calls should be avoided in classes.
-      // Replace \Drupal::l with dependency injection?
-      $this->logger->notice('Lightweight cron run completed.', ['link' => \Drupal::l(t('settings'), Url::fromRoute('scheduler.cron_form'))]);
-    }
-  }
-
-  /**
-   * Helper method to access the settings of this module.
-   *
-   * @param string $key
-   *   The key of the configuration.
-   *
-   * @return \Drupal\Core\Config\ImmutableConfig
-   *   The value of the configuration item requested.
-   */
-  protected function setting($key) {
-    return $this->configFactory->get('scheduler.settings')->get($key);
-  }
-
-}
diff --git a/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.info.yml b/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.info.yml
deleted file mode 100644
index e23f609..0000000
--- a/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: 'Scheduler Node Access Test'
-type: module
-description: 'Support module for Scheduler restricted node access testing.'
-package: Testing
-# core: 8.x
-dependencies:
-  - scheduler:scheduler
-
-# Information added by Drupal.org packaging script on 2017-11-14
-version: '8.x-1.0'
-core: '8.x'
-project: 'scheduler'
-datestamp: 1510690392
diff --git a/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.install b/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.install
deleted file mode 100644
index 70c7472..0000000
--- a/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.install
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * @file
- * Installation file for Scheduler Access Test module.
- */
-
-/**
- * Implements hook_install().
- */
-function scheduler_access_test_install() {
-  // The function node_access_needs_rebuild() does not exist at install-time
-  // when testing via run-tests.sh, hence protect this from failure. Also we
-  // cannot call node_access_rebuild() directly as the node type does not exist
-  // at this point, either during run-tests.sh or via simpletest.
-  if (function_exists('node_access_needs_rebuild')) {
-    node_access_needs_rebuild(TRUE);
-  }
-}
-
-/**
- * Implements hook_uninstall().
- */
-function scheduler_access_test_uninstall() {
-  node_access_needs_rebuild(TRUE);
-}
diff --git a/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.module b/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.module
deleted file mode 100644
index 2caafbb..0000000
--- a/modules/scheduler/tests/modules/scheduler_access_test/scheduler_access_test.module
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file
- * Installation file for Scheduler Access Test module.
- */
-
-use Drupal\Core\Session\AccountInterface;
-use Drupal\node\NodeInterface;
-
-/**
- * Implements hook_node_access_records().
- */
-function scheduler_access_test_node_access_records(NodeInterface $node) {
-  // For the purpose of this test we deny access to every node regardless of
-  // its published status.
-  $grants = [[
-    'realm' => 'scheduler',
-    'gid' => 1,
-    'grant_view' => 0,
-    'grant_update' => 0,
-    'grant_delete' => 0,
-  ],
-  ];
-  return $grants;
-}
-
-/**
- * Implements hook_node_grants().
- */
-function scheduler_access_test_node_grants(AccountInterface $account, $op) {
-  // This hook needs to exist, but we do not return any grants.
-  return [];
-}
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_form_display.node.scheduler_api_test.default.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_form_display.node.scheduler_api_test.default.yml
deleted file mode 100644
index e943f58..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_form_display.node.scheduler_api_test.default.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.scheduler_api_test.field_approved_publishing
-    - field.field.node.scheduler_api_test.field_approved_unpublishing
-    - node.type.scheduler_api_test
-  module:
-    - path
-    - scheduler
-id: node.scheduler_api_test.default
-targetEntityType: node
-bundle: scheduler_api_test
-mode: default
-content:
-  title:
-    type: string_textfield
-    weight: 0
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 1
-    settings: {  }
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 2
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  created:
-    type: datetime_timestamp
-    weight: 3
-    settings: {  }
-    third_party_settings: {  }
-  promote:
-    type: boolean_checkbox
-    settings:
-      display_label: true
-    weight: 4
-    third_party_settings: {  }
-  sticky:
-    type: boolean_checkbox
-    settings:
-      display_label: true
-    weight: 5
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 6
-    settings: {  }
-    third_party_settings: {  }
-  field_approved_publishing:
-    type: boolean_checkbox
-    weight: 7
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  field_approved_unpublishing:
-    type: boolean_checkbox
-    weight: 8
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  publish_on:
-    type: datetime_timestamp_no_default
-    weight: 9
-    settings: {  }
-    third_party_settings: {  }
-  unpublish_on:
-    type: datetime_timestamp_no_default
-    weight: 10
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_view_display.node.scheduler_api_test.default.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_view_display.node.scheduler_api_test.default.yml
deleted file mode 100644
index 34011b1..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/core.entity_view_display.node.scheduler_api_test.default.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.scheduler_api_test.field_approved_publishing
-    - field.field.node.scheduler_api_test.field_approved_unpublishing
-    - node.type.scheduler_api_test
-  module:
-    - user
-id: node.scheduler_api_test.default
-targetEntityType: node
-bundle: scheduler_api_test
-mode: default
-content:
-  field_approved_publishing:
-    type: boolean
-    weight: 1
-    label: inline
-    settings:
-      format: default
-      format_custom_false: ''
-      format_custom_true: ''
-    third_party_settings: {  }
-  field_approved_unpublishing:
-    type: boolean
-    weight: 1
-    label: inline
-    settings:
-      format: default
-      format_custom_false: ''
-      format_custom_true: ''
-    third_party_settings: {  }
-  links:
-    weight: 0
-    settings: {  }
-    third_party_settings: {  }
-hidden:
-  langcode: true
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_publishing.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_publishing.yml
deleted file mode 100644
index 9d1a167..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_publishing.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_approved_publishing
-    - node.type.scheduler_api_test
-  enforced:
-    module:
-      - scheduler_api_test
-id: node.scheduler_api_test.field_approved_publishing
-field_name: field_approved_publishing
-entity_type: node
-bundle: scheduler_api_test
-label: 'Approved for Publishing'
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 0
-default_value_callback: ''
-settings:
-  on_label: 'Yes'
-  off_label: 'No'
-field_type: boolean
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_unpublishing.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_unpublishing.yml
deleted file mode 100644
index 1902663..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.field.node.scheduler_api_test.field_approved_unpublishing.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_approved_unpublishing
-    - node.type.scheduler_api_test
-  enforced:
-    module:
-      - scheduler_api_test
-id: node.scheduler_api_test.field_approved_unpublishing
-field_name: field_approved_unpublishing
-entity_type: node
-bundle: scheduler_api_test
-label: 'Approved for Unpublishing'
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 0
-default_value_callback: ''
-settings:
-  on_label: 'Yes'
-  off_label: 'No'
-field_type: boolean
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_publishing.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_publishing.yml
deleted file mode 100644
index 76bfedb..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_publishing.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - scheduler_api_test
-id: node.field_approved_publishing
-field_name: field_approved_publishing
-entity_type: node
-type: boolean
-settings: {  }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_unpublishing.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_unpublishing.yml
deleted file mode 100644
index 083b926..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/field.storage.node.field_approved_unpublishing.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  enforced:
-    module:
-      - scheduler_api_test
-id: node.field_approved_unpublishing
-field_name: field_approved_unpublishing
-entity_type: node
-type: boolean
-settings: {  }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/config/install/node.type.scheduler_api_test.yml b/modules/scheduler/tests/modules/scheduler_api_test/config/install/node.type.scheduler_api_test.yml
deleted file mode 100644
index 4e75ce1..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/config/install/node.type.scheduler_api_test.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - menu_ui
-    - scheduler
-  enforced:
-    module:
-      - scheduler_api_test
-third_party_settings:
-  menu_ui:
-    available_menus:
-      - main
-    parent: 'main:'
-  scheduler:
-    expand_fieldset: when_required
-    fields_display_mode: fieldset
-    publish_enable: true
-    publish_past_date: schedule
-    publish_required: false
-    publish_revision: false
-    publish_touch: false
-    unpublish_enable: true
-    unpublish_required: false
-    unpublish_revision: false
-name: 'Scheduler API test type'
-type: scheduler_api_test
-description: 'Used for Scheduler API testing'
-help: ''
-new_revision: false
-preview_mode: 1
-display_submitted: true
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.info.yml b/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.info.yml
deleted file mode 100644
index 1427f62..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: 'Scheduler API Test'
-type: module
-description: 'Support module for Scheduler API-related testing.'
-package: Testing
-# core: 8.x
-dependencies:
-  - scheduler:scheduler
-
-# Information added by Drupal.org packaging script on 2017-11-14
-version: '8.x-1.0'
-core: '8.x'
-project: 'scheduler'
-datestamp: 1510690392
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.install b/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.install
deleted file mode 100644
index d1509db..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.install
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file
- * Install and uninstall hooks for the Scheduler API Test module.
- */
-
-/**
- * Implements hook_uninstall().
- *
- * Although not strictly necessary for testing, it is good practice to tidy up
- * module config and content on uninstalling. Plus, when developing this module
- * and enabling it manually as a real module, this code is needed to clean up,
- * otherwise a re-install fails.
- */
-function scheduler_api_test_uninstall() {
-
-  // Delete any content that may have been created for the custom node type.
-  $nids_query = \Drupal::database()->select('node', 'n')
-    ->fields('n', ['nid'])
-    ->condition('n.type', ['scheduler_api_test'], 'IN')
-    ->execute();
-  if ($nids = $nids_query->fetchCol()) {
-    entity_delete_multiple('node', $nids);
-    drupal_set_message(t('@number %type node(s) have been deleted.', [
-      '@number' => count($nids),
-      '%type' => 'scheduler_api_test',
-    ]));
-  }
-
-  // The content type, custom fields and storage are deleted automatically by
-  // having 'enforced: module: - scheduler_api_test' in the
-  // config/install/*.yml files.
-}
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.module b/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.module
deleted file mode 100644
index 70f0286..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.module
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * @file
- * Hook implementations of the Scheduler API Test module.
- */
-
-use Drupal\node\Entity\Node;
-
-/**
- * Implements hook_scheduler_nid_list().
- */
-function scheduler_api_test_scheduler_nid_list($action) {
-  $nids = [];
-
-  // Check to see what test nodes exist.
-  $query = \Drupal::entityQuery('node');
-  $nodes = Node::loadMultiple($query->execute());
-
-  foreach ($nodes as $nid => $node) {
-    // If publishing and this is the publish test node, set a date and add
-    // the node id to the list.
-    if ($action == 'publish' && $node->title->value == 'API TEST nid_list publish me') {
-      $node->set('publish_on', REQUEST_TIME)->save();
-      $nids[] = $nid;
-    }
-    // If unpublishing and this is the unpublish test node, set a date and add
-    // the node id to the list.
-    if ($action == 'unpublish' && $node->title->value == 'API TEST nid_list unpublish me') {
-      $node->set('unpublish_on', REQUEST_TIME)->save();
-      $nids[] = $nid;
-    }
-  }
-  return $nids;
-}
-
-/**
- * Implements hook_scheduler_nid_list_alter().
- */
-function scheduler_api_test_scheduler_nid_list_alter(&$nids, $action) {
-  $query = \Drupal::entityQuery('node');
-  $nodes = Node::loadMultiple($query->execute());
-
-  foreach ($nodes as $nid => $node) {
-    if ($action == 'publish' && $node->title->value == 'API TEST nid_list_alter do not publish me') {
-      // Remove the node id.
-      $nids = array_diff($nids, [$nid]);
-    }
-    if ($action == 'publish' && $node->title->value == 'API TEST nid_list_alter publish me') {
-      // Set a publish_on date and add the node id.
-      $node->set('publish_on', REQUEST_TIME)->save();
-      $nids[] = $nid;
-    }
-    if ($action == 'unpublish' && $node->title->value == 'API TEST nid_list_alter do not unpublish me') {
-      // Remove the node id.
-      $nids = array_diff($nids, [$nid]);
-    }
-    if ($action == 'unpublish' && $node->title->value == 'API TEST nid_list_alter unpublish me') {
-      // Set an unpublish_on date and add the node id.
-      $node->set('unpublish_on', REQUEST_TIME)->save();
-      $nids[] = $nid;
-    }
-  }
-  return $nids;
-}
-
-/**
- * Implements hook_scheduler_allow_publishing().
- */
-function scheduler_api_test_scheduler_allow_publishing($node) {
-  // If there is no 'Approved for Publishing' field then allow publishing.
-  if (!isset($node->field_approved_publishing)) {
-    $allowed = TRUE;
-  }
-  else {
-    // Only publish nodes that have 'Approved for Publishing' set.
-    $allowed = $node->field_approved_publishing->value;
-    // If publication is denied then inform the user why.
-    if (!$allowed) {
-      drupal_set_message(t('%title is scheduled for publishing, but will not be published until approved.', ['%title' => $node->title->value]), 'status', FALSE);
-      // If the time is in the past it means that the action has been prevented.
-      // Write a dblog message to show this. Give a link to view the node but
-      // cater for no nid as the node may be new and not yet saved.
-      if ($node->publish_on->value <= REQUEST_TIME) {
-        \Drupal::logger('scheduler_api_test')->warning('Publishing of "%title" is prevented until approved.', [
-          '%title' => $node->title->value,
-          'link' => $node->id() ? $node->link(t('View node')) : '',
-        ]);
-      }
-    }
-  }
-  return $allowed;
-}
-
-/**
- * Implements hook_scheduler_allow_unpublishing().
- */
-function scheduler_api_test_scheduler_allow_unpublishing($node) {
-  // If there is no 'Approved for Unpublishing' field then allow unpublishing.
-  if (!isset($node->field_approved_unpublishing)) {
-    $allowed = TRUE;
-  }
-  else {
-    // Only unpublish nodes that have 'Approved for Unpublishing' set.
-    $allowed = $node->field_approved_unpublishing->value;
-    // If unpublication is denied then inform the user why.
-    if (!$allowed) {
-      drupal_set_message(t('%title is scheduled for unpublishing, but will not be unpublished until approved.', ['%title' => $node->title->value]), 'status', FALSE);
-      // If the time is in the past it means that the action has been prevented.
-      // Write a dblog message to show this. Give a link to view the node but
-      // cater for no nid as the node may be new and not yet saved.
-      if ($node->unpublish_on->value <= REQUEST_TIME) {
-        \Drupal::logger('scheduler_api_test')->warning('Unpublishing of "%title" is prevented until approved.', [
-          '%title' => $node->title->value,
-          'link' => $node->id() ? $node->link(t('View node')) : '',
-        ]);
-      }
-    }
-  }
-  return $allowed;
-}
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.services.yml b/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.services.yml
deleted file mode 100644
index 582bcd5..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/scheduler_api_test.services.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-services:
-  scheduler_api_test.event_subscriber:
-    class: Drupal\scheduler_api_test\EventSubscriber
-    tags:
-      - { name: event_subscriber }
diff --git a/modules/scheduler/tests/modules/scheduler_api_test/src/EventSubscriber.php b/modules/scheduler/tests/modules/scheduler_api_test/src/EventSubscriber.php
deleted file mode 100644
index 4efdc6c..0000000
--- a/modules/scheduler/tests/modules/scheduler_api_test/src/EventSubscriber.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-namespace Drupal\scheduler_api_test;
-
-use Drupal\scheduler\SchedulerEvent;
-use Drupal\scheduler\SchedulerEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * Tests events fired on entity objects.
- *
- * These events allow modules to react to the Scheduler process being performed.
- * They are all triggered during Scheduler cron processing with the exception of
- * 'pre_publish_immediately' and 'publish_immediately' which are triggered from
- * scheduler_node_presave().
- *
- * The tests use the standard 'sticky' and 'promote' fields as a simple way to
- * check the processing. Use extra conditional checks on $node->isPublished() to
- * make the tests stronger so they fail if the calls are in the wrong place.
- *
- * To allow this API test module to be enabled interactively (for development
- * and testing) we must avoid unwanted side-effects on other non-test nodes.
- * This is done simply by checking that the node title starts with 'API TEST'.
- *
- * @group scheduler_api_test
- */
-class EventSubscriber implements EventSubscriberInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    // The values in the arrays give the function names below.
-    $events[SchedulerEvents::PRE_PUBLISH][] = ['apiTestPrePublish'];
-    $events[SchedulerEvents::PUBLISH][] = ['apiTestPublish'];
-    $events[SchedulerEvents::PRE_UNPUBLISH][] = ['apiTestPreUnpublish'];
-    $events[SchedulerEvents::UNPUBLISH][] = ['apiTestUnpublish'];
-    $events[SchedulerEvents::PRE_PUBLISH_IMMEDIATELY][] = ['apiTestPrePublishImmediately'];
-    $events[SchedulerEvents::PUBLISH_IMMEDIATELY][] = ['apiTestPublishImmediately'];
-    return $events;
-  }
-
-  /**
-   * Operations to perform before Scheduler publishes a node.
-   *
-   * @param \Drupal\scheduler\SchedulerEvent $event
-   *   The scheduler event.
-   */
-  public function apiTestPrePublish(SchedulerEvent $event) {
-    /** @var \Drupal\node\Entity\Node $node */
-    $node = $event->getNode();
-    // Before publishing a node make it sticky.
-    if (!$node->isPublished() && strpos($node->title->value, 'API TEST') === 0) {
-      $node->setSticky(TRUE);
-      $event->setNode($node);
-    }
-  }
-
-  /**
-   * Operations to perform before Scheduler unpublishes a node.
-   *
-   * @param \Drupal\scheduler\SchedulerEvent $event
-   *   The scheduler event.
-   */
-  public function apiTestPreUnpublish(SchedulerEvent $event) {
-    /** @var \Drupal\node\Entity\Node $node */
-    $node = $event->getNode();
-    if ($node->isPublished() && strpos($node->title->value, 'API TEST') === 0) {
-      // Before unpublishing a node make it unsticky.
-      $node->setSticky(FALSE);
-      $event->setNode($node);
-    }
-  }
-
-  /**
-   * Operations before Scheduler publishes a node immediately not via cron.
-   *
-   * @param \Drupal\scheduler\SchedulerEvent $event
-   *   The scheduler event.
-   */
-  public function apiTestPrePublishImmediately(SchedulerEvent $event) {
-    /** @var \Drupal\node\Entity\Node $node */
-    $node = $event->getNode();
-    // Before publishing immediately set the node to sticky.
-    if (!$node->isPromoted() && strpos($node->title->value, 'API TEST') === 0) {
-      $node->setSticky(TRUE);
-      $event->setNode($node);
-    }
-  }
-
-  /**
-   * Operations to perform after Scheduler publishes a node.
-   *
-   * @param \Drupal\scheduler\SchedulerEvent $event
-   *   The scheduler event.
-   */
-  public function apiTestPublish(SchedulerEvent $event) {
-    /** @var \Drupal\node\Entity\Node $node */
-    $node = $event->getNode();
-    // After publishing a node promote it to the front page.
-    if ($node->isPublished() && strpos($node->title->value, 'API TEST') === 0) {
-      $node->setPromoted(TRUE);
-      $event->setNode($node);
-    }
-  }
-
-  /**
-   * Operations to perform after Scheduler unpublishes a node.
-   *
-   * @param \Drupal\scheduler\SchedulerEvent $event
-   *   The scheduler event.
-   */
-  public function apiTestUnpublish(SchedulerEvent $event) {
-    /** @var \Drupal\node\Entity\Node $node */
-    $node = $event->getNode();
-    // After unpublishing a node remove it from the front page.
-    if (!$node->isPublished() && strpos($node->title->value, 'API TEST') === 0) {
-      $node->setPromoted(FALSE);
-      $event->setNode($node);
-    }
-  }
-
-  /**
-   * Operations after Scheduler publishes a node immediately not via cron.
-   *
-   * @param \Drupal\scheduler\SchedulerEvent $event
-   *   The scheduler event.
-   */
-  public function apiTestPublishImmediately(SchedulerEvent $event) {
-    /** @var \Drupal\node\Entity\Node $node */
-    $node = $event->getNode();
-    // After publishing immediately set the node to promoted and change the
-    // title.
-    if (!$node->isPromoted() && strpos($node->title->value, 'API TEST') === 0) {
-      $node->setTitle('Published immediately')
-        ->setPromoted(TRUE);
-      $event->setNode($node);
-    }
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerAdminSettingsTest.php b/modules/scheduler/tests/src/Functional/SchedulerAdminSettingsTest.php
deleted file mode 100644
index 7c8a999..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerAdminSettingsTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-/**
- * Tests the admin settings page of Scheduler.
- *
- * @group scheduler
- */
-class SchedulerAdminSettingsTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Test the admin settings page.
-   */
-  public function testAdminSettings() {
-    $this->drupalLogin($this->adminUser);
-
-    // Check that the correct default time is added to the scheduled date.
-    // For testing we use an offset of 6 hours 30 minutes (23400 seconds).
-    $this->seconds = 23400;
-    // If the test happens to be run at a time when '+1 day' puts the calculated
-    // publishing date into a different daylight-saving period then formatted
-    // time can be an hour different. To avoid these failures we use a fixed
-    // string when asserting the message and looking for field values.
-    // @see https://www.drupal.org/node/2809627
-    $this->seconds_formatted = '06:30:00';
-    // In $edit use '6:30' not '06:30:00' to test flexibility.
-    $settings = [
-      'allow_date_only' => TRUE,
-      'default_time' => '6:30',
-    ];
-    $this->drupalPostForm('admin/config/content/scheduler', $settings, t('Save configuration'));
-
-    // Verify that the values have been saved correctly.
-    $this->assertTrue($this->config('scheduler.settings')->get('allow_date_only'), 'The config setting for allow_date_only is stored correctly.');
-    $this->assertEqual($this->config('scheduler.settings')->get('default_time'), $this->seconds_formatted, 'The config setting for default_time is stored correctly.');
-
-    // Try to save an invalid time value.
-    $settings = [
-      'allow_date_only' => TRUE,
-      'default_time' => '123',
-    ];
-    $this->drupalPostForm('admin/config/content/scheduler', $settings, t('Save configuration'));
-    // Verify that an error is displayed and the value has not been saved.
-    $this->assertEqual($this->config('scheduler.settings')->get('default_time'), $this->seconds_formatted, 'The config setting for default_time has not changed.');
-    $this->assertText('The default time should be in the format HH:MM:SS', 'When an invalid default time is entered the correct error message is displayed.');
-
-    // Show the status report, which includes the Scheduler timecheck.
-    $this->drupalGet('admin/reports/status');
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerApiTest.php b/modules/scheduler/tests/src/Functional/SchedulerApiTest.php
deleted file mode 100644
index 278beaa..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerApiTest.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\node\Entity\NodeType;
-
-/**
- * Tests the API of the Scheduler module.
- *
- * @group scheduler
- */
-class SchedulerApiTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Additional modules required.
-   *
-   * @var array
-   *
-   * @TODO 'menu_ui' is in the exported node.type definition, and 'path' is in
-   * the entity_form_display. Could these be removed from the config files and
-   * then not needed here?
-   */
-  public static $modules = ['scheduler_api_test', 'menu_ui', 'path'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Load the custom node type. It will be enabled for Scheduler automatically
-    // as that is pre-configured in node.type.scheduler_api_test.yml.
-    $this->customName = 'scheduler_api_test';
-    $this->customNodetype = NodeType::load($this->customName);
-
-    // Check that the custom node type has loaded OK.
-    $this->assertNotNull($this->customNodetype, 'Custom node type "' . $this->customName . '"  was created during install');
-
-    // Create a web user for this content type.
-    $this->webUser = $this->drupalCreateUser([
-      'create ' . $this->customName . ' content',
-      'edit any ' . $this->customName . ' content',
-      'schedule publishing of nodes',
-    ]);
-
-  }
-
-  /**
-   * Covers hook_scheduler_allow_publishing()
-   *
-   * This hook can allow or deny the publishing of individual nodes. This test
-   * uses the customised content type which has checkboxes 'Approved for
-   * publication' and 'Approved for unpublication'.
-   *
-   * @todo Create and update the nodes through the interface so we can check if
-   *   the correct messages are displayed.
-   */
-  public function testAllowedPublishing() {
-    $this->drupalLogin($this->webUser);
-    // Check the 'approved for publishing' field is shown on the node form.
-    $this->drupalGet('node/add/' . $this->customName);
-    $this->assertFieldById('edit-field-approved-publishing-value', NULL, 'The "Approved for publishing" field is shown on the node form');
-
-    // Check that the message is shown when scheduling a node for publishing
-    // which is not yet allowed to be published.
-    $edit = [
-      'title[0][value]' => 'Set publish-on date without approval',
-      'publish_on[0][value][date]' => date('Y-m-d', time() + 3),
-      'publish_on[0][value][time]' => date('H:i:s', time() + 3),
-    ];
-    $this->drupalPostForm('node/add/' . $this->customName, $edit, t('Save'));
-    $this->assertText('is scheduled for publishing, but will not be published until approved.', 'The message is shown when scheduling a node which is not yet allowed to be published.');
-
-    // Create a node that is scheduled but not approved for publication. Then
-    // simulate a cron run, and check that the node is still not published.
-    $node = $this->createUnapprovedNode('publish_on');
-    scheduler_cron();
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertFalse($node->isPublished(), 'An unapproved node is not published during cron processing.');
-
-    // Create a node and approve it for publication, simulate a cron run and
-    // check that the node is published. This is a stronger test than simply
-    // approving the previously used node above, as we do not know what publish
-    // state that may be in after the cron run above.
-    $node = $this->createUnapprovedNode('publish_on');
-    $this->approveNode($node->id(), 'field_approved_publishing');
-    $this->assertFalse($node->isPublished(), 'A new approved node is initially not published.');
-    scheduler_cron();
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertTrue($node->isPublished(), 'An approved node is published during cron processing.');
-
-    // Turn on immediate publication of nodes with publication dates in the past
-    // and repeat the tests. It is not needed to simulate cron runs here.
-    $this->customNodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'publish')->save();
-    $node = $this->createUnapprovedNode('publish_on');
-    $this->assertFalse($node->isPublished(), 'An unapproved node with a date in the past is not published immediately after saving.');
-
-    // Check that the node can be approved and published programatically.
-    $this->approveNode($node->id(), 'field_approved_publishing');
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertTrue($node->isPublished(), 'An approved node with a date in the past is published immediately via $node->set()->save().');
-
-    // Check that a node can be approved and published via edit form.
-    $node = $this->createUnapprovedNode('publish_on');
-    $this->drupalPostForm('node/' . $node->id() . '/edit', ['field_approved_publishing[value]' => '1'], t('Save'));
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertTrue($node->isPublished(), 'An approved node with a date in the past is published immediately after saving via edit form.');
-
-    // Show the dblog messages.
-    $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/reports/dblog');
-  }
-
-  /**
-   * Covers hook_scheduler_allow_unpublishing()
-   *
-   * This hook can allow or deny the unpublishing of individual nodes. This test
-   * is simpler than the test sequence for allowed publishing, because the past
-   * date 'publish' option is not applicable.
-   */
-  public function testAllowedUnpublishing() {
-    $this->drupalLogin($this->webUser);
-    // Check the 'approved for unpublishing' field is shown on the node form.
-    $this->drupalGet('node/add/' . $this->customName);
-    $this->assertFieldById('edit-field-approved-unpublishing-value', NULL, 'The "Approved for unpublishing" field is shown on the node form');
-
-    // Check that the message is shown when scheduling a node for unpublishing
-    // which is not yet allowed to be unpublished.
-    $edit = [
-      'title[0][value]' => 'Set unpublish-on date without approval',
-      'unpublish_on[0][value][date]' => date('Y-m-d', time() + 3),
-      'unpublish_on[0][value][time]' => date('H:i:s', time() + 3),
-    ];
-    $this->drupalPostForm('node/add/' . $this->customName, $edit, t('Save'));
-    $this->assertText('is scheduled for unpublishing, but will not be unpublished until approved.', 'The message is shown when scheduling a node which is not yet allowed to be unpublished.');
-
-    // Create a node that is scheduled but not approved for unpublication. Then
-    // simulate a cron run, and check that the node is still published.
-    $node = $this->createUnapprovedNode('unpublish_on');
-    scheduler_cron();
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertTrue($node->isPublished(), 'An unapproved node is not unpublished during cron processing.');
-
-    // Create a node, then approve it for unpublishing, simulate a cron run and
-    // check that the node is now unpublished.
-    $node = $this->createUnapprovedNode('unpublish_on');
-    $this->approveNode($node->id(), 'field_approved_unpublishing');
-    $this->assertTrue($node->isPublished(), 'A new approved node is initially published.');
-    scheduler_cron();
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertFalse($node->isPublished(), 'An approved node is unpublished during cron processing.');
-
-    // Show the dblog messages.
-    $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/reports/dblog');
-  }
-
-  /**
-   * Creates a new node that is not approved.
-   *
-   * The node has a publish/unpublish date in the past to make sure it will be
-   * included in the next cron run.
-   *
-   * @param string $date_field
-   *   The Scheduler date field to set, either 'publish_on' or 'unpublish_on'.
-   *
-   * @return \Drupal\node\NodeInterface
-   *   A node object.
-   */
-  protected function createUnapprovedNode($date_field) {
-    $settings = [
-      'status' => ($date_field == 'unpublish_on'),
-      $date_field => strtotime('-1 day'),
-      'field_approved_publishing' => 0,
-      'field_approved_unpublishing' => 0,
-      'type' => $this->customName,
-    ];
-    return $this->drupalCreateNode($settings);
-  }
-
-  /**
-   * Approves a node for publication or unpublication.
-   *
-   * @param int $nid
-   *   The id of the node to approve.
-   * @param string $field_name
-   *   The name of the field to set, either 'field_approved_publishing' or
-   *   'field_approved_unpublishing'.
-   */
-  protected function approveNode($nid, $field_name) {
-    $this->nodeStorage->resetCache([$nid]);
-    $node = $this->nodeStorage->load($nid);
-    $node->set($field_name, TRUE)->save();
-  }
-
-  /**
-   * Covers six events.
-   *
-   * The events allow other modules to react to the Scheduler process being run.
-   * The API test implementations of the event listeners alter the nodes
-   * 'promote' and 'sticky' settings and changes the title.
-   */
-  public function testApiNodeAction() {
-    $this->drupalLogin($this->schedulerUser);
-
-    // Create a test node. Having the 'approved' fields here would complicate
-    // the tests, so use the ordinary page type.
-    $settings = [
-      'publish_on' => strtotime('-1 day'),
-      'type' => $this->type,
-      'promote' => FALSE,
-      'sticky' => FALSE,
-      'title' => 'API TEST node action',
-    ];
-    $node = $this->drupalCreateNode($settings);
-
-    // Check that the 'sticky' and 'promote' fields are off for the new node.
-    $this->assertFalse($node->isSticky(), 'The unpublished node is not sticky.');
-    $this->assertFalse($node->isPromoted(), 'The unpublished node is not promoted.');
-
-    // Run cron and check that hook_scheduler_api() has executed correctly, by
-    // verifying that the node has become promoted and is sticky.
-    scheduler_cron();
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertTrue($node->isSticky(), 'API action "PRE_PUBLISH" has changed the node to sticky.');
-    $this->assertTrue($node->isPromoted(), 'API action "PUBLISH" has changed the node to promoted.');
-
-    // Now set a date for unpublishing the node. Ensure 'sticky' and 'promote'
-    // are set, so that the assertions are not affected by any failures above.
-    $node->set('unpublish_on', strtotime('-1 day'))
-      ->set('sticky', TRUE)->set('promote', TRUE)->save();
-
-    // Run cron and check that hook_scheduler_api() has executed correctly, by
-    // verifying that the node is not promoted and no longer sticky.
-    scheduler_cron();
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertFalse($node->isSticky(), 'API action "PRE_UNPUBLISH" has changed the node to not sticky.');
-    $this->assertFalse($node->isPromoted(), 'API action "UNPUBLISH" has changed the node to not promoted.');
-
-    // Turn on immediate publication when a publish date is in the past.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'publish')->save();
-
-    // Ensure 'sticky' and 'promote' are not set, so that the assertions are not
-    // affected by any failures above.
-    $node->set('sticky', FALSE)->set('promote', FALSE)->save();
-
-    // Edit the node and set a publish-on date in the past.
-    $edit = [
-      'publish_on[0][value][date]' => date('Y-m-d', strtotime('-2 day', REQUEST_TIME)),
-      'publish_on[0][value][time]' => date('H:i:s', strtotime('-2 day', REQUEST_TIME)),
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    // Verify that the values have been altered as expected.
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertTrue($node->isSticky(), 'API action "PRE_PUBLISH_IMMEDIATELY" has changed the node to sticky.');
-    $this->assertTrue($node->isPromoted(), 'API action "PUBLISH_IMMEDIATELY" has changed the node to promoted.');
-    $this->assertEqual($node->title->value, 'Published immediately', 'API action "PUBLISH_IMMEDIATELY" has changed the node title correctly.');
-  }
-
-  /**
-   * Covers hook_scheduler_nid_list($action)
-   *
-   * Hook_scheduler_nid_list() allows other modules to add more node ids into
-   * the list to be processed. In real scenarios, the third-party module would
-   * likely have more complex data structures and/or tables from which to
-   * identify nodes to add. In this test, to keep it simple, we identify nodes
-   * by the text of the title.
-   */
-  public function testNidList() {
-    $this->drupalLogin($this->schedulerUser);
-
-    // Create test nodes. Use the ordinary page type for this test, as having
-    // the 'approved' fields here would unnecessarily complicate the processing.
-    // Node 1 is not published and has no publishing date set. The test API
-    // module will add node 1 into the list to be published.
-    $node1 = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => FALSE,
-      'title' => 'API TEST nid_list publish me',
-    ]);
-    // Node 2 is published and has no unpublishing date set. The test API module
-    // will add node 2 into the list to be unpublished.
-    $node2 = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => TRUE,
-      'title' => 'API TEST nid_list unpublish me',
-    ]);
-
-    // Before cron, check node 1 is unpublished and node 2 is published.
-    $this->assertFalse($node1->isPublished(), 'Before cron, node 1 "' . $node1->title->value . '" is unpublished.');
-    $this->assertTrue($node2->isPublished(), 'Before cron, node 2 "' . $node2->title->value . '" is published.');
-
-    // Run cron and refresh the nodes.
-    scheduler_cron();
-    $this->nodeStorage->resetCache();
-    $node1 = $this->nodeStorage->load($node1->id());
-    $node2 = $this->nodeStorage->load($node2->id());
-
-    // Check node 1 is published and node 2 is unpublished.
-    $this->assertTrue($node1->isPublished(), 'After cron, node 1 "' . $node1->title->value . '" is published.');
-    $this->assertFalse($node2->isPublished(), 'After cron, node 2 "' . $node2->title->value . '" is unpublished.');
-  }
-
-  /**
-   * Covers hook_scheduler_nid_list_alter($action)
-   *
-   * This hook allows other modules to add or remove node ids from the list to
-   * be processed. As in testNidList() we make it simple by using the title text
-   * to identify which nodes to act on.
-   */
-  public function testNidListAlter() {
-    $this->drupalLogin($this->schedulerUser);
-
-    // Create test nodes. Use the ordinary page type for this test, as having
-    // the 'approved' fields here would unnecessarily complicate the processing.
-    // Node 1 is set for scheduled publishing, but will be removed by the test
-    // API hook_nid_list_alter().
-    $node1 = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => FALSE,
-      'title' => 'API TEST nid_list_alter do not publish me',
-      'publish_on' => strtotime('-1 day'),
-    ]);
-
-    // Node 2 is not published and has no publishing date set. The test API
-    // module will add node 2 into the list to be published.
-    $node2 = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => FALSE,
-      'title' => 'API TEST nid_list_alter publish me',
-    ]);
-
-    // Node 3 is set for scheduled unpublishing, but will be removed by the test
-    // API hook_nid_list_alter().
-    $node3 = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => TRUE,
-      'title' => 'API TEST nid_list_alter do not unpublish me',
-      'unpublish_on' => strtotime('-1 day'),
-    ]);
-
-    // Node 4 is published and has no unpublishing date set. The test API module
-    // will add node 4 into the list to be unpublished.
-    $node4 = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => TRUE,
-      'title' => 'API TEST nid_list_alter unpublish me',
-    ]);
-
-    // Check node 1 and 2 are unpublished and node 3 and 4 are published.
-    $this->assertFalse($node1->isPublished(), 'Before cron, node 1 "' . $node1->title->value . '" is unpublished.');
-    $this->assertFalse($node2->isPublished(), 'Before cron, node 2 "' . $node2->title->value . '" is unpublished.');
-    $this->assertTrue($node3->isPublished(), 'Before cron, node 3 "' . $node3->title->value . '" is published.');
-    $this->assertTrue($node4->isPublished(), 'Before cron, node 4 "' . $node4->title->value . '" is published.');
-
-    // Run cron and refresh the nodes.
-    scheduler_cron();
-    $this->nodeStorage->resetCache();
-    $node1 = $this->nodeStorage->load($node1->id());
-    $node2 = $this->nodeStorage->load($node2->id());
-    $node3 = $this->nodeStorage->load($node3->id());
-    $node4 = $this->nodeStorage->load($node4->id());
-
-    // Check node 2 and 3 are published and node 1 and 4 are unpublished.
-    $this->assertFalse($node1->isPublished(), 'After cron, node 1 "' . $node1->title->value . '" is still unpublished.');
-    $this->assertTrue($node2->isPublished(), 'After cron, node 2 "' . $node2->title->value . '" is published.');
-    $this->assertTrue($node3->isPublished(), 'After cron, node 3 "' . $node3->title->value . '" is still published.');
-    $this->assertFalse($node4->isPublished(), 'After cron, node 4 "' . $node4->title->value . '" is unpublished.');
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerBasicTest.php b/modules/scheduler/tests/src/Functional/SchedulerBasicTest.php
deleted file mode 100644
index 3e7920f..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerBasicTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-/**
- * Tests the modules primary function - publishing and unpublishing content.
- *
- * @group scheduler
- */
-class SchedulerBasicTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Tests basic scheduling of content.
-   */
-  public function testPublishingAndUnpublishing() {
-    // Login is required here before creating the publish_on date and time
-    // values so that date.formatter can utilise the current users timezone. The
-    // constraints receive values which have been converted using the users
-    // timezone so they need to be consistent.
-    $this->drupalLogin($this->schedulerUser);
-
-    // Create node values. Set time to one hour in the future.
-    $edit = [
-      'title[0][value]' => 'Publish This Node',
-      'publish_on[0][value][date]' => \Drupal::service('date.formatter')->format(time() + 3600, 'custom', 'Y-m-d'),
-      'publish_on[0][value][time]' => \Drupal::service('date.formatter')->format(time() + 3600, 'custom', 'H:i:s'),
-    ];
-    $this->helpTestScheduler($edit);
-
-    // Remove publish_on and set unpublish_on, then run basic tests again.
-    $edit['unpublish_on[0][value][date]'] = $edit['publish_on[0][value][date]'];
-    $edit['unpublish_on[0][value][time]'] = $edit['publish_on[0][value][time]'];
-    unset($edit['publish_on[0][value][date]']);
-    unset($edit['publish_on[0][value][time]']);
-    // Need a new title for the new node, as we identify the node by title.
-    $edit['title[0][value]'] = 'Unpublish This Node';
-    $this->helpTestScheduler($edit);
-  }
-
-  /**
-   * Helper function for testPublishingAndUnpublishing().
-   *
-   * Schedules content, runs cron and asserts status.
-   */
-  protected function helpTestScheduler($edit) {
-    $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
-    // Verify that the node was created.
-    $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
-    $this->assertTrue($node, sprintf('"%s" was created sucessfully.', $edit['title[0][value]']));
-    if (empty($node)) {
-      $this->assert(FALSE, 'Test halted because node was not created.');
-      return;
-    }
-
-    // Assert that the node is correctly published or unpublished.
-    if (isset($edit['publish_on[0][value][date]'])) {
-      $key = 'publish_on';
-      $this->assertFalse($node->isPublished(), 'Node is unpublished before Cron');
-    }
-    else {
-      $key = 'unpublish_on';
-      $this->assertTrue($node->isPublished(), 'Node is published before Cron');
-    }
-
-    // Modify the scheduler field data to a time in the past, then run cron.
-    $node->$key = REQUEST_TIME - 1;
-    $node->save();
-    $this->cronRun();
-
-    // Refresh the node cache and check the node status.
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    if ($key == 'publish_on') {
-      $this->assertTrue($node->isPublished(), 'Node is published after Cron');
-    }
-    else {
-      $this->assertFalse($node->isPublished(), 'Node is unpublished after Cron');
-    }
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerBrowserTestBase.php b/modules/scheduler/tests/src/Functional/SchedulerBrowserTestBase.php
deleted file mode 100644
index 828554a..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerBrowserTestBase.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Base class to provide common test setup.
- *
- * Extends the preferred BrowserTestBase instead of the old WebTestBase.
- */
-abstract class SchedulerBrowserTestBase extends BrowserTestBase {
-
-  /**
-   * The profile to install as a basis for testing.
-   *
-   * @var string
-   */
-  protected $profile = 'testing';
-
-  /**
-   * The standard modules to be loaded for all tests.
-   *
-   * @var array
-   */
-  public static $modules = ['scheduler', 'dblog'];
-
-  /**
-   * A user with administration rights.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $adminUser;
-
-  /**
-   * A user with permission to schedule content.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $schedulerUser;
-
-  /**
-   * The internal name of the standard content type created for testing.
-   *
-   * @var string
-   */
-  protected $type;
-
-  /**
-   * The readable name of the standard content type created for testing.
-   *
-   * @var string
-   */
-  protected $typeName;
-
-  /**
-   * The node type.
-   *
-   * @var \Drupal\node\Entity\NodeType
-   */
-  protected $nodetype;
-
-  /**
-   * The node storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $nodeStorage;
-
-  /**
-   * The Database Connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Create a 'Basic Page' content type, with 'page' as the identifier.
-    // The test files should use $this->type and $this->typeName and not use
-    // $this->nodetype->get('type') or $this->nodetype->get('name'), nor have
-    // the hard-coded strings 'page' and 'Basic page'.
-    $this->type = 'page';
-    $this->typeName = 'Basic page';
-    /** @var NodeTypeInterface $nodetype */
-    $this->nodetype = $this->drupalCreateContentType([
-      'type' => $this->type,
-      'name' => $this->typeName,
-    ]);
-
-    // Add scheduler functionality to the node type.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_enable', TRUE)
-      ->setThirdPartySetting('scheduler', 'unpublish_enable', TRUE)
-      ->save();
-
-    // Define nodeStorage for use in many tests.
-    /** @var EntityStorageInterface $nodeStorage */
-    $this->nodeStorage = $this->container->get('entity.manager')->getStorage('node');
-
-    // Create an administrator user having the main admin permissions, full
-    // rights on the 'page' content type and all of the Scheduler permissions.
-    // 'access site reports' is required for admin/reports/dblog.
-    // 'administer site configuration' is required for admin/reports/status.
-    $this->adminUser = $this->drupalCreateUser([
-      'administer nodes',
-      'access content',
-      'access content overview',
-      'access site reports',
-      'administer site configuration',
-      'create ' . $this->type . ' content',
-      'edit own ' . $this->type . ' content',
-      'delete own ' . $this->type . ' content',
-      'view own unpublished content',
-      'administer scheduler',
-      'schedule publishing of nodes',
-      'view scheduled content',
-    ]);
-
-    // Create an ordinary Scheduler user, with permission to create and schedule
-    // content but not with administrator permissions.
-    $this->schedulerUser = $this->drupalCreateUser([
-      'create ' . $this->type . ' content',
-      'edit own ' . $this->type . ' content',
-      'delete own ' . $this->type . ' content',
-      'view own unpublished content',
-      'schedule publishing of nodes',
-      'view scheduled content',
-    ]);
-
-    // Store the database connection for re-use in the actual tests.
-    $this->database = $this->container->get('database');
-
-  }
-
-  /**
-   * Run standard Drupal cron.
-   *
-   * This replicates the standard cronRun function to allow the Scheduler tests
-   * that use this to be converted from WebTestBase to BrowserTestBase.
-   *
-   * @TODO Delete this function after it has been added to BrowserTestBase.
-   *
-   * Update Jan 2017: cronRun() has been committed to core 8.4 and 8.3 but will
-   * not be added to 8.2. Therefore we still need it here whilst we are using
-   * 8.2 for testing.
-   * @see https://www.drupal.org/node/2795037
-   */
-  public function cronRun() {
-    $this->drupalGet('cron/' . \Drupal::state()->get('system.cron_key'));
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerDefaultTimeTest.php b/modules/scheduler/tests/src/Functional/SchedulerDefaultTimeTest.php
deleted file mode 100644
index a0d0a22..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerDefaultTimeTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-/**
- * Tests the default time functionality.
- *
- * @group scheduler
- */
-class SchedulerDefaultTimeTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Test the default time functionality during content creation and edit.
-   */
-  public function testDefaultTime() {
-    $this->drupalLogin($this->schedulerUser);
-    $config = $this->config('scheduler.settings');
-    $date_formatter = \Drupal::service('date.formatter');
-
-    // For this test we use an offset of 6 hours 30 minutes (23400 seconds).
-    $seconds = 23400;
-
-    // If the test happens to be run at a time when '+1 day' puts the calculated
-    // publishing date into a different daylight-saving period then formatted
-    // time can be an hour different. To avoid these failures we use a fixed
-    // string when asserting the message and looking for field values.
-    // @see https://www.drupal.org/node/2809627
-    $seconds_formatted = '06:30:00';
-    $config->set('default_time', $seconds_formatted)->save();
-
-    // We cannot easily test the exact validation messages as they contain the
-    // REQUEST_TIME, which can be one or more seconds in the past. Best we can
-    // do is check the fixed part of the message as it is when passed to t() in
-    // Datetime::validateDatetime. This will only work in English.
-    $publish_validation_message = 'The Publish on date is invalid.';
-    $unpublish_validation_message = 'The Unpublish on date is invalid.';
-
-    // First test with the "date only" functionality disabled.
-    $config->set('allow_date_only', FALSE)->save();
-
-    // Test that entering a time is required.
-    $edit = [
-      'title[0][value]' => 'No time ' . $this->randomString(15),
-      'publish_on[0][value][date]' => $date_formatter->format(strtotime('+1 day', REQUEST_TIME), 'custom', 'Y-m-d'),
-      'unpublish_on[0][value][date]' => $date_formatter->format(strtotime('+2 day', REQUEST_TIME), 'custom', 'Y-m-d'),
-    ];
-    // Create a node and check that the expected error messages are shown.
-    $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
-    $this->assertSession()->pageTextContains($publish_validation_message, 'By default it is required to enter a time when scheduling content for publication.');
-    $this->assertSession()->pageTextContains($unpublish_validation_message, 'By default it is required to enter a time when scheduling content for unpublication.');
-
-    // Allow the user to enter only a date with no time.
-    $config->set('allow_date_only', TRUE)->save();
-
-    // Create a node and check that the expected error messages are not shown.
-    $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
-    $this->assertSession()->pageTextNotContains($publish_validation_message, 'If the default time option is enabled the user can skip the time when scheduling content for publication.');
-    $this->assertSession()->pageTextNotContains($unpublish_validation_message, 'If the default time option is enabled the user can skip the time when scheduling content for unpublication.');
-
-    // Check that the scheduled information is shown after saving.
-    $publish_time = strtotime('+1 day midnight', REQUEST_TIME) + $seconds;
-    $unpublish_time = strtotime('+2 day midnight', REQUEST_TIME) + $seconds;
-    $args = ['@publish_time' => $date_formatter->format($publish_time, 'long')];
-    $this->assertRaw(t('This post is unpublished and will be published @publish_time.', $args), 'The user is informed that the content will be published on the requested date, on the default time.');
-
-    // Protect in case the node was not created.
-    if ($node = $this->drupalGetNodeByTitle($edit['title[0][value]'])) {
-      // Check that the correct scheduled dates are stored in the node.
-      $this->assertEqual($node->publish_on->value, $publish_time, 'The node publish_on value is stored correctly.');
-      $this->assertEqual($node->unpublish_on->value, $unpublish_time, 'The node unpublish_on value is stored correctly.');
-
-      // Check that the default time has been added to the form on edit.
-      $this->drupalGet('node/' . $node->id() . '/edit');
-      $this->assertFieldByName('publish_on[0][value][time]', $seconds_formatted, 'The default time offset has been added to the date field when scheduling content for publication.');
-      $this->assertFieldByName('unpublish_on[0][value][time]', $seconds_formatted, 'The default time offset has been added to the date field when scheduling content for unpublication.');
-
-    }
-    else {
-      $this->fail('The expected node was not found.');
-    }
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerDeleteNodeTest.php b/modules/scheduler/tests/src/Functional/SchedulerDeleteNodeTest.php
deleted file mode 100644
index 1ca309a..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerDeleteNodeTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\node\Entity\NodeType;
-
-/**
- * Tests deletion of nodes enabled for Scheduler.
- *
- * This checks how the deletion of a node interacts with the Scheduler
- * 'required' options and scheduled dates in the past.
- *
- * @group scheduler
- */
-class SchedulerDeleteNodeTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Tests the deletion of a scheduled node.
-   *
-   * Check that it is possible to delete a node that does not have a publishing
-   * date set, when scheduled publishing is required. Likewise for unpublishing.
-   *
-   * @see https://drupal.org/node/1614880
-   */
-  public function testDeleteNodeWhenSchedulingIsRequired() {
-    // Log in.
-    $this->drupalLogin($this->adminUser);
-
-    // Create a published and an unpublished node, both without scheduled dates.
-    $published_node = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => 1,
-    ]);
-    $unpublished_node = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => 0,
-    ]);
-
-    // Make scheduled publishing and unpublishing required.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', TRUE)
-      ->setThirdPartySetting('scheduler', 'unpublish_required', TRUE)
-      ->save();
-
-    // Check that deleting the nodes does not throw form validation errors.
-    // In 7.x the 'Delete' functionality was a button but in 8.x it is a link.
-    // Hence, we get the form then use clickLink('Delete') which is a stronger
-    // test than simply getting the 'node/<id>/delete' link directly.
-    $this->drupalGet('node/' . $published_node->id() . '/edit');
-    $this->clickLink('Delete');
-
-    // The text 'error message' is used in a header h2 html tag which is
-    // normally made hidden from browsers but will be in the page source.
-    // It is also good when testing for the absense of something to also test
-    // for the presence of text, hence the second assertion for each check.
-    $this->assertNoRaw(t('Error message'), 'No error messages are shown when trying to delete a published node with no scheduling information.');
-    $this->assertRaw(t('Are you sure you want to delete the content'), 'The deletion warning message is shown immediately when trying to delete a published node with no scheduling information.');
-
-    // Do the same test for the unpublished node.
-    $this->drupalGet('node/' . $unpublished_node->id() . '/edit');
-    $this->clickLink('Delete');
-    $this->assertNoRaw(t('Error message'), 'No error messages are shown when trying to delete an unpublished node with no scheduling information.');
-    $this->assertRaw(t('Are you sure you want to delete the content'), 'The deletion warning message is shown immediately when trying to delete an unpublished node with no scheduling information.');
-  }
-
-  /**
-   * Tests the deletion of a scheduled node.
-   *
-   * Check that nodes can be deleted with no validation errors if the dates are
-   * in the past.
-   *
-   * @see http://drupal.org/node/2627370
-   */
-  public function testDeleteNodeWithPastDates() {
-    // Log in.
-    $this->drupalLogin($this->adminUser);
-
-    // Create nodes with publish_on and unpublish_on dates in the past.
-    $published_node = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => TRUE,
-      'unpublish_on' => strtotime('- 2 day'),
-    ]);
-    $unpublished_node = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => FALSE,
-      'publish_on' => strtotime('- 2 day'),
-    ]);
-
-    // Attempt to delete the published node and check for no validation error.
-    $this->drupalGet('node/' . $published_node->id() . '/edit');
-    $this->clickLink('Delete');
-    $this->assertNoRaw(t('Error message'), 'No error messages are shown when trying to delete a node with an unpublish date in the past.');
-    $this->assertRaw(t('Are you sure you want to delete the content'), 'The deletion warning message is shown immediately when trying to delete a node with an unpublish date in the past.');
-
-    // Attempt to delete the unpublished node and check for no validation error.
-    $this->drupalGet('node/' . $unpublished_node->id() . '/edit');
-    $this->clickLink('Delete');
-    $this->assertNoRaw(t('Error message'), 'No error messages are shown when trying to delete a node with a publish date in the past.');
-    $this->assertRaw(t('Are you sure you want to delete the content'), 'The deletion warning message is shown immediately when trying to delete a node with a publish date in the past.');
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerDevelGenerateTest.php b/modules/scheduler/tests/src/Functional/SchedulerDevelGenerateTest.php
deleted file mode 100644
index f1f5fc1..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerDevelGenerateTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-/**
- * Tests the Scheduler interaction with Devel Generate module.
- *
- * @group scheduler
- */
-class SchedulerDevelGenerateTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Additional modules required.
-   *
-   * @var array
-   */
-  public static $modules = ['devel_generate'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Create a user with devel permission. Only 'administer devel_generate' is
-    // actually required for these tests, but the others are useful.
-    // 'access content overview' is needed for /admin/content  (but it is empty)
-    // 'access content' is required to actually see the content list data.
-    // 'view scheduled content' is required for /admin/content/scheduled.
-    $this->develUser = $this->drupalCreateUser([
-      'administer devel_generate',
-      'view scheduled content',
-      'access content',
-      'access content overview',
-    ]);
-
-    // The majority of the tests use the standard Sceduler-enabled content type
-    // but we also verify that dates are not added for non-enabled types.
-    $this->non_scheduler_type = 'not_for_scheduler';
-    $this->drupalCreateContentType(['type' => $this->non_scheduler_type, 'name' => 'Not enabled for Scheduler']);
-  }
-
-  /**
-   * Helper function to count scheduled nodes and assert the expected number.
-   *
-   * @param string $type
-   *   The machine-name for the content type to be checked.
-   * @param string $field
-   *   The field name to count, either 'publish_on' or 'unpublish_on'.
-   * @param int $num_nodes
-   *   The total number of nodes that should exist.
-   * @param int $num_scheduled
-   *   The number of those nodes which should be scheduled with a $field.
-   * @param int $time_range
-   *   Optional time range from the devel form. The generated scheduler dates
-   *   should be in a range of +/- this value from the current time.
-   */
-  protected function countScheduledNodes($type, $field, $num_nodes, $num_scheduled, $time_range = NULL) {
-    // Check that the expected number of nodes have been created.
-    $count = \Drupal::entityQuery('node')
-      ->condition('type', $type)
-      ->count()
-      ->execute();
-    $this->assertEqual($count, $num_nodes, sprintf('The expected number of %s is %s, found %s', $type, $num_nodes, $count));
-
-    // Check that the expected number of nodes have been scheduled.
-    $count = \Drupal::entityQuery('node')
-      ->condition('type', $type)
-      ->exists($field)
-      ->count()
-      ->execute();
-    $this->assertEqual($count, $num_scheduled, sprintf('The expected number of scheduled %s is %s, found %s', $field, $num_scheduled, $count));
-
-    if (isset($time_range)) {
-      // Define the minimum and maximum times that we expect the scheduled dates
-      // to be within. REQUEST_TIME remains static for the duration of this test
-      // but even though devel_generate also uses uses REQUEST_TIME this will
-      // slowly creep forward during sucessive calls. Tests can fail incorrectly
-      // for this reason, hence the best approximation is to use time() when
-      // calculating the upper end of the range.
-      $min = REQUEST_TIME - $time_range;
-      $max = time() + $time_range;
-
-      $query = \Drupal::entityQueryAggregate('node');
-      $result = $query
-        ->condition('type', $type)
-        ->aggregate($field, 'min')
-        ->aggregate($field, 'max')
-        ->execute();
-      $min_found = $result[0]["{$field}_min"];
-      $max_found = $result[0]["{$field}_max"];
-
-      // Assert that the found values are within the expcted range.
-      $this->assertGreaterThanOrEqual($min, $min_found, sprintf('The minimum value for %s is %s, smaller than the expected %s', $field, format_date($min_found, 'custom', 'j M, H:i:s'), format_date($min, 'custom', 'j M, H:i:s')));
-      $this->assertLessThanOrEqual($max, $max_found, sprintf('The maximum value for %s is %s which is larger than expected %s', $field, format_date($max_found, 'custom', 'j M, H:i:s'), format_date($max, 'custom', 'j M, H:i:s')));
-    }
-  }
-
-  /**
-   * Test the functionality that Scheduler adds during content generation.
-   */
-  public function testDevelGenerate() {
-    $this->drupalLogin($this->develUser);
-
-    // Use the minimum required settings to see what happens when everything
-    // else is left as default.
-    $generate_settings = [
-      "node_types[$this->type]" => TRUE,
-    ];
-    $this->drupalPostForm('admin/config/development/generate/content', $generate_settings, 'Generate');
-    // Display the full content list and the scheduled list. Calls to these
-    // pages are for information and debug only. They could be removed.
-    $this->drupalGet('admin/content');
-    $this->drupalGet('admin/content/scheduled');
-
-    // Delete all content for this type and generate new content with only
-    // publish-on dates. Use 100% as this is how we can count the expected
-    // number of scheduled nodes. The time range of 3600 is one hour.
-    $generate_settings = [
-      "node_types[$this->type]" => TRUE,
-      'num' => 40,
-      'kill' => TRUE,
-      'time_range' => 3600,
-      'scheduler_publishing' => 100,
-      'scheduler_unpublishing' => 0,
-    ];
-    $this->drupalPostForm('admin/config/development/generate/content', $generate_settings, 'Generate');
-    $this->drupalGet('admin/content');
-    $this->drupalGet('admin/content/scheduled');
-
-    // Check we have the expected number of nodes scheduled for publishing only
-    // and verify that that the dates are within the time range specified.
-    $this->countScheduledNodes($this->type, 'publish_on', 40, 40, $generate_settings['time_range']);
-    $this->countScheduledNodes($this->type, 'unpublish_on', 40, 0);
-
-    // Do similar for unpublish_on date. Delete all then generate new content
-    // with only unpublish-on dates. Time range 86400 is one day.
-    $generate_settings = [
-      "node_types[$this->type]" => TRUE,
-      'num' => 30,
-      'kill' => TRUE,
-      'time_range' => 86400,
-      'scheduler_publishing' => 0,
-      'scheduler_unpublishing' => 100,
-    ];
-    $this->drupalPostForm('admin/config/development/generate/content', $generate_settings, 'Generate');
-    $this->drupalGet('admin/content');
-    $this->drupalGet('admin/content/scheduled');
-
-    // Check we have the expected number of nodes scheduled for unpublishing
-    // only, and verify that that the dates are within the time range specified.
-    $this->countScheduledNodes($this->type, 'publish_on', 30, 0);
-    $this->countScheduledNodes($this->type, 'unpublish_on', 30, 30, $generate_settings['time_range']);
-
-    // Generate new content using the type which is not enabled for Scheduler.
-    // The nodes should be created but no dates should be added even though the
-    // scheduler values are set to 100.
-    $generate_settings = [
-      "node_types[$this->non_scheduler_type]" => TRUE,
-      'num' => 20,
-      'kill' => TRUE,
-      'scheduler_publishing' => 100,
-      'scheduler_unpublishing' => 100,
-    ];
-    $this->drupalPostForm('admin/config/development/generate/content', $generate_settings, 'Generate');
-    $this->drupalGet('admin/content');
-    $this->drupalGet('admin/content/scheduled');
-
-    // Check we have the expected number of nodes but that none are scheduled.
-    $this->countScheduledNodes($this->non_scheduler_type, 'publish_on', 20, 0);
-    $this->countScheduledNodes($this->non_scheduler_type, 'unpublish_on', 20, 0);
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerFieldsDisplayTest.php b/modules/scheduler/tests/src/Functional/SchedulerFieldsDisplayTest.php
deleted file mode 100644
index ceba016..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerFieldsDisplayTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\node\Entity\NodeType;
-
-/**
- * Tests the display of the date entry fields (vertical tab, fieldset).
- *
- * @group scheduler
- */
-class SchedulerFieldsDisplayTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Additional module field_ui is required for the 'manage form display' test.
-   *
-   * @var array
-   */
-  public static $modules = ['field_ui'];
-
-  /**
-   * Tests date input is displayed as vertical tab or an expandable fieldset.
-   */
-  public function testFieldsDisplay() {
-    $this->drupalLogin($this->adminUser);
-
-    // Check that the dates are shown in a vertical tab by default.
-    $this->drupalGet('node/add/page');
-    $this->assertTrue($this->xpath('//div[contains(@class, "form-type-vertical-tabs")]//details[@id = "edit-scheduler-settings"]'), 'By default the scheduler dates are shown in a vertical tab.');
-
-    // Check that the dates are shown as a fieldset when configured to do so.
-    $this->nodetype->setThirdPartySetting('scheduler', 'fields_display_mode', 'fieldset')->save();
-    $this->drupalGet('node/add/page');
-    $this->assertFalse($this->xpath('//div[contains(@class, "form-type-vertical-tabs")]//details[@id = "edit-scheduler-settings"]'), 'The scheduler dates are not shown in a vertical tab when they are configured to show as a fieldset.');
-    $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings"]'), 'The scheduler dates are shown in a fieldset when they are configured to show as a fieldset.');
-    $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and not(@open = "open")]'), 'The scheduler dates fieldset is collapsed by default.');
-
-    // Check that the fieldset is expanded if either of the scheduling dates
-    // are required.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', TRUE)->save();
-    $this->drupalGet('node/add/page');
-    $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and @open = "open"]'), 'The scheduler dates are shown in an expanded fieldset when the publish-on date is required.');
-
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', FALSE)
-      ->setThirdPartySetting('scheduler', 'unpublish_required', TRUE)->save();
-    $this->drupalGet('node/add/page');
-    $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and @open = "open"]'), 'The scheduler dates are shown in an expanded fieldset when the unpublish-on date is required.');
-
-    // Check that the fieldset is expanded if the 'always' option is set.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', FALSE)
-      ->setThirdPartySetting('scheduler', 'unpublish_required', FALSE)
-      ->setThirdPartySetting('scheduler', 'expand_fieldset', 'always')->save();
-    $this->drupalGet('node/add/page');
-    $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and @open = "open"]'), 'The scheduler dates are shown in an expanded fieldset when the option to always expand is turned on.');
-
-    // Check that the fieldset is expanded if the node already has a publish-on
-    // date. This requires editing an existing scheduled node.
-    $this->nodetype->setThirdPartySetting('scheduler', 'expand_fieldset', 'when_required')->save();
-    $options = [
-      'title' => 'Contains Publish-on date ' . $this->randomMachineName(10),
-      'type' => $this->type,
-      'publish_on' => strtotime('+1 day'),
-    ];
-    $node = $this->drupalCreateNode($options);
-    $this->drupalGet('node/' . $node->id() . '/edit');
-    $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and @open = "open"]'), 'The scheduler dates are shown in an expanded fieldset when a publish-on date already exists.');
-
-    // Check that the fieldset is expanded if the node has an unpublish-on date.
-    $options = [
-      'title' => 'Contains Unpublish-on date ' . $this->randomMachineName(10),
-      'type' => $this->type,
-      'unpublish_on' => strtotime('+1 day'),
-    ];
-    $node = $this->drupalCreateNode($options);
-    $this->drupalGet('node/' . $node->id() . '/edit');
-    $this->assertTrue($this->xpath('//details[@id = "edit-scheduler-settings" and @open = "open"]'), 'The scheduler dates are shown in an expanded fieldset when an unpublish-on date already exists.');
-  }
-
-  /**
-   * Tests the settings entry in the content type form display.
-   *
-   * This test covers scheduler_entity_extra_field_info().
-   */
-  public function testManageFormDisplay() {
-
-    // Create a custom administrator user with permissions to use the field_ui
-    // module 'node form display' tab.
-    $this->adminUser = $this->drupalCreateUser([
-      'administer content types',
-      'administer node form display',
-    ]);
-    $this->drupalLogin($this->adminUser);
-
-    // Check that the weight input field is displayed when the content type is
-    // enabled for scheduling. This field still exists even with tabledrag on.
-    $this->drupalGet('admin/structure/types/manage/' . $this->type . '/form-display');
-    $this->assertFieldById('edit-fields-scheduler-settings-weight', NULL, 'The scheduler settings row is shown when the content type is enabled for scheduling.');
-
-    // Check that the weight input field is not displayed when the content type
-    // is not enabled for scheduling.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_enable', FALSE)
-      ->setThirdPartySetting('scheduler', 'unpublish_enable', FALSE)->save();
-    $this->drupalGet('admin/structure/types/manage/' . $this->type . '/form-display');
-    $this->assertNoFieldById('edit-fields-scheduler-settings-weight', NULL, 'The scheduler settings row is not shown when the content type is not enabled for scheduling.');
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerLightweightCronTest.php b/modules/scheduler/tests/src/Functional/SchedulerLightweightCronTest.php
deleted file mode 100644
index 1bad0e0..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerLightweightCronTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\Core\Url;
-
-/**
- * Tests the Scheduler lighweight cron urls and admin form.
- *
- * @group scheduler
- */
-class SchedulerLightweightCronTest extends SchedulerBrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->routeCronForm = Url::fromRoute('scheduler.cron_form');
-  }
-
-  /**
-   * Test scheduler lightweight cron runs.
-   */
-  public function testLightweightCronRun() {
-    // Run scheduler lightweight cron anonymously without any cron key.
-    $this->drupalGet('scheduler/cron');
-    $this->assertResponse(404, 'scheduler/cron with no cron key returns "404 Not Found"');
-
-    // Run scheduler lightweight cron anonymously with a random cron key.
-    $key = substr(md5(rand()), 0, 20);
-    $this->drupalGet('scheduler/cron/' . $key);
-    $this->assertResponse(403, 'scheduler/cron with the wrong cron key returns "403 Not Authorized"');
-
-    // Run scheduler lightweight cron anonymously with the valid cron key which
-    // is defined during install.
-    $config = $this->config('scheduler.settings');
-    $key = $config->get('lightweight_cron_access_key');
-    $this->drupalGet('scheduler/cron/' . $key);
-    $this->assertResponse(204, 'scheduler/cron with the correct cron key runs OK and returns "204 No Content"');
-  }
-
-  /**
-   * Test the lightweight cron settings form.
-   */
-  public function testLightweightCronSettingsForm() {
-    // Log in.
-    $this->drupalLogin($this->adminUser);
-
-    // Check that the cron key has an initial value, created during install.
-    $this->drupalGet($this->routeCronForm);
-    $key_xpath = $this->xpath('//input[@id="edit-lightweight-access-key"]/@value');
-    $key = $key_xpath[0]->getText();
-    $this->assertTrue(!empty($key), 'Default lightweight cron key field is not empty');
-    $this->assertTrue(strlen($key) == 20, 'Default lightweight cron key string length is 20');
-
-    // Check that a new random key can be generated.
-    $this->drupalPostForm($this->routeCronForm, [], t('Generate new random key'));
-    $new_key_xpath = $this->xpath('//input[@id="edit-lightweight-access-key"]/@value');
-    $new_key = $new_key_xpath[0]->getText();
-    $this->assertTrue(!empty($new_key), 'Lightweight cron key field is not empty after generating new key');
-    $this->assertTrue(strlen($new_key) == 20, 'New lightweight cron key string length is 20');
-    $this->assertNotEqual($key, $new_key, 'Lightweight cron key has changed.');
-
-    // Check that the 'run lightweight cron' button works.
-    $this->drupalPostForm($this->routeCronForm, [], t("Run Scheduler's lightweight cron now"));
-    $this->assertText('Lightweight cron run completed.', 'Lightweight cron runs OK manually');
-
-    // Check that the form cannot be saved if the cron key is blank.
-    $this->drupalPostForm($this->routeCronForm, ['lightweight_access_key' => ''], t('Save configuration'));
-    $this->assertText('Lightweight cron access key field is required.', 'Saving configuration with a blank cron key throws the expected validation message');
-    $this->assertNoText('The configuration options have been saved.', 'Saving configuration with a blank cron key is not possible');
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerMetaInformationTest.php b/modules/scheduler/tests/src/Functional/SchedulerMetaInformationTest.php
deleted file mode 100644
index 859f0c5..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerMetaInformationTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-/**
- * Tests meta information output by scheduler.
- *
- * @group scheduler
- */
-class SchedulerMetaInformationTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Tests meta-information on scheduled nodes.
-   *
-   * When nodes are scheduled for unpublication, an X-Robots-Tag HTTP header is
-   * sent, alerting crawlers about when an item expires and should be removed
-   * from search results.
-   */
-  public function testMetaInformation() {
-    // Log in.
-    $this->drupalLogin($this->schedulerUser);
-
-    // Create a published node without scheduling.
-    $published_node = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => TRUE,
-    ]);
-    $this->drupalGet('node/' . $published_node->id());
-
-    // Since we did not set an unpublish date, there should be no X-Robots-Tag
-    // header on the response.
-    $this->assertFalse($this->drupalGetHeader('X-Robots-Tag'), 'X-Robots-Tag is not present when no unpublish date is set.');
-
-    // Set a scheduler unpublish date on the node.
-    $unpublish_date = strtotime('+1 day');
-    $edit = [
-      'unpublish_on[0][value][date]' => \Drupal::service('date.formatter')->format($unpublish_date, 'custom', 'Y-m-d'),
-      'unpublish_on[0][value][time]' => \Drupal::service('date.formatter')->format($unpublish_date, 'custom', 'H:i:s'),
-    ];
-    $this->drupalPostForm('node/' . $published_node->id() . '/edit', $edit, t('Save'));
-
-    // The node page should now have an X-Robots-Tag header with an
-    // unavailable_after-directive and RFC850 date- and time-value.
-    $this->drupalGet('node/' . $published_node->id());
-    $this->assertSession()->responseHeaderEquals('X-Robots-Tag', 'unavailable_after: ' . date(DATE_RFC850, $unpublish_date), 'X-Robots-Tag is present with correct timestamp derived from unpublish_on date.');
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerMultilingualTest.php b/modules/scheduler/tests/src/Functional/SchedulerMultilingualTest.php
deleted file mode 100644
index 7823bc7..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerMultilingualTest.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\language\Entity\ConfigurableLanguage;
-
-/**
- * Tests the scheduling functions for node translations.
- *
- * @group scheduler
- */
-class SchedulerMultilingualTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Additional modules required.
-   *
-   * @var array
-   */
-  public static $modules = ['content_translation'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Create a user with the required translation permissions.
-    // 'administer languages' for url admin/config/regional/content-language.
-    // 'administer content translation' to show the list of content fields at
-    // url admin/config/regional/content-language.
-    // 'create content translations' for the 'translations' tab on node pages
-    // url node/*/translations.
-    // 'translate any entity' for the 'add translation' link on the translations
-    // page, url node/*/translations/add/.
-    $this->translatorUser = $this->drupalCreateUser([
-      'administer languages',
-      'administer content translation',
-      'create content translations',
-      'translate any entity',
-    ]);
-
-    // Get the additional role already assigned to the scheduler admin user
-    // created in SchedulerBrowserTestBase and add this role to the translator
-    // user, to avoid switching between users throughout this test.
-    $admin_roles = $this->adminUser->getRoles();
-    // Key 0 is 'authenticated' role. Key 1 is the first real role.
-    $this->translatorUser->addRole($admin_roles[1]);
-    $this->translatorUser->save();
-    $this->drupalLogin($this->translatorUser);
-
-    // Allow scheduler dates in the past to be published on next cron run.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'schedule')->save();
-
-    // Enable the content type for translation.
-    $this->ctm = $this->container->get('content_translation.manager');
-    $this->ctm->setEnabled('node', $this->type, TRUE);
-
-    // Make three additional languages available.
-    // Do not add 'en' here.
-    $this->langcodes = ['am', 'bg', 'ca'];
-    ConfigurableLanguage::createFromLangcode($this->langcodes[0])->save();
-    ConfigurableLanguage::createFromLangcode($this->langcodes[1])->save();
-    ConfigurableLanguage::createFromLangcode($this->langcodes[2])->save();
-
-    // Get the language names and store for later use.
-    $languages = \Drupal::languageManager()->getLanguages();
-    $this->languages = [
-      0 => ['code' => $this->langcodes[0], 'name' => $languages[$this->langcodes[0]]->getName()],
-      1 => ['code' => $this->langcodes[1], 'name' => $languages[$this->langcodes[1]]->getName()],
-      2 => ['code' => $this->langcodes[2], 'name' => $languages[$this->langcodes[2]]->getName()],
-      3 => ['code' => 'en', 'name' => $languages['en']->getName()],
-    ];
-  }
-
-  /**
-   * Helper function to assert the published status of translations.
-   *
-   * @param int $nid
-   *   The node id of the node to check.
-   * @param string $description
-   *   Text explaining what part of the test is being checked.
-   * @param array $st
-   *   Array of expected status values for the translations. The original
-   *   content status is first, followed by any number of translations.
-   */
-  private function checkStatus($nid, $description, array $st) {
-
-    // Reset the cache and reload the node.
-    $this->nodeStorage->resetCache([$nid]);
-    $node = $this->nodeStorage->load($nid);
-
-    foreach ($st as $key => $status) {
-      if ($key == 0) {
-        // Key 0 is the original, so we just check $node.
-        $this->assertEqual($node->isPublished(), $status,
-          sprintf('%s: The original content (%s) is %s', $description, $this->languages[$key]['name'], ($status ? 'published' : 'unpublished')));
-      }
-      else {
-        // Key > 0 are the translations, which we get using the Content
-        // Translation Manager getTranslationMetadata() function.
-        $trans = $this->ctm->getTranslationMetadata($node->getTranslation($this->languages[$key]['code']));
-        $trans = $node->getTranslation($this->languages[$key]['code']);
-        $this->assertEqual($trans->isPublished(), $status,
-          sprintf('%s: Translation %d (%s) is %s', $description, $key, $this->languages[$key]['name'], ($status ? 'published' : 'unpublished')));
-      }
-    }
-  }
-
-  /**
-   * Test creating translations with independent scheduling.
-   *
-   * @dataProvider dataPublishingTranslations()
-   */
-  public function testPublishingTranslations($publish_on_translatable, $unpublish_on_translatable, array $expected_status_values_before, array $expected_status_values_after) {
-
-    // Set the scheduler fields to be translatable yes/no depending on the
-    // parameters passed in.
-    $this->drupalGet('admin/config/regional/content-language');
-    $settings = [
-      'edit-settings-node-page-settings-language-language-alterable' => TRUE,
-      'edit-settings-node-page-fields-publish-on' => $publish_on_translatable,
-      'edit-settings-node-page-fields-unpublish-on' => $unpublish_on_translatable,
-    ];
-    // The submit shows the updated values, so no need for second get.
-    $this->submitForm($settings, 'Save configuration');
-
-    // Create a node. This will known as the 'original' before any translations.
-    // It is unpublished with no scheduled date.
-    $create = [
-      'type' => $this->type,
-      'title' => $this->languages[0]['name'] . '(0) - Unpublished and not scheduled',
-      'langcode' => $this->languages[0]['code'],
-      'status' => FALSE,
-    ];
-    $node = $this->drupalCreateNode($create);
-
-    // Create the first translation, published now with no scheduled date.
-    $this->drupalGet('node/' . $node->id() . '/translations/add/' . $this->languages[0]['code'] . '/' . $this->languages[1]['code']);
-    $edit = [
-      'title[0][value]' => $this->languages[1]['name'] . '(1) - Published now',
-      'publish_on[0][value][date]' => '',
-      'publish_on[0][value][time]' => '',
-    ];
-    // At core 8.4 an enhancement will be committed to change the 'save and ...'
-    // button into a 'save' with a corresponding status checkbox. This test has
-    // to pass at 8.3 but the core change will not be backported. Hence derive
-    // the button text and whether we need a 'status'field.
-    // @see https://www.drupal.org/node/2873108
-    $checkbox = $this->xpath('//input[@type="checkbox" and @id="edit-status-value"]');
-    if ($checkbox) {
-      $edit['status[value]'] = TRUE;
-      $save_button_text = 'Save';
-    }
-    else {
-      $save_button_text = 'Save and publish';
-    }
-    $this->submitForm($edit, $save_button_text);
-
-    // Create the second translation, to be published in the future.
-    $this->drupalGet('node/' . $node->id() . '/translations/add/' . $this->languages[0]['code'] . '/' . $this->languages[2]['code']);
-    $edit = [
-      'title[0][value]' => $this->languages[2]['name'] . '(2) - Publish in the future',
-      'publish_on[0][value][date]' => date('Y-m-d', strtotime('+2 day', REQUEST_TIME)),
-      'publish_on[0][value][time]' => date('H:i:s', strtotime('+2 day', REQUEST_TIME)),
-    ];
-    $this->submitForm($edit, $save_button_text);
-
-    // Create the third translation, to be published in the past.
-    $this->drupalGet('node/' . $node->id() . '/translations/add/' . $this->languages[0]['code'] . '/' . $this->languages[3]['code']);
-    $edit = [
-      'title[0][value]' => $this->languages[3]['name'] . '(3) - Publish in the past',
-      'publish_on[0][value][date]' => date('Y-m-d', strtotime('-2 day', REQUEST_TIME)),
-      'publish_on[0][value][time]' => date('H:i:s', strtotime('-2 day', REQUEST_TIME)),
-    ];
-    $this->submitForm($edit, $save_button_text);
-
-    // For info only.
-    $this->drupalGet($this->languages[0]['code'] . '/node/' . $node->id() . '/translations');
-    $this->drupalGet('admin/content/scheduled');
-
-    // Check the status of all four pieces of content before running cron.
-    $this->checkStatus($node->id(), 'Before cron', $expected_status_values_before);
-    $this->cronRun();
-
-    // For info only.
-    $this->drupalGet('admin/content/scheduled');
-    $this->drupalGet('admin/content');
-    $this->drupalGet('admin/reports/dblog');
-    $this->drupalGet($this->languages[0]['code'] . '/node/' . $node->id() . '/translations');
-
-    // Check all the status values after running cron.
-    $this->checkStatus($node->id(), 'After cron', $expected_status_values_after);
-
-  }
-
-  /**
-   * Provides data for testPublishingTranslations().
-   *
-   * Case 1 when the date is translatable and can differ between translations.
-   * Case 2 when the date is not translatable and the behavior should be
-   *   consistent over all translations.
-   *
-   * @return array
-   *   The test data.
-   */
-  public function dataPublishingTranslations() {
-    return [
-      'publish_on translatable' => [
-        TRUE,
-        FALSE,
-        [FALSE, TRUE, FALSE, FALSE],
-        [FALSE, TRUE, FALSE, TRUE],
-      ],
-    ];
-    /*
-    @TODO Fix module code before committing the 'publish_on not translatable'
-    test
-    // should be
-    'publish_on not translatable' => [FALSE, FALSE,
-    array(FALSE, FALSE, FALSE, FALSE), array(TRUE, TRUE, TRUE, TRUE)],
-    // actual before and after
-    'publish_on not translatable' => [FALSE, FALSE,
-    array(FALSE, TRUE, FALSE, FALSE), array(TRUE, TRUE, FALSE, FALSE)],
-    // actual before, but expected values after
-    'publish_on not translatable' => [FALSE, FALSE,
-    array(FALSE, TRUE, FALSE, FALSE), array(TRUE, TRUE, TRUE, TRUE)],
-     */
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerNodeAccessTest.php b/modules/scheduler/tests/src/Functional/SchedulerNodeAccessTest.php
deleted file mode 100644
index 7f5f25f..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerNodeAccessTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-/**
- * Tests that Scheduler cron has full access to the scheduled nodes.
- *
- * This test uses an additional test module 'scheduler_access_test' which uses
- * a custom node access definition to deny viewing of all nodes.
- *
- * @group scheduler
- */
-class SchedulerNodeAccessTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Additional modules required.
-   *
-   * @var array
-   */
-  public static $modules = ['scheduler_access_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    // scheduler_access_test_install() sets node_access_needs_rebuild(TRUE) and
-    // this works when testing the module interactively, but during simpletest
-    // the node access table is not rebuilt. Hence do that here explicitly here.
-    node_access_rebuild();
-  }
-
-  /**
-   * Tests Scheduler cron functionality when access to the nodes is denied.
-   */
-  public function testNodeAccess() {
-
-    // Create data to test publishing then unpublishing via loop.
-    // @TODO Convert this test to use a @dataProvider function instead of this
-    // array and the loop.
-    $test_data = [
-      'publish_on' => [
-        'status' => FALSE,
-        'before' => 'unpublished',
-        'after' => 'published',
-      ],
-      'unpublish_on' => [
-        'status' => TRUE,
-        'before' => 'published',
-        'after' => 'unpublished',
-      ],
-    ];
-
-    foreach ($test_data as $field => $data) {
-      // Create a node with the required scheduler date.
-      $settings = [
-        'type' => $this->type,
-        'status' => $data['status'],
-        'title' => 'Test node to be ' . $data['after'],
-        $field => REQUEST_TIME + 1,
-      ];
-      $node = $this->drupalCreateNode($settings);
-      $this->drupalGet('node/' . $node->id());
-      $this->assertResponse(403, 'Before cron, viewing the ' . $data['before'] . '  node returns "403 Not Authorized"');
-
-      // Delay so that the date entered is now in the past, then run cron.
-      sleep(2);
-      $this->cronRun();
-
-      // Reload the node.
-      $this->nodeStorage->resetCache([$node->id()]);
-      $node = $this->nodeStorage->load($node->id());
-      // Check that the node has been published or unpublished as required.
-      $this->assertTrue($node->isPublished() === !$data['status'], 'Scheduler has ' . $data['after'] . ' the node via cron.');
-
-      // Check the node is still not viewable.
-      $this->drupalGet('node/' . $node->id());
-      $this->assertResponse(403, 'After cron, viewing the ' . $data['after'] . '  node returns "403 Not Authorized"');
-    }
-
-    // Log in and show the dblog for info only.
-    $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/reports/dblog');
-    $this->assertText('scheduled publishing', '"Scheduled publishing" message is shown in the dblog');
-    $this->assertText('scheduled unpublishing', '"Scheduled unpublishing" message is shown in the dblog');
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerNonEnabledTypeTest.php b/modules/scheduler/tests/src/Functional/SchedulerNonEnabledTypeTest.php
deleted file mode 100644
index 79b162a..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerNonEnabledTypeTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-/**
- * Tests a content type which is not enabled for scheduling.
- *
- * @group scheduler
- */
-class SchedulerNonEnabledTypeTest extends SchedulerBrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Create a 'Not for scheduler' content type.
-    $this->contentName = 'not_for_scheduler';
-    $this->contentType = $this->drupalCreateContentType(['type' => $this->contentName, 'name' => 'Not for Scheduler']);
-
-    // Create an administrator user.
-    $this->adminUser = $this->drupalCreateUser([
-      'access content',
-      'administer scheduler',
-      'create ' . $this->contentName . ' content',
-      'edit own ' . $this->contentName . ' content',
-      'delete own ' . $this->contentName . ' content',
-      'view own unpublished content',
-      'administer nodes',
-      'schedule publishing of nodes',
-      'access site reports',
-    ]);
-  }
-
-  /**
-   * Helper function for testNonEnabledNodeType().
-   *
-   * This function is called four times.
-   * Check that the date fields are correctly shown or not shown in /node/add.
-   * Check that a node is not processed if it is not enabled for the action.
-   */
-  protected function checkNonEnabledTypes($publishing_enabled, $unpublishing_enabled, $run_number) {
-
-    // Create title to show what combinations are being tested. Store base info
-    // then add secondary details.
-    $details = [
-      1 => 'by default',
-      2 => 'after disabling both settings',
-      3 => 'after enabling publishing only',
-      4 => 'after enabling unpublishing only',
-    ];
-    $info = $run_number >= 2 ?
-      'Publishing ' . ($publishing_enabled ? 'enabled' : 'not enabled')
-      . ', Unpublishing ' . ($unpublishing_enabled ? 'enabled' : 'not enabled') . ', ' . $details[$run_number]
-      : $details[$run_number];
-
-    // Check that the field(s) are displayed only for the correct settings.
-    $title = $info . ' (' . $run_number . 'a)';
-    $this->drupalGet('node/add/' . $this->contentName);
-    if ($publishing_enabled) {
-      $this->assertFieldByName('publish_on[0][value][date]', NULL, 'The Publish-on field is shown - ' . $title);
-    }
-    else {
-      $this->assertNoFieldByName('publish_on[0][value][date]', NULL, 'The Publish-on field is not shown - ' . $title);
-    }
-
-    if ($unpublishing_enabled) {
-      $this->assertFieldByName('unpublish_on[0][value][date]', NULL, 'The Unpublish-on field is shown - ' . $title);
-    }
-    else {
-      $this->assertNoFieldByName('unpublish_on[0][value][date]', NULL, 'The Unpublish-on field is not shown - ' . $title);
-    }
-
-    // Create an unpublished node with a publishing date, which mimics what
-    // could be done by a third-party module, or a by-product of the node type
-    // being enabled for publishing then being disabled before it got published.
-    $title = $info . ' (' . $run_number . 'b)';
-    $edit = [
-      'title' => $title,
-      'status' => 0,
-      'type' => $this->contentName,
-      'publish_on' => REQUEST_TIME - 2,
-    ];
-    $node = $this->drupalCreateNode($edit);
-
-    // Run cron and display the dblog.
-    $this->cronRun();
-    $this->drupalGet('admin/reports/dblog');
-
-    // Reload the node.
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    // Check if the node has been published or remains unpublished.
-    if ($publishing_enabled) {
-      $this->assertTrue($node->isPublished(), 'The unpublished node has been published - ' . $title);
-    }
-    else {
-      $this->assertFalse($node->isPublished(), 'The unpublished node remains unpublished - ' . $title);
-    }
-    // Delete the node to avoid affecting subsequent tests.
-    $node->delete();
-
-    // Do the same for unpublishing.
-    $title = $info . ' (' . $run_number . 'c)';
-    $edit = [
-      'title' => $title,
-      'status' => 1,
-      'type' => $this->contentName,
-      'unpublish_on' => REQUEST_TIME - 1,
-    ];
-    $node = $this->drupalCreateNode($edit);
-
-    // Run cron and display the dblog.
-    $this->cronRun();
-    $this->drupalGet('admin/reports/dblog');
-
-    // Reload the node.
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    // Check if the node has been unpublished or remains published.
-    if ($unpublishing_enabled) {
-      $this->assertFalse($node->isPublished(), 'The published node has been unpublished - ' . $title);
-    }
-    else {
-      $this->assertTrue($node->isPublished(), 'The published node remains published - ' . $title);
-    }
-    // Delete the node to avoid affecting subsequent tests.
-    $node->delete();
-  }
-
-  /**
-   * Tests that a non-enabled node type cannot be scheduled.
-   *
-   * The case when both options are enabled is covered in the main tests. Here
-   * we need to check each of the other combinations, to ensure that the
-   * settings work independently.
-   */
-  public function testNonEnabledNodeType() {
-    // Log in.
-    $this->drupalLogin($this->adminUser);
-
-    // 1. By default check that the scheduler date fields are not displayed.
-    $this->checkNonEnabledTypes(FALSE, FALSE, 1);
-
-    // 2. Explicitly disable this content type for both settings and test again.
-    $this->contentType->setThirdPartySetting('scheduler', 'publish_enable', FALSE)
-      ->setThirdPartySetting('scheduler', 'unpublish_enable', FALSE)
-      ->save();
-    $this->checkNonEnabledTypes(FALSE, FALSE, 2);
-
-    // 3. Turn on scheduled publishing only and test again.
-    $this->contentType->setThirdPartySetting('scheduler', 'publish_enable', TRUE)
-      ->save();
-    $this->checkNonEnabledTypes(TRUE, FALSE, 3);
-
-    // 4. Turn on scheduled unpublishing only and test again.
-    $this->contentType->setThirdPartySetting('scheduler', 'publish_enable', FALSE)
-      ->setThirdPartySetting('scheduler', 'unpublish_enable', TRUE)
-      ->save();
-    $this->checkNonEnabledTypes(FALSE, TRUE, 4);
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerPastDatesTest.php b/modules/scheduler/tests/src/Functional/SchedulerPastDatesTest.php
deleted file mode 100644
index e4c8305..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerPastDatesTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\Component\Utility\SafeMarkup;
-
-/**
- * Tests the options and processing when dates are entered in the past.
- *
- * @group scheduler
- */
-class SchedulerPastDatesTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Test the different options for past publication dates.
-   */
-  public function testSchedulerPastDates() {
-    // Log in.
-    $this->drupalLogin($this->schedulerUser);
-
-    // Ensure that neither of the scheduling dates are set to be required.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', FALSE)
-      ->setThirdPartySetting('scheduler', 'unpublish_required', FALSE)->save();
-
-    // Create an unpublished page node.
-    $node = $this->drupalCreateNode(['type' => $this->type, 'status' => FALSE]);
-
-    // Test the default behavior: an error message should be shown when the user
-    // enters a publication date that is in the past.
-    $edit = [
-      'title[0][value]' => 'Past ' . $this->randomString(10),
-      'publish_on[0][value][date]' => \Drupal::service('date.formatter')->format(strtotime('-1 day', REQUEST_TIME), 'custom', 'Y-m-d'),
-      'publish_on[0][value][time]' => \Drupal::service('date.formatter')->format(strtotime('-1 day', REQUEST_TIME), 'custom', 'H:i:s'),
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->assertRaw(t("The 'publish on' date must be in the future"), 'An error message is shown by default when the publication date is in the past.');
-
-    // Test the 'error' behavior explicitly.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'error')->save();
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->assertRaw(t("The 'publish on' date must be in the future"), 'An error message is shown when the publication date is in the past and the "error" behavior is chosen.');
-
-    // Test the 'publish' behavior: the node should be published immediately.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'publish')->save();
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->assertNoText(t("The 'publish on' date must be in the future"), 'No error message is shown when the publication date is in the past and the "publish" behavior is chosen.');
-    $this->assertText(sprintf('%s %s has been updated.', $this->typeName, SafeMarkup::checkPlain($edit['title[0][value]'])), 'The node is saved successfully when the publication date is in the past and the "publish" behavior is chosen.');
-
-    // Reload the changed node and check that it is published.
-    $this->nodeStorage->resetCache([$node->id()]);
-
-    /** @var NodeInterface $node */
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertTrue($node->isPublished(), 'The node has been published immediately when the publication date is in the past and the "publish" behavior is chosen.');
-    $this->assertNull($node->publish_on->value, 'The node publish_on date has been removed after publishing when the "publish" behavior is chosen.');
-
-    // Test the 'schedule' behavior: the node should be unpublished and become
-    // published on the next cron run.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'schedule')->save();
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->assertNoText(t("The 'publish on' date must be in the future"), 'No error message is shown when the publication date is in the past and the "schedule" behavior is chosen.');
-    $this->assertText(sprintf('%s %s has been updated.', $this->typeName, SafeMarkup::checkPlain($edit['title[0][value]'])), 'The node is saved successfully when the publication date is in the past and the "schedule" behavior is chosen.');
-    $this->assertText('will be published', 'The node is scheduled to be published when the publication date is in the past and the "schedule" behavior is chosen.');
-
-    // Reload the node and check that it is unpublished but scheduled correctly.
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertFalse($node->isPublished(), 'The node has been unpublished when the publication date is in the past and the "schedule" behavior is chosen.');
-    $this->assertEqual($node->publish_on->value, strtotime('-1 day', REQUEST_TIME), 'The node has the correct publish_on date stored.');
-
-    // Simulate a cron run and check that the node is published.
-    scheduler_cron();
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    $this->assertTrue($node->isPublished(), 'The node with publication date in the past and the "schedule" behavior has now been published by cron.');
-
-    // Check that an Unpublish date in the past fails validation.
-    $edit = [
-      'title[0][value]' => 'Unpublish in the past ' . $this->randomString(10),
-      'unpublish_on[0][value][date]' => \Drupal::service('date.formatter')->format(REQUEST_TIME - 3600, 'custom', 'Y-m-d'),
-      'unpublish_on[0][value][time]' => \Drupal::service('date.formatter')->format(REQUEST_TIME - 3600, 'custom', 'H:i:s'),
-    ];
-    $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
-    $this->assertRaw(t("The 'unpublish on' date must be in the future"), 'An error message is shown when the unpublish date is in the past.');
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerPermissionsTest.php b/modules/scheduler/tests/src/Functional/SchedulerPermissionsTest.php
deleted file mode 100644
index c063258..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerPermissionsTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\Component\Utility\SafeMarkup;
-
-/**
- * Tests the permissions of the Scheduler module.
- *
- * @group scheduler
- */
-class SchedulerPermissionsTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Tests that users without permission do not see the scheduler date fields.
-   */
-  public function testUserPermissions() {
-    // Create a user who can add the content type but who does not have the
-    // permission to use the scheduler functionality.
-    $this->webUser = $this->drupalCreateUser([
-      'access content',
-      'administer nodes',
-      'create ' . $this->type . ' content',
-      'edit own ' . $this->type . ' content',
-      'delete own ' . $this->type . ' content',
-      'view own unpublished content',
-    ]);
-    $this->drupalLogin($this->webUser);
-
-    // Check that neither of the fields are displayed when creating a node.
-    $this->drupalGet('node/add/' . $this->type);
-    $this->assertNoFieldByName('publish_on[0][value][date]', NULL, 'The Publish-on field is not shown for users who do not have permission to schedule content');
-    $this->assertNoFieldByName('unpublish_on[0][value][date]', NULL, 'The Unpublish-on field is not shown for users who do not have permission to schedule content');
-
-    // At core 8.4 an enhancement will be committed to change the 'save and ...'
-    // button into a 'save' with a corresponding status checkbox. This test has
-    // to pass at 8.3 but the core change will not be backported. Hence derive
-    // the button text and whether we need a 'status'field.
-    // @see https://www.drupal.org/node/2873108
-    $checkbox = $this->xpath('//input[@type="checkbox" and @id="edit-status-value"]');
-
-    // Initially run tests when publishing and unpublishing are not required.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', FALSE)
-      ->setThirdPartySetting('scheduler', 'unpublish_required', FALSE)
-      ->save();
-
-    // Check that a new node can be saved and published.
-    $title = $this->randomString(15);
-    $edit = ['title[0][value]' => $title];
-    if ($checkbox) {
-      $edit['status[value]'] = TRUE;
-    }
-    $this->drupalPostForm('node/add/' . $this->type, $edit, $checkbox ? 'Save' : 'Save and publish');
-    $this->assertText(sprintf('%s %s has been created.', $this->typeName, SafeMarkup::checkPlain($title)), 'A node can be created and published when the user does not have scheduler permissions.');
-    $this->assertTrue($this->drupalGetNodeByTitle($title)->isPublished(), 'The new node is published');
-
-    // Check that a new node can be saved as unpublished.
-    $title = $this->randomString(15);
-    $edit = ['title[0][value]' => $title];
-    if ($checkbox) {
-      $edit['status[value]'] = FALSE;
-    }
-    $this->drupalPostForm('node/add/' . $this->type, $edit, $checkbox ? 'Save' : 'Save as unpublished');
-    $this->assertText(sprintf('%s %s has been created.', $this->typeName, SafeMarkup::checkPlain($title)), 'A node can be created and saved as unpublished when the user does not have scheduler permissions.');
-    $this->assertFalse($this->drupalGetNodeByTitle($title)->isPublished(), 'The new node is unpublished');
-
-    // Set publishing and unpublishing to required, to make it a stronger test.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', TRUE)
-      ->setThirdPartySetting('scheduler', 'unpublish_required', TRUE)
-      ->save();
-
-    // @TODO Add tests when scheduled publishing and unpublishing are required.
-    // Cannot be done until we make a decision on what 'required'  means.
-    // @see https://www.drupal.org/node/2707411
-    // "Conflict between 'required publishing' and not having scheduler
-    // permission"
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerRequiredTest.php b/modules/scheduler/tests/src/Functional/SchedulerRequiredTest.php
deleted file mode 100644
index 00ec4c4..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerRequiredTest.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\node\Entity\NodeType;
-use Drupal\Component\Utility\SafeMarkup;
-
-/**
- * Tests the options for scheduling dates to be required during add/edit.
- *
- * @group scheduler
- */
-class SchedulerRequiredTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Tests creating and editing nodes with required scheduling enabled.
-   */
-  public function testRequiredScheduling() {
-    $this->drupalLogin($this->schedulerUser);
-
-    // Define test scenarios with expected results.
-    // @TODO Re-write this with a dataProvider function.
-    $test_cases = [
-      // The 1-10 numbering used below matches the test cases described in
-      // http://drupal.org/node/1198788#comment-7816119
-      //
-      [
-        'id' => 0,
-        'required' => '',
-        'operation' => 'add',
-        'status' => 1,
-        'expected' => 'not required',
-        'message' => 'By default when a new node is created, the publish on and unpublish on dates are not required.',
-      ],
-      // A. Test scenarios that require scheduled publishing.
-      // When creating a new unpublished node it is required to enter a
-      // publication date.
-      [
-        'id' => 1,
-        'required' => 'publish',
-        'operation' => 'add',
-        'status' => 0,
-        'expected' => 'required',
-        'message' => 'When scheduled publishing is required and a new unpublished node is created, entering a date in the publish on field is required.',
-      ],
-
-      // When creating a new published node it is required to enter a
-      // publication date. The node will be unpublished on form submit.
-      [
-        'id' => 2,
-        'required' => 'publish',
-        'operation' => 'add',
-        'status' => 1,
-        'expected' => 'required',
-        'message' => 'When scheduled publishing is required and a new published node is created, entering a date in the publish on field is required.',
-      ],
-
-      // When editing a published node it is not needed to enter a publication
-      // date since the node is already published.
-      [
-        'id' => 3,
-        'required' => 'publish',
-        'operation' => 'edit',
-        'scheduled' => 0,
-        'status' => 1,
-        'expected' => 'not required',
-        'message' => 'When scheduled publishing is required and an existing published, unscheduled node is edited, entering a date in the publish on field is not required.',
-      ],
-
-      // When editing an unpublished node that is scheduled for publication it
-      // is required to enter a publication date.
-      [
-        'id' => 4,
-        'required' => 'publish',
-        'operation' => 'edit',
-        'scheduled' => 1,
-        'status' => 0,
-        'expected' => 'required',
-        'message' => 'When scheduled publishing is required and an existing unpublished, scheduled node is edited, entering a date in the publish on field is required.',
-      ],
-
-      // When editing an unpublished node that is not scheduled for publication
-      // it is not required to enter a publication date since this means that
-      // the node has already gone through a publication > unpublication cycle.
-      [
-        'id' => 5,
-        'required' => 'publish',
-        'operation' => 'edit',
-        'scheduled' => 0,
-        'status' => 0,
-        'expected' => 'not required',
-        'message' => 'When scheduled publishing is required and an existing unpublished, unscheduled node is edited, entering a date in the publish on field is not required.',
-      ],
-
-      // B. Test scenarios that require scheduled unpublishing.
-      // When creating a new unpublished node it is required to enter an
-      // unpublication date since it is to be expected that the node will be
-      // published at some point and should subsequently be unpublished.
-      [
-        'id' => 6,
-        'required' => 'unpublish',
-        'operation' => 'add',
-        'status' => 0,
-        'expected' => 'required',
-        'message' => 'When scheduled unpublishing is required and a new unpublished node is created, entering a date in the unpublish on field is required.',
-      ],
-
-      // When creating a new published node it is required to enter an
-      // unpublication date.
-      [
-        'id' => 7,
-        'required' => 'unpublish',
-        'operation' => 'add',
-        'status' => 1,
-        'expected' => 'required',
-        'message' => 'When scheduled unpublishing is required and a new published node is created, entering a date in the unpublish on field is required.',
-      ],
-
-      // When editing a published node it is required to enter an unpublication
-      // date.
-      [
-        'id' => 8,
-        'required' => 'unpublish',
-        'operation' => 'edit',
-        'scheduled' => 0,
-        'status' => 1,
-        'expected' => 'required',
-        'message' => 'When scheduled unpublishing is required and an existing published, unscheduled node is edited, entering a date in the unpublish on field is required.',
-      ],
-
-      // When editing an unpublished node that is scheduled for publication it
-      // it is required to enter an unpublication date.
-      [
-        'id' => 9,
-        'required' => 'unpublish',
-        'operation' => 'edit',
-        'scheduled' => 1,
-        'status' => 0,
-        'expected' => 'required',
-        'message' => 'When scheduled unpublishing is required and an existing unpublished, scheduled node is edited, entering a date in the unpublish on field is required.',
-      ],
-
-      // When editing an unpublished node that is not scheduled for publication
-      // it is not required to enter an unpublication date since this means that
-      // the node has already gone through a publication - unpublication cycle.
-      [
-        'id' => 10,
-        'required' => 'unpublish',
-        'operation' => 'edit',
-        'scheduled' => 0,
-        'status' => 0,
-        'expected' => 'not required',
-        'message' => 'When scheduled unpublishing is required and an existing unpublished, unscheduled node is edited, entering a date in the unpublish on field is not required.',
-      ],
-    ];
-
-    $fields = \Drupal::entityManager()->getFieldDefinitions('node', $this->type);
-
-    foreach ($test_cases as $test_case) {
-      // Set required (un)publishing as stipulated by the test case.
-      if (!empty($test_case['required'])) {
-        $this->nodetype->setThirdPartySetting('scheduler', 'publish_required', $test_case['required'] == 'publish')
-          ->setThirdPartySetting('scheduler', 'unpublish_required', $test_case['required'] == 'unpublish')
-          ->save();
-      }
-
-      // To assist viewing and analysing the generated test result pages create
-      // a text string showing all the test case parameters.
-      $title_data = [];
-      foreach ($test_case as $key => $value) {
-        if ($key != 'message') {
-          $title_data[] = $key . ' = ' . $value;
-        }
-      }
-      $title = implode(', ', $title_data);
-
-      // If the test case requires editing a node, we need to create one first.
-      if ($test_case['operation'] == 'edit') {
-        // Note: The key names in the $options parameter for drupalCreateNode()
-        // are the plain field names i.e. 'title' not title[0][value].
-        $options = [
-          'title' => $title,
-          'type' => $this->type,
-          'status' => $test_case['status'],
-          'publish_on' => !empty($test_case['scheduled']) ? strtotime('+1 day') : NULL,
-        ];
-        $node = $this->drupalCreateNode($options);
-        // Define the path and button to use for editing the node.
-        $path = 'node/' . $node->id() . '/edit';
-      }
-      else {
-        // Set the default status, used when testing creation of the new node.
-        $fields['status']->getConfig($this->type)
-          ->setDefaultValue($test_case['status'])
-          ->save();
-        // Define the path and button to use for creating the node.
-        $path = 'node/add/' . $this->type;
-      }
-
-      // Make sure that both date fields are empty so we can check if they throw
-      // validation errors when the fields are required.
-      $values = [
-        'title[0][value]' => $title,
-        'publish_on[0][value][date]' => '',
-        'publish_on[0][value][time]' => '',
-        'unpublish_on[0][value][date]' => '',
-        'unpublish_on[0][value][time]' => '',
-      ];
-      // Add or edit the node.
-      $this->drupalPostForm($path, $values, t('Save'));
-
-      // Check for the expected result.
-      switch ($test_case['expected']) {
-        case 'required':
-          $string = sprintf('The %s date is required.', ucfirst($test_case['required']) . ' on');
-          $this->assertText($string, $test_case['id'] . '. ' . $test_case['message']);
-          break;
-
-        case 'not required':
-          $string = sprintf('%s %s has been %s.', $this->typeName, SafeMarkup::checkPlain($title), ($test_case['operation'] == 'add' ? 'created' : 'updated'));
-          $this->assertText($string, $test_case['id'] . '. ' . $test_case['message']);
-          break;
-      }
-    }
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerRevisioningTest.php b/modules/scheduler/tests/src/Functional/SchedulerRevisioningTest.php
deleted file mode 100644
index 8810e8d..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerRevisioningTest.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\node\NodeInterface;
-
-/**
- * Tests revision options when Scheduler publishes or unpublishes content.
- *
- * @group scheduler
- */
-class SchedulerRevisioningTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Simulates the scheduled (un)publication of a node.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node to schedule.
-   * @param string $action
-   *   The action to perform: either 'publish' or 'unpublish'. Defaults to
-   *   'publish'.
-   *
-   * @return \Drupal\node\NodeInterface
-   *   The updated node, after scheduled (un)publication via a cron run.
-   */
-  protected function schedule(NodeInterface $node, $action = 'publish') {
-    // Simulate scheduling by setting the (un)publication date in the past and
-    // running cron.
-    $node->{$action . '_on'} = strtotime('-1 day', REQUEST_TIME);
-    $node->save();
-    scheduler_cron();
-    $this->nodeStorage->resetCache([$node->id()]);
-    return $this->nodeStorage->load($node->id());
-  }
-
-  /**
-   * Check if the latest revision log message of a node matches a given string.
-   *
-   * @param int $nid
-   *   The node id of the node to check.
-   * @param string $value
-   *   The value with which the log message will be compared.
-   * @param string $message
-   *   The message to display along with the assertion.
-   * @param string $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   *
-   * @return bool
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertRevisionLogMessage($nid, $value, $message = '', $group = 'Other') {
-    // Retrieve the latest revision log message for this node.
-    $log_message = $this->database->select('node_revision', 'r')
-      ->fields('r', ['revision_log'])
-      ->condition('nid', $nid)
-      ->orderBy('vid', 'DESC')
-      ->range(0, 1)
-      ->execute()
-      ->fetchColumn();
-
-    return $this->assertEqual($log_message, $value, $message, $group);
-  }
-
-  /**
-   * Check if the number of revisions for a node matches a given value.
-   *
-   * @param int $nid
-   *   The node id of the node to check.
-   * @param string $value
-   *   The value with which the number of revisions will be compared.
-   * @param string $message
-   *   The message to display along with the assertion.
-   * @param string $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   *
-   * @return bool
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertRevisionCount($nid, $value, $message = '', $group = 'Other') {
-    $count = \Drupal::database()->select('node_revision', 'r')
-      ->condition('nid', $nid)
-      ->countQuery()
-      ->execute()
-      ->fetchColumn();
-
-    return $this->assertEqual($count, $value, $message, $group);
-  }
-
-  /**
-   * Tests the creation of new revisions on scheduling.
-   */
-  public function testRevisioning() {
-    // Create a scheduled node that is not automatically revisioned.
-    $created = strtotime('-2 day', REQUEST_TIME);
-    $settings = [
-      'type' => $this->type,
-      'revision' => 0,
-      'created' => $created,
-    ];
-    $node = $this->drupalCreateNode($settings);
-
-    // Ensure nodes with past dates will be scheduled not published immediately.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'schedule')->save();
-
-    // First test scheduled publication with revisioning disabled by default.
-    $node = $this->schedule($node);
-    $this->assertRevisionCount($node->id(), 1, 'No new revision is created by default when a node is published.');
-
-    // Test scheduled unpublication.
-    $node = $this->schedule($node, 'unpublish');
-    $this->assertRevisionCount($node->id(), 1, 'No new revision is created by default when a node is unpublished.');
-
-    // Enable revisioning.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_revision', TRUE)
-      ->setThirdPartySetting('scheduler', 'unpublish_revision', TRUE)
-      ->save();
-
-    // Test scheduled publication with revisioning enabled.
-    $node = $this->schedule($node);
-    $this->assertRevisionCount($node->id(), 2, 'A new revision was created when revisioning is enabled.');
-    $expected_message = sprintf('Node published by Scheduler on %s. Previous creation date was %s.',
-      \Drupal::service('date.formatter')->format(REQUEST_TIME, 'short'),
-      \Drupal::service('date.formatter')->format($created, 'short'));
-    $this->assertRevisionLogMessage($node->id(), $expected_message, 'The correct message was found in the node revision log after scheduled publishing.');
-
-    // Test scheduled unpublication with revisioning enabled.
-    $node = $this->schedule($node, 'unpublish');
-    $this->assertRevisionCount($node->id(), 3, 'A new revision was created when a node was unpublished with revisioning enabled.');
-    $expected_message = sprintf('Node unpublished by Scheduler on %s. Previous change date was %s.',
-      \Drupal::service('date.formatter')->format(REQUEST_TIME, 'short'),
-      \Drupal::service('date.formatter')->format(REQUEST_TIME, 'short'));
-    $this->assertRevisionLogMessage($node->id(), $expected_message, 'The correct message was found in the node revision log after scheduled unpublishing.');
-  }
-
-  /**
-   * Tests the 'touch' option to alter the node created date during publishing.
-   */
-  public function testAlterCreationDate() {
-    // Ensure nodes with past dates will be scheduled not published immediately.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_past_date', 'schedule')->save();
-
-    // Create a node with a 'created' date two days in the past.
-    $created = strtotime('-2 day', REQUEST_TIME);
-    $settings = [
-      'type' => $this->type,
-      'created' => $created,
-      'status' => FALSE,
-    ];
-    $node = $this->drupalCreateNode($settings);
-    // Show that the node is not published.
-    $this->assertFalse($node->isPublished(), 'The node is not published.');
-
-    // Schedule the node for publishing and run cron.
-    $node = $this->schedule($node, 'publish');
-    // Get the created date from the node and check that it has not changed.
-    $created_after_cron = $node->created->value;
-    $this->assertTrue($node->isPublished(), 'The node has been published.');
-    $this->assertEqual($created, $created_after_cron, 'The node creation date is not changed by default.');
-
-    // Set option to change the created date to match the publish_on date.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_touch', TRUE)->save();
-
-    // Schedule the node again and run cron.
-    $node = $this->schedule($node, 'publish');
-    // Check that the created date has changed to match the publish_on date.
-    $created_after_cron = $node->created->value;
-    $this->assertEqual(strtotime('-1 day', REQUEST_TIME), $created_after_cron, "With 'touch' option set, the node creation date is changed to match the publishing date.");
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerRulesActionsTest.php b/modules/scheduler/tests/src/Functional/SchedulerRulesActionsTest.php
deleted file mode 100644
index 9bd335f..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerRulesActionsTest.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\rules\Context\ContextConfig;
-
-/**
- * Tests the six actions that Scheduler provides for use in Rules module.
- *
- * @group scheduler
- */
-class SchedulerRulesActionsTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Additional modules required.
-   *
-   * @var array
-   */
-  public static $modules = ['scheduler_rules_integration'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->rulesStorage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
-    $this->expressionManager = $this->container->get('plugin.manager.rules_expression');
-
-    // Create a published node.
-    $this->node = $this->drupalCreateNode([
-      'title' => 'Initial Test Node',
-      'type' => $this->type,
-      'uid' => $this->schedulerUser->id(),
-      'status' => TRUE,
-    ]);
-  }
-
-  /**
-   * Tests the actions which set and remove the 'Publish On' date.
-   */
-  public function testPublishOnActions() {
-
-    // Create rule 1 to set the publishing date.
-    $rule1 = $this->expressionManager->createRule();
-    $rule1->addCondition('scheduler_condition_publishing_is_enabled',
-      ContextConfig::create()
-        ->map('node', 'node')
-      )
-      ->addCondition('rules_data_comparison',
-        ContextConfig::create()
-          ->map('data', 'node.title.value')
-          ->setValue('operation', '==')
-          ->setValue('value', 'Trigger Action Rule 1')
-    );
-    $message1 = 'RULES message 1. Action to set Publish-on date.';
-    $rule1->addAction('scheduler_set_publishing_date_action',
-      ContextConfig::create()
-        ->map('node', 'node')
-        ->setValue('date', REQUEST_TIME + 1800)
-      )
-      ->addAction('rules_system_message',
-        ContextConfig::create()
-          ->setValue('message', $message1)
-          ->setValue('type', 'status')
-    );
-    // The event needs to be rules_entity_presave:node 'before saving' because
-    // rules_entity_update:node 'after save' is too late to set the date.
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule1',
-      'events' => [['event_name' => 'rules_entity_presave:node']],
-      'expression' => $rule1->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // Create rule 2 to remove the publishing date and publish the node now.
-    $rule2 = $this->expressionManager->createRule();
-    $rule2->addCondition('scheduler_condition_publishing_is_enabled',
-      ContextConfig::create()
-        ->map('node', 'node')
-      )
-      ->addCondition('rules_data_comparison',
-        ContextConfig::create()
-          ->map('data', 'node.title.value')
-          ->setValue('operation', '==')
-          ->setValue('value', 'Trigger Action Rule 2')
-    );
-    $message2 = 'RULES message 2. Action to remove Publish-on date and publish the node immediately.';
-    $rule2->addAction('scheduler_remove_publishing_date_action',
-      ContextConfig::create()
-        ->map('node', 'node')
-      )
-      ->addAction('scheduler_publish_now_action',
-        ContextConfig::create()
-          ->map('node', 'node')
-      )
-      ->addAction('rules_system_message',
-        ContextConfig::create()
-          ->setValue('message', $message2)
-          ->setValue('type', 'status')
-      );
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule2',
-      'events' => [['event_name' => 'rules_entity_presave:node']],
-      'expression' => $rule2->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    $this->drupalLogin($this->schedulerUser);
-    $node = $this->node;
-
-    // Edit node without changing title.
-    $edit = [
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    // Check that neither of the rules are triggered, no publish and unpublish
-    // dates are set and the status is still published.
-    $this->assertNoText($message1, '"' . $message1 . '" is not shown');
-    $this->assertNoText($message2, '"' . $message2 . '" is not shown');
-    $this->assertFalse($node->publish_on->value, 'Node is not scheduled for publishing.');
-    $this->assertFalse($node->unpublish_on->value, 'Node is not scheduled for unpublishing.');
-    $this->assertTrue($node->isPublished(), 'Node remains published for title: "' . $node->title->value . '".');
-
-    // Edit the node, triggering rule 1.
-    $edit = [
-      'title[0][value]' => 'Trigger Action Rule 1',
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
-    $this->nodeStorage->resetCache([$this->node->id()]);
-    $node = $this->nodeStorage->load($this->node->id());
-    // Check that rule 1 is triggered and rule 2 is not. Check that a publishing
-    // date has been set and status is now unpublished.
-    $this->assertText($message1, '"' . $message1 . '" is shown');
-    $this->assertNoText($message2, '"' . $message2 . '" is not shown');
-    $this->assertTrue($node->publish_on->value, 'Node is scheduled for publishing.');
-    $this->assertFalse($node->unpublish_on->value, 'Node is not scheduled for unpublishing.');
-    $this->assertFalse($node->isPublished(), 'Node is now unpublished for title: "' . $node->title->value . '".');
-
-    // Edit the node, triggering rule 2.
-    $edit = [
-      'title[0][value]' => 'Trigger Action Rule 2',
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
-    $this->nodeStorage->resetCache([$this->node->id()]);
-    $node = $this->nodeStorage->load($this->node->id());
-    // Check that rule 2 is triggered and rule 1 is not. Check that the
-    // publishing date has been removed and the status is published.
-    $this->assertNoText($message1, '"' . $message1 . '" is not shown');
-    $this->assertText($message2, '"' . $message2 . '" is shown');
-    $this->assertFalse($node->publish_on->value, 'Node is not scheduled for publishing.');
-    $this->assertFalse($node->unpublish_on->value, 'Node is not scheduled for unpublishing.');
-    $this->assertTrue($node->isPublished(), 'Node is now published for title: "' . $node->title->value . '".');
-
-  }
-
-  /**
-   * Tests the actions which set and remove the 'Unpublish On' date.
-   */
-  public function testUnpublishOnActions() {
-
-    // Create rule 3 to set the unpublishing date.
-    $rule3 = $this->expressionManager->createRule();
-    $rule3->addCondition('scheduler_condition_unpublishing_is_enabled',
-      ContextConfig::create()
-        ->map('node', 'node')
-      )
-      ->addCondition('rules_data_comparison',
-        ContextConfig::create()
-          ->map('data', 'node.title.value')
-          ->setValue('operation', '==')
-          ->setValue('value', 'Trigger Action Rule 3')
-    );
-    $message3 = 'RULES message 3. Action to set Unpublish-on date.';
-    $rule3->addAction('scheduler_set_unpublishing_date_action',
-      ContextConfig::create()
-        ->map('node', 'node')
-        ->setValue('date', REQUEST_TIME + 1800)
-      )
-      ->addAction('rules_system_message',
-        ContextConfig::create()
-          ->setValue('message', $message3)
-          ->setValue('type', 'status')
-    );
-    // The event needs to be rules_entity_presave:node 'before saving' because
-    // rules_entity_update:node 'after save' is too late to set the date.
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule3',
-      'events' => [['event_name' => 'rules_entity_presave:node']],
-      'expression' => $rule3->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // Create rule 4 to remove the unpublishing date and unpublish the node.
-    $rule4 = $this->expressionManager->createRule();
-    $rule4->addCondition('scheduler_condition_unpublishing_is_enabled',
-      ContextConfig::create()
-        ->map('node', 'node')
-      )
-      ->addCondition('rules_data_comparison',
-        ContextConfig::create()
-          ->map('data', 'node.title.value')
-          ->setValue('operation', '==')
-          ->setValue('value', 'Trigger Action Rule 4')
-    );
-    $message4 = 'RULES message 4. Action to remove Unpublish-on date and unpublish the node immediately.';
-    $rule4->addAction('scheduler_remove_unpublishing_date_action',
-      ContextConfig::create()
-        ->map('node', 'node')
-      )
-      ->addAction('scheduler_unpublish_now_action',
-        ContextConfig::create()
-          ->map('node', 'node')
-      )
-      ->addAction('rules_system_message',
-        ContextConfig::create()
-          ->setValue('message', $message4)
-          ->setValue('type', 'status')
-      );
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule4',
-      'events' => [['event_name' => 'rules_entity_presave:node']],
-      'expression' => $rule4->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    $this->drupalLogin($this->schedulerUser);
-    $node = $this->node;
-
-    // Edit node without changing title.
-    $edit = [
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->nodeStorage->resetCache([$node->id()]);
-    $node = $this->nodeStorage->load($node->id());
-    // Check that neither of the rules are triggered, no publish and unpublish
-    // dates are set and the status is still published.
-    $this->assertNoText($message3, '"' . $message3 . '" is not shown');
-    $this->assertNoText($message4, '"' . $message4 . '" is not shown');
-    $this->assertFalse($node->publish_on->value, 'Node is not scheduled for publishing.');
-    $this->assertFalse($node->unpublish_on->value, 'Node is not scheduled for unpublishing.');
-    $this->assertTrue($node->isPublished(), 'Node remains published for title: "' . $node->title->value . '".');
-
-    // Edit the node, triggering rule 3.
-    $edit = [
-      'title[0][value]' => 'Trigger Action Rule 3',
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
-    $this->nodeStorage->resetCache([$this->node->id()]);
-    $node = $this->nodeStorage->load($this->node->id());
-    // Check that rule 3 is triggered and rule 4 is not. Check that an
-    // unpublishing date has been set and status is still published.
-    $this->assertText($message3, '"' . $message3 . '" is shown');
-    $this->assertNoText($message4, '"' . $message4 . '" is not shown');
-    $this->assertFalse($node->publish_on->value, 'Node is not scheduled for publishing.');
-    $this->assertTrue($node->unpublish_on->value, 'Node is scheduled for unpublishing.');
-    $this->assertTrue($node->isPublished(), 'Node is still published for title: "' . $node->title->value . '".');
-
-    // Edit the node, triggering rule 4.
-    $edit = [
-      'title[0][value]' => 'Trigger Action Rule 4',
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
-    $this->nodeStorage->resetCache([$this->node->id()]);
-    $node = $this->nodeStorage->load($this->node->id());
-    // Check that rule 4 is triggered and rule 3 is not. Check that the
-    // unpublishing date has been removed and the status is unpublished.
-    $this->assertNoText($message3, '"' . $message3 . '" is not shown');
-    $this->assertText($message4, '"' . $message4 . '" is shown');
-    $this->assertFalse($node->publish_on->value, 'Node is not scheduled for publishing.');
-    $this->assertFalse($node->unpublish_on->value, 'Node is not scheduled for unpublishing.');
-    $this->assertFalse($node->isPublished(), 'Node is now unpublished for title: "' . $node->title->value . '".');
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerRulesConditionsTest.php b/modules/scheduler/tests/src/Functional/SchedulerRulesConditionsTest.php
deleted file mode 100644
index 62a07ef..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerRulesConditionsTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\rules\Context\ContextConfig;
-
-/**
- * Tests the four conditions that Scheduler provides for use in Rules module.
- *
- * @group scheduler
- */
-class SchedulerRulesConditionsTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Additional modules required.
-   *
-   * @var array
-   */
-  public static $modules = ['scheduler_rules_integration'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->rulesStorage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
-    $this->expressionManager = $this->container->get('plugin.manager.rules_expression');
-
-    // Create a published node.
-    $this->node = $this->drupalCreateNode([
-      'title' => 'Rules Test Node',
-      'type' => $this->type,
-      'uid' => $this->schedulerUser->id(),
-      'status' => TRUE,
-    ]);
-  }
-
-  /**
-   * Tests the conditions for whether a nodetype is enabled for Scheduler.
-   */
-  public function testNodeTypeEnabledConditions() {
-    // Create a reaction rule to display a message when viewing a node of a type
-    // that is enabled for scheduled publishing.
-    // "viewing content" actually means "viewing PUBLISHED content".
-    $rule1 = $this->expressionManager->createRule();
-    $rule1->addCondition('scheduler_condition_publishing_is_enabled',
-      ContextConfig::create()->map('node', 'node')
-    );
-    $message1 = 'RULES message 1. This node type is enabled for scheduled publishing.';
-    $rule1->addAction('rules_system_message', ContextConfig::create()
-      ->setValue('message', $message1)
-      ->setValue('type', 'status')
-      );
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule1',
-      'events' => [['event_name' => 'rules_entity_view:node']],
-      'expression' => $rule1->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // Create a reaction rule to display a message when viewing a node of a type
-    // that is enabled for scheduled unpublishing.
-    $rule2 = $this->expressionManager->createRule();
-    $rule2->addCondition('scheduler_condition_unpublishing_is_enabled',
-      ContextConfig::create()->map('node', 'node')
-    );
-    $message2 = 'RULES message 2. This node type is enabled for scheduled unpublishing.';
-    $rule2->addAction('rules_system_message', ContextConfig::create()
-      ->setValue('message', $message2)
-      ->setValue('type', 'status')
-      );
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule2',
-      'events' => [['event_name' => 'rules_entity_view:node']],
-      'expression' => $rule2->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // Create a reaction rule to display a message when viewing a node of a type
-    // that is NOT enabled for scheduled publishing.
-    $rule3 = $this->expressionManager->createRule();
-    $rule3->addCondition('scheduler_condition_publishing_is_enabled',
-      ContextConfig::create()->map('node', 'node')->negateResult()
-    );
-    $message3 = 'RULES message 3. This node type is not enabled for scheduled publishing.';
-    $rule3->addAction('rules_system_message', ContextConfig::create()
-      ->setValue('message', $message3)
-      ->setValue('type', 'status')
-      );
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule3',
-      'events' => [['event_name' => 'rules_entity_view:node']],
-      'expression' => $rule3->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // Create a reaction rule to display a message when viewing a node of a type
-    // that is NOT enabled for scheduled unpublishing.
-    $rule4 = $this->expressionManager->createRule();
-    $rule4->addCondition('scheduler_condition_unpublishing_is_enabled',
-      ContextConfig::create()->map('node', 'node')->negateResult()
-    );
-    $message4 = 'RULES message 4. This node type is not enabled for scheduled unpublishing.';
-    $rule4->addAction('rules_system_message', ContextConfig::create()
-      ->setValue('message', $message4)
-      ->setValue('type', 'status')
-      );
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule4',
-      'events' => [['event_name' => 'rules_entity_view:node']],
-      'expression' => $rule4->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // View the node and check the default position - that the node type is
-    // enabled for both publishing and unpublishing.
-    $this->drupalGet('node/' . $this->node->id());
-    $this->assertText($message1, '"' . $message1 . '" is shown');
-    $this->assertText($message2, '"' . $message2 . '" is shown');
-    $this->assertNoText($message3, '"' . $message3 . '" is not shown');
-    $this->assertNoText($message4, '"' . $message4 . '" is not shown');
-
-    // Turn off scheduled publishing for the node type and check the rules.
-    $this->nodetype->setThirdPartySetting('scheduler', 'publish_enable', FALSE)->save();
-    // Flushing the caches was not required when using WebTestBase but is needed
-    // after converting to BrowserTestBase.
-    drupal_flush_all_caches();
-    $this->drupalGet('node/' . $this->node->id());
-    $this->assertNoText($message1, '"' . $message1 . '" is not shown');
-    $this->assertText($message2, '"' . $message2 . '" is shown');
-    $this->assertText($message3, '"' . $message3 . '" is shown');
-    $this->assertNoText($message4, '"' . $message4 . '" is not shown');
-
-    // Turn off scheduled unpublishing for the node type and the check again.
-    $this->nodetype->setThirdPartySetting('scheduler', 'unpublish_enable', FALSE)->save();
-    drupal_flush_all_caches();
-    $this->drupalGet('node/' . $this->node->id());
-    $this->assertNoText($message1, '"' . $message1 . '" is not shown');
-    $this->assertNoText($message2, '"' . $message2 . '" is not shown');
-    $this->assertText($message3, '"' . $message3 . '" is shown');
-    $this->assertText($message4, '"' . $message4 . '" is shown');
-
-  }
-
-  /**
-   * Tests the conditions for whether a node is scheduled.
-   */
-  public function testNodeIsScheduledConditions() {
-    // Create a reaction rule to display a message when a node is updated and
-    // is not scheduled for publishing.
-    $rule5 = $this->expressionManager->createRule();
-    $rule5->addCondition('scheduler_condition_node_scheduled_for_publishing',
-      ContextConfig::create()->map('node', 'node')->negateResult()
-    );
-    $message5 = 'RULES message 5. This content is not scheduled for publishing.';
-    $rule5->addAction('rules_system_message', ContextConfig::create()
-      ->setValue('message', $message5)
-      ->setValue('type', 'status')
-      );
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule5',
-      'events' => [['event_name' => 'rules_entity_update:node']],
-      'expression' => $rule5->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // Create a reaction rule to display a message when a node is updated and
-    // is not scheduled for unpublishing.
-    $rule6 = $this->expressionManager->createRule();
-    $rule6->addCondition('scheduler_condition_node_scheduled_for_unpublishing',
-      ContextConfig::create()->map('node', 'node')->negateResult()
-    );
-    $message6 = 'RULES message 6. This content is not scheduled for unpublishing.';
-    $rule6->addAction('rules_system_message', ContextConfig::create()
-      ->setValue('message', $message6)
-      ->setValue('type', 'status')
-      );
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule6',
-      'events' => [['event_name' => 'rules_entity_update:node']],
-      'expression' => $rule6->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // Create a reaction rule to display a message when a node is updated and
-    // is scheduled for publishing.
-    $rule7 = $this->expressionManager->createRule();
-    $rule7->addCondition('scheduler_condition_node_scheduled_for_publishing',
-      ContextConfig::create()->map('node', 'node')
-    );
-    $message7 = 'RULES message 7. This content is scheduled for publishing.';
-    $rule7->addAction('rules_system_message', ContextConfig::create()
-      ->setValue('message', $message7)
-      ->setValue('type', 'status')
-      );
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule7',
-      'events' => [['event_name' => 'rules_entity_update:node']],
-      'expression' => $rule7->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    // Create a reaction rule to display a message when a node is updated and
-    // is scheduled for unpublishing.
-    $rule8 = $this->expressionManager->createRule();
-    $rule8->addCondition('scheduler_condition_node_scheduled_for_unpublishing',
-      ContextConfig::create()->map('node', 'node')
-    );
-    $message8 = 'RULES message 8. This content is scheduled for unpublishing.';
-    $rule8->addAction('rules_system_message', ContextConfig::create()
-      ->setValue('message', $message8)
-      ->setValue('type', 'status')
-      );
-    $config_entity = $this->rulesStorage->create([
-      'id' => 'rule8',
-      'events' => [['event_name' => 'rules_entity_update:node']],
-      'expression' => $rule8->getConfiguration(),
-    ]);
-    $config_entity->save();
-
-    $this->drupalLogin($this->schedulerUser);
-
-    // Edit the node but do not enter any scheduling dates.
-    $edit = [
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
-
-    $this->assertText($message5, '"' . $message5 . '" is shown');
-    $this->assertText($message6, '"' . $message6 . '" is shown');
-    $this->assertNoText($message7, '"' . $message7 . '" is not shown');
-    $this->assertNoText($message8, '"' . $message8 . '" is not shown');
-
-    // Edit the node and set a publish_on date.
-    $edit = [
-      'publish_on[0][value][date]' => date('Y-m-d', strtotime('+1 day', REQUEST_TIME)),
-      'publish_on[0][value][time]' => date('H:i:s', strtotime('+1 day', REQUEST_TIME)),
-    ];
-    $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
-
-    $this->assertNoText($message5, '"' . $message5 . '" is not shown');
-    $this->assertText($message6, '"' . $message6 . '" is shown');
-    $this->assertText($message7, '"' . $message7 . '" is shown');
-    $this->assertNoText($message8, '"' . $message8 . '" is not shown');
-
-    // Edit the node and set an unpublish_on date.
-    $edit = [
-      'unpublish_on[0][value][date]' => date('Y-m-d', strtotime('+2 day', REQUEST_TIME)),
-      'unpublish_on[0][value][time]' => date('H:i:s', strtotime('+2 day', REQUEST_TIME)),
-    ];
-    $this->drupalPostForm('node/' . $this->node->id() . '/edit', $edit, t('Save'));
-
-    $this->assertNoText($message5, '"' . $message5 . '" is not shown');
-    $this->assertNoText($message6, '"' . $message6 . '" is not shown');
-    $this->assertText($message7, '"' . $message7 . '" is shown');
-    $this->assertText($message8, '"' . $message8 . '" is shown');
-
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerRulesEventsTest.php b/modules/scheduler/tests/src/Functional/SchedulerRulesEventsTest.php
deleted file mode 100644
index f7276ad..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerRulesEventsTest.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\rules\Context\ContextConfig;
-
-/**
- * Tests the six events that Scheduler provides for use in Rules module.
- *
- * @group scheduler
- */
-class SchedulerRulesEventsTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Additional modules required.
-   *
-   * @var array
-   */
-  public static $modules = ['scheduler_rules_integration'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->rulesStorage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
-    $this->expressionManager = $this->container->get('plugin.manager.rules_expression');
-
-  }
-
-  /**
-   * Tests the six events provided by Scheduler.
-   *
-   * This class tests all six events provided by Scheduler, by creating six
-   * rules which are all active throughout the test. They are all checked in
-   * this one test class to make the tests stronger, as this will show not only
-   * that the correct events are triggered in the right places, but also
-   * that they are not triggered in the wrong places.
-   */
-  public function testRulesEvents() {
-
-    // Create six reaction rules, one for each event that Scheduler triggers.
-    $rule_data = [
-      1 => ['scheduler_new_node_is_scheduled_for_publishing_event', 'A new node is created and is scheduled for publishing.'],
-      2 => ['scheduler_existing_node_is_scheduled_for_publishing_event', 'An existing node is saved and is scheduled for publishing.'],
-      3 => ['scheduler_has_published_this_node_event', 'Scheduler has published this node during cron.'],
-      4 => ['scheduler_new_node_is_scheduled_for_unpublishing_event', 'A new node is created and is scheduled for unpublishing.'],
-      5 => ['scheduler_existing_node_is_scheduled_for_unpublishing_event', 'An existing node is saved and is scheduled for unpublishing.'],
-      6 => ['scheduler_has_unpublished_this_node_event', 'Scheduler has unpublished this node during cron.'],
-    ];
-    foreach ($rule_data as $i => list($event_name, $description)) {
-      $rule[$i] = $this->expressionManager->createRule();
-      $message[$i] = 'RULES message ' . $i . '. ' . $description;
-      $rule[$i]->addAction('rules_system_message', ContextConfig::create()
-        ->setValue('message', $message[$i])
-        ->setValue('type', 'status')
-        );
-      $config_entity = $this->rulesStorage->create([
-        'id' => 'rule' . $i,
-        'events' => [['event_name' => $event_name]],
-        'expression' => $rule[$i]->getConfiguration(),
-      ]);
-      $config_entity->save();
-    }
-
-    $this->drupalLogin($this->schedulerUser);
-
-    // Create a node without any scheduled dates, using node/add/ not
-    // drupalCreateNode(), and check that no events are triggered.
-    $edit = [
-      'title[0][value]' => 'Test for no events',
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
-    $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
-    $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
-    $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
-    $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
-    $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
-    $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
-    $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
-    // Edit the node and check that no events are triggered.
-    $edit = [
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
-    $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
-    $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
-    $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
-    $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
-    $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
-    // Create a new node with a publish-on date, and check that only event 1 is
-    // triggered.
-    $edit = [
-      'title[0][value]' => 'Create node with publish-on date',
-      'publish_on[0][value][date]' => date('Y-m-d', time() + 3),
-      'publish_on[0][value][time]' => date('H:i:s', time() + 3),
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
-    $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
-    $this->assertText($message[1], '"' . $message[1] . '" IS shown');
-    $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
-    $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
-    $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
-    $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
-    $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
-    // Edit this node and check that only event 2 is triggered.
-    $edit = [
-      'title[0][value]' => 'Edit node with publish-on date',
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
-    $this->assertText($message[2], '"' . $message[2] . '" IS shown');
-    $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
-    $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
-    $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
-    $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
-    // Delay to ensure that the date entered is now in the past so that the node
-    // will be processed during cron, and assert that event 3 is triggered.
-    sleep(5);
-    $this->cronRun();
-    $this->drupalGet('admin/reports/dblog');
-    $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
-    $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
-    $this->assertText($message[3], '"' . $message[3] . '" IS shown');
-    $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
-    $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
-    $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
-    // Create a new node with an unpublish-on date, and check that only event 4
-    // is triggered.
-    $edit = [
-      'title[0][value]' => 'Create node with unpublish-on date',
-      'unpublish_on[0][value][date]' => date('Y-m-d', time() + 3),
-      'unpublish_on[0][value][time]' => date('H:i:s', time() + 3),
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
-    $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
-    $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
-    $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
-    $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
-    $this->assertText($message[4], '"' . $message[4] . '" IS shown');
-    $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
-    $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
-    // Edit this node and check that only event 5 is triggered.
-    $edit = [
-      'title[0][value]' => 'Edit node with unpublish-on date',
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
-    $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
-    $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
-    $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
-    $this->assertText($message[5], '"' . $message[5] . '" IS shown');
-    $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
-    // Delay to ensure that the date entered is now in the past so that the node
-    // will be processed during cron, and assert that event 6 is triggered.
-    sleep(5);
-    $this->cronRun();
-    $this->drupalGet('admin/reports/dblog');
-    $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
-    $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
-    $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
-    $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
-    $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
-    $this->assertText($message[6], '"' . $message[6] . '" IS shown');
-
-    // Create a new node with both publish-on and unpublish-on dates, and check
-    // that events 1 and event 4 are both triggered.
-    $edit = [
-      'title[0][value]' => 'Create node with both dates',
-      'publish_on[0][value][date]' => date('Y-m-d', time() + 3),
-      'publish_on[0][value][time]' => date('H:i:s', time() + 3),
-      'unpublish_on[0][value][date]' => date('Y-m-d', time() + 4),
-      'unpublish_on[0][value][time]' => date('H:i:s', time() + 4),
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
-    $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
-    $this->assertText($message[1], '"' . $message[1] . '" IS shown');
-    $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
-    $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
-    $this->assertText($message[4], '"' . $message[4] . '" IS shown');
-    $this->assertNoText($message[5], '"' . $message[5] . '" is not shown');
-    $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
-    // Edit this node and check that events 2 and 5 are triggered.
-    $edit = [
-      'title[0][value]' => 'Edit node with both dates',
-      'body[0][value]' => $this->randomString(30),
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
-    $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
-    $this->assertText($message[2], '"' . $message[2] . '" IS shown');
-    $this->assertNoText($message[3], '"' . $message[3] . '" is not shown');
-    $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
-    $this->assertText($message[5], '"' . $message[5] . '" IS shown');
-    $this->assertNoText($message[6], '"' . $message[6] . '" is not shown');
-
-    // Delay to ensure that the dates are now in the past so that the node will
-    // be processed during cron, and assert that events 3, 5 & 6 are triggered.
-    sleep(6);
-    $this->cronRun();
-    $this->drupalGet('admin/reports/dblog');
-    $this->assertNoText($message[1], '"' . $message[1] . '" is not shown');
-    $this->assertNoText($message[2], '"' . $message[2] . '" is not shown');
-    $this->assertText($message[3], '"' . $message[3] . '" IS shown');
-    $this->assertNoText($message[4], '"' . $message[4] . '" is not shown');
-    $this->assertText($message[5], '"' . $message[5] . '" IS shown');
-    $this->assertText($message[6], '"' . $message[6] . '" IS shown');
-
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerScheduledContentListAccessTest.php b/modules/scheduler/tests/src/Functional/SchedulerScheduledContentListAccessTest.php
deleted file mode 100644
index bcac9f3..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerScheduledContentListAccessTest.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-/**
- * Tests access to the scheduled content overview page and user tab.
- *
- * @group scheduler
- */
-class SchedulerScheduledContentListAccessTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Additional modules required.
-   *
-   * @var array
-   */
-  public static $modules = ['views'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $base_permissions = [
-      'access content',
-      'create ' . $this->type . ' content',
-      'view own unpublished content',
-    ];
-
-    $this->editorUser = $this->drupalCreateUser(array_merge($base_permissions, ['access content overview']));
-    $this->schedulerUser = $this->drupalCreateUser(array_merge($base_permissions, ['schedule publishing of nodes']));
-    $this->schedulerManager = $this->drupalCreateUser(array_merge($base_permissions, ['view scheduled content']));
-
-    // Create nodes scheduled for publishing and for unpublishing.
-    $this->node1 = $this->drupalCreateNode([
-      'title' => 'Node created by Scheduler User for publishing',
-      'uid' => $this->schedulerUser->id(),
-      'status' => FALSE,
-      'type' => $this->type,
-      'publish_on' => strtotime('+1 week'),
-    ]);
-    $this->node2 = $this->drupalCreateNode([
-      'title' => 'Node created by Scheduler User for unpublishing',
-      'uid' => $this->schedulerUser->id(),
-      'status' => TRUE,
-      'type' => $this->type,
-      'unpublish_on' => strtotime('+1 week'),
-    ]);
-    $this->node3 = $this->drupalCreateNode([
-      'title' => 'Node created by Scheduler Manager for publishing',
-      'uid' => $this->schedulerManager->id(),
-      'status' => FALSE,
-      'type' => $this->type,
-      'publish_on' => strtotime('+1 week'),
-    ]);
-    $this->node4 = $this->drupalCreateNode([
-      'title' => 'Node created by Scheduler Manager for unpublishing',
-      'uid' => $this->schedulerManager->id(),
-      'status' => TRUE,
-      'type' => $this->type,
-      'unpublish_on' => strtotime('+1 week'),
-    ]);
-  }
-
-  /**
-   * Tests the scheduled content tab on the user page.
-   */
-  public function testViewScheduledContentUser() {
-    // Access a scheduled content user tab as an anonymous visitor.
-    $this->drupalGet("user/{$this->schedulerUser->id()}/scheduled");
-    $this->assertResponse(403, 'An anonymous visitor cannot access a user\'s scheduled content tab.');
-
-    // Access a users own scheduled content tab as "Editor" without any
-    // scheduler permissions.
-    $this->drupalLogin($this->editorUser);
-    $this->drupalGet("user/{$this->editorUser->id()}/scheduled");
-    $this->assertResponse(403, '"Editor" cannot access a scheduled content user tab.');
-
-    // Access a users own scheduled content tab as "Scheduler User" with only
-    // 'schedule publishing of nodes' permission.
-    $this->drupalLogin($this->schedulerUser);
-    $this->drupalGet("user/{$this->schedulerUser->id()}/scheduled");
-    $this->assertResponse(200, '"Scheduler User" can access their scheduled content user tab.');
-    $this->assertText('Node created by Scheduler User for publishing');
-    $this->assertText('Node created by Scheduler User for unpublishing');
-    $this->assertNoText('Node created by Scheduler Manager for unpublishing');
-
-    // Access another users scheduled content tab as "Scheduler User".
-    $this->drupalGet("user/{$this->schedulerManager->id()}/scheduled");
-    $this->assertResponse(403, '"Scheduler User" cannot access the scheduled content user tab for "Scheduler Manager"');
-
-    // Access the users own scheduled content tab as "Scheduler Manager" with
-    // only 'view scheduled content' permission.
-    $this->drupalLogin($this->schedulerManager);
-    $this->drupalGet("user/{$this->schedulerManager->id()}/scheduled");
-    $this->assertResponse(200, 'Scheduler Manager can access their own scheduled content user tab.');
-    $this->assertText('Node created by Scheduler Manager for publishing');
-    $this->assertText('Node created by Scheduler Manager for unpublishing');
-    $this->assertNoText('Node created by Scheduler User for unpublishing');
-
-    // Access another users scheduled content tab as "Scheduler Manager".
-    // The published and unpublished content should be listed.
-    $this->drupalGet("user/{$this->schedulerUser->id()}/scheduled");
-    $this->assertResponse(200, '"Scheduler Manager" can access the scheduled content user tab for "Scheduler User"');
-    $this->assertText('Node created by Scheduler User for publishing');
-    $this->assertText('Node created by Scheduler User for unpublishing');
-  }
-
-  /**
-   * Tests the scheduled content overview.
-   */
-  public function testViewScheduledContentOverview() {
-    // Access the scheduled content overview as anonymous visitor.
-    $this->drupalGet('admin/content/scheduled');
-    $this->assertResponse(403, 'An anonymous visitor cannot access the scheduled content overview.');
-
-    // Access the scheduled content overview as "Editor" without any
-    // scheduler permissions.
-    $this->drupalLogin($this->editorUser);
-    $this->drupalGet('admin/content/scheduled');
-    $this->assertResponse(403, '"Editor" cannot access the scheduled content overview.');
-
-    // Access the scheduled content overview as "Scheduler User" with only
-    // 'schedule publishing of nodes' permission.
-    $this->drupalLogin($this->schedulerUser);
-    $this->drupalGet('admin/content/scheduled');
-    $this->assertResponse(403, '"Scheduler User" cannot access the scheduled content overview.');
-
-    // Access the scheduled content overview as "Scheduler Manager" with only
-    // 'view scheduled content' permission. They should be able to see the
-    // scheduled published and unpublished content by all users.
-    $this->drupalLogin($this->schedulerManager);
-    $this->drupalGet('admin/content/scheduled');
-    $this->assertResponse(200, 'Scheduler Manager can access the scheduled content overview.');
-    $this->assertText('Node created by Scheduler User for publishing');
-    $this->assertText('Node created by Scheduler User for unpublishing');
-    $this->assertText('Node created by Scheduler Manager for publishing');
-    $this->assertText('Node created by Scheduler Manager for unpublishing');
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerStatusReportTest.php b/modules/scheduler/tests/src/Functional/SchedulerStatusReportTest.php
deleted file mode 100644
index b58c1f1..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerStatusReportTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-/**
- * Tests the Scheduler section of the status report.
- *
- * @group scheduler
- */
-class SchedulerStatusReportTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Tests that the Scheduler Time Check report is shown.
-   */
-  public function testStatusReport() {
-    $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/reports/status');
-
-    $this->assertText('Scheduler Time Check');
-    $this->assertText('In most cases the server time should match Coordinated Universal Time (UTC) / Greenwich Mean Time (GMT)');
-
-    $admin_regional_settings = \Drupal::url('system.regional_settings');
-    $this->assertLink('changed by admin users');
-    $this->assertLinkByHref($admin_regional_settings);
-
-    $account_edit = \Drupal::url('entity.user.edit_form', ['user' => $this->adminUser->id()]);
-    $this->assertLink('user account');
-    $this->assertLinkByHref($account_edit);
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerTokenReplaceTest.php b/modules/scheduler/tests/src/Functional/SchedulerTokenReplaceTest.php
deleted file mode 100644
index ceb4487..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerTokenReplaceTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-/**
- * Generates text using placeholders to check scheduler token replacement.
- *
- * @group scheduler
- */
-class SchedulerTokenReplaceTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Creates a node, then tests the tokens generated from it.
-   */
-  public function testSchedulerTokenReplacement() {
-    $this->drupalLogin($this->schedulerUser);
-    $date_formatter = \Drupal::service('date.formatter');
-
-    // Define timestamps for consistent use when repeated throughout this test.
-    $publish_on_timestamp = REQUEST_TIME + 3600;
-    $unpublish_on_timestamp = REQUEST_TIME + 7200;
-
-    // Create an unpublished page with scheduled dates.
-    $node = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => FALSE,
-      'publish_on' => $publish_on_timestamp,
-      'unpublish_on' => $unpublish_on_timestamp,
-    ]);
-    // Show that the node is scheduled.
-    $this->drupalGet('admin/content/scheduled');
-
-    // Create array of test case data.
-    // @TODO Convert this test to use @dataProvider instead of array and loop?
-    $test_cases = [
-      ['token_format' => '', 'date_format' => 'medium', 'custom' => ''],
-      ['token_format' => ':long', 'date_format' => 'long', 'custom' => ''],
-      ['token_format' => ':raw', 'date_format' => 'custom', 'custom' => 'U'],
-      [
-        'token_format' => ':custom:jS F g:ia e O',
-        'date_format' => 'custom',
-        'custom' => 'jS F g:ia e O',
-      ],
-    ];
-
-    foreach ($test_cases as $test_data) {
-      // Edit the node and set the body tokens to use the format being tested.
-      $edit = [
-        'body[0][value]' => 'Publish on: [node:scheduler-publish' . $test_data['token_format'] . ']. Unpublish on: [node:scheduler-unpublish' . $test_data['token_format'] . '].',
-      ];
-      $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-      $this->drupalGet('node/' . $node->id());
-
-      // Refresh the node and get the body output value.
-      $this->nodeStorage->resetCache([$node->id()]);
-      $node = $this->nodeStorage->load($node->id());
-      $body_output = \Drupal::token()->replace($node->body->value, ['node' => $node]);
-
-      // Create the expected text for the body.
-      $publish_on_date = $date_formatter->format($publish_on_timestamp, $test_data['date_format'], $test_data['custom']);
-      $unpublish_on_date = $date_formatter->format($unpublish_on_timestamp, $test_data['date_format'], $test_data['custom']);
-      $expected_output = 'Publish on: ' . $publish_on_date . '. Unpublish on: ' . $unpublish_on_date . '.';
-      // Check that the actual text matches the expected value.
-      $this->assertEqual($body_output, $expected_output, 'Scheduler tokens replaced correctly for ' . $test_data['token_format'] . ' format.');
-    }
-  }
-
-}
diff --git a/modules/scheduler/tests/src/Functional/SchedulerValidationTest.php b/modules/scheduler/tests/src/Functional/SchedulerValidationTest.php
deleted file mode 100644
index 346ac01..0000000
--- a/modules/scheduler/tests/src/Functional/SchedulerValidationTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Drupal\Tests\scheduler\Functional;
-
-use Drupal\Component\Utility\SafeMarkup;
-
-/**
- * Tests the validation when editing a node.
- *
- * @group scheduler
- */
-class SchedulerValidationTest extends SchedulerBrowserTestBase {
-
-  /**
-   * Tests the validation when editing a node.
-   *
-   * The 'required' checks and 'dates in the past' checks are handled in other
-   * tests. This test checks validation when fields interact.
-   */
-  public function testValidationDuringEdit() {
-    $this->drupalLogin($this->adminUser);
-
-    // Set unpublishing to be required.
-    $this->nodetype->setThirdPartySetting('scheduler', 'unpublish_required', TRUE)->save();
-
-    // Create an unpublished page node, then edit the node and check that if a
-    // publish-on date is entered then an unpublish-on date is also needed.
-    $node = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => FALSE,
-    ]);
-    $edit = [
-      'publish_on[0][value][date]' => date('Y-m-d', strtotime('+1 day', REQUEST_TIME)),
-      'publish_on[0][value][time]' => date('H:i:s', strtotime('+1 day', REQUEST_TIME)),
-    ];
-    $this->drupalGet('node/' . $node->id() . '/edit');
-
-    // At core 8.4 an enhancement will be committed to change the 'save and ...'
-    // button into a 'save' with a corresponding status checkbox. This test has
-    // to pass at 8.3 but the core change will not be backported. Hence derive
-    // the button text and whether we need a 'status'field.
-    // @see https://www.drupal.org/node/2873108
-    $checkbox = $this->xpath('//input[@type="checkbox" and @id="edit-status-value"]');
-
-    $this->submitForm($edit, $checkbox ? 'Save' : 'Save and keep unpublished');
-    $this->assertRaw(t("If you set a 'publish on' date then you must also set an 'unpublish on' date."), 'Validation prevents entering a publish-on date with no unpublish-on date if unpublishing is required.');
-    $this->assertNoRaw(t('@type %title has been updated.', ['@type' => $this->typeName, '%title' => SafeMarkup::checkPlain($node->title->value)]), 'The node has not been saved.');
-
-    // Create an unpublished page node, then edit the node and check that if the
-    // status is changed to published, then an unpublish-on date is also needed.
-    $node = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => FALSE,
-    ]);
-    if ($checkbox) {
-      $edit = ['status[value]' => TRUE];
-    }
-    else {
-      $edit = [];
-    }
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, $checkbox ? 'Save' : 'Save and publish');
-    $this->assertRaw(t("Either you must set an 'unpublish on' date or save this node as unpublished."), 'Validation prevents publishing the node directly without an unpublish-on date if unpublishing is required.');
-    $this->assertNoRaw(t('@type %title has been updated.', ['@type' => $this->typeName, '%title' => SafeMarkup::checkPlain($node->title->value)]), 'The node has not been saved.');
-
-    // Create an unpublished node, edit the node and check that if both dates
-    // are entered then the unpublish date is later than the publish date.
-    $node = $this->drupalCreateNode([
-      'type' => $this->type,
-      'status' => FALSE,
-    ]);
-    $edit = [
-      'publish_on[0][value][date]' => \Drupal::service('date.formatter')->format(REQUEST_TIME + 8100, 'custom', 'Y-m-d'),
-      'publish_on[0][value][time]' => \Drupal::service('date.formatter')->format(REQUEST_TIME + 8100, 'custom', 'H:i:s'),
-      'unpublish_on[0][value][date]' => \Drupal::service('date.formatter')->format(REQUEST_TIME + 1800, 'custom', 'Y-m-d'),
-      'unpublish_on[0][value][time]' => \Drupal::service('date.formatter')->format(REQUEST_TIME + 1800, 'custom', 'H:i:s'),
-    ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, $checkbox ? 'Save' : 'Save and keep unpublished');
-    $this->assertRaw(t("The 'unpublish on' date must be later than the 'publish on' date."), 'Validation prevents entering an unpublish-on date which is earlier than the publish-on date.');
-    $this->assertNoRaw(t('@type %title has been updated.', ['@type' => $this->typeName, '%title' => SafeMarkup::checkPlain($node->title->value)]), 'The node has not been saved.');
-  }
-
-}
diff --git a/modules/token/.travis.yml b/modules/token/.travis.yml
deleted file mode 100644
index fbf5036..0000000
--- a/modules/token/.travis.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-language: php
-cache:
-  bundler: true
-  directories:
-    - $HOME/tmp/drush
-    - $HOME/.bundle
-  apt: true
-
-php:
-  - 5.4
-  - 5.5
-
-env:
-  - PATH=$PATH:/home/travis/.composer/vendor/bin
-
-# This will create the database
-mysql:
-  database: drupal
-  username: root
-  encoding: utf8
-
-# To be able to run a webbrowser
-# If we need anything more powerful
-# than e.g. phantomjs
-before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-
-install:
-  # Grab Drush
-  - composer global require drush/drush:dev-master --prefer-source
-  - cd /home/travis/.composer/vendor/drush/drush && cd -
-  # Make sure we don't fail when checking out projects
-  - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-  # LAMP package installation (mysql is already started)
-  - sudo apt-get update
-  - sudo apt-get install apache2 libapache2-mod-fastcgi
-  # enable php-fpm, travis does not support any other method with php and apache
-  - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
-  - sudo a2enmod rewrite actions fastcgi alias
-  - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
-  # Make sure the apache root is in our wanted directory
-  - echo "$(curl -fsSL https://gist.githubusercontent.com/nickveenhof/11386315/raw/b8abaf9304fe12b5cc7752d39c29c1edae8ac2e6/gistfile1.txt)" | sed -e "s,PATH,$TRAVIS_BUILD_DIR/../drupal,g" | sudo tee /etc/apache2/sites-available/default > /dev/null
-  # Set sendmail so drush doesn't throw an error during site install.
-  - echo "sendmail_path='true'" >> `php --ini | grep "Loaded Configuration" | awk '{print $4}'`
-  # Forward the errors to the syslog so we can print them
-  - echo "error_log=syslog" >> `php --ini | grep "Loaded Configuration" | awk '{print $4}'`
-  # Get latest drupal 8 core
-  - cd $TRAVIS_BUILD_DIR/..
-  - git clone --depth 1 --branch 8.0.x http://git.drupal.org/project/drupal.git
-  # Restart apache and test it
-  - sudo service apache2 restart
-  - curl -v "http://localhost"
-  # Re-enable when trying to get CodeSniffer doesn't return a 403 anymore.
-  #- composer global require drupal/coder:\>7
-
-before_script:
-  - cd $TRAVIS_BUILD_DIR/../drupal
-  # Update drupal core
-  - git pull origin 8.0.x
-  # Install the site
-  - drush -v site-install minimal --db-url=mysql://root:@localhost/drupal --yes
-  - drush en --yes simpletest
-  - drush cr
-  - phpenv rehash
-
-script:
-  # go to our Drupal module directory
-  - mkdir $TRAVIS_BUILD_DIR/../drupal/modules/token
-  - cp -R $TRAVIS_BUILD_DIR/* $TRAVIS_BUILD_DIR/../drupal/modules/token/
-  # go to our Drupal main directory
-  - cd $TRAVIS_BUILD_DIR/../drupal
-  - ls -la $TRAVIS_BUILD_DIR/../drupal/sites/default
-  # Run the tests
-  - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --php `which php` --url http://localhost "token" | tee /tmp/test.txt; TEST_EXIT=${PIPESTATUS[0]}
-  - echo $TEST_EXIT
-  # Check if we had fails in the run-tests.sh script
-  # Exit with the inverted value, because if there are no fails found, it will exit with 1 and for us that\
-  # is a good thing so invert it to 0. Travis has some issues with the exclamation mark in front so we have to fiddle a
-  # bit.
-  # Also make the grep case insensitive and fail on run-tests.sh regular fails as well on fatal errors.
-  - TEST_OUTPUT=$(! egrep -i "([0-9]+ fails)|(PHP Fatal error)|([0-9]+ exceptions)" /tmp/test.txt > /dev/null)$?
-  - echo $TEST_OUTPUT
-  - cd $TRAVIS_BUILD_DIR/../drupal/core
-  - ./vendor/bin/phpunit --verbose --debug ../modules/token/; TEST_PHPUNIT=$?
-  - echo $TEST_PHPUNIT
-  # if the TEST_EXIT status is 0 AND the TEST_OUTPUT status is also 0 it means we succeeded, in all other cases we
-  # failed.
-  # Re-enable when trying to get CodeSniffer doesn't return a 403 anymore.
-  #- /home/travis/.composer/vendor/bin/phpcs --standard=/home/travis/.composer/vendor/drupal/coder/coder_sniffer/Drupal --extensions=php,inc,test,module,install --ignore=css/ $TRAVIS_BUILD_DIR/../drupal/modules/search_api
-  - php -i | grep 'php.ini'
-  - sudo cat /var/log/apache2/error.log
-  - sudo cat /var/log/syslog | grep 'php' | cat # Suppress grep exit status 1
-  # Exit the build
-  - if [ $TEST_EXIT -eq 0 ] && [ $TEST_OUTPUT -eq 0 ] && [ $TEST_PHPUNIT -eq 0 ]; then exit 0; else exit 1; fi
diff --git a/modules/token/LICENSE.txt b/modules/token/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/token/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/token/README.md b/modules/token/README.md
deleted file mode 100644
index c37d335..0000000
--- a/modules/token/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-INTRODUCTION
-------------
- 
- Provides common and resuable token UI elements and missing core tokens.
-
- * For a full description of the module, visit the project page:
-   https://drupal.org/project/token
-
- * To submit bug reports and feature suggestions, or to track changes:
-   https://drupal.org/project/issues/token
-
-
-INSTALLATION
-------------
-
-Install as usual, see
- https://www.drupal.org/docs/8/extending-drupal-8/installing-contributed-modules-find-import-enable-configure-drupal-8 for further
-information.
-
-
-TROUBLESHOOTING
----------------
-
-Token module doesn't provide any visible functions to the user on its own, it
-just provides token handling services for other modules.
-
-
-MAINTAINERS
------------
-
-Current maintainers:
-
- * Dave Reid (https://drupal.org/user/53892)
diff --git a/modules/token/css/jquery.treetable.css b/modules/token/css/jquery.treetable.css
deleted file mode 100644
index 4e95bfd..0000000
--- a/modules/token/css/jquery.treetable.css
+++ /dev/null
@@ -1,28 +0,0 @@
-table.treetable span.indenter {
-  display: inline-block;
-  margin: 0;
-  padding: 0;
-  text-align: right;
-
-  /* Disable text selection of nodes (for better D&D UX) */
-  user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -o-user-select: none;
-  -webkit-user-select: none;
-
-  /* Force content-box box model for indenter (Bootstrap compatibility) */
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-
-  width: 19px;
-}
-
-table.treetable span.indenter a {
-  background-position: left center;
-  background-repeat: no-repeat;
-  display: inline-block;
-  text-decoration: none;
-  width: 19px;
-}
diff --git a/modules/token/css/token.css b/modules/token/css/token.css
deleted file mode 100644
index ca201b8..0000000
--- a/modules/token/css/token.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.token-tree-dialog {
-  border: 1px solid #6b6b6b;
-  border-radius: 5px 5px 0 0;
-  box-shadow: 0 0 10px #6b6b6b;
-}
-
-.token-tree {
-  font-size: 0.85em;
-  margin-left: 19px;
-}
-
-.ui-dialog-content .token-tree {
-  margin-left: 0;
-}
-
-.token-tree td, .token-tree th {
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-.token-group {
-  font-weight: bold;
-}
-
-.js .token-group {
-  font-weight: normal;
-}
-
-/* Prevent the token columns from being wrapped. */
-.token-tree td.token-key {
-  white-space: nowrap;
-}
diff --git a/modules/token/css/token.treetable.theme.css b/modules/token/css/token.treetable.theme.css
deleted file mode 100644
index a93c557..0000000
--- a/modules/token/css/token.treetable.theme.css
+++ /dev/null
@@ -1,50 +0,0 @@
-table.treetable {
-}
-
-table.treetable caption {
-}
-
-table.treetable thead {
-}
-
-table.treetable thead tr th {
-}
-
-table.treetable tbody tr td {
-  cursor: default;
-}
-
-table.treetable span {
-  background-position: center left;
-  background-repeat: no-repeat;
-  padding: .2em 0 .2em 1.5em;
-}
-
-table.treetable tr.collapsed span.indenter a {
-  background-image: url(data:image/png;base64,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);
-}
-
-table.treetable tr.expanded span.indenter a {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAAHFJREFUeNpi/P//PwMlgImBQsA44C6gvhfa29v3MzAwOODRc6CystIRbxi0t7fjDJjKykpGYrwwi1hxnLHQ3t7+jIGBQRJJ6HllZaUUKYEYRYBPOB0gBShKwKGA////48VtbW3/8clTnBIH3gCKkzJgAGvBX0dDm0sCAAAAAElFTkSuQmCC);
-}
-
-table.treetable tr.branch {
-  background-color: #f9f9f9;
-}
-
-table.treetable tr.selected {
-  background-color: #3875d7;
-  color: #fff;
-}
-
-table.treetable tr span.indenter {
-  margin-left: -19px;
-}
-table.treetable tr span.indenter a {
-  outline: none; /* Expander shows outline after upgrading to 3.0 (#141) */
-}
-
-table.treetable tr.accept {
-  background-color: #a3bce4;
-  color: #fff
-}
diff --git a/modules/token/js/jquery.treetable.js b/modules/token/js/jquery.treetable.js
deleted file mode 100644
index ac9d90a..0000000
--- a/modules/token/js/jquery.treetable.js
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
- * jQuery treetable Plugin 3.2.0
- * http://ludo.cubicphuse.nl/jquery-treetable
- *
- * Copyright 2013, Ludo van den Boom
- * Dual licensed under the MIT or GPL Version 2 licenses.
- */
-(function($) {
-  var Node, Tree, methods;
-
-  Node = (function() {
-    function Node(row, tree, settings) {
-      var parentId;
-
-      this.row = row;
-      this.tree = tree;
-      this.settings = settings;
-
-      // TODO Ensure id/parentId is always a string (not int)
-      this.id = this.row.data(this.settings.nodeIdAttr);
-
-      // TODO Move this to a setParentId function?
-      parentId = this.row.data(this.settings.parentIdAttr);
-      if (parentId != null && parentId !== "") {
-        this.parentId = parentId;
-      }
-
-      this.treeCell = $(this.row.children(this.settings.columnElType)[this.settings.column]);
-      this.expander = $(this.settings.expanderTemplate);
-      this.indenter = $(this.settings.indenterTemplate);
-      this.children = [];
-      this.initialized = false;
-      this.treeCell.prepend(this.indenter);
-    }
-
-    Node.prototype.addChild = function(child) {
-      return this.children.push(child);
-    };
-
-    Node.prototype.ancestors = function() {
-      var ancestors, node;
-      node = this;
-      ancestors = [];
-      while (node = node.parentNode()) {
-        ancestors.push(node);
-      }
-      return ancestors;
-    };
-
-    Node.prototype.collapse = function() {
-      if (this.collapsed()) {
-        return this;
-      }
-
-      this.row.removeClass("expanded").addClass("collapsed");
-
-      this._hideChildren();
-      this.expander.attr("title", this.settings.stringExpand);
-
-      if (this.initialized && this.settings.onNodeCollapse != null) {
-        this.settings.onNodeCollapse.apply(this);
-      }
-
-      return this;
-    };
-
-    Node.prototype.collapsed = function() {
-      return this.row.hasClass("collapsed");
-    };
-
-    // TODO destroy: remove event handlers, expander, indenter, etc.
-
-    Node.prototype.expand = function() {
-      if (this.expanded()) {
-        return this;
-      }
-
-      this.row.removeClass("collapsed").addClass("expanded");
-
-      if (this.initialized && this.settings.onNodeExpand != null) {
-        this.settings.onNodeExpand.apply(this);
-      }
-
-      if ($(this.row).is(":visible")) {
-        this._showChildren();
-      }
-
-      this.expander.attr("title", this.settings.stringCollapse);
-
-      return this;
-    };
-
-    Node.prototype.expanded = function() {
-      return this.row.hasClass("expanded");
-    };
-
-    Node.prototype.hide = function() {
-      this._hideChildren();
-      this.row.hide();
-      return this;
-    };
-
-    Node.prototype.isBranchNode = function() {
-      if(this.children.length > 0 || this.row.data(this.settings.branchAttr) === true) {
-        return true;
-      } else {
-        return false;
-      }
-    };
-
-    Node.prototype.updateBranchLeafClass = function(){
-      this.row.removeClass('branch');
-      this.row.removeClass('leaf');
-      this.row.addClass(this.isBranchNode() ? 'branch' : 'leaf');
-    };
-
-    Node.prototype.level = function() {
-      return this.ancestors().length;
-    };
-
-    Node.prototype.parentNode = function() {
-      if (this.parentId != null) {
-        return this.tree[this.parentId];
-      } else {
-        return null;
-      }
-    };
-
-    Node.prototype.removeChild = function(child) {
-      var i = $.inArray(child, this.children);
-      return this.children.splice(i, 1)
-    };
-
-    Node.prototype.render = function() {
-      var handler,
-          settings = this.settings,
-          target;
-
-      if (settings.expandable === true && this.isBranchNode()) {
-        handler = function(e) {
-          $(this).parents("table").treetable("node", $(this).parents("tr").data(settings.nodeIdAttr)).toggle();
-          return e.preventDefault();
-        };
-
-        this.indenter.html(this.expander);
-        target = settings.clickableNodeNames === true ? this.treeCell : this.expander;
-
-        target.off("click.treetable").on("click.treetable", handler);
-        target.off("keydown.treetable").on("keydown.treetable", function(e) {
-          if (e.keyCode == 13) {
-            handler.apply(this, [e]);
-          }
-        });
-      }
-
-      this.indenter[0].style.paddingLeft = "" + (this.level() * settings.indent) + "px";
-
-      return this;
-    };
-
-    Node.prototype.reveal = function() {
-      if (this.parentId != null) {
-        this.parentNode().reveal();
-      }
-      return this.expand();
-    };
-
-    Node.prototype.setParent = function(node) {
-      if (this.parentId != null) {
-        this.tree[this.parentId].removeChild(this);
-      }
-      this.parentId = node.id;
-      this.row.data(this.settings.parentIdAttr, node.id);
-      return node.addChild(this);
-    };
-
-    Node.prototype.show = function() {
-      if (!this.initialized) {
-        this._initialize();
-      }
-      this.row.show();
-      if (this.expanded()) {
-        this._showChildren();
-      }
-      return this;
-    };
-
-    Node.prototype.toggle = function() {
-      if (this.expanded()) {
-        this.collapse();
-      } else {
-        this.expand();
-      }
-      return this;
-    };
-
-    Node.prototype._hideChildren = function() {
-      var child, _i, _len, _ref, _results;
-      _ref = this.children;
-      _results = [];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        child = _ref[_i];
-        _results.push(child.hide());
-      }
-      return _results;
-    };
-
-    Node.prototype._initialize = function() {
-      var settings = this.settings;
-
-      this.render();
-
-      if (settings.expandable === true && settings.initialState === "collapsed") {
-        this.collapse();
-      } else {
-        this.expand();
-      }
-
-      if (settings.onNodeInitialized != null) {
-        settings.onNodeInitialized.apply(this);
-      }
-
-      return this.initialized = true;
-    };
-
-    Node.prototype._showChildren = function() {
-      var child, _i, _len, _ref, _results;
-      _ref = this.children;
-      _results = [];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        child = _ref[_i];
-        _results.push(child.show());
-      }
-      return _results;
-    };
-
-    return Node;
-  })();
-
-  Tree = (function() {
-    function Tree(table, settings) {
-      this.table = table;
-      this.settings = settings;
-      this.tree = {};
-
-      // Cache the nodes and roots in simple arrays for quick access/iteration
-      this.nodes = [];
-      this.roots = [];
-    }
-
-    Tree.prototype.collapseAll = function() {
-      var node, _i, _len, _ref, _results;
-      _ref = this.nodes;
-      _results = [];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        node = _ref[_i];
-        _results.push(node.collapse());
-      }
-      return _results;
-    };
-
-    Tree.prototype.expandAll = function() {
-      var node, _i, _len, _ref, _results;
-      _ref = this.nodes;
-      _results = [];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        node = _ref[_i];
-        _results.push(node.expand());
-      }
-      return _results;
-    };
-
-    Tree.prototype.findLastNode = function (node) {
-      if (node.children.length > 0) {
-        return this.findLastNode(node.children[node.children.length - 1]);
-      } else {
-        return node;
-      }
-    };
-
-    Tree.prototype.loadRows = function(rows) {
-      var node, row, i;
-
-      if (rows != null) {
-        for (i = 0; i < rows.length; i++) {
-          row = $(rows[i]);
-
-          if (row.data(this.settings.nodeIdAttr) != null) {
-            node = new Node(row, this.tree, this.settings);
-            this.nodes.push(node);
-            this.tree[node.id] = node;
-
-            if (node.parentId != null && this.tree[node.parentId]) {
-              this.tree[node.parentId].addChild(node);
-            } else {
-              this.roots.push(node);
-            }
-          }
-        }
-      }
-
-      for (i = 0; i < this.nodes.length; i++) {
-        node = this.nodes[i].updateBranchLeafClass();
-      }
-
-      return this;
-    };
-
-    Tree.prototype.move = function(node, destination) {
-      // Conditions:
-      // 1: +node+ should not be inserted as a child of +node+ itself.
-      // 2: +destination+ should not be the same as +node+'s current parent (this
-      //    prevents +node+ from being moved to the same location where it already
-      //    is).
-      // 3: +node+ should not be inserted in a location in a branch if this would
-      //    result in +node+ being an ancestor of itself.
-      var nodeParent = node.parentNode();
-      if (node !== destination && destination.id !== node.parentId && $.inArray(node, destination.ancestors()) === -1) {
-        node.setParent(destination);
-        this._moveRows(node, destination);
-
-        // Re-render parentNode if this is its first child node, and therefore
-        // doesn't have the expander yet.
-        if (node.parentNode().children.length === 1) {
-          node.parentNode().render();
-        }
-      }
-
-      if(nodeParent){
-        nodeParent.updateBranchLeafClass();
-      }
-      if(node.parentNode()){
-        node.parentNode().updateBranchLeafClass();
-      }
-      node.updateBranchLeafClass();
-      return this;
-    };
-
-    Tree.prototype.removeNode = function(node) {
-      // Recursively remove all descendants of +node+
-      this.unloadBranch(node);
-
-      // Remove node from DOM (<tr>)
-      node.row.remove();
-
-      // Remove node from parent children list
-      if (node.parentId != null) {
-        node.parentNode().removeChild(node);
-      }
-
-      // Clean up Tree object (so Node objects are GC-ed)
-      delete this.tree[node.id];
-      this.nodes.splice($.inArray(node, this.nodes), 1);
-
-      return this;
-    }
-
-    Tree.prototype.render = function() {
-      var root, _i, _len, _ref;
-      _ref = this.roots;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        root = _ref[_i];
-
-        // Naming is confusing (show/render). I do not call render on node from
-        // here.
-        root.show();
-      }
-      return this;
-    };
-
-    Tree.prototype.sortBranch = function(node, sortFun) {
-      // First sort internal array of children
-      node.children.sort(sortFun);
-
-      // Next render rows in correct order on page
-      this._sortChildRows(node);
-
-      return this;
-    };
-
-    Tree.prototype.unloadBranch = function(node) {
-      // Use a copy of the children array to not have other functions interfere
-      // with this function if they manipulate the children array
-      // (eg removeNode).
-      var children = node.children.slice(0),
-          i;
-
-      for (i = 0; i < children.length; i++) {
-        this.removeNode(children[i]);
-      }
-
-      // Reset node's collection of children
-      node.children = [];
-
-      node.updateBranchLeafClass();
-
-      return this;
-    };
-
-    Tree.prototype._moveRows = function(node, destination) {
-      var children = node.children, i;
-
-      node.row.insertAfter(destination.row);
-      node.render();
-
-      // Loop backwards through children to have them end up on UI in correct
-      // order (see #112)
-      for (i = children.length - 1; i >= 0; i--) {
-        this._moveRows(children[i], node);
-      }
-    };
-
-    // Special _moveRows case, move children to itself to force sorting
-    Tree.prototype._sortChildRows = function(parentNode) {
-      return this._moveRows(parentNode, parentNode);
-    };
-
-    return Tree;
-  })();
-
-  // jQuery Plugin
-  methods = {
-    init: function(options, force) {
-      var settings;
-
-      settings = $.extend({
-        branchAttr: "ttBranch",
-        clickableNodeNames: false,
-        column: 0,
-        columnElType: "td", // i.e. 'td', 'th' or 'td,th'
-        expandable: false,
-        expanderTemplate: "<a href='#'>&nbsp;</a>",
-        indent: 19,
-        indenterTemplate: "<span class='indenter'></span>",
-        initialState: "collapsed",
-        nodeIdAttr: "ttId", // maps to data-tt-id
-        parentIdAttr: "ttParentId", // maps to data-tt-parent-id
-        stringExpand: "Expand",
-        stringCollapse: "Collapse",
-
-        // Events
-        onInitialized: null,
-        onNodeCollapse: null,
-        onNodeExpand: null,
-        onNodeInitialized: null
-      }, options);
-
-      return this.each(function() {
-        var el = $(this), tree;
-
-        if (force || el.data("treetable") === undefined) {
-          tree = new Tree(this, settings);
-          tree.loadRows(this.rows).render();
-
-          el.addClass("treetable").data("treetable", tree);
-
-          if (settings.onInitialized != null) {
-            settings.onInitialized.apply(tree);
-          }
-        }
-
-        return el;
-      });
-    },
-
-    destroy: function() {
-      return this.each(function() {
-        return $(this).removeData("treetable").removeClass("treetable");
-      });
-    },
-
-    collapseAll: function() {
-      this.data("treetable").collapseAll();
-      return this;
-    },
-
-    collapseNode: function(id) {
-      var node = this.data("treetable").tree[id];
-
-      if (node) {
-        node.collapse();
-      } else {
-        throw new Error("Unknown node '" + id + "'");
-      }
-
-      return this;
-    },
-
-    expandAll: function() {
-      this.data("treetable").expandAll();
-      return this;
-    },
-
-    expandNode: function(id) {
-      var node = this.data("treetable").tree[id];
-
-      if (node) {
-        if (!node.initialized) {
-          node._initialize();
-        }
-
-        node.expand();
-      } else {
-        throw new Error("Unknown node '" + id + "'");
-      }
-
-      return this;
-    },
-
-    loadBranch: function(node, rows) {
-      var settings = this.data("treetable").settings,
-          tree = this.data("treetable").tree;
-
-      // TODO Switch to $.parseHTML
-      rows = $(rows);
-
-      if (node == null) { // Inserting new root nodes
-        this.append(rows);
-      } else {
-        var lastNode = this.data("treetable").findLastNode(node);
-        rows.insertAfter(lastNode.row);
-      }
-
-      this.data("treetable").loadRows(rows);
-
-      // Make sure nodes are properly initialized
-      rows.filter("tr").each(function() {
-        tree[$(this).data(settings.nodeIdAttr)].show();
-      });
-
-      if (node != null) {
-        // Re-render parent to ensure expander icon is shown (#79)
-        node.render().expand();
-      }
-
-      return this;
-    },
-
-    move: function(nodeId, destinationId) {
-      var destination, node;
-
-      node = this.data("treetable").tree[nodeId];
-      destination = this.data("treetable").tree[destinationId];
-      this.data("treetable").move(node, destination);
-
-      return this;
-    },
-
-    node: function(id) {
-      return this.data("treetable").tree[id];
-    },
-
-    removeNode: function(id) {
-      var node = this.data("treetable").tree[id];
-
-      if (node) {
-        this.data("treetable").removeNode(node);
-      } else {
-        throw new Error("Unknown node '" + id + "'");
-      }
-
-      return this;
-    },
-
-    reveal: function(id) {
-      var node = this.data("treetable").tree[id];
-
-      if (node) {
-        node.reveal();
-      } else {
-        throw new Error("Unknown node '" + id + "'");
-      }
-
-      return this;
-    },
-
-    sortBranch: function(node, columnOrFunction) {
-      var settings = this.data("treetable").settings,
-          prepValue,
-          sortFun;
-
-      columnOrFunction = columnOrFunction || settings.column;
-      sortFun = columnOrFunction;
-
-      if ($.isNumeric(columnOrFunction)) {
-        sortFun = function(a, b) {
-          var extractValue, valA, valB;
-
-          extractValue = function(node) {
-            var val = node.row.find("td:eq(" + columnOrFunction + ")").text();
-            // Ignore trailing/leading whitespace and use uppercase values for
-            // case insensitive ordering
-            return $.trim(val).toUpperCase();
-          }
-
-          valA = extractValue(a);
-          valB = extractValue(b);
-
-          if (valA < valB) return -1;
-          if (valA > valB) return 1;
-          return 0;
-        };
-      }
-
-      this.data("treetable").sortBranch(node, sortFun);
-      return this;
-    },
-
-    unloadBranch: function(node) {
-      this.data("treetable").unloadBranch(node);
-      return this;
-    }
-  };
-
-  $.fn.treetable = function(method) {
-    if (methods[method]) {
-      return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
-    } else if (typeof method === 'object' || !method) {
-      return methods.init.apply(this, arguments);
-    } else {
-      return $.error("Method " + method + " does not exist on jQuery.treetable");
-    }
-  };
-
-  // Expose classes to world
-  this.TreeTable || (this.TreeTable = {});
-  this.TreeTable.Node = Node;
-  this.TreeTable.Tree = Tree;
-})(jQuery);
diff --git a/modules/token/js/token.js b/modules/token/js/token.js
deleted file mode 100644
index 0cd7621..0000000
--- a/modules/token/js/token.js
+++ /dev/null
@@ -1,58 +0,0 @@
-
-(function ($) {
-
-  'use strict';
-
-  Drupal.behaviors.tokenTree = {
-    attach: function (context, settings) {
-      $('table.token-tree', context).once('token-tree').each(function () {
-        $(this).treetable({ expandable: true });
-      });
-    }
-  };
-
-  Drupal.behaviors.tokenInsert = {
-    attach: function (context, settings) {
-      // Keep track of which textfield was last selected/focused.
-      $('textarea, input[type="text"]', context).focus(function () {
-        drupalSettings.tokenFocusedField = this;
-      });
-
-      $('.token-click-insert .token-key', context).once('token-click-insert').each(function () {
-        var newThis = $('<a href="javascript:void(0);" title="' + Drupal.t('Insert this token into your form') + '">' + $(this).html() + '</a>').click(function () {
-          if (typeof drupalSettings.tokenFocusedField == 'undefined') {
-            alert(Drupal.t('First click a text field to insert your tokens into.'));
-          }
-          else {
-            var myField = drupalSettings.tokenFocusedField;
-            var myValue = $(this).text();
-
-            // IE support.
-            if (document.selection) {
-              myField.focus();
-              var sel = document.selection.createRange();
-              sel.text = myValue;
-            }
-
-            // MOZILLA/NETSCAPE support.
-            else if (myField.selectionStart || myField.selectionStart === '0') {
-              var startPos = myField.selectionStart;
-              var endPos = myField.selectionEnd;
-              myField.value = myField.value.substring(0, startPos)
-                            + myValue
-                            + myField.value.substring(endPos, myField.value.length);
-            }
-            else {
-              myField.value += myValue;
-            }
-
-            $('html,body').animate({scrollTop: $(myField).offset().top}, 500);
-          }
-          return false;
-        });
-        $(this).html(newThis);
-      });
-    }
-  };
-
-})(jQuery, drupalSettings);
diff --git a/modules/token/src/Controller/TokenAutocompleteController.php b/modules/token/src/Controller/TokenAutocompleteController.php
deleted file mode 100644
index a50da70..0000000
--- a/modules/token/src/Controller/TokenAutocompleteController.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Drupal\token\Controller;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\token\TreeBuilderInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Returns autocomplete responses for tokens.
- */
-class TokenAutocompleteController extends ControllerBase {
-
-  /**
-   * @var \Drupal\token\TreeBuilderInterface
-   */
-  protected $treeBuilder;
-
-  public function __construct(TreeBuilderInterface $tree_builder) {
-    $this->treeBuilder = $tree_builder;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('token.tree_builder')
-    );
-  }
-
-  /**
-   * Retrieves suggestions for block category autocompletion.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The current request.
-   * @param string $token_type
-   *   The token type.
-   * @param string $filter
-   *   The autocomplete filter.
-   *
-   * @return \Symfony\Component\HttpFoundation\JsonResponse
-   *   A JSON response containing autocomplete suggestions.
-   */
-  public function autocomplete($token_type, $filter, Request $request) {
-    $filter = substr($filter, strrpos($filter, '['));
-
-    $matches = array();
-
-    if (!Unicode::strlen($filter)) {
-      $matches["[{$token_type}:"] = 0;
-    }
-    else {
-      $depth = max(1, substr_count($filter, ':'));
-      $tree = $this->treeBuilder->buildTree($token_type, ['flat' => TRUE, 'depth' => $depth]);
-      foreach (array_keys($tree) as $token) {
-        if (strpos($token, $filter) === 0) {
-          $matches[$token] = levenshtein($token, $filter);
-          if (isset($tree[$token]['children'])) {
-            $token = rtrim($token, ':]') . ':';
-            $matches[$token] = levenshtein($token, $filter);
-          }
-        }
-      }
-    }
-
-    asort($matches);
-
-    $keys = array_keys($matches);
-    $matches = array_combine($keys, $keys);
-
-    return new JsonResponse($matches);
-  }
-
-}
diff --git a/modules/token/src/Controller/TokenCacheController.php b/modules/token/src/Controller/TokenCacheController.php
deleted file mode 100644
index 39dc5b0..0000000
--- a/modules/token/src/Controller/TokenCacheController.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Drupal\token\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-
-/**
- * Clears cache for tokens.
- */
-class TokenCacheController extends ControllerBase  {
-
-  /**
-   * Clear caches and redirect back to the frontpage.
-   */
-  public function flush() {
-    token_clear_cache();
-    drupal_set_message(t('Token registry caches cleared.'));
-    return $this->redirect('<front>');
-  }
-
-}
diff --git a/modules/token/src/Controller/TokenDevelController.php b/modules/token/src/Controller/TokenDevelController.php
deleted file mode 100644
index 332bad2..0000000
--- a/modules/token/src/Controller/TokenDevelController.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-namespace Drupal\token\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\token\TokenEntityMapperInterface;
-use Drupal\token\TreeBuilderInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Devel integration for tokens.
- */
-class TokenDevelController extends ControllerBase {
-
-  /**
-   * @var \Drupal\token\TreeBuilderInterface
-   */
-  protected $treeBuilder;
-
-  /**
-   * @var \Drupal\token\TokenEntityMapperInterface
-   */
-  protected $entityMapper;
-
-  public function __construct(TreeBuilderInterface $tree_builder, TokenEntityMapperInterface $entity_mapper) {
-    $this->treeBuilder = $tree_builder;
-    $this->entityMapper = $entity_mapper;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('token.tree_builder'),
-      $container->get('token.entity_mapper')
-    );
-  }
-
-  /**
-   * Prints the loaded structure of the current entity.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *    A RouteMatch object.
-   *
-   * @return array
-   *    Array of page elements to render.
-   */
-  public function entityTokens(RouteMatchInterface $route_match) {
-    $output = [];
-
-    $parameter_name = $route_match->getRouteObject()->getOption('_token_entity_type_id');
-    $entity = $route_match->getParameter($parameter_name);
-
-    if ($entity && $entity instanceof EntityInterface) {
-      $output = $this->renderTokenTree($entity);
-    }
-
-    return $output;
-  }
-
-  /**
-   * Render the token tree for the specified entity.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity for which the token tree should be rendered.
-   *
-   * @return array
-   *   Render array of the token tree for the $entity.
-   *
-   * @see static::entityLoad
-   */
-  protected function renderTokenTree(EntityInterface $entity) {
-    $this->moduleHandler()->loadInclude('token', 'pages.inc');
-    $entity_type = $entity->getEntityTypeId();
-
-    $token_type = $this->entityMapper->getTokenTypeForEntityType($entity_type);
-    $options = [
-      'flat' => TRUE,
-      'values' => TRUE,
-      'data' => [$token_type => $entity],
-    ];
-
-    $token_tree = [
-      $token_type => [
-        'tokens' => $this->treeBuilder->buildTree($token_type, $options),
-      ],
-    ];
-//    foreach ($tree as $token => $token_info) {
-//      if (!isset($token_info['value']) && !empty($token_info['parent']) && !isset($tree[$token_info['parent']]['value'])) {
-//        continue;
-//      }
-//    }
-
-    $build['tokens'] = [
-      '#type' => 'token_tree_table',
-      '#show_restricted' => FALSE,
-      '#show_nested' => FALSE,
-      '#skip_empty_values' => TRUE,
-      '#token_tree' => $token_tree,
-      '#columns' => ['token', 'value'],
-      '#empty' => $this->t('No tokens available.'),
-    ];
-
-    return $build;
-  }
-}
diff --git a/modules/token/src/Controller/TokenTreeController.php b/modules/token/src/Controller/TokenTreeController.php
deleted file mode 100644
index f233ab2..0000000
--- a/modules/token/src/Controller/TokenTreeController.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Drupal\token\Controller;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\token\TreeBuilderInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Returns tree responses for tokens.
- */
-class TokenTreeController extends ControllerBase {
-
-  /**
-   * @var \Drupal\token\TreeBuilderInterface
-   */
-  protected $treeBuilder;
-
-  public function __construct(TreeBuilderInterface $tree_builder) {
-    $this->treeBuilder = $tree_builder;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('token.tree_builder')
-    );
-  }
-
-  /**
-   * Page callback to output a token tree as an empty page.
-   */
-  function outputTree(Request $request) {
-    $options = $request->query->has('options') ? Json::decode($request->query->get('options')) : [];
-
-    // The option token_types may only be an array OR 'all'. If it is not set,
-    // we assume that only global token types are requested.
-    $token_types = !empty($options['token_types']) ? $options['token_types'] : [];
-    if ($token_types == 'all') {
-      $build = $this->treeBuilder->buildAllRenderable($options);
-    }
-    else {
-      $build = $this->treeBuilder->buildRenderable($token_types, $options);
-    }
-
-    $build['#cache']['contexts'][] = 'url.query_args:options';
-    $build['#title'] = $this->t('Available tokens');
-
-    return $build;
-  }
-
-}
diff --git a/modules/token/src/Element/TokenTreeTable.php b/modules/token/src/Element/TokenTreeTable.php
deleted file mode 100644
index 6de9c95..0000000
--- a/modules/token/src/Element/TokenTreeTable.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-namespace Drupal\token\Element;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Render\Element\Table;
-
-/**
- * Provides a render element for a token tree table.
- *
- * @RenderElement("token_tree_table")
- */
-class TokenTreeTable extends Table {
-
-  protected static $cssFilter = [' ' => '-', '_' => '-', '/' => '-', '[' => '-', ']' => '', ':' => '--', '?' => '', '<' => '-', '>' => '-'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getInfo() {
-    $class = get_class($this);
-    return [
-      '#header' => [],
-      '#rows' => [],
-      '#token_tree' => [],
-      '#columns' => ['name', 'token', 'description'],
-      '#empty' => '',
-      '#show_restricted' => FALSE,
-      '#show_nested' => FALSE,
-      '#skip_empty_values' => FALSE,
-      '#click_insert' => TRUE,
-      '#sticky' => FALSE,
-      '#responsive' => TRUE,
-      '#input' => FALSE,
-      '#pre_render' => [
-        [$class, 'preRenderTokenTree'],
-        [$class, 'preRenderTable'],
-      ],
-      '#theme' => 'table__token_tree',
-      '#attached' => [
-        'library' => [
-          'token/token',
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * Pre-render the token tree to transform rows in the token tree.
-   *
-   * @param array $element
-   *
-   * @return array
-   *   The processed element.
-   */
-  public static function preRenderTokenTree($element) {
-    $multiple_token_types = count($element['#token_tree']) > 1;
-    foreach ($element['#token_tree'] as $token_type => $type_info) {
-      // Do not show nested tokens.
-      if (!empty($type_info['nested']) && empty($element['#show_nested'])) {
-        continue;
-      }
-
-      if ($multiple_token_types) {
-        $row = static::formatRow($token_type, $type_info, $element['#columns'], TRUE);
-        $element['#rows'][] = $row;
-      }
-
-      foreach ($type_info['tokens'] as $token => $token_info) {
-        if (!empty($token_info['restricted']) && empty($element['#show_restricted'])) {
-          continue;
-        }
-        if ($element['#skip_empty_values'] && empty($token_info['value']) && !empty($token_info['parent']) && !isset($tree[$token_info['parent']]['value'])) {
-          continue;
-        }
-        if ($multiple_token_types && !isset($token_info['parent'])) {
-          $token_info['parent'] = $token_type;
-        }
-        $row = static::formatRow($token, $token_info, $element['#columns']);
-        $element['#rows'][] = $row;
-      }
-    }
-
-    if (!empty($element['#rows'])) {
-      $element['#attached']['library'][] = 'token/jquery.treeTable';
-    }
-
-    // Fill headers if one is not specified.
-    if (empty($element['#header'])) {
-      $column_map = [
-        'name' => t('Name'),
-        'token' => t('Token'),
-        'value' => t('Value'),
-        'description' => t('Description'),
-      ];
-      foreach ($element['#columns'] as $col) {
-        $element['#header'][] = $column_map[$col];
-      }
-    }
-
-    $element['#attributes']['class'][] = 'token-tree';
-
-    if ($element['#click_insert']) {
-      $element['#caption'] = t('Click a token to insert it into the field you\'ve last clicked.');
-      $element['#attributes']['class'][] = 'token-click-insert';
-    }
-
-    return $element;
-  }
-
-  protected static function cleanCssIdentifier($id) {
-    return 'token-' . Html::cleanCssIdentifier(trim($id, '[]'), static::$cssFilter);
-  }
-
-  protected static function formatRow($token, $token_info, $columns, $is_group = FALSE) {
-    $row = [
-      'id' => static::cleanCssIdentifier($token),
-      'data-tt-id' => static::cleanCssIdentifier($token),
-      'class' => [],
-      'data' => [],
-    ];
-
-    foreach ($columns as $col) {
-      switch ($col) {
-        case 'name':
-          $row['data'][$col] = $token_info['name'];
-          break;
-
-        case 'token':
-          $row['data'][$col]['data'] = $token;
-          $row['data'][$col]['class'][] = 'token-key';
-          break;
-
-        case 'description':
-          $row['data'][$col] = isset($token_info['description']) ? $token_info['description'] : '';
-          break;
-
-        case 'value':
-          $row['data'][$col] = !$is_group && isset($token_info['value']) ? $token_info['value'] : '';
-          break;
-      }
-    }
-
-    if ($is_group) {
-      // This is a token type/group.
-      $row['class'][] = 'token-group';
-    }
-    elseif (!empty($token_info['parent'])) {
-      $row['data-tt-parent-id'] = static::cleanCssIdentifier($token_info['parent']);
-      unset($row['parent']);
-    }
-
-    return $row;
-  }
-}
diff --git a/modules/token/src/Plugin/Derivative/DevelLocalTask.php b/modules/token/src/Plugin/Derivative/DevelLocalTask.php
deleted file mode 100644
index 5b22e84..0000000
--- a/modules/token/src/Plugin/Derivative/DevelLocalTask.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Drupal\token\Plugin\Derivative;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-class DevelLocalTask extends DeriverBase implements ContainerDeriverInterface {
-
-  use StringTranslationTrait;
-
-  protected $entityTypeManager;
-
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, TranslationInterface $string_translation) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->stringTranslation = $string_translation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, $base_plugin_id) {
-    return new static(
-      $container->get('entity_type.manager'),
-      $container->get('string_translation')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    $this->derivatives = [];
-
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      if ($entity_type->hasLinkTemplate('token-devel')) {
-        $this->derivatives["$entity_type_id.token_devel_tab"] = [
-          'route_name' => "entity.$entity_type_id.token_devel",
-          'weight' => 110,
-          'title' => $this->t('Tokens'),
-          'parent_id' => "devel.entities:$entity_type_id.devel_tab",
-        ];
-      }
-    }
-
-    foreach ($this->derivatives as &$entry) {
-      $entry += $base_plugin_definition;
-    }
-
-    return $this->derivatives;
-  }
-}
diff --git a/modules/token/src/Routing/RouteSubscriber.php b/modules/token/src/Routing/RouteSubscriber.php
deleted file mode 100644
index ae6815a..0000000
--- a/modules/token/src/Routing/RouteSubscriber.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Drupal\token\Routing;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Routing\RouteSubscriberBase;
-use Drupal\Core\Routing\RoutingEvents;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * Subscriber for Devel routes.
- */
-class RouteSubscriber extends RouteSubscriberBase {
-
-  /**
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->moduleHandler = $module_handler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function alterRoutes(RouteCollection $collection) {
-    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-      if ($devel_render = $entity_type->getLinkTemplate('token-devel')) {
-        $options = [
-          '_admin_route' => TRUE,
-          '_token_entity_type_id' => $entity_type_id,
-          'parameters' => [
-            $entity_type_id => [
-              'type' => 'entity:' . $entity_type_id,
-            ],
-          ],
-        ];
-
-        $route = new Route(
-          $devel_render,
-          [
-            '_controller' => '\Drupal\token\Controller\TokenDevelController::entityTokens',
-            '_title' => 'Devel Tokens',
-          ],
-          [
-            '_permission' => 'access devel information',
-            '_module_dependencies' => 'devel',
-          ],
-          $options
-        );
-
-        $collection->add("entity.$entity_type_id.token_devel", $route);
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    $events = parent::getSubscribedEvents();
-    $events[RoutingEvents::ALTER] = array('onAlterRoutes', 100);
-    return $events;
-  }
-}
diff --git a/modules/token/src/Tests/TokenBlockTest.php b/modules/token/src/Tests/TokenBlockTest.php
deleted file mode 100644
index 66e3025..0000000
--- a/modules/token/src/Tests/TokenBlockTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests;
-use Drupal\block_content\Entity\BlockContent;
-use Drupal\block_content\Entity\BlockContentType;
-
-/**
- * Tests block tokens.
- *
- * @group token
- */
-class TokenBlockTest extends TokenTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['block', 'node', 'views', 'block_content'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp($modules = array()) {
-    parent::setUp();
-    $this->admin_user = $this->drupalCreateUser(array('access content', 'administer blocks'));
-    $this->drupalLogin($this->admin_user);
-  }
-
-  public function testBlockTitleTokens() {
-    $label = 'tokenblock';
-    $bundle = BlockContentType::create(array(
-      'id' => $label,
-      'label' => $label,
-      'revision' => FALSE
-    ));
-    $bundle->save();
-
-    $block_content = BlockContent::create(array(
-      'type' => $label,
-      'label' => '[current-page:title] block title',
-      'info' => 'Test token title block',
-      'body[value]' => 'This is the test token title block.',
-    ));
-    $block_content->save();
-
-    $block = $this->drupalPlaceBlock('block_content:' . $block_content->uuid(), array(
-      'label' => '[user:name]',
-    ));
-    $this->drupalGet($block->urlInfo());
-    // Ensure that the link to available tokens is present and correctly
-    // positioned.
-    $this->assertLink('Browse available tokens.');
-    $this->assertText('This field supports tokens. Browse available tokens.');
-    $this->drupalPostForm(NULL, array(), t('Save block'));
-    // Ensure token validation is working on the block.
-    $this->assertText('Title is using the following invalid tokens: [user:name].');
-
-    // Create the block for real now with a valid title.
-    $settings = $block->get('settings');
-    $settings['label'] = '[current-page:title] block title';
-    $block->set('settings', $settings);
-    $block->save();
-
-    // Ensure that tokens are not double-escaped when output as a block title.
-    $this->drupalCreateContentType(array('type' => 'page'));
-    $node = $this->drupalCreateNode(array('title' => "Site's first node"));
-    $this->drupalGet('node/' . $node->id());
-    // The apostraphe should only be escaped once.
-    $this->assertRaw("Site&#039;s first node block title");
-  }
-}
diff --git a/modules/token/src/Tests/TokenCurrentPageTest.php b/modules/token/src/Tests/TokenCurrentPageTest.php
deleted file mode 100644
index cd8ac37..0000000
--- a/modules/token/src/Tests/TokenCurrentPageTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests;
-
-use Drupal\Core\Url;
-
-/**
- * Test the [current-page:*] tokens.
- *
- * @group token
- */
-class TokenCurrentPageTest extends TokenTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node');
-
-  function testCurrentPageTokens() {
-    $tokens = array(
-      '[current-page:title]' => t('Log in'),
-      '[current-page:url]' => Url::fromRoute('user.login', [], array('absolute' => TRUE))->toString(),
-      '[current-page:url:absolute]' => Url::fromRoute('user.login', [], array('absolute' => TRUE))->toString(),
-      '[current-page:url:relative]' => Url::fromRoute('user.login')->toString(),
-      '[current-page:url:path]' => '/user/login',
-      '[current-page:url:args:value:0]' => 'user',
-      '[current-page:url:args:value:1]' => 'login',
-      '[current-page:url:args:value:2]' => NULL,
-      '[current-page:url:unaliased]' => Url::fromRoute('user.login', [], array('absolute' => TRUE, 'alias' => TRUE))->toString(),
-      '[current-page:page-number]' => 1,
-      '[current-page:query:foo]' => NULL,
-      '[current-page:query:bar]' => NULL,
-      // Deprecated tokens
-      '[current-page:arg:0]' => 'user',
-      '[current-page:arg:1]' => 'login',
-      '[current-page:arg:2]' => NULL,
-    );
-    $this->assertPageTokens('user/login', $tokens);
-
-    $this->drupalCreateContentType(array('type' => 'page'));
-    $node = $this->drupalCreateNode(array('title' => 'Node title', 'path' => array('alias' => '/node-alias')));
-    $tokens = array(
-      '[current-page:title]' => 'Node title',
-      '[current-page:url]' => $node->url('canonical', array('absolute' => TRUE)),
-      '[current-page:url:absolute]' => $node->url('canonical', array('absolute' => TRUE)),
-      '[current-page:url:relative]' => $node->url(),
-      '[current-page:url:alias]' => '/node-alias',
-      '[current-page:url:args:value:0]' => 'node-alias',
-      '[current-page:url:args:value:1]' => NULL,
-      '[current-page:url:unaliased]' => $node->url('canonical', array('absolute' => TRUE, 'alias' => TRUE)),
-      '[current-page:url:unaliased:args:value:0]' => 'node',
-      '[current-page:url:unaliased:args:value:1]' => $node->id(),
-      '[current-page:url:unaliased:args:value:2]' => NULL,
-      '[current-page:page-number]' => 1,
-      '[current-page:query:foo]' => 'bar',
-      '[current-page:query:bar]' => NULL,
-      // Deprecated tokens
-      '[current-page:arg:0]' => 'node',
-      '[current-page:arg:1]' => 1,
-      '[current-page:arg:2]' => NULL,
-    );
-    $this->assertPageTokens("/node/{$node->id()}", $tokens, array(), array('url_options' => array('query' => array('foo' => 'bar'))));
-  }
-}
diff --git a/modules/token/src/Tests/TokenFieldUiTest.php b/modules/token/src/Tests/TokenFieldUiTest.php
deleted file mode 100644
index f7983e7..0000000
--- a/modules/token/src/Tests/TokenFieldUiTest.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests;
-
-use Drupal\node\Entity\NodeType;
-use Drupal\node\Entity\Node;
-use Drupal\file\Entity\File;
-use Drupal\image\Entity\ImageStyle;
-
-/**
- * Tests field ui.
- *
- * @group token
- */
-class TokenFieldUiTest extends TokenTestBase {
-
-  /**
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $adminUser;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['field_ui', 'node', 'image'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp($modules = []) {
-    parent::setUp();
-    $this->adminUser = $this->drupalCreateUser(['administer content types', 'administer node fields']);
-    $this->drupalLogin($this->adminUser);
-
-    $node_type = NodeType::create([
-      'type' => 'article',
-      'name' => 'Article',
-      'description' => "Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.",
-    ]);
-    $node_type->save();
-
-    entity_create('field_storage_config', array(
-      'field_name' => 'field_body',
-      'entity_type' => 'node',
-      'type' => 'text_with_summary',
-    ))->save();
-    entity_create('field_config', array(
-      'field_name' => 'field_body',
-      'label' => 'Body',
-      'entity_type' => 'node',
-      'bundle' => 'article',
-    ))->save();
-    entity_create('field_storage_config', array(
-      'field_name' => 'field_image',
-      'entity_type' => 'node',
-      'type' => 'image',
-    ))->save();
-    entity_create('field_config', array(
-      'field_name' => 'field_image',
-      'label' => 'Image',
-      'entity_type' => 'node',
-      'bundle' => 'article',
-    ))->save();
-    entity_create('field_storage_config', array(
-      'field_name' => 'field_image_2',
-      'entity_type' => 'node',
-      'type' => 'image',
-    ))->save();
-    entity_create('field_config', array(
-      'field_name' => 'field_image_2',
-      'label' => 'Image 2',
-      'entity_type' => 'node',
-      'bundle' => 'article',
-    ))->save();
-    entity_create('field_storage_config', array(
-      'field_name' => 'multivalued_field_image',
-      'entity_type' => 'node',
-      'type' => 'image',
-    ))->save();
-    entity_create('field_config', array(
-      'field_name' => 'multivalued_field_image',
-      'label' => 'Multivalued field image',
-      'entity_type' => 'node',
-      'bundle' => 'article',
-    ))->save();
-
-    entity_get_form_display('node', 'article', 'default')
-      ->setComponent('field_body', [
-        'type' => 'text_textarea_with_summary',
-        'settings' => [
-          'rows' => '9',
-          'summary_rows' => '3',
-        ],
-        'weight' => 5,
-      ])
-      ->save();
-  }
-
-  public function testFileFieldUi() {
-    $this->drupalGet('admin/structure/types/manage/article/fields/node.article.field_image');
-
-    // Ensure the 'Browse available tokens' link is present and correct.
-    $this->assertLink('Browse available tokens.');
-    $this->assertLinkByHref('token/tree');
-
-    // Ensure that the default file directory value validates correctly.
-    $this->drupalPostForm(NULL, [], t('Save settings'));
-    $this->assertText(t('Saved Image configuration.'));
-  }
-
-  public function testFieldDescriptionTokens() {
-    $edit = [
-      'description' => 'The site is called [site:name].',
-    ];
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_body', $edit, 'Save settings');
-
-    $this->drupalGet('node/add/article');
-    $this->assertText('The site is called Drupal.');
-  }
-
-  /**
-   * Test that tokens are correctly provided and replaced for the image fields.
-   */
-  public function testImageFieldTokens() {
-    // Generate 2 different test images.
-    file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example1.png');
-    file_unmanaged_copy(\Drupal::root() . '/core/misc/loading.gif', 'public://example2.gif');
-
-    // Resize the test images so that they will be scaled down during token
-    // replacement.
-    $image1 = \Drupal::service('image.factory')->get('public://example1.png');
-    $image1->resize(500, 500);
-    $image1->save();
-    $image2 = \Drupal::service('image.factory')->get('public://example2.gif');
-    $image2->resize(500, 500);
-    $image2->save();
-
-    /** @var \Drupal\file\Entity\File $image1 */
-    $image1 = File::create(['uri' => 'public://example1.png']);
-    $image1->save();
-    /** @var \Drupal\file\Entity\File $image2 */
-    $image2 = File::create(['uri' => 'public://example2.gif']);
-    $image2->save();
-
-    $node = Node::create([
-      'title' => 'Test node title',
-      'type' => 'article',
-      'field_image' => [
-        [
-          'target_id' => $image1->id(),
-        ],
-      ],
-      'field_image_2' => [
-        [
-          'target_id' => $image2->id(),
-        ],
-      ],
-      'multivalued_field_image' => [
-        ['target_id' => $image1->id()],
-        ['target_id' => $image2->id()],
-      ],
-    ]);
-    $node->save();
-
-    // Obtain the file size and dimension of the images that will be scaled
-    // down during token replacement by applying the styles here.
-    $style_thumbnail = ImageStyle::load('thumbnail');
-    $style_thumbnail->createDerivative('public://example1.png', 'public://styles/thumbnail/public/example1-test.png');
-    $style_thumbnail->createDerivative('public://example2.gif', 'public://styles/thumbnail/public/example2-test.gif');
-    $image_1_thumbnail = \Drupal::service('image.factory')->get('public://styles/thumbnail/public/example1-test.png');
-    $image_2_thumbnail = \Drupal::service('image.factory')->get('public://styles/thumbnail/public/example2-test.gif');
-    $style_medium = ImageStyle::load('medium');
-    $style_medium->createDerivative('public://example1.png', 'public://styles/medium/public/example1-test.png');
-    $style_medium->createDerivative('public://example2.gif', 'public://styles/medium/public/example2-test.gif');
-    $image_1_medium = \Drupal::service('image.factory')->get('public://styles/medium/public/example1-test.png');
-    $image_2_medium = \Drupal::service('image.factory')->get('public://styles/medium/public/example2-test.gif');
-    $style_large = ImageStyle::load('large');
-    $style_large->createDerivative('public://example1.png', 'public://styles/large/public/example1-test.png');
-    $style_large->createDerivative('public://example2.gif', 'public://styles/large/public/example2-test.gif');
-    $image_1_large = \Drupal::service('image.factory')->get('public://styles/large/public/example1-test.png');
-    $image_2_large = \Drupal::service('image.factory')->get('public://styles/large/public/example2-test.gif');
-
-    // Delete the image derivatives, to make sure they are re-created.
-    unlink('public://styles/thumbnail/public/example1-test.png');
-    unlink('public://styles/medium/public/example1-test.png');
-    unlink('public://styles/large/public/example1-test.png');
-    unlink('public://styles/thumbnail/public/example2-test.gif');
-    unlink('public://styles/medium/public/example2-test.gif');
-    unlink('public://styles/large/public/example2-test.gif');
-
-    $tokens = [
-      // field_image
-      'field_image:thumbnail:mimetype' => 'image/png',
-      'field_image:medium:mimetype' => 'image/png',
-      'field_image:large:mimetype' => 'image/png',
-      'field_image:thumbnail:filesize' => $image_1_thumbnail->getFileSize(),
-      'field_image:medium:filesize' => $image_1_medium->getFileSize(),
-      'field_image:large:filesize' => $image_1_large->getFileSize(),
-      'field_image:thumbnail:height' => '100',
-      'field_image:medium:height' => '220',
-      'field_image:large:height' => '480',
-      'field_image:thumbnail:width' => '100',
-      'field_image:medium:width' => '220',
-      'field_image:large:width' => '480',
-      'field_image:thumbnail:uri' => 'public://styles/thumbnail/public/example1.png',
-      'field_image:medium:uri' => 'public://styles/medium/public/example1.png',
-      'field_image:large:uri' => 'public://styles/large/public/example1.png',
-      'field_image:thumbnail:url' => $style_thumbnail->buildUrl('public://example1.png'),
-      'field_image:medium:url' => $style_medium->buildUrl('public://example1.png'),
-      'field_image:large:url' => $style_large->buildUrl('public://example1.png'),
-      'field_image:thumbnail' => $style_thumbnail->buildUrl('public://example1.png'),
-      'field_image:medium' => $style_medium->buildUrl('public://example1.png'),
-      'field_image:large' => $style_large->buildUrl('public://example1.png'),
-      // field_image_2
-      'field_image_2:thumbnail:mimetype' => 'image/gif',
-      'field_image_2:medium:mimetype' => 'image/gif',
-      'field_image_2:large:mimetype' => 'image/gif',
-      'field_image_2:thumbnail:filesize' => $image_2_thumbnail->getFileSize(),
-      'field_image_2:medium:filesize' => $image_2_medium->getFileSize(),
-      'field_image_2:large:filesize' => $image_2_large->getFileSize(),
-      'field_image_2:thumbnail:height' => '100',
-      'field_image_2:medium:height' => '220',
-      'field_image_2:large:height' => '480',
-      'field_image_2:thumbnail:width' => '100',
-      'field_image_2:medium:width' => '220',
-      'field_image_2:large:width' => '480',
-      'field_image_2:thumbnail:uri' => 'public://styles/thumbnail/public/example2.gif',
-      'field_image_2:medium:uri' => 'public://styles/medium/public/example2.gif',
-      'field_image_2:large:uri' => 'public://styles/large/public/example2.gif',
-      'field_image_2:thumbnail:url' => $style_thumbnail->buildUrl('public://example2.gif'),
-      'field_image_2:medium:url' => $style_medium->buildUrl('public://example2.gif'),
-      'field_image_2:large:url' => $style_large->buildUrl('public://example2.gif'),
-      'field_image_2:thumbnail' => $style_thumbnail->buildUrl('public://example2.gif'),
-      'field_image_2:medium' => $style_medium->buildUrl('public://example2.gif'),
-      'field_image_2:large' => $style_large->buildUrl('public://example2.gif'),
-      // multivalued_field_image:0, test for thumbnail image style only.
-      'multivalued_field_image:0:thumbnail:mimetype' => 'image/png',
-      'multivalued_field_image:0:thumbnail:filesize' => $image_1_thumbnail->getFileSize(),
-      'multivalued_field_image:0:thumbnail:height' => '100',
-      'multivalued_field_image:0:thumbnail:width' => '100',
-      'multivalued_field_image:0:thumbnail:uri' => 'public://styles/thumbnail/public/example1.png',
-      'multivalued_field_image:0:thumbnail:url' => $style_thumbnail->buildUrl('public://example1.png'),
-      'multivalued_field_image:0:thumbnail' => $style_thumbnail->buildUrl('public://example1.png'),
-      // multivalued_field_image:1, test for medium image style only.
-      'multivalued_field_image:1:medium:mimetype' => 'image/gif',
-      'multivalued_field_image:1:medium:filesize' => $image_2_medium->getFileSize(),
-      'multivalued_field_image:1:medium:height' => '220',
-      'multivalued_field_image:1:medium:width' => '220',
-      'multivalued_field_image:1:medium:uri' => 'public://styles/medium/public/example2.gif',
-      'multivalued_field_image:1:medium:url' => $style_medium->buildUrl('public://example2.gif'),
-      'multivalued_field_image:1:medium' => $style_medium->buildUrl('public://example2.gif'),
-    ];
-    $this->assertTokens('node', ['node' => $node], $tokens);
-
-    /** @var \Drupal\token\Token $token_service */
-    $token_service = \Drupal::service('token');
-
-    // Test one of the image style's token info for cardinality 1 image field.
-    $token_info = $token_service->getTokenInfo('node-field_image', 'thumbnail');
-    $this->assertEqual('Thumbnail (100×100)', $token_info['name']);
-    $this->assertEqual('Represents the image in the given image style.', $token_info['description']);
-
-    // Test one of the image style's token info for a multivalued image field.
-    $token_info = $token_service->getTokenInfo('node-multivalued_field_image', 'medium');
-    $this->assertEqual('Medium (220×220)', $token_info['name']);
-    $this->assertEqual('Represents the image in the given image style.', $token_info['description']);
-
-    // Test few of the image styles' properties token info.
-    $token_info = $token_service->getTokenInfo('image_with_image_style', 'mimetype');
-    $this->assertEqual('MIME type', $token_info['name']);
-    $this->assertEqual('The MIME type (image/png, image/bmp, etc.) of the image.', $token_info['description']);
-
-    $token_info = $token_service->getTokenInfo('image_with_image_style', 'filesize');
-    $this->assertEqual('File size', $token_info['name']);
-    $this->assertEqual('The file size of the image.', $token_info['description']);
-  }
-
-}
diff --git a/modules/token/src/Tests/TokenMenuTest.php b/modules/token/src/Tests/TokenMenuTest.php
deleted file mode 100644
index b9eb920..0000000
--- a/modules/token/src/Tests/TokenMenuTest.php
+++ /dev/null
@@ -1,459 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests;
-
-use Drupal\node\Entity\Node;
-use Drupal\Core\Url;
-use Drupal\node\Entity\NodeType;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\system\Entity\Menu;
-use Drupal\menu_link_content\Entity\MenuLinkContent;
-
-/**
- * Tests menu tokens.
- *
- * @group token
- */
-class TokenMenuTest extends TokenTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'menu_ui',
-    'node',
-    'block',
-    'language',
-    'block_content',
-    'content_translation',
-  ];
-
-  function testMenuTokens() {
-    // Make sure we have a body field on the node type.
-    $this->drupalCreateContentType(['type' => 'page']);
-    // Add a menu.
-    $menu = entity_create('menu', array(
-      'id' => 'main-menu',
-      'label' => 'Main menu',
-      'description' => 'The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.',
-    ));
-    $menu->save();
-
-    // Place the menu block.
-    $this->drupalPlaceBlock('system_menu_block:main-menu');
-
-    // Add a root link.
-    /** @var \Drupal\menu_link_content\Plugin\Menu\MenuLinkContent $root_link */
-    $root_link = entity_create('menu_link_content', array(
-      'link' => ['uri' => 'internal:/admin'],
-      'title' => 'Administration',
-      'menu_name' => 'main-menu',
-    ));
-    $root_link->save();
-
-    // Add another link with the root link as the parent.
-    /** @var \Drupal\menu_link_content\Plugin\Menu\MenuLinkContent $parent_link */
-    $parent_link = entity_create('menu_link_content', array(
-      'link' => ['uri' => 'internal:/admin/config'],
-      'title' => 'Configuration',
-      'menu_name' => 'main-menu',
-      'parent' => $root_link->getPluginId(),
-    ));
-    $parent_link->save();
-
-    // Test menu link tokens.
-    $tokens = array(
-      'id' => $parent_link->getPluginId(),
-      'title' => 'Configuration',
-      'menu' => 'Main menu',
-      'menu:name' => 'Main menu',
-      'menu:machine-name' => $menu->id(),
-      'menu:description' => 'The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.',
-      'menu:menu-link-count' => '2',
-      'menu:edit-url' => Url::fromRoute('entity.menu.edit_form', ['menu' => 'main-menu'], array('absolute' => TRUE))->toString(),
-      'url' => Url::fromRoute('system.admin_config', [], array('absolute' => TRUE))->toString(),
-      'url:absolute' => Url::fromRoute('system.admin_config', [], array('absolute' => TRUE))->toString(),
-      'url:relative' => Url::fromRoute('system.admin_config', [], array('absolute' => FALSE))->toString(),
-      'url:path' => '/admin/config',
-      'url:alias' => '/admin/config',
-      'edit-url' => Url::fromRoute('entity.menu_link_content.canonical', ['menu_link_content' => $parent_link->id()], array('absolute' => TRUE))->toString(),
-      'parent' => 'Administration',
-      'parent:id' => $root_link->getPluginId(),
-      'parent:title' => 'Administration',
-      'parent:menu' => 'Main menu',
-      'parent:parent' => NULL,
-      'parents' => 'Administration',
-      'parents:count' => 1,
-      'parents:keys' => $root_link->getPluginId(),
-      'root' => 'Administration',
-      'root:id' => $root_link->getPluginId(),
-      'root:parent' => NULL,
-      'root:root' => NULL,
-    );
-    $this->assertTokens('menu-link', array('menu-link' => $parent_link), $tokens);
-
-    // Add a node.
-    $node = $this->drupalCreateNode();
-
-    // Allow main menu for this node type.
-    //$this->config('menu.entity.node.' . $node->getType())->set('available_menus', array('main-menu'))->save();
-
-    // Add a node menu link.
-    /** @var \Drupal\menu_link_content\Plugin\Menu\MenuLinkContent $node_link */
-    $node_link = entity_create('menu_link_content', array(
-      'link' => ['uri' =>'entity:node/' . $node->id()],
-      'title' => 'Node link',
-      'parent' => $parent_link->getPluginId(),
-      'menu_name' => 'main-menu',
-    ));
-    $node_link->save();
-
-    // Test [node:menu] tokens.
-    $tokens = array(
-      'menu-link' => 'Node link',
-      'menu-link:id' => $node_link->getPluginId(),
-      'menu-link:title' => 'Node link',
-      'menu-link:menu' => 'Main menu',
-      'menu-link:url' => $node->url('canonical', ['absolute' => TRUE]),
-      'menu-link:url:path' => '/node/' . $node->id(),
-      'menu-link:edit-url' => $node_link->url('edit-form', ['absolute' => TRUE]),
-      'menu-link:parent' => 'Configuration',
-      'menu-link:parent:id' => $parent_link->getPluginId(),
-      'menu-link:parents' => 'Administration, Configuration',
-      'menu-link:parents:count' => 2,
-      'menu-link:parents:keys' => $root_link->getPluginId() . ', ' . $parent_link->getPluginId(),
-      'menu-link:root' => 'Administration',
-      'menu-link:root:id' => $root_link->getPluginId(),
-    );
-    $this->assertTokens('node', array('node' => $node), $tokens);
-
-    // Reload the node which will not have $node->menu defined and re-test.
-    $loaded_node = Node::load($node->id());
-    $this->assertTokens('node', array('node' => $loaded_node), $tokens);
-
-    // Regression test for http://drupal.org/node/1317926 to ensure the
-    // original node object is not changed when calling menu_node_prepare().
-    $this->assertTrue(!isset($loaded_node->menu), t('The $node->menu property was not modified during token replacement.'), 'Regression');
-
-    // Now add a node with a menu-link from the UI and ensure it works.
-    $this->drupalLogin($this->drupalCreateUser([
-      'create page content',
-      'edit any page content',
-      'administer menu',
-      'administer nodes',
-      'administer content types',
-      'access administration pages',
-    ]));
-    // Setup node type menu options.
-    $edit = array(
-      'menu_options[main-menu]' => 1,
-      'menu_options[main]' => 1,
-      'menu_parent' => 'main-menu:',
-    );
-    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
-
-    // Use a menu-link token in the body.
-    $this->drupalGet('node/add/page');
-    $this->drupalPostForm(NULL, [
-      // This should get replaced on save.
-      // @see token_module_test_node_presave()
-      'title[0][value]' => 'Node menu title test',
-      'body[0][value]' => 'This is a [node:menu-link:title] token to the menu link title',
-      'menu[enabled]' => 1,
-      'menu[title]' => 'Test preview',
-    ], t('Save and publish'));
-    $node = $this->drupalGetNodeByTitle('Node menu title test');
-    $this->assertEqual('This is a Test preview token to the menu link title', $node->body->value);
-
-    // Disable the menu link, save the node and verify that the menu link is
-    // no longer displayed.
-    $link = menu_ui_get_menu_link_defaults($node);
-    $this->drupalPostForm('admin/structure/menu/manage/main-menu', ['links[menu_plugin_id:' . $link['id'] . '][enabled]' => FALSE], t('Save'));
-    $this->assertText('Menu Main menu has been updated.');
-    $this->drupalPostForm('node/' . $node->id() . '/edit', [], t('Save and keep published'));
-    $this->assertNoLink('Test preview');
-
-    // Now test a parent link and token.
-    $this->drupalGet('node/add/page');
-    // Make sure that the previous node save didn't result in two menu-links
-    // being created by the computed menu-link ER field.
-    // @see token_entity_base_field_info()
-    // @see token_node_menu_link_submit()
-    $selects = $this->cssSelect('select[name="menu[menu_parent]"]');
-    $select = reset($selects);
-    $options = $this->getAllOptions($select);
-    // Filter to items with title containing 'Test preview'.
-    $options = array_filter($options, function(\SimpleXMLElement $item) {
-      return strpos((string) $item[0], 'Test preview') !== FALSE;
-    });
-    $this->assertEqual(1, count($options));
-    $this->drupalPostForm(NULL, [
-      'title[0][value]' => 'Node menu title parent path test',
-      'body[0][value]' => 'This is a [node:menu-link:parent:url:path] token to the menu link parent',
-      'menu[enabled]' => 1,
-      'menu[title]' => 'Child link',
-      'menu[menu_parent]' => 'main-menu:' .  $parent_link->getPluginId(),
-    ], t('Save and publish'));
-    $node = $this->drupalGetNodeByTitle('Node menu title parent path test');
-    $this->assertEqual('This is a /admin/config token to the menu link parent', $node->body->value);
-
-    // Now edit the node and update the parent and title.
-    $this->drupalPostForm('node/' . $node->id() . '/edit', [
-      'menu[menu_parent]' => 'main-menu:' .  $node_link->getPluginId(),
-      'title[0][value]' => 'Node menu title edit parent path test',
-      'body[0][value]' => 'This is a [node:menu-link:parent:url:path] token to the menu link parent',
-    ], t('Save and keep published'));
-    $node = $this->drupalGetNodeByTitle('Node menu title edit parent path test', TRUE);
-    $this->assertEqual(sprintf('This is a /node/%d token to the menu link parent', $loaded_node->id()), $node->body->value);
-
-    // Make sure that the previous node edit didn't result in two menu-links
-    // being created by the computed menu-link ER field.
-    // @see token_entity_base_field_info()
-    // @see token_node_menu_link_submit()
-    $this->drupalGet('node/add/page');
-    $selects = $this->cssSelect('select[name="menu[menu_parent]"]');
-    $select = reset($selects);
-    $options = $this->getAllOptions($select);
-    // Filter to items with title containing 'Test preview'.
-    $options = array_filter($options, function(\SimpleXMLElement $item) {
-      return strpos((string) $item[0], 'Child link') !== FALSE;
-    });
-    $this->assertEqual(1, count($options));
-
-    // Now add a new node with no menu.
-    $this->drupalGet('node/add/page');
-    $this->drupalPostForm(NULL, [
-      'title[0][value]' => 'Node menu adding menu later test',
-      'body[0][value]' => 'Going to add a menu link on edit',
-      'menu[enabled]' => 0,
-    ], t('Save and publish'));
-    $node = $this->drupalGetNodeByTitle('Node menu adding menu later test');
-    // Now edit it and add a menu item.
-    $this->drupalGet('node/' . $node->id() . '/edit');
-    $this->drupalPostForm(NULL, [
-      'title[0][value]' => 'Node menu adding menu later test',
-      'body[0][value]' => 'This is a [node:menu-link:parent:url:path] token to the menu link parent',
-      'menu[enabled]' => 1,
-      'menu[title]' => 'Child link',
-      'menu[menu_parent]' => 'main-menu:' .  $parent_link->getPluginId(),
-    ], t('Save and keep published'));
-    $node = $this->drupalGetNodeByTitle('Node menu adding menu later test', TRUE);
-    $this->assertEqual('This is a /admin/config token to the menu link parent', $node->body->value);
-    // And make sure the menu link exists with the right URI.
-    $link = menu_ui_get_menu_link_defaults($node);
-    $this->assertTrue(!empty($link['entity_id']));
-    $query = \Drupal::entityQuery('menu_link_content')
-      ->condition('link.uri', 'entity:node/' . $node->id())
-      ->sort('id', 'ASC')
-      ->range(0, 1);
-    $result = $query->execute();
-    $this->assertTrue($result);
-
-    // Create a node with a menu link and create 2 menu links linking to this
-    // node after. Verify that the menu link provided by the node has priority.
-    $node_title = $this->randomMachineName();
-    $edit = [
-      'title[0][value]' => $node_title,
-      'menu[enabled]' => 1,
-      'menu[title]' => 'menu link provided by node',
-    ];
-    $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
-    $this->assertText('page ' . $node_title . ' has been created');
-    $node = $this->drupalGetNodeByTitle($node_title);
-
-    $menu_ui_link1 = entity_create('menu_link_content', [
-      'link' => ['uri' => 'entity:node/' . $node->id()],
-      'title' => 'menu link 1 provided by menu ui',
-      'menu_name' => 'main-menu',
-    ]);
-    $menu_ui_link1->save();
-
-    $menu_ui_link2 = entity_create('menu_link_content', [
-      'link' => ['uri' => 'entity:node/' . $node->id()],
-      'title' => 'menu link 2 provided by menu ui',
-      'menu_name' => 'main-menu',
-    ]);
-    $menu_ui_link2->save();
-
-    $tokens = [
-      'menu-link' => 'menu link provided by node',
-      'menu-link:title' => 'menu link provided by node',
-    ];
-    $this->assertTokens('node', ['node' => $node], $tokens);
-  }
-
-  /**
-   * Tests that the module doesn't affect integrity of the menu, when
-   * translating them and that menu links tokens are correct.
-   */
-  function testMultilingualMenu() {
-    // Place the menu block.
-    $this->drupalPlaceBlock('system_menu_block:main');
-
-    // Add a second language.
-    $language = ConfigurableLanguage::create([
-      'id' => 'de',
-      'label' => 'German',
-    ]);
-    $language->save();
-
-    // Create the article content type.
-    $node_type = NodeType::create([
-      'type' => 'article',
-    ]);
-    $node_type->save();
-
-    $permissions = array(
-      'access administration pages',
-      'administer content translation',
-      'administer content types',
-      'administer languages',
-      'create content translations',
-      'create article content',
-      'edit any article content',
-      'translate any entity',
-      'administer menu',
-    );
-    $this->drupalLogin($this->drupalCreateUser($permissions));
-
-    // Enable translation for articles and menu links.
-    $this->drupalGet('admin/config/regional/content-language');
-    $edit = array(
-      'entity_types[node]' => TRUE,
-      'entity_types[menu_link_content]' => TRUE,
-      'settings[node][article][translatable]' => TRUE,
-      'settings[node][article][fields][title]' => TRUE,
-      'settings[menu_link_content][menu_link_content][translatable]' => TRUE,
-    );
-    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
-    $this->assertText('Settings successfully updated.');
-
-    // Create an english node with an english menu.
-    $this->drupalGet('/node/add/article');
-    $edit = [
-      'title[0][value]' => 'English test node with menu',
-      'menu[enabled]' => TRUE,
-      'menu[title]' => 'English menu title',
-    ];
-    $this->drupalPostForm('/node/add/article', $edit, t('Save'));
-    $this->assertText('English test node with menu has been created.');
-
-    // Add a german translation.
-    $this->drupalGet('node/1/translations');
-    $this->clickLink('Add');
-    $edit = [
-      'title[0][value]' => 'German test node with menu',
-      'menu[enabled]' => TRUE,
-      'menu[title]' => 'German menu title',
-    ];
-    $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
-    $this->assertText('German test node with menu has been updated.');
-
-    // Verify that the menu links are correct.
-    $this->drupalGet('node/1');
-    $this->assertLink('English menu title');
-    $this->drupalGet('de/node/1');
-    $this->assertLink('German menu title');
-
-    // Verify that tokens are correct.
-    $node = Node::load(1);
-    $this->assertTokens('node', ['node' => $node], ['menu-link' => 'English menu title']);
-    $this->assertTokens('node', ['node' => $node], [
-      'menu-link' => 'German menu title',
-      'menu-link:title' => 'German menu title',
-    ], ['langcode' => 'de']);
-
-    // Get the menu link and create a child menu link to assert parent and root
-    // tokens.
-    $url = $node->toUrl();
-    /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
-    $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
-    $links = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters());
-    $link = reset($links);
-
-    $base_options = [
-      'provider' => 'menu_test',
-      'menu_name' => 'menu_test',
-    ];
-    $child_1 = $base_options + [
-        'title' => 'child_1 title EN',
-        'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child_1'],
-        'parent' => $link->getPluginId(),
-        'langcode' => 'en',
-      ];
-    $child_1 = MenuLinkContent::create($child_1);
-    $child_1->save();
-
-    // Add the german translation.
-    $child_1->addTranslation('de', ['title' => 'child_1 title DE'] + $child_1->toArray());
-    $child_1->save();
-
-    $this->assertTokens('menu-link', ['menu-link' => $child_1], [
-      'title' => 'child_1 title EN',
-      'parents' => 'English menu title',
-      'root' => 'English menu title',
-    ]);
-    $this->assertTokens('menu-link', ['menu-link' => $child_1], [
-      'title' => 'child_1 title DE',
-      'parents' => 'German menu title',
-      'root' => 'German menu title',
-    ], ['langcode' => 'de']);
-  }
-
-  /**
-   * Tests menu link parents token.
-   */
-  public function testMenuLinkParentsToken() {
-    // Create a menu with a simple link hierarchy :
-    // - parent
-    //   - child-1
-    //      - child-1-1
-    Menu::create(array(
-      'id' => 'menu_test',
-      'label' => 'Test menu',
-    ))->save();
-    $base_options = [
-      'provider' => 'menu_test',
-      'menu_name' => 'menu_test',
-    ];
-    $parent = $base_options + [
-        'title' => 'parent title',
-        'link' => ['uri' => 'internal:/menu-test/hierarchy/parent'],
-    ];
-    $parent = MenuLinkContent::create($parent);
-    $parent->save();
-    $child_1 = $base_options + [
-        'title' => 'child_1 title',
-        'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child_1'],
-        'parent' => $parent->getPluginId(),
-    ];
-    $child_1 = MenuLinkContent::create($child_1);
-    $child_1->save();
-    $child_1_1 = $base_options + [
-        'title' => 'child_1_1 title',
-        'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child_1/child_1_1'],
-        'parent' => $child_1->getPluginId(),
-    ];
-    $child_1_1 = MenuLinkContent::create($child_1_1);
-    $child_1_1->save();
-
-    $this->assertTokens('menu-link', ['menu-link' => $child_1_1], ['parents' => 'parent title, child_1 title']);
-
-    // Change the parent of child_1_1 to 'parent' at the entity level.
-    $child_1_1->parent->value = $parent->getPluginId();
-    $child_1_1->save();
-
-    $this->assertTokens('menu-link', ['menu-link' => $child_1_1], ['parents' => 'parent title']);
-
-    // Change the parent of child_1_1 to 'main', at the entity level.
-    $child_1_1->parent->value = '';
-    $child_1_1->save();
-
-    // The token shouldn't have been generated; the menu link has no parent.
-    $this->assertNoTokens('menu-link', ['menu-link' => $child_1_1], ['parents']);
-  }
-
-}
diff --git a/modules/token/src/Tests/TokenTestBase.php b/modules/token/src/Tests/TokenTestBase.php
deleted file mode 100644
index 29c1ac3..0000000
--- a/modules/token/src/Tests/TokenTestBase.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Helper test class with some added functions for testing.
- */
-abstract class TokenTestBase extends WebTestBase {
-
-  use TokenTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('path', 'token', 'token_module_test');
-
-}
diff --git a/modules/token/src/Tests/TokenTestTrait.php b/modules/token/src/Tests/TokenTestTrait.php
deleted file mode 100644
index b37cae9..0000000
--- a/modules/token/src/Tests/TokenTestTrait.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Language\Language;
-use Drupal\Core\Render\BubbleableMetadata;
-
-/**
- * Helper test trait with some added functions for testing.
- */
-trait TokenTestTrait {
-
-  function assertToken($type, array $data, $token, $expected, array $options = array()) {
-    return $this->assertTokens($type, $data, array($token => $expected), $options);
-  }
-
-  function assertTokens($type, array $data, array $tokens, array $options = array()) {
-    $input = $this->mapTokenNames($type, array_keys($tokens));
-    $bubbleable_metadata = new BubbleableMetadata();
-    $replacements = \Drupal::token()->generate($type, $input, $data, $options, $bubbleable_metadata);
-    foreach ($tokens as $name => $expected) {
-      $token = $input[$name];
-      if (!isset($expected)) {
-        $this->assertTrue(!isset($replacements[$token]), t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
-      }
-      elseif (!isset($replacements[$token])) {
-        $this->fail(t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
-      }
-      elseif (!empty($options['regex'])) {
-        $this->assertTrue(preg_match('/^' . $expected . '$/', $replacements[$token]), t("Token value for @token was '@actual', matching regular expression pattern '@expected'.", array('@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected)));
-      }
-      else {
-        $this->assertEqual($replacements[$token], $expected, t("Token value for @token was '@actual', expected value '@expected'.", array('@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected)));
-      }
-    }
-
-    return $replacements;
-  }
-
-  function mapTokenNames($type, array $tokens = array()) {
-    $return = array();
-    foreach ($tokens as $token) {
-      $return[$token] = "[$type:$token]";
-    }
-    return $return;
-  }
-
-  function assertNoTokens($type, array $data, array $tokens, array $options = array()) {
-    $input = $this->mapTokenNames($type, $tokens);
-    $bubbleable_metadata = new BubbleableMetadata();
-    $replacements = \Drupal::token()->generate($type, $input, $data, $options, $bubbleable_metadata);
-    foreach ($tokens as $name) {
-      $token = $input[$name];
-      $this->assertTrue(!isset($replacements[$token]), t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
-    }
-  }
-
-  function saveAlias($source, $alias, $language = Language::LANGCODE_NOT_SPECIFIED) {
-    $alias = array(
-      'source' => $source,
-      'alias' => $alias,
-      'language' => $language,
-    );
-    \Drupal::service('path.alias_storage')->save($alias['source'], $alias['alias']);
-    return $alias;
-  }
-
-  function saveEntityAlias($entity_type, EntityInterface $entity, $alias, $language = Language::LANGCODE_NOT_SPECIFIED) {
-    $uri = $entity->toUrl()->toArray();
-    return $this->saveAlias($uri['path'], $alias, $language);
-  }
-
-  /**
-   * Make a page request and test for token generation.
-   */
-  function assertPageTokens($url, array $tokens, array $data = array(), array $options = array()) {
-    if (empty($tokens)) {
-      return TRUE;
-    }
-
-    $token_page_tokens = array(
-      'tokens' => $tokens,
-      'data' => $data,
-      'options' => $options,
-    );
-    \Drupal::state()->set('token_page_tokens', $token_page_tokens);
-
-    $options += array('url_options' => array());
-    $this->drupalGet($url, $options['url_options']);
-    $this->refreshVariables();
-    $result = \Drupal::state()->get('token_page_tokens', array());
-
-    if (!isset($result['values']) || !is_array($result['values'])) {
-      return $this->fail('Failed to generate tokens.');
-    }
-
-    foreach ($tokens as $token => $expected) {
-      if (!isset($expected)) {
-        $this->assertTrue(!isset($result['values'][$token]) || $result['values'][$token] === $token, t("Token value for @token was not generated.", array('@token' => $token)));
-      }
-      elseif (!isset($result['values'][$token])) {
-        $this->fail(t('Failed to generate token @token.', array('@token' => $token)));
-      }
-      else {
-        $this->assertIdentical($result['values'][$token], (string) $expected, t("Token value for @token was '@actual', expected value '@expected'.", array('@token' => $token, '@actual' => $result['values'][$token], '@expected' => $expected)));
-      }
-    }
-  }
-
-}
diff --git a/modules/token/src/Tests/TokenURLTest.php b/modules/token/src/Tests/TokenURLTest.php
deleted file mode 100644
index 6241f3b..0000000
--- a/modules/token/src/Tests/TokenURLTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests;
-
-use Drupal\Core\Url;
-
-/**
- * Tests url tokens.
- *
- * @group token
- */
-class TokenURLTest extends TokenTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node');
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->saveAlias('/node/1', '/first-node');
-  }
-
-  function testURLTokens() {
-    $url = new Url('entity.node.canonical', array('node' => 1));
-    $tokens = array(
-      'absolute' => $url->setAbsolute()->toString(),
-      'relative' => $url->setAbsolute(FALSE)->toString(),
-      'path' => '/first-node',
-      'brief' => preg_replace(array('!^https?://!', '!/$!'), '', $url->setAbsolute()->toString()),
-      'args:value:0' => 'first-node',
-      'args:value:1' => NULL,
-      'args:value:N' => NULL,
-      'unaliased' => $url->setAbsolute()->setOption('alias', TRUE)->toString(),
-      'unaliased:relative' => $url->setAbsolute(FALSE)->setOption('alias', TRUE)->toString(),
-      'unaliased:path' => '/node/1',
-      'unaliased:brief' => preg_replace(array('!^https?://!', '!/$!'), '', $url->setAbsolute()->setOption('alias', TRUE)->toString()),
-      'unaliased:args:value:0' => 'node',
-      'unaliased:args:value:1' => '1',
-      'unaliased:args:value:2' => NULL,
-      // Deprecated tokens.
-      'alias' => '/first-node',
-    );
-    $this->assertTokens('url', array('url' => new Url('entity.node.canonical', array('node' => 1))), $tokens);
-  }
-}
diff --git a/modules/token/src/Tests/TokenUserTest.php b/modules/token/src/Tests/TokenUserTest.php
deleted file mode 100644
index 2178c7e..0000000
--- a/modules/token/src/Tests/TokenUserTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests;
-
-use Drupal\Core\Session\AnonymousUserSession;
-use Drupal\field\Entity\FieldStorageConfig;
-
-/**
- * Tests user tokens.
- *
- * @group token
- */
-class TokenUserTest extends TokenTestBase {
-
-  /**
-   * The user account.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $account = NULL;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('token_user_picture');
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->account = $this->drupalCreateUser(['administer users', 'administer account settings']);
-    $this->drupalLogin($this->account);
-  }
-
-  public function testUserTokens() {
-    // Enable user pictures.
-    \Drupal::state()->set('user_pictures', 1);
-    \Drupal::state()->set('user_picture_file_size', '');
-
-    // Set up the pictures directory.
-    $picture_path = file_default_scheme() . '://' . \Drupal::state()->get('user_picture_path', 'pictures');
-    if (!file_prepare_directory($picture_path, FILE_CREATE_DIRECTORY)) {
-      $this->fail('Could not create directory ' . $picture_path . '.');
-    }
-
-    // Add a user picture to the account.
-    $image = current($this->drupalGetTestFiles('image'));
-    $edit = array('files[user_picture_0]' => drupal_realpath($image->uri));
-    $this->drupalPostForm('user/' . $this->account->id() . '/edit', $edit, t('Save'));
-
-    $storage = \Drupal::entityTypeManager()->getStorage('user');
-
-    // Load actual user data from database.
-    $storage->resetCache();
-    $this->account = $storage->load($this->account->id());
-    $this->assertTrue(!empty($this->account->user_picture->target_id), 'User picture uploaded.');
-
-    $picture = [
-      '#theme' => 'user_picture',
-      '#account' => $this->account,
-    ];
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-    $user_tokens = array(
-      'picture' => $renderer->renderPlain($picture),
-      'picture:fid' => $this->account->user_picture->target_id,
-      'picture:size-raw' => 125,
-      'ip-address' => NULL,
-      'roles' => implode(', ', $this->account->getRoles()),
-    );
-    $this->assertTokens('user', array('user' => $this->account), $user_tokens);
-
-    // Remove the simpletest-created user role.
-    $roles = $this->account->getRoles();
-    $this->account->removeRole(end($roles));
-    $this->account->save();
-
-    // Remove the user picture field and reload the user.
-    FieldStorageConfig::loadByName('user', 'user_picture')->delete();
-    $storage->resetCache();
-    $this->account = $storage->load($this->account->id());
-
-    $user_tokens = array(
-      'picture' => NULL,
-      'picture:fid' => NULL,
-      'ip-address' => NULL,
-      'roles' => 'authenticated',
-      'roles:keys' => (string) DRUPAL_AUTHENTICATED_RID,
-    );
-    $this->assertTokens('user', array('user' => $this->account), $user_tokens);
-
-    // The ip address token should work for the current user token type.
-    $tokens = array(
-      'ip-address' => \Drupal::request()->getClientIp(),
-    );
-    $this->assertTokens('current-user', array(), $tokens);
-
-    $anonymous = new AnonymousUserSession();
-    $tokens = array(
-      'roles' => 'anonymous',
-      'roles:keys' => (string) DRUPAL_ANONYMOUS_RID,
-    );
-    $this->assertTokens('user', array('user' => $anonymous), $tokens);
-  }
-
-  public function testUserAccountSettings() {
-    $this->drupalGet('admin/config/people/accounts');
-    $this->assertText('The list of available tokens that can be used in e-mails is provided below.');
-    $this->assertLink('Browse available tokens.');
-    $this->assertLinkByHref('token/tree');
-  }
-}
\ No newline at end of file
diff --git a/modules/token/src/Tests/Tree/AutocompleteTest.php b/modules/token/src/Tests/Tree/AutocompleteTest.php
deleted file mode 100644
index 30b3ea4..0000000
--- a/modules/token/src/Tests/Tree/AutocompleteTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests\Tree;
-
-use Drupal\token\Tests\TokenTestBase;
-
-/**
- * Test token autocomplete.
- *
- * @group token
- */
-class AutocompleteTest extends TokenTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node'];
-
-  /**
-   * Tests autocomplete for node tokens.
-   */
-  public function testNodeAutocomplete() {
-    $url_prefix = "token/autocomplete/node/";
-
-    $url = $url_prefix . 'Title of [nod';
-    $response = $this->drupalGetJSON($url);
-
-    $this->assertTrue(isset($response['[node:nid]']));
-    $this->assertTrue(isset($response['[node:author]']));
-    $this->assertTrue(isset($response['[node:url]']));
-    $this->assertTrue(isset($response['[node:url:']));
-
-    $url = $url_prefix . 'Title of [node:url:';
-    $response = $this->drupalGetJSON($url);
-
-    $this->assertTrue(isset($response['[node:url:path]']));
-    $this->assertTrue(isset($response['[node:url:absolute]']));
-  }
-
-  /**
-   * Tests autocomplete for user tokens.
-   */
-  public function testUserAutocomplete() {
-    $url_prefix = "token/autocomplete/user/";
-
-    $url = $url_prefix . 'Name of the [us';
-    $response = $this->drupalGetJSON($url);
-
-    $this->assertTrue(isset($response['[user:uid]']));
-    $this->assertTrue(isset($response['[user:original]']));
-    $this->assertTrue(isset($response['[user:url]']));
-    $this->assertTrue(isset($response['[user:url:']));
-
-    $url = $url_prefix . 'Title of [user:original:';
-    $response = $this->drupalGetJSON($url);
-
-    $this->assertTrue(isset($response['[user:original:uid]']));
-  }
-}
diff --git a/modules/token/src/Tests/Tree/HelpPageTest.php b/modules/token/src/Tests/Tree/HelpPageTest.php
deleted file mode 100644
index a957e32..0000000
--- a/modules/token/src/Tests/Tree/HelpPageTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests\Tree;
-
-use Drupal\token\Tests\TokenTestBase;
-
-/**
- * Tests token tree on help page.
- *
- * @group token
- */
-class HelpPageTest extends TokenTestBase {
-
-  use TokenTreeTestTrait;
-
-  /**
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $account;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['help'];
-
-  public function setUp() {
-    parent::setUp();
-
-    $this->account = $this->drupalCreateUser(['access administration pages']);
-    $this->drupalLogin($this->account);
-  }
-
-  /**
-   * Tests the token browser on the token help page.
-   */
-  public function testHelpPageTree() {
-    $this->drupalGet('admin/help/token');
-    $this->assertText('The list of the currently available tokens on this site are shown below.');
-
-    $this->assertTokenGroup('Current date');
-    $this->assertTokenGroup('Site information');
-
-    $this->assertTokenInTree('[current-date:html_date]', 'current-date');
-    $this->assertTokenInTree('[current-date:html_week]', 'current-date');
-    $this->assertTokenInTree('[date:html_date]', 'date');
-    $this->assertTokenInTree('[date:html_week]', 'date');
-
-    $this->assertTokenInTree('[current-user:account-name]', 'current-user');
-    $this->assertTokenInTree('[user:account-name]', 'user');
-
-    $this->assertTokenInTree('[current-page:url:unaliased]', 'current-page--url');
-    $this->assertTokenInTree('[current-page:url:unaliased:args]', 'current-page--url--unaliased');
-    $this->assertTokenInTree('[user:original:account-name]', 'user--original');
-
-    // Assert some of the restricted tokens to ensure they are shown.
-    $this->assertTokenInTree('[user:one-time-login-url]', 'user');
-    $this->assertTokenInTree('[user:original:cancel-url]', 'user--original');
-
-    // The Array token is marked as nested, so it should not show up as a top
-    // level token, only nested under another token. For instance, user:roles
-    // is of type Array and tokens of type Array have 'nested' setting true.
-    $this->assertTokenNotGroup('Array');
-    $this->assertTokenNotGroup('user:roles');
-    $this->assertTokenInTree('[user:roles]', 'user');
-  }
-
-}
diff --git a/modules/token/src/Tests/Tree/TokenTreeTestTrait.php b/modules/token/src/Tests/Tree/TokenTreeTestTrait.php
deleted file mode 100644
index dc70a23..0000000
--- a/modules/token/src/Tests/Tree/TokenTreeTestTrait.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests\Tree;
-
-/**
- * Helper trait to assert tokens in token tree browser.
- */
-trait TokenTreeTestTrait {
-
-  /**
-   * Get an array of token groups from the last retrieved page.
-   *
-   * @return array
-   *   Array of token group names.
-   */
-  protected function getTokenGroups() {
-    $groups = $this->xpath('//tr[contains(@class, "token-group")]/td[1]');
-    return array_map(function ($item) {
-      return (string) $item;
-    }, $groups);
-  }
-
-  /**
-   * Check to see if the specified token group is present in the token browser.
-   *
-   * @param string $token_group
-   *   The name of the token group.
-   * @param string $message
-   *   (optional) A message to display with the assertion.
-   * @param string $group
-   *   (optional) The group this message is in, which is displayed in a column
-   *   in test output.
-   */
-  protected function assertTokenGroup($token_group, $message = '', $group = 'Other') {
-    $groups = $this->getTokenGroups();
-
-    if (!$message) {
-      $message = "Token group $token_group found.";
-    }
-
-    $this->assertTrue(in_array($token_group, $groups), $message, $group);
-  }
-
-  /**
-   * Check to see if the specified token group is not present in the token
-   * browser.
-   *
-   * @param string $token_group
-   *   The name of the token group.
-   * @param string $message
-   *   (optional) A message to display with the assertion.
-   * @param string $group
-   *   (optional) The group this message is not in, which is displayed in a
-   *   column in test output.
-   */
-  protected function assertTokenNotGroup($token_group, $message = '', $group = 'Other') {
-    $groups = $this->getTokenGroups();
-
-    if (!$message) {
-      $message = "Token group $token_group not found.";
-    }
-
-    $this->assertFalse(in_array($token_group, $groups), $message, $group);
-  }
-
-  /**
-   * Check to see if the specified token is present in the token browser.
-   *
-   * @param $token
-   *   The token name with the surrounding square brackets [].
-   * @param string $parent
-   *   (optional) The parent CSS identifier of this token.
-   * @param string $message
-   *   (optional) A message to display with the assertion.
-   * @param string $group
-   *   (optional) The group this message is in, which is displayed in a column
-   *   in test output.
-   */
-  protected function assertTokenInTree($token, $parent = '', $message = '', $group = 'Other') {
-    $xpath = $this->getXpathForTokenInTree($token, $parent);
-
-    if (!$message) {
-      $message = "Token $token found.";
-    }
-
-    $this->assertIdentical(1, count($this->xpath($xpath)), $message, $group);
-  }
-
-  /**
-   * Check to see if the specified token is present in the token browser.
-   *
-   * @param $token
-   *   The token name with the surrounding square brackets [].
-   * @param string $parent
-   *   (optional) The parent CSS identifier of this token.
-   * @param string $message
-   *   (optional) A message to display with the assertion.
-   * @param string $group
-   *   (optional) The group this message is in, which is displayed in a column
-   *   in test output.
-   */
-  protected function assertTokenNotInTree($token, $parent = '', $message = '', $group = 'Other') {
-    $xpath = $this->getXpathForTokenInTree($token, $parent);
-
-    if (!$message) {
-      $message = "Token $token not found.";
-    }
-
-    $this->assertIdentical(0, count($this->xpath($xpath)), $message, $group);
-  }
-
-  /**
-   * Get xpath to check for token in tree.
-   *
-   * @param $token
-   *   The token name with the surrounding square brackets [].
-   * @param string $parent
-   *   (optional) The parent CSS identifier of this token.
-   *
-   * @return string
-   *   The xpath to check for the token and parent.
-   */
-  protected function getXpathForTokenInTree($token, $parent = '') {
-    $xpath = "//tr";
-    if ($parent) {
-      $xpath .= '[@data-tt-parent-id="token-' . $parent . '"]';
-    }
-    $xpath .= '/td[contains(@class, "token-key") and text() = "' . $token . '"]';
-    return $xpath;
-  }
-}
diff --git a/modules/token/src/Tests/Tree/TreeTest.php b/modules/token/src/Tests/Tree/TreeTest.php
deleted file mode 100644
index ed1dd3c..0000000
--- a/modules/token/src/Tests/Tree/TreeTest.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-namespace Drupal\token\Tests\Tree;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\token\Tests\TokenTestBase;
-
-/**
- * Tests token tree page.
- *
- * @group token
- */
-class TreeTest extends TokenTestBase {
-
-  use TokenTreeTestTrait;
-
-  /**
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $account;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node'];
-
-  public function setUp() {
-    parent::setUp();
-
-    $this->account = $this->drupalCreateUser(['administer account settings']);
-    $this->drupalLogin($this->account);
-  }
-
-  /**
-   * Test various tokens that are possible on the site.
-   */
-  public function testAllTokens() {
-    $this->drupalGet($this->getTokenTreeUrl(['token_types' => 'all']));
-
-    $this->assertTokenGroup('Current date');
-    $this->assertTokenGroup('Site information');
-
-    $this->assertTokenInTree('[current-date:html_date]', 'current-date');
-    $this->assertTokenInTree('[current-date:html_week]', 'current-date');
-    $this->assertTokenInTree('[date:html_date]', 'date');
-    $this->assertTokenInTree('[date:html_week]', 'date');
-
-    $this->assertTokenInTree('[current-user:account-name]', 'current-user');
-    $this->assertTokenInTree('[user:account-name]', 'user');
-
-    $this->assertTokenInTree('[current-page:url:unaliased]', 'current-page--url');
-    $this->assertTokenInTree('[current-page:url:unaliased:args]', 'current-page--url--unaliased');
-    $this->assertTokenInTree('[user:original:account-name]', 'user--original');
-  }
-
-  /**
-   * Test various tokens that are possible on the site.
-   */
-  public function testGlobalTokens() {
-    $this->drupalGet($this->getTokenTreeUrl());
-
-    $this->assertTokenGroup('Current date');
-    $this->assertTokenGroup('Site information');
-
-    // Assert that non-global tokens are not listed.
-    $this->assertTokenNotInTree('[user:account-name]', 'user');
-    $this->assertTokenNotInTree('[user:original:account-name]', 'user--original');
-
-    // Assert some of the global tokens, just to be sure.
-    $this->assertTokenInTree('[current-date:html_date]', 'current-date');
-    $this->assertTokenInTree('[current-date:html_week]', 'current-date');
-
-    $this->assertTokenInTree('[current-user:account-name]', 'current-user');
-
-    $this->assertTokenInTree('[current-page:url:unaliased]', 'current-page--url');
-    $this->assertTokenInTree('[current-page:url:unaliased:args]', 'current-page--url--unaliased');
-  }
-
-  /**
-   * Tests if the token browser displays the user tokens.
-   */
-  public function testUserTokens() {
-    $this->drupalGet($this->getTokenTreeUrl(['token_types' => ['user']]));
-
-    $this->assertTokenGroup('Users');
-
-    $this->assertTokenInTree('[user:account-name]', 'user');
-    $this->assertTokenInTree('[user:original:account-name]', 'user--original');
-
-    // Assert some of the restricted tokens to ensure they are not shown.
-    $this->assertTokenNotInTree('[user:one-time-login-url]', 'user');
-    $this->assertTokenNotInTree('[user:original:cancel-url]', 'user--original');
-
-    // Request with show_restricted set to TRUE to show restricted tokens and
-    // check for them.
-    $this->drupalGet($this->getTokenTreeUrl(['token_types' => ['user'], 'show_restricted' => TRUE]));
-    $this->assertEqual('MISS', $this->drupalGetHeader('x-drupal-dynamic-cache'), 'Cache was not hit');
-    $this->assertTokenInTree('[user:one-time-login-url]', 'user');
-    $this->assertTokenInTree('[user:original:cancel-url]', 'user--original');
-  }
-
-  /**
-   * Tests if the token browser displays the node tokens.
-   */
-  public function testNodeTokens() {
-    $this->drupalGet($this->getTokenTreeUrl(['token_types' => ['node']]));
-
-    $this->assertTokenGroup('Nodes');
-
-    $this->assertTokenInTree('[node:body]', 'node');
-    $this->assertTokenInTree('[node:author:original:account-name]', 'node--author--original');
-  }
-
-  /**
-   * Get the URL for the token tree based on the specified options.
-   *
-   * The token tree route's URL requires CSRF and cannot be generated in the
-   * test code. The CSRF token generated using the test runner's session is
-   * different from the session inside the test environment. This is why the
-   * link has to be generated inside the environment.
-   *
-   * This function calls a page in token_module_test module which generates the
-   * link and the token. This then replaces the options query parameter with the
-   * specified options.
-   *
-   * The page also uses a title callback to set title to a render array, which
-   * allows us to test if [current-page:title] works properly.
-   *
-   * @param array $options
-   *   The options for the token tree browser.
-   *
-   * @return string
-   *   The complete URL of the token tree browser with the CSRF token.
-   */
-  protected function getTokenTreeUrl($options = []) {
-    $this->drupalGet('token_module_test/browse');
-    $this->assertTitle('Available Tokens | Drupal');
-    $links = $this->xpath('//a[contains(@href, :href)]/@href', array(':href' => 'token/tree'));
-    $link = $this->getAbsoluteUrl((string) current($links));
-    if (!empty($options)) {
-      $options = Json::encode($options);
-      $link = str_replace('options=%5B%5D', 'options=' . urlencode($options), $link);
-    }
-    return $link;
-  }
-}
diff --git a/modules/token/src/Token.php b/modules/token/src/Token.php
deleted file mode 100644
index 360ae35..0000000
--- a/modules/token/src/Token.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-namespace Drupal\token;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Utility\Token as TokenBase;
-
-/**
- * Service to retrieve token information.
- *
- * This service replaces the core's token service and provides the same
- * functionality by extending it. It also provides additional functionality
- * commonly required by the additional support provided by token module and
- * other modules.
- */
-class Token extends TokenBase implements TokenInterface {
-
-  /**
-   * Token definitions.
-   *
-   * @var array[]|null
-   *   An array of token definitions, or NULL when the definitions are not set.
-   *
-   * @see self::resetInfo()
-   */
-  protected $globalTokenTypes;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getInfo() {
-    if (empty($this->tokenInfo)) {
-      $cache_id = 'token_info_sorted:' . $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
-      $cache = $this->cache->get($cache_id);
-      if ($cache) {
-        $this->tokenInfo = $cache->data;
-      }
-      else {
-        $token_info = $this->moduleHandler->invokeAll('token_info');
-        $this->moduleHandler->alter('token_info', $token_info);
-
-        foreach (array_keys($token_info['types']) as $type_key) {
-          if (isset($token_info['types'][$type_key]['type'])) {
-            $base_type = $token_info['types'][$type_key]['type'];
-            // If this token type extends another token type, then merge in
-            // the base token type's tokens.
-            if (isset($token_info['tokens'][$base_type])) {
-              $token_info['tokens'] += [$type_key => []];
-              $token_info['tokens'][$type_key] += $token_info['tokens'][$base_type];
-            }
-          }
-          else {
-            // Add a 'type' value to each token type information.
-            $token_info['types'][$type_key]['type'] = $type_key;
-          }
-        }
-
-        // Pre-sort tokens.
-        $by_name = $this->prepareMultisort($token_info['types']);
-        array_multisort($by_name, SORT_ASC, SORT_NATURAL | SORT_FLAG_CASE, $token_info['types']);
-        foreach (array_keys($token_info['tokens']) as $type) {
-          $by_name = $this->prepareMultisort($token_info['tokens'][$type]);
-          array_multisort($by_name, SORT_ASC, SORT_NATURAL | SORT_FLAG_CASE, $token_info['tokens'][$type]);
-        }
-
-        $this->tokenInfo = $token_info;
-        $this->cache->set($cache_id, $this->tokenInfo, CacheBackendInterface::CACHE_PERMANENT, array(
-          static::TOKEN_INFO_CACHE_TAG,
-        ));
-      }
-    }
-
-    return $this->tokenInfo;
-  }
-
-  /**
-   * Extracts data from the token data for use in array_multisort().
-   *
-   * @param array $token_info
-   *   List of tokens or token types, each element must have a name key.
-   *
-   * @return string[]
-   *   List of the names keyed by the token key.
-   */
-  protected function prepareMultisort($token_info) {
-    $by_name = [];
-    foreach ($token_info as $key => $token_info_element) {
-      $by_name[$key] = $token_info_element['name'];
-    }
-    return $by_name;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTokenInfo($token_type, $token) {
-    if (empty($this->tokenInfo)) {
-      $this->getInfo();
-    }
-
-    return isset($this->tokenInfo['tokens'][$token_type][$token]) ? $this->tokenInfo['tokens'][$token_type][$token] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTypeInfo($token_type) {
-    if (empty($this->tokenInfo)) {
-      $this->getInfo();
-    }
-
-    return isset($this->tokenInfo['types'][$token_type]) ? $this->tokenInfo['types'][$token_type] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getGlobalTokenTypes() {
-    if (empty($this->globalTokenTypes)) {
-      $token_info = $this->getInfo();
-      foreach ($token_info['types'] as $type => $type_info) {
-        // If the token types has not specified that 'needs-data' => TRUE, then
-        // it is a global token type that will always be replaced in any context.
-        if (empty($type_info['needs-data'])) {
-          $this->globalTokenTypes[] = $type;
-        }
-      }
-    }
-
-    return $this->globalTokenTypes;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  function getInvalidTokens($type, $tokens) {
-    $token_info = $this->getInfo();
-    $invalid_tokens = array();
-
-    foreach ($tokens as $token => $full_token) {
-      if (isset($token_info['tokens'][$type][$token])) {
-        continue;
-      }
-
-      // Split token up if it has chains.
-      $parts = explode(':', $token, 2);
-
-      if (!isset($token_info['tokens'][$type][$parts[0]])) {
-        // This is an invalid token (not defined).
-        $invalid_tokens[] = $full_token;
-      }
-      elseif (count($parts) == 2) {
-        $sub_token_info = $token_info['tokens'][$type][$parts[0]];
-        if (!empty($sub_token_info['dynamic'])) {
-          // If this token has been flagged as a dynamic token, skip it.
-          continue;
-        }
-        elseif (empty($sub_token_info['type'])) {
-          // If the token has chains, but does not support it, it is invalid.
-          $invalid_tokens[] = $full_token;
-        }
-        else {
-          // Recursively check the chained tokens.
-          $sub_tokens = $this->findWithPrefix(array($token => $full_token), $parts[0]);
-          $invalid_tokens = array_merge($invalid_tokens, $this->getInvalidTokens($sub_token_info['type'], $sub_tokens));
-        }
-      }
-    }
-
-    return $invalid_tokens;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getInvalidTokensByContext($value, array $valid_types = []) {
-    if (in_array('all', $valid_types)) {
-      $info = $this->getInfo();
-      $valid_types = array_keys($info['types']);
-    }
-    else {
-      // Add the token types that are always valid in global context.
-      $valid_types = array_merge($valid_types, $this->getGlobalTokenTypes());
-    }
-
-    $invalid_tokens = array();
-    $value_tokens = is_string($value) ? $this->scan($value) : $value;
-
-    foreach ($value_tokens as $type => $tokens) {
-      if (!in_array($type, $valid_types)) {
-        // If the token type is not a valid context, its tokens are invalid.
-        $invalid_tokens = array_merge($invalid_tokens, array_values($tokens));
-      }
-      else {
-        // Check each individual token for validity.
-        $invalid_tokens = array_merge($invalid_tokens, $this->getInvalidTokens($type, $tokens));
-      }
-    }
-
-    array_unique($invalid_tokens);
-    return $invalid_tokens;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resetInfo() {
-    parent::resetInfo();
-    $this->globalTokenTypes = NULL;
-  }
-
-}
diff --git a/modules/token/src/TokenEntityMapper.php b/modules/token/src/TokenEntityMapper.php
deleted file mode 100644
index 051df8f..0000000
--- a/modules/token/src/TokenEntityMapper.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Drupal\token;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-
-/**
- * Service to provide mappings between entity and token types.
- *
- * Why do we need this? Because when the token API was moved to core we did not
- * reuse the entity type as the base name for taxonomy terms and vocabulary
- * tokens.
- */
-class TokenEntityMapper implements TokenEntityMapperInterface {
-
-  /**
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * @var array
-   */
-  protected $entityMappings;
-
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->moduleHandler = $module_handler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntityTypeMappings() {
-    if (empty($this->entityMappings)) {
-      foreach ($this->entityTypeManager->getDefinitions() as $entity_type => $info) {
-        $this->entityMappings[$entity_type] = $info->get('token_type') ?: $entity_type;
-      }
-      // Allow modules to alter the mapping array.
-      $this->moduleHandler->alter('token_entity_mapping', $this->entityMappings);
-    }
-
-    return $this->entityMappings;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  function getEntityTypeForTokenType($token_type, $fallback = FALSE) {
-    if (empty($this->entityMappings)) {
-      $this->getEntityTypeMappings();
-    }
-
-    $return = array_search($token_type, $this->entityMappings);
-    return $return !== FALSE ? $return : ($fallback ? $token_type : FALSE);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  function getTokenTypeForEntityType($entity_type, $fallback = FALSE) {
-    if (empty($this->entityMappings)) {
-      $this->getEntityTypeMappings();
-    }
-
-    return isset($this->entityMappings[$entity_type]) ? $this->entityMappings[$entity_type] : ($fallback ? $entity_type : FALSE);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resetInfo() {
-    $this->entityMappings = NULL;
-  }
-
-}
diff --git a/modules/token/src/TokenEntityMapperInterface.php b/modules/token/src/TokenEntityMapperInterface.php
deleted file mode 100644
index 5eb038e..0000000
--- a/modules/token/src/TokenEntityMapperInterface.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\token;
-
-interface TokenEntityMapperInterface {
-
-  /**
-   * Return an array of entity type to token type mappings.
-   *
-   * @return array
-   *   An array of mappings with entity type mapping to token type.
-   */
-  public function getEntityTypeMappings();
-
-  /**
-   * Return the entity type of a particular token type.
-   *
-   * @param string $token_type
-   *   The token type for which the mapping is returned.
-   * @param bool $fallback
-   *   (optional) Defaults to FALSE. If true, the same $value is returned in
-   *   case the mapping was not found.
-   *
-   * @return string
-   *   The entity type of the token type specified.
-   *
-   * @see token_entity_info_alter()
-   * @see http://drupal.org/node/737726
-   */
-  function getEntityTypeForTokenType($token_type, $fallback = FALSE);
-
-  /**
-   * Return the token type of a particular entity type.
-   *
-   * @param string $entity_type
-   *   The entity type for which the mapping is returned.
-   * @param bool $fallback
-   *   (optional) Defaults to FALSE. If true, the same $value is returned in
-   *   case the mapping was not found.
-   *
-   * @return string
-   *   The token type of the entity type specified.
-   *
-   * @see token_entity_info_alter()
-   * @see http://drupal.org/node/737726
-   */
-  function getTokenTypeForEntityType($entity_type, $fallback = FALSE);
-
-  /**
-   * Resets metadata describing token and entity mappings.
-   */
-  public function resetInfo();
-}
diff --git a/modules/token/src/TokenInterface.php b/modules/token/src/TokenInterface.php
deleted file mode 100644
index a66f137..0000000
--- a/modules/token/src/TokenInterface.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Drupal\token;
-
-interface TokenInterface {
-
-  /**
-   * Returns metadata describing supported token types.
-   *
-   * @param $token_type
-   *   The token type for which the metadata is required.
-   *
-   * @return array[]
-   *   An array of token type information from hook_token_info() for the
-   *   specified token type.
-   *
-   * @see hook_token_info()
-   * @see hook_token_info_alter()
-   */
-  public function getTypeInfo($token_type);
-
-  /**
-   * Returns metadata describing supported a token.
-   *
-   * @param $token_type
-   *   The token type for which the metadata is required.
-   * @param $token
-   *   The token name for which the metadata is required.
-   *
-   * @return array[]
-   *   An array of information from hook_token_info() for the specified token.
-   *
-   * @see hook_token_info()
-   * @see hook_token_info_alter()
-   *
-   * @deprecated
-   */
-  public function getTokenInfo($token_type, $token);
-
-  /**
-   * Get a list of token types that can be used without any context (global).
-   *
-   * @return array[]
-   *   An array of global token types.
-   */
-  public function getGlobalTokenTypes();
-
-  /**
-   * Validate an array of tokens based on their token type.
-   *
-   * @param string $type
-   *   The type of tokens to validate (e.g. 'node', etc.)
-   * @param string[] $tokens
-   *   A keyed array of tokens, and their original raw form in the source text.
-   *
-   * @return string[]
-   *   An array with the invalid tokens in their original raw forms.
-   */
-  function getInvalidTokens($type, $tokens);
-
-  /**
-   * Validate tokens in raw text based on possible contexts.
-   *
-   * @param string|string[] $value
-   *   A string with the raw text containing the raw tokens, or an array of
-   *   tokens from token_scan().
-   * @param string[] $valid_types
-   *   An array of token types that will be used when token replacement is
-   *   performed.
-   *
-   * @return string[]
-   *   An array with the invalid tokens in their original raw forms.
-   */
-  public function getInvalidTokensByContext($value, array $valid_types = []);
-}
diff --git a/modules/token/src/TokenServiceProvider.php b/modules/token/src/TokenServiceProvider.php
deleted file mode 100644
index c855195..0000000
--- a/modules/token/src/TokenServiceProvider.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Drupal\token;
-
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\DependencyInjection\ServiceProviderBase;
-
-/**
- * Replace core's token service with our own.
- */
-class TokenServiceProvider extends ServiceProviderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alter(ContainerBuilder $container) {
-    $definition = $container->getDefinition('token');
-    $definition->setClass('\Drupal\token\Token');
-  }
-}
diff --git a/modules/token/src/TreeBuilder.php b/modules/token/src/TreeBuilder.php
deleted file mode 100644
index 80ebca2..0000000
--- a/modules/token/src/TreeBuilder.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-
-namespace Drupal\token;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\Render\BubbleableMetadata;
-
-class TreeBuilder implements TreeBuilderInterface {
-
-  /**
-   * @var \Drupal\token\Token
-   */
-  protected $tokenService;
-
-  /**
-   * @var \Drupal\token\TokenEntityMapperInterface
-   */
-  protected $entityMapper;
-
-  /**
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
-   * @var \Drupal\Core\Cache\CacheBackendInterface
-   */
-  protected $cacheBackend;
-
-  /**
-   * Cache already built trees.
-   *
-   * @var array
-   */
-  protected $builtTrees;
-
-  public function __construct(TokenInterface $token_service, TokenEntityMapperInterface $entity_mapper, CacheBackendInterface $cache_backend, LanguageManagerInterface $language_manager) {
-    $this->tokenService = $token_service;
-    $this->entityMapper = $entity_mapper;
-    $this->cacheBackend = $cache_backend;
-    $this->languageManager = $language_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRenderable(array $token_types, array $options = []) {
-    // Set default options.
-    $options += [
-      'global_types' => TRUE,
-      'click_insert' => TRUE,
-      'show_restricted' => FALSE,
-      'show_nested' => FALSE,
-      'recursion_limit' => 3,
-    ];
-
-    $info = $this->tokenService->getInfo();
-    if ($options['global_types']) {
-      $token_types = array_merge($token_types, $this->tokenService->getGlobalTokenTypes());
-    }
-
-    $element = array(
-      /*'#cache' => array(
-        'cid' => 'tree-rendered:' . hash('sha256', serialize(array('token_types' => $token_types, 'global_types' => NULL) + $variables)),
-        'tags' => array(Token::TOKEN_INFO_CACHE_TAG),
-      ),*/
-    );
-
-    // @todo Find a way to use the render cache for this.
-    /*if ($cached_output = token_render_cache_get($element)) {
-      return $cached_output;
-    }*/
-
-    $tree_options = [
-      'flat' => TRUE,
-      'restricted' => $options['show_restricted'],
-      'nested' => $options['show_nested'],
-      'depth' => $options['recursion_limit'],
-    ];
-
-    $token_tree = [];
-    foreach ($info['types'] as $type => $type_info) {
-      if (!in_array($type, $token_types)) {
-        continue;
-      }
-
-      $token_tree[$type] = $type_info;
-      $token_tree[$type]['tokens'] = $this->buildTree($type, $tree_options);
-    }
-
-    $element += [
-      '#type' => 'token_tree_table',
-      '#token_tree' => $token_tree,
-      '#show_restricted' => $options['show_restricted'],
-      '#show_nested' => $options['show_nested'],
-      '#click_insert' => $options['click_insert'],
-      '#columns' => ['name', 'token', 'description'],
-      '#empty' => t('No tokens available'),
-    ];
-
-    return $element;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildAllRenderable(array $options = []) {
-    $info = $this->tokenService->getInfo();
-    $token_types = array_keys($info['types']);
-
-    // Disable merging in global types as we will be adding in all token types
-    // explicitly. There is no difference in leaving this set to TRUE except for
-    // an additional method call which is unnecessary.
-    $options['global_types'] = FALSE;
-    return $this->buildRenderable($token_types, $options);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildTree($token_type, array $options = []) {
-    $options += [
-      'restricted' => FALSE,
-      'depth' => 4,
-      'data' => [],
-      'values' => FALSE,
-      'flat' => FALSE,
-    ];
-
-    // Do not allow past the maximum token information depth.
-    $options['depth'] = min($options['depth'], static::MAX_DEPTH);
-
-    // If $token_type is an entity, make sure we are using the actual token type.
-    if ($entity_token_type = $this->entityMapper->getTokenTypeForEntityType($token_type)) {
-      $token_type = $entity_token_type;
-    }
-
-    $langcode = $this->languageManager->getCurrentLanguage()->getId();
-    $tree_cid = "token_tree:{$token_type}:{$langcode}:{$options['depth']}";
-
-    // If we do not have this base tree in the static cache, check the cache
-    // otherwise generate and store it in the cache.
-    if (!isset($this->builtTrees[$tree_cid])) {
-      if ($cache = $this->cacheBackend->get($tree_cid)) {
-        $this->builtTrees[$tree_cid] = $cache->data;
-      }
-      else {
-        $options['parents'] = [];
-        $this->builtTrees[$tree_cid] = $this->getTokenData($token_type, $options);
-        $this->cacheBackend->set($tree_cid, $this->builtTrees[$tree_cid], Cache::PERMANENT, [Token::TOKEN_INFO_CACHE_TAG]);
-      }
-    }
-
-    $tree = $this->builtTrees[$tree_cid];
-
-    // If the user has requested a flat tree, convert it.
-    if (!empty($options['flat'])) {
-      $tree = $this->flattenTree($tree);
-    }
-
-    // Fill in token values.
-    if (!empty($options['values'])) {
-      $token_values = [];
-      foreach ($tree as $token => $token_info) {
-        if (!empty($token_info['dynamic']) || !empty($token_info['restricted'])) {
-          continue;
-        }
-        elseif (!isset($token_info['value'])) {
-          $token_values[$token_info['token']] = $token;
-        }
-      }
-      if (!empty($token_values)) {
-        $token_values = $this->tokenService->generate($token_type, $token_values, $options['data'], [], new BubbleableMetadata());
-        foreach ($token_values as $token => $replacement) {
-          $tree[$token]['value'] = $replacement;
-        }
-      }
-    }
-
-    return $tree;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function flattenTree(array $tree) {
-    $result = [];
-    foreach ($tree as $token => $token_info) {
-      $result[$token] = $token_info;
-      if (isset($token_info['children']) && is_array($token_info['children'])) {
-        $result += $this->flattenTree($token_info['children']);
-      }
-    }
-    return $result;
-  }
-
-  /**
-   * Generate a token tree.
-   *
-   * @param string $token_type
-   *   The token type.
-   * @param array $options
-   *   An associative array of additional options. See documentation for
-   *   TreeBuilderInterface::buildTree() for more information.
-   *
-   * @return array
-   *   The token data for the specified $token_type.
-   *
-   * @internal
-   */
-  protected function getTokenData($token_type, array $options) {
-    $options += [
-      'parents' => [],
-    ];
-
-    $info = $this->tokenService->getInfo();
-    if ($options['depth'] <= 0 || !isset($info['types'][$token_type]) || !isset($info['tokens'][$token_type])) {
-      return [];
-    }
-
-    $tree = [];
-    foreach ($info['tokens'][$token_type] as $token => $token_info) {
-      // Build the raw token string.
-      $token_parents = $options['parents'];
-      if (empty($token_parents)) {
-        // If the parents array is currently empty, assume the token type is its
-        // parent.
-        $token_parents[] = $token_type;
-      }
-      elseif (in_array($token, array_slice($token_parents, 1), TRUE)) {
-        // Prevent duplicate recursive tokens. For example, this will prevent
-        // the tree from generating the following tokens or deeper:
-        // [comment:parent:parent]
-        // [comment:parent:root:parent]
-        continue;
-      }
-
-      $token_parents[] = $token;
-      if (!empty($token_info['dynamic'])) {
-        $token_parents[] = '?';
-      }
-      $raw_token = '[' . implode(':', $token_parents) . ']';
-      $tree[$raw_token] = $token_info;
-      $tree[$raw_token]['raw token'] = $raw_token;
-
-      // Add the token's real name (leave out the base token type).
-      $tree[$raw_token]['token'] = implode(':', array_slice($token_parents, 1));
-
-      // Add the token's parent as its raw token value.
-      if (!empty($options['parents'])) {
-        $tree[$raw_token]['parent'] = '[' . implode(':', $options['parents']) . ']';
-      }
-
-      // Fetch the child tokens.
-      if (!empty($token_info['type'])) {
-        $child_options = $options;
-        $child_options['depth']--;
-        $child_options['parents'] = $token_parents;
-        $tree[$raw_token]['children'] = $this->getTokenData($token_info['type'], $child_options);
-      }
-    }
-
-    return $tree;
-  }
-}
diff --git a/modules/token/src/TreeBuilderInterface.php b/modules/token/src/TreeBuilderInterface.php
deleted file mode 100644
index c4212c2..0000000
--- a/modules/token/src/TreeBuilderInterface.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Drupal\token;
-
-interface TreeBuilderInterface {
-
-  /**
-   * The maximum depth for token tree recursion.
-   */
-  const MAX_DEPTH = 9;
-
-  /**
-   * Build a tree array of tokens used for themeing or information.
-   *
-   * @param string $token_type
-   *   The token type.
-   * @param array $options
-   *   (optional) An associative array of additional options, with the following
-   *   elements:
-   *   - 'flat' (defaults to FALSE): Set to true to generate a flat list of
-   *     token information. Otherwise, child tokens will be inside the
-   *     'children' parameter of a token.
-   *   - 'restricted' (defaults to FALSE): Set to true to how restricted tokens.
-   *   - 'depth' (defaults to 4): Maximum number of token levels to recurse.
-   *
-   * @return array
-   *   The token information constructed in a tree or flat list form depending
-   *   on $options['flat'].
-   */
-  public function buildTree($token_type, array $options = []);
-
-  /**
-   * Flatten a token tree.
-   *
-   * @param array $tree
-   *   The tree array as returned by TreeBuilderInterface::buildTree().
-   *
-   * @return array
-   *   The flattened version of the tree.
-   */
-  public function flattenTree(array $tree);
-
-  /**
-   * Build a render array with token tree built as per specified options.
-   *
-   * @param array $token_types
-   *   An array containing token types that should be shown in the tree.
-   * @param array $options
-   *   (optional) An associative array to control which tokens are shown and
-   *   how. The properties available are:
-   *   - 'global_types' (defaults to TRUE): Show all global token types along
-   *     with the specified types.
-   *   - 'click_insert' (defaults to TRUE): Include classes and caption to show
-   *     allow inserting tokens in fields by clicking on them.
-   *   - 'show_restricted' (defaults to FALSE): Show restricted tokens in the
-   *     tree.
-   *   - 'show_nested' (defaults to FALSE): If this token is nested and should
-   *     therefor not show on the token browser as a top level token.
-   *   - 'recursion_limit' (defaults to 3): Only show tokens up to the specified
-   *     depth.
-   *
-   * @return array
-   *   Render array for the token tree.
-   */
-  public function buildRenderable(array $token_types, array $options = []);
-
-  /**
-   * Build a render array with token tree containing all possible tokens.
-   *
-   * @param array $options
-   *   (optional) An associative array to control which tokens are shown and
-   *   how. The properties available are: See
-   *   \Drupal\token\TreeBuilderInterface::buildRenderable() for details.
-   *
-   * @return array
-   *   Render array for the token tree.
-   */
-  public function buildAllRenderable(array $options = []);
-}
diff --git a/modules/token/templates/token-tree-link.html.twig b/modules/token/templates/token-tree-link.html.twig
deleted file mode 100644
index aaf708e..0000000
--- a/modules/token/templates/token-tree-link.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for the token tree link.
- *
- * Available variables:
- * - url: The URL to the token tree page.
- * - text: The text to be displayed in the link.
- * - attributes: Attributes for the anchor tag.
- * - link: The complete link.
- *
- * @see template_preprocess_token_tree_link()
- *
- * @ingroup themeable
- */
-#}
-{% if link -%}
-  {{ link }}
-{%- endif %}
diff --git a/modules/token/tests/modules/token_module_test/config/install/core.date_format.token_module_test.yml b/modules/token/tests/modules/token_module_test/config/install/core.date_format.token_module_test.yml
deleted file mode 100644
index 419cce7..0000000
--- a/modules/token/tests/modules/token_module_test/config/install/core.date_format.token_module_test.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-id: token_module_test
-label: 'Token test'
-status: true
-langcode: en
-locked: true
-pattern: Y
diff --git a/modules/token/tests/modules/token_module_test/src/Controller/TokenTreeBrowseController.php b/modules/token/tests/modules/token_module_test/src/Controller/TokenTreeBrowseController.php
deleted file mode 100644
index 9b2ba08..0000000
--- a/modules/token/tests/modules/token_module_test/src/Controller/TokenTreeBrowseController.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\token_module_test\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Symfony\Component\HttpFoundation\Request;
-
-class TokenTreeBrowseController extends ControllerBase {
-
-  /**
-   * Page callback to output a link.
-   */
-  function outputLink(Request $request) {
-    $build['tree']['#theme'] = 'token_tree_link';
-    $build['tokenarea'] = [
-      '#markup' => \Drupal::token()->replace('[current-page:title]'),
-      '#type' => 'markup',
-    ];
-    return $build;
-  }
-
-  /**
-   * Title callback for the page outputting a link.
-   *
-   * We are using a title callback instead of directly defining the title in the
-   * routing YML file. This is so that we could return an array instead of a
-   * simple string. This allows us to test if [current-page:title] works with
-   * render arrays and other objects as titles.
-   */
-  public function getTitle() {
-    return [
-      '#type' => 'markup',
-      '#markup' => 'Available Tokens',
-    ];
-  }
-
-}
diff --git a/modules/token/tests/modules/token_module_test/token_module_test.info.yml b/modules/token/tests/modules/token_module_test/token_module_test.info.yml
deleted file mode 100644
index 342ef6c..0000000
--- a/modules/token/tests/modules/token_module_test/token_module_test.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-type: module
-name: Token Module Test
-description: Testing module for token functionality.
-package: Testing
-# core: 8.x
-hidden: TRUE
-
-# Information added by Drupal.org packaging script on 2017-04-29
-version: '8.x-1.0'
-core: '8.x'
-project: 'token'
-datestamp: 1493466847
diff --git a/modules/token/tests/modules/token_module_test/token_module_test.module b/modules/token/tests/modules/token_module_test/token_module_test.module
deleted file mode 100644
index c263320..0000000
--- a/modules/token/tests/modules/token_module_test/token_module_test.module
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * @file
- * Helper module for token tests.
- */
-use Drupal\node\NodeInterface;
-
-/**
- * Implements hook_page_attachments().
- */
-function token_module_test_page_attachments() {
-  if ($debug = \Drupal::state()->get('token_page_tokens', array())) {
-    $debug += array('tokens' => array(), 'data' => array(), 'options' => array());
-    foreach (array_keys($debug['tokens']) as $token) {
-      $debug['values'][$token] = \Drupal::token()->replace($token, $debug['data'], $debug['options']);
-    }
-    \Drupal::state()->set('token_page_tokens', $debug);
-  }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_presave for Node entities.
- */
-function token_module_test_node_presave(NodeInterface $node) {
-  // Transform tokens in the body.
-  // @see \Drupal\token\Tests\TokenMenuTest::testMenuTokens()
-  if ($node->hasField('body')) {
-    $node->body->value = \Drupal::token()
-      ->replace($node->body->value, ['node' => $node]);
-  }
-}
diff --git a/modules/token/tests/modules/token_module_test/token_module_test.routing.yml b/modules/token/tests/modules/token_module_test/token_module_test.routing.yml
deleted file mode 100644
index fb99f1c..0000000
--- a/modules/token/tests/modules/token_module_test/token_module_test.routing.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-token_module_test.browse:
-  path: '/token_module_test/browse'
-  defaults:
-    _controller: '\Drupal\token_module_test\Controller\TokenTreeBrowseController::outputLink'
-    _title_callback: '\Drupal\token_module_test\Controller\TokenTreeBrowseController::getTitle'
-  requirements:
-    _access: 'TRUE'
diff --git a/modules/token/tests/modules/token_module_test/token_module_test.tokens.inc b/modules/token/tests/modules/token_module_test/token_module_test.tokens.inc
deleted file mode 100644
index ba8da53..0000000
--- a/modules/token/tests/modules/token_module_test/token_module_test.tokens.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * Implements hook_token_info()
- */
-function token_module_test_token_info() {
-  $info['tokens']['node']['colons:in:name'] = array(
-    'name' => t('A test token with colons in the name'),
-    'description' => NULL,
-  );
-
-  return $info;
-}
diff --git a/modules/token/tests/modules/token_user_picture/config/install/core.entity_form_display.user.user.default.yml b/modules/token/tests/modules/token_user_picture/config/install/core.entity_form_display.user.user.default.yml
deleted file mode 100644
index a30d012..0000000
--- a/modules/token/tests/modules/token_user_picture/config/install/core.entity_form_display.user.user.default.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: de
-status: true
-dependencies:
-  module:
-    - image
-    - user
-id: user.user.default
-targetEntityType: user
-bundle: user
-mode: default
-content:
-  account:
-    weight: -10
-  user_picture:
-    type: image_image
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-    weight: -1
-  timezone:
-    weight: 6
-hidden: {  }
diff --git a/modules/token/tests/modules/token_user_picture/config/install/field.field.user.user.user_picture.yml b/modules/token/tests/modules/token_user_picture/config/install/field.field.user.user.user_picture.yml
deleted file mode 100644
index 45f6e82..0000000
--- a/modules/token/tests/modules/token_user_picture/config/install/field.field.user.user.user_picture.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-id: user.user.user_picture
-status: true
-langcode: en
-entity_type: user
-bundle: user
-field_name: user_picture
-label: Picture
-description: 'Your virtual face or picture.'
-required: false
-default_value: {  }
-default_value_function: ''
-settings:
-  file_extensions: 'png gif jpg jpeg'
-  file_directory: pictures
-  max_filesize: '30 KB'
-  alt_field: false
-  title_field: false
-  max_resolution: 85x85
-  min_resolution: ''
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-  alt_field_required: false
-  title_field_required: false
-field_type: image
-dependencies:
-  config:
-    - field.storage.user.user_picture
diff --git a/modules/token/tests/modules/token_user_picture/config/install/field.storage.user.user_picture.yml b/modules/token/tests/modules/token_user_picture/config/install/field.storage.user.user_picture.yml
deleted file mode 100644
index 01d0939..0000000
--- a/modules/token/tests/modules/token_user_picture/config/install/field.storage.user.user_picture.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-id: user.user_picture
-status: true
-langcode: en
-field_name: user_picture
-entity_type: user
-type: image
-settings:
-  uri_scheme: public
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-module: image
-locked: false
-cardinality: 1
-translatable: false
-indexes:
-  target_id:
-    - target_id
-dependencies:
-  module:
-    - image
-    - user
diff --git a/modules/token/tests/modules/token_user_picture/token_user_picture.info.yml b/modules/token/tests/modules/token_user_picture/token_user_picture.info.yml
deleted file mode 100644
index 4f8b990..0000000
--- a/modules/token/tests/modules/token_user_picture/token_user_picture.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-type: module
-name: Token User picture
-description: Testing module that provides user pictures field.
-package: Testing
-# core: 8.x
-hidden: TRUE
-dependencies:
-  - image
-
-# Information added by Drupal.org packaging script on 2017-04-29
-version: '8.x-1.0'
-core: '8.x'
-project: 'token'
-datestamp: 1493466847
diff --git a/modules/token/tests/src/Kernel/ArrayTest.php b/modules/token/tests/src/Kernel/ArrayTest.php
deleted file mode 100644
index a7f83ae..0000000
--- a/modules/token/tests/src/Kernel/ArrayTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-/**
- * Tests array tokens.
- *
- * @group token
- */
-class ArrayTest extends KernelTestBase {
-
-  function testArrayTokens() {
-    // Test a simple array.
-    $array = array(0 => 'a', 1 => 'b', 2 => 'c', 4 => 'd');
-    $tokens = array(
-      'first' => 'a',
-      'last' => 'd',
-      'value:0' => 'a',
-      'value:2' => 'c',
-      'count' => 4,
-      'keys' => '0, 1, 2, 4',
-      'keys:value:3' => '4',
-      'keys:join' => '0124',
-      'reversed' => 'd, c, b, a',
-      'reversed:keys' => '4, 2, 1, 0',
-      'join:/' => 'a/b/c/d',
-      'join' => 'abcd',
-      'join:, ' => 'a, b, c, d',
-      'join: ' => 'a b c d',
-    );
-    $this->assertTokens('array', array('array' => $array), $tokens);
-
-    // Test a mixed simple and render array.
-    // 2 => c, 0 => a, 4 => d, 1 => b
-    $array = array(
-      '#property' => 'value',
-      0 => 'a',
-      1 => array('#markup' => 'b', '#weight' => 0.01),
-      2 => array('#markup' => 'c', '#weight' => -10),
-      4 => array('#markup' => 'd', '#weight' => 0),
-    );
-    $tokens = array(
-      'first' => 'c',
-      'last' => 'b',
-      'value:0' => 'a',
-      'value:2' => 'c',
-      'count' => 4,
-      'keys' => '2, 0, 4, 1',
-      'keys:value:3' => '1',
-      'keys:join' => '2041',
-      'reversed' => 'b, d, a, c',
-      'reversed:keys' => '1, 4, 0, 2',
-      'join:/' => 'c/a/d/b',
-      'join' => 'cadb',
-      'join:, ' => 'c, a, d, b',
-      'join: ' => 'c a d b',
-    );
-    $this->assertTokens('array', array('array' => $array), $tokens);
-  }
-}
diff --git a/modules/token/tests/src/Kernel/BookTest.php b/modules/token/tests/src/Kernel/BookTest.php
deleted file mode 100644
index 67a13ee..0000000
--- a/modules/token/tests/src/Kernel/BookTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-use Drupal\node\Entity\Node;
-use Drupal\Core\Url;
-
-/**
- * Test the book tokens.
- *
- * @group token
- */
-class BookTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['user', 'field', 'filter', 'text', 'node', 'book'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-    $this->installSchema('book', array('book'));
-    $this->installSchema('node', array('node_access'));
-    $this->installConfig(array('node', 'book', 'field'));
-  }
-
-  function testBookTokens() {
-    $book = Node::create([
-      'type' => 'book',
-      'title' => 'Book Main Page',
-      'book' => ['bid' => 'new'],
-    ]);
-    $book->save();
-
-    $page1 = Node::create([
-      'type' => 'book',
-      'title' => '1st Page',
-      'book' => ['bid' => $book->id(), 'pid' => $book->id()],
-    ]);
-    $page1->save();
-
-    $page2 = Node::create([
-      'type' => 'book',
-      'title' => '2nd Page',
-      'book' => ['bid' => $book->id(), 'pid' => $page1->id()],
-    ]);
-    $page2->save();
-
-    $book_title = $book->getTitle();
-
-    $tokens = [
-      'nid' => $book->id(),
-      'title' => $book_title,
-      'book:title' => $book_title,
-      'book:root' => $book_title,
-      'book:root:nid' => $book->id(),
-      'book:root:title' => $book_title,
-      'book:root:url' => Url::fromRoute('entity.node.canonical', ['node' => $book->id()], array('absolute' => TRUE))->toString(),
-      'book:root:content-type' => 'Book page',
-      'book:parent' => null,
-      'book:parents' => null,
-    ];
-    $this->assertTokens('node', array('node' => $book), $tokens);
-
-    $tokens = [
-      'nid' => $page1->id(),
-      'title' => $page1->getTitle(),
-      'book:title' => $book_title,
-      'book:root' => $book_title,
-      'book:root:nid' => $book->id(),
-      'book:root:title' => $book_title,
-      'book:root:url' => Url::fromRoute('entity.node.canonical', ['node' => $book->id()], array('absolute' => TRUE))->toString(),
-      'book:root:content-type' => 'Book page',
-      'book:parent:nid' => $book->id(),
-      'book:parent:title' => $book_title,
-      'book:parent:url' => Url::fromRoute('entity.node.canonical', ['node' => $book->id()], array('absolute' => TRUE))->toString(),
-      'book:parents:count' => 1,
-      'book:parents:join:/' => $book_title,
-    ];
-    $this->assertTokens('node', array('node' => $page1), $tokens);
-
-    $tokens = [
-      'nid' => $page2->id(),
-      'title' => $page2->getTitle(),
-      'book:title' => $book_title,
-      'book:root' => $book_title,
-      'book:root:nid' => $book->id(),
-      'book:root:title' => $book_title,
-      'book:root:url' => Url::fromRoute('entity.node.canonical', ['node' => $book->id()], array('absolute' => TRUE))->toString(),
-      'book:root:content-type' => 'Book page',
-      'book:parent:nid' => $page1->id(),
-      'book:parent:title' => $page1->getTitle(),
-      'book:parent:url' => Url::fromRoute('entity.node.canonical', ['node' => $page1->id()], array('absolute' => TRUE))->toString(),
-      'book:parents:count' => 2,
-      'book:parents:join:/' => $book_title . '/' . $page1->getTitle(),
-    ];
-    $this->assertTokens('node', array('node' => $page2), $tokens);
-  }
-}
diff --git a/modules/token/tests/src/Kernel/CommentTest.php b/modules/token/tests/src/Kernel/CommentTest.php
deleted file mode 100644
index 499f087..0000000
--- a/modules/token/tests/src/Kernel/CommentTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-use Drupal\comment\Entity\Comment;
-use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
-use Drupal\Core\Url;
-
-/**
- * Tests comment tokens.
- *
- * @group token
- */
-class CommentTest extends KernelTestBase {
-
-  use CommentTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node', 'comment', 'field', 'text', 'entity_reference'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('comment');
-    $this->installSchema('comment', ['comment_entity_statistics']);
-
-    $node_type = NodeType::create(['type' => 'page', 'name' => t('Page')]);
-    $node_type->save();
-
-    $this->installConfig(['comment']);
-
-    $this->addDefaultCommentField('node', 'page');
-  }
-
-  function testCommentTokens() {
-    $node = Node::create([
-      'type' => 'page',
-      'title' => $this->randomMachineName()
-    ]);
-    $node->save();
-
-    $parent_comment = Comment::create([
-      'entity_id' => $node->id(),
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-      'name' => 'anonymous user',
-      'mail' => 'anonymous@example.com',
-      'subject' => $this->randomMachineName(),
-      'body' => $this->randomMachineName(),
-    ]);
-    $parent_comment->save();
-
-    // Fix http://example.com/index.php/comment/1 fails 'url:path' test.
-    $parent_comment_path = $parent_comment->url();
-
-    $tokens = array(
-      'url' => $parent_comment->urlInfo('canonical', ['fragment' => "comment-{$parent_comment->id()}"])->setAbsolute()->toString(),
-      'url:absolute' => $parent_comment->urlInfo('canonical', ['fragment' => "comment-{$parent_comment->id()}"])->setAbsolute()->toString(),
-      'url:relative' => $parent_comment->urlInfo('canonical', ['fragment' => "comment-{$parent_comment->id()}"])->toString(),
-      'url:path' => $parent_comment_path,
-      'parent:url:absolute' => NULL,
-    );
-    $this->assertTokens('comment', array('comment' => $parent_comment), $tokens);
-
-    $comment = Comment::create([
-      'entity_id' => $node->id(),
-      'pid' => $parent_comment->id(),
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-      'uid' => 1,
-      'name' => 'anonymous user',
-      'mail' => 'anonymous@example.com',
-      'subject' => $this->randomMachineName(),
-      'body' => $this->randomMachineName(),
-    ]);
-    $comment->save();
-
-    // Fix http://example.com/index.php/comment/1 fails 'url:path' test.
-    $comment_path = Url::fromRoute('entity.comment.canonical', array('comment' => $comment->id()))->toString();
-
-    $tokens = array(
-      'url' => $comment->urlInfo('canonical', ['fragment' => "comment-{$comment->id()}"])->setAbsolute()->toString(),
-      'url:absolute' => $comment->urlInfo('canonical', ['fragment' => "comment-{$comment->id()}"])->setAbsolute()->toString(),
-      'url:relative' => $comment->urlInfo('canonical', ['fragment' => "comment-{$comment->id()}"])->toString(),
-      'url:path' => $comment_path,
-      'parent:url:absolute' => $parent_comment->urlInfo('canonical', ['fragment' => "comment-{$parent_comment->id()}"])->setAbsolute()->toString(),
-    );
-    $this->assertTokens('comment', array('comment' => $comment), $tokens);
-  }
-
-}
diff --git a/modules/token/tests/src/Kernel/DateTest.php b/modules/token/tests/src/Kernel/DateTest.php
deleted file mode 100644
index c25bf03..0000000
--- a/modules/token/tests/src/Kernel/DateTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-/**
- * Tests date tokens.
- *
- * @group token
- */
-class DateTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['system', 'token_module_test']);
-  }
-
-  function testDateTokens() {
-    $tokens = array(
-      'token_module_test' => '1984',
-      'invalid_format' => NULL,
-    );
-
-    $this->assertTokens('date', array('date' => 453859200), $tokens);
-  }
-}
diff --git a/modules/token/tests/src/Kernel/EntityTest.php b/modules/token/tests/src/Kernel/EntityTest.php
deleted file mode 100644
index 7ff471d..0000000
--- a/modules/token/tests/src/Kernel/EntityTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\node\Entity\Node;
-use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\taxonomy\VocabularyInterface;
-
-/**
- * Tests entity tokens.
- *
- * @group token
- */
-class EntityTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node', 'taxonomy', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Create the default tags vocabulary.
-    $vocabulary = Vocabulary::create([
-      'name' => 'Tags',
-      'vid' => 'tags',
-    ]);
-    $vocabulary->save();
-
-    $this->installEntitySchema('taxonomy_term');
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-
-    $this->vocab = $vocabulary;
-  }
-
-  function testEntityMapping() {
-    /** @var \Drupal\token\TokenEntityMapperInterface $mapper */
-    $mapper = \Drupal::service('token.entity_mapper');
-    $this->assertIdentical($mapper->getEntityTypeForTokenType('node'), 'node');
-    $this->assertIdentical($mapper->getEntityTypeForTokenType('term'), 'taxonomy_term');
-    $this->assertIdentical($mapper->getEntityTypeForTokenType('vocabulary'), 'taxonomy_vocabulary');
-    $this->assertIdentical($mapper->getEntityTypeForTokenType('invalid'), FALSE);
-    $this->assertIdentical($mapper->getEntityTypeForTokenType('invalid', TRUE), 'invalid');
-    $this->assertIdentical($mapper->getTokenTypeForEntityType('node'), 'node');
-    $this->assertIdentical($mapper->getTokenTypeForEntityType('taxonomy_term'), 'term');
-    $this->assertIdentical($mapper->getTokenTypeForEntityType('taxonomy_vocabulary'), 'vocabulary');
-    $this->assertIdentical($mapper->getTokenTypeForEntityType('invalid'), FALSE);
-    $this->assertIdentical($mapper->getTokenTypeForEntityType('invalid', TRUE), 'invalid');
-
-    // Test that when we send the mis-matched entity type into token_replace()
-    // that we still get the tokens replaced.
-    $vocabulary = entity_load('taxonomy_vocabulary', 'tags');
-    $term = $this->addTerm($vocabulary);
-    $this->assertIdentical(\Drupal::token()->replace('[vocabulary:name]', array('taxonomy_vocabulary' => $vocabulary)), $vocabulary->label());
-    $this->assertIdentical(\Drupal::token()->replace('[term:name][term:vocabulary:name]', array('taxonomy_term' => $term)), $term->label() . $vocabulary->label());
-  }
-
-  function addTerm(VocabularyInterface $vocabulary, array $term = array()) {
-    $term += array(
-      'name' => Unicode::strtolower($this->randomMachineName(5)),
-      'vid' => $vocabulary->id(),
-    );
-    $term = entity_create('taxonomy_term', $term);
-    $term->save();
-    return $term;
-  }
-
-  /**
-   * Test the [entity:original:*] tokens.
-   */
-  function testEntityOriginal() {
-    $node = Node::create(['type' => 'page', 'title' => 'Original title']);
-    $node->save();
-
-    $tokens = array(
-      'nid' => $node->id(),
-      'title' => 'Original title',
-      'original' => NULL,
-      'original:nid' => NULL,
-    );
-    $this->assertTokens('node', array('node' => $node), $tokens);
-
-    // Emulate the original entity property that would be available from
-    // node_save() and change the title for the node.
-    $node->original = entity_load_unchanged('node', $node->id());
-    $node->title = 'New title';
-
-    $tokens = array(
-      'nid' => $node->id(),
-      'title' => 'New title',
-      'original' => 'Original title',
-      'original:nid' => $node->id(),
-    );
-    $this->assertTokens('node', array('node' => $node), $tokens);
-  }
-}
diff --git a/modules/token/tests/src/Kernel/FieldTest.php b/modules/token/tests/src/Kernel/FieldTest.php
deleted file mode 100644
index de94699..0000000
--- a/modules/token/tests/src/Kernel/FieldTest.php
+++ /dev/null
@@ -1,708 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\contact\Entity\ContactForm;
-use Drupal\Core\Entity\Entity\EntityViewMode;
-use Drupal\Core\Render\Markup;
-use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
-use Drupal\datetime_range\Plugin\Field\FieldType\DateRangeItem;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
-use Drupal\contact\Entity\Message;
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\taxonomy\Tests\TaxonomyTestTrait;
-use Drupal\language\Entity\ConfigurableLanguage;
-
-/**
- * Tests field tokens.
- *
- * @group token
- */
-class FieldTest extends KernelTestBase {
-
-  use TaxonomyTestTrait;
-
-  /**
-   * @var \Drupal\filter\FilterFormatInterface
-   */
-  protected $testFormat;
-
-
-  /**
-   * Vocabulary for testing chained token support.
-   *
-   * @var \Drupal\taxonomy\VocabularyInterface
-   */
-  protected $vocabulary;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node', 'text', 'field', 'filter', 'contact', 'options', 'taxonomy', 'language', 'datetime', 'datetime_range'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('taxonomy_term');
-
-    // Create the article content type with a text field.
-    $node_type = NodeType::create([
-      'type' => 'article',
-    ]);
-    $node_type->save();
-
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => 'test_field',
-      'entity_type' => 'node',
-      'type' => 'text',
-    ]);
-    $field_storage->save();
-
-    $field = FieldConfig::create([
-      'field_name' => 'test_field',
-      'entity_type' => 'node',
-      'bundle' => 'article',
-      'label' => 'Test field',
-    ]);
-    $field->save();
-
-    // Create a reference field with the same name on user.
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => 'test_field',
-      'entity_type' => 'user',
-      'type' => 'entity_reference',
-    ]);
-    $field_storage->save();
-
-    $field = FieldConfig::create([
-      'field_name' => 'test_field',
-      'entity_type' => 'user',
-      'bundle' => 'user',
-      'label' => 'Test field',
-    ]);
-    $field->save();
-
-    $this->testFormat = FilterFormat::create([
-      'format' => 'test',
-      'weight' => 1,
-      'filters' => [
-        'filter_html_escape' => ['status' => TRUE],
-      ],
-    ]);
-    $this->testFormat->save();
-
-    // Create a multi-value list_string field.
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => 'test_list',
-      'entity_type' => 'node',
-      'type' => 'list_string',
-      'cardinality' => 2,
-      'settings' => [
-        'allowed_values' => [
-          'key1' => 'value1',
-          'key2' => 'value2',
-        ]
-      ],
-    ]);
-    $field_storage->save();
-
-    $this->field = FieldConfig::create([
-      'field_name' => 'test_list',
-      'entity_type' => 'node',
-      'bundle' => 'article',
-    ])->save();
-
-    // Add an untranslatable node reference field.
-    FieldStorageConfig::create([
-      'field_name' => 'test_reference',
-      'type' => 'entity_reference',
-      'entity_type' => 'node',
-      'settings' => [
-        'target_type' => 'node',
-      ],
-      'translatable' => FALSE,
-    ])->save();
-    FieldConfig::create([
-      'field_name' => 'test_reference',
-      'entity_type' => 'node',
-      'bundle' => 'article',
-      'label' => 'Test reference',
-    ])->save();
-
-    // Add an untranslatable taxonomy term reference field.
-    $this->vocabulary = $this->createVocabulary();
-
-    FieldStorageConfig::create([
-      'field_name' => 'test_term_reference',
-      'type' => 'entity_reference',
-      'entity_type' => 'node',
-      'settings' => [
-        'target_type' => 'taxonomy_term',
-      ],
-      'translatable' => FALSE,
-    ])->save();
-    FieldConfig::create([
-      'field_name' => 'test_term_reference',
-      'entity_type' => 'node',
-      'bundle' => 'article',
-      'label' => 'Test term reference',
-      'settings' => [
-        'handler' => 'default:taxonomy_term',
-        'handler_settings' => [
-          'target_bundles' => [
-            $this->vocabulary->id() => $this->vocabulary->id(),
-          ],
-        ],
-      ],
-    ])->save();
-
-    // Add a field to terms of the created vocabulary.
-    $storage = FieldStorageConfig::create([
-      'field_name' => 'term_field',
-      'entity_type' => 'taxonomy_term',
-      'type' => 'text',
-    ]);
-    $storage->save();
-    $field = FieldConfig::create([
-      'field_name' => 'term_field',
-      'entity_type' => 'taxonomy_term',
-      'bundle' => $this->vocabulary->id(),
-    ]);
-    $field->save();
-
-    // Add a second language.
-    $language = ConfigurableLanguage::create([
-      'id' => 'de',
-      'label' => 'German',
-    ]);
-    $language->save();
-
-    // Add a datetime field.
-    $field_datetime_storage = FieldStorageConfig::create(array(
-        'field_name' => 'field_datetime',
-        'type' => 'datetime',
-        'entity_type' => 'node',
-        'settings' => array('datetime_type' => DateTimeItem::DATETIME_TYPE_DATETIME),
-    ));
-    $field_datetime_storage->save();
-    $field_datetime = FieldConfig::create([
-        'field_storage' => $field_datetime_storage,
-        'bundle' => 'article',
-    ]);
-    $field_datetime->save();
-
-    // Add a daterange field.
-    $field_daterange_storage = FieldStorageConfig::create(array(
-        'field_name' => 'field_daterange',
-        'type' => 'daterange',
-        'entity_type' => 'node',
-        'settings' => array('datetime_type' => DateRangeItem::DATETIME_TYPE_DATETIME),
-    ));
-    $field_daterange_storage->save();
-    $field_daterange = FieldConfig::create([
-        'field_storage' => $field_daterange_storage,
-        'bundle' => 'article',
-    ]);
-    $field_daterange->save();
-  }
-
-  /**
-   * Tests [entity:field_name] tokens.
-   */
-  public function testEntityFieldTokens() {
-    // Create a node with a value in its fields and test its tokens.
-    $entity = Node::create([
-      'title' => 'Test node title',
-      'type' => 'article',
-      'test_field' => [
-        'value' => 'foo',
-        'format' => $this->testFormat->id(),
-      ],
-      'test_list' => [
-        'value1',
-        'value2',
-      ],
-    ]);
-    $entity->save();
-    $this->assertTokens('node', ['node' => $entity], [
-      'test_field' => Markup::create('foo'),
-      'test_field:0' => Markup::create('foo'),
-      'test_field:0:value' => 'foo',
-      'test_field:value' => 'foo',
-      'test_field:0:format' => $this->testFormat->id(),
-      'test_field:format' => $this->testFormat->id(),
-      'test_list:0' => Markup::create('value1'),
-      'test_list:1' => Markup::create('value2'),
-      'test_list:0:value' => Markup::create('value1'),
-      'test_list:value' => Markup::create('value1'),
-      'test_list:1:value' => Markup::create('value2'),
-    ]);
-
-    // Verify that no third token was generated for the list_string field.
-    $this->assertNoTokens('node', ['node' => $entity], [
-      'test_list:2',
-      'test_list:2:value',
-    ]);
-
-    // Test the test_list token metadata.
-    $tokenService = \Drupal::service('token');
-    $token_info = $tokenService->getTokenInfo('node', 'test_list');
-    $this->assertEqual($token_info['name'], 'test_list');
-    $this->assertEqual($token_info['module'], 'token');
-    $this->assertEqual($token_info['type'], 'list<node-test_list>');
-    $typeInfo = $tokenService->getTypeInfo('list<node-test_list>');
-    $this->assertEqual($typeInfo['name'], 'List of test_list values');
-    $this->assertEqual($typeInfo['type'], 'list<node-test_list>');
-
-    // Create a node type that does not have test_field field.
-    $node_type = NodeType::create([
-      'type' => 'page',
-    ]);
-    $node_type->save();
-
-    $node_without_test_field = Node::create([
-      'title' => 'Node without test_field',
-      'type' => 'page',
-    ]);
-    $node_without_test_field->save();
-
-    // Ensure that trying to generate tokens for a non-existing field does not
-    // throw an exception.
-    $this->assertNoTokens('node', ['node' => $node_without_test_field], ['test_field']);
-
-    // Create a node without a value in the text field and test its token.
-    $entity = Node::create([
-      'title' => 'Test node title',
-      'type' => 'article',
-    ]);
-    $entity->save();
-
-    $this->assertNoTokens('node', ['node' => $entity], [
-      'test_field',
-    ]);
-  }
-
-  /**
-   * Tests the token metadata for a field token.
-   */
-  public function testFieldTokenInfo() {
-    /** @var \Drupal\token\Token $tokenService */
-    $tokenService = \Drupal::service('token');
-
-    // Test the token info of the text field of the artcle content type.
-    $token_info = $tokenService->getTokenInfo('node', 'test_field');
-    $this->assertEqual($token_info['name'], 'Test field', 'The token info name is correct.');
-    $this->assertEqual($token_info['description'], 'Text (formatted) field.', 'The token info description is correct.');
-    $this->assertEqual($token_info['module'], 'token', 'The token info module is correct.');
-
-    // Now create two more content types that share the field but the last
-    // of them sets a different label. This should show an alternative label
-    // at the token info.
-    $node_type = NodeType::create([
-      'type' => 'article2',
-    ]);
-    $node_type->save();
-    $field = FieldConfig::create([
-      'field_name' => 'test_field',
-      'entity_type' => 'node',
-      'bundle' => 'article2',
-      'label' => 'Test field',
-    ]);
-    $field->save();
-
-    $node_type = NodeType::create([
-      'type' => 'article3',
-    ]);
-    $node_type->save();
-    $field = FieldConfig::create([
-      'field_name' => 'test_field',
-      'entity_type' => 'node',
-      'bundle' => 'article3',
-      'label' => 'Different test field',
-    ]);
-    $field->save();
-
-    $token_info = $tokenService->getTokenInfo('node', 'test_field');
-    $this->assertEqual($token_info['name'], 'Test field', 'The token info name is correct.');
-    $this->assertEqual((string) $token_info['description'], 'Text (formatted) field. Also known as <em class="placeholder">Different test field</em>.', 'When a field is used in several bundles with different labels, this is noted at the token info description.');
-    $this->assertEqual($token_info['module'], 'token', 'The token info module is correct.');
-    $this->assertEqual($token_info['type'], 'node-test_field', 'The field property token info type is correct.');
-
-    // Test field property token info.
-    $token_info = $tokenService->getTokenInfo('node-test_field', 'value');
-    $this->assertEqual($token_info['name'], 'Text', 'The field property token info name is correct.');
-    // This particular field property description happens to be empty.
-    $this->assertEqual((string) $token_info['description'], '', 'The field property token info description is correct.');
-    $this->assertEqual($token_info['module'], 'token', 'The field property token info module is correct.');
-  }
-
-  /**
-   * Test tokens on node with the token view mode overriding default formatters.
-   */
-  public function testTokenViewMode() {
-    $value = 'A really long string that should be trimmed by the special formatter on token view we are going to have.';
-
-    // The formatter we are going to use will eventually call Unicode::strlen.
-    // This expects that the Unicode has already been explicitly checked, which
-    // happens in DrupalKernel. But since that doesn't run in kernel tests, we
-    // explicitly call this here.
-    Unicode::check();
-
-    // Create a node with a value in the text field and test its token.
-    $entity = Node::create([
-      'title' => 'Test node title',
-      'type' => 'article',
-      'test_field' => [
-        'value' => $value,
-        'format' => $this->testFormat->id(),
-      ],
-    ]);
-    $entity->save();
-
-    $this->assertTokens('node', ['node' => $entity], [
-      'test_field' => Markup::create($value),
-    ]);
-
-    // Now, create a token view mode which sets a different format for
-    // test_field. When replacing tokens, this formatter should be picked over
-    // the default formatter for the field type.
-    // @see field_tokens().
-    $view_mode = EntityViewMode::create([
-      'id' => 'node.token',
-      'targetEntityType' => 'node',
-    ]);
-    $view_mode->save();
-    $entity_display = entity_get_display('node', 'article', 'token');
-    $entity_display->setComponent('test_field', [
-      'type' => 'text_trimmed',
-      'settings' => [
-        'trim_length' => 50,
-      ]
-    ]);
-    $entity_display->save();
-
-    $this->assertTokens('node', ['node' => $entity], [
-      'test_field' => Markup::create(substr($value, 0, 50)),
-    ]);
-  }
-
-  /**
-   * Test that tokens are properly created for an entity's base fields.
-   */
-  public function testBaseFieldTokens() {
-    // Create a new contact_message entity and verify that tokens are generated
-    // for its base fields. The contact_message entity type is used because it
-    // provides no tokens by default.
-    $contact_form = ContactForm::create([
-      'id' => 'form_id',
-    ]);
-    $contact_form->save();
-
-    $entity = Message::create([
-      'contact_form' => 'form_id',
-      'uuid' => '123',
-      'langcode' => 'en',
-      'name' => 'Test name',
-      'mail' => 'Test mail',
-      'subject' => 'Test subject',
-      'message' => 'Test message',
-      'copy' => FALSE,
-    ]);
-    $entity->save();
-    $this->assertTokens('contact_message', ['contact_message' => $entity], [
-      'uuid' => Markup::create('123'),
-      'langcode' => Markup::create('English'),
-      'name' => Markup::create('Test name'),
-      'mail' => Markup::create('Test mail'),
-      'subject' => Markup::create('Test subject'),
-      'message' => Markup::create('Test message'),
-      'copy' => 'Off',
-    ]);
-
-    // Test the metadata of one of the tokens.
-    $tokenService = \Drupal::service('token');
-    $token_info = $tokenService->getTokenInfo('contact_message', 'subject');
-    $this->assertEquals($token_info['name'], 'Subject');
-    $this->assertEquals($token_info['description'], 'Text (plain) field.');
-    $this->assertEquals($token_info['module'], 'token');
-
-    // Verify that node entity type doesn't have a uid token.
-    $this->assertNull($tokenService->getTokenInfo('node', 'uid'));
-  }
-
-  /*
-   * Tests chaining entity reference tokens.
-   */
-  public function testEntityReferenceTokens() {
-    $reference = Node::create([
-      'title' => 'Test node to reference',
-      'type' => 'article',
-      'test_field' => [
-        'value' => 'foo',
-        'format' => $this->testFormat->id(),
-      ]
-    ]);
-    $reference->save();
-    $term_reference_field_value = $this->randomString();
-    $term_reference = $this->createTerm($this->vocabulary, [
-      'name' => 'Term to reference',
-      'term_field' => [
-        'value' => $term_reference_field_value,
-        'format' => $this->testFormat->id(),
-      ],
-    ]);
-    $entity = Node::create([
-      'title' => 'Test entity reference',
-      'type' => 'article',
-      'test_reference' => ['target_id' => $reference->id()],
-      'test_term_reference' => ['target_id' => $term_reference->id()],
-    ]);
-    $entity->save();
-
-    $this->assertTokens('node', ['node' => $entity], [
-      'test_reference:entity:title' => Markup::create('Test node to reference'),
-      'test_reference:entity:test_field' => Markup::create('foo'),
-      'test_term_reference:entity:term_field' => Html::escape($term_reference_field_value),
-      'test_reference:target_id' => $reference->id(),
-      'test_term_reference:target_id' => $term_reference->id(),
-      'test_term_reference:entity:url:path' => '/' . $term_reference->toUrl('canonical')->getInternalPath(),
-      // Expects the entity's label to be returned for :entity tokens.
-      'test_reference:entity' => $reference->label(),
-      'test_term_reference:entity' => $term_reference->label(),
-    ]);
-
-    // Test some non existent tokens.
-    $this->assertNoTokens('node', ['node' => $entity], [
-      'test_reference:1:title',
-      'test_reference:entity:does_not_exist',
-      'test_reference:does_not:exist',
-      'test_term_reference:does_not_exist',
-      'test_term_reference:does:not:exist',
-      'test_term_reference:does_not_exist:0',
-      'non_existing_field:entity:title',
-    ]);
-
-    /** @var \Drupal\token\Token $token_service */
-    $token_service = \Drupal::service('token');
-
-    $token_info = $token_service->getTokenInfo('node', 'test_reference');
-    $this->assertEquals('Test reference', $token_info['name']);
-    $this->assertEquals('Entity reference field.', (string) $token_info['description']);
-    $this->assertEquals('token', $token_info['module']);
-    $this->assertEquals('node-test_reference', $token_info['type']);
-
-    // Test target_id field property token info.
-    $token_info = $token_service->getTokenInfo('node-test_reference', 'target_id');
-    $this->assertEquals('Content ID', $token_info['name']);
-    $this->assertEquals('token', $token_info['module']);
-    $this->assertEquals('token', $token_info['module']);
-
-    // Test entity field property token info.
-    $token_info = $token_service->getTokenInfo('node-test_reference', 'entity');
-    $this->assertEquals('Content', $token_info['name']);
-    $this->assertEquals('The referenced entity', $token_info['description']);
-    $this->assertEquals('token', $token_info['module']);
-    $this->assertEquals('node', $token_info['type']);
-
-    // Test entity field property token info of the term reference.
-    $token_info = $token_service->getTokenInfo('node-test_term_reference', 'entity');
-    $this->assertEquals('Taxonomy term', $token_info['name']);
-    $this->assertEquals('The referenced entity', $token_info['description']);
-    $this->assertEquals('token', $token_info['module']);
-    $this->assertEquals('term', $token_info['type']);
-
-  }
-
-  /**
-   * Tests support for cardinality > 1 for entity reference tokens.
-   */
-  public function testEntityReferenceTokensCardinality() {
-    /** @var \Drupal\field\FieldStorageConfigInterface $storage */
-    $storage = FieldStorageConfig::load('node.test_term_reference');
-    $storage->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
-    $storage->save();
-
-    // Add a few terms.
-    $terms = [];
-    $terms_value = [];
-    foreach (range(1, 3) as $i) {
-      $terms_value[$i] = $this->randomString();
-      $terms[$i] = $this->createTerm($this->vocabulary, [
-        'name' => $this->randomString(),
-        'term_field' => [
-          'value' => $terms_value[$i],
-          'format' => $this->testFormat->id(),
-        ],
-      ]);
-    }
-
-    $entity = Node::create([
-      'title' => 'Test multivalue chained tokens',
-      'type' => 'article',
-      'test_term_reference' => [
-        ['target_id' => $terms[1]->id()],
-        ['target_id' => $terms[2]->id()],
-        ['target_id' => $terms[3]->id()],
-      ],
-    ]);
-    $entity->save();
-
-    $this->assertTokens('node', ['node' => $entity], [
-      'test_term_reference:0:entity:term_field' => Html::escape($terms[1]->term_field->value),
-      'test_term_reference:1:entity:term_field' => Html::escape($terms[2]->term_field->value),
-      'test_term_reference:2:entity:term_field' => Html::escape($terms[3]->term_field->value),
-      'test_term_reference:0:target_id' => $terms[1]->id(),
-      'test_term_reference:1:target_id' => $terms[2]->id(),
-      'test_term_reference:2:target_id' => $terms[3]->id(),
-      // Expects the entity's label to be returned for :entity tokens.
-      'test_term_reference:0:entity' => $terms[1]->label(),
-      'test_term_reference:1:entity' => $terms[2]->label(),
-      'test_term_reference:2:entity' => $terms[3]->label(),
-      // To make sure tokens without an explicit delta can also be replaced in
-      // the same token replacement call.
-      'test_term_reference:entity:term_field' => Html::escape($terms[1]->term_field->value),
-      'test_term_reference:target_id' => $terms[1]->id(),
-    ]);
-
-    // Test some non existent tokens.
-    $this->assertNoTokens('node', ['node' => $entity], [
-      'test_term_reference:3:term_field',
-      'test_term_reference:0:does_not_exist',
-      'test_term_reference:1:does:not:exist',
-      'test_term_reference:1:2:does_not_exist',
-    ]);
-  }
-
-  /**
-   * Test tokens for multilingual fields and entities.
-   */
-  public function testMultilingualFields() {
-    // Create an english term and add a german translation for it.
-    $term = $this->createTerm($this->vocabulary, [
-      'name' => 'english-test-term',
-      'langcode' => 'en',
-      'term_field' => [
-        'value' => 'english-term-field-value',
-        'format' => $this->testFormat->id(),
-      ],
-    ]);
-    $term->addTranslation('de', [
-      'name' => 'german-test-term',
-      'term_field' => [
-        'value' => 'german-term-field-value',
-        'format' => $this->testFormat->id(),
-      ],
-    ])->save();
-    $german_term = $term->getTranslation('de');
-
-    // Create an english node, add a german translation for it and add the
-    // english term to the english node's entity reference field and the
-    // german term to the german's entity reference field.
-    $node = Node::create([
-      'title' => 'english-node-title',
-      'type' => 'article',
-      'test_term_reference' => [
-        'target_id' => $term->id(),
-      ],
-      'test_field' => [
-        'value' => 'test-english-field',
-        'format' => $this->testFormat->id(),
-      ],
-    ]);
-    $node->addTranslation('de', [
-      'title' => 'german-node-title',
-      'test_term_reference' => [
-        'target_id' => $german_term->id(),
-      ],
-      'test_field' => [
-        'value' => 'test-german-field',
-        'format' => $this->testFormat->id(),
-      ],
-    ])->save();
-
-    // Verify the :title token of the english node and the :name token of the
-    // english term it refers to. Also verify the value of the term's field.
-    $this->assertTokens('node', ['node' => $node], [
-      'title' => 'english-node-title',
-      'test_term_reference:entity:name' => 'english-test-term',
-      'test_term_reference:entity:term_field:value' => 'english-term-field-value',
-      'test_term_reference:entity:term_field' => 'english-term-field-value',
-      'test_field' => 'test-english-field',
-      'test_field:value' => 'test-english-field',
-    ]);
-
-    // Same test for the german node and its german term.
-    $german_node = $node->getTranslation('de');
-    $this->assertTokens('node', ['node' => $german_node], [
-      'title' => 'german-node-title',
-      'test_term_reference:entity:name' => 'german-test-term',
-      'test_term_reference:entity:term_field:value' => 'german-term-field-value',
-      'test_term_reference:entity:term_field' => 'german-term-field-value',
-      'test_field' => 'test-german-field',
-      'test_field:value' => 'test-german-field',
-    ]);
-
-    // If the langcode is specified, it should have priority over the node's
-    // active language.
-    $tokens = [
-      'test_field' => 'test-german-field',
-      'test_field:value' => 'test-german-field',
-      'test_term_reference:entity:term_field' => 'german-term-field-value',
-      'test_term_reference:entity:term_field:value' => 'german-term-field-value',
-    ];
-    $this->assertTokens('node', ['node' => $node], $tokens, ['langcode' => 'de']);
-  }
-
-  /**
-   * Tests support for a datetime fields.
-   */
-  public function testDatetimeFieldTokens() {
-
-    $node = Node::create([
-      'title' => 'Node for datetime field',
-      'type' => 'article',
-    ]);
-
-    $node->set('field_datetime', '1925-09-28T00:00:00')->save();
-    $this->assertTokens('node', ['node' => $node], [
-      'field_datetime:date:custom:Y' => '1925',
-      'field_datetime:date:html_month' => '1925-09',
-      'field_datetime:date' => $node->field_datetime->date->getTimestamp(),
-    ]);
-  }
-
-  /**
-   * Tests support for a daterange fields.
-   */
-  public function testDatetimeRangeFieldTokens() {
-
-    $node = Node::create([
-        'title' => 'Node for daterange field',
-        'type' => 'article',
-    ]);
-
-    $node->field_daterange->value = '2013-12-22T00:00:00';
-    $node->field_daterange->end_value = '2016-08-26T00:00:00';
-    $node->save();
-    $this->assertTokens('node', ['node' => $node], [
-      'field_daterange:start_date:html_month' => '2013-12',
-      'field_daterange:start_date:custom:Y' => '2013',
-      'field_daterange:end_date:custom:Y' => '2016',
-      'field_daterange:start_date' => $node->field_daterange->start_date->getTimestamp(),
-    ]);
-  }
-
-}
diff --git a/modules/token/tests/src/Kernel/FileTest.php b/modules/token/tests/src/Kernel/FileTest.php
deleted file mode 100644
index 3a6a7fd..0000000
--- a/modules/token/tests/src/Kernel/FileTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-/**
- * Tests file tokens.
- *
- * @group token
- */
-class FileTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('file');
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('file');
-  }
-
-  function testFileTokens() {
-    // Create a test file object.
-    $file = entity_create('file', array(
-      'fid' => 1,
-      'filename' => 'test.png',
-      'filesize' => 100,
-      'uri' => 'public://images/test.png',
-      'filemime' => 'image/png',
-    ));
-
-    $tokens = array(
-      'basename' => 'test.png',
-      'extension' => 'png',
-      'size-raw' => 100,
-    );
-    $this->assertTokens('file', array('file' => $file), $tokens);
-
-    // Test a file with no extension and a fake name.
-    $file->filename = 'Test PNG image';
-    $file->uri = 'public://images/test';
-
-    $tokens = array(
-      'basename' => 'test',
-      'extension' => '',
-      'size-raw' => 100,
-    );
-    $this->assertTokens('file', array('file' => $file), $tokens);
-  }
-}
diff --git a/modules/token/tests/src/Kernel/KernelTestBase.php b/modules/token/tests/src/Kernel/KernelTestBase.php
deleted file mode 100644
index a9657f6..0000000
--- a/modules/token/tests/src/Kernel/KernelTestBase.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-use Drupal\KernelTests\KernelTestBase as BaseKernelTestBase;
-use Drupal\token\Tests\TokenTestTrait;
-
-/**
- * Helper test class with some added functions for testing.
- */
-abstract class KernelTestBase extends BaseKernelTestBase {
-
-  use TokenTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['path', 'token', 'token_module_test', 'system', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', ['router', 'url_alias']);
-    \Drupal::service('router.builder')->rebuild();
-    $this->installConfig(['system']);
-  }
-
-}
diff --git a/modules/token/tests/src/Kernel/NodeTest.php b/modules/token/tests/src/Kernel/NodeTest.php
deleted file mode 100644
index e44b9ab..0000000
--- a/modules/token/tests/src/Kernel/NodeTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
-use Drupal\Core\Url;
-
-/**
- * Test the node and content type tokens.
- *
- * @group token
- */
-class NodeTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node', 'field', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-
-    $node_type = NodeType::create([
-      'type' => 'page',
-      'name' => 'Basic page',
-      'description' => "Use <em>basic pages</em> for your static content, such as an 'About us' page.",
-    ]);
-    $node_type->save();
-    $node_type = NodeType::create([
-      'type' => 'article',
-      'name' => 'Article',
-      'description' => "Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.",
-    ]);
-    $node_type->save();
-  }
-
-  function testNodeTokens() {
-    $page = Node::create([
-      'type' => 'page',
-      'title' => 'Source Title',
-      'revision_log' => $this->randomMachineName(),
-      'path' => array('alias' => '/content/source-node')
-    ]);
-    $page->save();
-    $tokens = array(
-      'log' => $page->revision_log->value,
-      'url:path' => '/content/source-node',
-      'url:absolute' => Url::fromRoute('entity.node.canonical', ['node' => $page->id()], array('absolute' => TRUE))->toString(),
-      'url:relative' => Url::fromRoute('entity.node.canonical', ['node' => $page->id()], array('absolute' => FALSE))->toString(),
-      'url:unaliased:path' => "/node/{$page->id()}",
-      'content-type' => 'Basic page',
-      'content-type:name' => 'Basic page',
-      'content-type:machine-name' => 'page',
-      'content-type:description' => "Use <em>basic pages</em> for your static content, such as an 'About us' page.",
-      'content-type:node-count' => 1,
-      'content-type:edit-url' => Url::fromRoute('entity.node_type.edit_form', ['node_type' => 'page'], array('absolute' => TRUE))->toString(),
-      'source:title' => 'Source Title',
-      // Deprecated tokens.
-      'type' => 'page',
-      'type-name' => 'Basic page',
-      'url:alias' => '/content/source-node',
-    );
-    $this->assertTokens('node', array('node' => $page), $tokens);
-
-    $article = Node::create([
-      'type' => 'article',
-      'title' => 'Source Title',
-    ]);
-    $article->save();
-    $tokens = array(
-      'log' => '',
-      'url:path' => "/node/{$article->id()}",
-      'url:absolute' => Url::fromRoute('entity.node.canonical', ['node' => $article->id()], array('absolute' => TRUE))->toString(),
-      'url:relative' => Url::fromRoute('entity.node.canonical', ['node' => $article->id()], array('absolute' => FALSE))->toString(),
-      'url:unaliased:path' => "/node/{$article->id()}",
-      'content-type' => 'Article',
-      'content-type:name' => 'Article',
-      'content-type:machine-name' => 'article',
-      'content-type:description' => "Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.",
-      'content-type:node-count' => 1,
-      'content-type:edit-url' => Url::fromRoute('entity.node_type.edit_form', ['node_type' => 'article'], array('absolute' => TRUE))->toString(),
-      'source:title' => 'Source Title',
-      // Deprecated tokens.
-      'type' => 'article',
-      'type-name' => 'Article',
-      'url:alias' => "/node/{$article->id()}",
-    );
-    $this->assertTokens('node', array('node' => $article), $tokens);
-  }
-}
diff --git a/modules/token/tests/src/Kernel/RandomTest.php b/modules/token/tests/src/Kernel/RandomTest.php
deleted file mode 100644
index a4b0930..0000000
--- a/modules/token/tests/src/Kernel/RandomTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-/**
- * Tests random tokens.
- *
- * @group token
- */
-class RandomTest extends KernelTestBase {
-
-  function testRandomTokens() {
-    $tokens = array(
-      'number' => '[0-9]{1,}',
-      'hash:md5' => '[0-9a-f]{32}',
-      'hash:sha1' => '[0-9a-f]{40}',
-      'hash:sha256' => '[0-9a-f]{64}',
-      'hash:invalid-algo' => NULL,
-    );
-
-    $first_set = $this->assertTokens('random', array(), $tokens, array('regex' => TRUE));
-    $second_set = $this->assertTokens('random', array(), $tokens, array('regex' => TRUE));
-    foreach ($first_set as $token => $value) {
-      $this->assertNotIdentical($first_set[$token], $second_set[$token]);
-    }
-  }
-}
diff --git a/modules/token/tests/src/Kernel/TaxonomyTest.php b/modules/token/tests/src/Kernel/TaxonomyTest.php
deleted file mode 100644
index 73274df..0000000
--- a/modules/token/tests/src/Kernel/TaxonomyTest.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\Core\Url;
-
-/**
- * Tests taxonomy tokens.
- *
- * @group token
- */
-class TaxonomyTest extends KernelTestBase {
-  protected $vocab;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('taxonomy', 'text', 'language');
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('taxonomy_term');
-
-    // Create the default tags vocabulary.
-    $vocabulary = Vocabulary::create([
-      'name' => 'Tags',
-      'vid' => 'tags',
-    ]);
-    $vocabulary->save();
-    $this->vocab = $vocabulary;
-  }
-
-  /**
-   * Test the additional taxonomy term tokens.
-   */
-  function testTaxonomyTokens() {
-    $root_term = $this->addTerm($this->vocab, array('name' => 'Root term', 'path' => array('alias' => '/root-term')));
-    $tokens = array(
-      'url' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $root_term->id()], array('absolute' => TRUE))->toString(),
-      'url:absolute' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $root_term->id()], array('absolute' => TRUE))->toString(),
-      'url:relative' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $root_term->id()], array('absolute' => FALSE))->toString(),
-      'url:path' => '/root-term',
-      'url:unaliased:path' => "/taxonomy/term/{$root_term->id()}",
-      'edit-url' => Url::fromRoute('entity.taxonomy_term.edit_form', ['taxonomy_term' => $root_term->id()], array('absolute' => TRUE))->toString(),
-      'parents' => NULL,
-      'parents:count' => NULL,
-      'parents:keys' => NULL,
-      'root' => NULL,
-      // Deprecated tokens
-      'url:alias' => '/root-term',
-    );
-    $this->assertTokens('term', array('term' => $root_term), $tokens);
-
-    $parent_term = $this->addTerm($this->vocab, array('name' => 'Parent term', 'parent' => $root_term->id()));
-    $tokens = array(
-      'url' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $parent_term->id()], array('absolute' => TRUE))->toString(),
-      'url:absolute' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $parent_term->id()], array('absolute' => TRUE))->toString(),
-      'url:relative' => Url::fromRoute('entity.taxonomy_term.canonical', ['taxonomy_term' => $parent_term->id()], array('absolute' => FALSE))->toString(),
-      'url:path' => "/taxonomy/term/{$parent_term->id()}",
-      'url:unaliased:path' => "/taxonomy/term/{$parent_term->id()}",
-      'edit-url' => Url::fromRoute('entity.taxonomy_term.edit_form', ['taxonomy_term' => $parent_term->id()], array('absolute' => TRUE))->toString(),
-      'parents' => 'Root term',
-      'parents:count' => 1,
-      'parents:keys' => $root_term->id(),
-      'root' => $root_term->label(),
-      'root:tid' => $root_term->id(),
-      // Deprecated tokens
-      'url:alias' => "/taxonomy/term/{$parent_term->id()}",
-    );
-    $this->assertTokens('term', array('term' => $parent_term), $tokens);
-
-    $term = $this->addTerm($this->vocab, array('name' => 'Test term', 'parent' => $parent_term->id()));
-    $tokens = array(
-      'parents' => 'Root term, Parent term',
-      'parents:count' => 2,
-      'parents:keys' => implode(', ', array($root_term->id(), $parent_term->id())),
-    );
-    $this->assertTokens('term', array('term' => $term), $tokens);
-  }
-
-  /**
-   * Test the additional vocabulary tokens.
-   */
-  function testVocabularyTokens() {
-    $vocabulary = $this->vocab;
-    $tokens = array(
-      'machine-name' => 'tags',
-      'edit-url' => Url::fromRoute('entity.taxonomy_vocabulary.edit_form', ['taxonomy_vocabulary' => $vocabulary->id()], array('absolute' => TRUE))->toString(),
-    );
-    $this->assertTokens('vocabulary', array('vocabulary' => $vocabulary), $tokens);
-  }
-
-  function addVocabulary(array $vocabulary = array()) {
-    $vocabulary += array(
-      'name' => Unicode::strtolower($this->randomMachineName(5)),
-      'nodes' => array('article' => 'article'),
-    );
-    $vocabulary = entity_create('taxonomy_vocabulary', $vocabulary)->save();
-    return $vocabulary;
-  }
-
-  function addTerm($vocabulary, array $term = array()) {
-    $term += array(
-      'name' => Unicode::strtolower($this->randomMachineName(5)),
-      'vid' => $vocabulary->id(),
-    );
-    $term = entity_create('taxonomy_term', $term);
-    $term->save();
-    return $term;
-  }
-
-  /**
-   * Test the multilingual terms.
-   */
-  function testMultilingualTerms() {
-    // Add a second language.
-    $language = ConfigurableLanguage::createFromLangcode('de');
-    $language->save();
-
-    // Create an english parent term and add a german translation for it.
-    $parent_term = $this->addTerm($this->vocab, [
-      'name' => 'english-parent-term',
-      'langcode' => 'en',
-    ]);
-    $parent_term->addTranslation('de', [
-      'name' => 'german-parent-term',
-    ])->save();
-
-    // Create a term related to the parent term.
-    $child_term = $this->addTerm($this->vocab, [
-      'name' => 'english-child-term',
-      'langcode' => 'en',
-      'parent' => $parent_term->id(),
-    ]);
-    $child_term->addTranslation('de', [
-      'name' => 'german-child-term',
-    ])->save();
-
-    // Expect the parent term to be in the specified language.
-    $this->assertTokens('term', array('term' => $child_term), ['parents' => 'german-parent-term'], ['langcode' => 'de']);
-  }
-}
diff --git a/modules/token/tests/src/Kernel/UnitTest.php b/modules/token/tests/src/Kernel/UnitTest.php
deleted file mode 100644
index c91f194..0000000
--- a/modules/token/tests/src/Kernel/UnitTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-namespace Drupal\Tests\token\Kernel;
-
-/**
- * Test basic, low-level token functions.
- *
- * @group token
- */
-class UnitTest extends KernelTestBase {
-
-  /**
-   * @var \Drupal\token\Token
-   */
-  protected $tokenService;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['file', 'node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->tokenService = \Drupal::token();
-  }
-
-  /**
-   * Test invalid tokens.
-   */
-  public function testGetInvalidTokens() {
-    $tests = array();
-    $tests[] = array(
-      'valid tokens' => array(
-        '[node:title]',
-        '[node:created:short]',
-        '[node:created:custom:invalid]',
-        '[node:created:custom:mm-YYYY]',
-        '[node:colons:in:name]',
-        '[site:name]',
-        '[site:slogan]',
-        '[current-date:short]',
-        '[current-user:uid]',
-        '[current-user:ip-address]',
-      ),
-      'invalid tokens' => array(
-        '[node:title:invalid]',
-        '[node:created:invalid]',
-        '[node:created:short:invalid]',
-        '[node:colons:in:name:invalid]',
-        '[invalid:title]',
-        '[site:invalid]',
-        '[user:ip-address]',
-        '[user:uid]',
-        '[comment:cid]',
-        // Deprecated tokens
-        '[node:tnid]',
-        '[node:type]',
-        '[node:type-name]',
-        '[date:short]',
-      ),
-      'types' => array('node'),
-    );
-    $tests[] = array(
-      'valid tokens' => array(
-        '[node:title]',
-        '[node:created:short]',
-        '[node:created:custom:invalid]',
-        '[node:created:custom:mm-YYYY]',
-        '[node:colons:in:name]',
-        '[site:name]',
-        '[site:slogan]',
-        '[user:uid]',
-        '[current-date:short]',
-        '[current-user:uid]',
-      ),
-      'invalid tokens' => array(
-        '[node:title:invalid]',
-        '[node:created:invalid]',
-        '[node:created:short:invalid]',
-        '[node:colons:in:name:invalid]',
-        '[invalid:title]',
-        '[site:invalid]',
-        '[user:ip-address]',
-        '[comment:cid]',
-        // Deprecated tokens
-        '[node:tnid]',
-        '[node:type]',
-        '[node:type-name]',
-      ),
-      'types' => array('all'),
-    );
-
-    foreach ($tests as $test) {
-      $tokens = array_merge($test['valid tokens'], $test['invalid tokens']);
-      shuffle($tokens);
-
-      $invalid_tokens = $this->tokenService->getInvalidTokensByContext(implode(' ', $tokens), $test['types']);
-
-      sort($invalid_tokens);
-      sort($test['invalid tokens']);
-      $this->assertEqual($invalid_tokens, $test['invalid tokens'], 'Invalid tokens detected properly: ' . implode(', ', $invalid_tokens));
-    }
-  }
-
-  /**
-   * Test that tokens are generated only for content entities.
-   */
-  public function testContentEntityOnlyTokens() {
-    // Verify that type and token info for a config entity is not generated.
-    $this->assertNull($this->tokenService->getTokenInfo('user_role', 'original'));
-    $this->assertNull($this->tokenService->getTokenInfo('user_role', 'url'));
-    $this->assertNull($this->tokenService->getTypeInfo('user_role'));
-  }
-}
diff --git a/modules/token/token.drush.inc b/modules/token/token.drush.inc
deleted file mode 100644
index b31b8d7..0000000
--- a/modules/token/token.drush.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * @file
- * Drush integration for the Token module.
- */
-
-/**
- * Implements hook_drush_cache_clear().
- */
-function token_drush_cache_clear(&$types) {
-  $types['token'] = 'drush_token_cache_clear_token_info';
-}
-
-/**
- * Clear caches internal to Token module.
- */
-function drush_token_cache_clear_token_info() {
-  token_clear_cache();
-}
diff --git a/modules/token/token.info.yml b/modules/token/token.info.yml
deleted file mode 100644
index ca8b3c8..0000000
--- a/modules/token/token.info.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-type: module
-name: Token
-description: Provides a user interface for the Token API and some missing core tokens.
-# core: 8.x
-
-# Information added by Drupal.org packaging script on 2017-04-29
-version: '8.x-1.0'
-core: '8.x'
-project: 'token'
-datestamp: 1493466847
diff --git a/modules/token/token.install b/modules/token/token.install
deleted file mode 100644
index 664b1af..0000000
--- a/modules/token/token.install
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, update and uninstall functions for the token module.
- */
-
-/**
- * Implements hook_requirements().
- */
-function token_requirements($phase = 'runtime') {
-  $requirements = array();
-
-  if ($phase == 'runtime') {
-    // Check for various token definition problems.
-    $token_problems = token_get_token_problems();
-    // Format and display each token problem.
-    foreach ($token_problems as $problem_key => $problem) {
-      if (!empty($problem['problems'])) {
-        $problems = array_unique($problem['problems']);
-
-        $build = [
-          '#theme' => 'item_list',
-          '#items' => $problems,
-        ];
-
-        $requirements['token-' . $problem_key] = array(
-          'title' => $problem['label'],
-          'value' => \Drupal::service('renderer')->renderPlain($build),
-          'severity' => $problem['severity'],
-        );
-      }
-    }
-  }
-
-  return $requirements;
-}
-
-/**
- * Implements hook_install().
- */
-function token_install() {
-  // Create a token view mode for each entity type.
-  $info = \Drupal::entityTypeManager()->getDefinitions();
-  foreach ($info as $entity_type => $entity_type_info) {
-    // We're only interested in entity types with a view builder.
-    if (!$entity_type_info->getViewBuilderClass()) {
-      continue;
-    }
-    // Try to find a token view mode for that entity type.
-    $storage = \Drupal::entityTypeManager()->getStorage('entity_view_mode');
-    // Add a token view mode if it does not already exist.
-    if (!$storage->load("$entity_type.token")) {
-      $storage->create(array(
-        'targetEntityType' => $entity_type,
-        'id' => "$entity_type.token",
-        'status' => TRUE,
-        'label' => t('Token'),
-      ))->save();
-    }
-  }
-}
-
-/**
- * Build a list of Drupal 6 tokens and their Drupal 7 token names.
- */
-function _token_upgrade_token_list() {
-  $tokens = array(
-    // Global tokens
-    'user-name' => 'current-user:name',
-    'user-id' => 'current-user:id',
-    'user-mail' => 'current-user:mail',
-    'site-url' => 'site:url',
-    'site-name' => 'site:name',
-    'site-slogan' => 'site:slogan',
-    'site-mission' => 'site:mission',
-    'site-mail' => 'site:mail',
-    'site-date' => 'date:short',
-    //'site-date-' => '', // Date tokens expanded below
-    'current-page-path' => 'current-page:path',
-    'current-page-url' => 'current-page:url',
-    'page-number' => 'current-page:page-number',
-
-    // Comment tokens
-    'comment-cid' => 'comment:cid',
-    'comment-nid' => 'comment:node:nid',
-    'comment-title' => 'comment:title',
-    'comment-body' => 'comment:body',
-    'comment-author-name' => 'comment:author:name',
-    'comment-author-mail' => 'comment:author:mail',
-    //'comment-body-format' => '',
-    //'comment-' => '', // Date tokens expanded below
-    'comment-node-title' => 'comment:node',
-
-    // Node tokens
-    'nid' => 'node:nid',
-    'type' => 'node:type',
-    'type-name' => 'node:type-name',
-    'language' => 'node:language',
-    'title' => 'node:title',
-    'author-uid' => 'node:author:uid',
-    'author-name' => 'node:author:name',
-    'author-mail' => 'node:author:mail',
-    'node_comment_count' => 'node:comment-count',
-    'unread_comment_count' => 'node:comment-count-new',
-    'log' => 'node:log',
-    //'' => '', // Date tokens expanded below
-    //'mod-' => '', // Date tokens expanded below
-    'menupath' => 'node:menu-link:parent:path][node:menu-link',
-    'menu' => 'node:menu-link:menu-name',
-    'menu-link-title' => 'node:menu-link',
-    'menu-link-mlid' => 'node:menu-link:mlid',
-    'menu-link-plid' => 'node:menu-link:parent:mlid',
-    //'term' => 'node:term',
-    //'term-id' => 'node:term:tid',
-    //'vocab' => 'node:term:vocabulary',
-    //'vocab-id' => 'node:term:vocabulary:vid',
-
-    // Book tokens
-    //'book' => 'node:book',
-    //'book_id' => 'node:book:bid',
-    //'bookpath' => 'node:book:path',
-
-    // Taxonomy tokens
-    'tid' => 'term:tid',
-    'cat' => 'term:name',
-    'cat-description' => 'term:description',
-    'vid' => 'term:vocabulary:vid',
-    'vocab' => 'term:vocabulary',
-    'vocab-description' => 'term:vocabulary:description',
-
-    // User tokens
-    'user' => 'user:name',
-    'uid' => 'user:uid',
-    'mail' => 'user:mail',
-    'reg-date' => 'user:created',
-    'reg-since' => 'user:created:since',
-    //'user-created' => '', // Date tokens expanded below
-    'log-date' => 'user:last-login',
-    'log-since' => 'user:last-login:since',
-    //'user-last-login' => '', // Date tokens expanded below
-    //'date-in-tz' => '',
-    'account-url' => 'user:url',
-    'account-edit' => 'user:edit-url',
-  );
-
-  // Account for date tokens which need to be expanded.
-  $tokens += _token_upgrade_token_date_list('site-', 'site:date');
-  $tokens += _token_upgrade_token_date_list('', 'node:created');
-  $tokens += _token_upgrade_token_date_list('mod-', 'node:changed');
-  //$tokens += _token_upgrade_token_date_list('node-revision-', 'node:changed');
-  $tokens += _token_upgrade_token_date_list('comment-', 'comment:created');
-  $tokens += _token_upgrade_token_date_list('user-register-', 'user:created');
-  $tokens += _token_upgrade_token_date_list('user-last-login-', 'user:last-login');
-
-  return $tokens;
-}
-
-/**
- * Build a list of Drupal 6 date tokens and their Drupal 7 token names.
- */
-function _token_upgrade_token_date_list($old_token, $new_token) {
-  $tokens = array();
-  $formats = array(
-    'yyyy' => 'Y',
-    'yy' => 'y',
-    'month' => 'F',
-    'mon' => 'M',
-    'mm' => 'm',
-    'm' => 'n',
-    'ww' => 'W',
-    'date' => 'N',
-    'day' => 'l',
-    'ddd' => 'D',
-    'dd' => 'd',
-    'd' => 'j',
-  );
-  foreach ($formats as $token_format => $date_format) {
-    $tokens[$old_token . $token_format] = "$new_token:custom:$date_format";
-  }
-  $tokens[$old_token . 'raw'] = "$new_token:raw";
-  $tokens[$old_token . 'since'] = "$new_token:since";
-  return $tokens;
-}
-
-/**
- * Update a string containing Drupal 6 style tokens to Drupal 7 style tokens.
- *
- * @param $text
- *   A string containing tokens.
- * @param $updates
- *   An optional array of Drupal 7 tokens keyed by their Drupal 6 token name.
- *   The default tokens will be merged into this array. Note neither the old
- *   or new token names should include the surrounding bracket ([ and ])
- *   characters.
- * @return
- *   A string with the tokens upgraded
- *
- * @see _token_upgrade_token_list()
- */
-function token_update_token_text($text, $updates = array(), $leading = '[', $trailing = ']') {
-  $updates += _token_upgrade_token_list();
-  $regex = '/' . preg_quote($leading, '/') . '([^\s]*)' . preg_quote($trailing, '/') . '/';
-  preg_match_all($regex, $text, $matches);
-
-  foreach ($matches[1] as $index => $old_token) {
-    if (isset($updates[$old_token])) {
-      $new_token = $updates[$old_token];
-      $text = str_replace("{$leading}{$old_token}{$trailing}", "[$new_token]", $text);
-      // Also replace any tokens that have a -raw suffix.
-      $text = str_replace("{$leading}{$old_token}-raw{$trailing}", "[$new_token]", $text);
-    }
-  }
-
-  return $text;
-}
-
-/**
- * Get token problems.
- */
-function token_get_token_problems() {
-  // @todo Improve the duplicate checking to report which modules are the offenders.
-  //$token_info = array();
-  //foreach (module_implements('token_info') as $module) {
-  //  $module_token_info = module_invoke($module, 'token_info');
-  //  if (in_array($module, _token_core_supported_modules())) {
-  //    $module .= '/token';
-  //  }
-  //  if (isset($module_token_info['types'])) {
-  //    if (is_array($module_token_info['types'])) {
-  //      foreach (array_keys($module_token_info['types']) as $type) {
-  //        if (is_array($module_token_info['types'][$type])) {
-  //          $module_token_info['types'][$type] += array('module' => $module);
-  //        }
-  //      }
-  //    }
-  //  }
-  //  if (isset($module_token_info['tokens'])) {
-  //    if (is_array($module_token_info['tokens'])) {
-  //
-  //    }
-  //  }
-  //  if (is_array($module_token_info)) {
-  //    $token_info = array_merge_recursive($token_info, $module_token_info);
-  //  }
-  //}
-
-  $token_info = \Drupal::token()->getInfo();
-  $token_problems = array(
-    'not-array' => array(
-      'label' => t('Tokens or token types not defined as arrays'),
-      'severity' => REQUIREMENT_ERROR,
-    ),
-    'missing-info' => array(
-      'label' => t('Tokens or token types missing name property'),
-      'severity' => REQUIREMENT_WARNING,
-    ),
-    'type-no-tokens' => array(
-      'label' => t('Token types do not have any tokens defined'),
-      'severity' => REQUIREMENT_INFO,
-    ),
-    'tokens-no-type' => array(
-      'label' => t('Token types are not defined but have tokens'),
-      'severity' => REQUIREMENT_INFO,
-    ),
-    'duplicate' => array(
-      'label' => t('Token or token types are defined by multiple modules'),
-      'severity' => REQUIREMENT_ERROR,
-    ),
-  );
-
-  // Check token types for problems.
-  foreach ($token_info['types'] as $type => $type_info) {
-    $real_type = !empty($type_info['type']) ? $type_info['type'] : $type;
-    if (!is_array($type_info)) {
-      $token_problems['not-array']['problems'][] = "\$info['types']['$type']";
-      continue;
-    }
-    elseif (!isset($type_info['name'])) {
-      $token_problems['missing-info']['problems'][] = "\$info['types']['$type']";
-    }
-    elseif (is_array($type_info['name'])) {
-      $token_problems['duplicate']['problems'][] = "\$info['types']['$type']";
-    }
-    elseif (empty($token_info['tokens'][$real_type])) {
-      $token_problems['type-no-tokens']['problems'][] = "\$info['types']['$real_type']";
-    }
-  }
-
-  // Check tokens for problems.
-  foreach ($token_info['tokens'] as $type => $tokens) {
-    if (!is_array($tokens)) {
-      $token_problems['not-array']['problems'][] = "\$info['tokens']['$type']";
-      continue;
-    }
-    else {
-      foreach (array_keys($tokens) as $token) {
-        if (!is_array($tokens[$token])) {
-          $token_problems['not-array']['problems'][] = "\$info['tokens']['$type']['$token']";
-          continue;
-        }
-        elseif (!isset($tokens[$token]['name'])) {
-          $token_problems['missing-info']['problems'][] = "\$info['tokens']['$type']['$token']";
-        }
-        elseif (is_array($tokens[$token]['name'])) {
-          $token_problems['duplicate']['problems'][] = "\$info['tokens']['$type']['$token']";
-        }
-      }
-    }
-    if (!isset($token_info['types'][$type])) {
-      $token_problems['tokens-no-type']['problems'][] = "\$info['types']['$type']";
-    }
-  }
-
-  return $token_problems;
-}
\ No newline at end of file
diff --git a/modules/token/token.libraries.yml b/modules/token/token.libraries.yml
deleted file mode 100644
index 5c7ca14..0000000
--- a/modules/token/token.libraries.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-jquery.treeTable:
-  remote: 'http://plugins.jquery.com/treetable/'
-  version: 3.2.0
-  license:
-    name: MIT
-    url: https://github.com/ludo/jquery-treetable/blob/3.2.0/MIT-LICENSE.txt
-    gpl-compatible: true
-  js:
-    js/jquery.treetable.js: {}
-  css:
-    component:
-      css/jquery.treetable.css: {}
-      css/token.treetable.theme.css: {}
-  dependencies:
-    - core/jquery
-token:
-  version: VERSION
-  js:
-    js/token.js: {}
-  css:
-    component:
-      css/token.css: {}
-  dependencies:
-    - core/jquery
-    - core/drupal
diff --git a/modules/token/token.links.task.yml b/modules/token/token.links.task.yml
deleted file mode 100644
index e89ce16..0000000
--- a/modules/token/token.links.task.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-token.devel_entities:
-  class: \Drupal\Core\Menu\LocalTaskDefault
-  deriver: \Drupal\token\Plugin\Derivative\DevelLocalTask
diff --git a/modules/token/token.module b/modules/token/token.module
deleted file mode 100644
index 32a38da..0000000
--- a/modules/token/token.module
+++ /dev/null
@@ -1,788 +0,0 @@
-<?php
-
-/**
- * @file
- * Enhances the token API in core: adds a browseable UI, missing tokens, etc.
- */
-
-use Drupal\Component\Render\PlainTextOutput;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Block\BlockPluginInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Menu\MenuLinkInterface;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\Render\Element;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\TypedData\TranslatableInterface;
-use Drupal\menu_link_content\Entity\MenuLinkContent;
-use Drupal\menu_link_content\MenuLinkContentInterface;
-use Drupal\node\Entity\Node;
-use Drupal\node\NodeInterface;
-
-/**
- * Implements hook_help().
- */
-function token_help($route_name, RouteMatchInterface $route_match) {
-  if ($route_name == 'help.page.token') {
-    $token_tree = \Drupal::service('token.tree_builder')->buildAllRenderable([
-      'click_insert' => FALSE,
-      'show_restricted' => TRUE,
-      'show_nested' => FALSE,
-    ]);
-    $output = '<h3>' . t('About') . '</h3>';
-    $output .= '<p>' . t('The <a href=":project">Token</a> module provides a user interface for the site token system. It also adds some additional tokens that are used extensively during site development. Tokens are specially formatted chunks of text that serve as placeholders for a dynamically generated value. For more information, covering both the token system and the additional tools provided by the Token module, see the <a href=":online">online documentation</a>.', [':online' => 'https://www.drupal.org/documentation/modules/token', ':project' => 'https://www.drupal.org/project/token']) . '</p>';
-    $output .= '<h3>' . t('Uses') . '</h3>';
-    $output .= '<p>' . t('Your website uses a shared token system for exposing and using placeholder tokens and their appropriate replacement values. This allows for any module to provide placeholder tokens for strings without having to reinvent the wheel. It also ensures consistency in the syntax used for tokens, making the system as a whole easier for end users to use.') . '</p>';
-    $output .= '<dl>';
-    $output .= '<dt>' . t('The list of the currently available tokens on this site are shown below.') . '</dt>';
-    $output .= '<dd>' . \Drupal::service('renderer')->render($token_tree) . '</dd>';
-    $output .= '</dl>';
-    return $output;
-  }
-}
-
-/**
- * Return an array of the core modules supported by token.module.
- */
-function _token_core_supported_modules() {
-  return array('book', 'field', 'menu_ui');
-}
-
-/**
- * Implements hook_theme().
- */
-function token_theme() {
-  $info['token_tree_link'] = [
-    'variables' => [
-      'token_types' => [],
-      'global_types' => TRUE,
-      'click_insert' => TRUE,
-      'show_restricted' => FALSE,
-      'show_nested' => FALSE,
-      'recursion_limit' => 3,
-      'text' => NULL,
-      'options' => [],
-    ],
-    'file' => 'token.pages.inc',
-  ];
-
-  return $info;
-}
-
-/**
- * Implements hook_block_view_alter().
- */
-function token_block_view_alter(&$build, BlockPluginInterface $block) {
-  $label = $build['#configuration']['label'];
-  if ($label != '<none>') {
-    // The label is automatically escaped, avoid escaping it twice.
-    // @todo https://www.drupal.org/node/2580723 will add a method or option
-    //   to the token API to do this, use that when available.
-    $bubbleable_metadata = BubbleableMetadata::createFromRenderArray($build);
-    $build['#configuration']['label'] = PlainTextOutput::renderFromHtml(\Drupal::token()->replace($label, [], [], $bubbleable_metadata));
-    $bubbleable_metadata->applyTo($build);
-  }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function token_form_block_form_alter(&$form, FormStateInterface $form_state) {
-  $token_tree = [
-    '#theme' => 'token_tree_link',
-    '#token_types' => [],
-  ];
-  $rendered_token_tree = \Drupal::service('renderer')->render($token_tree);
-  $form['settings']['label']['#description'] =
-    t('This field supports tokens. @browse_tokens_link', ['@browse_tokens_link' => $rendered_token_tree])
-  ;
-  $form['settings']['label']['#element_validate'][] = 'token_element_validate';
-  $form['settings']['label'] += ['#token_types' => []];
-}
-
-/**
- * Implements hook_field_info_alter().
- */
-function token_field_info_alter(&$info) {
-  $defaults = array(
-    'taxonomy_term_reference' => 'taxonomy_term_reference_plain',
-    'number_integer' => 'number_unformatted',
-    'number_decimal' => 'number_unformatted',
-    'number_float' => 'number_unformatted',
-    'file' => 'file_url_plain',
-    'image' => 'file_url_plain',
-    'text' => 'text_default',
-    'text_long' => 'text_default',
-    'text_with_summary' => 'text_default',
-    'list_integer' => 'list_default',
-    'list_float' => 'list_default',
-    'list_string' => 'list_default',
-    'list_boolean' => 'list_default',
-  );
-  foreach ($defaults as $field_type => $default_token_formatter) {
-    if (isset($info[$field_type])) {
-      $info[$field_type] += array('default_token_formatter' => $default_token_formatter);
-    }
-  }
-}
-
-/**
- * Implements hook_date_format_insert().
- */
-function token_date_format_insert() {
-  token_clear_cache();
-}
-
-/**
- * Implements hook_date_format_delete().
- */
-function token_date_format_delete() {
-  token_clear_cache();
-}
-
-/**
- * Implements hook_field_storage_config_presave().
- */
-function token_field_config_presave($instance) {
-  token_clear_cache();
-}
-
-/**
- * Implements hook_field_storage_config_delete().
- */
-function token_field_config_delete($instance) {
-  token_clear_cache();
-}
-
-/**
- * Clear token caches and static variables.
- */
-function token_clear_cache() {
-  \Drupal::token()->resetInfo();
-  \Drupal::service('token.entity_mapper')->resetInfo();
-  drupal_static_reset('token_menu_link_load_all_parents');
-  drupal_static_reset('token_book_link_load');
-}
-
-/**
- * Implements hook_entity_type_alter().
- *
- * Because some token types to do not match their entity type names, we have to
- * map them to the proper type. This is purely for other modules' benefit.
- *
- * @see \Drupal\token\TokenEntityMapperInterface::getEntityTypeMappings()
- * @see http://drupal.org/node/737726
- */
-function token_entity_type_alter(array &$entity_types) {
-  $devel_exists = \Drupal::moduleHandler()->moduleExists('devel');
-  /* @var $entity_types EntityTypeInterface[] */
-  foreach ($entity_types as $entity_type_id => $entity_type) {
-    if (!$entity_type->get('token_type')) {
-      // Fill in default token types for entities.
-      switch ($entity_type_id) {
-        case 'taxonomy_term':
-        case 'taxonomy_vocabulary':
-          // Stupid taxonomy token types...
-          $entity_type->set('token_type', str_replace('taxonomy_', '', $entity_type_id));
-          break;
-
-        default:
-          // By default the token type is the same as the entity type.
-          $entity_type->set('token_type', $entity_type_id);
-          break;
-      }
-    }
-
-    if ($devel_exists
-      && $entity_type->hasViewBuilderClass()
-      && ($canonical = $entity_type->getLinkTemplate('canonical'))
-      && !$entity_type->hasLinkTemplate('token-devel')) {
-      $entity_type->setLinkTemplate('token-devel', $canonical . '/devel/token');
-    }
-  }
-}
-
-/**
- * Implements hook_entity_view_modes_info().
- */
-
-/**
- * Implements hook_module_implements_alter().
- *
- * Adds missing token support for core modules.
- */
-function token_module_implements_alter(&$implementations, $hook) {
-  module_load_include('inc', 'token', 'token.tokens');
-
-  if ($hook == 'tokens' || $hook == 'token_info' || $hook == 'token_info_alter' || $hook == 'tokens_alter') {
-    foreach (_token_core_supported_modules() as $module) {
-      if (\Drupal::moduleHandler()->moduleExists($module) && function_exists($module . '_' . $hook)) {
-        $implementations[$module] = TRUE;
-      }
-    }
-    // Move token.module to get included first since it is responsible for
-    // other modules.
-    if (isset($implementations['token'])) {
-      unset($implementations['token']);
-      $implementations = array_merge(array('token' => 'tokens'), $implementations);
-    }
-  }
-}
-
-/**
- * Return the module responsible for a token.
- *
- * @param string $type
- *   The token type.
- * @param string $name
- *   The token name.
- *
- * @return mixed
- *   The value of $info['tokens'][$type][$name]['module'] from token info, or
- *   NULL if the value does not exist.
- */
-function _token_module($type, $name) {
-  $token_info = \Drupal::token()->getTokenInfo($type, $name);
-  return isset($token_info['module']) ? $token_info['module'] : NULL;
-}
-
-/**
- * Validate a form element that should have tokens in it.
- *
- * Form elements that want to add this validation should have the #token_types
- * parameter defined.
- *
- * For example:
- * @code
- * $form['my_node_text_element'] = array(
- *   '#type' => 'textfield',
- *   '#title' => t('Some text to token-ize that has a node context.'),
- *   '#default_value' => 'The title of this node is [node:title].',
- *   '#element_validate' => array('token_element_validate'),
- *   '#token_types' => array('node'),
- *   '#min_tokens' => 1,
- *   '#max_tokens' => 10,
- * );
- * @endcode
- */
-function token_element_validate($element, FormStateInterface $form_state) {
-  $value = isset($element['#value']) ? $element['#value'] : $element['#default_value'];
-
-  if (!Unicode::strlen($value)) {
-    // Empty value needs no further validation since the element should depend
-    // on using the '#required' FAPI property.
-    return $element;
-  }
-
-  $tokens = \Drupal::token()->scan($value);
-  $title = empty($element['#title']) ? $element['#parents'][0] : $element['#title'];
-
-  // Validate if an element must have a minimum number of tokens.
-  if (isset($element['#min_tokens']) && count($tokens) < $element['#min_tokens']) {
-    $error = \Drupal::translation()->formatPlural($element['#min_tokens'], '%name must contain at least one token.', '%name must contain at least @count tokens.', array('%name' => $title));
-    $form_state->setError($element, $error);
-  }
-
-  // Validate if an element must have a maximum number of tokens.
-  if (isset($element['#max_tokens']) && count($tokens) > $element['#max_tokens']) {
-    $error = \Drupal::translation()->formatPlural($element['#max_tokens'], '%name must contain at most one token.', '%name must contain at most @count tokens.', array('%name' => $title));
-    $form_state->setError($element, $error);
-  }
-
-  // Check if the field defines specific token types.
-  if (isset($element['#token_types'])) {
-    $invalid_tokens = \Drupal::token()->getInvalidTokensByContext($tokens, $element['#token_types']);
-    if ($invalid_tokens) {
-      $form_state->setError($element, t('%name is using the following invalid tokens: @invalid-tokens.', array('%name' => $title, '@invalid-tokens' => implode(', ', $invalid_tokens))));
-    }
-  }
-
-  return $element;
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function token_form_field_config_edit_form_alter(&$form, FormStateInterface $form_state) {
-  $field_config = $form_state->getFormObject()->getEntity();
-  $field_storage = $field_config->getFieldStorageDefinition();
-  if ($field_storage->isLocked()) {
-    return;
-  }
-  $field_type = $field_storage->getType();
-  if (($field_type == 'file' || $field_type == 'image') && isset($form['settings']['file_directory'])) {
-    // GAH! We can only support global tokens in the upload file directory path.
-    $form['settings']['file_directory']['#element_validate'][] = 'token_element_validate';
-    // Date support needs to be implicitly added, as while technically it's not
-    // a global token, it is a not only used but is the default value.
-    // https://www.drupal.org/node/2642160
-    $form['settings']['file_directory'] += array('#token_types' => array('date'));
-    $form['settings']['file_directory']['#description'] .= ' ' . t('This field supports tokens.');
-  }
-
-  // Note that the description is tokenized via token_field_widget_form_alter().
-  $form['description']['#element_validate'][] = 'token_element_validate';
-  $form['description'] += array('#token_types' => array());
-
-  $form['token_tree'] = array(
-    '#theme' => 'token_tree_link',
-    '#token_types' => array(),
-    '#weight' => $form['description']['#weight'] + 0.5,
-  );
-}
-
-/**
- * Implements hook_form_BASE_FORM_ID_alter().
- *
- * Alters the configure action form to add token context validation and
- * adds the token tree for a better token UI and selection.
- */
-function token_form_action_form_alter(&$form, $form_state) {
-  switch ($form['plugin']['#value']) {
-    case 'action_message_action':
-    case 'action_send_email_action':
-    case 'action_goto_action':
-      $form['token_tree'] = [
-        '#theme' => 'token_tree_link',
-        '#token_types' => 'all',
-        '#weight' => 100,
-      ];
-      $form['actions']['#weight'] = 101;
-      // @todo Add token validation to the action fields that can use tokens.
-      break;
-  }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * Alters the user e-mail fields to add token context validation and
- * adds the token tree for a better token UI and selection.
- */
-function token_form_user_admin_settings_alter(&$form, FormStateInterface $form_state) {
-  $email_token_help = t('Available variables are: [site:name], [site:url], [user:display-name], [user:account-name], [user:mail], [site:login-url], [site:url-brief], [user:edit-url], [user:one-time-login-url], [user:cancel-url].');
-
-  foreach (Element::children($form) as $key) {
-    $element = &$form[$key];
-
-    // Remove the crummy default token help text.
-    if (!empty($element['#description'])) {
-      $element['#description'] = trim(str_replace($email_token_help, t('The list of available tokens that can be used in e-mails is provided below.'), $element['#description']));
-    }
-
-    switch ($key) {
-      case 'email_admin_created':
-      case 'email_pending_approval':
-      case 'email_no_approval_required':
-      case 'email_password_reset':
-      case 'email_cancel_confirm':
-        // Do nothing, but allow execution to continue.
-        break;
-      case 'email_activated':
-      case 'email_blocked':
-      case 'email_canceled':
-        // These fieldsets have their e-mail elements inside a 'settings'
-        // sub-element, so switch to that element instead.
-        $element = &$form[$key]['settings'];
-        break;
-      default:
-        continue 2;
-    }
-
-    foreach (Element::children($element) as $sub_key) {
-      if (!isset($element[$sub_key]['#type'])) {
-        continue;
-      }
-      elseif ($element[$sub_key]['#type'] == 'textfield' && substr($sub_key, -8) === '_subject') {
-        // Add validation to subject textfields.
-        $element[$sub_key]['#element_validate'][] = 'token_element_validate';
-        $element[$sub_key] += array('#token_types' => array('user'));
-      }
-      elseif ($element[$sub_key]['#type'] == 'textarea' && substr($sub_key, -5) === '_body') {
-        // Add validation to body textareas.
-        $element[$sub_key]['#element_validate'][] = 'token_element_validate';
-        $element[$sub_key] += array('#token_types' => array('user'));
-      }
-    }
-  }
-
-  // Add the token tree UI.
-  $form['email']['token_tree'] = array(
-    '#theme' => 'token_tree_link',
-    '#token_types' => array('user'),
-    '#show_restricted' => TRUE,
-    '#show_nested' => FALSE,
-    '#weight' => 90,
-  );
-}
-
-/**
- * Prepare a string for use as a valid token name.
- *
- * @param $name
- *   The token name to clean.
- * @return
- *   The cleaned token name.
- */
-function token_clean_token_name($name) {
-  static $names = array();
-
-  if (!isset($names[$name])) {
-    $cleaned_name = strtr($name, array(' ' => '-', '_' => '-', '/' => '-', '[' => '-', ']' => ''));
-    $cleaned_name = preg_replace('/[^\w\-]/i', '', $cleaned_name);
-    $cleaned_name = trim($cleaned_name, '-');
-    $names[$name] = $cleaned_name;
-  }
-
-  return $names[$name];
-}
-
-/**
- * Do not use this function yet. Its API has not been finalized.
- */
-function token_render_array(array $array, array $options = array()) {
-  $rendered = array();
-
-  /** @var \Drupal\Core\Render\RendererInterface $renderer */
-  $renderer = \Drupal::service('renderer');
-
-  foreach (token_element_children($array) as $key) {
-    $value = $array[$key];
-    $rendered[] = is_array($value) ? $renderer->renderPlain($value) : (string) $value;
-  }
-  $join = isset($options['join']) ? $options['join'] : ', ';
-  return implode($join, $rendered);
-}
-
-/**
- * Do not use this function yet. Its API has not been finalized.
- */
-function token_render_array_value($value, array $options = array()) {
-  /** @var \Drupal\Core\Render\RendererInterface $renderer */
-  $renderer = \Drupal::service('renderer');
-
-  $rendered = is_array($value) ? $renderer->renderPlain($value) : (string) $value;
-  return $rendered;
-}
-
-/**
- * Copy of drupal_render_cache_get() that does not care about request method.
- */
-function token_render_cache_get($elements) {
-  if (!$cid = drupal_render_cid_create($elements)) {
-    return FALSE;
-  }
-  $bin = isset($elements['#cache']['bin']) ? $elements['#cache']['bin'] : 'render';
-
-  if (!empty($cid) && $cache = \Drupal::cache($bin)->get($cid)) {
-    // Add additional libraries, JavaScript, CSS and other data attached
-    // to this element.
-    if (isset($cache->data['#attached'])) {
-      drupal_process_attached($cache->data);
-    }
-    // Return the rendered output.
-    return $cache->data['#markup'];
-  }
-  return FALSE;
-}
-
-/**
- * Coyp of drupal_render_cache_set() that does not care about request method.
- */
-function token_render_cache_set(&$markup, $elements) {
-  // This should only run of drupal_render_cache_set() did not.
-  if (in_array(\Drupal::request()->server->get('REQUEST_METHOD'), array('GET', 'HEAD'))) {
-    return FALSE;
-  }
-
-  $original_method = \Drupal::request()->server->get('REQUEST_METHOD');
-  \Drupal::request()->server->set('REQUEST_METHOD', 'GET');
-  drupal_render_cache_set($markup, $elements);
-  \Drupal::request()->server->set('REQUEST_METHOD', $original_method);
-}
-
-/**
- * Loads menu link titles for all purents of a menu link plugin ID.
- *
- * @param string $plugin_id
- *   The menu link plugin ID.
- * @param string $langcode
- *   The language code.
- *
- * @return string[]
- *   List of menu link parent titles.
- */
-function token_menu_link_load_all_parents($plugin_id, $langcode) {
-  $cache = &drupal_static(__FUNCTION__, array());
-
-  if (!isset($cache[$plugin_id][$langcode])) {
-    $cache[$plugin_id][$langcode] = array();
-    /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
-    $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
-    $parent_ids = $menu_link_manager->getParentIds($plugin_id);
-    // Remove the current plugin ID from the parents.
-    unset($parent_ids[$plugin_id]);
-    foreach ($parent_ids as $parent_id) {
-      $parent = $menu_link_manager->createInstance($parent_id);
-      $cache[$plugin_id][$langcode] = array($parent_id => token_menu_link_translated_title($parent, $langcode)) + $cache[$plugin_id][$langcode];
-    }
-  }
-
-  return $cache[$plugin_id][$langcode];
-}
-
-/**
- * Returns the translated link of a menu title.
- *
- * If the underlying entity is a content menu item, load it to get the
- * translated menu item title.
- *
- * @todo Remove this when there is a better way to get a translated menu
- *   item title in core: https://www.drupal.org/node/2795143
- *
- * @param \Drupal\Core\Menu\MenuLinkInterface $menu_link
- *   The menu link.
- * @param string|null $langcode
- *   (optional) The langcode, defaults to the current language.
- *
- * @return string
- *   The menu link title.
- */
-function token_menu_link_translated_title(MenuLinkInterface $menu_link, $langcode = NULL) {
-  $metadata = $menu_link->getMetaData();
-  if (isset($metadata['entity_id']) && $menu_link->getProvider() == 'menu_link_content') {
-    /** @var \Drupal\menu_link_content\MenuLinkContentInterface $entity */
-    $entity = \Drupal::entityTypeManager()->getStorage('menu_link_content')->load($metadata['entity_id']);
-    $entity = \Drupal::service('entity.repository')->getTranslationFromContext($entity, $langcode);
-    return $entity->getTitle();
-  }
-  return $menu_link->getTitle();
-}
-
-/**
- * Loads all the parents of the term in the specified language.
- *
- * @param int $tid
- *   The term id.
- * @param string $langcode
- *   The language code.
- *
- * @return string[]
- *   The term parents collection.
- */
-function token_taxonomy_term_load_all_parents($tid, $langcode) {
-  $cache = &drupal_static(__FUNCTION__, array());
-
-  if (!is_numeric($tid)) {
-    return array();
-  }
-
-  if (!isset($cache[$langcode][$tid])) {
-    $cache[$langcode][$tid] = array();
-    /** @var \Drupal\taxonomy\TermStorageInterface $term_storage */
-    $term_storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
-    $parents = $term_storage->loadAllParents($tid);
-    // Remove this term from the array.
-    array_shift($parents);
-    $parents = array_reverse($parents);
-    foreach ($parents as $term) {
-      $translation = \Drupal::service('entity.repository')->getTranslationFromContext($term, $langcode);
-      $cache[$langcode][$tid][$term->id()] = $translation->label();
-    }
-  }
-
-  return $cache[$langcode][$tid];
-}
-
-function token_element_children(&$elements, $sort = FALSE) {
-  // Do not attempt to sort elements which have already been sorted.
-  $sort = isset($elements['#sorted']) ? !$elements['#sorted'] : $sort;
-
-  // Filter out properties from the element, leaving only children.
-  $children = array();
-  $sortable = FALSE;
-  foreach ($elements as $key => $value) {
-    if ($key === '' || $key[0] !== '#') {
-      $children[$key] = $value;
-      if (is_array($value) && isset($value['#weight'])) {
-        $sortable = TRUE;
-      }
-    }
-  }
-  // Sort the children if necessary.
-  if ($sort && $sortable) {
-    uasort($children, 'Drupal\Component\Utility\SortArray::sortByWeightProperty');
-    // Put the sorted children back into $elements in the correct order, to
-    // preserve sorting if the same element is passed through
-    // element_children() twice.
-    foreach ($children as $key => $child) {
-      unset($elements[$key]);
-      $elements[$key] = $child;
-    }
-    $elements['#sorted'] = TRUE;
-  }
-
-  return array_keys($children);
-}
-
-/**
- * Loads all the parents of the book page.
- *
- * @param array $book
- *   The book data. The 'nid' key points to the current page of the book.
- *   The 'p1' ... 'p9' keys point to parents of the page, if they exist, with 'p1'
- *   pointing to the book itself and the last defined pX to the current page.
- *
- * @return string[]
- *   List of node titles of the book parents.
- */
-function token_book_load_all_parents(array $book) {
-  $cache = &drupal_static(__FUNCTION__, array());
-
-  if (empty($book['nid'])) {
-    return array();
-  }
-  $nid = $book['nid'];
-
-  if (!isset($cache[$nid])) {
-    $cache[$nid] = array();
-    $i = 1;
-    while ($book["p$i"] != $nid) {
-      $cache[$nid][] = Node::load($book["p$i"])->getTitle();
-      $i++;
-    }
-  }
-
-  return $cache[$nid];
-}
-
-/**
- * Implements hook_entity_base_field_info().
- */
-function token_entity_base_field_info(EntityTypeInterface $entity_type) {
-  // We add a psuedo entity-reference field to track the menu entry created
-  // from the node add/edit form so that tokens generated at that time that
-  // reference the menu link can access the yet to be saved menu link.
-  // @todo Revisit when https://www.drupal.org/node/2315773 is resolved.
-  if ($entity_type->id() === 'node' && \Drupal::moduleHandler()->moduleExists('menu_ui')) {
-    $fields['menu_link'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Menu link'))
-      ->setDescription(t('Computed menu link for the node (only available during node saving).'))
-      ->setRevisionable(TRUE)
-      ->setSetting('target_type', 'menu_link_content')
-      ->setTranslatable(TRUE)
-      ->setDisplayOptions('view', array(
-        'label' => 'hidden',
-        'type' => 'hidden',
-      ))
-      ->setComputed(TRUE)
-      ->setDisplayOptions('form', array(
-        'type' => 'hidden',
-      ));
-
-    return $fields;
-  }
-  return [];
-}
-
-/**
- * Implements hook_form_BASE_FORM_ID_alter() for node_form.
- *
- * Populates menu_link field on nodes from the menu item on unsaved nodes.
- *
- * @see menu_ui_form_node_form_submit()
- * @see token_entity_base_field_info()
- */
-function token_form_node_form_alter(&$form, FormStateInterface $form_state) {
-  if (!\Drupal::moduleHandler()->moduleExists('menu_ui')) {
-    return;
-  }
-  /** @var \Drupal\node\NodeForm $form_object */
-  if (!\Drupal::currentUser()->hasPermission('administer menu')) {
-    // We're only interested in when the node is unsaved and the editor has
-    // permission to create new menu links.
-    return;
-  }
-  $form['#entity_builders'][] = 'token_node_menu_link_submit';
-}
-
-/**
- * Entity builder.
- */
-function token_node_menu_link_submit($entity_type, NodeInterface $node, &$form, FormStateInterface $form_state) {
-  // Entity builders run twice, once during validation and again during
-  // submission, so we only run this code after validation has been performed.
-  if (!$form_state->isValueEmpty('menu') && $form_state->getTemporaryValue('entity_validated')) {
-    $values = $form_state->getValue('menu');
-    if (!empty($values['enabled']) && trim($values['title'])) {
-      if (!empty($values['menu_parent'])) {
-        list($menu_name, $parent) = explode(':', $values['menu_parent'], 2);
-        $values['menu_name'] = $menu_name;
-        $values['parent'] = $parent;
-      }
-      // Construct an unsaved entity.
-      if ($entity_id = $form_state->getValue(['menu', 'entity_id'])) {
-        // Use the existing menu_link_content entity.
-        $entity = MenuLinkContent::load($entity_id);
-        // If the loaded MenuLinkContent doesn't have a translation for the
-        // Node's active langcode, create a new translation.
-        if ($entity->isTranslatable()) {
-          if (!$entity->hasTranslation($node->language()->getId())) {
-            $entity = $entity->addTranslation($node->language()->getId(), $entity->toArray());
-          }
-          else {
-            $entity = $entity->getTranslation($node->language()->getId());
-          }
-        }
-      }
-      else {
-        if ($node->isNew()) {
-          // Create a new menu_link_content entity.
-          $entity = MenuLinkContent::create(array(
-            // Lets just reference the UUID for now, the link is not important for
-            // token generation.
-            'link' => ['uri' => 'internal:/node/' . $node->uuid()],
-            'langcode' => $node->language()->getId(),
-          ));
-        }
-        else {
-          // Create a new menu_link_content entity.
-          $entity = MenuLinkContent::create(array(
-            'link' => ['uri' => 'entity:node/' . $node->id()],
-            'langcode' => $node->language()->getId(),
-          ));
-        }
-      }
-      $entity->title->value = trim($values['title']);
-      $entity->description->value = trim($values['description']);
-      $entity->menu_name->value = $values['menu_name'];
-      $entity->parent->value = $values['parent'];
-      $entity->weight->value = isset($values['weight']) ? $values['weight'] : 0;
-      $entity->save();
-      $node->menu_link = $entity;
-      // Leave this for _menu_ui_node_save() to pick up so we don't end up with
-      // duplicate menu-links.
-      $form_state->setValue(['menu', 'entity_id'], $entity->id());
-    }
-  }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_insert for node entities.
- */
-function token_node_insert(NodeInterface $node) {
-  if ($node->hasField('menu_link') && $menu_link = $node->menu_link->entity) {
-    // Update the menu-link to point to the now saved node.
-    $menu_link->link = 'entity:node/' .  $node->id();
-    $menu_link->save();
-  }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_presave() for menu_link_content.
- */
-function token_menu_link_content_presave(MenuLinkContentInterface $menu_link_content) {
-  drupal_static_reset('token_menu_link_load_all_parents');
-}
diff --git a/modules/token/token.pages.inc b/modules/token/token.pages.inc
deleted file mode 100644
index 4b92df1..0000000
--- a/modules/token/token.pages.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * @file
- * User page callbacks for the token module.
- */
-use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\DiffArray;
-use Drupal\Core\Link;
-use Drupal\Core\Url;
-
-/**
- * Theme a link to a token tree shown as a dialog.
- */
-function template_preprocess_token_tree_link(&$variables) {
-  if (empty($variables['text'])) {
-    $variables['text'] = t('Browse available tokens.');
-  }
-
-  $variables['#attached']['library'][] = 'core/drupal.dialog.ajax';
-  $variables['#attached']['library'][] = 'token/token';
-  $variables['options']['attributes']['class'][] = 'token-dialog';
-  $variables['options']['attributes']['class'][] = 'use-ajax';
-
-  $tree_variables = [
-    'token_types' => [],
-    'global_types' => TRUE,
-    'click_insert' => TRUE,
-    'show_restricted' => FALSE,
-    'show_nested' => FALSE,
-    'recursion_limit' => 3,
-  ];
-  $query_options = array_intersect_key($variables, $tree_variables);
-  $query_options = DiffArray::diffAssocRecursive($query_options, $tree_variables);
-  if (!isset($variables['options']['query']['options'])) {
-    $variables['options']['query']['options'] = [];
-  }
-  $variables['options']['query']['options'] += $query_options;
-
-  // Because PHP converts query strings with arrays into a different syntax on
-  // the next request, the options have to be encoded with JSON in the query
-  // string so that we can reliably decode it for token comparison.
-  $variables['options']['query']['options'] = Json::encode($variables['options']['query']['options']);
-
-  // Set the token tree to open in a separate window.
-  $variables['options']['attributes'] += [
-    'data-dialog-type' => 'dialog',
-    'data-dialog-options' => json_encode([
-      'dialogClass' => 'token-tree-dialog',
-      'width' => 600,
-      'height' => 400,
-      'position' => ['my' => 'right bottom', 'at' => 'right-10 bottom-10'],
-      'draggable' => TRUE,
-      'autoResize' => FALSE,
-    ]),
-   ];
-
-  $variables['link'] = Link::createFromRoute($variables['text'], 'token.tree', [], $variables['options'])->toRenderable();
-  $variables['url'] = new Url('token.tree', [], $variables['options']);
-  $variables['attributes'] = $variables['options']['attributes'];
-}
diff --git a/modules/token/token.routing.yml b/modules/token/token.routing.yml
deleted file mode 100644
index f2105ae..0000000
--- a/modules/token/token.routing.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-token.tree:
-  path: '/token/tree'
-  defaults:
-    _controller: '\Drupal\token\Controller\TokenTreeController::outputTree'
-  requirements:
-    _csrf_token: 'TRUE'
-
-token.autocomplete:
-  path: '/token/autocomplete/{token_type}/{filter}'
-  defaults:
-    _controller: '\Drupal\token\Controller\TokenAutocompleteController::autocomplete'
-  requirements:
-    _access: 'TRUE'
-
-token.flush_cache:
-  path: '/token/flush-cache'
-  defaults:
-    _controller: '\Drupal\token\Controller\TokenCacheController::flush'
-  requirements:
-    _permission: 'flush caches'
-    _csrf_token: 'TRUE'
-    _module_dependencies: 'admin_menu'
diff --git a/modules/token/token.services.yml b/modules/token/token.services.yml
deleted file mode 100644
index f6011aa..0000000
--- a/modules/token/token.services.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-services:
-  token.entity_mapper:
-    class: Drupal\token\TokenEntityMapper
-    arguments: ['@entity_type.manager', '@module_handler']
-  token.tree_builder:
-    class: Drupal\token\TreeBuilder
-    arguments: ['@token', '@token.entity_mapper', '@cache.data', '@language_manager']
-  token.route_subscriber:
-    class: Drupal\token\Routing\RouteSubscriber
-    arguments: ['@entity_type.manager', '@module_handler']
-    tags:
-      - { name: event_subscriber }
diff --git a/modules/token/token.tokens.inc b/modules/token/token.tokens.inc
deleted file mode 100644
index f6ad619..0000000
--- a/modules/token/token.tokens.inc
+++ /dev/null
@@ -1,1721 +0,0 @@
-<?php
-
-/**
- * @file
- * Token callbacks for the token module.
- */
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\Render\Element;
-use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Utility\Html;
-use Drupal\Core\TypedData\DataReferenceDefinitionInterface;
-use Drupal\Core\Url;
-use Drupal\field\FieldStorageConfigInterface;
-use Drupal\menu_link_content\MenuLinkContentInterface;
-use Drupal\node\Entity\Node;
-use Drupal\node\NodeInterface;
-use Drupal\system\Entity\Menu;
-use Drupal\user\UserInterface;
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
-use Drupal\Core\TypedData\PrimitiveInterface;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\image\Entity\ImageStyle;
-
-/**
- * Implements hook_token_info_alter().
- */
-function token_token_info_alter(&$info) {
-  // Force 'date' type tokens to require input and add a 'current-date' type.
-  // @todo Remove when http://drupal.org/node/943028 is fixed.
-  $info['types']['date']['needs-data'] = 'date';
-  $info['types']['current-date'] = array(
-    'name' => t('Current date'),
-    'description' => t('Tokens related to the current date and time.'),
-    'type' => 'date',
-  );
-
-  // Add a 'dynamic' key to any tokens that have chained but dynamic tokens.
-  $info['tokens']['date']['custom']['dynamic'] = TRUE;
-
-  // The [file:size] may not always return in kilobytes.
-  // @todo Remove when http://drupal.org/node/1193044 is fixed.
-  if (!empty($info['tokens']['file']['size'])) {
-    $info['tokens']['file']['size']['description'] = t('The size of the file.');
-  }
-
-  // Remove deprecated tokens from being listed.
-  unset($info['tokens']['node']['tnid']);
-  unset($info['tokens']['node']['type']);
-  unset($info['tokens']['node']['type-name']);
-
-  // Support 'url' type tokens for core tokens.
-  if (isset($info['tokens']['comment']['url']) && \Drupal::moduleHandler()->moduleExists('comment')) {
-    $info['tokens']['comment']['url']['type'] = 'url';
-  }
-  if (isset($info['tokens']['node']['url']) && \Drupal::moduleHandler()->moduleExists('node')) {
-    $info['tokens']['node']['url']['type'] = 'url';
-  }
-  if (isset($info['tokens']['term']['url']) && \Drupal::moduleHandler()->moduleExists('taxonomy')) {
-    $info['tokens']['term']['url']['type'] = 'url';
-  }
-  $info['tokens']['user']['url']['type'] = 'url';
-
-  // Add [token:url] tokens for any URI-able entities.
-  $entities = \Drupal::entityTypeManager()->getDefinitions();
-  foreach ($entities as $entity => $entity_info) {
-    // Do not generate tokens if the entity doesn't define a token type or is
-    // not a content entity.
-    if (!$entity_info->get('token_type') || (!$entity_info instanceof ContentEntityTypeInterface)) {
-      continue;
-    }
-
-    $token_type = $entity_info->get('token_type');
-    if (!isset($info['types'][$token_type]) || !isset($info['tokens'][$token_type])) {
-      // Define tokens for entity type's without their own integration.
-      $info['types'][$entity_info->id()] = [
-        'name' => $entity_info->getLabel(),
-        'needs-data' => $entity_info->id(),
-        'module' => 'token',
-      ];
-    }
-
-    // Add [entity:url] tokens if they do not already exist.
-    // @todo Support entity:label
-    if (!isset($info['tokens'][$token_type]['url'])) {
-      $info['tokens'][$token_type]['url'] = array(
-        'name' => t('URL'),
-        'description' => t('The URL of the @entity.', array('@entity' => Unicode::strtolower($entity_info->getLabel()))),
-        'module' => 'token',
-        'type' => 'url',
-      );
-    }
-
-    // Add [entity:original] tokens if they do not already exist.
-    if (!isset($info['tokens'][$token_type]['original'])) {
-      $info['tokens'][$token_type]['original'] = array(
-        'name' => t('Original @entity', array('@entity' => Unicode::strtolower($entity_info->getLabel()))),
-        'description' => t('The original @entity data if the @entity is being updated or saved.', array('@entity' => Unicode::strtolower($entity_info->getLabel()))),
-        'module' => 'token',
-        'type' => $token_type,
-      );
-    }
-  }
-
-  // Add support for custom date formats.
-  // @todo Remove when http://drupal.org/node/1173706 is fixed.
-  $date_format_types = \Drupal::entityTypeManager()->getStorage('date_format')->loadMultiple();
-  foreach ($date_format_types as $date_format_type => $date_format_type_info) {
-    /* @var \Drupal\system\Entity\DateFormat $date_format_type_info */
-    if (!isset($info['tokens']['date'][$date_format_type])) {
-      $info['tokens']['date'][$date_format_type] = array(
-        'name' => Html::escape($date_format_type_info->label()),
-        'description' => t("A date in '@type' format. (%date)", array('@type' => $date_format_type, '%date' => format_date(REQUEST_TIME, $date_format_type))),
-        'module' => 'token',
-      );
-    }
-  }
-}
-
-/**
- * Implements hook_token_info().
- */
-function token_token_info() {
-  // Node tokens.
-  $info['tokens']['node']['source'] = array(
-    'name' => t('Translation source node'),
-    'description' => t("The source node for this current node's translation set."),
-    'type' => 'node',
-  );
-  $info['tokens']['node']['log'] = array(
-    'name' => t('Revision log message'),
-    'description' => t('The explanation of the most recent changes made to the node.'),
-  );
-  $info['tokens']['node']['content-type'] = array(
-    'name' => t('Content type'),
-    'description' => t('The content type of the node.'),
-    'type' => 'content-type',
-  );
-
-  // Content type tokens.
-  $info['types']['content-type'] = array(
-    'name' => t('Content types'),
-    'description' => t('Tokens related to content types.'),
-    'needs-data' => 'node_type',
-  );
-  $info['tokens']['content-type']['name'] = array(
-    'name' => t('Name'),
-    'description' => t('The name of the content type.'),
-  );
-  $info['tokens']['content-type']['machine-name'] = array(
-    'name' => t('Machine-readable name'),
-    'description' => t('The unique machine-readable name of the content type.'),
-  );
-  $info['tokens']['content-type']['description'] = array(
-    'name' => t('Description'),
-    'description' => t('The optional description of the content type.'),
-  );
-  $info['tokens']['content-type']['node-count'] = array(
-    'name' => t('Node count'),
-    'description' => t('The number of nodes belonging to the content type.'),
-  );
-  $info['tokens']['content-type']['edit-url'] = array(
-    'name' => t('Edit URL'),
-    'description' => t("The URL of the content type's edit page."),
-    // 'type' => 'url',
-  );
-
-  // Taxonomy term and vocabulary tokens.
-  if (\Drupal::moduleHandler()->moduleExists('taxonomy')) {
-    $info['tokens']['term']['edit-url'] = array(
-      'name' => t('Edit URL'),
-      'description' => t("The URL of the taxonomy term's edit page."),
-      // 'type' => 'url',
-    );
-    $info['tokens']['term']['parents'] = array(
-      'name' => t('Parents'),
-      'description' => t("An array of all the term's parents, starting with the root."),
-      'type' => 'array',
-    );
-    $info['tokens']['term']['root'] = array(
-      'name' => t('Root term'),
-      'description' => t("The root term of the taxonomy term."),
-      'type' => 'term',
-    );
-
-    $info['tokens']['vocabulary']['machine-name'] = array(
-      'name' => t('Machine-readable name'),
-      'description' => t('The unique machine-readable name of the vocabulary.'),
-    );
-    $info['tokens']['vocabulary']['edit-url'] = array(
-      'name' => t('Edit URL'),
-      'description' => t("The URL of the vocabulary's edit page."),
-      // 'type' => 'url',
-    );
-  }
-
-  // File tokens.
-  $info['tokens']['file']['basename'] = array(
-    'name' => t('Base name'),
-    'description' => t('The base name of the file.'),
-  );
-  $info['tokens']['file']['extension'] = array(
-    'name' => t('Extension'),
-    'description' => t('The extension of the file.'),
-  );
-  $info['tokens']['file']['size-raw'] = array(
-    'name' => t('File byte size'),
-    'description' => t('The size of the file, in bytes.'),
-  );
-
-  // User tokens.
-  // Add information on the restricted user tokens.
-  $info['tokens']['user']['cancel-url'] = array(
-    'name' => t('Account cancellation URL'),
-    'description' => t('The URL of the confirm delete page for the user account.'),
-    'restricted' => TRUE,
-    // 'type' => 'url',
-  );
-  $info['tokens']['user']['one-time-login-url'] = array(
-    'name' => t('One-time login URL'),
-    'description' => t('The URL of the one-time login page for the user account.'),
-    'restricted' => TRUE,
-    // 'type' => 'url',
-  );
-  $info['tokens']['user']['roles'] = array(
-    'name' => t('Roles'),
-    'description' => t('The user roles associated with the user account.'),
-    'type' => 'array',
-  );
-
-  // Current user tokens.
-  $info['tokens']['current-user']['ip-address'] = array(
-    'name' => t('IP address'),
-    'description' => 'The IP address of the current user.',
-  );
-
-  // Menu link tokens (work regardless if menu module is enabled or not).
-  $info['types']['menu-link'] = array(
-    'name' => t('Menu links'),
-    'description' => t('Tokens related to menu links.'),
-    'needs-data' => 'menu-link',
-  );
-  $info['tokens']['menu-link']['mlid'] = array(
-    'name' => t('Link ID'),
-    'description' => t('The unique ID of the menu link.'),
-  );
-  $info['tokens']['menu-link']['title'] = array(
-    'name' => t('Title'),
-    'description' => t('The title of the menu link.'),
-  );
-  $info['tokens']['menu-link']['url'] = array(
-    'name' => t('URL'),
-    'description' => t('The URL of the menu link.'),
-    'type' => 'url',
-  );
-  $info['tokens']['menu-link']['parent'] = array(
-    'name' => t('Parent'),
-    'description' => t("The menu link's parent."),
-    'type' => 'menu-link',
-  );
-  $info['tokens']['menu-link']['parents'] = array(
-    'name' => t('Parents'),
-    'description' => t("An array of all the menu link's parents, starting with the root."),
-    'type' => 'array',
-  );
-  $info['tokens']['menu-link']['root'] = array(
-    'name' => t('Root'),
-    'description' => t("The menu link's root."),
-    'type' => 'menu-link',
-  );
-
-  // Current page tokens.
-  $info['types']['current-page'] = array(
-    'name' => t('Current page'),
-    'description' => t('Tokens related to the current page request.'),
-  );
-  $info['tokens']['current-page']['title'] = array(
-    'name' => t('Title'),
-    'description' => t('The title of the current page.'),
-  );
-  $info['tokens']['current-page']['url'] = array(
-    'name' => t('URL'),
-    'description' => t('The URL of the current page.'),
-    'type' => 'url',
-  );
-  $info['tokens']['current-page']['page-number'] = array(
-    'name' => t('Page number'),
-    'description' => t('The page number of the current page when viewing paged lists.'),
-  );
-  $info['tokens']['current-page']['query'] = array(
-    'name' => t('Query string value'),
-    'description' => t('The value of a specific query string field of the current page.'),
-    'dynamic' => TRUE,
-  );
-
-  // URL tokens.
-  $info['types']['url'] = array(
-    'name' => t('URL'),
-    'description' => t('Tokens related to URLs.'),
-    'needs-data' => 'path',
-  );
-  $info['tokens']['url']['path'] = array(
-    'name' => t('Path'),
-    'description' => t('The path component of the URL.'),
-  );
-  $info['tokens']['url']['relative'] = array(
-    'name' => t('Relative URL'),
-    'description' => t('The relative URL.'),
-  );
-  $info['tokens']['url']['absolute'] = array(
-    'name' => t('Absolute URL'),
-    'description' => t('The absolute URL.'),
-  );
-  $info['tokens']['url']['brief'] = array(
-    'name' => t('Brief URL'),
-    'description' => t('The URL without the protocol and trailing backslash.'),
-  );
-  $info['tokens']['url']['unaliased'] = array(
-    'name' => t('Unaliased URL'),
-    'description' => t('The unaliased URL.'),
-    'type' => 'url',
-  );
-  $info['tokens']['url']['args'] = array(
-    'name' => t('Arguments'),
-    'description' => t("The specific argument of the current page (e.g. 'arg:1' on the page 'node/1' returns '1')."),
-    'type' => 'array',
-  );
-
-  // Array tokens.
-  $info['types']['array'] = array(
-    'name' => t('Array'),
-    'description' => t('Tokens related to arrays of strings.'),
-    'needs-data' => 'array',
-    'nested' => TRUE,
-  );
-  $info['tokens']['array']['first'] = array(
-    'name' => t('First'),
-    'description' => t('The first element of the array.'),
-  );
-  $info['tokens']['array']['last'] = array(
-    'name' => t('Last'),
-    'description' => t('The last element of the array.'),
-  );
-  $info['tokens']['array']['count'] = array(
-    'name' => t('Count'),
-    'description' => t('The number of elements in the array.'),
-  );
-  $info['tokens']['array']['reversed'] = array(
-    'name' => t('Reversed'),
-    'description' => t('The array reversed.'),
-    'type' => 'array',
-  );
-  $info['tokens']['array']['keys'] = array(
-    'name' => t('Keys'),
-    'description' => t('The array of keys of the array.'),
-    'type' => 'array',
-  );
-  $info['tokens']['array']['join'] = array(
-    'name' => t('Imploded'),
-    'description' => t('The values of the array joined together with a custom string in-between each value.'),
-    'dynamic' => TRUE,
-  );
-  $info['tokens']['array']['value'] = array(
-    'name' => t('Value'),
-    'description' => t('The specific value of the array.'),
-    'dynamic' => TRUE,
-  );
-
-  // Random tokens.
-  $info['types']['random'] = array(
-    'name' => t('Random'),
-    'description' => t('Tokens related to random data.'),
-  );
-  $info['tokens']['random']['number'] = array(
-    'name' => t('Number'),
-    'description' => t('A random number from 0 to @max.', array('@max' => mt_getrandmax())),
-  );
-  $info['tokens']['random']['hash'] = array(
-    'name' => t('Hash'),
-    'description' => t('A random hash. The possible hashing algorithms are: @hash-algos.', array('@hash-algos' => implode(', ', hash_algos()))),
-    'dynamic' => TRUE,
-  );
-
-  // Define image_with_image_style token type.
-  if (\Drupal::moduleHandler()->moduleExists('image')) {
-    $info['types']['image_with_image_style'] = [
-      'name' => t('Image with image style'),
-      'needs-data' => 'image_with_image_style',
-      'module' => 'token',
-      'nested' => TRUE,
-    ];
-
-    // Provide tokens for the ImageStyle attributes.
-    $info['tokens']['image_with_image_style']['mimetype'] = [
-      'name' => t('MIME type'),
-      'description' => t('The MIME type (image/png, image/bmp, etc.) of the image.'),
-    ];
-    $info['tokens']['image_with_image_style']['filesize'] = [
-      'name' => t('File size'),
-      'description' => t('The file size of the image.'),
-    ];
-    $info['tokens']['image_with_image_style']['height'] = [
-      'name' => t('Height'),
-      'description' => t('The height the image, in pixels.'),
-    ];
-    $info['tokens']['image_with_image_style']['width'] = [
-      'name' => t('Width'),
-      'description' => t('The width of the image, in pixels.'),
-    ];
-    $info['tokens']['image_with_image_style']['uri'] = [
-      'name' => t('URI'),
-      'description' => t('The URI to the image.'),
-    ];
-    $info['tokens']['image_with_image_style']['url'] = [
-      'name' => t('URL'),
-      'description' => t('The URL to the image.'),
-    ];
-  }
-
-  return $info;
-}
-
-/**
- * Implements hook_tokens().
- */
-function token_tokens($type, array $tokens, array $data = array(), array $options = array(), BubbleableMetadata $bubbleable_metadata) {
-  $replacements = array();
-  $language_manager = \Drupal::languageManager();
-  $url_options = array('absolute' => TRUE);
-  if (isset($options['langcode'])) {
-    $url_options['language'] = $language_manager->getLanguage($options['langcode']);
-    $langcode = $options['langcode'];
-  }
-  else {
-    $langcode = $language_manager->getCurrentLanguage()->getId();
-  }
-
-  // Date tokens.
-  if ($type == 'date') {
-    $date = !empty($data['date']) ? $data['date'] : REQUEST_TIME;
-
-    // @todo Remove when http://drupal.org/node/1173706 is fixed.
-    $date_format_types = \Drupal::entityTypeManager()->getStorage('date_format')->loadMultiple();
-    foreach ($tokens as $name => $original) {
-      if (isset($date_format_types[$name]) && _token_module('date', $name) == 'token') {
-        $replacements[$original] = format_date($date, $name, '', NULL, $langcode);
-      }
-    }
-  }
-
-  // Current date tokens.
-  // @todo Remove when http://drupal.org/node/943028 is fixed.
-  if ($type == 'current-date') {
-    $replacements += \Drupal::token()->generate('date', $tokens, array('date' => REQUEST_TIME), $options, $bubbleable_metadata);
-  }
-
-  // Comment tokens.
-  if ($type == 'comment' && !empty($data['comment'])) {
-    /* @var \Drupal\comment\CommentInterface $comment */
-    $comment = $data['comment'];
-
-    // Chained token relationships.
-    if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url'))) {
-      // Add fragment to url options.
-      $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $comment->urlInfo('canonical', ['fragment' => "comment-{$comment->id()}"])), $options, $bubbleable_metadata);
-    }
-  }
-
-  // Node tokens.
-  if ($type == 'node' && !empty($data['node'])) {
-    /* @var \Drupal\node\NodeInterface $node */
-    $node = $data['node'];
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'log':
-          $replacements[$original] = (string) $node->revision_log->value;
-          break;
-        case 'content-type':
-          $type_name = \Drupal::entityTypeManager()->getStorage('node_type')->load($node->getType())->label();
-          $replacements[$original] = $type_name;
-          break;
-      }
-    }
-
-    // Chained token relationships.
-    if (($parent_tokens = \Drupal::token()->findWithPrefix($tokens, 'source')) && $source_node = $node->getUntranslated()) {
-      $replacements += \Drupal::token()->generate('node', $parent_tokens, array('node' => $source_node), $options, $bubbleable_metadata);
-    }
-    if (($node_type_tokens = \Drupal::token()->findWithPrefix($tokens, 'content-type')) && $node_type = node_type_load($node->bundle())) {
-      $replacements += \Drupal::token()->generate('content-type', $node_type_tokens, array('node_type' => $node_type), $options, $bubbleable_metadata);
-    }
-    if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url'))) {
-      $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $node->urlInfo()), $options, $bubbleable_metadata);
-    }
-  }
-
-  // Content type tokens.
-  if ($type == 'content-type' && !empty($data['node_type'])) {
-    /* @var \Drupal\node\NodeTypeInterface $node_type */
-    $node_type = $data['node_type'];
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'name':
-          $replacements[$original] = $node_type->label();
-          break;
-        case 'machine-name':
-          $replacements[$original] = $node_type->id();
-          break;
-        case 'description':
-          $replacements[$original] = $node_type->getDescription();
-          break;
-        case 'node-count':
-          $count = \Drupal::entityQueryAggregate('node')
-            ->aggregate('nid', 'COUNT')
-            ->condition('type', $node_type->id())
-            ->execute();
-          $replacements[$original] = (int) $count;
-          break;
-        case 'edit-url':
-          $replacements[$original] = $node_type->url('edit-form', $url_options);
-          break;
-      }
-    }
-  }
-
-  // Taxonomy term tokens.
-  if ($type == 'term' && !empty($data['term'])) {
-    /* @var \Drupal\taxonomy\TermInterface $term */
-    $term = $data['term'];
-
-    /** @var \Drupal\taxonomy\TermStorageInterface $term_storage */
-    $term_storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'edit-url':
-          $replacements[$original] = Url::fromRoute('entity.taxonomy_term.edit_form', ['taxonomy_term' => $term->id()], $url_options)->toString();
-          break;
-
-        case 'parents':
-          if ($parents = token_taxonomy_term_load_all_parents($term->id(), $langcode)) {
-            $replacements[$original] = token_render_array($parents, $options);
-          }
-          break;
-
-        case 'root':
-          $parents = $term_storage->loadAllParents($term->id());
-          $root_term = end($parents);
-          if ($root_term->id() != $term->id()) {
-            $replacements[$original] = $root_term->label();
-          }
-          break;
-      }
-    }
-
-    // Chained token relationships.
-    if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url'))) {
-      $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $term->urlInfo()), $options, $bubbleable_metadata);
-    }
-    // [term:parents:*] chained tokens.
-    if ($parents_tokens = \Drupal::token()->findWithPrefix($tokens, 'parents')) {
-      if ($parents = token_taxonomy_term_load_all_parents($term->id(), $langcode)) {
-        $replacements += \Drupal::token()->generate('array', $parents_tokens, array('array' => $parents), $options, $bubbleable_metadata);
-      }
-    }
-    if ($root_tokens = \Drupal::token()->findWithPrefix($tokens, 'root')) {
-      $parents = $term_storage->loadAllParents($term->id());
-      $root_term = end($parents);
-      if ($root_term->tid != $term->id()) {
-        $replacements += \Drupal::token()->generate('term', $root_tokens, array('term' => $root_term), $options, $bubbleable_metadata);
-      }
-    }
-  }
-
-  // Vocabulary tokens.
-  if ($type == 'vocabulary' && !empty($data['vocabulary'])) {
-    $vocabulary = $data['vocabulary'];
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'machine-name':
-          $replacements[$original] = $vocabulary->id();
-          break;
-        case 'edit-url':
-          $replacements[$original] = Url::fromRoute('entity.taxonomy_vocabulary.edit_form', ['taxonomy_vocabulary' => $vocabulary->id()], $url_options)->toString();
-          break;
-      }
-    }
-  }
-
-  // File tokens.
-  if ($type == 'file' && !empty($data['file'])) {
-    $file = $data['file'];
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'basename':
-          $basename = pathinfo($file->uri->value, PATHINFO_BASENAME);
-          $replacements[$original] = $basename;
-          break;
-        case 'extension':
-          $extension = pathinfo($file->uri->value, PATHINFO_EXTENSION);
-          $replacements[$original] = $extension;
-          break;
-        case 'size-raw':
-          $replacements[$original] = (int) $file->filesize->value;
-          break;
-      }
-    }
-  }
-
-  // User tokens.
-  if ($type == 'user' && !empty($data['user'])) {
-    /* @var \Drupal\user\UserInterface $account */
-    $account = $data['user'];
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'picture':
-          if ($account instanceof UserInterface && $account->hasField('user_picture')) {
-            /** @var \Drupal\Core\Render\RendererInterface $renderer */
-            $renderer = \Drupal::service('renderer');
-            $output = [
-              '#theme' => 'user_picture',
-              '#account' => $account,
-            ];
-            $replacements[$original] = $renderer->renderPlain($output);
-          }
-          break;
-
-        case 'roles':
-          $roles = $account->getRoles();
-          $roles_names = array_combine($roles, $roles);
-          $replacements[$original] = token_render_array($roles_names, $options);
-          break;
-      }
-    }
-
-    // Chained token relationships.
-    if ($account instanceof UserInterface && $account->hasField('user_picture') && ($picture_tokens = \Drupal::token()->findWithPrefix($tokens, 'picture'))) {
-      $replacements += \Drupal::token()->generate('file', $picture_tokens, array('file' => $account->user_picture->entity), $options, $bubbleable_metadata);
-    }
-    if ($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url')) {
-      $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $account->urlInfo()), $options, $bubbleable_metadata);
-    }
-    if ($role_tokens = \Drupal::token()->findWithPrefix($tokens, 'roles')) {
-      $roles = $account->getRoles();
-      $roles_names = array_combine($roles, $roles);
-      $replacements += \Drupal::token()->generate('array', $role_tokens, array('array' => $roles_names), $options, $bubbleable_metadata);
-    }
-  }
-
-  // Current user tokens.
-  if ($type == 'current-user') {
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'ip-address':
-          $ip = \Drupal::request()->getClientIp();
-          $replacements[$original] = $ip;
-          break;
-      }
-    }
-  }
-
-  // Menu link tokens.
-  if ($type == 'menu-link' && !empty($data['menu-link'])) {
-    /** @var \Drupal\Core\Menu\MenuLinkInterface $link */
-    $link = $data['menu-link'];
-    /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
-    $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
-
-    if ($link instanceof MenuLinkContentInterface) {
-      $link = $menu_link_manager->createInstance($link->getPluginId());
-    }
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'id':
-          $replacements[$original] = $link->getPluginId();
-          break;
-        case 'title':
-          $replacements[$original] = token_menu_link_translated_title($link, $langcode);
-          break;
-        case 'url':
-          $replacements[$original] = $link->getUrlObject()->setAbsolute()->toString();
-          break;
-        case 'parent':
-
-          /** @var \Drupal\Core\Menu\MenuLinkInterface $parent */
-          if ($link->getParent() && $parent = $menu_link_manager->createInstance($link->getParent())) {
-            $replacements[$original] = token_menu_link_translated_title($parent, $langcode);
-          }
-          break;
-        case 'parents':
-          if ($parents = token_menu_link_load_all_parents($link->getPluginId(), $langcode)) {
-            $replacements[$original] = token_render_array($parents, $options);
-          }
-          break;
-        case 'root';
-          if ($link->getParent() && $parent_ids = array_keys(token_menu_link_load_all_parents($link->getPluginId(), $langcode))) {
-            $root = $menu_link_manager->createInstance(array_shift($parent_ids));
-            $replacements[$original] = token_menu_link_translated_title($root, $langcode);
-          }
-          break;
-      }
-    }
-
-    // Chained token relationships.
-    /** @var \Drupal\Core\Menu\MenuLinkInterface $parent */
-    if ($link->getParent() && ($parent_tokens = \Drupal::token()->findWithPrefix($tokens, 'parent')) && $parent = $menu_link_manager->createInstance($link->getParent())) {
-      $replacements += \Drupal::token()->generate('menu-link', $parent_tokens, array('menu-link' => $parent), $options, $bubbleable_metadata);
-    }
-    // [menu-link:parents:*] chained tokens.
-    if ($parents_tokens = \Drupal::token()->findWithPrefix($tokens, 'parents')) {
-      if ($parents = token_menu_link_load_all_parents($link->getPluginId(), $langcode)) {
-        $replacements += \Drupal::token()->generate('array', $parents_tokens, array('array' => $parents), $options, $bubbleable_metadata);
-      }
-    }
-    if (($root_tokens = \Drupal::token()->findWithPrefix($tokens, 'root')) && $link->getParent() && $parent_ids = array_keys(token_menu_link_load_all_parents($link->getPluginId(), $langcode))) {
-      $root = $menu_link_manager->createInstance(array_shift($parent_ids));
-      $replacements += \Drupal::token()->generate('menu-link', $root_tokens, array('menu-link' => $root), $options, $bubbleable_metadata);
-    }
-    if ($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url')) {
-      $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $link->getUrlObject()), $options, $bubbleable_metadata);
-    }
-
-  }
-
-  // Current page tokens.
-  if ($type == 'current-page') {
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'title':
-          $request = \Drupal::request();
-          $route = $request->attributes->get(RouteObjectInterface::ROUTE_OBJECT);
-          if ($route) {
-            $title = \Drupal::service('title_resolver')->getTitle($request, $route);
-            $replacements[$original] = token_render_array_value($title);
-          }
-          break;
-        case 'url':
-          $replacements[$original] = Url::fromRoute('<current>', [], $url_options)->toString();
-          break;
-        case 'page-number':
-          if ($page = \Drupal::request()->query->get('page')) {
-            // @see PagerDefault::execute()
-            $pager_page_array = explode(',', $page);
-            $page = $pager_page_array[0];
-          }
-          $replacements[$original] = (int) $page + 1;
-          break;
-      }
-    }
-
-    // @deprecated
-    // [current-page:arg] dynamic tokens.
-    if ($arg_tokens = \Drupal::token()->findWithPrefix($tokens, 'arg')) {
-      $path = ltrim(\Drupal::service('path.current')->getPath(), '/');
-      // Make sure its a system path.
-      $path = \Drupal::service('path.alias_manager')->getPathByAlias($path);
-      foreach ($arg_tokens as $name => $original) {
-        $parts = explode('/', $path);
-        if (is_numeric($name) && isset($parts[$name])) {
-          $replacements[$original] = $parts[$name];
-        }
-      }
-    }
-
-    // [current-page:query] dynamic tokens.
-    if ($query_tokens = \Drupal::token()->findWithPrefix($tokens, 'query')) {
-      foreach ($query_tokens as $name => $original) {
-        if (\Drupal::request()->query->has($name)) {
-          $value = \Drupal::request()->query->get($name);
-          $replacements[$original] = $value;
-        }
-      }
-    }
-
-    // Chained token relationships.
-    if ($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url')) {
-      $url = Url::fromRoute('<current>');
-      $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $url), $options, $bubbleable_metadata);
-    }
-  }
-
-  // URL tokens.
-  if ($type == 'url' && !empty($data['url'])) {
-    /** @var \Drupal\Core\Url $url */
-    $url = $data['url'];
-    // To retrieve the correct path, modify a copy of the Url object.
-    $path_url = clone $url;
-    $path = '/' . $path_url->setAbsolute(FALSE)->setOption('fragment', NULL)->getInternalPath();
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'path':
-          $value = !($url->getOption('alias')) ? \Drupal::service('path.alias_manager')->getAliasByPath($path, $langcode) : $path;
-          $replacements[$original] = $value;
-          break;
-        case 'alias':
-          // @deprecated
-          $alias = \Drupal::service('path.alias_manager')->getAliasByPath($path, $langcode);
-          $replacements[$original] = $alias;
-          break;
-        case 'absolute':
-          $replacements[$original] = $url->setAbsolute()->toString();
-          break;
-        case 'relative':
-          $replacements[$original] = $url->setAbsolute(FALSE)->toString();
-          break;
-        case 'brief':
-          $replacements[$original] = preg_replace(array('!^https?://!', '!/$!'), '', $url->setAbsolute()->toString());
-          break;
-        case 'unaliased':
-          $unaliased = clone $url;
-          $replacements[$original] = $unaliased->setAbsolute()->setOption('alias', TRUE)->toString();
-          break;
-        case 'args':
-          $value = !($url->getOption('alias')) ? \Drupal::service('path.alias_manager')->getAliasByPath($path, $langcode) : $path;
-          $replacements[$original] = token_render_array(explode('/', $value), $options);
-          break;
-
-      }
-    }
-
-    // [url:args:*] chained tokens.
-    if ($arg_tokens = \Drupal::token()->findWithPrefix($tokens, 'args')) {
-      $value = !($url->getOption('alias')) ? \Drupal::service('path.alias_manager')->getAliasByPath($path, $langcode) : $path;
-      $replacements += \Drupal::token()->generate('array', $arg_tokens, array('array' => explode('/', ltrim($value, '/'))), $options, $bubbleable_metadata);
-    }
-
-    // [url:unaliased:*] chained tokens.
-    if ($unaliased_tokens = \Drupal::token()->findWithPrefix($tokens, 'unaliased')) {
-      $url->setOption('alias', TRUE);
-      $replacements += \Drupal::token()->generate('url', $unaliased_tokens, array('url' => $url), $options, $bubbleable_metadata);
-    }
-  }
-
-  // Entity tokens.
-  if (!empty($data[$type]) && $entity_type = \Drupal::service('token.entity_mapper')->getEntityTypeForTokenType($type)) {
-    /* @var \Drupal\Core\Entity\EntityInterface $entity */
-    $entity = $data[$type];
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'url':
-          if (_token_module($type, 'url') == 'token' && $url = $entity->url()) {
-            $replacements[$original] = $url;
-          }
-          break;
-
-        case 'original':
-          if (_token_module($type, 'original') == 'token' && !empty($entity->original)) {
-            $label = $entity->original->label();
-            $replacements[$original] = $label;
-          }
-          break;
-      }
-    }
-
-    // [entity:url:*] chained tokens.
-    if (($url_tokens = \Drupal::token()->findWithPrefix($tokens, 'url')) && _token_module($type, 'url') == 'token') {
-      $replacements += \Drupal::token()->generate('url', $url_tokens, array('url' => $entity->toUrl()), $options, $bubbleable_metadata);
-    }
-
-    // [entity:original:*] chained tokens.
-    if (($original_tokens = \Drupal::token()->findWithPrefix($tokens, 'original')) && _token_module($type, 'original') == 'token' && !empty($entity->original)) {
-      $replacements += \Drupal::token()->generate($type, $original_tokens, array($type => $entity->original), $options, $bubbleable_metadata);
-    }
-
-    // Pass through to an generic 'entity' token type generation.
-    $entity_data = array(
-      'entity_type' => $entity_type,
-      'entity' => $entity,
-      'token_type' => $type,
-    );
-    // @todo Investigate passing through more data like everything from entity_extract_ids().
-    $replacements += \Drupal::token()->generate('entity', $tokens, $entity_data, $options, $bubbleable_metadata);
-  }
-
-  // Array tokens.
-  if ($type == 'array' && !empty($data['array']) && is_array($data['array'])) {
-    $array = $data['array'];
-
-    $sort = isset($options['array sort']) ? $options['array sort'] : TRUE;
-    $keys = token_element_children($array, $sort);
-
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'first':
-          $value = $array[$keys[0]];
-          $value = is_array($value) ? $renderer->renderPlain($value) : (string) $value;
-          $replacements[$original] = $value;
-          break;
-        case 'last':
-          $value = $array[$keys[count($keys) - 1]];
-          $value = is_array($value) ? $renderer->renderPlain($value) : (string) $value;
-          $replacements[$original] =$value;
-          break;
-        case 'count':
-          $replacements[$original] = count($keys);
-          break;
-        case 'keys':
-          $replacements[$original] = token_render_array($keys, $options);
-          break;
-        case 'reversed':
-          $reversed = array_reverse($array, TRUE);
-          $replacements[$original] = token_render_array($reversed, $options);
-          break;
-        case 'join':
-          $replacements[$original] = token_render_array($array, array('join' => '') + $options);
-          break;
-      }
-    }
-
-    // [array:value:*] dynamic tokens.
-    if ($value_tokens = \Drupal::token()->findWithPrefix($tokens, 'value')) {
-      foreach ($value_tokens as $key => $original) {
-        if ($key[0] !== '#' && isset($array[$key])) {
-          $replacements[$original] = token_render_array_value($array[$key], $options);
-        }
-      }
-    }
-
-    // [array:join:*] dynamic tokens.
-    if ($join_tokens = \Drupal::token()->findWithPrefix($tokens, 'join')) {
-      foreach ($join_tokens as $join => $original) {
-        $replacements[$original] = token_render_array($array, array('join' => $join) + $options);
-      }
-    }
-
-    // [array:keys:*] chained tokens.
-    if ($key_tokens = \Drupal::token()->findWithPrefix($tokens, 'keys')) {
-      $replacements += \Drupal::token()->generate('array', $key_tokens, array('array' => $keys), $options, $bubbleable_metadata);
-    }
-
-    // [array:reversed:*] chained tokens.
-    if ($reversed_tokens = \Drupal::token()->findWithPrefix($tokens, 'reversed')) {
-      $replacements += \Drupal::token()->generate('array', $reversed_tokens, array('array' => array_reverse($array, TRUE)), array('array sort' => FALSE) + $options, $bubbleable_metadata);
-    }
-
-    // @todo Handle if the array values are not strings and could be chained.
-  }
-
-  // Random tokens.
-  if ($type == 'random') {
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'number':
-          $replacements[$original] = mt_rand();
-          break;
-      }
-    }
-
-    // [custom:hash:*] dynamic token.
-    if ($hash_tokens = \Drupal::token()->findWithPrefix($tokens, 'hash')) {
-      $algos = hash_algos();
-      foreach ($hash_tokens as $name => $original) {
-        if (in_array($name, $algos)) {
-          $replacements[$original] = hash($name, Crypt::randomBytes(55));
-        }
-      }
-    }
-  }
-
-  // If $type is a token type, $data[$type] is empty but $data[$entity_type] is
-  // not, re-run token replacements.
-  if (empty($data[$type]) && ($entity_type = \Drupal::service('token.entity_mapper')->getEntityTypeForTokenType($type)) && $entity_type != $type && !empty($data[$entity_type]) && empty($options['recursive'])) {
-    $data[$type] = $data[$entity_type];
-    $options['recursive'] = TRUE;
-    $replacements += \Drupal::moduleHandler()->invokeAll('tokens', array($type, $tokens, $data, $options, $bubbleable_metadata));
-  }
-
-  // If the token type specifics a 'needs-data' value, and the value is not
-  // present in $data, then throw an error.
-  if (!empty($GLOBALS['drupal_test_info']['test_run_id'])) {
-    // Only check when tests are running.
-    $type_info = \Drupal::token()->getTypeInfo($type);
-    if (!empty($type_info['needs-data']) && !isset($data[$type_info['needs-data']])) {
-      trigger_error(t('Attempting to perform token replacement for token type %type without required data', array('%type' => $type)), E_USER_WARNING);
-    }
-  }
-
-  return $replacements;
-}
-
-/**
- * Implements hook_token_info() on behalf of book.module.
- */
-function book_token_info() {
-  $info['types']['book'] = array(
-    'name' => t('Book'),
-    'description' => t('Tokens related to books.'),
-    'needs-data' => 'book',
-  );
-
-  $info['tokens']['book']['title'] = array(
-    'name' => t('Title'),
-    'description' => t('Title of the book.'),
-  );
-  $info['tokens']['book']['author'] = array(
-    'name' => t('Author'),
-    'description' => t('The author of the book.'),
-    'type' => 'user',
-  );
-  $info['tokens']['book']['root'] = array(
-    'name' => t('Root'),
-    'description' => t('Top level of the book.'),
-    'type' => 'node',
-  );
-  $info['tokens']['book']['parent'] = array(
-    'name' => t('Parent'),
-    'description' => t('Parent of the current page.'),
-    'type' => 'node',
-  );
-  $info['tokens']['book']['parents'] = array(
-    'name' => t('Parents'),
-    'description' => t("An array of all the node's parents, starting with the root."),
-    'type' => 'array',
-  );
-
-  $info['tokens']['node']['book'] = array(
-    'name' => t('Book'),
-    'description' => t('The book page associated with the node.'),
-    'type' => 'book',
-  );
-  return $info;
-}
-
-/**
- * Implements hook_tokens() on behalf of book.module.
- */
-function book_tokens($type, $tokens, array $data = array(), array $options = array(), BubbleableMetadata $bubbleable_metadata) {
-  $replacements = array();
-
-  // Node tokens.
-  if ($type == 'node' && !empty($data['node'])) {
-    $book = $data['node']->book;
-
-    if (!empty($book['bid'])) {
-      if ($book_tokens = \Drupal::token()->findWithPrefix($tokens, 'book')) {
-        $child_node = Node::load($book['nid']);
-        $replacements += \Drupal::token()->generate('book', $book_tokens, array('book' => $child_node), $options, $bubbleable_metadata);
-      }
-    }
-  }
-  // Book tokens.
-  else if ($type == 'book' && !empty($data['book'])) {
-    $book = $data['book']->book;
-
-    if (!empty($book['bid'])) {
-      $book_node = Node::load($book['bid']);
-
-      foreach ($tokens as $name => $original) {
-        switch ($name) {
-          case 'root':
-          case 'title':
-            $replacements[$original] = $book_node->getTitle();
-            break;
-          case 'parent':
-            if (!empty($book['pid'])) {
-              $parent_node = Node::load($book['pid']);
-              $replacements[$original] = $parent_node->getTitle();
-            }
-            break;
-          case 'parents':
-            if ($parents = token_book_load_all_parents($book)) {
-              $replacements[$original] = token_render_array($parents, $options);
-            }
-            break;
-        }
-      }
-
-      if ($book_tokens = \Drupal::token()->findWithPrefix($tokens, 'author')) {
-        $replacements += \Drupal::token()->generate('user', $book_tokens, array('user' => $book_node->getOwner()), $options, $bubbleable_metadata);
-      }
-      if ($book_tokens = \Drupal::token()->findWithPrefix($tokens, 'root')) {
-        $replacements += \Drupal::token()->generate('node', $book_tokens, array('node' => $book_node), $options, $bubbleable_metadata);
-      }
-      if (!empty($book['pid']) && $book_tokens = \Drupal::token()->findWithPrefix($tokens, 'parent')) {
-        $parent_node = Node::load($book['pid']);
-        $replacements += \Drupal::token()->generate('node', $book_tokens, array('node' => $parent_node), $options, $bubbleable_metadata);
-      }
-      if ($book_tokens = \Drupal::token()->findWithPrefix($tokens, 'parents')) {
-        $parents = token_book_load_all_parents($book);
-        $replacements += \Drupal::token()->generate('array', $book_tokens, array('array' => $parents), $options, $bubbleable_metadata);
-      }
-    }
-  }
-
-  return $replacements;
-}
-
-/**
- * Implements hook_token_info() on behalf of menu_ui.module.
- */
-function menu_ui_token_info() {
-  // Menu tokens.
-  $info['types']['menu'] = array(
-    'name' => t('Menus'),
-    'description' => t('Tokens related to menus.'),
-    'needs-data' => 'menu',
-  );
-  $info['tokens']['menu']['name'] = array(
-    'name' => t('Name'),
-    'description' => t("The name of the menu."),
-  );
-  $info['tokens']['menu']['machine-name'] = array(
-    'name' => t('Machine-readable name'),
-    'description' => t("The unique machine-readable name of the menu."),
-  );
-  $info['tokens']['menu']['description'] = array(
-    'name' => t('Description'),
-    'description' => t('The optional description of the menu.'),
-  );
-  $info['tokens']['menu']['menu-link-count'] = array(
-    'name' => t('Menu link count'),
-    'description' => t('The number of menu links belonging to the menu.'),
-  );
-  $info['tokens']['menu']['edit-url'] = array(
-    'name' => t('Edit URL'),
-    'description' => t("The URL of the menu's edit page."),
-  );
-
-  $info['tokens']['menu-link']['menu'] = array(
-    'name' => t('Menu'),
-    'description' => t('The menu of the menu link.'),
-    'type' => 'menu',
-  );
-  $info['tokens']['menu-link']['edit-url'] = array(
-    'name' => t('Edit URL'),
-    'description' => t("The URL of the menu link's edit page."),
-  );
-  $info['tokens']['node']['menu-link'] = array(
-    'name' => t('Menu link'),
-    'description' => t("The menu link for this node."),
-    'type' => 'menu-link',
-  );
-
-  return $info;
-}
-
-/**
- * Implements hook_tokens() on behalf of menu_ui.module.
- */
-function menu_ui_tokens($type, $tokens, array $data = array(), array $options = array(), BubbleableMetadata $bubbleable_metadata) {
-  $replacements = array();
-
-  /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
-  $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
-
-  $url_options = array('absolute' => TRUE);
-  if (isset($options['langcode'])) {
-    $url_options['language'] = \Drupal::languageManager()->getLanguage($options['langcode']);
-    $langcode = $options['langcode'];
-  }
-  else {
-    $langcode = NULL;
-  }
-
-  // Node tokens.
-  if ($type == 'node' && !empty($data['node'])) {
-    /** @var \Drupal\node\NodeInterface $node */
-    $node = $data['node'];
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'menu-link':
-          // On node-form save we populate a calculated field with a menu_link
-          // references.
-          // @see token_node_menu_link_submit()
-          if ($node->getFieldDefinition('menu_link') && $menu_link = $node->menu_link->entity) {
-            /** @var \Drupal\menu_link_content\MenuLinkContentInterface $menu_link */
-            $replacements[$original] = $menu_link->getTitle();
-          }
-          else {
-            $url = $node->toUrl();
-            if ($links = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters())) {
-              $link = _token_menu_link_best_match($node, $links);
-              $replacements[$original] = token_menu_link_translated_title($link, $langcode);
-            }
-          }
-          break;
-      }
-
-      // Chained token relationships.
-      if ($menu_tokens = \Drupal::token()->findWithPrefix($tokens, 'menu-link')) {
-        if ($node->getFieldDefinition('menu_link') && $menu_link = $node->menu_link->entity) {
-          /** @var \Drupal\menu_link_content\MenuLinkContentInterface $menu_link */
-          $replacements += \Drupal::token()->generate('menu-link', $menu_tokens, array('menu-link' => $menu_link), $options, $bubbleable_metadata);
-        }
-        else {
-          $url = $node->urlInfo();
-          if ($links = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters())) {
-            $link = _token_menu_link_best_match($node, $links);
-            $replacements += \Drupal::token()->generate('menu-link', $menu_tokens, array('menu-link' => $link), $options, $bubbleable_metadata);
-          }
-        }
-      }
-    }
-  }
-
-  // Menu link tokens.
-  if ($type == 'menu-link' && !empty($data['menu-link'])) {
-    /** @var \Drupal\Core\Menu\MenuLinkInterface $link */
-    $link = $data['menu-link'];
-
-    if ($link instanceof MenuLinkContentInterface) {
-      $link = $menu_link_manager->createInstance($link->getPluginId());
-    }
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'menu':
-          if ($menu = Menu::load($link->getMenuName())) {
-            $replacements[$original] = $menu->label();
-          }
-          break;
-
-        case 'edit-url':
-          $replacements[$original] = $link->getEditRoute()->setOptions($url_options)->toString();
-          break;
-      }
-    }
-
-    // Chained token relationships.
-    if (($menu_tokens = \Drupal::token()->findWithPrefix($tokens, 'menu')) && $menu = Menu::load($link->getMenuName())) {
-      $replacements += \Drupal::token()->generate('menu', $menu_tokens, array('menu' => $menu), $options, $bubbleable_metadata);
-    }
-  }
-
-  // Menu tokens.
-  if ($type == 'menu' && !empty($data['menu'])) {
-    /** @var \Drupal\system\MenuInterface $menu */
-    $menu = $data['menu'];
-
-    foreach ($tokens as $name => $original) {
-      switch ($name) {
-        case 'name':
-          $replacements[$original] = $menu->label();
-          break;
-
-        case 'machine-name':
-          $replacements[$original] = $menu->id();
-          break;
-
-        case 'description':
-          $replacements[$original] = $menu->getDescription();
-          break;
-
-        case 'menu-link-count':
-          $replacements[$original] = $menu_link_manager->countMenuLinks($menu->id());
-          break;
-
-        case 'edit-url':
-          $replacements[$original] = Url::fromRoute('entity.menu.edit_form', ['menu' => $menu->id()], $url_options)->toString();
-          break;
-      }
-    }
-  }
-
-  return $replacements;
-}
-
-/**
- * Returns a best matched link for a given node.
- *
- * If the url exists in multiple menus, default to the one set on the node
- * itself.
- *
- * @param \Drupal\node\NodeInterface $node
- *   The node to look up the default menu settings from.
- * @param array $links
- *   An array of instances keyed by plugin ID.
- *
- * @return \Drupal\Core\Menu\MenuLinkInterface
- *   A Link instance.
- */
-function _token_menu_link_best_match(NodeInterface $node, array $links) {
-  // Get the menu ui defaults so we can determine what menu was
-  // selected for this node. This ensures that if the node was added
-  // to the menu via the node UI, we use that as a default. If it
-  // was not added via the node UI then grab the first in the
-  // retrieved array.
-  $defaults = menu_ui_get_menu_link_defaults($node);
-  if (isset($defaults['id']) && isset($links[$defaults['id']])) {
-    $link = $links[$defaults['id']];
-  }
-  else {
-    $link = reset($links);
-  }
-  return $link;
-}
-
-/**
- * Implements hook_token_info_alter() on behalf of field.module.
- *
- * We use hook_token_info_alter() rather than hook_token_info() as other
- * modules may already have defined some field tokens.
- */
-function field_token_info_alter(&$info) {
-  $type_info = \Drupal::service('plugin.manager.field.field_type')->getDefinitions();
-
-  // Attach field tokens to their respecitve entity tokens.
-  foreach (\Drupal::entityTypeManager()->getDefinitions() as $entity_type_id => $entity_type) {
-    if (!$entity_type->isSubclassOf('\Drupal\Core\Entity\ContentEntityInterface')) {
-      continue;
-    }
-
-    // Make sure a token type exists for this entity.
-    $token_type = \Drupal::service('token.entity_mapper')->getTokenTypeForEntityType($entity_type_id);
-    if (empty($token_type)) {
-      continue;
-    }
-
-    $fields = \Drupal::service('entity_field.manager')->getFieldStorageDefinitions($entity_type_id);
-    foreach ($fields as $field_name => $field) {
-      /** @var \Drupal\field\FieldStorageConfigInterface $field */
-      // Ensure the token type exists.
-      if (!isset($info['types'][$token_type])) {
-        continue;
-      }
-
-      // Ensure the token implements FieldStorageConfigInterface or is defined
-      // in token module.
-      $provider = '';
-      if (isset($info['types'][$token_type]['module'])) {
-        $provider = $info['types'][$token_type]['module'];
-      }
-      if (!($field instanceof FieldStorageConfigInterface) && $provider != 'token') {
-        continue;
-      }
-
-      // If a token already exists for this field, then don't add it.
-      if (isset($info['tokens'][$token_type][$field_name])) {
-        continue;
-      }
-
-      if ($token_type == 'comment' && $field_name == 'comment_body') {
-        // Core provides the comment field as [comment:body].
-        continue;
-      }
-
-      // Do not define the token type if the field has no properties.
-      if (!$field->getPropertyDefinitions()) {
-        continue;
-      }
-
-      // Generate a description for the token.
-      $labels = _token_field_label($entity_type_id, $field_name);
-      $label = array_shift($labels);
-      $params['@type'] = $type_info[$field->getType()]['label'];
-      if (!empty($labels)) {
-        $params['%labels'] = implode(', ', $labels);
-        $description = t('@type field. Also known as %labels.', $params);
-      }
-      else {
-        $description = t('@type field.', $params);
-      }
-
-      $cardinality = $field->getCardinality();
-      $cardinality = ($cardinality == FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED || $cardinality > 3) ? 3 : $cardinality;
-      $field_token_name = $token_type . '-' . $field_name;
-      $info['tokens'][$token_type][$field_name] = array(
-        'name' => Html::escape($label),
-        'description' => $description,
-        'module' => 'token',
-        // For multivalue fields the field token is a list type.
-        'type' => $cardinality > 1 ? "list<$field_token_name>" : $field_token_name,
-      );
-
-      // Field token type.
-      $info['types'][$field_token_name] = [
-        'name' => Html::escape($label),
-        'description' => t('@label tokens.', ['@label' => Html::escape($label)]),
-        'needs-data' => $field_token_name,
-        'nested' => TRUE,
-      ];
-      // Field list token type.
-      if ($cardinality > 1) {
-        $info['types']["list<$field_token_name>"] = array(
-          'name' => t('List of @type values', array('@type' => Html::escape($label))),
-          'description' => t('Tokens for lists of @type values.', array('@type' => Html::escape($label))),
-          'needs-data' => "list<$field_token_name>",
-          'nested' => TRUE,
-        );
-      }
-
-      // Show a different token for each field delta.
-      if ($cardinality > 1) {
-        for ($delta = 0; $delta < $cardinality; $delta++) {
-          $info['tokens']["list<$field_token_name>"][$delta] = [
-            'name' => t('@type type with delta @delta', ['@type' => Html::escape($label), '@delta' => $delta]),
-            'module' => 'token',
-            'type' => $field_token_name,
-          ];
-        }
-      }
-
-      // Property tokens.
-      foreach ($field->getPropertyDefinitions() as $property => $property_definition) {
-        if (is_subclass_of($property_definition->getClass(), 'Drupal\Core\TypedData\PrimitiveInterface')) {
-          $info['tokens'][$field_token_name][$property] = [
-            'name' => $property_definition->getLabel(),
-            'description' => $property_definition->getDescription(),
-            'module' => 'token',
-          ];
-        }
-        elseif (($property_definition instanceof DataReferenceDefinitionInterface) && ($property_definition->getTargetDefinition() instanceof EntityDataDefinitionInterface)) {
-          $referenced_entity_type = $property_definition->getTargetDefinition()->getEntityTypeId();
-          $referenced_token_type = \Drupal::service('token.entity_mapper')->getTokenTypeForEntityType($referenced_entity_type);
-          $info['tokens'][$field_token_name][$property] = [
-            'name' => $property_definition->getLabel(),
-            'description' => $property_definition->getDescription(),
-            'module' => 'token',
-            'type' => $referenced_token_type,
-          ];
-        }
-      }
-      // Provide image_with_image_style tokens for image fields.
-      if ($field->getType() == 'image') {
-        $image_styles = image_style_options(FALSE);
-        foreach ($image_styles as $style => $description) {
-          $info['tokens'][$field_token_name][$style] = [
-            'name' => $description,
-            'description' => t('Represents the image in the given image style.'),
-            'type' => 'image_with_image_style',
-          ];
-        }
-      }
-      // Provide format token for datetime fields.
-      if ($field->getType() == 'datetime') {
-        $info['tokens'][$field_token_name]['date'] = $info['tokens'][$field_token_name]['value'];
-        $info['tokens'][$field_token_name]['date']['name'] .= ' ' . t('format');
-        $info['tokens'][$field_token_name]['date']['type'] = 'date';
-      }
-      if ($field->getType() == 'daterange') {
-        $info['tokens'][$field_token_name]['start_date'] = $info['tokens'][$field_token_name]['value'];
-        $info['tokens'][$field_token_name]['start_date']['name'] .= ' ' . t('format');
-        $info['tokens'][$field_token_name]['start_date']['type'] = 'date';
-        $info['tokens'][$field_token_name]['end_date'] = $info['tokens'][$field_token_name]['end_value'];
-        $info['tokens'][$field_token_name]['end_date']['name'] .= ' ' . t('format');
-        $info['tokens'][$field_token_name]['end_date']['type'] = 'date';
-      }
-    }
-  }
-}
-
-/**
- * Returns the label of a certain field.
- *
- * Therefore it looks up in all bundles to find the most used instance.
- *
- * Based on views_entity_field_label().
- *
- * @todo Resync this method with views_entity_field_label().
- */
-function _token_field_label($entity_type, $field_name) {
-  $labels = [];
-  // Count the amount of instances per label per field.
-  foreach (array_keys(\Drupal::service('entity_type.bundle.info')->getBundleInfo($entity_type)) as $bundle) {
-    $bundle_instances = \Drupal::service('entity_field.manager')->getFieldDefinitions($entity_type, $bundle);
-    if (isset($bundle_instances[$field_name])) {
-      $instance = $bundle_instances[$field_name];
-      $label = (string) $instance->getLabel();
-      $labels[$label] = isset($labels[$label]) ? ++$labels[$label] : 1;
-    }
-  }
-
-  if (empty($labels)) {
-    return [$field_name];
-  }
-
-  // Sort the field labels by it most used label and return the labels.
-  arsort($labels);
-  return array_keys($labels);
-}
-
-/**
- * Implements hook_tokens() on behalf of field.module.
- */
-function field_tokens($type, $tokens, array $data = array(), array $options = array(), BubbleableMetadata $bubbleable_metadata) {
-  $replacements = array();
-  $langcode = isset($options['langcode']) ? $options['langcode'] : NULL;
-  // Entity tokens.
-  if ($type == 'entity' && !empty($data['entity_type']) && !empty($data['entity']) && !empty($data['token_type'])) {
-    /* @var \Drupal\Core\Entity\ContentEntityInterface $entity */
-    $entity = $data['entity'];
-    if (!($entity instanceof ContentEntityInterface)) {
-      return $replacements;
-    }
-
-    if (!isset($options['langcode'])) {
-      // Set the active language in $options, so that it is passed along.
-      $langcode = $options['langcode'] = $entity->language()->getId();
-    }
-    // Obtain the entity with the correct language.
-    $entity = \Drupal::service('entity.repository')->getTranslationFromContext($entity, $langcode);
-
-    $view_mode_name = $entity->getEntityTypeId() . '.' . $entity->bundle() . '.token';
-    $view_display = \Drupal::entityTypeManager()->getStorage('entity_view_display')->load($view_mode_name);
-    $token_view_display = (!empty($view_display) && $view_display->status());
-    foreach ($tokens as $name => $original) {
-      // For the [entity:field_name] token.
-      if (strpos($name, ':') === FALSE) {
-        $field_name = $name;
-        $token_name = $name;
-      }
-      // For [entity:field_name:0], [entity:field_name:0:value] and
-      // [entity:field_name:value] tokens.
-      else {
-        list($field_name, $delta) = explode(':', $name, 2);
-        if (!is_numeric($delta)) {
-          unset($delta);
-        }
-        $token_name = $field_name;
-      }
-      // Ensure the entity has the requested field and that the token for it is
-      // defined by token.module.
-      if (!$entity->hasField($field_name) || _token_module($data['token_type'], $token_name) != 'token') {
-        continue;
-      }
-
-      $display_options = 'token';
-      // Do not continue if the field is empty.
-      if ($entity->get($field_name)->isEmpty()) {
-        continue;
-      }
-      // Handle [entity:field_name] and [entity:field_name:0] tokens.
-      if ($field_name === $name || isset($delta)) {
-        if (!$token_view_display) {
-          // We don't have the token view display and should fall back on
-          // default formatters. If the field has specified a specific formatter
-          // to be used by default with tokens, use that, otherwise use the
-          // default formatter.
-          /** @var \Drupal\Core\Field\FieldTypePluginManager $field_type_manager */
-          $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
-          $field_type_definition = $field_type_manager->getDefinition($entity->getFieldDefinition($field_name)->getType());
-          $display_options = [
-            'type' => !empty($field_type_definition['default_token_formatter']) ? $field_type_definition['default_token_formatter'] : $field_type_definition['default_formatter'],
-            'label' => 'hidden',
-          ];
-        }
-
-        // Render only one delta.
-        if (isset($delta)) {
-          if ($field_delta = $entity->{$field_name}[$delta]) {
-            $field_output = $field_delta->view($display_options);
-          }
-          // If no such delta exists, let's not replace the token.
-          else {
-            continue;
-          }
-        }
-        // Render the whole field (with all deltas).
-        else {
-          $field_output = $entity->$field_name->view($display_options);
-          // If we are displaying all field items we need this #pre_render
-          // callback.
-          $field_output['#pre_render'][] = 'token_pre_render_field_token';
-        }
-        $field_output['#token_options'] = $options;
-        $replacements[$original] = \Drupal::service('renderer')->renderPlain($field_output);
-      }
-      // Handle [entity:field_name:value] and [entity:field_name:0:value]
-      // tokens.
-      else if ($field_tokens = \Drupal::token()->findWithPrefix($tokens, $field_name)) {
-        $property_token_data = [
-          'field_property' => TRUE,
-          $data['entity_type'] . '-' . $field_name => $entity->$field_name,
-          'field_name' => $data['entity_type'] . '-' . $field_name,
-        ];
-        $replacements += \Drupal::token()->generate($field_name, $field_tokens, $property_token_data, $options, $bubbleable_metadata);
-      }
-    }
-
-    // Remove the cloned object from memory.
-    unset($entity);
-  }
-  elseif (!empty($data['field_property'])) {
-    foreach ($tokens as $token => $original) {
-      $filtered_tokens = $tokens;
-      $delta = 0;
-      $parts = explode(':', $token);
-      if (is_numeric($parts[0])) {
-        if (count($parts) > 1) {
-          $delta = $parts[0];
-          $property_name = $parts[1];
-          // Pre-filter the tokens to select those with the correct delta.
-          $filtered_tokens = \Drupal::token()->findWithPrefix($tokens, $delta);
-          // Remove the delta to unify between having and not having one.
-          array_shift($parts);
-        }
-        else {
-          // Token is fieldname:delta, which is invalid.
-          continue;
-        }
-      }
-      else {
-        $property_name = $parts[0];
-      }
-
-      if (isset($data[$data['field_name']][$delta])) {
-        $field_item = $data[$data['field_name']][$delta];
-      }
-      else {
-        // The field has no such delta, abort replacement.
-        continue;
-      }
-
-      if (isset($field_item->$property_name) && ($field_item->$property_name instanceof FieldableEntityInterface)) {
-        // Entity reference field.
-        $entity = $field_item->$property_name;
-        // Obtain the referenced entity with the correct language.
-        $entity = \Drupal::service('entity.repository')->getTranslationFromContext($entity, $langcode);
-
-        if (count($parts) > 1) {
-          $field_tokens = \Drupal::token()->findWithPrefix($filtered_tokens, $property_name);
-          $token_type = \Drupal::service('token.entity_mapper')->getTokenTypeForEntityType($entity->getEntityTypeId(), TRUE);
-          $replacements += \Drupal::token()->generate($token_type, $field_tokens, [$token_type => $entity], $options, $bubbleable_metadata);
-        }
-        else {
-          $replacements[$original] = $entity->label();
-        }
-      }
-      elseif (($field_item->getFieldDefinition()->getType() == 'image') && ($style = ImageStyle::load($property_name))) {
-        // Handle [node:field_name:image_style:property] tokens and multivalued
-        // [node:field_name:delta:image_style:property] tokens. If the token is
-        // of the form [node:field_name:image_style], provide the URL as a
-        // replacement.
-        $property_name = isset($parts[1]) ? $parts[1] : 'url';
-        $entity = $field_item->entity;
-        $original_uri = $entity->getFileUri();
-
-        // Only generate the image derivative if needed.
-        if ($property_name === 'width' || $property_name === 'height') {
-          $dimensions = [
-            'width' => $field_item->width,
-            'height' => $field_item->height,
-          ];
-          $style->transformDimensions($dimensions, $original_uri);
-          $replacements[$original] = $dimensions[$property_name];
-        }
-        elseif ($property_name === 'uri') {
-          $replacements[$original] = $style->buildUri($original_uri);
-        }
-        elseif ($property_name === 'url') {
-          $replacements[$original] = $style->buildUrl($original_uri);
-        }
-        else {
-          // Generate the image derivative, if it doesn't already exist.
-          $derivative_uri = $style->buildUri($original_uri);
-          $derivative_exists = TRUE;
-          if (!file_exists($derivative_uri)) {
-            $derivative_exists = $style->createDerivative($original_uri, $derivative_uri);
-          }
-          if ($derivative_exists) {
-            $image = \Drupal::service('image.factory')->get($derivative_uri);
-            // Provide the replacement.
-            switch ($property_name) {
-              case 'mimetype':
-                $replacements[$original] = $image->getMimeType();
-                break;
-              case 'filesize' :
-                $replacements[$original] = $image->getFileSize();
-                break;
-            }
-          }
-        }
-      }
-      elseif (in_array($field_item->getFieldDefinition()->getType(), ['datetime', 'daterange']) && in_array($property_name, ['date', 'start_date', 'end_date'])) {
-        $datetime = $field_item->$property_name->getTimestamp();
-        if($property_name == $token) {
-          $replacements[$original] = $datetime;
-        }
-        else {
-          $field_tokens = \Drupal::token()->findWithPrefix($tokens, $property_name);
-          $replacements += \Drupal::token()->generate('date', $field_tokens, ['date' => $datetime], $options, $bubbleable_metadata);
-        }
-      }
-      else {
-        $replacements[$original] = $field_item->$property_name;
-      }
-    }
-  }
-  return $replacements;
-}
-
-/**
- * Pre-render callback for field output used with tokens.
- */
-function token_pre_render_field_token($elements) {
-  // Remove the field theme hook, attachments, and JavaScript states.
-  unset($elements['#theme']);
-  unset($elements['#states']);
-  unset($elements['#attached']);
-
-  // Prevent multi-value fields from appearing smooshed together by appending
-  // a join suffix to all but the last value.
-  $deltas = Element::getVisibleChildren($elements);
-  $count = count($deltas);
-  if ($count > 1) {
-    $join = isset($elements['#token_options']['join']) ? $elements['#token_options']['join'] : ", ";
-    foreach ($deltas as $index => $delta) {
-      // Do not add a suffix to the last item.
-      if ($index < ($count - 1)) {
-        $elements[$delta] += array('#suffix' => $join);
-      }
-    }
-  }
-  return $elements;
-}
diff --git a/modules/tour_ui/LICENSE.txt b/modules/tour_ui/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/tour_ui/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/tour_ui/README.txt b/modules/tour_ui/README.txt
deleted file mode 100644
index 0f01590..0000000
--- a/modules/tour_ui/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is the UI for core module Tour
diff --git a/modules/tour_ui/src/Controller/TourTipController.php b/modules/tour_ui/src/Controller/TourTipController.php
deleted file mode 100644
index 23c5f4d..0000000
--- a/modules/tour_ui/src/Controller/TourTipController.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace Drupal\tour_ui\Controller;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Form\FormState;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\tour\Entity\Tour;
-use Drupal\tour\TipPluginManager;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Handles page returns for tour tip.
- */
-class TourTipController extends ControllerBase implements ContainerInjectionInterface {
-
-  /**
-   * The Tip plugin manager.
-   *
-   * @var \Drupal\tour\TipPluginManager
-   */
-  protected $tipPluginManager;
-
-  /**
-   * The form builder.
-   *
-   * @var \Drupal\Core\Form\FormBuilderInterface
-   */
-  protected $formBuilder;
-
-  /**
-   * Constructs a new TourTipController object.
-   *
-   * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
-   *   The form builder.
-   */
-  public function __construct(TipPluginManager $tipPluginManager, FormBuilderInterface $form_builder) {
-    $this->tipPluginManager = $tipPluginManager;
-    $this->formBuilder = $form_builder;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.tour.tip'),
-      $container->get('form_builder')
-    );
-  }
-
-  /**
-   * Provides a creation form for a new tip to be added to a tour entity.
-   *
-   * @param $tour
-   *   The tour in which the tip needs to be added to.
-   *
-   * @param $type
-   *   The type of tip that will be added to the tour.
-   *
-   * @return array
-   *   A renderable form array.
-   */
-  public function add(Tour $tour, $type = '') {
-    // We need a type to build this form.
-    if (!$type) {
-      throw new NotFoundHttpException();
-    }
-
-    // Default values.
-    $request = \Drupal::service('request_stack');
-    $defaults = array(
-      'plugin' => Html::escape($type),
-      'weight' => $request->getCurrentRequest()->query->get('weight'),
-    );
-
-    // Build a new stub tip.
-    $manager = \Drupal::service('plugin.manager.tour.tip');
-    $stub = $manager->createInstance($type, $defaults);
-
-    // Attach the tour, tip and if it's new to the form.
-    $form_state = new FormState();
-    $form_state->setFormState([
-      '#tour' => $tour,
-      '#tip' => $stub,
-      '#new' => TRUE,
-    ]);
-    return $this->formBuilder->buildForm('\Drupal\tour_ui\Form\TourTipForm', $form_state);
-  }
-
-  /**
-   * Provides an edit form for tip to be updated against a tour entity.
-   *
-   * @param $tour
-   *   The tour in which the tip is being edited against.
-   *
-   * @param $tip
-   *   The identifier of tip that will be edited against the tour.
-   *
-   * @return array
-   *   A renderable form array.
-   */
-  public function edit(Tour $tour, $tip = '') {
-    // We need a tip to build this form.
-    if (!$tip && !$tour) {
-      throw new NotFoundHttpException();
-    }
-
-    // If the tip doesn't exist return.
-    $tips = array_keys($tour->getTips());
-    if (!in_array($tip, $tips)) {
-      throw new NotFoundHttpException();
-    }
-
-    // Attach the tour and tip.
-    $form_state = new FormState();
-    $form_state->setFormState([
-      '#tour' => $tour,
-      '#tip' => $tour->getTip($tip),
-    ]);
-    return $this->formBuilder->buildForm('\Drupal\tour_ui\Form\TourTipForm', $form_state);
-  }
-
-}
diff --git a/modules/tour_ui/src/Form/TourDeleteForm.php b/modules/tour_ui/src/Form/TourDeleteForm.php
deleted file mode 100644
index cdec37f..0000000
--- a/modules/tour_ui/src/Form/TourDeleteForm.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\tour_ui\Form;
-
-use Drupal\Core\Entity\EntityDeleteForm;
-use Drupal\Core\Url;
-
-/**
- * Builds the form to delete a tour.
- */
-class TourDeleteForm extends EntityDeleteForm {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return Url::fromRoute('entity.tour.collection');
-  }
-}
diff --git a/modules/tour_ui/src/Form/TourForm.php b/modules/tour_ui/src/Form/TourForm.php
deleted file mode 100644
index 19eb257..0000000
--- a/modules/tour_ui/src/Form/TourForm.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-
-namespace Drupal\tour_ui\Form;
-
-use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Form\FormState;
-use Drupal\Core\Language\LanguageInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Url;
-
-/**
- * Form controller for the tour entity edit forms.
- */
-class TourForm extends EntityForm {
-
-  /**
-   * Entity manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity_type.manager')
-    );
-  }
-
-  /**
-   * Constructs a TourForm object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity manager service.
-   * @param \Psr\Log\LoggerInterface $logger
-   *   A logger instance.
-   * @param \Drupal\comment\CommentManagerInterface $comment_manager
-   *   The comment manager.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $tour = $this->entity;
-    $form = parent::form($form, $form_state);
-    $form['label'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Tour name'),
-      '#required' => TRUE,
-      '#default_value' => $tour->label(),
-    ];
-    $form['id'] = [
-      '#type' => 'machine_name',
-      '#machine_name' => [
-        'exists' => '\Drupal\tour\Entity\Tour::load',
-        'replace_pattern' => '[^a-z0-9-]+',
-        'replace' => '-',
-      ],
-      '#default_value' => $tour->id(),
-      '#disabled' => !$tour->isNew(),
-    ];
-
-    $form['langcode'] = [
-      '#type' => 'language_select',
-      '#title' => $this->t('Language'),
-      '#languages' => LanguageInterface::STATE_ALL,
-      // Default to the content language opposed to und (language not specified).
-      '#default_value' => empty($tour->langcode) ? \Drupal::languageManager()->getCurrentLanguage()->getId() : $tour->langcode,
-    ];
-    $form['module'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Module name'),
-      '#description' => $this->t('Each tour needs a module.'),
-      '#required' => TRUE,
-      '#default_value' => $tour->get('module'),
-    ];
-
-    $default_routes = [];
-    if ($routes = $tour->getRoutes()) {
-      foreach ($routes as $route) {
-        $default_routes[] = $route['route_name'];
-      }
-    }
-    $form['routes'] = [
-      '#type' => 'textarea',
-      '#title' => $this->t('Routes'),
-      '#default_value' => implode("\n", $default_routes),
-      '#rows' => 5,
-      '#description' => $this->t('Provide a list of routes that this tour will be displayed on. Add one route by line.'),
-    ];
-
-    // Don't show the tips on the inital add.
-    if ($tour->isNew()) {
-      return $form;
-    }
-
-    // Start building the list of tips assigned to this tour.
-    $form['tips'] = [
-      '#type' => 'table',
-      '#header' => [
-        $this->t('Label'),
-        $this->t('Weight'),
-        $this->t('Operations'),
-      ],
-      '#caption' => [['#markup' => $this->t('Tips provided by this tour. By clicking on Operations buttons, every changes which are not saved will be lost.')]],
-      '#tabledrag' => [
-        [
-          'action' => 'order',
-          'relationship' => 'sibling',
-          'group' => 'tip-order-weight'
-        ],
-      ],
-      '#weight' => 40,
-    ];
-
-    // Populate the table with the assigned tips.
-    $tips = $tour->getTips();
-    if (!empty($tips)) {
-      foreach ($tips as $key => $tip) {
-        $tip_id = $tip->get('id');
-        try {
-          $form['#data'][$tip_id] = $tip->getConfiguration();
-        }
-        catch (\Error $e) {
-          drupal_set_message($this->t('Tip %tip is not configurable. You cannot save this tour.', ['%tip' => $tip->getLabel()]), 'warning');
-        }
-        $form['tips'][$tip_id]['#attributes']['class'][] = 'draggable';
-        $form['tips'][$tip_id]['label'] = [
-          '#plain_text' => $tip->get('label'),
-        ];
-
-        $form['tips'][$tip_id]['weight'] = [
-          '#type' => 'weight',
-          '#title' => $this->t('Weight for @title', ['@title' => $tip->get('label')]),
-          '#delta' => 100,
-          '#title_display' => 'invisible',
-          '#default_value' => $tip->get('weight'),
-          '#attributes' => [
-            'class' => ['tip-order-weight'],
-          ],
-        ];
-
-        // Provide operations links for the tip.
-        $links = [];
-        if (method_exists($tip, 'buildConfigurationForm')) {
-          $links['edit'] = [
-            'title' => $this->t('Edit'),
-            'url' => Url::fromRoute('tour_ui.tip.edit', ['tour' => $tour->id(), 'tip' => $tip_id]),
-          ];
-        }
-        $links['delete'] = [
-          'title' => $this->t('Delete'),
-          'url' => Url::fromRoute('tour_ui.tip.delete', ['tour' => $tour->id(), 'tip' => $tip_id]),
-        ];
-        $form['tips'][$tip_id]['operations'] = [
-          '#type' => 'operations',
-          '#links' => $links,
-        ];
-      }
-    }
-
-    // Build the new tour tip addition form and add it to the tips list.
-    $tip_definitions = \Drupal::service('plugin.manager.tour.tip')->getDefinitions();
-    $tip_definition_options = [];
-    foreach ($tip_definitions as $tip => $definition) {
-      if (method_exists($definition['class'], 'buildConfigurationForm')) {
-        $tip_definition_options[$tip] = $definition['title'];
-      }
-    }
-
-    $user_input = $form_state->getUserInput();
-    $form['tips']['new'] = [
-      '#tree' => FALSE,
-      '#weight' => isset($user_input['weight']) ? $user_input['weight'] : 0,
-      '#attributes' => [
-        'class' => ['draggable'],
-      ],
-    ];
-    $form['tips']['new']['new'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Tip'),
-      '#title_display' => 'invisible',
-      '#options' => $tip_definition_options,
-      '#empty_option' => $this->t('Select a new tip'),
-    ];
-    $form['tips']['new']['weight'] = [
-      '#type' => 'weight',
-      '#title' => $this->t('Weight for new tip'),
-      '#title_display' => 'invisible',
-      '#default_value' => count($form['tips']) - 1,
-      '#attributes' => [
-        'class' => ['tip-order-weight'],
-      ],
-    ];
-    $form['tips']['new']['add'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Add'),
-      '#validate' => [[$this, 'tipValidate']],
-      '#submit' => [[$this, 'tipAdd']],
-    ];
-
-    return $form;
-  }
-
-  /**
-   * Validate handler.
-   */
-  public function tipValidate($form, FormStateInterface $form_state) {
-    if (!$form_state->getValue('new')) {
-      $form_state->setError($form['tips']['new']['new'], $this->t('Select a new tip.'));
-    }
-  }
-
-  /**
-   * Submit handler.
-   */
-  public function tipAdd($form, FormStateInterface $form_state) {
-    $tour = $this->getEntity($form_state);
-
-    $this::submitForm($form, $form_state, FALSE);
-
-    $weight = 0;
-    if (!$form_state->isValueEmpty('tips')) {
-      // Get last weight.
-      foreach ($form_state->getValue('tips') as $tip) {
-        if ($tip['weight'] > $weight) {
-          $weight = $tip['weight'] + 1;
-        }
-      }
-    }
-
-    $manager = \Drupal::service('plugin.manager.tour.tip');
-    $stub = $manager->createInstance($form_state->getValue('new'), []);
-
-    // If a form is available for this tip then redirect to a add page.
-    $stub_form = $stub->buildConfigurationForm([], new FormState());
-    if (isset($stub_form)) {
-      // Redirect to the appropriate page to add this new tip.
-      $form_state->setRedirect('tour_ui.tip.add', ['tour' => $tour->id(), 'type' => $form_state->getValue('new')], ['query' => ['weight' => $weight]]);
-    }
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state, $redirect = TRUE) {
-    // Form cannot be validated if a tip has no #data, so no way to export
-    // configuration.
-    if (!$form_state->isValueEmpty('tips')) {
-      foreach ($form_state->getValue('tips') as $key => $values) {
-        if (!isset($form['#data'][$key])) {
-          $form_state->setError($form['tips'][$key], $this->t('You cannot save the tour while %tip tip cannot be exported.', ['%tip' => $this->getEntity()->getTip($key)->getLabel()]));
-        }
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state, $redirect = TRUE) {
-    // Filter out invalid characters and convert to an array.
-    $routes = [];
-    $values_routes = preg_replace("/(\r\n?|\n)/", "\n", $form_state->getValue('routes'));
-    $values_routes = explode("\n", $values_routes);
-    $values_routes = array_map('trim', $values_routes);
-    if (!empty($values_routes)) {
-      foreach (array_filter($values_routes) as $route) {
-        $routes[]['route_name'] = $route;
-      }
-    }
-
-    $form_state->setValue('routes', array_filter($routes));
-
-    // Merge the form values in with the current configuration.
-    if (!$form_state->isValueEmpty('tips')) {
-      $tips = [];
-      foreach ($form_state->getValue('tips') as $key => $values) {
-        $data = $form['#data'][$key];
-        $tips[$key] = array_merge($data, $values);
-      }
-      $form_state->setValue('tips', $tips);
-    }
-    else {
-      $form_state->setValue('tips', []);
-    }
-
-    parent::submitForm($form, $form_state);
-
-    // Redirect to Entity edition.
-    if ($redirect) {
-      $form_state->setRedirect('entity.tour.edit_form', ['tour' => $this->entity->id()]);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function delete(array $form, FormStateInterface $form_state) {
-    $entity = $this->getEntity($form_state);
-    $form_state->setRedirect('entity.tour.delete_form',  ['tour' => $entity->id()]);
-  }
-
-}
diff --git a/modules/tour_ui/src/Form/TourTipDeleteForm.php b/modules/tour_ui/src/Form/TourTipDeleteForm.php
deleted file mode 100644
index 28d84d5..0000000
--- a/modules/tour_ui/src/Form/TourTipDeleteForm.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Drupal\tour_ui\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-
-/**
- * Builds the form to delete a tour tip.
- */
-class TourTipDeleteForm extends ConfirmFormBase {
-
-  /**
-   * Stores the tour entity being deleted.
-   *
-   * @var \Drupal\Core\Entity\EntityInterface
-   */
-  protected $entity;
-
-  /**
-   * Stores the tour tip candidate for deletion.
-   *
-   * @var \Drupal\Core\Entity\EntityInterface
-   */
-  protected $tip;
-
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Constructs a new TourTipDeleteForm object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity manager.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity_type.manager')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormID() {
-    return 'tour_ui_tip_confirm_delete';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return Url::fromRoute('entity.tour.edit_form', ['tour' => $this->entity->id()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return $this->t('Are you sure you want to delete the %tour tour %tip tip?', ['%tour' => $this->entity->label(), '%tip' => $this->tip->get('label')]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $tour = '', $tip = '') {
-    $this->entity = $this->entityTypeManager->getStorage('tour')->load($tour);
-    $tour = $this->entity;
-    $this->tip = $tour->getTip($tip);
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Rebuild the tips and remove the irrelevant one.
-    $candidate = $this->tip->get('id');
-    $tips = array();
-    foreach ($this->entity->getTips() as $tip) {
-      $tip_id = $tip->get('id');
-      if ($tip_id == $candidate) {
-        continue;
-      }
-      $tips[$tip_id] = $tip->export();
-    }
-    $this->entity->set('tips', $tips);
-    $this->entity->save();
-
-    $form_state->setRedirect('entity.tour.edit_form', ['tour' => $this->entity->id()]);
-    drupal_set_message($this->t('Deleted the %tour tour %tip tip.', ['%tour' => $this->entity->label(), '%tip' => $this->tip->get('label')]));
-  }
-
-}
diff --git a/modules/tour_ui/src/Form/TourTipForm.php b/modules/tour_ui/src/Form/TourTipForm.php
deleted file mode 100644
index a7c8c16..0000000
--- a/modules/tour_ui/src/Form/TourTipForm.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-namespace Drupal\tour_ui\Form;
-
-use Drupal\Core\Render\Element;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\tour\TipPluginManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Form controller for the tour tip plugin edit forms.
- */
-class TourTipForm extends FormBase {
-
-  /**
-   * The Tour tip plugin manager.
-   *
-   * @var \Drupal\Tour\TipPluginManager
-   */
-  protected $pluginManager;
-
-  /**
-   * Constructs a new TourTipForm object.
-   *
-   * @param \Drupal\Tour\TipPluginManager $plugin_manager
-   *   The Tour tip plugin manager.
-   */
-  public function __construct(TipPluginManager $plugin_manager) {
-    $this->pluginManager = $plugin_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.tour.tip')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'tour_ui_tip_test_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $storage = $form_state->getStorage();
-    $tip = $storage['#tip'];
-
-    $form += $tip->buildConfigurationForm($form, $form_state);
-
-    // Retrieve and add the form actions array.
-    $actions = $this->actionsElement($form, $form_state);
-    if (!empty($actions)) {
-      $form['actions'] = $actions;
-    }
-
-    return $form;
-  }
-
-  /**
-   * Returns the action form element for the current entity form.
-   */
-  protected function actionsElement(array $form, FormStateInterface $form_state) {
-    $element = $this->actions($form, $form_state);
-
-    if (isset($element['delete'])) {
-      // Move the delete action as last one, unless weights are explicitly
-      // provided.
-      $delete = $element['delete'];
-      unset($element['delete']);
-      $element['delete'] = $delete;
-      $element['delete']['#button_type'] = 'danger';
-    }
-
-    if (isset($element['submit'])) {
-      // Give the primary submit button a #button_type of primary.
-      $element['submit']['#button_type'] = 'primary';
-    }
-
-    $count = 0;
-    foreach (Element::children($element) as $action) {
-      $element[$action] += array(
-        '#weight' => ++$count * 5,
-      );
-    }
-
-    if (!empty($element)) {
-      $element['#type'] = 'actions';
-    }
-
-    return $element;
-  }
-
-  /**
-   * Returns an array of supported actions for the current entity form.
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    $actions['submit'] = array(
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-      '#submit' => array('::submitForm'),
-    );
-
-    $actions['delete'] = array(
-      '#type' => 'link',
-      '#title' => $this->t('Delete'),
-      '#attributes' => array(
-        'class' => array('button', 'button--danger'),
-      ),
-    );
-
-    return $actions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    // Determine if one of our tips already exist.
-    $storage = $form_state->getStorage();
-    $tour = $storage['#tour'];
-    $tips = $tour->getTips();
-    // If there are no initial tips then we don't need to check.
-    if (empty($tips)) {
-      return;
-    }
-
-    $tip_ids = array_map(function($data) {
-      return $data->id();
-    }, $tips);
-
-    if (in_array($form_state->getValue('id'), $tip_ids) && isset($storage['#new'])) {
-      $form_state->setError($form['label'], $this->t('A tip with the same identifier exists.'));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $storage = $form_state->getStorage();
-    $tour = $storage['#tour'];
-    $tip = $storage['#tip'];
-    // Get available fields from current tip plugin.
-    $configuration = $tip->getConfiguration();
-
-    // Build a new tip.
-    $new_tip = $tip->getConfiguration();
-    foreach ($configuration as $name => $configuration_value) {
-      $value = $form_state->getValue($name);
-      $new_tip[$name] = is_array($value) ? array_filter($value) : $value;
-    }
-
-    // Rebuild the tips.
-    $new_tip_list = $tour->getTips();
-    $new_tips = array();
-    if (!empty($new_tip_list)) {
-      foreach ($new_tip_list as $tip) {
-        $new_tips[$tip->id()] = $tip->getConfiguration();
-      }
-    }
-
-    // Add our tip and save.
-    $new_tips[$new_tip['id']] = $new_tip;
-    $tour->set('tips', $new_tips);
-    $tour->save();
-
-    if (isset($storage['#new'])) {
-      drupal_set_message($this->t('The %tip tip has been created.', array('%tip' => $new_tip['label'])));
-    }
-    else {
-      drupal_set_message($this->t('Updated the %tip tip.', array('%tip' => $new_tip['label'])));
-    }
-
-    $form_state->setRedirect('entity.tour.edit_form', ['tour' => $tour->id()]);
-    return $tour;
-  }
-
-}
diff --git a/modules/tour_ui/src/Plugin/tour_ui/tip/TipPluginTextExtended.php b/modules/tour_ui/src/Plugin/tour_ui/tip/TipPluginTextExtended.php
deleted file mode 100644
index 9b7f076..0000000
--- a/modules/tour_ui/src/Plugin/tour_ui/tip/TipPluginTextExtended.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-namespace Drupal\tour_ui\Plugin\tour_ui\tip;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\tour\Plugin\tour\tip\TipPluginText;
-
-/**
- * This plugin override Tour\tip\TipPluginText to add UI methods.
- *
- * It should not appear as tour\tip plugin because tour_ui shouldn't be
- * installed on production. So this plugin will not be availble anymore once the
- * module will be installed.
- * The only goal of this plugin is to provide missing ui methods for default
- * tip text plugin.
- *
- * @Tip(
- *   id = "text_extended",
- *   title = @Translation("Text")
- * )
- */
-class TipPluginTextExtended extends TipPluginText {
-
-  /**
-   * {@inheritdoc}
-   *
-   * TODO: Remove this method when
-   * https://www.drupal.org/node/2851166#comment-11925707 will be commited.
-   */
-  public function getConfiguration() {
-    $names = [
-      'id',
-      'plugin',
-      'label',
-      'weight',
-      'attributes',
-      'body',
-      'location',
-    ];
-    foreach ($names as $name) {
-      $properties[$name] = $this->get($name);
-    }
-    return $properties;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $id = $this->get('id');
-    $form['label'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Label'),
-      '#required' => TRUE,
-      '#default_value' => $this->get('label'),
-    ];
-    $form['id'] = [
-      '#type' => 'machine_name',
-      '#machine_name' => [
-        'exists' => '\Drupal\tour\Entity\Tour::load',
-        'replace_pattern' => '[^a-z0-9-]+',
-        'replace' => '-',
-      ],
-      '#default_value' => $id,
-      '#disabled' => !empty($id),
-    ];
-    $form['plugin'] = [
-      '#type' => 'value',
-      '#value' => $this->get('plugin'),
-    ];
-    $form['weight'] = [
-      '#type' => 'weight',
-      '#title' => $this->t('Weight'),
-      '#default_value' => $this->get('weight'),
-      '#attributes' => [
-        'class' => ['tip-order-weight'],
-      ],
-      '#delta' => 100,
-    ];
-
-    $attributes = $this->getAttributes();
-    $form['attributes'] = [
-      '#type' => 'fieldset',
-      '#title' => $this->t('Attributes'),
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE,
-      '#tree' => TRUE,
-    ];
-
-    // Determine the type identifier of the tip.
-    if (!empty($attributes['data-id'])) {
-      $tip_type = 'data-id';
-    }
-    else if (!empty($attributes['data-class'])) {
-      $tip_type = 'data-class';
-    }
-    else {
-      $tip_type = 'modal';
-    }
-    $form['attributes']['selector_type'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Selector type'),
-      '#description' => $this->t('The type of selector that this tip will target.'),
-      '#options' => [
-        'data-id' => $this->t('Data ID'),
-        'data-class' => $this->t('Data Class'),
-        'modal' => $this->t('Modal'),
-      ],
-      '#default_value' => $tip_type,
-      '#element_validate' => [[$this, 'optionsFormValidate']],
-    ];
-    $form['attributes']['data-id'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Data id'),
-      '#description' => $this->t('Provide the ID of the page element.'),
-      '#field_prefix' => '#',
-      '#default_value' => !empty($attributes['data-id']) ? $attributes['data-id'] : '',
-      '#states' => [
-        'visible' => [
-          'select[name="attributes[selector_type]"]' => ['value' => 'data-id'],
-        ],
-        'enabled' => [
-          'select[name="attributes[selector_type]"]' => ['value' => 'data-id'],
-        ],
-      ],
-    ];
-    $form['attributes']['data-class'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Data class'),
-      '#description' => $this->t('Provide the Class of the page element. You can provide more complexe jquery selection like <pre>action-links a[href="/admin/structure/forum/add/forum"]</pre>'),
-      '#field_prefix' => '.',
-      '#default_value' => !empty($attributes['data-class']) ? $attributes['data-class'] : '',
-      '#states' => [
-        'visible' => [
-          'select[name="attributes[selector_type]"]' => ['value' => 'data-class'],
-        ],
-        'enabled' => [
-          'select[name="attributes[selector_type]"]' => ['value' => 'data-class'],
-        ],
-      ],
-    ];
-
-    $form['location'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Location'),
-        '#options' => [
-        'top' => $this->t('Top'),
-        'bottom' => $this->t('Bottom'),
-        'left' => $this->t('Left'),
-        'right' => $this->t('Right'),
-      ],
-      '#default_value' => $this->get('location'),
-    ];
-    $form['body'] = [
-      '#type' => 'textarea',
-      '#title' => $this->t('Body'),
-      '#required' => TRUE,
-      '#default_value' => $this->get('body'),
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * Validates the selector_type tip optionsForm().
-   *
-   * @param $element
-   *   The form element that has the validate attached.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The state of the form after submission.
-   * @param $form
-   *   The form array.
-   */
-  public function optionsFormValidate($element, FormStateInterface $form_state, $form) {
-    $selector_type = $form_state->get(['attributes', 'selector_type']);
-    $form_state->unsetValue(['attributes', 'selector_type']);
-
-    // If modal we need to ensure that there is no data-id or data-class specified.
-    if ($selector_type == 'modal') {
-      $form_state->unsetValue(['attributes', 'data-id']);
-      $form_state->unsetValue(['attributes', 'data-class']);
-    }
-
-    // If data-id was selected and no id provided.
-    if ($selector_type == 'data-id' && $form_state->isValueEmpty(['attributes', 'data-id'])) {
-      $form_state->setError($form['attributes']['data-id'], $this->t('Please provide a data id.'));
-    }
-
-    // If data-class was selected and no class provided.
-    if ($selector_type == 'data-class' && $form_state->isValueEmpty(['attributes', 'data-class'])) {
-      $form_state->setError($form['attributes']['data-class'], $this->t('Please provide a data class.'));
-    }
-
-    // Remove the data-class value if data-id is provided.
-    if ($selector_type == 'data-id') {
-      $form_state->unsetValue(['attributes', 'data-class']);
-    }
-
-    // Remove the data-id value is data-class is provided.
-    if ($selector_type == 'data-class') {
-      $form_state->unsetValue(['attributes', 'data-id']);
-    }
-  }
-}
diff --git a/modules/tour_ui/src/Tests/TourUITest.php b/modules/tour_ui/src/Tests/TourUITest.php
deleted file mode 100644
index 9e9da15..0000000
--- a/modules/tour_ui/src/Tests/TourUITest.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\tour_ui\Tests\TourUITest.
- */
-
-namespace Drupal\tour_ui\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests the Tour UI.
- */
-class TourUITest extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('tour_ui', 'tour_test');
-
-  public static function getInfo() {
-    return array(
-      'name' => 'Tour UI',
-      'description' => 'Tests the Tour UI.',
-      'group' => 'Tour',
-    );
-  }
-
-  /**
-   * Tests the listing and editing of a tour.
-   */
-  public function testUI() {
-    $this->drupalLogin($this->root_user);
-    $this->listTest();
-    $this->editTest();
-    $this->tipTest();
-  }
-
-  /**
-   * Tests the listing of a tour.
-   */
-  protected function listTest() {
-    // Assert that two test tours are shown.
-    $this->drupalGet('admin/config/user-interface/tour');
-    $elements = $this->xpath('//table/tbody/tr');
-    $this->assertEqual(count($elements), 2);
-
-    // The first column contains the id.
-    $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td[1]', array(':class' => 'tour-test'));
-    $this->assertIdentical((string) $elements[0], 'tour-test-2');
-    // The second column contains the title.
-    $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td[2]', array(':class' => 'tour-test'));
-    $this->assertIdentical((string) $elements[0], t('Tour test english'));
-    // The third column contains the paths.
-    $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td/a[contains(@href, :href)]', array(':class' => 'tour-test', ':href' => 'tour-test-1'));
-    $this->assertIdentical((string) $elements[0], '/tour-test-1');
-    // The fourth column contains the number of tips.
-    $elements = $this->xpath('//table/tbody/tr[contains(@class, :class)]/td[4]', array(':class' => 'tour-test'));
-    $this->assertIdentical((string) $elements[0], '1', 'Core tour_test/config/tour-test-2 has 1 tip');
-    $this->assertIdentical((string) $elements[1], '3', 'Core tour_test/config/tour-test-1 has 3 tips');
-  }
-
-  /**
-   * Tests the editing of a tour.
-   */
-  protected function editTest() {
-    // Create a new tour. Ensure that it comes before the test tours.
-    $edit = array(
-      'label' => 'a' . $this->randomString(),
-      'id' => strtolower($this->randomName()),
-      'module' => strtolower($this->randomName()),
-    );
-    $this->drupalPost('admin/config/user-interface/tour/add', $edit, t('Save'));
-    $this->assertRaw(t('The %tour tour has been created.', array('%tour' => $edit['label'])));
-    $elements = $this->xpath('//table/tbody/tr');
-    $this->assertEqual(count($elements), 1);
-
-    // Edit and re-save an existing tour.
-    $this->assertTitle(t('Edit tour | @site-name', array('@site-name' => config('system.site')->get('name'))));
-    $this->drupalPost(NULL, array(), t('Save'));
-    $this->assertRaw(t('Updated the %tour tour', array('%tour' => $edit['label'])));
-
-    // Reorder the tour tips.
-    $this->drupalGet('admin/config/user-interface/tour/manage/tour-test');
-    $weights = array(
-      'tips[tour-test-1][weight]' => '2',
-      'tips[tour-test-3][weight]' => '1',
-    );
-    $this->drupalPost(NULL, $weights, t('Save'));
-    $this->drupalGet('admin/config/user-interface/tour/manage/tour-test');
-    $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
-      ':class' => 'draggable odd',
-      ':text' => 'The awesome image',
-    ));
-    $this->assertEqual(count($elements), 1, 'Found odd tip "The awesome image".');
-    $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
-      ':class' => 'draggable even',
-      ':text' => 'The first tip',
-    ));
-    $this->assertEqual(count($elements), 1, 'Found even tip "The first tip".');
-    $weights = array(
-      'tips[tour-test-1][weight]' => '1',
-      'tips[tour-test-3][weight]' => '2',
-    );
-    $this->drupalPost(NULL, $weights, t('Save'));
-    $this->drupalGet('admin/config/user-interface/tour/manage/tour-test');
-    $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
-      ':class' => 'draggable odd',
-      ':text' => 'The first tip',
-    ));
-    $this->assertEqual(count($elements), 1, 'Found odd tip "The first tip".');
-    $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
-      ':class' => 'draggable even',
-      ':text' => 'The awesome image',
-    ));
-    $this->assertEqual(count($elements), 1, 'Found even tip "The awesome image".');
-
-    // Attempt to create a duplicate tour.
-    $this->drupalPost('admin/config/user-interface/tour/add', $edit, t('Save'));
-    $this->assertRaw(t('The machine-readable name is already in use. It must be unique.'));
-
-    // Delete a tour.
-    $this->drupalGet('admin/config/user-interface/tour/manage/' . $edit['id']);
-    $this->drupalPost(NULL, NULL, t('Delete'));
-    $this->assertRaw(t('Are you sure you want to delete the %tour tour?', array('%tour' => $edit['label'])));
-    $this->clickLink(t('Cancel'));
-    $this->clickLink(t('Delete'));
-    $this->drupalPost(NULL, NULL, t('Delete'));
-    $elements = $this->xpath('//table/tbody/tr');
-    $this->assertEqual(count($elements), 2);
-    $this->assertRaw(t('Deleted the %tour tour.', array('%tour' => $edit['label'])));
-  }
-
-  /**
-   * Tests the add/edit/delete of a tour tip.
-   */
-  protected function tipTest() {
-    // Create a new tour for tips to be added to.
-    $edit = array(
-      'label' => 'a' . $this->randomString(),
-      'id' => strtolower($this->randomName()),
-      'module' => $this->randomString(),
-      'paths' => '',
-    );
-    $this->drupalPost('admin/config/user-interface/tour/add', $edit, t('Save'));
-    $this->assertRaw(t('The %tour tour has been created.', array('%tour' => $edit['label'])));
-
-    // Add a new tip.
-    $tip = array(
-      'new' => 'image',
-    );
-    $this->drupalPost('admin/config/user-interface/tour/manage/' . $edit['id'], $tip, t('Add'));
-    $tip = array(
-      'label' => 'a' . $this->randomString(),
-      'id' => 'tour-ui-test-image-tip',
-      'url' => 'http://testimage.png',
-      'alt' => 'Testing a new image tip through Tour UI.',
-    );
-    $this->drupalPost(NULL, $tip, t('Save'));
-    $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
-      ':class' => 'draggable odd',
-      ':text' => $tip['label'],
-    ));
-    $this->assertEqual(count($elements), 1, 'Found tip "' . $tip['label']. '".');
-
-    // Edit the tip.
-    $tip_id = $tip['id'];
-    unset($tip['id']);
-    $tip['label'] = 'a' . $this->randomString();
-    $this->drupalPost('admin/config/user-interface/tour/manage/' . $edit['id'] . '/tip/edit/' . $tip_id, $tip, t('Save'));
-    $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
-      ':class' => 'draggable odd',
-      ':text' => $tip['label'],
-    ));
-    $this->assertEqual(count($elements), 1, 'Found tip "' . $tip['label']. '".');
-
-    // Delete the tip.
-    $this->drupalPost('admin/config/user-interface/tour/manage/' . $edit['id'] .'/tip/delete/' . $tip_id, array(), t('Delete'));
-    $elements = $this->xpath('//tr[@class=:class and ./td[contains(., :text)]]', array(
-      ':class' => 'draggable odd',
-      ':text' => $tip['label'],
-    ));
-    $this->assertNotEqual(count($elements), 1, 'Did not find tip "' . $tip['label']. '".');
-  }
-
-}
diff --git a/modules/tour_ui/src/TourAccessControlHandler.php b/modules/tour_ui/src/TourAccessControlHandler.php
deleted file mode 100644
index c82e926..0000000
--- a/modules/tour_ui/src/TourAccessControlHandler.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\tour_ui;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Entity\EntityAccessControlHandler;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
-
-class TourAccessControlHandler extends EntityAccessControlHandler {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
-    return AccessResult::allowedIfHasPermission($account, 'administer tour');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
-    return AccessResult::allowedIfHasPermission($account, 'administer tour');
-  }
-}
diff --git a/modules/tour_ui/src/TourListBuilder.php b/modules/tour_ui/src/TourListBuilder.php
deleted file mode 100644
index 3f6cfe7..0000000
--- a/modules/tour_ui/src/TourListBuilder.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace Drupal\tour_ui;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Config\Entity\ConfigEntityStorageInterface;
-use Drupal\Core\Entity\EntityListBuilder;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Component\Utility\Html;
-
-/**
- * Provides a listing of tours.
- */
-class TourListBuilder extends EntityListBuilder {
-
-  /**
-   * Constructs a new TourListBuilder object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param \Drupal\Core\Config\Entity\ConfigEntityStorageInterface $storage
-   *   The config storage class.
-   */
-  public function __construct(EntityTypeInterface $entity_type, ConfigEntityStorageInterface $storage) {
-    parent::__construct($entity_type, $storage);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
-      $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id())
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildHeader() {
-    $row['id'] = t('Id');
-    $row['label'] = t('Label');
-    $row['routes'] = t('routes');
-    $row['tips'] = t('Number of tips');
-    $row['operations'] = t('Operations');
-    return $row;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    $row['title'] = [
-      'data' => $entity->label(),
-      'class' => ['menu-label'],
-    ];
-
-    $row = parent::buildRow($entity);
-
-    $data['id'] = Html::escape($entity->id());
-    $data['label'] = Html::escape($entity->label());
-    // Include the routes this tour is used on.
-    $routes_name = [];
-    if ($routes = $entity->getRoutes()) {
-      foreach ($routes as $route) {
-        $routes_name[] = $route['route_name'];
-      }
-    }
-    $data['routes'] = [
-      'data' => [
-        '#type' => 'inline_template',
-        '#template' => '<div class="tour-routes">{{ routes|safe_join("<br />") }}</div>',
-        '#context' => array('routes' => $routes_name),
-      ],
-    ];
-
-    // Count the number of tips.
-    $data['tips'] = count($entity->getTips());
-    $data['operations'] = $row['operations'];
-    // Wrap the whole row so that the entity ID is used as a class.
-    return [
-      'data' => $data,
-      'class' => [
-        $entity->id(),
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOperations(EntityInterface $entity) {
-    $operations = parent::getOperations($entity);
-
-    $operations['edit'] = [
-      'title' => t('Edit'),
-      'url' => $entity->toUrl('edit-form'),
-      'weight' => 1,
-    ];
-    $operations['delete'] = [
-      'title' => t('Delete'),
-      'url' => $entity->toUrl('delete-form'),
-      'weight' => 2,
-    ];
-
-    return $operations;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function render() {
-    $build = parent::render();
-    $build['#empty'] = $this->t('No tours available. <a href="@link">Add tour</a>.', [
-      '@link' => 'tour_ui.tour.add',
-    ]);
-    return $build;
-  }
-
-}
diff --git a/modules/tour_ui/tour_ui.info.yml b/modules/tour_ui/tour_ui.info.yml
deleted file mode 100644
index ddf7eed..0000000
--- a/modules/tour_ui/tour_ui.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Tour UI
-type: module
-description : 'Provides a UI to manage guided tours.'
-package: Development
-configure: admin/config/user-interface/tour
-# core: 8.x
-dependencies:
-  - tour
-
-# Information added by Drupal.org packaging script on 2017-06-06
-version: '8.x-1.0-alpha1'
-core: '8.x'
-project: 'tour_ui'
-datestamp: 1496774344
diff --git a/modules/tour_ui/tour_ui.links.action.yml b/modules/tour_ui/tour_ui.links.action.yml
deleted file mode 100644
index 02ee757..0000000
--- a/modules/tour_ui/tour_ui.links.action.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-tour_ui_tour_add_action:
-  route_name: tour_ui.tour.add
-  title: 'Add tour'
-  appears_on:
-    - entity.tour.collection
diff --git a/modules/tour_ui/tour_ui.links.menu.yml b/modules/tour_ui/tour_ui.links.menu.yml
deleted file mode 100644
index 7a92740..0000000
--- a/modules/tour_ui/tour_ui.links.menu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-entity.tour.collection:
-  title: Tours
-  description: 'Add and modify tours.'
-  route_name: entity.tour.collection
-  parent: system.admin_config_ui
diff --git a/modules/tour_ui/tour_ui.module b/modules/tour_ui/tour_ui.module
deleted file mode 100644
index 997c9e2..0000000
--- a/modules/tour_ui/tour_ui.module
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file
- * Core functionality for Tour UI module.
- */
-
-use Drupal\Core\Entity\EntityInterface;
-
-/**
- * Implements hook_entity_type_alter().
- */
-function tour_ui_entity_type_alter(array &$entity_types) {
-  /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
-  $entity_types['tour']->setAccessClass('Drupal\tour_ui\TourAccessControlHandler');
-  $entity_types['tour']->setFormClass('default', 'Drupal\tour_ui\Form\TourForm');
-  $entity_types['tour']->setFormClass('add', 'Drupal\tour_ui\Form\TourForm');
-  $entity_types['tour']->setFormClass('edit', 'Drupal\tour_ui\Form\TourForm');
-  $entity_types['tour']->setFormClass('delete', 'Drupal\tour_ui\Form\TourDeleteForm');
-  $entity_types['tour']->setListBuilderClass('Drupal\tour_ui\TourListBuilder');
-  $entity_types['tour']->setLinkTemplate('add-form', '/admin/config/user-interface/tour/add');
-  $entity_types['tour']->setLinkTemplate('edit-form', '/admin/config/user-interface/tour/manage/{tour}');
-  $entity_types['tour']->setLinkTemplate('delete-form', '/admin/config/user-interface/tour/manage/{tour}/delete');
-}
-
-/**
- * Implements hook_tour_tips_info_alter().
- */
-function tour_ui_tour_tips_info_alter(&$info) {
-  // Override the core text plugin.
-  if (isset($info['text'])) {
-    $info['text']['class'] = 'Drupal\tour_ui\Plugin\tour_ui\tip\TipPluginTextExtended';
-  }
-}
diff --git a/modules/tour_ui/tour_ui.permissions.yml b/modules/tour_ui/tour_ui.permissions.yml
deleted file mode 100644
index 7e7b661..0000000
--- a/modules/tour_ui/tour_ui.permissions.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-administer tour:
-  title: 'Administer tour'
-  restrict access: true
diff --git a/modules/tour_ui/tour_ui.routing.yml b/modules/tour_ui/tour_ui.routing.yml
deleted file mode 100644
index 3c94657..0000000
--- a/modules/tour_ui/tour_ui.routing.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-entity.tour.collection:
-  path: '/admin/config/user-interface/tour'
-  defaults:
-    _entity_list: 'tour'
-    _title: 'Tours'
-  requirements:
-    _permission: 'administer tour'
-
-tour_ui.tour.add:
-  path: '/admin/config/user-interface/tour/add'
-  defaults:
-    _entity_form: tour.default
-    _title: 'Add tour'
-  requirements:
-    _permission: 'administer tour'
-
-entity.tour.edit_form:
-  path: '/admin/config/user-interface/tour/manage/{tour}'
-  defaults:
-    _entity_form: tour.default
-    _title: 'Edit tour'
-  requirements:
-    _permission: 'administer tour'
-
-entity.tour.delete_form:
-  path: '/admin/config/user-interface/tour/manage/{tour}/delete'
-  defaults:
-    _entity_form: tour.delete
-  requirements:
-    _permission: 'administer tour'
-
-tour_ui.tip.add:
-  path: '/admin/config/user-interface/tour/manage/{tour}/tip/add/{type}'
-  defaults:
-    _controller: '\Drupal\tour_ui\Controller\TourTipController:add'
-    _title: 'Add tip'
-  requirements:
-    _permission: 'administer tour'
-
-tour_ui.tip.edit:
-  path: '/admin/config/user-interface/tour/manage/{tour}/tip/edit/{tip}'
-  defaults:
-    _controller: '\Drupal\tour_ui\Controller\TourTipController:edit'
-    _title: 'Edit tip'
-  requirements:
-    _permission: 'administer tour'
-
-tour_ui.tip.delete:
-  path: '/admin/config/user-interface/tour/manage/{tour}/tip/delete/{tip}'
-  defaults:
-    _form: '\Drupal\tour_ui\Form\TourTipDeleteForm'
-    _title: 'Delete tip'
-  requirements:
-    _permission: 'administer tour'
diff --git a/modules/typed_data/.gitignore b/modules/typed_data/.gitignore
deleted file mode 100644
index 61ead86..0000000
--- a/modules/typed_data/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/vendor
diff --git a/modules/typed_data/.travis.yml b/modules/typed_data/.travis.yml
deleted file mode 100644
index 8793f0d..0000000
--- a/modules/typed_data/.travis.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-language: php
-# The Travis CI container mode has random functional test fails, so we must use
-# sudo here.
-sudo: true
-
-php:
-  - 5.5
-  - 5.6
-  - 7
-
-env:
-  global:
-    # Make the script re-usable for other modules.
-    - MODULE=typed_data
-  matrix:
-    - DRUPAL_CORE=8.3.x
-    - DRUPAL_CORE=8.4.x
-    - DRUPAL_CORE=8.5.x
-
-matrix:
-  fast_finish: true
-
-mysql:
-  database: $MODULE
-  username: root
-  encoding: utf8
-
-# Be sure to cache composer downloads.
-cache:
-  directories:
-    - $HOME/.composer
-
-before_script:
-  - echo $MODULE
-
-  # Remove Xdebug as we don't need it and it causes
-  # PHP Fatal error:  Maximum function nesting level of '256' reached.
-  # We also don't care if that file exists or not on PHP 7.
-  - phpenv config-rm xdebug.ini || true
-
-  # Remember the current $MODULE test directory for later use in the Drupal
-  # installation.
-  - TESTDIR=$(pwd)
-  # Navigate out of module directory to prevent blown stack by recursive module
-  # lookup.
-  - cd ..
-
-  # Create database.
-  - mysql -e "create database $MODULE"
-  # Export database variable for kernel tests.
-  - export SIMPLETEST_DB=mysql://root:@127.0.0.1/$MODULE
-  # Download Drupal 8 core from the Github mirror because it is faster.
-  - travis_retry git clone --branch $DRUPAL_CORE --depth 1 https://github.com/drupal/drupal.git
-  - cd drupal
-
-  # Reference $MODULE in build site.
-  - ln -s $TESTDIR modules/$MODULE
-
-  # Run composer install for Drupal 8.1 and up. We need an up-to-date composer
-  # when installing Drupal 8.1.
-  - travis_retry composer self-update && travis_retry composer install
-  # Run composer install in the module directory in order to fetch dev
-  # dependencies there. This includes phpcs & coder for checking coding style.
-  - travis_retry composer -d=$TESTDIR install
-
-  # Start a web server on port 8888, run in the background.
-  - php -S localhost:8888 &
-
-  # Export web server URL for browser tests.
-  - export SIMPLETEST_BASE_URL=http://localhost:8888
-
-script:
-  # Run the PHPUnit tests which also include the kernel tests.
-  - ./vendor/bin/phpunit -c ./core/phpunit.xml.dist ./modules/$MODULE/tests/
-  # Check for coding standards.
-  - cd modules/$MODULE && ./vendor/bin/phpcs --colors --report-width=130
diff --git a/modules/typed_data/LICENSE.txt b/modules/typed_data/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/typed_data/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/typed_data/README.md b/modules/typed_data/README.md
deleted file mode 100644
index f6d1fce..0000000
--- a/modules/typed_data/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Typed Data API module
-
-[![Build Status](https://travis-ci.org/fago/typed_data.svg?branch=8.x-1.x)](https://travis-ci.org/fago/typed_data)
-
-Extends the core Typed Data API with new APIs and features.
-
-* Project homepage: https://www.drupal.org/project/typed_data
-* For example usage, see the Rules module: https://www.drupal.org/project/rules
-
-## Contributing
-
-Always use the  [Typed Data module issue queue](https://www.drupal.org/project/issues/typed_data).
-
-Development happens on GitHub using the pull request model:
-in case you are not familiar with that, please take a few minutes to read the
-[GitHub article](https://help.github.com/articles/using-pull-requests) on using
-pull requests.
-
-There are a few conventions that should be followed when contributing:
-
-* Always create an issue in the [drupal.org Typed Data issue queue](https://www.drupal.org/project/issues/typed_data)
-  for every pull request you are working on.
-* Always cross-reference the Issue in the Pull Request and the Pull Request in
-  the issue.
-* Always create a new branch for every pull request: its name should contain a
-  brief summary of the ticket and its issue id, e.g **readme-2276369**.
-* Try to keep the history of your pull request as clean as possible by squashing
-  your commits: you can look at the [Symfony documentation](http://symfony.com/doc/current/cmf/contributing/commits.html)
-  or at the [Git book](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages)
-  for more information on how to do that.
-
-For further information on how to contribute please refer to
-[our documentation](https://thefubhy.gitbooks.io/typed_data/content/).
-
-## Checking coding style
-
-The module comes with a phpcs setup that is verifying a correct coding style.
-To run the check just execute the following command from the rules module
-directory:
-
-    # Install phpcs as local dev dependency, then run it:
-    composer install
-    ./vendor/bin/phpcs
-
-    # If there are some coding style violations that can be fixed
-    # automatically, use the code beautifier:
-    ./vendor/bin/phpcbf
-
-## Executing the automated tests
-
-This module comes with PHPUnit tests. You need a working Drupal 8 installation
-and a checkout of the Rules module in the modules folder.
-
-
-Make sure to use your DB connection details for the SIMPLETEST_DB and the URL to
-your local Drupal installation for SIMPLETEST_BASE_URL.
-
-    cd /path/to/drupal-8/core
-    export SIMPLETEST_DB=mysql://drupal-8:password@localhost/drupal-8
-    export SIMPLETEST_BASE_URL=http://drupal-8.localhost
-    ../vendor/bin/phpunit ../modules/typed_data
diff --git a/modules/typed_data/composer.json b/modules/typed_data/composer.json
deleted file mode 100644
index 3ab2925..0000000
--- a/modules/typed_data/composer.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "drupal/typed_data",
-  "description": "Extends the core Typed Data API with new APIS and features.",
-  "type": "drupal-module",
-  "license": "GPL-2.0+",
-  "minimum-stability": "dev",
-  "prefer-stable": true,
-  "require": {
-  },
-  "require-dev" : {
-    "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-    "drupal/coder": "8.2.*",
-    "squizlabs/php_codesniffer": "2.9.*",
-    "symfony/yaml": "3.*"
-  }
-}
diff --git a/modules/typed_data/composer.lock b/modules/typed_data/composer.lock
deleted file mode 100644
index d817a3b..0000000
--- a/modules/typed_data/composer.lock
+++ /dev/null
@@ -1,258 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "247b0db5635aea9acb1243e9fe4f7e73",
-    "packages": [],
-    "packages-dev": [
-        {
-            "name": "dealerdirect/phpcodesniffer-composer-installer",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/DealerDirect/phpcodesniffer-composer-installer.git",
-                "reference": "63c0ec0ac286d31651d3c70e5bf76ad87db3ba23"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/DealerDirect/phpcodesniffer-composer-installer/zipball/63c0ec0ac286d31651d3c70e5bf76ad87db3ba23",
-                "reference": "63c0ec0ac286d31651d3c70e5bf76ad87db3ba23",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0",
-                "php": "^5.3|^7",
-                "squizlabs/php_codesniffer": "*"
-            },
-            "require-dev": {
-                "composer/composer": "*",
-                "wimg/php-compatibility": "^8.0"
-            },
-            "suggest": {
-                "dealerdirect/qa-tools": "All the PHP QA tools you'll need"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Franck Nijhof",
-                    "email": "f.nijhof@dealerdirect.nl",
-                    "homepage": "http://workingatdealerdirect.eu",
-                    "role": "Developer"
-                }
-            ],
-            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
-            "homepage": "http://workingatdealerdirect.eu",
-            "keywords": [
-                "PHPCodeSniffer",
-                "PHP_CodeSniffer",
-                "code quality",
-                "codesniffer",
-                "composer",
-                "installer",
-                "phpcs",
-                "plugin",
-                "qa",
-                "quality",
-                "standard",
-                "standards",
-                "style guide",
-                "stylecheck",
-                "tests"
-            ],
-            "time": "2017-09-18T07:49:36+00:00"
-        },
-        {
-            "name": "drupal/coder",
-            "version": "8.2.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/klausi/coder.git",
-                "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/klausi/coder/zipball/984c54a7b1e8f27ff1c32348df69712afd86b17f",
-                "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "php": ">=5.4.0",
-                "squizlabs/php_codesniffer": ">=2.8.1 <3.0",
-                "symfony/yaml": ">=2.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": ">=3.7 <6"
-            },
-            "type": "phpcodesniffer-standard",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0+"
-            ],
-            "description": "Coder is a library to review Drupal code.",
-            "homepage": "https://www.drupal.org/project/coder",
-            "keywords": [
-                "code review",
-                "phpcs",
-                "standards"
-            ],
-            "time": "2017-03-18T10:28:49+00:00"
-        },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "2.9.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "68fb8e5c76da4a220275ecce7179f25c9ecc2b13"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/68fb8e5c76da4a220275ecce7179f25c9ecc2b13",
-                "reference": "68fb8e5c76da4a220275ecce7179f25c9ecc2b13",
-                "shasum": ""
-            },
-            "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "bin": [
-                "scripts/phpcs",
-                "scripts/phpcbf"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "CodeSniffer.php",
-                    "CodeSniffer/CLI.php",
-                    "CodeSniffer/Exception.php",
-                    "CodeSniffer/File.php",
-                    "CodeSniffer/Fixer.php",
-                    "CodeSniffer/Report.php",
-                    "CodeSniffer/Reporting.php",
-                    "CodeSniffer/Sniff.php",
-                    "CodeSniffer/Tokens.php",
-                    "CodeSniffer/Reports/",
-                    "CodeSniffer/Tokenizers/",
-                    "CodeSniffer/DocGenerators/",
-                    "CodeSniffer/Standards/AbstractPatternSniff.php",
-                    "CodeSniffer/Standards/AbstractScopeSniff.php",
-                    "CodeSniffer/Standards/AbstractVariableSniff.php",
-                    "CodeSniffer/Standards/IncorrectPatternException.php",
-                    "CodeSniffer/Standards/Generic/Sniffs/",
-                    "CodeSniffer/Standards/MySource/Sniffs/",
-                    "CodeSniffer/Standards/PEAR/Sniffs/",
-                    "CodeSniffer/Standards/PSR1/Sniffs/",
-                    "CodeSniffer/Standards/PSR2/Sniffs/",
-                    "CodeSniffer/Standards/Squiz/Sniffs/",
-                    "CodeSniffer/Standards/Zend/Sniffs/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "http://www.squizlabs.com/php-codesniffer",
-            "keywords": [
-                "phpcs",
-                "standards"
-            ],
-            "time": "2017-07-13T01:37:12+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v3.3.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46",
-                "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "require-dev": {
-                "symfony/console": "~2.8|~3.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-10-05T14:43:42+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "dev",
-    "stability-flags": {
-        "dealerdirect/phpcodesniffer-composer-installer": 20
-    },
-    "prefer-stable": true,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": []
-}
diff --git a/modules/typed_data/phpcs.xml.dist b/modules/typed_data/phpcs.xml.dist
deleted file mode 100644
index 2db1c42..0000000
--- a/modules/typed_data/phpcs.xml.dist
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset name="rules">
-  <description>Default PHP CodeSniffer configuration for Rules.</description>
-  <file>.</file>
-  
-  <exclude-pattern>./vendor/</exclude-pattern>
-  <exclude-pattern>./config/</exclude-pattern>
-
-  <arg name="extensions" value="inc,install,module,php,profile,test,theme,yml"/>
-  <arg value="s"/>
-  
-  <rule ref="Drupal.NamingConventions.ValidVariableName.LowerCamelName">
-    <!-- Annotations must use the same property names as in the configuration. -->
-    <exclude-pattern>src/Annotation</exclude-pattern>
-  </rule>
-
-  <!--Blacklist of coding standard rules that are not yet fixed. -->
-  <rule ref="Drupal">
-    <exclude name="Drupal.Commenting.DocComment.MissingShort"/>
-  </rule>
-
-  <rule ref="DrupalPractice">
-    <!-- Allow empty lines after comments, we don't care. -->
-    <exclude name="DrupalPractice.Commenting.CommentEmptyLine"/>
-  </rule>
-
-  <!-- We always want short array syntax only. -->
-  <rule ref="Generic.Arrays.DisallowLongArraySyntax" />
-
-  <rule ref="Drupal.Files.TxtFileLineLength.TooLong">
-    <exclude-pattern>README.md</exclude-pattern>
-  </rule>
-</ruleset>
diff --git a/modules/typed_data/src/Annotation/DataFilter.php b/modules/typed_data/src/Annotation/DataFilter.php
deleted file mode 100644
index d27f51b..0000000
--- a/modules/typed_data/src/Annotation/DataFilter.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Annotation class for data filter plugins.
- *
- * @Annotation
- */
-class DataFilter extends Plugin {
-
-  /**
-   * The machine-name of the data filter.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the filter.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   *
-   * @ingroup plugin_translatable
-   */
-  public $label;
-
-}
diff --git a/modules/typed_data/src/Annotation/TypedDataFormWidget.php b/modules/typed_data/src/Annotation/TypedDataFormWidget.php
deleted file mode 100644
index 99f33e5..0000000
--- a/modules/typed_data/src/Annotation/TypedDataFormWidget.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Annotation class for typed data form widget plugins.
- *
- * @Annotation
- */
-class TypedDataFormWidget extends Plugin {
-
-  /**
-   * The machine-name of the widget.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the widget.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   *
-   * @ingroup plugin_translatable
-   */
-  public $label;
-
-  /**
-   * The human-readable description of the widget.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   *
-   * @ingroup plugin_translatable
-   */
-  public $description;
-
-}
diff --git a/modules/typed_data/src/Context/AnnotatedClassDiscovery.php b/modules/typed_data/src/Context/AnnotatedClassDiscovery.php
deleted file mode 100644
index b768ec2..0000000
--- a/modules/typed_data/src/Context/AnnotatedClassDiscovery.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Context;
-
-use Doctrine\Common\Annotations\SimpleAnnotationReader;
-use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery as CoreAnnotatedClassDiscovery;
-
-/**
- * Extends the annotation class discovery for usage with Typed data context.
- *
- * We modify the annotations classes for ContextDefinition and for Condition.
- * This class makes sure that our plugin managers apply these.
- */
-class AnnotatedClassDiscovery extends CoreAnnotatedClassDiscovery {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getAnnotationReader() {
-    if (!isset($this->annotationReader)) {
-      // Do not call out the parent, but re-configure the simple annotation
-      // reader on our own, so we can control the order of namespaces.
-      $this->annotationReader = new SimpleAnnotationReader();
-
-      // Make sure to add our namespace first, so our ContextDefinition and
-      // Condition annotations gets picked.
-      $this->annotationReader->addNamespace('Drupal\typed_data\Context\Annotation');
-      // Add the namespaces from the main plugin annotation, like @EntityType.
-      $namespace = substr($this->pluginDefinitionAnnotationName, 0, strrpos($this->pluginDefinitionAnnotationName, '\\'));
-      $this->annotationReader->addNamespace($namespace);
-      // Add general core annotations like @Translation.
-      $this->annotationReader->addNamespace('Drupal\Core\Annotation');
-    }
-    return $this->annotationReader;
-  }
-
-}
diff --git a/modules/typed_data/src/Context/Annotation/ContextDefinition.php b/modules/typed_data/src/Context/Annotation/ContextDefinition.php
deleted file mode 100644
index 578c900..0000000
--- a/modules/typed_data/src/Context/Annotation/ContextDefinition.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Context\Annotation;
-
-use Drupal\Core\Annotation\ContextDefinition as CoreContextDefinition;
-use Drupal\Core\Annotation\Translation;
-use Drupal\typed_data\Context\ContextDefinition as TypedDataContextDefinition;
-
-/**
- * Extends the core context definition annotation object for Typed data.
- *
- * Ensures context definitions use
- * \Drupal\typed_data\Context\ContextDefinitionInterface.
- *
- * @Annotation
- *
- * @ingroup plugin_context
- */
-class ContextDefinition extends CoreContextDefinition {
-
-  /**
-   * The ContextDefinitionInterface object.
-   *
-   * @var \Drupal\typed_data\Context\ContextDefinitionInterface
-   */
-  protected $definition;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $values) {
-    // Filter out any @Translation annotation objects.
-    foreach ($values as $key => $value) {
-      if ($value instanceof Translation) {
-        $values[$key] = $value->get();
-      }
-    }
-    $this->definition = TypedDataContextDefinition::createFromArray($values);
-  }
-
-  /**
-   * Returns the value of an annotation.
-   *
-   * @return \Drupal\typed_data\Context\ContextDefinitionInterface
-   *   Return the Typed data version of the ContextDefinitionInterface.
-   */
-  public function get() {
-    return $this->definition;
-  }
-
-}
diff --git a/modules/typed_data/src/Context/ContextDefinition.php b/modules/typed_data/src/Context/ContextDefinition.php
deleted file mode 100644
index 34f90d0..0000000
--- a/modules/typed_data/src/Context/ContextDefinition.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Context;
-
-use Drupal\Core\Plugin\Context\ContextDefinition as ContextDefinitionCore;
-use Drupal\Component\Plugin\Exception\ContextException;
-
-/**
- * Extends the core context definition class with useful methods.
- */
-class ContextDefinition extends ContextDefinitionCore implements ContextDefinitionInterface {
-
-  /**
-   * The mapping of config export keys to internal properties.
-   *
-   * @var array
-   */
-  protected static $nameMap = [
-    'type' => 'dataType',
-    'label' => 'label',
-    'description' => 'description',
-    'multiple' => 'isMultiple',
-    'required' => 'isRequired',
-    'default_value' => 'defaultValue',
-    'constraints' => 'constraints',
-    'allow_null' => 'allowNull',
-    'assignment_restriction' => 'assignmentRestriction',
-  ];
-
-  /**
-   * Whether the context value is allowed to be NULL or not.
-   *
-   * @var bool
-   */
-  protected $allowNull = FALSE;
-
-  /**
-   * The assignment restriction of this context.
-   *
-   * @var string|null
-   *
-   * @see \Drupal\typed_data\Context\ContextDefinitionInterface::getAssignmentRestriction()
-   */
-  protected $assignmentRestriction = NULL;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function toArray() {
-    $values = [];
-    $defaults = get_class_vars(__CLASS__);
-    foreach (static::$nameMap as $key => $property_name) {
-      // Only export values for non-default properties.
-      if ($this->$property_name !== $defaults[$property_name]) {
-        $values[$key] = $this->$property_name;
-      }
-    }
-    return $values;
-  }
-
-  /**
-   * Creates a definition object from an exported array of values.
-   *
-   * @param array $values
-   *   The array of values, as returned by toArray().
-   *
-   * @return static
-   *   The created definition.
-   *
-   * @throws \Drupal\Component\Plugin\Exception\ContextException
-   *   If the required classes are not implemented.
-   */
-  public static function createFromArray(array $values) {
-    if (isset($values['class']) && !in_array(ContextDefinitionInterface::class, class_implements($values['class']))) {
-      throw new ContextException('ContextDefinition class must implement ' . ContextDefinitionInterface::class . '.');
-    }
-    // Default to Typed data context definition class.
-    $values['class'] = isset($values['class']) ? $values['class'] : ContextDefinition::class;
-    if (!isset($values['value'])) {
-      $values['value'] = 'any';
-    }
-
-    $definition = $values['class']::create($values['value']);
-    foreach (array_intersect_key(static::$nameMap, $values) as $key => $name) {
-      $definition->$name = $values[$key];
-    }
-    return $definition;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isAllowedNull() {
-    return $this->allowNull;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setAllowNull($null_allowed) {
-    $this->allowNull = $null_allowed;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAssignmentRestriction() {
-    return $this->assignmentRestriction;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setAssignmentRestriction($restriction) {
-    $this->assignmentRestriction = $restriction;
-    return $this;
-  }
-
-}
diff --git a/modules/typed_data/src/Context/ContextDefinitionInterface.php b/modules/typed_data/src/Context/ContextDefinitionInterface.php
deleted file mode 100644
index 19963e3..0000000
--- a/modules/typed_data/src/Context/ContextDefinitionInterface.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Context;
-
-use Drupal\Core\Plugin\Context\ContextDefinitionInterface as CoreContextDefinitionInterfaceCore;
-
-/**
- * Context definition information required by Typed data.
- *
- * The core interface is extended to add properties that are necessary for
- * Typed data.
- */
-interface ContextDefinitionInterface extends CoreContextDefinitionInterfaceCore {
-
-  /**
-   * Constants for the context assignment restriction mode.
-   *
-   * @see ::getAssignmentRestriction()
-   */
-  const ASSIGNMENT_RESTRICTION_INPUT = 'input';
-  const ASSIGNMENT_RESTRICTION_SELECTOR = 'selector';
-
-  /**
-   * Determines if the context value is allowed to be NULL.
-   *
-   * @return bool
-   *   TRUE if NULL values are allowed, FALSE otherwise.
-   */
-  public function isAllowedNull();
-
-  /**
-   * Sets the "allow NULL value" behavior.
-   *
-   * @param bool $null_allowed
-   *   TRUE if NULL values should be allowed, FALSE otherwise.
-   *
-   * @return $this
-   */
-  public function setAllowNull($null_allowed);
-
-  /**
-   * Determines if this context has an assignment restriction.
-   *
-   * @return string|null
-   *   Either ASSIGNMENT_RESTRICTION_INPUT for contexts that are only allowed to
-   *   be provided as input values, ASSIGNMENT_RESTRICTION_SELECTOR for contexts
-   *   that must be provided as data selectors or NULL if there is no
-   *   restriction for this context.
-   */
-  public function getAssignmentRestriction();
-
-  /**
-   * Sets the assignment restriction mode for this context.
-   *
-   * @param string|null $restriction
-   *   Either ASSIGNMENT_RESTRICTION_INPUT for contexts that are only allowed to
-   *   be provided as input values, ASSIGNMENT_RESTRICTION_SELECTOR for contexts
-   *   that must be provided as data selectors or NULL if there is no
-   *   restriction for this context.
-   */
-  public function setAssignmentRestriction($restriction);
-
-  /**
-   * Exports the definition as an array.
-   *
-   * @return array
-   *   An array with values for all definition keys.
-   */
-  public function toArray();
-
-}
diff --git a/modules/typed_data/src/DataFetcher.php b/modules/typed_data/src/DataFetcher.php
deleted file mode 100644
index bf497d9..0000000
--- a/modules/typed_data/src/DataFetcher.php
+++ /dev/null
@@ -1,320 +0,0 @@
-<?php
-
-namespace Drupal\typed_data;
-
-use Drupal\Core\Cache\CacheableDependencyInterface;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Render\AttachmentsInterface;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\TypedData\ComplexDataDefinitionInterface;
-use Drupal\Core\TypedData\ComplexDataInterface;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\DataReferenceDefinitionInterface;
-use Drupal\Core\TypedData\DataReferenceInterface;
-use Drupal\Core\TypedData\Exception\MissingDataException;
-use Drupal\Core\TypedData\ListDataDefinitionInterface;
-use Drupal\Core\TypedData\ListInterface;
-use Drupal\Core\TypedData\PrimitiveInterface;
-use Drupal\Core\TypedData\TranslatableInterface;
-use Drupal\Core\TypedData\TypedDataInterface;
-use Drupal\typed_data\Exception\InvalidArgumentException;
-
-/**
- * Implementation of the data fetcher service.
- */
-class DataFetcher implements DataFetcherInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function fetchDataByPropertyPath(TypedDataInterface $typed_data, $property_path, BubbleableMetadata $bubbleable_metadata = NULL, $langcode = NULL) {
-    $sub_paths = explode('.', $property_path);
-    return $this->fetchDataBySubPaths($typed_data, $sub_paths, $bubbleable_metadata, $langcode);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function fetchDataBySubPaths(TypedDataInterface $typed_data, array $sub_paths, BubbleableMetadata $bubbleable_metadata = NULL, $langcode = NULL) {
-    $current_selector = [];
-    $bubbleable_metadata = $bubbleable_metadata ?: new BubbleableMetadata();
-
-    try {
-      foreach ($sub_paths as $name) {
-        $current_selector[] = $name;
-
-        // If the current data is just a reference then directly dereference the
-        // target.
-        if ($typed_data instanceof DataReferenceInterface) {
-          $this->addBubbleableMetadata($typed_data, $bubbleable_metadata);
-          $typed_data = $typed_data->getTarget();
-          if ($typed_data === NULL) {
-            throw new MissingDataException("The specified reference is NULL.");
-          }
-        }
-
-        // Make sure we are using the right language.
-        if (isset($langcode) && $typed_data instanceof TranslatableInterface) {
-          if ($typed_data->hasTranslation($langcode)) {
-            $typed_data = $typed_data->getTranslation($langcode);
-          }
-          // @todo What if the requested translation does not exist? Currently
-          // we just ignore that and continue with the current object.
-        }
-
-        // If this is a list but the selector is not an integer, we forward the
-        // selection to the first element in the list.
-        if ($typed_data instanceof ListInterface && !ctype_digit($name)) {
-          $this->addBubbleableMetadata($typed_data, $bubbleable_metadata);
-          $typed_data = $typed_data->get(0);
-        }
-
-        // Drill down to the next step in the data selector.
-        if ($typed_data instanceof ListInterface || $typed_data instanceof ComplexDataInterface) {
-          $this->addBubbleableMetadata($typed_data, $bubbleable_metadata);
-          $typed_data = $typed_data->get($name);
-        }
-        else {
-          $current_selector_string = implode('.', $current_selector);
-          throw new InvalidArgumentException("The parent property is not a list or a complex structure at '$current_selector_string'.");
-        }
-
-        // If an accessed list item is not existing, $typed_data will be NULL.
-        if (!isset($typed_data)) {
-          $selector_string = implode('.', $sub_paths);
-          $current_selector_string = implode('.', $current_selector);
-          throw new MissingDataException("Unable to apply data selector '$selector_string' at '$current_selector_string'");
-        }
-      }
-      $this->addBubbleableMetadata($typed_data, $bubbleable_metadata);
-      return $typed_data;
-    }
-    catch (MissingDataException $e) {
-      $selector = implode('.', $sub_paths);
-      $current_selector = implode('.', $current_selector);
-      throw new MissingDataException("Unable to apply data selector '$selector' at '$current_selector': " . $e->getMessage());
-    }
-    catch (\InvalidArgumentException $e) {
-      $selector = implode('.', $sub_paths);
-      $current_selector = implode('.', $current_selector);
-      throw new InvalidArgumentException("Unable to apply data selector '$selector' at '$current_selector': " . $e->getMessage());
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function fetchDefinitionByPropertyPath(DataDefinitionInterface $data_definition, $property_path, $langcode = NULL) {
-    $sub_paths = explode('.', $property_path);
-    return $this->fetchDefinitionBySubPaths($data_definition, $sub_paths, $langcode);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function fetchDefinitionBySubPaths(DataDefinitionInterface $data_definition, array $sub_paths, $langcode = NULL) {
-    $current_selector = [];
-
-    foreach ($sub_paths as $name) {
-      $current_selector[] = $name;
-
-      // If the current data is just a reference then directly dereference the
-      // target.
-      if ($data_definition instanceof DataReferenceDefinitionInterface) {
-        $data_definition = $data_definition->getTargetDefinition();
-      }
-
-      // If this is a list but the selector is not an integer, we forward the
-      // selection to the first element in the list.
-      if ($data_definition instanceof ListDataDefinitionInterface && !ctype_digit($name)) {
-        $data_definition = $data_definition->getItemDefinition();
-      }
-
-      // Drill down to the next step in the data selector.
-      if ($data_definition instanceof ComplexDataDefinitionInterface) {
-        $data_definition = $data_definition->getPropertyDefinition($name);
-      }
-      elseif ($data_definition instanceof ListDataDefinitionInterface) {
-        $data_definition = $data_definition->getItemDefinition();
-      }
-      else {
-        $current_selector_string = implode('.', $current_selector);
-        if (count($current_selector) > 1) {
-          $parent_property = $current_selector[count($current_selector) - 2];
-          throw new InvalidArgumentException("The data selector '$current_selector_string' cannot be applied because the parent property '$parent_property' is not a list or a complex structure");
-        }
-        else {
-          $type = $data_definition->getDataType();
-          throw new InvalidArgumentException("The data selector '$current_selector_string' cannot be applied because the definition of type '$type' is not a list or a complex structure");
-        }
-      }
-
-      // If an accessed property is not existing, $data_definition will be
-      // NULL.
-      if (!isset($data_definition)) {
-        $selector_string = implode('.', $sub_paths);
-        $current_selector_string = implode('.', $current_selector);
-        throw new InvalidArgumentException("Unable to apply data selector '$selector_string' at '$current_selector_string'");
-      }
-    }
-    return $data_definition;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function autocompletePropertyPath(array $data_definitions, $partial_property_path) {
-    // For the empty string we suggest the names of the data definitions.
-    if ($partial_property_path == '') {
-      return array_keys($data_definitions);
-    }
-    $results = [];
-    // If the supplied path is part of the top level variable names then suggest
-    // them directly.
-    foreach ($data_definitions as $variable_name => $data_definition) {
-      if (stripos($variable_name, $partial_property_path) === 0) {
-        $results = array_merge($results, $this->getAutocompleteSuggestion($data_definition, $variable_name));
-      }
-    }
-    if (!empty($results)) {
-      return $results;
-    }
-
-    $parts = explode('.', $partial_property_path);
-    $first_part = array_shift($parts);
-
-    if (!isset($data_definitions[$first_part])) {
-      return [];
-    }
-
-    $last_part = array_pop($parts);
-    $middle_path = implode('.', $parts);
-
-    if ($middle_path === '') {
-      $variable_definition = $data_definitions[$first_part];
-    }
-    else {
-      try {
-        $variable_definition = $this->fetchDefinitionByPropertyPath($data_definitions[$first_part], $middle_path);
-      }
-      catch (InvalidArgumentException $e) {
-        // Invalid property path, so no suggestions available.
-        return [];
-      }
-    }
-
-    // If the current data is just a reference then directly dereference the
-    // target.
-    if ($variable_definition instanceof DataReferenceDefinitionInterface) {
-      $variable_definition = $variable_definition->getTargetDefinition();
-    }
-
-    if ($variable_definition instanceof ListDataDefinitionInterface) {
-      // Suggest a couple of example indices of a list if there is nothing
-      // selected on it yet. Special case for fields: only make the suggestion
-      // if this is a multi-valued field.
-      if ($last_part === '' && !($variable_definition instanceof FieldDefinitionInterface
-        && $variable_definition->getFieldStorageDefinition()->getCardinality() === 1)
-      ) {
-        if ($middle_path === '') {
-          $property_path = $first_part;
-        }
-        else {
-          $property_path = "$first_part.$middle_path";
-        }
-        $item_definition = $variable_definition->getItemDefinition();
-        for ($i = 0; $i < 3; $i++) {
-          $results = array_merge($results, $this->getAutocompleteSuggestion($item_definition, "$property_path.$i"));
-        }
-      }
-
-      // If this is a list but the selector is not an integer, we forward the
-      // selection to the first element in the list.
-      if (!ctype_digit($last_part)) {
-        $variable_definition = $variable_definition->getItemDefinition();
-      }
-    }
-
-    if ($variable_definition instanceof ComplexDataDefinitionInterface) {
-      foreach ($variable_definition->getPropertyDefinitions() as $property_name => $property_definition) {
-        // If the property starts with the part then we have a suggestion. If
-        // the part after the dot is the empty string we include all properties.
-        if (stripos($property_name, $last_part) === 0 || $last_part === '') {
-
-          if ($middle_path === '') {
-            $property_path = "$first_part.$property_name";
-          }
-          else {
-            $property_path = "$first_part.$middle_path.$property_name";
-          }
-          $results = array_merge($results, $this->getAutocompleteSuggestion($property_definition, $property_path));
-        }
-      }
-    }
-
-    usort($results, function ($a, $b) {
-      return strnatcasecmp($a['value'], $b['value']);
-    });
-    return $results;
-  }
-
-  /**
-   * Generates autocomplete suggestions for a matched data definition.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $data_definition
-   *   The data definition to inspect.
-   * @param string $variable_name
-   *   The variable name or property path.
-   *
-   * @return array[]
-   *   A list of autocomplete suggestions - valid property paths for the
-   *   provided data definition. Each entry is an array with the following keys:
-   *   - value: the data selecor property path.
-   *   - label: the human readable label suggestion.
-   */
-  protected function getAutocompleteSuggestion(DataDefinitionInterface $data_definition, $variable_name) {
-    $label = $variable_name;
-    if ($data_label = $data_definition->getLabel()) {
-      $label .= " ($data_label)";
-    }
-    $results[] = ['value' => $variable_name, 'label' => $label];
-
-    // If the data definition is just a reference then directly dereference the
-    // target.
-    if ($data_definition instanceof DataReferenceDefinitionInterface) {
-      $data_definition = $data_definition->getTargetDefinition();
-    }
-
-    if ($data_definition instanceof ListDataDefinitionInterface
-      || $data_definition instanceof ComplexDataDefinitionInterface
-    ) {
-      $label = "$variable_name...";
-      if ($data_label) {
-        $label .= " ($data_label)";
-      }
-      $results[] = ['value' => "$variable_name.", 'label' => $label];
-    }
-
-    return $results;
-  }
-
-  /**
-   * Adds the bubbleable metadata of the given data.
-   *
-   * @param \Drupal\Core\TypedData\TypedDataInterface $data
-   *   The data of which to add the metadata.
-   * @param \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata
-   *   The bubbleable metadata to which to add the data.
-   */
-  protected function addBubbleableMetadata(TypedDataInterface $data, BubbleableMetadata $bubbleable_metadata) {
-    if ($data instanceof PrimitiveInterface) {
-      // Primitives do not have any metadata attached.
-      return;
-    }
-    $value = $data->getValue();
-    if ($value instanceof CacheableDependencyInterface || $value instanceof AttachmentsInterface) {
-      $bubbleable_metadata->addCacheableDependency($value);
-    }
-  }
-
-}
diff --git a/modules/typed_data/src/DataFetcherInterface.php b/modules/typed_data/src/DataFetcherInterface.php
deleted file mode 100644
index 6626e64..0000000
--- a/modules/typed_data/src/DataFetcherInterface.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace Drupal\typed_data;
-
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\TypedDataInterface;
-
-/**
- * Interface for the DataFetcher service.
- */
-interface DataFetcherInterface {
-
-  /**
-   * Fetches data based upon the given property path.
-   *
-   * @param \Drupal\Core\TypedData\TypedDataInterface $typed_data
-   *   The data from which to select a value.
-   * @param string $property_path
-   *   The property path string, e.g. "uid.entity.mail.value".
-   * @param \Drupal\Core\Render\BubbleableMetadata|null $bubbleable_metadata
-   *   (optional) An object to which required bubbleable metadata will be added.
-   * @param string $langcode
-   *   (optional) The language code used to get the argument value if the
-   *   argument value should be translated. Defaults to NULL.
-   *
-   * @return \Drupal\Core\TypedData\TypedDataInterface
-   *   The variable wrapped as typed data.
-   *
-   * @throws \Drupal\Core\TypedData\Exception\MissingDataException
-   *   Thrown if the data cannot be fetched due to missing data; e.g., unset
-   *   properties or list items.
-   * @throws \Drupal\typed_data\Exception\InvalidArgumentException
-   *   Thrown if the given path is not valid for the given data; e.g., a not
-   *   existing property is referenced.
-   */
-  public function fetchDataByPropertyPath(TypedDataInterface $typed_data, $property_path, BubbleableMetadata $bubbleable_metadata = NULL, $langcode = NULL);
-
-  /**
-   * Fetches data based upon the given sub-paths.
-   *
-   * @param \Drupal\Core\TypedData\TypedDataInterface $typed_data
-   *   The data from which to select a value.
-   * @param string[] $sub_paths
-   *   A list of sub paths; i.e., a property path separated into its parts.
-   * @param \Drupal\Core\Render\BubbleableMetadata|null $bubbleable_metadata
-   *   (optional) An object to which required bubbleable metadata will be added.
-   * @param string $langcode
-   *   (optional) The language code used to get the argument value if the
-   *   argument value should be translated. Defaults to NULL.
-   *
-   * @return \Drupal\Core\TypedData\TypedDataInterface
-   *   The variable wrapped as typed data.
-   *
-   * @throws \Drupal\Core\TypedData\Exception\MissingDataException
-   *   Thrown if the data cannot be fetched due to missing data; e.g., unset
-   *   properties or list items.
-   * @throws \Drupal\typed_data\Exception\InvalidArgumentException
-   *   Thrown if the given path is not valid for the given data; e.g., a not
-   *   existing property is referenced.
-   */
-  public function fetchDataBySubPaths(TypedDataInterface $typed_data, array $sub_paths, BubbleableMetadata $bubbleable_metadata = NULL, $langcode = NULL);
-
-  /**
-   * Fetches a data definition based upon the given property path.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $data_definition
-   *   The data definition from which to retrieve a nested definition.
-   * @param string $property_path
-   *   The property path string, e.g. "uid.entity.mail.value".
-   * @param string $langcode
-   *   (optional) The language code used to get the argument value if the
-   *   argument value should be translated. Defaults to NULL.
-   *
-   * @return \Drupal\Core\TypedData\DataDefinitionInterface
-   *   The data definition of the target.
-   *
-   * @throws \Drupal\typed_data\Exception\InvalidArgumentException
-   *   Thrown if the given path is not valid for the given data; e.g., a not
-   *   existing property is referenced.
-   */
-  public function fetchDefinitionByPropertyPath(DataDefinitionInterface $data_definition, $property_path, $langcode = NULL);
-
-  /**
-   * Fetches a data definition based upon the given sub-paths.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $data_definition
-   *   The data definition from which to retrieve a nested definition.
-   * @param string[] $sub_paths
-   *   A list of sub paths; i.e., a property path separated into its parts.
-   * @param string $langcode
-   *   (optional) The language code used to get the argument value if the
-   *   argument value should be translated. Defaults to NULL.
-   *
-   * @return \Drupal\Core\TypedData\DataDefinitionInterface
-   *   The data definition of the target.
-   *
-   * @throws \Drupal\typed_data\Exception\InvalidArgumentException
-   *   Thrown if the given path is not valid for the given data; e.g., a not
-   *   existing property is referenced.
-   */
-  public function fetchDefinitionBySubPaths(DataDefinitionInterface $data_definition, array $sub_paths, $langcode = NULL);
-
-  /**
-   * Provides autocomplete suggestions for an incomplete property path.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface[] $data_definitions
-   *   A map of available data definitions that should be seareched. The array
-   *   keys are the first part of the property path.
-   * @param string $partial_property_path
-   *   The partial property path, example: "node.uid.ent".
-   *
-   * @return array[]
-   *   A list of autocomplete suggestions - valid property paths for one of the
-   *   provided data definitions. Each entry is an array with the following
-   *   keys:
-   *   - value: the data selecor property path.
-   *   - label: the human readable label suggestion.
-   */
-  public function autocompletePropertyPath(array $data_definitions, $partial_property_path);
-
-}
diff --git a/modules/typed_data/src/DataFetcherTrait.php b/modules/typed_data/src/DataFetcherTrait.php
deleted file mode 100644
index 0c37e14..0000000
--- a/modules/typed_data/src/DataFetcherTrait.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\typed_data;
-
-/**
- * Helper for classes that need the data fetcher object.
- */
-trait DataFetcherTrait {
-
-  /**
-   * The data fetcher.
-   *
-   * @var \Drupal\typed_data\DataFetcherInterface
-   */
-  protected $dataFetcher;
-
-  /**
-   * Sets the data fetcher.
-   *
-   * @param \Drupal\typed_data\DataFetcherInterface $data_fetcher
-   *   The data fetcher.
-   *
-   * @return $this
-   */
-  public function setDataFetcher(DataFetcherInterface $data_fetcher) {
-    $this->dataFetcher = $data_fetcher;
-    return $this;
-  }
-
-  /**
-   * Gets the data fetcher.
-   *
-   * @return \Drupal\typed_data\DataFetcherInterface
-   *   The data fetcher.
-   */
-  public function getDataFetcher() {
-    if (empty($this->dataFetcher)) {
-      $this->dataFetcher = \Drupal::service('typed_data.data_fetcher');
-    }
-
-    return $this->dataFetcher;
-  }
-
-}
diff --git a/modules/typed_data/src/DataFilterBase.php b/modules/typed_data/src/DataFilterBase.php
deleted file mode 100644
index 8635362..0000000
--- a/modules/typed_data/src/DataFilterBase.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\typed_data;
-
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\TypedDataTrait;
-
-/**
- * Base class for data filters.
- */
-abstract class DataFilterBase implements DataFilterInterface {
-
-  use TypedDataTrait;
-  use StringTranslationTrait;
-
-  /**
-   * The filter id.
-   *
-   * @var string
-   */
-  protected $filterId;
-
-  /**
-   * The plugin definition.
-   *
-   * @var array
-   */
-  protected $pluginDefinition;
-
-  /**
-   * Constructs the object.
-   */
-  public function __construct($configuration, $plugin_id, $plugin_definition) {
-    $this->filterId = $plugin_id;
-    $this->pluginDefinition = $plugin_definition;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getNumberOfRequiredArguments() {
-    return 0;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function allowsNullValues() {
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function suggestArgument(DataDefinitionInterface $definition, array $arguments, $input = '') {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateArguments(DataDefinitionInterface $definition, array $arguments) {
-    $errors = [];
-    if (count($arguments) < $this->getNumberOfRequiredArguments()) {
-      $errors[] = $this->t('Missing arguments for filter %filter_id', ['%filter_id' => $this->filterId]);
-    }
-    return $errors;
-  }
-
-}
diff --git a/modules/typed_data/src/DataFilterInterface.php b/modules/typed_data/src/DataFilterInterface.php
deleted file mode 100644
index ee02b12..0000000
--- a/modules/typed_data/src/DataFilterInterface.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace Drupal\typed_data;
-
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-
-/**
- * Interface for data filters.
- *
- * Data filters allow filtering data values by a simple, possibly user inputted
- * string like default(0), or format_date('short'). Data filters are may be
- * used on placeholder replacement values.
- *
- * @see \Drupal\typed_data\PlaceholderResolverInterface
- */
-interface DataFilterInterface {
-
-  /**
-   * Filters the given data value.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $definition
-   *   The definition of the filtered data.
-   * @param mixed $value
-   *   The value for which to apply the filter.
-   * @param array $arguments
-   *   The array of filter arguments.
-   * @param \Drupal\Core\Render\BubbleableMetadata|null $bubbleable_metadata
-   *   (optional) An object to which required bubbleable metadata will be added.
-   *
-   * @return mixed
-   *   The resulting data value.
-   */
-  public function filter(DataDefinitionInterface $definition, $value, array $arguments, BubbleableMetadata $bubbleable_metadata = NULL);
-
-  /**
-   * Determines whether data based upon the given definition can be filtered.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $definition
-   *   The definition of the filtered data.
-   *
-   * @return bool
-   *   Whether the data can be filtered.
-   */
-  public function canFilter(DataDefinitionInterface $definition);
-
-  /**
-   * Describes the data after applying the filter.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $definition
-   *   The definition of the filtered data.
-   * @param string[] $arguments
-   *   The array of filter arguments.
-   *
-   * @return \Drupal\Core\TypedData\DataDefinitionInterface
-   *   The definition of the resulting data.
-   */
-  public function filtersTo(DataDefinitionInterface $definition, array $arguments);
-
-  /**
-   * Gets the number of required arguments.
-   *
-   * @return int
-   *   The number of required arguments.
-   */
-  public function getNumberOfRequiredArguments();
-
-  /**
-   * Defines whether the filter is able to process NULL values.
-   *
-   * @return bool
-   *   Whether the filter is able to process NULL values.
-   */
-  public function allowsNullValues();
-
-  /**
-   * Suggests some possible argument values based on user input.
-   *
-   * This is used to provide sensible auto-completion.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $definition
-   *   The definition of the filtered data.
-   * @param string[] $arguments
-   *   The array of filter arguments, which have been already inputted.
-   * @param string $input
-   *   (optional) The filter argument currently being input. Defaults to an
-   *   empty string.
-   *
-   * @return string[]
-   *   An array of possible argument strings.
-   */
-  public function suggestArgument(DataDefinitionInterface $definition, array $arguments, $input = '');
-
-  /**
-   * Validates the inputted arguments.
-   *
-   * Determines whether the given arguments have a valid syntax and can be
-   * applied to data of the given definition.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $definition
-   *   The definition of the filtered data.
-   * @param string[] $arguments
-   *   The array of filter arguments.
-   *
-   * @return \Drupal\Core\StringTranslation\TranslatableMarkup[]|string[]
-   *   An array of translated validation error messages. If the arguments are
-   *   valid, an empty array must be returned.
-   */
-  public function validateArguments(DataDefinitionInterface $definition, array $arguments);
-
-}
diff --git a/modules/typed_data/src/DataFilterManager.php b/modules/typed_data/src/DataFilterManager.php
deleted file mode 100644
index 6c5a262..0000000
--- a/modules/typed_data/src/DataFilterManager.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\typed_data;
-
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\typed_data\Annotation\DataFilter;
-
-/**
- * Manager for data filter plugins.
- *
- * @see \Drupal\typed_data\DataFilterInterface
- */
-class DataFilterManager extends DefaultPluginManager implements DataFilterManagerInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(\Traversable $namespaces, ModuleHandlerInterface $module_handler, $plugin_definition_annotation_name = DataFilter::class) {
-    $this->alterInfo('typed_data_filter');
-    parent::__construct('Plugin/TypedDataFilter', $namespaces, $module_handler, DataFilterInterface::class, $plugin_definition_annotation_name);
-  }
-
-}
diff --git a/modules/typed_data/src/DataFilterManagerInterface.php b/modules/typed_data/src/DataFilterManagerInterface.php
deleted file mode 100644
index 2b090c7..0000000
--- a/modules/typed_data/src/DataFilterManagerInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\typed_data;
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-
-/**
- * Interface for the data filter manager.
- */
-interface DataFilterManagerInterface extends PluginManagerInterface {
-
-  /**
-   * Creates a pre-configured instance of a filter plugin.
-   *
-   * @param string $plugin_id
-   *   The ID of the plugin being instantiated; i.e., the filter machine name.
-   * @param array $configuration
-   *   An array of configuration relevant to the plugin instance. As this plugin
-   *   is not configurable, this is unused and should stay empty.
-   *
-   * @return \Drupal\typed_data\DataFilterInterface
-   *   A fully configured plugin instance.
-   *
-   * @throws \Drupal\Component\Plugin\Exception\PluginException
-   *   If the instance cannot be created, such as if the ID is invalid.
-   */
-  public function createInstance($plugin_id, array $configuration = []);
-
-}
diff --git a/modules/typed_data/src/Exception/FilterException.php b/modules/typed_data/src/Exception/FilterException.php
deleted file mode 100644
index d50dbb5..0000000
--- a/modules/typed_data/src/Exception/FilterException.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Exception;
-
-/**
- * Exception thrown when filters cannot be applied.
- *
- * Data filters should provide separate exception classes for any possible
- * problem.
- */
-abstract class FilterException extends TypedDataException {}
diff --git a/modules/typed_data/src/Exception/InvalidArgumentException.php b/modules/typed_data/src/Exception/InvalidArgumentException.php
deleted file mode 100644
index dacb951..0000000
--- a/modules/typed_data/src/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Exception;
-
-/**
- * An exception that is thrown if an argument is invalid.
- */
-class InvalidArgumentException extends TypedDataException {
-
-}
diff --git a/modules/typed_data/src/Exception/LogicException.php b/modules/typed_data/src/Exception/LogicException.php
deleted file mode 100644
index 839804a..0000000
--- a/modules/typed_data/src/Exception/LogicException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Exception;
-
-/**
- * An exception that is thrown when there is an error in program logic.
- */
-class LogicException extends TypedDataException {
-
-}
diff --git a/modules/typed_data/src/Exception/TypedDataException.php b/modules/typed_data/src/Exception/TypedDataException.php
deleted file mode 100644
index 254ecc9..0000000
--- a/modules/typed_data/src/Exception/TypedDataException.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Exception;
-
-/**
- * A common exception for typed data.
- *
- * This class can be used to catch all exceptions thrown by this module.
- */
-abstract class TypedDataException extends \Exception {
-
-}
diff --git a/modules/typed_data/src/Form/SubformState.php b/modules/typed_data/src/Form/SubformState.php
deleted file mode 100644
index 904c681..0000000
--- a/modules/typed_data/src/Form/SubformState.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Form;
-
-use Drupal\Core\Form\SubformState as CoreSubformState;
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Class SubformState.
- */
-class SubformState extends CoreSubformState {
-
-  /**
-   * The array parents; i.e., where the sub-form is located in the parent.
-   *
-   * @var string[]
-   */
-  protected $arrayParents;
-
-  /**
-   * Creates a new subform by specifying the array parents.
-   *
-   * @param string[] $arrayParents
-   *   The array parents; i.e., where the sub-form is located in the parent.
-   *   For example if a sub-form is located in $form['fieldset']['parent'], the
-   *   array parents would be "fieldset" and "parent".
-   * @param mixed[] $parentForm
-   *   The subform's complete parent form array.
-   * @param \Drupal\Core\Form\FormStateInterface $parentFormState
-   *   The parent form state.
-   *
-   * @return static
-   */
-  public static function createWithParents(array $arrayParents, array &$parentForm, FormStateInterface $parentFormState) {
-    $exists = NULL;
-    $form = &NestedArray::getValue($parentForm, $arrayParents, $exists);
-    if (!$exists) {
-      $form = static::getNewSubForm();
-    }
-    $instance = parent::createForSubform($form, $parentForm, $parentFormState);
-    $instance->arrayParents = $arrayParents;
-    return $instance;
-  }
-
-  /**
-   * Gets a new sub-form array.
-   *
-   * Sub-forms must have #tree set to TRUE, so this is set as default.
-   *
-   * @return mixed[]
-   *   The new sub-form.
-   */
-  public static function getNewSubForm() {
-    return [
-      '#tree' => TRUE,
-    ];
-  }
-
-}
diff --git a/modules/typed_data/src/PlaceholderResolver.php b/modules/typed_data/src/PlaceholderResolver.php
deleted file mode 100644
index d039d1a..0000000
--- a/modules/typed_data/src/PlaceholderResolver.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-
-namespace Drupal\typed_data;
-
-use Drupal\Component\Render\HtmlEscapedText;
-use Drupal\Component\Render\MarkupInterface;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\TypedData\Exception\MissingDataException;
-use Drupal\typed_data\Exception\InvalidArgumentException;
-
-/**
- * Resolver for placeholder tokens based upon typed data.
- */
-class PlaceholderResolver implements PlaceholderResolverInterface {
-
-  /**
-   * The typed data manager.
-   *
-   * @var \Drupal\typed_data\DataFetcherInterface
-   */
-  protected $dataFetcher;
-
-  /**
-   * The data filter manager.
-   *
-   * @var \Drupal\typed_data\DataFilterManagerInterface
-   */
-  protected $dataFilterManager;
-
-  /**
-   * Constructs the object.
-   *
-   * @param \Drupal\typed_data\DataFetcherInterface $data_fetcher
-   *   The typed data manager.
-   * @param \Drupal\typed_data\DataFilterManagerInterface $data_filter_manager
-   *   The data filter manager.
-   */
-  public function __construct(DataFetcherInterface $data_fetcher, DataFilterManagerInterface $data_filter_manager) {
-    $this->dataFetcher = $data_fetcher;
-    $this->dataFilterManager = $data_filter_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resolvePlaceholders($text, array $data = [], BubbleableMetadata $bubbleable_metadata = NULL, array $options = []) {
-    $options += [
-      'langcode' => NULL,
-      'clear' => FALSE,
-    ];
-    $placeholder_by_data = $this->scan($text);
-    if (empty($placeholder_by_data)) {
-      return [];
-    }
-
-    $replacements = [];
-    foreach ($placeholder_by_data as $data_name => $placeholders) {
-      foreach ($placeholders as $placeholder_main_part => $placeholder) {
-        try {
-          if (!isset($data[$data_name])) {
-            throw new MissingDataException("There is no data with the name '$data_name' available.");
-          }
-          list ($property_sub_paths, $filters) = $this->parseMainPlaceholderPart($placeholder_main_part, $placeholder);
-          $fetched_data = $this->dataFetcher->fetchDataBySubPaths($data[$data_name], $property_sub_paths, $bubbleable_metadata, $options['langcode']);
-
-          // Apply filters.
-          if ($filters) {
-            $value = $fetched_data->getValue();
-            $definition = $fetched_data->getDataDefinition();
-            foreach ($filters as $data) {
-              list($filter_id, $arguments) = $data;
-              $filter = $this->dataFilterManager->createInstance($filter_id);
-              if (!$filter->allowsNullValues() && !isset($value)) {
-                throw new MissingDataException("There is no data value for filter '$filter_id' to work on.");
-              }
-              $value = $filter->filter($definition, $value, $arguments, $bubbleable_metadata);
-              $definition = $filter->filtersTo($definition, $arguments);
-            }
-          }
-          else {
-            $value = $fetched_data->getString();
-          }
-
-          // Escape the tokens, unless they are explicitly markup.
-          $replacements[$placeholder] = $value instanceof MarkupInterface ? $value : new HtmlEscapedText($value);
-        }
-        catch (InvalidArgumentException $e) {
-          // Should we log warnings if there are problems other than missing
-          // data, like syntactically invalid placeholders?
-          if (!empty($options['clear'])) {
-            $replacements[$placeholder] = '';
-          }
-        }
-        catch (MissingDataException $e) {
-          if (!empty($options['clear'])) {
-            $replacements[$placeholder] = '';
-          }
-        }
-      }
-    }
-    return $replacements;
-  }
-
-  /**
-   * Parses the main placeholder part.
-   *
-   * Main placeholder parts look like 'property.property|filter(arg)|filter'.
-   *
-   * @param string $main_part
-   *   The main placeholder part.
-   * @param string $placeholder
-   *   The full placeholer string.
-   *
-   * @return array[]
-   *   An numerically indexed arrays containing:
-   *   - The numerically indexed array of property sub-paths.
-   *   - The numerically indexed array of parsed filter expressions, where each
-   *     entry is another numerically indexed array containing two items: the
-   *     the filter id and the array of filter arguments.
-   *
-   * @throws \Drupal\typed_data\Exception\InvalidArgumentException
-   *   Thrown if in invalid placeholders are to be parsed.
-   */
-  protected function parseMainPlaceholderPart($main_part, $placeholder) {
-    if (!$main_part) {
-      return [[], []];
-    }
-    $properties = explode('.', $main_part);
-    $last_part = array_pop($properties);
-    $filter_expressions = array_filter(explode('|', $last_part));
-    // If there is a property, the first part, before the first |, is it.
-    // Also be sure to remove potential whitespace after the last property.
-    if ($main_part[0] != '|') {
-      $properties[] = rtrim(array_shift($filter_expressions));
-    }
-    $filters = [];
-
-    foreach ($filter_expressions as $expression) {
-      // Look for filter arguments.
-      $matches = [];
-      preg_match_all('/
-      ([^\(]+)
-      \(             # ( - pattern start
-       (.+)
-      \)             # ) - pattern end
-      /x', $expression, $matches);
-
-      $filter_id = isset($matches[1][0]) ? $matches[1][0] : $expression;
-      // Be sure to remove all whitespaces.
-      $filter_id = str_replace(' ', '', $filter_id);
-      $args = array_map(function ($arg) {
-        // Remove surrounding whitespaces and then quotes.
-        return trim(trim($arg), "'");
-      }, explode(',', isset($matches[2][0]) ? $matches[2][0] : ''));
-
-      $filters[] = [$filter_id, $args];
-    }
-    return [$properties, $filters];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function replacePlaceHolders($text, array $data = [], BubbleableMetadata $bubbleable_metadata = NULL, array $options = []) {
-    $replacements = $this->resolvePlaceholders($text, $data, $bubbleable_metadata, $options);
-
-    $placeholders = array_keys($replacements);
-    $values = array_values($replacements);
-
-    return str_replace($placeholders, $values, $text);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function scan($text) {
-    // Matches tokens with the following pattern: {{ $name.$property_path }}
-    // $name and $property_path may not contain {{ }} characters.
-    // $name may not contain : or whitespace characters, but $property_path may.
-    preg_match_all('/
-      \{\{             # {{ - pattern start
-      ([^\{\}.|]+)      # match $type not containing whitespace . { or }
-      ((.|\|)          # . - separator
-      ([^\{\}]+))?     # match $name not containing { or }
-      \}\}             # }} - pattern end
-      /x', $text, $matches);
-
-    $names = $matches[1];
-    $tokens = $matches[2];
-
-    // Iterate through the matches, building an associative array containing
-    // $tokens grouped by $types, pointing to the version of the token found in
-    // the source text. For example,
-    // $results['node']['title'] = '[node.title]';.
-    $results = [];
-    for ($i = 0; $i < count($tokens); $i++) {
-      // Remove leading whitespaces and ".", but not the | denoting a filter.
-      $main_part = trim($tokens[$i], ". \t\n\r\0\x0B");
-      $results[trim($names[$i])][$main_part] = $matches[0][$i];
-    }
-
-    return $results;
-  }
-
-}
diff --git a/modules/typed_data/src/PlaceholderResolverInterface.php b/modules/typed_data/src/PlaceholderResolverInterface.php
deleted file mode 100644
index 7c8c301..0000000
--- a/modules/typed_data/src/PlaceholderResolverInterface.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Drupal\typed_data;
-
-use Drupal\Core\Render\BubbleableMetadata;
-
-/**
- * Interface for a placeholder resolver based upon typed data.
- *
- * This is a Typed Data based alternative to the token service, see
- * \Drupal\Core\Utility\Token.
- *
- * Placeholder tokens use the format {{ data.property.property|filter1 }},
- * while filters may be piped and can have arguments; e.g.,
- * {{ data | filter1 | filter2('argument1', 'argument') }}
- *
- * The name of the filter refers to the filter plugin ID. The arguments which
- * are allowed or even required depend on the filter plugin, see
- * \Drupal\typed_data\DataFilterInterface.
- */
-interface PlaceholderResolverInterface {
-
-  /**
-   * Replaces all placeholder tokens in a given string with appropriate values.
-   *
-   * @param string $text
-   *   An HTML string containing replaceable tokens. The caller is responsible
-   *   for calling \Drupal\Component\Utility\Html::escape() in case the $text
-   *   was plain text.
-   * @param \Drupal\Core\TypedData\TypedDataInterface[] $data
-   *   The data to use for generating values for the placeholder, keyed by
-   *   name.
-   * @param \Drupal\Core\Render\BubbleableMetadata|null $bubbleable_metadata
-   *   (optional) An object to which required bubbleable metadata will be added.
-   *   Refer to ::replacePlaceHolders() for further details.
-   * @param array $options
-   *   (optional) A keyed array of settings and flags to control the token
-   *   replacement process. Supported options are:
-   *   - langcode: A language code to be used when generating locale-sensitive
-   *     tokens.
-   *   - clear: A boolean flag indicating that tokens should be removed from the
-   *     final text if no replacement value can be generated. Defaults to FALSE.
-   *
-   * @return \Drupal\Component\Render\MarkupInterface[]
-   *   An array of replacement values for the placeholders contained in the
-   *   text, keyed by placeholder.
-   */
-  public function resolvePlaceholders($text, array $data = [], BubbleableMetadata $bubbleable_metadata = NULL, array $options = []);
-
-  /**
-   * Replaces the placeholders in the given text.
-   *
-   * To ensure that the metadata associated with the token replacements gets
-   * attached to the render array that contains the token-replaced text,
-   * callers
-   * of this method are encouraged to pass in a BubbleableMetadata object and
-   * apply it to the corresponding render array. For example:
-   *
-   * @code
-   *   $bubbleable_metadata = new BubbleableMetadata();
-   *   $build['#markup'] = $resolver->replacePlaceHolders('Tokens: [node:nid] [current-user:uid]', ['node' => $node->getTypedData()], [], $bubbleable_metadata);
-   *   $bubbleable_metadata->applyTo($build);
-   * @endcode
-   *
-   * @param string $text
-   *   The text containing the placeholders.
-   * @param \Drupal\Core\TypedData\TypedDataInterface[] $data
-   *   The data to use for generating values for the placeholder, keyed by
-   *   name.
-   * @param \Drupal\Core\Render\BubbleableMetadata|null $bubbleable_metadata
-   *   (optional) An object to which required bubbleable metadata will be added.
-   * @param array $options
-   *   (optional) A keyed array of settings and flags to control the token
-   *   replacement process. Supported options are:
-   *   - langcode: A language code to be used when generating locale-sensitive
-   *     tokens.
-   *   - clear: A boolean flag indicating that tokens should be removed from the
-   *     final text if no replacement value can be generated. Defaults to
-   *     FALSE.
-   *
-   * @return string
-   *   The result is the entered HTML text with tokens replaced. The
-   *   caller is responsible for choosing the right escaping / sanitization. If
-   *   the result is intended to be used as plain text, using
-   *   PlainTextOutput::renderFromHtml() is recommended. If the result is just
-   *   printed as part of a template relying on Twig autoescaping is possible,
-   *   otherwise for example the result can be put into #markup, in which case
-   *   it would be sanitized by Xss::filterAdmin().
-   */
-  public function replacePlaceHolders($text, array $data = [], BubbleableMetadata $bubbleable_metadata = NULL, array $options = []);
-
-  /**
-   * Builds a list of all placeholder tokens that appear in the text.
-   *
-   * @param string $text
-   *   The text to be scanned for possible tokens.
-   *
-   * @return array
-   *   An associative array of discovered placeholder tokens, grouped by data
-   *   name. For each data name, the value is another associative array
-   *   containing the completed, discovered placeholder and the main placeholder
-   *   part as key; i.e. the placeholder without brackets and data name. For
-   *   example, for the placeholder {{ data.property.property|filter }} the
-   *   main placeholder part is 'property.property|filter'.
-   */
-  public function scan($text);
-
-}
diff --git a/modules/typed_data/src/PlaceholderResolverTrait.php b/modules/typed_data/src/PlaceholderResolverTrait.php
deleted file mode 100644
index 0c7726b..0000000
--- a/modules/typed_data/src/PlaceholderResolverTrait.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\typed_data;
-
-/**
- * Helper for classes that need the placeholder resolver.
- */
-trait PlaceholderResolverTrait {
-
-  /**
-   * The placeholder resolver.
-   *
-   * @var \Drupal\typed_data\PlaceholderResolverInterface
-   */
-  protected $placeholderResolver;
-
-  /**
-   * Sets the placeholder resolver.
-   *
-   * @param \Drupal\typed_data\PlaceholderResolverInterface $placeholder_resolver
-   *   The placeholder resolver.
-   *
-   * @return $this
-   */
-  public function setPlaceholderResolver(PlaceholderResolverInterface $placeholder_resolver) {
-    $this->placeholderResolver = $placeholder_resolver;
-    return $this;
-  }
-
-  /**
-   * Gets the placeholder resolver.
-   *
-   * @return \Drupal\typed_data\PlaceholderResolverInterface
-   *   The placeholder resolver.
-   */
-  public function getPlaceholderResolver() {
-    if (empty($this->placeholderResolver)) {
-      $this->placeholderResolver = \Drupal::service('typed_data.placeholder_resolver');
-    }
-
-    return $this->placeholderResolver;
-  }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFilter/DefaultFilter.php b/modules/typed_data/src/Plugin/TypedDataFilter/DefaultFilter.php
deleted file mode 100644
index 2b89c0c..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFilter/DefaultFilter.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Plugin\TypedDataFilter;
-
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\Type\StringInterface;
-use Drupal\typed_data\DataFilterBase;
-
-/**
- * A data filter lowering all string characters.
- *
- * @DataFilter(
- *   id = "default",
- *   label = @Translation("Applies a default-value if there is no value."),
- * )
- */
-class DefaultFilter extends DataFilterBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function filter(DataDefinitionInterface $definition, $value, array $arguments, BubbleableMetadata $bubbleable_metadata = NULL) {
-    return isset($value) ? $value : $arguments[0];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function canFilter(DataDefinitionInterface $definition) {
-    return is_subclass_of($definition->getClass(), StringInterface::class);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function filtersTo(DataDefinitionInterface $definition, array $arguments) {
-    return $definition;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function allowsNullValues() {
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getNumberOfRequiredArguments() {
-    return 1;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateArguments(DataDefinitionInterface $definition, array $arguments) {
-    $errors = parent::validateArguments($definition, $arguments);
-    if (isset($arguments[0])) {
-      // Ensure the provided value is given for this data.
-      $violations = $this->getTypedDataManager()
-        ->create($definition, $arguments[0])
-        ->validate();
-      foreach ($violations as $violation) {
-        $errors[] = $violation->getMessage();
-      }
-    }
-    return $errors;
-  }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFilter/EntityUrlFilter.php b/modules/typed_data/src/Plugin/TypedDataFilter/EntityUrlFilter.php
deleted file mode 100644
index f1fe3bd..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFilter/EntityUrlFilter.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Plugin\TypedDataFilter;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\typed_data\DataFilterBase;
-
-/**
- * A data filter that provides the URL of an entity.
- *
- * @DataFilter(
- *   id = "entity_url",
- *   label = @Translation("Provides the URL of an entity."),
- * )
- */
-class EntityUrlFilter extends DataFilterBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function filter(DataDefinitionInterface $definition, $value, array $arguments, BubbleableMetadata $bubbleable_metadata = NULL) {
-    assert($value instanceof EntityInterface);
-    // @todo: url() is deprecated, but toUrl() does not work for file entities,
-    // thus move to url() once toUrl() works for file entities also.
-    return $value->url('canonical', ['absolute' => TRUE]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function canFilter(DataDefinitionInterface $definition) {
-    return $definition instanceof EntityDataDefinitionInterface;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function filtersTo(DataDefinitionInterface $definition, array $arguments) {
-    return 'uri';
-  }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFilter/FormatDateFilter.php b/modules/typed_data/src/Plugin/TypedDataFilter/FormatDateFilter.php
deleted file mode 100644
index 53d3cf6..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFilter/FormatDateFilter.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Plugin\TypedDataFilter;
-
-use Drupal\Core\Datetime\DateFormatterInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\Type\DateTimeInterface;
-use Drupal\typed_data\Exception\InvalidArgumentException;
-use Drupal\typed_data\DataFilterBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * A data filter for formatting dates.
- *
- * @DataFilter(
- *   id = "format_date",
- *   label = @Translation("Formats a date, using a configured date type or a custom date format string."),
- * )
- */
-class FormatDateFilter extends DataFilterBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The date formatter.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatterInterface
-   */
-  protected $dateFormatter;
-
-  /**
-   * The date format storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $dateFormatStorage;
-
-  /**
-   * {@inheritdoc}
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
-   *   The date formatter to use.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $date_format_storage
-   *   The date format storage.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, DateFormatterInterface $date_formatter, EntityStorageInterface $date_format_storage) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->dateFormatter = $date_formatter;
-    $this->dateFormatStorage = $date_format_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('date.formatter'),
-      $container->get('entity.manager')->getStorage('date_format')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function filter(DataDefinitionInterface $definition, $value, array $arguments, BubbleableMetadata $bubbleable_metadata = NULL) {
-    if ($definition->getDataType() != 'timestamp') {
-      // Convert the date to an timestamp.
-      $value = $this->getTypedDataManager()->create($definition, $value)
-        ->getDateTime()
-        ->getTimestamp();
-    }
-    $arguments += [0 => 'medium', 1 => '', 2 => NULL, 3 => NULL];
-    if ($arguments[0] != 'custom' && $bubbleable_metadata) {
-      $config = $this->dateFormatStorage->load($arguments[0]);
-      if (!$config) {
-        throw new InvalidArgumentException("Unknown date format $arguments[0] given.");
-      }
-      $bubbleable_metadata->addCacheableDependency($config);
-    }
-    return $this->dateFormatter->format($value, $arguments[0], $arguments[1], $arguments[2], $arguments[3]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function canFilter(DataDefinitionInterface $definition) {
-    return is_subclass_of($definition->getClass(), DateTimeInterface::class);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function filtersTo(DataDefinitionInterface $definition, array $arguments) {
-    return DataDefinition::create('string');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateArguments(DataDefinitionInterface $definition, array $arguments) {
-    $fails = parent::validateArguments($definition, $arguments);
-    $arguments += [0 => 'medium', 1 => '', 2 => NULL, 3 => NULL];
-    if ($arguments[0] != 'custom' && $this->dateFormatStorage->load($arguments[0]) === NULL) {
-      $fails[] = $this->t('Unkown date format %format given.', ['%format' => $arguments[0]]);
-    }
-    if ($arguments[0] != 'custom' && $arguments[1]) {
-      $fails[] = $this->t("If a custom date format is supplied, 'custom' must be passed as date format.");
-    }
-    elseif ($arguments[0] == 'custom' && !$arguments[1]) {
-      $fails[] = $this->t("If 'custom' is given as date type, a custom date formatting string must be provided; e.g., 'Y-m-d H:i:s'.");
-    }
-    return $fails;
-    // @todo: Should we validate timezones and langcodes also?
-  }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFilter/LowerFilter.php b/modules/typed_data/src/Plugin/TypedDataFilter/LowerFilter.php
deleted file mode 100644
index fa6a4e7..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFilter/LowerFilter.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Plugin\TypedDataFilter;
-
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\Type\StringInterface;
-use Drupal\typed_data\DataFilterBase;
-
-/**
- * A data filter lowering all string characters.
- *
- * @DataFilter(
- *   id = "lower",
- *   label = @Translation("Convert to lower-case")
- * )
- */
-class LowerFilter extends DataFilterBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function filter(DataDefinitionInterface $definition, $value, array $arguments, BubbleableMetadata $bubbleable_metadata = NULL) {
-    return strtolower($value);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function canFilter(DataDefinitionInterface $definition) {
-    return is_subclass_of($definition->getClass(), StringInterface::class);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function filtersTo(DataDefinitionInterface $definition, array $arguments) {
-    return DataDefinition::create('string');
-  }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFilter/StripTagsFilter.php b/modules/typed_data/src/Plugin/TypedDataFilter/StripTagsFilter.php
deleted file mode 100644
index 8baeb7d..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFilter/StripTagsFilter.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Plugin\TypedDataFilter;
-
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\Type\StringInterface;
-use Drupal\typed_data\DataFilterBase;
-
-/**
- * A data filter call "strip_tags()".
- *
- * @DataFilter(
- *   id = "striptags",
- *   label = @Translation("The striptags filter strips SGML/XML tags and replace adjacent whitespace by one space."),
- * )
- */
-class StripTagsFilter extends DataFilterBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function filter(DataDefinitionInterface $definition, $value, array $arguments, BubbleableMetadata $bubbleable_metadata = NULL) {
-    return strip_tags($value);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function canFilter(DataDefinitionInterface $definition) {
-    return is_subclass_of($definition->getClass(), StringInterface::class);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function filtersTo(DataDefinitionInterface $definition, array $arguments) {
-    return 'string';
-  }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFormWidget/SelectWidget.php b/modules/typed_data/src/Plugin/TypedDataFormWidget/SelectWidget.php
deleted file mode 100644
index 77330ff..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFormWidget/SelectWidget.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Plugin\TypedDataFormWidget;
-
-use Drupal\Core\Form\SubformStateInterface;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\ListInterface;
-use Drupal\Core\TypedData\OptionsProviderInterface;
-use Drupal\Core\TypedData\TypedDataInterface;
-use Drupal\rules\Context\ContextDefinition;
-use Drupal\typed_data\Form\SubformState;
-use Drupal\typed_data\Widget\FormWidgetBase;
-use Symfony\Component\Validator\ConstraintViolationListInterface;
-
-/**
- * Plugin implementation of the 'select' widget.
- *
- * @TypedDataFormWidget(
- *   id = "select",
- *   label = @Translation("Select"),
- *   description = @Translation("A simple select box."),
- * )
- */
-class SelectWidget extends FormWidgetBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return parent::defaultConfiguration() + [
-      'label' => NULL,
-      'description' => NULL,
-      'empty_option' => NULL,
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isApplicable(DataDefinitionInterface $definition) {
-    return is_subclass_of($definition->getClass(), OptionsProviderInterface::class);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(TypedDataInterface $data, SubformStateInterface $form_state) {
-    assert($data instanceof OptionsProviderInterface);
-    $form = SubformState::getNewSubForm();
-    $form['value'] = [
-      '#type' => 'select',
-      '#title' => $this->configuration['label'] ?: $data->getDataDefinition()->getLabel(),
-      '#description' => $this->configuration['description'] ?: $data->getDataDefinition()->getDescription(),
-      '#default_value' => $data->getValue(),
-      '#multiple' => $data instanceof ListInterface,
-      '#empty_option' => $this->configuration['empty_option'],
-      '#empty_value' => '',
-      '#required' => $data->getDataDefinition()->isRequired(),
-      '#disabled' => $data->getDataDefinition()->isReadOnly(),
-      '#options' => $data->getSettableOptions(),
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function extractFormValues(TypedDataInterface $data, SubformStateInterface $form_state) {
-    // Ensure empty values correctly end up as NULL value.
-    $value = $form_state->getValue('value');
-    if ($value === '') {
-      $value = NULL;
-    }
-    $data->setValue($value);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function flagViolations(TypedDataInterface $data, ConstraintViolationListInterface $violations, SubformStateInterface $formState) {
-    foreach ($violations as $violation) {
-      /** @var ConstraintViolationInterface $violation */
-      $formState->setErrorByName('value', $violation->getMessage());
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfigurationDefinitions(DataDefinitionInterface $definition) {
-    return [
-      'label' => ContextDefinition::create('string')
-        ->setLabel($this->t('Label')),
-      'description' => ContextDefinition::create('string')
-        ->setLabel($this->t('Description')),
-      'empty_option' => ContextDefinition::create('string')
-        ->setLabel($this->t('Empty option label'))
-        ->setDescription($this->t('Allows overriding the label of the empty option')),
-    ];
-  }
-
-}
diff --git a/modules/typed_data/src/Plugin/TypedDataFormWidget/TextInputWidget.php b/modules/typed_data/src/Plugin/TypedDataFormWidget/TextInputWidget.php
deleted file mode 100644
index a48d6ef..0000000
--- a/modules/typed_data/src/Plugin/TypedDataFormWidget/TextInputWidget.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Plugin\TypedDataFormWidget;
-
-use Drupal\Core\Form\SubformStateInterface;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\Type\FloatInterface;
-use Drupal\Core\TypedData\Type\IntegerInterface;
-use Drupal\Core\TypedData\Type\StringInterface;
-use Drupal\Core\TypedData\TypedDataInterface;
-use Drupal\typed_data\Form\SubformState;
-use Drupal\typed_data\Widget\FormWidgetBase;
-use Symfony\Component\Validator\ConstraintViolationListInterface;
-
-/**
- * Plugin implementation of the 'text_input' widget.
- *
- * @TypedDataFormWidget(
- *   id = "text_input",
- *   label = @Translation("Text input"),
- *   description = @Translation("A simple, one-line text input widget."),
- * )
- */
-class TextInputWidget extends FormWidgetBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return parent::defaultConfiguration() + [
-      'label' => NULL,
-      'description' => NULL,
-      'placeholder' => NULL,
-      'size' => 60,
-      'maxlength' => 255,
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isApplicable(DataDefinitionInterface $definition) {
-    return is_subclass_of($definition->getClass(), StringInterface::class) ||
-      is_subclass_of($definition->getClass(), IntegerInterface::class) ||
-      is_subclass_of($definition->getClass(), FloatInterface::class);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(TypedDataInterface $data, SubformStateInterface $form_state) {
-    $form = SubformState::getNewSubForm();
-    $form['value'] = [
-      '#type' => 'textfield',
-      '#title' => $this->configuration['label'] ?: $data->getDataDefinition()->getLabel(),
-      '#description' => $this->configuration['description'] ?: $data->getDataDefinition()->getDescription(),
-      '#default_value' => $data->getValue(),
-      '#placeholder' => $this->configuration['placeholder'],
-      '#size' => $this->configuration['size'],
-      '#maxlength' => $this->configuration['maxlength'],
-      '#required' => $data->getDataDefinition()->isRequired(),
-      '#disabled' => $data->getDataDefinition()->isReadOnly(),
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function extractFormValues(TypedDataInterface $data, SubformStateInterface $form_state) {
-    // Ensure empty values correctly end up as NULL value.
-    $value = $form_state->getValue('value');
-    if ($value === '') {
-      $value = NULL;
-    }
-    $data->setValue($value);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function flagViolations(TypedDataInterface $data, ConstraintViolationListInterface $violations, SubformStateInterface $formState) {
-    foreach ($violations as $violation) {
-      /** @var ConstraintViolationInterface $violation */
-      $formState->setErrorByName('value', $violation->getMessage());
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfigurationDefinitions(DataDefinitionInterface $definition) {
-    return [
-      'label' => DataDefinition::create('string')
-        ->setLabel($this->t('Label')),
-      'description' => DataDefinition::create('string')
-        ->setLabel($this->t('Description')),
-      'placeholder' => DataDefinition::create('string')
-        ->setLabel($this->t('Placeholder value')),
-      'size' => DataDefinition::create('integer')
-        ->setLabel($this->t('Input field size')),
-      'maxlength' => DataDefinition::create('integer')
-        ->setLabel($this->t('Maximum text length')),
-    ];
-  }
-
-}
diff --git a/modules/typed_data/src/Util/StateTrait.php b/modules/typed_data/src/Util/StateTrait.php
deleted file mode 100644
index 9cc88d3..0000000
--- a/modules/typed_data/src/Util/StateTrait.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Util;
-
-use Drupal\Core\State\StateInterface;
-
-/**
- * Helper for classes that need the state storage.
- */
-trait StateTrait {
-
-  /**
-   * The state storage.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-  /**
-   * Sets the state storage.
-   *
-   * @param \Drupal\Core\State\StateInterface $state
-   *   The state storage.
-   *
-   * @return $this
-   */
-  public function setState(StateInterface $state) {
-    $this->state = $state;
-    return $this;
-  }
-
-  /**
-   * Gets the state storage.
-   *
-   * @return \Drupal\Core\State\StateInterface
-   *   The state storage.
-   */
-  public function getState() {
-    if (empty($this->state)) {
-      $this->state = \Drupal::state();
-    }
-
-    return $this->state;
-  }
-
-}
diff --git a/modules/typed_data/src/Widget/FormWidgetBase.php b/modules/typed_data/src/Widget/FormWidgetBase.php
deleted file mode 100644
index 9a7e74c..0000000
--- a/modules/typed_data/src/Widget/FormWidgetBase.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Widget;
-
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Plugin\PluginBase;
-use Drupal\Core\TypedData\TypedDataManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Base class for 'form widget' plugin implementations.
- */
-abstract class FormWidgetBase extends PluginBase implements FormWidgetInterface, ContainerFactoryPluginInterface {
-
-  /**
-   * The typed data manager.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManagerInterface
-   */
-  protected $typedDataManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static($configuration, $plugin_id, $plugin_definition, $container->get('typed_data_manager'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, TypedDataManagerInterface $typedDataManager) {
-    parent::__construct($configuration + $this->defaultConfiguration(), $plugin_id, $plugin_definition);
-    $this->typedDataManager = $typedDataManager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfiguration() {
-    return $this->configuration;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setConfiguration(array $configuration) {
-    $this->configuration = NestedArray::mergeDeep(
-      $this->defaultConfiguration(),
-      $configuration
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    return [];
-  }
-
-}
diff --git a/modules/typed_data/src/Widget/FormWidgetInterface.php b/modules/typed_data/src/Widget/FormWidgetInterface.php
deleted file mode 100644
index d86f516..0000000
--- a/modules/typed_data/src/Widget/FormWidgetInterface.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Widget;
-
-use Drupal\Component\Plugin\ConfigurablePluginInterface;
-use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\Core\Form\SubformStateInterface;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\TypedDataInterface;
-use Symfony\Component\Validator\ConstraintViolationListInterface;
-
-/**
- * Interface definition for form widget plugins.
- */
-interface FormWidgetInterface extends ConfigurablePluginInterface, PluginInspectionInterface {
-
-  /**
-   * Returns if the widget can be used for the provided data.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $definition
-   *   The definition of the edited data.
-   *
-   * @return bool
-   *   Whether the data can be edited with the widget.
-   */
-  public function isApplicable(DataDefinitionInterface $definition);
-
-  /**
-   * Creates the widget's form elements for editing the given data.
-   *
-   * Note that the FAPI element callbacks (such as #process, #element_validate,
-   * #value_callback, etc.) used by the widget do not have access to the
-   * definition passed to this method. Therefore, if any information is needed
-   * from that definition by those callbacks, the widget implementing this
-   * method must extract the needed properties from the data definition and set
-   * them as ad-hoc $element['#custom'] properties, for later use by its element
-   * callbacks.
-   *
-   * @param \Drupal\Core\TypedData\TypedDataInterface $data
-   *   The data to be edited.
-   * @param \Drupal\Core\Form\SubformStateInterface $form_state
-   *   The form state of the widget's form.
-   *
-   * @return array[]
-   *   The form elements for the given data. Note that this must be an array,
-   *   holding one or more form-elements.
-   */
-  public function form(TypedDataInterface $data, SubformStateInterface $form_state);
-
-  /**
-   * Extracts the data value from submitted form values.
-   *
-   * @param \Drupal\Core\TypedData\TypedDataInterface $data
-   *   The data to be updated with the submitted form values.
-   * @param \Drupal\Core\Form\SubformStateInterface $form_state
-   *   The form state of the widget's form.
-   */
-  public function extractFormValues(TypedDataInterface $data, SubformStateInterface $form_state);
-
-  /**
-   * Reports validation errors against actual form elements.
-   *
-   * Depending on the widget's internal structure, a property-level validation
-   * error needs to be flagged on the right sub-element.
-   *
-   * Note that validation is run according to the validation constraints of
-   * the data definition. In addition to that, widget-level validation may be
-   * provided using the regular #element_validate callbacks of the form API.
-   *
-   * @param \Drupal\Core\TypedData\TypedDataInterface $data
-   *   The data to be edited.
-   * @param \Symfony\Component\Validator\ConstraintViolationListInterface $violations
-   *   A list of constraint violations to flag.
-   * @param \Drupal\Core\Form\SubformStateInterface $formState
-   *   The form state of the widget's form.
-   */
-  public function flagViolations(TypedDataInterface $data, ConstraintViolationListInterface $violations, SubformStateInterface $formState);
-
-  /**
-   * Defines the supported configuration settings.
-   *
-   * If the widget is configurable, this method must define the supported
-   * setting values. The definitions may include suiting widgets and widget
-   * configurations for generating a configuration form.
-   *
-   * @param \Drupal\Core\TypedData\DataDefinitionInterface $definition
-   *   The definition of the edited data.
-   *
-   * @return ContextDefinitionInterface[]
-   *   An array of context definitions describing the configuration values,
-   *   keyed by configuration setting name. The keys must match the actual keys
-   *   of the supported configuration.
-   */
-  public function getConfigurationDefinitions(DataDefinitionInterface $definition);
-
-}
diff --git a/modules/typed_data/src/Widget/FormWidgetManager.php b/modules/typed_data/src/Widget/FormWidgetManager.php
deleted file mode 100644
index 1ccedbe..0000000
--- a/modules/typed_data/src/Widget/FormWidgetManager.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Widget;
-
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\typed_data\Annotation\TypedDataFormWidget;
-
-/**
- * Plugin manager for form widgets.
- */
-class FormWidgetManager extends DefaultPluginManager implements FormWidgetManagerInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(\Traversable $namespaces, ModuleHandlerInterface $module_handler, $plugin_definition_annotation_name = TypedDataFormWidget::class) {
-    $this->alterInfo('typed_data_form_widget');
-    parent::__construct('Plugin/TypedDataFormWidget', $namespaces, $module_handler, FormWidgetInterface::class, $plugin_definition_annotation_name);
-  }
-
-}
diff --git a/modules/typed_data/src/Widget/FormWidgetManagerInterface.php b/modules/typed_data/src/Widget/FormWidgetManagerInterface.php
deleted file mode 100644
index a98dca7..0000000
--- a/modules/typed_data/src/Widget/FormWidgetManagerInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Widget;
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-
-/**
- * Interface for the form widget manager.
- *
- * @see \Drupal\typed_data\Widget\FormWidgetInterface
- */
-interface FormWidgetManagerInterface extends PluginManagerInterface {
-
-  /**
-   * Creates a form widget plugin instance.
-   *
-   * @param string $plugin_id
-   *   The ID of the plugin being instantiated; i.e., the filter machine name.
-   * @param array $configuration
-   *   An array of configuration relevant to the plugin instance. As this plugin
-   *   is not configurable, this is unused and should stay empty.
-   *
-   * @return \Drupal\typed_data\Widget\FormWidgetInterface
-   *   A fully configured plugin instance.
-   *
-   * @throws \Drupal\Component\Plugin\Exception\PluginException
-   *   If the instance cannot be created, such as if the ID is invalid.
-   */
-  public function createInstance($plugin_id, array $configuration = []);
-
-}
diff --git a/modules/typed_data/src/Widget/FormWidgetManagerTrait.php b/modules/typed_data/src/Widget/FormWidgetManagerTrait.php
deleted file mode 100644
index ef67aac..0000000
--- a/modules/typed_data/src/Widget/FormWidgetManagerTrait.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\typed_data\Widget;
-
-/**
- * Helper to access the form widget manager service.
- */
-trait FormWidgetManagerTrait {
-
-  /**
-   * The widget manager.
-   *
-   * @var \Drupal\typed_data\Widget\FormWidgetManagerInterface
-   */
-  protected $widgetManager;
-
-  /**
-   * Sets the widget manager.
-   *
-   * @param \Drupal\typed_data\Widget\FormWidgetManagerInterface $widgetManager
-   *   The widget manager.
-   *
-   * @return $this
-   */
-  public function setFormWidgetManager(FormWidgetManagerInterface $widgetManager) {
-    $this->widgetManager = $widgetManager;
-    return $this;
-  }
-
-  /**
-   * Gets the widget manager.
-   *
-   * @return \Drupal\typed_data\Widget\FormWidgetManagerInterface
-   *   The widget manager.
-   */
-  public function getFormWidgetManager() {
-    if (empty($this->widgetManager)) {
-      $this->widgetManager = \Drupal::service('plugin.manager.typed_data_form_widget');
-    }
-
-    return $this->widgetManager;
-  }
-
-}
diff --git a/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleController.php b/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleController.php
deleted file mode 100644
index f548843..0000000
--- a/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleController.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\typed_data_widget_test;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Url;
-use Drupal\typed_data\Widget\FormWidgetManagerTrait;
-
-/**
- * Class FormWidgetExampleController.
- */
-class FormWidgetExampleController extends ControllerBase {
-
-  use FormWidgetManagerTrait;
-
-  /**
-   * Returns a couple of links to widgets.
-   */
-  public function listWidgetExamples() {
-    $build = [
-      '#theme' => 'item_list',
-      '#title' => 'Widgets',
-      '#items' => [],
-    ];
-
-    foreach ($this->getFormWidgetManager()->getDefinitions() as $id => $definition) {
-      $build['#items'][$id] = [
-        '#title' => $definition['label'],
-        '#type' => 'link',
-        '#url' => Url::fromRoute('typed_data_widget_test.examples.form', ['widget_id' => $id]),
-      ];
-    }
-    return $build;
-  }
-
-}
diff --git a/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleForm.php b/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleForm.php
deleted file mode 100644
index c213921..0000000
--- a/modules/typed_data/tests/modules/typed_data_widget_test/src/FormWidgetExampleForm.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace Drupal\typed_data_widget_test;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\typed_data\Form\SubformState;
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\Core\TypedData\TypedDataTrait;
-use Drupal\typed_data\Util\StateTrait;
-use Drupal\typed_data\Widget\FormWidgetManagerTrait;
-
-/**
- * Class FormWidgetExampleForm.
- */
-class FormWidgetExampleForm extends FormBase {
-
-  use FormWidgetManagerTrait;
-  use StateTrait;
-  use TypedDataTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'typed_data_widget_test_form';
-  }
-
-  /**
-   * Gets some example context definition.
-   *
-   * @param string $widget_id
-   *   The widget id.
-   *
-   * @return \Drupal\Core\Plugin\Context\ContextDefinitionInterface
-   *   The definition.
-   */
-  public function getExampleContextDefinition($widget_id) {
-    switch ($widget_id) {
-      default:
-      case 'text_input':
-        return ContextDefinition::create('string')
-          ->setLabel('Example string')
-          ->setDescription('Some example string with max. 8 characters.')
-          ->setDefaultValue('default')
-          ->addConstraint('Length', ['max' => 8]);
-      case 'select':
-        return ContextDefinition::create('filter_format')
-          ->setLabel('Filter format')
-          ->setDescription('Some example selection.');
-    }
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $widget_id = NULL) {
-    $widget = $this->getFormWidgetManager()->createInstance($widget_id);
-
-    // Read and write widget configuration from the state.
-    // Allow tests to define a custom context definition.
-    $context_definition = $this->getState()->get('typed_data_widgets.definition');
-    $context_definition = $context_definition ?: $this->getExampleContextDefinition($widget_id);
-    $form_state->set('widget_id', $widget_id);
-    $form_state->set('context_definition', $context_definition);
-
-    // Create a typed data object.
-    $data = $this->getTypedDataManager()
-      ->create($context_definition->getDataDefinition());
-    $value = $this->getState()->get('typed_data_widgets.' . $widget_id);
-    $value = isset($value) ? $value : $context_definition->getDefaultValue();
-    $data->setValue($value);
-
-    $subform_state = SubformState::createWithParents(['data'], $form, $form_state);
-    $form['data'] = $widget->form($data, $subform_state);
-
-    $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = [
-      '#type' => 'submit',
-      '#value' => 'Submit',
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    parent::validateForm($form, $form_state);
-
-    $context_definition = $form_state->get('context_definition');
-    $widget_id = $form_state->get('widget_id');
-    $widget = $this->getFormWidgetManager()->createInstance($widget_id);
-
-    $subform_state = SubformState::createWithParents(['data'], $form, $form_state);
-    $data = $this->getTypedDataManager()
-      ->create($context_definition->getDataDefinition());
-    $widget->extractFormValues($data, $subform_state);
-
-    // Validate the data and flag possible violations.
-    $violations = $data->validate();
-    $widget->flagViolations($data, $violations, $subform_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $context_definition = $form_state->get('context_definition');
-    $widget_id = $form_state->get('widget_id');
-    $widget = $this->getFormWidgetManager()->createInstance($widget_id);
-
-    $subform_state = SubformState::createWithParents(['data'], $form, $form_state);
-    $data = $this->getTypedDataManager()
-      ->create($context_definition->getDataDefinition());
-    $widget->extractFormValues($data, $subform_state);
-
-    // Read and write widget configuration via the state.
-    $this->getState()->set('typed_data_widgets.' . $widget_id, $data->getValue());
-    drupal_set_message($this->t('Value saved'));
-  }
-
-}
diff --git a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.info.yml b/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.info.yml
deleted file mode 100644
index 44103f4..0000000
--- a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Typed Data Widgets Test
-type: module
-description: 'Implements example forms using typed data widgets.'
-# core: 8.x
-dependencies:
-  - drupal:typed_data
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-1.0-alpha1+34-dev'
-core: '8.x'
-project: 'typed_data'
-datestamp: 1508419447
diff --git a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.links.menu.yml b/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.links.menu.yml
deleted file mode 100644
index d6b0024..0000000
--- a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.links.menu.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-typed_data_widget_test.examples:
-  title: 'Typed Data Widgets'
-  parent: system.admin_config_ui
-  description: 'Shows examples for typed data widgets.'
-  route_name: typed_data_widget_test.examples
-  weight: 10
diff --git a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.routing.yml b/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.routing.yml
deleted file mode 100644
index 6c91299..0000000
--- a/modules/typed_data/tests/modules/typed_data_widget_test/typed_data_widget_test.routing.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-typed_data_widget_test.examples:
-  path: '/admin/config/user-interface/typed-data-widgets'
-  defaults:
-    _controller: 'Drupal\typed_data_widget_test\FormWidgetExampleController:listWidgetExamples'
-    _title: 'Widget examples'
-  requirements:
-    _permission: 'administer site configuration'
-typed_data_widget_test.examples.form:
-  path: '/admin/config/user-interface/typed-data-widgets/{widget_id}'
-  defaults:
-    _form: 'Drupal\typed_data_widget_test\FormWidgetExampleForm'
-    _title: 'Widget examples'
-  requirements:
-    _permission: 'administer site configuration'
diff --git a/modules/typed_data/tests/src/Functional/TypedDataFormWidget/SelectWidgetTest.php b/modules/typed_data/tests/src/Functional/TypedDataFormWidget/SelectWidgetTest.php
deleted file mode 100644
index 972ee7d..0000000
--- a/modules/typed_data/tests/src/Functional/TypedDataFormWidget/SelectWidgetTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-namespace Drupal\Tests\typed_data\Functional\TypedDataFormWidget;
-
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\Core\TypedData\ListDataDefinition;
-use Drupal\Core\TypedData\MapDataDefinition;
-use Drupal\Core\TypedData\TypedDataTrait;
-use Drupal\Tests\BrowserTestBase;
-use Drupal\Tests\typed_data\Traits\BrowserTestHelpersTrait;
-use Drupal\typed_data\Util\StateTrait;
-use Drupal\typed_data\Widget\FormWidgetManagerTrait;
-
-/**
- * Class SelectWidgetTest.
- *
- * @group typed_data
- *
- * @coversDefaultClass \Drupal\typed_data\Plugin\TypedDataFormWidget\SelectWidget
- */
-class SelectWidgetTest extends BrowserTestBase {
-
-  use BrowserTestHelpersTrait;
-  use FormWidgetManagerTrait;
-  use StateTrait;
-  use TypedDataTrait;
-
-  /**
-   * The tested form widget.
-   *
-   * @var \Drupal\typed_data\Widget\FormWidgetInterface
-   */
-  protected $widget;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'typed_data',
-    'typed_data_widget_test',
-    'text',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->widget = $this->getFormWidgetManager()->createInstance('select');
-  }
-
-  /**
-   * @covers ::isApplicable
-   */
-  public function testIsApplicable() {
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('any')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('binary')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('boolean')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('datetime_iso8601')));;
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('duration_iso8601')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('email')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('float')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('integer')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('string')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('timespan')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('timestamp')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('uri')));
-    $this->assertFalse($this->widget->isApplicable(ListDataDefinition::create('string')));
-    $this->assertFalse($this->widget->isApplicable(MapDataDefinition::create()));
-    $this->assertTrue($this->widget->isApplicable(DataDefinition::create('filter_format')));
-  }
-
-  /**
-   * @covers ::form
-   * @covers ::extractFormValues
-   */
-  public function testFormEditing() {
-    $context_definition = ContextDefinition::create('filter_format')
-      ->setLabel('Filter format')
-      ->setDescription('Some example selection.');
-    $this->getState()->set('typed_data_widgets.definition', $context_definition);
-
-    $this->drupalLogin($this->createUser([], NULL, TRUE));
-    $path = 'admin/config/user-interface/typed-data-widgets/' . $this->widget->getPluginId();
-    $this->drupalGet($path);
-
-    $this->assertSession()->elementTextContains('css', 'label[for=edit-data-value]', $context_definition->getLabel());
-    $this->assertSession()->elementTextContains('css', 'div[id=edit-data-value--description]', $context_definition->getDescription());
-    $this->assertSession()->fieldValueEquals('data[value]', $context_definition->getDefaultValue());
-
-    $this->getSession()->getPage()->selectFieldOption('data[value]', 'plain_text');
-    $this->pressButton('Submit');
-
-    $this->drupalGet($path);
-    $this->assertSession()->fieldValueEquals('data[value]', 'plain_text');
-  }
-
-  /**
-   * @covers ::form
-   * @covers ::flagViolations
-   */
-  public function testValidation() {
-    $context_definition = ContextDefinition::create('filter_format')
-      ->setLabel('Filter format')
-      ->setDescription('Some example selection.')
-      ->setRequired(TRUE);
-    $this->getState()->set('typed_data_widgets.definition', $context_definition);
-
-    $this->drupalLogin($this->createUser([], NULL, TRUE));
-    $path = 'admin/config/user-interface/typed-data-widgets/' . $this->widget->getPluginId();
-    $this->drupalGet($path);
-
-    // Set the empty option and make sure it results in a violation.
-    $this->fillField('data[value]', '');
-    $this->pressButton('Submit');
-    $this->assertSession()
-      ->fieldExists('data[value]')
-      ->hasClass('error');
-
-    // Make sure the changes have not been saved also.
-    $this->drupalGet($path);
-    $this->assertSession()->fieldValueEquals('data[value]', $context_definition->getDefaultValue());
-  }
-
-}
diff --git a/modules/typed_data/tests/src/Functional/TypedDataFormWidget/TextInputWidgetTest.php b/modules/typed_data/tests/src/Functional/TypedDataFormWidget/TextInputWidgetTest.php
deleted file mode 100644
index 318776a..0000000
--- a/modules/typed_data/tests/src/Functional/TypedDataFormWidget/TextInputWidgetTest.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace Drupal\Tests\typed_data\Functional\TypedDataFormWidget;
-
-use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\Core\TypedData\ListDataDefinition;
-use Drupal\Core\TypedData\MapDataDefinition;
-use Drupal\Core\TypedData\TypedDataTrait;
-use Drupal\Tests\BrowserTestBase;
-use Drupal\Tests\typed_data\Traits\BrowserTestHelpersTrait;
-use Drupal\typed_data\Util\StateTrait;
-use Drupal\typed_data\Widget\FormWidgetManagerTrait;
-
-/**
- * Class TextInputWidgetTest.
- *
- * @group typed_data
- *
- * @coversDefaultClass \Drupal\typed_data\Plugin\TypedDataFormWidget\TextInputWidget
- */
-class TextInputWidgetTest extends BrowserTestBase {
-
-  use BrowserTestHelpersTrait;
-  use FormWidgetManagerTrait;
-  use StateTrait;
-  use TypedDataTrait;
-
-  /**
-   * The tested form widget.
-   *
-   * @var \Drupal\typed_data\Widget\FormWidgetInterface
-   */
-  protected $widget;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'typed_data',
-    'typed_data_widget_test',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->widget = $this->getFormWidgetManager()->createInstance('text_input');
-  }
-
-  /**
-   * @covers ::isApplicable
-   */
-  public function testIsApplicable() {
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('any')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('binary')));
-    $this->assertFalse($this->widget->isApplicable(DataDefinition::create('boolean')));
-    $this->assertTrue($this->widget->isApplicable(DataDefinition::create('datetime_iso8601')));;
-    $this->assertTrue($this->widget->isApplicable(DataDefinition::create('duration_iso8601')));
-    $this->assertTrue($this->widget->isApplicable(DataDefinition::create('email')));
-    $this->assertTrue($this->widget->isApplicable(DataDefinition::create('float')));
-    $this->assertTrue($this->widget->isApplicable(DataDefinition::create('integer')));
-    $this->assertTrue($this->widget->isApplicable(DataDefinition::create('string')));
-    $this->assertTrue($this->widget->isApplicable(DataDefinition::create('timespan')));
-    $this->assertTrue($this->widget->isApplicable(DataDefinition::create('timestamp')));
-    $this->assertTrue($this->widget->isApplicable(DataDefinition::create('uri')));
-    $this->assertFalse($this->widget->isApplicable(ListDataDefinition::create('string')));
-    $this->assertFalse($this->widget->isApplicable(MapDataDefinition::create()));
-  }
-
-  /**
-   * @covers ::form
-   * @covers ::extractFormValues
-   */
-  public function testFormEditing() {
-    $context_definition = ContextDefinition::create('string')
-      ->setLabel('Example string')
-      ->setDescription('Some example string')
-      ->setDefaultValue('default1');
-    $this->getState()->set('typed_data_widgets.definition', $context_definition);
-
-    $this->drupalLogin($this->createUser([], NULL, TRUE));
-    $path = 'admin/config/user-interface/typed-data-widgets/' . $this->widget->getPluginId();
-    $this->drupalGet($path);
-
-    $this->assertSession()->elementTextContains('css', 'label[for=edit-data-value]', $context_definition->getLabel());
-    $this->assertSession()->elementTextContains('css', 'div[id=edit-data-value--description]', $context_definition->getDescription());
-    $this->assertSession()->fieldValueEquals('data[value]', $context_definition->getDefaultValue());
-
-    $this->fillField('data[value]', 'jump');
-    $this->pressButton('Submit');
-
-    $this->drupalGet($path);
-    $this->assertSession()->fieldValueEquals('data[value]', 'jump');
-  }
-
-  /**
-   * @covers ::form
-   * @covers ::flagViolations
-   */
-  public function testValidation() {
-    $context_definition = ContextDefinition::create('string')
-      ->setLabel('Example string')
-      ->setDescription('Some example string')
-      ->setDefaultValue('default1')
-      ->addConstraint('Length', ['max' => 3]);
-    $this->getState()->set('typed_data_widgets.definition', $context_definition);
-
-    $this->drupalLogin($this->createUser([], NULL, TRUE));
-    $path = 'admin/config/user-interface/typed-data-widgets/' . $this->widget->getPluginId();
-    $this->drupalGet($path);
-
-    $this->fillField('data[value]', 'too-long');
-    $this->pressButton('Submit');
-    $this->assertSession()
-      ->fieldExists('data[value]')
-      ->hasClass('error');
-
-    // Make sure the changes have not been saved also.
-    $this->drupalGet($path);
-    $this->assertSession()->fieldValueEquals('data[value]', $context_definition->getDefaultValue());
-  }
-
-}
diff --git a/modules/typed_data/tests/src/Kernel/DataDefinitionFetcherTest.php b/modules/typed_data/tests/src/Kernel/DataDefinitionFetcherTest.php
deleted file mode 100644
index 697dc2d..0000000
--- a/modules/typed_data/tests/src/Kernel/DataDefinitionFetcherTest.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-
-namespace Drupal\Tests\typed_data\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\typed_data\Exception\InvalidArgumentException;
-
-/**
- * @coversDefaultClass \Drupal\typed_data\DataFetcher
- *
- * @group typed_data
- */
-class DataDefinitionFetcherTest extends KernelTestBase {
-
-  /**
-   * The data fetcher object we want to test.
-   *
-   * @var \Drupal\typed_data\DataFetcherInterface
-   */
-  protected $dataFetcher;
-
-  /**
-   * The typed data manager.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManagerInterface
-   */
-  protected $typedDataManager;
-
-  /**
-   * The data definition of our page node used for testing.
-   *
-   * @var \Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface
-   */
-  protected $nodeDefinition;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['typed_data', 'system', 'node', 'field', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->dataFetcher = $this->container->get('typed_data.data_fetcher');
-    $this->typedDataManager = $this->container->get('typed_data_manager');
-
-    $entity_type_manager = $this->container->get('entity_type.manager');
-    $entity_type_manager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    // Create a multi-value integer field for testing.
-    FieldStorageConfig::create([
-      'field_name' => 'field_integer',
-      'type' => 'integer',
-      'entity_type' => 'node',
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ])->save();
-    FieldConfig::create([
-      'field_name' => 'field_integer',
-      'entity_type' => 'node',
-      'bundle' => 'page',
-    ])->save();
-
-    $node = $entity_type_manager->getStorage('node')
-      ->create([
-        'title' => 'test',
-        'type' => 'page',
-      ]);
-    $this->nodeDefinition = $node->getTypedData()->getDataDefinition();
-  }
-
-  /**
-   * @covers ::fetchDefinitionByPropertyPath
-   */
-  public function testFetchingByBasicPropertyPath() {
-    $target_definition = $this->nodeDefinition
-      ->getPropertyDefinition('title')
-      ->getItemDefinition()
-      ->getPropertyDefinition('value');
-
-    $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
-      $this->nodeDefinition,
-      'title.0.value'
-    );
-
-    $this->assertSame($target_definition, $fetched_definition);
-  }
-
-  /**
-   * @covers ::fetchDefinitionBySubPaths
-   */
-  public function testFetchingByBasicSubPath() {
-    $target_definition = $this->nodeDefinition
-      ->getPropertyDefinition('title')
-      ->getItemDefinition()
-      ->getPropertyDefinition('value');
-
-    $fetched_definition = $this->dataFetcher->fetchDefinitionBySubPaths(
-      $this->nodeDefinition,
-      ['title', '0', 'value']
-    );
-
-    $this->assertSame($target_definition, $fetched_definition);
-  }
-
-  /**
-   * @covers ::fetchDefinitionByPropertyPath
-   */
-  public function testFetchingEntityReference() {
-    $target_definition = $this->nodeDefinition
-      ->getPropertyDefinition('uid')
-      ->getItemDefinition()
-      ->getPropertyDefinition('entity');
-
-    $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
-      $this->nodeDefinition,
-      'uid.entity'
-    );
-
-    $this->assertSame($target_definition, $fetched_definition);
-  }
-
-  /**
-   * @covers ::fetchDefinitionByPropertyPath
-   */
-  public function testFetchingAcrossReferences() {
-    $target_definition = $this->nodeDefinition
-      ->getPropertyDefinition('uid')
-      ->getItemDefinition()
-      ->getPropertyDefinition('entity')
-      ->getTargetDefinition()
-      ->getPropertyDefinition('name')
-      ->getItemDefinition()
-      ->getPropertyDefinition('value');
-
-    $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
-      $this->nodeDefinition,
-      'uid.entity.name.value'
-    );
-
-    $this->assertSame($target_definition, $fetched_definition);
-  }
-
-  /**
-   * @covers ::fetchDefinitionByPropertyPath
-   */
-  public function testFetchingAtValidPositions() {
-    $target_definition = $this->nodeDefinition
-      ->getPropertyDefinition('field_integer')
-      ->getItemDefinition()
-      ->getPropertyDefinition('value');
-
-    $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
-      $this->nodeDefinition,
-      'field_integer.0.value'
-    );
-
-    $this->assertSame($target_definition, $fetched_definition);
-
-    $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
-      $this->nodeDefinition,
-      'field_integer.1.value'
-    );
-
-    $this->assertSame($target_definition, $fetched_definition);
-  }
-
-  /**
-   * @covers ::fetchDefinitionByPropertyPath
-   */
-  public function testFetchingInvalidProperty() {
-    $this->setExpectedException(InvalidArgumentException::class, "Unable to apply data selector 'field_invalid.0.value' at 'field_invalid'");
-    // This should trigger an exception.
-    $this->dataFetcher->fetchDefinitionByPropertyPath(
-      $this->nodeDefinition,
-      'field_invalid.0.value'
-    );
-  }
-
-  /**
-   * @covers ::fetchDefinitionByPropertyPath
-   */
-  public function testFetchingField() {
-    $target_definition = $this->nodeDefinition
-      ->getPropertyDefinition('field_integer');
-
-    $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
-      $this->nodeDefinition,
-      'field_integer'
-    );
-
-    $this->assertSame($target_definition, $fetched_definition);
-  }
-
-  /**
-   * @covers ::fetchDefinitionByPropertyPath
-   */
-  public function testFetchingReferenceField() {
-    $target_definition = $this->nodeDefinition
-      ->getPropertyDefinition('uid');
-
-    $fetched_definition = $this->dataFetcher->fetchDefinitionByPropertyPath(
-      $this->nodeDefinition,
-      'uid'
-    );
-
-    $this->assertSame($target_definition, $fetched_definition);
-  }
-
-  /**
-   * @covers ::fetchDefinitionByPropertyPath
-   */
-  public function testFetchingNonComplexType() {
-    $this->setExpectedException(InvalidArgumentException::class, "The data selector 'field_integer.0.value.not_existing' cannot be applied because the parent property 'value' is not a list or a complex structure");
-    // This should trigger an exception.
-    $this->dataFetcher->fetchDefinitionByPropertyPath(
-      $this->nodeDefinition,
-      'field_integer.0.value.not_existing'
-    );
-  }
-
-  /**
-   * @covers ::fetchDefinitionByPropertyPath
-   */
-  public function testFetchingFromPrimitive() {
-    $this->setExpectedException(InvalidArgumentException::class, "The data selector 'unknown_property' cannot be applied because the definition of type 'string' is not a list or a complex structure");
-    $definition = $this->nodeDefinition
-      ->getPropertyDefinition('title')
-      ->getItemDefinition()
-      ->getPropertyDefinition('value');
-
-    // This should trigger an exception.
-    $this->dataFetcher->fetchDefinitionByPropertyPath(
-      $definition,
-      'unknown_property'
-    );
-  }
-
-  /**
-   * @covers ::fetchDefinitionByPropertyPath
-   */
-  public function testFetchingAtInvalidPosition() {
-    $this->setExpectedException(InvalidArgumentException::class, "The data selector 'unknown_property' cannot be applied because the definition of type 'integer' is not a list or a complex structure");
-    $list_definition = $this->typedDataManager->createListDataDefinition('integer');
-
-    // This should trigger an exception.
-    $this->dataFetcher->fetchDefinitionByPropertyPath(
-      $list_definition,
-      'unknown_property'
-    );
-  }
-
-}
diff --git a/modules/typed_data/tests/src/Kernel/DataFetcherTest.php b/modules/typed_data/tests/src/Kernel/DataFetcherTest.php
deleted file mode 100644
index 1a6db3a..0000000
--- a/modules/typed_data/tests/src/Kernel/DataFetcherTest.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-
-namespace Drupal\Tests\typed_data\Kernel;
-
-use Drupal\Core\Entity\TypedData\EntityDataDefinition;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\TypedData\Exception\MissingDataException;
-use Drupal\typed_data\Exception\InvalidArgumentException;
-
-/**
- * Class DataFetcherTest.
- *
- * @group typed_data
- *
- * @coversDefaultClass \Drupal\typed_data\DataFetcher
- */
-class DataFetcherTest extends KernelTestBase {
-
-  /**
-   * The typed data manager.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManagerInterface
-   */
-  protected $typedDataManager;
-
-  /**
-   * The data fetcher object we want to test.
-   *
-   * @var \Drupal\typed_data\DataFetcherInterface
-   */
-  protected $dataFetcher;
-
-  /**
-   * A node used for testing.
-   *
-   * @var \Drupal\node\NodeInterface
-   */
-  protected $node;
-
-  /**
-   * An entity type manager used for testing.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManager
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'typed_data',
-    'system',
-    'node',
-    'field',
-    'text',
-    'user',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->typedDataManager = $this->container->get('typed_data_manager');
-    $this->dataFetcher = $this->container->get('typed_data.data_fetcher');
-
-    $this->entityTypeManager = $this->container->get('entity_type.manager');
-    $this->entityTypeManager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    // Create a multi-value integer field for testing.
-    FieldStorageConfig::create([
-      'field_name' => 'field_integer',
-      'type' => 'integer',
-      'entity_type' => 'node',
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ])->save();
-    FieldConfig::create([
-      'field_name' => 'field_integer',
-      'entity_type' => 'node',
-      'bundle' => 'page',
-    ])->save();
-
-    $this->installSchema('system', ['sequences']);
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-
-    $this->node = $this->entityTypeManager->getStorage('node')
-      ->create([
-        'title' => 'test',
-        'type' => 'page',
-      ]);
-  }
-
-  /**
-   * @covers ::fetchDataByPropertyPath
-   */
-  public function testFetchingByBasicPropertyPath() {
-    $this->assertEquals(
-      $this->node->title->value,
-      $this->dataFetcher
-        ->fetchDataByPropertyPath($this->node->getTypedData(), 'title.0.value')
-        ->getValue()
-    );
-  }
-
-  /**
-   * @covers ::fetchDataBySubPaths
-   */
-  public function testFetchingByBasicSubPath() {
-    $this->assertEquals(
-      $this->node->title->value,
-      $this->dataFetcher
-        ->fetchDataBySubPaths(
-          $this->node->getTypedData(),
-          ['title', '0', 'value']
-        )
-        ->getValue()
-    );
-  }
-
-  /**
-   * @covers ::fetchDataByPropertyPath
-   */
-  public function testFetchingEntityReference() {
-    $user = $this->entityTypeManager->getStorage('user')
-      ->create([
-        'name' => 'test',
-        'type' => 'user',
-      ]);
-    $this->node->uid->entity = $user;
-
-    $fetched_user = $this->dataFetcher
-      ->fetchDataByPropertyPath($this->node->getTypedData(), 'uid.entity')
-      ->getValue();
-    $this->assertSame($fetched_user, $user);
-  }
-
-  /**
-   * @covers ::fetchDataByPropertyPath
-   */
-  public function testFetchingAcrossReferences() {
-    $user = $this->entityTypeManager->getStorage('user')
-      ->create([
-        'name' => 'test',
-        'type' => 'user',
-      ]);
-    $this->node->uid->entity = $user;
-
-    $fetched_value = $this->dataFetcher
-      ->fetchDataByPropertyPath($this->node->getTypedData(), 'uid.entity.name.value')
-      ->getValue();
-    $this->assertSame($fetched_value, 'test');
-  }
-
-  /**
-   * @covers ::fetchDataByPropertyPath
-   */
-  public function testFetchingNonExistingEntityReference() {
-    $fetched_user = $this->dataFetcher
-      ->fetchDataByPropertyPath($this->node->getTypedData(), 'uid.0.entity')
-      ->getValue();
-    $this->assertNull($fetched_user);
-  }
-
-  /**
-   * @covers ::fetchDataByPropertyPath
-   */
-  public function testFetchingValueAtValidPositions() {
-    $this->node->field_integer->setValue(['0' => 1, '1' => 2]);
-
-    $fetched_value = $this->dataFetcher
-      ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_integer.0.value')
-      ->getValue();
-    $this->assertEquals($fetched_value, 1);
-
-    $fetched_value = $this->dataFetcher
-      ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_integer.1.value')
-      ->getValue();
-    $this->assertEquals($fetched_value, 2);
-  }
-
-  /**
-   * @covers ::fetchDataByPropertyPath
-   */
-  public function testFetchingValueAtInvalidPosition() {
-    $this->setExpectedException(MissingDataException::class, "Unable to apply data selector 'field_integer.0.value' at 'field_integer.0'");
-    $this->node->field_integer->setValue([]);
-
-    // This should trigger an exception.
-    $this->dataFetcher
-      ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_integer.0.value')
-      ->getValue();
-  }
-
-  /**
-   * @covers ::fetchDataByPropertyPath
-   */
-  public function testFetchingInvalidProperty() {
-    $this->setExpectedException(InvalidArgumentException::class, "Unable to apply data selector 'field_invalid.0.value' at 'field_invalid'");
-    // This should trigger an exception.
-    $this->dataFetcher
-      ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_invalid.0.value')
-      ->getValue();
-  }
-
-  /**
-   * @covers ::fetchDataByPropertyPath
-   */
-  public function testFetchingEmptyProperty() {
-    $this->node->field_integer->setValue([]);
-
-    $fetched_value = $this->dataFetcher
-      ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_integer')
-      ->getValue();
-    $this->assertEquals($fetched_value, []);
-  }
-
-  /**
-   * @covers ::fetchDataByPropertyPath
-   */
-  public function testFetchingNotExistingListItem() {
-    $this->setExpectedException(MissingDataException::class);
-    $this->node->field_integer->setValue([]);
-
-    // This will throw an exception.
-    $this->dataFetcher
-      ->fetchDataByPropertyPath($this->node->getTypedData(), 'field_integer.0')
-      ->getValue();
-  }
-
-  /**
-   * @covers ::fetchDataByPropertyPath
-   */
-  public function testFetchingFromEmptyData() {
-    $this->setExpectedException(MissingDataException::class, "Unable to apply data selector 'field_integer.0.value' at 'field_integer': Unable to get property field_integer as no entity has been provided.");
-    $data_empty = $this->typedDataManager->create(EntityDataDefinition::create('node'));
-    // This should trigger an exception.
-    $this->dataFetcher
-      ->fetchDataByPropertyPath($data_empty, 'field_integer.0.value')
-      ->getValue();
-  }
-
-  /**
-   * @covers ::fetchDataByPropertyPath
-   */
-  public function testBubbleableMetadata() {
-    $this->node->field_integer->setValue([]);
-    // Save the node, so that it gets an ID and it has a cache tag.
-    $this->node->save();
-    // Also add a user for testing cache tags of references.
-    $user = $this->entityTypeManager->getStorage('user')
-      ->create([
-        'name' => 'test',
-        'type' => 'user',
-      ]);
-    $user->save();
-    $this->node->uid->entity = $user;
-
-    $bubbleable_metadata = new BubbleableMetadata();
-    $this->dataFetcher
-      ->fetchDataByPropertyPath($this->node->getTypedData(), 'title.value', $bubbleable_metadata)
-      ->getValue();
-
-    $expected = ['node:' . $this->node->id()];
-    $this->assertEquals($expected, $bubbleable_metadata->getCacheTags());
-
-    // Test cache tags of references are added correctly.
-    $this->dataFetcher
-      ->fetchDataByPropertyPath($this->node->getTypedData(), 'uid.entity.name', $bubbleable_metadata)
-      ->getValue();
-
-    $expected = ['node:' . $this->node->id(), 'user:' . $user->id()];
-    $this->assertEquals($expected, $bubbleable_metadata->getCacheTags());
-  }
-
-}
diff --git a/modules/typed_data/tests/src/Kernel/DataFilterTest.php b/modules/typed_data/tests/src/Kernel/DataFilterTest.php
deleted file mode 100644
index 278f8ed..0000000
--- a/modules/typed_data/tests/src/Kernel/DataFilterTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-namespace Drupal\Tests\typed_data\Kernel;
-
-use Drupal\Core\Datetime\Entity\DateFormat;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests using typed data filters.
- *
- * @group typed_data
- *
- * @coversDefaultClass \Drupal\typed_data\DataFilterManager
- */
-class DataFiterTest extends KernelTestBase {
-
-  /**
-   * The typed data manager.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManagerInterface
-   */
-  protected $typedDataManager;
-
-  /**
-   * The data filter manager.
-   *
-   * @var \Drupal\typed_data\DataFilterManagerInterface
-   */
-  protected $dataFilterManager;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['typed_data', 'system', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->typedDataManager = $this->container->get('typed_data_manager');
-    $this->dataFilterManager = $this->container->get('plugin.manager.typed_data_filter');
-
-    // Make sure default date formats are there for testing the format_date
-    // filter.
-    $this->installConfig(['system']);
-  }
-
-  /**
-   * @covers \Drupal\typed_data\Plugin\TypedDataFilter\LowerFilter
-   */
-  public function testLowerFilter() {
-    $filter = $this->dataFilterManager->createInstance('lower');
-    $data = $this->typedDataManager->create(DataDefinition::create('string'), 'tEsT');
-
-    $this->assertTrue($filter->canFilter($data->getDataDefinition()));
-    $this->assertFalse($filter->canFilter(DataDefinition::create('any')));
-
-    $this->assertEquals('string', $filter->filtersTo($data->getDataDefinition(), [])->getDataType());
-
-    $this->assertEquals('test', $filter->filter($data->getDataDefinition(), $data->getValue(), []));
-  }
-
-  /**
-   * @covers \Drupal\typed_data\Plugin\TypedDataFilter\DefaultFilter
-   */
-  public function testDefaultFilter() {
-    $filter = $this->dataFilterManager->createInstance('default');
-    $data = $this->typedDataManager->create(DataDefinition::create('string'));
-
-    $this->assertTrue($filter->canFilter($data->getDataDefinition()));
-    $this->assertFalse($filter->canFilter(DataDefinition::create('any')));
-
-    $this->assertSame($data->getDataDefinition(), $filter->filtersTo($data->getDataDefinition(), ['default']));
-
-    $fails = $filter->validateArguments($data->getDataDefinition(), []);
-    $this->assertEquals(1, count($fails));
-    $this->assertContains('Missing arguments', (string) $fails[0]);
-    $fails = $filter->validateArguments($data->getDataDefinition(), [new \StdClass()]);
-    $this->assertEquals(1, count($fails));
-    $this->assertEquals('This value should be of the correct primitive type.', $fails[0]);
-
-    $this->assertEquals('default', $filter->filter($data->getDataDefinition(), $data->getValue(), ['default']));
-    $data->setValue('non-default');
-    $this->assertEquals('non-default', $filter->filter($data->getDataDefinition(), $data->getValue(), ['default']));
-  }
-
-  /**
-   * @covers \Drupal\typed_data\Plugin\TypedDataFilter\FormatDateFilter
-   */
-  public function testFormatDateFilter() {
-    $filter = $this->dataFilterManager->createInstance('format_date');
-    $data = $this->typedDataManager->create(DataDefinition::create('timestamp'), 3700);
-
-    $this->assertTrue($filter->canFilter($data->getDataDefinition()));
-    $this->assertFalse($filter->canFilter(DataDefinition::create('any')));
-
-    $this->assertEquals('string', $filter->filtersTo($data->getDataDefinition(), [])->getDataType());
-
-    $fails = $filter->validateArguments($data->getDataDefinition(), []);
-    $this->assertEquals(0, count($fails));
-    $fails = $filter->validateArguments($data->getDataDefinition(), ['medium']);
-    $this->assertEquals(0, count($fails));
-    $fails = $filter->validateArguments($data->getDataDefinition(), ['invalid-format']);
-    $this->assertEquals(1, count($fails));
-    $fails = $filter->validateArguments($data->getDataDefinition(), ['custom']);
-    $this->assertEquals(1, count($fails));
-    $fails = $filter->validateArguments($data->getDataDefinition(), ['custom', 'Y']);
-    $this->assertEquals(0, count($fails));
-
-    /** @var \Drupal\Core\Datetime\DateFormatterInterface $date_formatter */
-    $date_formatter = $this->container->get('date.formatter');
-    $this->assertEquals($date_formatter->format(3700), $filter->filter($data->getDataDefinition(), $data->getValue(), []));
-    $this->assertEquals($date_formatter->format(3700, 'short'), $filter->filter($data->getDataDefinition(), $data->getValue(), ['short']));
-    $this->assertEquals('1970', $filter->filter($data->getDataDefinition(), $data->getValue(), ['custom', 'Y']));
-
-    // Verify the filter works with non-timestamp data as well.
-    $data = $this->typedDataManager->create(DataDefinition::create('datetime_iso8601'), "1970-01-01T10:10:10+00:00");
-    $this->assertTrue($filter->canFilter($data->getDataDefinition()));
-    $this->assertEquals('string', $filter->filtersTo($data->getDataDefinition(), [])->getDataType());
-    $this->assertEquals('1970', $filter->filter($data->getDataDefinition(), $data->getValue(), ['custom', 'Y']));
-
-    // Test cache dependencies of date format config entities are added in.
-    $metadata = new BubbleableMetadata();
-    $filter->filter($data->getDataDefinition(), $data->getValue(), ['short'], $metadata);
-    $this->assertEquals(DateFormat::load('short')->getCacheTags(), $metadata->getCacheTags());
-    $metadata = new BubbleableMetadata();
-    $filter->filter($data->getDataDefinition(), $data->getValue(), ['custom', 'Y'], $metadata);
-    $this->assertEquals([], $metadata->getCacheTags());
-  }
-
-}
diff --git a/modules/typed_data/tests/src/Kernel/PlaceholderResolverTest.php b/modules/typed_data/tests/src/Kernel/PlaceholderResolverTest.php
deleted file mode 100644
index dc78102..0000000
--- a/modules/typed_data/tests/src/Kernel/PlaceholderResolverTest.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-namespace Drupal\Tests\typed_data\Kernel;
-
-use Drupal\Component\Render\HtmlEscapedText;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Datetime\Entity\DateFormat;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests the placeholder resolver.
- *
- * @group typed_data
- *
- * @coversDefaultClass \Drupal\typed_data\PlaceholderResolver
- */
-class PlaceholderResolverTest extends KernelTestBase {
-
-  /**
-   * The typed data manager.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManagerInterface
-   */
-  protected $typedDataManager;
-
-  /**
-   * A node used for testing.
-   *
-   * @var \Drupal\node\NodeInterface
-   */
-  protected $node;
-
-  /**
-   * An entity type manager used for testing.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManager
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The placeholder resolver instanced tested.
-   *
-   * @var \Drupal\typed_data\PlaceholderResolver
-   */
-  protected $placeholderResolver;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = [
-    'typed_data',
-    'system',
-    'node',
-    'field',
-    'text',
-    'user',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-    $this->typedDataManager = $this->container->get('typed_data_manager');
-    $this->entityTypeManager = $this->container->get('entity_type.manager');
-    $this->placeholderResolver = $this->container->get('typed_data.placeholder_resolver');
-
-    $this->entityTypeManager->getStorage('node_type')
-      ->create(['type' => 'page'])
-      ->save();
-
-    // Create a multi-value integer field for testing.
-    FieldStorageConfig::create([
-      'field_name' => 'field_integer',
-      'type' => 'integer',
-      'entity_type' => 'node',
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ])->save();
-    FieldConfig::create([
-      'field_name' => 'field_integer',
-      'entity_type' => 'node',
-      'bundle' => 'page',
-    ])->save();
-
-    $this->installSchema('system', ['sequences']);
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-
-    $this->node = $this->entityTypeManager->getStorage('node')
-      ->create([
-        'title' => 'test',
-        'type' => 'page',
-      ]);
-
-    // Make sure default date formats are there for testing the format_date
-    // filter.
-    $this->installConfig(['system']);
-  }
-
-  /**
-   * @covers ::scan
-   */
-  public function testScanningForPlaceholders() {
-    $text = 'token {{example.foo}} and {{example.foo.bar}} just as {{example.foo|default(bar)}} and {{ example.whitespace }}';
-    $placeholders = $this->placeholderResolver->scan($text);
-    $this->assertEquals([
-      'example' => [
-        'foo' => '{{example.foo}}',
-        'foo.bar' => '{{example.foo.bar}}',
-        'foo|default(bar)' => '{{example.foo|default(bar)}}',
-        'whitespace' => '{{ example.whitespace }}',
-      ],
-    ], $placeholders);
-    // Test a simple placeholder with filters only.
-    $text = "text {{ date | filter }} text";
-    $placeholders = $this->placeholderResolver->scan($text);
-    $this->assertEquals([
-      'date' => [
-        '| filter' => '{{ date | filter }}',
-      ],
-    ], $placeholders);
-  }
-
-  /**
-   * @covers ::resolvePlaceholders
-   */
-  public function testResolvingPlaceholders() {
-    $text = 'test {{node.title}} and {{node.title.value}}';
-    $result = $this->placeholderResolver->resolvePlaceholders($text, ['node' => $this->node->getTypedData()]);
-    $expected = [
-      '{{node.title}}' => 'test',
-      '{{node.title.value}}' => 'test',
-    ];
-    $this->assertEquals($expected, $result);
-
-    // Test a placeholder without accessing a property.
-    $text = 'test {{string}}';
-    $result = $this->placeholderResolver->resolvePlaceholders($text, [
-      'string' => $this->typedDataManager->create(
-      DataDefinition::create('string'), 'replacement'
-      ),
-    ]);
-    $expected = [
-      '{{string}}' => 'replacement',
-    ];
-    $this->assertEquals($expected, $result);
-  }
-
-  /**
-   * @covers ::replacePlaceHolders
-   */
-  public function testReplacePlaceholders() {
-    $text = 'test {{node.title}} and {{node.title.value}}';
-    $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()]);
-    $this->assertEquals('test test and test', $result);
-  }
-
-  /**
-   * @covers ::replacePlaceHolders
-   */
-  public function testPlaceholdersAcrossReferences() {
-    $user = $this->entityTypeManager->getStorage('user')
-      ->create([
-        'name' => 'test',
-        'type' => 'user',
-      ]);
-    $this->node->uid->entity = $user;
-    $text = 'test {{node.title}} and {{node.uid.entity.name}}';
-    $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()]);
-    $this->assertEquals('test test and test', $result);
-  }
-
-  /**
-   * @covers ::replacePlaceHolders
-   */
-  public function testPlaceholdersWithMissingData() {
-    $text = 'test {{node.title.1.value}}';
-    $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()], NULL, []);
-    $this->assertEquals('test {{node.title.1.value}}', $result);
-    $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()], NULL, ['clear' => FALSE]);
-    $this->assertEquals('test {{node.title.1.value}}', $result);
-    $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()], NULL, ['clear' => TRUE]);
-    $this->assertEquals('test ', $result);
-  }
-
-  /**
-   * @covers ::replacePlaceHolders
-   */
-  public function testStringEncoding() {
-    $this->node->title->value = '<b>XSS</b>';
-    $text = 'test {{node.title}}';
-    $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()]);
-    $this->assertEquals('test ' . new HtmlEscapedText('<b>XSS</b>'), $result);
-  }
-
-  /**
-   * @covers ::replacePlaceHolders
-   */
-  public function testIntegerPlaceholder() {
-    $this->node->field_integer->value = 3;
-    $text = 'test {{node.field_integer.0.value}}';
-    $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()]);
-    $this->assertEquals('test 3', $result);
-  }
-
-  /**
-   * @covers ::replacePlaceHolders
-   */
-  public function testListPlaceholder() {
-    $this->node->field_integer = [1, 2];
-    $text = 'test {{node.field_integer}}';
-    $result = $this->placeholderResolver->replacePlaceHolders($text, ['node' => $this->node->getTypedData()]);
-    $this->assertEquals('test 1, 2', $result);
-  }
-
-  /**
-   * @covers ::replacePlaceHolders
-   */
-  public function testApplyingFilters() {
-    $this->node->field_integer = [1, 2, NULL];
-    $this->node->title->value = NULL;
-    $result = $this->placeholderResolver->replacePlaceHolders("test {{node.field_integer.2.value|default('0')}}", ['node' => $this->node->getTypedData()]);
-    $this->assertEquals('test 0', $result);
-    $result = $this->placeholderResolver->replacePlaceHolders("test {{node.title.value|default('tEsT')|lower}}", ['node' => $this->node->getTypedData()]);
-    $this->assertEquals('test test', $result);
-
-    // Test filter expressions with whitespaces.
-    $result = $this->placeholderResolver->replacePlaceHolders("test {{ node.title.value | default('tEsT') | lower }}", ['node' => $this->node->getTypedData()]);
-    $this->assertEquals('test test', $result);
-
-    // Test a filter expression on data without accessing a property.
-    $text = 'test {{string | lower}}';
-    $result = $this->placeholderResolver->replacePlaceHolders($text, [
-      'string' => $this->typedDataManager->create(DataDefinition::create('string'), 'Replacement'),
-    ]);
-    $this->assertEquals('test replacement', $result);
-
-    $text = "The year is {{ date | format_date('custom', 'Y') }}.";
-    $result = $this->placeholderResolver->replacePlaceHolders($text, [
-      'date' => $this->typedDataManager->create(DataDefinition::create('timestamp'), '3600'),
-    ]);
-    $this->assertEquals('The year is 1970.', $result);
-  }
-
-  /**
-   * @covers ::replacePlaceHolders
-   */
-  public function testBubbleableMetadata() {
-    // Make sure the bubbleable metadata added by the fetcher is properly passed
-    // though.
-    $bubbleable_metadata = new BubbleableMetadata();
-    // Save the node, so it gets a cache tag.
-    $this->node->save();
-    $this->placeholderResolver->replacePlaceHolders('test {{node.field_integer}}', ['node' => $this->node->getTypedData()], $bubbleable_metadata);
-    $expected = ['node:' . $this->node->id()];
-    $this->assertEquals($expected, $bubbleable_metadata->getCacheTags());
-
-    // Ensure cache tags of filters are added in.
-    $bubbleable_metadata = new BubbleableMetadata();
-    $this->placeholderResolver->replacePlaceHolders("test {{ node.created.value | format_date('medium') }}", ['node' => $this->node->getTypedData()], $bubbleable_metadata);
-    $expected = Cache::mergeTags(['node:' . $this->node->id()], DateFormat::load('medium')->getCacheTags());
-    $this->assertEquals($expected, $bubbleable_metadata->getCacheTags());
-  }
-
-}
diff --git a/modules/typed_data/tests/src/Traits/BrowserTestHelpersTrait.php b/modules/typed_data/tests/src/Traits/BrowserTestHelpersTrait.php
deleted file mode 100644
index 34eb052..0000000
--- a/modules/typed_data/tests/src/Traits/BrowserTestHelpersTrait.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\Tests\typed_data\Traits;
-
-/**
- * Provides some helpers for BrowserTestBase.
- */
-trait BrowserTestHelpersTrait {
-
-  /**
-   * Finds link with specified locator.
-   *
-   * @param string $locator
-   *   Link id, title, text or image alt.
-   *
-   * @return \Behat\Mink\Element\NodeElement|null
-   *   The link node element.
-   */
-  public function findLink($locator) {
-    return $this->getSession()->getPage()->findLink($locator);
-  }
-
-  /**
-   * Finds field (input, textarea, select) with specified locator.
-   *
-   * @param string $locator
-   *   Input id, name or label.
-   *
-   * @return \Behat\Mink\Element\NodeElement|null
-   *   The input field element.
-   */
-  public function findField($locator) {
-    return $this->getSession()->getPage()->findField($locator);
-  }
-
-  /**
-   * Finds button with specified locator.
-   *
-   * @param string $locator
-   *   Button id, value or alt.
-   *
-   * @return \Behat\Mink\Element\NodeElement|null
-   *   The button node element.
-   */
-  public function findButton($locator) {
-    return $this->getSession()->getPage()->findButton($locator);
-  }
-
-  /**
-   * Presses button with specified locator.
-   *
-   * @param string $locator
-   *   Button id, value or alt.
-   *
-   * @throws \Behat\Mink\Exception\ElementNotFoundException
-   */
-  public function pressButton($locator) {
-    $this->getSession()->getPage()->pressButton($locator);
-  }
-
-  /**
-   * Fills in field (input, textarea, select) with specified locator.
-   *
-   * @param string $locator
-   *   Input id, name or label.
-   * @param string $value
-   *   Value.
-   *
-   * @throws \Behat\Mink\Exception\ElementNotFoundException
-   *
-   * @see \Behat\Mink\Element\NodeElement::setValue
-   */
-  public function fillField($locator, $value) {
-    $this->getSession()->getPage()->fillField($locator, $value);
-  }
-
-}
diff --git a/modules/typed_data/typed_data.info.yml b/modules/typed_data/typed_data.info.yml
deleted file mode 100644
index 9f02a2a..0000000
--- a/modules/typed_data/typed_data.info.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: Typed Data
-type: module
-description: 'Extends the core Typed Data API with new APIs and features.'
-# core: 8.x
-
-# Information added by Drupal.org packaging script on 2017-10-19
-version: '8.x-1.0-alpha1+34-dev'
-core: '8.x'
-project: 'typed_data'
-datestamp: 1508419447
diff --git a/modules/typed_data/typed_data.services.yml b/modules/typed_data/typed_data.services.yml
deleted file mode 100644
index c520144..0000000
--- a/modules/typed_data/typed_data.services.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-services:
-  plugin.manager.typed_data_filter:
-    class: Drupal\typed_data\DataFilterManager
-    arguments: ['@container.namespaces', '@module_handler']
-  plugin.manager.typed_data_form_widget:
-    class: Drupal\typed_data\Widget\FormWidgetManager
-    arguments: ['@container.namespaces', '@module_handler']
-  typed_data.data_fetcher:
-    class: Drupal\typed_data\DataFetcher
-  typed_data.placeholder_resolver:
-    class: Drupal\typed_data\PlaceholderResolver
-    arguments: ['@typed_data.data_fetcher', '@plugin.manager.typed_data_filter']
diff --git a/modules/workbench_access-8.x-1.x/.travis.yml b/modules/workbench_access-8.x-1.x/.travis.yml
deleted file mode 100644
index 40f3375..0000000
--- a/modules/workbench_access-8.x-1.x/.travis.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-language: php
-sudo: false
-
-php: [5.5, 5.6, 7.0, hhvm]
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: hhvm
-
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
-env:
-  - DRUPAL=8.3.x
-  - DRUPAL=8.4.x
-
-mysql:
-  database: wa
-  username: root
-  encoding: utf8
-
-notifications:
-  email: false
-
-before_install:
-  # Add composer's global bin directory to the path
-  # see: https://github.com/drush-ops/drush#install---composer
-  - export PATH="$HOME/.composer/vendor/bin:$PATH"
-
-  # Remove Xdebug. Not an issue for PHP 7.
-  - phpenv config-rm xdebug.ini || true
-
-  - composer self-update
-
-install:
-  # Install Drush. We need to pin this to 8.1.5 because there are compatability
-  # issues with symfony/console 2.8/3.0 in later versions.
-  - composer global require drush/drush:8.1.5
-  - phpenv rehash
-
-  # Create database.
-  - mysql -e 'create database wa'
-
-before_script:
-  # Remember the current rules test directory for later use in the Drupal installation.
-  - TESTDIR=$(pwd)
-  # Navigate out of module directory to prevent blown stack by recursive module lookup.
-  - cd ..
-
-  # Download Drupal 8 core.
-  - travis_retry drush dl drupal-$DRUPAL --drupal-project-rename=drupal
-  - cd drupal
-
-  # Make the module appear in the correct place
-  - ln -s $TESTDIR modules/workbench_access
-
-  # Install drupal default profile
-  - /usr/bin/env PHP_OPTIONS="-d sendmail_path=$(which true)" drush --yes --verbose site-install minimal --db-url=mysql://root:@127.0.0.1/wa
-  # Install modules
-  - drush --yes en simpletest workbench_access taxonomy
-  - drush cr
-
-  # Start a web server on port 8080 in the background.
-  - nohup php -S 0.0.0.0:8080 > /dev/null 2>&1 &
-
-  # Wait until the web server is responding.
-  - until curl -s localhost:8080; do true; done > /dev/null
-
-script:
-  - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --types "Simpletest" --php `which php` --url http://localhost:8080 "workbench_access"
-  - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --types "PHPUnit-Functional" --php `which php` --url http://localhost:8080 "workbench_access"
-  - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --types "PHPUnit-Kernel" --php `which php` --url http://localhost:8080 "workbench_access"
-  - php core/scripts/run-tests.sh --verbose --color --concurrency 4 --types "PHPUnit-Unit" --php `which php` --url http://localhost:8080 "workbench_access"
diff --git a/modules/workbench_access-8.x-1.x/README.md b/modules/workbench_access-8.x-1.x/README.md
deleted file mode 100644
index 3a5c089..0000000
--- a/modules/workbench_access-8.x-1.x/README.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# Workbench Access
-
-The Workbench Access module creates editorial access controls based on hierarchies. It is an extensible system that supports structures created by other Drupal modules.
-
-When creating and editing content, users will be asked to place the content in an editorial section. Other users within that section or its parents will be able to edit the content.
-
-A user may be granted editorial rights to a section specific to his account or by her assigned role on the site. To create, edit and delete content in a section, the user must have the core node module permission (e.g. `Edit all Article content`) and the content must be assigned to the same section.
-
-As of this writing, the module supports the core Taxonomy and Menu modules for the management of access hierarchies. It uses Drupal 8's plugin system to create new hierarchies.
-
-Note that the module only controls access to content editing. It does not provide any content filtering of access restrictions for users trying to view that content.
-
-While Workbench Access is part of a larger module suite, it may be run as a stand-alone module with no dependencies.
-
-## Installation and Configuration
-
-### Install
-To start using the module, install normally and then go to the configuration page at `admin/config/workflow/workbench_access`. From there, select the access control scheme you wish to use (by default, either Menu or Taxonomy) and the corresponding hierarchies that you wish to use for access control.
-
-Tip: It is best if you create your hierarchy (say a Taxonomy Vocabulary called `Editorial section` before configuring the module.
-
-If you want to test how the system works, you can run the drush command `drush wa-test` to install and configure a sample taxonomy hierarchy.
-
-### Configure
-After assigning the access control scheme, you must save the form. After saving, you will be asked to select the fields you wish to use for access control. You may elect not to place a content type under access control, but to use Workbench Access with a content type, you must first create and select a field that contains the data that will be used to assign access.
-
-Note that the Menu access scheme only supports one field type, the default menu selection field.
-
-### Assign
-Once you select the fields, it is time to assign users to editorial sections. For each role that should use Workbench Access, give the role either of the following permissions:
-
-* Bypass Workbench Access permissions
-  This permission assigns users in the role to all sections automatically. Give only to trusted administrators.
-* Allow all members of this role to be assigned to Workbench Access sections
-  This permission lets users and roles be assigned to specific editorial sections. It is the default permission for most roles.
-
-After permissions are assigned, go to the Sections overview page `admin/config/workflow/workbench_access/sections`. This page shows a list of all sections in your access hierarchy and provides links for adding roles or users to those sections.
-
-Note that when granting access, the hierarchy is enforced such that if you have the following structure:
-
-```
-- Alumni
--- Events
--- Giving
-```
-
-A user or role assigned to `Alumni` will also have access to `Events` and `Giving` and does not need to be assigned to all three.
-
-### User Sections
-Note that user sections are currently stored as a field on the user account. However,
-they are not intended to be edited from the account page. These fields should be hidden
-by the module's installation process.
-
-You can check this configuration by going to `/admin/config/people/accounts/form-display`
-and ensuring that the Workbench Access 'Section' field is disabled.
-
-The user storage will likely change before the stable release to remediate this issue.
-
-## Contributing
-
-If you'd like to contribute, please do. Github forks and pull requests are preferable. If you prefer a patch-based workflow, you can attach patches to GitHub issues or Drupal.org
-issues. If you open a Drupal.org issue, please link to it from the appropriate GitHub issue.
-
-The GitHub issues are grouped under three milestones:
-
-1. Alpha -- items required for a test release. When this is complete, we will roll an alpha1 release on Drupal.org.
-2. Beta -- items considered critical features for a release. When complete, we will roll a beta release on Drupal.org.
-3. Final -- items required for a stable, secure release on Drupal.org.
-
-We would like to tackle issues in that order, but feel free to work on what motivates you.
-
-## Testing
-
-The module does not have solid test coverage, and complete coverage is required for release. Right now, we mostly use SimpleTest, because it is most familiar, but unit tests are welcome.
-
-All pull requests will automatically run tests in TravisCI. Test coverage runs against the following:
-
-1. PHP 5.5, 5.6, and 7.
-2. Drupal 8.0.x and 8.1.x.
-3. Tests also run for the HHVM but are allowed to fail.
-
-[![Build Status](https://travis-ci.org/agentrickard/workbench_access.svg?branch=8.x-1.x)](https://travis-ci.org/agentrickard/workbench_access)
-
-## Developer Notes
-
-### Access controls
-Workbench Access only applies to content (node) editing.
-
-By design, Workbench Access never _allows_ access. It only responds with `neutral` or `deny`. The intention is that normal editing permissions should apply, but only within the sections that a user is assigned to.
-
-Access controls are controlled by the `WorkbenchAccessManager` class but the individual response is delegated to plugins via the `checkEntityAccess` method provided in the `AccessControlHierarchyBase` plugin. So if you want to change access behavior, you can write your own plugin or extend an existing one.
-
-### Data storage
-Access is granted either at the `user` or `role` level. User-level access is stored in the field `user.field_workbench_access`, which installs with the module. Role-level access is stored in the `state` system. We use the state system instead of config because access control hierarchies are typically content entities, which cannot be exported via config.
-
-*This storage is now a service, and swappable. In the future, we will likely replace the current storage with an entity-based system.*
-
-This means that base configuration of Workbench Access is config-exportable, but the actual access control assignments are not. This is a limitation of Drupal 8's design.
-
-Content-level data is stored on individual fields, which must be created and assigned via the Workbench Access configuration page at `admin/config/workflow/workbench_access`.
diff --git a/modules/workbench_access-8.x-1.x/composer.json b/modules/workbench_access-8.x-1.x/composer.json
deleted file mode 100644
index d395ac7..0000000
--- a/modules/workbench_access-8.x-1.x/composer.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "name": "drupal/workbench_access",
-    "description": "Hierarchical access control for content.",
-    "type": "drupal-module",
-    "license": "GPL-2.0+",
-    "homepage": "https://www.drupal.org/project/workbench_access"
-}
diff --git a/modules/workbench_access-8.x-1.x/config/install/field.storage.user.field_workbench_access.yml b/modules/workbench_access-8.x-1.x/config/install/field.storage.user.field_workbench_access.yml
deleted file mode 100644
index 6819e4a..0000000
--- a/modules/workbench_access-8.x-1.x/config/install/field.storage.user.field_workbench_access.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - workbench_access
-    - user
-id: user.field_workbench_access
-field_name: field_workbench_access
-entity_type: user
-type: list_string
-module: workbench_access
-settings: { }
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/modules/workbench_access-8.x-1.x/config/install/workbench_access.settings.yml b/modules/workbench_access-8.x-1.x/config/install/workbench_access.settings.yml
deleted file mode 100644
index 687cc5e..0000000
--- a/modules/workbench_access-8.x-1.x/config/install/workbench_access.settings.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-scheme:
-parents: {}
-label: Section
-plural_label: Sections
-fields: {}
-deny_on_empty: false
diff --git a/modules/workbench_access-8.x-1.x/config/schema/workbench_access.schema.yml b/modules/workbench_access-8.x-1.x/config/schema/workbench_access.schema.yml
deleted file mode 100644
index 1036e87..0000000
--- a/modules/workbench_access-8.x-1.x/config/schema/workbench_access.schema.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-workbench_access.settings:
-  type: config_object
-  label: 'Workbench Access settings'
-  mapping:
-    scheme:
-      type: text
-      label: 'Active access scheme.'
-    parents:
-      type: sequence
-      label: 'Active access parents for a scheme.'
-      sequence:
-        type: string
-        label: 'Parent'
-    deny_on_empty:
-      type: boolean
-      label: 'Deny access to unassigned content'
-    label:
-      type: text
-      label: 'Label shown to define a Workbench Access control group.'
-    plural_label:
-      type: text
-      label: 'Label shown to define a set of Workbench Access control groups.'
-    fields:
-      type: sequence
-      label: 'Fields that store access control data.'
-      sequence:
-        type: sequence
-        label: 'Content type'
-        sequence:
-          type: string
-          label: 'Field'
-
-node.type.*.third_party.workbench_access:
-  type: mapping
-  label: 'Per-content type access control settings'
-  mapping:
-    workbench_access_status:
-      type: boolean
-      label: 'Workbench Access status'
-
-entity_reference_selection.workbench_access:
-  type: entity_reference_selection.default
-  label: 'Default selection handler settings'
-
-entity_reference_selection.workbench_access:*:
-  type: entity_reference_selection.default
diff --git a/modules/workbench_access-8.x-1.x/config/schema/workbench_access.views.schema.yml b/modules/workbench_access-8.x-1.x/config/schema/workbench_access.views.schema.yml
deleted file mode 100644
index c6c67ca..0000000
--- a/modules/workbench_access-8.x-1.x/config/schema/workbench_access.views.schema.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Schema for the views plugins of the Workbench Access module.
-
-views.field.workbench_access_section:
-  type: views_field
-  label: 'Workbench Section'
-  mapping:
-    separator:
-      type: label
-      label: 'Separator'
-views.field.workbench_access_user_section:
-  type: views_field
-  label: 'Workbench Section'
-  mapping:
-    separator:
-      type: label
-      label: 'Separator'
-views.filter.workbench_access_section:
-  type: views_filter
-  label: 'Workbench Section'
-  mapping:
-    operator:
-      type: string
-      label: 'Operator'
-    value:
-      type: sequence
-      label: 'Values'
-      sequence:
-        type: string
-        label: 'Value'
-    expose:
-      type: mapping
-      label: 'Expose'
-      mapping:
-        reduce:
-          type: integer
-          label: 'Reduce'
-    reduce_duplicates:
-      type: integer
-      label: 'Reduce duplicates'
-    section_filter:
-      type: mapping
-      label: 'Section Filter'
-      mapping:
-        show_hierarchy:
-          type: integer
-          label: 'Show Hierarchy'
diff --git a/modules/workbench_access-8.x-1.x/js/workbench_access.js b/modules/workbench_access-8.x-1.x/js/workbench_access.js
deleted file mode 100644
index 666d03c..0000000
--- a/modules/workbench_access-8.x-1.x/js/workbench_access.js
+++ /dev/null
@@ -1,19 +0,0 @@
-
-(function ($) {
-
-  'use strict';
-
-  Drupal.behaviors.workbenchAccess = {
-    attach: function (context, settings) {
-      $('#edit-add', context).once('field-switch').each(function () {
-        // We hide mass assign.
-        $('.form-item-editors-add-mass').hide();
-        $(this).find('.switch').click(function(e) {
-          $('.form-item-editors-add').toggle();
-          $('.form-item-editors-add-mass').toggle();
-        })
-      });
-    }
-  };
-
-})(jQuery, drupalSettings);
diff --git a/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyBase.php b/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyBase.php
deleted file mode 100644
index 6aea4ec..0000000
--- a/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyBase.php
+++ /dev/null
@@ -1,374 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\workbench_access\Plugin\views\filter\Section;
-use Drupal\Component\Plugin\PluginBase;
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Defines a base hierarchy class that others may extend.
- */
-abstract class AccessControlHierarchyBase extends PluginBase implements AccessControlHierarchyInterface, ContainerFactoryPluginInterface {
-
-  use StringTranslationTrait;
-
-  /*
-   * A configuration factory object to store configuration.
-   *
-   * @var ConfigFactory
-   */
-  protected $configFactory;
-
-  /**
-   * The access tree array.
-   *
-   * @var array
-   */
-  protected $tree;
-
-  /**
-   * User section storage.
-   *
-   * @var \Drupal\workbench_access\UserSectionStorageInterface
-   */
-  protected $userSectionStorage;
-
-  /**
-   * Config for module.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $config;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Constructs a new AccessControlHierarchyBase object.
-   *
-   * @param array $configuration
-   *   Configuration.
-   * @param string $plugin_id
-   *   Plugin ID.
-   * @param mixed $plugin_definition
-   *   Plugin definition.
-   * @param \Drupal\workbench_access\UserSectionStorageInterface $user_section_storage
-   *   User section storage.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
-   *   Config factory.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
-   *   Entity type manager.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, UserSectionStorageInterface $user_section_storage, ConfigFactoryInterface $configFactory, EntityTypeManagerInterface $entityTypeManager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->config = $configFactory->get('workbench_access.settings');
-    $this->userSectionStorage = $user_section_storage;
-    $this->entityTypeManager = $entityTypeManager;
-  }
-
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('workbench_access.user_section_storage'),
-      $container->get('config.factory'),
-      $container->get('entity_type.manager')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function id() {
-    return $this->pluginDefinition['id'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function label() {
-    return $this->pluginDefinition['label'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function status() {
-    return $this->config->get('scheme') === $this->id();
-  }
-
-  /**
-   * @inheritdoc
-   */
-  public function options() {
-    if ($entity_type = $this->pluginDefinition['base_entity']) {
-      return array_map(function (EntityInterface $entity) {
-        return $entity->label();
-      }, $this->entityTypeManager->getStorage($entity_type)->loadMultiple());
-    }
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTree() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resetTree() {
-    unset($this->tree);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function load($id) {
-    $tree = $this->getTree();
-    foreach ($tree as $parent => $data) {
-      if (isset($data[$id])) {
-        return $data[$id];
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function configForm($parents = []) {
-    $node_types = $this->entityTypeManager->getStorage('node_type')->loadMultiple();
-    $form = [];
-    /** @var \Drupal\node\NodeTypeInterface $type */
-    foreach ($node_types as $id => $type) {
-      $form['workbench_access_status_' . $id] = [
-        '#type' => 'checkbox',
-        '#title' => $this->t('Enable Workbench Access control for @type content.', ['@type' => $type->label()]),
-        '#description' => $this->t('If selected, all @type content will be subject to editorial access restrictions.', ['@type' => $type->label()]),
-        '#default_value' => $type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0),
-      ];
-      $options = ['' => $this->t('No field set')];
-      $options += $this->getFields('node', $type->id(), $parents);
-      if (!empty($options)) {
-        $form['field_' . $id] = [
-          '#type' => 'select',
-          '#title' => $this->t('Access control field'),
-          '#options' => $options,
-          '#default_value' => $this->fields('node', $type->id()),
-        ];
-      }
-      else {
-        $form['field_' . $id] = [
-          '#type' => 'markup',
-          '#markup' => $this->t('There are no eligible fields on this content type.'),
-        ];
-      }
-    }
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function configValidate(array &$form, FormStateInterface $form_state) {
-    // Default implementation is empty.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function configSubmit(array &$form, FormStateInterface $form_state) {
-    $fields = $this->config->get('fields');
-
-    $node_types = $this->entityTypeManager->getStorage('node_type')->loadMultiple();
-    /** @var \Drupal\node\NodeTypeInterface $type */
-    foreach ($node_types as $id => $type) {
-      $field = $form_state->getValue('field_' . $id);
-      if (!empty($field)) {
-        $type->setThirdPartySetting('workbench_access', 'workbench_access_status', $form_state->getValue('workbench_access_status_' . $id));
-        $fields['node'][$id] = $field;
-      }
-      else {
-        $type->setThirdPartySetting('workbench_access', 'workbench_access_status', 0);
-        $fields['node'][$id] = '';
-      }
-      $type->save();
-    }
-    return ['fields' => $fields];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function checkEntityAccess(EntityInterface $entity, $op, AccountInterface $account, WorkbenchAccessManagerInterface $manager) {
-    // @TODO: Check for super-admin?
-    // We don't care about the View operation right now.
-    if ($op === 'view' || $op === 'view label' || $account->hasPermission('bypass workbench access')) {
-      // Return early.
-      return AccessResult::neutral();
-    }
-
-    // Check that the content type is configured.
-    // @TODO: Right now this only handles nodes.
-    /** @var \Drupal\node\NodeTypeInterface $type */
-    $active = FALSE;
-    if ($type = $this->entityTypeManager->getStorage('node_type')->load($entity->bundle())) {
-      $active = $type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0);
-    }
-
-    if (!$active) {
-      // No such node-type or not-active.
-      return AccessResult::neutral();
-    }
-
-    if ($field = $this->fields('node', $type->id())) {
-      // Discover the field and check status.
-      $entity_sections = $this->getEntityValues($entity, $field);
-      // If no value is set on the entity, ignore.
-      // @TODO: Is this the correct logic? It is helpful for new installs.
-      $deny_on_empty = $this->config->get('deny_on_empty');
-
-      if (!$deny_on_empty && empty($entity_sections)) {
-        return AccessResult::neutral();
-      }
-      $user_sections = $this->userSectionStorage->getUserSections($account->id());
-      if (empty($user_sections)) {
-        return AccessResult::forbidden();
-      }
-      // Check the tree status of the $entity against the $user.
-      // Return neutral if in tree, forbidden if not.
-      if ($manager->checkTree($entity_sections, $user_sections)) {
-        return AccessResult::neutral();
-      }
-      return AccessResult::forbidden();
-    }
-    // Deny is our default response.
-    return AccessResult::forbidden();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntityValues(EntityInterface $entity, $field) {
-    $values = [];
-    foreach ($entity->get($field)->getValue() as $item) {
-      if (isset($item['target_id'])) {
-        $values[] = $item['target_id'];
-      }
-    }
-    return $values;
-  }
-
-  /**
-   * {inheritdoc}
-   */
-  public function fields($entity_type, $bundle) {
-    $fields = $this->config->get('fields');
-    return isset($fields[$entity_type][$bundle]) ? $fields[$entity_type][$bundle] : [];
-  }
-
-  /**
-   * {inheritdoc}
-   */
-  public function fieldsByEntityType($entity_type) {
-    // User/users do not name the data table consistently.
-    if ($entity_type == 'user' || $entity_type == 'users') {
-      return ['user' => WorkbenchAccessManagerInterface::FIELD_NAME];
-    }
-    else {
-      $fields = $this->config->get('fields');
-      return $fields[$entity_type];
-    }
-  }
-
-  /**
-   * {inheritdoc}
-   */
-  public function disallowedOptions($field) {
-    $options = [];
-    if (isset($field['widget']['#default_value']) && isset($field['widget']['#options'])) {
-      $options = array_diff_key(array_flip($field['widget']['#default_value']), $field['widget']['#options']);
-    }
-    return array_keys($options);
-  }
-
-  /**
-   * {inheritdoc}
-   */
-  public static function submitEntity(array &$form, FormStateInterface $form_state) {
-    $values = $form_state->getValue('workbench_access_disallowed');
-    if (!empty($values)) {
-      $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
-      if ($scheme = $manager->getActiveScheme()) {
-        $node = $form_state->getFormObject()->getEntity();
-        $field = $scheme->fields('node', $node->bundle());
-        $entity_values = $form_state->getValue($field);
-      }
-      foreach ($values as $value) {
-        $entity_values[]['target_id'] = $value;
-      }
-      $form_state->setValue($field, $entity_values);
-    }
-  }
-
-  /**
-   * {inheritdoc}
-   */
-  public function getViewsJoin($table, $key, $alias = NULL) {
-    $fields = $this->fieldsByEntityType($table);
-    $table_prefix = $table;
-    $field_suffix = '_target_id';
-    if ($table == 'users') {
-      $table_prefix = 'user';
-      $field_suffix = '_value';
-    }
-    foreach ($fields as $field) {
-      if (!empty($field)) {
-        $configuration[$field] = [
-         'table' => $table_prefix . '__' . $field,
-         'field' => 'entity_id',
-         'left_table' => $table,
-         'left_field' => $key,
-         'operator' => '=',
-         'table_alias' => $field,
-         'real_field' => $field . $field_suffix,
-        ];
-      }
-    }
-    return $configuration;
-  }
-
-  /**
-   * {inheritdoc}
-   */
-  public function addWhere(Section $filter, $values) {
-    // The JOIN data tells us if we have multiple tables to deal with.
-    $join_data = $this->getViewsJoin($filter->table, $filter->realField);
-    if (count($join_data) == 1) {
-      $filter->query->addWhere($filter->options['group'], "$filter->tableAlias.$filter->realField", array_values($values), $filter->operator);
-    }
-    else {
-      $or = db_or();
-      foreach ($join_data as $field => $data) {
-        $alias = $data['table_alias'] . '.' . $data['real_field'];
-        $or->condition($alias, array_values($values), $filter->operator);
-      }
-      $filter->query->addWhere($filter->options['group'], $or);
-    }
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyInterface.php b/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyInterface.php
deleted file mode 100644
index 925d629..0000000
--- a/modules/workbench_access-8.x-1.x/src/AccessControlHierarchyInterface.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access;
-
-use Drupal\workbench_access\WorkbenchAccessManager;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-use Drupal\workbench_access\Plugin\views\filter\Section;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Defines a base hierarchy class that others may extend.
- */
-interface AccessControlHierarchyInterface {
-
-  /**
-   * Returns the id for a hierarchy.
-   *
-   * @return string
-   */
-  public function id();
-
-  /**
-   * Returns the label for a hierarchy.
-   *
-   * @return string
-   */
-  public function label();
-
-  /**
-   * Returns the status of a hierarchy.
-   *
-   * @return boolean
-   */
-  public function status();
-
-  /**
-   * Gets the options for a hierarchy.
-   *
-   * @return array
-   *   In the format id => label.
-   */
-  public function options();
-
-  /**
-   * Gets the entire hierarchy tree.
-   *
-   * @return array
-   */
-  public function getTree();
-
-  /**
-   * Gets the fields that may be used for a plugin type.
-   *
-   * This method informs the system what fields are eligible to use for
-   * access controls. For instance, with taxonomy, it returns all taxonomy
-   * reference fields.
-   *
-   * @param $entity_type
-   *   The type of entity access control is being tested for (e.g. 'node').
-   * @param $bundle
-   *   The entity bundle being tested (e.g. 'article').
-   * @param $parents
-   *   The selected parent roots of the hierarchy. e.g. a taxonomy vocabulary.
-   *   The array contains the ids of the root items (e.g. a vocabulary id).
-   *
-   * @return array
-   *   An array of fields in the format id => label, for use in a form.
-   */
-  public function getFields($entity_type, $bundle, $parents);
-
-  /**
-   * Retrieves the access control values from an entity.
-   *
-   * @param EntityInterface $entity
-   *   A Drupal entity, typically a node or a user.
-   * @param $field
-   *   The field holding the access control data.
-   *
-   * @return array
-   *   An array of field data from the entity.
-   */
-  public function getEntityValues(EntityInterface $entity, $field);
-
-  /**
-   * Loads a hierarchy definition for a single item in the tree.
-   *
-   * @param $id
-   *   The identifier for the item, such as a term id.
-   *
-   * @return \Drupal\workbench_access\AccessControlHierarchyInterface
-   *   A plugin implementation.
-   */
-  public function load($id);
-
-  /**
-   * Provides configuration options.
-   *
-   * @param $parents
-   *   The selected parent roots of the hierarchy. e.g. a taxonomy vocabulary.
-   *   The array contains the ids of the root items (e.g. a vocabulary id).
-   */
-  public function configForm($parents = []);
-
-  /**
-   * Validates configuration options.
-   *
-   * @param array &$form
-   *   The submitted form, passed by reference.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The form state object.
-   *
-   * @return
-   *   No return value. Interact with the $form_state object.
-   */
-  public function configValidate(array &$form, FormStateInterface $form_state);
-
-  /**
-   * Submits configuration options.
-   *
-   * @param array &$form
-   *   The submitted form, passed by reference.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The form state object.
-   */
-  public function configSubmit(array &$form, FormStateInterface $form_state);
-
-  /**
-   * Responds to request for node access.
-   *
-   * @param EntityInterface $entity
-   *   The node being checked. In future this may handle other entity types.
-   * @param AccountInterface $account
-   *   The user requesting access to the node.
-   * @param WorkbenchAccessManagerInterface $manager
-   *   The access control manager.
-   *
-   * @return \Drupal\Core\Access\AccessResultInterface
-   *   An access result response. By design, this is either neutral or deny.
-   *
-   * @see workbench_access_node_access()
-   */
-  public function checkEntityAccess(EntityInterface $entity, $op, AccountInterface $account, WorkbenchAccessManagerInterface $manager);
-
-  /**
-   * Alters the selection options provided for an access control field.
-   *
-   * @param $field
-   *   The field element from a node form.
-   * @param WorkbenchAccessManagerInterface $manager
-   *   The access manager.
-   * @param array $user_sections
-   *   The user sections.
-   *
-   * @return $element
-   *   The field element, after restricting selection options.
-   */
-  public function alterOptions($field, WorkbenchAccessManagerInterface $manager, array $user_sections = []);
-
-  /**
-   * Gets any options that are set but cannot be changed by the editor.
-   *
-   * @param $field
-   *   The field element from a node form, after running through alterOptions().
-   *
-   * @return array
-   *   An array of section ids to preserve.
-   */
-  public function disallowedOptions($field);
-
-  /**
-   * Responds to the submission of an entity form.
-   *
-   * If the entity contains section values that the user cannot change, they
-   * are passed in the 'workbench_access_disallowed' field on the form. Plugins
-   * should examine that value and make modifications to their target field
-   * as necessary.
-   *
-   * Currently only supports nodes. A default implementation is provided.
-   *
-   * @param array &$form
-   *   A form array.
-   * @param FormStateInterface $form_state
-   *   The form_state object.
-   */
-  public static function submitEntity(array &$form, FormStateInterface $form_state);
-
-  /**
-   * Returns information about how to join this section data to a base view table.
-   *
-   * @param $table
-   *   The base table of the view.
-   * @param $key
-   *   The primary key of the base table.
-   * @param $alias (optional)
-   *   The views alias of the base table.
-   *
-   * @return array
-   *   The configuration array for adding a views JOIN statement.
-   */
-  public function getViewsJoin($table, $key, $alias = NULL);
-
-  /**
-   * Adds a where clause to a view when using a section filter.
-   *
-   * @param Drupal\workbench_access\Plugin\views\filter\Section $filter
-   *   The views filter object provided by Workbench Access.
-   * @param $values
-   *   An array of values for the current view.
-   */
-  public function addWhere(Section $filter, $values);
-
-  /**
-   * Resets the internal cache of the tree.
-   *
-   * Right now, this is a per-request cache until we figure out a long-term
-   * caching strategy.
-   */
-  public function resetTree();
-
-  /**
-   * Returns the access control fields configured for use by the plugin.
-   *
-   * @param $entity_type
-   *   The type of entity access control is being tested for (e.g. 'node').
-   * @param $bundle
-   *   The entity bundle being tested (e.g. 'article').
-   */
-  public function fields($entity_type, $bundle);
-
-  /**
-   * Returns the access control fields configured for use by the plugin.
-   *
-   * @param $entity_type
-   *   The type of entity access control is being tested for (e.g. 'node').
-   */
-  public function fieldsByEntityType($entity_type);
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Annotation/AccessControlHierarchy.php b/modules/workbench_access-8.x-1.x/src/Annotation/AccessControlHierarchy.php
deleted file mode 100644
index d33887e..0000000
--- a/modules/workbench_access-8.x-1.x/src/Annotation/AccessControlHierarchy.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a hierarchical access control annotation object.
- *
- * Plugin Namespace: Plugin\AccessControlHierarchy
- *
- * For a working example, see
- * \Drupal\workbench_access\Plugin\AccessControlHierarchy\Taxonomy.
- *
- * Modules should use Drupal\workbench_access\AccessControlHierarchyBase as
- * a basis for new implementations.
- *
- * @see plugin_api
- *
- * @Annotation
- */
-class AccessControlHierarchy extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The module required by the plugin.
-   *
-   * @var string
-   */
-  public $module;
-
-  /**
-   * The entity that defines an access control group. (Optional)
-   *
-   * If this value is not set, your plugin class will need to provide it's own
-   * version of the options() method.
-   *
-   * @var string
-   */
-  public $base_entity;
-
-  /**
-   * The entity that defines an access control item. (Optional)
-   *
-   * @var string
-   */
-  public $entity;
-
-  /**
-   * The human-readable name of the hierarchy system.
-   *
-   * @ingroup plugin_translatable
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $label;
-
-  /**
-   * A brief description of the hierarchy source.
-   *
-   * This will be shown when adding or configuring Workbench Access.
-   *
-   * @ingroup plugin_translatable
-   *
-   * @var \Drupal\Core\Annotation\Translation (optional)
-   */
-  public $description = '';
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Controller/WorkbenchAccessSections.php b/modules/workbench_access-8.x-1.x/src/Controller/WorkbenchAccessSections.php
deleted file mode 100644
index 37b4a89..0000000
--- a/modules/workbench_access-8.x-1.x/src/Controller/WorkbenchAccessSections.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Controller;
-
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Link;
-use Drupal\workbench_access\RoleSectionStorageInterface;
-use Drupal\workbench_access\UserSectionStorageInterface;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Generates the sections list page.
- */
-class WorkbenchAccessSections extends ControllerBase implements ContainerInjectionInterface {
-
-  /**
-   * The Workbench Access manager service.
-   *
-   * @var \Drupal\workbench_access\WorkbenchAccessManager
-   */
-  protected $manager;
-
-  /**
-   * The role section storage service.
-   *
-   * @var \Drupal\workbench_access\RoleSectionStorageInterface
-   */
-  protected $roleSectionStorage;
-
-  /**
-   * The user section storage service.
-   *
-   * @var \Drupal\workbench_access\UserSectionStorageInterface
-   */
-  protected $userSectionStorage;
-
-  /**
-   * Constructs a new WorkbenchAccessConfigForm.
-   *
-   * @param \Drupal\workbench_access\WorkbenchAccessManagerInterface $manager
-   *   The Workbench Access hierarchy manager.
-   * @param \Drupal\workbench_access\RoleSectionStorageInterface $role_section_storage
-   *   The role section storage service.
-   * @param \Drupal\workbench_access\UserSectionStorageInterface $user_section_storage
-   *   The user section storage service.
-   */
-  public function __construct(WorkbenchAccessManagerInterface $manager, RoleSectionStorageInterface $role_section_storage, UserSectionStorageInterface $user_section_storage) {
-    $this->manager = $manager;
-    $this->roleSectionStorage = $role_section_storage;
-    $this->userSectionStorage = $user_section_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.workbench_access.scheme'),
-      $container->get('workbench_access.role_section_storage'),
-      $container->get('workbench_access.user_section_storage')
-    );
-  }
-
-  /**
-   * Returns the section assignment page.
-   */
-  public function page() {
-    $config = $this->config('workbench_access.settings');
-    $rows = [];
-    if ($scheme_id = $config->get('scheme')) {
-      $parents = $config->get('parents');
-      $tree = $this->manager->getActiveTree();
-      foreach ($parents as $id => $label) {
-        // @TODO: Move to a theme function?
-        // @TODO: format plural
-        foreach ($tree[$id] as $iid => $item) {
-          $editor_count = count($this->userSectionStorage->getEditors($iid));
-          $role_count = count($this->roleSectionStorage->getRoles($iid));
-          $row = [];
-          $row[] = str_repeat('-', $item['depth']) . ' ' . $item['label'];
-          $row[] = Link::fromTextAndUrl($this->t('@count editors', ['@count' => $editor_count]), Url::fromRoute('workbench_access.by_user', ['id' => $iid]));
-          $row[] = Link::fromTextAndUrl($this->t('@count roles', ['@count' => $role_count]), Url::fromRoute('workbench_access.by_role', ['id' => $iid]));
-          $rows[] = $row;
-        }
-      }
-      $build = [
-        '#type' => 'table',
-        '#header' => [$config->get('plural_label'), $this->t('Editors'), $this->t('Roles')],
-        '#rows' => $rows,
-      ];
-    }
-    else {
-      $build = [
-        '#type' => 'markup',
-        '#markup' => $this->t('No sections are available.'),
-      ];
-    }
-    return $build;
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByRoleForm.php b/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByRoleForm.php
deleted file mode 100644
index 4d3e666..0000000
--- a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByRoleForm.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Form;
-
-use Drupal\workbench_access\RoleSectionStorageInterface;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Configure Workbench Access per role.
- */
-class WorkbenchAccessByRoleForm extends FormBase {
-
-  /**
-   * The Workbench Access manager service.
-   *
-   * @var \Drupal\workbench_access\WorkbenchAccessManager
-   */
-  protected $manager;
-
-  /**
-   * The role section storage service.
-   *
-   * @var \Drupal\workbench_access\RoleSectionStorageInterface
-   */
-  protected $roleSectionStorage;
-
-  /**
-   * Constructs a new WorkbenchAccessConfigForm.
-   *
-   * @param \Drupal\workbench_access\WorkbenchAccessManagerInterface $manager
-   *   The Workbench Access hierarchy manager.
-   * @param \Drupal\workbench_access\RoleSectionStorageInterface $role_section_storage
-   *   The role section storage service.
-   */
-  public function __construct(WorkbenchAccessManagerInterface $manager, RoleSectionStorageInterface $role_section_storage) {
-    $this->manager = $manager;
-    $this->roleSectionStorage = $role_section_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.workbench_access.scheme'),
-      $container->get('workbench_access.role_section_storage')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'workbench_access_by_role';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $id = NULL) {
-    $element = $this->manager->getElement($id);
-    $existing_roles = $this->roleSectionStorage->getRoles($id);
-    $potential_roles = $this->roleSectionStorage->getPotentialRolesFiltered($id);
-
-    $form['existing_roles'] = ['#type' => 'value', '#value' => $existing_roles];
-    $form['section_id'] = ['#type' => 'value', '#value' => $id];
-    if (!$existing_roles) {
-      $text = $this->t('There are no roles assigned to the %label section.', ['%label' => $element['label']]);
-      $form['help'] = [
-        '#type' => 'markup',
-        '#markup' => '<p>' . $text . '</p>',
-      ];
-    }
-
-    if ($potential_roles) {
-      $form['roles'] = [
-        '#title' => $this->t('Roles for the %label section.', ['%label' => $element['label']]),
-        '#type' => 'checkboxes',
-        '#options' => $potential_roles,
-        '#default_value' => array_keys($existing_roles),
-      ];
-      $form['actions'] = ['#type' => 'actions'];
-      $form['actions']['submit'] = ['#type' => 'submit', '#value' => $this->t('Submit')];
-    }
-    if (array_keys($potential_roles) == array_keys($existing_roles)) {
-      $form['message'] = [
-        '#type' => 'markup',
-        '#markup' => '<p>' . $this->t('There are no addtional roles that can be added to the %label section', ['%label' => $element['label']]) . '</p>',
-      ];
-    }
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $roles = $form_state->getValue('roles');
-    $existing_roles = $form_state->getValue('existing_roles');
-    $id = $form_state->getValue('section_id');
-    foreach ($roles as $role_id => $value) {
-      // Add user to section.
-      if ($value && !isset($existing_roles[$role_id])) {
-        $this->roleSectionStorage->addRole($role_id, [$id]);
-      }
-      // Remove user from section.
-      if (!$value && isset($existing_roles[$role_id])) {
-        $this->roleSectionStorage->removeRole($role_id, [$id]);
-      }
-    }
-  }
-
-  /**
-   * Returns a dynamic page title for the route.
-   *
-   * @param string $id
-   *   The section id.
-   *
-   * @return string
-   *   A page title.
-   */
-  public function pageTitle($id) {
-    $element = $this->manager->getElement($id);
-    return $this->t('Roles assigned to %label', ['%label' => $element['label']]);
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByUserForm.php b/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByUserForm.php
deleted file mode 100644
index 476a640..0000000
--- a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessByUserForm.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Form;
-
-use Drupal\workbench_access\UserSectionStorageInterface;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Session\AccountInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\user\Entity\User;
-
-/**
- * Configure Workbench Access per user.
- */
-class WorkbenchAccessByUserForm extends FormBase {
-
-  /**
-   * The Workbench Access manager service.
-   *
-   * @var \Drupal\workbench_access\WorkbenchAccessManager
-   */
-  protected $manager;
-
-  /**
-   * The user section storage service.
-   *
-   * @var \Drupal\workbench_access\UserSectionStorageInterface
-   */
-  protected $userSectionStorage;
-
-  /**
-   * Constructs a new WorkbenchAccessConfigForm.
-   *
-   * @param \Drupal\workbench_access\WorkbenchAccessManagerInterface $manager
-   *   The Workbench Access hierarchy manager.
-   * @param \Drupal\workbench_access\UserSectionStorageInterface $user_section_storage
-   *   The user section storage service.
-   */
-  public function __construct(WorkbenchAccessManagerInterface $manager, UserSectionStorageInterface $user_section_storage) {
-    $this->manager = $manager;
-    $this->userSectionStorage = $user_section_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('plugin.manager.workbench_access.scheme'),
-      $container->get('workbench_access.user_section_storage')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'workbench_access_by_user';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $id = NULL) {
-    $element = $this->manager->getElement($id);
-    $existing_editors = $this->userSectionStorage->getEditors($id);
-    $potential_editors = $this->userSectionStorage->getPotentialEditors($id);
-
-    $form['existing_editors'] = ['#type' => 'value', '#value' => $existing_editors];
-    $form['section_id'] = ['#type' => 'value', '#value' => $id];
-
-    $form['add'] = [
-      '#type' => 'container',
-    ];
-    if ($potential_editors) {
-      $toggle = '<br>' . $this->t('<a class="switch" href="#">Switch between textarea/autocomplete</a>');
-      $form['add']['editors_add'] = [
-        '#type' => 'entity_autocomplete',
-        '#target_type' => 'user',
-        '#selection_handler' => 'workbench_access:user',
-        '#selection_settings' => [
-          'include_anonymous' => FALSE,
-          'match_operator' => 'STARTS_WITH',
-          'filter' => ['section_id' => $id],
-        ],
-        '#title' => $this->t('Add editors to the %label section.', ['%label' => $element['label']]),
-        '#description' => $this->t('Search editors to add to this section, separate with comma to add multiple editors.<br>Only users in roles with permission to be assigned can be referenced.') . $toggle,
-        '#tags' => TRUE,
-      ];
-      // The authenticated user role is not stored in the database, so we cannot query for
-      // it. If 'authenticated user' is present, do not filter on roles at all.
-      $potential_editors_roles = $this->userSectionStorage->getPotentialEditorsRoles($id);
-      if (!isset($potential_editors_roles[AccountInterface::AUTHENTICATED_ROLE])) {
-        // Add the role filter, which uses the role id stored as array_keys().
-        $form['add']['editors_add']['#selection_settings']['filter'] = ['role' => array_keys($potential_editors_roles), 'section_id' => $id];
-      }
-      $form['add']['editors_add_mass'] = [
-        '#type' => 'textarea',
-        '#title' => $this->t('Add editors to the %label section.', ['%label' => $element['label']]),
-        '#description' => $this->t('Add a list of user ids or usernames separated with comma or new line. Invalid or existing users will be ignored.') . $toggle,
-      ];
-      $form['add']['actions'] = [
-        '#type' => 'actions',
-        'submit' => [
-          '#type' => 'submit',
-          '#name' => 'add',
-          '#value' => $this->t('Add'),
-        ],
-      ];
-    }
-    else {
-      $form['add']['message'] = ['#type' => 'markup',
-        '#markup' => '<p>' . $this->t('There are no additional users that can be added to the %label section', ['%label' => $element['label']]) . '</p>',
-      ];
-    }
-
-    $form['remove'] = [
-      '#type' => 'details',
-      '#open' => TRUE,
-      '#title' => $this->t('Existing editors in the %label section.', array('%label' => $element['label'])),
-      '#description' => $this->t('Current editors list. Use the checkboxes to remove editors from this section.'),
-    ];
-    // Prepare editors list for tableselect.
-    $editors_data = [];
-    if ($existing_editors) {
-      foreach ($existing_editors as $uid => $username) {
-        $editors_data[$uid] = [$username];
-      }
-      asort($editors_data);
-    }
-    $form['remove']['editors_remove'] = [
-      '#type' => 'tableselect',
-      '#header' => [$this->t('Username')],
-      '#options' => $editors_data,
-      '#empty' => $this->t('There are no editors assigned to the %label section.', ['%label' => $element['label']]),
-    ];
-    if ($existing_editors) {
-      $form['remove']['actions'] = [
-        '#type' => 'actions',
-        'submit' => [
-          '#type' => 'submit',
-          '#name' => 'remove',
-          '#value' => $this->t('Remove'),
-        ],
-      ];
-    }
-    $form['#attached']['library'][] = 'workbench_access/admin';
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $trigger = $form_state->getTriggeringElement();
-    $existing_editors = $form_state->getValue('existing_editors');
-    $section_id = $form_state->getValue('section_id');
-
-    // Add new editors.
-    if ($trigger['#name'] == 'add') {
-      $uids_added = [];
-      if ($add_editors = $form_state->getValue('editors_add')) {
-        foreach ($add_editors as $target_entity) {
-          $user_id = $target_entity['target_id'];
-          if (!isset($existing_editors[$user_id])) {
-            $uids_added[] = $user_id;
-          }
-        }
-      }
-      elseif ($add_editors = $form_state->getValue('editors_add_mass')) {
-        $add_editors = preg_split('/[\ \n\,]+/', $add_editors);
-        foreach ($add_editors as $uid_or_username) {
-          // This is a uid.
-          if ((int)$uid_or_username > 0) {
-            if (!isset($existing_editors[(int)$uid_or_username])) {
-              $uids_added[] = $uid_or_username;
-            }
-          }
-          elseif (strlen($uid_or_username) > 1) {
-            $user = user_load_by_name(trim($uid_or_username));
-            if ($user) {
-              if (!isset($existing_editors[$user->id()])) {
-                $uids_added[] = $user->id();
-              }
-            }
-          }
-        }
-      }
-      if (count($uids_added)) {
-        $this->addEditors($uids_added, $section_id, $existing_editors);
-      }
-      else {
-        drupal_set_message($this->t('No valid users were selected to add'), 'warning');
-      }
-    }
-
-    // Remove unwanted editors.
-    if ($trigger['#name'] == 'remove') {
-      if ($remove_editors = array_filter($form_state->getValue('editors_remove'))) {
-        $this->removeEditors($remove_editors, $section_id, $existing_editors);
-      }
-      else {
-        drupal_set_message($this->t('No users were selected to remove.'), 'warning');
-      }
-    }
-  }
-
-  /**
-   * Returns a dynamic page title for the route.
-   *
-   * @param string $id
-   *   The section id.
-   *
-   * @return string
-   *   A page title.
-   */
-  public function pageTitle($id) {
-    $element = $this->manager->getElement($id);
-    return $this->t('Editors assigned to %label', ['%label' => $element['label']]);
-  }
-
-  /**
-   * Add editors to the section.
-   *
-   * @param array $uids
-   *   User ids to add.
-   *
-   * @param integer $section_id
-   *   Workbench access section id.
-   *
-   * @param array $existing_editors
-   *   Existing editors uids.
-   */
-  protected function addEditors($uids, $section_id, $existing_editors = []) {
-    $users = User::loadMultiple($uids);
-    $editors_added = [];
-    foreach ($users as $uid => $user) {
-      // Add user to section.
-      if (!isset($existing_editors[$uid])) {
-        $this->userSectionStorage->addUser($uid, [$section_id]);
-        $editors_added[] = $user->getDisplayName();
-      }
-    }
-    if (count($editors_added)) {
-      $text = $this->formatPlural(count($editors_added),
-        'User @user added.',
-        'Users added: @user',
-        ['@user' => implode(', ', $editors_added)]
-      )->__toString();
-      drupal_set_message($text);
-    }
-  }
-
-  /**
-   * Remove editors to the section.
-   *
-   * @param array $uids
-   *   User ids to add.
-   *
-   * @param integer $section_id
-   *   Workbench access section id.
-   *
-   * @param array $existing_editors
-   *   Existing editors uids.
-   */
-  protected function removeEditors($uids, $section_id, $existing_editors = []) {
-    $editors_removed = [];
-    foreach ($uids as $user_id) {
-      if (isset($existing_editors[$user_id])) {
-        $this->userSectionStorage->removeUser($user_id, [$section_id]);
-        $editors_removed[] = $existing_editors[$user_id];
-      }
-    }
-    if (count($editors_removed)) {
-      $text = $this->formatPlural(count($editors_removed),
-        'User @user removed.',
-        'Users removed: @user',
-        ['@user' => implode(', ', $editors_removed)]
-      )->__toString();
-      drupal_set_message($text);
-    }
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessConfigForm.php b/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessConfigForm.php
deleted file mode 100644
index 6f42fad..0000000
--- a/modules/workbench_access-8.x-1.x/src/Form/WorkbenchAccessConfigForm.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Form;
-
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-use Drupal\workbench_access\RoleSectionStorageInterface;
-use Drupal\workbench_access\UserSectionStorageInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\State\StateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Configure Workbench access settings for this site.
- */
-class WorkbenchAccessConfigForm extends ConfigFormBase {
-
-  /**
-   * The Workbench Access manager service.
-   *
-   * @var \Drupal\workbench_access\WorkbenchAccessManager
-   */
-  protected $manager;
-
-  /**
-   * The state keyvalue collection.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-  /**
-   * User section storage.
-   *
-   * @var \Drupal\workbench_access\UserSectionStorageInterface
-   */
-  protected $userSectionStorage;
-
-  /**
-   * Role section storage.
-   *
-   * @var \Drupal\workbench_access\RoleSectionStorageInterface
-   */
-  protected $roleSectionStorage;
-
-  /**
-   * Constructs a new WorkbenchAccessConfigForm.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The factory for configuration objects.
-   * @param \Drupal\Core\State\StateInterface $state
-   *   The state keyvalue collection to use.
-   * @param \Drupal\workbench_access\WorkbenchAccessManagerInterface
-   *   The Workbench Access hierarchy manager.
-   * @param \Drupal\workbench_access\UserSectionStorageInterface $user_section_storage
-   *   User section storage.
-   * @param \Drupal\workbench_access\RoleSectionStorageInterface $role_section_storage
-   *   Role section storage.
-   */
-  public function __construct(ConfigFactoryInterface $config_factory, StateInterface $state, WorkbenchAccessManagerInterface $manager, UserSectionStorageInterface $user_section_storage, RoleSectionStorageInterface $role_section_storage) {
-    parent::__construct($config_factory);
-    $this->state = $state;
-    $this->manager = $manager;
-    $this->userSectionStorage = $user_section_storage;
-    $this->roleSectionStorage = $role_section_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('state'),
-      $container->get('plugin.manager.workbench_access.scheme'),
-      $container->get('workbench_access.user_section_storage'),
-      $container->get('workbench_access.role_section_storage')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'workbench_access_settings';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return ['workbench_access.settings'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $config = $this->config('workbench_access.settings');
-    $schemes = $this->manager->getSchemes();
-    if (empty($schemes)) {
-      $form['error'] = [
-        '#type' => 'item',
-        '#title' => $this->t('Error'),
-        '#markup' => $this->t('There are no available access schemes to configure.'),
-      ];
-    }
-    else {
-      $form['scheme'] = [
-        '#type' => 'details',
-        '#title' => $this->t('Active access scheme'),
-        '#open' => TRUE,
-      ];
-      $form['scheme']['scheme'] = [
-        '#type' => 'radios',
-        '#title' => $this->t('Active access scheme'),
-        '#options' => $schemes,
-        '#default_value' => $config->get('scheme'),
-      ];
-      $form['scheme']['reset_scheme'] = [
-        '#type' => 'checkbox',
-        '#default_value' => FALSE,
-        '#title' => $this->t('Reset assigned fields, user and role sections'),
-        '#states' => [
-          'invisible' => [
-            ':input[name=scheme]' => ['value' => $config->get('scheme')],
-          ],
-        ],
-        '#description' => $this->t('When switching access schemes, flush current field settings, user and role permissions. Recommended.'),
-      ];
-      foreach ($schemes as $id => $label) {
-        $scheme = $this->manager->getScheme($id);
-        $form['scheme']['parents'][$id] = [
-          '#type' => 'checkboxes',
-          '#title' => $this->t('@label editorial access options', ['@label' => $label]),
-          '#options' => $scheme->options(),
-          '#default_value' => $config->get('parents'),
-          '#states' => [
-            'visible' => [
-              ':input[name=scheme]' => ['value' => $id],
-            ],
-          ],
-          '#description' => $this->t('Select the @label options to be used for access control.', ['@label' => $label]),
-        ];
-      }
-      $form['scheme']['set'] = [
-        '#type' => 'submit',
-        '#value' => $this->t('Set active scheme'),
-        '#submit' => ['::submitActiveScheme'],
-      ];
-    }
-    if ($id = $config->get('scheme')) {
-      $scheme = $this->manager->getScheme($id);
-      $custom = $this->manager->getActiveScheme()->configForm($config->get('parents'));
-    }
-    if (!empty($custom)) {
-      $form['custom'] = [
-        '#type' => 'details',
-        '#title' => $this->t('Scheme settings'),
-        '#open' => TRUE,
-        '#markup' => '<strong>' . $this->t('These settings must be confirmed after saving the scheme and options above.') . '</strong>',
-      ];
-      $form['custom'] += $custom;
-    }
-    $form['behavior'] = [
-      '#type' => 'details',
-      '#title' => $this->t('Advanced behaviors'),
-    ];
-    $form['behavior']['deny_on_empty'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Deny access to unassigned content'),
-      '#default_value' => $config->get('deny_on_empty', 0),
-      '#description' => $this->t('For content under access control, deny access for any content not assigned to a section. This setting is off by default so that installing the module does not break existing site behavior.'),
-    ];
-    $form['labels'] = [
-      '#type' => 'details',
-      '#title' => $this->t('Labels'),
-    ];
-    $form['labels']['label'] = [
-      '#type' => 'textfield',
-      '#size' => 32,
-      '#title' => $this->t('Access group label'),
-      '#default_value' => $config->get('label'),
-      '#description' => $this->t('Label shown to define a Workbench Access control group.'),
-    ];
-    $form['labels']['plural_label'] = [
-      '#type' => 'textfield',
-      '#size' => 32,
-      '#title' => $this->t('Access group label (plural form)'),
-      '#default_value' => $config->get('plural_label'),
-      '#description' => $this->t('Label shown to define a set of Workbench Access control groups.'),
-    ];
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $config = $this->config('workbench_access.settings');
-    $config->set('deny_on_empty', $form_state->getValue('deny_on_empty'))
-      ->set('label', $form_state->getValue('label'))
-      ->set('plural_label', $form_state->getValue('plural_label'));
-    $new_scheme = $form_state->getValue('scheme');
-    if ($config->get('scheme') !== $new_scheme) {
-      $config->set('scheme', $new_scheme);
-    }
-    $config->set('parents', array_filter($form_state->getValue($new_scheme)));
-    $extra = $this->manager->getScheme($new_scheme)->configSubmit($form, $form_state);
-    foreach ($extra as $key => $value) {
-      $config->set($key, $value);
-    }
-    $config->save();
-    parent::submitForm($form, $form_state);
-  }
-
-  /**
-   * Custom submit handler for schema changes.
-   */
-  public function submitActiveScheme(array $form, FormStateInterface $form_state) {
-    $scheme = $form_state->getValue('scheme');
-    $config = $this->config('workbench_access.settings');
-    $config->set('scheme', $scheme)
-      ->set('parents', array_filter($form_state->getValue($scheme)));
-    $config->save();
-
-    $reset_scheme = $form_state->getValue('reset_scheme');
-    if (!empty($reset_scheme)) {
-      // Flush access data on scheme change.
-      $this->roleSectionStorage->flushRoles();
-      $this->userSectionStorage->flushUsers();
-      $this->manager->flushFields();
-    }
-    drupal_set_message($this->t('Access scheme updated.'));
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Menu.php b/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Menu.php
deleted file mode 100644
index 5d948da..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Menu.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Plugin\AccessControlHierarchy;
-
-use Drupal\workbench_access\AccessControlHierarchyBase;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-use Drupal\menu_link_content\Entity\MenuLinkContent;
-use Drupal\system\Entity\Menu as MenuEntity;
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Menu\MenuLinkInterface;
-use Drupal\Core\Menu\MenuLinkManagerInterface;
-use Drupal\Core\Menu\MenuLinkTreeElement;
-use Drupal\Core\Menu\MenuLinkTreeInterface;
-use Drupal\Core\Menu\MenuTreeParameters;
-
-/**
- * Defines a hierarchy based on a Menu.
- *
- * @AccessControlHierarchy(
- *   id = "menu",
- *   module = "menu_ui",
- *   base_entity = "menu",
- *   entity = "menu_link_content",
- *   label = @Translation("Menu"),
- *   description = @Translation("Uses a menu as an access control hierarchy.")
- * )
- */
-class Menu extends AccessControlHierarchyBase {
-
-  /**
-   * @inheritdoc
-   */
-  public function getTree() {
-    if (!isset($this->tree)) {
-      $parents = $this->config->get('parents');
-      $tree = [];
-      $this->menuTree = \Drupal::getContainer()->get('menu.link_tree');
-      foreach ($parents as $id => $label) {
-        if ($menu = MenuEntity::load($id)) {
-          $tree[$id][$id] = [
-            'label' => $menu->label(),
-            'depth' => 0,
-            'parents' => [],
-            'weight' => 0,
-            'description' => $menu->label(),
-          ];
-          $params = new MenuTreeParameters();
-          $data = $this->menuTree->load($id, $params);
-          $this->tree = $this->buildTree($id, $data, $tree);
-        }
-      }
-    }
-    return $this->tree;
-  }
-
-  /**
-   * Traverses the menu link tree and builds parentage arrays.
-   *
-   * Note: this method is necessary because Menu does not auto-load parents.
-   *
-   * @param $id
-   *   The root id of the section tree.
-   * @param array $data
-   *   An array of menu tree or subtree data.
-   * @param array &$tree
-   *   The computed tree array to return.
-   *
-   * @return array $tree
-   *   The compiled tree data.
-   */
-  protected function buildTree($id, $data, &$tree) {
-    foreach ($data as $link_id => $link) {
-      $tree[$id][$link_id] = [
-        'id' => $link_id,
-        'label' => $link->link->getTitle(),
-        'depth' => $link->depth,
-        'parents' => [],
-        'weight' => $link->link->getWeight(),
-        'description' => $link->link->getDescription(),
-      ];
-      // Get the parents.
-      if ($parent = $link->link->getParent()) {
-        $tree[$id][$link_id]['parents'] = array_unique(array_merge($tree[$id][$link_id]['parents'], [$parent]));
-        $tree[$id][$link_id]['parents'] = array_unique(array_merge($tree[$id][$link_id]['parents'], $tree[$id][$parent]['parents']));
-      }
-      else {
-        $tree[$id][$link_id]['parents'] = [$id];
-      }
-      if (isset($link->subtree)) {
-        $this->buildTree($id, $link->subtree, $tree);
-      }
-    }
-    return $tree;
-  }
-
-  /**
-   * @inheritdoc
-   */
-  public function getFields($entity_type, $bundle, $parents) {
-    return ['menu' => 'Menu field'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterOptions($field, WorkbenchAccessManagerInterface $manager, array $user_sections = []) {
-    $element = $field;
-    $menu_check = [];
-    foreach ($element['link']['menu_parent']['#options'] as $id => $data) {
-      // The menu value here prepends the menu name. Remove that.
-      $parts = explode(':', $id);
-      $menu = array_shift($parts);
-      $sections = [implode(':', $parts)];
-      // Remove unusable elements, except the existing parent.
-      if ((!empty($element['link']['menu_parent']['#default_value']) && $id != $element['link']['menu_parent']['#default_value']) && empty($manager->checkTree($sections, $user_sections))) {
-        unset($element['link']['menu_parent']['#options'][$id]);
-      }
-      // Check for the root menu item.
-      if (!isset($menu_check[$menu]) && isset($element['link']['menu_parent']['#options'][$menu . ':'])) {
-        if (empty($manager->checkTree([$menu], $user_sections))) {
-          unset($element['link']['menu_parent']['#options'][$menu . ':']);
-        }
-        $menu_check[$menu] = TRUE;
-      }
-    }
-    return $element;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntityValues(EntityInterface $entity, $field) {
-    $values = [];
-    $defaults = menu_ui_get_menu_link_defaults($entity);
-    if (!empty($defaults['id'])) {
-      $values = [$defaults['id']];
-    }
-    return $values;
-  }
-
-  /**
-   * {inheritdoc}
-   */
-  public function disallowedOptions($field) {
-    // On the menu form, we never remove an existing parent item, so there is
-    // no concept of a disallowed option.
-    return [];
-  }
-
-  /**
-   * {inheritdoc}
-   */
-  public function getViewsJoin($table, $key, $alias = NULL) {
-    if ($table == 'users') {
-      $configuration['menu'] = [
-       'table' => 'user__' . WorkbenchAccessManagerInterface::FIELD_NAME,
-       'field' => 'entity_id',
-       'left_table' => $table,
-       'left_field' => $key,
-       'operator' => '=',
-       'table_alias' => WorkbenchAccessManagerInterface::FIELD_NAME,
-       'real_field' => WorkbenchAccessManagerInterface::FIELD_NAME . '_value',
-      ];
-    }
-    else {
-      $configuration['menu'] = [
-       'table' => 'menu_tree',
-       'field' => 'route_param_key',
-       'left_table' => $table,
-       'left_field' => $key,
-       'left_query' => "CONCAT('{$table}=', {$alias}.{$key})",
-       'operator' => '=',
-       'table_alias' => 'menu_tree',
-       'real_field' => 'id',
-      ];
-    }
-    return $configuration;
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Taxonomy.php b/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Taxonomy.php
deleted file mode 100644
index 2a0a573..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/AccessControlHierarchy/Taxonomy.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Plugin\AccessControlHierarchy;
-
-use Drupal\workbench_access\AccessControlHierarchyBase;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-use Drupal\taxonomy\Entity\Term;
-use Drupal\taxonomy\Entity\Vocabulary;
-
-/**
- * Defines a hierarchy based on a Vocabulary.
- *
- * @AccessControlHierarchy(
- *   id = "taxonomy",
- *   module = "taxonomy",
- *   base_entity = "taxonomy_vocabulary",
- *   entity = "taxonomy_term",
- *   label = @Translation("Taxonomy"),
- *   description = @Translation("Uses a taxonomy vocabulary as an access control hierarchy.")
- * )
- */
-class Taxonomy extends AccessControlHierarchyBase {
-
-  /**
-   * @inheritdoc
-   */
-  public function getTree() {
-    if (!isset($this->tree)) {
-      $parents = $this->config->get('parents');
-      $tree = [];
-      foreach ($parents as $id => $label) {
-        if ($vocabulary = Vocabulary::load($id)) {
-          $tree[$id][$id] = [
-            'label' => $vocabulary->label(),
-            'depth' => 0,
-            'parents' => [],
-            'weight' => 0,
-            'description' => $vocabulary->label(),
-          ];
-          // @TODO: It is possible that this will return a filtered set, if
-          // term_access is applied to the query.
-          $data = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->loadTree($id);
-          $this->tree = $this->buildTree($id, $data, $tree);
-        }
-      }
-    }
-    return $this->tree;
-  }
-
-  /**
-   * Traverses the taxonomy tree and builds parentage arrays.
-   *
-   * Note: this method is necessary to load all parents to the array.
-   *
-   * @param $id
-   *   The root id of the section tree.
-   * @param array $data
-   *   An array of menu tree or subtree data.
-   * @param array &$tree
-   *   The computed tree array to return.
-   *
-   * @return array $tree
-   *   The compiled tree data.
-   */
-  protected function buildTree($id, $data, &$tree) {
-    foreach ($data as $term) {
-      $tree[$id][$term->tid] = [
-        'id' => $term->tid,
-        'label' => $term->name,
-        'depth' => $term->depth + 1,
-        'parents' => $this->convertParents($term, $id), // @TODO: This doesn't return what we want.
-        'weight' => $term->weight,
-        'description' => $term->description__value, // @TODO: security
-      ];
-      foreach ($tree[$id][$term->tid]['parents'] as $key) {
-        if (!empty($tree[$id][$key]['parents'])) {
-          $tree[$id][$term->tid]['parents'] = array_unique(array_merge($tree[$id][$key]['parents'], $tree[$id][$term->tid]['parents']));
-        }
-      }
-    }
-    return $tree;
-  }
-
-  /**
-   * Coverts the 0 parent id to a string.
-   *
-   * @param $term
-   *   The term to modify.
-   * @param $id
-   *   The root parent id string.
-   */
-  private function convertParents($term, $id) {
-    foreach ($term->parents as $pos => $parent) {
-      if ($parent === 0 || $parent === '0') {
-        $term->parents[$pos] = $id;
-      }
-    }
-    return $term->parents;
-  }
-
-  /**
-   * @inheritdoc
-   */
-  public function getFields($entity_type, $bundle, $parents) {
-    $list = [];
-    $query = \Drupal::entityQuery('field_config')
-      ->condition('status', 1)
-      ->condition('entity_type', $entity_type)
-      ->condition('bundle', $bundle)
-      ->condition('field_type', 'entity_reference')
-      ->sort('label')
-      ->execute();
-    $fields = \Drupal::entityTypeManager()->getStorage('field_config')->loadMultiple(array_keys($query));
-    foreach ($fields as $id => $field) {
-      $handler = $field->getSetting('handler');
-      $settings = $field->getSetting('handler_settings');
-      if (substr_count($handler, 'taxonomy_term') > 0) {
-        foreach ($settings['target_bundles'] as $key => $target) {
-          if (isset($parents[$key])) {
-            $list[$field->getName()] = $field->label();
-          }
-        }
-      }
-    }
-    return $list;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterOptions($field, WorkbenchAccessManagerInterface $manager, array $user_sections = []) {
-    $element = $field;
-    if (isset($element['widget']['#options'])) {
-      foreach ($element['widget']['#options'] as $id => $data) {
-        $sections = [$id];
-        if (empty($manager->checkTree($sections, $user_sections))) {
-          unset($element['widget']['#options'][$id]);
-        }
-      }
-    }
-    // Check for autocomplete fields. In this case, we replace the selection
-    // handler with our own, which likely breaks Views-based handlers, but that
-    // can be handled later. We swap out the default handler for our own, since
-    // we don't have another way to filter the autocomplete results.
-    // @TODO: test this against views-based handlers.
-    // @see \Drupal\workbench_access\Plugin\EntityReferenceSelection\TaxonomyHierarchySelection
-    else {
-      foreach ($element['widget'] as $key => $item) {
-        if (is_array($item) && isset($item['target_id']['#type']) && $item['target_id']['#type'] == 'entity_autocomplete') {
-          $element['widget'][$key]['target_id']['#selection_handler'] = 'workbench_access:taxonomy_term';
-        }
-      }
-    }
-
-    return $element;
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/Block/WorkbenchAccessBlock.php b/modules/workbench_access-8.x-1.x/src/Plugin/Block/WorkbenchAccessBlock.php
deleted file mode 100644
index 32ba10c..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/Block/WorkbenchAccessBlock.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Plugin\Block;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Block\BlockBase;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Creates a block to show editorial status.
- *
- * @TODO: Replace with Workbench block later.
- *
- * @Block(
- *   id = "workbench_access_block",
- *   admin_label = @Translation("Workbench Access information")
- * )
- */
-class WorkbenchAccessBlock extends BlockBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build() {
-    $build = [];
-    if ($node = \Drupal::routeMatch()->getParameter('node')) {
-      $manager = \Drupal::service('plugin.manager.workbench_access.scheme');
-      if ($scheme = $manager->getActiveScheme()) {
-
-        if ($field = $scheme->fields('node', $node->getType())) {
-          foreach ($scheme->getEntityValues($node, $field) as $value) {
-            if ($element = $manager->getElement($value)) {
-              // @TODO: This needs to be tested better.
-              $build['#theme'] = 'item_list';
-              $build['#items']['#title'] = $this->t('Editorial sections:');
-              $build['#items'][] = $element['label'];
-              $build['#plain_text'] = TRUE;
-            }
-          }
-        }
-      }
-    }
-    return $build;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function blockAccess(AccountInterface $account) {
-    return AccessResult::allowedIfHasPermissions($account, ['administer workbench access', 'view workbench access information'], 'OR');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheContexts() {
-    return ['url.path'];
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/TaxonomyHierarchySelection.php b/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/TaxonomyHierarchySelection.php
deleted file mode 100644
index ff4a982..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/TaxonomyHierarchySelection.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Plugin\EntityReferenceSelection;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Database\Query\SelectInterface;
-use Drupal\Core\Entity\Plugin\EntityReferenceSelection\DefaultSelection;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\taxonomy\Plugin\EntityReferenceSelection\TermSelection;
-
-/**
- * Provides specific access control for the taxonomy_term entity type.
- *
- * @EntityReferenceSelection(
- *   id = "workbench_access:taxonomy_term",
- *   label = @Translation("Restricted Taxonomy Term selection"),
- *   entity_types = {"taxonomy_term"},
- *   group = "workbench_access",
- *   weight = 1,
- *   base_plugin_label = @Translation("Workbench Access: Restricted term selection")
- * )
- */
-class TaxonomyHierarchySelection extends TermSelection {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getReferenceableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) {
-    // Get the base options list from the normal handler. We will filter later.
-    if ($match || $limit) {
-      $options = parent::getReferenceableEntities($match , $match_operator, $limit);
-    }
-    else {
-      $options = [];
-
-      $bundles = $this->entityManager->getBundleInfo('taxonomy_term');
-      $handler_settings = $this->configuration['handler_settings'];
-      $bundle_names = !empty($handler_settings['target_bundles']) ? $handler_settings['target_bundles'] : array_keys($bundles);
-
-      foreach ($bundle_names as $bundle) {
-        if ($vocabulary = Vocabulary::load($bundle)) {
-          if ($terms = $this->entityManager->getStorage('taxonomy_term')->loadTree($vocabulary->id(), 0, NULL, TRUE)) {
-            foreach ($terms as $term) {
-              $options[$vocabulary->id()][$term->id()] = str_repeat('-', $term->depth) . Html::escape($this->entityManager->getTranslationFromContext($term)->label());
-            }
-          }
-        }
-      }
-    }
-    // Now, filter the options by permission.
-    // If assigned to the top level or a superuser, no alteration.
-    $account = \Drupal::currentUser();
-    if ($account->hasPermission('bypass workbench access')) {
-      return $options;
-    }
-    // Check each section for access.
-    $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
-    $user_section_storage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
-    $user_sections = $user_section_storage->getUserSections($account->id());
-    foreach ($options as $key => $values) {
-      if ($manager->checkTree([$key], $user_sections)) {
-        continue;
-      }
-      else {
-        foreach ($values as $id => $value) {
-          if (!$manager->checkTree([$id], $user_sections)) {
-            unset($options[$key][$id]);
-          }
-        }
-      }
-    }
-
-    return $options;
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/UserFilteredSelection.php b/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/UserFilteredSelection.php
deleted file mode 100644
index 1286acc..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/EntityReferenceSelection/UserFilteredSelection.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Plugin\EntityReferenceSelection;
-
-use Drupal\user\Plugin\EntityReferenceSelection\UserSelection;
-
-/**
- * Provides specific access control for the taxonomy_term entity type.
- *
- * @EntityReferenceSelection(
- *   id = "workbench_access:user",
- *   label = @Translation("Filtered user selection"),
- *   entity_types = {"user"},
- *   group = "workbench_access",
- *   weight = 1,
- *   base_plugin_label = @Translation("Workbench Access: Filtered user selection")
- * )
- */
-class UserFilteredSelection extends UserSelection {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function buildEntityQuery($match = NULL, $match_operator = 'CONTAINS') {
-    $query = parent::buildEntityQuery($match, $match_operator);
-    $handler_settings = $this->configuration['handler_settings'];
-
-    // Filter out the already referenced users.
-    if (isset($handler_settings['filter']['section_id'])) {
-      $id = $handler_settings['filter']['section_id'];
-      $user_section_storage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
-      $editors = $user_section_storage->getEditors($id);
-      if (count($editors)) {
-        $query->condition('uid', array_keys($editors), 'NOT IN');
-      }
-    }
-
-    return $query;
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/views/field/Section.php b/modules/workbench_access-8.x-1.x/src/Plugin/views/field/Section.php
deleted file mode 100644
index dae5af9..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/views/field/Section.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Plugin\views\field;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\ResultRow;
-use Drupal\views\ViewExecutable;
-
-/**
- * Field handler to present the section assigned to the node.
- *
- * This is a very simple handler, mainly for testing.
- * @TODO: Convert this to using a proper multi-value handler.
- *
- * @ingroup views_field_handlers
- *
- * @ViewsField("workbench_access_section")
- */
-class Section extends FieldPluginBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
-    parent::init($view, $display, $options);
-
-    $this->additional_fields['nid'] = 'nid';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    parent::buildOptionsForm($form, $form_state);
-    $form['separator'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Separator'),
-      '#default_value' => $this->options['separator'],
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-    $options['separator'] = [
-      'default' => ', '
-    ];
-
-    return $options;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function query() {
-    $this->ensureMyTable();
-    $this->addAdditionalFields();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function render(ResultRow $values) {
-    $nid = $this->getValue($values, 'nid');
-    $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
-    if ($scheme = $manager->getActiveScheme()) {
-      $node = \Drupal::entityTypeManager()->getStorage('node')->load($nid);
-      $fields = $scheme->fields('node', $node->bundle());
-      $sections = $scheme->getEntityValues($node, $fields);
-      $tree = $manager->getActiveTree();
-      foreach ($sections as $id) {
-        foreach ($tree as $root => $data) {
-          if (isset($data[$id])) {
-            $output[] = $this->sanitizeValue($data[$id]['label']);
-          }
-        }
-      }
-      if (isset($output)) {
-        return trim(implode($this->options['separator'], $output), $this->options['separator']);
-      }
-    }
-    return '';
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/views/field/UserSection.php b/modules/workbench_access-8.x-1.x/src/Plugin/views/field/UserSection.php
deleted file mode 100644
index 16504e1..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/views/field/UserSection.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Plugin\views\field;
-
-use Drupal\workbench_access\Plugin\views\field\Section;
-use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\ResultRow;
-use Drupal\views\ViewExecutable;
-
-/**
- * Field handler to present the section assigned to the user.
- *
- * This is a very simple handler, mainly for testing.
- * @TODO: Convert this to using a proper multi-value handler.
- *
- * @ingroup views_field_handlers
- *
- * @ViewsField("workbench_access_user_section")
- */
-class UserSection extends Section {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
-    FieldPluginBase::init($view, $display, $options);
-
-    $this->additional_fields['uid'] = 'uid';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function render(ResultRow $values) {
-    $uid = $this->getValue($values, 'uid');
-    $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
-    if ($scheme = $manager->getActiveScheme()) {
-      if ($manager->userInAll($uid)) {
-        $sections = $manager->getAllSections(TRUE);
-      }
-      else {
-        $user_section_storage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
-        $sections = $user_section_storage->getUserSections($uid);
-      }
-      $output = [];
-      $tree = $manager->getActiveTree();
-      foreach ($sections as $id) {
-        foreach ($tree as $root => $data) {
-          if (isset($data[$id])) {
-            $output[] = $this->sanitizeValue($data[$id]['label']);
-          }
-        }
-      }
-      return trim(implode($this->options['separator'], $output), $this->options['separator']);
-    }
-    return '';
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Plugin/views/filter/Section.php b/modules/workbench_access-8.x-1.x/src/Plugin/views/filter/Section.php
deleted file mode 100644
index 1b189cc..0000000
--- a/modules/workbench_access-8.x-1.x/src/Plugin/views/filter/Section.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Plugin\views\filter;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\Plugin\views\filter\ManyToOne;
-use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Views;
-use Drupal\views\ViewExecutable;
-use Drupal\views\ManyToOneHelper;
-
-/**
- * Filter by assigned section.
- *
- * @ingroup views_filter_handlers
- *
- * @ViewsFilter("workbench_access_section")
- */
-class Section extends ManyToOne {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
-    parent::init($view, $display, $options);
-    $this->manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
-    $this->userSectionStorage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
-    $this->scheme = $this->manager->getActiveScheme();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getValueOptions() {
-    if (isset($this->valueOptions)) {
-      return $this->valueOptions;
-    }
-    $this->valueOptions = [];
-    if (!empty($this->scheme)) {
-      if ($this->manager->userInAll()) {
-        $list = $this->manager->getAllSections();
-      }
-      else {
-        $list = $this->userSectionStorage->getUserSections();
-      }
-      foreach($list as $id) {
-        if ($section = $this->manager->getElement($id)) {
-          $this->valueOptions[$id] = str_repeat('-', $section['depth']) . ' ' . $section['label'];
-        }
-      }
-    }
-    return $this->valueOptions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-
-    $options['operator']['default'] = 'in';
-    $options['value']['default'] = ['All'];
-    $options['expose']['contains']['reduce'] = ['default' => TRUE];
-    $options['section_filter']['contains']['show_hierarchy'] = ['default' => TRUE];
-
-    return $options;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultExposeOptions() {
-    parent::defaultExposeOptions();
-    $this->options['expose']['reduce'] = TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  function operators() {
-    $operators = [
-      'in' => [
-        'title' => $this->t('Is one of'),
-        'short' => $this->t('in'),
-        'short_single' => $this->t('='),
-        'method' => 'opSimple',
-        'values' => 1,
-      ],
-      'not in' => [
-        'title' => $this->t('Is not one of'),
-        'short' => $this->t('not in'),
-        'short_single' => $this->t('<>'),
-        'method' => 'opSimple',
-        'values' => 1,
-      ],
-    ];
-    return $operators;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    parent::buildOptionsForm($form, $form_state);
-    $form['section_filter']['show_hierarchy'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Show children'),
-      '#default_value' => !empty($this->options['section_filter']['show_hierarchy']),
-      '#description' => $this->t('If checked, the filter will return the selected item and all its children.'),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Check to see if input from the exposed filters should change
-   * the behavior of this filter.
-   *
-   * We change this default behavior, since our "Any" result should be filtered
-   * by the user's assignments.
-   */
-  public function acceptExposedInput($input) {
-    if (empty($this->options['exposed'])) {
-      return TRUE;
-    }
-
-    if (!empty($this->options['expose']['use_operator']) && !empty($this->options['expose']['operator_id']) && isset($input[$this->options['expose']['operator_id']])) {
-      $this->operator = $input[$this->options['expose']['operator_id']];
-    }
-
-    if (!empty($this->options['expose']['identifier'])) {
-      $value = $input[$this->options['expose']['identifier']];
-
-      // Various ways to check for the absence of non-required input.
-      if (empty($this->options['expose']['required'])) {
-        if (($this->operator == 'empty' || $this->operator == 'not empty') && $value === '') {
-          $value = ' ';
-        }
-      }
-
-      // We removed two clauses here that cause the filter to be ignored.
-      if (isset($value)) {
-        $this->value = $value;
-        if (empty($this->alwaysMultiple) && empty($this->options['expose']['multiple']) && !is_array($value)) {
-          $this->value = [$value];
-        }
-      }
-      else {
-        return FALSE;
-      }
-    }
-
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function query() {
-    $helper = new ManyToOneHelper($this);
-    // The 'All' selection must be filtered by user sections.
-    if (empty($this->value) || strtolower(current($this->value)) == 'all') {
-      if ($this->manager->userInAll()) {
-        return;
-      }
-      else {
-        // This method will get all user sections and children.
-        $values = $this->userSectionStorage->getUserSections();
-      }
-    }
-    if (!empty($this->table)) {
-      $alias = $this->query->ensureTable($this->table);
-      foreach ($this->scheme->getViewsJoin($this->table, $this->realField, $alias) as $configuration) {
-        // Allow subquery JOINs, which Menu uses.
-        $type = 'standard';
-        if (isset($configuration['left_query'])) {
-          $type = 'subquery';
-        }
-        $join = Views::pluginManager('join')->createInstance($type, $configuration);
-        $this->tableAlias = $helper->addTable($join, $configuration['table_alias']);
-        $this->realField = $configuration['real_field'];
-      }
-      // If 'All' was not selected, fetch the query values.
-      if (!isset($values)) {
-        if (!empty($this->options['section_filter']['show_hierarchy'])) {
-          $values = $this->getChildren();
-        }
-        else {
-          $values = $this->value;
-        }
-      }
-      // If values, add our standard where clause.
-      if (!empty($values)) {
-        $this->scheme->addWhere($this, $values);
-      }
-      // Else add a failing where clause.
-      else {
-        $this->query->addWhere($this->options['group'], '1 = 0');
-      }
-    }
-  }
-
-  /**
-   * Gets the child sections of a base section.
-   *
-   * @return array
-   *   An array of section ids that this user may see.
-   */
-  protected function getChildren() {
-    $tree = $this->manager->getActiveTree();
-    $children = [];
-    foreach ($this->value as $id) {
-      foreach ($tree as $key => $data) {
-        if ($id == $key) {
-          $children += array_keys($data);
-        }
-        else {
-          foreach ($data as $iid => $item) {
-            if ($iid == $id || in_array($id, $item['parents'])) {
-              $children[] = $iid;
-            }
-          }
-        }
-      }
-    }
-    return $children;
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/RoleSectionStorage.php b/modules/workbench_access-8.x-1.x/src/RoleSectionStorage.php
deleted file mode 100644
index f292fcc..0000000
--- a/modules/workbench_access-8.x-1.x/src/RoleSectionStorage.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\State\StateInterface;
-
-/**
- * Defines a role-section storage that uses the State API.
- */
-class RoleSectionStorage implements RoleSectionStorageInterface {
-
-  /**
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $roleStorage;
-
-  /**
-   * Constructs a new RoleSectionStorage object.
-   *
-   * @param \Drupal\Core\State\StateInterface $state
-   *   State service.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
-   *   Entity type manager.
-   */
-  public function __construct(StateInterface $state, EntityTypeManagerInterface $entityTypeManager) {
-    $this->state = $state;
-    $this->roleStorage = $entityTypeManager->getStorage('user_role');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addRole($role_id, $sections = []) {
-    $settings = $this->loadRoleSections($role_id);
-    foreach ($sections as $id) {
-      $settings[$id] = 1;
-    }
-    $this->saveRoleSections($role_id, $settings);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function removeRole($role_id, $sections = []) {
-    $settings = $this->loadRoleSections($role_id);
-    foreach ($sections as $id) {
-      if (isset($settings[$id])) {
-        unset($settings[$id]);
-      }
-    }
-    $this->saveRoleSections($role_id, $settings);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRoleSections(AccountInterface $account) {
-    $sections = [];
-    foreach ($account->getRoles() as $rid) {
-      $settings = $this->loadRoleSections($rid);
-      $sections = array_merge($sections, array_keys($settings));
-    }
-    return $sections;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPotentialRoles($id) {
-    $list = [];
-    $roles = $this->roleStorage->loadMultiple();
-    foreach ($roles as $rid => $role) {
-      $list[$rid] = $role->label();
-    }
-    return $list;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPotentialRolesFiltered($id) {
-    $list = [];
-    $roles = $this->roleStorage->loadMultiple();
-    foreach ($roles as $rid => $role) {
-      if ($role->hasPermission('use workbench access')) {
-        $list[$rid] = $role->label();
-      }
-    }
-    return $list;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRoles($id) {
-    $list = [];
-    $roles = $this->roleStorage->loadMultiple();
-    foreach ($roles as $rid => $role) {
-      $settings = $this->loadRoleSections($rid);
-      if (!empty($settings[$id])) {
-        $list[$rid] = $role->label();
-      }
-    }
-    return $list;
-  }
-
-  /**
-   * @inheritdoc
-   */
-  public function flushRoles() {
-    $roles = $this->roleStorage->loadMultiple();
-    foreach ($roles as $rid => $role) {
-      $this->deleteRoleSections($rid);
-    }
-    // @TODO clear cache?
-  }
-
-
-  /**
-   * Loads the saved role sections for a given role ID.
-   *
-   * @param string $role_id
-   *   The role ID.
-   *
-   * @return array
-   *   Sections for role.
-   */
-  protected function loadRoleSections($role_id) {
-    return $this->state->get(self::WORKBENCH_ACCESS_ROLES_STATE_PREFIX . $role_id, []);
-  }
-
-  /**
-   * Saves the role sections for a given role ID.
-   *
-   * @param string $role_id
-   *   The role ID.
-   * @param array $settings
-   *   Sections for the role.
-   */
-  protected function saveRoleSections($role_id, array $settings = []) {
-    return $this->state->set(self::WORKBENCH_ACCESS_ROLES_STATE_PREFIX . $role_id, $settings);
-  }
-
-  /**
-   * Delete the saved sections for this role.
-   *
-   * @param string $rid
-   *   The role ID.
-   */
-  protected function deleteRoleSections($rid) {
-    return $this->state->delete(self::WORKBENCH_ACCESS_ROLES_STATE_PREFIX . $rid);
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/RoleSectionStorageInterface.php b/modules/workbench_access-8.x-1.x/src/RoleSectionStorageInterface.php
deleted file mode 100644
index d6b8fff..0000000
--- a/modules/workbench_access-8.x-1.x/src/RoleSectionStorageInterface.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access;
-
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Defines an interface for storing and retrieving sections for a role.
- */
-interface RoleSectionStorageInterface {
-
-  /**
-   * State prefix.
-   */
-  const WORKBENCH_ACCESS_ROLES_STATE_PREFIX = 'workbench_access_roles_';
-
-  /**
-   * Adds a set of sections to a role.
-   *
-   * @param int $role_id
-   *   A role id.
-   * @param array $sections
-   *   An array of section ids to assign to this role.
-   */
-  public function addRole($role_id, $sections = []);
-
-  /**
-   * Reomves a set of sections to a role.
-   *
-   * @param int $role_id
-   *   A role id.
-   * @param array $sections
-   *   An array of section ids to assign to this role.
-   */
-  public function removeRole($role_id, $sections = []);
-
-  /**
-   * Gets a list of potential roles.
-   *
-   * @param string $id
-   *   The section id.
-   *
-   * @return array
-   *   An array of roles keyed by rid with name values.
-   */
-  public function getPotentialRoles($id);
-
-  /**
-   * Gets a list of potential roles for assigning users.
-   *
-   * @param string $id
-   *   The section id.
-   *
-   * @return array
-   *   An array of roles keyed by rid with rid values.
-   */
-  public function getPotentialRolesFiltered($id);
-
-  /**
-   * Gets a list of roles assigned to a section.
-   *
-   * @param string $id
-   *   The section id.
-   *
-   * @return array
-   *   An array of role ids.
-   */
-  public function getRoles($id);
-
-  /**
-   * Removes all role assignments.
-   *
-   * This method should be triggered when changing access schemes. If possible,
-   * let the administrator choose to run this.
-   */
-  public function flushRoles();
-
-  /**
-   * Gets the sections assigned to a user by way of their roles.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   The account to retrieve sections for by way of their roles.
-   *
-   * @return array
-   *   Array of section IDs.
-   */
-  public function getRoleSections(AccountInterface $account);
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Tests/WorkbenchAccessNodeTypeFormTest.php b/modules/workbench_access-8.x-1.x/src/Tests/WorkbenchAccessNodeTypeFormTest.php
deleted file mode 100644
index a678ca2..0000000
--- a/modules/workbench_access-8.x-1.x/src/Tests/WorkbenchAccessNodeTypeFormTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Tests;
-
-use Drupal\workbench_access\Tests\WorkbenchAccessTestBase;
-use Drupal\node\NodeTypeInterface;
-
-/**
- * Adds configuration options to node types.
- *
- * @group workbench_access
- */
-class WorkbenchAccessNodeTypeFormTest extends WorkbenchAccessTestBase {
-
-  /**
-   * An editor user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $editor;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->editor = $this->drupalCreateUser([
-      'access administration pages',
-      'administer content types',
-      'create page content',
-      'edit any page content',
-      'delete any page content',
-    ]);
-    $this->drupalLogin($this->editor);
-  }
-
-  /**
-   * Test that the Workbench Access setting applies properly.
-   */
-  public function testWorkbenchAccessNodeTypeForm() {
-    // The form text string to find.
-    $string = 'Enable Workbench Access control for Basic page content.';
-    // The form path.
-    $path = 'admin/structure/types/manage/page';
-
-    // Get the page content type settings.
-    $this->drupalGet($path);
-
-    // Workbench Access should not be visible.
-    $this->assertNoText($string);
-
-    // Set permission to 'administer workbench access'.
-    user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, ['administer workbench access']);
-
-    // Workbench Access should be visible.
-    $this->drupalGet('admin/structure/types/manage/page');
-    $this->assertText($string);
-
-    // Test the setting on the entity.
-    $type = entity_load('node_type', 'page');
-    $status = $type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0);
-    $this->assertTrue($status === 0, 'Access control status is set to zero (off).');
-
-    // Save the form.
-    $edit['workbench_access_status'] = 1;
-    $this->drupalPostForm($path, $edit, 'Save content type');
-
-    // Test the setting on the entity.
-    $type = entity_load('node_type', 'page');
-    $status = $type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0);
-    $this->assertTrue($status == 1, 'Access control status is set to one (on).');
-
-  }
-}
diff --git a/modules/workbench_access-8.x-1.x/src/Tests/WorkbenchAccessTestBase.php b/modules/workbench_access-8.x-1.x/src/Tests/WorkbenchAccessTestBase.php
deleted file mode 100644
index da5a758..0000000
--- a/modules/workbench_access-8.x-1.x/src/Tests/WorkbenchAccessTestBase.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access\Tests;
-
-use Drupal\simpletest\WebTestBase;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-
-/**
- * Base test class for Workbench Access.
- */
-abstract class WorkbenchAccessTestBase extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['workbench_access', 'node', 'taxonomy', 'menu_ui', 'options'];
-
-  /**
-   * The Workbench Access manager class.
-   *
-   * @var \Drupal\workbench_access\WorkbenchAccessManager
-   */
-  protected $pluginmanager;
-
-  /**
-   * The entity storage manager.
-   */
-  protected $storage;
-
-  /**
-   * An array of created nodes.
-   */
-  protected $nodes;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
-    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
-
-    // Install our base taxonomy.
-    $this->installTaxonomy();
-
-    // Install our base nodes for testing.
-    $this->installNodes();
-
-    // Install a base menu.
-    $this->installMenu();
-
-    // Instantiate the manager.
-    $this->manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
-    $this->assertTrue(count($this->nodes) == 12, '12 nodes created');
-    $tree = $this->manager->getActiveTree();
-    $this->assertTrue(count($tree['workbench_access']) == 13, 'Access tree has 13 items');
-  }
-
-  /**
-   * Loads and installs the test taxonomy from drush.
-   */
-  protected function installTaxonomy() {
-    // This creates 12 taxonomy terms.
-    $file = DRUPAL_ROOT . '/' . drupal_get_path('module', 'workbench_access') . "/workbench_access.drush.inc";
-    require_once $file;
-    drush_workbench_access_test();
-  }
-
-  /**
-   * Loads and installs the test menu.
-   */
-  protected function installMenu() {
-    // We have 12 nodes. They should mirror the taxonomy tree.
-    // @TODO.
-  }
-
-  protected function installNodes() {
-    // Create nine nodes, each assigned to a taxonomy term.
-    // Terms 11 and 12 will have no assignees.
-    for ($i = 1; $i <= 10; $i++) {
-      $this->nodes[] = $this->drupalCreateNode([
-        'type' => 'article',
-        WorkbenchAccessManagerInterface::FIELD_NAME => [$i],
-      ]);
-    }
-    // Create two page nodes for testing.
-    for ($i = 1; $i <= 2; $i++) {
-      $this->nodes[] = $this->drupalCreateNode([
-        'type' => 'page',
-      ]);
-    }
-  }
-
-  protected function setTaxonomyScheme() {
-    // @TODO: switch to taxonomy scheme.
-  }
-
-  protected function setMenuScheme() {
-    // @TODO: switch to menu scheme.
-  }
-
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php b/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php
deleted file mode 100644
index 5e0c5ce..0000000
--- a/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Defines a class for storing and retrieving sections assigned to a user.
- */
-class UserSectionStorage implements UserSectionStorageInterface {
-
-  /**
-   * User storage handler.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $userStorage;
-
-  /**
-   * Static cache to prevent recalculation of sections for a user in a request.
-   *
-   * @var array
-   */
-  protected $userSectionCache;
-
-  /**
-   * Current user service.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $currentUser;
-
-  /**
-   * Role section storage service.
-   *
-   * @var \Drupal\workbench_access\RoleSectionStorageInterface
-   */
-  protected $roleSectionStorage;
-
-  /**
-   * Constructs a new UserSectionStorage object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
-   *   Entity type manager.
-   * @param \Drupal\Core\Session\AccountInterface $currentUser
-   *   Current user.
-   * @param \Drupal\workbench_access\RoleSectionStorageInterface $role_section_storage
-   *   Role section storage.
-   */
-  public function __construct(EntityTypeManagerInterface $entityTypeManager, AccountInterface $currentUser, RoleSectionStorageInterface $role_section_storage) {
-    $this->userStorage = $entityTypeManager->getStorage('user');
-    $this->currentUser = $currentUser;
-    $this->roleSectionStorage = $role_section_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getUserSections($uid = NULL, $add_roles = TRUE) {
-    // Get the information from the account.
-    if (is_null($uid)) {
-      $uid = $this->currentUser->id();
-    }
-    if (!isset($this->userSectionCache[$uid])) {
-      $user_sections = [];
-      $user = $this->userStorage->load($uid);
-      $sections = $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue();
-      foreach ($sections as $data) {
-        $user_sections[] = $data['value'];
-      }
-      // Merge in role data.
-      if ($add_roles) {
-        $user_sections = array_merge($user_sections, $this->roleSectionStorage->getRoleSections($user));
-      }
-
-      $this->userSectionCache[$uid] = array_unique($user_sections);
-    }
-    return $this->userSectionCache[$uid];
-
-  }
-
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addUser($user_id, $sections = []) {
-    $entity = $this->userStorage->load($user_id);
-    $values = $this->getUserSections($user_id, FALSE);
-    $new = array_merge($values, $sections);
-    $entity->set(WorkbenchAccessManagerInterface::FIELD_NAME, $new);
-    $entity->save();
-    $this->userSectionCache[$user_id] = $new;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function removeUser($user_id, $sections = []) {
-    $entity = $this->userStorage->load($user_id);
-    $values = $this->getUserSections($user_id, FALSE);
-    $new = array_flip($values);
-    foreach ($sections as $id) {
-      unset($new[$id]);
-    }
-    $entity->set(WorkbenchAccessManagerInterface::FIELD_NAME, array_keys($new));
-    $entity->save();
-    $this->userSectionCache[$user_id] = array_keys($new);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEditors($id) {
-    $users = $this->userStorage->getQuery()
-      ->condition(WorkbenchAccessManagerInterface::FIELD_NAME, $id)
-      ->condition('status', 1)
-      ->sort('name')
-      ->execute();
-    return $this->filterByPermission($users);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPotentialEditors($id) {
-    $query = $this->userStorage->getQuery();
-    $users = $query
-      ->condition('status', 1)
-      ->sort('name')
-      ->execute();
-    return $this->filterByPermission($users);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPotentialEditorsRoles($id) {
-    return $this->roleSectionStorage->getPotentialRolesFiltered($id);
-  }
-
-  /**
-   * @inheritdoc
-   */
-  public function flushUsers() {
-    // We might want to use purgeFieldData() or similar for this, but the data
-    // is currently not revisioned, so a simple table flush will do. Wrap the
-    // statement in a try/catch just in case it isn't portable.
-    try {
-      $database = \Drupal::getContainer()->get('database');
-      $database->truncate('user__' . WorkbenchAccessManagerInterface::FIELD_NAME)->execute();
-    }
-    catch (\Exception $e) {
-      // @todo return FALSE instead here, let UI handle it.
-      drupal_set_message($this->t('Failed to delete user assignments.'));
-    }
-    // @TODO clear cache?
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function filterByPermission($users = []) {
-    $list = [];
-    $entities = $this->userStorage->loadMultiple($users);
-    foreach ($entities as $account) {
-      if ($account->hasPermission('use workbench access')) {
-        $list[$account->id()] = $account->label();
-      }
-    }
-    return $list;
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php.orig b/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php.orig
deleted file mode 100644
index 84f32c6..0000000
--- a/modules/workbench_access-8.x-1.x/src/UserSectionStorage.php.orig
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Defines a class for storing and retrieving sections assigned to a user.
- */
-class UserSectionStorage implements UserSectionStorageInterface {
-
-  /**
-   * User storage handler.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $userStorage;
-
-  /**
-   * Static cache to prevent recalculation of sections for a user in a request.
-   *
-   * @var array
-   */
-  protected $userSectionCache;
-
-  /**
-   * Current user service.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $currentUser;
-
-  /**
-   * Role section storage service.
-   *
-   * @var \Drupal\workbench_access\RoleSectionStorageInterface
-   */
-  protected $roleSectionStorage;
-
-  /**
-   * Constructs a new UserSectionStorage object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
-   *   Entity type manager.
-   * @param \Drupal\Core\Session\AccountInterface $currentUser
-   *   Current user.
-   * @param \Drupal\workbench_access\RoleSectionStorageInterface $role_section_storage
-   *   Role section storage.
-   */
-  public function __construct(EntityTypeManagerInterface $entityTypeManager, AccountInterface $currentUser, RoleSectionStorageInterface $role_section_storage) {
-    $this->userStorage = $entityTypeManager->getStorage('user');
-    $this->currentUser = $currentUser;
-    $this->roleSectionStorage = $role_section_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getUserSections($uid = NULL, $add_roles = TRUE) {
-    // Get the information from the account.
-    if (is_null($uid)) {
-      $uid = $this->currentUser->id();
-    }
-    if (!isset($this->userSectionCache[$uid])) {
-      $user_sections = [];
-      $user = $this->userStorage->load($uid);
-      $sections = $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue();
-      foreach ($sections as $data) {
-        $user_sections[] = $data['value'];
-      }
-      // Merge in role data.
-      if ($add_roles) {
-        $user_sections = array_merge($user_sections, $this->roleSectionStorage->getRoleSections($user));
-      }
-
-      $this->userSectionCache[$uid] = array_unique($user_sections);
-    }
-    return $this->userSectionCache[$uid];
-
-  }
-
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addUser($user_id, $sections = []) {
-    $entity = $this->userStorage->load($user_id);
-    $values = $this->getUserSections($user_id, FALSE);
-    $new = array_merge($values, $sections);
-    $entity->set(WorkbenchAccessManagerInterface::FIELD_NAME, $new);
-    $entity->save();
-    $this->userSectionCache[$user_id] = $new;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function removeUser($user_id, $sections = []) {
-    $entity = $this->userStorage->load($user_id);
-    $values = $this->getUserSections($user_id, FALSE);
-    $new = array_flip($values);
-    foreach ($sections as $id) {
-      unset($new[$id]);
-    }
-    $entity->set(WorkbenchAccessManagerInterface::FIELD_NAME, array_keys($new));
-    $entity->save();
-    $this->userSectionCache[$user_id] = array_keys($new);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEditors($id) {
-    $users = $this->userStorage->getQuery()
-      ->condition(WorkbenchAccessManagerInterface::FIELD_NAME, $id)
-      ->condition('status', 1)
-      ->sort('name')
-      ->execute();
-    return $this->filterByPermission($users);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPotentialEditors($id) {
-    $query = $this->userStorage->getQuery();
-    // For right now, we just show all possible users. If we switch to using
-    // an autocomplete form, then we may change back to the filtered query.
-    /*
-    $query->condition($query->orConditionGroup()
-        ->condition(WorkbenchAccessManagerInterface::FIELD_NAME, $id, '<>')
-        ->condition(WorkbenchAccessManagerInterface::FIELD_NAME, NULL, 'IS NULL'))
-      ->condition('status', 1);
-    $users = $query->execute();
-    */
-    $users = $query
-      ->condition('status', 1)
-      ->sort('name')
-      ->execute();
-    return $this->filterByPermission($users);
-  }
-
-  /**
-   * @inheritdoc
-   */
-  public function flushUsers() {
-    // We might want to use purgeFieldData() or similar for this, but the data
-    // is currently not revisioned, so a simple table flush will do. Wrap the
-    // statement in a try/catch just in case it isn't portable.
-    try {
-      $database = \Drupal::getContainer()->get('database');
-      $database->truncate('user__' . WorkbenchAccessManagerInterface::FIELD_NAME)->execute();
-    }
-    catch (\Exception $e) {
-      // @todo return FALSE instead here, let UI handle it.
-      drupal_set_message($this->t('Failed to delete user assignments.'));
-    }
-    // @TODO clear cache?
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function filterByPermission($users = []) {
-    $list = [];
-    $entities = $this->userStorage->loadMultiple($users);
-    foreach ($entities as $account) {
-      if ($account->hasPermission('use workbench access')) {
-        $list[$account->id()] = $account->label();
-      }
-    }
-    return $list;
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/UserSectionStorageInterface.php b/modules/workbench_access-8.x-1.x/src/UserSectionStorageInterface.php
deleted file mode 100644
index 79ebaf7..0000000
--- a/modules/workbench_access-8.x-1.x/src/UserSectionStorageInterface.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access;
-
-/**
- * Defines an interface for storing and retrieving sections for a user.
- */
-interface UserSectionStorageInterface {
-
-  /**
-   * Adds a set of sections to a user.
-   *
-   * @param int $user_id
-   *   A user id.
-   * @param array $sections
-   *   An array of section ids to assign to this user.
-   */
-  public function addUser($user_id, $sections = []);
-
-  /**
-   * Removes a set of sections to a user.
-   *
-   * @param int $user_id
-   *   A user id.
-   * @param array $sections
-   *   An array of section ids to assign to this user.
-   */
-  public function removeUser($user_id, $sections = []);
-
-  /**
-   * Gets a list of editors assigned to a section.
-   *
-   * This method does not return editors assigned by role.
-   *
-   * @param $id
-   *   The section id.
-   *
-   * @return array
-   *   An array of user ids.
-   */
-  public function getEditors($id);
-
-  /**
-   * Gets a list of editors who may be assigned to a section.
-   *
-   * This method does not remove editors already assigned to a section.
-   *
-   * @param $id
-   *   The section id.
-   *
-   * @return array
-   *   An array of user ids.
-   */
-  public function getPotentialEditors($id);
-
-  /**
-   * Gets a list of editors roles who may be assigned to a section.
-   *
-   * @param $id
-   *   The section id.
-   *
-   * @return array
-   *   An array of role ids.
-   */
-  public function getPotentialEditorsRoles($id);
-
-  /**
-   * Gets the editorial sections assigned to a user.
-   *
-   * @param $uid
-   *   An optional user id. If not provided, the active user is returned.
-   * @param $add_roles
-   *   Whether to add the role-based assignments to the user. Defaults to true.
-   *
-   * @return
-   *   An array of section ids that the user is assigned to.
-   */
-  public function getUserSections($uid = NULL, $add_roles = TRUE);
-
-  /**
-   * Removes all user assignments.
-   *
-   * This method should be triggered when changing access schemes. If possible,
-   * let the administrator choose to run this.
-   */
-  public function flushUsers();
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/WorkbenchAccessManager.php b/modules/workbench_access-8.x-1.x/src/WorkbenchAccessManager.php
deleted file mode 100644
index 58f1e20..0000000
--- a/modules/workbench_access-8.x-1.x/src/WorkbenchAccessManager.php
+++ /dev/null
@@ -1,439 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access;
-
-use Drupal\Component\Plugin\Exception\PluginNotFoundException;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Defines a class for interacting with content and fields.
- */
-class WorkbenchAccessManager extends DefaultPluginManager implements WorkbenchAccessManagerInterface {
-  use StringTranslationTrait;
-
-  /**
-   * Static cache of user sections keyed by user ID.
-   *
-   * @var array
-   */
-  protected $userSectionCache = [];
-
-  /**
-   * The access tree array.
-   *
-   * @var array
-   */
-  public $tree;
-
-  /**
-   * Entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * User section storage.
-   *
-   * @var \Drupal\workbench_access\UserSectionStorageInterface
-   */
-  protected $userSectionStorage;
-
-  /**
-   * Role section storage.
-   *
-   * @var \Drupal\workbench_access\RoleSectionStorageInterface
-   */
-  protected $roleSectionStorage;
-
-  /**
-   * Module config.
-   *
-   * @var \Drupal\Core\Config\ConfigFactory
-   */
-  protected $configFactory;
-
-  /**
-   * Current user.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $currentUser;
-
-  /**
-   * Constructs a new WorkbenchAccessManager.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   Cache backend instance to use.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
-   *   Entity type manager.
-   * @param \Drupal\workbench_access\UserSectionStorageInterface $user_section_storage
-   *   User section storage.
-   * @param \Drupal\workbench_access\RoleSectionStorageInterface $role_section_storage
-   *   Role section storage.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
-   *   Config factory.
-   * @param \Drupal\Core\Session\AccountInterface $currentUser
-   *   Current user.
-   */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, EntityTypeManagerInterface $entityTypeManager, UserSectionStorageInterface $user_section_storage, RoleSectionStorageInterface $role_section_storage, ConfigFactoryInterface $configFactory, AccountInterface $currentUser) {
-    parent::__construct('Plugin/AccessControlHierarchy', $namespaces, $module_handler, 'Drupal\workbench_access\AccessControlHierarchyInterface', 'Drupal\workbench_access\Annotation\AccessControlHierarchy');
-
-    $this->alterInfo('workbench_access_info');
-    $this->setCacheBackend($cache_backend, 'workbench_access_plugins');
-    $this->moduleHandler = $module_handler;
-    $this->namespaces = $namespaces;
-    $this->userSectionStorage = $user_section_storage;
-    $this->configFactory = $configFactory;
-    $this->currentUser = $currentUser;
-    $this->entityTypeManager = $entityTypeManager;
-    $this->roleSectionStorage = $role_section_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSchemes() {
-    $schemes = [];
-    $definitions = $this->getDefinitions();
-
-    foreach ($definitions as $id => $info) {
-      if ($this->moduleHandler->moduleExists($info['module'])) {
-        $schemes[$id] = (string) $info['label'];
-      }
-    }
-
-    return $schemes;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getScheme($id) {
-    try {
-      return $this->createInstance($id);
-    }
-    catch (PluginNotFoundException $e) {
-      return FALSE;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getActiveScheme() {
-    if ($scheme_id = $this->configFactory->get('workbench_access.settings')->get('scheme')) {
-      return $this->getScheme($scheme_id);
-    }
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getActiveTree() {
-    if (!isset($this->tree)) {
-      if ($scheme = $this->getActiveScheme()) {
-        $this->tree = $scheme->getTree();
-      }
-    }
-    return $this->tree;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resetTree() {
-    unset($this->tree);
-    if ($scheme = $this->getActiveScheme()) {
-      $scheme->resetTree();
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getElement($id) {
-    if ($scheme = $this->getActiveScheme()) {
-      return $scheme->load($id);
-    }
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getDefaultValue() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addEntity($entity_id, $entity_type, $sections = []) {
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function removeEntity($entity_id, $entity_type, $sections = []) {
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function checkTree($entity_sections, $user_sections) {
-    $tree = $this->getActiveTree();
-    $list = array_flip($user_sections);
-    foreach ($entity_sections as $section) {
-      // Simple check first: is there an exact match?
-      if (isset($list[$section])) {
-        return TRUE;
-      }
-      // Check for section on the tree.
-      foreach ($tree as $id => $info) {
-        if (isset($list[$section]) && isset($info[$section])) {
-          return TRUE;
-        }
-        // Recursive check for parents.
-        if (!empty($info[$section]['parents'])) {
-          $parents = array_flip($info[$section]['parents']);
-          // Check for parents.
-          foreach ($list as $uid => $data) {
-            if (isset($parents[$uid])) {
-              return TRUE;
-            }
-          }
-        }
-      }
-    }
-    return FALSE;
-  }
-
-  /**
-   * @inheritdoc
-   */
-  public function flushFields() {
-    // Flush the field settings.
-    $node_types = $this->entityTypeManager->getStorage('node_type')->loadMultiple();
-    foreach ($node_types as $id => $type) {
-      $type->setThirdPartySetting('workbench_access', 'workbench_access_status', 0);
-      $type->save();
-      $fields['node'][$id] = '';
-    }
-    $this->configFactory->getEditable('workbench_access.settings')
-      ->set('fields', $fields)
-      ->save();
-    drupal_set_message($this->t('Field settings reset.'));
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\RoleSectionStorage::addRole() instead
-   */
-  public function addRole($role_id, $sections = []) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    $this->roleSectionStorage->addRole($role_id, $sections);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\RoleSectionStorage::removeRole() instead
-   */
-  public function removeRole($role_id, $sections = []) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    $this->roleSectionStorage->removeRole($role_id, $sections);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\RoleSectionStorage::getRoles() instead
-   */
-  public function getRoles($id) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    $this->roleSectionStorage->getRoles($id);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\RoleSectionStorage::flushRoles() instead
-   */
-  public function flushRoles() {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    $this->roleSectionStorage->flushRoles();
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\UserSectionStorage::addUser() instead
-   */
-  public function addUser($user_id, $sections = []) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    $this->userSectionStorage->addUser($user_id, $sections);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\UserSectionStorage::removeUser() instead
-   */
-  public function removeUser($user_id, $sections = []) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    $this->userSectionStorage->removeUser($user_id, $sections);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\UserSectionStorage::getEditors() instead
-   */
-  public function getEditors($id) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    return $this->userSectionStorage->getEditors($id);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\UserSectionStorage::getPotentialEditors() instead
-   */
-  public function getPotentialEditors($id) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    return $this->userSectionStorage->getPotentialEditors($id);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\UserSectionStorage::getPotentialEditorsRoles() instead
-   */
-  public function getPotentialEditorsRoles($id) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    return $this->userSectionStorage->getPotentialEditorsRoles($id);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\UserSectionStorage::getUserSections() instead
-   */
-  public function getUserSections($uid = NULL, $add_roles = TRUE) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    return $this->userSectionStorage->getUserSections($uid, $add_roles);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\UserSectionStorage::flushUsers() instead
-   */
-  public function flushUsers() {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\UserSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    $this->userSectionStorage->flushUsers();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAllSections($root_only = FALSE) {
-    $sections = [];
-    foreach ($this->getActiveTree() as $root => $item) {
-      if ($root_only) {
-        $sections[] = $root;
-      }
-      else {
-        foreach ($item as $id => $data) {
-          $sections[] = $id;
-        }
-      }
-    }
-    return $sections;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function userInAll($uid = NULL) {
-    // Get the information from the account.
-    if (is_null($uid)) {
-      $uid = $this->currentUser->id();
-    }
-    $user = $this->entityTypeManager->getStorage('user')->load($uid);
-    if ($user->hasPermission('bypass workbench access')) {
-      return TRUE;
-    }
-    else {
-      // If the user is assigned to all the top-level sections, treat as admin.
-      $user_sections = $this->userSectionStorage->getUserSections($uid);
-      foreach (array_keys($this->getActiveTree()) as $root) {
-        if (empty($user_sections[$root])) {
-          return FALSE;
-        }
-      }
-    }
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\RoleSectionStorage::getRoleSections() instead
-   */
-  public function getRoleSections(AccountInterface $account) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    return $this->roleSectionStorage->getRoleSections($account);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\RoleSectionStorage::getPotentialRoles() instead
-   */
-  public function getPotentialRoles($id) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    return $this->roleSectionStorage->getPotentialRoles($id);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated To be removed before 8.x-1.0 - use
-   *   \Drupal\workbench_access\RoleSectionStorage::getPotentialRolesFiltered() instead
-   */
-  public function getPotentialRolesFiltered($id) {
-    trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated, please use \Drupal\workbench_access\RoleSectionStorage::' . __METHOD__ . ' instead', E_USER_DEPRECATED);
-    return $this->roleSectionStorage->getPotentialRolesFiltered($id);
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/src/WorkbenchAccessManagerInterface.php b/modules/workbench_access-8.x-1.x/src/WorkbenchAccessManagerInterface.php
deleted file mode 100644
index a055a7c..0000000
--- a/modules/workbench_access-8.x-1.x/src/WorkbenchAccessManagerInterface.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access;
-
-/**
- * Defines an interface handling Workbench Access configuration.
- */
-interface WorkbenchAccessManagerInterface extends UserSectionStorageInterface, RoleSectionStorageInterface {
-  const FIELD_NAME = 'field_workbench_access';
-
-  /**
-   * Returns an array of available access schemes.
-   *
-   * @return \Drupal\workbench_access\AccessControlHierarchyInterface[]
-   *   An array of schemes.
-   */
-  public function getSchemes();
-
-  /**
-   * Gets a single access scheme.
-   *
-   * Access schemes are defined by AccessControlHierarchy plugins.
-   *
-   * @param $id
-   *   A string indicating the plugin name.
-   *
-   * @return \Drupal\workbench_access\AccessControlHierarchyInterface
-   *   The scheme identified by the id.
-   */
-  public function getScheme($id);
-
-  /**
-   * Gets the active access scheme, as set in module configuration.
-   *
-   * @return \Drupal\workbench_access\AccessControlHierarchyInterface
-   *   The active scheme.
-   */
-  public function getActiveScheme();
-
-  /**
-   * Gets the hierarchy tree defined by an access control plugin.
-   *
-   * @return array
-   *   The array will be keyed by the id of each element, and contain the
-   *   following data:
-   *   - label (string) -- The human-readable label of the element.
-   *   - depth (int) -- The depth of the element in the tree.
-   *   - parents (array) -- An array of parent elements for this element.
-   *   - weight (int) -- The sort weight of the element.
-   *   - description (text) -- An optional text description of the element.
-   *
-   * @TODO: Convert this to a classed object.
-   */
-  public function getActiveTree();
-
-  /**
-   * Gets a single element from the active access tree.
-   *
-   * @param $id
-   *   The id of the item to return.
-   *
-   * @return array
-   *   An array as described by getActiveTree().
-   */
-  public function getElement($id);
-
-  /**
-   * Get the default value for a workbench access form element.
-   *
-   * Note that this function only applies to our test field.
-   *
-   * @return array
-   */
-  public static function getDefaultValue();
-
-  /**
-   * Adds a set of sections to an entity.
-   *
-   * @param int $entity_id
-   *   An entity id.
-   * @param $entity_type
-   *   The entity type.
-   * @param array $sections
-   *   An array of section ids to assign to this entity.
-   */
-  public function addEntity($entity_id, $entity_type, $sections = []);
-
-  /**
-   * Removes a set of sections to an entity.
-   *
-   * @param int $entity_id
-   *   An entity id.
-   * @param $entity_type
-   *   The entity type.
-   * @param array $sections
-   *   An array of section ids to assign to this entity.
-   */
-  public function removeEntity($entity_id, $entity_type, $sections = []);
-
-  /**
-   * Checks that an entity belongs to a user section or its children.
-   *
-   * @param array $entity_sections
-   *   The section assignments for the entity. An array of section ids.
-   * @param array $user_sections
-   *   The section assignements for the user. An array of section ids.
-   *
-   * return boolean
-   */
-  public function checkTree($entity_sections, $user_sections);
-
-  /**
-   * Returns a flat array of all active section ids.
-   *
-   * Used to display assignments for admins.
-   *
-   * @param boolean $root_only
-   *   If TRUE, only show the root-level assignments.
-   *
-   * @return array
-   */
-  public function getAllSections($root_only = FALSE);
-
-  /**
-   * Determines if a user is assigned to all sections.
-   *
-   * This method checks the permissions and assignments for a user. Someone set
-   * as an admin or with access to the top-level sections is assumed to be able
-   * to access all sections. We use this logic in query filtering.
-   *
-   * @param $uid
-   *   An optional user id. If not provided, the active user is returned.
-   *
-   * @return boolean
-   */
-  public function userInAll($uid = NULL);
-
-  /**
-   * Removes all field settings.
-   *
-   * This method should be triggered when changing access schemes. If possible,
-   * let the administrator choose to run this.
-   */
-  public function flushFields();
-
-  /**
-   * Resets the internal cache of the tree.
-   *
-   * Right now, this is a per-request cache until we figure out a long-term
-   * caching strategy.
-   */
-  public function resetTree();
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/src/Plugin/AccessControlHierarchy/DerivedAccessControlHierarchy.php b/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/src/Plugin/AccessControlHierarchy/DerivedAccessControlHierarchy.php
deleted file mode 100644
index 141f083..0000000
--- a/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/src/Plugin/AccessControlHierarchy/DerivedAccessControlHierarchy.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access_test\Plugin\AccessControlHierarchy;
-
-use Drupal\workbench_access\AccessControlHierarchyBase;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-
-/**
- * Defines a hierarchy based on an entity hierarchy field.
- *
- * @AccessControlHierarchy(
- *   id = "workbench_access_test_derived",
- *   module = "workbench_access_test",
- *   deriver = "Drupal\workbench_access_test\Plugin\Derivative\DerivedAccessControlPlugins",
- *   label = @Translation("Derived plugins"),
- *   description = @Translation("Uses derivatives for plugins.")
- * )
- */
-class DerivedAccessControlHierarchy extends AccessControlHierarchyBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFields($entity_type, $bundle, $parents) {
-    return ['uid' => 'User'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterOptions($field, WorkbenchAccessManagerInterface $manager, array $user_sections = []) {
-    return $field;
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/src/Plugin/Derivative/DerivedAccessControlPlugins.php b/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/src/Plugin/Derivative/DerivedAccessControlPlugins.php
deleted file mode 100644
index df12a39..0000000
--- a/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/src/Plugin/Derivative/DerivedAccessControlPlugins.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\workbench_access_test\Plugin\Derivative;
-
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-
-/**
- * Defines a class for deriving plugins for test-sake.
- */
-class DerivedAccessControlPlugins extends DeriverBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDerivativeDefinitions($base_plugin_definition) {
-    $this->derivatives = [];
-    foreach (['foo', 'bar'] as $plugin_id) {
-      $this->derivatives[$plugin_id] = [
-        'label' => sprintf('Plugin for %s', $plugin_id),
-      ] + $base_plugin_definition;
-    }
-    return $this->derivatives;
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/workbench_access_test.info.yml b/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/workbench_access_test.info.yml
deleted file mode 100644
index b157261..0000000
--- a/modules/workbench_access-8.x-1.x/tests/modules/workbench_access_test/workbench_access_test.info.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: Workbench access test
-description: Test code for workbench access
-type: module
-core: 8.x
-hidden: true
-dependencies:
-  - workbench_access
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByRoleFormTest.php b/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByRoleFormTest.php
deleted file mode 100644
index 53c9892..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByRoleFormTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Drupal\Tests\workbench_access\Functional;
-
-use Drupal\taxonomy\Entity\Term;
-use Drupal\Tests\BrowserTestBase;
-use Drupal\workbench_access\RoleSectionStorageInterface;
-
-/**
- * Tests for the access by role form.
- *
- * @group workbench_access
- */
-class AccessByRoleFormTest extends BrowserTestBase {
-
-  use WorkbenchAccessTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'workbench_access',
-    'node',
-    'taxonomy',
-    'options',
-    'user',
-    'system',
-  ];
-
-  /**
-   * Tests that the correct users are displayed on the access by user form.
-   */
-  public function testAccessByRoleForm() {
-    $web_assert = $this->assertSession();
-    $page = $this->getSession()->getPage();
-
-    // Set up a content type, taxonomy field, and taxonomy scheme.
-    $node_type = $this->setUpContentType();
-    $vocab = $this->setUpVocabulary();
-    $this->setUpTaxonomyField($node_type, $vocab);
-    $this->setUpTaxonomyScheme($node_type, $vocab);
-
-    // Set up some roles and terms for this test.
-    // Create terms and roles.
-    $staff_term = Term::create([
-      'vid' => $vocab->id(),
-      'name' => 'Staff',
-    ]);
-    $staff_term->save();
-
-    $this->createRole([], 'non_staff', 'Non staff');
-    $this->createRole(['use workbench access'], 'staff', 'Staff');
-    $this->createRole(['use workbench access'], 'super_staff', 'Super staff');
-
-    $this->drupalLogin($this->setUpAdminUser());
-    $this->drupalGet(sprintf('/admin/config/workflow/workbench_access/sections/%s/roles', $staff_term->id()));
-
-    $editors = $page->findField('edit-editors');
-    $web_assert->fieldNotExists('Non staff', $editors);
-    $web_assert->fieldExists('Staff', $editors);
-    $web_assert->fieldExists('Super staff', $editors);
-
-    $page->checkField('Staff');
-    $page->pressButton('Submit');
-    $expected = [$staff_term->id() => 1];
-    $this->assertEquals($expected, \Drupal::state()->get(RoleSectionStorageInterface::WORKBENCH_ACCESS_ROLES_STATE_PREFIX . 'staff', []));
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByUserFormTest.php b/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByUserFormTest.php
deleted file mode 100644
index 62884f6..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Functional/AccessByUserFormTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Drupal\Tests\workbench_access\Functional;
-
-use Drupal\taxonomy\Entity\Term;
-use Drupal\Tests\BrowserTestBase;
-use Drupal\user\Entity\User;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-
-/**
- * Tests for the access by user form.
- *
- * @group workbench_access
- */
-class AccessByUserFormTest extends BrowserTestBase {
-
-  use WorkbenchAccessTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'workbench_access',
-    'node',
-    'taxonomy',
-    'options',
-    'user',
-    'system',
-  ];
-
-  /**
-   * Tests that the correct users are displayed on the access by user form.
-   */
-  public function testAccessByUserForm() {
-    $web_assert = $this->assertSession();
-    $page = $this->getSession()->getPage();
-
-    $node_type = $this->setUpContentType();
-    $vocab = $this->setUpVocabulary();
-    $this->setUpTaxonomyField($node_type, $vocab);
-    $this->setUpTaxonomyScheme($node_type, $vocab);
-
-    // Set up some roles and terms for this test.
-    $staff_term = Term::create([
-      'vid' => $vocab->id(),
-      'name' => 'Staff',
-    ]);
-    $staff_term->save();
-
-    $non_staff_rid = $this->createRole([], 'non_staff');
-    $staff_rid = $this->createRole(['use workbench access'], 'staff');
-
-    $user1 = $this->createUserWithRole($non_staff_rid);
-    $user2 = $this->createUserWithRole($staff_rid);
-    $user3 = $this->createUserWithRole($staff_rid);
-    $user4 = $this->createUserWithRole($staff_rid);
-
-    $this->drupalLogin($this->setUpAdminUser());
-    $this->drupalGet(sprintf('/admin/config/workflow/workbench_access/sections/%s/users', $staff_term->id()));
-
-    // Add a user from staff with autocomplete.
-    $page->fillField('edit-editors-add', $user2->label() . ' (' . $user2->id() . ')');
-    $page->pressButton('add');
-
-    // Check remove editors list.
-    $editors = $page->findField('editors_remove');
-    $web_assert->fieldNotExists('editors_remove[' . $user1->id() . ']', $editors);
-    $web_assert->fieldExists('editors_remove[' . $user2->id() . ']', $editors);
-
-    // Test remove the user.
-    $page->checkField('editors_remove[' . $user2->id() . ']');
-    $page->pressButton('remove');
-
-    // Check user has been removed to the section.
-    $editors = $page->findField('editors_remove');
-    $web_assert->fieldNotExists('editors_remove[' . $user2->id() . ']', $editors);
-
-    // Test adding users with the textarea, mixed username and uid.
-    $page->fillField('edit-editors-add-mass', $user3->label() . ', ' . $user4->id());
-    $page->pressButton('add');
-
-    $editors = $page->findField('editors_remove');
-    $web_assert->fieldExists('editors_remove[' . $user3->id() . ']', $editors);
-    $web_assert->fieldExists('editors_remove[' . $user4->id() . ']', $editors);
-
-    // Check user is not or removed to the section.
-    $user = User::load($user1->id());
-    $expected = [['value' => $staff_term->id()]];
-    $this->assertNotEquals($expected, $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue());
-
-    $user = User::load($user2->id());
-    $expected = [['value' => $staff_term->id()]];
-    $this->assertNotEquals($expected, $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue());
-
-    // Check user has been added to the section.
-    $user = User::load($user3->id());
-    $expected = [['value' => $staff_term->id()]];
-    $this->assertEquals($expected, $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue());
-
-    $user = User::load($user4->id());
-    $expected = [['value' => $staff_term->id()]];
-    $this->assertEquals($expected, $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->getValue());
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Functional/ConfigFormTest.php b/modules/workbench_access-8.x-1.x/tests/src/Functional/ConfigFormTest.php
deleted file mode 100644
index cc735d3..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Functional/ConfigFormTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Drupal\Tests\workbench_access\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Defines a class for testing the configuration form.
- *
- * @group workbench_access
- */
-class ConfigFormTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'workbench_access',
-    'menu_ui',
-    'taxonomy',
-    'system',
-    'user',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    // Login the admin user.
-    $this->drupalLogin($this->createUser([], NULL, TRUE));
-  }
-
-  /**
-   * Tests the config form.
-   */
-  public function testConfigFormSubmit() {
-    $assert = $this->assertSession();
-    $this->drupalGet('admin/config/workflow/workbench_access');
-    $assert->statusCodeEquals(200);
-    // Check the two schemes exist.
-    $page = $this->getSession()->getPage();
-    $menu_field = $page->find('css', 'input[name=scheme][value=menu]');
-    $this->assertNotNull($menu_field);
-    $this->assertNotNull($page->find('css', 'input[name=scheme][value=taxonomy]'));
-    $page->fillField('scheme', $menu_field->getAttribute('value'));
-    $this->submitForm([], 'Save configuration');
-    $assert->statusCodeEquals(200);
-    $scheme = $this->container->get('plugin.manager.workbench_access.scheme')->getActiveScheme();
-    $this->assertEquals('menu', $scheme->id());
-    // Set some parents
-    $page->checkField('menu[admin]');
-    $this->submitForm([], 'Save configuration');
-    $assert->checkboxChecked('menu[admin]');
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Functional/NodeFormTest.php b/modules/workbench_access-8.x-1.x/tests/src/Functional/NodeFormTest.php
deleted file mode 100644
index c3940ee..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Functional/NodeFormTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-namespace Drupal\Tests\workbench_access\Functional;
-
-use Drupal\taxonomy\Entity\Term;
-use Drupal\Tests\BrowserTestBase;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-
-/**
- * Tests for the node form.
- *
- * @group workbench_access
- */
-class NodeFormTest extends BrowserTestBase {
-
-  use WorkbenchAccessTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'workbench_access',
-    'node',
-    'taxonomy',
-    'options',
-    'user',
-    'system',
-  ];
-
-  /**
-   * Tests that the user can see all valid options on the node form.
-   */
-  public function testNodeForm() {
-    // Set up a content type, taxonomy field, and taxonomy scheme.
-    $node_type = $this->setUpContentType();
-    $vocab = $this->setUpVocabulary();
-    $this->setUpTaxonomyField($node_type, $vocab);
-    $this->setUpTaxonomyScheme($node_type, $vocab);
-    // Set up an editor and log in as them.
-    $editor = $this->setUpEditorUser();
-    $this->drupalLogin($editor);
-
-    // Set up some roles and terms for this test.
-    // Create terms and roles.
-    $staff_term = Term::create([
-      'vid' => $vocab->id(),
-      'name' => 'Staff',
-    ]);
-    $staff_term->save();
-    $super_staff_term = Term::create([
-      'vid' => $vocab->id(),
-      'name' => 'Super staff',
-    ]);
-    $super_staff_term->save();
-    $base_term = Term::create([
-      'vid' => $vocab->id(),
-      'name' => 'Editor',
-    ]);
-    $base_term->save();
-    $editor->{WORKBENCH_ACCESS_FIELD} = $base_term->id();
-    $editor->save();
-
-    $staff_rid = $this->createRole([], 'staff');
-    $super_staff_rid = $this->createRole([], 'super_staff');
-    // Set the role -> term mapping.
-    \Drupal::state()->set('workbench_access_roles_' . $staff_rid, [$staff_term->id() => 1]);
-    \Drupal::state()->set('workbench_access_roles_' . $super_staff_rid, [$super_staff_term->id() => 1]);
-
-    $web_assert = $this->assertSession();
-    $this->drupalGet('node/add/page');
-
-    // Assert we can't see the options yet.
-    $web_assert->optionNotExists(WorkbenchAccessManagerInterface::FIELD_NAME, $staff_term->getName());
-    $web_assert->optionNotExists(WorkbenchAccessManagerInterface::FIELD_NAME, $super_staff_term->getName());
-
-    // Add the staff role and check the option exists.
-    $editor->addRole($staff_rid);
-    $editor->save();
-    $this->drupalGet('node/add/page');
-    $web_assert->optionExists(WorkbenchAccessManagerInterface::FIELD_NAME, $staff_term->getName());
-
-    // Add the super staff role and check both options exist.
-    $editor->addRole($super_staff_rid);
-    $editor->save();
-    $this->drupalGet('node/add/page');
-    $web_assert->optionExists(WorkbenchAccessManagerInterface::FIELD_NAME, $staff_term->getName());
-    $web_assert->optionExists(WorkbenchAccessManagerInterface::FIELD_NAME, $super_staff_term->getName());
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Functional/WorkbenchAccessTestTrait.php b/modules/workbench_access-8.x-1.x/tests/src/Functional/WorkbenchAccessTestTrait.php
deleted file mode 100644
index 5161565..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Functional/WorkbenchAccessTestTrait.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-namespace Drupal\Tests\workbench_access\Functional;
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\node\Entity\NodeType;
-use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-
-/**
- * Contains helper classes for tests to set up various configuration.
- */
-trait WorkbenchAccessTestTrait {
-
-  /**
-   * Set up a content type with workbench access enabled.
-   *
-   * @return \Drupal\node\Entity\NodeType
-   *   The node type entity.
-   */
-  public function setUpContentType() {
-    $node_type = $this->createContentType(['type' => 'page']);
-    $node_type->setThirdPartySetting('workbench_access', 'workbench_access_status', 1);
-    $node_type->save();
-
-    return $node_type;
-  }
-
-  /**
-   * Create a test vocabulary.
-   *
-   * @return \Drupal\taxonomy\Entity\Vocabulary
-   *   The vocabulary entity.
-   */
-  public function setUpVocabulary() {
-    $vocab = Vocabulary::create(['vid' => 'workbench_access', 'name' => 'Access']);
-    $vocab->save();
-    return $vocab;
-  }
-
-  /**
-   * Sets up an access taxonomy field for a given vocab on a given node type.
-   *
-   * @param \Drupal\node\Entity\NodeType $node_type
-   *   The node type to create the field on.
-   * @param \Drupal\taxonomy\Entity\Vocabulary $vocab
-   *   The vocab to create the field against.
-   */
-  public function setUpTaxonomyField(NodeType $node_type, Vocabulary $vocab) {
-    // Create workbench access storage for node.
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => WorkbenchAccessManagerInterface::FIELD_NAME,
-      'entity_type' => 'node',
-      'type' => 'entity_reference',
-      'cardinality' => 1,
-      'settings' => [
-        'target_type' => 'taxonomy_term',
-      ],
-    ]);
-    $field_storage->save();
-    // Create an instance of the access field on the content type.
-    FieldConfig::create([
-      'field_storage' => $field_storage,
-      'bundle' => $node_type->id(),
-      'settings' => [
-        'handler' => 'workbench_access:taxonomy_term',
-        'handler_settings' => [
-          'target_bundles' => [
-            $vocab->id() => $vocab->id(),
-          ],
-        ],
-      ],
-    ])->save();
-    // Set the field to display as a dropdown on the form.
-    $form_display = EntityFormDisplay::load('node.' . $node_type->id() . '.default');
-    $form_display->setComponent(WorkbenchAccessManagerInterface::FIELD_NAME, ['type' => 'options_select']);
-    $form_display->save();
-  }
-
-  /**
-   * Sets up a user with an editor role that has access to content.
-   *
-   * @return \Drupal\user\Entity\User
-   *   The user entity.
-   */
-  public function setUpEditorUser() {
-    $editor_rid = $this->createRole([
-      'access administration pages',
-      'create page content',
-      'edit any page content',
-      'delete any page content',
-    ], 'editor');
-
-    return $this->createUserWithRole($editor_rid);
-  }
-
-  /**
-   * Sets up a user with an editor role that has access to content.
-   *
-   * @return \Drupal\user\Entity\User
-   *   The user entity.
-   */
-  protected function setUpAdminUser() {
-    $admin_rid = $this->createRole([
-      'access administration pages',
-      'assign workbench access',
-    ], 'admin');
-
-    return $this->createUserWithRole($admin_rid);
-  }
-
-  /**
-   * Sets up a user with a given role and saves it.
-   *
-   * @param string $rid
-   *    The role id.
-   *
-   * @return \Drupal\user\Entity\User
-   *   The user entity.
-   */
-  protected function createUserWithRole($rid) {
-    $user = $this->createUser();
-    $user->addRole($rid);
-    $user->save();
-    return $user;
-  }
-
-  /**
-   * Sets up a taxonomy scheme for a given node type.
-   *
-   * @param \Drupal\taxonomy\Entity\Vocabulary $vocab
-   *   The vocab to use for the scheme.
-   */
-  public function setUpTaxonomyScheme(NodeType $node_type, Vocabulary $vocab) {
-    $config = \Drupal::configFactory()->getEditable('workbench_access.settings');
-    $config->set('scheme', 'taxonomy');
-    $config->set('parents', [$vocab->id() => $vocab->id()]);
-    $fields['node'][$node_type->id()] = WorkbenchAccessManagerInterface::FIELD_NAME;
-    $config->set('fields', $fields);
-    $config->save();
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Kernel/NodeAccessTest.php b/modules/workbench_access-8.x-1.x/tests/src/Kernel/NodeAccessTest.php
deleted file mode 100644
index 0f3936f..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Kernel/NodeAccessTest.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-namespace Drupal\Tests\workbench_access\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\simpletest\ContentTypeCreationTrait;
-use Drupal\simpletest\NodeCreationTrait;
-use Drupal\simpletest\UserCreationTrait;
-use Drupal\taxonomy\Entity\Term;
-use Drupal\Tests\workbench_access\Functional\WorkbenchAccessTestTrait;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-
-/**
- * Tests workbench_access integration with node access APIs.
- *
- * @group workbench_access
- */
-class NodeAccessTest extends KernelTestBase {
-
-  use WorkbenchAccessTestTrait;
-  use NodeCreationTrait;
-  use ContentTypeCreationTrait;
-  use UserCreationTrait;
-
-  /**
-   * Access vocabulary.
-   *
-   * @var \Drupal\taxonomy\VocabularyInterface
-   */
-  protected $vocabulary;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'node',
-    'text',
-    'system',
-    'user',
-    'workbench_access',
-    'field',
-    'filter',
-    'taxonomy',
-    'options',
-  ];
-
-  /**
-   * Access handler.
-   *
-   * @var \Drupal\Core\Entity\EntityAccessControlHandlerInterface
-   */
-  protected $accessHandler;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('node');
-    $this->installConfig(['filter', 'node', 'workbench_access']);
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('taxonomy_term');
-    $this->installSchema('system', ['key_value', 'sequences']);
-    module_load_install('workbench_access');
-    workbench_access_install();
-    $node_type = $this->setUpContentType();
-    $this->vocabulary = $this->setUpVocabulary();
-    $this->accessHandler = $this->container->get('entity_type.manager')
-      ->getAccessControlHandler('node');
-    $this->setUpTaxonomyField($node_type, $this->vocabulary);
-    $this->setUpTaxonomyScheme($node_type, $this->vocabulary);
-  }
-
-  /**
-   * Test create access integration.
-   */
-  public function testCreateAccess() {
-    // The first user in a kernel test gets UID 1, so we need to make sure we're
-    // not testing with that user.
-    $this->createUser();
-    // Create a section.
-    $term = Term::create([
-      'vid' => $this->vocabulary->id(),
-      'name' => 'Some section',
-    ]);
-    $term->save();
-    // Create two users with equal permissions but assign one of them to the
-    // section.
-    $permissions = [
-      'create page content',
-      'edit any page content',
-      'access content',
-      'delete any page content',
-      'administer nodes',
-    ];
-    $allowed_editor = $this->createUser($permissions);
-    $allowed_editor->{WorkbenchAccessManagerInterface::FIELD_NAME} = $term->id();
-    $allowed_editor->save();
-    $editor_with_no_access = $this->createUser($permissions);
-    $permissions[] = 'bypass workbench access';
-    $editor_with_bypass_access = $this->createUser($permissions);
-
-    $this->assertTrue($this->accessHandler->createAccess('page', $allowed_editor));
-    $this->assertFalse($this->accessHandler->createAccess('page', $editor_with_no_access));
-    $this->assertTrue($this->accessHandler->createAccess('page', $editor_with_bypass_access));
-  }
-
-  /**
-   * Test edit access integration.
-   */
-  public function testEditAccess() {
-    // The first user in a kernel test gets UID 1, so we need to make sure we're
-    // not testing with that user.
-    $this->createUser();
-    // Create a section.
-    $term = Term::create([
-      'vid' => $this->vocabulary->id(),
-      'name' => 'Some section',
-    ]);
-    $term->save();
-    // Create two users with equal permissions but assign one of them to the
-    // section.
-    $permissions = [
-      'create page content',
-      'edit any page content',
-      'access content',
-      'delete any page content',
-    ];
-    $allowed_editor = $this->createUser($permissions);
-    $allowed_editor->{WorkbenchAccessManagerInterface::FIELD_NAME} = $term->id();
-    $allowed_editor->save();
-    $editor_with_no_access = $this->createUser($permissions);
-
-    // Test a node that is not assigned to a section. Both should be allowed because we
-    // do not assert access control by default.
-    $node1 = $this->createNode(['type' => 'page', 'title' => 'foo']);
-    $this->assertTrue($this->accessHandler->access($node1, 'update', $allowed_editor));
-    $this->assertTrue($this->accessHandler->access($node1, 'update', $editor_with_no_access));
-
-    // Create a node that is assigned to a section.
-    $node2 = $this->createNode(['type' => 'page', 'title' => 'bar', WorkbenchAccessManagerInterface::FIELD_NAME => $term->id()]);
-    $this->assertTrue($this->accessHandler->access($node2, 'update', $allowed_editor));
-    $this->assertFalse($this->accessHandler->access($node2, 'update', $editor_with_no_access));
-
-    // With strict checking, nodes that are not assigned to a section return false.
-    $this->config('workbench_access.settings')
-      ->set('deny_on_empty', 1)
-      ->save();
-
-    // Test a new node because the results for $node1 are cached.
-    $node3 = $this->createNode(['type' => 'page', 'title' => 'baz']);
-    $this->assertFalse($this->accessHandler->access($node3, 'update', $allowed_editor));
-    $this->assertFalse($this->accessHandler->access($node3, 'update', $editor_with_no_access));
-
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Kernel/SectionCacheTest.php b/modules/workbench_access-8.x-1.x/tests/src/Kernel/SectionCacheTest.php
deleted file mode 100644
index b61909a..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Kernel/SectionCacheTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-namespace Drupal\Tests\workbench_access\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\simpletest\UserCreationTrait;
-use Drupal\taxonomy\Entity\Term;
-use Drupal\Tests\workbench_access\Functional\WorkbenchAccessTestTrait;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-
-/**
- * Tests the internal caching of section data.
- *
- * @group workbench_access
- */
-class SectionCacheTest extends KernelTestBase {
-
-  use WorkbenchAccessTestTrait;
-  use UserCreationTrait;
-
-  /**
-   * Access vocabulary.
-   *
-   * @var \Drupal\taxonomy\VocabularyInterface
-   */
-  protected $vocabulary;
-
-  /**
-   * User storage handler
-   *
-   * @var \Drupal\workbench_access\UserSectionStorageInterface
-   */
-  protected $userSectionStorage;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'system',
-    'user',
-    'workbench_access',
-    'field',
-    'taxonomy',
-    'options',
-    'text',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['workbench_access']);
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('taxonomy_term');
-    $this->installSchema('system', ['key_value', 'sequences']);
-    module_load_install('workbench_access');
-    workbench_access_install();
-    $this->vocabulary = $this->setUpVocabulary();
-    // The user section storage service.
-    $this->userSectionStorage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
-  }
-
-  /**
-   * Test create access integration.
-   */
-  public function testSectionCache() {
-    // The first user in a kernel test gets UID 1, so we need to make sure we're
-    // not testing with that user.
-    $this->createUser();
-    // Create a section.
-    $term = Term::create([
-      'vid' => $this->vocabulary->id(),
-      'name' => 'Some section',
-    ]);
-    $term->save();
-    // Create one user and assign to the section.
-    $permissions = [
-      'use workbench access'
-    ];
-    $editor = $this->createUser($permissions);
-    $editor->{WorkbenchAccessManagerInterface::FIELD_NAME} = $term->id();
-    $editor->save();
-
-    // Now fetch the sections for this user. Count should be 1.
-    $sections = $this->userSectionStorage->getUserSections($editor->id());
-    $this->assertTrue(count($sections) == 1);
-
-    // Create a new section.
-    $term2 = Term::create([
-      'vid' => $this->vocabulary->id(),
-      'name' => 'Some new section',
-    ]);
-    $term2->save();
-
-    // Add to the user.
-    $this->userSectionStorage->addUser($editor->id(), [$term2->id()]);
-
-    // Now fetch the sections for this user. Count should be 2.
-    $sections = $this->userSectionStorage->getUserSections($editor->id());
-    $this->assertTrue(count($sections) == 2);
-
-    // Now remove and test again.
-    $this->userSectionStorage->removeUser($editor->id(), [$term2->id()]);
-    $sections = $this->userSectionStorage->getUserSections($editor->id());
-    $this->assertTrue(count($sections) == 1);
-
-  }
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Kernel/WorkbenchAccessDerivativeDiscoveryTest.php b/modules/workbench_access-8.x-1.x/tests/src/Kernel/WorkbenchAccessDerivativeDiscoveryTest.php
deleted file mode 100644
index a05fba5..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Kernel/WorkbenchAccessDerivativeDiscoveryTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Drupal\Tests\workbench_access\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests plugin discovery respects derivative discovery.
- *
- * @group workbench_access
- */
-class WorkbenchAccessDerivativeDiscoveryTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'workbench_access',
-    'workbench_access_test',
-    'entity_test',
-    'system',
-    'user',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('entity_test');
-  }
-
-  /**
-   * Tests that derivative plugins work.
-   */
-  public function testDerivativeDiscovery() {
-    $manager = $this->container->get('plugin.manager.workbench_access.scheme');
-    foreach ($manager->getSchemes() as $id => $name) {
-      $this->assertNotNull($manager->createInstance($id));
-    }
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/tests/src/Unit/UserSectionStorageUnitTest.php b/modules/workbench_access-8.x-1.x/tests/src/Unit/UserSectionStorageUnitTest.php
deleted file mode 100644
index 08ea073..0000000
--- a/modules/workbench_access-8.x-1.x/tests/src/Unit/UserSectionStorageUnitTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Drupal\Tests\workbench_access\Unit;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\State\StateInterface;
-use Drupal\Tests\UnitTestCase;
-use Drupal\user\UserInterface;
-use Drupal\user\UserStorageInterface;
-use Drupal\workbench_access\RoleSectionStorageInterface;
-use Drupal\workbench_access\UserSectionStorage;
-use Drupal\workbench_access\WorkbenchAccessManager;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-
-/**
- * Unit tests for user section storage service.
- *
- * @group workbench_access
- *
- * @coversDefaultClass \Drupal\workbench_access\UserSectionStorage
- */
-class UserSectionStorageUnitTest extends UnitTestCase {
-
-  /**
-   * Tests that ::getUserSections is statically cached.
-   *
-   * @covers ::getUserSections
-   */
-  public function testGetUserSectionsShouldBeStaticallyCached() {
-    $field_items = $this->prophesize(FieldItemListInterface::class);
-    $field_items->getValue()->willReturn([
-      ['value' => 123],
-      ['value' => 456],
-    ])->shouldBeCalledTimes(1);
-    $user = $this->prophesize(UserInterface::class);
-    $user->get(WorkbenchAccessManagerInterface::FIELD_NAME)->willReturn($field_items->reveal());
-    $testUserId = 37;
-    $user_storage = $this->prophesize(UserStorageInterface::class);
-    // We shouldn't hit this code more than once if the static cache works.
-    $user_storage->load($testUserId)->willReturn($user->reveal())->shouldBeCalledTimes(1);
-    $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
-    $entity_type_manager->getStorage('user')->willReturn($user_storage->reveal());
-    $role_section_storage = $this->prophesize(RoleSectionStorageInterface::class);
-    $role_section_storage->getRoleSections($user->reveal())->willReturn([]);
-    $user_section_storage = new UserSectionStorage($entity_type_manager->reveal(), $user->reveal(), $role_section_storage->reveal());
-    // First time, prime the cache.
-    $user_section_storage->getUserSections($testUserId);
-    // Second time, just return the result.
-    $user_section_storage->getUserSections($testUserId);
-  }
-
-}
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.drush.inc b/modules/workbench_access-8.x-1.x/workbench_access.drush.inc
deleted file mode 100644
index 73d8036..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.drush.inc
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-/**
- * @file
- * Drush commands for Workbench Access.
- */
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-
-/**
- * Implements hook_drush_command().
- */
-function workbench_access_drush_command() {
-  $items = array();
-
-  $items['workbench-access-test'] = array(
-    'description' => 'Install test configuration of Workbench Access.',
-    'aliases' => array('wa-test'),
-  );
-  $items['workbench-access-flush'] = array(
-    'description' => 'Flush section assignments for users and roles.',
-    'aliases' => array('wa-flush'),
-  );
-
-  return $items;
-}
-
-/**
- * Implement hook_drush_help().
- */
-function workbench_access_drush_help($section) {
-  $items = workbench_access_drush_command();
-  $name = str_replace('workbench access:', '', $section);
-  if (isset($items[$name])) {
-    return dt($items[$name]['description']);
-  }
-}
-
-/**
- * Installs the test configuration.
- */
-function drush_workbench_access_test() {
-  try {
-    // Create a vocabulary.
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
-      'name' => 'Workbench Access',
-      'description' => 'Test taxonomy for Workbench Access',
-      'vid' => 'workbench_access',
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      'weight' => 100,
-    ));
-    $vocabulary->save();
-    // Create some terms.
-    $terms = array(
-     'Alumni',
-     'Faculty',
-     'Staff',
-     'Students',
-    );
-    $children = array(
-     'Directory',
-     'Information',
-    );
-
-    $filter_formats = filter_formats();
-    $format = array_pop($filter_formats);
-    foreach ($terms as $name) {
-      $term = entity_create('taxonomy_term', array(
-        'name' => $name,
-        'description' => array(),
-        'vid' => $vocabulary->id(),
-        'parent' => 0,
-        'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      ));
-      $term->save();
-      foreach ($children as $child) {
-        $child = entity_create('taxonomy_term', array(
-          'name' => "$name $child",
-          'description' => array(),
-          'vid' => $vocabulary->id(),
-          'parent' => $term->id(),
-          'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-        ));
-        $child->save();
-      }
-    }
-  }
-  catch (Exception $e) {
-    drush_print('The test vocabulary has already been created.');
-  }
-  try {
-    workbench_access_confirm_fields('user', 'user');
-    $node_types = \Drupal::entityTypeManager()->getStorage('node_type')->loadMultiple();
-    _workbench_access_create_node_storage();
-    foreach ($node_types as $id => $type) {
-      if ($id != 'page') {
-        workbench_access_confirm_fields('node', $id);
-        $type->setThirdPartySetting('workbench_access', 'workbench_access_status', 1);
-        $type->save();
-        $fields['node'][$id] = WorkbenchAccessManagerInterface::FIELD_NAME;
-        _workbench_access_form_display('node', $id);
-      }
-    }
-    if (isset($fields)) {
-      $config = \Drupal::configFactory()->getEditable('workbench_access.settings');
-      $config->set('scheme', 'taxonomy');
-      $config->set('parents', ['workbench_access' => 'workbench_access']);
-      $config->set('fields', $fields);
-      $config->save();
-    }
-  }
-  catch (Exception $e) {
-    drush_print('Field creation failed.');
-  }
-}
-
-/**
- * Flushes assigned user permissions.
- */
-function drush_workbench_access_flush() {
-  $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
-  $user_section_storage = \Drupal::getContainer()->get('workbench_access.user_section_storage');
-  $role_section_storage = \Drupal::getContainer()->get('workbench_access.role_section_storage');
-  $role_section_storage->flushRoles();
-  $user_section_storage->flushUsers();
-  $manager->flushFields();
-  drush_print('User and role assignments cleared. Field assigments reset.');
-}
-
-/**
- * Creates a node storage field for testing.
- */
-function _workbench_access_create_node_storage() {
-  try {
-    $field_storage_values = [
-      'field_name' => WorkbenchAccessManagerInterface::FIELD_NAME,
-      'entity_type' => 'node',
-      'type' => 'entity_reference',
-      'translatable' => TRUE,
-      'settings' => ['target_type' => 'taxonomy_term'],
-      'cardinality' => 1,
-      'dependencies' => ['module' => ['node', 'taxonomy', 'workbench_access']],
-    ];
-    $manager = \Drupal::entityTypeManager();
-    $manager->getStorage('field_storage_config')->create($field_storage_values)->save();
-  }
-  catch (Exception $e) {
-    drush_print('Field storage creation failed.');
-  }
-
-}
-
-function _workbench_access_form_display($entity_type, $bundle) {
-  // Tell the form system how to behave. Default to radio buttons.
-  // @TODO: This function is deprecated, but using the OO syntax is causing
-  // test fails.
-  entity_get_form_display($entity_type, $bundle, 'default')
-    ->setComponent(WorkbenchAccessManagerInterface::FIELD_NAME, array(
-      'type' => 'options_select',
-      'weight' => 0,
-    ))
-    ->save();
-
-}
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.info.yml b/modules/workbench_access-8.x-1.x/workbench_access.info.yml
deleted file mode 100644
index c1d207f..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.info.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Workbench Access
-type: module
-description: Hierarchical access control module.
-core: 8.x
-configure: workbench_access.admin
-package: Workbench
-
-dependencies:
-  - node
-  - taxonomy
-  - options
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.install b/modules/workbench_access-8.x-1.x/workbench_access.install
deleted file mode 100644
index ba848ab..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.install
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, update and uninstall functions for the Workbench Access module.
- */
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-
-/**
- * Implements hook_install().
- *
- * Installs the default on users.
- * @TODO: Can we do this via schema?
- */
-function workbench_access_install() {
-  // Assign domain access to bundles.
-  $list['user'] = 'user';
-  foreach ($list as $bundle => $entity_type) {
-    workbench_access_confirm_fields($entity_type, $bundle);
-  }
-}
-
-/**
- * Implements hook_uninstall().
- *
- * Removes access control fields on uninstall.
- */
-function workbench_access_uninstall() {
-  foreach (array('user') as $type) {
-    $id = $type . '.' . WorkbenchAccessManagerInterface::FIELD_NAME;
-    if ($field = \Drupal::entityManager()->getStorage('field_storage_config')->load($id)) {
-      $field->delete();
-    }
-  }
-}
-
-/**
- * Add the setting to deny access to unassigned content.
- */
-function workbench_access_update_8001() {
-  $config_factory = \Drupal::configFactory();
-  $config = $config_factory->getEditable('workbench_access.settings');
-  $config->set('deny_on_empty', 0);
-  $config->save(TRUE);
-}
-
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.libraries.yml b/modules/workbench_access-8.x-1.x/workbench_access.libraries.yml
deleted file mode 100644
index 3aa9661..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.libraries.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-admin:
-  version: VERSION
-  js:
-    js/workbench_access.js: {}
-  dependencies:
-    - core/jquery
-    - core/drupal
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.links.menu.yml b/modules/workbench_access-8.x-1.x/workbench_access.links.menu.yml
deleted file mode 100644
index 62b1805..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.links.menu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-workbench_access.settings:
-  title: 'Workbench Access'
-  description: 'Configure settings for Workbench Access.'
-  parent: system.admin_config_workflow
-  route_name: workbench_access.admin
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.links.task.yml b/modules/workbench_access-8.x-1.x/workbench_access.links.task.yml
deleted file mode 100644
index 440500a..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.links.task.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-workbench_access.admin:
-  title: 'Settings'
-  route_name: workbench_access.admin
-  base_route: workbench_access.admin
-
-workbench_access.sections:
-  title: 'Sections'
-  route_name: workbench_access.sections
-  base_route: workbench_access.admin
-  weight: 10
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.module b/modules/workbench_access-8.x-1.x/workbench_access.module
deleted file mode 100644
index 6367e6f..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.module
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains workbench_access.module.
- */
-
-use Drupal\node\NodeTypeInterface;
-use Drupal\node\NodeInterface;
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\workbench_access\WorkbenchAccessManagerInterface;
-
-/**
- * Defines the name of the node access control field.
- *
- * @deprecated to be removed before 8.x.1.0 - use
- *   \Drupal\workbench_access\WorkbenchAccessManagerInterface::FIELD_NAME
- *   instead.
- */
-define('WORKBENCH_ACCESS_FIELD', 'field_workbench_access');
-
-/**
- * Implements hook_help().
- */
-function workbench_access_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    // Main module help for the workbench_access module.
-    case 'help.page.workbench_access':
-      $output = '';
-      $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('Hierarchical access control module.') . '</p>';
-      return $output;
-
-    default:
-  }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * Restricts selection options for the node form.
- */
-function workbench_access_form_node_form_alter(&$form, FormStateInterface $form_state) {
-  $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
-  if ($scheme = $manager->getActiveScheme()) {
-    $node = $form_state->getFormObject()->getEntity();
-
-    // If no access field is set, we do nothing.
-    $field = $scheme->fields('node', $node->bundle());
-    if (empty($field)) {
-      return;
-    }
-    // Load field data that can be edited.
-    $account = \Drupal::currentUser();
-    // If the user cannot access the form element or is a superuser, ignore.
-    if (!empty($form[$field]['#access']) && !$account->hasPermission('bypass workbench access')) {
-      $form[$field] = $scheme->alterOptions($form[$field], $manager, \Drupal::service('workbench_access.user_section_storage')->getUserSections($account->id()));
-      // Add the options hidden from the user silently to the form.
-      $options_diff = $scheme->disallowedOptions($form[$field]);
-      if (!empty($options_diff)) {
-        // @TODO: Potentially show this information to users with permission.
-        $form['workbench_access_disallowed'] = workbench_access_hidden_field($options_diff, $scheme);
-        // Call our submitEntity() method to merge in values.
-        // @todo Add tests for this.
-        $class = '\\' . get_class($scheme) . '::submitEntity';
-        // Account for all the submit buttons on the node form.
-        $buttons = ['submit', 'publish', 'unpublish'];
-        foreach ($buttons as $button) {
-          if (isset($form['actions'][$button]['#submit'])) {
-            array_unshift($form['actions'][$button]['#submit'], $class);
-          }
-        }
-      }
-    }
-  }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * Adds Workbench Access options to the node type form.
- *
- * @see NodeTypeForm::form().
- * @see menu_ui_form_node_type_form_builder().
- */
-function workbench_access_form_node_type_form_alter(&$form, FormStateInterface $form_state) {
-  // Add a checkbox to registration form about agreeing to terms of use.
-  $type = $form_state->getFormObject()->getEntity();
-  $form['workflow']['workbench_access_status'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Enable Workbench Access control for @type content.', array('@type' => $type->label())),
-    '#description' => t('If selected, all @type content will be subject to editorial access restrictions.', array('@type' => $type->label())),
-    '#default_value' => $type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0),
-    '#access' => \Drupal::currentUser()->hasPermission('administer workbench access'),
-  );
-  $form['#entity_builders'][] = 'workbench_access_form_node_type_form_builder';
- }
-
-/**
- * Entity builder for the node type form with Workbench Access options.
- *
- * @see workbench_access_form_node_type_form_alter().
- */
-function workbench_access_form_node_type_form_builder($entity_type, NodeTypeInterface $type, &$form, FormStateInterface $form_state) {
-  $type->setThirdPartySetting('workbench_access', 'workbench_access_status', $form_state->getValue('workbench_access_status'));
-}
-
-/**
- * Creates our fields for an entity bundle.
- *
- * @param $entity_type
- *   The entity type being created. Users are supported.
- * @param $bundle
- *   The bundle being created.
- */
-function workbench_access_confirm_fields($entity_type, $bundle) {
-  // We have reports that importing config causes this function to fail.
-  try {
-    $text = [
-      'user' => [
-        'type' => 'user',
-        'label' => 'Sections', // @TODO tie to config
-        'description' => 'Assign the editorial sections that this user belongs to.',
-      ],
-      'node' => [
-        'type' => $bundle,
-        'label' => 'Sections', // @TODO tie to config
-        'description' => 'The editorial section for this content.',
-      ]
-    ];
-    $id = $entity_type . '.' . $bundle . '.' . WorkbenchAccessManagerInterface::FIELD_NAME;
-
-    if (!$field = \Drupal::entityManager()->getStorage('field_config')->load($id)) {
-      $field = array(
-        'field_name' => WorkbenchAccessManagerInterface::FIELD_NAME,
-        'entity_type' => $entity_type,
-        'label' => $text[$entity_type]['label'],
-        'bundle' => $bundle,
-        'required' => FALSE,
-        'description' => $text[$entity_type]['description'],
-        'default_value_callback' => 'Drupal\workbench_access\WorkbenchAccessManager::getDefaultValue',
-      );
-      if ($entity_type == 'node') {
-        $field['settings']['handler_settings']['target_bundles'] = ['workbench_access' => 'workbench_access'];
-        $field['settings']['handler_settings']['auto_create'] = FALSE;
-        $field['settings']['handler_settings']['sort'] = ['field' => '_none'];
-      }
-      $field_config = \Drupal::entityManager()->getStorage('field_config')->create($field);
-      $field_config->save();
-    }
-    // Installing without setting form display leaves the field hidden, which is
-    // what we want right now. @TODO: UI for user form.
-  }
-  catch (Exception $e) {
-    \Drupal::logger('workbench_access')->notice('Field installation failed.');
-  }
-}
-
-/**
- * Implements hook_node_access().
- */
-function workbench_access_node_access(NodeInterface $node, $op, AccountInterface $account) {
-  // Check that our access control is configured.
-  $manager = \Drupal::service('plugin.manager.workbench_access.scheme');
-  if ($scheme = $manager->getActiveScheme()) {
-    return $scheme->checkEntityAccess($node, $op, $account, $manager);
-  }
-  return AccessResult::neutral();
-}
-
-/**
- * Implements hook_node_create_access().
- *
- * @link https://www.drupal.org/node/2348203
- */
-function workbench_access_node_create_access(AccountInterface $account, $context, $entity_bundle) {
-  $return = AccessResult::neutral();
-  // User can bypass.
-  if ($account->hasPermission('bypass workbench access')) {
-    return $return;
-  }
-
-  // Check that our access control is configured.
-  $manager = \Drupal::service('plugin.manager.workbench_access.scheme');
-  if (!$manager->getActiveScheme()) {
-    return $return;
-  }
-
-  // Check that access control applies to this content type.
-  $type = \Drupal::entityTypeManager()->getStorage('node_type')->load($entity_bundle);
-  if (!$type->getThirdPartySetting('workbench_access', 'workbench_access_status', 0)) {
-    return $return;
-  }
-
-  // Check that the user is able to assign content to a section.
-  $user_section_storage = \Drupal::service('workbench_access.user_section_storage');
-  if (!$user_section_storage->getUserSections($account->id())) {
-    return AccessResult::forbidden();
-  }
-  return $return;
-}
-
-/**
- * Implements hook_views_data_alter().
- */
-function workbench_access_views_data_alter(array &$data) {
-  $manager = \Drupal::getContainer()->get('plugin.manager.workbench_access.scheme');
-  if ($scheme = $manager->getActiveScheme()) {
-    $data['node']['workbench_access_section'] = array(
-      'title' => t('Workbench Section'),
-      'help' => t('The sections to which this content belongs.'),
-      'field' => array(
-        'id' => 'workbench_access_section',
-      ),
-      'filter' => array(
-        'field' => 'nid',
-        'id' => 'workbench_access_section',
-      ),
-    );
-    $data['users']['workbench_access_section'] = array(
-      'title' => t('Workbench Section'),
-      'help' => t('The sections to which this user belongs.'),
-      'field' => array(
-        'id' => 'workbench_access_user_section',
-      ),
-      'filter' => array(
-        'field' => 'uid',
-        'id' => 'workbench_access_section',
-      ),
-    );
-  }
-}
-
-/**
- * Adds a hidden field that stored access information that cannot be edited.
- *
- * @param array $options_diff
- *   An array of section ids that cannot be edited by the current user.
- * @param Drupal\workbench_access\Annotation\AccessControlHierarchy $scheme
- *   The active access control scheme.
- *
- * @return array
- *   A form element.
- */
-function workbench_access_hidden_field($options_diff, $scheme) {
-  $element = array(
-    '#type' => 'value',
-    '#value' => $options_diff,
-  );
-  return $element;
-}
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.permissions.yml b/modules/workbench_access-8.x-1.x/workbench_access.permissions.yml
deleted file mode 100644
index e1d81dc..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.permissions.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-administer workbench access:
-  description: 'Administer access control settings for Workbench Access.'
-  title: 'Administer Workbench Access configuration'
-  restrict access: TRUE
-
-assign workbench access:
-  description: 'Assign users and roles to edit content in specific editorial sections.'
-  title: 'Assign users to Workbench Access sections'
-  restrict access: FALSE
-
-batch update workbench access:
-  description: 'Perform batch section assignments from the content overview page.'
-  title: 'Batch update section assignments for content'
-  restrict access: FALSE
-
-bypass workbench access:
-  description: 'Automatically grant access to all access sections.'
-  title: 'Bypass Workbench Access permissions'
-  restrict access: TRUE
-
-use workbench access:
-  description: 'Lets users be assigned to editorial sections.'
-  title: 'Allow all members of this role to be assigned to Workbench Access sections'
-  restrict access: FALSE
-
-view workbench access information:
-  description: 'View the editorial access status of each content page.'
-  title: 'View Workbench Access information'
-  restrict access: FALSE
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.routing.yml b/modules/workbench_access-8.x-1.x/workbench_access.routing.yml
deleted file mode 100644
index 84aaade..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.routing.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-workbench_access.admin:
-  path: '/admin/config/workflow/workbench_access'
-  defaults:
-    _form: 'Drupal\workbench_access\Form\WorkbenchAccessConfigForm'
-    _title: 'Workbench Access'
-  requirements:
-    _permission: 'administer workbench access'
-
-workbench_access.sections:
-  path: '/admin/config/workflow/workbench_access/sections'
-  defaults:
-    _controller: 'Drupal\workbench_access\Controller\WorkbenchAccessSections::page'
-    _title: 'Sections'
-  requirements:
-    _permission: 'assign workbench access'
-
-workbench_access.by_role:
-  path: '/admin/config/workflow/workbench_access/sections/{id}/roles'
-  defaults:
-    _form: 'Drupal\workbench_access\Form\WorkbenchAccessByRoleForm'
-    _title_callback: 'Drupal\workbench_access\Form\WorkbenchAccessByRoleForm::pageTitle'
-  requirements:
-    _permission: 'assign workbench access'
-
-workbench_access.by_user:
-  path: '/admin/config/workflow/workbench_access/sections/{id}/users'
-  defaults:
-    _form: 'Drupal\workbench_access\Form\WorkbenchAccessByUserForm'
-    _title_callback: 'Drupal\workbench_access\Form\WorkbenchAccessByUserForm::pageTitle'
-  requirements:
-    _permission: 'assign workbench access'
diff --git a/modules/workbench_access-8.x-1.x/workbench_access.services.yml b/modules/workbench_access-8.x-1.x/workbench_access.services.yml
deleted file mode 100644
index 4f911fe..0000000
--- a/modules/workbench_access-8.x-1.x/workbench_access.services.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-services:
-  plugin.manager.workbench_access.scheme:
-    class: Drupal\workbench_access\WorkbenchAccessManager
-    arguments: ['@container.namespaces', '@cache.discovery', '@module_handler', '@entity_type.manager', '@workbench_access.user_section_storage', '@workbench_access.role_section_storage', '@config.factory', '@current_user']
-  workbench_access.user_section_storage:
-    class: Drupal\workbench_access\UserSectionStorage
-    arguments: ['@entity_type.manager', '@current_user', '@workbench_access.role_section_storage']
-  workbench_access.role_section_storage:
-    class: Drupal\workbench_access\RoleSectionStorage
-    arguments: ['@state', '@entity_type.manager']
diff --git a/modules/workflow/CHANGELOG.txt b/modules/workflow/CHANGELOG.txt
deleted file mode 100644
index 97a4423..0000000
--- a/modules/workflow/CHANGELOG.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Changes since 8.x-1.x
-Issue #2351299 by johnv: Porting D7-version to D8 - numerous commits.
-
-Issue #2585093 by johnv: Fixed lost error message on Workflow UI - Transitions page.
-Issue #2587165 by johnv: Port Workflow to D8: dropped features, clone support.
-Issue #297898: Move "Workflow tab permissions" to permissions page'
-Issue #2587171: Make permission "schedule workflow transition" specific per Workflow type
\ No newline at end of file
diff --git a/modules/workflow/LICENSE.txt b/modules/workflow/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/modules/workflow/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/modules/workflow/config/install/workflow.settings.yml b/modules/workflow/config/install/workflow.settings.yml
deleted file mode 100644
index 815b395..0000000
--- a/modules/workflow/config/install/workflow.settings.yml
+++ /dev/null
@@ -1 +0,0 @@
-workflow_states_per_page: 20
diff --git a/modules/workflow/config/optional/block.block.workflowtransitionform.yml b/modules/workflow/config/optional/block.block.workflowtransitionform.yml
deleted file mode 100644
index 1fb0302..0000000
--- a/modules/workflow/config/optional/block.block.workflowtransitionform.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - workflow
-  theme:
-    - bartik
-id: workflowtransitionform
-theme: bartik
-region: sidebar_second
-weight: -7
-provider: null
-plugin: workflow_transition_form_block
-settings:
-  id: workflow_transition_form_block
-  label: 'Workflow Transition form'
-  provider: workflow
-  label_display: visible
-visibility: {  }
diff --git a/modules/workflow/config/optional/system.action.change_a_node_to_next_workflow_state.yml b/modules/workflow/config/optional/system.action.change_a_node_to_next_workflow_state.yml
deleted file mode 100644
index 4dda8ce..0000000
--- a/modules/workflow/config/optional/system.action.change_a_node_to_next_workflow_state.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: nl
-status: true
-dependencies:
-  module:
-    - action
-    - node
-    - workflow
-id: change_a_node_to_next_workflow_state
-label: 'Change a node to next Workflow state'
-type: node
-plugin: workflow_node_next_state_action
-configuration:
-  label: 'Change a node to next Workflow state'
-  id: change_a_node_to_next_workflow_state
-  plugin: workflow_node_next_state_action
-  type: node
-  workflow_scheduling:
-    scheduled: '0'
-  comment: 'New state is set by a triggered Action.'
-  force: 0
-  actions: {  }
diff --git a/modules/workflow/config/schema/workflow.schema.yml b/modules/workflow/config/schema/workflow.schema.yml
deleted file mode 100644
index f9dabcc..0000000
--- a/modules/workflow/config/schema/workflow.schema.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-# Schema for the configuration files of the Workflow module.
-workflow.settings:
-  type: config_object
-  label: 'Workflow settings'
-  mapping:
-    workflow_states_per_page:
-      type: integer
-      label: 'Number of workflow states per page'
-
-workflow.workflow.*:
-  type: config_entity
-  label: 'Workflow settings'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    status:
-      type: boolean
-      label: 'Status'
-    label:
-      type: string
-      label: 'Label'
-    module:
-      type: string
-      label: 'Module'
-    options:
-      type: mapping
-      label: 'Options'
-      mapping:
-        name_as_title:
-          type: integer
-          label: 'Use the workflow name as the title of the workflow form'
-        fieldset:
-          type: integer
-          label: 'Show the form in a fieldset'
-        options:
-          type: string
-          label: 'How to show the available states'
-        schedule_timezone:
-          type: integer
-          label: 'Show a timezone when scheduling a transition'
-        comment_log_node:
-          type: integer
-          label: 'Show comment on the Content edit form'
-        watchdog_log:
-          type: integer
-          label: 'Log watchdog messages upon state change'
-
-field.storage_settings.workflow:
-  type: mapping
-  label: 'Workflow settings'
-  mapping:
-    workflow_type:
-      type: string
-      label: 'Workflow'
-    allowed_values:
-      type: sequence
-      label: 'Allowed values list'
-      sequence:
-        type: mapping
-        label: 'Allowed value with label'
-        mapping:
-          value:
-            type: string
-            label: 'Value'
-          label:
-            type: label
-            label: 'Label'
-    allowed_values_function:
-      type: string
-      label: 'Allowed values function'
-
-field.field_settings.workflow:
-  type: mapping
-  label: 'Workflow settings'
-
-workflow.settings:
-  type: config_object
-  mapping:
-    workflow_states_per_page:
-      type: integer
-      label: 'Number of workflow states displayed per page.'
diff --git a/modules/workflow/config/schema/workflow.state.schema.yml b/modules/workflow/config/schema/workflow.state.schema.yml
deleted file mode 100644
index d406d5c..0000000
--- a/modules/workflow/config/schema/workflow.state.schema.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Schema for the configuration files of the state from Workflow module.
-
-workflow.state.*:
-  type: config_entity
-  label: 'Workflow State'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    status:
-      type: boolean
-      label: 'Status'
-    label:
-      type: string
-      label: 'Label'
-    module:
-      type: string
-      label: 'Module'
-    wid:
-      type: string
-      label: 'Machine name of the attached Workflow'
-    weight:
-      type: integer
-      label: 'Weight'
-    sysid:
-      type: integer
-      label: 'SysId'
diff --git a/modules/workflow/config/schema/workflow.transition.schema.yml b/modules/workflow/config/schema/workflow.transition.schema.yml
deleted file mode 100644
index 9027684..0000000
--- a/modules/workflow/config/schema/workflow.transition.schema.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Schema for the configuration files of the transitions for Workflow module.
-
-workflow.transition.*:
-  type: config_entity
-  label: 'Workflow Transition'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: string
-      label: 'Label'
-    module:
-      type: string
-      label: 'Module'
-    from_sid:
-      type: string
-      label: 'From workflow state'
-    to_sid:
-      type: string
-      label: 'To workflow state'
-    roles:
-      type: sequence
-      label: 'User roles'
-      sequence:
-        type: string
-        label: 'Role'
diff --git a/modules/workflow/config/schema/workflow.views.schema.yml b/modules/workflow/config/schema/workflow.views.schema.yml
deleted file mode 100644
index 4877697..0000000
--- a/modules/workflow/config/schema/workflow.views.schema.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Schema for the views plugins of the Workflow module.
-
-views.filter.workflow_state:
-  type: views.filter.many_to_one
diff --git a/modules/workflow/modules/workflow_access/config/install/workflow_access.settings.yml b/modules/workflow/modules/workflow_access/config/install/workflow_access.settings.yml
deleted file mode 100644
index bfa09f3..0000000
--- a/modules/workflow/modules/workflow_access/config/install/workflow_access.settings.yml
+++ /dev/null
@@ -1 +0,0 @@
-workflow_access_priority: 0
diff --git a/modules/workflow/modules/workflow_access/config/schema/workflow_access.schema.yml b/modules/workflow/modules/workflow_access/config/schema/workflow_access.schema.yml
deleted file mode 100644
index e8567d8..0000000
--- a/modules/workflow/modules/workflow_access/config/schema/workflow_access.schema.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-workflow_access.settings:
-  type: config_object
-  label: Settings
-  mapping:
-    workflow_access_priority:
-      type: integer
diff --git a/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessRoleForm.php b/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessRoleForm.php
deleted file mode 100644
index 73749f7..0000000
--- a/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessRoleForm.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-namespace Drupal\workflow_access\Form;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\workflow\Entity\WorkflowState;
-use Drupal\workflow_ui\Form\WorkflowConfigTransitionFormBase;
-
-/**
- * Provides the base form for workflow add and edit forms.
- */
-class WorkflowAccessRoleForm extends WorkflowConfigTransitionFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $entitiesKey = 'workflow_state';
-
-  /**
-   * The WorkflowConfigTransition form type.
-   *
-   * @var string
-   */
-  protected $type = 'access';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'workflow_access_role';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return ['workflow_access.role'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildHeader() {
-    $header = [
-      'label_new' => t('State'),
-      'view' => t('Roles who can view posts in this state'),
-      'update' => t('Roles who can edit posts in this state'),
-      'delete' => t('Roles who can delete posts in this state'),
-    ];
-    return $header;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    $row = [];
-
-    $workflow = $this->workflow;
-    if ($workflow) {
-      /* @var $state WorkflowState */
-      $state = $entity;
-      $sid = $state->id();
-
-      // A list of role names keyed by role ID, including the 'author' role.
-      // Only get the roles with proper permission + Author role.
-      $type_id = $workflow->id();
-      $roles = workflow_get_user_role_names("create $type_id workflow_transition");
-
-      if ($state->isCreationState()) {
-        // No need to set perms on creation.
-        return [];
-      }
-
-      $view = $update = $delete = [];
-      $count = 0;
-      foreach (workflow_access_get_workflow_access_by_sid($sid) as $rid => $access) {
-        $count++;
-        $view[$rid] = ($access['grant_view']) ? $rid : 0;
-        $update[$rid] = ($access['grant_update']) ? $rid : 0;
-        $delete[$rid] = ($access['grant_delete']) ? $rid : 0;
-      }
-      // Allow view grants by default for anonymous and authenticated users,
-      // if no grants were set up earlier.
-      if (!$count) {
-        $view = [
-          AccountInterface::ANONYMOUS_ROLE => AccountInterface::ANONYMOUS_ROLE,
-          AccountInterface::AUTHENTICATED_ROLE => AccountInterface::AUTHENTICATED_ROLE,
-        ];
-      }
-
-      $row['label_new'] = [
-        '#type' => 'value',
-        '#markup' => t('@label', ['@label' => $state->label()]),
-      ];
-      $row['view'] = [
-        '#type' => 'checkboxes',
-        '#options' => $roles,
-        '#default_value' => $view,
-      ];
-      $row['update'] = [
-        '#type' => 'checkboxes',
-        '#options' => $roles,
-        '#default_value' => $update,
-      ];
-      $row['delete'] = [
-        '#type' => 'checkboxes',
-        '#options' => $roles,
-        '#default_value' => $delete,
-      ];
-    }
-    return $row;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    foreach ($form_state->getValue($this->entitiesKey) as $sid => $access) {
-      // @todo: not waterproof; can be done smarter, using elementchildren().
-      if (!WorkflowState::load($sid)) {
-        continue;
-      }
-
-      foreach ($access['view'] as $rid => $checked) {
-        $data[$rid] = [
-          'grant_view' => (!empty($access['view'][$rid])) ? (bool) $access['view'][$rid] : 0,
-          'grant_update' => (!empty($access['update'][$rid])) ? (bool) $access['update'][$rid] : 0,
-          'grant_delete' => (!empty($access['delete'][$rid])) ? (bool) $access['delete'][$rid] : 0,
-        ];
-      }
-      workflow_access_insert_workflow_access_by_sid($sid, $data);
-
-      // Update all nodes to reflect new settings.
-      node_access_needs_rebuild(TRUE);
-    }
-
-    parent::submitForm($form, $form_state);
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessSettingsForm.php b/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessSettingsForm.php
deleted file mode 100644
index 16f7fd3..0000000
--- a/modules/workflow/modules/workflow_access/src/Form/WorkflowAccessSettingsForm.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Drupal\workflow_access\Form;
-
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Provides the base form for workflow add and edit forms.
- */
-class WorkflowAccessSettingsForm extends ConfigFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'workflow_access_settings';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return ['workflow_access.settings'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $config = $this->config('workflow_access.settings');
-    $weight = $config->get('workflow_access_priority');
-
-    $form['workflow_access'] = [
-      '#type' => 'details',
-      '#open' => TRUE,
-      '#title' => t('Workflow Access Settings'),
-    ];
-    $form['workflow_access']['#tree'] = TRUE;
-
-    $url = 'https://api.drupal.org/api/drupal/core%21modules%21node%21node.api.php/function/hook_node_access_records/8';
-    $form['workflow_access']['workflow_access_priority'] = [
-      '#type' => 'weight',
-      '#delta' => 10,
-      '#title' => t('Workflow Access Priority'),
-      '#default_value' => $weight,
-      '#description' => t('This sets the node access priority. Changing this
-      setting can be dangerous. If there is any doubt, leave it at 0.
-      <a href=":url" target="_blank">Read the manual</a>.', [':url' => $url]),
-    ];
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $weight = $form_state->getValues()['workflow_access']['workflow_access_priority'];
-
-    $this->config('workflow_access.settings')
-      ->set('workflow_access_priority', $weight)
-      ->save();
-
-    parent::submitForm($form, $form_state);
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_access/workflow_access.info.yml b/modules/workflow/modules/workflow_access/workflow_access.info.yml
deleted file mode 100644
index 306acb1..0000000
--- a/modules/workflow/modules/workflow_access/workflow_access.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: 'Workflow access'
-description: 'Content access control based on workflows and roles. Depends on the node_access system, so only works for entities of type ''node''.'
-dependencies:
-  - workflow
-package: Workflow
-# core: 8.x
-type: module
-
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/modules/workflow_access/workflow_access.install b/modules/workflow/modules/workflow_access/workflow_access.install
deleted file mode 100644
index 57c6589..0000000
--- a/modules/workflow/modules/workflow_access/workflow_access.install
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Workflow access installation.
- */
-
-/**
- * Implements hook_schema().
- */
-function workflow_access_schema() {
-  // The D7-table 'workflow_access' is not used anymore.
-  // The data is no in table 'config'.
-  return [];
-}
-
-/**
- * Force rebuild of node access.
- */
-function workflow_access_uninstall() {
-  node_access_needs_rebuild(TRUE);
-}
-
-/**
- * Force rebuild of node access.
- */
-function workflow_access_update_8001(&$sandbox) {
-  // Rebuild data.
-  node_access_needs_rebuild(TRUE);
-}
-
-/**
- * Remove table workflow_access. All current settings are lost!
- */
-function workflow_access_update_8002(&$sandbox) {
-  // Remove the table. Data is now in config.
-  $schema = \Drupal\Core\Database\Database::getConnection()->schema();
-  $schema->dropTable('workflow_access');
-  // Rebuild data.
-  node_access_needs_rebuild(TRUE);
-}
diff --git a/modules/workflow/modules/workflow_access/workflow_access.links.task.yml b/modules/workflow/modules/workflow_access/workflow_access.links.task.yml
deleted file mode 100644
index a1bac44..0000000
--- a/modules/workflow/modules/workflow_access/workflow_access.links.task.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Menu tasks for Workflow UI.
-
-workflow_access_settings:
-  route_name: workflow.access.settings
-  base_route: entity.workflow_type.collection
-  title: 'Access settings'
-  weight: 5
-  appears_on:
-    - entity.workflow_type.collection
-
-entity.workflow_type.access_form:
-  title: 'Access'
-  route_name: entity.workflow_type.access_form
-  base_route: entity.workflow_type.edit_form
-  weight: -1
diff --git a/modules/workflow/modules/workflow_access/workflow_access.module b/modules/workflow/modules/workflow_access/workflow_access.module
deleted file mode 100644
index ae82ed9..0000000
--- a/modules/workflow/modules/workflow_access/workflow_access.module
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-
-/**
- * @file
- * Provides node access permissions based on workflow states.
- */
-
-use Drupal\Core\Config\Config;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\user\Entity\Role;
-use Drupal\workflow\Entity\WorkflowTransition;
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-
-/**
- * Implements hook_help().
- */
-function workflow_access_help($route_name, RouteMatchInterface $route_match) {
-  $output = '';
-
-  switch ($route_name) {
-    case 'entity.workflow_type.access_form':
-      $url = \Drupal\Core\Url::fromRoute('workflow.access.settings');
-      $output .= t("This page lets you refine the permissions per role and per
-        workflow state. Although the workflow module allows you to add multiple
-        workflows to per entity type, Workflow Access supports only one
-        workflow per entity type."
-      );
-      $output .= "<br>";
-      $output .= t("WARNING: Use of the 'Edit any', 'Edit own', and even 'View
-        published content' permissions for the content type may override these
-        access settings. You may disable those permissions or
-        <a href=':url'>alter the priority of
-        the Workflow access module</a>.", [':url' => $url->toString()]
-      );
-      if (\Drupal::moduleHandler()->moduleExists('og')) {
-        $output .= '<br>';
-        $output .= t('WARNING: Organic Groups (OG) is present and may interfere
-          with these settings.');
-        //$output .= ' ';
-        //$url = \Drupal\Core\Url::fromUri('admin/config/group/settings'); // @todo D8: FIXME when OG module is ported.
-        //$output .= t("In particular, if <a href=':url'>Strict node access
-        //  permissions</a> is enabled, since this may override Workflow access
-        //  settings.", [':url' => $url]);
-        $output .= t("In particular, if <i>Strict node access
-            permissions</i> is enabled, since this may override Workflow access
-            settings.");
-      }
-      break;
-
-    default:
-      break;
-  }
-  return $output;
-}
-
-/**
- * Implements hook_workflow_operations().
- *
- * Create action link for access form on EntityWorkflowUIController::overviewForm.
- */
-function workflow_access_workflow_operations($op, EntityInterface $entity = NULL) {
-  $operations = [];
-  return $operations;
-}
-
-/**
- * Implements hook_entity_insert().
- *
- * We use the Role weight as an id.
- * In contrary to content_access module, that uses a 'content_access_roles_gids'
- * config setting.
- * @todo: determine the best way for D8. See also content_access.module
- * The problem is that node_access table uses Int, whereas the Role Id is string.
- */
-function workflow_access_user_role_insert(EntityInterface $entity) {
-  // Attend user to Rebuild data, because the weight of a role
-  // is the key for workflow_Access.
-  /** @var $entity \Drupal\user\RoleInterface */
-   node_access_needs_rebuild(TRUE);
-}
-
-/**
- * Implements hook_access_entity_update().
- *
- * @param EntityInterface $entity
- */
-function workflow_access_user_role_update(EntityInterface $entity) {
-  // Attend user to Rebuild data, because the weight of a role
-  // is the key for workflow_Access.
-  /** @var $entity \Drupal\user\RoleInterface */
-  if ($entity->getWeight() != $entity->original->getWeight()) {
-    // Role's weight has changed.
-    node_access_needs_rebuild(TRUE);
-  }
-}
-
-/**
- * Implements hook_node_grants().
- *
- * Supply the workflow access grants. We are simply using
- * roles as access lists, so rids translate directly to gids.
- */
-function workflow_access_node_grants(AccountInterface $account, $op) {
-  $gids = [];
-  $roles = $account->getRoles();
-  foreach ($roles as $role) {
-    // @todo D8: compare with content_access module.
-    $gids[] = workflow_access_get_role_gid($role);
-  }
-
-  return [
-    'workflow_access' => $gids,
-    'workflow_access_owner' => [$account->id()],
-  ];
-}
-
-/**
- * Helper providing numeric id for role.
- * Copied from content_access.module
- */
-function workflow_access_get_role_gid($rid) {
-  // @todo D8: compare with content_access module.
-  //  $config = \Drupal::configFactory()->getEditable('content_access.settings');
-  //  $roles_gids = $config->get('content_access_roles_gids');
-  //  return $roles_gids[$role];
-
-  /* @var $role Role */
-  $role = \Drupal\user\Entity\Role::load($rid);
-  $weight = 100; // Avoid negative values.
-  if ($role) {
-    $weight += $role->getWeight();
-  }
-  else {
-    // For Author, no role exists.
-    $weight -= 20;
-  }
-
-  return $weight;
-}
-
-/**
- * Implements hook_node_access_records().
- *
- * Returns a list of grant records for the passed in node object.
- * This hook is invoked by function node_access_acquire_grants().
- */
-function workflow_access_node_access_records(\Drupal\node\NodeInterface $node) {
-  $grants = [];
-  $workflow_transitions_added = FALSE;
-
-  //if (!$node->isPublished()) {
-  //  // @todo: return;
-  //}
-
-  $entity_type = $node->getEntityTypeId();
-
-
-  // Only relevant for content with Workflow.
-  if (!isset($node->workflow_transitions)) {
-    $node->workflow_transitions = [];
-    // Sometimes, a node is saved without going through workflow_transition_form.
-    // E.g.,
-    // - when saving a node with workflow_node programmatically with node_save();
-    // - when changing a state on a node view page/history tab;
-    // - when rebuilding permissions via batch for Workflow Fields.
-    // In that case, we need to create the workflow_transitions ourselves to
-    // calculate the grants.
-    foreach (_workflow_info_fields($node, $entity_type) as $field) {
-      $field_name = $field->getName(); // Do not use id().
-      $old_sid = $new_sid = $node->$field_name->value;
-
-      // Create a dummy transition, just to set $node->workflow_transitions.
-      if ($old_sid) {
-        /* @var $transition WorkflowTransitionInterface */
-        $transition = WorkflowTransition::create([$old_sid, 'field_name' => $field_name]);
-        $transition->setTargetEntity($node);
-        $transition->setValues($new_sid, $node->getOwnerId(), \Drupal::time()->getRequestTime(), '');
-
-        // Store the transition, so it can be easily fetched later on.
-        // Store in an array, to prepare for multiple workflow_fields per entity.
-        // This is a.o. used in hook_entity_update to trigger 'transition post'.
-        $node->workflow_transitions[$field_name] = $transition;
-        $workflow_transitions_added = TRUE;
-      }
-    }
-  }
-
-  // Get 'author' of this entity.
-  // - Some entities (e.g., taxonomy_term) do not have a uid.
-  // But then again: node_access is only for nodes...
-  $uid = ($node->getOwnerId()) ? (int) $node->getOwnerId() : 0;
-  $priority = workflow_access_get_setting('workflow_access_priority');
-
-  $count = 0;
-  foreach ($node->workflow_transitions as $transition) {
-    // @todo: add support for +1 workflows per entity.
-    if ($count++ == 1) {
-      continue;
-    }
-
-    $field_name = $transition->getFieldName();
-    if ($current_sid = workflow_node_current_state($node, $field_name)) {
-      foreach (workflow_access_get_workflow_access_by_sid($current_sid) as $rid => $grant) {
-        $realm = ($uid > 0 && $rid == WORKFLOW_ROLE_AUTHOR_RID) ? 'workflow_access_owner' : 'workflow_access';
-        $gid = ($uid > 0 && $rid == WORKFLOW_ROLE_AUTHOR_RID) ? $uid : workflow_access_get_role_gid($rid);
-
-        // Anonymous ($uid == 0) author is not allowed for role 'author' (== -1).
-        // Both logically (Anonymous having more rights then authenticated)
-        // and technically: $gid must be a positive int.
-        if ($uid == 0 && $rid == WORKFLOW_ROLE_AUTHOR_RID) {
-          continue;
-        }
-
-        $grants[] = [
-          'realm' => $realm,
-          'gid' => $gid,
-          'grant_view' => (int) $grant['grant_view'],
-          'grant_update' => (int) $grant['grant_update'],
-          'grant_delete' => (int) $grant['grant_delete'],
-          'priority' => $priority,
-          // 'langcode' => $node->language(),
-          'field_name' => $field_name, // Just for analysis and info.
-        ];
-      }
-    }
-  }
-  if ($workflow_transitions_added == TRUE) {
-    unset($node->workflow_transitions);
-  }
-
-  return $grants;
-}
-
-/**
- * Implements hook_node_access_explain().
- *
- * This is a Devel Node Access hook.
- */
-function workflow_access_node_access_explain($row) {
-  static $interpretations = [];
-  switch ($row->realm) {
-    case 'workflow_access_owner':
-      $interpretations[$row->gid] = t('Workflow access: author of the content may access');
-      break;
-
-    case 'workflow_access':
-      $roles = user_roles();
-      $interpretations[$row->gid] = t('Workflow access: %role may access', ['%role' => $roles[$row->gid]]);
-      break;
-  }
-  return (!empty($interpretations[$row->gid]) ? $interpretations[$row->gid] : NULL);
-}
-
-/**
- * DB functions - all DB interactions are isolated here to make for easy updating should our schema change.
- */
-
-/**
- * Given a sid, retrieve the access information and return the row(s).
- */
-function workflow_access_get_workflow_access_by_sid($sid) {
-  $result = \Drupal::config('workflow_access.role')->get($sid);
-  if ($result == NULL) {
-    // Avoid errors in calling function when no data available.
-    $result = [];
-  }
-  return $result;
-}
-
-/**
- * Given a sid, delete all access data for this state.
- */
-function workflow_access_delete_workflow_access_by_sid($sid) {
-  \Drupal::configFactory()->getEditable('workflow_access.role')
-    ->clear($sid)
-    ->save();
-}
-
-/**
- * Given data, insert into workflow access - we never update.
- */
-function workflow_access_insert_workflow_access_by_sid($sid, &$data, Config $config = NULL) {
-  $config = \Drupal::configFactory()->getEditable('workflow_access.role');
-  $config
-    ->set($sid, $data)
-    ->save();
-}
-
-/**
- * Get the module settings.
- *
- * @see WorkflowAccessSettingsForm::submitForm()
- */
-function workflow_access_get_setting($value) {
-  $config = \Drupal::config('workflow_access.settings');
-  $priority = $config->get($value);
-  return $priority;
-}
diff --git a/modules/workflow/modules/workflow_access/workflow_access.routing.yml b/modules/workflow/modules/workflow_access/workflow_access.routing.yml
deleted file mode 100644
index f5bae05..0000000
--- a/modules/workflow/modules/workflow_access/workflow_access.routing.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Declaration of Workflow Access routings.
-
-### Workflow settings form
-workflow.access.settings:
-  path: '/admin/config/workflow/workflow/access'
-  defaults:
-    _form: '\Drupal\workflow_access\Form\WorkflowAccessSettingsForm'
-    _title: 'Access settings'
-  requirements:
-    _permission: 'administer workflow'
-    _module_dependencies: 'workflow_ui'
-
-entity.workflow_type.access_form:
-  path: '/admin/config/workflow/workflow/{workflow_type}/access'
-  defaults:
-    _title: 'Edit Workflow'
-    _title_callback: 'workflow_url_get_title'
-    _form: '\Drupal\workflow_access\Form\WorkflowAccessRoleForm'
-  requirements:
-    _permission: 'administer workflow'
-    _module_dependencies: 'workflow_ui'
diff --git a/modules/workflow/modules/workflow_cleanup/src/Form/WorkflowCleanupSettingsForm.php b/modules/workflow/modules/workflow_cleanup/src/Form/WorkflowCleanupSettingsForm.php
deleted file mode 100644
index 3529b0b..0000000
--- a/modules/workflow/modules/workflow_cleanup/src/Form/WorkflowCleanupSettingsForm.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-namespace Drupal\workflow_cleanup\Form;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\workflow\Entity\WorkflowConfigTransition;
-use Drupal\workflow\Entity\WorkflowState;
-
-/**
- * Class WorkflowCleanupSettingsForm
- *
- * @package Drupal\workflow_cleanup\Form
- */
-class WorkflowCleanupSettingsForm extends FormBase {
-
-  /**
-   * @inheritdoc
-   */
-  public function getFormId() {
-    return 'workflow_cleanup_settings';
-  }
-
-  /**
-   * @inheritdoc
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form = [];
-
-    // Get all of the states, indexed by sid.
-    $orphans = $inactive = [];
-
-    /* @var $states WorkflowState[] */
-    /* @var $state WorkflowState */
-    $states = WorkflowState::loadMultiple();
-
-    foreach ($states as $state) {
-      // Does the associated workflow exist?
-      if (!$state->getWorkflow()) {
-        $orphans[$state->id()] = $state;
-      }
-      else {
-        // Is the state still active?
-        if (!$state->isActive()) {
-          $inactive[$state->id()] = $state;
-        }
-      }
-    }
-
-    // Save the relevant states in an indexed array.
-    $form['#workflow_states'] = $orphans + $inactive;
-
-    $form['no_workflow'] = [
-      '#type' => 'details',
-      '#title' => t('Orphaned States'),
-      '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
-      '#description' => t('These states no longer belong to an existing workflow.'),
-      '#tree' => TRUE,
-    ];
-    foreach ($orphans as $sid => $state) {
-      $form['no_workflow'][$sid]['check'] = [
-        '#type' => 'checkbox',
-        '#title' => $state->label(),
-        '#return_value' => $sid,
-      ];
-    }
-
-    $form['inactive'] = [
-      '#type' => 'details',
-      '#title' => t('Inactive (Deleted) States'),
-      '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
-      '#description' => t('These states belong to a workflow, but have been marked inactive (deleted).'),
-      '#tree' => TRUE,
-    ];
-    foreach ($inactive as $sid => $state) {
-      $form['inactive'][$sid]['check'] = [
-        '#type' => 'checkbox',
-        '#title' => $state->label() . ' (' . $state->getWorkflow()->label() . ')',
-        '#return_value' => $sid,
-      ];
-    }
-
-    $form['submit'] = [
-      '#type' => 'submit',
-      '#value' => t('Delete selected states'),
-    ];
-
-    return $form;
-  }
-
-  /**
-   * @inheritdoc
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $states = $form['#workflow_states'];
-    $values = $form_state->getValues();
-    foreach (['no_workflow', 'inactive'] as $section) {
-      if (!isset($values[$section])) {
-        continue;
-      }
-
-      foreach ($values[$section] as $sid => $data) {
-        if ($data['check']) {
-          /* @var $state WorkflowState */
-          $state = $states[$sid];
-          $state_name = $state->label();
-
-          // Delete any transitions this state is involved in.
-          $count = 0;
-          foreach (WorkflowConfigTransition::loadMultiple() as $config_transition) {
-            /* @var $config_transition WorkflowConfigTransition */
-            if ($config_transition->getFromSid() == $sid || $config_transition->getToSid() == $sid) {
-              $config_transition->delete();
-              $count++;
-            }
-          }
-          if ($count) {
-            drupal_set_message(t('@count transitions for the "@state" state have been deleted.',
-              ['@state' => $state_name, '@count' => $count]));
-          }
-
-          // @todo: Remove history records too.
-          $count = 0;
-          // $count = db_delete('workflow_node_history')->condition('sid', $sid)->execute();
-          if ($count) {
-            drupal_set_message(t('@count history records for the "@state" state have been deleted.',
-              ['@state' => $state_name, '@count' => $count]));
-          }
-
-          $state->delete();
-          drupal_set_message(t('The "@state" state has been deleted.',
-            ['@state' => $state_name]));
-        }
-      }
-    }
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.info.yml b/modules/workflow/modules/workflow_cleanup/workflow_cleanup.info.yml
deleted file mode 100644
index b2d3c57..0000000
--- a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.info.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Workflow Clean Up
-type: module
-description: 'Cleans up Workflow cruft. (Do not enable in production sites.)'
-package: Workflow
-# core: 8.x
-dependencies:
-  - workflow
-configure: workflow.cleanup.settings
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.links.task.yml b/modules/workflow/modules/workflow_cleanup/workflow_cleanup.links.task.yml
deleted file mode 100644
index 3b9bd94..0000000
--- a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.links.task.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Menu tasks for Workflow Cleanup.
-
-workflow.cleanup.settings:
-  title: 'Cleanup'
-  route_name: workflow.cleanup.settings
-  base_route: entity.workflow_type.collection
-  weight: 7
diff --git a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.module b/modules/workflow/modules/workflow_cleanup/workflow_cleanup.module
deleted file mode 100644
index 896b22f..0000000
--- a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.module
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * @file
- * Cleans up Workflow cruft that may build up over time.
- */
-
-/**
- * Implements hook_help().
- */
-function workflow_cleanup_help($route_name, \Drupal\Core\Routing\RouteMatchInterface $route_match) {
-  $output = [];
-
-  switch ($route_name) {
-    case 'workflow.cleanup.settings':
-      $output = t('This page allows you to delete orphaned and inactive states.
-        States can be deleted freely in a development environment, but be
-        careful if you have used a State in a production environment. The
-        transition history of your content will loose the description of a
-        previously used state. If your Workflow must comply to some auditing
-        standards, you should NOT use this function.');
-    break;
-  }
-
-  return $output;
-}
diff --git a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.routing.yml b/modules/workflow/modules/workflow_cleanup/workflow_cleanup.routing.yml
deleted file mode 100644
index 2cc43e6..0000000
--- a/modules/workflow/modules/workflow_cleanup/workflow_cleanup.routing.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-workflow.cleanup.settings:
-  path: '/admin/config/workflow/workflow/cleanup'
-  defaults:
-    _form: '\Drupal\workflow_cleanup\Form\WorkflowCleanupSettingsForm'
-    _title: 'Clean up workflow'
-  requirements:
-    _permission: 'administer workflow'
diff --git a/modules/workflow/modules/workflow_devel/README.txt b/modules/workflow/modules/workflow_devel/README.txt
deleted file mode 100644
index 98ae0fc..0000000
--- a/modules/workflow/modules/workflow_devel/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The Workflow Devel module helps you to develop addons for Workflow.
-
-When activating this module, you will get a message with every hook, Workflow provides.
\ No newline at end of file
diff --git a/modules/workflow/modules/workflow_devel/workflow_devel.info.yml b/modules/workflow/modules/workflow_devel/workflow_devel.info.yml
deleted file mode 100644
index a80ff2d..0000000
--- a/modules/workflow/modules/workflow_devel/workflow_devel.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: 'Workflow Devel'
-description: 'Tools for developing Workflow add-ons. Calls every hook in workflow.api.php and generates a user message on each call. (Do not enable in production sites.)'
-package: Workflow
-type: module
-# core: 8.x
-
-dependencies:
-  - workflow
-
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/modules/workflow_devel/workflow_devel.module b/modules/workflow/modules/workflow_devel/workflow_devel.module
deleted file mode 100644
index a1c3d25..0000000
--- a/modules/workflow/modules/workflow_devel/workflow_devel.module
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/**
- * @file
- * Development tools for Workflow.
- */
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\user\UserInterface;
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-
-module_load_include('php', 'workflow', 'workflow.api');
-
-/**
- * Hooks defined by workflow_ui, workflow module.
- */
-function workflow_devel_workflow_operations($op, EntityInterface $entity = NULL) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, $op, '');
-  return hook_workflow_operations($op, $entity);
-}
-
-/**
- * Hooks defined by workflow module.
- */
-function workflow_devel_workflow($op, WorkflowTransitionInterface $transition, UserInterface $user) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, $op, '');
-  return hook_workflow($op, $transition, $user);
-}
-
-function workflow_devel_workflow_comment_alter(&$comment, array &$context) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, $comment, '');
-  return hook_workflow_comment_alter($comment, $context);
-}
-
-function workflow_devel_workflow_history_alter(array &$context) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__);
-  return hook_workflow_history_alter($context);
-}
-
-function workflow_devel_workflow_permitted_state_transitions_alter(array &$transitions, array $context) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__);
-  return hook_workflow_permitted_state_transitions_alter($transitions, $context);
-}
-
-/**
- * Hooks defined by core Form API: Change the Workflow Transition Form.
- */
-
-/**
- * Alter forms for field widgets provided by other modules.
- *
- * @param $element
- *   The field widget form element as constructed by hook_field_widget_form().
- * @param $form_state
- *   An associative array containing the current state of the form.
- * @param $context
- *   An associative array containing the following key-value pairs, matching the
- *   arguments received by hook_field_widget_form():
- *   - form: The form structure to which widgets are being attached. This may be
- *     a full form structure, or a sub-element of a larger form.
- *   - field: The field structure.
- *   - instance: The field instance structure.
- *   - langcode: The language associated with $items.
- *   - items: Array of default values for this field.
- *   - delta: The order of this item in the array of subelements (0, 1, 2, etc).
- *
- * @see hook_field_widget_form()
- * @see hook_field_widget_WIDGET_TYPE_form_alter()
- */
-function workflow_devel_field_widget_form_alter(&$element, \Drupal\Core\Form\FormStateInterface $form_state, $context) {
-  // A hook for changing any widget. Better not use it: it is called on EVERY
-  // Widget. (Even though the message is only shown once.)
-  // D7: This hook is introduced in Drupal 7.8.
-  // workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-  // dpm($context['widget']->getPluginId());
-  return hook_field_widget_form_alter($element, $form_state, $context);
-}
-
-function workflow_devel_field_widget_workflow_default_form_alter(&$element, \Drupal\Core\Form\FormStateInterface $form_state, $context) {
-  // A hook specific for the 'workflow_default' widget.
-  // D7: This hook is introduced in Drupal 7.8.
-  // D8: This name is specified in the annotation of WorkflowDefaultWidget.
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-  return hook_field_widget_workflow_default_form_alter($element, $form_state, $context);
-}
-
-function workflow_devel_form_workflow_transition_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, $form_id, '');
-  return hook_form_workflow_transition_form_alter($form, $form_state, $form_id);
-}
-
-function workflow_devel_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
-  if (substr($form_id, 0, 8) == 'workflow') {
-    workflow_debug(__FILE__, __FUNCTION__, __LINE__, $form_id, '');
-  }
-  return hook_form_alter($form, $form_state, $form_id);
-}
-
-/**
- * Hooks defined by core: Change the operations column in an Entity list.
- *
- * @see EntityListBuilder::getOperations()
- *
- * @return array
- */
-function workflow_devel_entity_operation($entities) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-  $operations = [];
-  return $operations;
-}
-
-function workflow_devel_entity_operation_alter(array $operations, EntityInterface $entity) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, $entity->getEntityTypeId(), $entity->id());
-}
-
-/**
- * Hooks defined by core: hook_entity_CRUD.
- *
- * @see hook_entity_create(), hook_entity_update(), etc.
- * @see hook_ENTITY_TYPE_create(), hook_ENTITY_TYPE_update(), etc.
- */
-function workflow_devel_entity_create(EntityInterface $entity) {
-  //workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'create' , $entity->getEntityTypeId());
-}
-function workflow_devel_entity_presave(EntityInterface $entity) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'presave', $entity->getEntityTypeId());
-}
-function workflow_devel_entity_insert(EntityInterface $entity) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'insert', $entity->getEntityTypeId());
-}
-function workflow_devel_entity_update(EntityInterface $entity) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'update', $entity->getEntityTypeId());
-}
-function workflow_devel_entity_predelete(EntityInterface $entity) {
-  if (substr($entity->getEntityTypeId(), 0, 8) == 'workflow') {
-    workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'predelete', $entity->getEntityTypeId());
-  }
-  return hook_entity_predelete($entity);
-}
-function workflow_devel_entity_delete(EntityInterface $entity) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'delete', $entity->getEntityTypeId());
-  return hook_entity_delete($entity);
-}
diff --git a/modules/workflow/modules/workflow_field/workflowfield.info.yml b/modules/workflow/modules/workflow_field/workflowfield.info.yml
deleted file mode 100644
index 2bd11b7..0000000
--- a/modules/workflow/modules/workflow_field/workflowfield.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: 'Workflow Field'
-description: 'A residual submodule. No need to enable this module for installations with workflow 8.x-1.0-beta6 and later.'
-package: Workflow
-type: module
-# core: 8.x
-
-hidden: TRUE
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/modules/workflow_operations/src/Form/WorkflowTransitionRevertForm.php b/modules/workflow/modules/workflow_operations/src/Form/WorkflowTransitionRevertForm.php
deleted file mode 100644
index 73dbbad..0000000
--- a/modules/workflow/modules/workflow_operations/src/Form/WorkflowTransitionRevertForm.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-namespace Drupal\workflow_operations\Form;
-
-use Drupal\Core\Entity\EntityConfirmFormBase;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element\Url;
-use Drupal\workflow\Entity\WorkflowTransition;
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-
-class WorkflowTransitionRevertForm extends EntityConfirmFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'workflow_transition_revert_confirm';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    /* @var $transition WorkflowTransitionInterface */
-    $transition = $this->entity;
-    $state = $transition->getFromState();
-
-    if ($state) {
-      $question = t('Are you sure you want to revert %title to the "@state" state?', [
-        '@state' => $state->label(),
-        '%title' => $transition->label(),
-      ]);
-      return $question;
-    }
-    else {
-      \Drupal::logger('workflow_revert')->error('Invalid state', []);
-      drupal_set_message(t('Invalid transition. Your information has been recorded.'), 'error');
-      //drupal_goto($return_uri);
-    }
-
-    return [];
-  }
-
-  public function getCancelUrl() {
-    /* @var $transition WorkflowTransitionInterface */
-    $transition = $this->entity;
-    return new Url('entity.node.workflow_history', ['node' => $transition->getTargetEntityId(), 'field_name' => $transition->getFieldname()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return t('Revert');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  //public function getDescription() {
-  //  return '';
-  //}
-
-  /**
-   * The fact that we need to overwrite this function, is an indicator that
-   * the Transition is not completely a complete Entity.
-   *
-   * {@inheritdoc}
-   */
-  protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
-    //return parent::copyFormValuesToEntity($entity, $form, $form_state);
-    return $this->entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, \Drupal\Core\Form\FormStateInterface $form_state) {
-
-    // If Rules is available, signal the reversion.
-    // @todo: move this Rules_invoke_event to hook outside this module.
-    if (\Drupal::moduleHandler()->moduleExists('rules')) {
-      rules_invoke_event('workflow_state_reverted', $this->entity);
-    }
-
-    /* @var $transition WorkflowTransitionInterface */
-    $transition = $this->prepareRevertedTransition($this->entity);
-
-    // The entity will be updated when the transition is executed. Keep the
-    // original one for the confirmation message.
-    $previous_sid = $transition->getToSid();
-
-    // Force the transition because it's probably not valid.
-    $transition->force(TRUE);
-    $new_sid = workflow_execute_transition($transition, TRUE);
-
-    $comment = ($previous_sid == $new_sid) ? 'State is reverted.' : 'State could not be reverted.';
-    drupal_set_message(t($comment), 'warning');
-
-    $form_state->setRedirect('entity.node.workflow_history', [
-        'node' => $transition->getTargetEntityId(),
-        'field_name' => $transition->getFieldName(),
-      ]
-    );
-  }
-
-  /**
-   * Prepares a transition to be reverted.
-   *
-   * @param \Drupal\workflow\Entity\WorkflowTransitionInterface $transition
-   *   The transition to be reverted.
-   *
-   * @return \Drupal\workflow\Entity\WorkflowTransitionInterface
-   *   The prepared transition ready to be stored.
-   */
-  protected function prepareRevertedTransition(WorkflowTransitionInterface $transition) {
-    $user = \Drupal::currentUser();
-
-    $entity = $transition->getTargetEntity();
-    $field_name = $transition->getFieldName();
-    $current_sid = workflow_node_current_state($entity, $field_name);
-    $previous_sid = $transition->getFromSid();
-    $comment = t('State reverted.');
-
-    $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
-    $transition->setTargetEntity($entity);
-    $transition->setValues($previous_sid, $user->id(), \Drupal::time()->getRequestTime(), $comment);
-
-    return $transition;
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_operations/src/WorkflowAccessControlHandler.php b/modules/workflow/modules/workflow_operations/src/WorkflowAccessControlHandler.php
deleted file mode 100644
index 9b0db23..0000000
--- a/modules/workflow/modules/workflow_operations/src/WorkflowAccessControlHandler.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-namespace Drupal\workflow_operations;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\workflow\Entity\WorkflowManager;
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Defines the access control handler for the workflow entity type.
- *
- * @see \Drupal\workflow\Entity\Workflow
- * @ingroup workflow_access
- */
-class WorkflowAccessControlHandler extends \Drupal\workflow\WorkflowAccessControlHandler {
-
-  /**
-   * This is a hack.
-   *
-   * {@inheritdoc}
-   */
-  public function __construct(EntityTypeInterface $entity_type = NULL) {
-    if ($entity_type) {
-      parent::__construct($entity_type);
-    }
-    else {
-      //$this->entityTypeId = $entity_type->id();
-      $this->entityType = $entity_type;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
-      $entity_type
-    );
-  }
-
-  /**
-   * Access check, to be called from
-   * - module.routing.yml
-   * - hook_entity_operation
-   *
-   * @param \Drupal\workflow_operations\WorkflowTransitionInterface|null $transition
-   *
-   * @return \Drupal\Core\Access\AccessResult
-   */
-  public function revertAccess(WorkflowTransitionInterface $transition = NULL, AccountInterface $account = NULL, $return_as_object = TRUE) {
-    if ($transition) {
-      // Called from hook_entity_operation
-    }
-    else {
-      // Called from module.routing.yml
-      /* @var $transition WorkflowTransitionInterface */
-      $route_match = \Drupal::routeMatch();
-      $transition = $route_match->getParameter('workflow_transition');
-    }
-    return $this->access($transition, 'revert', $account, $return_as_object);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function access(EntityInterface $entity, $operation, AccountInterface $account = NULL, $return_as_object = FALSE) {
-    $result = AccessResult::neutral();
-
-    $account = $user = workflow_current_user($account);
-
-    // This is only for Edit/Delete transition. For Add/create, use createAccess.
-    switch ($entity->getEntityTypeId()) {
-
-      case 'workflow_transition':
-      case 'workflow_scheduled_transition':
-        /* @var $transition WorkflowTransitionInterface */
-        $transition = $entity;
-
-        switch ($operation) {
-          case 'revert':
-            $is_owner = WorkflowManager::isOwner($user, $transition);
-            $type_id = $transition->getWorkflowId();
-            if ($transition->getFromSid() == $transition->getToSid()) {
-              // No access for same state transitions.
-              $result = AccessResult::forbidden();
-            }
-            elseif ($user->hasPermission("revert any $type_id workflow_transition")) {
-              // OK, add operation.
-              $result = AccessResult::allowed();
-            }
-            elseif ($is_owner && $user->hasPermission("revert own $type_id workflow_transition")) {
-              // OK, add operation.
-              $result = AccessResult::allowed();
-            }
-            else {
-              // No access.
-              $result = AccessResult::forbidden();
-            }
-            break;
-
-          default:
-            $result = parent::access($entity, $operation, $account, $return_as_object)->cachePerPermissions();
-            break;
-        } // End of switch ($operation).
-
-        break; // case
-
-      default: // $entity_type
-        $result = AccessResult::forbidden();
-    } // End of  switch($entity->getEntityTypeId()).
-
-    return $return_as_object ? $result : $result->isAllowed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createAccess($entity_bundle = NULL, AccountInterface $account = NULL, array $context = [], $return_as_object = FALSE) {
-    workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-    $result = parent::createAccess($entity_bundle, $account, $context, TRUE)->cachePerPermissions();
-    return $return_as_object ? $result : $result->isAllowed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function checkAccess(EntityInterface $transition, $operation, AccountInterface $account) {
-    workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-    return parent::checkAccess($transition, $operation, $account);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
-    workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-    return AccessResult::allowedIf($account->hasPermission('create ' . $entity_bundle . ' content'))->cachePerPermissions();
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_operations/src/WorkflowPermissions.php b/modules/workflow/modules/workflow_operations/src/WorkflowPermissions.php
deleted file mode 100644
index c48b273..0000000
--- a/modules/workflow/modules/workflow_operations/src/WorkflowPermissions.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\workflow_operations;
-
-use Drupal\workflow\Entity\Workflow;
-
-/**
- * Provides dynamic permissions for workflows of different types.
- */
-class WorkflowPermissions extends \Drupal\workflow\WorkflowPermissions {
-
-  /**
-   * Returns an array of workflow type permissions.
-   *
-   * @return array
-   *   The workflow type permissions.
-   *   @see \Drupal\user\PermissionHandlerInterface::getPermissions()
-   */
-  //public function workflowTypePermissions() {
-  //  return parent::workflowTypePermissions();
-  //}
-
-  /**
-   * Returns a list of workflow permissions for a given workflow type.
-   *
-   * @param Workflow|\Drupal\workflow\Entity\Workflow $type
-   *   The workflow type.
-   * @return array An associative array of permission names and descriptions.
-   * An associative array of permission names and descriptions.
-   */
-  protected function buildPermissions(Workflow $type) {
-    $type_id = $type->id();
-    $type_params = ['%type_name' => $type->label()];
-
-    return [
-      // D7->D8-Conversion of 'edit workflow comment' permission to "edit own $type_id transition" (@see NodePermissions::edit any/own content).
-      // D7->D8-Conversion of 'edit workflow comment' permission to "edit any $type_id transition" (@see NodePermissions::edit any/own content).
-      "edit own $type_id workflow_transition" => [
-        'title' => $this->t('%type_name: Edit own comments', $type_params),
-        'description' => t('Edit the comment of own executed state transitions.'),
-        'restrict access' => TRUE,
-      ],
-      "edit any $type_id workflow_transition" => [
-        'title' => $this->t('%type_name: Edit any comments', $type_params),
-        'description' => t('Edit the comment of any executed state transitions.'),
-        'restrict access' => TRUE,
-      ],
-      /*
-      // Workflow has no 'delete' permissions.
-      "delete own $type_id workflow_transition" => [
-        'title' => $this->t('%type_name: Delete own content', $type_params),
-      ],
-      "delete any $type_id workflow_transition" => [
-        'title' => $this->t('%type_name: Delete any content', $type_params),
-      ],
-       */
-      // D7->D8-Conversion of 'revert workflow' permission to "revert any/own $type_id transition"
-      "revert own $type_id workflow_transition" => [
-        'title' => $this->t('%type_name: Revert own state transition', $type_params),
-        'description' => t('Allow user to revert own last executed state transition on entity.'),
-        'restrict access' => TRUE,
-      ],
-      "revert any $type_id workflow_transition" => [
-        'title' => $this->t('%type_name: Revert any state transition', $type_params),
-        'description' => t('Allow user to revert any last executed state transition on entity.'),
-        'restrict access' => TRUE,
-      ],
-    ];
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_operations/workflow_operations.info.yml b/modules/workflow/modules/workflow_operations/workflow_operations.info.yml
deleted file mode 100644
index 841bed9..0000000
--- a/modules/workflow/modules/workflow_operations/workflow_operations.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: 'Workflow operations'
-description: "Adds lesser-used Transition permissions (edit, revert, delete permissions)."
-package: Workflow
-type: module
-# core: 8.x
-
-dependencies:
-  - workflow
-
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/modules/workflow_operations/workflow_operations.module b/modules/workflow/modules/workflow_operations/workflow_operations.module
deleted file mode 100644
index 4f06f01..0000000
--- a/modules/workflow/modules/workflow_operations/workflow_operations.module
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * @file
- * Adds an 'Revert' link to the first workflow history row.
- */
-
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-use Drupal\workflow_operations\WorkflowAccessControlHandler;
-
-/**
- * Implements hook_rules_event_info().
- *
- * @todo: Add support for every entity_type in Revert rules.
- */
-function workflow_operations_rules_event_info() {
-  workflow_debug( __FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-  $events = [
-    'workflow_state_reverted' => [
-      'group' => t('Workflow'),
-      'label' => t('Workflow state reverted'),
-      'variables' => rules_events_node_variables(t('updated content'), TRUE),
-    ],
-  ];
-  return $events;
-}
-
-/**
- * Core hooks: Change the operations column in a Entity list.
- * Add a 'revert' operation.
- *
- * @see EntityListBuilder::getOperations()
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- *
- * @return array
- */
-function workflow_operations_entity_operation(\Drupal\Core\Entity\EntityInterface $entity) {
-  $operations = [];
-
-  // Check correct entity type.
-  if (!in_array($entity->getEntityTypeId(), ['workflow_transition'])) {
-    return $operations;
-  }
-
-  $user = workflow_current_user();
-  /* @var $transition WorkflowTransitionInterface */
-  $transition = $entity;
-
-  // Check access, to avoid that user sees a revert link, but is not allowed to
-  // view the revert form. Use $first to check only once per page.
-  static $first = TRUE;
-
-  if ($first) {
-    $handler = new WorkflowAccessControlHandler();
-    $is_allowed = $handler->access($transition, 'revert', $user, FALSE);
-    if (!$is_allowed) {
-      // No access. We may try at next row.
-      return $operations;
-    }
-  }
-
-  // Only mark the first row.
-  if ($first) {
-    // Some states are not fit to revert to. In each of these cases, prohibit
-    // to revert to an even older state.
-    if ((!$from_state = $transition->getFromState()) || !$from_state->isActive() || $from_state->isCreationState()) {
-      $first = FALSE;
-    }
-    else {
-      // Let's ask other modules if the reversion is allowed. Reversing old and new sid!
-      $permitted = \Drupal::moduleHandler()->invokeAll('workflow', ['transition revert', $transition, $user]); // @todo: add revert operation.
-      // Stop if a module says so.
-      if (!in_array(FALSE, $permitted, TRUE)) {
-        // Add the operation - it is not vetoed.
-        // @todo: Pluggability problem: the revert_form route is fixed in WorkflowTransition Annotation. Add to some alter() function.
-        $operations['revert'] = [
-          'title' => t('Revert to last state'),
-          'url' => \Drupal\Core\Url::fromRoute('entity.workflow_transition.revert_form', ['workflow_transition' => $transition->id()]),
-          'query' => \Drupal::destination()->getAsArray(), // Add destination.
-          'weight' => 50,
-        ];
-
-        $first = FALSE;
-      }
-    }
-  }
-
-  return $operations;
-}
-
-/**
- * Implements hook_entity_operation_alter
- * This hook is not needed in this case.
- */
-//function workflow_operations_entity_operation_alter(array $operations, \Drupal\Core\Entity\EntityInterface $entity) {
-//}
diff --git a/modules/workflow/modules/workflow_operations/workflow_operations.permissions.yml b/modules/workflow/modules/workflow_operations/workflow_operations.permissions.yml
deleted file mode 100644
index b1281dc..0000000
--- a/modules/workflow/modules/workflow_operations/workflow_operations.permissions.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-permission_callbacks:
-  - \Drupal\workflow_operations\WorkflowPermissions::workflowTypePermissions
diff --git a/modules/workflow/modules/workflow_operations/workflow_operations.routing.yml b/modules/workflow/modules/workflow_operations/workflow_operations.routing.yml
deleted file mode 100644
index 7c95012..0000000
--- a/modules/workflow/modules/workflow_operations/workflow_operations.routing.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-### Workflow Transition CRUD
-entity.workflow_transition.revert_form:
-  path: '/workflow_transition/{workflow_transition}/revert'
-  defaults:
-    _entity_form: 'workflow_transition.revert'
-    _title: 'Revert Workflow transition'
-  requirements:
-#    _entity_access: 'workflow_transition.revert'
-    _custom_access: '\Drupal\workflow_operations\WorkflowAccessControlHandler::revertAccess'
-#    _access: 'true'
diff --git a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowListBuilder.php b/modules/workflow/modules/workflow_ui/src/Controller/WorkflowListBuilder.php
deleted file mode 100644
index 59550bd..0000000
--- a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowListBuilder.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-namespace Drupal\workflow_ui\Controller;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
-
-/**
- * Defines a class to build a listing of Workflow entities.
- *
- * @see \Drupal\workflow\Entity\Workflow
- */
-class WorkflowListBuilder extends ConfigEntityListBuilder {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    // return 'workflow_form';
-    return parent::getFormId();
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Building the header and content lines for the contact list.
-   *
-   * Calling the parent::buildHeader() adds a column for the possible actions
-   * and inserts the 'edit' and 'delete' links as defined for the entity type.
-   */
-  public function buildHeader() {
-    $header['id'] = $this->t('ID');
-    $header['label'] = $this->t('Label');
-    $header['status'] = $this->t('Status');
-
-    return $header + parent::buildHeader();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    /* @var $entity \Drupal\workflow\Entity\Workflow */
-    $row['id'] = $entity->id();
-    $row['label'] = $this->getLabel($entity);
-    $row['status'] = ''; // TODO $entity->getStatus();
-
-    return $row + parent::buildRow($entity);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefaultOperations(EntityInterface $entity) {
-    $operations = parent::getDefaultOperations($entity);
-
-    /* @var $workflow \Drupal\workflow\Entity\Workflow */
-    $workflow = $entity;
-
-    // Do not delete a Workflow if it contains content.
-    if (isset($operations['delete']) && !$workflow->isDeletable()) {
-      unset ($operations['delete']);
-    }
-
-    /**
-     * Allow modules to insert their own workflow operations to the list.
-     */
-    // This is what EntityListBuilder::getOperations() does:
-    // $operations = $this->getDefaultOperations($entity);
-    // $operations += $this->moduleHandler()->invokeAll('entity_operation', [$entity]);
-    // $this->moduleHandler->alter('entity_operation', $operations, $entity);
-
-    // In D8, the interface of below hook_workflow_operations has changed a bit.
-    // @see EntityListBuilder::getOperations, workflow_operations, workflow.api.php.
-    $operations += $this->moduleHandler()->invokeAll('workflow_operations', ['workflow', $workflow]);
-
-    return $operations;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function render() {
-    $build = parent::render();
-
-    /**
-     * Allow modules to insert their own top_action links to the list, like cleanup module.
-     *
-     * This is not done anymore via the workflow hook.
-     * Instead, for an example:
-     *   @see workflow_ui.links.action.yml
-     *   @see workflow.api.php under 'hook_workflow_operations'.
-     */
-    // $top_actions = \Drupal::moduleHandler()
-    //   ->invokeAll('workflow_operations', ['top_actions', NULL]);
-    // $top_actions_args = [
-    //   'links' => $top_actions,
-    //   'attributes' => ['class' => ['inline', 'action-links']],
-    // ];
-
-    return $build;
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowStateListBuilder.php b/modules/workflow/modules/workflow_ui/src/Controller/WorkflowStateListBuilder.php
deleted file mode 100644
index ad03f76..0000000
--- a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowStateListBuilder.php
+++ /dev/null
@@ -1,421 +0,0 @@
-<?php
-
-namespace Drupal\workflow_ui\Controller;
-
-use Drupal\Core\Config\Entity\DraggableListBuilder;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\workflow\Entity\WorkflowState;
-
-/**
- * Defines a class to build a draggable listing of Workflow State entities.
- *
- * @see \Drupal\workflow\Entity\WorkflowState
- */
-class WorkflowStateListBuilder extends DraggableListBuilder {
-
-  // @TODO D8-port WorkflowStateListBuilder: enable machine_name: interactive WorkflowState element.
-
-  /**
-   * Load the Transitions, and filter for Workflow type.
-   * {@inheritdoc}
-   */
-  public function load() {
-    $entities = [];
-
-    // Get the Workflow from the page.
-    /* @var $workflow \Drupal\workflow\Entity\Workflow */
-    if (!$workflow = workflow_url_get_workflow()) {
-      // @todo: Generate error message.
-      return $entities;
-    }
-    $wid = $url_wid = $workflow->id();
-
-    $entities = parent::load();
-    foreach ($entities as $key => $entity) {
-      if (!isset($entity->wid) || $entity->wid != $wid) {
-        unset($entities[$key]);
-      }
-    }
-
-    return $entities;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'workflow_state_form';
-    //return parent::getFormId();
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Building the header and content lines for the contact list.
-   *
-   * Calling the parent::buildHeader() adds a column for the possible actions
-   * and inserts the 'edit' and 'delete' links as defined for the entity type.
-   */
-  public function buildHeader() {
-    // The column 'weight' is added magically in the draggable EntityList.
-    //  $header['weight'] = $this->t('Weight');
-    // Some columns are not welcome in the list.
-    //  $header['module'] = $this->t('Module');
-    //  $header['wid'] = $this->t('Workflow');
-    //  $header['sysid'] = $this->t('Sysid');
-    // Column 'label' is manipulated in parent::buildForm(). So, we use 'label_new'.
-    //  $header['label'] = $this->t('Label');
-    $header['label_new'] = $this->t('Label');
-    $header['id'] = $this->t('ID');
-    $header['sysid'] = '';
-    $header['status'] = $this->t('Active');
-    $header['reassign'] = $this->t('Reassign');
-    $header['count'] = $this->t('Count');
-
-    return $header + parent::buildHeader();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    $row = [];
-
-    // Get the Workflow from the page.
-    /* @var $workflow \Drupal\workflow\Entity\Workflow */
-    if (!$workflow = workflow_url_get_workflow()) {
-      workflow_debug( __FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-    }
-    $wid = $url_wid = $workflow->id();
-
-    /* @var $entity \Drupal\workflow\Entity\WorkflowState */
-    $state = $entity;
-    $sid = $state->id();
-    $label = $state->label();
-    $count = $state->count();
-
-    // Build select options for reassigning states.
-    // We put a blank state first for validation.
-    $state_options = ['' => ' '];
-    $state_options += workflow_get_workflow_state_names($wid, $grouped = FALSE, $all = FALSE);
-
-    // Make it impossible to reassign to the same state that is disabled.
-    if ($state->isCreationState() || !$sid || !$state->isActive()) {
-      $current_state_options = [];
-    }
-    else {
-      $current_state = [$sid => $state_options[$sid]];
-      $current_state_options = array_diff($state_options, $current_state);
-    }
-
-    /*
-     *  Build the Row.
-     */
-    // The column 'weight' is added magically in the draggable EntityList.
-    //  $row['weight'] = $state->weight;
-    // Some columns are not welcome in the list.
-    //  $row['module'] = $state->getModule();
-    //  $row['wid'] = $state->getWorkflow();
-    // Column 'label' is manipulated in parent::buildForm(). So, we use 'label_new'.
-    //  $row['label'] = $state->label();
-    $row['label_new'] = [
-      '#markup' => $label,
-      '#type' => 'textfield',
-      '#size' => 30,
-      '#maxlength' => 255,
-      '#default_value' => $label,
-      '#title' => NULL, // This hides the red 'required' asterisk.
-      // '#required' => TRUE,
-    ];
-    $row['id'] = [
-      '#type' => 'machine_name',
-      '#title' => NULL, // This hides the red 'required' asterisk.
-      '#size' => 30,
-      '#description' => NULL,
-      '#disabled' => TRUE, // !$state->isNew(),
-      '#default_value' => $state->id(),
-      // N.B.: Keep machine_name in WorkflowState and ~ListBuilder aligned.
-      '#required' => FALSE,
-      // @TODO D8-port: enable machine_name: interactive WorkflowState element.
-      '#machine_name' => [
-        'exists' => [$this, 'exists'], // Local helper function, at the bottom of this class.
-//        'source' => ['label_new'],
-        'source' => ['states', $state->id(), 'label_new'],
-//        'replace_pattern' =>'([^a-z0-9_]+)|(^custom$)',
-        'replace_pattern' => '[^a-z0-9_()]+', // Added '()' characters from exclusion list since creation state has it.
-        'error' => $this->t('The machine-readable name must be unique, and can only contain lowercase letters, numbers, and underscores.'),
-      ],
-    ];
-    $row['sysid'] = [
-      '#type' => 'value',
-      '#value' => $state->sysid,
-    ];
-    $row['status'] = [
-      '#type' => 'checkbox',
-      '#default_value' => $state->isActive(),
-    ];
-    // The new value of states that are inactivated.
-    $row['reassign'] = [
-      '#type' => 'select',
-      '#options' => $current_state_options,
-    ];
-    $row['count'] = [
-      '#type' => 'value',
-      '#value' => $count,
-      '#markup' => $count,
-    ];
-
-    // Don't let the creation state change weight or status or name.
-    if ($state->isCreationState()) {
-      $row['label_new']['#disabled'] = TRUE;
-      $row['status']['#disabled'] = TRUE;
-      $row['reassign']['#type'] = 'hidden';
-      $row['reassign']['#disabled'] = TRUE;
-    }
-    // New state and disabled states cannot be reassigned.
-    if (!$sid || !$state->isActive() || ($count == 0) ) {
-      $row['reassign']['#type'] = 'hidden';
-      $row['reassign']['#disabled'] = TRUE;
-    }
-    // Disabled states cannot be renamed (and is a visual clue, too).
-    if (!$state->isActive()) {
-      $row['label_new']['#disabled'] = TRUE;
-    }
-
-    return $row + parent::buildRow($entity);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    // Get the Workflow from the page.
-    /* @var $workflow \Drupal\workflow\Entity\Workflow */
-    if (!$workflow = workflow_url_get_workflow()) {
-      return $form;
-    }
-    $wid = $workflow->getWorkflowId();
-
-    $form = parent::buildForm($form, $form_state);
-    // Add a sticky header.
-    $form[$this->entitiesKey] += [
-      '#sticky' => TRUE,
-    ];
-
-    // Build select options for reassigning states.
-    // We put a blank state first for validation.
-    $state_options = workflow_get_workflow_state_names($wid, $grouped = FALSE, $all = FALSE);
-    // Is this the last state available?
-    $form['#last_mohican'] = (count($state_options) == 1);
-
-    // Create a placeholder WorkflowState (It must NOT be saved to DB). Add it to the item list.
-    $sid = '';
-    $placeholder = $workflow->createState($sid, FALSE);
-    $placeholder->set('label', '');
-    $this->entities['placeholder'] = $placeholder;
-    $form['entities']['placeholder'] = $this->buildRow($placeholder);
-
-    // Rename 'submit' button.
-    $form['actions']['submit']['#value'] = t('Save');
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefaultOperations(EntityInterface $entity) {
-    $operations = parent::getDefaultOperations($entity);
-
-    /* @var $state \Drupal\workflow\Entity\WorkflowState */
-    $state = $entity;
-
-    // $workflow = $state->getWorkflow();
-
-    /**
-     * Allow modules to insert their own workflow operations to the list.
-     */
-    // This is what EntityListBuilder::getOperations() does:
-    // $operations = $this->getDefaultOperations($entity);
-    // $operations += $this->moduleHandler()->invokeAll('entity_operation', [$entity]);
-    // $this->moduleHandler->alter('entity_operation', $operations, $entity);
-
-    // In D8, the interface of below hook_workflow_operations has changed a bit.
-    // @see EntityListBuilder::getOperations, workflow_operations, workflow.api.php.
-    $operations += $this->moduleHandler()->invokeAll('workflow_operations', ['state', $state]);
-
-    return $operations;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-
-    foreach ($form_state->getValue($this->entitiesKey) as $sid => $value) {
-      if (isset($this->entities[$sid])) {
-        /* @var $state WorkflowState */
-        $state = $this->entities[$sid];
-
-        // Does user want to deactivate the state (reassign current content)?
-        if ($sid && $value['status'] == 0 && $state->isActive()) {
-          workflow_debug( __FILE__, __FUNCTION__, __LINE__, '', '');  // @todo D8-port: still test this snippet.
-          $args = ['%state' => $state->label()];
-          // Does that state have content in it?
-          if ($value['count'] > 0 && empty($value['reassign'])) {
-            if ($form['#last_mohican']) {
-              $message = 'Since you are deleting the last available
-                workflow state in this workflow, all content items
-                which are in that state will have their workflow state
-                removed.';
-              drupal_set_message($this->t($message, $args), 'warning');
-            }
-            else {
-              $message = 'The %state state has content; you must
-                reassign the content to another state.';
-              $form_state->setErrorByName("states'][$sid]['reassign'", $this->t($message, $args));
-            }
-          }
-        }
-
-        // Create the machine_name for new states.
-        // N.B.: Keep machine_name in WorkflowState and ~ListBuilder aligned.
-        if ($value['label_new'] && !$value['id']) {
-          //$message = 'Machine name is required.';
-          //$form_state->setErrorByName('machine_name', $this->t($message));
-        }
-
-      }
-    }
-    return;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Overrides DraggableListBuilder::submitForm().
-   * The WorkflowState entities are always saved.
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    //  parent::submitForm($form, $form_state);
-
-    // Get the Workflow from the page.
-    /* @var $workflow \Drupal\workflow\Entity\Workflow */
-    if (!$workflow = workflow_url_get_workflow()) {
-      return ;
-    }
-
-    // The default min_weight is -10. Work with it.
-    $creation_weight = -11;
-    $maxweight = $minweight = -9;
-    foreach ($form_state->getValue($this->entitiesKey) as $sid => $value) {
-      if (isset($this->entities[$sid])) {
-        /* @var $state WorkflowState */
-        $state = $this->entities[$sid];
-
-        // Is the new state name empty?
-        if (empty($value['label_new'])) {
-          // No new state entered, so skip it.
-          continue;
-        }
-
-        // Does user want to deactivate the state (reassign current content)?
-        if ($sid && $value['status'] == 0 && $state->isActive()) {
-          $new_sid = $value['reassign'];
-          $new_state = WorkflowState::load($new_sid);
-
-          $args = [
-            '%workflow' => $workflow->label(),
-            '%old_state' => $state->label(),
-            '%new_state' => isset($new_state) ? $new_state->label() : '',
-          ];
-
-          if ($value['count'] > 0) {
-            if ($form['#last_mohican']) {
-              $new_sid = NULL; // Do not reassign to new state.
-              $message = 'Removing workflow states from content in the %workflow.';
-              drupal_set_message($this->t($message, $args));
-            }
-            else {
-              // Prepare the state delete function.
-              $message = 'Reassigning content from %old_state to %new_state.';
-              drupal_set_message($this->t($message, $args));
-            }
-          }
-          // Delete the old state without orphaning content, move them to the new state.
-          $state->deactivate($new_sid);
-
-          $message = $this->t('Deactivated workflow state %old_state in %workflow.', $args);
-          \Drupal::logger('workflow')->notice($message, []);
-          drupal_set_message($message);
-        }
-
-        // Set a proper weight to the new state.
-        $maxweight = max($maxweight, $state->get($this->weightKey));
-
-        // Is this a new state?
-        if ($sid == 'placeholder' && empty(!$value['label_new'])) {
-          // New state, add it.
-          $state->set('id', $value['id']);
-          // Set a proper weight to the new state.
-          $state->set($this->weightKey, $maxweight + 1);
-        }
-        elseif ($value['sysid'] == WORKFLOW_CREATION_STATE) {
-          // Set a proper weight to the creation state.
-          $state->set($this->weightKey, $creation_weight);
-        }
-        else {
-          $state->set($this->weightKey, $value['weight']);
-        }
-        $state->set('label', $value['label_new']);
-        $state->set('status', $value['status']);
-
-        $state->save();
-      }
-
-    }
-    drupal_set_message(t('The Workflow states have been updated.'));
-
-    return;
-  }
-
-  /**
-   * Validate duplicate machine names. Function registered in 'machine_name'
-   * form element.
-   *
-   * @param string $name
-   * @param array $element
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *
-   * @return bool
-   */
-  function exists($name, array $element, FormStateInterface $form_state) {
-    $state_names = [];
-    foreach ($form_state->getValue($this->entitiesKey) as $sid => $value) {
-      $state_names[] = $value['id'];
-    }
-
-    $state_names = array_map('strtolower', $state_names);
-    $result = array_unique(array_diff_assoc($state_names, array_unique($state_names)));
-
-    if (in_array($name, $result)) {
-      return TRUE;
-    }
-    return FALSE;
-  }
-
-  /**
-   * Returns the form builder.
-   *
-   * @return \Drupal\Core\Form\FormBuilderInterface
-   *   The form builder.
-   */
-  protected function formBuilder() {
-    if (!$this->formBuilder) {
-      $this->formBuilder = \Drupal::formBuilder();
-    }
-    return $this->formBuilder;
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowUiController.php b/modules/workflow/modules/workflow_ui/src/Controller/WorkflowUiController.php
deleted file mode 100644
index 6287a72..0000000
--- a/modules/workflow/modules/workflow_ui/src/Controller/WorkflowUiController.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\workflow_ui\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-
-/**
- * Returns responses for Workflow UI routes.
- */
-class WorkflowUiController extends ControllerBase {
-  /**
-   * Returns the settings page.
-   *
-   * @return array
-   *   Renderable array.
-   */
-  public function settingsForm() {
-    $element = [
-      '#markup' => 'Workflow settings form is not implemented yet.',
-    ];
-    return $element;
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionFormBase.php b/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionFormBase.php
deleted file mode 100644
index 71b513d..0000000
--- a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionFormBase.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-namespace Drupal\workflow_ui\Form;
-
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\workflow\Entity\WorkflowState;
-
-/**
- * Defines a class to build a draggable listing of Workflow Config Transitions entities.
- *
- * @see \Drupal\workflow\Entity\WorkflowConfigTransition
- */
-abstract class WorkflowConfigTransitionFormBase extends ConfigFormBase {
-
-  /**
-   * The key to use for the form element containing the entities.
-   *
-   * @var string
-   */
-  protected $entitiesKey = 'entities';
-
-  /**
-   * The WorkflowConfigTransition form type.
-   *
-   * @var string
-   */
-  protected $type;
-
-  /**
-   * The entities being listed.
-   *
-   * @var \Drupal\Core\Entity\EntityInterface[]
-   */
-  protected $entities = [];
-
-  /**
-   * The workflow object.
-   *
-   * @var \Drupal\workflow\Entity\Workflow
-   */
-  protected $workflow;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct() {
-    // The $this->type and $this->entitiesKey must be set in the var section.
-
-    // Get the Workflow from the page.
-    $this->workflow = workflow_url_get_workflow();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'workflow_config_transition_' . $this->type . '_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Create an $entity for every ConfigTransition.
-   */
-  public function load() {
-    $entities = [];
-
-    $entity_type = $this->entitiesKey;
-    $workflow = $this->workflow;
-    $states = $workflow->getStates($all = 'CREATION');
-
-    if ($states) {
-      /* @var $from_state WorkflowState */
-      /* @var $to_state WorkflowState */
-      switch ($entity_type) {
-        case 'workflow_state':
-          foreach ($states as $from_state) {
-            $from_sid = $from_state->id();
-            $entities[$from_sid] = $from_state;
-          }
-          break;
-
-        case 'workflow_config_transition':
-          foreach ($states as $from_state) {
-            $from_sid = $from_state->id();
-            foreach ($states as $to_state) {
-              $to_sid = $to_state->id();
-
-              // Don't allow transition TO (creation).
-              if ($to_state->isCreationState()) {
-                continue;
-              }
-//            // Only allow transitions from $from_state.
-//            if ($state->id() <> $from_state->id()) {
-//              continue;
-//            }
-
-              // Load existing config_transitions. Create if not found.
-              $config_transitions = $workflow->getTransitionsByStateId($from_sid, $to_sid);
-              if (!$config_transition = reset($config_transitions)) {
-                $config_transition = $workflow->createTransition($from_sid, $to_sid);
-              }
-              $entities[] = $config_transition;
-            }
-          }
-          break;
-
-        default:
-          drupal_set_message(t('Improper type provided in load method.'), 'error');
-          \Drupal::logger('workflow_ui')->notice('Improper type provided in load method.', []);
-          return $entities;
-      }
-    }
-    return $entities;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-//  abstract public function buildHeader();
-
-  /**
-   * {@inheritdoc}
-   */
-//  abstract public function buildRow(EntityInterface $entity);
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form = [];
-
-    if (!$this->workflow) {
-      return $form;
-    }
-
-    /*
-     * Begin of copied code DraggableListBuilder::buildForm()
-     */
-    $form[$this->entitiesKey] = [
-      '#type' => 'table',
-      '#header' => $this->buildHeader(),
-      '#sticky' => TRUE,
-      '#empty' => t('There is no @label yet.', ['@label' => 'Transition']),
-      '#tabledrag' => [['action' => 'order', 'relationship' => 'sibling', 'group' => 'weight', ], ],
-    ];
-
-    $this->entities = $this->load();
-    $delta = 10;
-    // Change the delta of the weight field if have more than 20 entities.
-    if (!empty($this->weightKey)) {
-      $count = count($this->entities);
-      if ($count > 20) {
-        $delta = ceil($count / 2);
-      }
-    }
-    foreach ($this->entities as $entity) {
-      $row = $this->buildRow($entity);
-      if (isset($row['label'])) {
-        $row['label'] = ['#markup' => $row['label']];
-      }
-      if (isset($row['weight'])) {
-        $row['weight']['#delta'] = $delta;
-      }
-      $form[$this->entitiesKey][$entity->id()] = $row;
-    }
-    /*
-     * End of copied code DraggableListBuilder::buildForm()
-     */
-
-    $form = parent::buildForm($form, $form_state);
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    parent::validateForm($form, $form_state);
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionLabelForm.php b/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionLabelForm.php
deleted file mode 100644
index 090f3f9..0000000
--- a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionLabelForm.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\workflow_ui\Form;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Defines a class to build a draggable listing of Workflow Config Transitions entities.
- *
- * @see \Drupal\workflow\Entity\WorkflowConfigTransition
- */
-class WorkflowConfigTransitionLabelForm extends WorkflowConfigTransitionFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $entitiesKey = 'workflow_config_transition';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $type = 'label';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildHeader() {
-    $header = [
-      'from' => t('Transition from'),
-      'to' => t('Transition to'),
-      'label_new' => t('label'),
-      'config_transition' => '',
-    ];
-
-    return $header;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    $row = [];
-
-    $workflow = $this->workflow;
-    if ($workflow) {
-      /* @var $entity \Drupal\workflow\Entity\WorkflowConfigTransition */
-      $config_transition = $entity;
-
-      static $previous_from_sid = -1;
-      // Get transitions, sorted by weight of the old state.
-      $from_state = $config_transition->getFromState();
-      $to_state = $config_transition->getToState();
-      $from_sid = $from_state->id();
-
-      // Skip the transitions without any roles.
-      $skip = TRUE;
-      foreach ($config_transition->roles as $rid => $active) {
-        if ($active) {
-          $skip = FALSE;
-        }
-      }
-      if ($skip == TRUE && ($from_state != $to_state)) {
-        return $row;
-      }
-
-      $row['from'] = [
-        '#type' => 'value',
-        '#markup' => ($previous_from_sid != $from_sid) ? $from_state->label() : '"',
-      ];
-      $row['to'] = [
-        '#type' => 'value',
-        '#markup' => $to_state->label(),
-      ];
-      $row['label_new'] = [
-        '#type' => 'textfield',
-        '#default_value' => $config_transition->get('label'),
-      ];
-      $row['config_transition'] = [
-        '#type' => 'value',
-        '#value' => $config_transition,
-      ];
-
-      $previous_from_sid = $from_sid;
-    }
-    return $row;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    foreach ($form_state->getValue($this->entitiesKey) as $key => $value) {
-      $new_label = trim($value['label_new']);
-      $value['config_transition']
-        ->set('label', $new_label)
-        ->save();
-    }
-
-    drupal_set_message(t('The transition labels have been saved.'));
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionRoleForm.php b/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionRoleForm.php
deleted file mode 100644
index 19377ad..0000000
--- a/modules/workflow/modules/workflow_ui/src/Form/WorkflowConfigTransitionRoleForm.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-namespace Drupal\workflow_ui\Form;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\workflow\Entity\WorkflowConfigTransition;
-use Drupal\workflow\Entity\WorkflowState;
-
-/**
- * Defines a class to build a listing of Workflow Config Transitions entities.
- *
- * @see \Drupal\workflow\Entity\WorkflowConfigTransition
- */
-class WorkflowConfigTransitionRoleForm extends WorkflowConfigTransitionFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $entitiesKey = 'workflow_state';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $type = 'permission';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildHeader() {
-    $header = [];
-
-    $workflow = $this->workflow;
-    $states = $workflow->getStates($all = 'CREATION');
-    if ($states) {
-      $header['label_new'] = t('From \ To');
-
-      /* @var $state WorkflowState */
-      foreach ($states as $state) {
-        // Don't allow transition TO (creation).
-        if (!$state->isCreationState()) {
-          $header[$state->id()] = t('@label', ['@label' => $state->label()]);
-        }
-      }
-    }
-    return $header;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Builds a row for the following table:
-   *   Transitions, for example:
-   *     18 => [
-   *       20 => [
-   *         'author' => 1,
-   *         1        => 0,
-   *         2        => 1,
-   *       ]
-   *     ]
-   *   means the transition from state 18 to state 20 can be executed by
-   *   the content author or a user in role 2. The $transitions array should
-   *   contain ALL transitions for the workflow.
-   */
-  public function buildRow(EntityInterface $entity) {
-    $row = [];
-
-    $workflow = $this->workflow;
-    if ($workflow) {
-      // Each $entity is a from-state.
-      /* @var $entity \Drupal\workflow\Entity\WorkflowState */
-      $from_state = $entity;
-      $from_sid = $from_state->id();
-
-      /* @var $states WorkflowState[] */
-      $states = $workflow->getStates($all = 'CREATION');
-      if ($states) {
-        // Only get the roles with proper permission + Author role.
-        $type_id = $workflow->id();
-        $roles = workflow_get_user_role_names("create $type_id workflow_transition");
-        // Prepare default value for 'stay_on_this_state'.
-        $allow_all_roles = []; // array_combine (array_keys($roles) , array_keys($roles));
-
-        /* @var $state WorkflowState */
-        foreach ($states as $state) {
-          $row['to'] = [
-            '#type' => 'value',
-            '#markup' => t('@label', ['@label' => $from_state->label()]),
-          ];
-
-          /* @var $to_state WorkflowState */
-          foreach ($states as $to_state) {
-            // Don't allow transition TO (creation).
-            if ($to_state->isCreationState()) {
-              continue;
-            }
-            // Only allow transitions from $from_state.
-            if ($state->id() <> $from_state->id()) {
-              continue;
-            }
-            $to_sid = $to_state->id();
-            $stay_on_this_state = ($to_sid == $from_sid);
-
-            // Load existing config_transitions. Create if not found.
-            $config_transitions = $workflow->getTransitionsByStateId($from_sid, $to_sid);
-            if (!$config_transition = reset($config_transitions)) {
-              $config_transition = $workflow->createTransition($from_sid, $to_sid);
-            }
-
-            $row[$to_sid]['workflow_config_transition'] = ['#type' => 'value', '#value' => $config_transition, ];
-            $row[$to_sid]['roles'] = [
-              '#type' => $stay_on_this_state ? 'checkboxes' : 'checkboxes',
-              '#options' => $stay_on_this_state ? [] : $roles,
-              '#disabled' => $stay_on_this_state,
-              // When $stay_on_this_state, allow all roles.
-              '#default_value' => $stay_on_this_state ? $allow_all_roles : $config_transition->roles,
-            ];
-          }
-        }
-      }
-    }
-    return $row;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $workflow = $this->workflow;
-    // Make sure 'author' is checked for (creation) -> [something].
-    $creation_state = $workflow->getCreationState();
-
-    if (empty($form_state->getValue($this->entitiesKey))) {
-      $author_has_permission = TRUE;
-    }
-    else {
-      $author_has_permission = FALSE;
-      foreach ($form_state->getValue($this->entitiesKey) as $from_sid => $to_data) {
-        foreach ($to_data as $to_sid => $transition_data) {
-          if ($from_sid == $to_sid) {
-            // Same-state-transition do not count.
-          }
-          elseif (!empty($transition_data['roles'][WORKFLOW_ROLE_AUTHOR_RID])) {
-            $author_has_permission = TRUE;
-            break;
-          }
-        }
-      }
-    }
-    if (!$author_has_permission) {
-      $form_state->setErrorByName('id', t('Please give the author permission to go from %creation to at least one state!',
-        ['%creation' => $creation_state->label()]));
-    }
-
-    return;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-
-    foreach ($form_state->getValue($this->entitiesKey) as $from_sid => $to_data) {
-      foreach ($to_data as $transition_data) {
-        /* @var $config_transition WorkflowConfigTransition */
-        if (isset($transition_data['workflow_config_transition'])) {
-          $config_transition = $transition_data['workflow_config_transition'];
-          $config_transition->roles = $transition_data['roles'];
-          $config_transition->save();
-        }
-        else {
-          // Should not be possible.
-          // $config_transition = [];
-        }
-      }
-    }
-
-    drupal_set_message(t('The workflow was updated.'));
-  }
-
-}
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.info.yml b/modules/workflow/modules/workflow_ui/workflow_ui.info.yml
deleted file mode 100644
index d777b01..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.info.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: 'Workflow UI'
-description: 'Administrative UI for Workflow.'
-package: Workflow
-type: module
-# core: 8.x
-# version: VERSION
-
-configure: entity.workflow_type.collection
-
-dependencies:
-  - workflow
-
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.install b/modules/workflow/modules/workflow_ui/workflow_ui.install
deleted file mode 100644
index c2b2f66..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.install
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, update and uninstall functions for the workflow_ui module.
- */
-
-/**
- * Implements hook_install().
- */
-function workflow_ui_install() {
-  $url = \Drupal\Core\Url::fromRoute('user.admin_permissions', [],
-    ['fragment' => 'module-workflow']);
-  $message = t("Please review which roles may 'participate in workflows'
-    <a href=':url'>on the Permissions page</a>.",
-    [':url' => $url->toString()]);
-  drupal_set_message($message);
-}
-
-/**
- * Drupal 8 updates.
- */
-function workflow_ui_update_8001(&$sandbox) {
-}
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.links.action.yml b/modules/workflow/modules/workflow_ui/workflow_ui.links.action.yml
deleted file mode 100644
index 6e43aff..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.links.action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Action links for Workflow UI.
-
-### Workflow related actions.
-workflow_type_add_action:
-  route_name: entity.workflow_type.add_form
-  title: 'Add workflow'
-  weight: 1
-  appears_on:
-    - entity.workflow_type.collection
-
-### Workflow State related actions.
-
-### Workflow Transition related actions.
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.links.menu.yml b/modules/workflow/modules/workflow_ui/workflow_ui.links.menu.yml
deleted file mode 100644
index 66f173f..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.links.menu.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Menu links for Workflow UI.
-
-workflow.ui.workflows:
-  title: 'Workflow'
-  route_name: entity.workflow_type.collection
-  parent: system.admin_config_workflow
-  description: 'Workflow administration overview.'
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.links.task.yml b/modules/workflow/modules/workflow_ui/workflow_ui.links.task.yml
deleted file mode 100644
index 573c111..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.links.task.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Menu tasks for Workflow UI.
-
-workflow.ui.settings:
-  title: 'Settings'
-  route_name: workflow.ui.settings
-  base_route: entity.workflow_type.collection
-  weight: 9
-workflow.ui.workflows:
-  title: 'Workflows'
-  route_name: entity.workflow_type.collection
-  base_route: entity.workflow_type.collection
-  weight: 1
-
-workflow.ui.workflow_states:
-  title: 'States'
-  route_name: entity.workflow_state.collection
-  base_route: entity.workflow_type.edit_form
-  weight: -4
-workflow.ui.workflow_transitions:
-  title: 'Transitions'
-  route_name: entity.workflow_transition.collection
-  base_route: entity.workflow_type.edit_form
-  weight: -3
-workflow.ui.workflow_labels:
-  title: 'Transition labels'
-  route_name: entity.workflow_label.collection
-  base_route: entity.workflow_type.edit_form
-  weight: -2
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.module b/modules/workflow/modules/workflow_ui/workflow_ui.module
deleted file mode 100644
index bfce242..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.module
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/**
- * @file
- * Provides administrative UI for workflow.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Implements hook_help().
- */
-function workflow_ui_help($route_name, RouteMatchInterface $route_match) {
-
-  switch ($route_name) {
-    case 'entity.workflow_transition.field_ui_fields':
-      return t('This page allows you to add fields to the Workflow form.
-        Normally this is an advanced action, which is not needed in
-        regular use cases.');
-
-    case 'entity.workflow_type.collection':
-      return t('This page allows you to maintain Workflows. Once a workflow is
-        created, you can maintain your entity type and add a Field of type
-        \'Workflow\'.');
-
-    case 'entity.workflow_type.add_form':
-      return '';
-
-    case 'entity.workflow_state.collection':
-      return t("To create a new state, enter its name in the last row of the
-        'State' column. Check the 'Active' box to make it effective. You may
-        also drag it to the appropriate position.") . '<br />'
-      . t("A state must be marked as active, to be available in the
-        workflow's transitions.") . '<br />'
-      . t("If you wish to inactivate a state that has content (i.e. count is
-        not zero), then you need to select a state to which to reassign that
-        content.");
-
-    case 'entity.workflow_transition.collection':
-      $url = \Drupal\Core\Url::fromRoute('user.admin_permissions', [],
-        ['fragment' => 'module-workflow']);
-      return t('You are currently viewing the possible transitions to and from
-        workflow states. The state is shown in the left column; the state to be
-        moved to is to the right. For each transition, check the box next to
-        the role(s) that may initiate the transition. For example, if only the
-        "production editor" role may move content from Review state to the
-        Published state, check the box next to "production editor". The author
-        role is built in and refers to the user who authored the content.')
-      . '<br /><i>'
-      . t("If not all roles are in the list, please review which roles may
-        'participate in workflows' on <a href=':url'>the Permissions page</a>.
-        On that page, uncheck the 'Authenticated user' role temporarily to
-        view the permissions of each separate role.</i>",
-        [':url' => $url->toString()]);
-
-    case 'entity.workflow_label.collection':
-      return t('You can add labels to transitions if you don\'t like the
-        standard state labels. They will modify the Workflow form options, so
-        specific workflow transitions can have their own labels, relative to
-        the beginning and ending states. Rather than showing the user a
-        workflow box containing options like "review required" as a state in
-        the workflow, it could say "move to the editing department for grammar
-        review".');
-  }
-  return [];
-}
-
-/**
- * Helper function to determine Workflow from Workflow UI URL.
- *
- * @deprecated : @see workflow_url_get_workflow .
- */
-function workflow_ui_url_get_workflow($url = '' ) {
-  return workflow_url_get_workflow($url);
-}
-
-/**
- * Helper function to determine the title of the page.
- *
- * @deprecated : @see workflow_url_get_title .
- */
-function workflow_ui_url_get_title() {
-  return workflow_url_get_title();
-}
-
-/**
- * Helper function to determine Workflow from Workflow UI URL.
- *
- * @deprecated : @see workflow_url_get_form_type .
- */
-function workflow_ui_url_get_form_type($url = '' ) {
-  return workflow_url_get_form_type($url);
-}
diff --git a/modules/workflow/modules/workflow_ui/workflow_ui.routing.yml b/modules/workflow/modules/workflow_ui/workflow_ui.routing.yml
deleted file mode 100644
index 93c16fc..0000000
--- a/modules/workflow/modules/workflow_ui/workflow_ui.routing.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Declaration of Workflow UI routings.
-
-# copy from WorkflowUIController.php
-# https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Entity%21entity.api.php/group/entity_api/8
-
-### Workflow settings form
-workflow.ui.settings:
-  path: '/admin/config/workflow/workflow/settings'
-  defaults:
-    _controller: '\Drupal\workflow_ui\Controller\WorkflowUiController::settingsForm'
-    _title: 'Workflow settings'
-  requirements:
-    _permission: 'administer workflow'
-
-
-### Workflow States
-entity.workflow_state.collection:
-  path: '/admin/config/workflow/workflow/{workflow_type}/states'
-  defaults:
-    _entity_list: 'workflow_state'
-#    _controller: '\workflow\EntityWorkflowUIController::adminOverview'
-    _title: 'Edit Workflow'
-    _title_callback: 'workflow_url_get_title'
-  requirements:
-    _permission: 'administer workflow'
-
-
-### Workflow Transitions
-entity.workflow_transition.collection:
-  path: '/admin/config/workflow/workflow/{workflow_type}/transition_roles'
-  defaults:
-    _form: 'Drupal\workflow_ui\Form\WorkflowConfigTransitionRoleForm'
-    _title: 'Edit Workflow'
-    _title_callback: 'workflow_url_get_title'
-  requirements:
-    _permission: 'administer workflow'
-
-### Workflow Labels
-entity.workflow_label.collection:
-  path: '/admin/config/workflow/workflow/{workflow_type}/transition_labels'
-  defaults:
-    _form: 'Drupal\workflow_ui\Form\WorkflowConfigTransitionLabelForm'
-    _title: 'Edit Workflow'
-    _title_callback: 'workflow_url_get_title'
-  requirements:
-    _permission: 'administer workflow'
diff --git a/modules/workflow/src/Controller/WorkflowTransitionListController.php b/modules/workflow/src/Controller/WorkflowTransitionListController.php
deleted file mode 100644
index 225fd28..0000000
--- a/modules/workflow/src/Controller/WorkflowTransitionListController.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Controller;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Datetime\DateFormatter;
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Entity\Controller\EntityListController;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\workflow\Entity\WorkflowManager;
-use Drupal\workflow\Entity\WorkflowTransition;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Returns responses for Workflow routes.
- */
-class WorkflowTransitionListController extends EntityListController implements ContainerInjectionInterface {
-
-  /**
-   * The date formatter service.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatter
-   */
-  protected $dateFormatter;
-
-  /**
-   * The renderer service.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * Constructs an object.
-   *
-   * @param \Drupal\Core\Datetime\DateFormatter $date_formatter
-   *   The date formatter service.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer service.
-   */
-  public function __construct(DateFormatter $date_formatter, RendererInterface $renderer) {
-    // These parameters are taken from some random other controller.
-    $this->dateFormatter = $date_formatter;
-    $this->renderer = $renderer;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('date.formatter'),
-      $container->get('renderer')
-    );
-  }
-
-  /**
-   * Generates an overview table of older revisions of a node,
-   * but only if this::historyAccess() allows it.
-   *
-   * @param EntityInterface $node
-   *   A node object.
-   * @return array An array as expected by drupal_render().
-   * An array as expected by drupal_render().
-   */
-  public function historyOverview(EntityInterface $node = NULL) {
-    $form = [];
-
-    /*
-     * Get data from parameters.
-     */
-
-    // @todo D8-port: make Workflow History tab happen for every entity_type.
-    // For workflow_tab_page with multiple workflows, use a separate view. See [#2217291].
-    // @see workflow.routing.yml, workflow.links.task.yml, WorkflowTransitionListController.
-    //    workflow_debug(__FILE__, __FUNCTION__, __LINE__);  // @todo D8-port: still test this snippet.
-    // ATM it only works for Nodes and Terms.
-    // This is a hack. The Route should always pass an object.
-    // On view tab, $entity is object,
-    // On workflow tab, $entity is id().
-    // Get the entity for this form.
-    if (!$entity = workflow_url_get_entity($node)) {
-      return $form;
-    }
-
-    /*
-     * Get derived data from parameters.
-     */
-    if (!$field_name = workflow_get_field_name($entity, workflow_url_get_field_name())) {
-      return $form;
-    }
-
-    /*
-     * Step 1: generate the Transition Form.
-     */
-    // Create a transition, to pass to the form. No need to use setValues().
-    $current_sid = workflow_node_current_state($entity, $field_name);
-    $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
-    $transition->setTargetEntity($entity);
-    // Add the WorkflowTransitionForm to the page.
-    $form = $this->entityFormBuilder()->getForm($transition, 'add');
-
-    /*
-     * Step 2: generate the Transition History List.
-     */
-    $entity_type = 'workflow_transition';
-    // $form = $this->listing('workflow_transition');
-    $list_builder = $this->entityTypeManager()->getListBuilder($entity_type);
-    // Add the Node explicitly, since $list_builder expects a Transition.
-    $list_builder->workflow_entity = $entity;
-
-    $form += $list_builder->render();
-
-    /*
-     * Finally: sort the elements (overriding their weight).
-     */
-    // $form['#weight'] = 10;
-    $form['actions']['#weight'] = 100;
-    $form['table']['#weight'] = 201;
-
-    return $form;
-  }
-
-  /**
-   * Menu access control callback. Checks access to Workflow tab.
-   *
-   * This used to be D7-function workflow_tab_access($user, $entity).
-   *
-   * The History tab should not be used with multiple workflows per entity.
-   * Use the dedicated view for this use case.
-   * @todo D8: remove this in favour of View 'Workflow history per entity'.
-   * @todo D8-port: make this workf for non-Node entity types.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   Run access checks for this account.
-   *
-   * @return \Drupal\Core\Access\AccessResult
-   */
-  public function historyAccess(AccountInterface $account) {
-    static $access = [];
-
-    $uid = ($account) ? $account->id() : -1;
-
-    // @todo D8-port: make Workflow History tab happen for every entity_type.
-    // @see workflow.routing.yml, workflow.links.task.yml, WorkflowTransitionListController.
-    // ATM it only works for Nodes and Terms.
-    // This is a hack. The Route should always pass an object.
-    // On view tab, $entity is object,
-    // On workflow tab, $entity is id().
-    // Get the entity for this form.
-    $entity = workflow_url_get_entity();
-
-    /* @var $entity EntityInterface */
-    // Figure out the $entity's bundle and id.
-    $entity_type = $entity->getEntityTypeId();
-    $entity_bundle = $entity->bundle();
-    $entity_id = ($entity) ? $entity->id() : '';
-    $field_name = workflow_url_get_field_name();
-
-    if (isset($access[$uid][$entity_type][$entity_id][$field_name ? $field_name : 'no_field'])) {
-      return $access[$uid][$entity_type][$entity_id][$field_name ? $field_name : 'no_field'];
-    }
-
-    $access_result = AccessResult::forbidden();
-
-    // When having multiple workflows per bundle, use Views display
-    // 'Workflow history per entity' instead!
-    $fields = _workflow_info_fields($entity, $entity_type, $entity_bundle, $field_name);
-    if (!$fields) {
-      return AccessResult::forbidden();
-    }
-    else {
-      // @todo: Keep below code aligned between WorkflowState, ~Transition, ~TransitionListController
-      $uid = ($account) ? $account->id() : -1;
-      $entity_id = ($entity) ? $entity->id() : '';
-      // Determine if user is owner of the entity.
-      $is_owner = WorkflowManager::isOwner($account, $entity);
-
-      /**
-       * Determine if user has Access. Fill the cache.
-       */
-      // @todo: what to do with multiple workflow_fields per bundle? Use Views instead! Or introduce a setting.
-      // @todo D8-port: workflow_tab_access: use proper 'WORKFLOW_TYPE' permissions
-      foreach ($fields as $definition) {
-        $type_id = $definition->getSetting('workflow_type');
-        if ($account->hasPermission("access any $type_id workflow_transion overview")) {
-          $access_result = AccessResult::allowed();
-        }
-        elseif ($is_owner && $account->hasPermission("access own $type_id workflow_transion overview")) {
-          $access_result = AccessResult::allowed();
-        }
-        elseif ($account->hasPermission('administer nodes')) {
-          $access_result = AccessResult::allowed();
-        }
-        $access[$uid][$entity_type][$entity_id][$field_name ? $field_name : 'no_field'] = $access_result;
-      }
-    }
-    return $access_result;
-  }
-
-}
diff --git a/modules/workflow/src/Element/WorkflowTransitionElement.php b/modules/workflow/src/Element/WorkflowTransitionElement.php
deleted file mode 100644
index 8ce6717..0000000
--- a/modules/workflow/src/Element/WorkflowTransitionElement.php
+++ /dev/null
@@ -1,576 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Element;
-
-use Drupal\comment\CommentInterface;
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element;
-use Drupal\Core\Render\Element\FormElement;
-use Drupal\workflow\Entity\Workflow;
-use Drupal\workflow\Entity\WorkflowScheduledTransition;
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-
-/**
- * Provides a form element for the WorkflowTransitionForm and ~Widget.
- *
- * Properties:
- * - #return_value: The value to return when the checkbox is checked.
- *
- * @see \Drupal\Core\Render\Element\FormElement
- * @see https://www.drupal.org/node/169815 "Creating Custom Elements"
- *
- * @FormElement("workflow_transition")
- */
-class WorkflowTransitionElement extends FormElement {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getInfo() {
-    $class = get_class($this);
-    return [
-      '#input' => TRUE,
-      '#return_value' => 1,
-      '#process' => [
-        [$class, 'processTransition'],
-        [$class, 'processAjaxForm'],
-        //array($class, 'processGroup'),
-      ],
-      '#element_validate' => [
-        [$class, 'validateTransition'],
-      ],
-      '#pre_render' => [
-        [$class, 'preRenderTransition'],
-        //array($class, 'preRenderGroup'),
-      ],
-      //'#theme' => 'input__checkbox',
-      //'#theme' => 'input__textfield',
-      '#theme_wrappers' => ['form_element'],
-      //'#title_display' => 'after',
-    ];
-  }
-
-  /**
-   * Form element validation handler.
-   *
-   * Note that #maxlength is validated by _form_validate() already.
-   *
-   * This checks that the submitted value:
-   * - Does not contain the replacement character only.
-   * - Does not contain disallowed characters.
-   * - Is unique; i.e., does not already exist.
-   * - Does not exceed the maximum length (via #maxlength).
-   * - Cannot be changed after creation (via #disabled).
-   *
-   * @param array $element Reference to the Form element
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   * @param array $complete_form
-   */
-  public static function validateTransition(&$element, FormStateInterface $form_state, &$complete_form) {
-    workflow_debug( __FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-  }
-
-  /**
-   * Generate an element.
-   *
-   * This function is referenced in the Annotation for this class.
-   *
-   * @param $element
-   * @param FormStateInterface $form_state
-   * @param $complete_form
-   *
-   * @return array
-   *   The Workflow element
-   */
-  public static function processTransition(&$element, FormStateInterface $form_state, &$complete_form) {
-    workflow_debug( __FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-    return self::transitionElement($element, $form_state, $complete_form);
-  }
-
-  /**
-   * Generate an element.
-   *
-   * This function is an internal function, to be reused in:
-   * - TransitionElement
-   * - TransitionDefaultWidget
-   *
-   * Usage:
-   * @example $element['#default_value'] = $transition;
-   * @example $element += WorkflowTransitionElement::transitionElement($element, $form_state, $form);
-   *
-   * @param array $element Reference to the form element
-   * @param FormStateInterface $form_state
-   * @param array $complete_form
-   *
-   * @return array
-   *   The form element
-   */
-  public static function transitionElement(&$element, FormStateInterface $form_state, &$complete_form) {
-    // $element = [];
-
-    /*
-     * Input.
-     */
-    // A Transition object must have been set explicitly.
-    /** @var $transition WorkflowTransitionInterface */
-    $transition = $element['#default_value'];
-    /** @var $user \Drupal\Core\Session\AccountInterface */
-    $user = \Drupal::currentUser();
-
-    /*
-     * Derived input.
-     */
-    $field_name = $transition->getFieldName();
-    $workflow = $transition->getWorkflow();
-    $wid = $transition->getWorkflowId();
-    $force = $transition->isForced();
-    $entity = $transition->getTargetEntity();
-    $entity_type = $transition->getTargetEntityTypeId();
-    $entity_id = $transition->getTargetEntityId();
-
-    if ($transition->isExecuted()) {
-      // We are editing an existing/executed/not-scheduled transition.
-      // Only the comments may be changed!
-
-      $current_sid = $from_sid = $transition->getFromSid();
-      // The states may not be changed anymore.
-      $to_state = $transition->getToState();
-      $options = [$to_state->id() => $to_state->label()];
-      // We need the widget to edit the comment.
-      $show_widget = TRUE;
-      $default_value = $transition->getToSid();
-    }
-    elseif ($entity) {
-      // Normal situation: adding a new transition on an new/existing entity.
-
-      // Get the scheduling info, only when updating an existing entity.
-      // This may change the $default_value on the Form.
-      // Technically you could have more than one scheduled transition, but
-      // this will only add the soonest one.
-      // @todo: Read the history with an explicit langcode?
-      $langcode = ''; // $entity->language()->getId();
-      if ($entity_id && $scheduled_transition = WorkflowScheduledTransition::loadByProperties($entity_type, $entity_id, [], $field_name, $langcode)) {
-        $transition = $scheduled_transition;
-      }
-
-      $current_sid = $from_sid = $transition->getFromSid();
-      $current_state = $from_state = $transition->getFromState();
-      $options = ($current_state) ? $current_state->getOptions($entity, $field_name, $user, FALSE) : [];
-      $show_widget = ($from_state) ? $from_state->showWidget($entity, $field_name, $user, FALSE) : [];
-      $default_value = $from_sid;
-      $default_value = ($from_state && $from_state->isCreationState()) ? $workflow->getFirstSid($entity, $field_name, $user, FALSE) : $default_value;
-      $default_value = ($transition->isScheduled()) ? $transition->getToSid() : $default_value;
-    }
-    elseif (!$entity) {
-      // Sometimes, no entity is given. We encountered the following cases:
-      // - D7: the Field settings page,
-      // - D7: the VBO action form;
-      // - D7/D8: the Advance Action form on admin/config/system/actions;
-      // If so, show all options for the given workflow(s).
-      if (!$temp_state = $transition->getFromState()) {
-        $temp_state = $transition->getToState();
-      }
-      $options = ($temp_state)
-        ? $temp_state->getOptions($entity, $field_name, $user, FALSE)
-        : workflow_get_workflow_state_names($wid, $grouped = TRUE, $all = FALSE);
-      $show_widget = TRUE;
-      $current_sid = $transition->getToSid(); // @todo
-      $default_value = $from_sid = $transition->getToSid(); // @todo
-    }
-    else {
-      // We are in trouble! A message is already set in workflow_node_current_state().
-      $options = [];
-      $current_sid = 0;
-      $show_widget = FALSE;
-      $default_value = FALSE;
-    }
-
-    // Fetch the form ID. This is unique for each entity, to allow multiple form per page (Views, etc.).
-    // Make it uniquer by adding the field name, or else the scheduling of
-    // multiple workflow_fields is not independent of each other.
-    // If we are indeed on a Transition form (so, not a Node Form with widget)
-    // then change the form id, too.
-    // $form_id = $this->getFormId();
-    $form_id = 'workflow_transition_form'; //@todo D8-port: add $form_id for widget and History tab.
-
-    /*
-     * Output: generate the element.
-     */
-    // Get settings from workflow. @todo: implement default_settings.
-    if ($workflow) {
-      $workflow_settings = $workflow->options;
-    }
-    else {
-      // @todo D8-port: now only tested with Action.
-      $workflow_settings = [
-        'name_as_title' => 0,
-        'options' => "radios",
-        'schedule_timezone' => 1,
-        'comment_log_node' => "1",
-        'watchdog_log' => TRUE,
-      ];
-    }
-    // Current sid and default value may differ in a scheduled transition.
-
-    $workflow_settings['comment'] = $workflow_settings['comment_log_node']; // 'comment_log_tab' is removed;
-
-    // Capture settings to format the form/widget.
-    $settings_title_as_name = !empty($workflow_settings['name_as_title']);
-    $settings_fieldset = isset($workflow_settings['fieldset']) ? $workflow_settings['fieldset'] : 0;
-    $settings_options_type = $workflow_settings['options'];
-
-    // Display scheduling form if user has permission.
-    // Not shown on new entity (not supported by workflow module, because that
-    // leaves the entity in the (creation) state until scheduling time.)
-    // Not shown when editing existing transition.
-    $type_id = ($workflow) ? $workflow->id() : ''; // Might be empty on Action configuration.
-    $settings_schedule = !$transition->isExecuted() && $user->hasPermission("schedule $type_id workflow_transition");
-    if ($settings_schedule) {
-      //@todo D8-port: check below code: form on VBO.
-      // workflow_debug( __FILE__ , __FUNCTION__, __LINE__);  // @todo D8-port: still test this snippet.
-      $step = $form_state->getValue('step');
-      if (isset($step) && ($form_state->getValue('step') == 'views_bulk_operations_config_form')) {
-        // On VBO 'modify entity values' form, leave field settings.
-        $settings_schedule = TRUE;
-      }
-      else {
-        // ... and cannot be shown on a Content add page (no $entity_id),
-        // ...but can be shown on a VBO 'set workflow state to..'page (no entity).
-        $settings_schedule = !($entity && !$entity_id);
-      }
-    }
-
-    $settings_schedule_timezone = !empty($workflow_settings['schedule_timezone']);
-    // Show comment, when both Field and Instance allow this.
-    $settings_comment = $workflow_settings['comment'];
-
-    $transition_is_scheduled = $transition->isScheduled();
-    // Save the current value of the entity in the form, for later Workflow-module specific references.
-    // We add prefix, since #tree == FALSE.
-    $element['workflow_transition'] = [
-      '#type' => 'value',
-      '#value' => $transition,
-    ];
-
-    // Decide if we show a widget or a formatter.
-    // There is no need for a widget when the only option is the current sid.
-
-    // Add a state formatter before the rest of the form,
-    // when transition is scheduled or widget is hidden.
-    if ( (!$show_widget) || $transition_is_scheduled || $transition->isExecuted()) {
-      $element['workflow_current_state'] = workflow_state_formatter($entity, $field_name, $current_sid);
-      // Set a proper weight, which works for Workflow Options in select list AND action buttons.
-      $element['workflow_current_state']['#weight'] = -0.005;
-    }
-
-    $element['#tree'] = TRUE;
-    // Add class following node-form pattern (both on form and container).
-    $workflow_type_id = ($workflow) ? $workflow->id() : '';
-    $element['#attributes']['class'][] = 'workflow-transition-' . $workflow_type_id . '-container';
-    $element['#attributes']['class'][] = 'workflow-transition-container';
-    if (!$show_widget) {
-      // Show no widget.
-      $element['to_sid']['#type'] = 'value';
-      $element['to_sid']['#value'] = $default_value;
-      $element['to_sid']['#options'] = $options; // In case action buttons need them.
-      $element['comment']['#type'] = 'value';
-      $element['comment']['#value'] = '';
-
-      return $element; // <-- exit.
-    }
-
-    // @todo: repair the usage of $settings_title_as_name: no container if no details (schedule/comment).
-    // Prepare a UI wrapper. This might be a fieldset.
-    if ($settings_fieldset == 0) { // Use 'container'.
-      $element += [
-        '#type' => 'container',
-      ];
-    }
-    else {
-      $element += [
-        '#type' => 'details',
-        '#collapsible' => TRUE,
-        '#open' => ($settings_fieldset == 2) ? FALSE : TRUE,
-      ];
-    }
-
-    $element['field_name'] = [
-      '#type' => 'select',
-      '#title' => t('Field name'),
-      '#description' => t('Choose the field name.'),
-      '#access' => FALSE, // Only show on VBO/Actions screen.
-      '#options' => workflow_get_workflow_field_names($entity),
-      '#default_value' => $field_name,
-      '#required' => TRUE,
-      '#weight' => -20,
-    ];
-    $element['force'] = [
-      '#type' => 'checkbox',
-      '#title' => t('Force transition'),
-      '#description' => t('If this box is checked, the new state will be assigned even if workflow permissions disallow it.'),
-      '#access' => FALSE, // Only show on VBO/Actions screen.
-      '#default_value' => $force,
-      '#weight' => -19,
-    ];
-
-    // This overrides BaseFieldDefinition. @todo: apply for form and widget.
-    // The 'options' widget. May be removed later if 'Action buttons' are chosen.
-    // The help text is not available for container. Let's add it to the
-    // State box. N.B. it is empty on Workflow Tab, Node View page.
-    $help_text = isset($element['#description']) ? $element['#description'] : '';
-    // This overrides BaseFieldDefinition. @todo: apply for form and widget.
-    $element['to_sid'] = [
-      '#type' => ($wid) ? $settings_options_type : 'select', // Avoid error with grouped options.
-      '#title' => ($settings_title_as_name && !$transition->isExecuted())
-        ? t('Change @name state', ['@name' => $workflow->label()])
-        : t('Target state'),
-      '#access' => TRUE,
-      '#options' => $options,
-      // '#parents' => array('workflow'),
-      '#default_value' => $default_value,
-      '#description' => $help_text,
-    ];
-
-    // Display scheduling form under certain conditions.
-    if ($settings_schedule == TRUE) {
-      $timezone = $user->getTimeZone();
-
-      $timezone_options = array_combine(timezone_identifiers_list(), timezone_identifiers_list());
-      $timestamp = $transition ? $transition->getTimestamp() : \Drupal::time()->getRequestTime();
-      $hours = (!$transition_is_scheduled) ? '00:00' : \Drupal::service('date.formatter')->format($timestamp, 'custom', 'H:i', $timezone);
-      // Add a container, so checkbox and time stay together in extra fields.
-      $element['workflow_scheduling'] = [
-        '#type' => 'container',
-        '#tree' => TRUE,
-      ];
-      $element['workflow_scheduling']['scheduled'] = [
-        '#type' => 'radios',
-        '#title' => t('Schedule'),
-        '#options' => [
-          '0' => t('Immediately'),
-          '1' => t('Schedule for state change'),
-        ],
-        '#default_value' => $transition_is_scheduled ? '1' : '0',
-        '#attributes' => [
-          // 'id' => 'scheduled_' . $form_id,
-          'class' => [Html::getClass('scheduled_' . $form_id)],
-        ],
-      ];
-      $element['workflow_scheduling']['date_time'] = [
-        '#type' => 'details', // 'container',
-        '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
-        '#attributes' => ['class' => ['container-inline']],
-        '#prefix' => '<div style="margin-left: 1em;">',
-        '#suffix' => '</div>',
-        '#states' => [
-          //'visible' => array(':input[id="' . 'scheduled_' . $form_id . '"]' => array('value' => '1')),
-          'visible' => ['input.' . Html::getClass('scheduled_' . $form_id) => ['value' => '1']],
-        ],
-      ];
-      $element['workflow_scheduling']['date_time']['workflow_scheduled_date'] = [
-        '#type' => 'date',
-        '#prefix' => t('At'),
-        '#default_value' => implode( '-', [
-            'year' => date('Y', $timestamp),
-            'month' => date('m', $timestamp),
-            'day' => date('d', $timestamp),
-          ]
-        )
-      ];
-      $element['workflow_scheduling']['date_time']['workflow_scheduled_hour'] = [
-        '#type' => 'textfield',
-        '#title' => t('Time'),
-        '#maxlength' => 7,
-        '#size' => 6,
-        '#default_value' => $hours,
-        '#element_validate' => ['_workflow_transition_form_element_validate_time'], // @todo D8-port: this is not called.
-      ];
-      $element['workflow_scheduling']['date_time']['workflow_scheduled_timezone'] = [
-        '#type' => $settings_schedule_timezone ? 'select' : 'hidden',
-        '#title' => t('Time zone'),
-        '#options' => $timezone_options,
-        '#default_value' => [$timezone => $timezone],
-      ];
-      $element['workflow_scheduling']['date_time']['workflow_scheduled_help'] = [
-        '#type' => 'item',
-        '#prefix' => '<br />',
-        '#description' => t('Please enter a time.
-          If no time is included, the default will be midnight on the specified date.
-          The current time is: @time.', ['@time' => \Drupal::service('date.formatter')->format(\Drupal::time()->getRequestTime(), 'custom', 'H:i', $timezone)]
-        ),
-      ];
-    }
-
-    // This overrides BaseFieldDefinition. @todo: apply for form and widget.
-    $element['comment'] = [
-      '#type' => 'textarea',
-      '#required' => $settings_comment == '2',
-      '#access' => $settings_comment != '0', // Align with action buttons.
-      '#title' => t('Workflow comment'),
-      '#description' => t('A comment to put in the workflow log.'),
-      '#default_value' => $transition ? $transition->getComment() : '',
-      '#rows' => 2,
-    ];
-
-    // In WorkflowTransitionForm, a default 'Submit' button is added over there.
-    // In Entity Form, a button per permitted state is added in workflow_form_alter().
-    if ($settings_options_type == 'buttons' || $settings_options_type == 'dropbutton') {
-      // D7: How do action buttons work? See also d.o. issue #2187151.
-      // D7: Create 'action buttons' per state option. Set $sid property on each button.
-      // 1. Admin sets ['widget']['options']['#type'] = 'buttons'.
-      // 2. This function formElement() creates 'action buttons' per state option;
-      //    sets $sid property on each button.
-      // 3. User clicks button.
-      // 4. Callback _workflow_transition_form_validate_buttons() sets proper State.
-      // 5. Callback _workflow_transition_form_validate_buttons() sets Submit function.
-
-      // Performance: inform workflow_form_alter() to do its job.
-      _workflow_use_action_buttons($settings_options_type);
-
-      // Make sure the '#type' is not set to the invalid 'buttons' value.
-      // It will be replaced by action buttons, but sometimes, the select box
-      // is still shown.
-      // @see workflow_form_alter().
-      $element['to_sid']['#type'] = 'select';
-      $element['to_sid']['#access'] = FALSE;
-    }
-    return $element;
-  }
-
-  /**
-   * Implements ContentEntityForm::copyFormValuesToEntity(), and is called from:
-   * - WorkflowTransitionForm::buildEntity()
-   * - WorkflowDefaultWidget
-   *
-   * N.B. in contrary to ContentEntityForm::copyFormValuesToEntity(),
-   * - parameter 1 is returned as result, to be able to create a new Transition object.
-   * - parameter 3 is not $form_state (from Form), but an $item array (from Widget).
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $transition
-   * @param array $form
-   * @param FormStateInterface $form_state
-   * @param array $item
-   *
-   * @return WorkflowTransitionInterface
-   */
-  static public function copyFormValuesToTransition(EntityInterface $transition, array $form, FormStateInterface $form_state, array $item) {
-    $user = workflow_current_user(); // @todo #2287057: verify if submit() really is only used for UI. If not, $user must be passed.
-
-    /**
-     * Derived input
-     */
-    // Make sure we have subset ['workflow_scheduled_date_time']
-    if (!isset($item['to_sid'])) {
-      $entity_id = $transition->getTargetEntityId();
-      drupal_set_message(t('Error: content @id has no workflow attached. The data is not saved.', ['@id' => $entity_id]), 'error');
-      // The new state is still the previous state.
-      return $transition;
-    }
-
-    // In WorkflowTransitionForm, we receive the complete $form_state.
-    // Remember, the workflow_scheduled element is not set on 'add' page.
-    $scheduled = !empty($item['workflow_scheduling']['scheduled']);
-    $schedule_values = ($scheduled) ? $item['workflow_scheduling']['date_time'] : [];
-
-    // Get user input from element.
-    $to_sid = $item['to_sid'];
-    $comment = $item['comment'];
-    $force = FALSE;
-
-    // @todo D8: add the VBO use case.
-    /*
-    // Determine if the transition is forced.
-    // This can be set by a 'workflow_vbo action' in an additional form element.
-     $force = isset($form_state['input']['workflow_force']) ? $form_state['input']['workflow_force'] : FALSE;
-    if (!$entity) {
-      // E.g., on VBO form.
-    }
-     */
-
-    // @todo D8-port: add below exception.
-    // Extract the data from $items, depending on the type of widget.
-    // @todo D8: use MassageFormValues($item, $form, $form_state).
-    /*
-    $old_sid = workflow_node_previous_state($entity, $entity_type, $field_name);
-    if (!$old_sid) {
-      // At this moment, $old_sid should have a value. If the content does not
-      // have a state yet, old_sid contains '(creation)' state. But if the
-      // content is not associated to a workflow, old_sid is now 0. This may
-      // happen in workflow_vbo, if you assign a state to non-relevant nodes.
-      $entity_id = entity_id($entity_type, $entity);
-      drupal_set_message(t('Error: content @id has no workflow attached. The data is not saved.', array('@id' => $entity_id)), 'error');
-      // The new state is still the previous state.
-      $new_sid = $old_sid;
-      return $new_sid;
-    }
-     */
-
-    $timestamp = \Drupal::time()->getRequestTime();
-    if ($scheduled) {
-      // Fetch the (scheduled) timestamp to change the state.
-      // Override $timestamp.
-      $scheduled_date_time = implode(' ', [
-        $schedule_values['workflow_scheduled_date'],
-        $schedule_values['workflow_scheduled_hour'],
-        // $schedule_values['workflow_scheduled_timezone'],
-      ]);
-      $timezone = $schedule_values['workflow_scheduled_timezone'];
-      $old_timezone = date_default_timezone_get();
-      date_default_timezone_set($timezone);
-      $timestamp = strtotime($scheduled_date_time);
-      date_default_timezone_set($old_timezone);
-      if (!$timestamp) {
-        // Time should have been validated in form/widget.
-        $timestamp = \Drupal::time()->getRequestTime();
-      }
-    }
-
-    /**
-     * Process
-     */
-
-    /*
-     * Create a new ScheduledTransition.
-     */
-    if ($scheduled) {
-      $transition_entity = $transition->getTargetEntity();
-      $field_name = $transition->getFieldName();
-      $from_sid = $transition->getFromSid();
-      /** @var $transition WorkflowTransitionInterface */
-      $transition = WorkflowScheduledTransition::create([$from_sid, 'field_name' => $field_name]);
-      $transition->setTargetEntity($transition_entity);
-      $transition->setValues($to_sid, $user->id(), $timestamp, $comment);
-    }
-    if (!$transition->isExecuted()) {
-      // Set new values.
-      // When editing an existing Transition, only comments may change.
-      $transition->set('to_sid', $to_sid);
-      $transition->setOwner($user);
-      $transition->setTimestamp($timestamp);
-      $transition->schedule($scheduled);
-      $transition->force($force);
-    }
-    $transition->setComment($comment);
-    // Determine and add the attached fields.
-    // Caveat: This works automatically on a Workflow Form,
-    // but only with a hack on a widget.
-    // It does not support ScheduledTransitions.
-    $attached_fields = Workflow::workflowManager()->getAttachedFields('workflow_transition', $transition->bundle());
-    foreach ($attached_fields as $attached_field) {
-      if (isset($item[$attached_field])) {
-        // On Workflow Form. Both lines have the same effect.
-        $transition->{$attached_field} = $item[$attached_field];
-      }
-      else {
-        // On Workflow Widget. First line gives empty result.
-        //$transition->{$attached_field} = $form_state->value($attached_field);
-        $transition->{$attached_field} = $form_state->getUserInput()[$attached_field];
-      }
-    }
-
-    return $transition;
-  }
-
-}
diff --git a/modules/workflow/src/Entity/Workflow.php b/modules/workflow/src/Entity/Workflow.php
deleted file mode 100644
index 2588308..0000000
--- a/modules/workflow/src/Entity/Workflow.php
+++ /dev/null
@@ -1,468 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Workflow configuration entity to persistently store configuration.
- *
- * @ConfigEntityType(
- *   id = "workflow_type",
- *   label = @Translation("Workflow"),
- *   label_singular = @Translation("Workflow"),
- *   label_plural = @Translation("Workflows"),
- *   label_count = @PluralTranslation(
- *     singular = "@count Workflow",
- *     plural = "@count Workflows",
- *   ),
- *   module = "workflow",
- *   translatable = FALSE,
- *   handlers = {
- *     "storage" = "Drupal\workflow\Entity\WorkflowStorage",
- *     "list_builder" = "Drupal\workflow_ui\Controller\WorkflowListBuilder",
- *     "form" = {
- *        "add" = "Drupal\workflow\Form\WorkflowForm",
- *        "delete" = "Drupal\Core\Entity\EntityDeleteForm",
- *        "edit" = "Drupal\workflow\Form\WorkflowForm",
- *      }
- *   },
- *   admin_permission = "administer workflow",
- *   config_prefix = "workflow",
- *   bundle_of = "workflow_transition",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *   },
- *   config_export = {
- *     "id",
- *     "label",
- *     "module",
- *     "status",
- *     "options",
- *   },
- *   links = {
- *     "canonical" = "/admin/config/workflow/workflow/{workflow_type}",
- *     "collection" = "/admin/config/workflow/workflow",
- *     "delete-form" = "/admin/config/workflow/workflow/{workflow_type}/delete",
- *     "edit-form" = "/admin/config/workflow/workflow/{workflow_type}",
- *   },
- * )
- */
-class Workflow extends ConfigEntityBase implements WorkflowInterface {
-
-  /**
-   * The machine name.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human readable name.
-   *
-   * @var string
-   */
-  public $label;
-
-  // TODO D8-port Workflow: complete below variables. (Add get()-functions).
-  // @see https://www.drupal.org/node/1809494
-  // @see https://codedrop.com.au/blog/creating-custom-config-entities-drupal-8
-  public $options = [];
-
-  /**
-   * The workflow-specific creation state.
-   */
-  private $creation_state;
-  private $creation_sid = 0;
-
-  // Attached States and Transitions.
-  public $states = [];
-  public $transitions = [];
-
-  /**
-   * Retrieves the workflow manager.
-   *
-   * @return \Drupal\workflow\Entity\WorkflowManagerInterface
-   *   The workflow manager.
-   */
-  public static function workflowManager() {
-    return \Drupal::service('workflow.manager');
-  }
-
-  /**
-   * CRUD functions.
-   */
-
-  /**
-   * Given information, update or insert a new workflow.
-   *
-   * This also handles importing, rebuilding, reverting from Features,
-   * as defined in workflow.features.inc.
-   * TODO D8: clean up this function, since we are config entity now.
-   * todo D7: reverting does not refresh States and transitions, since no
-   * machine_name was present. As of 7.x-2.3, the machine_name exists in
-   * Workflow and WorkflowConfigTransition, so rebuilding is possible.
-   *
-   * When changing this function, test with the following situations:
-   * - maintain Workflow in Admin UI;
-   * - clone Workflow in Admin UI;
-   * - create/revert/rebuild Workflow with Features; @see workflow.features.inc
-   * - save Workflow programmatic;
-   *
-   * @inheritdoc
-   */
-  public function save() {
-    $status = parent::save();
-    // Are we saving a new Workflow?
-    // Make sure a Creation state exists.
-    if ($status == SAVED_NEW) {
-      $this->getCreationState();
-    }
-
-    return $status;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @return Workflow|null
-   *   The entity object or NULL if there is no entity with the given ID.
-   */
-  public static function load($id) {
-    $entity = parent::load($id);
-
-    if ($entity) {
-      // Load the states, so they are already present on the next (cached) load.
-      // N.B. commented out, since it doesn't work. Workflow is loaded 4x per
-      // Node form. Use lazy loading.
-      // $entity->states = $entity->getStates($all = TRUE);
-      // $entity->transitions = $entity->getTransitions(NULL);
-    }
-    return $entity;
-  }
-
-  /**
-   * Given a wid, delete the workflow and its data.
-   */
-  public function delete() {
-    if (!$this->isDeletable()) {
-      // @todo: throw error if not workflow->isDeletable().
-    }
-    else {
-      // Delete associated state (also deletes any associated transitions).
-      foreach ($this->getStates($all = TRUE) as $state) {
-        $state->deactivate('');
-        $state->delete();
-      }
-
-      // Delete the workflow.
-      parent::delete();
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isValid() {
-    $is_valid = TRUE;
-
-    // Don't allow Workflow without states. There should always be a creation state.
-    $states = $this->getStates($all = FALSE);
-    if (count($states) < 1) {
-      // That's all, so let's remind them to create some states.
-      $message = t('Workflow %workflow has no states defined, so it cannot be assigned to content yet.',
-        ['%workflow' => $this->label()]);
-      drupal_set_message($message, 'warning');
-
-      // Skip allowing this workflow.
-      $is_valid = FALSE;
-    }
-
-    // Also check for transitions, at least out of the creation state. Don't filter for roles.
-    $transitions = $this->getTransitionsByStateId($this->getCreationSid(), '');
-    if (count($transitions) < 1) {
-      // That's all, so let's remind them to create some transitions.
-      $message = t('Workflow %workflow has no transitions defined, so it cannot be assigned to content yet.',
-        ['%workflow' => $this->label()]);
-      drupal_set_message($message, 'warning');
-
-      // Skip allowing this workflow.
-      $is_valid = FALSE;
-    }
-
-    return $is_valid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isDeletable() {
-
-    // May not be deleted if assigned to a Field.
-    foreach ($fields = _workflow_info_fields() as $field_info) {
-      if ($field_info->getSetting('workflow_type') == $this->id()) {
-        return FALSE;
-      }
-    }
-
-    // D8-port: This is deleted, since it is only for D7's workflow_node.
-    // // May not be deleted if a State is assigned to a state.
-    // foreach ($this->getStates(TRUE) as $state) {
-    //   if ($state->count()) {
-    //     return $is_deletable;
-    //   }
-    // }
-    return TRUE;
-  }
-
-  /**
-   * Property functions.
-   */
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWorkflowId() {
-    return $this->id();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createState($sid, $save = TRUE) {
-    $wid = $this->id();
-    /* @var $state WorkflowState */
-    $state = WorkflowState::load($sid);
-    if (!$state || $wid != $state->getWorkflowId()) {
-      $state = WorkflowState::create($values = ['id' => $sid, 'wid' => $wid]);
-      if ($save) {
-        $state->save();
-      }
-    }
-
-    // Maintain the new object in the workflow.
-    $this->states[$state->id()] = $state;
-
-    return $state;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCreationState() {
-    // First, find it.
-    if (!$this->creation_state) {
-      foreach ($this->getStates($all = TRUE) as $state) {
-        if ($state->isCreationState()) {
-          $this->creation_state = $state;
-          $this->creation_sid = $state->id();
-        }
-      }
-    }
-
-    // First, then, create it.
-    if (!$this->creation_state) {
-      $state = $this->createState(WORKFLOW_CREATION_STATE_NAME);
-      $this->creation_state = $state;
-      $this->creation_sid = $state->id();
-    }
-
-    return $this->creation_state;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCreationSid() {
-    if (!$this->creation_sid) {
-      $state = $this->getCreationState();
-      return $state->id();
-    }
-    return $this->creation_sid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFirstSid(EntityInterface $entity, $field_name, AccountInterface $user, $force = FALSE) {
-    $creation_state = $this->getCreationState();
-    $options = $creation_state->getOptions($entity, $field_name, $user, $force);
-    if ($options) {
-      $keys = array_keys($options);
-      $sid = $keys[0];
-    }
-    else {
-      // This should never happen, but it did during testing.
-      drupal_set_message(t('There are no workflow states available. Please notify your site administrator.'), 'error');
-      $sid = 0;
-    }
-    return $sid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getNextSid(EntityInterface $entity, $field_name, AccountInterface $user, $force = FALSE) {
-    $current_sid = Workflow::workflowManager()->getCurrentStateId($entity, $field_name);
-    /* @var $current_state WorkflowState */
-    $current_state = WorkflowState::load($current_sid);
-    $options = $current_state->getOptions($entity, $field_name, $user, $force);
-    // Loop over every option. To find the next one.
-    $flag = $current_state->isCreationState();
-    $new_sid = $current_state->id();
-
-    foreach ($options as $sid => $name) {
-      if ($flag) {
-        $new_sid = $sid;
-        break;
-      }
-      if ($sid == $current_state->id()) {
-        $flag = TRUE;
-      }
-    }
-
-    return $new_sid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getStates($all = FALSE, $reset = FALSE) {
-    $wid = $this->id();
-
-    if ($reset) {
-      $this->states = $wid ? WorkflowState::loadMultiple([], $wid, $reset) : [];
-    }
-    elseif ($this->states === NULL) {
-      $this->states = $wid ? WorkflowState::loadMultiple([], $wid, $reset) : [];
-    }
-    elseif ($this->states === []) {
-      $this->states = $wid ? WorkflowState::loadMultiple([], $wid, $reset) : [];
-    }
-    // Do not unset, but add to array - you'll remove global objects otherwise.
-    $states = [];
-
-    foreach ($this->states as $state) {
-      $id = $state->id();
-      if ($all === TRUE) {
-        $states[$id] = $state;
-      }
-      elseif (($all === FALSE) && ($state->isActive() && !$state->isCreationState())) {
-        $states[$id] = $state;
-      }
-      elseif (($all == 'CREATION') && ($state->isActive() || $state->isCreationState())) {
-        $states[$id] = $state;
-      }
-      else {
-        // Do not add state.
-      }
-    }
-
-    return $states;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getState($sid) {
-    $wid = $this->id();
-    $state = WorkflowState::load($sid);
-    if (!$wid || $wid == $state->getWorkflowId()) {
-      return $state;
-    }
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createTransition($from_sid, $to_sid, $values = []) {
-    $config_transition = NULL;
-
-    $workflow = $this;
-
-    // First check if this transition already exists.
-    if ($transitions = $this->getTransitionsByStateId($from_sid, $to_sid)) {
-      $config_transition = reset($transitions);
-    }
-    else {
-      $values['wid'] = $workflow->id();
-      $values['from_sid'] = $from_sid;
-      $values['to_sid'] = $to_sid;
-      $config_transition = WorkflowConfigTransition::create($values);
-      $config_transition->save();
-    }
-    // Maintain the new object in the workflow.
-    $this->transitions[$config_transition->id()] = $config_transition;
-
-    return $config_transition;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function sortTransitions() {
-    // Sort the transitions on state weight.
-    uasort($this->transitions, ['Drupal\workflow\Entity\WorkflowConfigTransition', 'sort'] );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTransitions(array $ids = NULL, array $conditions = []) {
-    $config_transitions = [];
-
-    // Get filters on 'from' states, 'to' states, roles.
-    $from_sid = isset($conditions['from_sid']) ? $conditions['from_sid'] : FALSE;
-    $to_sid = isset($conditions['to_sid']) ? $conditions['to_sid'] : FALSE;
-
-    // Get valid states + creation state.
-    $states = $this->getStates('CREATION');
-    // Cache all transitions in the workflow.
-    if (!$this->transitions) {
-      $this->transitions = WorkflowConfigTransition::loadMultiple($ids);
-
-      $this->sortTransitions();
-    }
-
-    /* @var $config_transition WorkflowConfigTransition */
-    foreach ($this->transitions as &$config_transition) {
-      if (!isset($states[$config_transition->getFromSid()])) {
-        // Not a valid transition for this workflow. @todo: delete them.
-      }
-      elseif ($from_sid && $from_sid != $config_transition->getFromSid()) {
-        // Not the requested 'from' state.
-      }
-      elseif ($to_sid && $to_sid != $config_transition->getToSid()) {
-        // Not the requested 'to' state.
-      }
-      else {
-        // Transition is allowed, permitted. Add to list.
-        $config_transitions[$config_transition->id()] = $config_transition;
-      }
-    }
-    return $config_transitions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTransitionsById($tid) {
-    return $this->getTransitions([$tid]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTransitionsByStateId($from_sid, $to_sid) {
-    $conditions = [
-      'from_sid' => $from_sid,
-      'to_sid' => $to_sid,
-    ];
-    return $this->getTransitions(NULL, $conditions);
-  }
-
-}
diff --git a/modules/workflow/src/Entity/WorkflowConfigTransition.php b/modules/workflow/src/Entity/WorkflowConfigTransition.php
deleted file mode 100644
index ec14025..0000000
--- a/modules/workflow/src/Entity/WorkflowConfigTransition.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-use Drupal\user\UserInterface;
-
-/**
- * Workflow configuration entity to persistently store configuration.
- *
- * @ConfigEntityType(
- *   id = "workflow_config_transition",
- *   label = @Translation("Workflow config transition"),
- *   label_singular = @Translation("Workflow config transition"),
- *   label_plural = @Translation("Workflow config transitions"),
- *   label_count = @PluralTranslation(
- *     singular = "@count Workflow config transition",
- *     plural = "@count Workflow config transitions",
- *   ),
- *   module = "workflow",
- *   translatable = FALSE,
- *   handlers = {
- *     "form" = {
- *        "delete" = "\Drupal\Core\Entity\EntityDeleteForm",
- *      }
- *   },
- *   admin_permission = "administer workflow",
- *   config_prefix = "transition",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *   },
- *   config_export = {
- *     "id",
- *     "label",
- *     "module",
- *     "from_sid",
- *     "to_sid",
- *     "roles",
- *   },
- *   links = {
- *     "collection" = "/admin/config/workflow/workflow/{workflow_type}/transitions",
- *   },
- * )
- */
-class WorkflowConfigTransition extends ConfigEntityBase implements WorkflowConfigTransitionInterface {
-
-  // Transition data.
-  public $id;
-  public $from_sid;
-  public $to_sid;
-  public $roles = [];
-
-  // Extra fields.
-  protected $wid;
-  // The following must explicitly defined, and not be public, to avoid errors
-  // when exporting with json_encode().
-  protected $workflow = NULL;
-
-  /*
-   * Entity class functions.
-   */
-
-  public function __construct(array $values = [], $entityType = NULL) {
-    // Please be aware that $entity_type and $entityType are different things!
-    $result = parent::__construct($values, $entity_type = 'workflow_config_transition');
-
-    return $result;
-  }
-
-  /**
-   * Helper function for __construct. Used for all children of WorkflowTransition (aka WorkflowScheduledTransition)
-   */
-  public function setValues($from_sid, $to_sid) {
-    $this->from_sid = $from_sid;
-    $this->to_sid = $to_sid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-//  public static function loadMultiple(array $ids = NULL, $wid = '') {
-//    foreach ($transitions = parent::loadMultiple($ids) as $key =>$transition) {
-//      if ($wid && $transition->getWorkflowId() != $wid) {
-//        unset($transitions[$key]);
-//      }
-//    }
-//    return $transitions;
-//  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save() {
-    $workflow = $this->getWorkflow();
-
-    // To avoid double posting, check if this (new) transition already exist.
-    if (empty($this->id())) {
-      if ($workflow) {
-        $config_transitions = $workflow->getTransitionsByStateId($this->from_sid, $this->to_sid);
-        $config_transition = reset($config_transitions);
-        if ($config_transition) {
-          $this->set('id', $config_transition->id());
-        }
-      }
-    }
-
-    // Create the machine_name. This can be used to rebuild/revert the Feature in a target system.
-    if (empty($this->id())) {
-      $wid = $workflow->id();
-      $this->set('id', implode('', [$wid, substr($this->from_sid, strlen($wid)), substr($this->to_sid, strlen($wid))]));
-    }
-
-    $status = parent::save();
-
-    if ($status) {
-      // Save in current workflow for the remainder of this page request.
-      // Keep in sync with Workflow::getTransitions() !
-      if ($workflow) {
-        $workflow->transitions[$this->id()] = $this;
-        // $workflow->sortTransitions();
-      }
-    }
-
-    return $status;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function sort(ConfigEntityInterface $a, ConfigEntityInterface $b) {
-    // Sort the entities using the entity class's sort() method.
-    // See \Drupal\Core\Config\Entity\ConfigEntityBase::sort().
-
-    /* @var $a WorkflowTransitionInterface */
-    /* @var $b WorkflowTransitionInterface */
-
-    if (!$a->getFromSid() || !$b->getFromSid()) {
-      return 0;
-    }
-    // First sort on From-State.
-    $from_state_a = $a->getFromState();
-    $from_state_b = $b->getFromState();
-    if ($from_state_a->weight < $from_state_b->weight) return -1;
-    if ($from_state_a->weight > $from_state_b->weight) return +1;
-
-    // Then sort on To-State.
-    $to_state_a = $a->getToState();
-    $to_state_b = $b->getToState();
-    if ($to_state_a->weight < $to_state_b->weight) return -1;
-    if ($to_state_a->weight > $to_state_b->weight) return +1;
-
-    return 0;
-  }
-
-  /**
-   * Property functions.
-   */
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWorkflow() {
-    if (!$this->workflow && $wid = $this->getWorkflowId()) {
-      $this->workflow = Workflow::load($wid);
-    }
-    return $this->workflow;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWorkflowId() {
-    if (!$this->wid) {
-      $from_sid = $this->getFromSid();
-      $to_sid = $this->getToSid();
-      $state = WorkflowState::load($to_sid ? $to_sid : $from_sid);
-      $this->wid = $state->getWorkflowId();
-    }
-    return $this->wid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFromState() {
-    return WorkflowState::load($this->from_sid);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getToState() {
-    return WorkflowState::load($this->to_sid);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFromSid() {
-    return $this->from_sid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getToSid() {
-    return $this->to_sid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isAllowed(UserInterface $user, $force = FALSE) {
-    $result = FALSE;
-
-    $type_id = $this->getWorkflowId();
-    if ($user->hasPermission("bypass $type_id workflow_transition access")) {
-      // Superuser is special. And $force allows Rules to cause transition.
-      return TRUE;
-    }
-
-    if ($force) {
-      return TRUE;
-    }
-    if ($this->getFromSid() == $this->getToSid()) {
-      // Anyone may save an entity without changing state.
-      return TRUE;
-    }
-    return TRUE == array_intersect($user->getRoles(), $this->roles);
-  }
-
-}
diff --git a/modules/workflow/src/Entity/WorkflowConfigTransitionInterface.php b/modules/workflow/src/Entity/WorkflowConfigTransitionInterface.php
deleted file mode 100644
index b0a2546..0000000
--- a/modules/workflow/src/Entity/WorkflowConfigTransitionInterface.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Entity;
-
-use Drupal\user\UserInterface;
-
-/**
- * Defines a common interface for Workflow*Transition* objects.
- *
- * @see \Drupal\workflow\Entity\WorkflowConfigTransition
- * @see \Drupal\workflow\Entity\WorkflowTransition
- * @see \Drupal\workflow\Entity\WorkflowScheduledTransition
- */
-interface WorkflowConfigTransitionInterface {
-
-  /**
-   * Determines if the current transition between 2 states is allowed:
-   * - in settings;
-   * - in permissions;
-   * - by permission hooks, implemented by other modules.
-   *
-   * @param \Drupal\user\UserInterface $user
-   *   The user to act upon.
-   *   May have the custom WORKFLOW_ROLE_AUTHOR_RID role.
-   * @param bool $force
-   *   Indicates if the transition must be forced(E.g., by cron, rules).
-   *
-   * @return bool
-   *   TRUE if OK, else FALSE.
-   */
-  public function isAllowed(UserInterface $user, $force = FALSE);
-
-  /**
-   * Returns the Workflow object of this State.
-   *
-   * @return Workflow
-   *   Workflow object.
-   */
-  public function getWorkflow();
-
-  /**
-   * Returns the Workflow ID of this Transition
-   *
-   * @return string
-   *   Workflow Id.
-   */
-  public function getWorkflowId();
-
-  /**
-   * @return WorkflowState
-   */
-  public function getFromState();
-
-  /**
-   * @return WorkflowState
-   */
-  public function getToState();
-
-  /**
-   * @return string
-   */
-  public function getFromSid();
-
-  /**
-   * @return string
-   */
-  public function getToSid();
-
-}
diff --git a/modules/workflow/src/Entity/WorkflowInterface.php b/modules/workflow/src/Entity/WorkflowInterface.php
deleted file mode 100644
index 2847785..0000000
--- a/modules/workflow/src/Entity/WorkflowInterface.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Entity;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Defines a common interface for Workflow*Transition* objects.
- *
- * @see \Drupal\workflow\Entity\WorkflowConfigTransition
- * @see \Drupal\workflow\Entity\WorkflowTransition
- * @see \Drupal\workflow\Entity\WorkflowScheduledTransition
- */
-interface WorkflowInterface {
-
-  /**
-   * Returns the workflow id.
-   *
-   * @return string
-   *   $wid
-   */
-  public function getWorkflowId();
-
-  /**
-   * Validate the workflow. Generate a message if not correct.
-   *
-   * This function is used on the settings page of:
-   * - Workflow field: WorkflowItem->settingsForm()
-   *
-   * @return bool
-   *   $is_valid
-   */
-  public function isValid();
-
-  /**
-   * Returns if the Workflow may be deleted.
-   *
-   * @return bool
-   *   TRUE if a Workflow may safely be deleted.
-   */
-  public function isDeletable();
-
-  /**
-   * Create a new state for this workflow.
-   *
-   * @param string $sid
-   * @param bool $save
-   *   Indicator if the new state must be saved. Normally, the new State is
-   *   saved directly in the database. This is because you can use States only
-   *   with Transitions, and they rely on State IDs which are generated
-   *   magically when saving the State. But you may need a temporary state.
-   * @return \Drupal\workflow\Entity\WorkflowState
-   *   The new state.
-   */
-  public function createState($sid, $save = TRUE);
-
-  /**
-   * Gets the initial state for a newly created entity.
-   */
-  public function getCreationState();
-
-  /**
-   * Gets the ID of the initial state for a newly created entity.
-   */
-  public function getCreationSid();
-
-  /**
-   * Gets the first valid state ID, after the creation state.
-   *
-   * Uses WorkflowState::getOptions(), because this does an access check.
-   * The first State ID is user-dependent!
-   *
-   * @param EntityInterface|null $entity
-   *   The entity at hand. May be NULL (E.g., on a Field settings page).
-   * @param $field_name
-   * @param AccountInterface $user
-   * @param bool $force
-   *
-   * @return string
-   *   A State ID.
-   */
-  public function getFirstSid(EntityInterface $entity, $field_name, AccountInterface $user, $force = FALSE);
-
-  /**
-   * Returns the next state for the current state.
-   * Is used in VBO Bulk actions.
-   *
-   * @param EntityInterface $entity
-   *   The entity at hand.
-   * @param $field_name
-   * @param AccountInterface $user
-   * @param bool $force
-   *
-   * @return string
-   *   A State ID.
-   */
-  public function getNextSid(EntityInterface $entity, $field_name, AccountInterface $user, $force = FALSE);
-
-  /**
-   * Gets all states for a given workflow.
-   *
-   * @param mixed $all
-   *   Indicates to which states to return.
-   *   - TRUE = all, including Creation and Inactive;
-   *   - FALSE = only Active states, not Creation;
-   *   - 'CREATION' = only Active states, including Creation.
-   * @param bool $reset
-   *
-   * @return WorkflowState[]
-   *   An array of WorkflowState objects.
-   */
-  public function getStates($all = FALSE, $reset = FALSE);
-
-  /**
-   * Gets a state for a given workflow.
-   *
-   * @param string $sid
-   *   A state ID.
-   *
-   * @return WorkflowState
-   *   A WorkflowState object.
-   */
-  public function getState($sid);
-
-  /**
-   * Creates a Transition for this workflow.
-   *
-   * @param string $from_sid
-   * @param string $to_sid
-   * @param array $values
-   *
-   * @return mixed|null|static
-   */
-  public function createTransition($from_sid, $to_sid, $values = []);
-
-  /**
-   * Sorts all Transitions for this workflow, according to State weight.
-   *
-   * This is only needed for the Admin UI.
-   */
-  public function sortTransitions();
-
-  /**
-   * Loads all allowed ConfigTransitions for this workflow.
-   *
-   * @param array|null $ids
-   *   Array of Transitions IDs. If NULL, show all transitions.
-   * @param array $conditions
-   *   $conditions['from_sid'] : if provided, a 'from' State ID.
-   *   $conditions['to_sid'] : if provided, a 'to' state ID.
-   *
-   * @return \Drupal\workflow\Entity\WorkflowConfigTransition[]
-   */
-  public function getTransitions(array $ids = NULL, array $conditions = []);
-
-  public function getTransitionsById($tid);
-
-  /**
-   * Get a specific transition.
-   *
-   * @param string $from_sid
-   * @param string $to_sid
-   *
-   * @return WorkflowConfigTransition[]
-   */
-  public function getTransitionsByStateId($from_sid, $to_sid);
-
-}
diff --git a/modules/workflow/src/Entity/WorkflowManager.php b/modules/workflow/src/Entity/WorkflowManager.php
deleted file mode 100644
index 04cb558..0000000
--- a/modules/workflow/src/Entity/WorkflowManager.php
+++ /dev/null
@@ -1,426 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Entity;
-
-use Drupal\comment\Entity\Comment;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-
-/**
- * Manages entity type plugin definitions.
- */
-class WorkflowManager implements WorkflowManagerInterface {
-  use StringTranslationTrait;
-
-  /**
-   * The entity_type manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The entity query factory.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $queryFactory;
-
-  /**
-   * The user settings config object.
-   *
-   * @var \Drupal\Core\Config\Config
-   */
-  protected $userConfig;
-
-  /**
-   * The module handler service.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $currentUser;
-
-  /**
-   * Construct the WorkflowManager object as a service.
-   * @see workflow.services.yml
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity_type manager service.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query factory.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory.
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
-   *   The string translation service.
-   *  @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler service.
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   The current user.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, QueryFactory $query_factory, ConfigFactoryInterface $config_factory, TranslationInterface $string_translation, ModuleHandlerInterface $module_handler, AccountInterface $current_user) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->queryFactory = $query_factory;
-    $this->userConfig = $config_factory->get('user.settings');
-    $this->stringTranslation = $string_translation;
-    $this->moduleHandler = $module_handler;
-    $this->currentUser = $current_user;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function executeScheduledTransitionsBetween($start = 0, $end = 0) {
-    $clear_cache = FALSE;
-
-    // If the time now is greater than the time to execute a transition, do it.
-    foreach (WorkflowScheduledTransition::loadBetween($start, $end) as $scheduled_transition) {
-      $field_name = $scheduled_transition->getFieldName();
-      $entity = $scheduled_transition->getTargetEntity();
-      $from_sid = $scheduled_transition->getFromSid();
-
-      // Make sure transition is still valid: the entity must still be in
-      // the state it was in, when the transition was scheduled.
-      if (!$entity) {
-        continue;
-      }
-
-      $current_sid = workflow_node_current_state($entity, $field_name);
-      if (!$current_sid || ($current_sid != $from_sid)) {
-        // Entity is not in the same state it was when the transition
-        // was scheduled. Defer to the entity's current state and
-        // abandon the scheduled transition.
-        $message = t('Scheduled Transition is discarded, since Entity has state ID %sid1, instead of expected ID %sid2.');
-        $scheduled_transition->logError($message, 'error', $current_sid, $from_sid);
-        $scheduled_transition->delete();
-        continue;
-      }
-
-      // If user didn't give a comment, create one.
-      $comment = $scheduled_transition->getComment();
-      if (empty($comment)) {
-        $scheduled_transition->addDefaultComment();
-      }
-
-      // Do transition. Force it because user who scheduled was checked.
-      // The scheduled transition is not scheduled anymore, and is also deleted from DB.
-      // A watchdog message is created with the result.
-      $scheduled_transition->schedule(FALSE);
-      $scheduled_transition->executeAndUpdateEntity(TRUE);
-
-      if (!$field_name) {
-        $clear_cache = TRUE;
-      }
-    }
-
-    if ($clear_cache) {
-      // Clear the cache so that if the transition resulted in a entity
-      // being published, the anonymous user can see it.
-      Cache::invalidateTags(['rendered']);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function executeTransitionsOfEntity(EntityInterface $entity) {
-
-    // Avoid this hook on workflow objects.
-    if (in_array($entity->getEntityTypeId(), [
-      'workflow_type',
-      'workflow_state',
-      'workflow_config_transition',
-      'workflow_transition',
-      'workflow_scheduled_transition',
-    ])) {
-      return;
-    }
-
-    $user = workflow_current_user();
-
-    foreach (_workflow_info_fields($entity) as $field_info) {
-      $field_name = $field_info->getName();
-
-      // Transition is created in widget or WorkflowTransitionForm.
-      /** @var $transition WorkflowTransitionInterface */
-      $transition = $entity->$field_name->__get('workflow_transition');
-      if (!$transition) {
-        // We come from creating/editing an entity via entity_form, with core widget or hidden Workflow widget.
-        // @todo D8: from an Edit form with hidden widget.
-        if ($entity->original) {
-          // Editing a Node with hidden Widget. State change not possible, so bail out.
-//          $entity->$field_name->value = $entity->original->$field_name->value;
-//          continue;
-        }
-
-        // Creating a Node with hidden Workflow Widget. Generate valid first transition.
-        // @todo D8: Test Creating a non-Node Entity with hidden Workflow widget.
-        $comment = '';
-        $old_sid = workflow_node_previous_state($entity, $field_name);
-        $new_sid = $entity->$field_name->value;
-        if ((!$new_sid) && $wid = $field_info->getSetting('workflow_type')) {
-          $workflow = Workflow::load($wid);
-          $new_sid = $workflow->getFirstSid($entity, $field_name, $user);
-        }
-        $transition = WorkflowTransition::create([$old_sid, 'field_name' => $field_name]);
-        $transition->setValues($new_sid, $user->id(), \Drupal::time()->getRequestTime(), $comment, TRUE);
-      }
-
-      // We come from Content/Comment edit page, from widget.
-      // Set the just-saved entity explicitly. Not necessary for update,
-      // but upon insert, the old version didn't have an ID, yet.
-      $transition->setTargetEntity($entity);
-
-      if ($transition->isScheduled()) {
-        $executed = $transition->save(); // Returns a positive integer.
-      }
-      elseif ($entity->getEntityTypeId() == 'comment') {
-        // If Transition is added via CommentForm, save Comment AND Entity.
-        // Execute and check the result.
-        $new_sid = $transition->executeAndUpdateEntity();
-        $executed = ($new_sid == $transition->getToSid()) ? TRUE : FALSE;
-      }
-      else {
-        // Execute and check the result.
-        $new_sid = $transition->execute();
-        $executed = ($new_sid == $transition->getToSid()) ? TRUE : FALSE;
-      }
-
-      // If the transition failed, revert the entity workflow status.
-      // For new entities, we do nothing: it has no original.
-      if (!$executed && isset($entity->original)) {
-        $originalValue = $entity->original->{$field_name}->value;
-        $entity->{$field_name}->setValue($originalValue);
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function deleteUser(AccountInterface $account) {
-    self::cancelUser([], $account, 'user_cancel_delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function cancelUser($edit, AccountInterface $account, $method) {
-
-    switch ($method) {
-      case 'user_cancel_block': // Disable the account and keep its content.
-      case 'user_cancel_block_unpublish': // Disable the account and unpublish its content.
-        // Do nothing.
-        break;
-      case 'user_cancel_reassign': // Delete the account and make its content belong to the Anonymous user.
-      case 'user_cancel_delete': // Delete the account and its content.
-
-        // Update tables for deleted account, move account to user 0 (anon.)
-        // ALERT: This may cause previously non-Anonymous posts to suddenly
-        // be accessible to Anonymous.
-
-        /**
-         * Given a user id, re-assign history to the new user account. Called by user_delete().
-         */
-        $uid = $account->id();
-        $new_uid = 0;
-
-        db_update('workflow_transition_history')
-          ->fields(['uid' => $new_uid])
-          ->condition('uid', $uid, '=')
-          ->execute();
-        db_update('workflow_transition_schedule')
-          ->fields(['uid' => $new_uid])
-          ->condition('uid', $uid, '=')
-          ->execute();
-
-        break;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function participateUserRoles(Workflow $workflow) {
-    $type_id = $workflow->id();
-    foreach (user_roles() as $rid => $role) {
-      $perms = ["create $type_id workflow_transition" => 1];
-      user_role_change_permissions($rid, $perms);  // <=== Enable Roles.
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-//  public function getFields($entity_type_id) {
-//    $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
-//    if (!$entity_type->isSubclassOf('\Drupal\Core\Entity\FieldableEntityInterface')) {
-//      return [];
-//    }
-//
-//    $map = $this->entityTypeManager->getFieldMapByFieldType('workflow');
-//    return isset($map[$entity_type_id]) ? $map[$entity_type_id] : [];
-//  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAttachedFields($entity_type_id, $bundle) {
-    // Determine the new fields added by Field UI.
-    $entityfield_manager = \Drupal::service('entity_field.manager');
-    //$extra_fields = $this->entityFieldManager->getExtraFields($entity_type_id, $bundle);
-    $base_fields = $entityfield_manager->getBaseFieldDefinitions($entity_type_id, $bundle);
-    $ui_fields = $entityfield_manager->getFieldDefinitions($entity_type_id, $bundle);
-    $added_fields = array_diff(array_keys($ui_fields), array_keys($base_fields));
-    return $added_fields;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getCurrentStateId(EntityInterface $entity, $field_name = '') {
-    $sid = '';
-
-    if (!$entity) {
-      return $sid;
-    }
-
-    // If $field_name is not known, yet, determine it.
-    $field_name = ($field_name) ? $field_name : workflow_get_field_name($entity, $field_name);
-    // If $field_name is found, get more details.
-    if (!$field_name || !isset($entity->$field_name)) {
-      // Return the initial value.
-      return $sid;
-    }
-
-    // Normal situation: get the value.
-    $sid = $entity->$field_name->value;
-
-    // Entity is new or in preview or there is no current state. Use previous state.
-    // (E.g., content was created before adding workflow.)
-    if ( !$sid || !empty($entity->isNew()) || !empty($entity->in_preview) ) {
-      $sid = self::getPreviousStateId($entity, $field_name);
-    }
-
-    return $sid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getPreviousStateId(EntityInterface $entity, $field_name = '') {
-    $sid = '';
-
-    if (!$entity) {
-      return $sid;
-    }
-
-    // If $field_name is not known, yet, determine it.
-    $field_name = ($field_name) ? $field_name : workflow_get_field_name($entity, $field_name);
-    // If $field_name is found, get more details.
-    if (!$field_name) {
-      // Return the initial value.
-      return $sid;
-    }
-
-    // A node may not have a Workflow attached.
-    if ($entity->isNew()) {
-      // A new Node. D7: $is_new is not set when saving terms, etc.
-      $sid = self::getCreationStateId($entity, $field_name);
-    }
-    else {
-      // @todo?: Read the history with an explicit langcode.
-      // @todo D8: #2373383 add integration with older revisions via Revisioning module.
-      $langcode = ''; // $entity->language()->getId();
-      $entity_type = $entity->getEntityTypeId();
-      if ($last_transition = WorkflowTransition::loadByProperties($entity_type, $entity->id(), [], $field_name, $langcode, 'DESC')) {
-        $sid = $last_transition->getToSid(); // @see #2637092, #2612702
-      }
-    }
-
-    if (!$sid) {
-      // No history found on an existing entity.
-      $sid = self::getCreationStateId($entity, $field_name);
-    }
-
-    return $sid;
-  }
-
-  /**
-   * Gets the creation sid for a given $entity and $field_name.
-   *
-   * Is a helper function for:
-   * - workflow_node_current_state()
-   * - workflow_node_previous_state()
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   * @param string $field_name
-   *
-   * @return string
-   *   The ID of the creation State for the Workflow of the field.
-   */
-  private static function getCreationStateId($entity, $field_name) {
-    $sid = '';
-
-    $field_config = $entity->get($field_name)->getFieldDefinition();
-    $field_storage = $field_config->getFieldStorageDefinition();
-    $wid = $field_storage->getSetting('workflow_type');
-    if ($wid) {
-      $workflow = Workflow::load($wid);
-      if (!$workflow) {
-        drupal_set_message(t('Workflow %wid cannot be loaded. Contact your system administrator.', ['%wid' => $wid]), 'error');
-      }
-      else {
-        $sid = $workflow->getCreationSid();
-      }
-    }
-
-    return $sid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function isOwner(AccountInterface $account, EntityInterface $entity = NULL) {
-    $is_owner = FALSE;
-
-    // @todo: Keep below code aligned between WorkflowState, ~Transition, ~TransitionListController
-    // Determine if user is owner of the entity.
-    $uid = ($account) ? $account->id() : -1;
-    // Get the entity's ID and Author ID.
-    $entity_id = ($entity) ? $entity->id() : '';
-    // Some entities (e.g., taxonomy_term) do not have a uid.
-    // $entity_uid = $entity->get('uid'); // isset($entity->uid) ? $entity->uid : 0;
-    $entity_uid = (method_exists($entity, 'getOwnerId')) ? $entity->getOwnerId() : -1;
-
-    if (!$entity_id) {
-      // This is a new entity. User is author. Add 'author' role to user.
-      $is_owner = TRUE;
-    }
-    elseif (($entity_uid > 0) && ($uid > 0) && ($entity_uid == $uid)) {
-      // This is an existing entity. User is author.
-      // D8: use "access own" permission. D7: Add 'author' role to user.
-      // N.B.: If 'anonymous' is the author, don't allow access to History Tab,
-      // since anyone can access it, and it will be published in Search engines.
-      $is_owner = TRUE;
-    }
-    else {
-      // This is an existing entity. User is not the author. Do nothing.
-    }
-    return $is_owner;
-  }
-
-}
diff --git a/modules/workflow/src/Entity/WorkflowManagerInterface.php b/modules/workflow/src/Entity/WorkflowManagerInterface.php
deleted file mode 100644
index 81e480d..0000000
--- a/modules/workflow/src/Entity/WorkflowManagerInterface.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Entity;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
-
-/**
- * Provides an interface for workflow manager.
- *
- * Contains lost of functions from D7 workflow.module file.
- */
-interface WorkflowManagerInterface {
-
-  /**
-   * Given a time frame, execute all scheduled transitions.
-   *
-   * Implements hook_cron().
-   *
-   * @param int $start
-   * @param int $end
-   */
-  public static function executeScheduledTransitionsBetween($start = 0, $end = 0);
-
-  /**
-   * Execute a single transition for the given entity.
-   *
-   * Implements hook_entity insert(), hook_entity_update().
-   *
-   * When inserting an entity with workflow field, the initial Transition is
-   * saved without reference to the proper entity, since Id is not yet known.
-   * So, we cannot save Transition in the Widget, but only(?) in a hook.
-   * To keep things simple, this is done for both insert() and update().
-   *
-   * This is referenced in from WorkflowDefaultWidget::massageFormValues().
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   */
-  public static function executeTransitionsOfEntity(EntityInterface $entity);
-
-  /********************************************************************
-   *
-   * Hook-implementing functions.
-   *
-   */
-
-  /**
-   * Implements hook_WORKFLOW_insert().
-   *
-   * Make sure some roles are allowed to participate in a Workflow by default.
-   *
-   * @param Workflow $workflow
-   */
-  public static function participateUserRoles(Workflow $workflow);
-
-  /**
-   * Implements hook_user_delete().
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   */
-  public static function deleteUser(AccountInterface $account);
-
-  /**
-   * Implements hook_user_cancel().
-   * Implements deprecated workflow_update_workflow_transition_history_uid().
-   *
-   * " When cancelling the account
-   * " - Disable the account and keep its content.
-   * " - Disable the account and unpublish its content.
-   * " - Delete the account and make its content belong to the Anonymous user.
-   * " - Delete the account and its content.
-   * "This action cannot be undone.
-   *
-   * @param $edit
-   * @param \Drupal\Core\Session\AccountInterface $account
-   * @param string $method
-   */
-  public static function cancelUser($edit, AccountInterface $account, $method);
-
-  /********************************************************************
-   *
-   * Helper functions.
-   *
-   */
-
-  /**
-   * Utility function to return an array of workflow fields.
-   *
-   * @param string $entity_type_id
-   *   The content entity type to which the workflow fields are attached.
-   *
-   * @return array
-   *   An array of workflow field map definitions, keyed by field name. Each
-   *   value is an array with two entries:
-   *   - type: The field type.
-   *   - bundles: The bundles in which the field appears, as an array with entity
-   *     types as keys and the array of bundle names as values.
-   *
-   * @see \Drupal\Core\Entity\EntityManagerInterface::getFieldMap()
-   */
-  //public function getFields($entity_type_id);
-
-  /**
-   * Returns the attached fields (via Field UI)
-   *
-   * @param $entity_type_id
-   * @param $bundle
-   *
-   * @return array
-   */
-  public function getAttachedFields($entity_type_id, $bundle);
-
-  /**
-   * Gets the current state ID of a given entity.
-   *
-   * There is no need to use a page cache.
-   * The performance is OK, and the cache gives problems when using Rules.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to check. May be an EntityDrupalWrapper.
-   * @param string $field_name
-   *   The name of the field of the entity to check.
-   *   If empty, the field_name is determined on the spot. This must be avoided,
-   *   since it makes having multiple workflow per entity unpredictable.
-   *   The found field_name will be returned in the param.
-   *
-   * @return string
-   *   The ID of the current state.
-   */
-  public static function getCurrentStateId(EntityInterface $entity, $field_name = '');
-
-  /**
-   * Gets the previous state ID of a given entity.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   * @param string $field_name
-   *
-   * @return string
-   *   The ID of the previous state.
-   */
-  public static function getPreviousStateId(EntityInterface $entity, $field_name = '');
-
-  /**
-   * Determine if User is owner/author of the entity.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *
-   * @return bool
-   */
-  public static function isOwner(AccountInterface $account, EntityInterface $entity = NULL);
-
-}
diff --git a/modules/workflow/src/Entity/WorkflowScheduledTransition.php b/modules/workflow/src/Entity/WorkflowScheduledTransition.php
deleted file mode 100644
index b84474e..0000000
--- a/modules/workflow/src/Entity/WorkflowScheduledTransition.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Entity;
-
-use Drupal\Core\Entity\EntityConstraintViolationList;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-
-/**
- * Implements a scheduled transition, as shown on Workflow form.
- *
- * @ContentEntityType(
- *   id = "workflow_scheduled_transition",
- *   label = @Translation("Workflow scheduled transition"),
- *   label_singular = @Translation("Workflow scheduled transition"),
- *   label_plural = @Translation("Workflow scheduled transitions"),
- *   label_count = @PluralTranslation(
- *     singular = "@count Workflow scheduled transition",
- *     plural = "@count Workflow scheduled transitions",
- *   ),
- *   bundle_label = @Translation("Workflow type"),
- *   module = "workflow",
- *   handlers = {
- *     "access" = "Drupal\workflow\WorkflowAccessControlHandler",
- *     "list_builder" = "Drupal\workflow\WorkflowTransitionListBuilder",
- *     "form" = {
- *        "add" = "Drupal\workflow\Form\WorkflowTransitionForm",
- *        "edit" = "Drupal\workflow\Form\WorkflowTransitionForm",
- *        "delete" = "Drupal\Core\Entity\EntityDeleteForm",
- *      },
- *     "views_data" = "Drupal\workflow\WorkflowScheduledTransitionViewsData",
- *   },
- *   base_table = "workflow_transition_schedule",
- *   translatable = FALSE,
- *   entity_keys = {
- *     "id" = "tid",
- *     "bundle" = "wid",
- *     "langcode" = "langcode",
- *   },
- *   links = {
- *     "canonical" = "/workflow_transition/{workflow_transition}",
- *     "delete-form" = "/workflow_transition/{workflow_transition}/delete",
- *     "edit-form" = "/workflow_transition/{workflow_transition}/edit",
- *   },
- * )
- */
-class WorkflowScheduledTransition extends WorkflowTransition {
-
-  /**
-   * Constructor.
-   */
-  public function __construct(array $values = [], $entityType = 'workflow_scheduled_transition', $bundle = FALSE, $translations = []) {
-    // Please be aware that $entity_type and $entityType are different things!
-    parent::__construct($values, $entityType, $bundle, $translations);
-
-    // This transition is scheduled.
-    $this->is_scheduled = TRUE;
-    // This transition is not executed.
-    $this->is_executed = FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setValues($to_sid, $uid = NULL, $scheduled = NULL, $comment = '', $force_create = FALSE) {
-    parent::setValues($to_sid, $uid, $scheduled, $comment, $force_create);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * This is a hack to avoid the following error, because ScheduledTransition is not a bundle of Workflow:
-   *   Drupal\Component\Plugin\Exception\PluginNotFoundException: The "entity:workflow_scheduled_transition:eerste" plugin does not exist. in Drupal\Core\Plugin\DefaultPluginManager->doGetDefinition() (line 60 of core\lib\Drupal\Component\Plugin\Discovery\DiscoveryTrait.php).
-   */
-  function validate() {
-    // Since this function generates an error in one use case (using WorkflowTransitionForm)
-    // and is not called in the other use case (using the Workflow Widget),
-    // this function is disabled for now.
-    // @todo: this function is only called in the WorkflowTransitionForm, not in the Widget.
-    // @todo: repair https://www.drupal.org/node/2896650
-
-    // The following is from return parent::validate();
-    $this->validated = TRUE;
-    //$violations = $this->getTypedData()->validate();
-    // return new EntityConstraintViolationList($this, iterator_to_array($violations));
-    $violations = [];
-    return new EntityConstraintViolationList($this, $violations);
-  }
-
-  /**
-   * CRUD functions.
-   */
-
-  /**
-   * {@inheritdoc}
-   *
-   * Saves a scheduled transition. If the transition is executed, save in history.
-   */
-  public function save() {
-
-    // If executed, save in history.
-    if ($this->is_executed) {
-      // Be careful, we are not a WorkflowScheduleTransition anymore!
-      // No fuzzing around, just copy the ScheduledTransition to a normal one.
-      $current_sid = $this->getFromSid();
-      $field_name = $this->getFieldName();
-      $executed_transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
-      $executed_transition->setTargetEntity($this->getTargetEntity());
-      $executed_transition->setValues($this->getToSid(), $this->getOwnerId(), \Drupal::time()->getRequestTime(), $this->getComment());
-      return $executed_transition->save();  // <-- exit !!
-    }
-
-    $hid = $this->id();
-    if (!$hid) {
-      // Insert the transition. Make sure it hasn't already been inserted.
-      // @todo: Allow a scheduled transition per revision.
-      $entity = $this->getTargetEntity();
-      $found_transition = self::loadByProperties($entity->getEntityTypeId(), $entity->id(), [], $this->getFieldName(), $this->getLangcode());
-      if ($found_transition) {
-        // Avoid duplicate entries.
-        $found_transition->delete();
-        $result = parent::save();
-      }
-      else {
-        $result = parent::save();
-      }
-    }
-    else {
-      workflow_debug(__FILE__, __FUNCTION__, __LINE__ );  // @todo D8-port: still test this snippet.
-      // Update the transition.
-      $result = parent::save();
-    }
-
-    // Create user message.
-    if ($state = $this->getToState()) {
-      $entity = $this->getTargetEntity();
-      $message = '%entity_title scheduled for state change to %state_name on %scheduled_date';
-      $args = [
-        '%entity_title' => $entity->label(),
-        '%state_name' => $state->label(),
-        '%scheduled_date' => $this->getTimestampFormatted(),
-        'link' => ($this->getTargetEntityId() && $this->getTargetEntity()->hasLinkTemplate('canonical')) ? $this->getTargetEntity()->toLink(t('View'))->toString() : '',
-      ];
-      \Drupal::logger('workflow')->notice($message, $args);
-      drupal_set_message(t($message, $args));
-    }
-
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-//  public static function loadMultiple(array $ids = NULL) {
-//    return parent::loadMultiple($ids);
-//  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function loadByProperties($entity_type, $entity_id, array $revision_ids = [], $field_name = '', $langcode = '', $sort = 'ASC', $transition_type = 'workflow_scheduled_transition') {
-    // N.B. $transition_type is set as parameter default.
-    return parent::loadByProperties($entity_type, $entity_id, $revision_ids, $field_name, $langcode, $sort, $transition_type);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function loadMultipleByProperties($entity_type, array $entity_ids, array $revision_ids = [], $field_name = '', $langcode = '', $limit = NULL, $sort = 'ASC', $transition_type = 'workflow_scheduled_transition') {
-    // N.B. $transition_type is set as parameter default.
-    return parent::loadMultipleByProperties($entity_type, $entity_ids, $revision_ids, $field_name, $langcode, $limit, $sort, $transition_type);
-  }
-
-  /**
-   * Given a time frame, get all scheduled transitions.
-   *
-   * @param int $start
-   * @param int $end
-   *
-   * @return WorkflowScheduledTransition[]
-   *   An array of transitions.
-   */
-  public static function loadBetween($start = 0, $end = 0) {
-    $transition_type = 'workflow_scheduled_transition'; // @todo: get this from annotation.
-
-    /* @var $query \Drupal\Core\Entity\Query\QueryInterface */
-    $query = \Drupal::entityQuery($transition_type)
-      ->sort('timestamp', 'ASC')
-      ->addTag($transition_type);
-    if ($start) {
-      $query->condition('timestamp', $start, '>');
-    }
-    if ($end) {
-      $query->condition('timestamp', $end, '<');
-    }
-
-    $ids = $query->execute();
-    $transitions = self::loadMultiple($ids);
-    return $transitions;
-  }
-
-
-  /**
-   * Property functions.
-   */
-
-  /**
-   * If a scheduled transition has no comment, a default comment is added before executing it.
-   */
-  public function addDefaultComment() {
-    $this->setComment(t('Scheduled by user @uid.', ['@uid' => $this->getOwnerId()]));
-  }
-
-  /**
-   * Define the fields. Modify the parent fields.
-   * {@inheritdoc}
-   */
-  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
-    $fields = [];
-
-    // Add the specific ID-field : tid vs. hid.
-    $fields['tid'] = BaseFieldDefinition::create('integer')
-      ->setLabel(t('Transition ID'))
-      ->setDescription(t('The transition ID.'))
-      ->setReadOnly(TRUE)
-      ->setSetting('unsigned', TRUE);
-
-    // Get the rest of the fields.
-    $fields += parent::baseFieldDefinitions($entity_type);
-
-    // The timestamp has a different description.
-    $fields['timestamp'] = []; // Reset old value.
-    $fields['timestamp'] = BaseFieldDefinition::create('created')
-      ->setLabel(t('Scheduled'))
-      ->setDescription(t('The date+time this transition is scheduled for.'))
-      ->setQueryable(FALSE)
-//      ->setTranslatable(TRUE)
-//      ->setDisplayOptions('view', array(
-//        'label' => 'hidden',
-//        'type' => 'timestamp',
-//        'weight' => 0,
-//      ))
-//      ->setDisplayOptions('form', array(
-//        'type' => 'datetime_timestamp',
-//        'weight' => 10,
-//      ))
-//      ->setDisplayConfigurable('form', TRUE);
-      ->setRevisionable(TRUE);
-
-
-    // Remove the specific ID-field : tid vs. hid.
-    unset($fields['hid']);
-
-    return $fields;
-  }
-
-}
diff --git a/modules/workflow/src/Entity/WorkflowState.php b/modules/workflow/src/Entity/WorkflowState.php
deleted file mode 100644
index 0ef02c5..0000000
--- a/modules/workflow/src/Entity/WorkflowState.php
+++ /dev/null
@@ -1,587 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-use Drupal\Core\Entity\Entity;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Language\LanguageInterface;
-
-/**
- * Workflow configuration entity to persistently store configuration.
- *
- * @ConfigEntityType(
- *   id = "workflow_state",
- *   label = @Translation("Workflow state"),
- *   label_singular = @Translation("Workflow state"),
- *   label_plural = @Translation("Workflow states"),
- *   label_count = @PluralTranslation(
- *     singular = "@count Workflow state",
- *     plural = "@count Workflow states",
- *   ),
- *   module = "workflow",
- *   translatable = FALSE,
- *   handlers = {
- *     "list_builder" = "Drupal\workflow_ui\Controller\WorkflowStateListBuilder",
- *     "form" = {
- *        "delete" = "Drupal\Core\Entity\EntityDeleteForm",
- *      }
- *   },
- *   admin_permission = "administer workflow",
- *   config_prefix = "state",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *     "weight" = "weight",
- *   },
- *   config_export = {
- *     "id",
- *     "label",
- *     "module",
- *     "wid",
- *     "weight",
- *     "sysid",
- *     "status",
- *   },
- *   links = {
- *     "canonical" = "/admin/config/workflow/workflow/{workflow_type}",
- *     "collection" = "/admin/config/workflow/workflow/{workflow_type}/states",
- *   },
- * )
- */
-class WorkflowState extends ConfigEntityBase {
-
-  /**
-   * The machine name.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human readable name.
-   *
-   * @var string
-   */
-  public $label;
-
-  /**
-   * The machine_name of the attached Workflow.
-   *
-   * @var string
-   */
-  public $wid;
-
-  /**
-   * The weight of this Workflow state.
-   *
-   * @var int
-   */
-  public $weight;
-
-  /**
-   * @var int
-   */
-  public $sysid = 0;
-  public $status = 1;
-
-  // Since workflows do not change, it is implemented as a singleton.
-  // @todo D8-port?  WorkflowState: remove static variable $states, cached by D8(?).
-  protected static $states = [];
-
-  /**
-   * The attached Workflow.
-   *
-   * @var Workflow
-   */
-  protected $workflow;
-
-  /**
-   * CRUD functions.
-   */
-
-  /**
-   * Constructor.
-   *
-   * @param array $values
-   * @param string $entityType
-   *   The name of the new State. If '(creation)', a CreationState is generated.
-   */
-  public function __construct(array $values = [], $entityType = 'workflow_state') {
-    // Please be aware that $entity_type and $entityType are different things!
-
-    $sid = isset($values['id']) ? $values['id'] : '';
-
-    // Keep official name and external name equal. Both are required.
-    // @todo: still needed? test import, manual creation, programmatic creation, etc.
-    if (!isset($values['label']) && $sid) {
-      $values['label'] = $sid;
-    }
-
-    // Set default values for '(creation)' state.
-    if ($sid == WORKFLOW_CREATION_STATE_NAME) {
-      $values['sysid'] = WORKFLOW_CREATION_STATE;
-      $values['weight'] = WORKFLOW_CREATION_DEFAULT_WEIGHT;
-      // Do not translate the machine_name.
-      $values['label'] = '(' . t('Creation') . ')';
-    }
-    parent::__construct($values, $entityType);
-
-    // Reset cache.
-    self::$states = [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save($create_creation_state = TRUE) {
-    // Create the machine_name for new states.
-    // N.B.: Keep machine_name in WorkflowState and ~ListBuilder aligned.
-    $sid = $this->id();
-    $wid = $this->wid;
-    $label = $this->label();
-
-    // Set the workflow-including machine_name.
-    if ($sid == WORKFLOW_CREATION_STATE_NAME) {
-      // Set the initial sid.
-      $sid = implode('_', [$wid, $sid]);
-      $this->set('id', $sid);
-    }
-    elseif (empty($sid)) {
-      if ($label) {
-        $transliteration = \Drupal::service('transliteration');
-        $value = $transliteration->transliterate($label, LanguageInterface::LANGCODE_DEFAULT, '_');
-        $value = strtolower($value);
-        $value = preg_replace('/[^a-z0-9_]+/', '_', $value);
-        $sid = implode('_', [$wid, $value]);
-      }
-      else {
-        workflow_debug(__FILE__, __FUNCTION__, __LINE__);  // @todo D8-port: still test this snippet.
-        $sid = 'state_' . $this->id();
-        $sid = implode('_', [$wid, $sid]);
-      }
-      $this->set('id', $sid);
-    }
-
-    return parent::save();
-  }
-
-  /**
-   * Get all states in the system, with options to filter, only where a workflow exists.
-   *
-   * @_deprecated WorkflowState::getStates() ==> WorkflowState::loadMultiple()
-   *
-   * {@inheritdoc}
-   *
-   * @param $wid
-   *   The requested Workflow ID.
-   * @param bool $reset
-   *   An option to refresh all caches.
-   *
-   * @return WorkflowState[]
-   *   An array of cached states.
-   */
-  public static function loadMultiple(array $ids = NULL, $wid = '', $reset = FALSE) {
-    if ($reset) {
-      self::$states = [];
-    }
-
-    if (empty(self::$states)) {
-      self::$states = parent::loadMultiple();
-      usort(self::$states, ['Drupal\workflow\Entity\WorkflowState', 'sort'] );
-    }
-
-    if (!$wid) {
-      // All states are requested and cached: return them.
-      $result = self::$states;
-    }
-    else {
-      // All states of only 1 Workflow is requested: return this one.
-      // E.g., when called by Workflow->getStates().
-      $result = [];
-      foreach (self::$states as $state) {
-        /* @var $state WorkflowState */
-        if ($state->wid == $wid) {
-          $result[$state->id()] = $state;
-        }
-      }
-    }
-    return $result;
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function sort(ConfigEntityInterface $a, ConfigEntityInterface $b) {
-    /* @var $a WorkflowState */
-    /* @var $b WorkflowState */
-    $a_wid = $a->wid;
-    $b_wid = $b->wid;
-    if ($a_wid == $b_wid) {
-      $a_weight = $a->getWeight();
-      $b_weight = $b->getWeight();
-      return ($a_weight < $b_weight) ? -1 : 1;
-    }
-    return ($a_wid < $b_wid) ? -1 : 1;
-  }
-
-  /**
-   * Deactivate a Workflow State, moving existing content to a given State.
-   *
-   * @param int $new_sid
-   *   The state ID, to which all affected entities must be moved.
-   */
-  public function deactivate($new_sid) {
-
-    $current_sid = $this->id();
-    $force = TRUE;
-
-    // Notify interested modules. We notify first to allow access to data before we zap it.
-    // - re-parents any entity that we don't want to orphan, whilst deactivating a State.
-    // - delete any lingering entity to state values.
-    // \Drupal::moduleHandler()->invokeAll('workflow', ['state delete', $current_sid, $new_sid, NULL, $force]);
-    // Invoke the hook.
-    \Drupal::moduleHandler()->invokeAll('entity_' . $this->getEntityTypeId() . '_predelete', [$this, $current_sid, $new_sid]);
-
-    // Re-parent any entity that we don't want to orphan, whilst deactivating a State.
-    // TODO D8-port: State should not know about Transition: move this to Workflow->DeactivateState.
-    if ($new_sid) {
-      // A candidate for the batch API.
-      // @TODO: Future updates should seriously consider setting this with batch.
-
-      $user = \Drupal::currentUser(); // We can use global, since deactivate() is a UI-only function.
-      $comment = t('Previous state deleted');
-
-      foreach (_workflow_info_fields() as $field_name => $field_info) {
-        $entity = NULL;
-        $entity_type = $field_info->getTargetEntityTypeId();
-        $field_name = $field_info->getName();
-        $query = \Drupal::entityQuery($entity_type);
-        $query->condition($field_name, $current_sid, '=');
-
-        // @todo D8: CommentForm & Deactivate WorkflowState
-        $result = ($entity_type == 'comment') ? [] : $query->execute();
-
-        foreach ($result as $entity_id) {
-          $entity = \Drupal::entityManager()->getStorage($entity_type)->load($entity_id);
-          $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
-          $transition->setTargetEntity($entity);
-          $transition->setValues($new_sid, $user->id(), \Drupal::time()->getRequestTime(), $comment, TRUE);
-          $transition->force($force);
-
-          // Execute Transition, invoke 'pre' and 'post' events, save new state in Field-table, save also in workflow_transition_history.
-          // For Workflow Node, only {workflow_node} and {workflow_transition_history} are updated. For Field, also the Entity itself.
-          $new_sid = workflow_execute_transition($transition, $force);
-        }
-      }
-    }
-
-    // Delete the transitions this state is involved in.
-    $workflow = Workflow::load($this->wid);
-    /* @var $transition WorkflowTransitionInterface*/
-    foreach ($workflow->getTransitionsByStateId($current_sid, '') as $transition) {
-      $transition->delete();
-    }
-    foreach ($workflow->getTransitionsByStateId('', $current_sid) as $transition) {
-      $transition->delete();
-    }
-
-    // Delete the state. -- We don't actually delete, just deactivate.
-    // This is a matter up for some debate, to delete or not to delete, since this
-    // causes name conflicts for states. In the meantime, we just stick with what we know.
-    // If you really want to delete the states, use workflow_cleanup module, or delete().
-    $this->status = FALSE;
-    $this->save();
-
-    // Clear the cache.
-    self::loadMultiple([], 0, TRUE);
-  }
-
-  /**
-   * Property functions.
-   */
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWeight() {
-    return $this->weight;
-  }
-
-  /**
-   * Returns the Workflow ID of this State.
-   *
-   * @return string
-   *   Workflow Id.
-   */
-  public function getWorkflowId() {
-    return $this->wid;
-  }
-
-  /**
-   * Returns the Workflow object of this State.
-   *
-   * @return Workflow
-   *   Workflow object.
-   */
-  public function getWorkflow() {
-    if (!isset($this->workflow)) {
-      $this->workflow = Workflow::load($this->wid);
-    }
-    return $this->workflow;
-  }
-
-  /**
-   * @param Workflow $workflow
-   */
-  public function setWorkflow(Workflow $workflow) {
-    workflow_debug(__FILE__, __FUNCTION__, __LINE__);  // @todo D8-port: still test this snippet.
-
-    $this->wid = $workflow->id();
-    $this->workflow = $workflow;
-  }
-
-  /**
-   * Returns the Workflow object of this State.
-   *
-   * @return bool
-   *   TRUE if state is active, else FALSE.
-   */
-  public function isActive() {
-    return (bool) $this->status;
-  }
-
-  /**
-   * Checks if the given state is the 'Create' state.
-   *
-   * @return bool
-   */
-  public function isCreationState() {
-    return $this->sysid == WORKFLOW_CREATION_STATE;
-  }
-
-  /**
-   * Determines if the Workflow Form must be shown.
-   *
-   * If not, a formatter must be shown, since there are no valid options.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   * @param string $field_name
-   * @param \Drupal\Core\Session\AccountInterface $account
-   * @param bool $force
-   *
-   * @return bool
-   *   TRUE = a form (a.k.a. widget) must be shown; FALSE = no form, a formatter must be shown instead.
-   */
-  public function showWidget(EntityInterface $entity, $field_name, AccountInterface $account, $force) {
-    $options = $this->getOptions($entity, $field_name, $account, $force);
-    $count = count($options);
-    // The easiest case first: more then one option: always show form.
-    if ($count > 1) {
-      return TRUE;
-    }
-    // #2226451: Even in Creation state, we must have 2 visible states to show the widget.
-    // // Only when in creation phase, one option is sufficient,
-    // // since the '(creation)' option is not included in $options.
-    // // When in creation state,
-    // if ($this->isCreationState()) {
-    // return TRUE;
-    // }
-    return FALSE;
-  }
-
-  /**
-   * Returns the allowed transitions for the current state.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface|null $entity
-   *   The entity at hand. May be NULL (E.g., on a Field settings page).
-   * @param string $field_name
-   * @param \Drupal\Core\Session\AccountInterface|null $account
-   * @param bool|false $force
-   *
-   * @return \Drupal\workflow\Entity\WorkflowConfigTransition[]
-   *   An array of id=>transition pairs with allowed transitions for State.
-   */
-  public function getTransitions(EntityInterface $entity = NULL, $field_name = '', AccountInterface $account = NULL, $force = FALSE) {
-    $transitions = [];
-
-    if (!$workflow = $this->getWorkflow()) {
-      // No workflow, no options ;-)
-      return $transitions;
-    }
-
-    // @todo: Keep below code aligned between WorkflowState, ~Transition, ~TransitionListController
-
-    /**
-     * Get permissions of user, adding a Role to user, depending on situation.
-     */
-    // Load a User object, since we cannot add Roles to AccountInterface.
-    /* @var $user \Drupal\user\UserInterface */
-    $user = workflow_current_user($account);
-    // Determine if user is owner of the entity.
-    $is_owner = WorkflowManager::isOwner($user, $entity);
-
-    // Check allow-ability of state change if user is not superuser (might be cron)
-    $type_id = $this->getWorkflowId();
-    if ($user->hasPermission("bypass $type_id workflow_transition access")) {
-      // Superuser is special. And $force allows Rules to cause transition.
-      $force = TRUE;
-    }
-
-    if ($is_owner) {
-      $user->addRole(WORKFLOW_ROLE_AUTHOR_RID);
-    }
-
-    /**
-     * Get the object and its permissions.
-     */
-    /* @var $transitions WorkflowConfigTransition[] */
-    $transitions = $workflow->getTransitionsByStateId($this->id(), '');
-
-    /**
-     * Determine if user has Access.
-     */
-    // Use default module permissions.
-    foreach ($transitions as $key => $transition) {
-      if (!$transition->isAllowed($user, $force)) {
-        unset($transitions[$key]);
-      }
-    }
-    // Let custom code add/remove/alter the available transitions,
-    // using the new drupal_alter.
-    // Modules may veto a choice by removing a transition from the list.
-    // Lots of data can be fetched via the $transition object.
-    $context = [
-      'entity' => $entity, // ConfigEntities do not have entity attached
-      'field_name' => $field_name, // or field.
-      'user' => $user, // user may have the custom role AUTHOR.
-      'workflow' => $workflow,
-      'state' => $this,
-      'force' => $force,
-    ];
-    \Drupal::moduleHandler()->alter('workflow_permitted_state_transitions', $transitions, $context);
-
-    /**
-     * Determine if user has Access.
-     */
-    // As of 8.x-1.x, below hook() is removed, in favour of above alter().
-    // Let custom code change the options, using old_style hook.
-    // Above drupal_alter() calls hook_workflow_permitted_state_transitions_alter() only once.
-//    foreach ($transitions as $transition) {
-//      $to_sid = $transition->to_sid;
-//      $permitted = [];
-//
-//      // We now have a list of config_transitions. Check each against the Entity.
-//      // Invoke a callback indicating that we are collecting state choices.
-//      // Modules may veto a choice by returning FALSE.
-//      // In this case, the choice is never presented to the user.
-//      if (!$force) {
-//        // @todo: D8-port: simplify interface for workflow_hook. Remove redundant context.
-//        $permitted = \Drupal::moduleHandler()->invokeAll('workflow', ['transition permitted', $transition, $user]);
-//      }
-//
-//      // If vetoed by a module, remove from list.
-//      if (in_array(FALSE, $permitted, TRUE)) {
-//        unset($transitions[$transition->id()]);
-//      }
-//    }
-
-    return $transitions;
-  }
-
-  /**
-   * Returns the allowed values for the current state.
-   *
-   * @param object $entity
-   *   The entity at hand. May be NULL (E.g., on a Field settings page).
-   * @param string $field_name
-   * @param \Drupal\Core\Session\AccountInterface|null $account
-   * @param bool $force
-   *
-   * @return array
-   *   An array of sid=>label pairs.
-   *   If $this->id() is set, returns the allowed transitions from this state.
-   *   If $this->id() is 0 or FALSE, then labels of ALL states of the State's
-   *   Workflow are returned.
-   */
-  public function getOptions($entity, $field_name, AccountInterface $account = NULL, $force = FALSE) {
-    $options = [];
-
-    // Define an Entity-specific cache per page load.
-    static $cache = [];
-
-    $entity_id = ($entity) ? $entity->id() : '';
-    $entity_type = ($entity) ? $entity->getEntityTypeId() : '';
-    $current_sid = $this->id();
-
-    // Get options from page cache, using a non-empty index (just to be sure).
-    $entity_index = (!$entity) ? 'x' : $entity_id;
-    if (isset($cache[$entity_type][$entity_index][$force][$current_sid])) {
-      $options = $cache[$entity_type][$entity_index][$force][$current_sid];
-      return $options;
-    }
-
-    $workflow = $this->getWorkflow();
-    if (!$workflow) {
-      // No workflow, no options ;-)
-      $options = [];
-    }
-    elseif (!$current_sid) {
-      // If no State ID is given, we return all states.
-      // We cannot use getTransitions, since there are no ConfigTransitions
-      // from State with ID 0, and we do not want to repeat States.
-      /* @var $state WorkflowState */
-      foreach ($workflow->getStates() as $state) {
-        $options[$state->id()] = html_entity_decode(t('@label', ['@label' => $state->label()]));
-      }
-    }
-    else {
-      $transitions = $this->getTransitions($entity, $field_name, $account, $force);
-      foreach ($transitions as $transition) {
-        // Get the label of the transition, and if empty of the target state.
-        // Beware: the target state may not exist, since it can be invented
-        // by custom code in the above drupal_alter() hook.
-        if (!$label = $transition->label()) {
-          $to_state = $transition->getToState();
-          $label = $to_state ? $to_state->label() : '';
-        }
-        $to_sid = $transition->to_sid;
-        $options[$to_sid] = html_entity_decode(t('@label', ['@label' => $label]));
-      }
-
-      // Save to entity-specific cache.
-      $cache[$entity_type][$entity_index][$force][$current_sid] = $options;
-    }
-
-    return $options;
-  }
-
-  /**
-   * Returns the number of entities with this state.
-   *
-   * @return int
-   *   Counted number.
-   *
-   * @todo: add $options to select on entity type, etc.
-   */
-  public function count() {
-    $count = 0;
-    $sid = $this->id();
-
-    foreach ($fields = _workflow_info_fields() as $field_info) {
-      $field_name = $field_info->getName();
-      $query = \Drupal::entityQuery($field_info->getTargetEntityTypeId());
-      // @see #2285983 for using SQLite on D7.
-      $count += $query
-        ->condition($field_name, $sid, '=')
-        ->count() // We only need the count.
-        ->execute();
-    }
-
-    return $count;
-  }
-
-}
diff --git a/modules/workflow/src/Entity/WorkflowStorage.php b/modules/workflow/src/Entity/WorkflowStorage.php
deleted file mode 100644
index 9cbd54a..0000000
--- a/modules/workflow/src/Entity/WorkflowStorage.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityStorage;
-use Drupal\Core\State\StateInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Component\Uuid\UuidInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Storage handler for workflow config entities.
- */
-class WorkflowStorage extends ConfigEntityStorage {
-
-  /**
-   * The state service.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $stateService;
-
-  /**
-   * Constructs a WorkflowStorage object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory service.
-   * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
-   *   The UUID service.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The language manager.
-   * @param \Drupal\Core\State\StateInterface $state_service
-   *   The state service.
-   */
-  public function __construct(EntityTypeInterface $entity_type, ConfigFactoryInterface $config_factory, UuidInterface $uuid_service, LanguageManagerInterface $language_manager, StateInterface $state_service) {
-    parent::__construct($entity_type, $config_factory, $uuid_service, $language_manager);
-
-    $this->stateService = $state_service;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
-      $entity_type,
-      $container->get('config.factory'),
-      $container->get('uuid'),
-      $container->get('language_manager'),
-      $container->get('state')
-    );
-  }
-
-  /**
-   * Returns a list of event names that are used by active workflows.
-   *
-   * @return string[]
-   *   The list of event names keyed by event name.
-   */
-  protected function getRegisteredEvents() {
-//    $events = [];
-//    foreach ($this->loadMultiple() as $rules_config) {
-//      $event = $rules_config->getEvent();
-//      if ($event && !isset($events[$event])) {
-//        $events[$event] = $event;
-//      }
-//    }
-//    return $events;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function doLoadMultiple(array $ids = NULL) {
-    $return = parent::doLoadMultiple($ids);
-
-    return $return;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(EntityInterface $entity) {
-    $return = parent::save($entity);
-
-//    // Update the state of registered events.
-//    // @todo Should we trigger a container rebuild here as well? Might be a bit
-//    // expensive on every save?
-//    $this->stateService->set('rules.registered_events', $this->getRegisteredEvents());
-
-    return $return;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function delete(array $entities) {
-    $return = parent::delete($entities);
-    return $return;
-  }
-
-}
diff --git a/modules/workflow/src/Entity/WorkflowTransition.php b/modules/workflow/src/Entity/WorkflowTransition.php
deleted file mode 100644
index 8d3b73b..0000000
--- a/modules/workflow/src/Entity/WorkflowTransition.php
+++ /dev/null
@@ -1,1103 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Entity;
-
-use Drupal\Core\Entity\ContentEntityBase;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Language\Language;
-use Drupal\user\Entity\User;
-use Drupal\user\UserInterface;
-
-/**
- * Implements an actual, executed, Transition.
- *
- * If a transition is executed, the new state is saved in the Field.
- * If a transition is saved, it is saved in table {workflow_transition_history}.
- *
- * @ContentEntityType(
- *   id = "workflow_transition",
- *   label = @Translation("Workflow executed transition"),
- *   label_singular = @Translation("Workflow executed transition"),
- *   label_plural = @Translation("Workflow executed transitions"),
- *   label_count = @PluralTranslation(
- *     singular = "@count Workflow executed transition",
- *     plural = "@count Workflow executed transitions",
- *   ),
- *   bundle_label = @Translation("Workflow type"),
- *   module = "workflow",
- *   translatable = FALSE,
- *   handlers = {
- *     "access" = "Drupal\workflow\WorkflowAccessControlHandler",
- *     "list_builder" = "Drupal\workflow\WorkflowTransitionListBuilder",
- *     "form" = {
- *        "add" = "Drupal\workflow\Form\WorkflowTransitionForm",
- *        "delete" = "Drupal\Core\Entity\EntityDeleteForm",
- *        "edit" = "Drupal\workflow\Form\WorkflowTransitionForm",
- *        "revert" = "Drupal\workflow_operations\Form\WorkflowTransitionRevertForm",
- *      },
- *     "views_data" = "Drupal\workflow\WorkflowTransitionViewsData",
- *   },
- *   base_table = "workflow_transition_history",
- *   entity_keys = {
- *     "id" = "hid",
- *     "bundle" = "wid",
- *     "langcode" = "langcode",
- *   },
- *   permission_granularity = "bundle",
- *   bundle_entity_type = "workflow_type",
- *   field_ui_base_route = "entity.workflow_type.edit_form",
- *   links = {
- *     "canonical" = "/workflow_transition/{workflow_transition}",
- *     "delete-form" = "/workflow_transition/{workflow_transition}/delete",
- *     "edit-form" = "/workflow_transition/{workflow_transition}/edit",
- *     "revert-form" = "/workflow_transition/{workflow_transition}/revert",
- *   },
- * )
- */
-class WorkflowTransition extends ContentEntityBase implements WorkflowTransitionInterface {
-
-  /*
-   * Entity data: Use WorkflowTransition->getTargetEntity() to fetch this.
-   */
-//  public $entity_type;
-//  public $bundle;
-//  private $entity_id; // Use WorkflowTransition->getTargetEntity() to fetch this.
-//  private $revision_id; // Use WorkflowTransition->getTargetEntity() to fetch this.
-//  public $field_name = '';
-//  private $langcode = Language::LANGCODE_NOT_SPECIFIED;
-//  public $delta = 0;
-
-  /*
-   * Transition data: are provided via baseFieldDefinitions().
-   */
-//  private $hid = 0;
-//  public $from_sid;
-//  public $to_sid;
-//  public $uid; // baseFieldProperty. Use WorkflowTransition->getOwnerId() to fetch this.
-//  public $timestamp;  // baseFieldProperty. use getTimestamp() to fetch this.
-//  public $comment; // baseFieldProperty. use getComment() to fetch this.
-
-  /*
-   * Cache data.
-   */
-//  protected $wid; // Use WorkflowTransition->getWorkflowId() to fetch this.
-  protected $workflow; // Use WorkflowTransition->getWorkflow() to fetch this.
-  protected $entity = NULL; // Use WorkflowTransition->getTargetEntity() to fetch this.
-  protected $user = NULL; // Use WorkflowTransition->getOwner() to fetch this.
-
-  /*
-   * Extra data: describe the state of the transition.
-   */
-  protected $is_scheduled;
-  protected $is_executed;
-  protected $is_forced = FALSE;
-
-  /**
-   * Entity class functions.
-   */
-
-  /**
-   * Creates a new entity.
-   *
-   * @param array $values
-   * @param string $entityType
-   *   The entity type of this Entity subclass.
-   *
-   * @param bool $bundle
-   * @param array $translations
-   * @internal param string $entity_type The entity type of the attached $entity.
-   * @see entity_create()
-   *
-   * No arguments passed, when loading from DB.
-   * All arguments must be passed, when creating an object programmatically.
-   * One argument $entity may be passed, only to directly call delete() afterwards.
-   */
-  public function __construct(array $values = [], $entityType = 'workflow_transition', $bundle = FALSE, $translations = []) {
-    // Please be aware that $entity_type and $entityType are different things!
-    parent::__construct($values, $entityType, $bundle, $translations);
-    // This transition is not scheduled.
-    $this->is_scheduled = FALSE;
-    // This transition is not executed, if it has no hid, yet, upon load.
-    $this->is_executed = ($this->id() > 0);
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @param array $values
-   *   $values[0] may contain a Workflow object or State object or State ID.
-   *
-   * @return static
-   *   The entity object.
-   */
-  public static function create(array $values = []) {
-    if (is_array($values) && isset($values[0])) {
-      $value = $values[0];
-      $values['wid'] = '';
-      $values['from_sid'] = '';
-      if (is_string($value) && $state = WorkflowState::load($value)) {
-        $values['wid'] = $state->getWorkflowId();
-        $values['from_sid'] = $state->id();
-      }
-      elseif (is_object($value) && $value instanceof WorkflowState) {
-        $state = $value;
-        $values['wid'] = $state->getWorkflowId();
-        $values['from_sid'] = $state->id();
-      }
-    }
-
-    // Add default values.
-    $values += [
-      'timestamp' => \Drupal::time()->getRequestTime(),
-      'uid' => \Drupal::currentUser()->id(),
-    ];
-    return parent::create($values);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setValues($to_sid, $uid = NULL, $timestamp = NULL, $comment = '', $force_create = FALSE) {
-    // Normally, the values are passed in an array, and set in parent::__construct, but we do it ourselves.
-
-    $uid = ($uid === NULL) ? workflow_current_user()->id() : $uid;
-    $from_sid = $this->getFromSid();
-
-    $this->set('to_sid', $to_sid);
-    $this->setOwnerId($uid);
-    $this->setTimestamp($timestamp == NULL ? \Drupal::time()->getRequestTime() : $timestamp);
-    $this->setComment($comment);
-
-    // If constructor is called with new() and arguments.
-    if (!$from_sid && !$to_sid && !$this->getTargetEntity()) {
-      // If constructor is called without arguments, e.g., loading from db.
-    }
-    elseif ($from_sid && $this->getTargetEntity()) {
-      // Caveat: upon entity_delete, $to_sid is '0'.
-      // If constructor is called with new() and arguments.
-    }
-    elseif (!$from_sid) {
-      // Not all parameters are passed programmatically.
-      if (!$force_create) {
-        drupal_set_message(
-          t('Wrong call to constructor Workflow*Transition(%from_sid to %to_sid)',
-            ['%from_sid' => $from_sid, '%to_sid' => $to_sid]),
-          'error');
-      }
-    }
-
-    return $this;
-  }
-
-  /**
-   * CRUD functions.
-   */
-
-  /**
-   * Saves the entity.
-   * Mostly, you'd better use WorkflowTransitionInterface::execute();
-   *
-   * {@inheritdoc}
-   */
-  public function save() {
-    // return parent::save();
-
-    // Avoid custom actions for subclass WorkflowScheduledTransition.
-    if ($this->isScheduled()) {
-      return parent::save();
-    }
-    if ($this->getEntityTypeId() != 'workflow_transition') {
-      return parent::save();
-    }
-
-    $transition = $this;
-    $entity_type = $transition->getTargetEntityTypeId();
-    $entity_id = $transition->getTargetEntityId();
-    $field_name = $transition->getFieldName();
-
-    // Remove any scheduled state transitions.
-    foreach (WorkflowScheduledTransition::loadMultipleByProperties($entity_type, [$entity_id], [], $field_name) as $scheduled_transition) {
-      /** @var WorkflowTransitionInterface $scheduled_transition */
-      $scheduled_transition->delete();
-    }
-
-    // Check for no transition.
-    if ($this->getFromSid() == $this->getToSid()) {
-      if (!$this->getComment()) {
-        // Write comment into history though.
-        return SAVED_UPDATED;
-      }
-    }
-
-    $hid = $this->id();
-    if (!$hid) {
-      // Insert the transition. Make sure it hasn't already been inserted.
-      // @todo: Allow a scheduled transition per revision.
-      // @todo: Allow a state per language version (langcode).
-      $found_transition = self::loadByProperties($entity_type, $entity_id, [], $field_name);
-      if ($found_transition &&
-        $found_transition->getTimestamp() == \Drupal::time()->getRequestTime() &&
-        $found_transition->getToSid() == $this->getToSid()) {
-        return SAVED_UPDATED;
-      }
-      else {
-        return parent::save();
-      }
-    }
-    else {
-      // Update the transition.
-      return parent::save();
-    }
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-//  public static function loadMultiple(array $ids = NULL) {
-//    return parent::loadMultiple($ids);
-//  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function loadByProperties($entity_type, $entity_id, array $revision_ids = [], $field_name = '', $langcode = '', $sort = 'ASC', $transition_type = 'workflow_transition') {
-    $limit = 1;
-    if ($transitions = self::loadMultipleByProperties($entity_type, [$entity_id], $revision_ids, $field_name, $langcode, $limit, $sort, $transition_type)) {
-      $transition = reset($transitions);
-      return $transition;
-    }
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function loadMultipleByProperties($entity_type, array $entity_ids, array $revision_ids = [], $field_name = '', $langcode = '', $limit = NULL, $sort = 'ASC', $transition_type = 'workflow_transition') {
-
-    /** @var $query \Drupal\Core\Entity\Query\QueryInterface */
-    $query = \Drupal::entityQuery($transition_type)
-      ->condition('entity_type', $entity_type)
-      ->sort('timestamp', $sort) // 'DESC' || 'ASC'
-      ->addTag($transition_type);
-    if (!empty($entity_ids)) {
-      $query->condition('entity_id', $entity_ids, 'IN');
-    }
-    if (!empty($revision_ids)) {
-      $query->condition('revision_id', $entity_ids, 'IN');
-    }
-    if ($field_name != '') {
-      $query->condition('field_name', $field_name, '=');
-    }
-    if ($langcode != '') {
-      $query->condition('langcode', $langcode, '=');
-    }
-    if ($limit) {
-      $query->range(0, $limit);
-    }
-    if ($transition_type == 'workflow_transition') {
-      // The timestamp is only granular to the second; on a busy site, we need the id.
-      // $query->orderBy('h.timestamp', 'DESC');
-      $query->sort('hid', 'DESC');
-    }
-    $ids = $query->execute();
-    $transitions = self::loadMultiple($ids);
-    return $transitions;
-  }
-
-  /**
-   * Implementing interface WorkflowTransitionInterface - properties.
-   */
-
-  /**
-   * Determines if the Transition is valid and can be executed.
-   * @todo: add to isAllowed() ?
-   * @todo: add checks to WorkflowTransitionElement ?
-   *
-   * @return bool
-   */
-  public function isValid() {
-    // Load the entity, if not already loaded.
-    // This also sets the (empty) $revision_id in Scheduled Transitions.
-    $entity = $this->getTargetEntity();
-
-    if (!$entity) {
-      // @todo: There is a watchdog error, but no UI-error. Is this OK?
-      $message = 'User tried to execute a Transition without an entity.';
-      $this->logError($message);
-      return FALSE;  // <-- exit !!!
-    }
-    if (!$this->getFromState()) {
-      // @todo: the page is not correctly refreshed after this error.
-      $message = t('You tried to set a Workflow State, but
-        the entity is not relevant. Please contact your system administrator.');
-      drupal_set_message($message, 'error');
-      $message = 'Setting a non-relevant Entity from state %sid1 to %sid2';
-      $this->logError($message);
-      return FALSE;  // <-- exit !!!
-    }
-
-    // The transition is OK.
-    return TRUE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isAllowed(UserInterface $user, $force = FALSE) {
-    /**
-     * Get early permissions of user, and bail out to avoid extra hook-calls.
-     */
-
-    if ($force) {
-      // $force allows Rules to cause transition.
-      return TRUE;
-    }
-
-    // Determine if user is owner of the entity.
-    $is_owner = WorkflowManager::isOwner($user, $this->getTargetEntity());
-    // Check allow-ability of state change if user is not superuser (might be cron).
-    $type_id = $this->getWorkflowId();
-    if ($user->hasPermission("bypass $type_id workflow_transition access")) {
-      // Superuser is special. And $force allows Rules to cause transition.
-      return TRUE;
-    }
-    // Determine if user is owner of the entity.
-    if ($is_owner) {
-      $user->addRole(WORKFLOW_ROLE_AUTHOR_RID);
-    }
-
-    // @todo: Keep below code aligned between WorkflowState, ~Transition, ~TransitionListController
-    /**
-     * Get the object and its permissions.
-     */
-    $config_transitions = $this->getWorkflow()->getTransitionsByStateId($this->getFromSid(), $this->getToSid());
-
-    /**
-     * Determine if user has Access.
-     */
-    $result = FALSE;
-    /** @var $config_transition WorkflowTransitionInterface */
-    foreach ($config_transitions as $config_transition) {
-      $result = $result || $config_transition->isAllowed($user, $force);
-    }
-
-    if ($result == FALSE) {
-      // @todo: There is a watchdog error, but no UI-error. Is this OK?
-      $message = t('Attempt to go to nonexistent transition (from %sid1 to %sid2)');
-      $this->logError($message);
-    }
-
-    return $result;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function execute($force = FALSE) {
-    // Load the entity, if not already loaded.
-    // This also sets the (empty) $revision_id in Scheduled Transitions.
-    /** @var $entity \Drupal\Core\Entity\EntityInterface */
-    $entity = $this->getTargetEntity();
-    // Load explicit User object (not via $transition) for adding Role later.
-    /** @var $user \Drupal\user\UserInterface */
-    $user = $this->getOwner();
-    $from_sid = $this->getFromSid();
-    $to_sid = $this->getToSid();
-    $field_name = $this->getFieldName();
-    $comment = $this->getComment();
-
-    static $static_info = NULL;
-
-    if (isset($static_info[$entity->id()][$field_name][$this->id()])) {
-      // Error: this Transition is already executed.
-      // On the development machine, execute() is called twice, when
-      // on an Edit Page, the entity has a scheduled transition, and
-      // user changes it to 'immediately'.
-      // Why does this happen?? ( BTW. This happens with every submit.)
-      // Remedies:
-      // - search root cause of second call.
-      // - try adapting code of transition->save() to avoid second record.
-      // - avoid executing twice.
-      $message = 'Transition is executed twice in a call. The second call for
-        @entity_type %entity_id is not executed.';
-      $this->logError($message);
-
-      // Return the result of the last call.
-      return $static_info[$entity->id()][$field_name][$this->id()]; // <-- exit !!!
-    }
-
-    // OK. Prepare for next round. Do not set last_sid!!
-    $static_info[$entity->id()][$field_name][$this->id()] = $from_sid;
-
-    // Make sure $force is set in the transition, too.
-    if ($force) {
-      $this->force($force);
-    }
-    $force = $this->isForced();
-
-    // TODO D8-port: figure out usage of $entity->workflow_transitions[$field_name]
-    /*
-        // Store the transition, so it can be easily fetched later on.
-        // Store in an array, to prepare for multiple workflow_fields per entity.
-        // This is a.o. used in hook_entity_update to trigger 'transition post'.
-        $entity->workflow_transitions[$field_name] = $this;
-    */
-
-    if (!$this->isValid()) {
-      return $from_sid;  // <-- exit !!!
-    }
-
-    // @todo: move below code to $this->isAllowed().
-    // If the state has changed, check the permissions.
-    $state_changed = ($from_sid != $to_sid);
-    if ($state_changed) {
-
-      // Make sure this transition is allowed by workflow module Admin UI.
-      if (!$force) {
-        $user->addRole(WORKFLOW_ROLE_AUTHOR_RID);
-      }
-      if (!$this->isAllowed($user, $force)) {
-        $message = 'User %user not allowed to go from state %sid1 to %sid2';
-        $this->logError($message);
-        return FALSE;  // <-- exit !!!
-      }
-
-      // Make sure this transition is valid and allowed for the current user.
-      // Invoke a callback indicating a transition is about to occur.
-      // Modules may veto the transition by returning FALSE.
-      // (Even if $force is TRUE, but they shouldn't do that.)
-      // P.S. The D7 hook_workflow 'transition permitted' is removed, in favour of below hook_workflow 'transition pre'.
-      $permitted = \Drupal::moduleHandler()->invokeAll('workflow', ['transition pre', $this, $user]);
-      // Stop if a module says so.
-      if (in_array(FALSE, $permitted, TRUE)) {
-        // @todo: There is a watchdog error, but no UI-error. Is this OK?
-        $message = 'Transition vetoed by module.';
-        $this->logError($message, 'notice');
-        return FALSE;  // <-- exit !!!
-      }
-    }
-    elseif ($this->getComment()) {
-      // No need to ask permission for adding comments.
-      // Since you should not add actions to a 'transition pre' event, there is
-      // no need to invoke the event.
-    }
-    else {
-      // There is no state change, and no comment.
-      // We may need to clean up something.
-    }
-
-
-    /**
-     * Output: process the transition.
-     */
-    if ($this->isScheduled()) {
-      /*
-       * Log the transition in {workflow_transition_scheduled}.
-       */
-      $this->save();
-    }
-    else {
-      // The transition is allowed, but not scheduled.
-      // Let other modules modify the comment. The transition (in context) contains all relevant data.
-      $context = ['transition' => $this];
-      \Drupal::moduleHandler()->alter('workflow_comment', $comment, $context);
-      $this->setComment($comment);
-
-      $this->is_executed = TRUE;
-
-      $state_changed = ($from_sid != $to_sid);
-      if ($state_changed || $comment) {
-
-        /*
-         * Log the transition in {workflow_transition_history}.
-         */
-        $this->save();
-
-        // Register state change with watchdog.
-        if ($state_changed) {
-          $workflow = $this->getWorkflow();
-          if (($new_state = $this->getToState()) && !empty($workflow->options['watchdog_log'])) {
-            if ($this->getEntityTypeId() == 'workflow_scheduled_transition') {
-              $message = 'Scheduled state change of @entity_type_label %entity_label to %sid2 executed';
-              $this->logError($message);
-              return FALSE;  // <-- exit !!!
-            }
-            $message = 'State of @entity_type_label %entity_label set to %sid2';
-            $this->logError($message, 'notice');
-          }
-        }
-
-        // Notify modules that transition has occurred.
-        // Action triggers should take place in response to this callback, not the 'transaction pre'.
-
-        //\Drupal::moduleHandler()->invokeAll('workflow', ['transition post', $this, $user]);
-        // We have a problem here with Rules, Trigger, etc. when invoking
-        // 'transition post': the entity has not been saved, yet. we are still
-        // IN the transition, not AFTER. Alternatives:
-        // 1. Save the field here explicitly, using field_attach_save;
-        // 2. Move the invoke to another place: hook_entity_insert(), hook_entity_update();
-        // 3. Rely on the entity hooks. This works for Rules, not for Trigger.
-        // --> We choose option 2:
-        // TODO D8-port: figure out usage of $entity->workflow_transitions[$field_name]
-        // - First, $entity->workflow_transitions[] is set for easy re-fetching.
-        // - Then, post_execute() is invoked via workflow_entity_insert(), _update().
-      }
-    }
-
-    // Save value in static from top of this function.
-    $static_info[$entity->id()][$field_name][$this->id()] = $to_sid;
-
-    return $to_sid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function executeAndUpdateEntity($force = FALSE) {
-    $to_sid = $this->getToSid();
-
-
-    // Generate error and stop if transition has no new State.
-    if (!$to_sid) {
-      $t_args = [
-        '%sid2' => $this->getToState()->label(),
-        '%entity_label' => $this->getTargetEntity()->label(),
-      ];
-      $message = "Transition is not executed for %entity_label, since 'To' state %sid2 is invalid.";
-      $this->logError($message);
-      drupal_set_message(t($message, $t_args), 'error');
-
-      return $this->getFromSid();
-    }
-
-    // Save the (scheduled) transition.
-    $do_update_entity = (!$this->isScheduled() && !$this->isExecuted());
-    if ($do_update_entity) {
-      $this->_updateEntity();
-    }
-    else {
-      // We create a new transition, or update an existing one.
-      // Do not update the entity itself.
-      // Validate transition, save in history table and delete from schedule table.
-      $to_sid = $this->execute($force);
-    }
-
-    return $to_sid;
-  }
-
-  private function _updateEntity() {
-    // Update the workflow field of the entity.
-    $field_name = $this->getFieldName();
-    $entity = $this->getTargetEntity();
-    // N.B. Align the following functions:
-    // - WorkflowDefaultWidget::massageFormValues();
-    // - WorkflowManager::executeTransition().
-    $entity->$field_name->workflow_transition = $this;
-    $entity->$field_name->value = $this->getToSid();
-
-    $entity->save();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function post_execute($force = FALSE) {
-    // @todo D8-port: This function post_execute() is not yet used.
-    workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: Test this snippet.
-
-    $state_changed = ($this->getFromSid() != $this->getToSid());
-    if ($state_changed || $this->getComment()) {
-      $user = $this->getOwner();
-      \Drupal::moduleHandler()->invokeAll('workflow', ['transition post', $this, $user]);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWorkflow() {
-    if (!$this->workflow && $wid = $this->getWorkflowId()) {
-      $this->workflow = Workflow::load($wid);
-    }
-    return $this->workflow;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWorkflowId() {
-
-    if (!$this->wid->target_id && $state = $this->getFromState()) {
-      // Fallback.
-      $state = ($state) ? $state : $this->getToState();
-      $wid = ($state) ? $state->getWorkflowId() : '';
-
-      $this->set('wid', $wid);
-    }
-    return $this->wid->target_id;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setTargetEntity($entity) {
-    $this->entity_type = '';
-    $this->entity_id = '';
-    $this->revision_id = '';
-    $this->delta = 0; // Only single value is supported.
-    $this->langcode = Language::LANGCODE_NOT_SPECIFIED;
-
-    if (!$entity) {
-      return $this;
-    }
-
-    // If Transition is added via CommentForm, use the Commented Entity.
-    if ($entity->getEntityTypeId() == 'comment') {
-      /** @var $entity \Drupal\comment\CommentInterface */
-      $entity = $entity->getCommentedEntity();
-    }
-
-    $this->entity = $entity;
-    /** @var \Drupal\Core\Entity\RevisionableContentEntityBase $entity */
-    $this->entity_type = $entity->getEntityTypeId();
-    $this->entity_id = $entity->id();
-    $this->revision_id = $entity->getRevisionId();
-    $this->delta = 0; // Only single value is supported.
-    $this->langcode = $entity->language()->getId();
-
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTargetEntity() {
-    // Use an explicit property, in case of adding new entities.
-    if (isset($this->entity)) {
-       return $this->entity;
-    }
-    // @todo D8: the following line only returns Node, not Term.
-    // return $this->entity = $this->get('entity_id')->entity;
-
-    $entity_type = $this->getTargetEntityTypeId();
-    if ($id = $this->getTargetEntityId()) {
-      $this->entity = \Drupal::entityManager()->getStorage($entity_type)->load($id);
-    }
-    return $this->entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTargetEntityId() {
-    return $this->get('entity_id')->target_id;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTargetEntityTypeId() {
-    return $this->get('entity_type')->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFieldName() {
-    return $this->get('field_name')->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLangcode() {
-    return $this->getTargetEntity()->language()->getId();
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFromState() {
-    $sid = $this->getFromSid();
-    return ($sid) ? WorkflowState::load($sid) : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getToState() {
-    $sid = $this->getToSid();
-    return ($sid) ? WorkflowState::load($sid) : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFromSid() {
-    $sid = $this->{'from_sid'}->target_id;
-    return $sid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getToSid() {
-    $sid = $this->{'to_sid'}->target_id;
-    return $sid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getComment() {
-    return $this->get('comment')->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setComment($value) {
-    $this->set('comment', $value);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTimestamp() {
-    return $this->get('timestamp')->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTimestampFormatted() {
-    $timestamp = $this->getTimestamp();
-    return \Drupal::service('date.formatter')->format($timestamp);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setTimestamp($value) {
-    $this->set('timestamp', $value);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isScheduled() {
-    return $this->is_scheduled;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function schedule($schedule = TRUE) {
-//    // We do a tricky thing here. The id of the entity is altered, so
-//    // all functions of another subclass are called.
-//    $this->entityTypeId = ($schedule) ? 'workflow_scheduled_transition' : 'workflow_transition';
-
-    $this->is_scheduled = $schedule;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setExecuted($is_executed = TRUE) {
-    $this->is_executed = $is_executed;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isExecuted() {
-    return (bool) $this->is_executed;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isForced() {
-    return (bool) $this->is_forced;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function force($force = TRUE) {
-    $this->is_forced = $force;
-    return $this;
-  }
-
-  /**
-   * Implementing interface EntityOwnerInterface. Copied from Comment.php.
-   */
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOwner() {
-    /** @var $user UserInterface */
-    $user = $this->get('uid')->entity;
-    if (!$user || $user->isAnonymous()) {
-      $user = User::getAnonymousUser();
-      $user->name = \Drupal::config('user.settings')->get('anonymous');
-    }
-    return $user;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOwnerId() {
-    return $this->get('uid')->target_id;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setOwnerId($uid) {
-    $this->set('uid', $uid);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setOwner(UserInterface $account) {
-    $this->set('uid', $account->id());
-    return $this;
-  }
-
-  /**
-   * Implementing interface FieldableEntityInterface extends EntityInterface.
-   */
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
-    // @todo ? $fields = parent::baseFieldDefinitions($entity_type);
-    $fields = [];
-
-    $fields['hid'] = BaseFieldDefinition::create('integer')
-      ->setLabel(t('Transition ID'))
-      ->setDescription(t('The transition ID.'))
-      ->setReadOnly(TRUE)
-      ->setSetting('unsigned', TRUE);
-
-//    $fields['wid'] = BaseFieldDefinition::create('string')
-    $fields['wid'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Workflow Type'))
-      ->setDescription(t('The workflow type the transition relates to.'))
-      ->setSetting('target_type', 'workflow_type')
-      ->setRequired(TRUE)
-      ->setTranslatable(FALSE)
-      ->setRevisionable(FALSE)
-//      ->setSetting('max_length', 32)
-//      ->setDisplayOptions('view', [
-//        'label' => 'hidden',
-//        'type' => 'string',
-//        'weight' => -5,
-//      ])
-//      ->setDisplayOptions('form', [
-//        'type' => 'string_textfield',
-//        'weight' => -5,
-//      ])
-//      ->setDisplayConfigurable('form', TRUE)
-      ;
-
-    $fields['entity_type'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Entity type'))
-      ->setDescription(t('The Entity type this transition belongs to.'))
-      ->setSetting('is_ascii', TRUE)
-      ->setSetting('max_length', EntityTypeInterface::ID_MAX_LENGTH)
-      ->setReadOnly(TRUE);
-
-    $fields['entity_id'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Entity ID'))
-      ->setDescription(t('The Entity ID this record is for.'))
-      ->setRequired(TRUE)
-      ->setReadOnly(TRUE)
-      ->setSetting('unsigned', TRUE);
-
-    $fields['revision_id'] = BaseFieldDefinition::create('integer')
-      ->setLabel(t('Revision ID'))
-      ->setDescription(t('The current version identifier.'))
-      ->setReadOnly(TRUE)
-      ->setSetting('unsigned', TRUE);
-
-    $fields['field_name'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Field name'))
-      ->setDescription(t('The name of the field the transition relates to.'))
-      ->setRequired(TRUE)
-      ->setTranslatable(FALSE)
-      ->setRevisionable(FALSE)
-      ->setSetting('max_length', 32)
-//      ->setDisplayConfigurable('form', FALSE)
-//      ->setDisplayOptions('form', [
-//        'type' => 'string_textfield',
-//        'weight' => -5,
-//      ])
-//      ->setDisplayConfigurable('view', FALSE)
-//      ->setDisplayOptions('view', [
-//        'label' => 'hidden',
-//        'type' => 'string',
-//        'weight' => -5,
-//      ])
-    ;
-
-    $fields['langcode'] = BaseFieldDefinition::create('language')
-      ->setLabel(t('Language'))
-      ->setDescription(t('The entity language code.'))
-      ->setTranslatable(TRUE)
-      ->setDisplayOptions('view', [
-        'type' => 'hidden',
-      ])
-      ->setDisplayOptions('form', [
-        'type' => 'language_select',
-        'weight' => 2,
-      ]);
-
-    $fields['delta'] = BaseFieldDefinition::create('integer')
-      ->setLabel(t('Delta'))
-      ->setDescription(t('The sequence number for this data item, used for multi-value fields.'))
-      ->setReadOnly(TRUE)
-      ->setSetting('unsigned', TRUE);
-
-    $fields['from_sid'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('From state'))
-      ->setDescription(t('The {workflow_states}.sid the entity started as.'))
-      ->setSetting('target_type', 'workflow_state')
-      ->setReadOnly(TRUE);
-
-    $fields['to_sid'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('To state'))
-      ->setDescription(t('The {workflow_states}.sid the entity transitioned to.'))
-      ->setSetting('target_type', 'workflow_state')
-// @todo D8: activate this. Test with both Form and Widget.
-//      ->setDisplayOptions('form', [
-//        'type' => 'select',
-//        'weight' => -5,
-//      ])
-//      ->setDisplayConfigurable('form', TRUE)
-      ->setReadOnly(TRUE);
-
-    $fields['uid'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('User ID'))
-      ->setDescription(t('The user ID of the transition author.'))
-      ->setTranslatable(TRUE)
-      ->setSetting('target_type', 'user')
-      ->setDefaultValue(0)
-//      ->setQueryable(FALSE)
-//      ->setSetting('handler', 'default')
-//      ->setDefaultValueCallback('Drupal\node\Entity\Node::getCurrentUserId')
-//      ->setTranslatable(TRUE)
-//      ->setDisplayOptions('view', [
-//        'label' => 'hidden',
-//        'type' => 'author',
-//        'weight' => 0,
-//      ])
-//      ->setDisplayOptions('form', [
-//        'type' => 'entity_reference_autocomplete',
-//        'weight' => 5,
-//        'settings' => [
-//          'match_operator' => 'CONTAINS',
-//          'size' => '60',
-//          'placeholder' => '',
-//        ],
-//      ])
-//      ->setDisplayConfigurable('form', TRUE),
-      ->setRevisionable(TRUE);
-
-    $fields['timestamp'] = BaseFieldDefinition::create('created')
-      ->setLabel(t('Timestamp'))
-      ->setDescription(t('The time that the current transition was executed.'))
-//      ->setQueryable(FALSE)
-//      ->setTranslatable(TRUE)
-//      ->setDisplayOptions('view', [
-//        'label' => 'hidden',
-//        'type' => 'timestamp',
-//        'weight' => 0,
-//      ])
-// @todo D8: activate this. Test with both Form and Widget.
-//      ->setDisplayOptions('form', [
-//        'type' => 'datetime_timestamp',
-//        'weight' => 10,
-//      ])
-//      ->setDisplayConfigurable('form', TRUE);
-      ->setRevisionable(TRUE);
-
-    $fields['comment'] = BaseFieldDefinition::create('string_long')
-      ->setLabel(t('Log message'))
-      ->setDescription(t('The comment explaining this transition.'))
-      ->setRevisionable(TRUE)
-      ->setTranslatable(TRUE)
-// @todo D8: activate this. Test with both Form and Widget.
-//      ->setDisplayOptions('form', [
-//        'type' => 'string_textarea',
-//        'weight' => 25,
-//        'settings' => [
-//          'rows' => 4,
-//        ],
-//      ])
-//      ->setDisplayConfigurable('form', FALSE)
-    ;
-
-    return $fields;
-  }
-
-  /**
-   * Generate a Watchdog error
-   *
-   * @param $message
-   * @param $type {'error' | 'notice'}
-   * @param $from_sid
-   * @param $to_sid
-   */
-  public function logError($message, $type = 'error', $from_sid = '', $to_sid = '') {
-
-    // Prepare an array of arguments for error messages.
-    $entity = $this->getTargetEntity();
-    $t_args = [
-      /** @var $user \Drupal\user\UserInterface */
-      '%user' => ($user = $this->getOwner()) ? $user->getDisplayName() : '',
-      '%sid1' => ($from_sid) ? $from_sid : $this->getFromState()->label(),
-      '%sid2' => ($to_sid) ? $to_sid : $this->getToState()->label(),
-      '%entity_id' => $this->getTargetEntityId(),
-      '%entity_label' => $entity ? $entity->label() : '',
-      '@entity_type' => ($entity) ? $entity->getEntityTypeId() : '',
-      '@entity_type_label' => ($entity) ? $entity->getEntityType()->getLabel() : '',
-      'link' => ($this->getTargetEntityId() && $this->getTargetEntity()->hasLinkTemplate('canonical')) ? $this->getTargetEntity()->toLink(t('View'))->toString() : '',
-    ];
-    ($type == 'error') ? \Drupal::logger('workflow')->error($message, $t_args)
-      : \Drupal::logger('workflow')->notice($message, $t_args);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function dpm($function = '') {
-    $transition = $this;
-    $entity = $transition->getTargetEntity();
-    $time = \Drupal::service('date.formatter')->format($transition->getTimestamp());
-    // Do this extensive $user_name lines, for some troubles with Action.
-    $user = $transition->getOwner();
-    $user_name = ($user) ? $user->getAccountName() : 'unknown username';
-    $t_string = $this->getEntityTypeId() . ' ' . $this->id() . ' for workflow_type <i>' . $this->getWorkflowId() . '</i> ' . ($function ? ("in function '$function'") : '');
-    $output[] = 'Entity  = ' . $this->getTargetEntityTypeId() . '/' . (($entity) ? ($entity->bundle() . '/' . $entity->id()) : '___/0') ;
-    $output[] = 'Field   = ' . $transition->getFieldName();
-    $output[] = 'From/To = ' . $transition->getFromSid() . ' > ' . $transition->getToSid() . ' @ ' . $time;
-    $output[] = 'Comment = ' . $user_name . ' says: ' . $transition->getComment();
-    $output[] = 'Forced  = ' . ($transition->isForced() ? 'yes' : 'no') .'; ' . 'Scheduled = ' . ($transition->isScheduled() ? 'yes' : 'no');
-    if (function_exists('dpm')) { dpm($output, $t_string); }
-  }
-
-}
diff --git a/modules/workflow/src/Entity/WorkflowTransitionInterface.php b/modules/workflow/src/Entity/WorkflowTransitionInterface.php
deleted file mode 100644
index ad55871..0000000
--- a/modules/workflow/src/Entity/WorkflowTransitionInterface.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Entity;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\user\EntityOwnerInterface;
-
-/**
- * Defines a common interface for Workflow*Transition* objects.
- *
- * @see \Drupal\workflow\Entity\WorkflowConfigTransition
- * @see \Drupal\workflow\Entity\WorkflowTransition
- * @see \Drupal\workflow\Entity\WorkflowScheduledTransition
- */
-interface WorkflowTransitionInterface extends WorkflowConfigTransitionInterface, EntityInterface, EntityOwnerInterface {
-
-  /**
-   * Helper function for __construct. Used for all children of WorkflowTransition (aka WorkflowScheduledTransition)
-   *
-   * Usage:
-   *   $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
-   *   $transition->setTargetEntity($entity);
-   *   $transition->setValues($new_sid, $user->id(), REQUEST_TIME, $comment);
-   *
-   * @param string $to_sid
-   * @param int $uid
-   * @param int $timestamp
-   * @param string $comment
-   * @param bool $force_create
-   */
-  public function setValues($to_sid, $uid = NULL, $timestamp = NULL, $comment = '', $force_create = FALSE);
-
-  /**
-   * Load (Scheduled) WorkflowTransitions, most recent first.
-   *
-   * @param string $entity_type
-   * @param int $entity_id
-   * @param array $revision_ids
-   * @param string $field_name
-   * @param string $langcode
-   * @param string $sort
-   * @param string $transition_type
-   *
-   * @return \Drupal\workflow\Entity\WorkflowTransitionInterface
-   *   Object representing one row from the {workflow_transition_history} table.
-   */
-  public static function loadByProperties($entity_type, $entity_id, array $revision_ids = [], $field_name = '', $langcode = '', $sort = 'ASC', $transition_type = '');
-
-  /**
-   * Given an entity, get all transitions for it.
-   *
-   * Since this may return a lot of data, a limit is included to allow for only one result.
-   *
-   * @param string $entity_type
-   * @param int[] $entity_ids
-   * @param int[] $revision_ids
-   * @param string $field_name
-   *   Optional. Can be NULL, if you want to load any field.
-   * @param string $langcode
-   *   Optional. Can be empty, if you want to load any language.
-   * @param int $limit
-   *   Optional. Can be NULL, if you want to load all transitions.
-   * @param string $sort
-   *   Optional sort order. {'ASC'|'DESC'}
-   * @param string $transition_type
-   *   The type of the transition to be fetched.
-   *
-   * @return WorkflowTransitionInterface[]
-   *   An array of transitions.
-   */
-  public static function loadMultipleByProperties($entity_type, array $entity_ids, array $revision_ids = [], $field_name = '', $langcode = '', $limit = NULL, $sort = 'ASC', $transition_type = '');
-
-  /**
-   * Execute a transition (change state of an entity).
-   *
-   * A Scheduled Transition shall only be saved, unless the
-   * 'schedule' property is set.
-   * @usage
-   *   $transition->schedule(FALSE);
-   *   $to_sid = $transition->execute(TRUE);
-   *
-   * @param bool $force
-   *   If set to TRUE, workflow permissions will be ignored.
-   *
-   * @return
-   *   New state ID. If execution failed, old state ID is returned,
-   */
-  public function execute($force = FALSE);
-
-  /**
-   * Executes a transition (change state of an entity), from OUTSIDE the entity.
-   *
-   * Use $transition->executeAndUpdateEntity() to start a State Change from
-   *   outside an entity, e.g., workflow_cron().
-   * Use $transition->execute() to start a State Change from within an entity.
-   *
-   * A Scheduled Transition ($transition->isScheduled() == TRUE) will be
-   *   un-scheduled and saved in the history table.
-   *   The entity will not be updated.
-   * If $transition->isScheduled() == FALSE, the Transition will be
-   *   removed from the {workflow_transition_scheduled} table (if necessary),
-   *   and added to {workflow_transition_history} table.
-   *   Then the entity wil be updated to reflect the new status.
-   *
-   * @usage
-   *   $to_sid = $transition->->executeAndUpdateEntity($force);
-   *
-   * @see workflow_execute_transition()
-   *
-   * @param bool $force
-   *   If set to TRUE, workflow permissions will be ignored.
-   *
-   * @return string
-   *   The resulting WorkflowState id.
-   */
-  public function executeAndUpdateEntity($force = FALSE);
-
-  /**
-   * Invokes 'transition post'.
-   * Adds the possibility to invoke the hook from elsewhere.
-   *
-   * @param bool $force
-   */
-  public function post_execute($force = FALSE);
-
-  /**
-   * Set the Entity, that is added to the Transition.
-   * Also set all dependent fields, that will be saved in tables {workflow_transition_*}
-   *
-   * @param EntityInterface $entity
-   *   The Entity ID or the Entity object, to add to the Transition.
-   *
-   * @return object
-   *   The Entity, that is added to the Transition.
-   */
-  public function setTargetEntity($entity);
-
-  /**
-   * Returns the entity to which the workflow is attached.
-   *
-   * @return EntityInterface
-   *   The entity to which the workflow is attached.
-   */
-  public function getTargetEntity();
-
-  /**
-   * Returns the ID of the entity to which the workflow is attached.
-   *
-   * @return int
-   *   The ID of the entity to which the workflow is attached.
-   */
-  public function getTargetEntityId();
-
-  /**
-   * Returns the type of the entity to which the workflow is attached.
-   *
-   * @return string
-   *   An entity type.
-   */
-  public function getTargetEntityTypeId();
-
-  /**
-   * Get the field_name for which the Transition is valid.
-   *
-   * @return string
-   *   The field_name, that is added to the Transition.
-   */
-  public function getFieldName();
-
-  /**
-   * Get the language code for which the Transition is valid.
-   *
-   * @todo: OK?? Shouldn't we use entity's language() method for langcode?
-   *
-   * @return string $langcode
-   */
-  public function getLangcode();
-
-  /**
-   * Get the comment of the Transition.
-   *
-   * @return
-   *   The comment
-   */
-  public function getComment();
-
-  /**
-   * Get the comment of the Transition.
-   *
-   * @param $value
-   *   The new comment.
-   *
-   * @return WorkflowTransitionInterface
-   */
-  public function setComment($value);
-
-  /**
-   * Returns the time on which the transitions was or will be executed.
-   *
-   * @return
-   */
-  public function getTimestamp();
-
-  /**
-   * Returns the human-readable time.
-   *
-   * @return string
-   */
-  public function getTimestampFormatted();
-
-  /**
-   * Returns the time on which the transitions was or will be executed.
-   *
-   * @param $value
-   *   The new timestamp.
-   * @return WorkflowTransitionInterface
-   */
-  public function setTimestamp($value);
-
-  /**
-   * Returns if this is a Scheduled Transition.
-   *
-   * @return bool
-   */
-  public function isScheduled();
-
-  /**
-   * Sets the Transition to be scheduled or not.
-   *
-   * @param bool $schedule
-   * @return WorkflowTransitionInterface
-   */
-  public function schedule($schedule = TRUE);
-
-  /**
-   * Set the 'is_executed' property.
-   *
-   * @param bool $is_executed
-   *
-   * @return WorkflowTransitionInterface
-   */
-  public function setExecuted($is_executed = TRUE);
-
-  /**
-   * Returns if this is an Executed Transition.
-   *
-   * @return bool
-   */
-  public function isExecuted();
-
-  /**
-   * A transition may be forced skipping checks.
-   *
-   * @return bool
-   *  If the transition is forced. (Allow not-configured transitions).
-   */
-  public function isForced();
-
-  /**
-   * Set if a transition must be executed, even if transition is invalid
-   * or user not authorized.
-   *
-   * @param bool $force
-   *
-   * @return object
-   *   The transition itself
-   */
-  public function force($force = TRUE);
-
-  /**
-   * Helper/debugging function. Shows simple contents of Transition.
-   *
-   * @param string $function
-   */
-  public function dpm($function = '');
-
-}
diff --git a/modules/workflow/src/Form/WorkflowForm.php b/modules/workflow/src/Form/WorkflowForm.php
deleted file mode 100644
index 35298f3..0000000
--- a/modules/workflow/src/Form/WorkflowForm.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Form;
-
-use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\workflow\Entity\Workflow;
-
-/**
- * Provides the base form for workflow add and edit forms.
- */
-class WorkflowForm extends EntityForm {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $noyes = [0 => t('No'), 1 => t('Yes')];
-    $fieldset_options = [0 => t('No fieldset'), 1 => t('Collapsible fieldset'), 2 => t('Collapsed fieldset')];
-    /* @var $workflow Workflow */
-    $workflow = $this->entity;
-
-    $form['label'] = [
-      '#type' => 'textfield',
-      '#description' => t('The human-readable label of the workflow. This will be used as a label when
-         the workflow status is shown during editing of content.'),
-      '#title' => $this->t('Label'),
-      '#default_value' => $this->entity->label(),
-      '#required' => TRUE,
-    ];
-
-    $form['id'] = [
-      '#type' => 'machine_name',
-      '#description' => t('A unique machine-readable name. Can only contain lowercase letters, numbers, and underscores.'),
-      '#disabled' => !$this->entity->isNew(),
-      '#default_value' => $this->entity->id(),
-      '#machine_name' => [
-        'exists' => [$this, 'exists'],
-        'replace_pattern' => '([^a-z0-9_]+)|(^custom$)',
-        'error' => $this->t('The machine-readable name must be unique, and can only contain lowercase letters, numbers, and underscores. Additionally, it can not be the reserved word "custom".'),
-      ],
-    ];
-
-    $form['permissions'] = [
-      '#type' => 'details',
-      '#title' => t('Workflow permissions'),
-      '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
-      '#description' => t("To enable further Workflow functionality, go to the
-        /admin/people/permissions page and select any roles that should have
-        access to below and other functionalities."),
-    ];
-    $form['permissions']['transition_execute'] = [
-      '#type' => 'item',
-      '#title' => t('Participate in workflow (create, execute transitions)'),
-      '#markup' => t("You can determine which roles are enabled on the
-        'Workflow Transitions & roles' configuration page. Use this to enable
-        only the relevant roles. Some sites have too many roles to show on
-        the configuration page."),
-    ];
-    $form['permissions']['transition_schedule'] = [
-      '#type' => 'item',
-      '#title' => t('Schedule state transition'),
-      '#markup' => t("Workflow transitions may be scheduled to a moment in the
-        future. Soon after the desired moment, the transition is executed by
-        Cron. This may be hidden by settings in widgets, formatters or permissions."
-      ),
-    ];
-    $form['permissions']['history_tab'] = [
-      '#type' => 'item',
-      '#title' => t('Access Workflow history tab'),
-      '#markup' => t("You can determine if a tab 'Workflow history' is
-         shown on the entity view page, which gives access to the History of
-         the workflow.
-         If you have multiple workflows per bundle, better disable this feature,
-         and use, clone & adapt the Views display 'Workflow history per Entity'."),
-    ];
-
-    $form['basic'] = [
-      '#type' => 'details',
-      '#title' => t('Workflow form settings'),
-      // '#description' => t('Lorem ipsum.'),
-      '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
-    ];
-
-    $form['basic']['fieldset'] = [
-      '#type' => 'select',
-      '#options' => $fieldset_options,
-      '#title' => t('Show the form in a fieldset?'),
-      '#default_value' => isset($workflow->options['fieldset']) ? $workflow->options['fieldset'] : 0,
-    ];
-    $form['basic']['options'] = [
-      '#type' => 'select',
-      '#title' => t('How to show the available states'),
-      '#required' => FALSE,
-      '#default_value' => isset($workflow->options['options']) ? $workflow->options['options'] : 'radios',
-      // '#multiple' => TRUE / FALSE,
-      '#options' => [
-        // These options are taken from options.module
-        'select' => 'Select list',
-        'radios' => 'Radio buttons',
-        'buttons' => 'Action buttons',
-        'dropbutton' => 'Drop button',
-      ],
-      '#description' => t("The Widget shows all available states. Decide which
-      is the best way to show them."
-      ),
-    ];
-
-    $form['basic']['name_as_title'] = [
-      '#type' => 'checkbox',
-      '#attributes' => ['class' => ['container-inline']],
-      '#title' => t('Use the workflow name as the title of the workflow form'),
-      '#default_value' => isset($workflow->options['name_as_title']) ? $workflow->options['name_as_title'] : 0,
-      '#description' => t(
-        'The workflow section of the editing form is in its own fieldset.
-             Checking the box will add the workflow name as the title of workflow
-             section of the editing form.'
-      ),
-    ];
-
-    $form['basic']['schedule_timezone'] = [
-      '#type' => 'checkbox',
-      '#title' => t('Show a timezone when scheduling a transition.'),
-      '#required' => FALSE,
-      '#default_value' => isset($workflow->options['schedule_timezone']) ? $workflow->options['schedule_timezone'] : 1,
-    ];
-
-    $form['basic']['comment_log_node'] = [
-      '#type' => 'select',
-      '#required' => FALSE,
-      '#options' => [
-        // Use 0/1/2 to stay compatible with previous checkbox.
-        0 => t('hidden'),
-        1 => t('optional'),
-        2 => t('required'),
-      ],
-      '#attributes' => ['class' => ['container-inline']],
-      '#title' => t('How to show the Comment subfield'),
-      '#default_value' => isset($workflow->options['comment_log_node']) ? $workflow->options['comment_log_node'] : 1,
-      '#description' => t(
-        'A Comment area can be shown on the Workflow Transition form so that the person
-         making a state change can record reasons for doing so. The comment is
-         then included in the content\'s workflow history.'
-      ),
-    ];
-
-    $form['watchdog'] = [
-      '#type' => 'details',
-      '#title' => t('Watchdog'),
-      '#description' => t('Informational watchdog messages can be logged when a transition is executed (state of a node is changed).'),
-      '#open' => TRUE, // Controls the HTML5 'open' attribute. Defaults to FALSE.
-    ];
-
-    $form['watchdog']['watchdog_log'] = [
-      '#type' => 'checkbox',
-      '#title' => t('Log watchdog messages upon state change'),
-      '#default_value' => isset($workflow->options['watchdog_log']) ? $workflow->options['watchdog_log'] : 0,
-      '#description' => '',
-    ];
-
-    return parent::form($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    $actions = parent::actions($form, $form_state);
-    // $actions['submit']['#value'] = $this->t('Save');
-    return $actions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    /* @var $entity \Drupal\workflow\Entity\Workflow */
-    $entity = $this->entity;
-
-    // Prevent leading and trailing spaces.
-    $entity->set('label', trim($entity->label()));
-
-    $entity->set('options', [
-        'name_as_title' => $form_state->getValue('name_as_title'),
-        'fieldset' => $form_state->getValue('fieldset'),
-        'options' => $form_state->getValue('options'),
-        'schedule_timezone' => $form_state->getValue('schedule_timezone'),
-        'comment_log_node' => $form_state->getValue('comment_log_node'),
-        'watchdog_log' => $form_state->getValue('watchdog_log'),
-      ]
-    );
-
-    $status = parent::save($form, $form_state);
-    $action = $status == SAVED_UPDATED ? 'updated' : 'added';
-
-    // Tell the user we've updated the data.
-    $args = [
-      '%label' => $entity->label(),
-      '%action' => $action,
-      'link' => $entity->toLink(t('Edit'))->toString(),
-    ];
-    drupal_set_message($this->t('Workflow %label has been %action. Please maintain the permissions, states and transitions.', $args));
-    $this->logger('workflow')->notice('Workflow %label has been %action.', $args);
-
-    if ($status == SAVED_NEW) {
-      $form_state->setRedirect('entity.workflow_type.edit_form', ['workflow_type' => $entity->id()]);
-    }
-
-  }
-
-  /**
-   * Form validation handler.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    $workflow = $this->entity;
-    $name = $workflow->id();
-
-    // Make sure workflow name is not numeric.
-    // TODO: this was a prerequisite in D7. Remove in D8?
-    if (ctype_digit($name)) {
-      $form_state->setErrorByName('id', t('Please choose a non-numeric name for your workflow.'));
-    }
-
-    parent::validateForm($form, $form_state);
-  }
-
-  /**
-   * Machine name exists callback.
-   *
-   * @param string $id
-   *   The machine name ID.
-   *
-   * @return bool
-   *   TRUE if an entity with the same name already exists, FALSE otherwise.
-   */
-  public function exists($id) {
-    $type = $this->entity->getEntityTypeId();
-
-    return (bool) $this->entityTypeManager->getStorage($type)->load($id);
-  }
-
-}
diff --git a/modules/workflow/src/Form/WorkflowTransitionForm.php b/modules/workflow/src/Form/WorkflowTransitionForm.php
deleted file mode 100644
index b85b306..0000000
--- a/modules/workflow/src/Form/WorkflowTransitionForm.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Form;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Entity\ContentEntityForm;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\workflow\Element\WorkflowTransitionElement;
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-
-/**
- * Provides a Transition Form to be used in the Workflow Widget.
- */
-class WorkflowTransitionForm extends ContentEntityForm {
-
-  /*************************************************************************
-   *
-   * Implementation of interface FormInterface.
-   *
-   */
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-
-    /** @var $transition \Drupal\workflow\Entity\WorkflowTransitionInterface */
-    $transition = $this->entity;
-    $field_name = $transition->getFieldName();
-
-    /** @var $entity \Drupal\Core\Entity\EntityInterface */
-    // Entity may be empty on VBO bulk form.
-    // $entity = $transition->getTargetEntity();
-    // Compose Form Id from string + Entity Id + Field name.
-    // Field ID contains entity_type, bundle, field_name.
-    // The Form Id is unique, to allow for multiple forms per page.
-    // $workflow_type_id = $transition->getWorkflowId();
-    // Field name contains implicit entity_type & bundle (since 1 field per entity)
-    // $entity_type = $transition->getTargetEntityTypeId();
-    // $entity_id = $transition->getTargetEntityId();;
-
-    // Emulate nodeForm convention.
-    if ($transition->id()) {
-      $suffix = 'edit_form';
-    }
-    else {
-      $suffix = 'form';
-    }
-    $form_id = implode('_', ['workflow_transition', $field_name, $suffix]);
-    $form_id = Html::getUniqueId($form_id);
-
-    return $form_id;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * N.B. The D8-version of this form is stripped. If any use case is missing:
-   * - compare with the D7-version of WorkflowTransitionForm::submitForm()
-   * - compare with the D8-version of WorkflowTransitionElement::copyFormValuesToEntity()
-   */
-  /*
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    parent::submitForm($form, $form_state);
-  }
-   */
-
-  /* *************************************************************************
-   *
-   * Implementation of interface EntityFormInterface (extends FormInterface).
-   *
-   */
-
-  /**
-   * This function is called by buildForm().
-   * Caveat: !! It is not declared in the EntityFormInterface !!
-   *
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    // Call parent to get (extra) fields.
-    // This might cause baseFieldDefinitions to appear twice.
-    $form = parent::form($form, $form_state);
-
-    /** @var $transition \Drupal\workflow\Entity\WorkflowTransitionInterface */
-    $transition = $this->entity;
-
-    // Do not pass the element, but the form.
-    // $element['#default_value'] = $transition;
-    // $form += WorkflowTransitionElement::transitionElement($element, $form_state, $form);
-    //
-    // Pass the form via parameter
-    $form['#default_value'] = $transition;
-    $form = WorkflowTransitionElement::transitionElement($form, $form_state, $form);
-    return $form;
-  }
-
-  /*
-   * Returns the action form element for the current entity form.
-   * Caveat: !! It is not declared in the EntityFormInterface !!
-   *
-   * {@inheritdoc}
-  protected function actionsElement(array $form, FormStateInterface $form_state) {
-    $element = parent::actionsElement($form, $form_state);
-    return $element;
-  }
-   */
-
-  /**
-   * Returns an array of supported actions for the current entity form.
-   * Caveat: !! It is not declared in the EntityFormInterface !!
-   * @param array $form
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   * @return array
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    // N.B. Keep code aligned: workflow_form_alter(), WorkflowTransitionForm::actions().
-    $actions = parent::actions($form, $form_state);
-
-    // A default button is provided by core. Override it.
-    $actions['submit']['#value'] = t('Update workflow');
-    $actions['submit']['#attributes'] = ['class' => ['form-save-default-button']];
-
-    if (!_workflow_use_action_buttons()) {
-      // Change the default submit button on the Workflow History tab.
-      return $actions;
-    }
-
-    // Find the first workflow.
-    // (So this won't work with multiple workflows per entity.)
-    // Quit if there is no Workflow on this page.
-    if (!$workflow_form = &$form) {
-      return $actions;
-    }
-
-    // Quit if there are no Workflow Action buttons.
-    // (If user has only 1 workflow option, there are no Action buttons.)
-    if (count($workflow_form['to_sid']['#options']) <= 1) {
-      return $actions;
-    }
-
-    // Place the buttons. Remove the default 'Save' button.
-    // $actions += _workflow_transition_form_get_action_buttons($form, $workflow_form);
-    // Remove the default submit button from the form.
-    // unset($actions['submit']);
-    $default_submit_action = $actions['submit'];
-    $actions = _workflow_transition_form_get_action_buttons($form, $workflow_form, $default_submit_action);
-    foreach ($actions as $key => &$action) {
-      $action['#submit'] = $default_submit_action['#submit'];
-    }
-
-    return $actions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildEntity(array $form, FormStateInterface $form_state) {
-    /** @var \Drupal\Core\Entity\FieldableEntityInterface $entity */
-    $entity = clone $this->entity;
-    // N.B. Use a proprietary version of copyFormValuesToEntity,
-    // where $entity is passed by reference.
-    // $this->copyFormValuesToEntity($entity, $form, $form_state);
-    $item = $form_state->getValues();
-    $entity = WorkflowTransitionElement::copyFormValuesToTransition($entity, $form, $form_state, $item);
-
-    // Mark the entity as NOT requiring validation. (Used in validateForm().)
-    $entity->setValidationRequired(FALSE);
-
-    return $entity;
-  }
-
-  /*
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form = parent::buildForm($form, $form_state);
-
-    // Add class following node-form pattern (both on form and container).
-    // D8-port: This is apparently already magically set in parent.
-    // $form['#attributes']['class'][] = 'workflow-transition-' . $workflow_type_id . '-form';
-    // $form['#attributes']['class'][] = 'workflow-transition-form';
-    return $form;
-  }
-   */
-
-  /**
-   * {@inheritdoc}
-   *
-   * This is called from submitForm().
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    // Execute transition and update the attached entity.
-    /** @var WorkflowTransitionInterface $transition */
-    $transition = $this->getEntity();
-    return $transition->executeAndUpdateEntity();
-  }
-
-  /*************************************************************************
-   *
-   * Implementation of interface ContentEntityFormInterface (extends EntityFormInterface).
-   *
-   */
-
-  /**
-   * {@inheritdoc}
-   */
-  //public function validateForm(array &$form, FormStateInterface $form_state) {
-  //  return parent::validateForm($form, $form_state);
-  //}
-
-}
diff --git a/modules/workflow/src/Plugin/Action/WorkflowNodeGivenStateAction.php b/modules/workflow/src/Plugin/Action/WorkflowNodeGivenStateAction.php
deleted file mode 100644
index b12bbcf..0000000
--- a/modules/workflow/src/Plugin/Action/WorkflowNodeGivenStateAction.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Plugin\Action;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Sets an entity to a new, given state.
- *
- * The only change is the 'type' in tha Annotation, so it works on Nodes,
- * and can be seen on admin/content page.
- *
- * @Action(
- *   id = "workflow_node_given_state_action",
- *   label = @Translation("Change a node to new Workflow state"),
- *   type = "node"
- * )
- */
-class WorkflowNodeGivenStateAction extends WorkflowStateActionBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies(){
-    return [
-      'module' => ['workflow', 'node'],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form = parent::buildConfigurationForm($form, $form_state);
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function execute($object = NULL) {
-    /*
-     * D7: As advanced action with Trigger 'node':
-     * - $entity is empty;
-     * - $context['group'] = 'node'
-     * - $context['hook'] = 'node_insert / _update / _delete'
-     * - $context['node'] = (Object) stdClass
-     * - $context['entity_type'] = NULL
-     *
-     * D7: As advanced action with Trigger 'taxonomy':
-     * - $entity is (Object) stdClass;
-     * - $context['type'] = 'entity'
-     * - $context['group'] = 'taxonomy'
-     * - $context['hook'] = 'taxonomy_term_insert / _update / _delete'
-     * - $context['node'] = (Object) stdClass
-     * - $context['entity_type'] = NULL
-     *
-     * D7: As advanced action with Trigger 'workflow API':
-     * ...
-     *
-     * D7: As VBO action:
-     * - $entity is (Object) stdClass;
-     * - $context['type'] = NULL
-     * - $context['group'] = NULL
-     * - $context['hook'] = NULL
-     * - $context['node'] = (Object) stdClass
-     * - $context['entity_type'] = 'node'
-     */
-
-    if (!$transition = $this->getTransitionForExecution($object)) {
-      drupal_set_message('The entity is not valid for this action.');
-      return;
-    }
-
-    // Fire the transition.
-    workflow_execute_transition($transition, $force);
-  }
-
-}
diff --git a/modules/workflow/src/Plugin/Action/WorkflowNodeNextStateAction.php b/modules/workflow/src/Plugin/Action/WorkflowNodeNextStateAction.php
deleted file mode 100644
index 87caa85..0000000
--- a/modules/workflow/src/Plugin/Action/WorkflowNodeNextStateAction.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Plugin\Action;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Sets an entity to the next state.
- *
- * The only change is the 'type' in tha Annotation, so it works on Nodes,
- * and can be seen on admin/content page.
- *
- * @Action(
- *   id = "workflow_node_next_state_action",
- *   label = @Translation("Change a node to next Workflow state"),
- *   type = "node"
- * )
- */
-class WorkflowNodeNextStateAction extends WorkflowStateActionBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies(){
-    return [
-      'module' => ['workflow', 'node'],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form = parent::buildConfigurationForm($form, $form_state);
-
-    // Remove to_sid. User can't set it, since we want a dynamic 'next' state.
-    unset($form['to_sid']);
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function execute($object = NULL) {
-
-    if (!$transition = $this->getTransitionForExecution($object)) {
-      drupal_set_message('The object is not valid for this action.', 'warning');
-      return;
-    }
-
-    /*
-     * Set the new next state.
-     */
-    $entity = $transition->getTargetEntity();
-    $field_name = $transition->getFieldName();
-    $user = $transition->getOwner();
-    $force = $this->configuration['force'];
-    // $comment = $transition->getComment();
-
-    // Get the node's new State Id (which is the next available state).
-    $to_sid = $transition->getWorkflow()->getNextSid($entity, $field_name, $user, $force);
-
-    // Add actual data.
-    $transition->to_sid = $to_sid;
-
-    // Fire the transition.
-    workflow_execute_transition($transition, $force);
-  }
-
-}
diff --git a/modules/workflow/src/Plugin/Action/WorkflowStateActionBase.php b/modules/workflow/src/Plugin/Action/WorkflowStateActionBase.php
deleted file mode 100644
index 21afc7e..0000000
--- a/modules/workflow/src/Plugin/Action/WorkflowStateActionBase.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Plugin\Action;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Action\ConfigurableActionBase;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\workflow\Element\WorkflowTransitionElement;
-use Drupal\workflow\Entity\Workflow;
-use Drupal\workflow\Entity\WorkflowTransition;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Sets an entity to a new, given state.
- *
- * Example Annotation @ Action(
- *   id = "workflow_given_state_action",
- *   label = @Translation("Change a node to new Workflow state"),
- *   type = "workflow"
- * )
- */
-abstract class WorkflowStateActionBase extends ConfigurableActionBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    return parent::calculateDependencies() + [
-      'module' => ['workflow',],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static($configuration, $plugin_id, $plugin_definition);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultConfiguration() {
-    $configuration = parent::defaultConfiguration();
-    $configuration += $this->configuration;
-    $configuration += [
-      'field_name' => '',
-      'to_sid' => '',
-      'comment' => "New state is set by a triggered Action.",
-      'force' => 0,
-    ];
-    return $configuration;
-  }
-
-  /**
-   * @param EntityInterface $entity
-   * @return \Drupal\workflow\Entity\WorkflowTransitionInterface
-   */
-  protected function getTransitionForExecution(EntityInterface $entity) {
-    $user = workflow_current_user();
-
-    if (!$entity) {
-      \Drupal::logger('workflow_action')->notice('Unable to get current entity - entity is not defined.', []);
-      return NULL;
-    }
-
-    // Get the entity type and numeric ID.
-    $entity_id = $entity->id();
-    if (!$entity_id) {
-      \Drupal::logger('workflow_action')->notice('Unable to get current entity ID - entity is not yet saved.', []);
-      return NULL;
-    }
-
-    // In 'after saving new content', the node is already saved. Avoid second insert.
-    // @todo: clone?
-    $entity->enforceIsNew(FALSE);
-
-    $config = $this->configuration;
-    $field_name = workflow_get_field_name($entity, $config['field_name']);
-    $current_sid = workflow_node_current_state($entity, $field_name);
-    if (!$current_sid) {
-      \Drupal::logger('workflow_action')->notice('Unable to get current workflow state of entity %id.', ['%id' => $entity_id]);
-      return NULL;
-    }
-
-    $to_sid = isset($config['to_sid']) ? $config['to_sid'] : '';
-    // Get the Comment. Parse the $comment variables.
-    $comment_string = $this->configuration['comment'];
-    $comment = t($comment_string, [
-      '%title' => $entity->label(),
-      // "@" and "%" will automatically run check_plain().
-      '%state' => workflow_get_sid_name($to_sid),
-      '%user' => $user->getDisplayName(),
-    ]);
-    $force = $this->configuration['force'];
-
-    $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
-    $transition->setTargetEntity($entity);
-    $transition->setValues($to_sid, $user->id(), \Drupal::time()->getRequestTime(), $comment);
-    $transition->force($force);
-
-    return $transition;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form = [];
-
-    // If we are on admin/config/system/actions and use CREATE AN ADVANCED ACTION
-    // Then $context only contains:
-    // - $context['actions_label'] = "Change workflow state of post to new state"
-    // - $context['actions_type'] = "entity"
-    //
-    // If we are on a VBO action form, then $context only contains:
-    // - $context['entity_type'] = "node"
-    // - $context['view'] = "(Object) view"
-    // - $context['settings'] = "[]"
-
-    $config = $this->configuration;
-    $field_name = $config['field_name'];
-    $wids = workflow_get_workflow_names();
-
-    if (empty($field_name) && count($wids) > 1) {
-      drupal_set_message('You have more then one workflow in the system. Please first select the field name
-          and save the form. Then, revisit the form to set the correct state value.', 'warning');
-    }
-    if (empty($field_name)) {
-      $wid = count($wids) ? array_keys($wids)[0] : '';
-    }
-    else {
-      $fields = _workflow_info_fields($entity = NULL, $entity_type = '', $entity_bundle = '', $field_name);
-      $wid = count($fields) ? reset($fields)->getSetting('workflow_type') : '';
-    }
-
-    // Get the common Workflow, or create a dummy Workflow.
-    $workflow = $wid ? Workflow::load($wid) : Workflow::create(['id' => 'dummy_action', 'label' => 'dummy_action']);
-    $current_state = $workflow->getCreationState();
-
-    /*
-    // @todo D8-port for VBO
-    // Show the current state and the Workflow form to allow state changing.
-    // N.B. This part is replicated in hook_node_view, workflow_tab_page, workflow_vbo.
-    if ($workflow) {
-      $field = _workflow_info_field($field_name, $workflow);
-      $field_name = $field['field_name'];
-      $field_id = $field['id'];
-      $instance = field_info_instance($entity_type, $field_name, $entity_bundle);
-
-      // Hide the submit button. VBO has its own 'next' button.
-      $instance['widget']['settings']['submit_function'] = '';
-      if (!$field_id) {
-        // This is a Workflow Node workflow. Set widget options as in v7.x-1.2
-        $field['settings']['widget']['comment'] = $workflow->options['comment_log_node']; // 'comment_log_tab' is removed;
-        $field['settings']['widget']['current_status'] = TRUE;
-        // As stated above, the options list is probably very long, so let's use select list.
-        $field['settings']['widget']['options'] = 'select';
-        // Do not show the default [Update workflow] button on the form.
-        $instance['widget']['settings']['submit_function'] = '';
-      }
-    }
-
-    // Add the form/widget to the formatter, and include the nid and field_id in the form id,
-    // to allow multiple forms per page (in listings, with hook_forms() ).
-    // Ultimately, this is a wrapper for WorkflowDefaultWidget.
-    // $form['workflow_current_state'] = workflow_state_formatter($entity_type, $entity, $field, $instance);
-    $form_id = implode('_', [
-      'workflow_transition_form',
-      $entity_type,
-      $entity_id,
-      $field_id
-    ]);
-     */
-    $user = workflow_current_user();
-    $transition = WorkflowTransition::create([$current_state, 'field_name' => $field_name]);
-    $transition->setValues(
-      $to_sid = $config['to_sid'],
-      $user->id(),
-      \Drupal::time()->getRequestTime(),
-      $comment = $config['comment'],
-      $force = $config['force']
-  );
-
-    // Add the WorkflowTransitionForm to the page.
-
-    $element = []; // Just to be explicit.
-    $element['#default_value'] = $transition;
-
-    // Avoid Action Buttons. That removes the options box&more. No Buttons in config screens!
-    $original_options = $transition->getWorkflow()->options['options'];
-    $transition->getWorkflow()->options['options'] = 'select';
-    // Generate and add the Workflow form element.
-    $element = WorkflowTransitionElement::transitionElement($element, $form_state, $form);
-    // Just to be sure, reset the options box setting.
-    $transition->getWorkflow()->options['options'] = $original_options;
-
-    // Make adaptations for VBO-form:
-    $element['field_name']['#access'] = TRUE;
-    $element['force']['#access'] = TRUE;
-    $element['to_sid']['#description'] = t('Please select the state that should be assigned when this action runs.');
-    $element['comment']['#title'] = $this->t('Message');
-    $element['comment']['#description'] = $this->t('This message will be written into the workflow history log when the action
-      runs. You may include the following variables: %state, %title, %user.');
-
-    $form['workflow_transition_action_config'] = $element;
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $configuration = $form_state->getValue('workflow_transition_action_config');
-    // Remove the transition: generates an error upon saving the action definition.
-    unset($configuration['workflow_transition']);
-
-    $this->configuration = $configuration;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
-    $access = AccessResult::allowed();
-    return $return_as_object ? $access : $access->isAllowed();
-  }
-
-}
diff --git a/modules/workflow/src/Plugin/Block/WorkflowTransitionBlock.php b/modules/workflow/src/Plugin/Block/WorkflowTransitionBlock.php
deleted file mode 100644
index a60dae1..0000000
--- a/modules/workflow/src/Plugin/Block/WorkflowTransitionBlock.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Plugin\Block;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Block\BlockBase;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\workflow\Entity\WorkflowTransition;
-
-/**
- * Provides a 'Workflow Transition form' block.
- * Credits to workflow_extensions module.
- *
- * @todo D8-port: add cache options in configuration.
- *    'cache' => DRUPAL_NO_CACHE, // DRUPAL_CACHE_PER_ROLE will be assumed.
- *
- * @Block(
- *   id = "workflow_transition_form_block",
- *   admin_label = @Translation("Workflow Transition form"),
- *   category = @Translation("Forms")
- * )
- */
-class WorkflowTransitionBlock extends BlockBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function blockAccess(AccountInterface $account) {
-    /* @var $entity \Drupal\Core\Entity\EntityInterface */
-    if (!$entity = workflow_url_get_entity()) {
-      return AccessResult::forbidden();
-    }
-
-    // Only show block on entity view page (when default operation = '').
-    if ($operation = workflow_url_get_operation()) {
-      return AccessResult::forbidden();
-    }
-
-    // Only show block if entity has workflow, and user has permission.
-    foreach (_workflow_info_fields($entity) as $definition) {
-      $type_id = $definition->getSetting('workflow_type');
-      if ($account->hasPermission("access $type_id workflow_transition form")) {
-        return AccessResult::allowed();
-      }
-    }
-
-    return AccessResult::forbidden();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build() {
-    $form = [];
-
-    // Get the entity for this form.
-    /* @var $entity \Drupal\Core\Entity\EntityInterface */
-    if (!$entity = workflow_url_get_entity()) {
-      return $form;
-    }
-    // Get the field name. Avoid error on Node Add page.
-    if (!$field_name = workflow_get_field_name($entity)) {
-      return $form;
-    }
-
-    /*
-     * Output: generate the Transition Form.
-     */
-    // Create a transition, to pass to the form. No need to use setValues().
-    $current_sid = workflow_node_current_state($entity, $field_name);
-    $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
-    $transition->setTargetEntity($entity);
-    // Add the WorkflowTransitionForm to the page.
-    $form = $this->entityFormBuilder()->getForm($transition, 'add');
-
-    return $form;
-  }
-
-  /**
-   * Retrieves the entity form builder.
-   *
-   * @return \Drupal\Core\Entity\EntityFormBuilderInterface
-   *   The entity form builder.
-   */
-  protected function entityFormBuilder() {
-    return \Drupal::getContainer()->get('entity.form_builder');
-  }
-
-}
diff --git a/modules/workflow/src/Plugin/Field/FieldFormatter/WorkflowDefaultFormatter.php b/modules/workflow/src/Plugin/Field/FieldFormatter/WorkflowDefaultFormatter.php
deleted file mode 100644
index 62a4bee..0000000
--- a/modules/workflow/src/Plugin/Field/FieldFormatter/WorkflowDefaultFormatter.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Plugin\Field\FieldFormatter;
-
-use Drupal\Core\Entity\EntityFormBuilderInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FormatterBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\workflow\Entity\WorkflowManagerInterface;
-use Drupal\workflow\Entity\WorkflowState;
-use Drupal\workflow\Entity\WorkflowTransition;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a default workflow formatter.
- *
- * @FieldFormatter(
- *   id = "workflow_default",
- *   module = "workflow",
- *   label = @Translation("Workflow form"),
- *   field_types = {
- *     "workflow"
- *   },
- *   quickedit = {
- *     "editor" = "disabled"
- *   }
- * )
- */
-class WorkflowDefaultFormatter extends FormatterBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function defaultSettings() {
-    return [
-    ] + parent::defaultSettings();
-  }
-
-  /**
-   * The workflow storage.
-   *
-   * @var \Drupal\workflow\WorkflowStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $currentUser;
-
-  /**
-   * The  render controller.
-   *
-   * @var \Drupal\Core\Entity\EntityViewBuilderInterface
-   */
-  protected $viewBuilder;
-
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * The entity form builder.
-   *
-   * @var \Drupal\Core\Entity\EntityFormBuilderInterface
-   */
-  protected $entityFormBuilder;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $plugin_id,
-      $plugin_definition,
-      $configuration['field_definition'],
-      $configuration['settings'],
-      $configuration['label'],
-      $configuration['view_mode'],
-      $configuration['third_party_settings'],
-      $container->get('current_user'),
-      $container->get('entity.manager'),
-      $container->get('entity.form_builder')
-    );
-  }
-
-  /**
-   * Constructs a new WorkflowDefaultFormatter.
-   *
-   * @param string $plugin_id
-   *   The plugin_id for the formatter.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
-   *   The definition of the field to which the formatter is associated.
-   * @param array $settings
-   *   The formatter settings.
-   * @param string $label
-   *   The formatter label display setting.
-   * @param string $view_mode
-   *   The view mode.
-   * @param array $third_party_settings
-   *   Third party settings.
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   The current user.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager
-   * @param \Drupal\Core\Entity\EntityFormBuilderInterface $entity_form_builder
-   *   The entity form builder.
-   */
-  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AccountInterface $current_user, EntityManagerInterface $entity_manager, EntityFormBuilderInterface $entity_form_builder) {
-    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
-    $this->viewBuilder = $entity_manager->getViewBuilder('workflow_transition');
-    $this->storage = $entity_manager->getStorage('workflow_transition');
-    $this->currentUser = $current_user;
-    $this->entityManager = $entity_manager;
-    $this->entityFormBuilder = $entity_form_builder;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * N.B. A large part of this function is taken from CommentDefaultFormatter.
-   */
-  public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = [];
-    $output = [];
-
-    $field_name = $this->fieldDefinition->getName();
-    $entity = $items->getEntity();
-    $entity_type = $entity->getEntityTypeId();
-
-    $status = $items->status;
-
-    $workflow_settings = $this->getFieldSettings();
-
-    $user = \Drupal::currentUser(); // @todo #2287057: OK?
-    // @todo: Perhaps global user is not always the correct user.
-    // E.g., on ScheduledTransition->execute()? But this function is mostly used in UI.
-
-    $current_sid = $this->workflowManager()->getCurrentStateId($entity, $field_name);
-    /* @var $current_state WorkflowState */
-    $current_state = WorkflowState::load($current_sid);
-
-    // First compose the current value with the normal formatter from list.module.
-    $elements = workflow_state_formatter($entity, $field_name, $current_sid);
-
-    // The state must not be deleted, or corrupted.
-    if (!$current_state) {
-      return $elements;
-    }
-
-    // Check permission, so that even with state change rights,
-    // the form can be suppressed from the entity view (#1893724).
-    $type_id = $current_state->getWorkflowId();
-    if (!\Drupal::currentUser()->hasPermission("access $type_id workflow_transition form")) {
-      return $elements;
-    }
-
-    // Workflows are added to the search results and search index by
-    // workflow_node_update_index() instead of by this formatter, so don't
-    // return anything if the view mode is search_index or search_result.
-    if (in_array($this->viewMode, ['search_result', 'search_index'])) {
-      return $elements;
-    }
-
-    if ($entity_type == 'comment') {
-      // No Workflow form allowed on a comment display.
-      // (Also, this avoids a lot of error messages.)
-      return $elements;
-    }
-
-    // Only build form if user has possible target state(s).
-    if (!$current_state->showWidget($entity, $field_name, $user, FALSE)) {
-      return $elements;
-    }
-
-    // Create a transition, to pass to the form. No need to use setValues().
-    $transition = WorkflowTransition::create([$current_sid, 'field_name' => $field_name]);
-    $transition->setTargetEntity($entity);
-
-    // Remove the default formatter. We are now building the widget.
-    $elements = [];
-
-    // BEGIN Copy from CommentDefaultFormatter
-    $elements['#cache']['contexts'][] = 'user.permissions';
-    $output['workflows'] = [];
-    // Add the WorkflowTransitionForm to the page.
-    // $build = $this->viewBuilder->viewMultiple($workflows);
-    $build = $this->entityFormBuilder()->getForm($transition, 'add');
-    $output['workflows'] += $build;
-
-    // Only show the add workflow form if the user has permission.
-    $elements['#cache']['contexts'][] = 'user.roles';
-    // Do not show the form for the print view mode.
-    $elements[] = $output + [
-      '#workflow_type' => $this->getFieldSetting('workflow_type'),
-      '#workflow_display_mode' => $this->getFieldSetting('default_mode'),
-      'workflows' => [],
-      ];
-    // END Copy from CommentDefaultFormatter
-
-    return $elements;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element = [];
-    return $element;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsSummary() {
-    return [];
-  }
-
-  /**
-   * Retrieves the entity form builder.
-   *
-   * @return \Drupal\Core\Entity\EntityFormBuilderInterface
-   *   The entity form builder.
-   */
-  protected function entityFormBuilder() {
-    if (!$this->entityFormBuilder) {
-      $this->entityFormBuilder = $this->container()->get('entity.form_builder');
-    }
-    return $this->entityFormBuilder;
-  }
-
-  /**
-   * Retrieves the WorkflowManager.
-   *
-   * @return WorkflowManagerInterface
-   */
-  protected function workflowManager() {
-    return \Drupal::service('workflow.manager');
-  }
-
-}
diff --git a/modules/workflow/src/Plugin/Field/FieldType/WorkflowItem.php b/modules/workflow/src/Plugin/Field/FieldType/WorkflowItem.php
deleted file mode 100644
index 689d444..0000000
--- a/modules/workflow/src/Plugin/Field/FieldType/WorkflowItem.php
+++ /dev/null
@@ -1,406 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Plugin\Field\FieldType;
-
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Form\OptGroup;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\Core\Url;
-use Drupal\options\Plugin\Field\FieldType\ListItemBase;
-use Drupal\workflow\Entity\Workflow;
-use Drupal\workflow\Entity\WorkflowState;
-
-/**
- * Plugin implementation of the 'workflow' field type.
- *
- * @FieldType(
- *   id = "workflow",
- *   label = @Translation("Workflow state"),
- *   description = @Translation("This field stores Workflow values for a certain Workflow type from a list of allowed 'value => label' pairs, i.e. 'Publishing': 1 => unpublished, 2 => draft, 3 => published."),
- *   category = @Translation("Workflow"),
- *   default_widget = "workflow_default",
- *   default_formatter = "list_default",
- *   constraints = {
- *     "WorkflowField" = {}
- *   },
- * )
- */
-class WorkflowItem extends ListItemBase {
-  //class WorkflowItem extends FieldItemBase implements OptionsProviderInterface {
-  // @todo D8-port: perhaps even:
-  //class WorkflowItem extends FieldStringItem {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    $schema = [
-      'columns' => [
-        'value' => [
-          'description' => 'The {workflow_states}.sid that this entity is currently in.',
-          'type' => 'varchar',
-          'length' => 128,
-        ],
-      ],
-      'indexes' => [
-        'value' => ['value'],
-      ],
-    ];
-
-    return $schema;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
-
-    /**
-     * Property definitions of the contained properties.
-     *
-     * @see FileItem::getPropertyDefinitions()
-     *
-     * @var array
-     */
-    static $propertyDefinitions;
-
-
-    $definition['settings']['target_type'] = 'workflow_transition';
-    // Definitions vary by entity type and bundle, so key them accordingly.
-    $key = $definition['settings']['target_type'] . ':';
-    $key .= isset($definition['settings']['target_bundle']) ? $definition['settings']['target_bundle'] : '';
-
-    if (!isset($propertyDefinitions[$key])) {
-
-      $propertyDefinitions[$key]['value'] = DataDefinition::create('string') // TODO D8-port : or 'any'
-        ->setLabel(t('Workflow state'))
-        ->addConstraint('Length', ['max' => 128])
-        ->setRequired(TRUE);
-
-      //workflow_debug( __FILE__ , __FUNCTION__, __LINE__);  // @todo D8-port: still test this snippet.
-      /*
-      // @todo D8-port: test this.
-      $propertyDefinitions[$key]['workflow_transition'] = DataDefinition::create('any')
-        //    $properties['workflow_transition'] = DataDefinition::create('WorkflowTransition')
-        ->setLabel(t('Transition'))
-        ->setDescription(t('The computed WorkflowItem object.'))
-        ->setComputed(TRUE)
-        ->setClass('\Drupal\workflow\Entity\WorkflowTransition')
-        ->setSetting('date source', 'value');
-
-      $propertyDefinitions[$key]['display'] = array(
-        'type' => 'boolean',
-        'label' => t('Flag to control whether this file should be displayed when viewing content.'),
-      );
-      $propertyDefinitions[$key]['description'] = array(
-        'type' => 'string',
-        'label' => t('A description of the file.'),
-      );
-
-      $propertyDefinitions[$key]['display'] = array(
-        'type' => 'boolean',
-        'label' => t('Flag to control whether this file should be displayed when viewing content.'),
-      );
-      $propertyDefinitions[$key]['description'] = array(
-        'type' => 'string',
-        'label' => t('A description of the file.'),
-      );
-       */
-    }
-    return $propertyDefinitions[$key];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntity() {
-    $entity = parent::getEntity();
-
-    // For Workflow on CommentForm, get the CommentedEntity.
-    if ($entity->getEntityTypeId() == 'comment') {
-      /** @var $entity \Drupal\comment\CommentInterface */
-      $entity = $entity->getCommentedEntity();
-    }
-
-    return $entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isEmpty() {
-    $is_empty = empty($this->value);
-    return $is_empty;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function onChange($property_name, $notify = TRUE) {
-    //workflow_debug( __FILE__ , __FUNCTION__, __LINE__);  // @todo D8-port: still test this snippet.
-
-    // TODO D8: use this function onChange for adding a line in table workflow_transition_*
-    // Enforce that the computed date is recalculated.
-    //if ($property_name == 'value') {
-    //  $this->date = NULL;
-    //}
-    parent::onChange($property_name, $notify);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function defaultStorageSettings() {
-
-    return [
-      'workflow_type' => '',
-      'allowed_values_function' => 'workflow_state_allowed_values',
-    ] + parent::defaultStorageSettings();
-  }
-
-  /**
-   * Implements hook_field_settings_form() -> ConfigFieldItemInterface::settingsForm().
-   */
-  public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    $element = [];
-
-    // Create list of all Workflow types. Include an initial empty value.
-    // Validate each workflow, and generate a message if not complete.
-    $workflows = workflow_get_workflow_names(FALSE);
-
-    // @todo D8: add this to WorkflowFieldConstraintValidator.
-    // Set message, if no 'validated' workflows exist.
-    if (count($workflows) == 1) {
-      drupal_set_message(
-        $this->t('You must <a href=":create">create at least one workflow</a>
-          before content can be assigned to a workflow.',
-          [':create' => Url::fromRoute('entity.workflow_type.collection')->toString(),]
-        ), 'warning'
-      );
-    }
-
-    // Validate via annotation WorkflowFieldConstraint. Show a message for each error.
-    $violation_list = $this->validate();
-    /** @var \Symfony\Component\Validator\ConstraintViolation $violation */
-    foreach ($violation_list->getIterator() as $violation) {
-      switch ($violation->getPropertyPath()) {
-        case 'fieldnameOnComment':
-          // @todo D8: CommentForm & constraints on storageSettingsForm()
-          // A 'comment' field name MUST be equal to content field name.
-          // @todo: Still not waterproof. You could have a field on a non-relevant entity_type.
-          drupal_set_message($violation->getMessage(), 'error');
-          $workflows = [];
-          break;
-
-        default:
-          break;
-      }
-    }
-
-    // @todo D8: CommentForm & constraints on storageSettingsForm
-    // Set the required workflow_type on 'comment' fields.
-    // N.B. the following must BELOW the (count($workflows) == 1) snippet.
-    $field_storage = $this->getFieldDefinition()->getFieldStorageDefinition();
-    if (!$this->getSetting('workflow_type') && $field_storage->getTargetEntityTypeId() == 'comment') {
-      $field_name = $field_storage->get('field_name');
-      $workflows = [];
-      foreach (_workflow_info_fields($entity = NULL, $entity_type = '', $entity_bundle = '', $field_name) as $key => $info) {
-        if ($info->getName() == $field_name && ($info->getTargetEntityTypeId() !== 'comment')) {
-          $wid = $info->getSetting('workflow_type');
-          $workflow = Workflow::load($wid);
-          $workflows[$wid] = $workflow->label();
-        }
-      }
-    }
-
-    // Let the user choose between the available workflow types.
-    $wid = $this->getSetting('workflow_type');
-    $url = Url::fromRoute('entity.workflow_type.collection')->toString();
-    $element['workflow_type'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Workflow type'),
-      '#options' => $workflows,
-      '#default_value' => $wid,
-      '#required' => TRUE,
-      '#disabled' => $has_data,
-      '#description' => $this->t('Choose the Workflow type. Maintain workflows
-         <a href=":url">here</a>.', [':url' => $url]),
-    ];
-
-    // Get a string representation to show all options.
-
-    /*
-     * Overwrite ListItemBase::storageSettingsForm().
-     */
-    if ($wid) {
-      $allowed_values = WorkflowState::loadMultiple([], $wid);
-      $allowed_values_function = $this->getSetting('allowed_values_function');
-
-      $element['allowed_values'] = [
-        '#type' => 'textarea',
-        '#title' => $this->t('Allowed values for the selected Workflow type'),
-        '#default_value' => ($wid) ? $this->allowedValuesString($allowed_values) : [],
-        '#rows' => count($allowed_values),
-        '#access' => ($wid) ? TRUE : FALSE, // User can see the data,
-        '#disabled' => TRUE, // .. but cannot change them.
-        '#element_validate' => [[get_class($this), 'validateAllowedValues']],
-
-        '#field_has_data' => $has_data,
-        '#field_name' => $this->getFieldDefinition()->getName(),
-        '#entity_type' => ($this->getEntity()) ? $this->getEntity()->getEntityTypeId() : '',
-        '#allowed_values' => $allowed_values,
-        '#description' => $this->allowedValuesDescription(),
-      ];
-    }
-
-    return $element;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function allowedValuesDescription() {
-    return '';
-  }
-
-  /**
-   * Generates a string representation of an array of 'allowed values'.
-   *
-   * This string format is suitable for edition in a textarea.
-   *
-   * @param WorkflowState[] $states
-   *   An array of WorkflowStates, where array keys are values and array values are
-   *   labels.
-   *
-   * @return string
-   *   The string representation of the $states array:
-   *    - Values are separated by a carriage return.
-   *    - Each value is in the format "value|label" or "value".
-   */
-  protected function allowedValuesString($states) {
-    $lines = [];
-
-    $wid = $this->getSetting('workflow_type');
-
-    $previous_wid = -1;
-    /** @var $state WorkflowState */
-    foreach ($states as $key => $state) {
-      // Only show enabled states.
-      if ($state->isActive()) {
-        // Show a Workflow name between Workflows, if more then 1 in the list.
-        if ((!$wid) && ($previous_wid <> $state->getWorkflowId())) {
-          $previous_wid = $state->getWorkflowId();
-          $lines[] = $state->getWorkflow()->label() . "'s states: ";
-        }
-        $label = $this->t('@label', ['@label' => $state->label()]);
-
-        $lines[] = "   $key|$label";
-      }
-    }
-    return implode("\n", $lines);
-  }
-
-//  /**
-//   * {@inheritdoc}
-//   */
-//  public static function generateSampleValue(FieldDefinitionInterface $field_definition) {
-//    // @todo Implement this once https://www.drupal.org/node/2238085 lands.
-//    $values['value'] = rand(pow(10, 8), pow(10, 9)-1);
-//    return $values;
-//  }
-
-
-  /**
-   * Implementation of TypedDataInterface
-   *
-   * @see folder \workflow\src\Plugin\Validation\Constraint
-   */
-
-  /**
-   * {@inheritdoc}
-   *
-   * @see folder \workflow\src\Plugin\Validation\Constraint
-   */
-//  public function getConstraints() {
-//    $constraints = parent::getConstraints();
-//    return $constraints;
-//  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @see folder \workflow\src\Plugin\Validation\Constraint
-   */
-//  public function validate() {
-//    $result = parent::validate();
-//    return $result;
-//  }
-
-  /**
-   * Implementation of OptionsProviderInterface
-   *
-   *   An array of settable options for the object that may be used in an
-   *   Options widget, usually when new data should be entered. It may either be
-   *   a flat array of option labels keyed by values, or a two-dimensional array
-   *   of option groups (array of flat option arrays, keyed by option group
-   *   label). Note that labels should NOT be sanitized.
-   */
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPossibleValues(AccountInterface $account = NULL) {
-    // Flatten options firstly, because Possible Options may contain group
-    // arrays.
-    $flatten_options = OptGroup::flattenOptions($this->getPossibleOptions($account));
-    return array_keys($flatten_options);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPossibleOptions(AccountInterface $account = NULL) {
-    $allowed_options = [];
-
-    // Use the 'allowed_values_function' to calculate the options.
-    $field_storage = $this->getFieldDefinition()->getFieldStorageDefinition();
-    $entity = $this->getEntity();
-    $cacheable = TRUE;
-    $allowed_options = workflow_state_allowed_values($field_storage, $entity, $cacheable, $account);
-
-    return $allowed_options;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSettableValues(AccountInterface $account = NULL) {
-    // Flatten options firstly, because Settable Options may contain group
-    // arrays.
-    $flatten_options = OptGroup::flattenOptions($this->getSettableOptions($account));
-    return array_keys($flatten_options);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSettableOptions(AccountInterface $account = NULL) {
-    $allowed_options = [];
-
-    // When we are initially on the Storage settings form, no wid is set, yet.
-    if (!$wid = $this->getSetting('workflow_type')) {
-      return $allowed_options;
-    }
-
-    // Use the 'allowed_values_function' to calculate the options.
-    $field_storage = $this->getFieldDefinition()->getFieldStorageDefinition();
-    $entity = $this->getEntity();
-    $cacheable = TRUE;
-    $allowed_options = workflow_state_allowed_values($field_storage, $entity, $cacheable, $account);
-
-    return $allowed_options;
-  }
-
-}
diff --git a/modules/workflow/src/Plugin/Field/FieldWidget/WorkflowDefaultWidget.php b/modules/workflow/src/Plugin/Field/FieldWidget/WorkflowDefaultWidget.php
deleted file mode 100644
index 82a58f4..0000000
--- a/modules/workflow/src/Plugin/Field/FieldWidget/WorkflowDefaultWidget.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Plugin\Field\FieldWidget;
-
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\WidgetBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\workflow\Element\WorkflowTransitionElement;
-use Drupal\workflow\Entity\Workflow;
-use Drupal\workflow\Entity\WorkflowTransition;
-
-/**
- * Plugin implementation of the 'workflow_default' widget.
- *
- * @FieldWidget(
- *   id = "workflow_default",
- *   label = @Translation("Workflow transition form"),
- *   field_types = {
- *     "workflow"
- *   },
- * )
- */
-class WorkflowDefaultWidget extends WidgetBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function defaultSettings() {
-    return [
-      /*
-      'workflow_default' => array(
-        'label' => t('Workflow'),
-        'field types' => array('workflow'),
-        'settings' => array(
-          'fieldset' => 0,
-          'name_as_title' => 1,
-          'comment' => 1,
-        ),
-      ),
-       */
-    ] + parent::defaultSettings();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-
-    // Field ID contains entity_type, bundle, field_name.
-    $field_id = $this->fieldDefinition->id();
-    $entity_id = '';  // TODO D8-port
-
-    $form_id = implode('_', ['workflow_transition_form', $entity_id, $field_id]);
-    return $form_id;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Be careful: Widget may be shown in very different places. Test carefully!!
-   *  - On a entity add/edit page
-   *  - On a entity preview page
-   *  - On a entity view page
-   *  - On a entity 'workflow history' tab
-   *  - On a comment display, in the comment history
-   *  - On a comment form, below the comment history
-   *
-   * @todo D8: change "array $items" to "FieldInterface $items"
-   */
-  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-
-    $wid = $this->getFieldSetting('workflow_type');
-    /** @var $workflow Workflow */
-    if (!$workflow = Workflow::load($wid)) {
-      // @todo: add error message.
-      return $element;
-    }
-
-    if ($this->isDefaultValueWidget($form_state)) {
-      // On the Field settings page, User may not set a default value
-      // (this is done by the Workflow module).
-      return [];
-    }
-
-    /** @var $item \Drupal\workflow\Plugin\Field\FieldType\WorkflowItem */
-    $item = $items[$delta];
-    /** @var $field_config \Drupal\field\Entity\FieldConfig */
-    $field_config = $item->getFieldDefinition();
-    /** @var $field_storage \Drupal\field\Entity\FieldStorageConfig */
-    $field_storage = $field_config->getFieldStorageDefinition();
-
-    $field_name = $field_storage->get('field_name');
-    $entity = $item->getEntity();
-    $from_sid = workflow_node_current_state($entity, $field_name);
-
-    // Create a transition, to pass to the form. No need to use setValues().
-    /** @var $transition WorkflowTransition */
-    $transition = WorkflowTransition::create([$from_sid, 'field_name' => $field_name]);
-    $transition->setTargetEntity($entity);
-
-    // Here, on entity form, not the $element is added, but the entity form.
-    // Problem 1: adding the element, does not add added fields.
-    // Problem 2: adding the form, generates wrong UI.
-    // Problem 3: does not work on ScheduledTransition.
-
-    // Step 1: use the Element.
-    $element['#default_value'] = $transition;
-    $element += WorkflowTransitionElement::transitionElement($element, $form_state, $form);
-
-    // Step 2: use the Form, in order to get extra fields.
-    $entity_form_builder = \Drupal::getContainer()->get('entity.form_builder');
-    $workflow_form = $entity_form_builder->getForm($transition, 'add');
-    // Determine and add the attached fields.
-    $attached_fields = Workflow::workflowManager()->getAttachedFields('workflow_transition', $wid);
-    foreach ($attached_fields as $attached_field) {
-      $element[$attached_field] = $workflow_form[$attached_field];
-    }
-
-    // Option 3: use the true Element.
-    // $form = $this->element($form, $form_state, $transition);
-    //$element['workflow_transition'] = array(
-    //      '#type' => 'workflow_transition',
-    //      '#title' => t('Workflow transition'),
-    //      '#default_value' => $transition,
-    // );
-
-    return $element;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Implements workflow_transition() -> WorkflowDefaultWidget::submit().
-   *
-   * Overrides submit(array $form, array &$form_state).
-   * Contains 2 extra parameters for D7
-   *
-   * @param array $form
-   * @param array $form_state
-   * @param array $items
-   *   The value of the field.
-   * @param bool $force
-   *   TRUE if all access must be overridden, e.g., for Rules.
-   *
-   * @return int
-   *   If update succeeded, the new State Id. Else, the old Id is returned.
-   *
-   * This is called from function _workflow_form_submit($form, &$form_state)
-   * It is a replacement of function workflow_transition($entity, $to_sid, $force, $field)
-   * It performs the following actions;
-   * - save a scheduled action
-   * - update history
-   * - restore the normal $items for the field.
-   * @todo: remove update of {node_form} table. (separate task, because it has features, too)
-   */
-  public function massageFormValues(array $values, array $form, FormStateInterface $form_state) {
-
-    $user = workflow_current_user(); // @todo #2287057: verify if submit() really is only used for UI. If not, $user must be passed.
-
-    // Set the new value.
-    // Beware: We presume cardinality = 1 !!
-    // The widget form element type has transformed the value to a
-    // WorkflowTransition object at this point. We need to convert it
-    // back to the regular 'value' string format.
-    foreach ($values as &$item) {
-      if (!empty($item)) { // } && $item['value'] instanceof DrupalDateTime) {
-
-        // The following can NOT be retrieved from the WorkflowTransition.
-        /** @var $entity \Drupal\Core\Entity\EntityInterface */
-        $entity = $form_state->getFormObject()->getEntity();
-        /** @var $transition \Drupal\workflow\Entity\WorkflowTransitionInterface */
-        $transition = $item['workflow_transition'];
-        $field_name = $transition->getFieldName();
-        // N.B. Use a proprietary version of copyFormValuesToEntity,
-        // where $entity/$transition is passed by reference.
-        /** @var $transition \Drupal\workflow\Entity\WorkflowTransitionInterface */
-        $transition = WorkflowTransitionElement::copyFormValuesToTransition($transition, $form, $form_state, $item);
-
-        // Try to execute the transition. Return $from_sid when error.
-        if (!$transition) {
-          // This should not be possible (perhaps when testing/developing).
-          drupal_set_message(t('Error: the transition from %from_sid to %to_sid could not be generated.'), 'error');
-          // The current value is still the previous state.
-          $to_sid = $from_sid = 0;
-        }
-        else {
-          // The transition may be scheduled or not. Save the result, and
-          // rely upon hook workflow_entity_insert/update($entity) in
-          // file workflow.module to save/execute the transition.
-
-          // - validate option; add hook to let other modules change comment.
-          // - add to history; add to watchdog
-          // Return the new State ID. (Execution may fail and return the old Sid.)
-
-          // Get the new value from an action button if set in the workflow settings.
-          $action_info = _workflow_transition_form_get_triggering_button($form_state);
-          if ($field_name == $action_info['field_name']) {
-            $transition->set('to_sid', $action_info['to_sid']);
-          }
-
-          $force = FALSE; // @TODO D8-port: add to form for usage in VBO.
-
-          // Now, save/execute the transition.
-          $from_sid = $transition->getFromSid();
-          $force = $force || $transition->isForced();
-
-          if (!$transition->isAllowed($user, $force)) {
-            // Transition is not allowed.
-            $to_sid = $from_sid;
-          }
-          elseif (!$entity || !$entity->id()) {
-            // Entity is inserted. The Id is not yet known.
-            // So we can't yet save the transition right now, but must rely on
-            // function/hook workflow_entity_insert($entity) in file workflow.module.
-            // $to_sid = $transition->execute($force);
-            $to_sid = $transition->getToSid();
-          }
-          else {
-            // Entity is updated. To stay in sync with insert, we rely on
-            // function/hook workflow_entity_update($entity) in file workflow.module.
-            // $to_sid = $transition->execute($force);
-            $to_sid = $transition->getToSid();
-          }
-        }
-
-        // Now the data is captured in the Transition, and before calling the
-        // Execution, restore the default values for Workflow Field.
-        // For instance, workflow_rules evaluates this.
-        //
-        // N.B. Align the following functions:
-        // - WorkflowDefaultWidget::massageFormValues();
-        // - WorkflowManager::executeTransition().
-        // Set the transition back, to be used in hook_entity_update().
-        $item['workflow_transition'] = $transition;
-        // Set the value at the proper location.
-        if ($transition && $transition->isScheduled()) {
-          $item['value'] = $from_sid;
-        }
-        else {
-          $item['value'] = $to_sid;
-        }
-      }
-    }
-    return $values;
-  }
-
-}
diff --git a/modules/workflow/src/Plugin/Validation/Constraint/WorkflowFieldConstraint.php b/modules/workflow/src/Plugin/Validation/Constraint/WorkflowFieldConstraint.php
deleted file mode 100644
index dbc7eb1..0000000
--- a/modules/workflow/src/Plugin/Validation/Constraint/WorkflowFieldConstraint.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Plugin\Validation\Constraint;
-
-use Drupal\Core\Entity\Plugin\Validation\Constraint\CompositeConstraintBase;
-
-/**
- * Supports validating Workflow Field names.
- *
- * @see https://drupalwatchdog.com/volume-5/issue-2/introducing-drupal-8s-entity-validation-api
- *
- * @Constraint(
- *   id = "WorkflowField",
- *   label = @Translation("Workflow field name", context = "Validation"),
- * )
- */
-class WorkflowFieldConstraint extends CompositeConstraintBase {
-
-  /**
-   * Message shown when a comment fieldname doesn't match an entity field name.
-   *
-   * @var string
-   */
-  // @todo D8: CommentForm & constraints on Field
-  public $messageFieldname = 'A workflow field on a comment must have
-    the same field_name as the commented Entity. Please maintain the entity
-    first, or choose another field name.';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function coversFields() {
-    return ['field_name', ];
-  }
-
-}
diff --git a/modules/workflow/src/Plugin/Validation/Constraint/WorkflowFieldConstraintValidator.php b/modules/workflow/src/Plugin/Validation/Constraint/WorkflowFieldConstraintValidator.php
deleted file mode 100644
index a3917fb..0000000
--- a/modules/workflow/src/Plugin/Validation/Constraint/WorkflowFieldConstraintValidator.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Plugin\Validation\Constraint;
-
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\user\UserStorageInterface;
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-
-/**
- * Validates the CommentName constraint.
- *
- * @see https://drupalwatchdog.com/volume-5/issue-2/introducing-drupal-8s-entity-validation-api
- */
-class WorkflowFieldConstraintValidator extends ConstraintValidator implements ContainerInjectionInterface {
-
-  /**
-   * Validator 2.5 and upwards compatible execution context.
-   *
-   * @var \Symfony\Component\Validator\Context\ExecutionContextInterface
-   */
-  protected $context;
-
-  /**
-   * User storage handler.
-   *
-   * @var \Drupal\user\UserStorageInterface
-   */
-  protected $userStorage;
-
-  /**
-   * Constructs a new Validator.
-   *
-   * @param \Drupal\user\UserStorageInterface $user_storage
-   *   The user storage handler.
-   */
-  public function __construct(UserStorageInterface $user_storage) {
-    $this->userStorage = $user_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('entity.manager')->getStorage('user'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validate($entity, Constraint $constraint) {
-    // Workflow field name on CommentForm has special requirements.
-    $field_storage = $entity->getFieldDefinition()->getFieldStorageDefinition();
-    if ($field_storage->getTargetEntityTypeId() == 'comment') {
-      if (!$this->isValidFieldname($field_storage)) {
-        $this->context->buildViolation($constraint->messageFieldname)
-          ->atPath('fieldnameOnComment')
-          ->addViolation();
-      }
-    }
-  }
-
-  /**
-   * @param FieldStorageConfig $field_storage
-   *
-   * @return bool
-   */
-  protected function isValidFieldname(FieldStorageConfig $field_storage) {
-    $comment_field_name_ok = FALSE;
-
-    if ($field_storage->getTargetEntityTypeId() !== 'comment') {
-      return TRUE;
-    }
-
-    $field_name = $field_storage->get('field_name');
-
-    // Check if the 'comment' field name exists on the 'commented' entity type.
-    // @todo: Still not waterproof. You could have a field on a non-relevant entity_type.
-    foreach (_workflow_info_fields() as $key => $info) {
-      if (($info->getName() == $field_name) && ($info->getTargetEntityTypeId() !== 'comment')) {
-        $comment_field_name_ok = TRUE;
-      }
-    }
-
-    return $comment_field_name_ok;
-  }
-
-}
diff --git a/modules/workflow/src/Plugin/views/filter/WorkflowState.php b/modules/workflow/src/Plugin/views/filter/WorkflowState.php
deleted file mode 100644
index 8556a69..0000000
--- a/modules/workflow/src/Plugin/views/filter/WorkflowState.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Drupal\workflow\Plugin\views\filter;
-
-use Drupal\views\FieldAPIHandlerTrait;
-use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Plugin\views\filter\ManyToOne;
-use Drupal\views\ViewExecutable;
-
-/**
- * Filter handler which uses workflow_state as options.
- *
- * @ingroup views_filter_handlers
- *
- * @ViewsFilter("workflow_state")
- */
-class WorkflowState extends ManyToOne {
-
-  use FieldAPIHandlerTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
-    parent::init($view, $display, $options);
-    $wid = isset($this->definition['wid']) ? $this->definition['wid'] : '';
-    $grouped = isset($options['group_info']['widget']) ? $options['group_info']['widget'] == 'select' : false;
-    $this->valueOptions = workflow_get_workflow_state_names($wid, $grouped);
-  }
-
-  /**
-   * Child classes should be used to override this function and set the
-   * 'value options', unless 'options callback' is defined as a valid function
-   * or static public method to generate these values.
-   *
-   * This can use a guard to be used to reduce database hits as much as
-   * possible.
-   *
-   * @return array|null
-   *   The stored values from $this->valueOptions.
-   */
-  public function getValueOptions() {
-
-    if (isset($this->valueOptions)) {
-      return $this->valueOptions;
-    }
-
-    //@todo: implement the below code, and remove the line from init.
-    // @todo: follow Options patterns
-    // @see callback_allowed_values_function()
-    // @see options_allowed_values()
-
-    return parent::getValueOptions();
-  }
-}
diff --git a/modules/workflow/src/WorkflowAccessControlHandler.php b/modules/workflow/src/WorkflowAccessControlHandler.php
deleted file mode 100644
index 8597407..0000000
--- a/modules/workflow/src/WorkflowAccessControlHandler.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-namespace Drupal\workflow;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Entity\EntityAccessControlHandler;
-use Drupal\Core\Entity\EntityHandlerInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\workflow\Entity\WorkflowManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Defines the access control handler for the workflow entity type.
- *
- * @see \Drupal\workflow\Entity\Workflow
- * @ingroup workflow_access
- */
-class WorkflowAccessControlHandler extends EntityAccessControlHandler implements EntityHandlerInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
-      $entity_type
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function access(EntityInterface $entity, $operation, AccountInterface $account = NULL, $return_as_object = FALSE) {
-    $result = AccessResult::neutral();
-
-    $account = $this->prepareUser($account);
-    // $account = workflow_current_user($account);
-
-    /* @var $transition \Drupal\workflow\Entity\WorkflowTransitionInterface */
-    $transition = $entity;
-
-    // This is only for Edit/Delete transition. For Add/create, use createAccess.
-    switch ($entity->getEntityTypeId()) {
-      case 'workflow_scheduled_transition':
-        switch ($operation) {
-          case 'update':
-            // This operation is not defined for Scheduled Transitions.
-            $result = AccessResult::forbidden();
-            break;
-
-          case 'delete':
-            // This operation is not defined for Scheduled Transitions.
-            $result = AccessResult::forbidden();
-            break;
-
-          case 'revert':
-            // This operation is not defined for Scheduled Transitions.
-            $result = AccessResult::forbidden();
-            break;
-
-          default:
-            $result = parent::access($entity, $operation, $account, $return_as_object);
-            break;
-        } // End of switch ($operation).
-
-        break;
-
-      case 'workflow_transition':
-
-        switch ($operation) {
-          case 'update':
-            $is_owner = WorkflowManager::isOwner($account, $transition);
-            $type_id = $transition->getWorkflowId();
-            if ($account->hasPermission("bypass $type_id workflow_transition access")) {
-              $result = AccessResult::allowed()->cachePerPermissions();
-            }
-            elseif ($account->hasPermission("edit any $type_id workflow_transition")) {
-              $result = AccessResult::allowed()->cachePerPermissions();
-            }
-            elseif ($is_owner && $account->hasPermission("edit own $type_id workflow_transition")) {
-              $result = AccessResult::allowed()->cachePerPermissions();
-            }
-            return $return_as_object ? $result : $result->isAllowed();
-
-          case 'delete':
-            // The delete operation is not defined for Transitions.
-            $result = AccessResult::forbidden();
-            break;
-
-          case 'revert':
-            // @see workflow_operations.
-          default:
-            $type_id = $transition->getWorkflowId();
-            $result = parent::access($entity, $operation, $account, $return_as_object);
-            //if ($account->hasPermission("bypass $type_id workflow_transition access")) {
-            //  $result = AccessResult::allowed()->cachePerPermissions();
-            //}
-            break;
-        } // End of switch ($operation).
-
-        break;
-
-      case 'workflow_config_transition':
-        workflow_debug(__FILE__, __FUNCTION__, __LINE__, $account->id(), $transition->getOwnerId()); // @todo D8-port: still test this snippet.
-        break;
-    }
-
-    /* @var $result \Drupal\Core\Access\AccessResult */
-    $result = parent::access($entity, $operation, $account, TRUE)->cachePerPermissions();
-    return $return_as_object ? $result : $result->isAllowed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createAccess($entity_bundle = NULL, AccountInterface $account = NULL, array $context = [], $return_as_object = FALSE) {
-    workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-    /* @var $result \Drupal\Core\Access\AccessResult */
-    $result = parent::createAccess($entity_bundle, $account, $context, TRUE)->cachePerPermissions();
-    return $return_as_object ? $result : $result->isAllowed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function checkAccess(EntityInterface $transition, $operation, AccountInterface $account) {
-    return parent::checkAccess($transition, $operation, $account);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
-    workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-    return AccessResult::allowedIf($account->hasPermission('create ' . $entity_bundle . ' content'))->cachePerPermissions();
-  }
-
-}
diff --git a/modules/workflow/src/WorkflowPermissions.php b/modules/workflow/src/WorkflowPermissions.php
deleted file mode 100644
index ab440c3..0000000
--- a/modules/workflow/src/WorkflowPermissions.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Drupal\workflow;
-
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\workflow\Entity\Workflow;
-
-/**
- * Provides dynamic permissions for workflows of different types.
- */
-class WorkflowPermissions {
-
-  use StringTranslationTrait;
-
-  /**
-   * Returns an array of workflow type permissions.
-   *
-   * @return array
-   *   The workflow type permissions.
-   *   @see \Drupal\user\PermissionHandlerInterface::getPermissions()
-   */
-  public function workflowTypePermissions() {
-    $perms = [];
-    // Generate workflow permissions for all workflow types.
-    foreach (Workflow::loadMultiple() as $type) {
-      $perms += $this->buildPermissions($type);
-    }
-    return $perms;
-  }
-
-  /**
-   * Returns a list of workflow permissions for a given workflow type.
-   *
-   * @param \Drupal\workflow\Entity\Workflow $type
-   *   The workflow type.
-   *
-   * @return array
-   *   An associative array of permission names and descriptions.
-   */
-  protected function buildPermissions(Workflow $type) {
-    $type_id = $type->id();
-    $type_params = ['%type_name' => $type->label()];
-
-    return [
-      // D7->D8-Conversion of the 'User 1 is special' permission (@see NodePermissions::bypass node access).
-      "bypass $type_id workflow_transition access" => [
-        'title' => $this->t('%type_name: Bypass transition access control', $type_params),
-        'description' => $this->t('View, edit and delete all transitions regardless of permission restrictions.'),
-        'restrict access' => TRUE,
-      ],
-      // D7->D8-Conversion of 'participate in workflow' permission to "create $type_id transition" (@see NodePermissions::create content).
-      "create $type_id workflow_transition" => [
-        'title' => $this->t('%type_name: Participate in workflow', $type_params),
-        'description' => $this->t("Role is enabled to create state transitions. (Determines transition-specific permission on the workflow admin page.
-          <i> Warning: For better control, uncheck the 'Authenticated user', and manage the permissions per separate role.</i>)"),
-      ],
-      // D7->D8-Conversion of 'schedule workflow transitions' permission to "schedule $type_id transition" (@see NodePermissions::create content).
-      "schedule $type_id workflow_transition" => [
-        'title' => $this->t('%type_name: Schedule state transition', $type_params),
-        'description' => $this->t('Role is enabled to schedule state transitions.'),
-      ],
-      // D7->D8-Conversion of 'workflow history' permission on Workflow settings to "access $type_id overview" (@see NodePermissions::access content overview).
-      "access own $type_id workflow_transion overview" => [
-        'title' => $this->t('%type_name: Access Workflow history tab of own content', $type_params),
-        'description' => $this->t('Role is enabled to view the "Workflow state transition history" tab on own entity.'),
-      ],
-      "access any $type_id workflow_transion overview" => [
-        'title' => $this->t('%type_name: Access Workflow history tab of any content', $type_params),
-        'description' => $this->t('Role is enabled to view the "Workflow state transition history" tab on any entity.'),
-      ],
-      // D7->D8-Conversion of 'show workflow transition form' permission. @see #1893724
-      "access $type_id workflow_transition form" => [
-        'title' => $this->t('%type_name: Access the Workflow state transition form on entity view page', $type_params),
-        'description' => $this->t('Role is enabled to view a "Workflow state transition" block/widget and add a state transition on the entity page.'),
-      ],
-    ];
-  }
-
-}
diff --git a/modules/workflow/src/WorkflowScheduledTransitionViewsData.php b/modules/workflow/src/WorkflowScheduledTransitionViewsData.php
deleted file mode 100644
index 9319a5d..0000000
--- a/modules/workflow/src/WorkflowScheduledTransitionViewsData.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Drupal\workflow;
-
-use Drupal\views\EntityViewsData;
-
-/**
- * Provides the views data for the workflow entity type.
- */
-class WorkflowScheduledTransitionViewsData extends WorkflowTransitionViewsData {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getViewsData() {
-    $data = parent::getViewsData();
-    // @todo D8-port: Add some data from D7 function workflow_views_views_data_alter() ??
-    // @see http://cgit.drupalcode.org/workflow/tree/workflow_views/workflow_views.views.inc
-    return $data;
-  }
-
-}
diff --git a/modules/workflow/src/WorkflowTransitionListBuilder.php b/modules/workflow/src/WorkflowTransitionListBuilder.php
deleted file mode 100644
index 0b838ef..0000000
--- a/modules/workflow/src/WorkflowTransitionListBuilder.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-
-namespace Drupal\workflow;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Entity\EntityListBuilder;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\workflow\Entity\WorkflowTransition;
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-
-define('WORKFLOW_MARK_STATE_IS_DELETED', '*');
-
-/**
- * Defines a class to build a draggable listing of Workflow State entities.
- *
- * @see \Drupal\workflow\Entity\WorkflowState
- */
-class WorkflowTransitionListBuilder extends EntityListBuilder implements FormInterface {
-
-  /**
-   * A variable to pass the entity of a transition to the ListBuilder.
-   * @todo: There should be a better way.
-   *
-   * @var EntityInterface
-   */
-  public $workflow_entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $limit = 50;
-
-  /**
-   * Indicates if a column 'Field name' must be generated.
-   *
-   * @var bool
-   */
-  protected $show_column_fieldname = NULL;
-
-  /**
-   * Indicates if a footer must be generated.
-   *
-   * @var bool
-   */
-  protected $footer_needed = FALSE;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function load() {
-    $entities = [];
-
-    // @todo: D8-port: get entity from proper core methods.
-    /* @var $entity EntityInterface */
-    $entity = $this->workflow_entity; // N.B. This is a custom variable.
-    $field_name = workflow_url_get_field_name();
-
-    $entity_type = $entity->getEntityTypeId();
-    $entity_id = $entity->id();
-
-    // @todo D8-port: document $limit.
-    // @todo d8-port: $limit should be used in pager, not in load().
-    $this->limit = \Drupal::config('workflow.settings')->get('workflow_states_per_page');
-    $limit = $this->limit;
-    // Get Transitions with highest timestamp first.
-    $entities = WorkflowTransition::loadMultipleByProperties($entity_type, [$entity_id], [], $field_name, '', $limit, 'DESC');
-    return $entities;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'workflow_transiton_history_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Building the header and content lines for the contact list.
-   *
-   * Calling the parent::buildHeader() adds a column for the possible actions
-   * and inserts the 'edit' and 'delete' links as defined for the entity type.
-   */
-  public function buildHeader() {
-
-    $entity = $this->workflow_entity; // N.B. This is a custom variable.
-    $field_name = workflow_url_get_field_name();
-
-    $header['timestamp'] = $this->t('Date');
-    if ($this->showColumnFieldname($entity)) {
-      $header['field_name'] = $this->t('Field name');
-    }
-    $header['from_state'] = $this->t('From State');
-    $header['to_state'] = $this->t('To State');
-    $header['user_name'] = $this->t('By');
-    $header['comment'] = $this->t('Comment');
-
-    // column 'Operations' is now added by core.
-    //$header['operations'] = $this->t('Operations');
-
-    return $header + parent::buildHeader();
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @todo D8-port: add D7-theming to TransitionListBuilder.
-   */
-  public function buildRow(EntityInterface $transition) {
-    // Show the history table.
-    $current_themed = FALSE;
-    /* @var $transition WorkflowTransitionInterface */
-    $entity = $transition->getTargetEntity();
-    $field_name = $transition->getFieldName();
-    $current_sid = workflow_node_current_state($entity, $field_name);
-
-    $to_state = $transition->getToState();
-    if (!$to_state) {
-      // This is an invalid/deleted state.
-      $to_label = WORKFLOW_MARK_STATE_IS_DELETED;
-      // Add a footer to explain the addition.
-      $this->footer_needed = TRUE;
-    }
-    else {
-      $label = Html::escape($this->t($to_state->label()));
-      if ($transition->getToSid() == $current_sid && $to_state->isActive() && !$current_themed) {
-        $to_label = $label;
-
-        if (!$current_themed) {
-          // Make a note that we have themed the current state; other times in the history
-          // of this entity where the entity was in this state do not need to be specially themed.
-          $current_themed = TRUE;
-        }
-      }
-      elseif (!$to_state->isActive()) {
-        $to_label = $label . WORKFLOW_MARK_STATE_IS_DELETED;
-        // Add a footer to explain the addition.
-        $this->footer_needed = TRUE;
-      }
-      else {
-        // Regular state.
-        $to_label = $label;
-      }
-    }
-    unset($to_state); // Not needed anymore.
-
-    $from_state = $transition->getFromState();
-    if (!$from_state) {
-      // This is an invalid/deleted state.
-      $from_label = WORKFLOW_MARK_STATE_IS_DELETED;
-      // Add a footer to explain the addition.
-      $this->footer_needed = TRUE;
-    }
-    else {
-      $label = Html::escape($this->t($from_state->label()));
-      if (!$from_state->isActive()) {
-        $from_label = $label . WORKFLOW_MARK_STATE_IS_DELETED;
-        // Add a footer to explain the addition.
-        $this->footer_needed = TRUE;
-      }
-      else {
-        // Regular state.
-        $from_label = $label;
-      }
-    }
-    unset($from_state); // Not needed anymore.
-
-    $owner = $transition->getOwner();
-    $field_name = $transition->getFieldName();
-    $field_label = $transition->getFieldName();
-    $variables = [
-      'transition' => $transition,
-      'extra' => '',
-      'from_label' => $from_label,
-      'to_label' => $to_label,
-      'user' => $owner,
-    ];
-    // Allow other modules to modify the row.
-    \Drupal::moduleHandler()->alter('workflow_history', $variables);
-
-    // 'class' => array('workflow_history_row'), // TODO D8-port
-    $row['timestamp']['data'] = $transition->getTimestampFormatted(); // 'class' => array('timestamp')
-    // html_entity_decode() transforms chars like '&' correctly.
-    if ($this->showColumnFieldname($entity)) {
-      $row['field_name']['data'] = html_entity_decode($field_label);
-    }
-    $row['from_state']['data'] = html_entity_decode($from_label); // 'class' => array('previous-state-name'))
-    $row['to_state']['data'] = html_entity_decode($to_label); // 'class' => array('state-name'))
-    $row['user_name']['data'] = $owner->getUsername(); // 'class' => array('user-name')
-    $row['comment']['data'] = html_entity_decode($transition->getComment()); // 'class' => array('log-comment')
-
-    // Column 'Operations' is now added by core.
-    // D7: $row['operations']['data'] = $this->buildOperations($entity);
-    $row += parent::buildRow($transition);
-
-    return $row;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    workflow_debug(__FILE__, __FUNCTION__, __LINE__); // @todo D8-port: still test this snippet.
-    $form = parent::buildForm($form, $form_state);
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Builds the entity listing as renderable array for table.html.twig.
-   */
-  public function render() {
-    $build = [];
-
-    // @todo d8-port: get pager working.
-    $this->limit = \Drupal::config('workflow.settings')->get('workflow_states_per_page'); // TODO D8-port
-    // $output .= theme('pager', array('tags' => $limit)); // @todo D8-port
-
-    $build += parent::render();
-
-    // Add a footer. This is not yet added in EntityListBilder::render()
-    if ($this->footer_needed) { // @todo D8-port: test this.
-      // Two variants. First variant is official, but I like 2nd better.
-      /*
-      $build['table']['#footer'] = [
-        [
-          'class' => ['footer-class'],
-          'data' => [
-            [
-              'data' => WORKFLOW_MARK_STATE_IS_DELETED . ' ' . t('State is no longer available.'),
-              'colspan' => count($build['table']['#header']),
-            ],
-          ],
-        ],
-      ];
-       */
-      $build['workflow_footer'] = [
-        '#markup' => WORKFLOW_MARK_STATE_IS_DELETED . ' ' . t('State is no longer available.'),
-        '#weight' => 500, // @todo Make this better.
-      ];
-    }
-
-    return $build;
-  }
-
-  /**
-   * Just for reference: parent::getOperations calls 2 hooks/alters.
-   * {@inheritdoc}
-   */
-  /*
-  public function getOperations(EntityInterface $entity) {
-    $operations = $this->getDefaultOperations($entity);
-    $operations += $this->moduleHandler()->invokeAll('entity_operation', array($entity));
-    $this->moduleHandler->alter('entity_operation', $operations, $entity);
-    uasort($operations, '\Drupal\Component\Utility\SortArray::sortByWeightElement');
-
-    return $operations;
-  }
-   */
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefaultOperations(EntityInterface $entity) {
-    $operations = parent::getDefaultOperations($entity);
-
-    /* @var $transition WorkflowTransitionInterface */
-    $transition = $entity;
-
-    if (isset($operations['edit'])) {
-      $destination = \Drupal::destination()->getAsArray();
-      $operations['edit']['query'] = $destination;
-    }
-
-    return $operations;
-  }
-
-  /**
-   * Gets the title of the page.
-   *
-   * @return string
-   *   A string title of the page.
-   */
-  protected function getTitle() {
-    return $this->t('Workflow history');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    return;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * Overrides DraggableListBuilder::submitForm().
-   * The WorkflowState entities are always saved.
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * Determines if the column 'Field name' must be shown.
-   *
-   * @param EntityInterface $entity
-   *
-   * @return bool
-   */
-  protected function showColumnFieldname(EntityInterface $entity) {
-    if (is_null($this->show_column_fieldname)) {
-      // @todo: also remove when field_name is set in route??
-      if (count(_workflow_info_fields($entity)) > 1) {
-        $this->show_column_fieldname = TRUE;
-      }
-    }
-    return $this->show_column_fieldname;
-  }
-
-}
diff --git a/modules/workflow/src/WorkflowTransitionViewsData.php b/modules/workflow/src/WorkflowTransitionViewsData.php
deleted file mode 100644
index 98b55b0..0000000
--- a/modules/workflow/src/WorkflowTransitionViewsData.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-namespace Drupal\workflow;
-
-use Drupal\views\EntityViewsData;
-
-/**
- * Provides the views data for the workflow entity type.
- * Partly taken from NodeViewsData.php.
- */
-class WorkflowTransitionViewsData extends EntityViewsData {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getViewsData() {
-    $data = parent::getViewsData();
-
-    // Use flexible $base_table, since both WorkflowTransition and
-    // WorkflowScheduledTransition use this.
-    $base_table = $this->entityType->getBaseTable();
-    $base_field = $this->entityType->getKey('id');
-
-    // @todo D8-port: Add data from D7 function workflow_views_views_data_alter()
-    // @see http://cgit.drupalcode.org/workflow/tree/workflow_views/workflow_views.views.inc
-
-    $data[$base_table]['table']['join'] = [
-      // This is provided for the many_to_one argument.
-      $base_table => [
-        'field' => $base_field,
-        'left_field' => $base_field,
-      ],
-    ];
-
-    // @todo: this relationship needs to be reversed. See also taxonomy/src/NodeTermData.php
-    //$data[$base_table]['nid'] = [
-    //  'title' => $this->t('Content with workflow'),
-    //  'help' => $this->t('Relate all content with a workflow.'),
-    //  'relationship' => [
-    //    'id' => 'standard',
-    //    'base' => 'node',
-    //    'base field' => 'nid',
-    //    'label' => $this->t('node'),
-    //    'skip base' => 'node',
-    //  ],
-    //];
-
-    $data[$base_table]['from_sid']['filter']['id'] = 'workflow_state';
-    $data[$base_table]['from_sid']['help'] = $this->t('The name of the previous state of the transition.');
-
-    $data[$base_table]['to_sid']['filter']['id'] = 'workflow_state';
-    $data[$base_table]['to_sid']['help'] = $this->t('The name of the new state of the transition. (For the latest transition, this is the current state.)');
-
-    $data[$base_table]['uid']['help'] = $this->t('The user who triggered the transition. If you need more fields than the uid add the content: author relationship');
-    $data[$base_table]['uid']['filter']['id'] = 'user_name';
-    $data[$base_table]['uid']['relationship']['title'] = $this->t('User');
-    $data[$base_table]['uid']['relationship']['help'] = $this->t('The user who triggered the transition.');
-    $data[$base_table]['uid']['relationship']['label'] = $this->t('User');
-
-    // @todo Add similar support to any date field
-    // @see https://www.drupal.org/node/2337507
-    $data[$base_table]['timestamp_fulldate'] = [
-      'title' => $this->t('Created date'),
-      'help' => $this->t('Date in the form of CCYYMMDD.'),
-      'argument' => [
-        'field' => 'timestamp',
-        'id' => 'date_fulldate',
-      ],
-    ];
-
-    $data[$base_table]['timestamp_year_month'] = [
-      'title' => $this->t('Created year + month'),
-      'help' => $this->t('Date in the form of YYYYMM.'),
-      'argument' => [
-        'field' => 'timestamp',
-        'id' => 'date_year_month',
-      ],
-    ];
-
-    $data[$base_table]['timestamp_year'] = [
-      'title' => $this->t('Created year'),
-      'help' => $this->t('Date in the form of YYYY.'),
-      'argument' => [
-        'field' => 'timestamp',
-        'id' => 'date_year',
-      ],
-    ];
-
-    $data[$base_table]['timestamp_month'] = [
-      'title' => $this->t('Created month'),
-      'help' => $this->t('Date in the form of MM (01 - 12).'),
-      'argument' => [
-        'field' => 'timestamp',
-        'id' => 'date_month',
-      ],
-    ];
-
-    $data[$base_table]['timestamp_day'] = [
-      'title' => $this->t('Created day'),
-      'help' => $this->t('Date in the form of DD (01 - 31).'),
-      'argument' => [
-        'field' => 'timestamp',
-        'id' => 'date_day',
-      ],
-    ];
-
-    $data[$base_table]['timestamp_week'] = [
-      'title' => $this->t('Created week'),
-      'help' => $this->t('Date in the form of WW (01 - 53).'),
-      'argument' => [
-        'field' => 'timestamp',
-        'id' => 'date_week',
-      ],
-    ];
-
-    $data[$base_table]['changed_fulldate'] = [
-      'title' => $this->t('Updated date'),
-      'help' => $this->t('Date in the form of CCYYMMDD.'),
-      'argument' => [
-        'field' => 'changed',
-        'id' => 'date_fulldate',
-      ],
-    ];
-
-    $data[$base_table]['changed_year_month'] = [
-      'title' => $this->t('Updated year + month'),
-      'help' => $this->t('Date in the form of YYYYMM.'),
-      'argument' => [
-        'field' => 'changed',
-        'id' => 'date_year_month',
-      ],
-    ];
-
-    $data[$base_table]['changed_year'] = [
-      'title' => $this->t('Updated year'),
-      'help' => $this->t('Date in the form of YYYY.'),
-      'argument' => [
-        'field' => 'changed',
-        'id' => 'date_year',
-      ],
-    ];
-
-    $data[$base_table]['changed_month'] = [
-      'title' => $this->t('Updated month'),
-      'help' => $this->t('Date in the form of MM (01 - 12).'),
-      'argument' => [
-        'field' => 'changed',
-        'id' => 'date_month',
-      ],
-    ];
-
-    $data[$base_table]['changed_day'] = [
-      'title' => $this->t('Updated day'),
-      'help' => $this->t('Date in the form of DD (01 - 31).'),
-      'argument' => [
-        'field' => 'changed',
-        'id' => 'date_day',
-      ],
-    ];
-
-    $data[$base_table]['changed_week'] = [
-      'title' => $this->t('Updated week'),
-      'help' => $this->t('Date in the form of WW (01 - 53).'),
-      'argument' => [
-        'field' => 'changed',
-        'id' => 'date_week',
-      ],
-    ];
-
-    return $data;
-  }
-
-}
diff --git a/modules/workflow/workflow.api.php b/modules/workflow/workflow.api.php
deleted file mode 100644
index c5da5f4..0000000
--- a/modules/workflow/workflow.api.php
+++ /dev/null
@@ -1,431 +0,0 @@
-<?php
-
-/**
- * @file
- * Hooks provided by the workflow module.
- */
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\user\UserInterface;
-use Drupal\workflow\Entity\Workflow;
-use Drupal\workflow\Entity\WorkflowConfigTransition;
-use Drupal\workflow\Entity\WorkflowState;
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-
-/**
- * Implements hook_workflow_operations().
- *
- * Adds extra operations to ListBuilders.
- * - workflow_ui: Workflow, State;
- * - workflow: WorkflowTransition;
- *
- * @param string $op
- *   'top_actions': Allow modules to insert their own front page action links.
- *   'operations': Allow modules to insert their own workflow operations.
- *   'workflow':  Allow modules to insert workflow operations.
- *   'state':  Allow modules to insert state operations.
- * @param EntityInterface|null $entity
- *   The current workflow/state/transition object.
- *
- * @return array
- *   The new actions, to be added to the entity list.
- */
-function hook_workflow_operations($op, EntityInterface $entity = NULL) {
-  $operations = [];
-
-  switch ($op) {
-    case 'top_actions':
-      // As of D8, below hook_workflow_operations is removed, in favour of core hooks.
-      // @see file workflow_ui.links.action.yml for an example top action.
-      return $operations;
-
-    case 'operations':
-      break;
-
-    case 'workflow':
-      // This example adds an operation to the 'operations column' of the Workflow List.
-      /* @var $workflow Workflow */
-      $workflow = $entity;
-
-      $alt = t('Control content access for @wf', ['@wf' => $workflow->label()]);
-      $attributes = ['alt' => $alt, 'title' => $alt];
-      $operations['workflow_access_form'] = [
-        'title' => t('Access'),
-        'weight' => 50,
-        'url' => \Drupal\Core\Url::fromRoute('entity.workflow_type.access_form', ['workflow_type' => $workflow->id()]),
-        'query' => \Drupal::destination()->getAsArray(), // Add destination.
-      ];
-      return $operations;
-
-    case 'state':
-      /* @var $state WorkflowState */
-      $state = $entity;
-      break;
-
-    case 'workflow_transition':
-      // As of D8, below hook_workflow_operations is removed, in favour of core hooks.
-      // @see EntityListBuilder::getOperations, workflow_operations, workflow.api.php.
-
-      // Your module may add operations to the Entity list.
-      /* @var $transition WorkflowTransitionInterface */
-      $transition = $entity;
-      break;
-
-    default:
-      break;
-  }
-  return $operations;
-}
-
-/**
- * Implements hook_workflow().
- *
- * NOTE: This hook may reside in the implementing module
- * or in a module.workflow.inc file.
- *
- * @param string $op
- *   The current workflow operation.
- *   E.g., 'transition pre', 'transition post'.
- * @param WorkflowTransitionInterface $transition
- *   The transition, that contains all of the above.
- * @param UserInterface $user
- *
- * @return bool|void
- */
-function hook_workflow($op, WorkflowTransitionInterface $transition, UserInterface $user) {
-  switch ($op) {
-    case 'transition permitted':
-      // As of version 8.x-1.x, this operation is never called to check if transition is permitted.
-      // This was called in the following situations:
-      // case 1. when building a workflow widget with list of available transitions;
-      // case 2. when executing a transition, just before the 'transition pre';
-      // case 3. when showing a 'revert state' link in a Views display.
-      // Your module's implementation may return FALSE here and disallow
-      // the execution, or avoid the presentation of the new State.
-      // This may be user-dependent.
-      // As of version 8.x-1.x:
-      // case 1: use hook_workflow_permitted_state_transitions_alter();
-      // case 2: use the 'transition pre' operation;
-      // case 3: use the 'transition pre' operation;
-      return TRUE;
-
-    case 'transition revert':
-      // Hook is called when showing the Transition Revert form.
-      // Implement this hook if you need to control this.
-      // If you return FALSE here, you will veto the transition.
-
-      //   workflow_debug(__FILE__, __FUNCTION__, __LINE__, $op, '');
-      break;
-
-    case 'transition pre':
-      // The workflow module does nothing during this operation.
-      // Implement this hook if you need to change/do something BEFORE anything
-      // is saved to the database.
-      // If you return FALSE here, you will veto the transition.
-
-      //   workflow_debug(__FILE__, __FUNCTION__, __LINE__, $op, '');
-      break;
-
-    case 'transition post':
-      // In D7, this is called by Workflow Node during update of the state, directly
-      // after updating the Workflow. Workflow Field does not call this,
-      // since you can call a hook_entity_* event after saving the entity.
-      // @see https://api.drupal.org/api/drupal/includes%21module.inc/group/hooks/7
-
-      //   workflow_debug(__FILE__, __FUNCTION__, __LINE__, $op, '');
-      break;
-
-    case 'transition delete':
-    case 'state delete':
-    case 'workflow delete':
-      // These hooks are removed in D8, in favour of the core hooks:
-      // - workflow_entity_predelete(EntityInterface $entity)
-      // - workflow_entity_delete(EntityInterface $entity)
-      // See examples at the bottom of this file.
-      break;
-  }
-
-  return;
-}
-
-/**
- * Implements hook_workflow_history_alter().
- *
- * In D8, hook_workflow_history_alter() is removed, in favour
- * of ListBuilder::getDefaultOperations
- * and hook_workflow_operations('workflow_transition').
- *
- * Allow other modules to add Operations to the most recent history change.
- * E.g., Workflow Revert implements an 'undo' operation.
- *
- * @param array $variables
- *   The current workflow history information as an array.
- *   'old_sid' - The state ID of the previous state.
- *   'old_state_name' - The state name of the previous state.
- *   'sid' - The state ID of the current state.
- *   'state_name' - The state name of the current state.
- *   'history' - The row from the workflow_transition_history table.
- *   'transition' - a WorkflowTransition object, containing all of the above.
- */
-function hook_workflow_history_alter(array &$variables) {
-  //  workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-
-  // The Workflow module does nothing with this hook.
-  // For an example implementation, see the Workflow Revert add-on.
-}
-
-/**
- * Implements hook_workflow_comment_alter().
- *
- * Allow other modules to change the user comment when saving a state change.
- *
- * @param string $comment
- *   The comment of the current state transition.
- * @param array $context
- *   'transition' - The current transition itself.
- */
-function hook_workflow_comment_alter(&$comment, array &$context) {
-  //  workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-
-  /* @var $transition WorkflowTransitionInterface */
-  $transition = $context['transition'];
-  //$comment = $transition->getOwner()->getUsername() . ' says: ' . $comment;
-}
-
-/**
- * Implements hook_workflow_permitted_state_transitions_alter().
- *
- * @param array $transitions
- *  An array of allowed transitions from the current state (as provided in
- *  $context). They are already filtered by the settings in Admin UI.
- * @param array $context
- *  An array of relevant objects. Currently:
- *    $context = array(
- *      'user' => $user,
- *      'workflow' => $workflow,
- *      'state' => $current_state,
- *      'force' => $force,
- *    );
- *
- * This hook allows you to add custom filtering of allowed target states, add
- * new custom states, change labels, etc.
- * It is invoked in WorkflowState::getOptions().
- */
-function hook_workflow_permitted_state_transitions_alter(array &$transitions, array $context) {
-  //  workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-
-  $user = $context['user']; // user may have the custom role AUTHOR.
-  // The following could be fetched from each transition.
-  $workflow = $context['workflow'];
-  $current_state = $context['state'];
-  // The following could be fetched from the $user and $transition objects.
-  $force = $context['force'];
-
-  // Implement here own permission logic.
-  foreach ($transitions as $key => $transition) {
-    /* @var $transition WorkflowTransitionInterface */
-    if (!$transition->isAllowed($user, $force)) {
-      //unset($transitions[$key]);
-    }
-  }
-
-  // This example creates a new custom target state.
-  $values = [
-    // Fixed values for new transition.
-    'wid' => $context['workflow']->id(),
-    'from_sid' => $context['state']->id(),
-
-    // Custom values for new transition.
-    // The ID must be an integer, due to db-table constraints.
-    'to_sid' => '998',
-    'label' => 'go to my new fantasy state',
-  ];
-  $new_transition = WorkflowConfigTransition::create($values);
-  //  $transitions[] = $new_transition;
-}
-
-
-/**********************************************************************
- * Hooks defined by core Form API: hooks to to alter the Workflow Form/Widget.
- */
-
-/**
- * Alter forms for field widgets provided by other modules.
- *
- * @param $element
- *   The field widget form element as constructed by hook_field_widget_form().
- * @param $form_state
- *   An associative array containing the current state of the form.
- * @param $context
- *   An associative array containing the following key-value pairs, matching the
- *   arguments received by hook_field_widget_form():
- *   - form: The form structure to which widgets are being attached. This may be
- *     a full form structure, or a sub-element of a larger form.
- *   - field: The field structure.
- *   - instance: The field instance structure.
- *   - langcode: The language associated with $items.
- *   - items: Array of default values for this field.
- *   - delta: The order of this item in the array of subelements (0, 1, 2, etc).
- *
- * @see hook_field_widget_form()
- * @see hook_field_widget_WIDGET_TYPE_form_alter()
- */
-function hook_field_widget_form_alter(&$element, \Drupal\Core\Form\FormStateInterface $form_state, $context) {
-  // A hook for changing any widget. Better not use it: it is called on EVERY
-  // Widget. (Even though the message is only shown once.)
-  // D7: This hook is introduced in Drupal 7.8.
-  // workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-  // dpm($context['widget']->getPluginId());
-}
-
-function hook_field_widget_workflow_default_form_alter(&$element, \Drupal\Core\Form\FormStateInterface $form_state, $context) {
-  // A hook specific for the 'workflow_default' widget.
-  // D7: This hook is introduced in Drupal 7.8.
-  // D8: This name is specified in the annotation of WorkflowDefaultWidget.
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__, '', '');
-
-  // A widget on an entity form.
-  if ('workflow_default' == $context['widget']->getPluginId()) {
-    // This object contains all you need. You may find it in one of two locations.
-    /* @var $transition WorkflowTransitionInterface */
-    /* @var $transition WorkflowTransitionInterface */
-    $transition = $element['#default_value'];
-
-    // An example of customizing/overriding the workflow widget.
-    // Beware, until now, you must do this twice: on the widget and on the form.
-    if ($transition->getOwnerId() == 1) {
-      drupal_set_message('(Test/Devel message) I got you, user 1, you will never schedule again,
-        and you WILL document each state change!', 'warning');
-      // Let's prohibit scheduling for user 1.
-      $element['workflow_scheduling']['#access'] = FALSE;
-      // Let's prohibit scheduling for user 1.
-      if ($element['comment']['#access'] == TRUE) {
-        $element['comment']['#required'] = TRUE;
-      }
-    }
-  }
-}
-
-/**
- * Implements hook_form_BASE_FORM_ID_alter().
- *
- * Use this hook to alter the form.
- * It is only suited if you only use View Page or Workflow Tab.
- * If you change the state on the Entity Edit page (form), you need the hook
- * hook_form_alter(). See below for more info.
- */
-function hook_form_workflow_transition_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  //  workflow_debug(__FILE__, __FUNCTION__, __LINE__, $form_id, '');
-
-  // The WorkflowTransitionForm (E.g., Workflow History tab, Block).
-  // It has its own handling.
-  // @todo: Populate the WorkflowTransitionForm with a Widget, so we have 1 way-of-working.
-
-  // Let's take a (changeable) reference to the element.
-  $workflow_element = &$form;
-
-  // This object contains all you need. You may find it in one of two locations.
-  /* @var $transition WorkflowTransitionInterface */
-  $transition = $form['workflow_transition']['#value'];
-  // dpm($transition);
-
-  // An example of customizing/overriding the workflow widget.
-  // Beware, until now, you must do this twice: on the widget and on the form.
-  if ($transition->getOwnerId() == 1) {
-    drupal_set_message('(Test/Devel message) I got you, user 1, you will never schedule again,
-        and you WILL document each state change!', 'warning');
-    // Let's prohibit scheduling for user 1.
-    $workflow_element['workflow_scheduling']['#access'] = FALSE;
-    // Let's prohibit scheduling for user 1.
-    if ( $workflow_element['comment']['#access'] == TRUE) {
-      $workflow_element['comment']['#required'] = TRUE;
-    }
-  }
-
-  // Get the Entity.
-  /* @var $entity \Drupal\Core\Entity\EntityInterface */
-  $entity = NULL;
-  //$entity = $form['workflow_entity']['#value'];
-  $entity_type = 'node'; // $form['workflow_entity_type']['#value'];
-  $entity_bundle = ''; // $entity->bundle();
-  $sid = '';
-  if ($entity) {
-    $entity_type = $entity->getEntityTypeId();
-    $entity_bundle = $entity->bundle();
-
-    // Get the current State ID.
-    $sid = workflow_node_current_state($entity, $field_name = NULL);
-    // Get the State object, if needed.
-    $state = WorkflowState::load($sid);
-  }
-
-  // Change the form, depending on the state ID.
-  // In the upcoming version 7.x-2.4, States should have a machine_name, too.
-  if ($entity_type == 'node' && $entity_bundle == 'MY_NODE_TYPE') {
-    switch ($sid) {
-      case '2':
-        // Change form element, form validate and form submit for state '2'.
-        break;
-
-      case '3':
-        // Change form element, form validate and form submit for state '3'.
-        break;
-    }
-  }
-
-}
-
-/**
- * Implements hook_form_alter().
- *
- * Use this hook to alter the form on an Entity Form, Comment Form (Edit page).
- *
- * @see hook_form_workflow_transition_form_alter() for example code.
- */
-function hook_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  if (substr($form_id, 0, 8) == 'workflow') {
-    //  workflow_debug(__FILE__, __FUNCTION__, __LINE__, $form_id, '');
-  }
-}
-
-
-/**
- * Hooks defined by core Entity: hook_entity_CRUD.
- *
- * Instead of using hook_entity_OPERATION, better use hook_ENTITY_TYPE_OPERATION.
- *
- * @see hook_entity_create(), hook_entity_update(), etc.
- * @see hook_ENTITY_TYPE_create(), hook_ENTITY_TYPE_update(), etc.
- */
-function hook_entity_predelete(EntityInterface $entity) {
-  if (substr($entity->getEntityTypeId(), 0, 8) == 'workflow') {
-    //  workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'pre-delete' , $entity->getEntityTypeId());
-  }
-  switch ($entity->getEntityTypeId()) {
-    case 'workflow_config_transition':
-    case 'workflow_state':
-    case 'workflow_type':
-      // Better use hook_ENTITY_TYPE_OPERATION.
-      // E.g., hook_workflow_type_predelete
-      break;
-  }
-}
-
-function hook_entity_delete(EntityInterface $entity) {
-  if (substr($entity->getEntityTypeId(), 0, 8) == 'workflow') {
-    //  workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'delete' , $entity->getEntityTypeId());
-  }
-}
-
-function hook_workflow_type_delete(EntityInterface $entity) {
-  //  workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'delete' , $entity->getEntityTypeId());
-}
-
-function hook_workflow_config_transition_delete(EntityInterface $entity) {
-  //  workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'delete' , $entity->getEntityTypeId());
-}
-
-function hook_workflow_state_delete(EntityInterface $entity) {
-  //  workflow_debug(__FILE__, __FUNCTION__, __LINE__, 'delete' , $entity->getEntityTypeId());
-}
diff --git a/modules/workflow/workflow.field.inc b/modules/workflow/workflow.field.inc
deleted file mode 100644
index 9a10e39..0000000
--- a/modules/workflow/workflow.field.inc
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-/**
- * @file
- * Defines a Workflow field, widget and formatter. (copied from list field).
- */
-
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\workflow\Entity\Workflow;
-use Drupal\workflow\Entity\WorkflowState;
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * Changes the hook_field_settings_form.
- * Fixes some Field settings and Field Instance settings, and makes sure users cannot change it.
- *
- * @todo: perhaps this is core functionality, but these values are only saved
- *        when the site builder explicitly save the instance settings. :-(
- */
-function workflow_form_field_storage_config_edit_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  $field_name = $form_state->getFormObject()->getEntity()->getType();
-
-  if ($field_name == 'workflow') {
-    // Make sure only 1 value can be entered in the Workflow field.
-    $form['cardinality_container']['cardinality']['#default_value'] = 'number';
-    $form['cardinality_container']['cardinality']['#disabled'] = TRUE;
-    $form['cardinality_container']['cardinality_number']['#default_value'] = 1;
-    $form['cardinality_container']['cardinality_number']['#disabled'] = TRUE;
-    $form['cardinality_container']['cardinality_number']['#states'] = [];
-  }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function workflow_form_field_config_edit_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  $field_name = $form_state->getFormObject()->getEntity()->getType();
-
-  if ($field_name == 'workflow') {
-    // The Workflow field must have a value, so set to required.
-    $form['required']['#default_value'] = 1;
-    $form['required']['#disabled'] = TRUE;
-
-    // There are alterations on the widget, too.
-    // @see WorkflowDefaultWidget::formElement();
-  }
-}
-
-/**
- * We will be using some default formatters and widgets from the List and Options modules.
- */
-
-/**
- * Implements hook_field_formatter_info_alter().
- *
- * The module reuses the formatters defined in list.module.
- */
-function workflow_field_formatter_info_alter(&$info) {
-  $info['list_key']['field_types'][] = 'workflow';
-  $info['list_default']['field_types'][] = 'workflow';
-}
-
-/**
- * Implements hook_field_widget_info_alter().
- *
- * The module does not implement widgets of its own, but reuses the
- * widgets defined in options.module.
- *
- * @see workflow_options_list()
- */
-function workflow_field_widget_info_alter(&$info) {
-  $info['options_select']['field_types'][] = 'workflow';
-  $info['options_buttons']['field_types'][] = 'workflow';
-}
-
-/**
- * {@inheritdoc}
- *
- * @see callback_allowed_values_function()
- *
- * deprecated: workflow_options_list --> workflow_state_allowed_values
- */
-function workflow_state_allowed_values(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL, &$cacheable = TRUE, AccountInterface $user = NULL) {
-  //function callback_allowed_values_function(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL, &$cacheable = TRUE) {
-  // N.B. the parameter $user is added by Workflow module.
-  $allowed_options = [];
-
-  $user = workflow_current_user($user); // @todo #2287057: OK?
-  $field_name = $definition->getName();
-
-  if ($entity) {
-    // Get the allowed new states for the entity's current state.
-    // @todo D8-port: overwrite getValue().
-    // $sid = $value = $this->getValue();
-    /* @var $state WorkflowState */
-    $sid = workflow_node_current_state($entity, $field_name);
-    $state = WorkflowState::load($sid);
-    $allowed_options = ($state) ? $state->getOptions($entity, $field_name, $user, FALSE) : [];
-  }
-  else {
-    // Create an empty State. This triggers to show all possible states for the Workflow.
-    $wid = $definition->getSetting('workflow_type');
-    if ($workflow = Workflow::load($wid)) {
-      // There is no entity, E.g., on the Rules action "Set a data value".
-      /* @var $state Drupal\workflow\Entity\WorkflowState */
-      $state = WorkflowState::create(['wid' => $wid, 'id' => '']);
-      $allowed_options = $state->getOptions(NULL, '', $user, FALSE);
-    }
-  }
-
-  return $allowed_options;
-}
-
-
-/**
- * Creates a form element to show the current value of a Workflow state.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- *   The entity this field is on.
- * @param string $field_name
- *   The field_name
- * @param string $current_sid
- *   The current State Id.
- *
- * @return array
- *   Form element, resembling the formatter of List module.
- *   If state 0 is given, return an empty form element.
- */
-function workflow_state_formatter($entity, $field_name, $current_sid = '') {
-  $element = [];
-
-  if (!$current_sid) {
-    $current_sid = workflow_node_current_state($entity, $field_name);
-  }
-  // Add the 'current value' formatter for this field.
-  // $list_display = $instance['display']['default'];
-  $list_display['type'] = 'list_default';
-  // Clone the entity and restore old value, in case you want to show an
-  // executed transition.
-  if ($entity->$field_name->value != $current_sid) {
-    $entity = clone $entity;
-    $entity->$field_name->value = $current_sid;
-  }
-  // Generate a renderable array for the field. Use default language determination ($langcode = NULL).
-  $element = $entity->$field_name->view($list_display);
-
-  // @todo D8: make weight better (even better: hook_field_extra_fields).
-  // Make sure the current value is before the form. (which has weight = 0.005)
-  // $element['#weight'] = 0;
-
-  return $element;
-}
diff --git a/modules/workflow/workflow.form.inc b/modules/workflow/workflow.form.inc
deleted file mode 100644
index a26ed43..0000000
--- a/modules/workflow/workflow.form.inc
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains helper functions for WorkflowTransitionForm.
- */
-
-use Drupal\Component\Utility\Html;
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-
-/**
- * Getter/Setter to tell if the action buttons are used.
- *
- * @param string $button_type
- *   Options. If empty, value is only getted, else the button type.
- *
- * @return string
- *   Previous value. If 'dropbutton'||'buttons', action buttons must be created.
- *
- * @see workflow_form_alter()
- * @see WorkflowDefaultWidget::formElement()
- *
- * Used to save some expensive operations on every form.
- */
-function _workflow_use_action_buttons($button_type = '') {
-  global $_workflow_use_actions_buttons;
-
-  // Reset value if requested.
-  if ($button_type) {
-    $_workflow_use_actions_buttons = $button_type;
-  }
-  return $_workflow_use_actions_buttons;
-}
-
-/**
- * Implements hook_form_alter().
- *
- * Form builder. Move action buttons next to the 'Save'/'Delete' buttons.
- *
- * This is only used if the set the 'options widget' to 'action buttons'.
- * Do not use with multiple workflows per entity: confusing UX.
- * ATM this works for:
- * - Workflow Field: create, edit, view, workflow tab, comment;
- * - Workflow Node: view, workflow tab;
- * (For forms with Workflow Node, the form_alter() is AFTER formElement(). )
- *
- * @todo: move this to WorkflowTransitionForm::_addActionButtons();
- */
-function workflow_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
-  // N.B. Keep code aligned: workflow_form_alter(), WorkflowTransitionForm::actions().
-
-  // Use a fast, custom way to check if we need to do this.
-  // @todo: Make this work with multiple workflows per entity.
-  if (!_workflow_use_action_buttons()) {
-    return;
-  }
-
-  if (isset($form_state->getBuildInfo()['base_form_id']) && $form_state->getBuildInfo()['base_form_id'] == 'workflow_transition_form') {
-    // The WorkflowTransitionForm::actions() has its own handling.
-    // E.g., Workflow History tab, Block.
-    return;
-  }
-
-  // Find the first workflow.
-  // (So this won't work with multiple workflows per entity.)
-  $workflow_element = _workflow_transition_form_get_first_workflow_element($form);
-
-  // Quit if there is no Workflow on this page.
-  if (!$workflow_element ) {
-    return;
-  }
-
-  // Quit if there are no Workflow Action buttons.
-  // (If user has only 1 workflow option, there are no Action buttons.)
-  if (count($workflow_element['to_sid']['#options']) <= 1) {
-    return;
-  }
-
-  // Find the default submit button and replace with our own action buttons.
-  if (isset($form['actions']['submit'])) {
-    $default_submit_action = $form['actions']['submit'];
-    // @todo D8-port: on Node-form, this is not sufficient.
-    unset($form['actions']['submit']);
-  }
-  elseif (isset($form['actions']['save'])) {
-    $default_submit_action = $form['actions']['save'];
-    unset($form['actions']['save']);
-  }
-  else {
-    // @todo test: when does this happen?
-    $default_submit_action = [];
-  }
-  if (isset($default_submit_action)) {
-    $actions = _workflow_transition_form_get_action_buttons($form, $workflow_element, $default_submit_action);
-    // Place the button with the other action buttons.
-    $form['actions'] = isset($form['actions']) ? $form['actions'] : [];
-    $form['actions'] += $actions;
-  }
-}
-
-/**
- * Fetches the first workflow_element from one of the Workflow Fields.
- *
- * @param array $form
- *
- * @return array
- */
-function _workflow_transition_form_get_first_workflow_element(&$form) {
-  $workflow_element = [];
-
-  // Find the first workflow.
-  // (So this won't work with multiple workflows per entity.)
-  foreach (\Drupal\Core\Render\Element::children($form) as $key) {
-    if (isset($form[$key]['widget'][0]['#default_value'])) {
-      $transition = $form[$key]['widget'][0]['#default_value'];
-      if (is_object($transition) && $transition instanceof WorkflowTransitionInterface ) {
-        $workflow_element = $form[$key]['widget'][0];
-        break;
-      }
-    }
-  }
-  return $workflow_element;
-}
-
-/**
- * Returns the action buttons from the options widget.
- *
- * @param array $form
- * @param array $workflow_element
- * @param array $default_submit_action
- *
- * @return array $actions
- */
-function _workflow_transition_form_get_action_buttons(array $form, array $workflow_element, array $default_submit_action) {
-  $actions = [];
-  $current_sid = $workflow_element['to_sid']['#default_value'];
-  /* @var $transition WorkflowTransitionInterface */
-  $transition = $workflow_element['workflow_transition']['#value'];
-  $field_name = $transition->getFieldName();
-
-  // Find the default submit button and add our action buttons before it.
-  // Get the min weight for our buttons.
-  $option_weight = isset($default_submit_action['#weight']) ? $default_submit_action['#weight'] : 0;
-  $option_weight = $option_weight - count($workflow_element['to_sid']['#options']);
-  $min_weight = $option_weight;
-  foreach ($workflow_element['to_sid']['#options'] as $sid => $option_name) {
-    // Make the workflow button act exactly like the original submit button.
-
-    $same_state_button = ($sid == $current_sid);
-    $workflow_submit_action = $default_submit_action;
-    // Add target State ID and Field name, to set correct value in validate_buttons callback.
-    $workflow_submit_action['#workflow'] = [
-      'field_name' => $field_name,
-      'to_sid' => $sid,
-    ];
-    // Keep option order. Put current state first.
-    $workflow_submit_action['#weight'] = ($same_state_button) ? $min_weight : ++$option_weight;
-    // Add/Overwrite some other settings.
-    $workflow_submit_action['#access'] = TRUE;
-    $workflow_submit_action['#value'] = $option_name;
-    // Use one drop button, instead of several action buttons.
-    if ('dropbutton' == _workflow_use_action_buttons()) {
-      $workflow_submit_action['#dropbutton'] = 'save';
-    }
-    $workflow_submit_action['#attributes'] = ($same_state_button) ? ['class' => ['form-save-default-button']] : [];
-    $workflow_submit_action['#button_type'] = ($same_state_button) ? 'primary' : ''; // @todo: works for node form and workflow tab, not for workflow block.
-    //$workflow_submit_action['#executes_submit_callback']  = TRUE;
-    // Add class to workflow button.
-    $workflow_submit_action['#attributes']['class'][] = Html::getClass('workflow_button_' . $option_name);
-    // Append the form's #validate function, or it won't be called upon submit,
-    // because the workflow buttons have its own #validate.
-    $workflow_submit_action['#validate'] = [];
-    $workflow_submit_action['#validate'][] = '_workflow_transition_form_validate_buttons';
-    if (isset($default_submit_action['#validate'])) {
-      $workflow_submit_action['#validate'] = $default_submit_action['#validate'];
-    }
-    elseif (isset($form['#validate'])) {
-      $workflow_submit_action['#validate'] = $form['#validate'];
-    }
-    // Append the submit-buttons's #submit function, or it won't be called upon submit.
-    if (isset($default_submit_action['#submit'])) {
-      $workflow_submit_action['#submit'] = $default_submit_action['#submit'];
-    }
-    elseif (isset($form['#submit'])) {
-      $workflow_submit_action['#submit'] = $form['#submit'];
-    }
-
-    // Hide the same-state button in some cases.
-    if ($same_state_button) {
-      if (isset($form['#form_id']) && substr($form['#form_id'], 0, 24) == 'workflow_transition_form') {
-        // Hide same-state-button on the transition-form (that is:
-        // view page or workflow history tab) if there is nothing to do.
-        // However, a Transition may be fieldable.
-        if ($form['comment']['#access'] == FALSE) {
-          $workflow_submit_action['#access'] = FALSE;
-        }
-      }
-      elseif (isset($form['#id']) && $form['#id'] == 'comment-form') {
-        // On comment-form, the button must stay, since you can comment to same state.
-      }
-      else {
-        // On a entity edit page, the button must stay.
-      }
-    }
-
-    // Place the button with the other action buttons.
-    $actions['workflow_' . $sid] = $workflow_submit_action;
-  }
-
-  return $actions;
-}
-
-/**
- * Get the Workflow parameter from the button, pressed by the user.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- *  The form state.
- * @return array
- *   A $field_name => $to_sid array.
- */
-function _workflow_transition_form_get_triggering_button(\Drupal\Core\Form\FormStateInterface $form_state) {
-  $result = ['field_name' => '', 'to_sid' => ''];
-
-  $triggering_element = $form_state->getTriggeringElement();
-  if (isset($triggering_element['#workflow'])) {
-    $result['field_name'] = $triggering_element['#workflow']['field_name'];
-    $result['to_sid'] = $triggering_element['#workflow']['to_sid'];
-  }
-
-  return $result;
-}
-
-/**
- * Submit callback function for the Workflow Form / DefaultWidget.
- *
- * Validate form data for 'time' element.
- * @param $element
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * @param $form
- */
-function _workflow_transition_form_element_validate_time($element, \Drupal\Core\Form\FormStateInterface &$form_state, $form) {
-  if (!strtotime($element['#value'])) {
-    $form_state->setError($element, t('Please enter a valid value for time.'));
-  }
-}
-
-/**
- * Submit callback function for the Workflow Form / DefaultWidget.
- *
- * This is only used when using action buttons in the widget.
- * It sets the new state to proper
- * element and sets a submit function if needed, making sure the action is
- * executed, influencing function core/includes/form.inc/form_execute_handlers().
- * (While constructing the Workflow form, we were not yet aware of the submit
- * buttons of the complete form. We try to correct this here, without adding
- * another hook_form_alter. We guess the first button is the Save button.
- */
-function _workflow_transition_form_validate_buttons($form, \Drupal\Core\Form\FormStateInterface &$form_state) {
-  // Retrieve the data from the form.
-  $transition = $form_state->getValue('workflow_transition');
-  if ($transition) {
-    // On WorkflowTransitionForm :
-    // D7: $form_state['input']['to_sid'] = $new_sid;
-    // D7: $form_state['values'][$field_name][$langcode][0]['to_sid'] = $new_sid;
-
-    $values = $form_state->getValues();
-
-    $to_sid = $form_state->getTriggeringElement()['#workflow']['to_sid'];
-    $values['to_sid'] = $to_sid;
-
-    // Update the form_state.
-    $form_state->setValues($values);
-  }
-  else {
-    // On edit form : See $form_state->getTriggeringElement() in WorkflowDefaultWidget;
-  }
-
-}
diff --git a/modules/workflow/workflow.info.yml b/modules/workflow/workflow.info.yml
deleted file mode 100644
index 537e7d7..0000000
--- a/modules/workflow/workflow.info.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: 'Workflow'
-description: 'Defines a field type with Workflows, containing customizable state transitions.'
-package: Workflow
-type: module
-# core: 8.x
-# version: VERSION
-
-dependencies:
-  - field
-  - options
-  - user
-
-# Information added by Drupal.org packaging script on 2017-11-16
-version: '8.x-1.0-rc1'
-core: '8.x'
-project: 'workflow'
-datestamp: 1510834404
diff --git a/modules/workflow/workflow.install b/modules/workflow/workflow.install
deleted file mode 100644
index 0f1a489..0000000
--- a/modules/workflow/workflow.install
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, update and uninstall functions for the workflow module.
- */
-
-/**
- * Implements hook_install().
- */
-function workflow_install() {
-  $url = \Drupal\Core\Url::fromRoute('system.modules_list', [], ['fragment' => 'edit-modules-workflow']);
-  $message = t('Thanks for using Workflow. To maintain workflows,
-    <a href=":url">install the Workflow UI module</a>. To start using
-    a Workflow, add a Workflow Field to your entity.',
-    [':url' => $url->toString()]
-  );
-  drupal_set_message($message);
-}
-
-/**
- * Implements hook_uninstall().
- */
-function workflow_uninstall() {
-//  \Drupal::config('workflow.settings')->clear('workflow_states_per_page')->save(); // @FIXME
-}
-
-/**
- * Implements hook_requirements().
- *
- * Let admins know that Workflow is in use.
- *
- * @todo: extend workflow_requirements() for use with Workflow Field API.
- *
- * @param $phase
- * @return array
- */
-function workflow_requirements($phase) {
-  $requirements = [];
-  switch ($phase) {
-    case 'install':
-      break;
-
-    case 'update':
-      break;
-
-    case 'runtime':
-//      workflow_debug(__FILE__), __FUNCTION__, __LINE__, $form_id);  // @todo D8-port: still test this snippet.
-
-      /*
-      // Show info on admin/reports/status.
-      $type_list = 'Not yet determined.';
-
-      // $types = db_query('SELECT wid, type FROM {workflow_type_map} WHERE wid <> 0 ORDER BY type')->fetchAllKeyed();
-      // If there are no types, then just bail.
-      if (count($types) == 0) {
-        return;
-      }
-      // Let's make it look nice.
-      if (count($types) == 1) {
-        $type_list = current($types);
-      } else {
-        $last = array_pop($types);
-        if (count($types) > 2) {
-          $type_list = implode(', ', $types) . ', and ' . $last;
-        } else {
-          $type_list = current($types) . ' and ' . $last;
-        }
-      }
-       */
-
-      /*
-      $requirements['workflow'] = array(
-        'title' => $t('Workflow'),
-        'value' => $t('Workflow is active on the @types content types.', array('@types' => $type_list)),
-        'severity' => REQUIREMENT_OK,
-      );
-       */
-      break;
-
-  }
-
-  return $requirements;
-}
-
-/**
- * Implements hook_schema().
- *
- * The D8-schema's have moved to:
- * - Workflow annotation (it is a Config Entity now);
- * - WorkfowState annotation (it is a Config Entity now);
- * - WorkfowConfigTransition annotation (it is a Config Entity now);
- * - WorkflowTransition::baseFieldDefinitions();
- * - WorkflowScheduledTransition::baseFieldDefinitions().
- */
-function workflow_schema() {
-  return $schema = [];
-}
-
-/**
- * Drupal 8 updates.
- */
-
-/**
- * Update from version beta1 to beta2 are not possible. Please re-install this module.
- */
-function workflow_update_8001(&$sandbox) {
-  drupal_set_message("Update from version beta1 to beta2 is not possible. Please re-install this module.");
-}
diff --git a/modules/workflow/workflow.links.task.yml b/modules/workflow/workflow.links.task.yml
deleted file mode 100644
index 46ea561..0000000
--- a/modules/workflow/workflow.links.task.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-#workflow.entities:
-#  class: \Drupal\Core\Menu\LocalTaskDefault
-#  deriver: \Drupal\workflow\Plugin\Derivative\WorkflowLocalTask
-
-#entity.workflow_type.canonical:
-#  route_name: entity.workflow_type.canonical
-#  base_route: entity.workflow_type.edit_form
-#  title: 'Edit'
-#  weight: -5
-entity.workflow_type.edit_form:
-  route_name: entity.workflow_type.canonical
-  base_route: entity.workflow_type.edit_form
-  title: 'Edit'
-  weight: -5
-entity.workflow_type.delete_form:
-  route_name: entity.workflow_type.delete_form
-  base_route: entity.workflow_type.edit_form
-  title:  'Delete'
-  weight: 10
-
-# @todo D8-port: make Workflow History tab happen for every entity_type.
-# @see workflow.routing.yml, workflow.links.task.yml, WorkflowTransitionListController.
-entity.node.workflow_history:
-  route_name: entity.node.workflow_history
-  base_route: entity.node.canonical
-  title: 'Workflow'
-  weight: 30
-entity.taxonomy_term.edit_form:
-  route_name: entity.taxonomy_term.workflow_history
-  base_route: entity.taxonomy_term.canonical
-  title: 'Workflow'
-  weight: 30
diff --git a/modules/workflow/workflow.module b/modules/workflow/workflow.module
deleted file mode 100644
index a382670..0000000
--- a/modules/workflow/workflow.module
+++ /dev/null
@@ -1,716 +0,0 @@
-<?php
-
-/**
- * @file
- * Support workflows made up of arbitrary states.
- */
-
-define('WORKFLOW_CREATION_STATE', 1);
-define('WORKFLOW_CREATION_DEFAULT_WEIGHT', -50);
-define('WORKFLOW_DELETION', 0);
-// Couldn't find a more elegant way to preserve translation.
-define('WORKFLOW_CREATION_STATE_NAME', 'creation');
-
-/**
- * Role ID for anonymous users.
- */
-// #2657072 brackets are added later to indicate a special role, and distinguish from frequently used 'author' role.
-define('WORKFLOW_ROLE_AUTHOR_NAME', 'Author');
-define('WORKFLOW_ROLE_AUTHOR_RID', 'workflow_author');
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\workflow\Entity\Workflow;
-use Drupal\workflow\Entity\WorkflowScheduledTransition;
-use Drupal\workflow\Entity\WorkflowState;
-use Drupal\workflow\Entity\WorkflowTransition;
-use Drupal\workflow\Entity\WorkflowTransitionInterface;
-
-module_load_include('inc', 'workflow', 'workflow.form');
-module_load_include('inc', 'workflow', 'workflow.field');
-
-/**********************************************************************
- *
- * Info hooks.
- *
- */
-
-/**
- * Implements hook_help().
- */
-function workflow_help($route_name, RouteMatchInterface $route_match) {
-  $output = '';
-
-  switch ($route_name) {
-    case 'help.page.workflow':
-      $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Workflow module adds a field to Entities to
-        store field values as Workflow states. You can control "state transitions"
-        and add action to specific transitions.') . '</p>';
-  }
-  return $output;
-}
-
-/**
- * Implements hook_hook_info().
- *
- * Allow adopters to place their hook implementations in either
- * their main module or in a module.workflow.inc file.
- */
-function workflow_hook_info() {
-  $hooks['workflow'] = ['group' => 'workflow'];
-  return $hooks;
-}
-
-/**
- * Implements hook_entity_type_build().
- *
- * @see https://www.drupal.org/node/2196275
- * "hook_entity_info() renamed to hook_entity_type_build()"
- */
-function TODO_workflow_entity_type_build(array &$entity_types) {
-  workflow_debug(__FILE__, __FUNCTION__, __LINE__);  // @todo D8-port: still test this snippet.
-
-  /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
-  // Add a form controller for a custom entity form without overriding the
-  // default entity form. To override the default entity form,
-  // use hook_entity_type_alter().
-  //$entity_types['node']->setFormClass('mymodule_foo', 'Drupal\mymodule\NodeFooFormController');
-}
-
-/**********************************************************************
- *
- * CRUD hooks.
- *
- */
-
-/**
- * Implements hook_user_cancel().
- *
- * Update tables for deleted account, move account to user 0 (anon.)
- * ALERT: This may cause previously non-Anonymous posts to suddenly
- * be accessible to Anonymous.
- */
-function workflow_user_cancel($edit, $account, $method) {
-  \Drupal::service('workflow.manager')->cancelUser($edit, $account, $method);
-}
-
-/**
- * Implements hook_user_delete().
- */
-function workflow_user_delete($account) {
-  \Drupal::service('workflow.manager')->deleteUser($account);
-}
-
-/**
- * Implements hook_ENTITY_TYPE_insert().
- *
- * Is called when adding a new Workflow type.
- * The technical name for the Workflow entity is 'workflow_type'.
- */
-function workflow_workflow_type_insert(EntityInterface $entity) {
-  \Drupal::service('workflow.manager')->participateUserRoles($entity);
-}
-
-/**
- * Implements hook_entity_insert().
- */
-function workflow_entity_insert(EntityInterface $entity) {
-  // Execute updates in hook_presave() to revert executions,
-  // Execute inserts in hook_insert, to have the Entity ID determined.
-    _workflow_execute_transitions($entity);
-}
-
-/**
- * Implements hook_entity_presave().
- */
-function workflow_entity_presave(EntityInterface $entity) {
-  if (!$entity->isNew()) {
-    // Avoid a double call by hook_entity_presave and hook_entity_insert.
-    _workflow_execute_transitions($entity);
-  }
-}
-
-/**
- *  Execute transitions. if prohibited, restore original field value.
- *  - insert: use hook_insert(), to have the Entity ID determined when saving transitions.
- *  - update: use hook_presave() to revert executions,
- *  - so, do not use hook_update().
- */
-function _workflow_execute_transitions(EntityInterface $entity) {
-  // Avoid this hook on workflow objects.
-  if (in_array($entity->getEntityTypeId(), [
-    'workflow_type',
-    'workflow_state',
-    'workflow_config_transition',
-    'workflow_transition',
-    'workflow_scheduled_transition',
-  ])) {
-    return;
-  }
-
-  // Execute/save the transitions fom the widgets in the entity form.
-  \Drupal::service('workflow.manager')->executeTransitionsOfEntity($entity);
-}
-
-/**
- * Implements hook_entity_delete().
- *
- * Delete the corresponding workflow table records.
- */
-function workflow_entity_delete(EntityInterface $entity) {
-  // @todo D8: test with multiple workflows.
-  if (get_class($entity) == 'Drupal\field\Entity\FieldConfig'
-    || get_class($entity) == 'Drupal\field\Entity\FieldStorageConfig') {
-    // A Workflow Field is removed from an entity.
-    $field_config = $entity;
-    $entity_type = $field_config->get('entity_type');
-    $field_name = $field_config->get('field_name');
-    foreach (WorkflowScheduledTransition::loadMultipleByProperties($entity_type, [], [], $field_name) as $scheduled_transition) {
-      /** @var $scheduled_transition WorkflowTransitionInterface */
-      $scheduled_transition->delete();
-    }
-    foreach (WorkflowTransition::loadMultipleByProperties($entity_type, [], [], $field_name) as $transition) {
-      /** @var $transition WorkflowTransitionInterface */
-      $transition->delete();
-    }
-  }
-  elseif (!in_array($entity->getEntityTypeId(), [
-    'workflow_type',
-    'workflow_state',
-    'workflow_config_transition',
-    'workflow_transition',
-    'workflow_scheduled_transition',
-  ])) {
-    // A 'normal' entity is deleted.
-    foreach ($fields = _workflow_info_fields($entity) as $field_id => $field_storage) {
-      /** @var $field_storage FieldStorageConfig */
-      $entity_type = $field_storage->getTargetEntityTypeId();
-      $entity_id = $entity->id();
-      $field_name = $field_storage->get('field_name');
-      foreach (WorkflowScheduledTransition::loadMultipleByProperties($entity_type, [$entity_id], [], $field_name) as $scheduled_transition) {
-        /** @var $scheduled_transition WorkflowTransitionInterface */
-        $scheduled_transition->delete();
-      }
-      foreach (WorkflowTransition::loadMultipleByProperties($entity_type, [$entity_id], [], $field_name) as $transition) {
-        /** @var $transition WorkflowTransitionInterface */
-        $transition->delete();
-      }
-    }
-  }
-}
-
-/**
- * Implements hook_cron().
- *
- * Given a time frame, execute all scheduled transitions.
- */
-function workflow_cron() {
-  \Drupal::service('workflow.manager')->executeScheduledTransitionsBetween(0, \Drupal::time()->getRequestTime());
-}
-
-/**
- * Business related functions, the API.
- */
-
-/**
- * @param WorkflowTransitionInterface $transition
- * @param bool $force
- * @return
- *
- * @deprecated D8: @see WorkflowManager::executeTransition().
- */
-function workflow_execute_transition(WorkflowTransitionInterface $transition, $force = FALSE) {
-  // Execute transition and update the attached entity.
-  return \Drupal::service('workflow.manager')->executeTransition($transition, $force);
-}
-
-/**
- * Functions to get an options list (to show in a Widget).
- * To be used in non-OO modules, like workflow_rules, workflow_views.
- *
- * The naming convention is workflow_get_<entity_type>_names.
- * (A bit different from 'user_role_names'.)
- * Can be used for hook_allowed_values from list.module.
- * Todo: move to \Drupal::entityManager::getEntityTypeLabels($group = FALSE).
- * - user_role
- * - workflow
- * - workflow_state
- * - sid
- */
-
-/**
- * Retrieves the names of roles matching specified conditions.
- *
- * deprecated D8: workflow_get_roles --> workflow_get_user_role_names
- *
- * Usage:
- *   D7: $roles = workflow_get_user_role_names('participate in workflow');
- *   D8: $type_id = $workflow->id();
- *   D8: $roles = workflow_get_user_role_names("create $type_id workflow_transition");
- *
- * @param string $permission
- *   (optional) A string containing a permission. If set, only roles
- *    containing that permission are returned. Defaults to NULL, which
- *    returns all roles.
- *    Normal usage for filtering roles that are enabled in a workflow_type
- *    would be: $permission = 'create $type_id transition'.
- *
- * @return array
- *   Array of role names keyed by role ID, including the 'author' role.
- */
-function workflow_get_user_role_names($permission) {
-  static $roles = NULL;
-
-  if (!$roles[$permission]) {
-    // Copied from AccountForm::form().
-    $roles[$permission] = array_map(['\Drupal\Component\Utility\Html', 'escape'],
-      [
-        WORKFLOW_ROLE_AUTHOR_RID => '(' . t(WORKFLOW_ROLE_AUTHOR_NAME) . ')'
-      ] + user_role_names(FALSE, $permission));
-  }
-
-  return $roles[$permission];
-}
-
-/**
- * Get an options list for workflow states.
- *
- * @param mixed $wid
- *   The Workflow ID.
- * @param bool $grouped
- *   Indicates if the value must be grouped per workflow.
- *   This influence the rendering of the select_list options.
- * @param bool $all
- *   Indicates to return all (TRUE) or active (FALSE) states of a workflow.
- *
- * @return array
- *   An array of $sid => state->label(), grouped per Workflow.
- */
-function workflow_get_workflow_state_names($wid = '', $grouped = FALSE, $all = FALSE) {
-  $options = [];
-
-  // @todo: implement $add parameter.
-  //
-  // @todo: follow Options pattern
-  // @see callback_allowed_values_function()
-  // @see options_allowed_values()
-
-
-  // Get the (user-dependent) options.
-  // Since this function is only used in UI, it is save to use the global $user.
-  $user = workflow_current_user();
-
-  /** @var $workflows Workflow[] */
-  $workflows = Workflow::loadMultiple($wid ? [$wid] : NULL);
-  // Do not group if only 1 Workflow is configured or selected.
-  $grouped = count($workflows) == 1 ? FALSE : $grouped;
-
-  foreach ($workflows as $wid => $workflow) {
-    /** @var $state WorkflowState */
-    $state = WorkflowState::create(['wid' => $wid]);
-    $workflow_options = $state->getOptions(NULL, '', $user, FALSE);
-    if (!$grouped) {
-      $options += $workflow_options;
-    }
-    else {
-      // Make a group for each Workflow.
-      $options[$workflow->label()] = $workflow_options;
-    }
-  }
-
-  return $options;
-}
-
-/**
- * Get an options list for workflows. Include an initial empty value
- * if requested. Validate each workflow, and generate a message if not complete.
- *
- * @param bool $required
- *   Indicates if the resulting list contains a options value.
- * @return array
- *   An array of $wid => workflow->label().
- */
-function workflow_get_workflow_names($required = TRUE) {
-  $options = [];
-
-  if (!$required) {
-    $options[''] = t('- Select a value -');
-  }
-  foreach (Workflow::loadMultiple() as $wid => $workflow) {
-    /** @var $workflow Workflow */
-    if ($workflow->isValid()) {
-      $options[$wid] = $workflow->label();
-    }
-  }
-
-  return $options;
-}
-
-/**
- * Gets an Options list of field names.
- *
- * @param null $entity
- * @param string $entity_type
- * @param string $entity_bundle
- * @param string $field_name
- * @return array
- */
-function workflow_get_workflow_field_names($entity = NULL, $entity_type = '', $entity_bundle = '', $field_name = '') {
-  $result = [];
-  foreach (_workflow_info_fields($entity, $entity_type, $entity_bundle, $field_name) as $definition) {
-    $field_name = $definition->getName();
-    $result[$field_name] = $definition->getName();
-  }
-  return $result;
-}
-
-/**
- * Helper function, to get the label of a given State Id.
- *
- * @param $sid
- *
- * @return string
- *
- * deprecated: workflow_get_sid_label() --> workflow_get_sid_name()
- */
-function workflow_get_sid_name($sid) {
-
-  if (empty($sid)) {
-    $label = 'No state';
-  }
-  /** @noinspection PhpAssignmentInConditionInspection */
-  elseif ($state = WorkflowState::load($sid)) {
-    $label = $state->label();
-  }
-  else {
-    $label = 'Unknown state';
-  }
-  return t($label);
-}
-
-/**
- * Determines the Workflow field_name of an entity.
- * If an entity has multiple workflows, only returns the first one.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- *   The entity at hand.
- * @param string $field_name
- *   The field name. If given, will be passed as return value.
- *
- * @return string
- */
-function workflow_get_field_name(\Drupal\Core\Entity\EntityInterface $entity, $field_name = '') {
-  if (!$entity) {
-    // $entity may be empty on Entity Add page.
-    $field_name = '';
-  }
-  elseif (!$field_name) {
-    $fields = _workflow_info_fields($entity);
-    $field = reset($fields);
-    /** @var $field \Drupal\field\Entity\FieldStorageConfig */
-    $field_name = $field->getName();
-  }
-
-  return $field_name;
-}
-
-/**
- * Helper function to get the entity from a route.
- *
- * This is a hack. It should be solved by using $routematch.
- *
- * @param \Drupal\Core\Entity\EntityInterface|null $entity
- *
- * @return \Drupal\Core\Entity\EntityInterface
- */
-function workflow_url_get_entity(EntityInterface $entity = NULL) {
-  if (!$entity) {
-    $route_match = \Drupal::routeMatch();
-    // On node pages, we'd get an object.
-    $entity = $route_match->getParameter('node');
-    if ($entity && is_object($entity)) {
-      return $entity;
-    }
-    if ($entity && !is_object($entity)) {
-      // On workflow tab, we'd get an id.
-      $entity = \Drupal\node\Entity\Node::load($entity);
-      return $entity;
-    }
-
-    // It was not a Node, try a Term.
-    if (!$entity) {
-      // On term pages, we get objects, or id's.
-      $entity = $route_match->getParameter('taxonomy_term');
-      if ($entity && is_object($entity)) {
-        return $entity;
-      }
-      elseif ($entity && !is_object($entity)) {
-        $entity = \Drupal\taxonomy\Entity\Term::load($entity);
-      }
-    }
-
-    if (!$entity) {
-      // We may be on a entity add page/
-      // Or we may be on a page of some unknown entity.
-    }
-
-  }
-
-  return $entity;
-}
-
-/**
- * Helper function to get the field name from a route.
- *
- * For now only used for ../{entity_id}/workflow history tab.
- *
- * @return string|null $field_name
- */
-function workflow_url_get_field_name() {
-  /** @var $route_match \Drupal\Core\Routing\RouteMatchInterface */
-  $route_match = \Drupal::routeMatch();
-  $field_name = $route_match->getParameter('field_name');
-  return $field_name;
-}
-
-/**
- * Helper function to get the entity from a route.
- *
- * @return mixed|string
- */
-function workflow_url_get_operation() {
-  $url = \Drupal\Core\Url::fromRoute('<current>');
-  // The last part of the path is the operation: edit, workflow, devel.
-  $url_parts = explode('/', $url->toString());
-  $operation = array_pop($url_parts);
-  // Except for view pages.
-  if (is_numeric($operation) || $operation == 'view') {
-    $operation = '';
-  }
-  return $operation;
-}
-
-/**
- * Functions to get the state of an entity.
- */
-
-/**
- * Wrapper function to get a UserInterface object.
- * We use UserInterface to check permissions.
- *
- * @param \Drupal\Core\Session\AccountInterface|null $account
- *
- * @return \Drupal\user\UserInterface
- */
-function workflow_current_user(\Drupal\Core\Session\AccountInterface $account = NULL) {
-  $account = ($account) ? $account : \Drupal::currentUser();
-  return \Drupal\user\Entity\User::load($account->id());
-}
-
-/**
- * Gets the current state ID of a given entity.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- * @param string $field_name
- *
- * @return string $current_sid
- *
- * @deprecated : use \Drupal::service('workflow.manager')->getCurrentStateId()
- */
-function workflow_node_current_state(\Drupal\Core\Entity\EntityInterface $entity, $field_name = '') {
-  return \Drupal::service('workflow.manager')->getCurrentStateId($entity, $field_name);
-}
-
-/**
- * Gets the previous state ID of a given entity.
- *
- * @param \Drupal\Core\Entity\EntityInterface $entity
- * @param string $field_name
- *
- * @return string $previous_sid
- *
- * @deprecated : use \Drupal::service('workflow.manager')->getPreviousStateId()
- */
-function workflow_node_previous_state($entity, $field_name = '') {
-  return \Drupal::service('workflow.manager')->getPreviousStateId($entity, $field_name);
-}
-
-/**
- * Get a specific workflow, given an entity type. Only one workflow is possible per node type.
- *
- * @param string $entity_bundle
- *   An entity bundle.
- * @param string $entity_type
- *   An entity type. This is passed when also the Field API must be checked.
- *
- * @return Workflow
- *   A Workflow object, or FALSE if no workflow is retrieved.
- *
- * Caveat: gives undefined results with multiple workflows per entity.
- *
- * @todo: support multiple workflows per entity.
- */
-function workflow_get_workflows_by_type($entity_bundle, $entity_type) {
-
-  static $map = [];
-
-  if (!isset($map[$entity_type][$entity_bundle])) {
-    $wid = FALSE;
-    $map[$entity_type][$entity_bundle] = FALSE;
-    if (!$wid && isset($entity_type)) {
-      foreach (_workflow_info_fields(NULL, $entity_type, $entity_bundle) as $field_info) {
-        $wid = $field_info->getSetting('workflow_type');
-      }
-    }
-
-    // Set the cache with a workflow object.
-    if ($wid) {
-      // $wid can be numeric or named.
-      $workflow = Workflow::load($wid);
-      $map[$entity_type][$entity_bundle] = $workflow;
-    }
-  }
-  return $map[$entity_type][$entity_bundle];
-}
-
-/**
- * Gets the workflow field names, if not known already.
- *
- * @param EntityInterface $entity
- *   Object to work with. May be empty, e.g., on menu build.
- * @param string $entity_type
- *   Entity type of object. Optional, but required if $entity provided.
- * @param string $entity_bundle
- *   Bundle of entity. Optional.
- * @param string $field_name
- *   Field name. Optional.
- *
- * @return Drupal\field\Entity\FieldStorageConfig[]
- *   An array of FieldStorageConfig objects.
- */
-function _workflow_info_fields($entity = NULL, $entity_type = '', $entity_bundle = '', $field_name = '') {
-  $field_info = [];
-
-  // Figure out the $entity's bundle and id.
-  if ($entity) {
-    $entity_type = $entity->getEntityTypeId();
-    $entity_bundle = $entity->bundle();
-  }
-  else {
-    // Entity type and bundle should be specified.
-  }
-
-  $field_list = Drupal::entityManager()->getFieldMapByFieldType('workflow');
-  foreach ($field_list as $e_type => $data) {
-    if (!$entity_type || ($entity_type == $e_type)) {
-      foreach ($data as $f_name => $value) {
-        if (!$entity_bundle || isset($value['bundles'][$entity_bundle])) {
-          if (!$field_name || ($field_name == $f_name)) {
-            // Do not use the field_name as ID, but the unique <entity_type>.<field_name>
-            // since you cannot share the same field on multiple entity_types (unlike D7).
-            $field_config = \Drupal\field\Entity\FieldStorageConfig::loadByName($e_type, $f_name);
-            $field_info[$field_config->id()] = $field_config;
-          }
-        }
-      }
-    }
-  }
-  return $field_info;
-}
-
-/**
- * Helper function for D8-port: Get some info on screen.
- * @see workflow_devel-module
- *
- * Usage:
- *   workflow_debug( __FILE__, __FUNCTION__, __LINE__, '', '');  // @todo D8-port: still test this snippet.
- *
- * @param string $class_name
- * @param string $function_name
- * @param string $line
- * @param string $value1
- * @param string $value2
- */
-function workflow_debug($class_name, $function_name, $line = '', $value1 = '', $value2 = '') {
-  $debug_switch = FALSE;
-//  $debug_switch = TRUE;
-
-  if (!$debug_switch) {
-    return;
-  }
-
-  $class_name_elements = explode( "\\", $class_name);
-  $output = 'Testing... function ' . end($class_name_elements) . '::' . $function_name . '/' . $line;
-  if ($value1) {
-    $output .= ' = ' . $value1;
-  }
-  if ($value2) {
-    $output .= ' > ' . $value2;
-  }
-  drupal_set_message($output, 'warning', TRUE);
-}
-
-/**
- * Helper function to determine Workflow from Workflow UI URL.
- *
- * @param string $url
- * @return Workflow
- */
-function workflow_url_get_workflow($url = '' ) {
-  /** @var $workflows \Drupal\workflow\Entity\Workflow[] */
-  static $workflows = [];
-
-  // For some reason, $_SERVER is not allowed as default.
-  $url = ($url == '') ? $_SERVER['REQUEST_URI'] : $url;
-
-  // The URL may have prefixes: /
-  // ex.1: /en/admin/config/workflow/workflow/MY_WORKFLOW/states
-  // ex.2: /admin/config/workflow/workflow/MY_WORKFLOW/states
-  $base_url = '/config/workflow/workflow/';
-  $string = substr($url, strpos($url, $base_url) + strlen($base_url));
-  $wid = explode('/', $string)[0];
-  if (!isset($workflows[$wid])) {
-    $workflows[$wid] = Workflow::load($wid);
-  }
-
-  return $workflows[$wid];
-}
-
-
-/**
- * Helper function to determine the title of the page.
- *
- * Used in file workflow_ui.routing.yml.
- *
- * @return \Drupal\Core\StringTranslation\TranslatableMarkup
- */
-function workflow_url_get_title() {
-  $label = '';
-
-  // Get the Workflow from the page.
-  /** @var $workflow \Drupal\workflow\Entity\Workflow */
-  if ($workflow = workflow_url_get_workflow()) {
-    $label = $workflow->label();
-  }
-
-  $title = t('Edit @entity %label', ['@entity' => 'Workflow', '%label' => $label]);
-  return $title;
-}
-
-/**
- * Helper function to determine Workflow from Workflow UI URL.
- *
- * @param string $url
- * @return mixed
- */
-function workflow_url_get_form_type($url = '' ) {
-  // For some reason, $_SERVER is not allowed as default.
-  $url = ($url == '') ? $_SERVER['REQUEST_URI'] : $url;
-
-  $base_url = '/config/workflow/workflow/';
-  $string = substr($url, strpos($url, $base_url) + strlen($base_url));
-  $type = explode('/', $string)[1];
-  return $type;
-}
diff --git a/modules/workflow/workflow.permissions.yml b/modules/workflow/workflow.permissions.yml
deleted file mode 100644
index 8313460..0000000
--- a/modules/workflow/workflow.permissions.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Permissions are declared in Workflow (not Workflow UI) so other contrib
-# modules can make use of it.
-
-administer workflow:
-  title: 'Administer workflows'
-  description: 'Administer all Workflow configurations and settings.'
-  restrict access: true
-
-permission_callbacks:
-  - \Drupal\workflow\WorkflowPermissions::workflowTypePermissions
diff --git a/modules/workflow/workflow.routing.yml b/modules/workflow/workflow.routing.yml
deleted file mode 100644
index 2e12465..0000000
--- a/modules/workflow/workflow.routing.yml
+++ /dev/null
@@ -1,144 +0,0 @@
-# All other routes for Workflow maintenance are declared in Workflow UI.
-
-### Workflow CRUD
-entity.workflow_type.collection:
-  path: '/admin/config/workflow/workflow'
-  defaults:
-    _entity_list: 'workflow_type'
-#    _controller: '\workflow\EntityWorkflowUIController::adminOverview'
-    _title: 'Workflows'
-  requirements:
-    _permission: 'administer workflow'
-
-entity.workflow_type.canonical:
-  path: '/admin/config/workflow/workflow/{workflow_type}'
-  defaults:
-    _entity_form: 'workflow_type.edit'
-    _title: 'Edit Workflow'
-    _title_callback: 'workflow_url_get_title'
-  requirements:
-    _permission: 'administer workflow'
-#   _entity_access: 'workflow.update'
-
-entity.workflow_type.add_form:
-  path: '/admin/config/workflow/workflow/add'
-  defaults:
-    _entity_form: 'workflow_type.add'
-    _title: 'Add Workflow'
-  requirements:
-    _permission: 'administer workflow'
-#   _entity_access: 'workflow.update'
-
-entity.workflow_type.edit_form:
-  path: '/admin/config/workflow/workflow/{workflow_type}'
-  defaults:
-    _entity_form: 'workflow_type.edit'
-    _title: 'Edit Workflow'
-    _title_callback: 'workflow_url_get_title'
-  requirements:
-    _permission: 'administer workflow'
-#   _entity_access: 'workflow.update'
-
-entity.workflow_type.delete_form:
-  path: '/admin/config/workflow/workflow/{workflow_type}/delete'
-  defaults:
-    _entity_form: 'workflow_type.delete'
-    _title: 'Delete Workflow'
-  requirements:
-    _permission: 'administer workflow'
-#   _entity_access: 'workflow.update'
-
-### Workflow Executed Transition CRUD
-entity.workflow_transition.canonical:
-  path: '/workflow_transition/{workflow_transition}'
-  defaults:
-  # Calls the view controller, defined in the annotation of the contact entity
-  #  _entity_view: 'workflow_transition'
-    _title: 'Workflow transition'
-  #requirements:
-  # Calls the access controller of the entity, $operation 'view'
-  #  _entity_access: 'workflow_transition.view'
-
-entity.workflow_transition.edit_form:
-  path: '/workflow_transition/{workflow_transition}/edit'
-  defaults:
-    _entity_form: 'workflow_transition.edit'
-    _title: 'Edit Workflow transition'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _entity_access: 'workflow_transition.update'
-
-entity.workflow_transition.delete_form:
-  path: '/workflow_transition/{workflow_transition}/delete'
-  defaults:
-    _entity_form: 'workflow_transition.delete'
-    _title: 'Delete Workflow transition'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _entity_access: 'workflow_transition.delete'
-
-### Workflow Scheduled Transition CRUD
-entity.workflow_scheduled_transition.canonical:
-  path: '/workflow_transition/{workflow_transition}'
-  defaults:
-  # Calls the view controller, defined in the annotation of the contact entity
-  #  _entity_view: 'workflow_transition'
-    _title: 'Workflow transition'
-  #requirements:
-  # Calls the access controller of the entity, $operation 'view'
-  #  _entity_access: 'workflow_transition.view'
-
-entity.workflow_scheduled_transition.edit_form:
-  path: '/workflow_transition/{workflow_transition}/edit'
-  defaults:
-    _entity_form: 'workflow_transition.edit'
-    _title: 'Edit Workflow transition'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _entity_access: 'workflow_transition.update'
-
-entity.workflow_scheduled_transition.delete_form:
-  path: '/workflow_transition/{workflow_transition}/delete'
-  defaults:
-    _entity_form: 'workflow_transition.delete'
-    _title: 'Delete Workflow transition'
-  options:
-    _admin_route: TRUE
-  requirements:
-    _entity_access: 'workflow_transition.delete'
-
-### The Workflow Transition History List (Tab)
-# @todo D8-port: make Workflow History tab happen for every entity_type.
-# @see workflow.routing.yml, workflow.links.task.yml, WorkflowTransitionListController.
-# A route for showing the Workflow history tab.
-entity.node.workflow_history:
-  path: '/node/{node}/workflow/{field_name}'
-  defaults:
-    _title: 'Workflow history'
-    _controller: '\Drupal\workflow\Controller\WorkflowTransitionListController::historyOverview'
-    field_name: ~
-  requirements:
-    _custom_access: '\Drupal\workflow\Controller\WorkflowTransitionListController::historyAccess'
-    _module_dependencies: 'node'
-  options:
-    _admin_route: TRUE
-    parameters:
-      entity:
-        type: entity:{entity_type}
-
-entity.taxonomy_term.workflow_history:
-  path: '/taxonomy/term/{taxonomy_term}/workflow/{field_name}'
-  defaults:
-    _title: 'Workflow history'
-    _controller: '\Drupal\workflow\Controller\WorkflowTransitionListController::historyOverview'
-    field_name: ~
-  requirements:
-    _custom_access: '\Drupal\workflow\Controller\WorkflowTransitionListController::historyAccess'
-    _module_dependencies: 'taxonomy'
-  options:
-    parameters:
-      entity:
-        type: entity:{entity_type}
diff --git a/modules/workflow/workflow.services.yml b/modules/workflow/workflow.services.yml
deleted file mode 100644
index 11489db..0000000
--- a/modules/workflow/workflow.services.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-services:
-  workflow.manager:
-    class: Drupal\workflow\Entity\WorkflowManager
-    arguments: ['@entity_type.manager', '@entity.query', '@config.factory', '@string_translation', '@module_handler', '@current_user']
-
-#  workflow.route_subscriber:
-#    class: Drupal\workflow\Routing\RouteSubscriber
-#    arguments: ['@entity.manager']
-#    tags:
-#      - { name: event_subscriber }
diff --git a/modules/workflow/workflow.views.inc b/modules/workflow/workflow.views.inc
deleted file mode 100644
index d238554..0000000
--- a/modules/workflow/workflow.views.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @file
- * Provide Views data for workflow.module.
- *
- * @ingroup views_module_handlers
- */
-
-use Drupal\field\FieldStorageConfigInterface;
-
-/**
- * Implements hook_field_views_data().
- */
-function workflow_field_views_data(FieldStorageConfigInterface $field) {
-
-  $data = views_field_default_views_data($field);
-  $settings = $field->getSettings();
-
-  foreach ($data as $table_name => $table_data) {
-    foreach ($table_data as $field_name => $field_data) {
-      if (isset($field_data['filter']) && $field_name != 'delta') {
-        $data[$table_name][$field_name]['filter']['wid'] = (array_key_exists('workflow_type', $settings)) ? $settings['workflow_type'] : '';
-        $data[$table_name][$field_name]['filter']['id'] = 'workflow_state';
-      }
-    }
-  }
-
-  return $data;
-}
diff --git a/themes/bootstrap/.csslintrc b/themes/bootstrap/.csslintrc
deleted file mode 100644
index b4e65db..0000000
--- a/themes/bootstrap/.csslintrc
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "adjoining-classes": false,
-  "box-sizing": true,
-  "box-model": false,
-  "bulletproof-font-face": true,
-  "compatible-vendor-prefixes": true,
-  "display-property-grouping": false,
-  "duplicate-background-images": true,
-  "duplicate-properties": true,
-  "empty-rules": true,
-  "errors": true,
-  "fallback-colors": false,
-  "floats": false,
-  "font-sizes": true,
-  "font-faces": true,
-  "gradients": true,
-  "ids": false,
-  "import": true,
-  "important": false,
-  "known-properties": true,
-  "outline-none": false,
-  "order-alphabetical": false,
-  "overqualified-elements": false,
-  "qualified-headings": false,
-  "regex-selectors": true,
-  "rules-count": true,
-  "selector-max": true,
-  "selector-max-approaching": true,
-  "shorthand": true,
-  "star-property-hack": true,
-  "text-indent": true,
-  "underscore-property-hack": true,
-  "unique-headings": false,
-  "universal-selector": true,
-  "unqualified-attributes": true,
-  "vendor-prefix": false,
-  "zero-units": true
-}
diff --git a/themes/bootstrap/.githooks.js.hbs b/themes/bootstrap/.githooks.js.hbs
deleted file mode 100644
index 0051ae9..0000000
--- a/themes/bootstrap/.githooks.js.hbs
+++ /dev/null
@@ -1,83 +0,0 @@
-var exec = require('sync-exec');
-var exit = 0;
-var glob = require("glob");
-var globOptions = {
-  ignore: [
-    'bower_components/**/*',
-    'node_modules/**/*'
-  ]
-};
-
-var pkg = require('../../package');
-// Change to \{{ hook }} once that variable is available.
-// @see https://github.com/wecodemore/grunt-githooks/pull/40
-var hooks = pkg.githooks && pkg.githooks['{{ task }}'];
-if (hooks) {
-  var ret, hook, files, commands, staged, matchAll;
-  var filesMatched = [];
-
-  // Iterate over all hook definitions.
-  for (var h in hooks) {
-    hook = hooks[h];
-    commands = hook.commands || [];
-    staged = hook.staged === void 0 ? false : !!hook.staged;
-    matchAll = hook.matchAll === void 0 ? true : !!hook.matchAll;
-
-    // Iterate over all files in a hook definition.
-    if (hook.files) {
-      // Expand all file paths using glob (for pattern matching).
-      if (typeof hook.files === 'string') {
-        files = glob.sync(hook.files, globOptions) || [];
-      }
-      if (Array.isArray(hook.files)) {
-        files = [];
-        for (var f = 0; f < hook.files.length; f++) {
-          files = [].concat(files, glob.sync(hook.files[f], globOptions) || []);
-        }
-      }
-
-      // All files must either be staged or modified for the entire
-      // hook definition command(s) to be executed.
-      for (f in files) {
-        var file = files[f];
-        if (file) {
-          // Only continue if file has been staged or modified.
-          ret = exec((staged ? 'git diff --name-only --cached ' + file : 'git diff HEAD@{1} --stat -- ' + file));
-          exit = ret.status;
-          if (exit === 0 && ret.stdout !== '') {
-            filesMatched.push(file);
-          }
-          else if (matchAll && (exit > 0 || ret.stdout === '')) {
-            console.log(ret.stdout);
-            filesMatched = [];
-            break;
-          }
-        }
-      }
-    }
-
-    // Iterate over all commands that should be executed for matched files.
-    if (filesMatched.length) {
-      if (typeof commands === 'string') {
-        commands = [commands];
-      }
-      for (var c in commands) {
-        var command = commands[c];
-        console.log("\033[4;35mgit: {{ task }}\033[0;35m\n>> " + command + "\033[0m\n");
-        ret = exec(command);
-        console.log(ret.stdout);
-        exit = ret.status;
-        if (exit > 0) {
-          break;
-        }
-      }
-    }
-
-    // Display any errors.
-    if (exit > 0 && ret && ret.stderr) {
-      console.log(ret.stderr);
-    }
-  }
-}
-
-process.exit(exit);
diff --git a/themes/bootstrap/.gitignore b/themes/bootstrap/.gitignore
deleted file mode 100644
index 1b5b477..0000000
--- a/themes/bootstrap/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-# OS
-.DS_Store
-
-# Applications & Tools
-.idea
-bower_components
-config.codekit
-node_modules
-npm-debug.log
-
-# Project Specific
-.libraries
-lib
-starterkits/*/bootstrap
diff --git a/themes/bootstrap/Gruntfile.js b/themes/bootstrap/Gruntfile.js
deleted file mode 100644
index 3eb8f83..0000000
--- a/themes/bootstrap/Gruntfile.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var path = require('path');
-
-module.exports = function (grunt) {
-  // Record grunt task execution times. Must be first.
-  require('time-grunt')(grunt);
-
-  // Register the "default" task.
-  grunt.registerTask('default', ['compile']);
-
-  // Register the "install" task.
-  grunt.registerTask('install', 'Installs or re-installs this grunt project. Read more in: docs/project/grunt.md.', ['githooks', 'sync', 'clean-vendor-dirs']);
-
-  // Load custom tasks.
-  grunt.task.loadTasks('grunt');
-
-  // Load npm installed 'grunt-*' tasks and configurations.
-  require('load-grunt-config')(grunt, {
-    configPath: path.join(process.cwd(), 'grunt', 'config')
-  });
-};
diff --git a/themes/bootstrap/README.md b/themes/bootstrap/README.md
deleted file mode 100644
index 3da7f7f..0000000
--- a/themes/bootstrap/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- @file Project Page -->
-# Bootstrap
-
-> Sleek, intuitive, and powerful mobile first front-end framework for faster and
-> easier web development. Bootstrap has become one of the most popular front-end
-> frameworks and open source projects in the world.
-
-This base theme bridges the gap between Drupal and the [Bootstrap Framework].
-
-### Features
-- [jsDelivr CDN](http://www.jsdelivr.com) for "out-of-the-box" styling and
-  faster page load times.
-- [Bootswatch](http://bootswatch.com) theme support, if using the CDN.
-- Glyphicons support via [Icon API](https://www.drupal.org/project/icon).
-- Extensive integration and template/preprocessor overrides for most of the
-  [Bootstrap Framework] CSS, Components and JavaScript
-- Theme settings to further enhance the Drupal Bootstrap integration:
-  - [Breadcrumbs](http://getbootstrap.com/components/#breadcrumbs)
-  - [Navbar](http://getbootstrap.com/components/#navbar)
-  - [Popovers](http://getbootstrap.com/javascript/#popovers)
-  - [Tooltips](http://getbootstrap.com/javascript/#tooltips)
-  - [Wells](http://getbootstrap.com/components/#wells) (per region)
-
-### Documentation
-Visit the project's [official documentation site](http://drupal-bootstrap.org)
-or the markdown files inside the `./docs` directory.
-
-### Supported modules
-
-**Drupal 8**
-- [Bootstrap Layouts](https://www.drupal.org/project/bootstrap_layouts)
-
-**Drupal 7**
-- [Bootstrap Core](https://www.drupal.org/project/bootstrap_core)
-- [jQuery Update](https://www.drupal.org/project/jquery_update)
-- [Icon API](https://www.drupal.org/project/icon)
-- [Picture](https://www.drupal.org/project/picture)
-- [Views](https://www.drupal.org/project/views) _(partial support)_
-- [Webform](https://www.drupal.org/project/webform) _(partial support)_
-
-### 5 Year Evolution (gource)
-https://youtu.be/Cvq6MPJp2dI
-
-[Bootstrap Framework]: http://getbootstrap.com
diff --git a/themes/bootstrap/autoload-fix.php b/themes/bootstrap/autoload-fix.php
deleted file mode 100644
index 0fe2369..0000000
--- a/themes/bootstrap/autoload-fix.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * @file
- * Fix the class loader to allow cross-request class based theme callbacks.
- */
-
-/**
- * Invokes \Drupal\Core\Extension\ThemeHandler::listInfo.
- *
- * This is in an attempt to ensure theme autoloading works properly.
- *
- * @see \Drupal\bootstrap\Bootstrap::autoloadFixInclude
- */
-try {
-  \Drupal::service('theme_handler')->listInfo();
-}
-catch (\Exception $e) {
-  // Intentionally left blank.
-}
diff --git a/themes/bootstrap/bootstrap.api.php b/themes/bootstrap/bootstrap.api.php
deleted file mode 100644
index 6346320..0000000
--- a/themes/bootstrap/bootstrap.api.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * @file
- * List of available procedural hook and alter APIs for use in your sub-theme.
- */
-
-/**
- * @addtogroup plugins_alter
- *
- * @{
- */
-
-/**
- * Allows sub-themes to alter the array used for colorizing text.
- *
- * @param array $texts
- *   An associative array containing the text and classes to be matched, passed
- *   by reference.
- *
- * @see \Drupal\bootstrap\Bootstrap::cssClassFromString()
- */
-function hook_bootstrap_colorize_text_alter(&$texts) {
-  // This matches the exact string: "My Unique Button Text".
-  $texts['matches'][t('My Unique Button Text')] = 'primary';
-
-  // This would also match the string above, however the class returned would
-  // also be the one above; "matches" takes precedence over "contains".
-  $texts['contains'][t('Unique')] = 'notice';
-
-  // Remove matching for strings that contain "apply":
-  unset($texts['contains'][t('Apply')]);
-
-  // Change the class that matches "Rebuild" (originally "warning"):
-  $texts['contains'][t('Rebuild')] = 'success';
-}
-
-/**
- * Allows sub-themes to alter the array used for associating an icon with text.
- *
- * @param array $texts
- *   An associative array containing the text and icons to be matched, passed
- *   by reference.
- *
- * @see \Drupal\bootstrap\Bootstrap::glyphiconFromString()
- */
-function hook_bootstrap_iconize_text_alter(&$texts) {
-  // This matches the exact string: "My Unique Button Text".
-  $texts['matches'][t('My Unique Button Text')] = 'heart';
-
-  // This would also match the string above, however the class returned would
-  // also be the one above; "matches" takes precedence over "contains".
-  $texts['contains'][t('Unique')] = 'bullhorn';
-
-  // Remove matching for strings that contain "filter":
-  unset($texts['contains'][t('Filter')]);
-
-  // Change the icon that matches "Upload" (originally "upload"):
-  $texts['contains'][t('Upload')] = 'ok';
-}
-
-/**
- * @} End of "addtogroup".
- */
diff --git a/themes/bootstrap/bootstrap.breakpoints.yml b/themes/bootstrap/bootstrap.breakpoints.yml
deleted file mode 100644
index c34e370..0000000
--- a/themes/bootstrap/bootstrap.breakpoints.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-bootstrap.screen-xs-max:
-  label: screen-xs-max
-  mediaQuery: 'all and (max-width: 767px)'
-  weight: 1
-  multipliers:
-    - 1x
-bootstrap.screen-sm-min:
-  label: screen-sm-min
-  mediaQuery: 'all and (min-width: 768px)'
-  weight: 1
-  multipliers:
-    - 1x
-bootstrap.screen-sm-max:
-  label: screen-sm-max
-  mediaQuery: 'all and (max-width: 991px)'
-  weight: 1
-  multipliers:
-    - 1x
-bootstrap.screen-md-min:
-  label: screen-md-min
-  mediaQuery: 'all and (min-width: 992px)'
-  weight: 1
-  multipliers:
-    - 1x
-bootstrap.screen-md-max:
-  label: screen-md-max
-  mediaQuery: 'all and (max-width: 1199px)'
-  weight: 1
-  multipliers:
-    - 1x
-bootstrap.screen-lg-min:
-  label: screen-lg-min
-  mediaQuery: 'all and (min-width: 1200px)'
-  weight: 1
-  multipliers:
-    - 1x
diff --git a/themes/bootstrap/bootstrap.drush.inc b/themes/bootstrap/bootstrap.drush.inc
deleted file mode 100644
index 79b9685..0000000
--- a/themes/bootstrap/bootstrap.drush.inc
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * @file
- * Drupal Bootstrap Drush commands.
- */
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Theme;
-use Drupal\Component\Serialization\Yaml;
-
-/**
- * Implements hook_drush_command().
- */
-function bootstrap_drush_command() {
-  $items['bootstrap-generate-docs'] = [
-    'description' => dt('Generates markdown documentation for the Drupal based code.'),
-    'arguments' => [
-      'type' => 'The specific type of documentation to generate, defaults to "all". Can be: "all", "settings".',
-    ],
-    'aliases' => ['bs-docs'],
-  ];
-  return $items;
-}
-
-/**
- * Generates markdown documentation.
- *
- * @param string $type
- */
-function drush_bootstrap_generate_docs($type = 'all') {
-  $types = $type === 'all' ? ['settings'] : [$type];
-  foreach ($types as $type) {
-    $function = "_drush_bootstrap_generate_docs_$type";
-    if (function_exists($function)) {
-      $ret = $function(Bootstrap::getTheme('bootstrap'));
-      if ($ret) {
-        drush_log('Successfully generated documentation for: ' . $type, 'success');
-      }
-      else {
-        drush_log('Unable to generate documentation for: ' . $type, 'error');
-      }
-    }
-    else {
-      drush_log('Invalid documentation type: ' . $type, 'error');
-    }
-  }
-}
-
-/**
- * Generates settings documentation.
- *
- * @param \Drupal\bootstrap\Theme $bootstrap
- *   The theme instance of the Drupal Bootstrap base theme.
- */
-function _drush_bootstrap_generate_docs_settings(Theme $bootstrap) {
-  $output[] = '<!-- @file Overview of theme settings for Drupal Bootstrap based themes. -->';
-  $output[] = '<!-- @defgroup -->';
-  $output[] = '<!-- @ingroup -->';
-  $output[] = '# Theme Settings';
-  $output[] = '';
-  $output[] = 'To override a setting, open `./config/install/THEMENAME.settings.yml` and add the following:';
-  $output[] = '';
-  $output[] = '```yaml';
-  $output[] = '# Settings';
-  $output[] = '';
-  $output[] = 'settings:';
-  $output[] = '  SETTING_NAME: SETTING_VALUE';
-  $output[] = '```';
-
-  // Determine the groups.
-  $groups = [];
-  foreach ($bootstrap->getSettingPlugin() as $setting) {
-    // Only get the first two groups (we don't need 3rd, or more, levels).
-    $_groups = array_slice($setting->getGroups(), 0, 2, FALSE);
-    if (!$_groups) {
-      continue;
-    }
-    $groups[implode(' > ', $_groups)][] = $setting->getPluginDefinition();
-  }
-
-  // Generate a table of each group's settings.
-  foreach ($groups as $group => $settings) {
-    $output[] = '';
-    $output[] = '---';
-    $output[] = '';
-    $output[] = "### $group";
-    $output[] = '';
-    $output[] = '<table class="table table-striped table-responsive">';
-    $output[] = '  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>';
-    $output[] = '  <tbody>';
-    foreach ($settings as $definition) {
-      $output[] = '  <tr>';
-      $output[] = '    <td class="col-xs-3">' . $definition['id'] . '</td>';
-      $output[] = '    <td>';
-      $output[] = '      <div class="help-block">' . str_replace('&quote;', '"', $definition['description']) . '</div>';
-      $output[] = '      <pre class=" language-yaml"><code>' . Yaml::encode([$definition['id'] => $definition['defaultValue']]) . '</code></pre>';
-      $output[] = '    </td>';
-      $output[] = '  </tr>';
-    }
-    $output[] = '  </tbody>';
-    $output[] = '</table>';
-  }
-
-  // Ensure we have link references at the bottom.
-  $output[] = '';
-  $output[] = '[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap';
-  $output[] = '[Bootstrap Framework]: http://getbootstrap.com';
-
-  // Save the generated output to the appropriate file.
-  return file_put_contents(realpath($bootstrap->getPath() . '/docs/Theme-Settings.md'), implode("\n", $output)) !== FALSE;
-}
diff --git a/themes/bootstrap/bootstrap.info.yml b/themes/bootstrap/bootstrap.info.yml
deleted file mode 100644
index 5038409..0000000
--- a/themes/bootstrap/bootstrap.info.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-# core: 8.x
-type: theme
-base theme: false
-
-name: 'Bootstrap'
-description: 'Built to use Bootstrap, a sleek, intuitive, and powerful front-end framework for faster and easier web development.'
-package: 'Bootstrap'
-
-regions:
-  navigation: 'Navigation'
-  navigation_collapsible: 'Navigation (Collapsible)'
-  header: 'Top Bar'
-  highlighted: 'Highlighted'
-  help: 'Help'
-  content: 'Content'
-  sidebar_first: 'Primary'
-  sidebar_second: 'Secondary'
-  footer: 'Footer'
-  page_top: 'Page top'
-  page_bottom: 'Page bottom'
-
-libraries:
-  - 'bootstrap/theme'
-
-libraries-extend:
-  core/drupal.ajax:
-    - bootstrap/drupal.ajax
-  core/drupal.autocomplete:
-    - bootstrap/drupal.autocomplete
-  core/drupal.form:
-    - bootstrap/drupal.form
-  core/drupal.progress:
-    - bootstrap/drupal.progress
-  core/drupal.states:
-    - bootstrap/drupal.states
-  core/drupal.tabledrag:
-    - bootstrap/drupal.tabledrag
-  image_widget_crop/cropper.integration:
-    - bootstrap/image_widget_crop
-  views/views.ajax:
-    - bootstrap/views.ajax
-
-libraries-override:
-  core/drupal.batch: bootstrap/drupal.batch
-  core/drupal.collapse: false
-  core/drupal.dropbutton: bootstrap/dropdown
-  core/drupal.vertical-tabs: bootstrap/drupal.vertical-tabs
-  filter/drupal.filter: bootstrap/drupal.filter
-  system/admin: false
-  text/drupal.text: bootstrap/drupal.text
-
-# Remove individual stylesheets.
-  system/base:
-    css:
-      component:
-        css/components/ajax-progress.module.css: false
-        css/components/autocomplete-loading.module.css: false
-        css/components/tabledrag.module.css: false
-
-  file/drupal.file:
-    css:
-      theme:
-        css/file.admin.css: false
-
-  filter/drupal.filter.admin:
-    css:
-      theme:
-        css/filter.admin.css: false
-
-  node/drupal.node.preview:
-    css:
-      theme:
-        css/node.preview.css: false
-
-# The following are dynamic library overrides based on certain critera,
-# usually a theme setting.
-#
-# @see \Drupal\bootstrap\Plugin\Alter\LibraryInfo::alter()
-#
-#  core/drupal.dialog: bootstrap/drupal.dialog
-#  core/drupal.dialog.ajax: bootstrap/drupal.dialog.ajax
-
-# Information added by Drupal.org packaging script on 2017-09-25
-version: '8.x-3.6'
-core: '8.x'
-project: 'bootstrap'
-datestamp: 1506357855
diff --git a/themes/bootstrap/bootstrap.libraries.yml b/themes/bootstrap/bootstrap.libraries.yml
deleted file mode 100644
index b98efe0..0000000
--- a/themes/bootstrap/bootstrap.libraries.yml
+++ /dev/null
@@ -1,145 +0,0 @@
-attributes:
-  js:
-    js/attributes.js: {}
-  dependencies:
-    - core/jquery
-    - core/underscore
-
-drupal.bootstrap:
-  js:
-    js/drupal.bootstrap.js: {}
-  dependencies:
-    - core/jquery
-    - core/drupal
-    - core/drupalSettings
-
-# Create a library placeholder for livereload.
-# This is altered dynamically based on the set URL.
-# @see \Drupal\bootstrap\Plugin\Alter\LibraryInfo::alter
-livereload:
-  js:
-    livereload.js: {}
-
-theme:
-  js:
-    js/theme.js: {}
-  dependencies:
-    - bootstrap/drupal.bootstrap
-    - bootstrap/attributes
-
-theme-settings:
-  js:
-    js/theme-settings.js: {}
-  dependencies:
-    - core/jquery
-    - core/jquery.once
-    - core/drupal
-    - core/drupalSettings
-
-dropdown:
-  js:
-    js/dropdown.js: {}
-  dependencies:
-    - bootstrap/theme
-
-modal:
-  js:
-    js/modal.js: {}
-  dependencies:
-    - bootstrap/theme
-
-popover:
-  js:
-    js/popover.js: {}
-  dependencies:
-    - bootstrap/theme
-
-tooltip:
-  js:
-    js/tooltip.js: {}
-  dependencies:
-    - bootstrap/theme
-
-# libraries-extend
-drupal.ajax:
-  js:
-    js/misc/ajax.js: {}
-
-drupal.autocomplete:
-  js:
-    js/misc/autocomplete.js: {}
-
-drupal.form:
-  js:
-    js/misc/form.js: {}
-  dependencies:
-    - bootstrap/theme
-
-drupal.progress:
-  js:
-    js/misc/progress.js: {}
-
-drupal.states:
-  js:
-    js/misc/states.js: {}
-
-drupal.tabledrag:
-  js:
-    js/misc/tabledrag.js: {}
-
-image_widget_crop:
-  js:
-    js/modules/image_widget_crop/ImageWidgetCrop.js: {}
-
-views.ajax:
-  js:
-    js/modules/views/ajax_view.js: {}
-
-# libraries-override
-drupal.batch:
-  js:
-    js/misc/batch.js: { cache: false }
-  dependencies:
-    - bootstrap/theme
-    - core/drupal.ajax
-    - core/drupal.progress
-    - core/jquery.once
-
-drupal.dialog:
-  js:
-    js/misc/dialog.js: {}
-  dependencies:
-    - bootstrap/modal
-
-drupal.dialog.ajax:
-  js:
-    js/misc/dialog.ajax.js: {}
-  dependencies:
-    - core/drupal.ajax
-    - bootstrap/drupal.dialog
-
-drupal.filter:
-  version: VERSION
-  js:
-    js/modules/filter/filter.js: {}
-  dependencies:
-    - core/jquery
-    - core/drupal
-    - core/jquery.once
-
-drupal.text:
-  js:
-    js/text/text.js: {}
-  dependencies:
-    - core/jquery
-    - core/jquery.once
-    - core/drupal
-
-drupal.vertical-tabs:
-  js:
-    js/misc/vertical-tabs.js: {}
-  dependencies:
-    - bootstrap/theme
-    - core/jquery.once
-    - core/drupal.form
-    - core/matchmedia
diff --git a/themes/bootstrap/bootstrap.theme b/themes/bootstrap/bootstrap.theme
deleted file mode 100644
index f89d6d8..0000000
--- a/themes/bootstrap/bootstrap.theme
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * @file
- * The primary PHP file for the Drupal Bootstrap base theme.
- *
- * This file should only contain light helper functions and point to stubs in
- * other files containing more complex functions.
- *
- * The stubs should point to files within the `./includes` directory named after
- * the function itself minus the theme prefix. If the stub contains a group of
- * functions, then please organize them so they are related in some way and name
- * the file appropriately to at least hint at what it contains.
- *
- * All [pre]process functions, theme functions and template files lives inside
- * the `./templates` directory. This is a highly automated and complex system
- * designed to only load the necessary files when a given theme hook is invoked.
- *
- * Visit this project's official documentation site, http://drupal-bootstrap.org
- * or the markdown files inside the `./docs` directory.
- *
- * @see bootstrap_theme()
- * @see \Drupal\bootstrap\Registry
- */
-
-use Drupal\bootstrap\Bootstrap;
-
-/**
- * Initialize the active theme.
- */
-Bootstrap::initialize();
-
-/**
- * {@inheritdoc}
- *
- * @see hook_bootstrap_colorize_text_alter().
- */
-function bootstrap_bootstrap_colorize_text_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-/**
- * {@inheritdoc}
- *
- * @see hook_bootstrap_iconize_text_alter().
- */
-function bootstrap_bootstrap_iconize_text_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-/**
- * {@inheritdoc}
- *
- * @see hook_bootstrap_layouts_class_options_alter().
- */
-function bootstrap_bootstrap_layouts_class_options_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-/**
- * {@inheritdoc}
- *
- * @see \Drupal\bootstrap\Plugin\Alter\ElementInfo::alter()
- */
-function bootstrap_element_info_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-/**
- * {@inheritdoc}
- *
- * @see \Drupal\bootstrap\Theme::alter()
- */
-function bootstrap_form_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-/**
- * {@inheritdoc}
- *
- * @see \Drupal\bootstrap\Plugin\Form\SystemThemeSettings::alterForm()
- */
-function bootstrap_form_system_theme_settings_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-/**
- * {@inheritdoc}
- */
-function bootstrap_js_settings_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-/**
- * {@inheritdoc}
- *
- * @see \Drupal\bootstrap\Plugin\Alter\LibraryInfo::alter()
- */
-function bootstrap_library_info_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-/**
- * {@inheritdoc}
- *
- * @see \Drupal\bootstrap\Plugin\Alter\PageAttachments::alter()
- */
-function bootstrap_page_attachments_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-/**
- * {@inheritdoc}
- *
- * @see \Drupal\bootstrap\Bootstrap::preprocess()
- */
-function bootstrap_preprocess(&$variables, $hook, $info) {
-  Bootstrap::preprocess($variables, $hook, $info);
-}
-
-/**
- * {@inheritdoc}
- *
- * @see \Drupal\bootstrap\Bootstrap::getInfo()
- */
-function bootstrap_theme() {
-  return Bootstrap::getThemeHooks();
-}
-
-/**
- * {@inheritdoc}
- *
- * @see \Drupal\bootstrap\Plugin\Alter\ThemeRegistry::alter()
- *
- * @todo Remove once a proper replacement for the theme.registry service can be
- * created in a bootstrap_core sub-module.
- */
-function bootstrap_theme_registry_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-/**
- * {@inheritdoc}
- *
- * @see \Drupal\bootstrap\Plugin\Alter\ThemeSuggestions::alter()
- */
-function bootstrap_theme_suggestions_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
diff --git a/themes/bootstrap/bower.json b/themes/bootstrap/bower.json
deleted file mode 100644
index 17d9213..0000000
--- a/themes/bootstrap/bower.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "drupal-bootstrap",
-  "version": "8.3.x-dev",
-  "license": "GPL+2",
-  "homepage": "https://www.drupal.org/project/bootstrap",
-  "private": true
-}
diff --git a/themes/bootstrap/composer.json b/themes/bootstrap/composer.json
deleted file mode 100644
index 0c1dcf9..0000000
--- a/themes/bootstrap/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "drupal/bootstrap",
-  "description": "Built to use Bootstrap, a sleek, intuitive, and powerful front-end framework for faster and easier web development.",
-  "type": "drupal-theme",
-  "license": "GPL-2.0",
-  "homepage": "http://drupal.org/project/bootstrap",
-  "authors": [
-    {
-      "name": "Mark Carver (markcarver)",
-      "homepage": "https://www.drupal.org/u/markcarver",
-      "role": "Maintainer"
-    },
-    {
-      "name": "John McCormick (neardark)",
-      "homepage": "https://www.drupal.org/u/neardark",
-      "role": "Co-maintainer"
-    },
-    {
-      "name": "Fabiano Sant'Ana (wundo)",
-      "homepage": "https://www.drupal.org/u/wundo",
-      "role": "Co-maintainer"
-    }
-  ],
-  "support": {
-    "docs": "http://drupal-bootstrap.org",
-    "issues": "https://www.drupal.org/project/issues/bootstrap",
-    "irc": "irc://irc.freenode.org/drupal-bootstrap",
-    "source": "http://cgit.drupalcode.org/bootstrap"
-  }
-}
diff --git a/themes/bootstrap/config/install/bootstrap.settings.yml b/themes/bootstrap/config/install/bootstrap.settings.yml
deleted file mode 100644
index c2375f0..0000000
--- a/themes/bootstrap/config/install/bootstrap.settings.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Default settings should not be located here. This file is only used to
-# initially install a theme's "settings".
-#
-# Instead, the Drupal Bootstrap base theme uses the @BootstrapSetting
-# annotated plugin discovery process. This ensures that sub-theme settings are
-# inherited from base themes themes properly and to determine when a setting
-# should be saved to config as "overridden".
-#
-# @see \Drupal\bootstrap\Plugin\SettingBase
-# @see \Drupal\bootstrap\Plugin\SettingInterface
-# @see \Drupal\bootstrap\Plugin\SettingManager
-# @see \Drupal\bootstrap\Plugin\Form\SystemThemeSettings
-# @see \Drupal\bootstrap\ThemeSettings
-
-# This file cannot be empty, so install an initial empty array for "schemas".
-# @see https://www.drupal.org/node/2813829
-schemas: []
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_account_menu.yml b/themes/bootstrap/config/optional/block.block.bootstrap_account_menu.yml
deleted file mode 100644
index 996354a..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_account_menu.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.account
-  module:
-    - system
-  theme:
-    - bootstrap
-id: bootstrap_account_menu
-theme: bootstrap
-region: navigation_collapsible
-weight: 11
-provider: null
-plugin: 'system_menu_block:account'
-settings:
-  id: 'system_menu_block:account'
-  label: 'User account menu'
-  provider: system
-  label_display: '0'
-  level: 1
-  depth: 2
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_branding.yml b/themes/bootstrap/config/optional/block.block.bootstrap_branding.yml
deleted file mode 100644
index 5563144..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_branding.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap
-id: bootstrap_branding
-theme: bootstrap
-region: navigation
-weight: 0
-provider: null
-plugin: system_branding_block
-settings:
-  id: system_branding_block
-  label: 'Site branding'
-  provider: system
-  label_display: '0'
-  use_site_logo: true
-  use_site_name: true
-  use_site_slogan: false
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_breadcrumbs.yml b/themes/bootstrap/config/optional/block.block.bootstrap_breadcrumbs.yml
deleted file mode 100644
index 614feae..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_breadcrumbs.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap
-id: bootstrap_breadcrumbs
-theme: bootstrap
-region: header
-weight: -100
-provider: null
-plugin: system_breadcrumb_block
-settings:
-  id: system_breadcrumb_block
-  label: Breadcrumbs
-  provider: system
-  label_display: '0'
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_content.yml b/themes/bootstrap/config/optional/block.block.bootstrap_content.yml
deleted file mode 100644
index de66359..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_content.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap
-id: bootstrap_content
-theme: bootstrap
-region: content
-weight: 0
-provider: null
-plugin: system_main_block
-settings:
-  id: system_main_block
-  label: 'Main page content'
-  provider: system
-  label_display: '0'
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_footer.yml b/themes/bootstrap/config/optional/block.block.bootstrap_footer.yml
deleted file mode 100644
index 21075dd..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_footer.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.footer
-  module:
-    - system
-  theme:
-    - bootstrap
-id: bootstrap_footer
-theme: bootstrap
-region: footer
-weight: 0
-provider: null
-plugin: 'system_menu_block:footer'
-settings:
-  id: 'system_menu_block:footer'
-  label: 'Footer menu'
-  provider: system
-  label_display: '0'
-  level: 1
-  depth: 0
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_help.yml b/themes/bootstrap/config/optional/block.block.bootstrap_help.yml
deleted file mode 100644
index 45d80ca..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_help.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - help
-  theme:
-    - bootstrap
-id: bootstrap_help
-theme: bootstrap
-region: help
-weight: -30
-provider: null
-plugin: help_block
-settings:
-  id: help_block
-  label: Help
-  provider: help
-  label_display: '0'
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_local_actions.yml b/themes/bootstrap/config/optional/block.block.bootstrap_local_actions.yml
deleted file mode 100644
index 7702268..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_local_actions.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bootstrap
-id: bootstrap_local_actions
-theme: bootstrap
-region: header
-weight: 20
-provider: null
-plugin: local_actions_block
-settings:
-  id: local_actions_block
-  label: 'Primary admin actions'
-  provider: core
-  label_display: '0'
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_local_tasks.yml b/themes/bootstrap/config/optional/block.block.bootstrap_local_tasks.yml
deleted file mode 100644
index dc2dfee..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_local_tasks.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bootstrap
-id: bootstrap_local_tasks
-theme: bootstrap
-region: header
-weight: 10
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: Tabs
-  provider: core
-  label_display: '0'
-  primary: true
-  secondary: true
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_main_menu.yml b/themes/bootstrap/config/optional/block.block.bootstrap_main_menu.yml
deleted file mode 100644
index 2b4e81d..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_main_menu.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.main
-  module:
-    - system
-  theme:
-    - bootstrap
-id: bootstrap_main_menu
-theme: bootstrap
-region: navigation_collapsible
-weight: 10
-provider: null
-plugin: 'system_menu_block:main'
-settings:
-  id: 'system_menu_block:main'
-  label: 'Main navigation'
-  provider: system
-  label_display: '0'
-  level: 1
-  depth: 2
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_messages.yml b/themes/bootstrap/config/optional/block.block.bootstrap_messages.yml
deleted file mode 100644
index 271a89d..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_messages.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap
-id: bootstrap_messages
-theme: bootstrap
-region: header
-weight: -50
-provider: null
-plugin: system_messages_block
-settings:
-  id: system_messages_block
-  label: 'Status messages'
-  provider: system
-  label_display: '0'
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_page_title.yml b/themes/bootstrap/config/optional/block.block.bootstrap_page_title.yml
deleted file mode 100644
index f87fa85..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_page_title.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bootstrap
-id: bootstrap_page_title
-theme: bootstrap
-region: header
-weight: 0
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  provider: core
-  label_display: '0'
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_powered.yml b/themes/bootstrap/config/optional/block.block.bootstrap_powered.yml
deleted file mode 100644
index 5087fd4..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_powered.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap
-id: bootstrap_powered
-theme: bootstrap
-region: footer
-weight: -10
-provider: null
-plugin: system_powered_by_block
-settings:
-  id: system_powered_by_block
-  label: 'Powered by Drupal'
-  provider: system
-  label_display: '0'
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_search.yml b/themes/bootstrap/config/optional/block.block.bootstrap_search.yml
deleted file mode 100644
index b2e1039..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_search.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - search
-  theme:
-    - bootstrap
-id: bootstrap_search
-theme: bootstrap
-region: sidebar_second
-weight: -1
-provider: null
-plugin: search_form_block
-settings:
-  id: search_form_block
-  label: Search
-  provider: search
-  label_display: visible
-visibility: {  }
diff --git a/themes/bootstrap/config/optional/block.block.bootstrap_tools.yml b/themes/bootstrap/config/optional/block.block.bootstrap_tools.yml
deleted file mode 100644
index 2a89d45..0000000
--- a/themes/bootstrap/config/optional/block.block.bootstrap_tools.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.tools
-  module:
-    - system
-  theme:
-    - bootstrap
-id: bootstrap_tools
-theme: bootstrap
-region: sidebar_second
-weight: 0
-provider: null
-plugin: 'system_menu_block:tools'
-settings:
-  id: 'system_menu_block:tools'
-  label: Tools
-  provider: system
-  label_display: visible
-  level: 1
-  depth: 0
-visibility: {  }
diff --git a/themes/bootstrap/config/schema/bootstrap.schema.yml b/themes/bootstrap/config/schema/bootstrap.schema.yml
deleted file mode 100644
index 1d5461a..0000000
--- a/themes/bootstrap/config/schema/bootstrap.schema.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-# Schema for the theme setting configuration file of the Bootstrap base theme.
-
-bootstrap.settings:
-  type: theme_settings
-  label: 'Bootstrap settings'
diff --git a/themes/bootstrap/css/3.0.0/overrides-amelia.min.css b/themes/bootstrap/css/3.0.0/overrides-amelia.min.css
deleted file mode 100644
index 377e95c..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-cerulean.min.css b/themes/bootstrap/css/3.0.0/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-cosmo.min.css b/themes/bootstrap/css/3.0.0/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-cyborg.min.css b/themes/bootstrap/css/3.0.0/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-flatly.min.css b/themes/bootstrap/css/3.0.0/overrides-flatly.min.css
deleted file mode 100644
index aaa4346..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1 #ddd #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-journal.min.css b/themes/bootstrap/css/3.0.0/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-readable.min.css b/themes/bootstrap/css/3.0.0/overrides-readable.min.css
deleted file mode 100644
index 1b19300..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:15px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:15px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lora,Georgia,"Times New Roman",Times,serif;font-size:17px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:22px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-simplex.min.css b/themes/bootstrap/css/3.0.0/overrides-simplex.min.css
deleted file mode 100644
index 87a207f..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-slate.min.css b/themes/bootstrap/css/3.0.0/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-spacelab.min.css b/themes/bootstrap/css/3.0.0/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides-united.min.css b/themes/bootstrap/css/3.0.0/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.0.0/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.0/overrides.min.css b/themes/bootstrap/css/3.0.0/overrides.min.css
deleted file mode 100644
index 11c6067..0000000
--- a/themes/bootstrap/css/3.0.0/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-amelia.min.css b/themes/bootstrap/css/3.0.1/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-cerulean.min.css b/themes/bootstrap/css/3.0.1/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-cosmo.min.css b/themes/bootstrap/css/3.0.1/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-cyborg.min.css b/themes/bootstrap/css/3.0.1/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-flatly.min.css b/themes/bootstrap/css/3.0.1/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-journal.min.css b/themes/bootstrap/css/3.0.1/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-readable.min.css b/themes/bootstrap/css/3.0.1/overrides-readable.min.css
deleted file mode 100644
index 1b19300..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:15px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:15px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lora,Georgia,"Times New Roman",Times,serif;font-size:17px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:22px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-simplex.min.css b/themes/bootstrap/css/3.0.1/overrides-simplex.min.css
deleted file mode 100644
index 87a207f..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-slate.min.css b/themes/bootstrap/css/3.0.1/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-spacelab.min.css b/themes/bootstrap/css/3.0.1/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides-united.min.css b/themes/bootstrap/css/3.0.1/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.0.1/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.1/overrides.min.css b/themes/bootstrap/css/3.0.1/overrides.min.css
deleted file mode 100644
index 23376fc..0000000
--- a/themes/bootstrap/css/3.0.1/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-amelia.min.css b/themes/bootstrap/css/3.0.2/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-cerulean.min.css b/themes/bootstrap/css/3.0.2/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-cosmo.min.css b/themes/bootstrap/css/3.0.2/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-cyborg.min.css b/themes/bootstrap/css/3.0.2/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-flatly.min.css b/themes/bootstrap/css/3.0.2/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-journal.min.css b/themes/bootstrap/css/3.0.2/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-readable.min.css b/themes/bootstrap/css/3.0.2/overrides-readable.min.css
deleted file mode 100644
index 1b19300..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:15px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:15px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lora,Georgia,"Times New Roman",Times,serif;font-size:17px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:22px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-simplex.min.css b/themes/bootstrap/css/3.0.2/overrides-simplex.min.css
deleted file mode 100644
index 87a207f..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-slate.min.css b/themes/bootstrap/css/3.0.2/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-spacelab.min.css b/themes/bootstrap/css/3.0.2/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-united.min.css b/themes/bootstrap/css/3.0.2/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides-yeti.min.css b/themes/bootstrap/css/3.0.2/overrides-yeti.min.css
deleted file mode 100644
index 23376fc..0000000
--- a/themes/bootstrap/css/3.0.2/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.2/overrides.min.css b/themes/bootstrap/css/3.0.2/overrides.min.css
deleted file mode 100644
index 23376fc..0000000
--- a/themes/bootstrap/css/3.0.2/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-amelia.min.css b/themes/bootstrap/css/3.0.3/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-cerulean.min.css b/themes/bootstrap/css/3.0.3/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-cosmo.min.css b/themes/bootstrap/css/3.0.3/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-cyborg.min.css b/themes/bootstrap/css/3.0.3/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-flatly.min.css b/themes/bootstrap/css/3.0.3/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-journal.min.css b/themes/bootstrap/css/3.0.3/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-readable.min.css b/themes/bootstrap/css/3.0.3/overrides-readable.min.css
deleted file mode 100644
index 99acc49..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#5cb85c}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-simplex.min.css b/themes/bootstrap/css/3.0.3/overrides-simplex.min.css
deleted file mode 100644
index 87a207f..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-slate.min.css b/themes/bootstrap/css/3.0.3/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-spacelab.min.css b/themes/bootstrap/css/3.0.3/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-united.min.css b/themes/bootstrap/css/3.0.3/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides-yeti.min.css b/themes/bootstrap/css/3.0.3/overrides-yeti.min.css
deleted file mode 100644
index 8632390..0000000
--- a/themes/bootstrap/css/3.0.3/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.0.3/overrides.min.css b/themes/bootstrap/css/3.0.3/overrides.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.0.3/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-amelia.min.css b/themes/bootstrap/css/3.1.0/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-cerulean.min.css b/themes/bootstrap/css/3.1.0/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-cosmo.min.css b/themes/bootstrap/css/3.1.0/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-cyborg.min.css b/themes/bootstrap/css/3.1.0/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-flatly.min.css b/themes/bootstrap/css/3.1.0/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-journal.min.css b/themes/bootstrap/css/3.1.0/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-lumen.min.css b/themes/bootstrap/css/3.1.0/overrides-lumen.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-readable.min.css b/themes/bootstrap/css/3.1.0/overrides-readable.min.css
deleted file mode 100644
index 99acc49..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#5cb85c}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-simplex.min.css b/themes/bootstrap/css/3.1.0/overrides-simplex.min.css
deleted file mode 100644
index 87a207f..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-slate.min.css b/themes/bootstrap/css/3.1.0/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-spacelab.min.css b/themes/bootstrap/css/3.1.0/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-superhero.min.css b/themes/bootstrap/css/3.1.0/overrides-superhero.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-united.min.css b/themes/bootstrap/css/3.1.0/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides-yeti.min.css b/themes/bootstrap/css/3.1.0/overrides-yeti.min.css
deleted file mode 100644
index 8632390..0000000
--- a/themes/bootstrap/css/3.1.0/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.0/overrides.min.css b/themes/bootstrap/css/3.1.0/overrides.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.1.0/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-amelia.min.css b/themes/bootstrap/css/3.1.1/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-cerulean.min.css b/themes/bootstrap/css/3.1.1/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-cosmo.min.css b/themes/bootstrap/css/3.1.1/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-cyborg.min.css b/themes/bootstrap/css/3.1.1/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-darkly.min.css b/themes/bootstrap/css/3.1.1/overrides-darkly.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-flatly.min.css b/themes/bootstrap/css/3.1.1/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-journal.min.css b/themes/bootstrap/css/3.1.1/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-lumen.min.css b/themes/bootstrap/css/3.1.1/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-readable.min.css b/themes/bootstrap/css/3.1.1/overrides-readable.min.css
deleted file mode 100644
index 14dcf59..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-simplex.min.css b/themes/bootstrap/css/3.1.1/overrides-simplex.min.css
deleted file mode 100644
index 5614d1b..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-slate.min.css b/themes/bootstrap/css/3.1.1/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-spacelab.min.css b/themes/bootstrap/css/3.1.1/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-superhero.min.css b/themes/bootstrap/css/3.1.1/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-united.min.css b/themes/bootstrap/css/3.1.1/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides-yeti.min.css b/themes/bootstrap/css/3.1.1/overrides-yeti.min.css
deleted file mode 100644
index 8632390..0000000
--- a/themes/bootstrap/css/3.1.1/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.1.1/overrides.min.css b/themes/bootstrap/css/3.1.1/overrides.min.css
deleted file mode 100644
index db53eb6..0000000
--- a/themes/bootstrap/css/3.1.1/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-amelia.min.css b/themes/bootstrap/css/3.2.0/overrides-amelia.min.css
deleted file mode 100644
index 14ef124..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#AD1D28;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#AD1D28;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#DEBB27;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #bf851d}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#13a0aa;border:1px solid #0d747c;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#AD1D28;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#AD1D28}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#ddd;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #15b5c1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#15b5c1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #15b5c1 #15b5c1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #15b5c1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #15b5c1 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#15b5c1 transparent #15b5c1 #15b5c1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #15b5c1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#15b5c1 #15b5c1 #15b5c1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Cabin,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#15b5c1;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-cerulean.min.css b/themes/bootstrap/css/3.2.0/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-cosmo.min.css b/themes/bootstrap/css/3.2.0/overrides-cosmo.min.css
deleted file mode 100644
index 3515581..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#007FFF;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#007FFF;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#007FFF;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#007FFF}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#007FFF;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-cyborg.min.css b/themes/bootstrap/css/3.2.0/overrides-cyborg.min.css
deleted file mode 100644
index e6ac24c..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-darkly.min.css b/themes/bootstrap/css/3.2.0/overrides-darkly.min.css
deleted file mode 100644
index 3bee0dc..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#375a7f;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#00bc8c;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-flatly.min.css b/themes/bootstrap/css/3.2.0/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-journal.min.css b/themes/bootstrap/css/3.2.0/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-lumen.min.css b/themes/bootstrap/css/3.2.0/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-paper.min.css b/themes/bootstrap/css/3.2.0/overrides-paper.min.css
deleted file mode 100644
index 72d6641..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-readable.min.css b/themes/bootstrap/css/3.2.0/overrides-readable.min.css
deleted file mode 100644
index 14dcf59..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-sandstone.min.css b/themes/bootstrap/css/3.2.0/overrides-sandstone.min.css
deleted file mode 100644
index 72d6641..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-simplex.min.css b/themes/bootstrap/css/3.2.0/overrides-simplex.min.css
deleted file mode 100644
index 5614d1b..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-slate.min.css b/themes/bootstrap/css/3.2.0/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-spacelab.min.css b/themes/bootstrap/css/3.2.0/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-superhero.min.css b/themes/bootstrap/css/3.2.0/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-united.min.css b/themes/bootstrap/css/3.2.0/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides-yeti.min.css b/themes/bootstrap/css/3.2.0/overrides-yeti.min.css
deleted file mode 100644
index 8632390..0000000
--- a/themes/bootstrap/css/3.2.0/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.2.0/overrides.min.css b/themes/bootstrap/css/3.2.0/overrides.min.css
deleted file mode 100644
index 72d6641..0000000
--- a/themes/bootstrap/css/3.2.0/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-amelia.min.css b/themes/bootstrap/css/3.3.0/overrides-amelia.min.css
deleted file mode 100644
index 72d6641..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-amelia.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.0/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.0/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.0/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-darkly.min.css b/themes/bootstrap/css/3.3.0/overrides-darkly.min.css
deleted file mode 100644
index 3bee0dc..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#375a7f;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#00bc8c;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-flatly.min.css b/themes/bootstrap/css/3.3.0/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-journal.min.css b/themes/bootstrap/css/3.3.0/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-lumen.min.css b/themes/bootstrap/css/3.3.0/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-paper.min.css b/themes/bootstrap/css/3.3.0/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-readable.min.css b/themes/bootstrap/css/3.3.0/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.0/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-simplex.min.css b/themes/bootstrap/css/3.3.0/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-slate.min.css b/themes/bootstrap/css/3.3.0/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.0/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-superhero.min.css b/themes/bootstrap/css/3.3.0/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-united.min.css b/themes/bootstrap/css/3.3.0/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides-yeti.min.css b/themes/bootstrap/css/3.3.0/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.0/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.0/overrides.min.css b/themes/bootstrap/css/3.3.0/overrides.min.css
deleted file mode 100644
index 72d6641..0000000
--- a/themes/bootstrap/css/3.3.0/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#428bca;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#428bca;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#428bca;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#428bca}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#428bca;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.1/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.1/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.1/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-darkly.min.css b/themes/bootstrap/css/3.3.1/overrides-darkly.min.css
deleted file mode 100644
index 3bee0dc..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#375a7f;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#00bc8c;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-flatly.min.css b/themes/bootstrap/css/3.3.1/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-journal.min.css b/themes/bootstrap/css/3.3.1/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-lumen.min.css b/themes/bootstrap/css/3.3.1/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-paper.min.css b/themes/bootstrap/css/3.3.1/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-readable.min.css b/themes/bootstrap/css/3.3.1/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.1/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-simplex.min.css b/themes/bootstrap/css/3.3.1/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-slate.min.css b/themes/bootstrap/css/3.3.1/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.1/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-superhero.min.css b/themes/bootstrap/css/3.3.1/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-united.min.css b/themes/bootstrap/css/3.3.1/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides-yeti.min.css b/themes/bootstrap/css/3.3.1/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.1/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.1/overrides.min.css b/themes/bootstrap/css/3.3.1/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.1/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.2/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.2/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.2/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-darkly.min.css b/themes/bootstrap/css/3.3.2/overrides-darkly.min.css
deleted file mode 100644
index 3bee0dc..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#375a7f;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#00bc8c;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-flatly.min.css b/themes/bootstrap/css/3.3.2/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-journal.min.css b/themes/bootstrap/css/3.3.2/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-lumen.min.css b/themes/bootstrap/css/3.3.2/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-paper.min.css b/themes/bootstrap/css/3.3.2/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-readable.min.css b/themes/bootstrap/css/3.3.2/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.2/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-simplex.min.css b/themes/bootstrap/css/3.3.2/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-slate.min.css b/themes/bootstrap/css/3.3.2/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.2/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-superhero.min.css b/themes/bootstrap/css/3.3.2/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-united.min.css b/themes/bootstrap/css/3.3.2/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides-yeti.min.css b/themes/bootstrap/css/3.3.2/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.2/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.2/overrides.min.css b/themes/bootstrap/css/3.3.2/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.2/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.4/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.4/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.4/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-darkly.min.css b/themes/bootstrap/css/3.3.4/overrides-darkly.min.css
deleted file mode 100644
index 3bee0dc..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#375a7f;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#00bc8c;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-flatly.min.css b/themes/bootstrap/css/3.3.4/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-journal.min.css b/themes/bootstrap/css/3.3.4/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-lumen.min.css b/themes/bootstrap/css/3.3.4/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-paper.min.css b/themes/bootstrap/css/3.3.4/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-readable.min.css b/themes/bootstrap/css/3.3.4/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.4/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-simplex.min.css b/themes/bootstrap/css/3.3.4/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-slate.min.css b/themes/bootstrap/css/3.3.4/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.4/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-superhero.min.css b/themes/bootstrap/css/3.3.4/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-united.min.css b/themes/bootstrap/css/3.3.4/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides-yeti.min.css b/themes/bootstrap/css/3.3.4/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.4/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.4/overrides.min.css b/themes/bootstrap/css/3.3.4/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.4/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.5/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.5/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.5/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-darkly.min.css b/themes/bootstrap/css/3.3.5/overrides-darkly.min.css
deleted file mode 100644
index 83a0383..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#303030;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#375a7f;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-flatly.min.css b/themes/bootstrap/css/3.3.5/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-journal.min.css b/themes/bootstrap/css/3.3.5/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-lumen.min.css b/themes/bootstrap/css/3.3.5/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-paper.min.css b/themes/bootstrap/css/3.3.5/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-readable.min.css b/themes/bootstrap/css/3.3.5/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.5/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-simplex.min.css b/themes/bootstrap/css/3.3.5/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-slate.min.css b/themes/bootstrap/css/3.3.5/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.5/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-superhero.min.css b/themes/bootstrap/css/3.3.5/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-united.min.css b/themes/bootstrap/css/3.3.5/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides-yeti.min.css b/themes/bootstrap/css/3.3.5/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.5/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.5/overrides.min.css b/themes/bootstrap/css/3.3.5/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.5/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.6/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.6/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.6/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-darkly.min.css b/themes/bootstrap/css/3.3.6/overrides-darkly.min.css
deleted file mode 100644
index 83a0383..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#303030;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#375a7f;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-flatly.min.css b/themes/bootstrap/css/3.3.6/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-journal.min.css b/themes/bootstrap/css/3.3.6/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-lumen.min.css b/themes/bootstrap/css/3.3.6/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-paper.min.css b/themes/bootstrap/css/3.3.6/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-readable.min.css b/themes/bootstrap/css/3.3.6/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.6/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-simplex.min.css b/themes/bootstrap/css/3.3.6/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-slate.min.css b/themes/bootstrap/css/3.3.6/overrides-slate.min.css
deleted file mode 100644
index 006f62b..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.6/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-superhero.min.css b/themes/bootstrap/css/3.3.6/overrides-superhero.min.css
deleted file mode 100644
index 1b07bad..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-united.min.css b/themes/bootstrap/css/3.3.6/overrides-united.min.css
deleted file mode 100644
index 51166a1..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DD4814;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DD4814;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DD4814;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DD4814}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#DD4814;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides-yeti.min.css b/themes/bootstrap/css/3.3.6/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.6/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.6/overrides.min.css b/themes/bootstrap/css/3.3.6/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.6/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-cerulean.min.css b/themes/bootstrap/css/3.3.7/overrides-cerulean.min.css
deleted file mode 100644
index e300a5c..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-cerulean.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2FA4E7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2FA4E7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2FA4E7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2FA4E7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2FA4E7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-cosmo.min.css b/themes/bootstrap/css/3.3.7/overrides-cosmo.min.css
deleted file mode 100644
index 0ad64c1..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-cosmo.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2780E3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2780E3;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#FF7518;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ee3800}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2780E3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2780E3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#e6e6e6 #ddd #e6e6e6 #e6e6e6}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#e6e6e6 #e6e6e6 #e6e6e6 #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro",Calibri,Candara,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2780E3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-cyborg.min.css b/themes/bootstrap/css/3.3.7/overrides-cyborg.min.css
deleted file mode 100644
index 20d9561..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-cyborg.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#888;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2A9FD6;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2A9FD6;border-bottom:1px solid #282828;border-top:1px solid #282828}.file>span:first-child{border-left:1px solid #282828}.file>span:last-child{border-right:1px solid #282828}.file>.tabledrag-changed{background:#F80;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d64f00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#222;border:1px solid #282828;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2A9FD6;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#888;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2A9FD6}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#888;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #282828}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#282828;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #282828 #282828}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #282828;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:transparent #282828 transparent transparent}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#282828 transparent #282828 #282828;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:transparent transparent transparent #282828;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#282828 #282828 #282828 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#222;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #444;border:1px solid rgba(255,255,255,.1);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#fff;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2A9FD6;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#888;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-darkly.min.css b/themes/bootstrap/css/3.3.7/overrides-darkly.min.css
deleted file mode 100644
index 83a0383..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-darkly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#375a7f;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#375a7f;border-bottom:1px solid #f1f1f1;border-top:1px solid #f1f1f1}.file>span:first-child{border-left:1px solid #f1f1f1}.file>span:last-child{border-right:1px solid #f1f1f1}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#303030;border:1px solid #464545;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#375a7f;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#375a7f}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#605e5e;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #464545}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#464545;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #464545 #464545}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #464545;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#464545}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#464545 transparent #464545 #464545;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#464545;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#464545 #464545 #464545 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#303030;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#375a7f;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-flatly.min.css b/themes/bootstrap/css/3.3.7/overrides-flatly.min.css
deleted file mode 100644
index 6f777a3..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-flatly.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b4bcc2;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2C3E50;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2C3E50;border-bottom:1px solid #dce4ec;border-top:1px solid #dce4ec}.file>span:first-child{border-left:1px solid #dce4ec}.file>span:last-child{border-right:1px solid #dce4ec}.file>.tabledrag-changed{background:#F39C12;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e08e0b}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ecf0f1;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2C3E50;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b4bcc2;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2C3E50}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b4bcc2;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ecf0f1}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ecf0f1;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ecf0f1 #ecf0f1}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ecf0f1;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ecf0f1}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ecf0f1 transparent #ecf0f1 #ecf0f1;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ecf0f1;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ecf0f1 #ecf0f1 #ecf0f1 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#7b8a8b;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#2C3E50;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b4bcc2;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-journal.min.css b/themes/bootstrap/css/3.3.7/overrides-journal.min.css
deleted file mode 100644
index 92453b2..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-journal.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#EB6864;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#EB6864;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#EB6864;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:13px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#EB6864}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:13px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#EB6864;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-lumen.min.css b/themes/bootstrap/css/3.3.7/overrides-lumen.min.css
deleted file mode 100644
index ef101ba..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-lumen.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#158CBA;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#158CBA;border-bottom:1px solid #e7e7e7;border-top:1px solid #e7e7e7}.file>span:first-child{border-left:1px solid #e7e7e7}.file>span:last-child{border-right:1px solid #e7e7e7}.file>.tabledrag-changed{background:#FF851B;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #e76b00}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid transparent;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#158CBA;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#158CBA}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #e7e7e7}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#e7e7e7;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #e7e7e7 #e7e7e7}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #e7e7e7;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #e7e7e7 #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#e7e7e7 transparent #e7e7e7 #e7e7e7;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #e7e7e7;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#e7e7e7 #e7e7e7 #e7e7e7 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #e7e7e7;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#999;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:0 0;color:#333}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#158CBA;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-paper.min.css b/themes/bootstrap/css/3.3.7/overrides-paper.min.css
deleted file mode 100644
index ec44ba2..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-paper.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#3d8b40}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#771e86}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#cc7a00}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#b9151b}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#bbb;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#2196F3;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#2196F3;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#ffe0b2;border-radius:0;color:#ff9800;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #ffb67f}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 3px 3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:3px;border-top-left-radius:3px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:3px;border-top-right-radius:3px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#2196F3;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#e51c23}.has-success .select-wrapper:after{color:#4CAF50}.has-warning .select-wrapper:after{color:#ff9800}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:79px}body.navbar-is-fixed-bottom{padding-bottom:79px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#bbb;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#2196F3}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#bbb;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 3px 3px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 3px 3px;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:3px 0 0 3px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee transparent #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 3px 3px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:3px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#666;cursor:pointer;display:block;font-weight:400;line-height:1.846;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#141414}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#2196F3;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#bbb;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-readable.min.css b/themes/bootstrap/css/3.3.7/overrides-readable.min.css
deleted file mode 100644
index 533ac40..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-readable.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#b3b3b3;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#4582EC;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#4582EC;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #eea236}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#4582EC;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#3FAD46}.has-warning .select-wrapper:after{color:#f0ad4e}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:80px}body.navbar-is-fixed-bottom{padding-bottom:80px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:14px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#b3b3b3;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#4582EC}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#b3b3b3;font-size:14px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Georgia,"Times New Roman",Times,serif;font-size:16px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#4582EC;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:20px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#b3b3b3;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-sandstone.min.css b/themes/bootstrap/css/3.3.7/overrides-sandstone.min.css
deleted file mode 100644
index ca442eb..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-sandstone.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#DFD7CA;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#325D88;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#325D88;border-bottom:1px solid #DFD7CA;border-top:1px solid #DFD7CA}.file>span:first-child{border-left:1px solid #DFD7CA}.file>span:last-child{border-right:1px solid #DFD7CA}.file>.tabledrag-changed{background:#F47C3C;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #DFD7CA;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#325D88;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#d9534f}.has-success .select-wrapper:after{color:#93C54B}.has-warning .select-wrapper:after{color:#F47C3C}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:75px}body.navbar-is-fixed-bottom{padding-bottom:75px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#DFD7CA;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#325D88}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#DFD7CA;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #DFD7CA}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#DFD7CA;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #DFD7CA #DFD7CA}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #DFD7CA;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#DFD7CA}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#DFD7CA transparent #DFD7CA #DFD7CA;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#DFD7CA;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#DFD7CA #DFD7CA #DFD7CA transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #DFD7CA;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Roboto,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#98978B;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#F8F5F0;color:#98978B}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#DFD7CA;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-simplex.min.css b/themes/bootstrap/css/3.3.7/overrides-simplex.min.css
deleted file mode 100644
index 58851e4..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-simplex.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:grey;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#D9230F;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#D9230F;border-bottom:1px solid #ddd;border-top:1px solid #ddd}.file>span:first-child{border-left:1px solid #ddd}.file>span:last-child{border-right:1px solid #ddd}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#D9230F;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:grey;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#D9230F}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:grey;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#ddd}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#444;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#D9230F;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:17px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:grey;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-slate.min.css b/themes/bootstrap/css/3.3.7/overrides-slate.min.css
deleted file mode 100644
index ec0b1ed..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-slate.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#7A8288;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#7A8288;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#7A8288;border-bottom:1px solid #000;border-top:1px solid #000}.file>span:first-child{border-left:1px solid #000}.file>span:last-child{border-right:1px solid #000}.file>.tabledrag-changed{background:#f89406;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #d05a05}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#2e3338;border:1px solid rgba(0,0,0,.6);border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#7A8288;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#fff}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#7A8288;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#7A8288}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#7A8288;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #1c1e22}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#1c1e22;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #1c1e22 #1c1e22}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #1c1e22;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#1c1e22}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#1c1e22 transparent #1c1e22 #1c1e22;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#1c1e22;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#1c1e22 #1c1e22 #1c1e22 transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#3A3F44;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #272B30;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#C8C8C8;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#272B30;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#7A8288;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-spacelab.min.css b/themes/bootstrap/css/3.3.7/overrides-spacelab.min.css
deleted file mode 100644
index 0b33b86..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-spacelab.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#446E9B;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#446E9B;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#446E9B;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#446E9B}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#446E9B;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-superhero.min.css b/themes/bootstrap/css/3.3.7/overrides-superhero.min.css
deleted file mode 100644
index bb50002..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-superhero.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#d2d2d2}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#4E5D6C;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#DF691A;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#DF691A;border-bottom:1px solid transparent;border-top:1px solid transparent}.file>span:first-child{border-left:1px solid transparent}.file>span:last-child{border-right:1px solid transparent}.file>.tabledrag-changed{background:#f0ad4e;border-radius:0;color:#EBEBEB;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child,.filter-wrapper{border:1px solid transparent}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#4E5D6C;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#DF691A;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after,.has-success .select-wrapper:after,.has-warning .select-wrapper:after{color:#EBEBEB}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:55px}body.navbar-is-fixed-bottom{padding-bottom:55px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#4E5D6C;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#DF691A}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#4E5D6C;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid transparent}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:transparent;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#4E5D6C transparent #4E5D6C #4E5D6C}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:transparent;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#4E5D6C #4E5D6C #4E5D6C transparent;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#4E5D6C;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid transparent;border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Lato,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#EBEBEB;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#485563;color:#EBEBEB}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#DF691A;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#4E5D6C;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-united.min.css b/themes/bootstrap/css/3.3.7/overrides-united.min.css
deleted file mode 100644
index bc4c0eb..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-united.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#356635}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#2d6987}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#a47e3c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#953b39}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#AEA79F;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#E95420;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#E95420;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#c09853;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f8e5be}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#E95420;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#b94a48}.has-success .select-wrapper:after{color:#468847}.has-warning .select-wrapper:after{color:#c09853}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#AEA79F;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#E95420}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#AEA79F;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:Ubuntu,Tahoma,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus,.ui-autocomplete .ui-menu-item.ui-state-hover{background:#E95420;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#AEA79F;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides-yeti.min.css b/themes/bootstrap/css/3.3.7/overrides-yeti.min.css
deleted file mode 100644
index df22c6c..0000000
--- a/themes/bootstrap/css/3.3.7/overrides-yeti.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover,.alert-info a,.alert-info a:focus,.alert-info a:hover,.alert-success a,.alert-success a:focus,.alert-success a:hover,.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#e6e6e6}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#999;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#008cba;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#008cba;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#E99002;border-radius:0;color:#fff;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #b67102}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#008cba;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#F04124}.has-success .select-wrapper:after{color:#43ac6a}.has-warning .select-wrapper:after{color:#E99002}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:60px}body.navbar-is-fixed-bottom{padding-bottom:60px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#999;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#008cba}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#999;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{border-radius:0}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:0;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#555;cursor:pointer;display:block;font-weight:400;line-height:1.4;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#eee;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#008cba;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:19px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#999;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/3.3.7/overrides.min.css b/themes/bootstrap/css/3.3.7/overrides.min.css
deleted file mode 100644
index 7d3c329..0000000
--- a/themes/bootstrap/css/3.3.7/overrides.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.glyphicon-spin,a .glyphicon-spin{display:inline-block}.alert a,.field--label,.file{font-weight:700}.file,.file-link{width:100%}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}.panel-title:focus,.panel-title:hover,a .glyphicon-spin{text-decoration:none}.image-widget.row,.region-help .block,.tabledrag-changed-warning{overflow:hidden}.alert-sm{padding:5px 10px}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}@-webkit-keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes glyphicon-spin{0%{-o-transform:rotate(0);transform:rotate(0)}100%{-o-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes glyphicon-spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.glyphicon-spin{-webkit-animation:glyphicon-spin 1s infinite linear;-o-animation:glyphicon-spin 1s infinite linear;animation:glyphicon-spin 1s infinite linear}html.js .btn .ajax-throbber{margin-left:.5em;margin-right:-.25em}html.js .form-item .input-group-addon .glyphicon{color:#777;opacity:.5;-webkit-transition:150ms color,150ms opacity;-o-transition:150ms color,150ms opacity;transition:150ms color,150ms opacity}html.js .form-item .input-group-addon .glyphicon.glyphicon-spin{color:#337ab7;opacity:1}html.js .form-item .input-group-addon .input-group-addon{background-color:#fff}html.js .ajax-new-content:empty{display:none!important}.field--label-inline .field--items,.field--label-inline .field--label{float:left}.field--label-inline .field--items,.field--label-inline .field--label,.field--label-inline>.field--item{padding-right:.5em}[dir=rtl] .field--label-inline .field--items,[dir=rtl] .field--label-inline .field--label{padding-left:.5em;padding-right:0}.field--label-inline .field--label::after{content:':'}.file{display:table;font-size:75%;margin:5px 0}.file-icon,.file-link,.file-size,.file>.tabledrag-changed{display:table-cell;vertical-align:middle}.file>span{background:#fff;color:#337ab7;border-bottom:1px solid #ccc;border-top:1px solid #ccc}.file>span:first-child{border-left:1px solid #ccc}.file>span:last-child{border-right:1px solid #ccc}.file>.tabledrag-changed{background:#fcf8e3;border-radius:0;color:#8a6d3b;padding:0 1em;top:0}.file>.tabledrag-changed,.file>.tabledrag-changed:last-child{border:1px solid #f7e1b5}.file-icon{font-size:150%;padding:.25em .5em;text-align:center}.file-link a,.file-link a:active,.file-link a:focus,.file-link a:hover{color:inherit}.file-size{padding:0 1em;text-align:right;white-space:pre}.filter-wrapper{background-color:#fff;border:1px solid #ddd;border-top:0;border-radius:0 0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);margin-bottom:0;padding:10px;height:51px}.filter-help{float:right;line-height:1;margin:.5em 0 0}.nav.nav-tabs.filter-formats{margin-bottom:15px}table .checkbox.form-no-label,table .radio.form-no-label{margin-bottom:0;margin-top:0}.select-wrapper{display:inline-block;position:relative;width:100%}.form-inline .select-wrapper{width:auto}.input-group .select-wrapper{display:table-cell}.input-group .select-wrapper:first-child .form-control:first-child{border-bottom-left-radius:4px;border-top-left-radius:4px}.input-group .select-wrapper:last-child .form-control:first-child{border-bottom-right-radius:4px;border-top-right-radius:4px}.select-wrapper select{-webkit-appearance:none;-moz-appearance:none;appearance:none;line-height:1;padding-right:2em}.select-wrapper select::-ms-expand{opacity:0}.select-wrapper:after{color:#337ab7;content:'▼';font-style:normal;font-weight:400;line-height:1;margin-top:-.5em;padding-right:.5em;pointer-events:none;position:absolute;right:0;top:50%;z-index:10}.has-glyphicons .select-wrapper:after{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:'\e114';display:inline-block;font-family:'Glyphicons Halflings'}.has-error .select-wrapper:after{color:#a94442}.has-success .select-wrapper:after{color:#3c763d}.has-warning .select-wrapper:after{color:#8a6d3b}.form-required:after{background-image:url(../images/required.svg);-webkit-background-size:10px 7px;background-size:10px 7px;content:"";display:inline-block;line-height:1;height:7px;width:10px}.form-actions .btn,.form-actions .btn-group{margin-right:10px}.form-actions .btn-group .btn{margin-right:0}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}body{position:relative}body.navbar-is-static-top{margin-top:0}body.navbar-is-fixed-top{margin-top:65px}body.navbar-is-fixed-bottom{padding-bottom:65px}@media screen and (max-width:767px){body.toolbar-vertical.navbar-is-fixed-bottom .toolbar-bar,body.toolbar-vertical.navbar-is-fixed-top .toolbar-bar{position:fixed}body.toolbar-vertical.navbar-is-fixed-bottom header,body.toolbar-vertical.navbar-is-fixed-top header{z-index:500}body.toolbar-vertical.navbar-is-fixed-top header{top:39px}}@media screen and (min-width:768px){body{margin-top:15px}.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}}.node-preview-container{margin-top:-15px}.node-preview-form-select{padding:15px}.panel-title{display:block;margin:-10px -15px;padding:10px 15px}.panel-title,.panel-title:focus,.panel-title:hover,.panel-title:hover:focus{color:inherit}.progress-wrapper{margin-bottom:15px}.progress-wrapper:last-child .progress{margin-bottom:5px}.progress-wrapper .message{font-weight:700;margin-bottom:5px}.progress-wrapper .percentage,.progress-wrapper .progress-label{font-size:12px}.progress-wrapper .progress-bar{min-width:2em}.tabledrag-toggle-weight{float:right;margin:1px 2px 1px 10px}.tabledrag-changed-warning{margin:0}.tabledrag-handle{color:#777;cursor:move;float:left;font-size:125%;line-height:1;margin:-10px 0 0 -10px;padding:10px}.tabledrag-handle:focus,.tabledrag-handle:hover{color:#337ab7}.indentation{float:left;height:1.7em;margin:-.4em .2em -.4em -.4em;padding:.42em 0 .42em .6em;width:20px}[dir=rtl] .indentation{float:right;margin:-.4em -.4em -.4em .2em;padding:.42em .6em .42em 0}.local-actions{margin:10px 0 10px -5px}.tabs--secondary{margin:10px 0 5px}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.form-group:last-child,.panel:last-child,.popover ol:last-child,.popover ul:last-child,p:last-child{margin-bottom:0}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;border:1px solid #ddd;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}body.toolbar-fixed .toolbar-oriented .toolbar-bar{z-index:1031}body.toolbar-fixed .navbar-fixed-top{top:39px}body.toolbar-fixed.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top{top:79px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open .navbar-fixed-top{left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed{margin-left:240px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray{padding-bottom:40px}body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray,body.toolbar-fixed.toolbar-vertical.toolbar-tray-open.toolbar-fixed .toolbar-tray>.toolbar-lining:before{width:240px}.ui-autocomplete{background:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);color:inherit;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;list-style:none;min-width:160px;padding:5px 0;text-align:left;z-index:1000}.ui-autocomplete .ui-menu-item{border:0;border-radius:0;clear:both;color:#333;cursor:pointer;display:block;font-weight:400;line-height:1.42857143;margin:0;outline:0;padding:3px 20px;text-decoration:none;white-space:nowrap}.ui-autocomplete .ui-menu-item.ui-state-hover{background:#f5f5f5;color:#262626}.ui-autocomplete .ui-menu-item.ui-state-active,.ui-autocomplete .ui-menu-item.ui-state-focus{background:#337ab7;color:#fff}ol,ul{padding-left:1.5em}.page-header{margin-top:0}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}.control-group .help-inline:first-child,.help-block:first-child{margin-top:0}
\ No newline at end of file
diff --git a/themes/bootstrap/css/README.md b/themes/bootstrap/css/README.md
deleted file mode 100644
index b87b91e..0000000
--- a/themes/bootstrap/css/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# **DO NOT MANUALLY MODIFY THE CSS FILES LOCATED IN THIS DIRECTORY AND BELOW**
-
-This entire folder is automatically generated by the maintainers of this project
-using `grunt` upon commit. The source of these files is:
-`starterkits/less/less/overrides.less`
-
-Read MAINTAINERS.md for a more comprehensive overview of this topic.
diff --git a/themes/bootstrap/css/images/required.svg b/themes/bootstrap/css/images/required.svg
deleted file mode 100644
index f7882d6..0000000
--- a/themes/bootstrap/css/images/required.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#EE0000"  d="M0,7.562l1.114-3.438c2.565,0.906,4.43,1.688,5.59,2.35C6.398,3.553,6.237,1.544,6.22,0.447h3.511 c-0.05,1.597-0.234,3.6-0.558,6.003c1.664-0.838,3.566-1.613,5.714-2.325L16,7.562c-2.05,0.678-4.06,1.131-6.028,1.356 c0.984,0.856,2.372,2.381,4.166,4.575l-2.906,2.059c-0.935-1.274-2.041-3.009-3.316-5.206c-1.194,2.275-2.244,4.013-3.147,5.206 l-2.856-2.059c1.872-2.307,3.211-3.832,4.017-4.575C3.849,8.516,1.872,8.062,0,7.562"/></svg>
diff --git a/themes/bootstrap/deprecated.php b/themes/bootstrap/deprecated.php
deleted file mode 100644
index de8aefa..0000000
--- a/themes/bootstrap/deprecated.php
+++ /dev/null
@@ -1,868 +0,0 @@
-<?php
-/**
- * @file
- * This contains deprecated functions that will be removed in a future release.
- */
-
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Plugin\ProviderManager;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Unicode;
-use Drupal\Component\Utility\NestedArray;
-
-/**
- * The base file system path for CDN providers.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   echo BOOTSTRAP_CDN_PROVIDER_PATH;
- *
- *   // After.
- *   use Drupal\bootstrap\Plugin\ProviderManager;
- *   echo ProviderManager::FILE_PATH;
- * @endcode
- *
- * @see \Drupal\bootstrap\Plugin\ProviderManager::FILE_PATH
- */
-define('BOOTSTRAP_CDN_PROVIDER_PATH', ProviderManager::FILE_PATH);
-
-/**
- * The current supported Bootstrap framework major version number.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   echo BOOTSTRAP_VERSION_MAJOR;
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   echo substr(Bootstrap::FRAMEWORK_VERSION, 0, 1);
- * @endcode
- *
- * @see \Drupal\bootstrap\Bootstrap::FRAMEWORK_VERSION
- */
-define('BOOTSTRAP_VERSION_MAJOR', substr(Bootstrap::FRAMEWORK_VERSION, 0, 1));
-
-/**
- * The current supported Bootstrap framework minor version number.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   echo BOOTSTRAP_VERSION_MINOR;
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   echo substr(Bootstrap::FRAMEWORK_VERSION, 2, 1);
- * @endcode
- *
- * @see \Drupal\bootstrap\Bootstrap::FRAMEWORK_VERSION
- */
-define('BOOTSTRAP_VERSION_MINOR', substr(Bootstrap::FRAMEWORK_VERSION, 2, 1));
-
-/**
- * The current supported Bootstrap framework patch version number.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   echo BOOTSTRAP_VERSION_PATCH;
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   echo substr(Bootstrap::FRAMEWORK_VERSION, 4, 1);
- * @endcode
- *
- * @see \Drupal\bootstrap\Bootstrap::FRAMEWORK_VERSION
- */
-define('BOOTSTRAP_VERSION_PATCH', substr(Bootstrap::FRAMEWORK_VERSION, 4, 1));
-
-/**
- * The current supported Bootstrap framework version.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   echo BOOTSTRAP_VERSION;
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   echo Bootstrap::FRAMEWORK_VERSION;
- * @endcode
- *
- * @see \Drupal\bootstrap\Bootstrap::FRAMEWORK_VERSION
- */
-define('BOOTSTRAP_VERSION', Bootstrap::FRAMEWORK_VERSION);
-
-/**
- * Adds a class to an element's render array.
- *
- * @param string|array $class
- *   An individual class or an array of classes to add.
- * @param array $element
- *   The individual renderable array element. It is possible to also pass the
- *   $variables parameter in [pre]process functions and it will logically
- *   determine the correct path to that particular theme hook's classes array.
- *   Passed by reference.
- * @param string $property
- *   Determines which attributes array to retrieve. By default, this is the
- *   element's normal "attributes", but it could also be one of the following:
- *   - "content_attributes"
- *   - "input_group_attributes"
- *   - "title_attributes"
- *   - "wrapper_attributes".
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   _bootstrap_add_class('my-class', $element);
- *
- *   // After.
- *   use Drupal\bootstrap\Utility\Element;
- *   Element::create($element)->addClass('my-class');
- * @endcode
- *
- * @see \Drupal\bootstrap\Utility\Element::addClass()
- */
-function _bootstrap_add_class($class, array &$element, $property = 'attributes') {
-  Bootstrap::deprecated();
-  Element::create($element)->addClass($class, $property);
-}
-
-/**
- * Adds a specific Bootstrap class to color a button based on its text value.
- *
- * @param array $element
- *   The form element, passed by reference.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   _bootstrap_colorize_button($element);
- *
- *   // After.
- *   use Drupal\bootstrap\Utility\Element;
- *   Element::create($element)->colorize();
- * @endcode
- *
- * @see \Drupal\bootstrap\Utility\Element::colorize()
- * */
-function _bootstrap_colorize_button(array &$element) {
-  Bootstrap::deprecated();
-  Element::create($element)->colorize();
-}
-
-/**
- * Matches a Bootstrap class based on a string value.
- *
- * @param string $string
- *   The string to match classes against.
- * @param string $default
- *   The default class to return if no match is found.
- *
- * @return string
- *   The Bootstrap class matched against the value of $haystack or $default if
- *   no match could be made.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   $class = _bootstrap_colorize_text($string, $default);
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   $class = Bootstrap::cssClassFromString($string, $default);
- * @endcode
- *
- * @see \Drupal\bootstrap\Bootstrap::cssClassFromString()
- */
-function _bootstrap_colorize_text($string, $default = '') {
-  Bootstrap::deprecated();
-  return Bootstrap::cssClassFromString($string, $default);
-}
-
-/**
- * Wrapper for the core file_scan_directory() function.
- *
- * Finds all files that match a given mask in a given directory and then caches
- * the results. A general site cache clear will force new scans to be initiated
- * for already cached directories.
- *
- * @param string $dir
- *   The base directory or URI to scan, without trailing slash.
- * @param string $mask
- *   The preg_match() regular expression of the files to find.
- * @param array $options
- *   Additional options to pass to file_scan_directory().
- *
- * @return array
- *   An associative array (keyed on the chosen key) of objects with 'uri',
- *   'filename', and 'name' members corresponding to the matching files.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   $files = _bootstrap_file_scan_directory($theme_path . '/js', '/\.js$/');
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   $files = Bootstrap::getTheme()->fileScan('/\.js$/', 'js');
- * @endcode
- *
- * @see \Drupal\bootstrap\Theme::fileScan()
- * @see file_scan_directory()
- */
-function _bootstrap_file_scan_directory($dir, $mask, array $options = []) {
-  Bootstrap::deprecated();
-  $theme = Bootstrap::getTheme();
-  $dir = preg_replace('/^' . preg_quote($theme->getPath()) . '\//', '', $dir);
-  return $theme->fileScan($mask, $dir, $options);
-}
-
-/**
- * Retrieves an element's "attributes" array.
- *
- * @param array $element
- *   The individual renderable array element, passed by reference.
- * @param string $property
- *   Determines which attributes array to retrieve. By default, this is the
- *   element's normal "attributes", but it could also be one of the following:
- *   - "content_attributes"
- *   - "input_group_attributes"
- *   - "title_attributes"
- *   - "wrapper_attributes".
- *
- * @return array
- *   The attributes array.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   $attributes = &_bootstrap_get_attributes($element);
- *   $attributes['class'][] = 'my-class';
- *
- *   // After.
- *   use Drupal\bootstrap\Utility\Element;
- *   $attributes = &Element::create($element)->getAttributes();
- *   $attributes['class'][] = 'my-class';
- * @endcode
- *
- * @see \Drupal\bootstrap\Utility\Element::getAttributes()
- */
-function &_bootstrap_get_attributes(array &$element, $property = 'attributes') {
-  Bootstrap::deprecated();
-  return Element::create($element)->getAttributes($property);
-}
-
-/**
- * Returns a list of base themes for active or provided theme.
- *
- * @param string $theme_key
- *   The machine name of the theme to check, if not set the active theme name
- *   will be used.
- * @param bool $include_theme_key
- *   Whether to append the returned list with $theme_key.
- *
- * @return array
- *   An indexed array of base themes.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before (including active theme).
- *   $base_themes = _bootstrap_get_base_themes(NULL, TRUE);
- *
- *   // Before (excluding active theme).
- *   $base_themes = _bootstrap_get_base_themes('my_subtheme');
- *
- *   // After (including active theme).
- *   use Drupal\bootstrap\Bootstrap;
- *   $theme = Bootstrap::getTheme();
- *   $base_themes = array_keys($theme->getAncestry());
- *
- *   // After (excluding active theme).
- *   use Drupal\bootstrap\Bootstrap;
- *   $my_subtheme = Bootstrap::getTheme('my_subtheme');
- *   $base_themes = array_keys($my_subtheme->getAncestry());
- *   array_pop($base_themes);
- * @endcode
- *
- * @see \Drupal\bootstrap\Theme::getAncestry()
- */
-function _bootstrap_get_base_themes($theme_key = NULL, $include_theme_key = FALSE) {
-  Bootstrap::deprecated();
-  $themes = array_keys(Bootstrap::getTheme($theme_key)->getAncestry());
-  if (!$include_theme_key) {
-    array_pop($themes);
-  }
-  return $themes;
-}
-
-/**
- * Retrieves an element's "class" attribute array.
- *
- * @param array $element
- *   The individual renderable array element, passed by reference.
- * @param string $property
- *   Determines which attributes array to retrieve. By default, this is the
- *   element's normal "attributes", but it could also be one of the following:
- *   - "content_attributes"
- *   - "input_group_attributes"
- *   - "title_attributes"
- *   - "wrapper_attributes".
- *
- * @return array
- *   The classes array.
- *
- * @deprecated Will be removed in a future release. There is no replacement.
- *
- * @code
- *   // Before.
- *   $classes = &_bootstrap_get_classes($element);
- *   $classes[] = 'my-class';
- *
- *   // After.
- *   use Drupal\bootstrap\Utility\Element;
- *   $classes = &Element::create($element)->getClasses();
- *   $classes[] = 'my-class';
- * @endcode
- *
- * @see \Drupal\bootstrap\Utility\Element::getClasses()
- */
-function &_bootstrap_get_classes(array &$element, $property = 'attributes') {
-  Bootstrap::deprecated();
-  return Element::create($element)->getClasses($property);
-}
-
-/**
- * Returns a list of available Bootstrap Glyphicons.
- *
- * @param string $version
- *   The specific version of glyphicons to return. If not set, the latest
- *   BOOTSTRAP_VERSION will be used.
- *
- * @return array
- *   An associative array of icons keyed by their classes.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   $glyphicons = _bootstrap_glyphicons($version);
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   $glyphicons = Bootstrap::glyphicons($version);
- * @endcode
- *
- * @see \Drupal\bootstrap\Bootstrap::glyphicons()
- */
-function _bootstrap_glyphicons($version = NULL) {
-  Bootstrap::deprecated();
-  return Bootstrap::glyphicons($version);
-}
-
-/**
- * Determine whether or not Bootstrap Glyphicons can be used.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   $supported = _bootstrap_glyphicons_supported();
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   $theme = Bootstrap::getTheme();
- *   $supported = $theme->hasGlyphicons();
- * @endcode
- *
- * @see \Drupal\bootstrap\Theme::hasGlyphicons()
- */
-function _bootstrap_glyphicons_supported() {
-  Bootstrap::deprecated();
-  return Bootstrap::getTheme()->hasGlyphicons();
-}
-
-/**
- * Returns a specific Bootstrap Glyphicon.
- *
- * @param string $name
- *   The icon name, minus the "glyphicon-" prefix.
- * @param string $default
- *   (Optional) The default value to return.
- *
- * @return string
- *   The HTML markup containing the icon defined by $name, $default value if
- *   icon does not exist or returns empty output for whatever reason.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   $icon = _bootstrap_icon($name, $default);
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   use Drupal\bootstrap\Utility\Element;
- *   $icon = (string) Element::createStandalone(Bootstrap::glyphicon($name, ['#markup' => $default]))->renderPlain();
- * @endcode
- *
- * @see \Drupal\bootstrap\Bootstrap::glyphicon()
- */
-function _bootstrap_icon($name, $default = NULL) {
-  Bootstrap::deprecated();
-  return Element::createStandalone(Bootstrap::glyphicon($name, ['#markup' => $default]))->renderPlain();
-}
-
-/**
- * Adds an icon to button element based on its text value.
- *
- * @param array $element
- *   The form element, passed by reference.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   _bootstrap_iconize_button($element);
- *
- *   // After.
- *   use Drupal\bootstrap\Utility\Element;
- *   Element::create($element)->setIcon();
- * @endcode
- *
- * @see \Drupal\bootstrap\Utility\Element::setIcon()
- */
-function _bootstrap_iconize_button(array &$element) {
-  Bootstrap::deprecated();
-  Element::create($element)->setIcon();
-}
-
-/**
- * Matches a Bootstrap Glyphicon based on a string value.
- *
- * @param string $string
- *   The string to match classes against.
- * @param string $default
- *   The default icon to return if no match is found.
- *
- * @return string
- *   The Bootstrap icon matched against the value of $haystack or $default if
- *   no match could be made.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   $icon = _bootstrap_iconize_text($string, $default);
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   $icon = Bootstrap::glyphiconFromString($string, ['#markup' => $default]);
- * @endcode
- *
- * @see \Drupal\bootstrap\Bootstrap::glyphiconFromString()
- */
-function _bootstrap_iconize_text($string, $default = '') {
-  Bootstrap::deprecated();
-  return Bootstrap::glyphiconFromString($string, ['#markup' => $default]);
-}
-
-/**
- * Determines if an element is a button.
- *
- * @param array $element
- *   A render array element.
- *
- * @return bool
- *   TRUE or FALSE.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   $button = _bootstrap_is_button($element);
- *
- *   // After.
- *   use Drupal\bootstrap\Utility\Element;
- *   $button = Element::create($element)->isButton();
- * @endcode
- *
- * @see \Drupal\bootstrap\Utility\Element::isButton()
- */
-function _bootstrap_is_button(array $element) {
-  Bootstrap::deprecated();
-  return Element::create($element)->isButton();
-}
-
-/**
- * Determines if a string of text is considered "simple".
- *
- * @param string $string
- *   The string of text to check "simple" criteria on.
- * @param int|FALSE $length
- *   The length of characters used to determine whether or not $string is
- *   considered "simple". Set explicitly to FALSE to disable this criteria.
- * @param array|FALSE $allowed_tags
- *   An array of allowed tag elements. Set explicitly to FALSE to disable this
- *   criteria.
- * @param bool $html
- *   A variable, passed by reference, that indicates whether or not the
- *   string contains HTML.
- *
- * @return bool
- *   Returns TRUE if the $string is considered "simple", FALSE otherwise.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   $simple = _bootstrap_is_simple_string($string, $length, $allowed_tags, $html);
- *
- *   // After.
- *   use Drupal\bootstrap\Utility\Unicode;
- *   $simple = Unicode::isSimple($string, $length, $allowed_tags, $html);
- * @endcode
- *
- * @see \Drupal\bootstrap\Utility\Unicode::isSimple()
- */
-function _bootstrap_is_simple_string($string, $length = 250, $allowed_tags = NULL, &$html = FALSE) {
-  Bootstrap::deprecated();
-  return Unicode::isSimple($string, $length, $allowed_tags, $html);
-}
-
-/**
- * Removes a class from an element's attributes array.
- *
- * @param string|array $class
- *   An individual class or an array of classes to remove.
- * @param array $element
- *   The individual renderable array element.
- * @param string $property
- *   Determines which attributes array to retrieve. By default, this is the
- *   element's normal "attributes", but it could also be one of the following:
- *   - "content_attributes"
- *   - "input_group_attributes"
- *   - "title_attributes"
- *   - "wrapper_attributes".
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   _bootstrap_remove_class('my-class', $element);
- *
- *   // After.
- *   use Drupal\bootstrap\Utility\Element;
- *   Element::create($element)->removeClass('my-class');
- * @endcode
- *
- * @see \Drupal\bootstrap\Utility\Element::removeClass()
- */
-function _bootstrap_remove_class($class, array &$element, $property = 'attributes') {
-  Bootstrap::deprecated();
-  Element::create($element)->removeClass($class, $property);
-}
-
-/**
- * Retrieves a list of available CDN providers for the Bootstrap framework.
- *
- * @param string $provider
- *   A specific provider data to return.
- * @param bool $reset
- *   Toggle determining whether or not to reset the database cache.
- *
- * @return array|FALSE
- *   An associative array of CDN providers, keyed by their machine name if
- *   $provider is not set. If $provider is set and exists, it's individual
- *   data array will be returned. If $provider is set and the data does not
- *   exist then FALSE will be returned.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   $providers = bootstrap_cdn_provider();
- *   $jsdelivr = bootstrap_cdn_provider('jsdelivr');
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   use Drupal\bootstrap\Plugin\ProviderManager;
- *
- *   $theme = Bootstrap::getTheme();
- *
- *   // Get provider definitions, the "equivalent" for bootstrap_cdn_provider().
- *   $provider_manager = new ProviderManager($theme);
- *   $providers = $provider_manager->getDefinitions();
- *   $jsdelivr = $provider_manager->getDefinition('jsdelivr');
- *
- *   // You should, however, use the the fully initialized classes made
- *   // available through a theme instance.
- *   $providers = $theme->getProviders();
- *   $jsdelivr = $theme->getProvider('jsdelivr');
- * @endcode
- *
- * @see \Drupal\bootstrap\Plugin\ProviderManager
- * @see \Drupal\bootstrap\Theme::getProviders()
- * @see \Drupal\bootstrap\Theme::getProvider()
- */
-function bootstrap_cdn_provider($provider = NULL, $reset = FALSE) {
-  Bootstrap::deprecated();
-  $provider_manager = new ProviderManager(Bootstrap::getTheme());
-  if ($reset) {
-    $provider_manager->clearCachedDefinitions();
-  }
-  if (isset($provider)) {
-    if ($provider_manager->hasDefinition($provider)) {
-      return $provider_manager->getDefinition($provider);
-    }
-    return FALSE;
-  }
-  return $provider_manager->getDefinitions();
-}
-
-/**
- * Converts an element description into a tooltip based on certain criteria.
- *
- * @param array $element
- *   An element render array, passed by reference.
- * @param array $target
- *   The target element render array the tooltip is to be attached to, passed
- *   by reference. If not set, it will default to the $element passed.
- * @param bool $input_only
- *   Toggle determining whether or not to only convert input elements.
- * @param int $length
- *   The length of characters to determine if description is "simple".
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   bootstrap_element_smart_description($element, $target, $input_only, $length);
- *
- *   // After.
- *   use Drupal\bootstrap\Utility\Element;
- *   Element::create($element)->smartDescription($target, $input_only, $length);
- * @endcode
- *
- * @see \Drupal\bootstrap\Utility\Element::smartDescription()
- */
-function bootstrap_element_smart_description(array &$element, array &$target = NULL, $input_only = TRUE, $length = NULL) {
-  Bootstrap::deprecated();
-  Element::create($element)->smartDescription($target, $input_only, $length);
-}
-
-/**
- * Retrieves CDN assets for the active provider, if any.
- *
- * @param string|array $type
- *   The type of asset to retrieve: "css" or "js", defaults to an array
- *   array containing both if not set.
- * @param string $provider
- *   The name of a specific CDN provider to use, defaults to the active provider
- *   set in the theme settings.
- * @param string $theme
- *   The name of a specific theme the settings should be retrieved from,
- *   defaults to the active theme.
- *
- * @return array
- *   If $type is a string or an array with only one (1) item in it, the assets
- *   are returned as an indexed array of files. Otherwise, an associative array
- *   is returned keyed by the type.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   $assets = bootstrap_get_cdn_assets($type, $provider, $theme);
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   $theme = Bootstrap::getTheme($theme);
- *   $assets = [];
- *   if ($provider = $theme->getProvider($provider)) {
- *     $assets = $provider->getAssets($type);
- *   }
- * @endcode
- *
- * @see \Drupal\bootstrap\Plugin\Provider\Custom::getAssets()
- * @see \Drupal\bootstrap\Plugin\Provider\JsDelivr::getAssets()
- * @see \Drupal\bootstrap\Plugin\Provider\ProviderBase::getAssets()
- * @see \Drupal\bootstrap\Plugin\Provider\ProviderInterface::getAssets()
- * @see \Drupal\bootstrap\Theme::getProvider()
- * @see \Drupal\bootstrap\Bootstrap::getTheme()
- */
-function bootstrap_get_cdn_assets($type = NULL, $provider = NULL, $theme = NULL) {
-  Bootstrap::deprecated();
-  $assets = [];
-  if ($provider = Bootstrap::getTheme($theme)->getProvider($provider)) {
-    $assets = $provider->getAssets($type);
-  }
-  return $assets;
-}
-
-/**
- * Return information from the .info file of a theme (and possible base themes).
- *
- * @param string $theme_key
- *   The machine name of the theme.
- * @param string $key
- *   The key name of the item to return from the .info file. This value can
- *   include "][" to automatically attempt to traverse any arrays.
- * @param bool $base_themes
- *   Recursively search base themes, defaults to TRUE.
- *
- * @return string|array|false
- *   A string or array depending on the type of value and if a base theme also
- *   contains the same $key, FALSE if no $key is found.
- *
- * @deprecated Will be removed in a future release. There is no replacement.
- */
-function bootstrap_get_theme_info($theme_key = NULL, $key = NULL, $base_themes = TRUE) {
-  Bootstrap::deprecated();
-  // If no $theme_key is given, use the current theme if we can determine it.
-  if (!isset($theme_key)) {
-    $theme_key = !empty($GLOBALS['theme_key']) ? $GLOBALS['theme_key'] : FALSE;
-  }
-  if ($theme_key) {
-    $themes = \Drupal::service('theme_handler')->listInfo();
-    if (!empty($themes[$theme_key])) {
-      $theme = $themes[$theme_key];
-      // If a key name was specified, return just that array.
-      if ($key) {
-        $value = FALSE;
-        // Recursively add base theme values.
-        if ($base_themes && isset($theme->base_themes)) {
-          foreach (array_keys($theme->base_themes) as $base_theme) {
-            $value = bootstrap_get_theme_info($base_theme, $key);
-          }
-        }
-        if (!empty($themes[$theme_key])) {
-          $info = $themes[$theme_key]->info;
-          // Allow array traversal.
-          $keys = explode('][', $key);
-          foreach ($keys as $parent) {
-            if (isset($info[$parent])) {
-              $info = $info[$parent];
-            }
-            else {
-              $info = FALSE;
-            }
-          }
-          if (is_array($value)) {
-            if (!empty($info)) {
-              if (!is_array($info)) {
-                $info = [$info];
-              }
-              $value = NestedArray::mergeDeep($value, $info);
-            }
-          }
-          else {
-            if (!empty($info)) {
-              if (empty($value)) {
-                $value = $info;
-              }
-              else {
-                if (!is_array($value)) {
-                  $value = [$value];
-                }
-                if (!is_array($info)) {
-                  $info = [$info];
-                }
-                $value = NestedArray::mergeDeep($value, $info);
-              }
-            }
-          }
-        }
-        return $value;
-      }
-      // If no info $key was specified, just return the entire info array.
-      return $theme->info;
-    }
-  }
-  return FALSE;
-}
-
-/**
- * Includes a file from a theme.
- *
- * @param string $theme
- *   Name of the theme to use for base path.
- * @param string $path
- *   Path relative to $theme.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before.
- *   bootstrap_include('my_subtheme', 'includes/file.inc');
- *   bootstrap_include('my_subtheme', 'some/other/path/file.inc');
- *
- *   // After.
- *   use Drupal\bootstrap\Bootstrap;
- *   $my_subtheme = Bootstrap::getTheme('my_subtheme');
- *   $my_subtheme->includeOnce('file.inc');
- *   $my_subtheme->includeOnce('file.inc', 'some/other/path');
- * @endcode
- *
- * @see \Drupal\bootstrap\Theme::includeOnce()
- * @see \Drupal\bootstrap\Bootstrap::getTheme()
- */
-function bootstrap_include($theme, $path) {
-  Bootstrap::deprecated();
-  $theme = Bootstrap::getTheme($theme);
-  $parts = explode('/', $path);
-  $file = array_pop($parts);
-  $dir = implode('/', $parts);
-  $theme->includeOnce($file, $dir);
-}
-
-/**
- * Retrieves a setting for the current theme or for a given theme.
- *
- * @param string $name
- *   The name of the setting to be retrieved.
- * @param string $theme
- *   The name of a given theme; defaults to the currently active theme.
- * @param string $prefix
- *   The prefix used on the $name of the setting, this will be appended with
- *   "_" automatically if set.
- *
- * @return mixed
- *   The value of the requested setting, NULL if the setting does not exist.
- *
- * @deprecated Will be removed in a future release.
- *
- * @code
- *   // Before ("button_colorize" and "my_subtheme_custom_option").
- *   $colorize = bootstrap_setting('button_colorize', 'my_subtheme');
- *   $custom_option = bootstrap_setting('custom_option', 'my_subtheme', 'my_subtheme');
- *
- *   // After ("button_colorize" and "my_subtheme_custom_option").
- *   use Drupal\bootstrap\Bootstrap;
- *   $my_subtheme = Bootstrap::getTheme('my_subtheme');
- *   $my_subtheme->getSetting('button_colorize');
- *   $my_subtheme->getSetting('my_subtheme_custom_option');
- * @endcode
- *
- * @see \Drupal\bootstrap\Theme::getSetting()
- * @see \Drupal\bootstrap\Bootstrap::getTheme()
- */
-function bootstrap_setting($name, $theme = NULL, $prefix = 'bootstrap') {
-  Bootstrap::deprecated();
-  $theme = Bootstrap::getTheme($theme);
-  $prefix = $prefix !== 'bootstrap' && !empty($prefix) ? $prefix . '_' : '';
-  return $theme->getSetting($prefix . $name);
-}
diff --git a/themes/bootstrap/docs/Contributing.md b/themes/bootstrap/docs/Contributing.md
deleted file mode 100644
index 2713fd6..0000000
--- a/themes/bootstrap/docs/Contributing.md
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- @file Overview on how to contribute to the Drupal Bootstrap project. -->
-<!-- @defgroup -->
-# Contributing
-
-Please read the @link faq FAQ @endlink and @link getting_started Getting Started @endlink
-topics first before creating an issue in this project's issue queue.
-
-Anything that falls within the scope of existing documentation or answered
-questions will be marked as "Closed (works as designed)" or "Closed (won't fix)".
-
-The [Theme development](https://drupal.org/forum/3) support forum and
-[Drupal StackExchange](http://drupal.stackexchange.com) are also amazing
-resources for asking questions, learning new techniques and overall general
-support.
-
-## Drupal.org Handbook Pages
-There has been some amazing Drupal Community work done around integration between
-Drupal and the [Bootstrap Framework]. Additional community driven documentation
-can be found on the [original Drupal.org handbook pages](https://www.drupal.org/node/1976938).
-
-If you find that the documentation in these locations are inaccurate or missing,
-please update it yourself (all logged in users have edit capability).
-
-## Creating New Issues
-
-{.alert.alert-info} **Recommended reading:** [How To Solve All Your [Drupal] Problems](http://www.lullabot.com/blog/article/how-solve-all-your-problems)
-
-{.alert.alert-warning} Please, [search the issue queue](https://drupal.org/project/issues/search/bootstrap)
-first. **DO NOT** duplicate existing issues.
-
-**If you find an existing issue and the issue status is:**
-- Closed (fixed, duplicate, won't fix) - **DO NOT** re-open it. Open a new
-  issue (unless it's "Closed (won't fix)") and reference the existing issue in
-  the "Related Issues" field.
-- Active, NR, NW, RTBC - Please update the issue accordingly, **DO NOT** create
-  a new issue.
-
-**The [Drupal Bootstrap] issue queue IS for:**
-- Fixing bugs and adding new features pertaining to the integration between
-  Drupal and the [Bootstrap Framework].
-
-**The [Drupal Bootstrap] issue queue IS NOT for:**
-- Bugs/feature requests pertaining to the [Bootstrap Framework] itself. Use
-  [their issue queue](https://github.com/twbs/bootstrap/issues) instead.
-- Custom CSS/Layout (e.g. site specific)
-- LESS/SASS - Compilation errors, syntax, mixins/functions
-- JavaScript, jQuery, Bootstrap plugins or custom (site specific) plugins
-- Modules that don't work in multiple themes. File the issue with that module.
-  It is likely they are not using [APIs](https://api.drupal.org) properly, not
-  following existing [Coding Standards](https://drupal.org/coding-standards)
-  or not developing with [Best Practices](https://drupal.org/best-practices) in
-  mind. It is actually a rare event when it is a legitimate issue with the
-  [Drupal Bootstrap] project.
-
-## IRC
-The [Drupal Bootstrap] project and its maintainers use the `#drupal-bootstrap`
-channel on the freenode.net IRC network to communicate in real time. Please read
-the following for more information on how to the community uses this technology:
-[Chat with the Drupal Community on IRC](https://www.drupal.org/irc).
-
-Please keep in mind though, this **IS NOT** a "support" channel. It's primary
-use is to discuss issues and to help fix bugs with the base theme itself.
-
-[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap
-[Bootstrap Framework]: http://getbootstrap.com
diff --git a/themes/bootstrap/docs/Getting-Started.md b/themes/bootstrap/docs/Getting-Started.md
deleted file mode 100644
index 65cddef..0000000
--- a/themes/bootstrap/docs/Getting-Started.md
+++ /dev/null
@@ -1,127 +0,0 @@
-<!-- @file The "Getting Started" topic. -->
-<!-- @defgroup -->
-# Getting Started
-
-## Installation
-- Install the Bootstrap base theme in `themes` or a similar `sites/*/themes`
-  directory.
-- Enable the [Drupal Bootstrap] base theme.
-
-## Bootstrap Framework Fundamentals
-Generally speaking, you should really read the entire [Bootstrap Framework]
-documentation site, if you haven't already. Here are the four basic "sections"
-that site is split into:
-
-- [Getting Started](http://getbootstrap.com/getting-started) - An overview of
-  the [Bootstrap Framework], how to download and use, basic templates and
-  examples, and more.
-- [CSS](http://getbootstrap.com/css/) - Global CSS settings, fundamental HTML
-  elements styled and enhanced with extensible classes, and an advanced grid
-  system.
-- [Components](http://getbootstrap.com/components/) - Over a dozen reusable
-  components built to provide iconography, dropdowns, input groups, navigation,
-  alerts, and much more.
-- [JavaScript](http://getbootstrap.com/javascript/) - Bring the
-  [Bootstrap Framework] components to life with over a dozen custom jQuery
-  plugins. Easily include them all, or one by one.
-
-
-## FAQ - Frequently Asked Questions
-
-- [Do you support X module?](#support)
-- [Do you support Internet Explorer?](#ie)
-- [Is Drupal Bootstrap a module or theme?](#module-or-theme)
-- [Where can I discuss an issue in real time?](#irc)
-- [Where should I make changes?](#changes)
-
----
-
-### Q: Do you support X module? {#support}
-**A: Possibly**
-
-Below are a list of modules the [Drupal Bootstrap] base theme actively supports.
-This list is constantly growing and each module's support has usually been
-implemented because of either extremely high usage or the fact it was designed
-explicitly for use with this base theme and has maintainers in both projects.
-
-**Supported modules:**
-See project page for a list of supported modules.
-
-**"Un-supported" modules:**
-The following modules are "un-supported modules" and are not documented by the
-[Drupal Bootstrap] base theme. This does not mean that the base theme will not
-work with them or that they are "bad". It simply means that this project does
-not have the time, energy or effort it would take to document "every possible
-scenario".
-
-It is certainly possible that some of these modules may eventually become
-"officially" supported. That will happen only, of course, if there are enough
-people to help contribute solid solutions and make supporting them by the base
-theme maintainers a relatively "easy" task.
-
-Some of these modules may have blogs or videos floating around on the internet.
-However, if you choose to use one of these modules, you are really doing so
-at your own expense. Do not expect support from this base theme or the project
-you are attempting to integrate the base theme with.
-
-- Color module (in core)
-- [Bootstrap API](https://www.drupal.org/project/bootstrap_api)
-- [Bootstrap Library](https://www.drupal.org/project/bootstrap_library)
-- [LESS module](https://drupal.org/project/less)
-
----
-
-### Q: Do you support Internet Explorer? {#ie}
-**A: No, not "officially"**
-
-The [Bootstrap Framework] itself does not officially support older Internet
-Explorer [compatibility modes](http://getbootstrap.com/getting-started/#support-ie-compatibility-modes).
-To ensure you are using the latest rendering mode for IE, consider installing
-the [HTML5 Tools](https://drupal.org/project/html5_tools) module.
-
-Internet Explorer 8 requires the use of [Respond.js] to enable media queries
-(Responsive Web Design). However, [Respond.js] does not work with CSS that is
-referenced via a CSS `@import` statement, which is the default way Drupal
-adds CSS files to a page when CSS aggregation is disabled. To ensure
-[Respond.js] works properly, enable CSS aggregation at the bottom of:
-`admin/config/development/performance`.
-
----
-
-### Q: Is Drupal Bootstrap a module or theme? {#module-or-theme}
-**A: Theme**
-
-More specifically a base theme. It is _not_ a module. Modules are allowed to
-participate in certain hooks, while themes cannot. This is a very important
-concept to understand and limits themes from participating in a wider range of
-functionality.
-
----
-
-### Q: Where can I discuss an issue in real time? {#irc}
-**A: In IRC**
-
-The [Drupal Bootstrap] project and its maintainers use the `#drupal-bootstrap`
-channel on the freenode.net IRC network to communicate in real time. Please read
-the following for more information on how to the community uses this technology:
-[Chat with the Drupal Community on IRC](https://www.drupal.org/irc).
-
-Please keep in mind though, this **IS NOT** a "support" channel. It's primary
-use is to discuss issues and to help fix bugs with the base theme itself.
-
----
-
-### Q: Where should I make changes? {#changes}
-**A: In a custom sub-theme**
-
-You should **never** modify any theme or sub-theme that is packaged and released
-from Drupal.org. If you do, all changes you have made would be lost once that
-theme is updated. This makes keeping track of changes next to impossible.
-
-Instead, you should create a custom sub-theme that isn't hosted on Drupal.org.
-
-[Respond.js]: https://github.com/scottjehl/Respond
-[Drush]: http://www.drush.org
-[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap
-[Bootstrap Framework]: http://getbootstrap.com
-[jQuery Update]: https://drupal.org/project/jquery_update
diff --git a/themes/bootstrap/docs/Maintainers.md b/themes/bootstrap/docs/Maintainers.md
deleted file mode 100644
index 11aaeb5..0000000
--- a/themes/bootstrap/docs/Maintainers.md
+++ /dev/null
@@ -1,185 +0,0 @@
-<!-- @file Maintaining the Drupal Bootstrap project. -->
-<!-- @defgroup -->
-# Maintainers
-
-Generally speaking, these topics will not be very helpful to you unless you are
-a maintainer for this project. If you're simply curious about the process or
-even want to help improve this aspect of the project, all suggestions will be
-appreciated!
-
-## Prerequisites
-For development, this project relies heavily on NodeJS/Grunt to automate some
-very time consuming tasks and to ensure consistent output. If you do not have
-these CLI tools, please install them now:
-
-* https://nodejs.org
-* http://gruntjs.com
-
-## Installation
-This project's installation may initially take a while to complete. Please read
-through the entire topic before continuing and be aware of what to expect.
-Suffice it to say: you will not have to manually update this project again.
-
-After you have installed the prerequisite CLI tools, run `npm install` in this
-directory. This will install the necessary NodeJS modules inside the
-`node_modules` directory.
-
-After NodeJS has finished installing its own modules, it will automatically
-invoke `grunt install` for you. This is a grunt task that is specifically
-designed to keep the project in sync amongst maintainers.
-
-## Drush
-There are several commands available to run, please execute `drush` to view the
-full list. This topic only covers the commands this project created.
-
-### `drush bootstrap-generate-docs` or `drush bs-docs`
-Generates markdown documentation for the Drupal based code. Possible arguments are:
-- **type:** The specific type of documentation to generate, defaults to `all`.
-  Possible values: `all|settings`
-
-## Grunt
-There are several tasks available to run, please execute `grunt --help` to view
-the full list of tasks currently available. This topic only covers the most
-important or commonly used tasks.
-
-### `grunt install`
-This task is automatically invoked as a `postinstall` event of `npm install`.
-There should be no need to manually invoke this task. However, if you feel the
-need to manual invoke this task, you may do so without fear of producing any
-unintended side-effects. This is simply an alias for sub-tasks defined below.
-
-### `grunt githooks`
-This is a sub-task of `grunt install`. It will automatically install the
-necessary git hooks for this project. These git hooks allow the project to keep
-track of changes to files in order to automate and ensure certain files are
-committed (e.g. compiled CSS files). Do not worry, if you already have existing
-git hook files in place, this will work around them.
-
-Any time there is a change to `package.json`, `Gruntfile.js`, `.githooks.js.hbs`
-or any of the files in the `grunt` subdirectory, the `npm install` task will
-automatically be executed by the git hook itself. This allows the workflow to
-be altered by one maintainer and those changes propagated to the others the
-next time they pull down the repository.
-
-### `grunt sync`
-This is a sub-task used by `grunt install`. It will automatically
-download and install the various 3.x.x versions of the Bootstrap and Bootswatch
-libraries for local development purposes in the `./lib` directory. This process
-utilizes Bower and can initially take a while for it to fully complete.
-
-Once you have the various versions of libraries have been installed, this task
-becomes much faster. This task utilizes the jsDelivr API to determine which
-versions to install. To avoid abusing API calls, this list is cached for one
-week as the `.libraries` file in the root of this project. In the event that a
-new list needs to be generated and the week cache expiration has not lifted,
-you can either simply remove the file manually or run `grunt sync --force` to
-force an API call and generate a new list.
-
-### `grunt clean-vendor-dirs`
-This is a sub-task used by `grunt install`. Drupal currently does not exclude
-vendor directories when scanning directories of modules/themes to look for
-.info files. Some NodeJS modules actually are installed with files that have
-this same extension, yet cannot be parsed by Drupal. Due to the nature of how
-Drupal currently parses these files, it can cause a PCRE recursion in PHP. This
-ultimately leads to a segmentation fault and thus rendering the site inoperable.
-For more details, see: https://www.drupal.org/node/2329453
-
-### `grunt compile`
-This task ensures that all the necessary variations of versions and themes of
-Bootstrap and Bootswatch are compile from `starterkits/less/less/overrides.less`.
-Typically, this task generates hundreds of files and can take upwards of \~10
-seconds to fully complete.
-
-Optionally, if the `--dev` parameter is specified, this task will only compile
-the starterkit's `overrides.less` file for the latest version of Bootstrap:
-
-* `./css/<%= latestVersion/overrides.css`
-* `./css/<%= latestVersion/overrides.min.css`
-
-### `grunt watch`
-This task is responsible for watching various source files and executing the
-appropriate tasks these source files are normally consumed by. With the caveat
-of long compilation times mentioned in the previous section, it is highly
-recommended running this task as such: `grunt watch --dev`. Keep in mind that
-this limits the rapid development of the `overrides.less` file to the default
-Bootstrap theme. If you have switched themes, you must manually compile all
-the version and theme override files.
-
-## Releases
-This project attempts to provide more structured release notes. This allows the
-project to communicate more effectively to the users what exactly has changed
-and where to go for additional information. This documentation is intended for
-the project maintainers to help provide consistent results between releases.
-
-### Release notes template
-The following is just a template to show a typical structured format used as release notes for this project:
-
-```html
-<h3 id="change-records">Change Records</h3>
-<!-- Change records table HTML -->
-
-Optionally, you can insert any additional verbiage here.
-However, if it is long, it should really be a change record.
-
-<p>&nbsp;</p>
-<h3 id="notes">Notes</h3>
-
-<p>&nbsp;</p>
-<p>Changes since <!-- Last major release version (no dev/beta/rc) --> (<!-- Total commit count -->):</p>
-
-<h3 id="features">New Features</h3>
-<ul>
-  <li><!-- Issue/Commit Message --></li>
-</ul>
-
-<h3 id="bugs">Bug Fixes</h3>
-<ul>
-  <li><!-- Issue/Commit Message --></li>
-</ul>
-```
-
-### Create a Release Node
-
-{.alert.alert-info} **NOTE:** This project currently relies on the
-[Drush Git Release Notes](https://www.drupal.org/project/grn) tool to
-automatically generate the the bulk of the release notes. This does, however,
-requires maintainers to do the following extra steps. This entire process will
-eventually be converted into a fully automated grunt task. Until then, please
-download and install this tool and follow the remaining steps.
-
-1. Create a [tag in git](https://www.drupal.org/node/1066342) that follows the
-   previous version and push it to the repository.
-2. Create a [project release node](https://www.drupal.org/node/1068944) for this
-   newly created tag.
-3. _(Skip this step if this is a new "alpha/beta" release)_ In a separate tab,
-   go to this project's [releases](https://www.drupal.org/node/259843/release)
-   page. Open and edit the previous release node. It should have followed the
-   release note template. If it has, copy and paste its contents into the new
-   release node body.
-4. In a separate tab, go to the [change records](https://www.drupal.org/list-changes/bootstrap)
-   for this project and filter by the new official release version
-   ("alpha/beta/RC" releases should always use the next "official" version for
-   their change records). If there are no change records, then remove this
-   section. Otherwise, copy and paste the entire table into the template
-   (replacing any existing one, if necessary).
-5. Generate a list of issues/commits by executing the following from the root
-   of the project:
-
-   `drush release-notes <last official version> <new version> --commit-count`
-   (e.g. `drush release-notes 7.x-3.0 7.x-3.1 --commit-count`)
-
-   If this is a follow-up "alpha/beta/RC" release, always use the last
-   "alpha/beta/RC" release version instead. This will allow for a quicker
-   parsing of the list to merge into the previously copied release notes:
-
-   `drush release-notes <last alpha/beta/RC version> <new alpha/beta/RC version> --commit-count`
-   (e.g. `drush release-notes 7.x-3.1-beta2 7.x-3.1-beta3 --commit-count`)
-
-6. Copy the entire generated output into the template, just under where the
-   "Change Records" section would be, replacing only the commit count (do not
-   replace the "since last {offical} version").
-7. Go though each item (`<li>`) that contains an issue link, ignoring duplicates
-   and standalone verbiage (direct commits). Move (cut and paste) these items
-   into the appropriate "New Features" or "Bug Fixes" sections.
-8. Once complete the generated list should be empty (e.g. `<ul></ul>`), remove it.
-9. Save the release node.
diff --git a/themes/bootstrap/docs/README.md b/themes/bootstrap/docs/README.md
deleted file mode 100644
index a42d478..0000000
--- a/themes/bootstrap/docs/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- @file Documentation landing page and topics for the http://drupal-bootstrap.org site. -->
-<!-- @mainpage -->
-# Drupal Bootstrap Documentation
-
-{.lead} The official documentation site for the [Drupal Bootstrap] base theme
-
-The majority of this site is automatically generated from source files
-located through out the project's repository. Topics are extracted from Markdown
-files and the rest is extracted from embedded PHP comments.
-
----
-
-## Topics
-
-Below are some topics to help get you started using the [Drupal Bootstrap] base
-theme. They are ordered based on the level one typically progresses while using
-a base theme like this.
-
-#### @link contributing Contributing @endlink
-
-#### @link getting_started Getting Started @endlink
-
-#### @link theme_settings Theme Settings @endlink
-
-#### @link sub_theming Sub-Theming @endlink
-- @link sub_theming_cdn CDN Starterkit @endlink
-- @link sub_theming_less Less Starterkit @endlink
-- @link sub_theming_sass Sass Starterkit @endlink
-
-#### @link templates Templates @endlink
-
-#### @link utility Utilities @endlink
-
-#### @link plugins Plugin System @endlink
-- @link plugins_alter @BootstrapAlter @endlink
-- @link plugins_form @BootstrapForm @endlink
-- @link plugins_preprocess @BootstrapPreprocess @endlink
-- @link plugins_prerender @BootstrapPrerender @endlink
-- @link plugins_process @BootstrapProcess @endlink
-- @link plugins_provider @BootstrapProvider @endlink
-- @link plugins_setting @BootstrapSetting @endlink
-- @link plugins_update @BootstrapUpdate @endlink
-
-#### @link maintainers Project Maintainers @endlink
-
----
-
-## Terminology
-
-The term **"bootstrap"** can be used excessively through out this project's
-documentation. For clarity, we will always attempt to use this word verbosely
-in one of the following ways:
-
-- **[Drupal Bootstrap]** refers to the Drupal base theme project.
-- **[Bootstrap Framework](http://getbootstrap.com)** refers to the external
-  front end framework.
-- **[drupal_bootstrap](https://api.drupal.org/apis/drupal_bootstrap)** refers
-  to Drupal's bootstrapping process or phase.
-  
-When referring to files inside the [Drupal Bootstrap] project directory, they
-will always start with `./bootstrap` and continue to specify the full path to
-the file or directory inside it. For example, the file that is responsible for
-displaying the text on this page is located at `./bootstrap/docs/README.md`.
-
-When referring to files inside a sub-theme, they will always start with
-`./THEMENAME/`, where `THEMENAME` is the machine name of your sub-theme. They
-will continue to specify the full path to the file or directory inside it. For
-example, the primary file Drupal uses to determine if a theme
-exists is: `./THEMENAME/THEMENAME.info.yml`.
-
-[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap
diff --git a/themes/bootstrap/docs/Sub-Theming.md b/themes/bootstrap/docs/Sub-Theming.md
deleted file mode 100644
index 605315f..0000000
--- a/themes/bootstrap/docs/Sub-Theming.md
+++ /dev/null
@@ -1,66 +0,0 @@
-<!-- @file Instructions on how to sub-theme the Drupal Bootstrap base theme. -->
-<!-- @defgroup sub_theming -->
-# Sub-Theming
-
-If you haven't already installed the Drupal Bootstrap theme, read 
-the @link getting_started Getting Started @endlink topic. Below 
-are instructions on how to create a [Drupal Bootstrap] based sub-theme.
-There are several different variations on how to accomplish this task, but this
-topic will focus on the two primarily and most common ways.
-
-{.alert.alert-warning} **Warning** You should never modify any theme or sub-theme that 
-is packaged and released from Drupal.org, such as Drupal Bootstrap. If you 
-do, all changes you have made will be lost once that theme is updated. Instead, 
-you should create a subtheme from one of the provided starterkits (this is 
-considered a best practice). Once you've done that, you can override CSS, 
-templates, and theme processing.
-
-#### Choose a Starterkit {#starterkit}
-
-- @link sub_theming_cdn CDN Starterkit @endlink - uses the "out-of-the-box"
-  CSS and JavaScript files served by the [jsDelivr CDN].
-- @link sub_theming_less Less Starterkit @endlink - uses the [Bootstrap Framework]
-  [Less] source files and a local [Less] preprocessor.
-- @link sub_theming_sass Sass Starterkit @endlink - uses the [Bootstrap Framework]
-  [Sass] source files and a local [Sass] preprocessor.
-
-Once you've selected one of the above starterkits, here's how to install it:
-
-1. Copy over one of the starterkits you have chosen from the
-   `./bootstrap/starterkits` directory into the `themes` directory.
-2. Rename the directory to a unique machine readable name. This is your sub-theme's
-   "machine name". When referring to files inside a sub-theme, they will always
-   start with `./THEMENAME/`, where `THEMENAME` is the machine name of your
-   sub-theme. They will continue to specify the full path to the file or
-   directory inside it. For example, the primary file Drupal uses to determine
-   if a theme exists is: `./THEMENAME/THEMENAME.info.yml`.
-3. Rename `./THEMENAME/THEMENAME.starterkit.yml` to match
-   `./THEMENAME/THEMENAME.info.yml`. Also, rename `./THEMENAME/THEMENAME.libraries.yml` 
-   and `./THEMENAME/THEMENAME.theme` as well.
-4. Open `./THEMENAME/THEMENAME.info.yml` and change the name, description and any
-   other properties to suite your needs. Make sure to rename the library name as
-   well:  `- THEMENAME/global-styling`.
-5. Rename the sub-theme configuration files, located at:
-   `./THEMENAME/config/install/THEMENAME.settings.yml` and
-   `./THEMENAME/config/schema/THEMENAME.schema.yml`.
-6. Open `./THEMENAME/config/schema/THEMENAME.schema.yml` and rename
-   `- THEMENAME.settings:` and `'THEMETITLE settings'`
-
-{.alert.alert-warning} **WARNING:** Ensure that the `.starterkit` suffix is
-not present on your sub-theme's `.info.yml` filename. This suffix is simply a stop
-gap measure to ensure that the bundled starter kit sub-theme cannot be enabled
-or used directly. This helps people unfamiliar with Drupal avoid modifying the
-starter kit sub-theme directly and instead forces them to create a new sub-theme
-to modify.
-
-#### Enable Your New Sub-theme {#enable}
-In your Drupal site, navigate to `admin/appearance` and click the `Enable and
-set default` link next to your newly created sub-theme. Now that you've enabled
-your starterkit, please refer to the starterkit's documentation page to customize.
-
-
-[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap
-[Bootstrap Framework]: http://getbootstrap.com
-[jsDelivr CDN]: http://www.jsdelivr.com
-[Less]: http://lesscss.org
-[Sass]: http://sass-lang.com
diff --git a/themes/bootstrap/docs/Templates.md b/themes/bootstrap/docs/Templates.md
deleted file mode 100644
index 83b0a72..0000000
--- a/themes/bootstrap/docs/Templates.md
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- @file List of theme templates used in the Drupal Bootstrap base theme. -->
-<!-- @defgroup -->
-# Templates
-
-List of theme templates used in the Drupal Bootstrap base theme.
diff --git a/themes/bootstrap/docs/Theme-Settings.md b/themes/bootstrap/docs/Theme-Settings.md
deleted file mode 100644
index be6d014..0000000
--- a/themes/bootstrap/docs/Theme-Settings.md
+++ /dev/null
@@ -1,603 +0,0 @@
-<!-- @file Overview of theme settings for Drupal Bootstrap based themes. -->
-<!-- @defgroup -->
-<!-- @ingroup -->
-# Theme Settings
-
-To override a setting, open `./config/install/THEMENAME.settings.yml` and add the following:
-
-```yaml
-# Settings
-
-settings:
-  SETTING_NAME: SETTING_VALUE
-```
-
----
-
-### Advanced
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">include_deprecated</td>
-    <td>
-      <div class="help-block">Enabling this setting will include any <code>deprecated.php</code> file found in your theme or base themes.</div>
-      <pre class=" language-yaml"><code>include_deprecated: 0
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">suppress_deprecated_warnings</td>
-    <td>
-      <div class="help-block">Enable this setting if you wish to suppress deprecated warning messages. <strong class='error text-error'>WARNING: Suppressing these messages does not "fix" the problem and you will inevitably encounter issues when they are removed in future updates. Only use this setting in extreme and necessary circumstances.</strong></div>
-      <pre class=" language-yaml"><code>suppress_deprecated_warnings: 0
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### Advanced > CDN (Content Delivery Network)
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">cdn_provider</td>
-    <td>
-      <div class="help-block">Choose between jsdelivr or a custom cdn source.</div>
-      <pre class=" language-yaml"><code>cdn_provider: jsdelivr
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">cdn_custom_css</td>
-    <td>
-      <div class="help-block">It is best to use <code>https</code> protocols here as it will allow more flexibility if the need ever arises.</div>
-      <pre class=" language-yaml"><code>cdn_custom_css: 'https://cdn.jsdelivr.net/bootstrap/3.3.7/css/bootstrap.css'
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">cdn_custom_css_min</td>
-    <td>
-      <div class="help-block">Additionally, you can provide the minimized version of the file. It will be used instead if site aggregation is enabled.</div>
-      <pre class=" language-yaml"><code>cdn_custom_css_min: 'https://cdn.jsdelivr.net/bootstrap/3.3.7/css/bootstrap.min.css'
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">cdn_custom_js</td>
-    <td>
-      <div class="help-block">It is best to use <code>https</code> protocols here as it will allow more flexibility if the need ever arises.</div>
-      <pre class=" language-yaml"><code>cdn_custom_js: 'https://cdn.jsdelivr.net/bootstrap/3.3.7/js/bootstrap.js'
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">cdn_custom_js_min</td>
-    <td>
-      <div class="help-block">Additionally, you can provide the minimized version of the file. It will be used instead if site aggregation is enabled.</div>
-      <pre class=" language-yaml"><code>cdn_custom_js_min: 'https://cdn.jsdelivr.net/bootstrap/3.3.7/js/bootstrap.min.js'
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">cdn_jsdelivr_version</td>
-    <td>
-      <div class="help-block">Choose the Bootstrap version from jsdelivr</div>
-      <pre class=" language-yaml"><code>cdn_jsdelivr_version: 3.3.7
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">cdn_jsdelivr_theme</td>
-    <td>
-      <div class="help-block">Choose the example Bootstrap Theme provided by Bootstrap or one of the Bootswatch themes.</div>
-      <pre class=" language-yaml"><code>cdn_jsdelivr_theme: bootstrap
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### Components > Breadcrumbs
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">breadcrumb</td>
-    <td>
-      <div class="help-block">Show or hide the Breadcrumbs</div>
-      <pre class=" language-yaml"><code>breadcrumb: '1'
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">breadcrumb_home</td>
-    <td>
-      <div class="help-block">If your site has a module dedicated to handling breadcrumbs already, ensure this setting is enabled.</div>
-      <pre class=" language-yaml"><code>breadcrumb_home: 0
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">breadcrumb_title</td>
-    <td>
-      <div class="help-block">If your site has a module dedicated to handling breadcrumbs already, ensure this setting is disabled.</div>
-      <pre class=" language-yaml"><code>breadcrumb_title: 1
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### Components > Navbar
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">navbar_inverse</td>
-    <td>
-      <div class="help-block">Select if you want the inverse navbar style.</div>
-      <pre class=" language-yaml"><code>navbar_inverse: 0
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">navbar_position</td>
-    <td>
-      <div class="help-block">Determines where the navbar is positioned on the page.</div>
-      <pre class=" language-yaml"><code>navbar_position: ''
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### Components > Region Wells
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">region_wells</td>
-    <td>
-      <div class="help-block">Enable the <code>.well</code>, <code>.well-sm</code> or <code>.well-lg</code> classes for specified regions.</div>
-      <pre class=" language-yaml"><code>region_wells:
-  navigation: ''
-  navigation_collapsible: ''
-  header: ''
-  highlighted: ''
-  help: ''
-  content: ''
-  sidebar_first: ''
-  sidebar_second: well
-  footer: ''
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### General > Buttons
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">button_colorize</td>
-    <td>
-      <div class="help-block">Adds classes to buttons based on their text value.</div>
-      <pre class=" language-yaml"><code>button_colorize: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">button_iconize</td>
-    <td>
-      <div class="help-block">Adds icons to buttons based on the text value</div>
-      <pre class=" language-yaml"><code>button_iconize: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">button_size</td>
-    <td>
-      <div class="help-block">Defines the Bootstrap Buttons specific size</div>
-      <pre class=" language-yaml"><code>button_size: ''
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### General > Container
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">fluid_container</td>
-    <td>
-      <div class="help-block">Uses the <code>.container-fluid</code> class instead of <code>.container</code>.</div>
-      <pre class=" language-yaml"><code>fluid_container: 0
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### General > Forms
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">forms_has_error_value_toggle</td>
-    <td>
-      <div class="help-block">If an element has a <code>.has-error</code> class attached to it, enabling this will automatically remove that class when a value is entered.</div>
-      <pre class=" language-yaml"><code>forms_has_error_value_toggle: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">forms_required_has_error</td>
-    <td>
-      <div class="help-block">If an element in a form is required, enabling this will always display the element with a <code>.has-error</code> class. This turns the element red and helps in usability for determining which form elements are required to submit the form.</div>
-      <pre class=" language-yaml"><code>forms_required_has_error: 0
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">forms_smart_descriptions</td>
-    <td>
-      <div class="help-block">Convert descriptions into tooltips (must be enabled) automatically based on certain criteria. This helps reduce the, sometimes unnecessary, amount of noise on a page full of form elements.</div>
-      <pre class=" language-yaml"><code>forms_smart_descriptions: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">forms_smart_descriptions_allowed_tags</td>
-    <td>
-      <div class="help-block">Prevents descriptions from becoming tooltips by checking for HTML not in the list above (i.e. links). Separate by commas. To disable this filtering criteria, leave an empty value.</div>
-      <pre class=" language-yaml"><code>forms_smart_descriptions_allowed_tags: 'b, code, em, i, kbd, span, strong'
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">forms_smart_descriptions_limit</td>
-    <td>
-      <div class="help-block">Prevents descriptions from becoming tooltips by checking the character length of the description (HTML is not counted towards this limit). To disable this filtering criteria, leave an empty value.</div>
-      <pre class=" language-yaml"><code>forms_smart_descriptions_limit: '250'
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### General > Images
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">image_responsive</td>
-    <td>
-      <div class="help-block">Images in Bootstrap 3 can be made responsive-friendly via the addition of the <code>.img-responsive</code> class. This applies <code>max-width: 100%;</code> and <code>height: auto;</code> to the image so that it scales nicely to the parent element.</div>
-      <pre class=" language-yaml"><code>image_responsive: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">image_shape</td>
-    <td>
-      <div class="help-block">Add classes to an <code>&lt;img&gt;</code> element to easily style images in any project.</div>
-      <pre class=" language-yaml"><code>image_shape: ''
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### General > Tables
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">table_bordered</td>
-    <td>
-      <div class="help-block">Add borders on all sides of the table and cells.</div>
-      <pre class=" language-yaml"><code>table_bordered: 0
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">table_condensed</td>
-    <td>
-      <div class="help-block">Make tables more compact by cutting cell padding in half.</div>
-      <pre class=" language-yaml"><code>table_condensed: 0
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">table_hover</td>
-    <td>
-      <div class="help-block">Enable a hover state on table rows.</div>
-      <pre class=" language-yaml"><code>table_hover: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">table_responsive</td>
-    <td>
-      <div class="help-block">Makes tables responsive by wrapping them in <code>.table-responsive</code> to make them scroll horizontally up to small devices (under 768px). When viewing on anything larger than 768px wide, you will not see any difference in these tables.</div>
-      <pre class=" language-yaml"><code>table_responsive: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">table_striped</td>
-    <td>
-      <div class="help-block">Add zebra-striping to any table row within the <code>&lt;tbody&gt;</code>.</div>
-      <pre class=" language-yaml"><code>table_striped: 1
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### JavaScript > Modals
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">modal_enabled</td>
-    <td>
-      <div class="help-block">Enabling this will replace core's jQuery UI Dialog implementations with modals from the Bootstrap Framework.</div>
-      <pre class=" language-yaml"><code>modal_enabled: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">modal_animation</td>
-    <td>
-      <div class="help-block">Apply a CSS fade transition to modals.</div>
-      <pre class=" language-yaml"><code>modal_animation: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">modal_backdrop</td>
-    <td>
-      <div class="help-block">Includes a modal-backdrop element. Alternatively, specify <code>static</code> for a backdrop which doesn't close the modal on click.</div>
-      <pre class=" language-yaml"><code>modal_backdrop: 'true'
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">modal_keyboard</td>
-    <td>
-      <div class="help-block">Closes the modal when escape key is pressed.</div>
-      <pre class=" language-yaml"><code>modal_keyboard: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">modal_show</td>
-    <td>
-      <div class="help-block">Shows the modal when initialized.</div>
-      <pre class=" language-yaml"><code>modal_show: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">modal_size</td>
-    <td>
-      <div class="help-block">Defines the modal size between the default, <code>modal-sm</code> and <code>modal-lg</code>.</div>
-      <pre class=" language-yaml"><code>modal_size: ''
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### JavaScript > Popovers
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">popover_enabled</td>
-    <td>
-      <div class="help-block">Elements that have the <code>data-toggle=&quot;popover&quot;</code> attribute set will automatically initialize the popover upon page load. <strong class='error text-error'>WARNING: This feature can sometimes impact performance. Disable if pages appear to hang after initial load.</strong></div>
-      <pre class=" language-yaml"><code>popover_enabled: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">popover_animation</td>
-    <td>
-      <div class="help-block">Apply a CSS fade transition to the popover.</div>
-      <pre class=" language-yaml"><code>popover_animation: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">popover_container</td>
-    <td>
-      <div class="help-block">Appends the popover to a specific element. Example: <code>body</code>. This option is particularly useful in that it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize.</div>
-      <pre class=" language-yaml"><code>popover_container: body
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">popover_content</td>
-    <td>
-      <div class="help-block">Default content value if <code>data-content</code> or <code>data-target</code> attributes are not present.</div>
-      <pre class=" language-yaml"><code>popover_content: ''
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">popover_delay</td>
-    <td>
-      <div class="help-block">The amount of time to delay showing and hiding the popover (in milliseconds). Does not apply to manual trigger type.</div>
-      <pre class=" language-yaml"><code>popover_delay: '0'
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">popover_html</td>
-    <td>
-      <div class="help-block">Insert HTML into the popover. If false, jQuery's text method will be used to insert content into the DOM. Use text if you're worried about XSS attacks.</div>
-      <pre class=" language-yaml"><code>popover_html: 0
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">popover_placement</td>
-    <td>
-      <div class="help-block">Where to position the popover. When <code>auto</code> is specified, it will dynamically reorient the popover. For example, if placement is <code>auto left</code>, the popover will display to the left when possible, otherwise it will display right.</div>
-      <pre class=" language-yaml"><code>popover_placement: right
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">popover_selector</td>
-    <td>
-      <div class="help-block">If a selector is provided, tooltip objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have popovers added.</div>
-      <pre class=" language-yaml"><code>popover_selector: ''
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">popover_title</td>
-    <td>
-      <div class="help-block">Default title value if <code>title</code> attribute isn't present.</div>
-      <pre class=" language-yaml"><code>popover_title: ''
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">popover_trigger</td>
-    <td>
-      <div class="help-block">How a popover is triggered.</div>
-      <pre class=" language-yaml"><code>popover_trigger: click
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">popover_trigger_autoclose</td>
-    <td>
-      <div class="help-block">Will automatically close the current popover if a click occurs anywhere else other than the popover element.</div>
-      <pre class=" language-yaml"><code>popover_trigger_autoclose: 1
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
----
-
-### JavaScript > Tooltips
-
-<table class="table table-striped table-responsive">
-  <thead><tr><th class="col-xs-3">Setting name</th><th>Description and default value</th></tr></thead>
-  <tbody>
-  <tr>
-    <td class="col-xs-3">tooltip_enabled</td>
-    <td>
-      <div class="help-block">Elements that have the <code>data-toggle="tooltip"</code> attribute set will automatically initialize the tooltip upon page load. <strong class='error text-error'>WARNING: This feature can sometimes impact performance. Disable if pages appear to "hang" after initial load.</strong></div>
-      <pre class=" language-yaml"><code>tooltip_enabled: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">tooltip_animation</td>
-    <td>
-      <div class="help-block">Apply a CSS fade transition to the tooltip.</div>
-      <pre class=" language-yaml"><code>tooltip_animation: 1
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">tooltip_container</td>
-    <td>
-      <div class="help-block">Appends the tooltip to a specific element. Example: <code>body</code>.</div>
-      <pre class=" language-yaml"><code>tooltip_container: body
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">tooltip_delay</td>
-    <td>
-      <div class="help-block">The amount of time to delay showing and hiding the tooltip (in milliseconds). Does not apply to manual trigger type.</div>
-      <pre class=" language-yaml"><code>tooltip_delay: '0'
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">tooltip_html</td>
-    <td>
-      <div class="help-block">Insert HTML into the tooltip. If false, jQuery's text method will be used to insert content into the DOM. Use text if you're worried about XSS attacks.</div>
-      <pre class=" language-yaml"><code>tooltip_html: 0
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">tooltip_placement</td>
-    <td>
-      <div class="help-block">Where to position the tooltip. When <code>auto</code> is specified, it will dynamically reorient the tooltip. For example, if placement is <code>auto left</code>, the tooltip will display to the left when possible, otherwise it will display right.</div>
-      <pre class=" language-yaml"><code>tooltip_placement: 'auto left'
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">tooltip_selector</td>
-    <td>
-      <div class="help-block">If a selector is provided, tooltip objects will be delegated to the specified targets.</div>
-      <pre class=" language-yaml"><code>tooltip_selector: ''
-</code></pre>
-    </td>
-  </tr>
-  <tr>
-    <td class="col-xs-3">tooltip_trigger</td>
-    <td>
-      <div class="help-block">How a tooltip is triggered.</div>
-      <pre class=" language-yaml"><code>tooltip_trigger: hover
-</code></pre>
-    </td>
-  </tr>
-  </tbody>
-</table>
-
-[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap
-[Bootstrap Framework]: http://getbootstrap.com
diff --git a/themes/bootstrap/docs/Utility.md b/themes/bootstrap/docs/Utility.md
deleted file mode 100644
index 6f90812..0000000
--- a/themes/bootstrap/docs/Utility.md
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- @file List of theme utility helper classes used in the Drupal Bootstrap base theme. -->
-<!-- @defgroup -->
-# Utilities
-
-List of theme utility helper classes used in the Drupal Bootstrap base theme.
diff --git a/themes/bootstrap/docs/plugins/Alter.md b/themes/bootstrap/docs/plugins/Alter.md
deleted file mode 100644
index e3c5aad..0000000
--- a/themes/bootstrap/docs/plugins/Alter.md
+++ /dev/null
@@ -1,133 +0,0 @@
-<!-- @file Documentation for the @BootstrapAlter annotated discovery plugin. -->
-<!-- @defgroup -->
-<!-- @ingroup -->
-# @BootstrapAlter
-
-- [Pre-requisite](#prerequisite)
-- [Supported alter hooks](#supported)
-- [Form alter hooks](#form)
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-
----
-
-## Pre-requisite {#prerequisite}
-
-Due to the nature of how Drupal alter hooks work, there is no "catch all" alter
-hook (like for forms with hook_form_alter). That means for you to use this
-plugin, it must be invoked from inside each and every alter hook that lives in
-`THEMENAME.theme`.
-
-Luckily you don't have to worry about invoking the plugin directly. Instead,
-all you have to do is call the `Bootstrap::alter` helper method and pass the
-alter function name and parameters as arguments:
-
-```php
-use Drupal\bootstrap\Bootstrap;
-
-/**
- * Implements hook_some_hook_alter().
- */
-function THEMENAME_some_hook_alter(&$data, &$context1 = NULL, &$context2 = NULL) {
-  Bootstrap::alter(__FUNCTION__, $data, $context1, $context2);
-}
-
-```
-
-## Supported alter hooks {#supported}
-
-This base theme implements several of the most commonly used alter hooks in
-themes and are automatically supported out-of-the-box.
-
-Once a base theme has implemented an alter hook, like mentioned above, all
-subsequent sub-themes will have the ability to implement a plugin for that
-alter hook directly. All you have to do is simply create the plugin file in
-`./THEMENAME/src/Plugin/Alter`. No need to implement any code in
-`THEMENAME.theme`:
-
-- `hook_bootstrap_colorize_text_alter`
-- `hook_bootstrap_iconize_text_alter`
-- `hook_element_info_alter`
-- `hook_js_settings_alter`
-- `hook_library_info_alter`
-- `hook_page_attachments_alter`
-- `hook_theme_registry_alter`
-- `hook_theme_suggestions_alter`
-
-{.alert.alert-info}**Note:** if you do not see an alter hook here that you think
-_should_ be here, please
-[create an issue](https://www.drupal.org/node/add/project-issue/bootstrap)
-
-## Form alter hooks {#form}
-
-You were probably thinking: "Hey, where's `hook_form_alter`? Didn't you _just_
-mention that above?"
-
-As we all know, forms can be a tad more involved than just a simple "alter" and
-we figured that we'd give you a little more power behind what you can actually
-do with them. So if you're interested in those, please go see:
-
-@link plugins_form @BootstrapForm @endlink
-
-While, yes technically, `hook_form_system_theme_settings_alter` could also
-fall under the form plugin, we decided to take those a step further as well, see:
-
-
-@link plugins_setting @BootstrapSetting @endlink
-
-## Create a plugin {#create}
-
-We'll use `PageAttachments` implemented by this base theme as an example of
-how to add a library from your sub-theme to every page request.
-
-Replace all following instances of `THEMENAME` with the actual machine name of
-your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Alter/PageAttachments.php` with the
-following contents:
-
-```php
-/**
- * @file
- * Contains \Drupal\THEMENAME\Plugin\Alter\PageAttachments.
- */
-
-namespace Drupal\THEMENAME\Plugin\Alter;
-
-use Drupal\bootstrap\Annotation\BootstrapAlter;
-
-/**
- * Implements hook_page_attachments_alter().
- *
- * @ingroup plugins_alter
- *
- * @BootstrapAlter("page_attachments")
- */
-class PageAttachments extends \Drupal\bootstrap\Plugin\Alter\PageAttachments {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alter(&$attachments, &$context1 = NULL, &$context2 = NULL) {
-    // Call the parent method from the base theme, if applicable (which it is
-    // in this case because Bootstrap actually implements this alter).
-    parent::alter($attachments, $context1, $context2);
-
-    // Add your custom library.
-    $attachments['#attached']['library'][] = 'THEMENAME/my_library';
-  }
-
-}
-```
-
-## Rebuild the cache {#rebuild}
-
-Once you have saved, you must rebuild your cache for this new plugin to be
-discovered. This must happen anytime you make a change to the actual file name
-or the information inside the `@BootstrapAlter` annotation.
-
-To rebuild your cache, navigate to `admin/config/development/performance` and
-click the `Clear all caches` button. Or if you prefer, run `drush cr` from the
-command line.
-
-Voilà! After this, you should have a fully functional `@BootstrapAlter` plugin!
diff --git a/themes/bootstrap/docs/plugins/Form.md b/themes/bootstrap/docs/plugins/Form.md
deleted file mode 100644
index 20ff1f9..0000000
--- a/themes/bootstrap/docs/plugins/Form.md
+++ /dev/null
@@ -1,112 +0,0 @@
-<!-- @file Documentation for the @BootstrapForm annotated discovery plugin. -->
-<!-- @defgroup -->
-<!-- @ingroup -->
-# @BootstrapForm
-
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-
----
-
-## Create a plugin {#create}
-
-We'll use `SearchBlockForm` implemented by this base theme as an example of
-how to remove `#input_group_button` from `search_block_form`.
-
-Replace all following instances of `THEMENAME` with the actual machine name of
-your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Form/SearchBlockForm.php` with the
-following contents:
-
-```php
-/**
- * @file
- * Contains \Drupal\THEMENAME\Plugin\Form\SearchBlockForm.
- */
-
-namespace Drupal\THEMENAME\Plugin\Form;
-
-use Drupal\bootstrap\Annotation\BootstrapForm;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * @ingroup plugins_form
- *
- * @BootstrapForm("search_block_form")
- */
-class SearchBlockForm extends \Drupal\bootstrap\Plugin\Form\SearchBlockForm {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterForm(array &$form, FormStateInterface $form_state, $form_id = NULL) {
-    // Call the parent method from the base theme, if applicable (which it is
-    // in this case because Bootstrap actually implements this alter).
-    parent::alterForm($form, $form_state, $form_id);
-
-    // Disable #input_group_button the normal way:
-    $form['keys']['#input_group_button'] = FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    // This method is the same as above, except the the $form argument passed is
-    // an instance of \Drupal\bootstrap\Utility\Element for easier manipulation.
-    // Using this method is preferable and considered "Best Practice".
-
-    // Disable #input_group_button using the $form Element object:
-    // $form->keys->setProperty('input_group_button', FALSE);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function submitForm(array &$form, FormStateInterface $form_state) {
-    // This method is automatically called when the form is submitted.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function submitFormElement(Element $form, FormStateInterface $form_state) {
-    // This method is the same as above, except the the $form argument passed is
-    // an instance of \Drupal\bootstrap\Utility\Element for easier manipulation.
-    // Using this method is preferable and considered "Best Practice".
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function validateForm(array &$form, FormStateInterface $form_state) {
-    // This method is automatically called when the form is validated.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function validateFormElement(Element $form, FormStateInterface $form_state) {
-    // This method is the same as above, except the the $form argument passed is
-    // an instance of \Drupal\bootstrap\Utility\Element for easier manipulation.
-    // Using this method is preferable and considered "Best Practice".
-  }
-
-}
-```
-
-## Rebuild the cache {#rebuild}
-
-Once you have saved, you must rebuild your cache for this new plugin to be
-discovered. This must happen anytime you make a change to the actual file name
-or the information inside the `@BootstrapForm` annotation.
-
-To rebuild your cache, navigate to `admin/config/development/performance` and
-click the `Clear all caches` button. Or if you prefer, run `drush cr` from the
-command line.
-
-Voilà! After this, you should have a fully functional `@BootstrapForm` plugin!
diff --git a/themes/bootstrap/docs/plugins/Preprocess.md b/themes/bootstrap/docs/plugins/Preprocess.md
deleted file mode 100644
index 69ee076..0000000
--- a/themes/bootstrap/docs/plugins/Preprocess.md
+++ /dev/null
@@ -1,118 +0,0 @@
-<!-- @file Documentation for the @BootstrapPreprocess annotated discovery plugin. -->
-<!-- @defgroup -->
-<!-- @ingroup -->
-# @BootstrapPreprocess
-
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-
----
-
-## Create a plugin {#create}
-
-We'll use `Page` implemented by this base theme as an example of how to add
-custom classes for the `page.html.twig` template that should only be added
-under certain conditions.
-
-Replace all following instances of `THEMENAME` with the actual machine name of
-your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Preprocess/Page.php` with the
-following contents:
-
-```php
-/**
- * @file
- * Contains \Drupal\THEMENAME\Plugin\Preprocess\Page.
- */
-
-namespace Drupal\THEMENAME\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "page" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("page")
- */
-class Page extends \Drupal\bootstrap\Plugin\Preprocess\Page {
-
-  // It should be noted that you do not need all three methods here.
-  // This is to just show you the different examples of how this plugin
-  // works and how they can be tailored to your needs.
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocess(array &$variables, $hook, array $info) {
-    $value = isset($variables['element']['child']['#value']) ? $variables['element']['child']['#value'] : FALSE;
-    if (_some_module_condition($value)) {
-      $variables['attributes']['class'][] = 'my-theme-class';
-      $variables['attributes']['class'][] = 'another-theme-class';
-      $key = array_search('page', $variables['attributes']['class']);
-      if ($key !== FALSE) {
-        unset($variables['attributes']['class'][$key]);
-      }
-    }
-
-    // If you are extending and overriding a preprocess method from the base
-    // theme, it is imperative that you also call the parent (base theme) method
-    // at some point in the process, typically after you have finished with your
-    // preprocessing.
-    parent::preprocess($variables, $hook, $info);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessVariables(Variables $variables) {
-    // This method is almost identical to the one above, but it introduces the
-    // Variables utility class in the base theme. This class has a plethora of
-    // helpful methods to quickly modify common tasks when you're in a
-    // preprocess function. It also acts like the normal $variables array when
-    // you need it to in instances of accessing nested content or in loop
-    // structures like foreach.
-    $value = isset($variables['element']['child']['#value']) ? $variables['element']['child']['#value'] : FALSE;
-    if (_some_module_condition($value)) {
-      $variables->addClass(['my-theme-class', 'another-theme-class'])->removeClass('page');
-    }
-    parent::preprocessVariables($variables);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function preprocessElement(Element $element, Variables $variables) {
-    // This method is only ever invoked if either $variables['element'] or
-    // $variables['elements'] exists. These keys are usually only found in forms
-    // or render arrays when there is a #type being used. This introduces the
-    // Element utility class in the base theme. It too has a bucket-load of
-    // features, specific to the unique characteristics of render arrays with
-    // their "properties" (keys starting with #). This will quickly allow you to
-    // access some of the nested element data and reduce the overhead required
-    // for commonly used logic.
-    $value = $element->child->getProperty('value', FALSE);
-    if (_some_module_condition($value)) {
-      $variables->addClass(['my-theme-class', 'another-theme-class'])->removeClass('page');
-    }
-    parent::preprocessElement($element, $variables);
-  }
-
-}
-```
-
-## Rebuild the cache {#rebuild}
-
-Once you have saved, you must rebuild your cache for this new plugin to be
-discovered. This must happen anytime you make a change to the actual file name
-or the information inside the `@BootstrapPreprocess` annotation.
-
-To rebuild your cache, navigate to `admin/config/development/performance` and
-click the `Clear all caches` button. Or if you prefer, run `drush cr` from the
-command line.
-
-Voilà! After this, you should have a fully functional `@BootstrapPreprocess` plugin!
diff --git a/themes/bootstrap/docs/plugins/Prerender.md b/themes/bootstrap/docs/plugins/Prerender.md
deleted file mode 100644
index f4db973..0000000
--- a/themes/bootstrap/docs/plugins/Prerender.md
+++ /dev/null
@@ -1,118 +0,0 @@
-<!-- @file Documentation for the @BootstrapPrerender annotated discovery plugin. -->
-<!-- @defgroup -->
-<!-- @ingroup -->
-# @BootstrapPrerender
-
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-
----
-
-## Create a plugin {#create}
-
-We'll use `Link` implemented by this base theme as an example of how to add
-custom classes and an icon to make the link look like a Bootstrap button. This
-example will only work if the link is passed some sort of `#context` when the
-render array is built, like the following:
-
-```php
-$build['my_button'] = [
-  '#type' => 'link',
-  '#title' => t('Download'),
-  '#url' => \Drupal\Core\Url::fromUserInput('/download', ['query' => ['item' => '1234']]),
-  '#context' => [
-    'downloadButton' => TRUE,
-  ],
-];
-```
-
-Replace all following instances of `THEMENAME` with the actual machine name of
-your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Prerender/Link.php` with the
-following contents:
-
-```php
-/**
- * @file
- * Contains \Drupal\THEMENAME\Plugin\Prerender\Link.
- */
-
-namespace Drupal\THEMENAME\Plugin\Prerender;
-
-use Drupal\bootstrap\Annotation\BootstrapConstant;
-use Drupal\bootstrap\Annotation\BootstrapPrerender;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Element;
-
-/**
- * Pre-render callback for the "link" element type.
- *
- * @ingroup plugins_prerender
- *
- * @BootstrapPrerender("link",
- *   action = @BootstrapConstant(
- *     "\Drupal\bootstrap\Bootstrap::CALLBACK_PREPEND"
- *   )
- * )
- *
- * @see \Drupal\Core\Render\Element\Link::preRenderLink()
- */
-class Link extends \Drupal\bootstrap\Plugin\Prerender\Link {
-
-  // It should be noted that you do not need both methods here.
-  // This is to just show you the different examples of how this plugin
-  // works and how it can be tailored to your needs.
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function preRender(array $element) {
-    $context = isset($element['#context']) ? $element['#context'] : [];
-
-    // Make downloadButton links into buttons.
-    if (!empty($context['downloadButton'])) {
-      $element['#icon'] = Bootstrap::glyphicon('download-alt');
-      $element['#attributes']['class'][] = 'btn';
-      $element['#attributes']['class'][] = 'btn-primary';
-      $element['#attributes']['class'][] = 'btn-lg';
-    }
-
-    // You must always return the element in this method, as well as call
-    // the parent method when sub-classing this method. It invokes preRenderElement().
-    return parent::preRender($element);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function preRenderElement(Element $element) {
-    $context = $element->getProperty('context', []);
-
-    // Make downloadButton links into buttons.
-    // Same as above, just a little cleaner with the Element utility class.
-    if (!empty($context['downloadButton'])) {
-      $element->addClass(['btn', 'btn-primary', 'btn-lg'])->setIcon(Bootstrap::glyphicon('download-alt'));
-    }
-
-    // You don't always have to call the parent method when sub-classing, but
-    // it is generally recommended that you do (otherwise the icon that was
-    // just added wouldn't work).
-    parent::preRenderElement($element);
-  }
-
-}
-
-```
-
-## Rebuild the cache {#rebuild}
-
-Once you have saved, you must rebuild your cache for this new plugin to be
-discovered. This must happen anytime you make a change to the actual file name
-or the information inside the `@BootstrapPrerender` annotation.
-
-To rebuild your cache, navigate to `admin/config/development/performance` and
-click the `Clear all caches` button. Or if you prefer, run `drush cr` from the
-command line.
-
-Voilà! After this, you should have a fully functional `@BootstrapPrerender` plugin!
diff --git a/themes/bootstrap/docs/plugins/Process.md b/themes/bootstrap/docs/plugins/Process.md
deleted file mode 100644
index 432f6bb..0000000
--- a/themes/bootstrap/docs/plugins/Process.md
+++ /dev/null
@@ -1,98 +0,0 @@
-<!-- @file Documentation for the @BootstrapProcess annotated discovery plugin. -->
-<!-- @defgroup -->
-<!-- @ingroup -->
-# @BootstrapProcess
-
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-
----
-
-## Create a plugin {#create}
-
-{.alert.alert-warning}**Note:** This plugin is _not_ a re-implementation of the
-D7 `hook_process_HOOK` for theme hooks in anyway. That layer was removed from
-the theme system in D8 and for good reason (see:
-[Remove the process layer](https://www.drupal.org/node/1843650)). This plugin
-is about automatically adding a `#process` callback for a form element `#type`.
-This is especially useful when dealing with core elements that have implemented
-their own callbacks; either to alter their output or remove entirely.
-
-We'll use `TextFormat` implemented by this base theme as an example of how to
-override the class entirely and remove this base theme's over-simplification
-for the "format tips" section.
-
-Replace all following instances of `THEMENAME` with the actual machine name of
-your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Process/TextFormat.php` with the
-following contents:
-
-```php
-/**
- * @file
- * Contains \Drupal\THEMENAME\Plugin\Process\TextFormat.
- */
-
-namespace Drupal\THEMENAME\Plugin\Process;
-
-use Drupal\bootstrap\Annotation\BootstrapProcess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Processes the "text_format" element.
- *
- * @ingroup plugins_process
- *
- * @BootstrapProcess("text_format")
- *
- * @see \Drupal\filter\Element\TextFormat::processFormat()
- */
-class TextFormat extends \Drupal\bootstrap\Plugin\Process\TextFormat {
-
-  // It should be noted that you do not need both methods here.
-  // This is to just show you the different examples of how this plugin
-  // works and how it can be tailored to your needs.
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function process(array $element, FormStateInterface $form_state, array &$complete_form) {
-    // You must return the element immediately if this is TRUE.
-    if (!empty($element['#bootstrap_ignore_process'])) {
-      return $element;
-    }
-
-    // Technically this isn't the method that we need to achieve our goal.
-    // But showing it just for example sake.
-
-    // You must always return the element in this method, as well as call
-    // the parent method when sub-classing this method, it invokes processElement();
-    return parent::process($element, $form_state, $complete_form);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function processElement(Element $element, FormStateInterface $form_state, array &$complete_form) {
-    // Normally, we'd call the parent method here. But this is actually an
-    // instance where we know we don't want to use the alterations made by
-    // the base theme. So we just comment it out and leave the method empty.
-    // parent::processElement($element, $form_state, $complete_form);
-  }
-
-}
-```
-
-## Rebuild the cache {#rebuild}
-
-Once you have saved, you must rebuild your cache for this new plugin to be
-discovered. This must happen anytime you make a change to the actual file name
-or the information inside the `@BootstrapProcess` annotation.
-
-To rebuild your cache, navigate to `admin/config/development/performance` and
-click the `Clear all caches` button. Or if you prefer, run `drush cr` from the
-command line.
-
-Voilà! After this, you should have a fully functional `@BootstrapProcess` plugin!
diff --git a/themes/bootstrap/docs/plugins/Provider.md b/themes/bootstrap/docs/plugins/Provider.md
deleted file mode 100644
index 17697c1..0000000
--- a/themes/bootstrap/docs/plugins/Provider.md
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- @file Documentation for the @BootstrapProvider annotated discovery plugin. -->
-<!-- @defgroup -->
-<!-- @ingroup -->
-# @BootstrapProvider
-
-This plugin is a little too complex to explain (for now). If you would like to
-help expand this documentation, please [create an issue](https://www.drupal.org/node/add/project-issue/bootstrap).
-
-See the existing classes below on examples of how to implement your own.
diff --git a/themes/bootstrap/docs/plugins/README.md b/themes/bootstrap/docs/plugins/README.md
deleted file mode 100644
index e86f07a..0000000
--- a/themes/bootstrap/docs/plugins/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-<!-- @file Documents the "Plugin System" for the Drupal Bootstrap base theme. -->
-<!-- @defgroup -->
-<!-- @ingroup -->
-# Plugin System
-
-- [Overview](#overview)
-- [Helpful Tips](#helpful-tips)
-
----
-
-## Overview {#overview}
-
-The [Drupal Bootstrap] base theme handles some very complex theme registry
-alterations and annotated plugin discoveries to assist with the organization
-and maintenance of its source code.
-
-By leveraging OOP (object oriented programming) with PHP namespacing and
-Drupal's autoloading, we garner the ability to include files only when a
-theme hook is actually invoked. This allows the base theme to reduce its per
-page PHP memory footprint as much as possible. It also allows for easier
-maintenance and organization with as much customization this base theme
-implements.
-
-The data and display logic of the [Drupal Bootstrap] base theme has been
-divided into what we call the "Plugin System". It's nearly identical to the
-other plugin system(s) found through out Drupal, with the exception that these
-plugins are not bound to the container in any way.
-
-This is, in part, due to the fact that themes are not allowed to participate in
-container construction since a theme could vary from page to page (in theory).
-So, instead, this base theme implements its own annotated discovery plugins
-to leverage the powerful inheritance capabilities of PHP class instances.
-
-All of these plugins can be found in the following directories and are discussed,
-in length, below in their respective sub-topics:
-- `./bootstrap/src/Plugin/Alter`
-- `./bootstrap/src/Plugin/Form`
-- `./bootstrap/src/Plugin/Preprocess`
-- `./bootstrap/src/Plugin/Prerender`
-- `./bootstrap/src/Plugin/Process`
-- `./bootstrap/src/Plugin/Provider`
-- `./bootstrap/src/Plugin/Setting`
-- `./bootstrap/src/Plugin/Update`
-
-While sub-themes are not required to do so, they can easily emulate this same
-type of file structure/workflow and take advantage of this base theme's unique
-ability and power. All you have to do is make sure you extend from this base
-theme's implementation, if it exists.
-
-Rest assured though, there is no need to structure your sub-theme this way. If
-you feel more comfortable storing everything in your sub-theme's
-`THEMENAME.theme` file and invoking the "normal" Drupal hooks, please feel free
-to do so. It will not impact your sub-theme one way or the other.
-
-It is, however, highly recommended that you at least read through this a bit to
-gain some understanding on how this base theme structures its PHP and template
-components. This will allow you to more easily copy stuff over to your
-sub-theme, should the need arise.
-
-## Helpful tips {#helpful-tips}
-
-All plugins, except those that only have static methods, have the active Theme
-object available to them: e.g. `$this->theme`. This will allow you to do things
-like get a theme setting very, very easily: e.g.
-`$this->theme->getSetting('button_size')`.
-
-A helpful primer on Annotation-based plugins can be found at:
-https://www.drupal.org/node/1882526
-
-[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap
diff --git a/themes/bootstrap/docs/plugins/Setting.md b/themes/bootstrap/docs/plugins/Setting.md
deleted file mode 100644
index d0200c6..0000000
--- a/themes/bootstrap/docs/plugins/Setting.md
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- @file Documentation for the @BootstrapSetting annotated discovery plugin. -->
-<!-- @defgroup -->
-<!-- @ingroup -->
-# @BootstrapSetting
-
-- [Create a plugin](#create)
-- [Rebuild the cache](#rebuild)
-- [Public Methods](#methods)
-
-## Create a plugin {#create}
-
-We will use `SkipLink` as our first `@BootstrapSetting` plugin to create. In
-this example we want our sub-theme to specify a different skip link anchor id
-to change in the Theme Settings interface altering the default of
-`#main-content`.
-
-Replace all of the following instances of `THEMENAME` with the actual machine
-name of your sub-theme.
-
-Create a file at `./THEMENAME/src/Plugin/Setting/THEMENAME/Accessibility/SkipLink.php`
-with the following contents:
-
-```php
-<?php
-namespace Drupal\THEMENAME\Plugin\Setting\THEMENAME\Accessibility;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "THEMENAME_skip_link_id" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "THEMENAME_skip_link_id",
- *   type = "textfield",
- *   title = @Translation("Anchor ID for the ""skip link"""),
- *   defaultValue = "main-content",
- *   description = @Translation("Specify the HTML ID of the element that the accessible-but-hidden ""skip link"" should link to. (<a href="":link"" target=""_blank"">Read more about skip links</a>.)",
-     arguments = { ":link"  = "http://drupal.org/node/467976" }),
- *   groups = {
- *     "THEMENAME" = "THEMETITLE",
- *     "accessibility" = @Translation("Accessibility"),
- *   },
- * )
- */
-class SkipLink extends SettingBase {}
-```
-
-Helpfully Bootstrap adds a global `theme` variable added to every template
-in `Bootstrap::preprocess()`.
-
-This variable can now simply be called in the `html.html.twig` file with the
-following contents:
-
-```twig
-<a href="#{{ theme.settings.THEMENAME_skip_link_id }}" class="visually-hidden focusable skip-link">
-  {{ 'Skip to main content'|t }}
-</a>
-```
-
-In addition, the `page.html.twig` file will also need to be adjusted for this to
-work properly with the new anchor id.
-
-```twig
-<a id="{{ theme.settings.THEMENAME_skip_link_id }}"></a>
-```
-
-## Rebuild the cache {#rebuild}
-
-Once you have saved, you must rebuild your cache for this new plugin to be
-discovered. This must happen anytime you make a change to the actual file name
-or the information inside the `@BootstrapSetting` annotation.
-
-To rebuild your cache, navigate to `admin/config/development/performance` and
-click the `Clear all caches` button. Or if you prefer, run `drush cr` from the
-command line.
-
-Voilà! After this, you should have a fully functional `@BootstrapSetting` plugin!
-
-## Public Methods {#methods}
-
-Now that we covered how to create a basic `@BootstrapSetting` plugin, we can
-discuss how to customize a setting to fulfill a range of requirements.
-
-The `@BootstrapSetting` is implemented through the base class `SettingBase`
-which provides a variety of public methods to assist in the customization of
-a plugin.
-
-#### SettingBase::alterForm(array &$form, FormStateInterface $form_state, $form_id = NULL)
-#### SettingBase::alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL)
-
-Both of these methods provide a way for you to alter the setting's form render
-array element as well as the form state object.
-
-The first method is similar to any standard `hook_form_alter`.
-
-However, the second method passes the `$form` argument as an instance of the
-`Element` utility helper class. This will allow easier manipulation of all the
-elements in this method. Using this method is preferable and considered
-"Best Practice".
-
-Two useful examples to study:
-
-- CDNProvider::alterFormElement
-- RegionWells::alterFormElement
-
-#### SettingBase::drupalSettings()
-
-This method provides a way for you to determine whether a theme setting should
-be added to the `drupalSettings` JavaScript variable. Please note that by
-default this is set to `FALSE` to prevent any potentially sensitive information
-from being leaked.
-
-#### SettingBase::getCacheTags()
-
-This method provides a way for you to add cache tags that when the instantiated
-class is modified the associated cache tags will be invalidated. This is
-incredibly useful for example with CDNCustomCss::getCacheTags() which returns an
-array of `library_info`. So when a CdnProvider::getCacheTags() instantiated
-plugin changes the `library_info` cache tag will be invalidated automatically.
-
-It is important to note that the invalidation occurs because the base theme
-loads external resources using libraries by altering the libraries it defines
-based on settings in LibraryInfo::alter().
-
-#### SettingBase::getGroupElement(Element $form, FormStateInterface $form_state)
-
-This method provides a way for you to retrieve the last group (fieldset /
-details form element) the setting is nested in; based on the plugin definition.
-
-#### SettingBase::getGroups()
-
-This method retrieves the associative array of groups; based on the plugin
-definition. It's keyed by the group machine name and its value is the
-translatable label.
-
-#### SettingBase::getSettingElement(Element $form, FormStateInterface $form_state)
-
-This method provides a way for you to retrieve the form element that was
-automatically generated by the base theme for the setting; based on the plugin
-definition.
-
-#### SettingBase::submitForm(array &$form, FormStateInterface $form_state)
-#### SettingBase::submitFormElement(Element $form, FormStateInterface $form_state)
-
-Both of these methods provide a way for you to alter the submitted values
-stored in the form state object before the setting's value is ultimately stored
-in configuration by the base theme, which is performed automatically for you.
-
-Two useful example to study:
-
-- RegionWells::submitFormElement
-
-#### SettingBase::validateForm(array &$form, FormStateInterface $form_state)
-#### SettingBase::validateFormElement(Element $form, FormStateInterface $form_state)
-
-Both of these methods provide a way for you to validate the setting's form.
diff --git a/themes/bootstrap/docs/plugins/Update.md b/themes/bootstrap/docs/plugins/Update.md
deleted file mode 100644
index a727537..0000000
--- a/themes/bootstrap/docs/plugins/Update.md
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- @file Documentation for the @BootstrapUpdate annotated discovery plugin. -->
-<!-- @defgroup -->
-<!-- @ingroup -->
-# @BootstrapUpdate
-
-This plugin is a little too complex to explain (for now). If you would like to
-help expand this documentation, please [create an issue](https://www.drupal.org/node/add/project-issue/bootstrap).
-
-See the existing classes below on examples of how to implement your own.
diff --git a/themes/bootstrap/favicon.ico b/themes/bootstrap/favicon.ico
deleted file mode 100644
index dea57407b73dfba672728a845f4f722e34657732..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmaiyyGjF55QZm2urwrSsX`jD2*k!p;;l{<B%KHr7Ah8A5F$owByXSy!A`*k5G;(n
zFJNa81iOHpMB_Kcf#GmA+2!Av`7g7FWkpilnT+t9maP$y2@#nAP%wR-B8zDGLLWL0
zx@rq+OW+YS!7(Tf@|%Wl7R-SXcmchCyi(WA7pv$;&i_oG1`WsQuB(LXa^O?%mwKt~
zK-=^?&~o5C@YuOG;CBP<n|ac9(C-DhWwl;_N<^=@d^4ikjw+h}F2*-q{w5*cRu5Vy
zqF=lGenh{8%YwUzrf1l3`Elltz_-d=4mdmeCw$iOTA5b@ul_HEfU|tXXRXJ3;QU4U
zZ8uxCVg6XfukV}(he1~Vk7_Iv<M3X({7K9+j3fU5%ENp~I@x@ZW_))_>YXu>w^5PS
exkx>w=sf+^Gwttl+PBhuk9xZ$k)Ko06Zr+B?k)5H

diff --git a/themes/bootstrap/grunt/clean-vendor-dirs.js b/themes/bootstrap/grunt/clean-vendor-dirs.js
deleted file mode 100644
index d7dfd8b..0000000
--- a/themes/bootstrap/grunt/clean-vendor-dirs.js
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = function (grunt, options) {
-  'use strict';
-
-  // Register the "clean-vendor-dirs" task.
-  grunt.registerTask('clean-vendor-dirs', 'Ensures vendor directories do not cause Drupal to segfault. Read more in: MAINTAINERS.md.', function () {
-    var glob = [
-      'node_modules/**/*.info',
-      'bower_components/**/*.info',
-      'lib/**/*.info'
-    ];
-    var files = grunt.file.expand(glob);
-    if (files.length) {
-      files.forEach(function (file) {
-        grunt.log.ok('Removed ' + file);
-        grunt.file.delete(file, {force: true});
-      });
-    }
-    grunt.log.ok('Vendor directories clean!');
-  });
-
-};
diff --git a/themes/bootstrap/grunt/compile.js b/themes/bootstrap/grunt/compile.js
deleted file mode 100644
index 90a8acd..0000000
--- a/themes/bootstrap/grunt/compile.js
+++ /dev/null
@@ -1,157 +0,0 @@
-var pkg = require('../package');
-
-module.exports = function (grunt) {
-  'use strict';
-
-  var dev = !!grunt.option('dev');
-  var path, cssPath, libraries, librariesCache, librariesPath, versions, latestVersion;
-
-  // Helper function for falling back to a Bootstrap variables file.
-  var resolveVariables = function (file, backup) {
-    if (backup === true) grunt.verbose.write('Checking for backup variables file...');
-    if (!grunt.file.exists(path.join(librariesPath, file))) {
-      if (backup === true) grunt.verbose.warn();
-      grunt.verbose.writeln("Missing " + file);
-      file = false;
-      if (backup && backup !== true) {
-        file = resolveVariables(backup, true);
-        if (file) grunt.verbose.writeln("Using: " + file);
-      }
-      return file;
-    }
-    else if (backup === true) grunt.verbose.ok();
-    return file;
-  };
-
-  // Register the "compile" task.
-  grunt.registerTask('compile', 'Compiles the Drupal/Bootstrap override CSS files for the base theme.', function () {
-    var cwd = process.cwd();
-    path = require('path');
-    cssPath = path.join(cwd, pkg.paths.css);
-    librariesCache = path.join(cwd, pkg.caches.libraries);
-    librariesPath = path.join(cwd, pkg.paths.libraries);
-    if (!grunt.file.exists(librariesCache) || !grunt.file.isDir(librariesPath)) {
-      return grunt.fail.fatal('No libraries detected. Please run `grunt sync`.');
-    }
-
-    libraries = grunt.file.readJSON(librariesCache);
-    if (!libraries.bootstrap || !libraries.bootswatch) {
-      return grunt.fail.fatal('Invalid libraries cache. Please run `grunt sync`.');
-    }
-
-    versions = Object.keys(libraries.bootstrap);
-    latestVersion = [].concat(versions).pop();
-    grunt.config.set('latestVersion', latestVersion);
-
-    // Register a private sub-task. Doing this inside the main task prevents
-    // this private sub-task from being executed directly and also prevents it
-    // from showing up on the list of available tasks on --help.
-    grunt.registerTask('compile:overrides', function () {
-      var done = this.async();
-      var total = {count: 0};
-      var less = require('less');
-      var LessPluginAutoPrefix = require('less-plugin-autoprefix');
-      var LessPluginCleanCSS = require('less-plugin-clean-css');
-      var lessPlugins = [
-        new LessPluginCleanCSS({
-          advanced: true
-        }),
-        new LessPluginAutoPrefix({
-          browsers: [
-            "Android 2.3",
-            "Android >= 4",
-            "Chrome >= 20",
-            "Firefox >= 24",
-            "Explorer >= 8",
-            "iOS >= 6",
-            "Opera >= 12",
-            "Safari >= 6"
-          ],
-          map: true
-        })
-      ];
-      var queue = require('queue')({concurrency: 1, timeout: 60000});
-
-      // Iterate over libraries.
-      for (var library in libraries) {
-        if (!libraries.hasOwnProperty(library) || (dev && library !== 'bootstrap')) continue;
-        // Iterate over versions.
-        for (var version in libraries[library]) {
-          if (!libraries[library].hasOwnProperty(version) || (dev && version !== latestVersion)) continue;
-          // Iterate over themes.
-          for (var i = 0; i < libraries[library][version].length; i++) {
-            // Queue LESS compilations.
-            (function (library, versions, version, theme, total) {
-              queue.push(function (done) {
-                var lessPaths = [path.join(librariesPath)];
-                var latestVersion = [].concat(versions).pop();
-                var latestVariables = path.join(latestVersion, 'bootstrap', 'less', 'variables.less');
-                var latestMixins = path.join(latestVersion, 'bootstrap', 'less', 'mixins.less');
-                var themeVariables = path.join(version, library, (library === 'bootstrap' ? 'less' : theme), 'variables.less');
-                var backupVariables = path.join(version, 'bootstrap', 'less', 'variables.less');
-                var fileName = (library === 'bootstrap' ? 'overrides.min.css' : 'overrides-' + theme + '.min.css');
-                var outputFile = path.join(cssPath, version, fileName);
-
-                // Resolve the variable files.
-                latestVariables = resolveVariables(latestVariables);
-                if (!latestVariables) return done(false);
-                themeVariables = resolveVariables(themeVariables, backupVariables);
-                if (!themeVariables) return grunt.fail.fatal("Unable to create: " + outputFile);
-
-                var options = {
-                  filename: outputFile,
-                  paths: lessPaths,
-                  plugins: lessPlugins
-                };
-                var imports = [
-                  // First, import the latest bootstrap (missing variables).
-                  '@import "' + latestVariables + '"',
-                  // Then, override variables with theme.
-                  '@import "' + themeVariables + '"',
-                  // Then, import latest bootstrap mixins.
-                  '@import "' + latestMixins + '"',
-                  // Finally, import the base-theme overrides.
-                  '@import "' + path.join('starterkits', 'less', 'less', 'overrides.less') + '"'
-                ];
-                grunt.log.debug("\noptions: " + JSON.stringify(options, null, 2));
-                grunt.log.debug(imports.join("\n"));
-                less.render(imports.join(';') + ';', options)
-                  .then(function (output) {
-                    total.count++;
-                    grunt.log.writeln('Compiled '.green + path.join(version, fileName).white.bold);
-                    grunt.file.write(outputFile, output.css);
-                    done();
-                  }, function (e) {
-                    if (e.type === 'Parse') {
-                      grunt.log.error("File:\t".red + e.filename.red);
-                      grunt.log.error("Line:\t".red + [e.line, e.column].join(':').red);
-                      grunt.log.error("Code:\t".red + e.extract.join('').white.bold);
-                      grunt.log.writeln();
-                    }
-                    return grunt.fail.fatal(e);
-                  })
-                ;
-              });
-            })(library, Object.keys(libraries[library]), version, libraries[library][version][i], total);
-          }
-        }
-      }
-
-      // Start LESS compilations queues.
-      queue.start(function (e) {
-        // Report how many files were compiled.
-        grunt.log.ok(grunt.util.pluralize(total.count, '1 file compiled./' + total.count + ' files compiled.'));
-        return done(e);
-      });
-    });
-
-    // Run necessary sub-tasks.
-    var subtask = (dev ? 'dev' : 'css');
-    grunt.task.run([
-      'clean:' + subtask,
-      'compile:overrides',
-      'csslint:' + subtask
-    ]);
-  });
-
-};
diff --git a/themes/bootstrap/grunt/config/autoprefixer.js b/themes/bootstrap/grunt/config/autoprefixer.js
deleted file mode 100644
index 50f7c60..0000000
--- a/themes/bootstrap/grunt/config/autoprefixer.js
+++ /dev/null
@@ -1,23 +0,0 @@
-module.exports = function (grunt, options) {
-  return {
-    options: {
-      browsers: [
-        "Android 2.3",
-        "Android >= 4",
-        "Chrome >= 20",
-        "Firefox >= 24",
-        "Explorer >= 8",
-        "iOS >= 6",
-        "Opera >= 12",
-        "Safari >= 6"
-      ],
-      map: true
-    },
-    css: {
-      src: ['css/**/*.css']
-    },
-    dev: {
-      src: ['css/<%= latestVersion %>/overrides.css']
-    }
-  }
-};
diff --git a/themes/bootstrap/grunt/config/clean.js b/themes/bootstrap/grunt/config/clean.js
deleted file mode 100644
index 4de5021..0000000
--- a/themes/bootstrap/grunt/config/clean.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = function (grunt, options, arg1, arg2) {
-  return {
-    css: ['css/**/*.css'],
-    dev: ['css/<%= latestVersion %>/overrides.css']
-  };
-};
diff --git a/themes/bootstrap/grunt/config/csslint.js b/themes/bootstrap/grunt/config/csslint.js
deleted file mode 100644
index 1505ff6..0000000
--- a/themes/bootstrap/grunt/config/csslint.js
+++ /dev/null
@@ -1,13 +0,0 @@
-module.exports = function () {
-  return {
-    options: {
-      csslintrc: '.csslintrc'
-    },
-    css: {
-      src: ['css/**/*.css']
-    },
-    dev: {
-      src: ['css/<%= latestVersion %>/overrides.min.css']
-    }
-  };
-};
diff --git a/themes/bootstrap/grunt/config/cssmin.js b/themes/bootstrap/grunt/config/cssmin.js
deleted file mode 100644
index 7442af9..0000000
--- a/themes/bootstrap/grunt/config/cssmin.js
+++ /dev/null
@@ -1,25 +0,0 @@
-module.exports = function (grunt, options) {
-  return {
-    options: {
-      report: 'gzip'
-    },
-    css: {
-      files: [{
-        expand: true,
-        cwd: 'css',
-        src: ['**/*.css', '!**/*.min.css'],
-        dest: 'css',
-        ext: '.min.css'
-      }]
-    },
-    dev: {
-      files: [{
-        expand: true,
-        cwd: 'css',
-        src: ['<%= latestVersion %>/overrides.css'],
-        dest: 'css',
-        ext: '.min.css'
-      }]
-    }
-  }
-}
diff --git a/themes/bootstrap/grunt/config/githooks.js b/themes/bootstrap/grunt/config/githooks.js
deleted file mode 100644
index 9e8772c..0000000
--- a/themes/bootstrap/grunt/config/githooks.js
+++ /dev/null
@@ -1,15 +0,0 @@
-module.exports = function (grunt, options) {
-  return {
-    install: {
-      options: {
-        template: '.githooks.js.hbs'
-      },
-      // Change to something else once the {{ hook }} variable can be used.
-      // @see https://github.com/wecodemore/grunt-githooks/pull/40
-      'pre-commit': 'pre-commit',
-      'post-merge': 'post-merge',
-      'post-checkout': 'post-checkout',
-      'post-commit': 'post-commit'
-    }
-  };
-};
diff --git a/themes/bootstrap/grunt/config/watch.js b/themes/bootstrap/grunt/config/watch.js
deleted file mode 100644
index 290a937..0000000
--- a/themes/bootstrap/grunt/config/watch.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = function (grunt, options) {
-  return {
-    less: {
-      files: ['starterkits/less/**/*.less'],
-      tasks: ['compile']
-    }
-  }
-}
diff --git a/themes/bootstrap/grunt/sync.js b/themes/bootstrap/grunt/sync.js
deleted file mode 100644
index b88dd19..0000000
--- a/themes/bootstrap/grunt/sync.js
+++ /dev/null
@@ -1,196 +0,0 @@
-module.exports = function (grunt) {
-  'use strict';
-
-  // Register the 'sync' task.
-  grunt.registerTask('sync', 'Syncs necessary libraries for development purposes. Read more in: MAINTAINERS.md.', function () {
-    var cwd = process.cwd();
-    var force = grunt.option('force');
-    var path = require('path');
-    var pkg = require('../package');
-
-    // Internal variables.
-    var libraries = {};
-    var librariesCache = path.join(cwd, pkg.caches.libraries);
-    var librariesPath = path.join(cwd, pkg.paths.libraries);
-    var exists = grunt.file.exists(librariesCache);
-    var expired = false;
-
-    // Determine the validity of any existing cached libraries file.
-    if (!force && exists) {
-      grunt.verbose.write('Cached library information detected, checking...');
-      var fs = require('fs');
-      var stat = fs.statSync(librariesCache);
-      var now = new Date().getTime();
-      var expire = new Date(stat.mtime);
-      expire.setDate(expire.getDate() + 7); // 1 week
-      expired = now > expire.getTime();
-      grunt.verbose.writeln((expired ? 'EXPIRED' : 'VALID')[expired ? 'red' : 'green']);
-    }
-
-    // Register a private sub-task. Doing this inside the main task prevents
-    // this private sub-task from being executed directly and also prevents it
-    // from showing up on the list of available tasks on --help.
-    grunt.registerTask('sync:api', function () {
-      var done = this.async();
-      var request = require('request');
-      grunt.verbose.write(pkg.urls.jsdelivr + ' ');
-      request(pkg.urls.jsdelivr, function (error, response, body) {
-        if (!error && response.statusCode == 200) {
-          grunt.verbose.ok();
-          var json;
-          grunt.verbose.write("\nParsing JSON response...");
-          try {
-            json = JSON.parse(body);
-            grunt.verbose.ok();
-          } catch (e) {
-            grunt.verbose.error();
-            throw grunt.util.error('Unable to parse the response value (' + e.message + ').', e);
-          }
-          grunt.verbose.write("\nExtracting versions and themes from libraries...");
-          libraries = {};
-          json.forEach(function (library) {
-            if (library.name === 'bootstrap' || library.name === 'bootswatch') {
-              library.assets.forEach(function (asset) {
-                if (asset.version.match(/^3.\d\.\d$/)) {
-                  if (!libraries[library.name]) libraries[library.name] = {};
-                  if (!libraries[library.name][asset.version]) libraries[library.name][asset.version] = {};
-                  asset.files.forEach(function (file) {
-                    if (!file.match(/bootstrap\.min\.css$/)) return;
-                    if (library.name === 'bootstrap') {
-                      libraries[library.name][asset.version]['bootstrap'] = true;
-                    }
-                    else {
-                      libraries[library.name][asset.version][file.split(path.sep)[0]] = true;
-                    }
-                  });
-                }
-              });
-            }
-          });
-          grunt.verbose.ok();
-
-          // Flatten themes.
-          for (var library in libraries) {
-            grunt.verbose.header(library);
-            if (!libraries.hasOwnProperty(library)) continue;
-            var versions = Object.keys(libraries[library]);
-            grunt.verbose.ok('Versions: ' + versions.join(', '));
-            var themeCount = 0;
-            for (var version in libraries[library]) {
-              if (!libraries[library].hasOwnProperty(version)) continue;
-              var themes = Object.keys(libraries[library][version]).sort();
-              libraries[library][version] = themes;
-              if (themes.length > themeCount) {
-                themeCount = themes.length;
-              }
-            }
-            grunt.verbose.ok(grunt.util.pluralize(themeCount, 'Themes: 1/Themes: ' + themeCount));
-          }
-          grunt.verbose.writeln();
-          grunt.file.write(librariesCache, JSON.stringify(libraries, null, 2));
-
-          grunt.log.ok('Synced');
-        }
-        else {
-          grunt.verbose.error();
-          if (error) grunt.verbose.error(error);
-          grunt.verbose.error('Request URL: ' + pkg.urls.jsdelivr);
-          grunt.verbose.error('Status Code: ' + response.statusCode);
-          grunt.verbose.error('Response Headers: ' + JSON.stringify(response.headers, null, 2));
-          grunt.verbose.error('Response:');
-          grunt.verbose.error(body);
-          grunt.fail.fatal('Unable to establish a connection. Run with --verbose to view the response received.');
-        }
-        return done(error);
-      });
-    });
-
-    // Run API sync sub-task.
-    if (!exists || force || expired) {
-      if (!exists) grunt.verbose.writeln('No libraries cache detected, syncing libraries.');
-      else if (force) grunt.verbose.writeln('Forced option detected, syncing libraries.');
-      else if (expired) grunt.verbose.writeln('Libraries cache is over a week old, syncing libraries.');
-      grunt.task.run(['sync:api']);
-    }
-
-    // Register another private sub-task.
-    grunt.registerTask('sync:libraries', function () {
-      var bower = require('bower');
-      var done = this.async();
-      var inquirer =  require('inquirer');
-      var queue = require('queue')({concurrency: 1, timeout: 60000});
-      if (!grunt.file.exists(librariesCache)) {
-        return grunt.fail.fatal('No libraries detected. Please run `grunt sync --force`.');
-      }
-      libraries = grunt.file.readJSON(librariesCache);
-      var bowerJson = path.join(cwd, 'bower.json');
-      if (!grunt.file.isDir(librariesPath)) grunt.file.mkdir(librariesPath);
-
-      // Iterate over libraries.
-      for (var library in libraries) {
-        if (!libraries.hasOwnProperty(library)) continue;
-
-        // Iterate over versions.
-        for (var version in libraries[library]) {
-          if (!libraries[library].hasOwnProperty(version)) continue;
-
-          var endpoint = library + '#' + version;
-
-          // Check if library is already installed. If so, skip.
-          var versionPath = path.join(librariesPath, version);
-          grunt.verbose.write('Checking ' + endpoint + '...');
-          if (grunt.file.isDir(versionPath) && grunt.file.isDir(versionPath + '/' + library)) {
-            grunt.verbose.writeln('INSTALLED'.green);
-            continue;
-          }
-
-          grunt.verbose.writeln('MISSING'.red);
-          grunt.file.mkdir(versionPath);
-          grunt.file.copy(bowerJson, path.join(versionPath, 'bower.json'));
-
-          var config = {
-            cwd: versionPath,
-            directory: '',
-            interactive: true,
-            scripts: {
-              postinstall: 'rm -rf jquery && rm -rf font-awesome'
-            }
-          };
-
-          // Enqueue bower installations.
-          (function (endpoint, config) {
-            queue.push(function (done) {
-              bower.commands
-                .install([endpoint], {saveDev: true}, config)
-                .on('log', function (result) {
-                  if (result.level === 'action' && result.id !== 'validate' && !result.message.match(/(jquery|font-awesome)/)) {
-                    grunt.log.writeln(['bower', result.id.cyan, result.message.green].join(' '));
-                  }
-                  else if (result.level === 'action') {
-                    grunt.verbose.writeln(['bower', result.id.cyan, result.message.green].join(' '));
-                  }
-                  else {
-                    grunt.log.debug(['bower', result.id.cyan, result.message.green].join(' '));
-                  }
-                })
-                .on('prompt', function (prompts, callback) {
-                  inquirer.prompt(prompts, callback);
-                })
-                .on('end', function () { done() })
-              ;
-            });
-          })(endpoint, config);
-        }
-      }
-
-      // Start bower queue.
-      queue.start(function (e) {
-        return done(e);
-      });
-    });
-
-    // Run private sub-task.
-    grunt.task.run(['sync:libraries']);
-  });
-
-}
diff --git a/themes/bootstrap/icons.inc b/themes/bootstrap/icons.inc
deleted file mode 100644
index 0c55c2a..0000000
--- a/themes/bootstrap/icons.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * @file
- * Icon API support to provide Bootstrap Framework glyphicons.
- */
-
-use Drupal\bootstrap\Bootstrap;
-
-/**
- * Implements hook_icon_providers().
- */
-function bootstrap_icon_providers() {
-  $providers['bootstrap'] = [
-    'title' => t('Bootstrap'),
-    'url' => 'http://getbootstrap.com/components/#glyphicons',
-  ];
-  return $providers;
-}
-
-/**
- * Implements hook_icon_bundles().
- */
-function bootstrap_icon_bundles() {
-  $bundles = [];
-  if (Bootstrap::getTheme()->hasGlyphicons()) {
-    $bundles['bootstrap'] = [
-      'render' => 'sprite',
-      'provider' => 'bootstrap',
-      'title' => t('Bootstrap'),
-      'version' => t('Icons by Glyphicons'),
-      'variations' => [
-        'icon-white' => t('White'),
-      ],
-      'settings' => [
-        'tag' => 'span',
-      ],
-      'icons' => Bootstrap::glyphicons(),
-    ];
-  }
-  return $bundles;
-}
diff --git a/themes/bootstrap/js/attributes.js b/themes/bootstrap/js/attributes.js
deleted file mode 100644
index dd71c5d..0000000
--- a/themes/bootstrap/js/attributes.js
+++ /dev/null
@@ -1,228 +0,0 @@
-(function ($, _) {
-
-  /**
-   * Class to help modify attributes.
-   *
-   * @param {object} object
-   *   An object to initialize attributes with.
-   *
-   * @constructor
-   */
-  var Attributes = function (object) {
-    this.data = object && _.isObject(object) && _.clone(object) || {};
-  };
-
-  /**
-   * Renders the attributes object as a string to inject into an HTML element.
-   *
-   * @returns {string}
-   */
-  Attributes.prototype.toString = function () {
-    var output = '';
-    var name, value;
-    var checkPlain = function (str) {
-      return str && str.toString().replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;') || '';
-    };
-    for (name in this.data) {
-      if (!this.data.hasOwnProperty(name)) continue;
-      value = this.data[name];
-      if (_.isFunction(value)) value = value();
-      if (_.isObject(value)) value = _.values(value);
-      if (_.isArray(value)) value = value.join(' ');
-      output += ' ' + checkPlain(name) + '="' + checkPlain(value) + '"';
-    }
-    return output;
-  };
-
-  /**
-   * Add class(es) to the array.
-   *
-   * @param {string|Array} value
-   *   An individual class or an array of classes to add.
-   *
-   * @return {Attributes}
-   *
-   * @chainable
-   */
-  Attributes.prototype.addClass = function (value) {
-    var classes = this.getClasses();
-    value = [].concat(classes, value);
-    this.set('class', _.uniq(value));
-    return this;
-  };
-
-  /**
-   * Returns whether the requested attribute exists.
-   *
-   * @param {string} name
-   *   An attribute name to check.
-   *
-   * @return {boolean}
-   *   TRUE or FALSE
-   */
-  Attributes.prototype.exists = function (name) {
-    return this.data[name] !== void(0) && this.data[name] !== null;
-  };
-
-  /**
-   * Retrieve a specific attribute from the array.
-   *
-   * @param {string} name
-   *   The specific attribute to retrieve.
-   * @param {*} defaultValue
-   *   (optional) The default value to set if the attribute does not exist.
-   *
-   * @return {*}
-   *   A specific attribute value, passed by reference.
-   */
-  Attributes.prototype.get = function (name, defaultValue) {
-    if (!this.exists(name)) this.data[name] = defaultValue;
-    return this.data[name];
-  };
-
-  /**
-   * Retrieves a cloned copy of the internal attributes data object.
-   *
-   * @returns {Object}
-   */
-  Attributes.prototype.getData = function () {
-    return _.clone(this.data);
-  };
-
-  /**
-   * Retrieves classes from the array.
-   *
-   * @return {Array}
-   *   The classes array.
-   */
-  Attributes.prototype.getClasses = function () {
-    var classes = [].concat(this.get('class', []));
-    return _.uniq(classes);
-  };
-
-  /**
-   * Indicates whether a class is present in the array.
-   *
-   * @param {string|Array} name
-   *   The class(es) to search for.
-   *
-   * @return {boolean}
-   *   TRUE or FALSE
-   */
-  Attributes.prototype.hasClass = function (name) {
-    name = [].concat(name);
-    var classes = this.getClasses();
-    var found = false;
-    _.each(name, function (value) { if (_.indexOf(classes, value) !== -1) found = true; });
-    return found;
-  };
-
-  /**
-   * Merges multiple values into the array.
-   *
-   * @param {object} values
-   *   An associative key/value array.
-   * @param {boolean} [recursive]
-   *   Flag determining whether or not to recursively merge key/value pairs.
-   *
-   * @return {Attributes}
-   *
-   * @chainable
-   */
-  Attributes.prototype.merge = function (values, recursive) {
-    values = values instanceof Attributes ? values.getData() : values;
-    if (recursive === void(0) || recursive) {
-      this.data = $.extend(true, {}, this.data, values);
-    }
-    else {
-      $.extend(this.data, values);
-    }
-    return this;
-  };
-
-  /**
-   * Removes an attribute from the array.
-   *
-   * @param {string} name
-   *   The name of the attribute to remove.
-   *
-   * @return {Attributes}
-   *
-   * @chainable
-   */
-  Attributes.prototype.remove = function (name) {
-    if (this.exists(name)) delete this.data[name];
-    return this;
-  };
-
-  /**
-   * Removes a class from the attributes array.
-   *
-   * @param {string|Array} value
-   *   An individual class or an array of classes to remove.
-   *
-   * @return {Attributes}
-   *
-   * @chainable
-   */
-  Attributes.prototype.removeClass = function (value) {
-    this.set('class', _.without(this.getClasses(), [].concat(value)));
-    return this;
-  };
-
-  /**
-   * Replaces a class in the attributes array.
-   *
-   * @param {string} oldValue
-   *   The old class to remove.
-   * @param {string} newValue
-   *   The new class. It will not be added if the old class does not exist.
-   *
-   * @return {Attributes}
-   *
-   * @chainable
-   */
-  Attributes.prototype.replaceClass = function (oldValue, newValue) {
-    var classes = this.getClasses();
-    var i = _.indexOf(oldValue, classes);
-    if (i >= 0) {
-      classes[i] = newValue;
-      this.set('class', classes);
-    }
-    return this;
-  };
-
-  /**
-   * Sets an attribute on the array.
-   *
-   * @param {string} name
-   *   The name of the attribute to set.
-   * @param {*} value
-   *   The value of the attribute to set.
-   *
-   * @return {Attributes}
-   *
-   * @chainable
-   */
-  Attributes.prototype.set = function (name, value) {
-    this.data[name] = value;
-    return this;
-  };
-
-  /**
-   * Creates an Attributes instance.
-   *
-   * @param {object|Attributes} object
-   *   An object to initialize attributes with.
-   *
-   * @returns {Attributes}
-   *
-   * @global
-   *
-   * @constructor
-   */
-  window.Attributes = function (object) {
-    return object instanceof Attributes ? object : new Attributes(object);
-  };
-
-})(window.jQuery, window._);
diff --git a/themes/bootstrap/js/dropdown.js b/themes/bootstrap/js/dropdown.js
deleted file mode 100644
index 0d9e315..0000000
--- a/themes/bootstrap/js/dropdown.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * @file
- * Provides an event handler for hidden elements in dropdown menus.
- */
-
-(function ($, Drupal, Bootstrap) {
-  'use strict';
-
-  /**
-   * The list of supported events to proxy.
-   *
-   * @type {Array}
-   */
-  var events = [
-    // MouseEvent.
-    'click', 'dblclick', 'mousedown', 'mouseenter', 'mouseleave', 'mouseup', 'mouseover', 'mousemove', 'mouseout',
-
-    // KeyboardEvent.
-    'keypress', 'keydown', 'keyup'
-  ];
-
-  /**
-   * Bootstrap dropdown behaviors.
-   *
-   * Proxy any dropdown element events that should actually be fired on the
-   * original target (e.g. button, submits, etc.). This allows any registered
-   * event callbacks to be fired as they were intended (despite the fact that
-   * the markup has been changed to work with Bootstrap).
-   *
-   * @see \Drupal\bootstrap\Plugin\Preprocess\BootstrapDropdown::preprocessLinks
-   *
-   * @type {Drupal~behavior#bootstrapDropdown}
-   */
-  Drupal.behaviors.bootstrapDropdown = {
-    attach: function (context) {
-      var elements = context.querySelectorAll('.dropdown [data-dropdown-target]');
-      for (var k in elements) {
-        if (!elements.hasOwnProperty(k)) {
-          continue;
-        }
-        var element = elements[k];
-        for (var i = 0, l = events.length; i < l; i++) {
-          var event = events[i];
-          element.removeEventListener(event, this.proxyEvent);
-          element.addEventListener(event, this.proxyEvent);
-        }
-      }
-    },
-
-    /**
-     * Proxy event handler for bootstrap dropdowns.
-     *
-     * @param {Event} e
-     *   The event object.
-     */
-    proxyEvent: function (e) {
-      // Ignore tabbing.
-      if (e.type.match(/^key/) && (e.which === 9 || e.keyCode === 9)) {
-        return;
-      }
-      var target = e.currentTarget.dataset && e.currentTarget.dataset.dropdownTarget || e.currentTarget.getAttribute('data-dropdown-target');
-      if (target) {
-        e.preventDefault();
-        e.stopPropagation();
-        var element = target && target !== '#' && document.querySelectorAll(target)[0];
-        if (element) {
-          Bootstrap.simulate(element, e.type, e);
-        }
-        else if (Bootstrap.settings.dev && window.console && !e.type.match(/^mouse/)) {
-          window.console.debug('[Drupal Bootstrap] Could not find a the target:', target);
-        }
-      }
-    }
-  }
-
-})(jQuery, Drupal, Drupal.bootstrap);
diff --git a/themes/bootstrap/js/drupal.bootstrap.js b/themes/bootstrap/js/drupal.bootstrap.js
deleted file mode 100644
index 332fcdd..0000000
--- a/themes/bootstrap/js/drupal.bootstrap.js
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * @file
- * Drupal Bootstrap object.
- */
-
-/**
- * All Drupal Bootstrap JavaScript APIs are contained in this namespace.
- *
- * @namespace
- */
-(function ($, Drupal, drupalSettings) {
-  'use strict';
-
-  Drupal.bootstrap = {
-    settings: drupalSettings.bootstrap || {}
-  };
-
-  /**
-   * Wraps Drupal.checkPlain() to ensure value passed isn't empty.
-   *
-   * Encodes special characters in a plain-text string for display as HTML.
-   *
-   * @param {string} str
-   *   The string to be encoded.
-   *
-   * @return {string}
-   *   The encoded string.
-   *
-   * @ingroup sanitization
-   */
-  Drupal.bootstrap.checkPlain = function (str) {
-    return str && Drupal.checkPlain(str) || '';
-  };
-
-  /**
-   * Extends a Bootstrap plugin constructor.
-   *
-   * @param {string} id
-   *   A Bootstrap plugin identifier located in $.fn.
-   * @param {function} [callback]
-   *   A callback to extend the plugin constructor.
-   *
-   * @return {function|boolean}
-   *   The Bootstrap plugin or FALSE if the plugin does not exist.
-   */
-  Drupal.bootstrap.extendPlugin = function (id, callback) {
-    // Immediately return if the plugin does not exist.
-    if (!$.fn[id] || !$.fn[id].Constructor) return false;
-
-    // Extend the plugin if a callback was provided.
-    if ($.isFunction(callback)) {
-      var ret = callback.apply($.fn[id].Constructor, [this.settings]);
-      if ($.isPlainObject(ret)) {
-        $.extend(true, $.fn[id].Constructor, ret);
-      }
-    }
-
-    // Add a jQuery UI like option getter/setter method.
-    if ($.fn[id].Constructor.prototype.option === void(0)) {
-      $.fn[id].Constructor.prototype.option = this.option;
-    }
-
-    return $.fn[id].Constructor;
-  };
-
-  /**
-   * Replaces a Bootstrap jQuery plugin definition.
-   *
-   * @param {string} id
-   *   A Bootstrap plugin identifier located in $.fn.
-   * @param {function} [callback]
-   *   A callback to replace the jQuery plugin definition. The callback must
-   *   return a function that is used to construct a jQuery plugin.
-   *
-   * @return {function|boolean}
-   *   The Bootstrap jQuery plugin definition or FALSE if the plugin does not
-   *   exist.
-   */
-  Drupal.bootstrap.replacePlugin = function (id, callback) {
-    // Immediately return if plugin does not exist or not a valid callback.
-    if (!$.fn[id] || !$.fn[id].Constructor || !$.isFunction(callback)) return false;
-    var constructor = $.fn[id].Constructor;
-
-    var plugin = callback.apply(constructor);
-    if ($.isFunction(plugin)) {
-      plugin.Constructor = constructor;
-
-      var old = $.fn[id];
-      plugin.noConflict = function () {
-        $.fn[id] = old;
-        return this;
-      };
-      $.fn[id] = plugin;
-    }
-  };
-
-  /**
-   * Map of supported events by regular expression.
-   *
-   * @type {Object<Event|MouseEvent|KeyboardEvent|TouchEvent,RegExp>}
-   */
-  Drupal.bootstrap.eventMap = {
-    Event: /^(?:load|unload|abort|error|select|change|submit|reset|focus|blur|resize|scroll)$/,
-    MouseEvent: /^(?:click|dblclick|mouse(?:down|enter|leave|up|over|move|out))$/,
-    KeyboardEvent: /^(?:key(?:down|press|up))$/,
-    TouchEvent: /^(?:touch(?:start|end|move|cancel))$/
-  };
-
-  /**
-   * Simulates a native event on an element in the browser.
-   *
-   * Note: This is a pretty complete modern implementation. If things are quite
-   * working the way you intend (in older browsers), you may wish to use the
-   * jQuery.simulate plugin. If it's available, this method will defer to it.
-   *
-   * @see https://github.com/jquery/jquery-simulate
-   *
-   * @param {HTMLElement} element
-   *   A DOM element to dispatch event on.
-   * @param {String} type
-   *   The type of event to simulate.
-   * @param {Object} [options]
-   *   An object of options to pass to the event constructor. Typically, if
-   *   an event is being proxied, you should just pass the original event
-   *   object here. This allows, if the browser supports it, to be a truly
-   *   simulated event.
-   */
-  Drupal.bootstrap.simulate = function (element, type, options) {
-    // Defer to the jQuery.simulate plugin, if it's available.
-    if (typeof $.simulate === 'function') {
-      new $.simulate(element, type, options);
-      return;
-    }
-    var event;
-    var ctor;
-    for (var name in Drupal.bootstrap.eventMap) {
-      if (Drupal.bootstrap.eventMap[name].test(type)) {
-        ctor = name;
-        break;
-      }
-    }
-    if (!ctor) {
-      throw new SyntaxError('Only rudimentary HTMLEvents, KeyboardEvents and MouseEvents are supported: ' + type);
-    }
-    var opts = {bubbles: true, cancelable: true};
-    if (ctor === 'KeyboardEvent' || ctor === 'MouseEvent') {
-      $.extend(opts, {ctrlKey: !1, altKey: !1, shiftKey: !1, metaKey: !1});
-    }
-    if (ctor === 'MouseEvent') {
-      $.extend(opts, {button: 0, pointerX: 0, pointerY: 0, view: window});
-    }
-    if (options) {
-      $.extend(opts, options);
-    }
-    if (typeof window[ctor] === 'function') {
-      event = new window[ctor](type, opts);
-      element.dispatchEvent(event);
-    }
-    else if (document.createEvent) {
-      event = document.createEvent(ctor);
-      event.initEvent(type, opts.bubbles, opts.cancelable);
-      element.dispatchEvent(event);
-    }
-    else if (typeof element.fireEvent === 'function') {
-      event = $.extend(document.createEventObject(), opts);
-      element.fireEvent('on' + type, event);
-    }
-    else if (typeof element[type]) {
-      element[type]();
-    }
-  };
-
-  /**
-   * Provide jQuery UI like ability to get/set options for Bootstrap plugins.
-   *
-   * @param {string|object} key
-   *   A string value of the option to set, can be dot like to a nested key.
-   *   An object of key/value pairs.
-   * @param {*} [value]
-   *   (optional) A value to set for key.
-   *
-   * @returns {*}
-   *   - Returns nothing if key is an object or both key and value parameters
-   *   were provided to set an option.
-   *   - Returns the a value for a specific setting if key was provided.
-   *   - Returns an object of key/value pairs of all the options if no key or
-   *   value parameter was provided.
-   *
-   * @see https://github.com/jquery/jquery-ui/blob/master/ui/widget.js
-   *
-   * @todo This isn't fully working since Bootstrap plugins don't allow
-   * methods to return values.
-   */
-  Drupal.bootstrap.option = function (key, value) {
-    var options = key;
-    var parts, curOption, i;
-
-    // Don't return a reference to the internal hash.
-    if (arguments.length === 0) {
-      return $.extend({}, this.options);
-    }
-
-    // Handle a specific option.
-    if (typeof key === "string") {
-      // Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
-      options = {};
-      parts = key.split(".");
-      key = parts.shift();
-      if (parts.length) {
-        curOption = options[key] = $.extend({}, this.options[key]);
-        for (i = 0; i < parts.length - 1; i++) {
-          curOption[parts[i]] = curOption[parts[i]] || {};
-          curOption = curOption[parts[i]];
-        }
-        key = parts.pop();
-        if (arguments.length === 1) {
-          return curOption[key] === undefined ? null : curOption[key];
-        }
-        curOption[key] = value;
-      }
-      else {
-        if (arguments.length === 1) {
-          return this.options[key] === undefined ? null : this.options[key];
-        }
-        options[key] = value;
-      }
-    }
-
-    // Set the new option(s).
-    for (key in options) {
-      if (!options.hasOwnProperty(key)) continue;
-      this.options[key] = options[key];
-    }
-    return this;
-  };
-
-})(window.jQuery, window.Drupal, window.drupalSettings);
diff --git a/themes/bootstrap/js/misc/ajax.js b/themes/bootstrap/js/misc/ajax.js
deleted file mode 100644
index 2fb1b0d..0000000
--- a/themes/bootstrap/js/misc/ajax.js
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * @file
- * Extends methods from core/misc/ajax.js.
- */
-
-(function ($, window, Drupal, drupalSettings) {
-
-  /**
-   * Attempts to find the closest glyphicon progress indicator.
-   *
-   * @param {jQuery|Element} element
-   *   A DOM element.
-   *
-   * @returns {jQuery}
-   *   A jQuery object.
-   */
-  Drupal.Ajax.prototype.findGlyphicon = function (element) {
-    return $(element).closest('.form-item').find('.ajax-progress.glyphicon')
-  };
-
-  /**
-   * Starts the spinning of the glyphicon progress indicator.
-   *
-   * @param {jQuery|Element} element
-   *   A DOM element.
-   * @param {string} [message]
-   *   An optional message to display (tooltip) for the progress.
-   *
-   * @returns {jQuery}
-   *   A jQuery object.
-   */
-  Drupal.Ajax.prototype.glyphiconStart = function (element, message) {
-    var $glyphicon = this.findGlyphicon(element);
-    if ($glyphicon[0]) {
-      $glyphicon.addClass('glyphicon-spin');
-
-      // Add any message as a tooltip to the glyphicon.
-      if (drupalSettings.bootstrap.tooltip_enabled) {
-        $glyphicon
-          .removeAttr('data-toggle')
-          .removeAttr('data-original-title')
-          .removeAttr('title')
-          .tooltip('destroy')
-        ;
-
-        if (message) {
-          $glyphicon.attr('data-toggle', 'tooltip').attr('title', message).tooltip();
-        }
-      }
-
-      // Append a message for screen readers.
-      if (message) {
-        $glyphicon.parent().append('<div class="sr-only message">' + message + '</div>');
-      }
-    }
-    return $glyphicon;
-  };
-
-  /**
-   * Stop the spinning of a glyphicon progress indicator.
-   *
-   * @param {jQuery|Element} element
-   *   A DOM element.
-   */
-  Drupal.Ajax.prototype.glyphiconStop = function (element) {
-    var $glyphicon = this.findGlyphicon(element);
-    if ($glyphicon[0]) {
-      $glyphicon.removeClass('glyphicon-spin');
-      if (drupalSettings.bootstrap.tooltip_enabled) {
-        $glyphicon
-          .removeAttr('data-toggle')
-          .removeAttr('data-original-title')
-          .removeAttr('title')
-          .tooltip('destroy')
-        ;
-      }
-    }
-  };
-
-  /**
-   * Sets the throbber progress indicator.
-   */
-  Drupal.Ajax.prototype.setProgressIndicatorThrobber = function () {
-    var $element = $(this.element);
-
-    // Find an existing glyphicon progress indicator.
-    var $glyphicon = this.glyphiconStart($element, this.progress.message);
-    if ($glyphicon[0]) {
-      this.progress.element = $glyphicon.parent();
-      this.progress.glyphicon = true;
-      return;
-    }
-
-    // Otherwise, add a glyphicon throbber after the element.
-    if (!this.progress.element) {
-      this.progress.element = $(Drupal.theme('ajaxThrobber'));
-    }
-    if (this.progress.message) {
-      this.progress.element.after('<div class="message">' + this.progress.message + '</div>');
-    }
-
-    // If element is an input DOM element type (not :input), append after.
-    if ($element.is('input')) {
-      $element.after(this.progress.element);
-    }
-    // Otherwise append the throbber inside the element.
-    else {
-      $element.append(this.progress.element);
-    }
-  };
-
-
-  /**
-   * Handler for the form redirection completion.
-   *
-   * @param {Array.<Drupal.AjaxCommands~commandDefinition>} response
-   * @param {number} status
-   */
-  Drupal.Ajax.prototype.success = function (response, status) {
-    if (this.progress.element) {
-
-      // Stop a glyphicon throbber.
-      if (this.progress.glyphicon) {
-        this.glyphiconStop(this.progress.element);
-      }
-      // Remove the progress element.
-      else {
-        this.progress.element.remove();
-      }
-
-      // Remove any message set.
-      this.progress.element.parent().find('.message').remove();
-    }
-
-    // --------------------------------------------------------
-    // Everything below is from core/misc/ajax.js.
-    // --------------------------------------------------------
-
-    if (this.progress.object) {
-      this.progress.object.stopMonitoring();
-    }
-    $(this.element).prop('disabled', false);
-
-    // Save element's ancestors tree so if the element is removed from the dom
-    // we can try to refocus one of its parents. Using addBack reverse the
-    // result array, meaning that index 0 is the highest parent in the hierarchy
-    // in this situation it is usually a <form> element.
-    var elementParents = $(this.element).parents('[data-drupal-selector]').addBack().toArray();
-
-    // Track if any command is altering the focus so we can avoid changing the
-    // focus set by the Ajax command.
-    var focusChanged = false;
-    for (var i in response) {
-      if (response.hasOwnProperty(i) && response[i].command && this.commands[response[i].command]) {
-        this.commands[response[i].command](this, response[i], status);
-        if (response[i].command === 'invoke' && response[i].method === 'focus') {
-          focusChanged = true;
-        }
-      }
-    }
-
-    // If the focus hasn't be changed by the ajax commands, try to refocus the
-    // triggering element or one of its parents if that element does not exist
-    // anymore.
-    if (!focusChanged && this.element && !$(this.element).data('disable-refocus')) {
-      var target = false;
-
-      for (var n = elementParents.length - 1; !target && n > 0; n--) {
-        target = document.querySelector('[data-drupal-selector="' + elementParents[n].getAttribute('data-drupal-selector') + '"]');
-      }
-
-      if (target) {
-        $(target).trigger('focus');
-      }
-    }
-
-    // Reattach behaviors, if they were detached in beforeSerialize(). The
-    // attachBehaviors() called on the new content from processing the response
-    // commands is not sufficient, because behaviors from the entire form need
-    // to be reattached.
-    if (this.$form) {
-      var settings = this.settings || drupalSettings;
-      Drupal.attachBehaviors(this.$form.get(0), settings);
-    }
-
-    // Remove any response-specific settings so they don't get used on the next
-    // call by mistake.
-    this.settings = null;
-  };
-
-})(jQuery, this, Drupal, drupalSettings);
diff --git a/themes/bootstrap/js/misc/autocomplete.js b/themes/bootstrap/js/misc/autocomplete.js
deleted file mode 100644
index 81128f1..0000000
--- a/themes/bootstrap/js/misc/autocomplete.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @file
- * Extends autocomplete based on jQuery UI.
- *
- * @todo Remove once jQuery UI is no longer used?
- */
-
-(function ($, Drupal) {
-  'use strict';
-
-  // Ensure the input element has a "change" event triggered. This is important
-  // so that summaries in vertical tabs can be updated properly.
-  // @see Drupal.behaviors.formUpdated
-  $(document).on('autocompleteselect', '.form-autocomplete', function (e) {
-    $(e.target).trigger('change.formUpdated');
-  });
-
-  // Extend ui.autocomplete widget so it triggers the glyphicon throbber.
-  $.widget('ui.autocomplete', $.ui.autocomplete, {
-    _search: function (value) {
-      this.pending++;
-      Drupal.Ajax.prototype.glyphiconStart(this.element);
-      this.cancelSearch = false;
-      this.source({term: value}, this._response());
-    },
-    _response: function () {
-      var index = ++this.requestIndex;
-      return $.proxy(function (content) {
-        if (index === this.requestIndex) this.__response(content);
-        this.pending--;
-        if (!this.pending) Drupal.Ajax.prototype.glyphiconStop(this.element);
-      }, this);
-    }
-  });
-
-})(jQuery, Drupal);
diff --git a/themes/bootstrap/js/misc/batch.js b/themes/bootstrap/js/misc/batch.js
deleted file mode 100644
index a424305..0000000
--- a/themes/bootstrap/js/misc/batch.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @file
- * Drupal's batch API.
- */
-
-(function ($, Drupal) {
-  'use strict';
-
-  /**
-   * Attaches the batch behavior to progress bars.
-   *
-   * @type {Drupal~behavior}
-   */
-  Drupal.behaviors.batch = {
-    attach: function (context, settings) {
-      var batch = settings.batch;
-      var $progress = $('[data-drupal-progress]').once('batch');
-      var progressBar;
-
-      // Success: redirect to the summary.
-      function updateCallback(progress, status, pb) {
-        if (progress === '100') {
-          pb.stopMonitoring();
-          window.location = batch.uri + '&op=finished';
-        }
-      }
-
-      function errorCallback(pb) {
-        $progress.prepend($('<p class="error"></p>').html(batch.errorMessage));
-        $('#wait').hide();
-      }
-
-      if ($progress.length) {
-        var id = $progress.find('.progress').attr('id') || 'updateprogress';
-        progressBar = new Drupal.ProgressBar(id, updateCallback, 'POST', errorCallback);
-        $progress.replaceWith(progressBar.element);
-        progressBar.setProgress(-1, batch.initMessage);
-        progressBar.startMonitoring(batch.uri + '&op=do', 10);
-      }
-    }
-  };
-
-})(jQuery, Drupal);
diff --git a/themes/bootstrap/js/misc/collapse.js b/themes/bootstrap/js/misc/collapse.js
deleted file mode 100644
index ad19ba4..0000000
--- a/themes/bootstrap/js/misc/collapse.js
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * @file
- * Overrides core/misc/progress.js.
- */
-(function ($, Modernizr, Drupal) {
-
-  "use strict";
-
-  /**
-   * The collapsible details object represents a single collapsible details element.
-   */
-  function CollapsibleDetails(node) {
-    this.$node = $(node);
-    this.$node.data('details', this);
-    // Expand details if there are errors inside, or if it contains an
-    // element that is targeted by the URI fragment identifier.
-    var anchor = location.hash && location.hash !== '#' ? ', ' + location.hash : '';
-    if (this.$node.find('.error' + anchor).length) {
-      this.$node.attr('open', true);
-    }
-    // Initialize and setup the summary,
-    this.setupSummary();
-    // Initialize and setup the legend.
-    this.setupLegend();
-  }
-
-  /**
-   * Extend CollapsibleDetails function.
-   */
-  $.extend(CollapsibleDetails, {
-    /**
-     * Holds references to instantiated CollapsibleDetails objects.
-     */
-    instances: []
-  });
-
-  /**
-   * Extend CollapsibleDetails prototype.
-   */
-  $.extend(CollapsibleDetails.prototype, {
-    /**
-     * Initialize and setup summary events and markup.
-     */
-    setupSummary: function () {
-      this.$summary = $('<span class="summary"></span>');
-      this.$node
-        .on('summaryUpdated', $.proxy(this.onSummaryUpdated, this))
-        .trigger('summaryUpdated');
-    },
-    /**
-     * Initialize and setup legend markup.
-     */
-    setupLegend: function () {
-      // Turn the summary into a clickable link.
-      var $legend = this.$node.find('> summary');
-
-      $('<span class="details-summary-prefix visually-hidden"></span>')
-        .append(this.$node.attr('open') ? Drupal.t('Hide') : Drupal.t('Show'))
-        .prependTo($legend)
-        .after(document.createTextNode(' '));
-
-      // .wrapInner() does not retain bound events.
-      $('<a class="details-title"></a>')
-        .attr('href', '#' + this.$node.attr('id'))
-        .prepend($legend.contents())
-        .appendTo($legend)
-        .on('click', $.proxy(this.onLegendClick, this));
-      $legend.append(this.$summary);
-    },
-    /**
-     * Handle legend clicks
-     */
-    onLegendClick: function (e) {
-      this.toggle();
-      e.preventDefault();
-    },
-    /**
-     * Update summary
-     */
-    onSummaryUpdated: function () {
-      var text = $.trim(this.$node.drupalGetSummary());
-      this.$summary.html(text ? ' (' + text + ')' : '');
-    },
-    /**
-     * Toggle the visibility of a details element using smooth animations.
-     */
-    toggle: function () {
-      var isOpen = !!this.$node.attr('open');
-      var $summaryPrefix = this.$node.find('> summary span.details-summary-prefix');
-      if (isOpen) {
-        $summaryPrefix.html(Drupal.t('Show'));
-      }
-      else {
-        $summaryPrefix.html(Drupal.t('Hide'));
-      }
-      this.$node.attr('open', !isOpen);
-    }
-  });
-
-  /**
-   * Scroll a given fieldset into view as much as possible.
-   */
-  Drupal.collapseScrollIntoView = function (node) {
-    var h = document.documentElement.clientHeight || document.body.clientHeight || 0;
-    var offset = document.documentElement.scrollTop || document.body.scrollTop || 0;
-    var posY = $(node).offset().top;
-    var fudge = 55;
-    if (posY + node.offsetHeight + fudge > h + offset) {
-      if (node.offsetHeight > h) {
-        window.scrollTo(0, posY);
-      }
-      else {
-        window.scrollTo(0, posY + node.offsetHeight - h + fudge);
-      }
-    }
-  };
-
-  Drupal.behaviors.collapse = {
-    attach: function (context) {
-      var $fieldset = $(context).find('fieldset.collapsible').once('collapse');
-
-      // Expand fieldset if there are errors inside, or if it contains an
-      // element that is targeted by the URI fragment identifier.
-      var anchor = location.hash && location.hash != '#' ? ', ' + location.hash : '';
-      if ($fieldset.find('.error' + anchor).length) {
-        $fieldset.removeClass('collapsed');
-      }
-
-      var summary = $('<span class="summary"></span>');
-      $fieldset.
-        bind('summaryUpdated', function () {
-          var text = $.trim($fieldset.drupalGetSummary());
-          summary.html(text ? ' (' + text + ')' : '');
-        })
-        .trigger('summaryUpdated');
-
-      // Turn the legend into a clickable link, but retain span.fieldset-legend
-      // for CSS positioning.
-      var $legend = $('> legend .fieldset-legend', this);
-
-      $('<span class="fieldset-legend-prefix element-invisible"></span>')
-        .append($fieldset.hasClass('collapsed') ? Drupal.t('Show') : Drupal.t('Hide'))
-        .prependTo($legend);
-
-      $fieldset.find('[data-toggle=collapse]').on('click', function (e) {
-        e.preventDefault();
-      });
-
-      // Bind Bootstrap events with Drupal core events.
-      $fieldset
-        .append(summary)
-        .on('show.bs.collapse', function () {
-          $fieldset
-            .removeClass('collapsed')
-            .find('> legend span.fieldset-legend-prefix').html(Drupal.t('Hide'));
-        })
-        .on('shown.bs.collapse', function () {
-          $fieldset.trigger({ type: 'collapsed', value: false });
-          Drupal.collapseScrollIntoView($fieldset.get(0));
-        })
-        .on('hide.bs.collapse', function () {
-          $fieldset
-            .addClass('collapsed')
-            .find('> legend span.fieldset-legend-prefix').html(Drupal.t('Show'));
-        })
-        .on('hidden.bs.collapse', function () {
-          $fieldset.trigger({ type: 'collapsed', value: true });
-        });
-
-      if ($fieldset.length) {
-        for (var i = 0; i < $fieldset.length; i++) {
-          CollapsibleDetails.instances.push(new CollapsibleDetails($fieldset[i]));
-        }
-      }
-    }
-  };
-
-  // Expose constructor in the public space.
-  Drupal.CollapsibleDetails = CollapsibleDetails;
-
-})(jQuery, Modernizr, Drupal);
diff --git a/themes/bootstrap/js/misc/dialog.ajax.js b/themes/bootstrap/js/misc/dialog.ajax.js
deleted file mode 100644
index b12c7e9..0000000
--- a/themes/bootstrap/js/misc/dialog.ajax.js
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- * @file
- * Extends the Drupal AJAX functionality to integrate the dialog API.
- */
-
-(function ($, Drupal) {
-  'use strict';
-
-  /**
-   * Initialize dialogs for Ajax purposes.
-   *
-   * @type {Drupal~behavior}
-   */
-  Drupal.behaviors.dialog = {
-    attach: function (context, settings) {
-      var $context = $(context);
-
-      // Provide a known 'drupal-modal' DOM element for Drupal-based modal
-      // dialogs. Non-modal dialogs are responsible for creating their own
-      // elements, since there can be multiple non-modal dialogs at a time.
-      if (!$('#drupal-modal').length) {
-        $(Drupal.theme.bootstrapModal()).appendTo('body');
-      }
-
-      // Special behaviors specific when attaching content within a dialog.
-      // These behaviors usually fire after a validation error inside a dialog.
-      var $dialog = $context.closest('.modal');
-      if ($dialog.length) {
-        // Remove and replace the dialog buttons with those from the new form.
-        if ($dialog.modal('option', 'drupalAutoButtons')) {
-          // Trigger an event to detect/sync changes to buttons.
-          $dialog.trigger('dialogButtonsChange');
-        }
-
-        // Attempt to force focus on the first visible input (not :input) in
-        // the modal body when the behavior is run.
-        Drupal.behaviors.dialog.focus($dialog);
-      }
-
-      var originalClose = settings.dialog.close;
-      // Overwrite the close method to remove the dialog on closing.
-      settings.dialog.close = function (event) {
-        originalClose.apply(settings.dialog, arguments);
-        $(event.target).remove();
-      };
-    },
-
-    /**
-     * Attempt to focus the first visible input (not :input) in the modal body.
-     *
-     * @param {jQuery} $dialog
-     *   An jQuery object containing the element that is the dialog target.
-     */
-    focus: function ($dialog) {
-      $dialog.find('.modal-body input:visible:first').trigger('focus');
-    },
-
-    /**
-     * Scan a dialog for any primary buttons and move them to the button area.
-     *
-     * @param {jQuery} $dialog
-     *   An jQuery object containing the element that is the dialog target.
-     *
-     * @return {Array}
-     *   An array of buttons that need to be added to the button area.
-     */
-    prepareDialogButtons: function ($dialog) {
-      var buttons = [];
-      var $buttons = $dialog.find('.form-actions :input[type=submit]');
-      $buttons.each(function () {
-        // Hidden form buttons need special attention. For browser consistency,
-        // the button needs to be "visible" in order to have the enter key fire
-        // the form submit event. So instead of a simple "hide" or
-        // "display: none", we set its dimensions to zero.
-        // See http://mattsnider.com/how-forms-submit-when-pressing-enter/
-        var $originalButton = $(this).css({
-          display: 'block',
-          width: 0,
-          height: 0,
-          padding: 0,
-          border: 0
-        });
-        buttons.push({
-          text: $originalButton.html() || $originalButton.attr('value'),
-          class: $originalButton.attr('class'),
-          click: function (e) {
-            $originalButton.trigger('mousedown').trigger('mouseup').trigger('click');
-            e.preventDefault();
-          }
-        });
-      });
-      return buttons;
-    }
-  };
-
-  /**
-   * Command to open a dialog.
-   *
-   * @param {Drupal.Ajax} ajax
-   * @param {object} response
-   * @param {number} [status]
-   *
-   * @return {bool|undefined}
-   */
-  Drupal.AjaxCommands.prototype.openDialog = function (ajax, response, status) {
-    if (!response.selector) {
-      return false;
-    }
-
-    var $dialog = $(response.selector);
-    if (!$dialog.length) {
-      // Create the element if needed.
-      $dialog = $(Drupal.theme.bootstrapModal({ id: response.selector.replace(/^#/, '') })).appendTo('body');
-    }
-    // Set up the wrapper, if there isn't one.
-    var id = $dialog.attr('id');
-    if (response.selector === '#' + id) {
-      response.selector = '#' + id + '--body';
-    }
-    else if (!ajax.wrapper) {
-      ajax.wrapper = id + '--body';
-    }
-
-    // Use the ajax.js insert command to populate the dialog contents.
-    response.command = 'insert';
-    response.method = 'html';
-    ajax.commands.insert(ajax, response, status);
-
-    // Move the buttons to the jQuery UI dialog buttons area.
-    if (!response.dialogOptions.buttons) {
-      response.dialogOptions.drupalAutoButtons = true;
-      response.dialogOptions.buttons = Drupal.behaviors.dialog.prepareDialogButtons($dialog);
-    }
-
-    // Bind dialogButtonsChange.
-    $dialog.on('dialogButtonsChange', function () {
-      var buttons = Drupal.behaviors.dialog.prepareDialogButtons($dialog);
-      $dialog.modal('option', 'buttons', buttons);
-    });
-
-    // Open the dialog itself.
-    response.dialogOptions = response.dialogOptions || {};
-    var dialog = Drupal.dialog($dialog.get(0), response.dialogOptions);
-    if (response.dialogOptions.modal) {
-      dialog.showModal();
-    }
-    else {
-      dialog.show();
-    }
-
-    // Add the standard Drupal class for buttons for style consistency.
-    $dialog.parent().find('.ui-dialog-buttonset').addClass('form-actions');
-  };
-
-  /**
-   * Command to close a dialog.
-   *
-   * If no selector is given, it defaults to trying to close the modal.
-   *
-   * @param {Drupal.Ajax} [ajax]
-   * @param {object} response
-   * @param {string} response.selector
-   * @param {bool} response.persist
-   * @param {number} [status]
-   */
-  Drupal.AjaxCommands.prototype.closeDialog = function (ajax, response, status) {
-    var $dialog = $(response.selector);
-    if ($dialog.length) {
-      Drupal.dialog($dialog.get(0)).close();
-      if (!response.persist) {
-        // Wrap this in a timer so animations can finish.
-        setTimeout(function() {
-          $dialog.remove();
-        }, 1000);
-      }
-    }
-
-    // Unbind dialogButtonsChange.
-    $dialog.off('dialogButtonsChange');
-  };
-
-  /**
-   * Command to set a dialog property.
-   *
-   * JQuery UI specific way of setting dialog options.
-   *
-   * @param {Drupal.Ajax} [ajax]
-   * @param {object} response
-   * @param {string} response.selector
-   * @param {string} response.optionsName
-   * @param {string} response.optionValue
-   * @param {number} [status]
-   */
-  Drupal.AjaxCommands.prototype.setDialogOption = function (ajax, response, status) {
-    var $dialog = $(response.selector);
-    if ($dialog.length) {
-      $dialog.modal('option', response.optionName, response.optionValue);
-    }
-  };
-
-  /**
-   * Binds a listener on dialog before creation to setup title and buttons.
-   *
-   * @param {jQuery.Event} e
-   * @param {Drupal.dialog} dialog
-   * @param {jQuery} $element
-   * @param {object} settings
-   */
-  $(window).on('dialog:beforecreate', function (e, dialog, $element, settings) {
-    // Replace title.
-    if (settings.title) {
-      var $header = $element.find('.modal-header');
-      if (!$header[0]) {
-        $header = $(Drupal.theme.bootstrapModalHeader()).prependTo($element.find('.modal-content'));
-      }
-      $header.find('.modal-title').text(Drupal.checkPlain(settings.title));
-    }
-
-    // Remove any existing buttons.
-    $element.find('.modal-footer').remove();
-
-    // Add new buttons.
-    if (settings.buttons && settings.buttons.length) {
-      var $footer = $(Drupal.theme.bootstrapModalFooter('', true)).appendTo($element.find('.modal-content'));
-      for (var i in settings.buttons) {
-        if (!settings.buttons.hasOwnProperty(i)) continue;
-        var button = settings.buttons[i];
-        $('<button class="' + button.class + '">' + button.text + '</button>')
-          .appendTo($footer)
-          .on('click', button.click);
-      }
-    }
-  });
-
-  /**
-   * Binds a listener on dialog creation to handle the cancel link.
-   *
-   * @param {jQuery.Event} e
-   * @param {Drupal.dialog} dialog
-   * @param {jQuery} $element
-   * @param {object} settings
-   */
-  $(window).on('dialog:aftercreate', function (e, dialog, $element, settings) {
-    Drupal.behaviors.dialog.focus($element);
-    $element.on('click.dialog', '.dialog-cancel', function (e) {
-      dialog.close('cancel');
-      e.preventDefault();
-      e.stopPropagation();
-    });
-  });
-
-  /**
-   * Removes all 'dialog' listeners.
-   *
-   * @param {jQuery.Event} e
-   * @param {Drupal.dialog} dialog
-   * @param {jQuery} $element
-   */
-  $(window).on('dialog:beforeclose', function (e, dialog, $element) {
-    $element.off('.modal.drupal');
-  });
-
-})(jQuery, Drupal);
diff --git a/themes/bootstrap/js/misc/dialog.js b/themes/bootstrap/js/misc/dialog.js
deleted file mode 100644
index 5a92e82..0000000
--- a/themes/bootstrap/js/misc/dialog.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * @file
- * Dialog API inspired by HTML5 dialog element.
- *
- * @see http://www.whatwg.org/specs/web-apps/current-work/multipage/commands.html#the-dialog-element
- */
-
-(function ($, Drupal, drupalSettings) {
-
-  'use strict';
-
-  /**
-   * Default dialog options.
-   *
-   * @type {object}
-   *
-   * @prop {bool} [autoOpen=true]
-   * @prop {string} [dialogClass='']
-   * @prop {string} [buttonClass='button']
-   * @prop {string} [buttonPrimaryClass='button--primary']
-   * @prop {function} close
-   */
-  drupalSettings.dialog = {
-    autoOpen: true,
-    dialogClass: '',
-    // Drupal-specific extensions: see dialog.jquery-ui.js.
-    buttonClass: 'button',
-    buttonPrimaryClass: 'button--primary',
-    // When using this API directly (when generating dialogs on the client
-    // side), you may want to override this method and do
-    // `jQuery(event.target).remove()` as well, to remove the dialog on
-    // closing.
-    close: function (event) {
-      Drupal.detachBehaviors(event.target, null, 'unload');
-    }
-  };
-
-  /**
-   * @typedef {object} Drupal.dialog~dialogDefinition
-   *
-   * @prop {boolean} open
-   *   Is the dialog open or not.
-   * @prop {*} returnValue
-   *   Return value of the dialog.
-   * @prop {function} show
-   *   Method to display the dialog on the page.
-   * @prop {function} showModal
-   *   Method to display the dialog as a modal on the page.
-   * @prop {function} close
-   *   Method to hide the dialog from the page.
-   */
-
-  /**
-   * Polyfill HTML5 dialog element with jQueryUI.
-   *
-   * @param {HTMLElement} element
-   * @param {object} options
-   *   jQuery UI options to be passed to the dialog.
-   *
-   * @return {Drupal.dialog~dialogDefinition}
-   */
-  Drupal.dialog = function (element, options) {
-    var $element = $(element);
-
-    function openDialog(settings) {
-      settings = $.extend({}, drupalSettings.dialog, options, settings);
-      // Trigger a global event to allow scripts to bind events to the dialog.
-      $(window).trigger('dialog:beforecreate', [dialog, $element, settings]);
-      $element
-        .modal(settings)
-        .on('shown.bs.modal.drupal', function () {
-          dialog.open = true;
-          $(window).trigger('dialog:aftercreate', [dialog, $element, settings]);
-        })
-      ;
-    }
-
-    function closeDialog(value) {
-      $(window).trigger('dialog:beforeclose', [dialog, $element]);
-      $element
-        .on('hidden.bs.modal.drupal', function () {
-          dialog.returnValue = value;
-          dialog.open = false;
-          $(window).trigger('dialog:afterclose', [dialog, $element]);
-        })
-        .modal('hide');
-    }
-
-    var dialog = {
-      open: false,
-      returnValue: void(0),
-      show: function () {
-        openDialog({show: false});
-      },
-      showModal: function () {
-        openDialog({show: true});
-      },
-      close: closeDialog
-    };
-
-    return dialog;
-  };
-
-})(jQuery, Drupal, drupalSettings);
diff --git a/themes/bootstrap/js/misc/form.js b/themes/bootstrap/js/misc/form.js
deleted file mode 100644
index 98f576f..0000000
--- a/themes/bootstrap/js/misc/form.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file
- * Extends methods from core/misc/form.js.
- */
-
-(function ($, window, Drupal, drupalSettings) {
-
-  /**
-   * Behavior for "forms_has_error_value_toggle" theme setting.
-   */
-  Drupal.behaviors.bootstrapForm = {
-    attach: function (context) {
-      if (drupalSettings.bootstrap && drupalSettings.bootstrap.forms_has_error_value_toggle) {
-        var $context = $(context);
-        $context.find('.form-item.has-error:not(.form-type-password.has-feedback)').once('error').each(function () {
-          var $formItem = $(this);
-          var $input = $formItem.find(':input');
-          $input.on('keyup focus blur', function () {
-            if (this.defaultValue !== void 0) {
-              $formItem[this.defaultValue !== this.value ? 'addClass' : 'addClass']('has-error');
-              $input[this.defaultValue !== this.value ? 'addClass' : 'removeClass']('error');
-            }
-          });
-        });
-      }
-    }
-  };
-
-
-})(jQuery, this, Drupal, drupalSettings);
diff --git a/themes/bootstrap/js/misc/progress.js b/themes/bootstrap/js/misc/progress.js
deleted file mode 100644
index 6eaaa68..0000000
--- a/themes/bootstrap/js/misc/progress.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * @file
- * Extends methods from core/misc/progress.js.
- */
-
-(function ($, Drupal) {
-
-  'use strict';
-
-  /**
-   * Theme function for the progress bar.
-   *
-   * @param {string} id
-   *
-   * @return {string}
-   *   The HTML for the progress bar.
-   */
-  Drupal.theme.progressBar = function (id) {
-    return '<div class="progress-wrapper" aria-live="polite">' +
-             '<div class="message"></div>'+
-             '<div id ="' + id + '" class="progress progress-striped active">' +
-               '<div class="progress-bar" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0">' +
-                 '<span class="percentage"></span>' +
-               '</div>' +
-             '</div>' +
-             '<div class="progress-label"></div>' +
-           '</div>';
-  };
-
-  $.extend(Drupal.ProgressBar.prototype, /** @lends Drupal.ProgressBar */{
-
-    /**
-     * Set the percentage and status message for the progressbar.
-     *
-     * @param {number} percentage
-     * @param {string} message
-     * @param {string} label
-     */
-    setProgress: function (percentage, message, label) {
-      if (percentage >= 0 && percentage <= 100) {
-        $(this.element).find('.progress-bar').css('width', percentage + '%').attr('aria-valuenow', percentage);
-        $(this.element).find('.percentage').html(percentage + '%');
-      }
-      if (message) {
-        // Remove the unnecessary whitespace at the end of the message.
-        message = message.replace(/<br\/>&nbsp;|\s*$/, '');
-
-        $('.message', this.element).html(message);
-      }
-      if (label) {
-        $('.progress-label', this.element).html(label);
-      }
-      if (this.updateCallback) {
-        this.updateCallback(percentage, message, this);
-      }
-    },
-
-    /**
-     * Display errors on the page.
-     *
-     * @param {string} string
-     */
-    displayError: function (string) {
-      var error = $('<div class="alert alert-block alert-error"><a class="close" data-dismiss="alert" href="#">&times;</a><h4>' + Drupal.t('Error message') + '</h4></div>').append(string);
-      $(this.element).before(error).hide();
-
-      if (this.errorCallback) {
-        this.errorCallback(this);
-      }
-    }
-  });
-
-})(jQuery, Drupal);
diff --git a/themes/bootstrap/js/misc/states.js b/themes/bootstrap/js/misc/states.js
deleted file mode 100644
index bf9a82b..0000000
--- a/themes/bootstrap/js/misc/states.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file
- * Extends core/misc/states.js.
- */
-(function($) {
-
-  // Unbind core state.js from document first so we can then override below.
-  $(document).unbind('state:disabled');
-
-  /**
-   * Global state change handlers. These are bound to "document" to cover all
-   * elements whose state changes. Events sent to elements within the page
-   * bubble up to these handlers. We use this system so that themes and modules
-   * can override these state change handlers for particular parts of a page.
-   */
-  $(document).bind('state:disabled', function(e) {
-    // Only act when this change was triggered by a dependency and not by the
-    // element monitoring itself.
-    if (e.trigger) {
-      $(e.target)
-        .attr('disabled', e.value)
-        .closest('.form-item, .form-submit, .form-wrapper').toggleClass('form-disabled', e.value)
-        .find(':input').attr('disabled', e.value);
-
-      // Note: WebKit nightlies don't reflect that change correctly.
-      // See https://bugs.webkit.org/show_bug.cgi?id=23789
-    }
-  });
-
-})(jQuery);
diff --git a/themes/bootstrap/js/misc/tabledrag.js b/themes/bootstrap/js/misc/tabledrag.js
deleted file mode 100644
index ac41c8f..0000000
--- a/themes/bootstrap/js/misc/tabledrag.js
+++ /dev/null
@@ -1,457 +0,0 @@
-/**
- * @file
- * Extends methods from core/misc/tabledrag.js.
- */
-(function ($) {
-
-  // Save the original prototype.
-  var prototype = Drupal.tableDrag.prototype;
-
-  /**
-   * Provides table and field manipulation.
-   *
-   * @constructor
-   *
-   * @param {HTMLElement} table
-   *   DOM object for the table to be made draggable.
-   * @param {object} tableSettings
-   *   Settings for the table added via drupal_add_dragtable().
-   */
-  Drupal.tableDrag = function (table, tableSettings) {
-    var self = this;
-    var $table = $(table);
-
-    /**
-     * @type {jQuery}
-     */
-    this.$table = $(table);
-
-    /**
-     *
-     * @type {HTMLElement}
-     */
-    this.table = table;
-
-    /**
-     * @type {object}
-     */
-    this.tableSettings = tableSettings;
-
-    /**
-     * Used to hold information about a current drag operation.
-     *
-     * @type {?HTMLElement}
-     */
-    this.dragObject = null;
-
-    /**
-     * Provides operations for row manipulation.
-     *
-     * @type {?HTMLElement}
-     */
-    this.rowObject = null;
-
-    /**
-     * Remember the previous element.
-     *
-     * @type {?HTMLElement}
-     */
-    this.oldRowElement = null;
-
-    /**
-     * Used to determine up or down direction from last mouse move.
-     *
-     * @type {number}
-     */
-    this.oldY = 0;
-
-    /**
-     * Whether anything in the entire table has changed.
-     *
-     * @type {bool}
-     */
-    this.changed = false;
-
-    /**
-     * Maximum amount of allowed parenting.
-     *
-     * @type {number}
-     */
-    this.maxDepth = 0;
-
-    /**
-     * Direction of the table.
-     *
-     * @type {number}
-     */
-    this.rtl = $(this.table).css('direction') === 'rtl' ? -1 : 1;
-
-    /**
-     *
-     * @type {bool}
-     */
-    this.striping = $(this.table).data('striping') === 1;
-
-    /**
-     * Configure the scroll settings.
-     *
-     * @type {object}
-     *
-     * @prop {number} amount
-     * @prop {number} interval
-     * @prop {number} trigger
-     */
-    this.scrollSettings = {amount: 4, interval: 50, trigger: 70};
-
-    /**
-     *
-     * @type {?number}
-     */
-    this.scrollInterval = null;
-
-    /**
-     *
-     * @type {number}
-     */
-    this.scrollY = 0;
-
-    /**
-     *
-     * @type {number}
-     */
-    this.windowHeight = 0;
-
-    /**
-     * Check this table's settings to see if there are parent relationships in
-     * this table. For efficiency, large sections of code can be skipped if we
-     * don't need to track horizontal movement and indentations.
-     *
-     * @type {bool}
-     */
-    this.indentEnabled = false;
-    for (var group in tableSettings) {
-      if (tableSettings.hasOwnProperty(group)) {
-        for (var n in tableSettings[group]) {
-          if (tableSettings[group].hasOwnProperty(n)) {
-            if (tableSettings[group][n].relationship === 'parent') {
-              this.indentEnabled = true;
-            }
-            if (tableSettings[group][n].limit > 0) {
-              this.maxDepth = tableSettings[group][n].limit;
-            }
-          }
-        }
-      }
-    }
-    if (this.indentEnabled) {
-
-      /**
-       * Total width of indents, set in makeDraggable.
-       *
-       * @type {number}
-       */
-      this.indentCount = 1;
-      // Find the width of indentations to measure mouse movements against.
-      // Because the table doesn't need to start with any indentations, we
-      // manually append 2 indentations in the first draggable row, measure
-      // the offset, then remove.
-      var indent = Drupal.theme('tableDragIndentation');
-      var testRow = $('<tr/>').addClass('draggable').appendTo(table);
-      var testCell = $('<td/>').appendTo(testRow).prepend(indent).prepend(indent);
-      var $indentation = testCell.find('.js-indentation');
-
-      /**
-       *
-       * @type {number}
-       */
-      this.indentAmount = $indentation.get(1).offsetLeft - $indentation.get(0).offsetLeft;
-      testRow.remove();
-    }
-
-    // Make each applicable row draggable.
-    // Match immediate children of the parent element to allow nesting.
-    $table.find('> tr.draggable, > tbody > tr.draggable').each(function () { self.makeDraggable(this); });
-
-    // Add a link before the table for users to show or hide weight columns.
-    var $button = $(Drupal.theme('btn-sm', {
-      'class': ['tabledrag-toggle-weight'],
-      title: Drupal.t('Re-order rows by numerical weight instead of dragging.'),
-      'data-toggle': 'tooltip'
-    }));
-
-    $button
-      .on('click', $.proxy(function (e) {
-        e.preventDefault();
-        this.toggleColumns();
-      }, this))
-      .wrap('<div class="tabledrag-toggle-weight-wrapper"></div>')
-      .parent()
-    ;
-    $table.before($button);
-
-    // Initialize the specified columns (for example, weight or parent columns)
-    // to show or hide according to user preference. This aids accessibility
-    // so that, e.g., screen reader users can choose to enter weight values and
-    // manipulate form elements directly, rather than using drag-and-drop..
-    self.initColumns();
-
-    // Add event bindings to the document. The self variable is passed along
-    // as event handlers do not have direct access to the tableDrag object.
-    $(document).on('touchmove', function (event) { return self.dragRow(event.originalEvent.touches[0], self); });
-    $(document).on('touchend', function (event) { return self.dropRow(event.originalEvent.touches[0], self); });
-    $(document).on('mousemove pointermove', function (event) { return self.dragRow(event, self); });
-    $(document).on('mouseup pointerup', function (event) { return self.dropRow(event, self); });
-
-    // React to localStorage event showing or hiding weight columns.
-    $(window).on('storage', $.proxy(function (e) {
-      // Only react to 'Drupal.tableDrag.showWeight' value change.
-      if (e.originalEvent.key === 'Drupal.tableDrag.showWeight') {
-        // This was changed in another window, get the new value for this
-        // window.
-        showWeight = JSON.parse(e.originalEvent.newValue);
-        this.displayColumns(showWeight);
-      }
-    }, this));
-  };
-
-  // Restore the original prototype.
-  Drupal.tableDrag.prototype = prototype;
-
-  /**
-   * Take an item and add event handlers to make it become draggable.
-   *
-   * @param {HTMLElement} item
-   */
-  Drupal.tableDrag.prototype.makeDraggable = function (item) {
-    var self = this;
-    var $item = $(item);
-
-    // Add a class to the title link
-    $item.find('td:first-of-type').find('a').addClass('menu-item__link');
-
-    // Create the handle.
-    var handle = $('<a href="#" class="tabledrag-handle"/>');
-
-    // Insert the handle after indentations (if any).
-    var $indentationLast = $item.find('td:first-of-type').find('.js-indentation').eq(-1);
-    if ($indentationLast.length) {
-      $indentationLast.after(handle);
-      // Update the total width of indentation in this entire table.
-      self.indentCount = Math.max($item.find('.js-indentation').length, self.indentCount);
-    }
-    else {
-      $item.find('td').eq(0).prepend(handle);
-    }
-
-    // Add the glyphicon to the handle.
-    handle
-      .attr('title', Drupal.t('Drag to re-order'))
-      .attr('data-toggle', 'tooltip')
-      .append(Drupal.theme('bootstrapIcon', 'move'))
-    ;
-
-    handle.on('mousedown touchstart pointerdown', function (event) {
-      event.preventDefault();
-      if (event.originalEvent.type === 'touchstart') {
-        event = event.originalEvent.touches[0];
-      }
-      self.dragStart(event, self, item);
-    });
-
-    // Prevent the anchor tag from jumping us to the top of the page.
-    handle.on('click', function (e) {
-      e.preventDefault();
-    });
-
-    // Set blur cleanup when a handle is focused.
-    handle.on('focus', function () {
-      self.safeBlur = true;
-    });
-
-    // On blur, fire the same function as a touchend/mouseup. This is used to
-    // update values after a row has been moved through the keyboard support.
-    handle.on('blur', function (event) {
-      if (self.rowObject && self.safeBlur) {
-        self.dropRow(event, self);
-      }
-    });
-
-    // Add arrow-key support to the handle.
-    handle.on('keydown', function (event) {
-      // If a rowObject doesn't yet exist and this isn't the tab key.
-      if (event.keyCode !== 9 && !self.rowObject) {
-        self.rowObject = new self.row(item, 'keyboard', self.indentEnabled, self.maxDepth, true);
-      }
-
-      var keyChange = false;
-      var groupHeight;
-      switch (event.keyCode) {
-        // Left arrow.
-        case 37:
-        // Safari left arrow.
-        case 63234:
-          keyChange = true;
-          self.rowObject.indent(-1 * self.rtl);
-          break;
-
-        // Up arrow.
-        case 38:
-        // Safari up arrow.
-        case 63232:
-          var $previousRow = $(self.rowObject.element).prev('tr:first-of-type');
-          var previousRow = $previousRow.get(0);
-          while (previousRow && $previousRow.is(':hidden')) {
-            $previousRow = $(previousRow).prev('tr:first-of-type');
-            previousRow = $previousRow.get(0);
-          }
-          if (previousRow) {
-            // Do not allow the onBlur cleanup.
-            self.safeBlur = false;
-            self.rowObject.direction = 'up';
-            keyChange = true;
-
-            if ($(item).is('.tabledrag-root')) {
-              // Swap with the previous top-level row.
-              groupHeight = 0;
-              while (previousRow && $previousRow.find('.js-indentation').length) {
-                $previousRow = $(previousRow).prev('tr:first-of-type');
-                previousRow = $previousRow.get(0);
-                groupHeight += $previousRow.is(':hidden') ? 0 : previousRow.offsetHeight;
-              }
-              if (previousRow) {
-                self.rowObject.swap('before', previousRow);
-                // No need to check for indentation, 0 is the only valid one.
-                window.scrollBy(0, -groupHeight);
-              }
-            }
-            else if (self.table.tBodies[0].rows[0] !== previousRow || $previousRow.is('.draggable')) {
-              // Swap with the previous row (unless previous row is the first
-              // one and undraggable).
-              self.rowObject.swap('before', previousRow);
-              self.rowObject.interval = null;
-              self.rowObject.indent(0);
-              window.scrollBy(0, -parseInt(item.offsetHeight, 10));
-            }
-            // Regain focus after the DOM manipulation.
-            handle.trigger('focus');
-          }
-          break;
-
-        // Right arrow.
-        case 39:
-        // Safari right arrow.
-        case 63235:
-          keyChange = true;
-          self.rowObject.indent(self.rtl);
-          break;
-
-        // Down arrow.
-        case 40:
-        // Safari down arrow.
-        case 63233:
-          var $nextRow = $(self.rowObject.group).eq(-1).next('tr:first-of-type');
-          var nextRow = $nextRow.get(0);
-          while (nextRow && $nextRow.is(':hidden')) {
-            $nextRow = $(nextRow).next('tr:first-of-type');
-            nextRow = $nextRow.get(0);
-          }
-          if (nextRow) {
-            // Do not allow the onBlur cleanup.
-            self.safeBlur = false;
-            self.rowObject.direction = 'down';
-            keyChange = true;
-
-            if ($(item).is('.tabledrag-root')) {
-              // Swap with the next group (necessarily a top-level one).
-              groupHeight = 0;
-              var nextGroup = new self.row(nextRow, 'keyboard', self.indentEnabled, self.maxDepth, false);
-              if (nextGroup) {
-                $(nextGroup.group).each(function () {
-                  groupHeight += $(this).is(':hidden') ? 0 : this.offsetHeight;
-                });
-                var nextGroupRow = $(nextGroup.group).eq(-1).get(0);
-                self.rowObject.swap('after', nextGroupRow);
-                // No need to check for indentation, 0 is the only valid one.
-                window.scrollBy(0, parseInt(groupHeight, 10));
-              }
-            }
-            else {
-              // Swap with the next row.
-              self.rowObject.swap('after', nextRow);
-              self.rowObject.interval = null;
-              self.rowObject.indent(0);
-              window.scrollBy(0, parseInt(item.offsetHeight, 10));
-            }
-            // Regain focus after the DOM manipulation.
-            handle.trigger('focus');
-          }
-          break;
-      }
-
-      if (self.rowObject && self.rowObject.changed === true) {
-        $(item).addClass('drag');
-        if (self.oldRowElement) {
-          $(self.oldRowElement).removeClass('drag-previous');
-        }
-        self.oldRowElement = item;
-        if (self.striping === true) {
-          self.restripeTable();
-        }
-        self.onDrag();
-      }
-
-      // Returning false if we have an arrow key to prevent scrolling.
-      if (keyChange) {
-        return false;
-      }
-    });
-
-    // Compatibility addition, return false on keypress to prevent unwanted
-    // scrolling. IE and Safari will suppress scrolling on keydown, but all
-    // other browsers need to return false on keypress.
-    // http://www.quirksmode.org/js/keys.html
-    handle.on('keypress', function (event) {
-      switch (event.keyCode) {
-        // Left arrow.
-        case 37:
-        // Up arrow.
-        case 38:
-        // Right arrow.
-        case 39:
-        // Down arrow.
-        case 40:
-          return false;
-      }
-    });
-  };
-
-  /**
-   * Add an asterisk or other marker to the changed row.
-   */
-  Drupal.tableDrag.prototype.row.prototype.markChanged = function () {
-    var $cell = $('td:first', this.element);
-    // Find the first appropriate place to insert the marker.
-    var $target = $($cell.find('.file-size').get(0) || $cell.find('.file').get(0) || $cell.find('.tabledrag-handle').get(0));
-    if (!$cell.find('.tabledrag-changed').length) {
-      $target.after(' ' + Drupal.theme('tableDragChangedMarker') + ' ');
-    }
-  };
-
-  $.extend(Drupal.theme, /** @lends Drupal.theme */{
-
-    /**
-     * @return {string}
-     */
-    tableDragChangedMarker: function () {
-      return Drupal.theme('bootstrapIcon', 'warning-sign', {'class': ['tabledrag-changed', 'text-warning']});
-    },
-
-    /**
-     * @return {string}
-     */
-    tableDragChangedWarning: function () {
-      return '<div class="tabledrag-changed-warning alert alert-sm alert-warning messages warning">' + Drupal.theme('tableDragChangedMarker') + ' ' + Drupal.t('You have unsaved changes.') + '</div>';
-    }
-  });
-
-})(jQuery);
diff --git a/themes/bootstrap/js/misc/vertical-tabs.js b/themes/bootstrap/js/misc/vertical-tabs.js
deleted file mode 100644
index 25befa5..0000000
--- a/themes/bootstrap/js/misc/vertical-tabs.js
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- * @file
- * Overrides core/misc/vertical-tabs.js.
- */
-
-(function ($, window, Drupal, drupalSettings) {
-  "use strict";
-
-  /**
-   * This script transforms a set of details into a stack of vertical
-   * tabs. Another tab pane can be selected by clicking on the respective
-   * tab.
-   *
-   * Each tab may have a summary which can be updated by another
-   * script. For that to work, each details element has an associated
-   * 'verticalTabCallback' (with jQuery.data() attached to the details),
-   * which is called every time the user performs an update to a form
-   * element inside the tab pane.
-   */
-  Drupal.behaviors.verticalTabs = {
-    attach: function (context) {
-      var width = drupalSettings.widthBreakpoint || 640;
-      var mq = '(max-width: ' + width + 'px)';
-
-      if (window.matchMedia(mq).matches) {
-        return;
-      }
-
-      $(context).find('[data-vertical-tabs-panes]').once('vertical-tabs').each(function () {
-        var $this = $(this).addClass('tab-content vertical-tabs-panes');
-
-        var focusID = $(':hidden.vertical-tabs__active-tab', this).val();
-        if (typeof focusID === 'undefined' || !focusID.length) {
-          focusID = false;
-        }
-        var tab_focus;
-
-        // Check if there are some details that can be converted to vertical-tabs
-        var $details = $this.find('> .panel');
-        if ($details.length === 0) {
-          return;
-        }
-
-        // Create the tab column.
-        var tab_list = $('<ul class="nav nav-tabs vertical-tabs-list"></ul>');
-        $this.wrap('<div class="tabbable tabs-left vertical-tabs clearfix"></div>').before(tab_list);
-
-        // Transform each details into a tab.
-        $details.each(function () {
-          var $that = $(this);
-          var vertical_tab = new Drupal.verticalTab({
-            title: $that.find('> .panel-heading > .panel-title, > .panel-heading').last().html(),
-            details: $that
-          });
-          tab_list.append(vertical_tab.item);
-          $that
-            .removeClass('collapsed')
-            // prop() can't be used on browsers not supporting details element,
-            // the style won't apply to them if prop() is used.
-            .attr('open', true)
-            .removeClass('collapsible collapsed panel panel-default')
-            .addClass('tab-pane vertical-tabs-pane')
-            .data('verticalTab', vertical_tab)
-            .find('> .panel-heading').remove();
-          if (this.id === focusID) {
-            tab_focus = $that;
-          }
-        });
-
-        $(tab_list).find('> li:first').addClass('first');
-        $(tab_list).find('> li:last').addClass('last');
-
-        if (!tab_focus) {
-          // If the current URL has a fragment and one of the tabs contains an
-          // element that matches the URL fragment, activate that tab.
-          var $locationHash = $this.find(window.location.hash);
-          if (window.location.hash && $locationHash.length) {
-            tab_focus = $locationHash.closest('.vertical-tabs-pane');
-          }
-          else {
-            tab_focus = $this.find('> .vertical-tabs-pane:first');
-          }
-        }
-        if (tab_focus.length) {
-          tab_focus.data('verticalTab').focus();
-        }
-      });
-
-      // Provide some Bootstrap tab/Drupal integration.
-      // @todo merge this into the above code from core.
-      $(context).find('.tabbable').once('bootstrap-tabs').each(function () {
-        var $wrapper = $(this);
-        var $tabs = $wrapper.find('.nav-tabs');
-        var $content = $wrapper.find('.tab-content');
-        var borderRadius = parseInt($content.css('borderBottomRightRadius'), 10);
-        var bootstrapTabResize = function() {
-          if ($wrapper.hasClass('tabs-left') || $wrapper.hasClass('tabs-right')) {
-            $content.css('min-height', $tabs.outerHeight());
-          }
-        };
-        // Add min-height on content for left and right tabs.
-        bootstrapTabResize();
-        // Detect tab switch.
-        if ($wrapper.hasClass('tabs-left') || $wrapper.hasClass('tabs-right')) {
-          $tabs.on('shown.bs.tab', 'a[data-toggle="tab"]', function (e) {
-            bootstrapTabResize();
-            if ($wrapper.hasClass('tabs-left')) {
-              if ($(e.target).parent().is(':first-child')) {
-                $content.css('borderTopLeftRadius', '0');
-              }
-              else {
-                $content.css('borderTopLeftRadius', borderRadius + 'px');
-              }
-            }
-            else {
-              if ($(e.target).parent().is(':first-child')) {
-                $content.css('borderTopRightRadius', '0');
-              }
-              else {
-                $content.css('borderTopRightRadius', borderRadius + 'px');
-              }
-            }
-          });
-        }
-      });
-    }
-  };
-
-  /**
-   * The vertical tab object represents a single tab within a tab group.
-   *
-   * @param settings
-   *   An object with the following keys:
-   *   - title: The name of the tab.
-   *   - details: The jQuery object of the details element that is the tab pane.
-   */
-  Drupal.verticalTab = function (settings) {
-    var self = this;
-    $.extend(this, settings, Drupal.theme('verticalTab', settings));
-
-    this.link.attr('href', '#' + settings.details.attr('id'));
-
-    this.link.on('click', function (e) {
-      e.preventDefault();
-      self.focus();
-    });
-
-    // Keyboard events added:
-    // Pressing the Enter key will open the tab pane.
-    this.link.on('keydown', function (event) {
-      event.preventDefault();
-      if (event.keyCode === 13) {
-        self.focus();
-        // Set focus on the first input field of the visible details/tab pane.
-        $(".vertical-tabs-pane :input:visible:enabled:first").trigger('focus');
-      }
-    });
-
-    this.details
-      .on('summaryUpdated', function () {
-        self.updateSummary();
-      })
-      .trigger('summaryUpdated');
-  };
-
-  Drupal.verticalTab.prototype = {
-    /**
-     * Displays the tab's content pane.
-     */
-    focus: function () {
-      this.details
-        .siblings('.vertical-tabs-pane')
-        .each(function () {
-          $(this).removeClass('active').find('> div').removeClass('in');
-          var tab = $(this).data('verticalTab');
-          tab.item.removeClass('selected');
-        })
-        .end()
-        .addClass('active')
-        .siblings(':hidden.vertical-tabs-active-tab')
-        .val(this.details.attr('id'));
-      this.details.find('> div').addClass('in');
-      this.details.data('verticalTab').item.find('a').tab('show');
-      this.item.addClass('selected');
-      // Mark the active tab for screen readers.
-      $('#active-vertical-tab').remove();
-      this.link.append('<span id="active-vertical-tab" class="visually-hidden">' + Drupal.t('(active tab)') + '</span>');
-    },
-
-    /**
-     * Updates the tab's summary.
-     */
-    updateSummary: function () {
-      this.summary.html(this.details.drupalGetSummary());
-    },
-
-    /**
-     * Shows a vertical tab pane.
-     */
-    tabShow: function () {
-      // Display the tab.
-      this.item.show();
-      // Show the vertical tabs.
-      this.item.closest('.form-type-vertical-tabs').show();
-      // Update .first marker for items. We need recurse from parent to retain the
-      // actual DOM element order as jQuery implements sortOrder, but not as public
-      // method.
-      this.item.parent().children('.vertical-tab-button').removeClass('first')
-        .filter(':visible:first').addClass('first');
-      // Display the details element.
-      this.details.removeClass('vertical-tab-hidden').show();
-      // Focus this tab.
-      this.focus();
-      return this;
-    },
-
-    /**
-     * Hides a vertical tab pane.
-     */
-    tabHide: function () {
-      // Hide this tab.
-      this.item.hide();
-      // Update .first marker for items. We need recurse from parent to retain the
-      // actual DOM element order as jQuery implements sortOrder, but not as public
-      // method.
-      this.item.parent().children('.vertical-tab-button').removeClass('first')
-        .filter(':visible:first').addClass('first');
-      // Hide the details element.
-      this.details.addClass('vertical-tab-hidden').hide();
-      // Focus the first visible tab (if there is one).
-      var $firstTab = this.details.siblings('.vertical-tabs-pane:not(.vertical-tab-hidden):first');
-      if ($firstTab.length) {
-        $firstTab.data('verticalTab').focus();
-      }
-      // Hide the vertical tabs (if no tabs remain).
-      else {
-        this.item.closest('.form-type-vertical-tabs').hide();
-      }
-      return this;
-    }
-  };
-
-  /**
-   * Theme function for a vertical tab.
-   *
-   * @param settings
-   *   An object with the following keys:
-   *   - title: The name of the tab.
-   * @return
-   *   This function has to return an object with at least these keys:
-   *   - item: The root tab jQuery element
-   *   - link: The anchor tag that acts as the clickable area of the tab
-   *       (jQuery version)
-   *   - summary: The jQuery element that contains the tab summary
-   */
-  Drupal.theme.verticalTab = function (settings) {
-    var tab = {};
-    tab.item = $('<li class="vertical-tab-button" tabindex="-1"></li>')
-      .append(tab.link = $('<a href="#' + settings.details[0].id + '" data-toggle="tab"></a>')
-        .append(tab.title = $('<span></span>').html(settings.title))
-        .append(tab.summary = $('<div class="summary"></div>')
-      )
-    );
-    return tab;
-  };
-
-})(jQuery, this, Drupal, drupalSettings);
diff --git a/themes/bootstrap/js/modal.js b/themes/bootstrap/js/modal.js
deleted file mode 100644
index 8f32e5b..0000000
--- a/themes/bootstrap/js/modal.js
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * @file
- * Bootstrap Modals.
- */
-(function ($, Drupal, Bootstrap) {
-  "use strict";
-
-  /**
-   * Extend the Bootstrap Modal plugin constructor class.
-   */
-  Bootstrap.extendPlugin('modal', function (settings) {
-    return {
-      DEFAULTS: {
-        animation: !!settings.modal_animation,
-        backdrop: settings.modal_backdrop === 'static' ? 'static' : !!settings.modal_backdrop,
-        keyboard: !!settings.modal_keyboard,
-        show: !!settings.modal_show,
-        size: settings.modal_size
-      }
-    };
-  });
-
-  /**
-   * Replace the Bootstrap Modal jQuery plugin definition.
-   *
-   * Replacing this is needed so that the "option" method can return values.
-   */
-  Bootstrap.replacePlugin('modal', function () {
-    var Modal = this;
-
-    // Extract the arguments.
-    var args = Array.prototype.slice.call(arguments, 1);
-
-    // Modal jQuery Plugin Definition.
-    return function (option, _relatedTarget) {
-      var ret = void(0);
-      this.each(function () {
-        var $this   = $(this);
-        var data    = $this.data('bs.modal');
-        var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option);
-
-        if (!data) $this.data('bs.modal', (data = new Modal(this, options)));
-        if (typeof option == 'string') ret = data[option].apply(data, args);
-        else if (options.show) data.show(_relatedTarget);
-      });
-
-      // If just one element and there was a result returned for the option passed,
-      // then return the result. Otherwise, just return the jQuery object.
-      return this.length === 1 && ret !== void(0) ? ret : this;
-    }
-  });
-
-  /**
-   * Extend Drupal theming functions.
-   */
-  $.extend(Drupal.theme, /** @lend Drupal.theme */ {
-    /**
-     * Theme function for a Bootstrap Modal.
-     *
-     * @param {object}[variables]
-     *   An object with the following keys:
-     *   - title: The name of the tab.
-     *
-     * @return {string}
-     *   The HTML for the modal.
-     */
-    bootstrapModal: function (variables) {
-      var settings = drupalSettings.bootstrap || {};
-      var defaults = {
-        body: '',
-        closeButton: true,
-        description: {
-          content: null,
-          position: 'before'
-        },
-        footer: '',
-        id: 'drupal-modal',
-        size: settings.modal_size ? settings.modal_size : '',
-        title: Drupal.t('Loading...')
-      };
-      variables = $.extend(true, {}, defaults, variables);
-      var output = '';
-
-      // Build the modal wrapper.
-      var classes = ['modal'];
-      if (settings.modal_animation) {
-        classes.push('fade');
-      }
-      output += '<div id="' + variables.id + '" class="' + classes.join(' ') + '" tabindex="-1" role="dialog">';
-
-      // Build the modal-dialog wrapper.
-      var dialogClasses = ['modal-dialog'];
-      if (variables.size) {
-        // @todo This should really be a clean CSS class method instead.
-        dialogClasses.push(Drupal.checkPlain(variables.size));
-      }
-      output += '<div class="' + dialogClasses.join(' ') + '" role="document">';
-
-      // Build the modal-content wrapper.
-      output += '<div class="modal-content">';
-
-      // Build the header wrapper and title.
-      output += Drupal.theme.bootstrapModalHeader(variables.title, variables.closeButton);
-
-      // Build the body.
-      output += Drupal.theme.bootstrapModalBody(variables.id + '--body', variables.body, variables.description);
-
-      // Build the footer.
-      output += Drupal.theme.bootstrapModalFooter(variables.footer);
-
-      // Close the modal-content wrapper.
-      output += '</div>';
-
-      // Close the modal-dialog wrapper.
-      output += '</div>';
-
-      // Close the modal wrapper.
-      output += '</div>';
-
-      // Return the constructed modal.
-      return output;
-    },
-
-    /**
-     * Theme function for a Bootstrap Modal body markup.
-     *
-     * @param {string} id
-     *   A unique ID for the modal body div.
-     * @param {string} body
-     *   The HTML markup to place in the body.
-     * @param {string|object} description
-     *   A description to show. Can either be a string or an object with the
-     *   following key/value pairs:
-     *   - content: The description value.
-     *   - position: (optional) A display setting that can have these values:
-     *     - before: The description is displayed before the body. This is the
-     *       default value.
-     *     - after: The description is display after the body.
-     *     - invisible: The description is displayed after the element, hidden
-     *       visually but available to screen readers.
-     *
-     * @return {string}
-     *   The HTML for the modal close button.
-     */
-    bootstrapModalBody: function (id, body, description) {
-      var output = '';
-      output += '<div id="' + id + '" class="modal-body">';
-      if (!description || !$.isPlainObject(description)) {
-        description = { content: description};
-      }
-      description = $.extend({ position: 'before' }, description);
-
-      var descriptionClasses = ['help-block'];
-      if (description.content && description.position === 'invisible') {
-        descriptionClasses.push('sr-only');
-      }
-      if (description.content && description.position === 'before') {
-        output += '<p class="' + descriptionClasses.join(' ') + '">' + description.content + '</p>';
-      }
-      output += body;
-      if (description.content && (description.position === 'after' || description.position === 'invisible')) {
-        output += '<p class="' + descriptionClasses.join(' ') + '">' + description.content + '</p>';
-      }
-      output += '</div>';
-      return output;
-    },
-
-    /**
-     * Theme function for a Bootstrap Modal close button.
-     *
-     * @return {string}
-     *   The HTML for the modal close button.
-     */
-    bootstrapModalClose: function () {
-      return '<button type="button" class="close" data-dismiss="modal" aria-label="' + Drupal.t('Close') + '"><span aria-hidden="true">&times;</span></button>';
-    },
-
-    /**
-     * Theme function for a Bootstrap Modal footer.
-     *
-     * @param {string} [footer]
-     *   The HTML markup to place in the footer.
-     * @param {boolean} [force]
-     *   Flag to force the rendering of the footer.
-     *
-     * @return {string}
-     *   The HTML for the modal footer.
-     */
-    bootstrapModalFooter: function (footer, force) {
-      return footer || force ? '<div class="modal-footer">' + (footer || '') + '</div>' : '';
-    },
-
-    /**
-     * Theme function for a Bootstrap Modal header.
-     *
-     * @param {string} [title]
-     *   The title for the header.
-     * @param {boolean} [closeButton]
-     *   Flag indicating whether or not to show the close button in the header.
-     *
-     * @return {string}
-     *   The HTML for the modal header.
-     */
-    bootstrapModalHeader: function (title, closeButton) {
-      var output = '';
-      if (title) {
-        closeButton = closeButton !== void(0) ? closeButton : true;
-        output += '<div class="modal-header">';
-        if (closeButton) {
-          output += Drupal.theme.bootstrapModalClose();
-        }
-        output += '<h4 class="modal-title">' + Drupal.checkPlain(title) + '</h4>';
-        output += '</div>';
-      }
-      return output;
-    }
-  })
-
-})(window.jQuery, window.Drupal, window.Drupal.bootstrap);
diff --git a/themes/bootstrap/js/modules/filter/filter.js b/themes/bootstrap/js/modules/filter/filter.js
deleted file mode 100644
index 34d8488..0000000
--- a/themes/bootstrap/js/modules/filter/filter.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @file
- * Attaches behavior for the Filter module.
- */
-
-(function ($) {
-  'use strict';
-
-  function updateFilterHelpLink () {
-    var $link = $(this).parents('.filter-wrapper').find('.filter-help > a');
-    var originalLink = $link.data('originalLink');
-    if (!originalLink) {
-      originalLink = $link.attr('href');
-      $link.data('originalLink', originalLink);
-    }
-    $link.attr('href', originalLink + '/' + $(this).find(':selected').val());
-  }
-
-  $(document).on('change', '.filter-wrapper select.filter-list', updateFilterHelpLink);
-
-  /**
-   * Displays the guidelines of the selected text format automatically.
-   *
-   * @type {Drupal~behavior}
-   *
-   * @prop {Drupal~behaviorAttach} attach
-   *   Attaches behavior for updating filter guidelines.
-   */
-  Drupal.behaviors.filterGuidelines = {
-    attach: function (context) {
-      $(context).find('.filter-wrapper select.filter-list').once('filter-list').each(updateFilterHelpLink);
-    }
-  };
-
-})(jQuery);
diff --git a/themes/bootstrap/js/modules/image_widget_crop/ImageWidgetCrop.js b/themes/bootstrap/js/modules/image_widget_crop/ImageWidgetCrop.js
deleted file mode 100644
index 6e5069a..0000000
--- a/themes/bootstrap/js/modules/image_widget_crop/ImageWidgetCrop.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @file
- * Theme hooks for the Drupal Bootstrap base theme.
- */
-(function ($, Drupal) {
-
-  if (Drupal.ImageWidgetCrop && Drupal.ImageWidgetCrop.prototype && Drupal.ImageWidgetCrop.prototype.selectors && Drupal.ImageWidgetCrop.prototype.selectors.summary) {
-    Drupal.ImageWidgetCrop.prototype.selectors.summary += ', > .panel-heading > .panel-title';
-  }
-
-})(window.jQuery, window.Drupal);
diff --git a/themes/bootstrap/js/modules/views/ajax_view.js b/themes/bootstrap/js/modules/views/ajax_view.js
deleted file mode 100644
index 4b7d995..0000000
--- a/themes/bootstrap/js/modules/views/ajax_view.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- * Extends core ajax_view.js.
- */
-
-(function ($, Drupal) {
-  'use strict';
-
-  /**
-   * @method
-   */
-  Drupal.views.ajaxView.prototype.attachExposedFormAjax = function () {
-    var that = this;
-    this.exposedFormAjax = [];
-    $('button[type=submit], input[type=submit], input[type=image]', this.$exposed_form).not('[data-drupal-selector=edit-reset]').each(function (index) {
-      var self_settings = $.extend({}, that.element_settings, {
-        base: $(this).attr('id'),
-        element: this
-      });
-      that.exposedFormAjax[index] = Drupal.ajax(self_settings);
-    });
-  };
-
-})(jQuery, Drupal);
diff --git a/themes/bootstrap/js/popover.js b/themes/bootstrap/js/popover.js
deleted file mode 100644
index 198cd3e..0000000
--- a/themes/bootstrap/js/popover.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * @file
- * Bootstrap Popovers.
- */
-
-var Drupal = Drupal || {};
-
-(function ($, Drupal, Bootstrap) {
-  "use strict";
-
-  /**
-   * Extend the Bootstrap Popover plugin constructor class.
-   */
-  Bootstrap.extendPlugin('popover', function (settings) {
-    return {
-      DEFAULTS: {
-        animation: !!settings.popover_animation,
-        enabled: settings.popover_enabled,
-        html: !!settings.popover_html,
-        placement: settings.popover_placement,
-        selector: settings.popover_selector,
-        trigger: settings.popover_trigger,
-        triggerAutoclose: !!settings.popover_trigger_autoclose,
-        title: settings.popover_title,
-        content: settings.popover_content,
-        delay: parseInt(settings.popover_delay, 10),
-        container: settings.popover_container
-      }
-    };
-  });
-
-  /**
-   * Bootstrap Popovers.
-   *
-   * @todo This should really be properly delegated if selector option is set.
-   */
-  Drupal.behaviors.bootstrapPopovers = {
-    attach: function (context) {
-      // Immediately return if popovers are not available.
-      if (!$.fn.popover || !$.fn.popover.Constructor.DEFAULTS.enabled) {
-        return;
-      }
-
-      // Popover autoclose.
-      if ($.fn.popover.Constructor.DEFAULTS.triggerAutoclose) {
-        var $currentPopover = null;
-        $(document)
-          .on('show.bs.popover', '[data-toggle=popover]', function () {
-            var $trigger = $(this);
-            var popover = $trigger.data('bs.popover');
-
-            // Only keep track of clicked triggers that we're manually handling.
-            if (popover.options.originalTrigger === 'click') {
-              if ($currentPopover && !$currentPopover.is($trigger)) {
-                $currentPopover.popover('hide');
-              }
-              $currentPopover = $trigger;
-            }
-          })
-          .on('click', function (e) {
-            var $target = $(e.target);
-            var popover = $target.is('[data-toggle=popover]') && $target.data('bs.popover');
-            if ($currentPopover && !$target.is('[data-toggle=popover]') && !$target.closest('.popover.in')[0]) {
-              $currentPopover.popover('hide');
-              $currentPopover = null;
-            }
-          })
-        ;
-      }
-
-      var elements = $(context).find('[data-toggle=popover]').toArray();
-      for (var i = 0; i < elements.length; i++) {
-        var $element = $(elements[i]);
-        var options = $.extend({}, $.fn.popover.Constructor.DEFAULTS, $element.data());
-
-        // Store the original trigger.
-        options.originalTrigger = options.trigger;
-
-        // If the trigger is "click", then we'll handle it manually here.
-        if (options.trigger === 'click') {
-          options.trigger = 'manual';
-        }
-
-        // Retrieve content from a target element.
-        var $target = $(options.target || $element.is('a[href^="#"]') && $element.attr('href')).clone();
-        if (!options.content && $target[0]) {
-          $target.removeClass('visually-hidden hidden').removeAttr('aria-hidden');
-          options.content = $target.wrap('<div/>').parent()[options.html ? 'html' : 'text']() || '';
-        }
-
-        // Initialize the popover.
-        $element.popover(options);
-
-        // Handle clicks manually.
-        if (options.originalTrigger === 'click') {
-          // To ensure the element is bound multiple times, remove any
-          // previously set event handler before adding another one.
-          $element
-            .off('click.drupal.bootstrap.popover')
-            .on('click.drupal.bootstrap.popover', function (e) {
-              $(this).popover('toggle');
-              e.preventDefault();
-              e.stopPropagation();
-            })
-          ;
-        }
-      }
-    },
-    detach: function (context) {
-      // Immediately return if popovers are not available.
-      if (!$.fn.popover || !$.fn.popover.Constructor.DEFAULTS.enabled) {
-        return;
-      }
-
-      // Destroy all popovers.
-      $(context).find('[data-toggle="popover"]')
-        .off('click.drupal.bootstrap.popover')
-        .popover('destroy')
-      ;
-    }
-  };
-
-})(window.jQuery, window.Drupal, window.Drupal.bootstrap);
diff --git a/themes/bootstrap/js/text/text.js b/themes/bootstrap/js/text/text.js
deleted file mode 100644
index 7665919..0000000
--- a/themes/bootstrap/js/text/text.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * @file
- * Text behaviors.
- */
-
-(function ($) {
-
-  'use strict';
-
-  /**
-   * Auto-hide summary textarea if empty and show hide and unhide links.
-   *
-   * @type {Drupal~behavior}
-   *
-   * @prop {Drupal~behaviorAttach} attach
-   *   Attaches auto-hide behavior on `text-summary` events.
-   */
-  Drupal.behaviors.textSummary = {
-    attach: function (context, settings) {
-      $(context).find('.js-text-summary').once('text-summary').each(function () {
-        var $widget = $(this).closest('.js-text-format-wrapper');
-
-        var $summary = $widget.find('.js-text-summary-wrapper');
-        var $summaryLabel = $summary.find('label').eq(0);
-        var $full = $widget.find('.js-text-full').closest('.js-form-item');
-        var $fullLabel = $full.find('label').eq(0);
-
-        // Create a placeholder label when the field cardinality is greater
-        // than 1.
-        if ($fullLabel.length === 0) {
-          $fullLabel = $('<label></label>').prependTo($full);
-        }
-
-        // Set up the edit/hide summary link.
-        var $link = $('<span class="field-edit-link"><button type="button" class="link link-edit-summary btn btn-default btn-xs pull-right" data-toggle="button" aria-pressed="false" autocomplete="off">' + Drupal.t('Hide summary') + '</button></span>');
-        var $button = $link.find('button');
-        var toggleClick = true;
-        $link.on('click', function (e) {
-          if (toggleClick) {
-            $summary.hide();
-            $button.html(Drupal.t('Edit summary'));
-            $fullLabel.before($link);
-          }
-          else {
-            $summary.show();
-            $button.html(Drupal.t('Hide summary'));
-            $summaryLabel.before($link);
-          }
-          e.preventDefault();
-          toggleClick = !toggleClick;
-        });
-        $summaryLabel.before($link);
-
-        // If no summary is set, hide the summary field.
-        if ($widget.find('.js-text-summary').val() === '') {
-          $link.trigger('click');
-        }
-        else {
-          $link.addClass('active');
-        }
-      });
-    }
-  };
-
-})(jQuery);
diff --git a/themes/bootstrap/js/theme-settings.js b/themes/bootstrap/js/theme-settings.js
deleted file mode 100644
index 53b0cb9..0000000
--- a/themes/bootstrap/js/theme-settings.js
+++ /dev/null
@@ -1,202 +0,0 @@
-(function ($, Drupal) {
-  /*global jQuery:false */
-  /*global Drupal:false */
-  "use strict";
-
-  /**
-   * Provide vertical tab summaries for Bootstrap settings.
-   */
-  Drupal.behaviors.bootstrapSettingSummaries = {
-    attach: function (context) {
-      var $context = $(context);
-
-      // General.
-      $context.find('#edit-general').drupalSetSummary(function () {
-        var summary = [];
-        // Buttons.
-        var size = $context.find('select[name="button_size"] :selected');
-        if (size.val()) {
-          summary.push(Drupal.t('@size Buttons', {
-            '@size': size.text()
-          }));
-        }
-
-        // Images.
-        var shape = $context.find('select[name="image_shape"] :selected');
-        if (shape.val()) {
-          summary.push(Drupal.t('@shape Images', {
-            '@shape': shape.text()
-          }));
-        }
-        if ($context.find(':input[name="image_responsive"]').is(':checked')) {
-          summary.push(Drupal.t('Responsive Images'));
-        }
-
-        // Tables.
-        if ($context.find(':input[name="table_responsive"]').is(':checked')) {
-          summary.push(Drupal.t('Responsive Tables'));
-        }
-
-        return summary.join(', ');
-
-      });
-
-      // Components.
-      $context.find('#edit-components').drupalSetSummary(function () {
-        var summary = [];
-        // Breadcrumbs.
-        var breadcrumb = parseInt($context.find('select[name="breadcrumb"]').val(), 10);
-        if (breadcrumb) {
-          summary.push(Drupal.t('Breadcrumbs'));
-        }
-        // Navbar.
-        var navbar = 'Navbar: ' + $context.find('select[name="navbar_position"] :selected').text();
-        if ($context.find('input[name="navbar_inverse"]').is(':checked')) {
-          navbar += ' (' + Drupal.t('Inverse') + ')';
-        }
-        summary.push(navbar);
-        return summary.join(', ');
-      });
-
-      // JavaScript.
-      $context.find('#edit-javascript').drupalSetSummary(function () {
-        var summary = [];
-        if ($context.find('input[name="modal_enabled"]').is(':checked')) {
-          summary.push(Drupal.t('Modals'));
-        }
-        if ($context.find('input[name="popover_enabled"]').is(':checked')) {
-          summary.push(Drupal.t('Popovers'));
-        }
-        if ($context.find('input[name="tooltip_enabled"]').is(':checked')) {
-          summary.push(Drupal.t('Tooltips'));
-        }
-        return summary.join(', ');
-      });
-
-      // Advanced.
-      $context.find('#edit-advanced').drupalSetSummary(function () {
-        var summary = [];
-        var $cdnProvider = $context.find('select[name="cdn_provider"] :selected');
-        var cdnProvider = $cdnProvider.val();
-        if ($cdnProvider.length && cdnProvider.length) {
-          summary.push(Drupal.t('CDN provider: %provider', { '%provider': $cdnProvider.text() }));
-
-          // jsDelivr CDN.
-          if (cdnProvider === 'jsdelivr') {
-            var $jsDelivrVersion = $context.find('select[name="cdn_jsdelivr_version"] :selected');
-            if ($jsDelivrVersion.length && $jsDelivrVersion.val().length) {
-              summary.push($jsDelivrVersion.text());
-            }
-            var $jsDelivrTheme = $context.find('select[name="cdn_jsdelivr_theme"] :selected');
-            if ($jsDelivrTheme.length && $jsDelivrTheme.val() !== 'bootstrap') {
-              summary.push($jsDelivrTheme.text());
-            }
-          }
-        }
-        return summary.join(', ');
-      });
-    }
-  };
-
-  /**
-   * Provide Bootstrap Bootswatch preview.
-   */
-  Drupal.behaviors.bootstrapBootswatchPreview = {
-    attach: function (context) {
-      var $context = $(context);
-      var $preview = $context.find('#bootstrap-theme-preview');
-      $preview.once('bootstrap-theme-preview').each(function () {
-        // Construct the "Bootstrap Theme" preview here since it's not actually
-        // a Bootswatch theme, but rather one provided by Bootstrap itself.
-        // Unfortunately getbootstrap.com does not have HTTPS enabled, so the
-        // preview image cannot be protocol relative.
-        // @todo Make protocol relative if/when Bootstrap enables HTTPS.
-        $preview.append('<a id="bootstrap-theme-preview-bootstrap_theme" class="bootswatch-preview element-invisible" href="http://getbootstrap.com/examples/theme/" target="_blank"><img class="img-responsive" src="http://getbootstrap.com/examples/screenshots/theme.jpg" alt="' + Drupal.t('Preview of the Bootstrap theme') + '" /></a>');
-
-        // Retrieve the Bootswatch theme preview images.
-        // @todo This should be moved into PHP.
-        $.ajax({
-          url: 'https://bootswatch.com/api/3.json',
-          dataType: 'json',
-          success: function (json) {
-            var themes = json.themes;
-            for (var i = 0, len = themes.length; i < len; i++) {
-              $preview.append('<a id="bootstrap-theme-preview-' + themes[i].name.toLowerCase() + '" class="bootswatch-preview element-invisible" href="' + themes[i].preview + '" target="_blank"><img class="img-responsive" src="' + themes[i].thumbnail.replace(/^http:/, 'https:') + '" alt="' + Drupal.t('Preview of the @title Bootswatch theme', { '@title': themes[i].name }) + '" /></a>');
-            }
-          },
-          complete: function () {
-            $preview.parent().find('select[name="cdn_jsdelivr_theme"]').bind('change', function () {
-              $preview.find('.bootswatch-preview').addClass('visually-hidden');
-              if ($(this).val().length) {
-                $preview.find('#bootstrap-theme-preview-' + $(this).val()).removeClass('visually-hidden');
-              }
-            }).change();
-          }
-        });
-      });
-    }
-  };
-
-  /**
-   * Provide Bootstrap navbar preview.
-   */
-  Drupal.behaviors.bootstrapContainerPreview = {
-    attach: function (context) {
-      var $context = $(context);
-      var $container = $context.find('#edit-container');
-      $container.once('container-preview').each(function () {
-        $container.find('[name="fluid_container"]').on('change.bootstrap', function () {
-          if ($(this).is(':checked')) {
-            $context.find('.container').removeClass('container').addClass('container-fluid');
-          }
-          else {
-            $context.find('.container-fluid').removeClass('container-fluid').addClass('container');
-          }
-        });
-      });
-    }
-  };
-
-  /**
-   * Provide Bootstrap navbar preview.
-   */
-  Drupal.behaviors.bootstrapNavbarPreview = {
-    attach: function (context) {
-      var $context = $(context);
-      var $preview = $context.find('#edit-navbar');
-      $preview.once('navbar').each(function () {
-        var $body = $context.find('body');
-        var $navbar = $context.find('#navbar.navbar');
-        $preview.find('select[name="navbar_position"]').bind('change', function () {
-          var $position = $(this).find(':selected').val();
-          $navbar.removeClass('navbar-fixed-bottom navbar-fixed-top navbar-static-top container');
-          if ($position.length) {
-            $navbar.addClass('navbar-'+ $position);
-          }
-          else {
-            $navbar.addClass('container');
-          }
-          // Apply appropriate classes to body.
-          $body.removeClass('navbar-is-fixed-top navbar-is-fixed-bottom navbar-is-static-top');
-          switch ($position) {
-            case 'fixed-top':
-              $body.addClass('navbar-is-fixed-top');
-              break;
-
-            case 'fixed-bottom':
-              $body.addClass('navbar-is-fixed-bottom');
-              break;
-
-            case 'static-top':
-              $body.addClass('navbar-is-static-top');
-              break;
-          }
-        });
-        $preview.find('input[name="navbar_inverse"]').bind('change', function () {
-          $navbar.toggleClass('navbar-inverse navbar-default');
-        });
-      });
-    }
-  };
-
-})(jQuery, Drupal);
diff --git a/themes/bootstrap/js/theme.js b/themes/bootstrap/js/theme.js
deleted file mode 100644
index 7e3de0a..0000000
--- a/themes/bootstrap/js/theme.js
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * @file
- * Theme hooks for the Drupal Bootstrap base theme.
- */
-(function ($, Drupal, Bootstrap) {
-
-  /**
-   * Fallback for theming an icon if the Icon API module is not installed.
-   */
-  if (!Drupal.icon) Drupal.icon = { bundles: {} };
-  if (!Drupal.theme.icon || Drupal.theme.prototype.icon) {
-    $.extend(Drupal.theme, /** @lends Drupal.theme */ {
-      /**
-       * Renders an icon.
-       *
-       * @param {string} bundle
-       *   The bundle which the icon belongs to.
-       * @param {string} icon
-       *   The name of the icon to render.
-       * @param {object|Attributes} [attributes]
-       *   An object of attributes to also apply to the icon.
-       *
-       * @returns {string}
-       */
-      icon: function (bundle, icon, attributes) {
-        if (!Drupal.icon.bundles[bundle]) return '';
-        attributes = Attributes(attributes).addClass('icon').set('aria-hidden', 'true');
-        icon = Drupal.icon.bundles[bundle](icon, attributes);
-        return '<span' + attributes + '></span>';
-      }
-    });
-  }
-
-  /**
-   * Callback for modifying an icon in the "bootstrap" icon bundle.
-   *
-   * @param {string} icon
-   *   The icon being rendered.
-   * @param {Attributes} attributes
-   *   Attributes object for the icon.
-   */
-  Drupal.icon.bundles.bootstrap = function (icon, attributes) {
-    attributes.addClass(['glyphicon', 'glyphicon-' + icon]);
-  };
-
-  /**
-   * Add necessary theming hooks.
-   */
-  $.extend(Drupal.theme, /** @lends Drupal.theme */ {
-
-    /**
-     * Renders a Bootstrap AJAX glyphicon throbber.
-     *
-     * @returns {string}
-     */
-    ajaxThrobber: function () {
-      return Drupal.theme.bootstrapIcon('refresh', {'class': ['ajax-throbber', 'glyphicon-spin'] });
-    },
-
-    /**
-     * Renders a button element.
-     *
-     * @param {object|Attributes} attributes
-     *   An object of attributes to apply to the button. If it contains one of:
-     *   - value: The label of the button.
-     *   - context: The context type of Bootstrap button, can be one of:
-     *     - default
-     *     - primary
-     *     - success
-     *     - info
-     *     - warning
-     *     - danger
-     *     - link
-     *
-     * @returns {string}
-     */
-    button: function (attributes) {
-      attributes = Attributes(attributes).addClass('btn');
-      var context = attributes.get('context', 'default');
-      var label = attributes.get('value', '');
-      attributes.remove('context').remove('value');
-      if (!attributes.hasClass(['btn-default', 'btn-primary', 'btn-success', 'btn-info', 'btn-warning', 'btn-danger', 'btn-link'])) {
-        attributes.addClass('btn-' + Bootstrap.checkPlain(context));
-      }
-      return '<button' + attributes + '>' + label + '</button>';
-    },
-
-    /**
-     * Alias for "button" theme hook.
-     *
-     * @param {object|Attributes} attributes
-     *   An object of attributes to apply to the button.
-     *
-     * @see Drupal.theme.button()
-     *
-     * @returns {string}
-     */
-    btn: function (attributes) {
-      return Drupal.theme('button', attributes);
-    },
-
-    /**
-     * Renders a button block element.
-     *
-     * @param {object|Attributes} attributes
-     *   An object of attributes to apply to the button.
-     *
-     * @see Drupal.theme.button()
-     *
-     * @returns {string}
-     */
-    'btn-block': function (attributes) {
-      return Drupal.theme('button', Attributes(attributes).addClass('btn-block'));
-    },
-
-    /**
-     * Renders a large button element.
-     *
-     * @param {object|Attributes} attributes
-     *   An object of attributes to apply to the button.
-     *
-     * @see Drupal.theme.button()
-     *
-     * @returns {string}
-     */
-    'btn-lg': function (attributes) {
-      return Drupal.theme('button', Attributes(attributes).addClass('btn-lg'));
-    },
-
-    /**
-     * Renders a small button element.
-     *
-     * @param {object|Attributes} attributes
-     *   An object of attributes to apply to the button.
-     *
-     * @see Drupal.theme.button()
-     *
-     * @returns {string}
-     */
-    'btn-sm': function (attributes) {
-      return Drupal.theme('button', Attributes(attributes).addClass('btn-sm'));
-    },
-
-    /**
-     * Renders an extra small button element.
-     *
-     * @param {object|Attributes} attributes
-     *   An object of attributes to apply to the button.
-     *
-     * @see Drupal.theme.button()
-     *
-     * @returns {string}
-     */
-    'btn-xs': function (attributes) {
-      return Drupal.theme('button', Attributes(attributes).addClass('btn-xs'));
-    },
-
-    /**
-     * Renders a glyphicon.
-     *
-     * @param {string} name
-     *   The name of the glyphicon.
-     * @param {object|Attributes} [attributes]
-     *   An object of attributes to apply to the icon.
-     *
-     * @returns {string}
-     */
-    bootstrapIcon: function (name, attributes) {
-      return Drupal.theme('icon', 'bootstrap', name, attributes);
-    }
-
-  });
-
-})(window.jQuery, window.Drupal, window.Drupal.bootstrap);
diff --git a/themes/bootstrap/js/tooltip.js b/themes/bootstrap/js/tooltip.js
deleted file mode 100644
index fa7cc71..0000000
--- a/themes/bootstrap/js/tooltip.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @file
- * Bootstrap Tooltips.
- */
-
-var Drupal = Drupal || {};
-
-(function ($, Drupal, Bootstrap) {
-  "use strict";
-
-  /**
-   * Extend the Bootstrap Tooltip plugin constructor class.
-   */
-  Bootstrap.extendPlugin('tooltip', function (settings) {
-    return {
-      DEFAULTS: {
-        animation: !!settings.tooltip_animation,
-        html: !!settings.tooltip_html,
-        placement: settings.tooltip_placement,
-        selector: settings.tooltip_selector,
-        trigger: settings.tooltip_trigger,
-        delay: parseInt(settings.tooltip_delay, 10),
-        container: settings.tooltip_container
-      }
-    };
-  });
-
-  /**
-   * Bootstrap Tooltips.
-   *
-   * @todo This should really be properly delegated if selector option is set.
-   */
-  Drupal.behaviors.bootstrapTooltips = {
-    attach: function (context) {
-      var elements = $(context).find('[data-toggle="tooltip"]').toArray();
-      for (var i = 0; i < elements.length; i++) {
-        var $element = $(elements[i]);
-        var options = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, $element.data());
-        $element.tooltip(options);
-      }
-    },
-    detach: function (context) {
-      // Destroy all tooltips.
-      $(context).find('[data-toggle="tooltip"]').tooltip('destroy');
-    }
-  };
-
-})(window.jQuery, window.Drupal, window.Drupal.bootstrap);
diff --git a/themes/bootstrap/logo.svg b/themes/bootstrap/logo.svg
deleted file mode 100644
index a5daf56..0000000
--- a/themes/bootstrap/logo.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<svg
-     version="1.1"
-     xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     width="32px" height="32px"
-     viewBox="0 0 32 32" preserveAspectRatio="none">
-   <g>
-<image width="32" height="32" xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
-bWFnZVJlYWR5ccllPAAAAohJREFUeNrEl1tIVGEQx12L0BQjoXwpoRfxIQUJuhAIvVRLIRQELYj1
-oKDgpQgVNQhBChQfLFDLoovVS0RQYuqLPUgFgTcQia5CSBBERUiKuv0+GGGJPd/l7Nkc+DNn98w3
-8/++mXNmTigajaasp4T8Ejhx+GIWavOTkbaviRBITWBtIbgDkfT1InAGHAGDkNj2X1NAwFLU3ZgN
-fATnSMezpBIgcAaqWRBPHoFLEJlNVgpWRC943D8FJiDaA3IDOQEc5aNK5Ocou3vDf3u5HgFbNEu/
-gzrs7/smQKAa1BWQEfN3L06ruFcmdWCSa+A8a1acUkCAetTVf4IrqeReBIf3pPhMojbR41QDBDiO
-atc4LRU9ZVk7FXKaZgLyhus2OExbS6FDAV+OV5jxTqAa7DQ4e4qzTegiBwKZoFFLAKdqZ+UGR8Pk
-vwu9A7i+AU8TY6vuBNTjtcvgJB0nJyGhCvAgeO9AIBsc0hHYb+GkGDyGxG1ITHIdlmfeVop1BAoc
-HJ2FxENIqBOodVhXoCOw3TGnEfVCgsQDrmcc0uBJYNVHR20S3R/EPDDvw0c+p6AK94Wl/aKOwLTP
-uSIPfAHLFrYfdAReJzBZ2abvpY7ABHjrg8AcyAEbDXZL4LknAapZGdxyDD4vpPdZ2A7JC0zbC3pl
-R7bSJ70+YjFNtVoNJNKObQbMcXAA7AFjhhGvA6INVvMAhgOoBkNwNQsck5Z8wxB8wGuQ9VwEiQ7U
-BSmcWPkGOiXnv2QS3q0Jru6rCWrZ71BaKH0/JLXxCmd/+F8RuKkJ/gO0YNsd6IcJgcPSfI56mLxT
-3RJcJ/jnoD9MNsg3oZobcqWxqGf/J/gkdTFJ4N9J/zoOSv4KMAC++teHNUg1rQAAAABJRU5ErkJg
-gg==
-"/>
-   </g>
-</svg>
-
diff --git a/themes/bootstrap/package.json b/themes/bootstrap/package.json
deleted file mode 100644
index 06a0234..0000000
--- a/themes/bootstrap/package.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "name": "drupal-bootstrap",
-  "version": "8.3.0-dev",
-  "private": true,
-  "devDependencies": {
-    "bower": "~1.3.0",
-    "glob": "^5.0.14",
-    "grunt": "^0.4.5",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-csslint": "^2.0.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-githooks": "^0.3.1",
-    "inquirer": "^0.9.0",
-    "less": "^2.5.1",
-    "less-plugin-autoprefix": "^1.4.2",
-    "less-plugin-clean-css": "^1.5.1",
-    "load-grunt-config": "^0.17.2",
-    "queue": "^3.1.0",
-    "request": "^2.60.0",
-    "sync-exec": "^0.6.1",
-    "time-grunt": "^1.2.1"
-  },
-  "scripts": {
-    "postinstall": "grunt install"
-  },
-  "caches": {
-    "libraries": ".libraries"
-  },
-  "paths": {
-    "css": "css",
-    "js": "js",
-    "libraries": "lib"
-  },
-  "urls": {
-    "jsdelivr": "https://api.jsdelivr.com/v1/bootstrap/libraries"
-  },
-  "githooks": {
-    "post-checkout": [
-      {
-        "files": [
-          "package.json",
-          "Gruntfile.js",
-          ".githooks.js.hbs",
-          "grunt/**/*"
-        ],
-        "commands": "npm install",
-        "matchAll": false
-      }
-    ],
-    "post-merge": [
-      {
-        "files": [
-          "package.json",
-          "Gruntfile.js",
-          ".githooks.js.hbs",
-          "grunt/**/*"
-        ],
-        "commands": "npm install",
-        "matchAll": false
-      }
-    ],
-    "pre-commit": [
-      {
-        "files": "starterkits/less/less/**/*.less",
-        "commands": [
-          "grunt compile"
-        ],
-        "matchAll": false,
-        "staged": true
-      }
-    ],
-    "post-commit": [
-      {
-        "files": "css/**/*.css",
-        "commands": [
-          "git add css/**/*.css",
-          "git commit -m \"Automated commit: grunt compile (CSS)\n\n$(git log -1 --pretty=%B)\" --author=\"$(git config user.name) <$(git config user.email)>\""
-        ],
-        "matchAll": false
-      }
-    ]
-  }
-}
diff --git a/themes/bootstrap/screenshot.png b/themes/bootstrap/screenshot.png
deleted file mode 100644
index 7b6893a5375032059254f64e26fb1e1391ffe2d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19493
zcmV)YK&-!sP)<h;3K|Lk000e1NJLTq00AZd007$v0ssI2Pu;8j0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBVo$4Nv%RCwC#T?c>^<@KMoyLX_{?&wX*
z!O@F!u+i)lBX$wvKWfAlTLfc^m{@`)u|xuDOpHo17NjZCJHk=!4g`)vX?I5vxZ5`K
zf8Y1b%+Bu2>`vd^gUJP9Z+7M@@Avw9AARGnNtEL9`#JKLP$)v_Tt@COep|L*WSSX1
zM;N5$2sH<<d9&^l0zUMFVAz2{+Iy6%8{y!?xies^^>|BusqvO%L*2t0c@BACEyi06
zaz-AS@*d^JSQww?zGf^nXAxV`1B^is>V4=e-jt6u`^+rD8-kou!p-c+i~tPoNw_UT
z=sW9#o1LL*%RP7SW<k)ow-+vPRn94}8624@NthggX`%S6)0vZqIOEbUaU<NpTjuaS
z_jVbc%-IoK#z*D|RFq#-!p}46&r-`R$$(QDavGo1Uc9-@(8=>Tw>3$ZfFVE48|--o
zZ)X*0vsRqu8#O-30K7T49bT$V@O;ia;pPpQx{W<=W}&(3@{H`fTJO6S&?t+zZ1f4G
z7ir4Zac&5=v=}^^*t0VRkHMxVUMvGIB~h9(2Qo^;+2KTKaR(>|%sDIEGQqoG)8zAV
zON@|?5_o1E!luTb(ubTOBF;Vo@{%~!<j0x9o6W$TS!Qg1Y4k*&2Nr^}A{1^jF77M~
zfz&?aq$18f!%c~5JFLWeF`zkG&JktOa-1N^x10^iWt5xI8YB#gJE#1335%Z`3`zp9
zX@Vv}wdL4vy1=ISYR8gJOo7eF%}IiC*_&Wxe+tQI+N>Md)E4N0A>pMqO;ATzXJ&#;
zgq$7OWg#wSKPZ>I*mH^mHEG&{rs{~kr#C5UCa8TjkuKUWZYy$b3pdA?z*!%9wg|VB
zz;k;YG(}v>^_OL`AtlH>uw7zm*0_Md_j2yx&23U}Re{Ms;pVE1Y9Y*Ja9#v;_6<3Y
z@n%i;wg|a2dM|4k@Ulw*P6)0zOW$_XOC!{8bN9WhV&NReTN>lwnFG99;OU7e@H+aQ
z@u?XRbjdxUj`MeeZgbZm=M>)3MQ0fTyjoDVnq1$rpKN8;Ty$!+(_V=}S;#(d9B+<?
z!qW)6tPpOF046P|e0E4KbGC*{7v56x8=I+;9s@6X&9+Pcxt>;;{EKGsmLXfid5kyX
zC~~Aa&TUV6CMYUiU`Ev(!K^#Paw=K!m~gsk$815)d%W4n{j(;u91o+P4oH(hrEZR3
z%I|Mkk9DdNBGWd=XlTXetej#tHq}L&*sC>2OW8KhkdM)TpfeOt()U%`DfY`)Cl+Tg
zoNXU(E+t;raj{S)D-3FfOw)vuDZxb<ODi$H?`o|wWy_Wf2@6|ypI9Du8il+4q;={v
z=(OpcIhP!DM%l4>5l2}{i_aYWg0ZPmrdPPblhqEAGneDeAp$lvJTw>IL|vaw=OUY3
z$ug4?<Yloqw~WpCIwQ55vhfmBO}!42ny538m}1gVnO!QSX5O=vwC2oIrXA5UPv=Y1
zoJ-(hdaabLH0L%Si*qm4*gdhSU83r^370Oq&z9PPOcQ7ZeI!KCS!iHxT%~kG#JPbn
zCmW<YZo;LV+|K~dnn2TpqNaLj2X(S=vzAfmwuti}bj~<y!etJXpYg0%=H<zIHp{LQ
z3k|<y;bx)W)gZ68@7|Cp$EAxi3m7|bb8Cxbzst}WiDz8UsXtc-0}@bYMB*hEZfT@F
z??r_Poz)FCW2C)`Q+-p;0MEEZr>R~hey9?68t#6DB(&4I%T*EQF;#G;2JJ>AfkDP*
zAA24*3(0mtr-!<Pb(4Xlr)s8@fyNs;xFO=a=fa#*Y{mlKY^EkVnCf*pV^34i>7kC&
zkAGTosF-S^<B~P&@$NH@uo+W}Vn0R85x)p|j`C5bp_fI^Uy|fkPC2CvvQ7^Ym^@x{
zb7$z-Uldn+Ioe$GOgJ(!UFxNAS!Z8GH{1TysZO|_3C|Reb0p5@G2UGAi)a?bo({mX
zfI2E^HHKarX;TDaYW;0m8D2{{Z&XTGO9~vf%}zI8ixJf6Ekeo@-YrYQTDj(&eakgN
znoqdV#W~@bS<ytu{%Hp`Pr7sJ1QH8PyRrjvb`WK%O}uCH>P8gKRHJV%0j4L8tN|eT
zG`$IL+VN&*J>(n=45U59*%3=Gy#}5UEZIM<C?#`oRpmY%>}R{jfMmGbcQy)_mcl&y
zodwN`CL_$n*@d+{$83!2*h+59q83XIT6$*Ngm{lM`#Pa<=3>fkX;x^vtw5#4QsAsH
zkBmA5I4zc*OS|Q2V9>0THl<4&^jl^QZFs{vO-MPXL|kTG_M7uLu3mZ;jj#YD3k&7t
zdFwVGl7@t@(?`Uqhi5r`$yu;@Q>kTn;u%|f=wR|g+92mtT6Y%NwMu&On9+I<Haio~
zsFYL(-|q257_)GyH6l(=gYwL9Pb1ipsE!7KmkC18sfeq`sN*caDZS^mxi>b?;@z1R
zeX?e-r7<VYS%i3;=fIhwgS5orj63mc=3aQS`WYMTwF5javFFADdYR{7nn1lwH?fd8
zp@%@Tr|h~K1IT2R+j6+yn;Ix@lH<K-H<W>Wr`;%ob1La6z2xG7{%?ot>m3Y8In?pa
z?c{j3#T{pACT0(9%#g*kpfWj*Iy*D6(8<&h9h-8l?S*~KGcEo0-FTz9`dn{ZNiI#*
zTJA-9@n)Gu9nrC=%&5LkOUa^pz~eH_>F+_W3sdW8U(i{Yk>j?IO(%!5&dDU2XTs||
zraiYO9+PsJ6W8`ec`%i;Yd_dcxzKCSd;6Ahxd_-P{WH@RO#^b7R`BNKi!v=9;H5v)
zj^gC1wUaIGT+5^7+#oXVziS6|nZQBP#n<i7&}rKP+osTC97lpvTE1tO<uq<1y#`GQ
zw=`NTmUFmH=i^qa&7H{*B&2J%Ql{A1X|0nXjhH;ZkDb);+5|iY6iY8x&{mePrEd7{
zsh64Ah{<h@@pL}O*7)4rO%!%rHtHYjV(KU+%7s!z_qtSAU=SAGVn5gUG(??|xo5E&
zkmB%L#ZgQtQRl3nGoC%?O|Z^RCW>X?oe_6>6L-b|;JqPdP=YylytRW;#p7U|Bc1ll
z%C6H~+$EVflObBAIks&^W0b|6v&gsR#-z-*B6i%LY5B+@3!atJ*{7m6amK;dc(bym
z@Mau!maQFAk1~~L=63MFLTtc-OY;osj6%-Z8o6FiZ60r$&Xx2SpJwnzWl8s;GpI8=
zaW0Mc@eFUuCz$=ZBig3%B~4>`q1j9nv(5R^YuDL749F?FF3T8?9lQ}&iX)=iLg?Hj
zH>SboyOg_Z%14q$)M-w{v;66ViF20e!($838d|*c_avE!ODFUibp2Zk5}2*G$XL|r
zEv%PaTa**G-mTeH@^#N1)6*>-;W8-&f+Kh{8=$kp-3@Aw8H+ko2jaOJOO#{340SqP
z$wBMV8G;Um4HDd#mcw+W{3Ql&Htr+w*qdTXsdhU>8y?HpC#fvD%xb54OJQ8AG<as1
z@m?m52k0nc(K#bt%1lF@Wv{zS!y}Jn(ymozxC6%i!5231=5~P2l+epM)H!mNptD2D
z4#m=K--#pL7R)}@luyMQceW!6q*>HuE_Zf8+$D3Lc<D{@%y;6RA*ZKmCXX2yIi%J?
zDyE%j8gWz_Io#N|k0isBFdg^zaA`N>ylZ6djv;3`M(0Rg7-hAAyiLEqQ>aUOh}?VB
zF=@nr_qwIo@PI*dIUA#M&w=T&*=DxpAj6eRrv{lFww!&f(riw%OCl~q9GG63ZRs`Y
zoHfH7c_5Qst<p;gnF%6}GLR$UnFG@izrT?vb6O5;qTFow?WB~;mbMFy;LQyYmjpIO
zv`z0Fm~M-*+N54OGEOF2M4a(TQ{#AZicoB-lxBsS_hgj(2B!{($(Cra&2chWG-uOw
zHwKD*42n4QhX!wR3U9`Ro199L@Z$*TTorWLW!+dFC*#~ag`_`@4c(xiONlqLR$P))
zbR!tH>`k%bz;xC{X;aYEKK0VtW$t{r7`y}lgG`{vfAJON(UtnkG)?3GQ07}}$?bzu
zz{wci+_2(|?~t?6g5;!Nuu)g??MS&<$s<?ZpD|`ZYzTrr!8#-xIcs>sU=w)sH(roX
zM@J}{p~B%vO2FYc&<srr6pd#o5Cobs>eOX8N!nT(CuM7nO0yVF$t;aW3ykw!gC%g*
zerpr1*6`^d(g;Zl@wlT2!3qkprR>7bf<-Rip$R;XrJ8_#$dE(fkk7}4!%-cqk-^gP
z#n22~JkN6Qtx(hyFHwp+Q}&((kD>t(q6G<s!eqnb3Ht*a{yd_dnp5eQ__nYhzgS5v
zw7BF6Z%>{};Vg12t8HGTq)5_3ym$$7f>OT42$sUK!Yc5{(wUwWmPvp!09<sy@J<rm
zcrr!|AwIc`TROK0K@H)JW%2zvIRP?Bv#7H+XX9#~F%SwqABTAmFKr%~DaG?l1Q-zf
zO^BPC&Gbv<Jw!(kM2$m9EARu0Osn5+gr;30cT;UJ-A7#vXL$GI?Gxf91zJfAIRP!G
z1U$>!gtIzQJ{pZa^~bxdymm5GRe7v*`|gEbty(dE8^?0dD9dqdBw`wM9^fq{2(i%T
zYl2}}?865%y3-$tM&KjhEV6`m7H{%)@R(xI05G4H@Wu#;x5d5Ph`e%1l$o~M-Ib^k
z*odZvm#%d|<MT)L%5U1Bb=zj-rs6HT4j!o5u)L(K^e`-?fEH9BOR8=58PG~ND`Q1M
z4M{o6({0$O-oT-~;AiKZWs@eneWI$SPHqn8<027WO&n>#n{k89=VuAIx9HHYS?h*K
z(WWRC^Fvsv)r(4CI`B^-X`IFzp&P{h3j4J>>+FEcqKV#~@b+|@OzsLs3wR@35-7P_
z|JHX+xVA$<>xBE-<4^9okNSDvp_%_)Fn`8+mSV9s#|o4=AB4PXrXeTD#+<<0pL&N*
zZKlt8ZrnA0IC%t6R|iv!^K#B$rz%T!9l~2M7=mpZeeHlNuDdYd{wwD{f~1Y$0N&J|
z5@Lq{#^LREJ#e*}Vw7(;tGs0b8eLK^Wp4z=TjZKMhu(GHb@2I-s$=uNT=`>3`HFd4
z;h%#?cRTCs+yO(o4H(+9dCSHRJaJ3^q1|76=zZxS98oAti8#t?Q$3NnIx_#9+`tQO
z-aFyu*MV+)92bcSG(|fLHp*nLJL7g8EP4<dR7gG1(llUFtiUoT{wYvyl=FzR6QxqW
zoi?t#rPWjK_DG1DCPalOtdEShFJ~=&`=!|oGTRuIMQ>cSU_0DAf5y6cd3A2OXC&~`
z0YiG+`oO4<{yN|9_YvFAxKd`nkEK8fj;#U6y6ywoY+tvJ&1L;Q(1VyzD4N8@B>Qn<
zo?Ov27dL;ybR1Sb6FvlP5=P&mWtWd02qpU)NgB<FKT%x-M)3Jqy_5hDmBg`0#p6bv
zS0JE05kchFqUo=GGRxBB?U)}cQ5WM6@HZGhNHJg8Rjzc#Xc3l@$)LXy_jQsTQ3=m@
zCo2^b8p<cbGdUk4?}$xLeQe2izANaH7;n@5K6B>uB`m`-G)rTrlRQJ3=8soazx~JA
zhxS+Ab^rA@-hRo+6Q{oZ&+15+XIa*WQf8uCv$bo*lJymbju1;m964UTHtm`h6rP)#
zo1^)y-UB*qU9%UcAJ}qEz^~FJ6p<5gqoruP(vd60PcV(rsiX>eQZN*zB(ER&BN~No
zMQO>+4wuj8Q~UY>Lg?$kkhFceQVvkZvVOP$CKvCuN8cc(U@+!;l-5g{R{&Um^j(?S
zWK>|)NY}0g8xOt?z~eXu>|_daWg(u_Yl0#43PF)1gr5%2gdZBeQ;2hp3-V9}>F?x!
zuyoOAL~}>TC$h*=q*BCl86ggfWTPY1QTP^~BYCF$T-utf5bZdgA3xz*_+<66O*5x0
z0sOEGM||lr^x;+pOl2A^?~G|n>Ykl@<L#GSJ9flZAFaZK$WU|&b56~yorm1KFP1O;
zW=n1$0464E8kr?=3Pqxk7vH{j@UTAWZ?$dTLPQfL?m)mNp-vGw;l&uBc%LG8LW@ZA
zV{a}4H-)vLVM^%~M8Zv!Qu1Sc92*Yv;Yft+C-Dxm*w>FgU<m0DItwB%B~M5bNKI4D
zAgW~$>4$-t0PW)kk{bmSU4SKu!gEAVH5KQfCejra4ThB9o)%LP$gA;>=1glsL3myy
z%GaT3Kpu=ipoy=IczFb@8qtv`4bLEyBOB^8`Yb9(P$`BXfE8Wpvcpe|5|JQ}086Lb
z5#%^!lo2hNU&OrgVrGRHxW&s8ld|G)U`ydQkw}CQ{q;EhA#I0g#NlDLDaa?*?+0&x
z$zazm0v$*>3Cl!gAUP+Ajt{1MbM+0w8#FwpQ=gXG)|QjqqD?vxoQE8YokOZH<M#!k
zObl|EWik`*efz_?FSKmcG~ru$`Sk@+Q;KQuNRkj)R1+dkz|tg&H=K_nO&<pucsLRQ
z%4f(0RHC&dM2iFIBr-Z7Dm(W%mI;Q#awwmW8o(GmHcB2#5z;|k6G3#_qDVkA5{X81
z;*dfl0(2PVSRc#<t1coF<uKlAYJyQAD&`bWf|CAxK43cVbOFACz8ISqc485<<G0ha
zpd;lXVSIme4V9CV!*WbG9Fc<xf*eu6(S&d$DoalED+&=`IKsoLDV9PziHFVe0MRI3
zH{x3tVS|1pps5nofW#>fA@gM9ECESOK4V9#^aL~^NgUFWGQ*SqA$kZ0!F&QiP0}Y|
zNP=QJjEg(6xMU3HkM0eB7HurqTXGnTH?lP}9TT3?e=)-m7#@)W|5N$F_64oau2)C&
zSf=t>s`V`AAxC5S02vLy^ZOW*{{@?aRZZkuE8hB}8glUl47w2S$DAApg$C%s)=<%I
z1KNzda$xJW&A|MN@$%~6zP$(5uG;ebHyier9)?$Ae#Me4VHBvtc%!g`k;fteun?`+
zDCg>1&hOHrL#x(J8#JmXKXymSp7K2hw*0Vj?kB6!j9^z#T!zgF_;?IjpqT!{J9Y2d
z4v~c*6n1Z~p3a14enr3wn|b)a(a%3zK`{hQfVW6>O$`hH?AW2hdv)&Cu2EithKd0k
zsXSIuain<5u4RjUC|b1#4FJ!JtRzfe!0=8z&g(!B(kQRK`t1)tH<kqG;LoD<JJ)}|
z6W|jHA|G9T(*|;?9njX64L>fOTSU?v+H}gl^Zu*y@*9vvp8nSC&p%ipAUTKLOGkxB
z6wUpdyxiee4(isceWUya9XqvEzW1l{1E)^ah$COUhr>$;mL(&}cHlG8>a`aXI_;qY
zRiD219nyL_H~!VQQJuTAYtgESyvwD<d)6#3TJ*)bUn*<Jb|7|u#IF@McVUlq@aOiT
z-Gq_R@px03m$Vo#rcFsyJ+F@|UMa$R0BkwPEc1bdMpy><0qax!mF-)0VU<f%odi+&
zLBI%B2SJ7m9#webotGqRt?csz;((u<?znu_vW@Tm{mb$ll>!U@qp*QXVF$gBJQhqB
z1U4ic!e=+id2rI$fkS&~&H~;AKNpW4c<bF)e)x~i=Y6)0<G4Bi6`qHw5y1!)qYexx
zudBz5l>ff7bnmR`OOZPS7<M!Q^6jjK$XlyqAIb~x4?i%5E3dzJXGz(6Z_EU9mtsL0
zFhphTd0xlMuDu}1+poD{l=7d;=Wj*o080%U(WgT};!79)Z*7CdXFu}nErW*kR(_t}
zv_4W?LB)#FcweG*8~Br~8(b|gOO;1HX~NsTR0Ux}0eiqn{U})n?W}tBfX)5ut+^9l
z8$aTb!RlS^(Yq7;+&ccsccy$Y|Fd-hhxU|&$xMcG5vA3sgWL)~mi)w^$R(qPC{gR6
zM7u-eDSIlk@(T>Ppq=l1f)Z1Z`xUKeb#)EUHujr|CI^sdev?M(Z|y4GM-xsHdkiuE
zfV@MGzBG2?<lkuGE#VqCwD**0k6(M|&@h-^e1zyNprH}dD=6VD91V5p-)j1t=aSHk
zGI0OUQ@8)=pZ7J$uLF+-s1RofR&E7TOC!!IidF{j_UhD!_3);4>OS|{{ayRF3Zsk`
zw2~ahnDiQ>mj^>3&5S%4RQ>$iDbs(KfHz6ij1r|F91VBw)574o$s>npcJ0>+D1iuM
zUQndws^0a|JNK#amViCjj%VJy3kZYc_o$MzlFI{RZy>D{!-Z(7QWj<0R!P2S;-cbV
z!RzJKCBgBs(nFde(TJ<u4akA@0(%2*L})pA>QpEk0@fHp3lzR=>_D~qq^k1RH=nH~
zQ^!(HoGtPkM8bb~bNukpgG>eb?*8qV>&6X(QGnioNK@d0!HAqR19UTJMB$&`dKB(7
z{@5P9JHPzy1A(*Ih)6nSGk!$l9mWG=009exC~Hjy=k?rczwOq)HIP1@l<5%&VjwZ3
zhAME$Nw3_~LPz1p76IZEtvWV(=9PO*ts544O@Lpt>X?VEaZy~v`ADU!RhwpmhxIk`
zOu+o_Cf^Jcg&8Yva5Y5B4{MT--SM~U20gLn+Y*LYaSGQF<_DrP7+cFx;(5OB$?M@E
z-_2hg^AAz9*$}Jqie-nwR+7((p<|&fs%eY7u07iiQsE7B^vM&a%El|941x`q?R`&Q
zYn-7fFF@U){Z(tfEyeK@j*;viLN~wr!#E4iY~Hd7C{)i)_$TI$Xt1D@m@;$yINkut
z?Gux3RpSjrU+MPUdv^VVjG1;V)G-yH^<O`D{Uf(efrnrt*^~i86C+SlG<NOYv7mFi
zBv>U5(%(IMyC&X1A>3B96aI46S#^5%>(a1MeKo%rbH~N6Py7^i84L}U6CI}sx9P=@
zG%sMpE5G|;)xuJSCUS~3v<RZ4V;DjFtB4&EeTl0|6L={D6D;W8zc#M_kRCv;)24hW
z3r2%36L%qZ>$q!--wZ_d^h0lKU0vq)<w!H9V%R9i17kq_t*XkSGyXGg?XqpVw(ajd
zqytzcqb?t+-mTv}a^sS(pZ5C#H1=@|l7sPg&)%j<H=oZ~xcu86Hm}@ucB9-u7j?by
z_RG{<AMihTRF_o?ifNVw`*8l8)f?9q6Qyg^6@v$#pU9#A@YoxeiGsDj)|?Cjae$D4
zk@V_YsGihg_rCh$*8O1c&?rkwsGncw(PwW>U{WY;p#Qm>S0SVSo0+RNtu4V0&*<F`
zjA_}bncmxhqy4<MiqvgHwelE};Ef0c_(sn`?bT{<b#-v!LsK@b+>KQ=3SL$d4F2(*
zd)30Kb=&3wj>}^Z)5%5BPvr-`p7Z^@&(|C|_)D)L?Z@0Qa*$SR>AuHqUOs;!nC*ZM
zn$pf&N{I1dEeeMsWY47XTXM`!cFFR5yDm+C|MK0<TQ&x~z5c=n$0|;8tdGW?=LFOl
zIb|uGNj-qKCm(nfb}QfuP?C)*@>2|tJMX_jb2A<q_sa2#8X%^CKX>bz^35xEFIl+Z
z#lK8QKpog%W5!=F=l$h8P=gpwiVnN9TL&$h@V&o&GW-3dNFFl2lU3n)pRHf{-PS47
zA5)|5uKTZBKJSG<zz@s4r})s1+xCNc6AA}=_wTHJ?Dt=9_Hlk6=gZB>1&RmD1E+xq
zYRs3H{k)@SAIJHLo&%p8uc&_gxqpAQFp<=H^eZS@T?Qn+Z)e4x(u1Hs!`p8ee}(4T
z{T!-8_Mv$p*b90Imx^oU(haMYZa#6m8mNlnxZ_7oqA&77pMe?^{OF&b!(e=9*a(&&
z4FZ(#$}=C%{;scfL<|E%z_|oT@TS<}oUN<NH?R1|4ZptVo(FDJo7tmp=(ljzMie$c
zXcjcflvL85l7jk_GP{7psOmM!E$G>@?%9EJJ2cO&o71^#I{+K<ewCEH`s|10r4<}<
z+lY##DV0*JmrEn$03mNood_HJm*+n|S%o5R4CaAEme<S68K^Sl0i_R)d*wuB(C72Z
z?sAa&CF}RS`rNchFW;AN|D{)-KXcj=hG)TOMacpzJ^a%C>XH2C{V!&JungoO&r^OM
zaykRxPgI3q<KO+{8KvW%SSG-COV<As4o69B2nF15ZiM>DFi4PEfHxn<k^5nCn#{PM
zuwBC@X9JyKLJ-Bv(Zi<}eY2wVxy_|y81(t66V=%6MI|I0kT1)#Jg4(^j%9twM~_r%
z^lCm8-hlOdI(0FJAqp4`_z`D81WoavG^+1kzpPk{8DdrviJ&Z*ssqQ9#i41e71O$m
z7?%B)%AntexDUJ?h#|tTpG{rdu4Bs)mkdeNJBD?iKVv;69wCYUP=y3q5qXQVT08Y@
z_4o^SCfGjnzh3s`XUocp58;@z#utre$)-Pb6%>Zn)0+Qo{9jHS36p#UBG?C9*j0V=
z59_x7Qc>;m1$?Y8Cnta*$Aftrj)a!XEvkC#Xo3|1@MzPi@xC2Zh`Vr1IKuZ-X>@RX
z@!zE&h=3LV7}y0bFg%VRAB)WYa_QJR5(UW6i+dHV+yk&j!^N45tR$LLi2-a*AOIvE
ziQqabo{~*gH3Ry1?kn@ZTK46qOF($aKI_Ske~7AJVPF8)DDtyoJa9yjLqip`Uro{y
zScZg2F?-@uq>R7t<Xfv27W)x9<M3BN5k(m=Y!oGc{Nqnwy!Fy-?0AgA6T^`xcKxB-
zkY+*=2OrW~FTTo<3q*4rV2gq8z!*SzV_A@dG*9y+C*_mr3)GMURs}DWGGH_&Xeu!p
zUR1KF{7;jn!(=*iZds>pPC=KppiW<P{c!mCV&->mzcf3R6+??@&8D)_orm1M^8MAP
zYSc`(PMsV*hZubR+O$W0bN$OeyudAyCtu*(6|_{}xn_A0P_W-0Ao~#x!CGUf7)A2r
zn=h8$eCL%3U+LVV&Hmj-h#AwOeM7ZIw`$qOUn*-rU;tSYIwLs+xj9TI9GdmfVm0JI
z*^rHYl758Zep<v#{LvAV!@*(ufgujFBbCP*#0yV?x~s>GfFH2yO1ACZ@<VCK*0K%D
zcKCfL00pGZk_Dp0*e$k+7(EOV4>(By!G?#F?Wl9}j*>mVw(92A0TkoZCoxooMHq{e
zeGsT9?o1+K49ateAou|&NVKFue%-EpI*q(yQ1A1)q@)wQh8;8iy^y3kqCa3e#2B=|
zvs_upp-mgM_v}-cpj*OwPaX{msT#>8_i7Lu5B`6wvU>Hx5@2!bzALT4F_n6Gxi{Z4
z`pWAsf}h4s8vgC28NXE30Nhw)k&4S{yb8p5$i4UGr%S#rBASVEcZuicvKt3zx+R*o
zY;x6YLuS9fEGOUxx&ou1OE-;VjxYbS0+f4{p^Gztr2JWu3dQa$F4u|+wfa`rh%+kr
z7H#s?Hyk=p6^#l&K+5opKj6ceT>Q~PLC`A_fSOw;AW$)f8`x^Wa8%PtjYEP8MMmuS
z!hZOV|2_EBZTgYG`h$k`h99EU{IGso(Z(I0PW=uP?*vC5tuHQ=H&6x&q886zgG4CD
zf#!=Dgk<y3pkDfFf+1Sr)(eF~dCku0e?gb_1+Ch&YXQ=rRqJMEg9n<|rj@(EwkK?Y
z5wodjInS$X*Ut%%L+;kT=dNB@N-{U8)RlpW8zq@@V*WNL4E`KH(w-tbEQmn!C#r()
zyfkO`j-T#%@P+|Hdsf_i<lUFQz>2!S&_clPOAd9)?X+fC86OfDK9rZOa6*!7uWvqE
zx8mC^|M>J7wIBJyk>|~v_I(g_G!Y^?S;C5V2&F8pNy5DWnxRmbcn&lNeDFY}1T<Re
zm4K?D!eKF~w|wvZgeW|)49VCgE_7PA$r8@O@o|2#wTODqP}s%)+jMrlI(OZ7y^(Mn
z*tGC-{mr9ieY{}Sv?WO2Lp;{u;`s&tTZ`>Cmh+)(MtM1bTzo!8%FIL&svE{%c->8-
z8mgqUg%GaJ7Bk{%QHqKVtst1<IVswu%2~UpVN5KU7r#eQn&9_|g$}5ug<)}WC7w1N
zoj+sU&*c@*zIyNF*IhVw=E{9Lt7s|eqqqB-3a9g-a8lt1iXR3Za@P6q-{qg<71cBT
z^Np4`YAfa13Q3a(;u3R2!oa&xw0?K0m|<)6hx_+cNL#B|Cb2bOGU-6LYH~Xvelx`C
z1kjB^Ynt)TC6C|t+R9}c4K6H@I12IKbv_FI3Q=Vaz9ZMsLnnYmVn(ABn_@vHC|Y2}
zb?x8g<Ar~``?ojP$D5w7GWpK`u&zWma+vBOqz~-F$1&I?t|&|q#9o6mUICOpO==6s
zk7z%$MXUELoVyYpa@&2Eqda&{E_5`CH$ze`fuvAUNQ4SULi#Hs>Ur37XXqGp3Z(2M
z%0w}hYg|1CwcE0~EJ<~{plbgtOB(oZ_rB-q#(?p6c5dIR{%y0Cc@$NQHp7o>x%g#D
zM$&X5K2x)G8F|>cV~SRl{jlP_ww)VabV=VXJvwwMY?o3u1JuFS=e)my=vvM)O9e+$
z6zvK^O-%?a+_M@6COma>1AVYnRUWIXI8wIzrzMNl-a7v3g3jlf9RjjAgcw6paX6~i
zd7bP`5!n|!DtH|<vaoCKcHhieb+GIxv3OPRkgNWPNE8@c>ihM~<yTyHVL@RVABW0Z
zf}seZ8RIc=&Ir<!-$dS62AL?l5J|dwa+W9&AcE4hdi>Z)&98y3B}*IZgGsy^G(PL(
zk+57NNh@-oIab??AnGSrGhwx8v`N!O0^;HfDWb#8LgcC{q)n-FJ9m`q!NqJoc&L5>
zdmK-YxdjM);$b8C*6_Nr;=|Lo&n0*E8r;6mfX-ceb^v<SgWq*yN6wtK6tq*&E(Pam
z^JVQV!Py}7oQuBj<^*-d449hBzF)Uu@usD7i=+|<kP=~loK<a;ln%wVSgM!g^?HBM
z3N17R%fs6W9Hg*k+e@w<3g+4V-BqDT6t{=c^FoQb2{PVjzO48VqQi#uut6KfF$0YP
zo+P?YvPR!}5)+J*Ff6K${whcr$<eqfF42}F-OD<4ZKJn#a-U8xlza3}jJ=M$s^6^X
zOG&vGjf*ybf@$Qoq=EDYUeHs+>AbcC))H)77{E_u8q&3}dwW<;(lrP;7SG5vwP+R{
zx;E2@9i6Jdc%yO0+hm(8w{4?=RZ%pD@W#WIi>0lYyeKj64|(UduGw3%;U}J7P!kMZ
zc4L1{R};vYdU?60jz&^u6-u?Fg0c;9%5Q<t&I$Nqi~{qWdW~|mQcr50dE~EK*6aZp
zfU<mu5)?&?nU~+d8ssh;I}kO}LK`e@F<HPU-Vx0TseNUKX+>98L$JetZ{4nGO>iv^
zqbExckm`4I^)A{>jE*xK(KEm-QJZx5i9{m|&l4p@kRXTZHKUQsuenh3yIVKxCS~0W
zBWzk*qR#f}KcxF-Q@@K~U#Jgda?!ZzEEvWa7(*`52nTK3xCd2>GfXfT{&CxWP<|5Z
z5D;Rm3L2FaSBOpy%wBOdH%bW_bH@nvGq)G*0-hH}+>uLeM__*g&qh&z*cb4_KLKwK
zzHmdUwoT+C9bkp_?%Dt6C;ttD3}9LhMZ;k9e*MXs&;Pyby;+mg8d}#r=dM{)nsP6s
zvOv)fWFZq;+B?3WM=SL&moHwoe%X$?xw*hkPz()4Y!Lfs)bt#+d(7Z<@g)Q1ezH0$
zy1QAtAv~!AZqqqmt#QDH?kPSP@aGupQYClvfWPN8sn3(e5g5IEF-k6M6^-{8V?rX1
zHitL(ZQS{Cj+|fyt5Y4U0b@^~qS8+U@DL2wz@I?efBE2H%>W&&-O-9uQtdOlY~EH-
zS`v-DK83x8w5Ms13_QHzRCV>q>S`=>Lw7xLd9F$m+q|*l)X@+;k5r2TKijx&oBGvv
z+<Rph)jbgT4T~A3QBQ$z;dw0wpRbYHw{-qSAY__~6<O)+cF)1>QJ@~U4{FDNYUBU_
zCr_N}P=E^jNJ(CYPHo{Ws2dknZbeV2B<{g9(r`1B9X7HTxCS>u=#}TS>t#|}7LsdL
z(02AJV!?8Mg;CcGFz%vMZ*liQ=i<ExNq>@`@Nb_OtG>T<`z|pYMbk!5N2J-V9s6(?
zy{*)@CP^)V*r15?oH+l|?i6mnN5_0?=K64RP6;>p8hz!EJ_8CRm$;}d);%k?b=zjS
z`q6OAGS@ST7E3(KF8F%6TF^cJ+5=BNG-dOuJ*<=s1jPEQUtgpSf}=RzjPIj7#bCUF
z<-;@lXYVgmmjVqM*5`%4-!t*PcL~n}%QzU~3;VTtL6x^jV7zPFK|hKeDcq&lDpL<&
z%&jB#?)d1`@d)bXfJ8pc3(<r7E7XyI@sC{o;hW!tcofedHZ!4v!fqYZj|IN&M~SI2
zm1&dOL(h$U<JnIM-LO*rsu8+ZW^5$kD(7}+3F8cgLd2I73?Xcvlb?I}H5b?+p%?!$
zVdBGYZeF>YWk_!blwkDYTmPqy$icPn%hfECEFU1z=);t`X7P6F31pIuzM<dz8S97|
zK#83l6unOrJtLw*lx6A5$DEIFzHN^juQK8?QT~>57H@E=v+0doAkaRW_H9leKvJ$?
znrwvr?4OH9UN$7biva(8?cFC<F5OV{!;by?4tFeU({E6B&Fa;irDb5#`=z)lXbzzK
z>@BTWG;gIQ>fV|0)V89Xo7a^#Ynk7+Lvv75HET)U`tv6^`<bM4h+Zv{AfmAv!}<>X
zwy!*%2{*kCo4D}vwd3y}lW^zQJFduU(%_S6^L7^>B1REN$VVsMp=MH>Hx?5LV`#ZW
zfHt{ZGiKy9Qdv6g(>O;E1aoDz64TU_t1!E}AH8b!M~jahKIQjuAc=YoZuiL3w<lq&
zf`N97u<WnB^EhnrmLGQfyzg+Yex18?@1VKGJ4*K8QuhEuC#$B3vwHA#wDQ#IWt#>J
z?RnchSFT#T?RZ5s{1!LbV5BghB(#ZV0(20DzWM%<-Fp?lopb)XSlzh6;L&`Rl}Xy!
zrpm8AKfUVUNibj{C@@KSS5sAoPQLoww23d@tG*u)qFK$M#PF+s_z>lViIsR@nW1z<
z(7!);^Q%IX9-ioYBWm8&V@4!-?0-M_s=Tz)hca#%iOC6mzb_mS4(_isV7a3Z^O3_R
zHDN#Ek|FR@jas?vZ`r!3Uh&xfKK-6iloyhW7O)08B(0hk%h&~7k*MxO0JITANhe5x
zm6aUUOj5gL+*R;{T(}g~Fur$7!qq6Rf!dFo<Vv~4a7}$<CWku((F|kEmcx7sWg{?u
z`{QRlXLSZa_tfM&UViF>V}Lp&&=^Tup%t~^QTTM=h{9jpb_x9AyLqd(tS%!pR&ol4
z@mAc71-!{-h9h7DY)qN_;mQTuIkC%9EGr5=S+Ssa>fdHqc;+*Y{%zlmN}Q)BRWQ<Y
zPL4k}Cvf6O@X_(F|5Sd^>|<9g`{Bbk=5ca2D00j|0J$!~R{Hjf4Qk_4BWQ_I1=y*t
zf37zGut)*<dU*SG-pZBpw~6yooEf%q@n%DDL0XqtCTL0$Rfw;EDZf1FpL!1_7HRVM
zIQ%yL)q+lN@2J7;0K(X^X0N1i7@|kXMn=?itg`y`7e9m#yZ7$&%G3u3k1C9aO>s!8
zi-^>)5bSXJmitFO^fXG)`+47?X;Z!=#S`*!nQDE{7PcH_I&dNdPj0#AQk!@KB7S+&
z^dFY(^09uB#ww9=EMBm6!|uaXhkKpZne!P+PXki^)1-fHTT@Pw&g75_$}K>dSrM?7
zt51c$U$C}U{|*iF>KnxH`|r+q=cPIDOc8Pnc_u!t74=i1s!xWtZYdphaUZ>LqJ9&z
zSK&N3CRiO=vT$9;t}UB1%QL=QU(EdW&1Yx$I6p~-kn`yfDU?;73Z3ZPuTby1rQ7$c
zTUJ84%Un8UuzKPjzc-JS9!uyKHbmJd<v{rnHW2NGHLFxxaA5b3dz&^(%xK-Rc}K<m
zUr1R1XwK&i>)feJVrlFX6J8lGq-SoOoRoN*H67J|h*HjwEvHbH@xA3g9@@OAc<4pF
zL3$4x-gm%-UGiI;Q@38=m!l_6ov7(PpiR$#?XS7zf`^{DrDtD6enlHgpL^)N<5ksS
zaRwu1fx<tG=b%`~v5c`j%VMp3@BVeGw#q&5#Dq+VZxES|Oj(8{bzlo;Zdko|+s*fk
zQk!-OG(GF%1v968kJED#@kVBj)CN586GuW1-1PeB8_v7@y7QAXGJ?@=TEBhz-@ho|
zQ9+9I$Xd&JXQ+!aN&`V<HQUzi{llYgU3>FIz4{hvj1vdnNDDV0xD!>uNxyk_0H`as
zkLr-BlM>i(pihE)^TkwUF%E?_CG^>>X-j@Ne)6Kx{nYVHvTfpdK(zJ&Y0AecD8?5I
zhQ;k>g@65Z{?6ikW5->hZV)Cf*Zi-R{p+2tyPwy-XP?A+f=jO%T)h5M6y?%~$A)D)
z?;i7q$DY4KPpjNnvS->~=WJV7?i0y|HKlTq7QncI9ml2C?EUq1FW&g;;Ug{`)S;lY
z`Y0924&VFf2lH0W-%g65n3yU{Co$nPr5}Ccut_FmoT%O69xM^k&eeFpCzh8i=7Yuh
ziqdpKr&l4?$yyTe@Xn#5yY}qYDZfdBM)?hhSO+ua;DO4GtBZ@U8<WKaVzLP*chn;@
zk9BU6nvTKpx9*tNYhXd+W{nEFiA=Zh@R7p@j}&d#xpKi)uqw#|#kH2S6Xm&zVkLW2
zYGlSo&%d<0fLoNy_n-JBxP5K8=yxG~hoaHyU=Y61x>J7V9&Oqew9ISLKn@~T96nNU
z@W_v)`&KXB3YJE!KPT2D<*F94N*qU5<L;0wOP$lGPC<{BVv3!#+WYrbmhY$}jaj87
z6+4s#{7A(>1yHee#d7CQ4xiZ|9t|ZmtBnr5v|IN+9on>OPQ(#eu1#x8S1;NQ?~33w
z3Ay<+(SKp&pw;731X0*C90~pA_g7za{qO_|xv=Ya4j0t6D{Ok<rRTM6-=a}|efbq~
zOV6B~0FV0lvJ&0UCaG9#J|K0sNAnvzs%wwF9pSf~F&R`=9IH5V<lxVh>sOSNl^l}J
zA!U^7pHih%|H?GvWJ6pWZY-c77!~R2?%5Ji>MxDhjzT<u59enQk|M{HN&)o5MF~hJ
z8!Klnx7~(^kmeSo)tqz&y2u+))RJbz3|A~6VzMQ1t>eat+^x8+7&*$AmOLCHlaabG
z`Ft#H8qJHHHezR?QWOcximG*NQj8?D<ChE11wReX2&K{RQoDaTRx!j#0dY$1ZBD))
zK$$dve_rmOsv;UilQ|4mz$RKWxtv0@D$yUPt+JSzB%P%!!k*4S-76T<bvG0VYC`Uk
z-uF?M#o@|ViX?x<JO~J6EXf&&;&KPtG~Se?6>E<l*XdoVx&kvq5hG0`S8J!2SuEZ`
zucxr4B30v3rUbj}=t*(vIr$ZesWHfp$>1Yw#C~!}qr<gol1m^~??$$P;7x<g;9vW2
z3K$>?7lZrd4)|m$a#A_i3i1iSGNG$hGj5!m&rgmHC+RFo=`NW`;%+ghG!QpuKw-1E
z0m$(_T6ws-_HvP4V+=X}IT8tTcshzKYB~<3xJL=xz~Y^wQN6qmHHn~Eef>;)sm$6q
zth)z8VYO2Y^gU!2NDdOQgbn{c8WC_MJ)I<dfRveYtdB4_WwnI3%Zw;9dD_k?Jh5s(
zoT`etQOn92>B}PKm&gnwwv1HDO7JAV<*W}@Bni`rwMkAw(ho-<bto5~c2D8-ZTK(l
z`l1k>R4g)VfCKpm4`WDLSA6y%`7Tf)&gh8?cLF!`;ZsELK|EA^8Id?npa!7D#9T0W
zizSYO4NFv3j0ZrGF6(>@axvB(b0_ImqmqI>Gy#?z@R^V=LdRDaiog>jD~^fMDNl`-
zLLzv;pw#(%KAu(Z2fU0lLt4pmG5H_A=_!>!%vxePyu2w1y9~esmTEJYEJ;YR1EPo%
z@rFtSxEN8%(K^N8Q%1ctKj-WXm!c@w&i2-dFcQMTCuwLV^3cZfZpevh@^T7NL9x=&
zqBv(Kwk4o|gu-EEX`}MtM6_y-P-{lw01!}7qY+#mLW?={(k)UKI+`3I$WzJu{IP5p
zBf%b7XTdpiMz@^|nHb@eGK~voZ-hh9K!DRH4}6?ZbyzQHCSIl|E~C85p-|MRqaGzB
z(f$BQ(II$a)pTVx>g_P(C=ZdQRmha$TV^GGg2t${lqe}r3Ljy?5o3~}q?3?nqwGz8
z08*X<&I?xhqL4|))AC^*v=j`a+&JIayyKcEe&Xp};;3=gK<Vf|P2LX%XOb%Zn0aQv
z5$WKW#*%6iNhR&=9ze}yCdQ1=u7%lJSS<N;J5mLF!IeGQv~Rj)!>%=pO4K`Jknd`|
z0z(b;H5<_>-WP@5u)nOLtn{#aoFPLhH7I9LXJ1wjtew*+w{y={s~45f;_*71ZgUDc
z)@?z{mSa$N13tB!cIqVYlx*5Tym{I>*2vb{Sv#9}(;I+{H<n|jeEd*OZs4cA2kX?$
zUA?H7CdUC2HZO=LMJDfCuD1yC(VkDdFitPtwRuD7-zU#N*??Hv!Y6<ys6Fv#IUBwd
zM>kVRZS1&6kn+ey__I@wR*yY@$Mp-JgrS9k;XuHzBOIyNxd2)$1BGP#M9rlsW2o~6
zY?etV;p?22&~i!#a073e!<Hxt`H=@+RM@OV{sXtYytlN1goXvN-!HQ6D4d9l&a)Oz
zNfrG=u_L)D@gD4GP4FIx5iD}g<fo^un7>u&AZ=Zc-*<4Qt8cvc-Oqmi;^XgaSzE?3
z$fU!^=F*A-hh?}4w1$I9<DeTKJ{X;xsH(ufI0bS>d3<SW%$cFY8&b8=h@=xzX<9#M
zB!(?u0q4zLy?Ol(a-gf^IAKT<lECw(cHaVNnawV?MnW2TwHq*V4_dC`P4foQJsMO>
zpsSzv9okcTkl6H6nWIRE$i~AlL+n$*Buh)qT!~hF_|$JvZxp>Rk|ierPwD(5siE+3
z`HqUcrH8-$a>L8-{&wP@fBpD9Q&3PFC!SD3f{4R!rleLFl7mNxA4<$Z<#`fzi&Zy^
zE&D}hVZzzbvc-n0kd!CC^71KcVkvA=w+(VkG3-w}tIA6&cpQ0?n;no?e>7Qwie2^6
ztZ;Ldr!zKbU0K*F|I`+|i4=y;PsSx%)u(DivZI8!d;lCBCg;xaQnQKJFQrTuQW8!o
zA}OstaEd-}VtZH|_Qj`&(9E%lQ&0Zi->R#F4^FxXze0Sb^utU4jGf*lP_gK4+?er@
zSe*Vs4%{Q(jf!Vqpx>jYx^yhKeDae#Tb85AG!>m5VsA<1c!{A4CFY?XaDEQ`aI9Ds
zV6c}-9E+Dp(Kxv}D-R9cz}XaQ9s|tU7%a*+>G;fk7kBQ`vu&fs^&95ZyZ86k0=*Qi
z-?@5WF=6VU^_@4QbLZ~o!f#8q?%uuQ=Y_L2NJ%Q_Ap=IBrc^8EZ;eLj;n((RSI`1^
zU%oAsbvP>C0wYl;Ipc&9t0a;7di3zgIsg53+<n)yD#!=92fw;*+^_>bRjypHy<T3O
zi?8U@xM@Ss*7^)8IQa9CHQ$zqZu{8j+rm}14MO)X+~(uh^DgX|*R<ZO=}YV9*ByKJ
zh}P$#E-!m`?_cp<(blzP0INtu^nZ}U*+*R0r{9pSB>f6(%XKTZ&iP=u5Ies`Fsx$5
zs*V)8svO;*Y4fFF38+(UsJ`plF}xW$aL2mGG84dNoblNA*?`7K>v-wl8aT4>p{H*-
zQh9vi+U;96?d;N{{l%9IxL{P@S111aXvIk)#=7@uPnvm6c<N@5QB@Vk4j(uwANrEW
z|79^ilSb%_NRvF#y{PZL+5nL2Gq}^9V$||+*zi8ZTXr{T-teYzmsM3B13A3>+s#9V
z_bJ)BXVt=De1;kc=!qh3$i=;YFRb})JBYQyUTr&fJ@=R6Cx1O*%#M<>?M1ubfo<9~
zpZKS{*DNpk+jBGJG6MMKQ?K3Dqff!ArJLYa=bUp^oA%9ayz`R69_{}4@cWdO-6m#`
zr$n8Wm&CFsR!`hnrd8v3GtT$9tOJ`_yjiw)Vc&^`wtU{!C380q98s8;U;mxSbL15M
zL8H1n`Qlw)&t5X^wXcXnd^WWVgx*t=$4z>D{KL0Skrl1HCJi2ce%x2HzyEaVqT}dj
zc~)^ma}t|Jra(as5Fa~y^2gG>O`0~~MHQDCd|@wigvj)-XQD>VcytfQS}XaXrMQ`x
zVuDRLl&lPr8Sn<*1zAU$j-tkXgW5ecdHkJ^ochPhUywmud&f|~+Y67sSG0OJ3IK2{
z%(qRaMX$d1aJ{^`M=DNGhKf!-x}1&F*~eP~nK1_6Z9xOh3cMwK4vljuB5|z_BnAuw
zcEjx>*DT)*coXx6alQoTdy}7<-oBvKppk{d2!eYD4CyiBqxtVn{`^=)H7yqeQf4Z=
z<n%uLolf1_Ne~hmG_3dfi~pKAeF+_(bEs&h7xTSJXI6yCZ{WL&=B}JIeF;uyX2|ga
z+t%%!^2d)rT%VJdOP<kpP#2JIfH$;m9O*11fSCQM{NNR12MaON)Tm~W`Im8jrddof
zSp+r*@n(Fn<ow21e|-Fx?gQGkFKGR*cjm&cBVk@DK@w31Q2f;$qhwFQk*Z_=d20co
zYN>*mwh%xg*QxlXx<wmH!BCW{pEQN1XfcuOL7uo7C4|hKxl-g9C@~sk`iCP?Fb+Wn
zzGCbU0=ac7x2{@JL`g~HDE5ePmRl#M&RIEX2W2LZN`{y%>gRANpOrbwXDX25h`ozy
zHxyZavE#NWs#&W>N2-qR-(7`Ea!67oO^hxOZHvBM`<q8^5F~O3`wg|`<OQiZhOw3c
zPjFJFPR^;5H8TG9?%ppK8R$Jyz%z=HbJ!Hc3P0~VREDaAS%%<^qJg!N3ffKUiW@g+
zKm;Qap_F(;2CPYg{Id#sx9QQhL-Ur6H>}yFJnzQm%X$&#AY0cYGcNOyW)^P-;bcYz
zCLBD1P}i<w%c_c_K!_21HY&j+FT`^G8#Fve{%-NsJq$T6$5<mOEvyN0bPQz6_AR?&
z-WOVNOe8HHdKc#b!f7$lC^}wQ5sg6iRG+FL<3ZhZX*z^kXbL!xe)42Z=dNujG0sn2
z`l|uwkLuH+RTDBVuqOfbfY|u(hU7TW?--C3YNsP?UGE+)(_ABt;LRD8(ljh6*^3}3
zwMHq$DG)$ssnUjpn-Ht<luwA^>*v=6*)sE^1+vFaSy)1;4lY5;q(Fs&VHA0bwSW~8
zFe$DHO)H)u`dmP8{r<H(y7w;lV#eZ+r_Mtj6sel_jgKFt^zxV8cW<~yX^z~ccMq50
zV57_@<~RZ;y@${eg>7EH<KjyO2;^u<)VLYRFq}w%%HEnbZ-ga4timcBjsoOT)XvK}
zB4WxV#Y>J5G43n~cRhGTO?7b1_uEOMQw6AFf3G}@nq+Z41|Mm{<MKkW>KW`$kdU(J
z)iAFfI{$>{gXG+ERIDk+(DNEMDBiM*<Ji_6^ZO0%{`=p)iOwESmJY^q8xqe5BN4|?
z*?Bo=xg@!VNlVIzORM0BN*VtUI`JHLsWSNIvWlGCz<`SjDXF_??65M5I)6l;^0EVp
z-h;Gpzzb4`U@>t;N@sy<(8w+qj_SW^>87I<r)a63FMg=#lZrz}^065f425fgA-M;5
z_W^B`FM**oXjrdR$9!@;uYAE5>*dwy*{4(WsUSSB=fIA@J~pq~mEa=*i>@U(h)1A&
zT-;%?*{fALV!0&0Ckq&ogIV5Im{ZKRD0(c3!+vjR#hT?s*WWfAs57Ax%%G8l$eH=}
z*HVd!2vv00K(ft{EJi`m6DgKZ#t$0R<>869qCSdmd@1&K5$j)KN6P`y3oZ1L-bw%!
z&;!LjNOJC(AdH`It^6+8&vElTqXp7@g>;v}-?{pxq42BE|Gg{{=Fd8-4ydvX^3RsB
zO1^mY&BI6+GaqhRLE`2qPX=&`d!|dJv?<~;9dc&Z-3<#ZCfTHO#z=l3{O_&FGaELl
zH~HP)V$_MWeeIn?pL}ur;`wXJcT`CADX}&RnupPe;z{<=#7=rfSm@fX^@!{H{N<wu
zpL%gT$hUj1|MT(6Y7z!iq<4re5ZpM3{^H~1@X^G-+$rmm_4DdZe(&DgIypN__mZW+
zr2zbqs$)I-be{CaU2-=k&@*qJaLM(zj{5KWbB|S?gm)~N{{wtw>^&nT35KR~@6*>_
zb;Ct~|Fh1ngPSr%V;v?a+GZtRx^yn5L|pPK)2qUrWr`LeEs7Kn>>Cv0UdU+)r2p7m
zZ$9|!jURmVJP;qqmKLoV!|y(L`}5f!EK{}vQ)r|_5UINri5VvF4}cc+V&cGlEG_^0
zpZ~jH)_RtSYYHSeW_;x7p$IzA_;_Xb#mA>U`rK{*Tl3nF7-JxH;V)0#^VetJxQB!U
zLJ<_=udFya^^I9iyl~f->!!dB@QijHTY;^J-ZgVQaXjwZQStuUbMCzNn%@07lXEs3
z=GCvNIQsl!@3w5y_`b)+UO2M<)%_opyUrx^S;;P6rAt&4M^P4<>SZS097%*z*MP))
z^OW2lPV(iUUX-ZFAom=9Ved9gn>XCCec#qKWdv!;R?2jY7BzZ=39+&~Uhf2OsYMIv
z4=g<yS2>W!qVTkQrmP^EWCKSQ!l+LCQoX;tqG-*Y_{N*UZ=SlUQ@3^x-t-zgV94lh
z1%+)+ovbO@vUkhcJy?Fq2ha$_x-0C}rhDJ^yLbEyPb=BDj|?jea$7oeNNNEXH`63*
zYic7h$0croiZWfwSvZ-*eqxTkQb{S!`lFRSdT88}4~V|zm&odcCB&B*YgMmg_H?3O
zQLge52ZkZW$UO?<Qx;=llC)2hnsXB96X!l1cThC;J_>>~Diop4%|VA_kw!XV6HA<`
z0-_9tvHts=8<+eD)1h$NW<^UevFh}fs+!e{is6TB5X-V5e1a@G$x)G`OzY##0vTj`
z7E3lMmKMqlT{9i!o;nIGQ~C`MHjt^`$I6~@MSspj<w~<9n*=;jn1+I3Qfw|Lz8dgz
zl4dLVCY0-=@X!z(it<pvHKyp{SU8g|fT;5*F5;FNkC1k*H0tL`6Gy)iIple?n4$?P
zF-{pHPh%N|N>~+%BWYT4W_hTWil~>b%Q(ncn7LEAaQcr*dXO}(x6H}$lkY0Jbkb(u
z2m%wg3`tDNm;Ej>g(rEq+-)-8XGuUCn{DFBX{3+`NmD^;!pfk!xL6x$I$;W=TpTr=
zqojs&q@$ju!KOJd%hX&e1s#`xcymL<xwLbH!XjZFMgro(=38`IVwo%<BaLw>9GIr4
zxZ_>LKA1QMV%raU4(&gJ`l5p-se6E#+yMo3FQ%lBw+Bv0j|H7)jDX8tyg4r7>}w|J
z<;uoVWN~x&0Ma&BF4&GF9yym#rx4rz3A<V3s5G*DDH%b^`DWH~nA%!rMVx)gNc4!L
zLk~B`fRI)h!UtUFIrJ$<({61d)|<t2kZC4=0+%@q#siV)w(_aj2*ANXYOa#m(4}M+
z(#rNm@n_081~!|FtX4WvxXi(u<0@skw3>uoH_nd1a>E?TSf6>vd6^@)^*BanGxC<{
zaXAZn?07m{hN#NvFzsB?B(qNPm{Kp34=Lq<xeQs>^s1D#=Ca(`%8gac(hM(yAh#@g
zxr`zaXCYc^lKR{*?Yt3g4mR8Jz9q3`L6^CZb6cgXHNw!nV;-_XW$->g=W57@%R0Qd
zA>uMe9_o$6@x9OdZUC8&b8DF7Y9-z*5R><m=NY<c2iVe*W{~8i$uXJai(FRV&6+cy
z_Ss!dy*le8TUwI8EUTBvN6Tde-rUG__MX<=K3=cZ+q4-7bqj#xvITEhB;wp_2bz}S
zGS6IkxUwdDxmt#|^wOUPsZwVQux!_9JxYG}3~%WYagKm3y@%1(4g<`4-eDF&oCmDP
zW4xv17+1^htz|Gf-7LB!ztV#h=W5i?GC5`!-t43r*Ls-Mn#yid6G;L^hEkNAxI~U;
z@Rsncgwxe)w|t;#MdqD@+r%kB=@dh<qifY-ygB7uv40x#8H+BB0+35s8vCfTuWQvl
zyxHeLrV!;`jqGWzUTV(5tU1T2zifGRJQi-*g*Q9Ve>*V}CH&IZcs!#T!&qBbv*KFs
ze$J8Aal~tP25)Y-Rpf`Hm*~@oIz8g_zEMrgeWGXb8Z6Yad6;-@#hck3b=$3yc27oH
z(4K@i<qusgI#J)x=&epl;MoUT?UrxGSH_W*%nH<b{B|Q-W@=56_d79oKWAh#E+rqO
z(dp+lpEgcd9<z`1npKwHZtX||%J5+oHrK?InU^+qbG8HnENr>sC!3!^9p!Shm#I-%
z@N_8ePtTE#*@ZV#`<LN(%LEP6vz%Tx*2F%iU@{+XZhMvto-kf(@Rml++)Ja*RjFup
zM#^6?nU6Qm{0dH~C?4RAup#?Yn_fZZ(%Wr5*72@$36o{A0&lg68QYnZ5^1JlIT<ME
z(#u0_@&ap}=E%30(;ROO<}12-@|I@Q&PXiBRh}ZV0Luf&!1PNyDo@I?eYk-+o$=;4
zyLIX0t>oIZwUDmOxoffjJG?*BE;kmF+`wcS-n>l1aa@0JgUSuAMp_QDSH9E^>atGI
z*)jQ;jKW(2+s=f6IjB{7V03vPF_NrXEz53ksksxAQF!xgx6*YyovT?FnZT#4p)T#`
zfjO&krwwu$YrkdJ**zZQM!8|Jr2QCo4`imbp1e$kkjojoW&ULrMcG~qZX_St!a^}=
z-=2)cTlOB0mI)7c@7$7XUw<Y;DBFYho7)G8q@8(X%Sj9t?##4uayx6zq!({)FK9x#
zMm8RQL78!fX4;v<*>29cp<8lp@PqWaC~IZU<CN#YpD|FCtKs-j5Ds=pVVos&Q<B74
zLQxB}3>0g2Qf8Bs=byowdmPqsMv>m<oU?fIeu1*6?XjJXj<T%Ne3W}ZB)0`fEkL+l
z3kDY<=h=~QwS&Q1rrLyFU6kiB-_xN9th2kO`7I`mL|@B}miMfQ^6Ai7-80MIJ>62z
z9ANCs-;qNwY6sr3;zTY-hLIKR8$58!85x-7uNa$Pvsnvx`skAeeIXv>&DEYiwW+s?
zowBTiUoqZ;&5=6!OekH=cGS7LgQt}r)l{B0V;pG?29!N+HS5_Rvn31B&U=lFytd-a
zkr)q?9Al1m?Y2*3S(>SkIjFObhpdPbI=--WbW7!mao!&TpDvBmvz>OSV`+xqEn(!8
z>Y$%Yz?=8+jFfMbSB&$%fWKCXILi>yquor#TLS0yGQ%#bWAS9<Tw2~*D^+&O{564g
zGwRUxjM`AMYwHF+QzpBnr+6oO)k3Ez$y$FX`yKL<3%88rcbU-E$^J79zLCiyI?gWb
z*Rpp@2|Sw(D${jpVdl_Ay1Y|KE-qW>IJ>srre8$w<l*EawAPBF7GEwoQIc${kvDRl
z;q5dLaZaHw32fXu@vl~1&RTRvK$ZNB9tj@@i{e}@A*Y;f-t2~IcbenMf<ri?M5{-w
zV>6%BToT20x|g3m5UPFb#*3<O&*<2_ByqQ+|BkyNYm?EHU9JQp&5`u(VX_NvZb%Go
zOilM<0B0_b@oc;;x8_E>)l|<tI(8Oy9=mqbF@Q5#Wi5MAN@Tj&RL=uFExYiR0K7BU
zvn++O=zJgbP}AI0&(1#Calv~zR3oI|ai(InL)3CTyT_}l>9Xds4s6NilPzFN&W4SL
zzt3ouZUfaOfR(z818L1^Z)m4>NEk`W$j0oa+A0P;o`q9_&MbhHN*R}pNHeaU)fxg#
zDF)9dqTUNSYf2es7Gs&b!KV+|B}d@tmRpzM7G1)={J#JL0Mk8s=m>8-^8f$<07*qo
IM6N<$g8C0hasU7T

diff --git a/themes/bootstrap/src/Annotation/BootstrapAlter.php b/themes/bootstrap/src/Annotation/BootstrapAlter.php
deleted file mode 100644
index f45ffaa..0000000
--- a/themes/bootstrap/src/Annotation/BootstrapAlter.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Annotation\BootstrapAlter.
- */
-
-namespace Drupal\bootstrap\Annotation;
-
-use Drupal\Component\Annotation\PluginID;
-
-/**
- * Defines a BootstrapAlter annotation object.
- *
- * Plugin Namespace: "Plugin/Alter".
- *
- * @see \Drupal\bootstrap\Plugin\AlterInterface
- * @see \Drupal\bootstrap\Plugin\AlterManager
- * @see plugin_api
- *
- * @Annotation
- *
- * @ingroup plugins_alter
- */
-class BootstrapAlter extends PluginID {}
diff --git a/themes/bootstrap/src/Annotation/BootstrapConstant.php b/themes/bootstrap/src/Annotation/BootstrapConstant.php
deleted file mode 100644
index b0c8864..0000000
--- a/themes/bootstrap/src/Annotation/BootstrapConstant.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Annotation\BootstrapConstant.
- */
-
-namespace Drupal\bootstrap\Annotation;
-
-use Doctrine\Common\Annotations\AnnotationException;
-use Drupal\Component\Annotation\AnnotationBase;
-
-/**
- * Defines a BootstrapConstant annotation object.
- *
- * @Annotation
- *
- * @ingroup utility
- */
-class BootstrapConstant extends AnnotationBase {
-
-  /**
-   * The stored constant value.
-   *
-   * @var mixed
-   */
-  protected $value;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $values) {
-    $string = $values['value'];
-
-    // Handle classes.
-    if (strpos($string, '::') !== FALSE) {
-      list($class, $constant) = explode('::', $string);
-      try {
-        $reflection = new \ReflectionClass($class);
-        if ($reflection->hasConstant($constant)) {
-          $this->value = $reflection->getConstant($constant);
-          return;
-        }
-      }
-      catch (\ReflectionException $e) {
-      }
-    }
-
-    // Handle procedural constants.
-    if (!$this->value && defined($string)) {
-      $this->value = constant($string);
-      return;
-    }
-
-    throw AnnotationException::semanticalErrorConstants($this->value);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function get() {
-    return $this->value;
-  }
-
-}
diff --git a/themes/bootstrap/src/Annotation/BootstrapForm.php b/themes/bootstrap/src/Annotation/BootstrapForm.php
deleted file mode 100644
index 01ba793..0000000
--- a/themes/bootstrap/src/Annotation/BootstrapForm.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Annotation\BootstrapForm.
- */
-
-namespace Drupal\bootstrap\Annotation;
-
-use Drupal\Component\Annotation\PluginID;
-
-/**
- * Defines a BootstrapForm annotation object.
- *
- * Plugin Namespace: "Plugin/Form".
- *
- * @see \Drupal\bootstrap\Plugin\FormInterface
- * @see \Drupal\bootstrap\Plugin\FormManager
- * @see plugin_api
- *
- * @Annotation
- *
- * @ingroup plugins_form
- */
-class BootstrapForm extends PluginID {}
diff --git a/themes/bootstrap/src/Annotation/BootstrapPreprocess.php b/themes/bootstrap/src/Annotation/BootstrapPreprocess.php
deleted file mode 100644
index 73a0ecc..0000000
--- a/themes/bootstrap/src/Annotation/BootstrapPreprocess.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Annotation\BootstrapPreprocess.
- */
-
-namespace Drupal\bootstrap\Annotation;
-
-/**
- * Defines a BootstrapPreprocess annotation object.
- *
- * Plugin Namespace: "Plugin/Preprocess".
- *
- * @see \Drupal\bootstrap\Plugin\PreprocessInterface
- * @see \Drupal\bootstrap\Plugin\PreprocessManager
- * @see plugin_api
- *
- * @Annotation
- *
- * @ingroup plugins_preprocess
- */
-class BootstrapPreprocess extends PluginCallback {}
diff --git a/themes/bootstrap/src/Annotation/BootstrapPrerender.php b/themes/bootstrap/src/Annotation/BootstrapPrerender.php
deleted file mode 100644
index 8748821..0000000
--- a/themes/bootstrap/src/Annotation/BootstrapPrerender.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Annotation\BootstrapPrerender.
- */
-
-namespace Drupal\bootstrap\Annotation;
-
-/**
- * Defines a BootstrapPrerender annotation object.
- *
- * Plugin Namespace: "Plugin/Prerender".
- *
- * @see \Drupal\bootstrap\Plugin\PrerenderInterface
- * @see \Drupal\bootstrap\Plugin\PrerenderManager
- * @see plugin_api
- *
- * @Annotation
- *
- * @ingroup plugins_prerender
- */
-class BootstrapPrerender extends PluginCallback {}
diff --git a/themes/bootstrap/src/Annotation/BootstrapProcess.php b/themes/bootstrap/src/Annotation/BootstrapProcess.php
deleted file mode 100644
index bbbb408..0000000
--- a/themes/bootstrap/src/Annotation/BootstrapProcess.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Annotation\BootstrapProcess.
- */
-
-namespace Drupal\bootstrap\Annotation;
-
-/**
- * Defines a BootstrapProcess annotation object.
- *
- * Plugin Namespace: "Plugin/Process".
- *
- * @see \Drupal\bootstrap\Plugin\ProcessInterface
- * @see \Drupal\bootstrap\Plugin\ProcessManager
- * @see plugin_api
- *
- * @Annotation
- *
- * @ingroup plugins_process
- */
-class BootstrapProcess extends PluginCallback {}
diff --git a/themes/bootstrap/src/Annotation/BootstrapProvider.php b/themes/bootstrap/src/Annotation/BootstrapProvider.php
deleted file mode 100644
index 2f8fe7c..0000000
--- a/themes/bootstrap/src/Annotation/BootstrapProvider.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Annotation\BootstrapProvider.
- */
-
-namespace Drupal\bootstrap\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a BootstrapProvider annotation object.
- *
- * Plugin Namespace: "Plugin/Provider".
- *
- * @see \Drupal\bootstrap\Plugin\ProviderInterface
- * @see \Drupal\bootstrap\Plugin\ProviderManager
- * @see \Drupal\bootstrap\Theme::getProviders()
- * @see \Drupal\bootstrap\Theme::getProvider()
- * @see plugin_api
- *
- * @Annotation
- *
- * @ingroup plugins_provider
- */
-class BootstrapProvider extends Plugin {
-
-  /**
-   * An API URL used to retrieve data for the provider.
-   *
-   * @var string
-   */
-  protected $api = '';
-
-  /**
-   * An array of CSS assets.
-   *
-   * @var array
-   */
-  protected $css = [];
-
-  /**
-   * A description about the provider.
-   *
-   * @var string
-   */
-  protected $description = '';
-
-  /**
-   * A flag determining whether or not the API request has failed.
-   *
-   * @var bool
-   */
-  protected $error = FALSE;
-
-  /**
-   * A flag determining whether or not data has been manually imported.
-   *
-   * @var bool
-   */
-  protected $imported = FALSE;
-
-  /**
-   * An array of JavaScript assets.
-   *
-   * @var array
-   */
-  protected $js = [];
-
-  /**
-   * A human-readable label.
-   *
-   * @var string
-   */
-  protected $label = '';
-
-  /**
-   * An associative array of minified CSS and JavaScript assets.
-   *
-   * @var array
-   */
-  protected $min = ['css' => [], 'js' => []];
-
-  /**
-   * An array of themes supported by the provider.
-   *
-   * @var array
-   */
-  protected $themes = [];
-
-  /**
-   * An array of versions supported by the provider.
-   *
-   * @var array
-   */
-  protected $versions = [];
-
-}
diff --git a/themes/bootstrap/src/Annotation/BootstrapSetting.php b/themes/bootstrap/src/Annotation/BootstrapSetting.php
deleted file mode 100644
index 9524858..0000000
--- a/themes/bootstrap/src/Annotation/BootstrapSetting.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Annotation\BootstrapSetting.
- */
-
-namespace Drupal\bootstrap\Annotation;
-
-use Doctrine\Common\Annotations\Annotation\Attribute;
-use Doctrine\Common\Annotations\Annotation\Attributes;
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a BootstrapSetting annotation object.
- *
- * Plugin Namespace: "Plugin/Setting".
- *
- * @see \Drupal\bootstrap\Plugin\SettingInterface
- * @see \Drupal\bootstrap\Plugin\SettingManager
- * @see plugin_api
- *
- * @Annotation
- *
- * @Attributes({
- *
- * @Attribute("defaultValue", type = "mixed", required = true),
- *
- * @Attribute("type", type = "string", required = true),
- * })
- *
- * @ingroup plugins_setting
- */
-class BootstrapSetting extends Plugin {
-
-  /**
-   * The setting's description.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $description;
-
-  /**
-   * The setting's default value.
-   *
-   * @var mixed
-   */
-  public $defaultValue;
-
-  /**
-   * The setting's groups.
-   *
-   * @var \Drupal\Core\Annotation\Translation[]
-   */
-  public $groups = [];
-
-  /**
-   * The setting's title.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $title;
-
-  /**
-   * The setting's type.
-   *
-   * @var string
-   */
-  public $type;
-
-  /**
-   * The setting's see references.
-   *
-   * @var array
-   */
-  public $see = [];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct($values) {
-    if (!isset($values['groups'])) {
-      $values['groups'] = ['general' => t('General')];
-    }
-    parent::__construct($values);
-  }
-
-}
diff --git a/themes/bootstrap/src/Annotation/BootstrapUpdate.php b/themes/bootstrap/src/Annotation/BootstrapUpdate.php
deleted file mode 100644
index 19de0b5..0000000
--- a/themes/bootstrap/src/Annotation/BootstrapUpdate.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Annotation\BootstrapUpdate.
- */
-
-namespace Drupal\bootstrap\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a BootstrapUpdate annotation object.
- *
- * Plugin Namespace: "Plugin/Update".
- *
- * @see \Drupal\bootstrap\Plugin\UpdateInterface
- * @see \Drupal\bootstrap\Plugin\UpdateManager
- * @see plugin_api
- *
- * @Annotation
- *
- * @ingroup plugins_update
- */
-class BootstrapUpdate extends Plugin {
-
-  /**
-   * The schema version.
-   *
-   * @var int
-   */
-  public $id = '';
-
-  /**
-   * A short human-readable label.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $label = '';
-
-  /**
-   * A detailed description.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $description = '';
-
-  /**
-   * Level of severity. Should be one of: default, danger, info, warning.
-   *
-   * @var string
-   */
-  public $severity = 'default';
-
-  /**
-   * Indicates whether or not the update should apply only to itself
-   * (the theme that implemented the plugin) and none of its sub-themes.
-   *
-   * @var bool
-   */
-  public $private = FALSE;
-
-
-}
diff --git a/themes/bootstrap/src/Annotation/PluginCallback.php b/themes/bootstrap/src/Annotation/PluginCallback.php
deleted file mode 100644
index 8878c92..0000000
--- a/themes/bootstrap/src/Annotation/PluginCallback.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Annotation\PluginCallback.
- */
-
-namespace Drupal\bootstrap\Annotation;
-
-use Drupal\bootstrap\Bootstrap;
-use Drupal\Component\Annotation\AnnotationInterface;
-use Drupal\Component\Annotation\PluginID;
-
-/**
- * Defines a Plugin annotation object that just contains an ID.
- *
- * @Annotation
- *
- * @ingroup utility
- */
-class PluginCallback extends PluginID {
-
-  /**
-   * The plugin ID.
-   *
-   * When an annotation is given no key, 'value' is assumed by Doctrine.
-   *
-   * @var string
-   */
-  public $value;
-
-  /**
-   * Flag that determines how to add the plugin to a callback array.
-   *
-   * Must be one of the following constants:
-   *   - \Drupal\bootstrap\Bootstrap::CALLBACK_APPEND
-   *   - \Drupal\bootstrap\Bootstrap::CALLBACK_PREPEND
-   *   - \Drupal\bootstrap\Bootstrap::CALLBACK_REPLACE_APPEND
-   *   - \Drupal\bootstrap\Bootstrap::CALLBACK_REPLACE_PREPEND
-   * Use with @ BootstrapConstant annotation.
-   *
-   * @see \Drupal\bootstrap\Bootstrap::addCallback()
-   *
-   * @var \Drupal\bootstrap\Annotation\BootstrapConstant
-   */
-  public $action = Bootstrap::CALLBACK_APPEND;
-
-  /**
-   * A callback to replace.
-   *
-   * @var string
-   */
-  public $replace = FALSE;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function get() {
-    $definition = parent::get();
-    $parent_properties = array_keys($definition);
-    $parent_properties[] = 'value';
-
-    // Merge in the defined properties.
-    $reflection = new \ReflectionClass($this);
-    foreach ($reflection->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) {
-      $name = $property->getName();
-      if (in_array($name, $parent_properties)) {
-        continue;
-      }
-      $value = $property->getValue($this);
-      if ($value instanceof AnnotationInterface) {
-        $value = $value->get();
-      }
-      $definition[$name] = $value;
-    }
-
-    return $definition;
-  }
-
-}
diff --git a/themes/bootstrap/src/Bootstrap.php b/themes/bootstrap/src/Bootstrap.php
deleted file mode 100644
index 63f0d66..0000000
--- a/themes/bootstrap/src/Bootstrap.php
+++ /dev/null
@@ -1,1159 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Bootstrap.
- */
-
-namespace Drupal\bootstrap;
-
-use Drupal\bootstrap\Plugin\AlterManager;
-use Drupal\bootstrap\Plugin\FormManager;
-use Drupal\bootstrap\Plugin\PreprocessManager;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Unicode;
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Extension\ThemeHandlerInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The primary class for the Drupal Bootstrap base theme.
- *
- * Provides many helper methods.
- *
- * @ingroup utility
- */
-class Bootstrap {
-
-  /**
-   * Tag used to invalidate caches.
-   *
-   * @var string
-   */
-  const CACHE_TAG = 'theme_registry';
-
-  /**
-   * Append a callback.
-   *
-   * @var int
-   */
-  const CALLBACK_APPEND = 1;
-
-  /**
-   * Prepend a callback.
-   *
-   * @var int
-   */
-  const CALLBACK_PREPEND = 2;
-
-  /**
-   * Replace a callback or append it if not found.
-   *
-   * @var int
-   */
-  const CALLBACK_REPLACE_APPEND = 3;
-
-  /**
-   * Replace a callback or prepend it if not found.
-   *
-   * @var int
-   */
-  const CALLBACK_REPLACE_PREPEND = 4;
-
-  /**
-   * The current supported Bootstrap Framework version.
-   *
-   * @var string
-   */
-  const FRAMEWORK_VERSION = '3.3.7';
-
-  /**
-   * The Bootstrap Framework documentation site.
-   *
-   * @var string
-   */
-  const FRAMEWORK_HOMEPAGE = 'http://getbootstrap.com';
-
-  /**
-   * The Bootstrap Framework repository.
-   *
-   * @var string
-   */
-  const FRAMEWORK_REPOSITORY = 'https://github.com/twbs/bootstrap';
-
-  /**
-   * The project branch.
-   *
-   * @var string
-   */
-  const PROJECT_BRANCH = '8.x-3.x';
-
-  /**
-   * The Drupal Bootstrap documentation site.
-   *
-   * @var string
-   */
-  const PROJECT_DOCUMENTATION = 'http://drupal-bootstrap.org';
-
-  /**
-   * The Drupal Bootstrap project page.
-   *
-   * @var string
-   */
-  const PROJECT_PAGE = 'https://www.drupal.org/project/bootstrap';
-
-  /**
-   * Adds a callback to an array.
-   *
-   * @param array $callbacks
-   *   An array of callbacks to add the callback to, passed by reference.
-   * @param array|string $callback
-   *   The callback to add.
-   * @param array|string $replace
-   *   If specified, the callback will instead replace the specified value
-   *   instead of being appended to the $callbacks array.
-   * @param int $action
-   *   Flag that determines how to add the callback to the array.
-   *
-   * @return bool
-   *   TRUE if the callback was added, FALSE if $replace was specified but its
-   *   callback could be found in the list of callbacks.
-   */
-  public static function addCallback(array &$callbacks, $callback, $replace = NULL, $action = Bootstrap::CALLBACK_APPEND) {
-    // Replace a callback.
-    if ($replace) {
-      // Iterate through the callbacks.
-      foreach ($callbacks as $key => $value) {
-        // Convert each callback and match the string values.
-        if (Unicode::convertCallback($value) === Unicode::convertCallback($replace)) {
-          $callbacks[$key] = $callback;
-          return TRUE;
-        }
-      }
-      // No match found and action shouldn't append or prepend.
-      if ($action !== self::CALLBACK_REPLACE_APPEND || $action !== self::CALLBACK_REPLACE_PREPEND) {
-        return FALSE;
-      }
-    }
-
-    // Append or prepend the callback.
-    switch ($action) {
-      case self::CALLBACK_APPEND:
-      case self::CALLBACK_REPLACE_APPEND:
-        $callbacks[] = $callback;
-        return TRUE;
-
-      case self::CALLBACK_PREPEND:
-      case self::CALLBACK_REPLACE_PREPEND:
-        array_unshift($callbacks, $callback);
-        return TRUE;
-
-      default:
-        return FALSE;
-    }
-  }
-
-  /**
-   * Manages theme alter hooks as classes and allows sub-themes to sub-class.
-   *
-   * @param string $function
-   *   The procedural function name of the alter (e.g. __FUNCTION__).
-   * @param mixed $data
-   *   The variable that was passed to the hook_TYPE_alter() implementation to
-   *   be altered. The type of this variable depends on the value of the $type
-   *   argument. For example, when altering a 'form', $data will be a structured
-   *   array. When altering a 'profile', $data will be an object.
-   * @param mixed $context1
-   *   (optional) An additional variable that is passed by reference.
-   * @param mixed $context2
-   *   (optional) An additional variable that is passed by reference. If more
-   *   context needs to be provided to implementations, then this should be an
-   *   associative array as described above.
-   */
-  public static function alter($function, &$data, &$context1 = NULL, &$context2 = NULL) {
-    static $theme;
-    if (!isset($theme)) {
-      $theme = self::getTheme();
-    }
-
-    // Immediately return if the active theme is not Bootstrap based.
-    if (!$theme->isBootstrap()) {
-      return;
-    }
-
-    // Extract the alter hook name.
-    $hook = Unicode::extractHook($function, 'alter');
-
-    // Handle form alters as a separate plugin.
-    if (strpos($hook, 'form') === 0 && $context1 instanceof FormStateInterface) {
-      $form_state = $context1;
-      $form_id = $context2;
-
-      // Due to a core bug that affects admin themes, we should not double
-      // process the "system_theme_settings" form twice in the global
-      // hook_form_alter() invocation.
-      // @see https://drupal.org/node/943212
-      if ($form_id === 'system_theme_settings') {
-        return;
-      }
-
-      // Keep track of the form identifiers.
-      $ids = [];
-
-      // Get the build data.
-      $build_info = $form_state->getBuildInfo();
-
-      // Extract the base_form_id.
-      $base_form_id = !empty($build_info['base_form_id']) ? $build_info['base_form_id'] : FALSE;
-      if ($base_form_id) {
-        $ids[] = $base_form_id;
-      }
-
-      // If there was no provided form identifier, extract it.
-      if (!$form_id) {
-        $form_id = !empty($build_info['form_id']) ? $build_info['form_id'] : Unicode::extractHook($function, 'alter', 'form');
-      }
-      if ($form_id) {
-        $ids[] = $form_id;
-      }
-
-      // Retrieve a list of form definitions.
-      $form_manager = new FormManager($theme);
-
-      // Iterate over each form identifier and look for a possible plugin.
-      foreach ($ids as $id) {
-        /** @var \Drupal\bootstrap\Plugin\Form\FormInterface $form */
-        if ($form_manager->hasDefinition($id) && ($form = $form_manager->createInstance($id, ['theme' => $theme]))) {
-          $data['#submit'][] = [get_class($form), 'submitForm'];
-          $data['#validate'][] = [get_class($form), 'validateForm'];
-          $form->alterForm($data, $form_state, $form_id);
-        }
-      }
-    }
-    // Process hook alter normally.
-    else {
-      // Retrieve a list of alter definitions.
-      $alter_manager = new AlterManager($theme);
-
-      /** @var \Drupal\bootstrap\Plugin\Alter\AlterInterface $class */
-      if ($alter_manager->hasDefinition($hook) && ($class = $alter_manager->createInstance($hook, ['theme' => $theme]))) {
-        $class->alter($data, $context1, $context2);
-      }
-    }
-  }
-
-  /**
-   * Returns a documentation search URL for a given query.
-   *
-   * @param string $query
-   *   The query to search for.
-   *
-   * @return string
-   *   The complete URL to the documentation site.
-   */
-  public static function apiSearchUrl($query = '') {
-    return self::PROJECT_DOCUMENTATION . '/api/bootstrap/' . self::PROJECT_BRANCH . '/search/' . Html::escape($query);
-  }
-
-  /**
-   * Returns the autoload fix include path.
-   *
-   * This method assists class based callbacks that normally do not work.
-   *
-   * If you notice that your class based callback is never invoked, you may try
-   * using this helper method as an "include" or "file" for your callback, if
-   * the callback metadata supports such an option.
-   *
-   * Depending on when or where a callback is invoked during a request, such as
-   * an ajax or batch request, the theme handler may not yet be fully
-   * initialized.
-   *
-   * Typically there is little that can be done about this "issue" from core.
-   * It must balance the appropriate level that should be bootstrapped along
-   * with common functionality. Cross-request class based callbacks are not
-   * common in themes.
-   *
-   * When this file is included, it will attempt to jump start this process.
-   *
-   * Please keep in mind, that it is merely an attempt and does not guarantee
-   * that it will actually work. If it does not appear to work, do not use it.
-   *
-   * @see \Drupal\Core\Extension\ThemeHandler::listInfo
-   * @see \Drupal\Core\Extension\ThemeHandler::systemThemeList
-   * @see system_list
-   * @see system_register()
-   * @see drupal_classloader_register()
-   *
-   * @return string
-   *   The autoload fix include path, relative to Drupal root.
-   */
-  public static function autoloadFixInclude() {
-    return static::getTheme('bootstrap')->getPath() . '/autoload-fix.php';
-  }
-
-  /**
-   * Matches a Bootstrap class based on a string value.
-   *
-   * @param string|array $value
-   *   The string to match against to determine the class. Passed by reference
-   *   in case it is a render array that needs to be rendered and typecast.
-   * @param string $default
-   *   The default class to return if no match is found.
-   *
-   * @return string
-   *   The Bootstrap class matched against the value of $haystack or $default
-   *   if no match could be made.
-   */
-  public static function cssClassFromString(&$value, $default = '') {
-    static $lang;
-    if (!isset($lang)) {
-      $lang = \Drupal::languageManager()->getCurrentLanguage()->getId();
-    }
-
-    $theme = static::getTheme();
-    $texts = $theme->getCache('cssClassFromString', [$lang]);
-
-    // Ensure it's a string value that was passed.
-    $string = static::toString($value);
-
-    if ($texts->isEmpty()) {
-      $data = [
-        // Text that match these specific strings are checked first.
-        'matches' => [
-          // Primary class.
-          t('Download feature')->render()   => 'primary',
-
-          // Success class.
-          t('Add effect')->render()         => 'success',
-          t('Add and configure')->render()  => 'success',
-          t('Save configuration')->render() => 'success',
-          t('Install and set as default')->render() => 'success',
-
-          // Info class.
-          t('Save and add')->render()       => 'info',
-          t('Add another item')->render()   => 'info',
-          t('Update style')->render()       => 'info',
-        ],
-
-        // Text containing these words anywhere in the string are checked last.
-        'contains' => [
-          // Primary class.
-          t('Confirm')->render()            => 'primary',
-          t('Filter')->render()             => 'primary',
-          t('Log in')->render()             => 'primary',
-          t('Submit')->render()             => 'primary',
-          t('Search')->render()             => 'primary',
-          t('Settings')->render()           => 'primary',
-          t('Upload')->render()             => 'primary',
-
-          // Danger class.
-          t('Delete')->render()             => 'danger',
-          t('Remove')->render()             => 'danger',
-          t('Uninstall')->render()          => 'danger',
-
-          // Success class.
-          t('Add')->render()                => 'success',
-          t('Create')->render()             => 'success',
-          t('Install')->render()            => 'success',
-          t('Save')->render()               => 'success',
-          t('Write')->render()              => 'success',
-
-          // Warning class.
-          t('Export')->render()             => 'warning',
-          t('Import')->render()             => 'warning',
-          t('Restore')->render()            => 'warning',
-          t('Rebuild')->render()            => 'warning',
-
-          // Info class.
-          t('Apply')->render()              => 'info',
-          t('Update')->render()             => 'info',
-        ],
-      ];
-
-      // Allow sub-themes to alter this array of patterns.
-      /** @var \Drupal\Core\Theme\ThemeManager $theme_manager */
-      $theme_manager = \Drupal::service('theme.manager');
-      $theme_manager->alter('bootstrap_colorize_text', $data);
-
-      $texts->setMultiple($data);
-    }
-
-    // Iterate over the array.
-    foreach ($texts as $pattern => $strings) {
-      foreach ($strings as $text => $class) {
-        switch ($pattern) {
-          case 'matches':
-            if ($string === $text) {
-              return $class;
-            }
-            break;
-
-          case 'contains':
-            if (strpos(Unicode::strtolower($string), Unicode::strtolower($text)) !== FALSE) {
-              return $class;
-            }
-            break;
-        }
-      }
-    }
-
-    // Return the default if nothing was matched.
-    return $default;
-  }
-
-  /**
-   * Logs and displays a warning about a deprecated function/method being used.
-   */
-  public static function deprecated() {
-    // Log backtrace.
-    $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-    \Drupal::logger('bootstrap')->warning('<pre><code>' . print_r($backtrace, TRUE) . '</code></pre>');
-
-    if (!self::getTheme()->getSetting('suppress_deprecated_warnings')) {
-      return;
-    }
-
-    // Extrapolate the caller.
-    $caller = $backtrace[1];
-    $class = '';
-    if (isset($caller['class'])) {
-      $parts = explode('\\', $caller['class']);
-      $class = array_pop($parts) . '::';
-    }
-    drupal_set_message(t('The following function(s) or method(s) have been deprecated, please check the logs for a more detailed backtrace on where these are being invoked. Click on the function or method link to search the documentation site for a possible replacement or solution.'), 'warning');
-    drupal_set_message(t('<a href=":url" target="_blank">@title</a>.', [
-      ':url' => self::apiSearchUrl($class . $caller['function']),
-      '@title' => ($class ? $caller['class'] . $caller['type'] : '') . $caller['function'] . '()',
-    ]), 'warning');
-  }
-
-  /**
-   * Provides additional variables to be used in elements and templates.
-   *
-   * @return array
-   *   An associative array containing key/default value pairs.
-   */
-  public static function extraVariables() {
-    return [
-      // @see https://drupal.org/node/2035055
-      'context' => [],
-
-      // @see https://drupal.org/node/2219965
-      'icon' => NULL,
-      'icon_position' => 'before',
-      'icon_only' => FALSE,
-    ];
-  }
-
-  /**
-   * Retrieves a theme instance of \Drupal\bootstrap.
-   *
-   * @param string $name
-   *   The machine name of a theme. If omitted, the active theme will be used.
-   * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
-   *   The theme handler object.
-   *
-   * @return \Drupal\bootstrap\Theme
-   *   A theme object.
-   */
-  public static function getTheme($name = NULL, ThemeHandlerInterface $theme_handler = NULL) {
-    // Immediately return if theme passed is already instantiated.
-    if ($name instanceof Theme) {
-      return $name;
-    }
-
-    static $themes = [];
-    static $active_theme;
-    if (!isset($active_theme)) {
-      $active_theme = \Drupal::theme()->getActiveTheme()->getName();
-    }
-    if (!isset($name)) {
-      $name = $active_theme;
-    }
-
-    if (!isset($theme_handler)) {
-      $theme_handler = self::getThemeHandler();
-    }
-
-    if (!isset($themes[$name])) {
-      $themes[$name] = new Theme($theme_handler->getTheme($name), $theme_handler);
-    }
-
-    return $themes[$name];
-  }
-
-  /**
-   * Retrieves the theme handler instance.
-   *
-   * @return \Drupal\Core\Extension\ThemeHandlerInterface
-   *   The theme handler instance.
-   */
-  public static function getThemeHandler() {
-    static $theme_handler;
-    if (!isset($theme_handler)) {
-      $theme_handler = \Drupal::service('theme_handler');
-    }
-    return $theme_handler;
-  }
-
-  /**
-   * Returns the theme hook definition information.
-   *
-   * This base-theme's custom theme hook implementations. Never define "path"
-   * as this is automatically detected and added.
-   *
-   * @see \Drupal\bootstrap\Plugin\Alter\ThemeRegistry::alter()
-   * @see bootstrap_theme_registry_alter()
-   * @see bootstrap_theme()
-   * @see hook_theme()
-   */
-  public static function getThemeHooks() {
-    $hooks['bootstrap_carousel'] = [
-      'variables' => [
-        'attributes' => [],
-        'controls' => TRUE,
-        'id' => NULL,
-        'indicators' => TRUE,
-        'interval' => 5000,
-        'pause' => 'hover',
-        'slides' => [],
-        'start_index' => 0,
-        'wrap' => TRUE,
-      ],
-    ];
-
-    $hooks['bootstrap_dropdown'] = [
-      'variables' => [
-        'alignment' => 'down',
-        'attributes' => [],
-        'items' => [],
-        'split' => FALSE,
-        'toggle' => NULL,
-      ],
-    ];
-
-    $hooks['bootstrap_modal'] = [
-      'variables' => [
-        'attributes' => [],
-        'body' => '',
-        'body_attributes' => [],
-        'close_button' => TRUE,
-        'content_attributes' => [],
-        'description' => NULL,
-        'description_display' => 'before',
-        'dialog_attributes' => [],
-        'footer' => '',
-        'footer_attributes' => [],
-        'header_attributes' => [],
-        'id' => NULL,
-        'size' => NULL,
-        'title' => '',
-        'title_attributes' => [],
-      ],
-    ];
-
-    $hooks['bootstrap_panel'] = [
-      'variables' => [
-        'attributes' => [],
-        'body' => [],
-        'body_attributes' => [],
-        'collapsible' => FALSE,
-        'collapsed' => FALSE,
-        'description' => NULL,
-        'description_display' => 'before',
-        'footer' => NULL,
-        'footer_attributes' => [],
-        'heading' => NULL,
-        'heading_attributes' => [],
-        'id' => NULL,
-        'panel_type' => 'default',
-      ],
-    ];
-
-    return $hooks;
-  }
-
-  /**
-   * Returns a specific Bootstrap Glyphicon.
-   *
-   * @param string $name
-   *   The icon name, minus the "glyphicon-" prefix.
-   * @param array $default
-   *   (Optional) The default render array to use if $name is not available.
-   *
-   * @return array
-   *   The render containing the icon defined by $name, $default value if
-   *   icon does not exist or returns NULL if no icon could be rendered.
-   */
-  public static function glyphicon($name, $default = []) {
-    $icon = [];
-
-    // Ensure the icon specified is a valid Bootstrap Glyphicon.
-    // @todo Supply a specific version to _bootstrap_glyphicons() when Icon API
-    // supports versioning.
-    if (self::getTheme()->hasGlyphicons() && in_array($name, self::glyphicons())) {
-      // Attempt to use the Icon API module, if enabled and it generates output.
-      if (\Drupal::moduleHandler()->moduleExists('icon')) {
-        $icon = [
-          '#type' => 'icon',
-          '#bundle' => 'bootstrap',
-          '#icon' => 'glyphicon-' . $name,
-        ];
-      }
-      else {
-        $icon = [
-          '#type' => 'html_tag',
-          '#tag' => 'span',
-          '#value' => '',
-          '#attributes' => [
-            'class' => ['icon', 'glyphicon', 'glyphicon-' . $name],
-            'aria-hidden' => 'true',
-          ],
-        ];
-      }
-    }
-
-    return $icon ?: $default;
-  }
-
-  /**
-   * Matches a Bootstrap Glyphicon based on a string value.
-   *
-   * @param string $value
-   *   The string to match against to determine the icon. Passed by reference
-   *   in case it is a render array that needs to be rendered and typecast.
-   * @param array $default
-   *   The default render array to return if no match is found.
-   *
-   * @return string
-   *   The Bootstrap icon matched against the value of $haystack or $default if
-   *   no match could be made.
-   */
-  public static function glyphiconFromString(&$value, $default = []) {
-    static $lang;
-    if (!isset($lang)) {
-      $lang = \Drupal::languageManager()->getCurrentLanguage()->getId();
-    }
-
-    $theme = static::getTheme();
-    $texts = $theme->getCache('glyphiconFromString', [$lang]);
-
-    // Ensure it's a string value that was passed.
-    $string = static::toString($value);
-
-    if ($texts->isEmpty()) {
-      $data = [
-        // Text that match these specific strings are checked first.
-        'matches' => [],
-
-        // Text containing these words anywhere in the string are checked last.
-        'contains' => [
-          t('Manage')->render()     => 'cog',
-          t('Configure')->render()  => 'cog',
-          t('Settings')->render()   => 'cog',
-          t('Download')->render()   => 'download',
-          t('Export')->render()     => 'export',
-          t('Filter')->render()     => 'filter',
-          t('Import')->render()     => 'import',
-          t('Save')->render()       => 'ok',
-          t('Update')->render()     => 'ok',
-          t('Edit')->render()       => 'pencil',
-          t('Uninstall')->render()  => 'trash',
-          t('Install')->render()    => 'plus',
-          t('Write')->render()      => 'plus',
-          t('Cancel')->render()     => 'remove',
-          t('Delete')->render()     => 'trash',
-          t('Remove')->render()     => 'trash',
-          t('Search')->render()     => 'search',
-          t('Upload')->render()     => 'upload',
-          t('Preview')->render()    => 'eye-open',
-          t('Log in')->render()     => 'log-in',
-        ],
-      ];
-
-      // Allow sub-themes to alter this array of patterns.
-      /** @var \Drupal\Core\Theme\ThemeManager $theme_manager */
-      $theme_manager = \Drupal::service('theme.manager');
-      $theme_manager->alter('bootstrap_iconize_text', $data);
-
-      $texts->setMultiple($data);
-    }
-
-    // Iterate over the array.
-    foreach ($texts as $pattern => $strings) {
-      foreach ($strings as $text => $icon) {
-        switch ($pattern) {
-          case 'matches':
-            if ($string === $text) {
-              return self::glyphicon($icon, $default);
-            }
-            break;
-
-          case 'contains':
-            if (strpos(Unicode::strtolower($string), Unicode::strtolower($text)) !== FALSE) {
-              return self::glyphicon($icon, $default);
-            }
-            break;
-        }
-      }
-    }
-
-    // Return a default icon if nothing was matched.
-    return $default;
-  }
-
-  /**
-   * Returns a list of available Bootstrap Framework Glyphicons.
-   *
-   * @param string $version
-   *   The specific version of glyphicons to return. If not set, the latest
-   *   BOOTSTRAP_VERSION will be used.
-   *
-   * @return array
-   *   An associative array of icons keyed by their classes.
-   */
-  public static function glyphicons($version = NULL) {
-    static $versions;
-    if (!isset($versions)) {
-      $versions = [];
-      $versions['3.0.0'] = [
-        // Class => Name.
-        'glyphicon-adjust' => 'adjust',
-        'glyphicon-align-center' => 'align-center',
-        'glyphicon-align-justify' => 'align-justify',
-        'glyphicon-align-left' => 'align-left',
-        'glyphicon-align-right' => 'align-right',
-        'glyphicon-arrow-down' => 'arrow-down',
-        'glyphicon-arrow-left' => 'arrow-left',
-        'glyphicon-arrow-right' => 'arrow-right',
-        'glyphicon-arrow-up' => 'arrow-up',
-        'glyphicon-asterisk' => 'asterisk',
-        'glyphicon-backward' => 'backward',
-        'glyphicon-ban-circle' => 'ban-circle',
-        'glyphicon-barcode' => 'barcode',
-        'glyphicon-bell' => 'bell',
-        'glyphicon-bold' => 'bold',
-        'glyphicon-book' => 'book',
-        'glyphicon-bookmark' => 'bookmark',
-        'glyphicon-briefcase' => 'briefcase',
-        'glyphicon-bullhorn' => 'bullhorn',
-        'glyphicon-calendar' => 'calendar',
-        'glyphicon-camera' => 'camera',
-        'glyphicon-certificate' => 'certificate',
-        'glyphicon-check' => 'check',
-        'glyphicon-chevron-down' => 'chevron-down',
-        'glyphicon-chevron-left' => 'chevron-left',
-        'glyphicon-chevron-right' => 'chevron-right',
-        'glyphicon-chevron-up' => 'chevron-up',
-        'glyphicon-circle-arrow-down' => 'circle-arrow-down',
-        'glyphicon-circle-arrow-left' => 'circle-arrow-left',
-        'glyphicon-circle-arrow-right' => 'circle-arrow-right',
-        'glyphicon-circle-arrow-up' => 'circle-arrow-up',
-        'glyphicon-cloud' => 'cloud',
-        'glyphicon-cloud-download' => 'cloud-download',
-        'glyphicon-cloud-upload' => 'cloud-upload',
-        'glyphicon-cog' => 'cog',
-        'glyphicon-collapse-down' => 'collapse-down',
-        'glyphicon-collapse-up' => 'collapse-up',
-        'glyphicon-comment' => 'comment',
-        'glyphicon-compressed' => 'compressed',
-        'glyphicon-copyright-mark' => 'copyright-mark',
-        'glyphicon-credit-card' => 'credit-card',
-        'glyphicon-cutlery' => 'cutlery',
-        'glyphicon-dashboard' => 'dashboard',
-        'glyphicon-download' => 'download',
-        'glyphicon-download-alt' => 'download-alt',
-        'glyphicon-earphone' => 'earphone',
-        'glyphicon-edit' => 'edit',
-        'glyphicon-eject' => 'eject',
-        'glyphicon-envelope' => 'envelope',
-        'glyphicon-euro' => 'euro',
-        'glyphicon-exclamation-sign' => 'exclamation-sign',
-        'glyphicon-expand' => 'expand',
-        'glyphicon-export' => 'export',
-        'glyphicon-eye-close' => 'eye-close',
-        'glyphicon-eye-open' => 'eye-open',
-        'glyphicon-facetime-video' => 'facetime-video',
-        'glyphicon-fast-backward' => 'fast-backward',
-        'glyphicon-fast-forward' => 'fast-forward',
-        'glyphicon-file' => 'file',
-        'glyphicon-film' => 'film',
-        'glyphicon-filter' => 'filter',
-        'glyphicon-fire' => 'fire',
-        'glyphicon-flag' => 'flag',
-        'glyphicon-flash' => 'flash',
-        'glyphicon-floppy-disk' => 'floppy-disk',
-        'glyphicon-floppy-open' => 'floppy-open',
-        'glyphicon-floppy-remove' => 'floppy-remove',
-        'glyphicon-floppy-save' => 'floppy-save',
-        'glyphicon-floppy-saved' => 'floppy-saved',
-        'glyphicon-folder-close' => 'folder-close',
-        'glyphicon-folder-open' => 'folder-open',
-        'glyphicon-font' => 'font',
-        'glyphicon-forward' => 'forward',
-        'glyphicon-fullscreen' => 'fullscreen',
-        'glyphicon-gbp' => 'gbp',
-        'glyphicon-gift' => 'gift',
-        'glyphicon-glass' => 'glass',
-        'glyphicon-globe' => 'globe',
-        'glyphicon-hand-down' => 'hand-down',
-        'glyphicon-hand-left' => 'hand-left',
-        'glyphicon-hand-right' => 'hand-right',
-        'glyphicon-hand-up' => 'hand-up',
-        'glyphicon-hd-video' => 'hd-video',
-        'glyphicon-hdd' => 'hdd',
-        'glyphicon-header' => 'header',
-        'glyphicon-headphones' => 'headphones',
-        'glyphicon-heart' => 'heart',
-        'glyphicon-heart-empty' => 'heart-empty',
-        'glyphicon-home' => 'home',
-        'glyphicon-import' => 'import',
-        'glyphicon-inbox' => 'inbox',
-        'glyphicon-indent-left' => 'indent-left',
-        'glyphicon-indent-right' => 'indent-right',
-        'glyphicon-info-sign' => 'info-sign',
-        'glyphicon-italic' => 'italic',
-        'glyphicon-leaf' => 'leaf',
-        'glyphicon-link' => 'link',
-        'glyphicon-list' => 'list',
-        'glyphicon-list-alt' => 'list-alt',
-        'glyphicon-lock' => 'lock',
-        'glyphicon-log-in' => 'log-in',
-        'glyphicon-log-out' => 'log-out',
-        'glyphicon-magnet' => 'magnet',
-        'glyphicon-map-marker' => 'map-marker',
-        'glyphicon-minus' => 'minus',
-        'glyphicon-minus-sign' => 'minus-sign',
-        'glyphicon-move' => 'move',
-        'glyphicon-music' => 'music',
-        'glyphicon-new-window' => 'new-window',
-        'glyphicon-off' => 'off',
-        'glyphicon-ok' => 'ok',
-        'glyphicon-ok-circle' => 'ok-circle',
-        'glyphicon-ok-sign' => 'ok-sign',
-        'glyphicon-open' => 'open',
-        'glyphicon-paperclip' => 'paperclip',
-        'glyphicon-pause' => 'pause',
-        'glyphicon-pencil' => 'pencil',
-        'glyphicon-phone' => 'phone',
-        'glyphicon-phone-alt' => 'phone-alt',
-        'glyphicon-picture' => 'picture',
-        'glyphicon-plane' => 'plane',
-        'glyphicon-play' => 'play',
-        'glyphicon-play-circle' => 'play-circle',
-        'glyphicon-plus' => 'plus',
-        'glyphicon-plus-sign' => 'plus-sign',
-        'glyphicon-print' => 'print',
-        'glyphicon-pushpin' => 'pushpin',
-        'glyphicon-qrcode' => 'qrcode',
-        'glyphicon-question-sign' => 'question-sign',
-        'glyphicon-random' => 'random',
-        'glyphicon-record' => 'record',
-        'glyphicon-refresh' => 'refresh',
-        'glyphicon-registration-mark' => 'registration-mark',
-        'glyphicon-remove' => 'remove',
-        'glyphicon-remove-circle' => 'remove-circle',
-        'glyphicon-remove-sign' => 'remove-sign',
-        'glyphicon-repeat' => 'repeat',
-        'glyphicon-resize-full' => 'resize-full',
-        'glyphicon-resize-horizontal' => 'resize-horizontal',
-        'glyphicon-resize-small' => 'resize-small',
-        'glyphicon-resize-vertical' => 'resize-vertical',
-        'glyphicon-retweet' => 'retweet',
-        'glyphicon-road' => 'road',
-        'glyphicon-save' => 'save',
-        'glyphicon-saved' => 'saved',
-        'glyphicon-screenshot' => 'screenshot',
-        'glyphicon-sd-video' => 'sd-video',
-        'glyphicon-search' => 'search',
-        'glyphicon-send' => 'send',
-        'glyphicon-share' => 'share',
-        'glyphicon-share-alt' => 'share-alt',
-        'glyphicon-shopping-cart' => 'shopping-cart',
-        'glyphicon-signal' => 'signal',
-        'glyphicon-sort' => 'sort',
-        'glyphicon-sort-by-alphabet' => 'sort-by-alphabet',
-        'glyphicon-sort-by-alphabet-alt' => 'sort-by-alphabet-alt',
-        'glyphicon-sort-by-attributes' => 'sort-by-attributes',
-        'glyphicon-sort-by-attributes-alt' => 'sort-by-attributes-alt',
-        'glyphicon-sort-by-order' => 'sort-by-order',
-        'glyphicon-sort-by-order-alt' => 'sort-by-order-alt',
-        'glyphicon-sound-5-1' => 'sound-5-1',
-        'glyphicon-sound-6-1' => 'sound-6-1',
-        'glyphicon-sound-7-1' => 'sound-7-1',
-        'glyphicon-sound-dolby' => 'sound-dolby',
-        'glyphicon-sound-stereo' => 'sound-stereo',
-        'glyphicon-star' => 'star',
-        'glyphicon-star-empty' => 'star-empty',
-        'glyphicon-stats' => 'stats',
-        'glyphicon-step-backward' => 'step-backward',
-        'glyphicon-step-forward' => 'step-forward',
-        'glyphicon-stop' => 'stop',
-        'glyphicon-subtitles' => 'subtitles',
-        'glyphicon-tag' => 'tag',
-        'glyphicon-tags' => 'tags',
-        'glyphicon-tasks' => 'tasks',
-        'glyphicon-text-height' => 'text-height',
-        'glyphicon-text-width' => 'text-width',
-        'glyphicon-th' => 'th',
-        'glyphicon-th-large' => 'th-large',
-        'glyphicon-th-list' => 'th-list',
-        'glyphicon-thumbs-down' => 'thumbs-down',
-        'glyphicon-thumbs-up' => 'thumbs-up',
-        'glyphicon-time' => 'time',
-        'glyphicon-tint' => 'tint',
-        'glyphicon-tower' => 'tower',
-        'glyphicon-transfer' => 'transfer',
-        'glyphicon-trash' => 'trash',
-        'glyphicon-tree-conifer' => 'tree-conifer',
-        'glyphicon-tree-deciduous' => 'tree-deciduous',
-        'glyphicon-unchecked' => 'unchecked',
-        'glyphicon-upload' => 'upload',
-        'glyphicon-usd' => 'usd',
-        'glyphicon-user' => 'user',
-        'glyphicon-volume-down' => 'volume-down',
-        'glyphicon-volume-off' => 'volume-off',
-        'glyphicon-volume-up' => 'volume-up',
-        'glyphicon-warning-sign' => 'warning-sign',
-        'glyphicon-wrench' => 'wrench',
-        'glyphicon-zoom-in' => 'zoom-in',
-        'glyphicon-zoom-out' => 'zoom-out',
-      ];
-      $versions['3.0.1'] = $versions['3.0.0'];
-      $versions['3.0.2'] = $versions['3.0.1'];
-      $versions['3.0.3'] = $versions['3.0.2'];
-      $versions['3.1.0'] = $versions['3.0.3'];
-      $versions['3.1.1'] = $versions['3.1.0'];
-      $versions['3.2.0'] = $versions['3.1.1'];
-      $versions['3.3.0'] = array_merge($versions['3.2.0'], [
-        'glyphicon-eur' => 'eur',
-      ]);
-      $versions['3.3.1'] = $versions['3.3.0'];
-      $versions['3.3.2'] = array_merge($versions['3.3.1'], [
-        'glyphicon-alert' => 'alert',
-        'glyphicon-apple' => 'apple',
-        'glyphicon-baby-formula' => 'baby-formula',
-        'glyphicon-bed' => 'bed',
-        'glyphicon-bishop' => 'bishop',
-        'glyphicon-bitcoin' => 'bitcoin',
-        'glyphicon-blackboard' => 'blackboard',
-        'glyphicon-cd' => 'cd',
-        'glyphicon-console' => 'console',
-        'glyphicon-copy' => 'copy',
-        'glyphicon-duplicate' => 'duplicate',
-        'glyphicon-education' => 'education',
-        'glyphicon-equalizer' => 'equalizer',
-        'glyphicon-erase' => 'erase',
-        'glyphicon-grain' => 'grain',
-        'glyphicon-hourglass' => 'hourglass',
-        'glyphicon-ice-lolly' => 'ice-lolly',
-        'glyphicon-ice-lolly-tasted' => 'ice-lolly-tasted',
-        'glyphicon-king' => 'king',
-        'glyphicon-knight' => 'knight',
-        'glyphicon-lamp' => 'lamp',
-        'glyphicon-level-up' => 'level-up',
-        'glyphicon-menu-down' => 'menu-down',
-        'glyphicon-menu-hamburger' => 'menu-hamburger',
-        'glyphicon-menu-left' => 'menu-left',
-        'glyphicon-menu-right' => 'menu-right',
-        'glyphicon-menu-up' => 'menu-up',
-        'glyphicon-modal-window' => 'modal-window',
-        'glyphicon-object-align-bottom' => 'object-align-bottom',
-        'glyphicon-object-align-horizontal' => 'object-align-horizontal',
-        'glyphicon-object-align-left' => 'object-align-left',
-        'glyphicon-object-align-right' => 'object-align-right',
-        'glyphicon-object-align-top' => 'object-align-top',
-        'glyphicon-object-align-vertical' => 'object-align-vertical',
-        'glyphicon-oil' => 'oil',
-        'glyphicon-open-file' => 'open-file',
-        'glyphicon-option-horizontal' => 'option-horizontal',
-        'glyphicon-option-vertical' => 'option-vertical',
-        'glyphicon-paste' => 'paste',
-        'glyphicon-pawn' => 'pawn',
-        'glyphicon-piggy-bank' => 'piggy-bank',
-        'glyphicon-queen' => 'queen',
-        'glyphicon-ruble' => 'ruble',
-        'glyphicon-save-file' => 'save-file',
-        'glyphicon-scale' => 'scale',
-        'glyphicon-scissors' => 'scissors',
-        'glyphicon-subscript' => 'subscript',
-        'glyphicon-sunglasses' => 'sunglasses',
-        'glyphicon-superscript' => 'superscript',
-        'glyphicon-tent' => 'tent',
-        'glyphicon-text-background' => 'text-background',
-        'glyphicon-text-color' => 'text-color',
-        'glyphicon-text-size' => 'text-size',
-        'glyphicon-triangle-bottom' => 'triangle-bottom',
-        'glyphicon-triangle-left' => 'triangle-left',
-        'glyphicon-triangle-right' => 'triangle-right',
-        'glyphicon-triangle-top' => 'triangle-top',
-        'glyphicon-yen' => 'yen',
-      ]);
-      $versions['3.3.4'] = array_merge($versions['3.3.2'], [
-        'glyphicon-btc' => 'btc',
-        'glyphicon-jpy' => 'jpy',
-        'glyphicon-rub' => 'rub',
-        'glyphicon-xbt' => 'xbt',
-      ]);
-      $versions['3.3.5'] = $versions['3.3.4'];
-      $versions['3.3.6'] = $versions['3.3.5'];
-      $versions['3.3.7'] = $versions['3.3.6'];
-    }
-
-    // Return a specific versions icon set.
-    if (isset($version) && isset($versions[$version])) {
-      return $versions[$version];
-    }
-
-    // Return the latest version.
-    return $versions[self::FRAMEWORK_VERSION];
-  }
-
-  /**
-   * Determines if the "cache_context.url.path.is_front" service exists.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   *
-   * @see \Drupal\bootstrap\Bootstrap::isFront
-   * @see \Drupal\bootstrap\Bootstrap::preprocess
-   * @see https://www.drupal.org/node/2829588
-   */
-  public static function hasIsFrontCacheContext() {
-    static $has_is_front_cache_context;
-    if (!isset($has_is_front_cache_context)) {
-      $has_is_front_cache_context = \Drupal::getContainer()->has('cache_context.url.path.is_front');
-    }
-    return $has_is_front_cache_context;
-  }
-
-  /**
-   * Initializes the active theme.
-   */
-  final public static function initialize() {
-    static $initialized = FALSE;
-    if (!$initialized) {
-      // Initialize the active theme.
-      $active_theme = self::getTheme();
-
-      // Include deprecated functions.
-      foreach ($active_theme->getAncestry() as $ancestor) {
-        if ($ancestor->getSetting('include_deprecated')) {
-          $files = $ancestor->fileScan('/^deprecated\.php$/');
-          if ($file = reset($files)) {
-            $ancestor->includeOnce($file->uri, FALSE);
-          }
-        }
-      }
-
-      $initialized = TRUE;
-    }
-  }
-
-  /**
-   * Determines if the current path is the "front" page.
-   *
-   * *Note:* This method will not return `TRUE` if there is not a proper
-   * "cache_context.url.path.is_front" service defined.
-   *
-   * *Note:* If using this method in preprocess/render array logic, the proper
-   * #cache context must also be defined:
-   *
-   * ```php
-   * $variables['#cache']['contexts'][] = 'url.path.is_front';
-   * ```
-   *
-   * @return bool
-   *   TRUE or FALSE
-   *
-   * @see \Drupal\bootstrap\Bootstrap::hasIsFrontCacheContext
-   * @see \Drupal\bootstrap\Bootstrap::preprocess
-   * @see https://www.drupal.org/node/2829588
-   */
-  public static function isFront() {
-    static $is_front;
-    if (!isset($is_front)) {
-      try {
-        $is_front = static::hasIsFrontCacheContext() ? \Drupal::service('path.matcher')->isFrontPage() : FALSE;
-      }
-      catch (\Exception $e) {
-        $is_front = FALSE;
-      }
-    }
-    return $is_front;
-  }
-
-  /**
-   * Preprocess theme hook variables.
-   *
-   * @param array $variables
-   *   The variables array, passed by reference.
-   * @param string $hook
-   *   The name of the theme hook.
-   * @param array $info
-   *   The theme hook info.
-   */
-  public static function preprocess(array &$variables, $hook, array $info) {
-    static $theme;
-    if (!isset($theme)) {
-      $theme = self::getTheme();
-    }
-    static $preprocess_manager;
-    if (!isset($preprocess_manager)) {
-      $preprocess_manager = new PreprocessManager($theme);
-    }
-
-    // Adds a global "is_front" variable back to all templates.
-    // @see https://www.drupal.org/node/2829585
-    if (!isset($variables['is_front'])) {
-      $variables['is_front'] = static::isFront();
-      if (static::hasIsFrontCacheContext()) {
-        $variables['#cache']['contexts'][] = 'url.path.is_front';
-      }
-    }
-
-    // Ensure that any default theme hook variables exist. Due to how theme
-    // hook suggestion alters work, the variables provided are from the
-    // original theme hook, not the suggestion.
-    if (isset($info['variables'])) {
-      $variables = NestedArray::mergeDeepArray([$info['variables'], $variables], TRUE);
-    }
-
-    // Add active theme context.
-    // @see https://www.drupal.org/node/2630870
-    if (!isset($variables['theme'])) {
-      $variables['theme'] = $theme->getInfo();
-      $variables['theme']['dev'] = $theme->isDev();
-      $variables['theme']['livereload'] = $theme->livereloadUrl();
-      $variables['theme']['name'] = $theme->getName();
-      $variables['theme']['path'] = $theme->getPath();
-      $variables['theme']['title'] = $theme->getTitle();
-      $variables['theme']['settings'] = $theme->settings()->get();
-      $variables['theme']['has_glyphicons'] = $theme->hasGlyphicons();
-      $variables['theme']['query_string'] = \Drupal::getContainer()->get('state')->get('system.css_js_query_string') ?: '0';
-    }
-
-    // Invoke necessary preprocess plugin.
-    if (isset($info['bootstrap preprocess'])) {
-      if ($preprocess_manager->hasDefinition($info['bootstrap preprocess'])) {
-        $class = $preprocess_manager->createInstance($info['bootstrap preprocess'], ['theme' => $theme]);
-        /** @var \Drupal\bootstrap\Plugin\Preprocess\PreprocessInterface $class */
-        $class->preprocess($variables, $hook, $info);
-      }
-    }
-  }
-
-  /**
-   * Ensures a value is typecast to a string, rendering an array if necessary.
-   *
-   * @param string|array $value
-   *   The value to typecast, passed by reference.
-   *
-   * @return string
-   *   The typecast string value.
-   */
-  public static function toString(&$value) {
-    return (string) (Element::isRenderArray($value) ? Element::create($value)->renderPlain() : $value);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Alter/AlterInterface.php b/themes/bootstrap/src/Plugin/Alter/AlterInterface.php
deleted file mode 100644
index 349f360..0000000
--- a/themes/bootstrap/src/Plugin/Alter/AlterInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Alter\AlterInterface.
- */
-
-namespace Drupal\bootstrap\Plugin\Alter;
-
-/**
- * Defines the interface for an object oriented alter.
- *
- * @ingroup plugins_alter
- */
-interface AlterInterface {
-
-  /**
-   * Alters data for a specific hook_TYPE_alter() implementation.
-   *
-   * @param mixed $data
-   *   The variable that will be passed to hook_TYPE_alter() implementations to
-   *   be altered. The type of this variable depends on the value of the $type
-   *   argument. For example, when altering a 'form', $data will be a structured
-   *   array. When altering a 'profile', $data will be an object.
-   * @param mixed $context1
-   *   (optional) An additional variable that is passed by reference.
-   * @param mixed $context2
-   *   (optional) An additional variable that is passed by reference. If more
-   *   context needs to be provided to implementations, then this should be an
-   *   associative array as described above.
-   */
-  public function alter(&$data, &$context1 = NULL, &$context2 = NULL);
-
-}
diff --git a/themes/bootstrap/src/Plugin/Alter/ElementInfo.php b/themes/bootstrap/src/Plugin/Alter/ElementInfo.php
deleted file mode 100644
index dd2cee1..0000000
--- a/themes/bootstrap/src/Plugin/Alter/ElementInfo.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Alter\ElementInfo.
- */
-
-namespace Drupal\bootstrap\Plugin\Alter;
-
-use Drupal\bootstrap\Annotation\BootstrapAlter;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Plugin\PluginBase;
-use Drupal\bootstrap\Plugin\PrerenderManager;
-use Drupal\bootstrap\Plugin\ProcessManager;
-
-/**
- * Implements hook_element_info_alter().
- *
- * @ingroup plugins_alter
- *
- * @BootstrapAlter("element_info")
- */
-class ElementInfo extends PluginBase implements AlterInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alter(&$types, &$context1 = NULL, &$context2 = NULL) {
-    // Sort the types for easier debugging.
-    ksort($types, SORT_NATURAL);
-
-    $extra_variables = Bootstrap::extraVariables();
-    $process_manager = new ProcessManager($this->theme);
-    $pre_render_manager = new PrerenderManager($this->theme);
-
-    foreach (array_keys($types) as $type) {
-      $element = &$types[$type];
-
-      // By default, the "checkboxes" and "radios" element types invoke
-      // CompositeFormElementTrait::preRenderCompositeFormElement which wraps
-      // the element in a fieldset and thus ultimately a panel. This isn't
-      // (usually) the desired effect for these elements, so to avoid rendering
-      // them as Bootstrap panels, the #bootstrap_panel should be set to FALSE
-      // by default. This allows those who wish to opt back in to do so.
-      if ($type === 'checkboxes' || $type === 'radios') {
-        $element['#bootstrap_panel'] = FALSE;
-      }
-
-      // Core does not actually use the "description_display" property on the
-      // "details" or "fieldset" element types because the positioning of the
-      // description is never used in core templates. However, the form builder
-      // automatically applies the value of "after", thus making it impossible
-      // to detect a valid value later in the rendering process. It looks better
-      // for the "details" and "fieldset" element types to display as "before".
-      // @see \Drupal\Core\Form\FormBuilder::doBuildForm()
-      if ($type === 'details' || $type === 'fieldset') {
-        $element['#description_display'] = 'before';
-        $element['#panel_type'] = 'default';
-      }
-
-      // Add extra variables as defaults to all elements.
-      foreach ($extra_variables as $key => $value) {
-        if (!isset($element["#$key"])) {
-          $element["#$key"] = $value;
-        }
-      }
-
-      // Only continue if the type isn't "form" (as it messes up AJAX).
-      if ($type !== 'form') {
-        $regex = "/^$type/";
-
-        // Add necessary #process callbacks.
-        $element['#process'][] = [get_class($process_manager), 'process'];
-        $definitions = $process_manager->getDefinitionsLike($regex);
-        foreach ($definitions as $definition) {
-          Bootstrap::addCallback($element['#process'], [$definition['class'], 'process'], $definition['replace'], $definition['action']);
-        }
-
-        // Add necessary #pre_render callbacks.
-        $element['#pre_render'][] = [get_class($pre_render_manager), 'preRender'];
-        foreach ($pre_render_manager->getDefinitionsLike($regex) as $definition) {
-          Bootstrap::addCallback($element['#pre_render'], [$definition['class'], 'preRender'], $definition['replace'], $definition['action']);
-        }
-      }
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Alter/LibraryInfo.php b/themes/bootstrap/src/Plugin/Alter/LibraryInfo.php
deleted file mode 100644
index d91f539..0000000
--- a/themes/bootstrap/src/Plugin/Alter/LibraryInfo.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Alter\LibraryInfo.
- */
-
-namespace Drupal\bootstrap\Plugin\Alter;
-
-use Drupal\bootstrap\Annotation\BootstrapAlter;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Plugin\PluginBase;
-use Drupal\Component\Utility\NestedArray;
-
-/**
- * Implements hook_library_info_alter().
- *
- * @ingroup plugins_alter
- *
- * @BootstrapAlter("library_info")
- */
-class LibraryInfo extends PluginBase implements AlterInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alter(&$libraries, &$extension = NULL, &$context2 = NULL) {
-    $livereload = $this->theme->livereloadUrl();
-
-    // Disable preprocess on all CSS/JS if "livereload" is enabled.
-    if ($livereload) {
-      $this->processLibrary($libraries, function (&$info, &$key, $type) {
-        if ($type === 'css' || $type === 'js') {
-          $info['preprocess'] = FALSE;
-        }
-      });
-    }
-
-    if ($extension === 'bootstrap') {
-      // Alter the "livereload.js" placeholder with the correct URL.
-      if ($livereload) {
-        $libraries['livereload']['js'][$livereload] = $libraries['livereload']['js']['livereload.js'];
-        unset($libraries['livereload']['js']['livereload.js']);
-      }
-
-      // Retrieve the theme's CDN provider and assets.
-      $provider = $this->theme->getProvider();
-      $assets = $provider ? $provider->getAssets() : [];
-
-      // Immediately return if there is no provider or assets.
-      if (!$provider || !$assets) {
-        return;
-      }
-
-      // Merge the assets into the library info.
-      $libraries['theme'] = NestedArray::mergeDeepArray([$assets, $libraries['theme']], TRUE);
-
-      // Add a specific version and theme CSS overrides file.
-      // @todo This should be retrieved by the Provider API.
-      $version = $this->theme->getSetting('cdn_' . $provider->getPluginId() . '_version') ?: Bootstrap::FRAMEWORK_VERSION;
-      $libraries['theme']['version'] = $version;
-      $provider_theme = $this->theme->getSetting('cdn_' . $provider->getPluginId() . '_theme') ?: 'bootstrap';
-      $provider_theme = $provider_theme === 'bootstrap' || $provider_theme === 'bootstrap_theme' ? '' : "-$provider_theme";
-
-      foreach ($this->theme->getAncestry(TRUE) as $ancestor) {
-        $overrides = $ancestor->getPath() . "/css/$version/overrides$provider_theme.min.css";
-        if (file_exists($overrides)) {
-          // Since this uses a relative path to the ancestor from DRUPAL_ROOT,
-          // we must prepend the entire path with forward slash (/) so it
-          // doesn't prepend the active theme's path.
-          $overrides = "/$overrides";
-
-          // The overrides file must also be stored in the "base" category so
-          // it isn't added after any potential sub-theme's "theme" category.
-          // There's no weight, so it will be added after the provider's assets.
-          // @see https://www.drupal.org/node/2770613
-          $libraries['theme']['css']['base'][$overrides] = [];
-          break;
-        }
-      }
-    }
-    // Core replacements.
-    elseif ($extension === 'core') {
-      // Replace core dialog/jQuery UI implementations with Bootstrap Modals.
-      if ($this->theme->getSetting('modal_enabled')) {
-        $libraries['drupal.dialog']['override'] = 'bootstrap/drupal.dialog';
-        $libraries['drupal.dialog.ajax']['override'] = 'bootstrap/drupal.dialog.ajax';
-      }
-    }
-  }
-
-  /**
-   * Processes library definitions.
-   *
-   * @param array $libraries
-   *   The libraries array, passed by reference.
-   * @param callable $callback
-   *   The callback to perform processing on the library.
-   */
-  public function processLibrary(&$libraries, callable $callback) {
-    foreach ($libraries as &$library) {
-      foreach ($library as $type => $definition) {
-        if (is_array($definition)) {
-          $modified = [];
-          // CSS needs special handling since it contains grouping.
-          if ($type === 'css') {
-            foreach ($definition as $group => $files) {
-              foreach ($files as $key => $info) {
-                call_user_func_array($callback, [&$info, &$key, $type]);
-                $modified[$group][$key] = $info;
-              }
-            }
-          }
-          else {
-            foreach ($definition as $key => $info) {
-              call_user_func_array($callback, [&$info, &$key, $type]);
-              $modified[$key] = $info;
-            }
-          }
-          $library[$type] = $modified;
-        }
-      }
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Alter/PageAttachments.php b/themes/bootstrap/src/Plugin/Alter/PageAttachments.php
deleted file mode 100644
index 5379dca..0000000
--- a/themes/bootstrap/src/Plugin/Alter/PageAttachments.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Alter\PageAttachments.
- */
-
-namespace Drupal\bootstrap\Plugin\Alter;
-
-use Drupal\bootstrap\Annotation\BootstrapAlter;
-use Drupal\bootstrap\Plugin\PluginBase;
-
-/**
- * Implements hook_page_attachments_alter().
- *
- * @ingroup plugins_alter
- *
- * @BootstrapAlter("page_attachments")
- */
-class PageAttachments extends PluginBase implements AlterInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alter(&$attachments, &$context1 = NULL, &$context2 = NULL) {
-    if ($this->theme->livereloadUrl()) {
-      $attachments['#attached']['library'][] = 'bootstrap/livereload';
-    }
-    if ($this->theme->getSetting('popover_enabled')) {
-      $attachments['#attached']['library'][] = 'bootstrap/popover';
-    }
-    if ($this->theme->getSetting('tooltip_enabled')) {
-      $attachments['#attached']['library'][] = 'bootstrap/tooltip';
-    }
-    $attachments['#attached']['drupalSettings']['bootstrap'] = $this->theme->drupalSettings();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Alter/ThemeRegistry.php b/themes/bootstrap/src/Plugin/Alter/ThemeRegistry.php
deleted file mode 100644
index 7ff3ac7..0000000
--- a/themes/bootstrap/src/Plugin/Alter/ThemeRegistry.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Alter\ThemeRegistry.
- */
-
-// Name of the base theme must be lowercase for it to be autoload discoverable.
-namespace Drupal\bootstrap\Plugin\Alter;
-
-use Drupal\bootstrap\Annotation\BootstrapAlter;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Plugin\PreprocessManager;
-use Drupal\Core\Theme\Registry;
-
-/**
- * Extends the theme registry to override and use protected functions.
- *
- * @todo Refactor into a proper theme.registry service replacement in a
- * bootstrap_core sub-module once this theme can add it as a dependency.
- *
- * @see https://www.drupal.org/node/474684
- *
- * @ingroup plugins_alter
- *
- * @BootstrapAlter("theme_registry")
- */
-class ThemeRegistry extends Registry implements AlterInterface {
-
-  /**
-   * The currently set Bootstrap theme object.
-   *
-   * Cannot use "$theme" because this is the Registry's ActiveTheme object.
-   *
-   * @var \Drupal\bootstrap\Theme
-   */
-  protected $currentTheme;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition) {
-    // This is technically a plugin constructor, but because we wish to use the
-    // protected methods of the Registry class, we must extend from it. Thus,
-    // to properly construct the extended Registry object, we must pass the
-    // arguments it would normally get from the service container to "fake" it.
-    if (!isset($configuration['theme'])) {
-      $configuration['theme'] = Bootstrap::getTheme();
-    }
-    $this->currentTheme = $configuration['theme'];
-    parent::__construct(
-      \Drupal::service('app.root'),
-      \Drupal::service('cache.default'),
-      \Drupal::service('lock'),
-      \Drupal::service('module_handler'),
-      \Drupal::service('theme_handler'),
-      \Drupal::service('theme.initialization'),
-      $this->currentTheme->getName()
-    );
-    $this->setThemeManager(\Drupal::service('theme.manager'));
-    $this->init();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alter(&$cache, &$context1 = NULL, &$context2 = NULL) {
-    // Sort the registry alphabetically (for easier debugging).
-    ksort($cache);
-
-    // Add extra variables to all theme hooks.
-    $extra_variables = Bootstrap::extraVariables();
-    foreach (array_keys($cache) as $hook) {
-      // Skip theme hooks that don't set variables.
-      if (!isset($cache[$hook]['variables'])) {
-        continue;
-      }
-      $cache[$hook]['variables'] += $extra_variables;
-    }
-
-    // Ensure paths to templates are set properly. This allows templates to
-    // be moved around in a theme without having to constantly ensuring that
-    // the theme's hook_theme() definitions have the correct static "path" set.
-    foreach ($this->currentTheme->getAncestry() as $ancestor) {
-      $current_theme = $ancestor->getName() === $this->currentTheme->getName();
-      $theme_path = $ancestor->getPath();
-      foreach ($ancestor->fileScan('/\.html\.twig$/', 'templates') as $file) {
-        $hook = str_replace('-', '_', str_replace('.html.twig', '', $file->filename));
-        $path = dirname($file->uri);
-        $incomplete = !isset($cache[$hook]) || strrpos($hook, '__');
-
-        // Create a new theme hook. This primarily happens when theme hook
-        // suggestion templates are created. To prevent the new hook from
-        // inheriting parent hook's "template", it must be manually set here.
-        // @see https://www.drupal.org/node/2871551
-        if (!isset($cache[$hook])) {
-          $cache[$hook] = [
-            'template' => str_replace('.html.twig', '', $file->filename),
-          ];
-        }
-
-        // Always ensure that "path", "type" and "theme path" are properly set.
-        $cache[$hook]['path'] = $path;
-        $cache[$hook]['type'] = $current_theme ? 'theme' : 'base_theme';
-        $cache[$hook]['theme path'] = $theme_path;
-
-        // Flag incomplete.
-        if ($incomplete) {
-          $cache[$hook]['incomplete preprocess functions'] = TRUE;
-        }
-      }
-    }
-
-    // Discover all the theme's preprocess plugins.
-    $preprocess_manager = new PreprocessManager($this->currentTheme);
-    $plugins = $preprocess_manager->getDefinitions();
-    ksort($plugins, SORT_NATURAL);
-
-    // Iterate over the preprocess plugins.
-    foreach ($plugins as $plugin_id => $definition) {
-      $incomplete = !isset($cache[$plugin_id]) || strrpos($plugin_id, '__');
-      if (!isset($cache[$plugin_id])) {
-        $cache[$plugin_id] = [];
-      }
-      array_walk($cache, function (&$info, $hook) use ($plugin_id, $definition) {
-        if ($hook === $plugin_id || strpos($hook, $plugin_id . '__') === 0) {
-          if (!isset($info['preprocess functions'])) {
-            $info['preprocess functions'] = [];
-          }
-          // Due to a limitation in \Drupal\Core\Theme\ThemeManager::render,
-          // callbacks must be functions and not classes. We always specify
-          // "bootstrap_preprocess" here and then assign the plugin ID to a
-          // separate property that we can later intercept and properly invoke.
-          // @todo Revisit if/when preprocess callbacks can be any callable.
-          Bootstrap::addCallback($info['preprocess functions'], 'bootstrap_preprocess', $definition['replace'], $definition['action']);
-          $info['preprocess functions'] = array_unique($info['preprocess functions']);
-          $info['bootstrap preprocess'] = $plugin_id;
-        }
-      });
-
-      if ($incomplete) {
-        $cache[$plugin_id]['incomplete preprocess functions'] = TRUE;
-      }
-    }
-
-    // Allow core to post process.
-    $this->postProcessExtension($cache, $this->theme);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Alter/ThemeSuggestions.php b/themes/bootstrap/src/Plugin/Alter/ThemeSuggestions.php
deleted file mode 100644
index b4a4c63..0000000
--- a/themes/bootstrap/src/Plugin/Alter/ThemeSuggestions.php
+++ /dev/null
@@ -1,369 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Alter\ThemeSuggestions.
- */
-
-namespace Drupal\bootstrap\Plugin\Alter;
-
-use Drupal\bootstrap\Annotation\BootstrapAlter;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Plugin\PluginBase;
-use Drupal\bootstrap\Utility\Unicode;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Core\Entity\EntityInterface;
-
-/**
- * Implements hook_theme_suggestions_alter().
- *
- * @ingroup plugins_alter
- *
- * @BootstrapAlter("theme_suggestions")
- */
-class ThemeSuggestions extends PluginBase implements AlterInterface {
-
-  /**
-   * @var array
-   */
-  protected $bootstrapPanelTypes = ['details', 'fieldset'];
-
-  /**
-   * An element object provided in the variables array, may not be set.
-   *
-   * @var \Drupal\bootstrap\Utility\Element|false
-   */
-  protected $element;
-
-  /**
-   * The theme hook invoked.
-   *
-   * @var string
-   */
-  protected $hook;
-
-  /**
-   * The theme hook suggestions, exploded by the "__" delimiter.
-   *
-   * @var array
-   */
-  protected $hookSuggestions;
-
-  /**
-   * The types of elements to ignore for the "input__form_control" suggestion.
-   *
-   * @var array
-   */
-  protected $ignoreFormControlTypes = ['checkbox', 'hidden', 'radio'];
-
-  /**
-   * The original "hook" value passed via hook_theme_suggestions_alter().
-   *
-   * @var string
-   */
-  protected $originalHook;
-
-  /**
-   * The array of suggestions to return.
-   *
-   * @var array
-   */
-  protected $suggestions;
-
-  /**
-   * The variables array object passed via hook_theme_suggestions_alter().
-   *
-   * @var \Drupal\bootstrap\Utility\Variables
-   */
-  protected $variables;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alter(&$suggestions, &$variables = [], &$hook = NULL) {
-    // This is intentionally backwards. The "original" theme hook is actually
-    // the hook being invoked. The provided $hook (to the alter) is the watered
-    // down version of said original hook.
-    $this->hook = !empty($variables['theme_hook_original']) ? $variables['theme_hook_original'] : $hook;
-    $this->hookSuggestions = explode('__', $this->hook);
-    $this->originalHook = $hook;
-    $this->suggestions = $suggestions;
-    $this->variables = Variables::create($variables);
-    $this->element = $this->variables->element;
-
-    // Processes the necessary theme hook suggestions.
-    $this->processSuggestions();
-
-    // Ensure the list of suggestions is unique.
-    $suggestions = array_unique($this->suggestions);
-  }
-
-  /***************************************************************************
-   * Dynamic alter methods.
-   ***************************************************************************/
-
-  /**
-   * Dynamic alter method for "input".
-   */
-  protected function alterInput() {
-    if ($this->element && $this->element->isButton()) {
-      $hook = 'input__button';
-      if ($this->element->getProperty('split')) {
-        $hook .= '__split';
-      }
-      $this->addSuggestion($hook);
-    }
-    elseif ($this->element && !$this->element->isType($this->ignoreFormControlTypes)) {
-      $this->addSuggestion('input__form_control');
-    }
-  }
-
-  /**
-   * Dynamic alter method for "links__dropbutton".
-   */
-  protected function alterLinksDropbutton() {
-    // Remove the 'dropbutton' suggestion.
-    array_shift($this->hookSuggestions);
-
-    $this->addSuggestion('bootstrap_dropdown');
-  }
-
-  /**
-   * Dynamic alter method for "user".
-   *
-   * @see https://www.drupal.org/node/2828634
-   * @see https://www.drupal.org/node/2808481
-   * @todo Remove/refactor once core issue is resolved.
-   */
-  protected function alterUser() {
-    $this->addSuggestionsForEntity('user');
-  }
-
-  /***************************************************************************
-   * Protected methods.
-   ***************************************************************************/
-
-  /**
-   * Adds suggestions based on an array of hooks.
-   *
-   * @param string|string[] $hook
-   *   A single theme hook suggestion or an array of theme hook suggestions.
-   */
-  protected function addSuggestion($hook) {
-    $hooks = (array) $hook;
-    foreach ($hooks as $hook) {
-      $suggestions = $this->buildSuggestions($hook);
-      foreach ($suggestions as $suggestion) {
-        $this->suggestions[] = $suggestion;
-      }
-    }
-  }
-
-  /**
-   * Adds "bundle" and "view mode" suggestions for an entity.
-   *
-   * This is a helper method because core's implementation of theme hook
-   * suggestions on entities is inconsistent.
-   *
-   * @see https://www.drupal.org/node/2808481
-   *
-   * @param string $entity_type
-   *   Optional. A specific type of entity to look for.
-   * @param string $prefix
-   *   Optional. A prefix (like "entity") to use. It will automatically be
-   *   appended with the "__" separator.
-   *
-   * @todo Remove/refactor once core issue is resolved.
-   */
-  protected function addSuggestionsForEntity($entity_type = 'entity', $prefix = '') {
-    // Immediately return if there is no element.
-    if (!$this->element) {
-      return;
-    }
-
-    // Extract the entity.
-    if ($entity = $this->getEntityObject($entity_type)) {
-      $entity_type_id = $entity->getEntityTypeId();
-      $suggestions = [];
-
-      // Only add the entity type identifier if there's a prefix.
-      if (!empty($prefix)) {
-        $prefix .= '__';
-        $suggestions[] = $prefix . '__' . $entity_type_id;
-      }
-
-      // View mode.
-      if ($view_mode = preg_replace('/[^A-Za-z0-9]+/', '_', $this->element->getProperty('view_mode'))) {
-        $suggestions[] = $prefix . $entity_type_id . '__' . $view_mode;
-
-        // Bundle.
-        if ($entity->getEntityType()->hasKey('bundle')) {
-          $suggestions[] = $prefix . $entity_type_id . '__' . $entity->bundle();
-          $suggestions[] = $prefix . $entity_type_id . '__' . $entity->bundle() . '__' . $view_mode;
-        }
-      }
-
-      // Add suggestions.
-      if ($suggestions) {
-        $this->addSuggestion($suggestions);
-      }
-    }
-  }
-
-  /**
-   * Builds a list of suggestions.
-   *
-   * @param string $hook
-   *   The theme hook suggestion to build.
-   *
-   * @return array
-   */
-  protected function buildSuggestions($hook) {
-    $suggestions = [];
-
-    $hook_suggestions = $this->hookSuggestions;
-
-    // Replace the first hook suggestion with $hook.
-    array_shift($hook_suggestions);
-    array_unshift($suggestions, $hook);
-
-    $suggestions = [];
-    while ($hook_suggestions) {
-      $suggestions[] = $hook . '__' . implode('__', $hook_suggestions);
-      array_pop($hook_suggestions);
-    }
-
-    // Append the base hook.
-    $suggestions[] = $hook;
-
-    // Return the suggestions, reversed.
-    return array_reverse($suggestions);
-  }
-
-  /**
-   * Retrieves the methods to invoke to process the theme hook suggestion.
-   *
-   * @return array
-   *   An indexed array of methods to be invoked.
-   */
-  protected function getAlterMethods() {
-    // Retrieve cached theme hook suggestion alter methods.
-    $cache = $this->theme->getCache('theme_hook_suggestions');
-    if ($cache->has($this->hook)) {
-      return $cache->get($this->hook);
-    }
-
-    // Uppercase each theme hook suggestion to be used in the method name.
-    $hook_suggestions = $this->hookSuggestions;
-    foreach ($hook_suggestions as $key => $suggestion) {
-      $hook_suggestions[$key] = Unicode::ucfirst($suggestion);
-    }
-
-    $methods = [];
-    while ($hook_suggestions) {
-      $method = 'alter' . implode('', $hook_suggestions);
-      if (method_exists($this, $method)) {
-        $methods[] = $method;
-      }
-      array_pop($hook_suggestions);
-    }
-
-    // Reverse the methods.
-    $methods = array_reverse($methods);
-
-    // Cache the methods.
-    $cache->set($this->hook, $methods);
-
-    return $methods;
-  }
-
-  /**
-   * Extracts the entity from the element(s) passed in the Variables object.
-   *
-   * @param string $entity_type
-   *   Optional. The entity type to attempt to retrieve.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface|null
-   *   The extracted entity, NULL if entity could not be found.
-   */
-  protected function getEntityObject($entity_type = 'entity') {
-    // Immediately return if there is no element.
-    if (!$this->element) {
-      return NULL;
-    }
-
-    // Attempt to retrieve the provided element type.
-    $entity = $this->element->getProperty($entity_type);
-
-    // If the provided entity type doesn't exist, check to see if a generic
-    // "entity" property was used instead.
-    if ($entity_type !== 'entity' && (!$entity || !($entity instanceof EntityInterface))) {
-      $entity = $this->element->getProperty('entity');
-    }
-
-    // Only return the entity if it's the proper object.
-    return $entity instanceof EntityInterface ? $entity : NULL;
-  }
-
-  /**
-   * Processes the necessary theme hook suggestions.
-   */
-  protected function processSuggestions() {
-    // Add special hook suggestions for Bootstrap panels.
-    if ((in_array($this->originalHook, $this->bootstrapPanelTypes)) && $this->element && $this->element->getProperty('bootstrap_panel', TRUE)) {
-      $this->addSuggestion('bootstrap_panel');
-    }
-
-    // Retrieve any dynamic alter methods.
-    $methods = $this->getAlterMethods();
-    foreach ($methods as $method) {
-      $this->$method();
-    }
-  }
-
-  /***************************************************************************
-   * Deprecated methods (DO NOT USE).
-   ***************************************************************************/
-
-  /**
-   * Adds "bundle" and "view mode" suggestions for an entity.
-   *
-   * @param array $suggestions
-   *   The suggestions array, this is ignored.
-   * @param \Drupal\bootstrap\Utility\Variables $variables
-   *   The variables object, this is ignored.
-   * @param string $entity_type
-   *   Optional. A specific type of entity to look for.
-   * @param string $prefix
-   *   Optional. A prefix (like "entity") to use. It will automatically be
-   *   appended with the "__" separator.
-   *
-   * @deprecated Since 8.x-3.2. Will be removed in a future release.
-   *
-   * @see \Drupal\bootstrap\Plugin\Alter\ThemeSuggestions::addSuggestionsForEntity
-   */
-  public function addEntitySuggestions(array &$suggestions, Variables $variables, $entity_type = 'entity', $prefix = '') {
-    Bootstrap::deprecated();
-    $this->addSuggestionsForEntity($entity_type, $prefix);
-  }
-
-  /**
-   * Extracts the entity from the element(s) passed in the Variables object.
-   *
-   * @param \Drupal\bootstrap\Utility\Variables $variables
-   *   The Variables object, this is ignored.
-   * @param string $entity_type
-   *   Optional. The entity type to attempt to retrieve.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface|null
-   *   The extracted entity, NULL if entity could not be found.
-   *
-   * @deprecated Since 8.x-3.2. Will be removed in a future release.
-   *
-   * @see \Drupal\bootstrap\Plugin\Alter\ThemeSuggestions::getEntityObject
-   */
-  public function getEntity(Variables $variables, $entity_type = 'entity') {
-    Bootstrap::deprecated();
-    return $this->getEntityObject($entity_type);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/AlterManager.php b/themes/bootstrap/src/Plugin/AlterManager.php
deleted file mode 100644
index 9f17301..0000000
--- a/themes/bootstrap/src/Plugin/AlterManager.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\AlterManager.
- */
-
-namespace Drupal\bootstrap\Plugin;
-
-use Drupal\bootstrap\Theme;
-
-/**
- * Manages discovery and instantiation of Bootstrap hook alters.
- *
- * @ingroup plugins_alter
- */
-class AlterManager extends PluginManager {
-
-  /**
-   * Constructs a new \Drupal\bootstrap\Plugin\AlterManager object.
-   *
-   * @param \Drupal\bootstrap\Theme $theme
-   *   The theme to use for discovery.
-   */
-  public function __construct(Theme $theme) {
-    parent::__construct($theme, 'Plugin/Alter', 'Drupal\bootstrap\Plugin\Alter\AlterInterface', 'Drupal\bootstrap\Annotation\BootstrapAlter');
-    $this->setCacheBackend(\Drupal::cache('discovery'), 'theme:' . $theme->getName() . ':alter', $this->getCacheTags());
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Form/FormBase.php b/themes/bootstrap/src/Plugin/Form/FormBase.php
deleted file mode 100644
index 9a1b31e..0000000
--- a/themes/bootstrap/src/Plugin/Form/FormBase.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Form\FormBase.
- */
-
-namespace Drupal\bootstrap\Plugin\Form;
-
-use Drupal\bootstrap\Plugin\PluginBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Base form alter class.
- *
- * @ingroup plugins_form
- */
-class FormBase extends PluginBase implements FormInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterForm(array &$form, FormStateInterface $form_state, $form_id = NULL) {
-    $this->alterFormElement(Element::create($form), $form_state, $form_id);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {}
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function submitForm(array &$form, FormStateInterface $form_state) {
-    static::submitFormElement(Element::create($form), $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function submitFormElement(Element $form, FormStateInterface $form_state) {}
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function validateForm(array &$form, FormStateInterface $form_state) {
-    static::validateFormElement(Element::create($form), $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function validateFormElement(Element $form, FormStateInterface $form_state) {}
-
-}
diff --git a/themes/bootstrap/src/Plugin/Form/FormInterface.php b/themes/bootstrap/src/Plugin/Form/FormInterface.php
deleted file mode 100644
index 12e79a7..0000000
--- a/themes/bootstrap/src/Plugin/Form/FormInterface.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Form\FormInterface.
- */
-
-namespace Drupal\bootstrap\Plugin\Form;
-
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Defines the interface for an object oriented form alter.
- *
- * @ingroup plugins_form
- */
-interface FormInterface {
-
-  /**
-   * The alter method to store the code.
-   *
-   * @param array $form
-   *   Nested array of form elements that comprises the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   * @param string $form_id
-   *   String representing the name of the form itself. Typically this is the
-   *   name of the function that generated the form.
-   */
-  public function alterForm(array &$form, FormStateInterface $form_state, $form_id = NULL);
-
-  /**
-   * The alter method to store the code.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $form
-   *   The Element object that comprises the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   * @param string $form_id
-   *   String representing the name of the form itself. Typically this is the
-   *   name of the function that generated the form.
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL);
-
-  /**
-   * Form validation handler.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public static function validateForm(array &$form, FormStateInterface $form_state);
-
-  /**
-   * Form validation handler.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $form
-   *   The Element object that comprises the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public static function validateFormElement(Element $form, FormStateInterface $form_state);
-
-  /**
-   * Form submission handler.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public static function submitForm(array &$form, FormStateInterface $form_state);
-
-  /**
-   * Form submission handler.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $form
-   *   The Element object that comprises the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public static function submitFormElement(Element $form, FormStateInterface $form_state);
-
-}
diff --git a/themes/bootstrap/src/Plugin/Form/NodePreviewFormSelect.php b/themes/bootstrap/src/Plugin/Form/NodePreviewFormSelect.php
deleted file mode 100644
index fb1ff48..0000000
--- a/themes/bootstrap/src/Plugin/Form/NodePreviewFormSelect.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Form\NodePreviewFormSelect.
- */
-
-namespace Drupal\bootstrap\Plugin\Form;
-
-use Drupal\bootstrap\Annotation\BootstrapForm;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * @ingroup plugins_form
- *
- * @BootstrapForm("node_preview_form_select")
- */
-class NodePreviewFormSelect extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $form->addClass(['form-inline', 'bg-info', 'text-center', 'clearfix']);
-
-    // Backlink.
-    $options = $form->backlink->getProperty('options', []);
-
-    $form->backlink->addClass(isset($options['attributes']['class']) ? $options['attributes']['class'] : []);
-    $form->backlink->addClass(['btn', 'btn-info', 'pull-left']);
-    $form->backlink->setButtonSize();
-    $form->backlink->setIcon(Bootstrap::glyphicon('chevron-left'));
-
-    // Ensure the UUID is set.
-    if ($uuid = $form->uuid->getProperty('value')) {
-      $options['query'] = ['uuid' => $uuid];
-    }
-
-    // Override the options attributes.
-    $options['attributes'] = $form->backlink->getAttributes()->getArrayCopy();
-
-    $form->backlink->setProperty('options', $options);
-
-
-    // View mode.
-    $form->view_mode->addClass('pull-right', $form::WRAPPER);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Form/SearchBlockForm.php b/themes/bootstrap/src/Plugin/Form/SearchBlockForm.php
deleted file mode 100644
index 46202b4..0000000
--- a/themes/bootstrap/src/Plugin/Form/SearchBlockForm.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Form\SearchBlockForm.
- */
-
-namespace Drupal\bootstrap\Plugin\Form;
-
-use Drupal\bootstrap\Annotation\BootstrapForm;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * @ingroup plugins_form
- *
- * @BootstrapForm("search_block_form")
- */
-class SearchBlockForm extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $form->actions->submit->setProperty('icon_only', TRUE);
-    $form->keys->setProperty('input_group_button', TRUE);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Form/SearchForm.php b/themes/bootstrap/src/Plugin/Form/SearchForm.php
deleted file mode 100644
index 9a821ab..0000000
--- a/themes/bootstrap/src/Plugin/Form/SearchForm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Form\SearchForm.
- */
-
-namespace Drupal\bootstrap\Plugin\Form;
-
-use Drupal\bootstrap\Annotation\BootstrapForm;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * @ingroup plugins_form
- *
- * @BootstrapForm("search_form")
- */
-class SearchForm extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $form->advanced->setProperty('collapsible', TRUE);
-    $form->advanced->setProperty('collapsed', TRUE);
-    $form->basic->removeClass('container-inline');
-    $form->basic->submit->setProperty('icon_only', TRUE);
-    $form->basic->keys->setProperty('input_group_button', TRUE);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Form/SystemThemeSettings.php b/themes/bootstrap/src/Plugin/Form/SystemThemeSettings.php
deleted file mode 100644
index 2f0ef49..0000000
--- a/themes/bootstrap/src/Plugin/Form/SystemThemeSettings.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Form\SystemThemeSettings.
- */
-
-namespace Drupal\bootstrap\Plugin\Form;
-
-use Drupal\bootstrap\Annotation\BootstrapForm;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Implements hook_form_system_theme_settings_alter().
- *
- * @ingroup plugins_form
- * @ingroup plugins_setting
- *
- * @BootstrapForm("system_theme_settings")
- */
-class SystemThemeSettings extends FormBase implements FormInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $theme = $this->getTheme($form, $form_state);
-    if (!$theme) {
-      return;
-    }
-
-    // Creates the necessary groups (vertical tabs) for a Bootstrap based theme.
-    $this->createGroups($form, $form_state);
-
-    // Iterate over all setting plugins and add them to the form.
-    foreach ($theme->getSettingPlugin() as $setting) {
-      $setting->alterForm($form->getArray(), $form_state);
-    }
-  }
-
-  /**
-   * Sets up the vertical tab groupings.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $form
-   *   The Element object that comprises the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  protected function createGroups(Element $form, FormStateInterface $form_state) {
-    // Vertical tabs for global settings provided by core or contrib modules.
-    if (!isset($form['global'])) {
-      $form['global'] = [
-        '#type' => 'vertical_tabs',
-        '#weight' => -9,
-        '#prefix' => '<h2><small>' . t('Override Global Settings') . '</small></h2>',
-      ];
-    }
-
-    // Iterate over existing children and move appropriate ones to global group.
-    foreach ($form->children() as $child) {
-      if ($child->isType(['details', 'fieldset']) && !$child->hasProperty('group')) {
-        $child->setProperty('type', 'details');
-        $child->setProperty('group', 'global');
-      }
-    }
-
-    // Provide the necessary default groups.
-    $form['bootstrap'] = [
-      '#type' => 'vertical_tabs',
-      '#attached' => ['library' => ['bootstrap/theme-settings']],
-      '#prefix' => '<h2><small>' . t('Bootstrap Settings') . '</small></h2>',
-      '#weight' => -10,
-    ];
-    $groups = [
-      'general' => t('General'),
-      'components' => t('Components'),
-      'javascript' => t('JavaScript'),
-      'advanced' => t('Advanced'),
-    ];
-    foreach ($groups as $group => $title) {
-      $form[$group] = [
-        '#type' => 'details',
-        '#title' => $title,
-        '#group' => 'bootstrap',
-      ];
-    }
-  }
-
-  /**
-   * Retrieves the currently selected theme on the settings form.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $form
-   *   The Element object that comprises the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return \Drupal\bootstrap\Theme|FALSE
-   *   The currently selected theme object or FALSE if not a Bootstrap theme.
-   */
-  public static function getTheme(Element $form, FormStateInterface $form_state) {
-    $build_info = $form_state->getBuildInfo();
-    $theme = isset($build_info['args'][0]) ? Bootstrap::getTheme($build_info['args'][0]) : FALSE;
-
-    // Do not continue if the theme is not Bootstrap specific.
-    if (!$theme || !$theme->isBootstrap()) {
-      unset($form['#submit'][0]);
-      unset($form['#validate'][0]);
-    }
-
-    return $theme;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function submitFormElement(Element $form, FormStateInterface $form_state) {
-    $theme = self::getTheme($form, $form_state);
-    if (!$theme) {
-      return;
-    }
-
-    $cache_tags = [];
-    $save = FALSE;
-    $settings = $theme->settings();
-
-    // Iterate over all setting plugins and manually save them since core's
-    // process is severely limiting and somewhat broken.
-    foreach ($theme->getSettingPlugin() as $name => $setting) {
-      // Allow the setting to participate in the form submission process.
-      // Must call the "submitForm" method in case any setting actually uses it.
-      // It should, in turn, invoke "submitFormElement", if the setting that
-      // overrides it is implemented properly.
-      $setting->submitForm($form->getArray(), $form_state);
-
-      // Retrieve the submitted value.
-      $value = $form_state->getValue($name);
-
-      // Determine if the setting has a new value that overrides the original.
-      // Ignore the schemas "setting" because it's handled by UpdateManager.
-      if ($name !== 'schemas' && $settings->overridesValue($name, $value)) {
-        // Set the new value.
-        $settings->set($name, $value);
-
-        // Retrieve the cache tags for the setting.
-        $cache_tags = array_unique(array_merge($setting->getCacheTags()));
-
-        // Flag the save.
-        $save = TRUE;
-      }
-
-      // Remove value from the form state object so core doesn't re-save it.
-      $form_state->unsetValue($name);
-    }
-
-    // Save the settings, if needed.
-    if ($save) {
-      $settings->save();
-
-      // Invalidate necessary cache tags.
-      if ($cache_tags) {
-        \Drupal::service('cache_tags.invalidator')->invalidateTags($cache_tags);
-      }
-
-      // Clear our internal theme cache so it can be rebuilt properly.
-      $theme->getCache('settings')->deleteAll();
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function validateFormElement(Element $form, FormStateInterface $form_state) {
-    $theme = self::getTheme($form, $form_state);
-    if (!$theme) {
-      return;
-    }
-
-    // Iterate over all setting plugins and allow them to participate.
-    foreach ($theme->getSettingPlugin() as $setting) {
-      // Allow the setting to participate in the form validation process.
-      // Must call the "validateForm" method in case any setting actually uses it.
-      // It should, in turn, invoke "validateFormElement", if the setting that
-      // overrides it is implemented properly.
-      $setting->validateForm($form->getArray(), $form_state);
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/FormManager.php b/themes/bootstrap/src/Plugin/FormManager.php
deleted file mode 100644
index 9a3776e..0000000
--- a/themes/bootstrap/src/Plugin/FormManager.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\FormManager.
- */
-
-namespace Drupal\bootstrap\Plugin;
-
-use Drupal\bootstrap\Theme;
-
-/**
- * Manages discovery and instantiation of Bootstrap form alters.
- *
- * @ingroup plugins_form
- */
-class FormManager extends PluginManager {
-
-  /**
-   * Constructs a new \Drupal\bootstrap\Plugin\FormManager object.
-   *
-   * @param \Drupal\bootstrap\Theme $theme
-   *   The theme to use for discovery.
-   */
-  public function __construct(Theme $theme) {
-    parent::__construct($theme, 'Plugin/Form', 'Drupal\bootstrap\Plugin\Form\FormInterface', 'Drupal\bootstrap\Annotation\BootstrapForm');
-    $this->setCacheBackend(\Drupal::cache('discovery'), 'theme:' . $theme->getName() . ':form', $this->getCacheTags());
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/PluginBase.php b/themes/bootstrap/src/Plugin/PluginBase.php
deleted file mode 100644
index ef3107f..0000000
--- a/themes/bootstrap/src/Plugin/PluginBase.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\PluginBase.
- */
-
-namespace Drupal\bootstrap\Plugin;
-
-use Drupal\bootstrap\Bootstrap;
-
-/**
- * Base class for an update.
- *
- * @ingroup utility
- */
-class PluginBase extends \Drupal\Core\Plugin\PluginBase {
-
-  /**
-   * The currently set theme object.
-   *
-   * @var \Drupal\bootstrap\Theme
-   */
-  protected $theme;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition) {
-    if (!isset($configuration['theme'])) {
-      $configuration['theme'] = Bootstrap::getTheme();
-    }
-    $this->theme = $configuration['theme'];
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/PluginManager.php b/themes/bootstrap/src/Plugin/PluginManager.php
deleted file mode 100644
index 803bfd0..0000000
--- a/themes/bootstrap/src/Plugin/PluginManager.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\PluginManager.
- */
-
-namespace Drupal\bootstrap\Plugin;
-
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Theme;
-use Drupal\Core\Plugin\DefaultPluginManager;
-
-/**
- * Base class for Bootstrap plugin managers.
- *
- * @ingroup utility
- */
-class PluginManager extends DefaultPluginManager {
-
-  /**
-   * The current theme.
-   *
-   * @var \Drupal\bootstrap\Theme
-   */
-  protected $theme;
-
-  /**
-   * The theme handler to check if theme exists.
-   *
-   * @var \Drupal\Core\Extension\ThemeHandlerInterface
-   */
-  protected $themeHandler;
-
-  /**
-   * The theme manager to invoke alter hooks.
-   *
-   * @var \Drupal\Core\Theme\ThemeManager
-   */
-  protected $themeManager;
-
-  /**
-   * Creates the discovery object.
-   *
-   * @param \Drupal\bootstrap\Theme $theme
-   *   The theme to use for discovery.
-   * @param string|bool $subdir
-   *   The plugin's subdirectory, for example Plugin/views/filter.
-   * @param string|null $plugin_interface
-   *   (optional) The interface each plugin should implement.
-   * @param string $plugin_definition_annotation_name
-   *   (optional) Name of the annotation that contains the plugin definition.
-   *   Defaults to 'Drupal\Component\Annotation\Plugin'.
-   */
-  public function __construct(Theme $theme, $subdir, $plugin_interface = NULL, $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') {
-    // Get the active theme.
-    $this->theme = $theme;
-
-    // Determine the namespaces to search for.
-    $namespaces = [];
-    foreach ($theme->getAncestry() as $ancestor) {
-      $namespaces['Drupal\\' . $ancestor->getName()] = [DRUPAL_ROOT . '/' . $ancestor->getPath() . '/src'];
-    }
-    $this->namespaces = new \ArrayObject($namespaces);
-
-    $this->subdir = $subdir;
-    $this->pluginDefinitionAnnotationName = $plugin_definition_annotation_name;
-    $this->pluginInterface = $plugin_interface;
-    $this->themeHandler = \Drupal::service('theme_handler');
-    $this->themeManager = \Drupal::service('theme.manager');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function alterDefinitions(&$definitions) {
-    if ($this->alterHook) {
-      $this->themeManager->alter($this->alterHook, $definitions);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createInstance($plugin_id, array $configuration = array()) {
-    if (!isset($configuration['theme'])) {
-      $configuration['theme'] = $this->theme;
-    }
-    return parent::createInstance($plugin_id, $configuration);
-  }
-
-  /**
-   * Retrieves the cache tags used to invalidate caches.
-   *
-   * @return array
-   *   An indexed array of cache tags.
-   */
-  public function getCacheTags() {
-    return [Bootstrap::CACHE_TAG];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefinitions($sorted = TRUE) {
-    $definitions = parent::getDefinitions();
-    if ($sorted) {
-      uasort($definitions, ['\Drupal\Component\Utility\SortArray', 'sortByWeightElement']);
-    }
-    return $definitions;
-  }
-
-  /**
-   * Retrieves all definitions where the plugin ID matches a certain criteria.
-   *
-   * @param string $regex
-   *   The regex pattern to match.
-   *
-   * @return array[]
-   *   An array of plugin definitions (empty array if no definitions were
-   *   found). Keys are plugin IDs.
-   */
-  public function getDefinitionsLike($regex) {
-    $definitions = [];
-    foreach ($this->getDefinitions() as $plugin_id => $definition) {
-      if (preg_match($regex, $plugin_id)) {
-        $definitions[$plugin_id] = $definition;
-      }
-    }
-    ksort($definitions, SORT_NATURAL);
-    return $definitions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function providerExists($provider) {
-    return $this->themeHandler->themeExists($provider);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/BootstrapCarousel.php b/themes/bootstrap/src/Plugin/Preprocess/BootstrapCarousel.php
deleted file mode 100644
index 2674f9c..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/BootstrapCarousel.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\BootstrapCarousel.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Template\Attribute;
-use Drupal\Core\Url;
-
-/**
- * Pre-processes variables for the "bootstrap_carousel" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("bootstrap_carousel")
- */
-class BootstrapCarousel extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function preprocessVariables(Variables $variables) {
-    // Retrieve the ID, generating one if needed.
-    $id = $variables->getAttribute('id', Html::getUniqueId($variables->offsetGet('id', 'bootstrap-carousel')));
-    unset($variables['id']);
-
-    // Build slides.
-    foreach ($variables->slides as $key => &$slide) {
-      if (!isset($slide['attributes'])) {
-        $slide['attributes'] = [];
-      }
-      $slide['attributes'] = new Attribute($slide['attributes']);
-    }
-
-    // Build controls.
-    if ($variables->controls) {
-      $left_icon = Bootstrap::glyphicon('chevron-left');
-      $right_icon = Bootstrap::glyphicon('chevron-right');
-      $url = Url::fromUserInput("#$id");
-      $variables->controls = [
-        'left' => [
-          '#type' => 'link',
-          '#title' => new FormattableMarkup(Element::create($left_icon)->renderPlain() . '<span class="sr-only">@text</span>', ['@text' => t('Previous')]),
-          '#url' => $url,
-          '#attributes' => [
-            'class' => ['left', 'carousel-control'],
-            'role' => 'button',
-            'data-slide' => 'prev',
-          ],
-        ],
-        'right' => [
-          '#type' => 'link',
-          '#title' => new FormattableMarkup(Element::create($right_icon)->renderPlain() . '<span class="sr-only">@text</span>', ['@text' => t('Next')]),
-          '#url' => $url,
-          '#attributes' => [
-            'class' => ['right', 'carousel-control'],
-            'role' => 'button',
-            'data-slide' => 'next',
-          ],
-        ],
-      ];
-    }
-
-    // Build indicators.
-    if ($variables->indicators) {
-      $variables->indicators = [
-        '#theme' => 'item_list__bootstrap_carousel_indicators',
-        '#list_type' => 'ol',
-        '#items' => array_keys($variables->slides),
-        '#context' => [
-          'target' => "#$id",
-          'start_index' => $variables->start_index,
-        ],
-      ];
-    }
-
-    // Ensure all attributes are proper objects.
-    $this->preprocessAttributes();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php b/themes/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php
deleted file mode 100644
index 73c601d..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/BootstrapDropdown.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\BootstrapDropdown.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Unicode;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Url;
-
-/**
- * Pre-processes variables for the "bootstrap_dropdown" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("bootstrap_dropdown")
- */
-class BootstrapDropdown extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function preprocessVariables(Variables $variables) {
-    $this->preprocessLinks($variables);
-
-    $toggle = Element::create($variables->toggle);
-    $toggle->setProperty('split', $variables->split);
-
-    // Convert the items into a proper item list.
-    $variables->items = [
-      '#theme' => 'item_list__dropdown',
-      '#items' => $variables->items,
-      '#context' => [
-        'alignment' => $variables->alignment,
-      ],
-    ];
-
-    // Ensure all attributes are proper objects.
-    $this->preprocessAttributes();
-  }
-
-  /**
-   * Preprocess links in the variables array to convert them from dropbuttons.
-   *
-   * @param \Drupal\bootstrap\Utility\Variables $variables
-   *   A variables object.
-   */
-  protected function preprocessLinks(Variables $variables) {
-    // Convert "dropbutton" theme suggestion variables.
-    if (Unicode::strpos($variables->theme_hook_original, 'links__dropbutton') !== FALSE && !empty($variables->links)) {
-      $operations = !!Unicode::strpos($variables->theme_hook_original, 'operations');
-
-      // Normal dropbutton links are not actually render arrays, convert them.
-      foreach ($variables->links as &$element) {
-        if (isset($element['title']) && $element['url']) {
-          // Preserve query parameters (if any)
-          if (!empty($element['query'])) {
-            $url_query = $element['url']->getOption('query') ?: [];
-            $element['url']->setOption('query', NestedArray::mergeDeep($url_query , $element['query']));
-          }
-
-          // Build render array.
-          $element = [
-            '#type' => 'link',
-            '#title' => $element['title'],
-            '#url' => $element['url'],
-          ];
-        }
-      }
-
-      $items = Element::createStandalone();
-
-      $primary_action = NULL;
-      $links = Element::create($variables->links);
-
-      // Iterate over all provided "links". The array may be associative, so
-      // this cannot rely on the key to be numeric, it must be tracked manually.
-      $i = -1;
-      foreach ($links->children(TRUE) as $key => $child) {
-        $i++;
-
-        // The first item is always the "primary link".
-        if ($i === 0) {
-          // Must generate an ID for this child because the toggle will use it.
-          $child->getProperty('id', $child->getAttribute('id', Html::getUniqueId('dropdown-item')));
-          $primary_action = $child->addClass('hidden');
-        }
-
-        // If actually a "link", add it to the items array directly.
-        if ($child->isType('link')) {
-          $items->$key->link = $child->getArrayCopy();
-        }
-        // Otherwise, convert into a proper link.
-        else {
-          // Hide the original element
-          $items->$key->element = $child->addClass('hidden')->getArrayCopy();
-
-          // Retrieve any set HTML identifier for the link, generating a new
-          // one if necessary.
-          $id = $child->getProperty('id', $child->getAttribute('id', Html::getUniqueId('dropdown-item')));
-          $items->$key->link = Element::createStandalone([
-            '#type' => 'link',
-            '#title' => $child->getProperty('value', $child->getProperty('title', $child->getProperty('text'))),
-            '#url' => Url::fromUserInput('#'),
-            '#attributes' => ['data-dropdown-target' => "#$id"],
-          ]);
-
-          // Also hide the real link if it's the primary action.
-          if ($i === 0) {
-            $items->$key->link->addClass('hidden');
-          }
-        }
-      }
-
-      // Create a toggle button, extracting relevant info from primary action.
-      $toggle = Element::createStandalone([
-        '#type' => 'button',
-        '#attributes' => $primary_action->getAttributes()->getArrayCopy(),
-        '#value' => $primary_action->getProperty('value', $primary_action->getProperty('title', $primary_action->getProperty('text'))),
-      ]);
-
-      // Remove the "hidden" class that was added to the primary action.
-      $toggle->removeClass('hidden')->removeAttribute('id')->setAttribute('data-dropdown-target', '#' . $primary_action->getAttribute('id'));
-
-      // Make operations smaller.
-      if ($operations) {
-        $toggle->setButtonSize('btn-xs', FALSE);
-      }
-
-      // Add the toggle render array to the variables.
-      $variables->toggle = $toggle->getArrayCopy();
-
-      // Determine if toggle should be a split button.
-      $variables->split = count($items) > 1;
-
-      // Add the items variable for "bootstrap_dropdown".
-      $variables->items = $items->getArrayCopy();
-
-      // Remove the unnecessary "links" variable now.
-      unset($variables->links);
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/BootstrapModal.php b/themes/bootstrap/src/Plugin/Preprocess/BootstrapModal.php
deleted file mode 100644
index 52f271f..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/BootstrapModal.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\BootstrapModal.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Component\Utility\Html;
-
-/**
- * Pre-processes variables for the "bootstrap_modal" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("bootstrap_modal")
- */
-class BootstrapModal extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function preprocessVariables(Variables $variables) {
-    // Immediately log an error and return if Bootstrap modals are not enabled.
-    if (!$this->theme->getSetting('modal_enabled')) {
-      \Drupal::logger('bootstrap')->error(t('Bootstrap modals are not enabled.'));
-      return;
-    }
-
-    // Retrieve the ID, generating one if needed.
-    $id = $variables->getAttribute('id', Html::getUniqueId($variables->offsetGet('id', 'bootstrap-modal')));
-    $variables->setAttribute('id', $id);
-    unset($variables['id']);
-
-    if ($variables->title) {
-      $title_id = $variables->getAttribute('id', "$id--title", $variables::TITLE);
-      $variables->setAttribute('id', $title_id, $variables::TITLE);
-      $variables->setAttribute('aria-labelledby', $title_id);
-    }
-
-    // Use a provided modal size or retrieve the default theme setting.
-    $variables->size = $variables->size ?: $this->theme->getSetting('modal_size');
-
-    // Convert the description variable.
-    $this->preprocessDescription();
-
-    // Ensure all attributes are proper objects.
-    $this->preprocessAttributes();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/BootstrapPanel.php b/themes/bootstrap/src/Plugin/Preprocess/BootstrapPanel.php
deleted file mode 100644
index 58eb700..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/BootstrapPanel.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\BootstrapPanel.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Component\Render\MarkupInterface;
-use Drupal\Component\Utility\Html;
-
-/**
- * Pre-processes variables for the "bootstrap_panel" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("bootstrap_panel")
- */
-class BootstrapPanel extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function preprocessElement(Element $element, Variables $variables) {
-    // Assign the ID, if not already set.
-    $element->map(['id']);
-
-    // Add necessary classes.
-    $element->addClass(['form-item', 'js-form-item', 'form-wrapper', 'js-form-wrapper']);
-
-    $body = [];
-    $properties = ['field_prefix', 'body', 'children'];
-
-    // Only add the #value property if it's a "details" or "fieldset" element
-    // type. Some form elements may use "CompositeFormElementTrait" which
-    // will inadvertently and eventually become preprocessed here and #value
-    // may actually be the element's value instead of a renderable element.
-    if ($element->isType(['details', 'fieldset'])) {
-      $properties[] = 'value';
-    }
-
-    // Add the "#field_suffix" property.
-    $properties[] = 'field_suffix';
-
-    // Merge all possible content from the element into a single render array.
-    foreach ($properties as $property) {
-      $body[$property] = Element::create($element->getProperty($property, []))->getArray();
-    }
-    $variables['body'] = array_filter($body);
-
-    $map = [
-      'attributes' => 'attributes',
-      'body_attributes' => 'body_attributes',
-      'content_attributes' => 'body_attributes',
-      'description' => 'description',
-      'description_attributes' => 'description_attributes',
-      'description_display' => 'description_display',
-      'errors' => 'errors',
-      'footer' => 'footer',
-      'required' => 'required',
-      'panel_type' => 'panel_type',
-      'title' => 'heading',
-      'title_attributes' => 'heading_attributes',
-    ];
-
-    // Handle specific "details" elements.
-    if ($element->isType('details')) {
-      // Details are always collapsible per the HTML5 spec.
-      // @see https://www.drupal.org/node/1852020
-      $variables['collapsible'] = TRUE;
-
-      // Determine the collapsed state.
-      $variables['collapsed'] = !$element->getProperty('open', TRUE);
-
-      // Remove the unnecessary details attribute.
-      $element->removeAttribute('open');
-    }
-    // Handle specific "fieldset" elements.
-    elseif ($element->isType('fieldset')) {
-      // Override variables to mimic the default "fieldset" element info.
-      // They will be mapped below if they exist on the element.
-      unset($variables['collapsible'], $variables['collapsed']);
-      $map['collapsed'] = 'collapsed';
-      $map['collapsible'] = 'collapsible';
-    }
-
-    // Map the element properties to the variables array.
-    $variables->map($map);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function preprocessVariables(Variables $variables) {
-    // Retrieve the ID, generating one if needed.
-    $id = $variables->getAttribute('id', Html::getUniqueId($variables->offsetGet('id', 'bootstrap-panel')));
-    unset($variables['id']);
-
-    // Handle collapsible state.
-    if ($variables['heading'] && $variables['collapsible']) {
-      // Retrieve the body ID attribute.
-      if ($body_id = $variables->getAttribute('id', "$id--content", 'body_attributes')) {
-        // Ensure the target is set.
-        if ($variables['target'] = $variables->offsetGet('target', "#$body_id")) {
-          // Set additional necessary attributes to the heading.
-          $variables->setAttributes([
-            'aria-controls' => preg_replace('/^#/', '', $variables['target']),
-            'aria-expanded' => !$variables['collapsed'] ? 'true' : 'false',
-            'aria-pressed' => !$variables['collapsed'] ? 'true' : 'false',
-            'data-toggle' => 'collapse',
-            'role' => 'button',
-          ], 'heading_attributes');
-        }
-      }
-    }
-
-    // Ensure we render HTML from heading.
-    $heading = $variables->offsetGet('heading');
-    if ($heading && (is_string($heading) || ($heading instanceof MarkupInterface))) {
-      $variables->offsetSet('heading', ['#markup' => $heading]);
-    }
-
-    // Ensure there is a valid panel state.
-    if (!$variables->offsetGet('panel_type')) {
-      $variables->offsetSet('panel_type', 'default');
-    }
-
-    // Convert the description variable.
-    $this->preprocessDescription();
-
-    // Ensure all attributes are proper objects.
-    $this->preprocessAttributes();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/Breadcrumb.php b/themes/bootstrap/src/Plugin/Preprocess/Breadcrumb.php
deleted file mode 100644
index ae5e8c4..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/Breadcrumb.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\Breadcrumb.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Core\Template\Attribute;
-use Drupal\Core\Url;
-
-/**
- * Pre-processes variables for the "breadcrumb" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("breadcrumb")
- */
-class Breadcrumb extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessVariables(Variables $variables) {
-    $breadcrumb = &$variables['breadcrumb'];
-
-    // Determine if breadcrumbs should be displayed.
-    $breadcrumb_visibility = $this->theme->getSetting('breadcrumb');
-    if (($breadcrumb_visibility == 0 || ($breadcrumb_visibility == 2 && \Drupal::service('router.admin_context')->isAdminRoute())) || empty($breadcrumb)) {
-      $breadcrumb = [];
-      return;
-    }
-
-    // Remove first occurrence of the "Home" <front> link, provided by core.
-    if (!$this->theme->getSetting('breadcrumb_home')) {
-      $front = Url::fromRoute('<front>')->toString();
-      foreach ($breadcrumb as $key => $link) {
-        if (isset($link['url']) && $link['url'] === $front) {
-          unset($breadcrumb[$key]);
-          break;
-        }
-      }
-    }
-
-    if ($this->theme->getSetting('breadcrumb_title') && !empty($breadcrumb)) {
-      $request = \Drupal::request();
-      $route_match = \Drupal::routeMatch();
-      $page_title = \Drupal::service('title_resolver')->getTitle($request, $route_match->getRouteObject());
-      if (!empty($page_title)) {
-        $breadcrumb[] = [
-          'text' => $page_title,
-          'attributes' => new Attribute(['class' => ['active']]),
-        ];
-      }
-    }
-
-    // Add cache context based on url.
-    $variables->addCacheContexts(['url']);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/FieldMultipleValueForm.php b/themes/bootstrap/src/Plugin/Preprocess/FieldMultipleValueForm.php
deleted file mode 100644
index 087ee67..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/FieldMultipleValueForm.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\FieldMultipleValueForm.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "field_multiple_value_form" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("field_multiple_value_form")
- */
-class FieldMultipleValueForm extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessElement(Element $element, Variables $variables) {
-    // Wrap header columns in label element for Bootstrap.
-    if ($variables['multiple']) {
-      $header = [
-        [
-          'data' => [
-            '#prefix' => '<label class="label">',
-            'title' => ['#markup' => $element->getProperty('title')],
-            '#suffix' => '</label>',
-          ],
-          'colspan' => 2,
-          'class' => [
-            'field-label',
-            !empty($element['#required']) ? 'form-required' : '',
-          ],
-        ],
-        t('Order', [], ['context' => 'Sort order']),
-      ];
-
-      $variables['table']['#header'] = $header;
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/FileLink.php b/themes/bootstrap/src/Plugin/Preprocess/FileLink.php
deleted file mode 100644
index 0e5c6c9..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/FileLink.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\FileLink.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Core\Link;
-use Drupal\Core\Url;
-use Drupal\file\Entity\File;
-
-/**
- * Pre-processes variables for the "file_link" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("file_link",
- *   replace = "template_preprocess_file_link"
- * )
- */
-class FileLink extends PreprocessBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessVariables(Variables $variables) {
-    $options = [];
-
-    $file = ($variables['file'] instanceof File) ? $variables['file'] : File::load($variables['file']->fid);
-    $url = file_create_url($file->getFileUri());
-
-    $file_size = $file->getSize();
-    $mime_type = $file->getMimeType();
-
-    // Set options as per anchor format described at
-    // http://microformats.org/wiki/file-format-examples
-    $options['attributes']['type'] = "$mime_type; length=$file_size";
-
-    // Use the description as the link text if available.
-    if (empty($variables['description'])) {
-      $link_text = $file->getFilename();
-    }
-    else {
-      $link_text = $variables['description'];
-      $options['attributes']['title'] = $file->getFilename();
-    }
-
-    // Retrieve the generic mime type from core (mislabeled as "icon_class").
-    $generic_mime_type = file_icon_class($mime_type);
-
-    // Map the generic mime types to an icon and state.
-    $mime_map = [
-      'application-x-executable' => [
-        'label' => t('binary file'),
-        'icon' => 'console',
-      ],
-      'audio' => [
-        'label' => t('audio file'),
-        'icon' => 'headphones',
-      ],
-      'image' => [
-        'label' => t('image'),
-        'icon' => 'picture',
-      ],
-      'package-x-generic' => [
-        'label' => t('archive'),
-        'icon' => 'compressed',
-      ],
-      'text' => [
-        'label' => t('document'),
-        'icon' => 'file',
-      ],
-      'video' => [
-        'label' => t('video'),
-        'icon' => 'film',
-      ],
-    ];
-
-    // Retrieve the mime map array.
-    $mime = isset($mime_map[$generic_mime_type]) ? $mime_map[$generic_mime_type] : [
-      'label' => t('file'),
-      'icon' => 'file',
-      'state' => 'primary',
-    ];
-
-    // Classes to add to the file field for icons.
-    $variables->addClass([
-      'file',
-      // Add a specific class for each and every mime type.
-      'file--mime-' . strtr($mime_type, ['/' => '-', '.' => '-']),
-      // Add a more general class for groups of well known mime types.
-      'file--' . $generic_mime_type,
-    ]);
-
-    // Set the icon for the mime type.
-    $icon = Bootstrap::glyphicon($mime['icon']);
-    $variables->icon = Element::create($icon)
-      ->addClass('text-primary')
-      ->getArray();
-
-    $options['attributes']['title'] = t('Open @mime in new window', ['@mime' => $mime['label']]);
-    $options['attributes']['target'] = '_blank';
-
-    if ($this->theme->getSetting('tooltip_enabled')) {
-      $options['attributes']['data-toggle'] = 'tooltip';
-      $options['attributes']['data-placement'] = 'bottom';
-    }
-    $variables['link'] = Link::fromTextAndUrl($link_text, Url::fromUri($url, $options));
-
-    // Add the file size as a variable.
-    $variables->file_size = format_size($file_size);
-
-    // Preprocess attributes.
-    $this->preprocessAttributes();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/FileUploadHelp.php b/themes/bootstrap/src/Plugin/Preprocess/FileUploadHelp.php
deleted file mode 100644
index 526f225..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/FileUploadHelp.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\FileUploadHelp.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Field\FieldFilteredMarkup;
-use Drupal\Core\Url;
-
-/**
- * Pre-processes variables for the "file_upload_help" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("file_upload_help",
- *   replace = "template_preprocess_file_upload_help"
- * )
- */
-class FileUploadHelp extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessVariables(Variables $variables) {
-    if (!empty($variables['description'])) {
-      $variables['description'] = FieldFilteredMarkup::create($variables['description']);
-    }
-
-    $descriptions = [];
-
-    $cardinality = $variables['cardinality'];
-    if (isset($cardinality)) {
-      if ($cardinality == -1) {
-        $descriptions[] = t('Unlimited number of files can be uploaded to this field.');
-      }
-      else {
-        $descriptions[] = \Drupal::translation()->formatPlural($cardinality, 'One file only.', 'Maximum @count files.');
-      }
-    }
-
-    $upload_validators = $variables['upload_validators'];
-    if (isset($upload_validators['file_validate_size'])) {
-      $descriptions[] = t('@size limit.', ['@size' => format_size($upload_validators['file_validate_size'][0])]);
-    }
-    if (isset($upload_validators['file_validate_extensions'])) {
-      $extensions = new FormattableMarkup('<code>@extensions</code>', [
-        '@extensions' => implode(', ', explode(' ', $upload_validators['file_validate_extensions'][0])),
-      ]);
-      $descriptions[] = t('Allowed types: @extensions.', ['@extensions' => $extensions]);
-    }
-
-    if (isset($upload_validators['file_validate_image_resolution'])) {
-      $max = $upload_validators['file_validate_image_resolution'][0];
-      $min = $upload_validators['file_validate_image_resolution'][1];
-      if ($min && $max && $min == $max) {
-        $descriptions[] = t('Images must be exactly <strong>@size</strong> pixels.', ['@size' => $max]);
-      }
-      elseif ($min && $max) {
-        $descriptions[] = t('Images must be larger than <strong>@min</strong> pixels. Images larger than <strong>@max</strong> pixels will be resized.', ['@min' => $min, '@max' => $max]);
-      }
-      elseif ($min) {
-        $descriptions[] = t('Images must be larger than <strong>@min</strong> pixels.', ['@min' => $min]);
-      }
-      elseif ($max) {
-        $descriptions[] = t('Images larger than <strong>@max</strong> pixels will be resized.', ['@max' => $max]);
-      }
-    }
-
-    $variables['descriptions'] = $descriptions;
-
-    if ($descriptions && $this->theme->getSetting('popover_enabled')) {
-      $build = array();
-      $id = Html::getUniqueId('upload-instructions');
-      $build['toggle'] = [
-        '#type' => 'link',
-        '#title' => t('Upload requirements'),
-        '#url' => Url::fromUserInput("#$id"),
-        '#icon' => Bootstrap::glyphicon('question-sign'),
-        '#attributes' => [
-          'class' => ['icon-before'],
-          'data-toggle' => 'popover',
-          'data-html' => 'true',
-          'data-placement' => 'bottom',
-          'data-title' => t('Upload requirements'),
-        ],
-      ];
-      $build['requirements'] = [
-        '#type' => 'container',
-        '#theme_wrappers' => ['container__file_upload_help'],
-        '#attributes' => [
-          'id' => $id,
-          'class' => ['hidden', 'help-block'],
-          'aria-hidden' => 'true',
-        ],
-      ];
-      $build['requirements']['descriptions'] = [
-        '#theme' => 'item_list__file_upload_help',
-        '#items' => $descriptions,
-      ];
-      $variables['popover'] = $build;
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/FilterTips.php b/themes/bootstrap/src/Plugin/Preprocess/FilterTips.php
deleted file mode 100644
index e9d9e23..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/FilterTips.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\FilterTips.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Core\Url;
-
-/**
- * Pre-processes variables for the "filter_tips" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("filter_tips",
- *   replace = "template_preprocess_filter_tips"
- * )
- */
-class FilterTips extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessVariables(Variables $variables) {
-    /** @var \Drupal\filter\FilterFormatInterface $current_format */
-    $current_format = \Drupal::routeMatch()->getParameter('filter_format');
-    $current_format_id = $current_format ? $current_format->id() : FALSE;
-
-    // Create a place holder for the tabs.
-    $build['tabs'] = [
-      '#theme' => 'item_list__filter_tips__tabs',
-      '#items' => [],
-      '#attributes' => [
-        'class' => ['nav', 'nav-tabs', 'filter-formats'],
-        'role' => 'tablist',
-      ],
-    ];
-
-    // Create a placeholder for the panes.
-    $build['panes'] = [
-      '#theme_wrappers' => ['container__filter_tips__panes'],
-      '#attributes' => [
-        'class' => ['tab-content'],
-      ],
-    ];
-
-    foreach (filter_formats(\Drupal::currentUser()) as $format_id => $format) {
-      // Set the current format ID to the first format.
-      if (!$current_format_id) {
-        $current_format_id = $format_id;
-      }
-
-      $tab = [
-        '#type' => 'link',
-        '#title' => $format->label(),
-        '#url' => Url::fromRoute('filter.tips', ['filter_format' => $format_id]),
-        '#attributes' => [
-          'role' => 'tab',
-          'data-toggle' => 'tab',
-          'data-target' => "#$format_id",
-        ],
-      ];
-      if ($current_format_id === $format_id) {
-        $tab['#wrapper_attributes']['class'][] = 'active';
-      }
-      $build['tabs']['#items'][] = $tab;
-
-      $tips = [];
-
-      // Iterate over each format's enabled filters.
-      /** @var \Drupal\filter\Plugin\FilterBase $filter */
-      foreach ($format->filters() as $name => $filter) {
-        // Ignore filters that are not enabled.
-        if (!$filter->status) {
-          continue;
-        }
-
-        $tip = $filter->tips(TRUE);
-        if (isset($tip)) {
-          $tips[] = ['#markup' => $tip];
-        }
-      }
-
-      // Construct the pane.
-      $pane = [
-        '#theme_wrappers' => ['container__filter_tips'],
-        '#attributes' => [
-          'class' => ['tab-pane', 'fade'],
-          'id' => $format_id,
-        ],
-        'list' => [
-          '#theme' => 'item_list',
-          '#items' => $tips,
-        ],
-      ];
-      if ($current_format_id === $format_id) {
-        $pane['#attributes']['class'][] = 'active';
-        $pane['#attributes']['class'][] = 'in';
-      }
-      $build['panes'][] = $pane;
-    }
-
-    $variables['tips'] = $build;
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/FormElement.php b/themes/bootstrap/src/Plugin/Preprocess/FormElement.php
deleted file mode 100644
index a61262b..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/FormElement.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\FormElement.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "form_element" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("form_element")
- */
-class FormElement extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessElement(Element $element, Variables $variables) {
-    // Set has_error flag.
-    $variables['has_error'] = $element->getProperty('has_error');
-
-    if ($element->getProperty('autocomplete_route_name')) {
-      $variables['is_autocomplete'] = TRUE;
-    }
-
-    // See http://getbootstrap.com/css/#forms-controls.
-    $checkbox = $variables['is_checkbox'] = $element->isType('checkbox');
-    $radio = $variables['is_radio'] = $element->isType('radio');
-
-    // Determine if the form element should have the "form-group" class added.
-    // Use an explicitly set property from the element or use its other
-    // properties as the criteria to determine if it should be set.
-    $variables['is_form_group'] = $element->getProperty('form_group', !$variables['is_checkbox'] && !$variables['is_radio'] && !$element->isType(['hidden', 'textarea']));
-
-    // Add label_display and label variables to template.
-    $display = $variables['label_display'] = $variables['title_display'] = $element->getProperty('title_display');
-
-    // Place single checkboxes and radios in the label field.
-    if (($checkbox || $radio)) {
-      $label = Element::create($variables['label']);
-      $children = &$label->getProperty('children', '');
-      $children .= $variables['children'];
-      if ($label->getProperty('title_display') != 'none') {
-        unset($variables['children']);
-      }
-
-      // Inform label if it is in checkbox/radio context.
-      $label->setProperty('is_checkbox', $checkbox);
-      $label->setProperty('is_radio', $radio);
-
-      // Pass the label attributes to the label, if available.
-      if ($element->hasProperty('label_attributes')) {
-        $label->setAttributes($element->getProperty('label_attributes'));
-      }
-    }
-
-    // Remove the #field_prefix and #field_suffix values set in
-    // template_preprocess_form_element(). These are handled at the input level.
-    // @see \Drupal\bootstrap\Plugin\Preprocess\Input::preprocess().
-    unset($variables['prefix']);
-    unset($variables['suffix']);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/FormElementLabel.php b/themes/bootstrap/src/Plugin/Preprocess/FormElementLabel.php
deleted file mode 100644
index 8a6ab40..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/FormElementLabel.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\FormElementLabel.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "form_element_label" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("form_element_label")
- */
-class FormElementLabel extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessElement(Element $element, Variables $variables) {
-    // Map the element properties.
-    $variables->map(['attributes', 'is_checkbox', 'is_radio']);
-
-    // Preprocess attributes.
-    $this->preprocessAttributes();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/ImageWidget.php b/themes/bootstrap/src/Plugin/Preprocess/ImageWidget.php
deleted file mode 100644
index 8a3381b..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/ImageWidget.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\ImageWidget.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "image_widget" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @see image-widget.html.twig
- *
- * @BootstrapPreprocess("image_widget",
- *   replace = "template_preprocess_image_widget"
- * )
- */
-class ImageWidget extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessElement(Element $element, Variables $variables) {
-    $variables->addClass(['image-widget', 'js-form-managed-file', 'form-managed-file', 'clearfix']);
-
-    $data = &$variables->offsetGet('data', []);
-    foreach ($element->children() as $key => $child) {
-      $data[$key] = $child->getArray();
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/Input.php b/themes/bootstrap/src/Plugin/Preprocess/Input.php
deleted file mode 100644
index e30c1c2..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/Input.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\Input.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "input" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("input")
- */
-class Input extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessElement(Element $element, Variables $variables) {
-    // Autocomplete.
-    if ($route = $element->getProperty('autocomplete_route_name')) {
-      $variables['autocomplete'] = TRUE;
-    }
-
-    // Create variables for #input_group and #input_group_button flags.
-    $variables['input_group'] = $element->getProperty('input_group') || $element->getProperty('input_group_button');
-
-    // Map the element properties.
-    $variables->map([
-      'attributes' => 'attributes',
-      'icon' => 'icon',
-      'field_prefix' => 'prefix',
-      'field_suffix' => 'suffix',
-      'type' => 'type',
-    ]);
-
-    // Ensure attributes are proper objects.
-    $this->preprocessAttributes();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/InputButton.php b/themes/bootstrap/src/Plugin/Preprocess/InputButton.php
deleted file mode 100644
index 3a2b6fe..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/InputButton.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\InputButton.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "input__button" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("input__button")
- */
-class InputButton extends Input implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessElement(Element $element, Variables $variables) {
-    $element->colorize();
-    $element->setButtonSize();
-    $element->setIcon($element->getProperty('icon'));
-    $variables['icon_only'] = $element->getProperty('icon_only');
-    $variables['icon_position'] = $element->getProperty('icon_position');
-    $variables['label'] = $element->getProperty('value');
-    if ($element->getProperty('split')) {
-      $variables->map([$variables::SPLIT_BUTTON]);
-    }
-    parent::preprocessElement($element, $variables);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/ItemListBootstrapCarouselIndicators.php b/themes/bootstrap/src/Plugin/Preprocess/ItemListBootstrapCarouselIndicators.php
deleted file mode 100644
index 227c993..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/ItemListBootstrapCarouselIndicators.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes for the "item_list__bootstrap_carousel_indicators" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("item_list__bootstrap_carousel_indicators")
- */
-class ItemListBootstrapCarouselIndicators extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function preprocessVariables(Variables $variables) {
-    parent::preprocessVariables($variables);
-
-    $variables->target = $variables->getContext('target');
-    $variables->start_index = $variables->getContext('start_index');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/ItemListDropdown.php b/themes/bootstrap/src/Plugin/Preprocess/ItemListDropdown.php
deleted file mode 100644
index 2b1979f..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/ItemListDropdown.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes for the "item_list__dropdown" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("item_list__dropdown")
- */
-class ItemListDropdown extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function preprocessVariables(Variables $variables) {
-    parent::preprocessVariables($variables);
-
-    $variables->alignment = $variables->getContext('alignment');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/Links.php b/themes/bootstrap/src/Plugin/Preprocess/Links.php
deleted file mode 100644
index 5efa157..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/Links.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\Links.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "links" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("links")
- */
-class Links extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessVariables(Variables $variables) {
-    if ($variables->theme_hook_original === 'links' && $variables->hasClass('operations')) {
-      $variables->addClass('list-inline');
-      foreach ($variables->links as &$data) {
-        $link = Element::create($data['link']);
-        $link->addClass(['btn', 'btn-sm']);
-        $link->colorize();
-        $link->setIcon();
-        if ($this->theme->getSetting('tooltip_enabled')) {
-          $link->setAttribute('data-toggle', 'tooltip');
-          $link->setAttribute('data-placement', 'bottom');
-        }
-      }
-    }
-    $this->preprocessAttributes();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/MenuLocalAction.php b/themes/bootstrap/src/Plugin/Preprocess/MenuLocalAction.php
deleted file mode 100644
index 5a4948c..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/MenuLocalAction.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\MenuLocalAction.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Component\Render\FormattableMarkup;
-
-/**
- * Pre-processes variables for the "menu_local_action" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("menu_local_action")
- */
-class MenuLocalAction extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessElement(Element $element, Variables $variables) {
-    $link = $element->getProperty('link');
-    $link += ['localized_options' => []];
-    $link['localized_options']['set_active_class'] = TRUE;
-
-    $icon = Bootstrap::glyphiconFromString($link['title']);
-    $options = isset($link['localized_options']) ? $link['localized_options'] : [];
-
-    if (isset($link['url'])) {
-      // Turn link into a mini-button and colorize based on title.
-      $class = Bootstrap::cssClassFromString($link['title'], 'default');
-      if (!isset($options['attributes']['class'])) {
-        $options['attributes']['class'] = [];
-      }
-      $string = is_string($options['attributes']['class']);
-      if ($string) {
-        $options['attributes']['class'] = explode(' ', $options['attributes']['class']);
-      }
-      $options['attributes']['class'][] = 'btn';
-      $options['attributes']['class'][] = 'btn-xs';
-      $options['attributes']['class'][] = 'btn-' . $class;
-      if ($string) {
-        $options['attributes']['class'] = implode(' ', $options['attributes']['class']);
-      }
-
-      $variables['link'] = [
-        '#type' => 'link',
-        '#title' => $icon ? new FormattableMarkup(Element::create($icon)->renderPlain() . '@text', ['@text' => $link['title']]) : $link['title'],
-        '#options' => $options,
-        '#url' => $link['url'],
-      ];
-    }
-    else {
-      $variables['link'] = [
-        '#type' => 'link',
-        '#title' => $link['title'],
-        '#options' => $options,
-        '#url' => $link['url'],
-      ];
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/Page.php b/themes/bootstrap/src/Plugin/Preprocess/Page.php
deleted file mode 100644
index b181316..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/Page.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\Page.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "page" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("page")
- */
-class Page extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessVariables(Variables $variables) {
-    // Setup default attributes.
-    $variables->getAttributes($variables::NAVBAR);
-    $variables->getAttributes($variables::HEADER);
-    $variables->getAttributes($variables::CONTENT);
-    $variables->getAttributes($variables::FOOTER);
-    $this->preprocessAttributes();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/PreprocessBase.php b/themes/bootstrap/src/Plugin/Preprocess/PreprocessBase.php
deleted file mode 100644
index a18d57f..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/PreprocessBase.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\PreprocessBase.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Plugin\PluginBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Core\Template\Attribute;
-
-/**
- * Base preprocess class used to build the necessary variables for templates.
- *
- * @ingroup plugins_preprocess
- */
-class PreprocessBase extends PluginBase implements PreprocessInterface {
-
-  /**
-   * The theme hook invoked.
-   *
-   * @type string
-   */
-  protected $hook;
-
-  /**
-   * The theme hook info array from the theme registry.
-   *
-   * @type array
-   */
-  protected $info;
-
-  /**
-   * The Variables object.
-   *
-   * @type \Drupal\bootstrap\Utility\Variables
-   */
-  protected $variables;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocess(array &$variables, $hook, array $info) {
-    $this->hook = $hook;
-    $this->info = $info;
-    $this->variables = Variables::create($variables);
-    if ($this->variables->element) {
-      // Check for errors and set the "has_error" property flag.
-      if (!$this->variables->element->hasProperty('has_error')) {
-        $errors = $this->variables->element->getProperty('errors');
-        $this->variables->element->setProperty('has_error', isset($errors) || ($this->variables->element->getProperty('required') && $this->theme->getSetting('forms_required_has_error')));
-      }
-      $this->preprocessElement($this->variables->element, $this->variables);
-    }
-    $this->preprocessVariables($this->variables);
-  }
-
-  /**
-   * Ensures all attributes have been converted to an Attribute object.
-   */
-  protected function preprocessAttributes() {
-    foreach ($this->variables as $name => $value) {
-      if (strpos($name, 'attributes') !== FALSE && is_array($value)) {
-        $this->variables[$name] = new Attribute($value);
-      }
-    }
-  }
-
-  /**
-   * Converts any set description variable into a traversable array.
-   *
-   * @see https://www.drupal.org/node/2324025
-   */
-  protected function preprocessDescription() {
-    if ($this->variables->offsetGet('description')) {
-      // Retrieve the description attributes.
-      $description_attributes = $this->variables->offsetGet('description_attributes', []);
-
-      // Remove standalone description attributes.
-      $this->variables->offsetUnset('description_attributes');
-
-      // Build the description attributes.
-      if ($id = $this->variables->getAttribute('id')) {
-        $this->variables->setAttribute('aria-describedby', "$id--description");
-        $description_attributes['id'] = "$id--description";
-      }
-
-      // Replace the description variable.
-      $this->variables->offsetSet('description', [
-        'attributes' => new Attribute($description_attributes),
-        'content' => $this->variables['description'],
-        'position' => $this->variables->offsetGet('description_display', 'after'),
-      ]);
-    }
-  }
-
-  /**
-   * Preprocess the variables array if an element is present.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $element
-   *   The Element object.
-   * @param \Drupal\bootstrap\Utility\Variables $variables
-   *   The Variables object.
-   */
-  protected function preprocessElement(Element $element, Variables $variables) {}
-
-  /**
-   * Preprocess the variables array.
-   *
-   * @param \Drupal\bootstrap\Utility\Variables $variables
-   *   The Variables object.
-   */
-  protected function preprocessVariables(Variables $variables) {}
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/PreprocessInterface.php b/themes/bootstrap/src/Plugin/Preprocess/PreprocessInterface.php
deleted file mode 100644
index b93e85c..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/PreprocessInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\PreprocessInterface.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-/**
- * Defines the interface for an object oriented preprocess plugin.
- *
- * @ingroup plugins_preprocess
- */
-interface PreprocessInterface {
-
-  /**
-   * Preprocess theme hook variables.
-   *
-   * @param array $variables
-   *   The variables array, passed by reference (modify in place).
-   * @param string $hook
-   *   The name of the theme hook.
-   * @param array $info
-   *   The theme hook info array.
-   */
-  public function preprocess(array &$variables, $hook, array $info);
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/ProgressBar.php b/themes/bootstrap/src/Plugin/Preprocess/ProgressBar.php
deleted file mode 100644
index 47b4b8b..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/ProgressBar.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\ProgressBar.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Variables;
-use Drupal\Component\Utility\Html;
-
-/**
- * Pre-processes variables for the "progress_bar" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("progress_bar")
- */
-class ProgressBar extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessVariables(Variables $variables) {
-    // Ensure a unique ID, generating one if needed.
-    $id = $variables->getAttribute('id', Html::getUniqueId($variables->offsetGet('id', 'progress-bar')));
-    $variables->setAttribute('id', $id);
-    unset($variables['id']);
-
-    // Preprocess attributes.
-    $this->preprocessAttributes();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/Region.php b/themes/bootstrap/src/Plugin/Preprocess/Region.php
deleted file mode 100644
index 09cd5d0..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/Region.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\Region.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "region" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("region")
- */
-class Region extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessVariables(Variables $variables) {
-    $region = $variables['elements']['#region'];
-    $variables['region'] = $region;
-    $variables['content'] = $variables['elements']['#children'];
-
-    // Help region.
-    if ($region === 'help' && !empty($variables['content'])) {
-      $variables['content'] = [
-        'icon' => Bootstrap::glyphicon('question-sign'),
-        'content' => ['#markup' => $variables['content']],
-      ];
-      $variables->addClass(['alert', 'alert-info', 'messages', 'info']);
-    }
-
-    // Support for "well" classes in regions.
-    static $region_wells;
-    if (!isset($region_wells)) {
-      $region_wells = $this->theme->getSetting('region_wells');
-    }
-    if (!empty($region_wells[$region])) {
-      $variables->addClass($region_wells[$region]);
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/Select.php b/themes/bootstrap/src/Plugin/Preprocess/Select.php
deleted file mode 100644
index 898369c..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/Select.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\Input.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "select" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("select")
- */
-class Select extends PreprocessBase implements PreprocessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessElement(Element $element, Variables $variables) {
-    // Create variables for #input_group and #input_group_button flags.
-    $variables['input_group'] = $element->getProperty('input_group') || $element->getProperty('input_group_button');
-
-    // Map the element properties.
-    $variables->map([
-      'attributes' => 'attributes',
-      'field_prefix' => 'prefix',
-      'field_suffix' => 'suffix',
-    ]);
-
-    // Ensure attributes are proper objects.
-    $this->preprocessAttributes();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/Table.php b/themes/bootstrap/src/Plugin/Preprocess/Table.php
deleted file mode 100644
index 731086c..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/Table.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\Table.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-use Drupal\bootstrap\Utility\Variables;
-
-/**
- * Pre-processes variables for the "table" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("table")
- */
-class Table extends PreprocessBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessVariables(Variables $variables) {
-    // Bordered.
-    $variables['bordered'] = !!$variables->getContext('bordered', $this->theme->getSetting('table_bordered'));
-
-    // Condensed.
-    $variables['condensed'] = !!$variables->getContext('condensed', $this->theme->getSetting('table_condensed'));
-
-    // Hover.
-    $variables['hover'] = !!$variables->getContext('hover', $this->theme->getSetting('table_hover'));
-
-    // Striped.
-    $variables['striped'] = empty($variables['no_striping']) && $variables->getContext('striped', $this->theme->getSetting('table_striped'));
-    unset($variables['no_striping']);
-
-    // Responsive.
-    $responsive = $variables->getContext('responsive', $this->theme->getSetting('table_responsive'));
-    $variables['responsive'] = $responsive == -1 ? !\Drupal::service('router.admin_context')->isAdminRoute() : !!(int) $responsive;
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Preprocess/ViewsViewTable.php b/themes/bootstrap/src/Plugin/Preprocess/ViewsViewTable.php
deleted file mode 100644
index 7d741d3..0000000
--- a/themes/bootstrap/src/Plugin/Preprocess/ViewsViewTable.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Preprocess\ViewsViewTable.
- */
-
-namespace Drupal\bootstrap\Plugin\Preprocess;
-
-use Drupal\bootstrap\Annotation\BootstrapPreprocess;
-
-/**
- * Pre-processes variables for the "views_view_table" theme hook.
- *
- * @ingroup plugins_preprocess
- *
- * @BootstrapPreprocess("views_view_table")
- */
-class ViewsViewTable extends Table {}
diff --git a/themes/bootstrap/src/Plugin/PreprocessManager.php b/themes/bootstrap/src/Plugin/PreprocessManager.php
deleted file mode 100644
index ea2c535..0000000
--- a/themes/bootstrap/src/Plugin/PreprocessManager.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\PreprocessManager.
- */
-
-namespace Drupal\bootstrap\Plugin;
-
-use Drupal\bootstrap\Theme;
-
-/**
- * Manages discovery and instantiation of Bootstrap preprocess hooks.
- *
- * @ingroup plugins_preprocess
- */
-class PreprocessManager extends PluginManager {
-
-  /**
-   * Constructs a new \Drupal\bootstrap\Plugin\PreprocessManager object.
-   *
-   * @param \Drupal\bootstrap\Theme $theme
-   *   The theme to use for discovery.
-   */
-  public function __construct(Theme $theme) {
-    parent::__construct($theme, 'Plugin/Preprocess', 'Drupal\bootstrap\Plugin\Preprocess\PreprocessInterface', 'Drupal\bootstrap\Annotation\BootstrapPreprocess');
-    $this->setCacheBackend(\Drupal::cache('discovery'), 'theme:' . $theme->getName() . ':preprocess', $this->getCacheTags());
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Prerender/Captcha.php b/themes/bootstrap/src/Plugin/Prerender/Captcha.php
deleted file mode 100644
index 3563436..0000000
--- a/themes/bootstrap/src/Plugin/Prerender/Captcha.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\bootstrap\Plugin\Prerender;
-
-use Drupal\bootstrap\Annotation\BootstrapPrerender;
-use Drupal\bootstrap\Utility\Element;
-
-/**
- * Pre-render callback for the "captcha" element type.
- *
- * @ingroup plugins_prerender
- *
- * @BootstrapPrerender("captcha",
- *   action = @BootstrapConstant(
- *     "\Drupal\bootstrap\Bootstrap::CALLBACK_PREPEND"
- *   )
- * )
- */
-class Captcha extends PrerenderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function preRenderElement(Element $element) {
-    parent::preRenderElement($element);
-    $element->setProperty('smart_description', FALSE, TRUE);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Prerender/Dropbutton.php b/themes/bootstrap/src/Plugin/Prerender/Dropbutton.php
deleted file mode 100644
index 5b2bf62..0000000
--- a/themes/bootstrap/src/Plugin/Prerender/Dropbutton.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Prerender\Dropbutton.
- */
-
-namespace Drupal\bootstrap\Plugin\Prerender;
-
-use Drupal\bootstrap\Annotation\BootstrapPrerender;
-use Drupal\bootstrap\Utility\Element;
-
-/**
- * Pre-render callback for the "dropbutton" element type.
- *
- * @ingroup plugins_prerender
- *
- * @BootstrapPrerender("dropbutton",
- *   replace = "Drupal\Core\Render\Element\Dropbutton::preRenderDropbutton"
- * )
- *
- * @see \Drupal\Core\Render\Element\Dropbutton::preRenderDropbutton()
- */
-class Dropbutton extends PrerenderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function preRenderElement(Element $element) {
-    $element['#attached']['library'][] = 'bootstrap/dropdown';
-
-    // Enable targeted theming of specific dropbuttons (e.g., 'operations' or
-    // 'operations__node').
-    if ($subtype = $element->getProperty('subtype')) {
-      $element->setProperty('theme', $element->getProperty('theme') . "__$subtype");
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Prerender/Link.php b/themes/bootstrap/src/Plugin/Prerender/Link.php
deleted file mode 100644
index b9309fa..0000000
--- a/themes/bootstrap/src/Plugin/Prerender/Link.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Prerender\Link.
- */
-
-namespace Drupal\bootstrap\Plugin\Prerender;
-
-use Drupal\bootstrap\Annotation\BootstrapConstant;
-use Drupal\bootstrap\Annotation\BootstrapPrerender;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Component\Render\FormattableMarkup;
-
-/**
- * Pre-render callback for the "link" element type.
- *
- * @ingroup plugins_prerender
- *
- * @BootstrapPrerender("link",
- *   action = @BootstrapConstant(
- *     "\Drupal\bootstrap\Bootstrap::CALLBACK_PREPEND"
- *   )
- * )
- *
- * @see \Drupal\Core\Render\Element\Link::preRenderLink()
- */
-class Link extends PrerenderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function preRenderElement(Element $element) {
-    // Injects the icon into the title (the only way this is possible).
-    if ($icon = &$element->getProperty('icon')) {
-      $title = $element->getProperty('title');
-
-      // Handle #icon_only.
-      if ($element->getProperty('icon_only')) {
-        if ($attribute_title = $element->getAttribute('title', '')) {
-          $title .= ' - ' . $attribute_title;
-        }
-        $element
-          ->setAttribute('title', $title)
-          ->addClass('icon-only')
-          ->setProperty('title', $icon);
-        if (Bootstrap::getTheme()->getSetting('tooltip_enabled')) {
-          $element->setAttribute('data-toggle', 'tooltip');
-        }
-        return;
-      }
-
-      // Handle #icon_position.
-      $position = $element->getProperty('icon_position', 'before');
-
-      // Render #icon and trim it (so it doesn't add underlines in whitespace).
-      $rendered_icon = trim(Element::create($icon)->renderPlain());
-
-      // Default position is before.
-      $markup = "$rendered_icon@title";
-      if ($position === 'after') {
-        $markup = "@title$rendered_icon";
-      }
-
-      // Replace the title and set an icon position class.
-      $element
-        ->setProperty('title', new FormattableMarkup($markup, ['@title' => $title]))
-        ->addClass("icon-$position");
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Prerender/Operations.php b/themes/bootstrap/src/Plugin/Prerender/Operations.php
deleted file mode 100644
index 5af1a27..0000000
--- a/themes/bootstrap/src/Plugin/Prerender/Operations.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Prerender\Operations.
- */
-
-namespace Drupal\bootstrap\Plugin\Prerender;
-
-use Drupal\bootstrap\Annotation\BootstrapPrerender;
-
-/**
- * Pre-render callback for the "operations" element type.
- *
- * @ingroup plugins_prerender
- *
- * @BootstrapPrerender("operations",
- *   replace = "Drupal\Core\Render\Element\Operations::preRenderDropbutton"
- * )
- *
- * @see \Drupal\bootstrap\Plugin\Prerender\Dropbutton
- * @see \Drupal\Core\Render\Element\Operations::preRenderDropbutton()
- */
-class Operations extends Dropbutton {}
diff --git a/themes/bootstrap/src/Plugin/Prerender/PrerenderBase.php b/themes/bootstrap/src/Plugin/Prerender/PrerenderBase.php
deleted file mode 100644
index cec1e60..0000000
--- a/themes/bootstrap/src/Plugin/Prerender/PrerenderBase.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Prerender\PrerenderBase.
- */
-
-namespace Drupal\bootstrap\Plugin\Prerender;
-
-use Drupal\bootstrap\Utility\Element;
-
-/**
- * Defines the interface for an object oriented preprocess plugin.
- *
- * @ingroup plugins_prerender
- */
-class PrerenderBase implements PrerenderInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function preRender(array $element) {
-    static::preRenderElement(Element::create($element));
-    return $element;
-  }
-
-  /**
-   * Pre-render element callback.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $element
-   *   The element object.
-   */
-  public static function preRenderElement(Element $element) {}
-
-}
diff --git a/themes/bootstrap/src/Plugin/Prerender/PrerenderInterface.php b/themes/bootstrap/src/Plugin/Prerender/PrerenderInterface.php
deleted file mode 100644
index c1197c0..0000000
--- a/themes/bootstrap/src/Plugin/Prerender/PrerenderInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Prerender\PrerenderInterface.
- */
-
-namespace Drupal\bootstrap\Plugin\Prerender;
-
-/**
- * Defines the interface for an object oriented preprocess plugin.
- *
- * @ingroup plugins_prerender
- */
-interface PrerenderInterface {
-
-  /**
-   * Pre-render render array element callback.
-   *
-   * @param array $element
-   *   The render array element.
-   *
-   * @return array
-   *   The modified render array element.
-   */
-  public static function preRender(array $element);
-
-}
diff --git a/themes/bootstrap/src/Plugin/PrerenderManager.php b/themes/bootstrap/src/Plugin/PrerenderManager.php
deleted file mode 100644
index 3c2e569..0000000
--- a/themes/bootstrap/src/Plugin/PrerenderManager.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\PrerenderManager.
- */
-
-namespace Drupal\bootstrap\Plugin;
-
-use Drupal\bootstrap\Theme;
-use Drupal\bootstrap\Utility\Element;
-
-/**
- * Manages discovery and instantiation of Bootstrap pre-render callbacks.
- *
- * @ingroup plugins_prerender
- */
-class PrerenderManager extends PluginManager {
-
-  /**
-   * Constructs a new \Drupal\bootstrap\Plugin\PrerenderManager object.
-   *
-   * @param \Drupal\bootstrap\Theme $theme
-   *   The theme to use for discovery.
-   */
-  public function __construct(Theme $theme) {
-    parent::__construct($theme, 'Plugin/Prerender', 'Drupal\bootstrap\Plugin\Prerender\PrerenderInterface', 'Drupal\bootstrap\Annotation\BootstrapPrerender');
-    $this->setCacheBackend(\Drupal::cache('discovery'), 'theme:' . $theme->getName() . ':prerender', $this->getCacheTags());
-  }
-
-  /**
-   * Pre-render render array element callback.
-   *
-   * @param array $element
-   *   The render array element.
-   *
-   * @return array
-   *   The modified render array element.
-   */
-  public static function preRender(array $element) {
-    if (!empty($element['#bootstrap_ignore_pre_render'])) {
-      return $element;
-    }
-
-    $e = Element::create($element);
-
-    if ($e->isType('machine_name')) {
-      $e->addClass('form-inline', 'wrapper_attributes');
-    }
-
-    // Add smart descriptions to the element, if necessary.
-    $e->smartDescription();
-
-    return $element;
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Process/Actions.php b/themes/bootstrap/src/Plugin/Process/Actions.php
deleted file mode 100644
index b598998..0000000
--- a/themes/bootstrap/src/Plugin/Process/Actions.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Process\Actions.
- */
-
-namespace Drupal\bootstrap\Plugin\Process;
-
-use Drupal\bootstrap\Annotation\BootstrapProcess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Processes the "actions" element.
- *
- * @ingroup plugins_process
- *
- * @BootstrapProcess("actions")
- */
-class Actions extends ProcessBase implements ProcessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function processElement(Element $element, FormStateInterface $form_state, array &$complete_form) {
-    foreach ($element->children() as $child) {
-      if ($child->isPropertyEmpty('icon')) {
-        $child->setIcon();
-      }
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Process/ActionsDropbutton.php b/themes/bootstrap/src/Plugin/Process/ActionsDropbutton.php
deleted file mode 100644
index d974da2..0000000
--- a/themes/bootstrap/src/Plugin/Process/ActionsDropbutton.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Process\ActionsDropbutton.
- */
-
-namespace Drupal\bootstrap\Plugin\Process;
-
-use Drupal\bootstrap\Annotation\BootstrapProcess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Replaces the process callback for dropbuttons on an "actions" element.
- *
- * @ingroup plugins_process
- *
- * @BootstrapProcess("actions__dropbutton",
- *   replace = "Drupal\Core\Render\Element\Actions::preRenderActionsDropbutton",
- * )
- *
- * @see \Drupal\Core\Render\Element\Actions::preRenderActionsDropbutton()
- *
- * @todo This may become a #pre_render callback.
- */
-class ActionsDropbutton extends ProcessBase implements ProcessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function processElement(Element $element, FormStateInterface $form_state, array &$complete_form) {
-    $dropbuttons = Element::create();
-    foreach ($element->children(TRUE) as $key => $child) {
-      if ($dropbutton = $child->getProperty('dropbutton')) {
-        // If there is no dropbutton for this button group yet, create one.
-        if (!isset($dropbuttons->$dropbutton)) {
-          $dropbuttons->$dropbutton = ['#type' => 'dropbutton'];
-        }
-
-        $dropbuttons[$dropbutton]['#links'][$key] = $child->getArray();
-
-        // Remove original child from the element so it's not rendered twice.
-        $child->setProperty('printed', TRUE);
-      }
-    }
-    $element->exchangeArray($dropbuttons->getArray() + $element->getArray());
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Process/ManagedFile.php b/themes/bootstrap/src/Plugin/Process/ManagedFile.php
deleted file mode 100644
index 402919f..0000000
--- a/themes/bootstrap/src/Plugin/Process/ManagedFile.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Process\ManagedFile.
- */
-
-namespace Drupal\bootstrap\Plugin\Process;
-
-use Drupal\bootstrap\Annotation\BootstrapProcess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Processes the "managed_file" element.
- *
- * @ingroup plugins_process
- *
- * @BootstrapProcess("managed_file")
- */
-class ManagedFile extends ProcessBase implements ProcessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function processElement(Element $element, FormStateInterface $form_state, array &$complete_form) {
-    $ajax_wrapper_id = $element->upload_button->getProperty('ajax')['wrapper'];
-    if ($prefix = $element->getProperty('prefix')) {
-      $prefix = preg_replace('/<div id="' . $ajax_wrapper_id . '">/', '<div id="' . $ajax_wrapper_id . '" class="form-group">', $prefix);
-      $element->setProperty('prefix', $prefix);
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Process/ProcessBase.php b/themes/bootstrap/src/Plugin/Process/ProcessBase.php
deleted file mode 100644
index 8ec543f..0000000
--- a/themes/bootstrap/src/Plugin/Process/ProcessBase.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Process\ProcessBase.
- */
-
-namespace Drupal\bootstrap\Plugin\Process;
-
-use Drupal\bootstrap\Plugin\PluginBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Base process class used to process elements.
- *
- * @ingroup plugins_process
- */
-class ProcessBase extends PluginBase implements ProcessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function process(array $element, FormStateInterface $form_state, array &$complete_form) {
-    if (!empty($element['#bootstrap_ignore_process'])) {
-      return $element;
-    }
-    static::processElement(Element::create($element, $form_state), $form_state, $complete_form);
-    return $element;
-  }
-
-  /**
-   * Process a specific form element.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $element
-   *   The element object.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   * @param array $complete_form
-   *   The complete form structure.
-   *
-   * @see \Drupal\bootstrap\Plugin\Process\ProcessBase::process()
-   * @see \Drupal\bootstrap\Plugin\Alter\ElementInfo::alter()
-   */
-  public static function processElement(Element $element, FormStateInterface $form_state, array &$complete_form) {}
-
-}
diff --git a/themes/bootstrap/src/Plugin/Process/ProcessInterface.php b/themes/bootstrap/src/Plugin/Process/ProcessInterface.php
deleted file mode 100644
index 6809794..0000000
--- a/themes/bootstrap/src/Plugin/Process/ProcessInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Process\ProcessInterface.
- */
-
-namespace Drupal\bootstrap\Plugin\Process;
-
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Defines the interface for an object oriented process plugin.
- *
- * @ingroup plugins_process
- */
-interface ProcessInterface {
-
-  /**
-   * Process a specific form element type.
-   *
-   * Implementations of this method should check to see if the element has a
-   * property named #bootstrap_ignore_process and check if it is set to TRUE.
-   * If it is, the method should immediately return with the unaltered element.
-   *
-   * @param array $element
-   *   The element render array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   * @param array $complete_form
-   *   The complete form structure.
-   *
-   * @return array
-   *   The altered element array.
-   *
-   * @see \Drupal\bootstrap\Plugin\Alter\ElementInfo::alter
-   */
-  public static function process(array $element, FormStateInterface $form_state, array &$complete_form);
-
-}
diff --git a/themes/bootstrap/src/Plugin/Process/Search.php b/themes/bootstrap/src/Plugin/Process/Search.php
deleted file mode 100644
index d560bfc..0000000
--- a/themes/bootstrap/src/Plugin/Process/Search.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Process\Search.
- */
-
-namespace Drupal\bootstrap\Plugin\Process;
-
-use Drupal\bootstrap\Annotation\BootstrapProcess;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Processes the "search" element.
- *
- * @ingroup plugins_process
- *
- * @BootstrapProcess("search")
- */
-class Search extends ProcessBase implements ProcessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function processElement(Element $element, FormStateInterface $form_state, array &$complete_form) {
-    $element->setProperty('title_display', 'invisible');
-    $element->setAttribute('placeholder', $element->getProperty('placeholder', $element->getProperty('title', t('Search'))));
-    if (!$element->hasProperty('description')) {
-      $element->setProperty('description', t('Enter the terms you wish to search for.'));
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Process/TextFormat.php b/themes/bootstrap/src/Plugin/Process/TextFormat.php
deleted file mode 100644
index ab0a0b7..0000000
--- a/themes/bootstrap/src/Plugin/Process/TextFormat.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Process\TextFormat.
- */
-
-namespace Drupal\bootstrap\Plugin\Process;
-
-use Drupal\bootstrap\Annotation\BootstrapProcess;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Processes the "text_format" element.
- *
- * @ingroup plugins_process
- *
- * @BootstrapProcess("text_format")
- *
- * @see \Drupal\filter\Element\TextFormat::processFormat()
- */
-class TextFormat extends ProcessBase implements ProcessInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function processElement(Element $element, FormStateInterface $form_state, array &$complete_form) {
-    if (isset($element->format)) {
-      $element->format->addClass('form-inline');
-
-      // Guidelines (removed).
-      $element->format->guidelines->setProperty('access', FALSE);
-
-      // Format (select).
-      $element->format->format
-        ->addClass('input-sm')
-        ->setProperty('title_display', 'invisible')
-        ->setProperty('weight', -10);
-
-      // Help (link).
-      $element->format->help->about
-        ->setAttribute('title', t('Opens in new window'))
-        ->setProperty('icon', Bootstrap::glyphicon('question-sign'));
-      if (Bootstrap::getTheme()->getSetting('tooltip_enabled')) {
-        $element->format->help->about->setAttribute('data-toggle', 'tooltip');
-      }
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/ProcessManager.php b/themes/bootstrap/src/Plugin/ProcessManager.php
deleted file mode 100644
index cf890cf..0000000
--- a/themes/bootstrap/src/Plugin/ProcessManager.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\ProcessManager.
- */
-
-namespace Drupal\bootstrap\Plugin;
-
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Theme;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Manages discovery and instantiation of Bootstrap form process callbacks.
- *
- * @ingroup plugins_process
- */
-class ProcessManager extends PluginManager {
-
-  /**
-   * Constructs a new \Drupal\bootstrap\Plugin\ProcessManager object.
-   *
-   * @param \Drupal\bootstrap\Theme $theme
-   *   The theme to use for discovery.
-   */
-  public function __construct(Theme $theme) {
-    parent::__construct($theme, 'Plugin/Process', 'Drupal\bootstrap\Plugin\Process\ProcessInterface', 'Drupal\bootstrap\Annotation\BootstrapProcess');
-    $this->setCacheBackend(\Drupal::cache('discovery'), 'theme:' . $theme->getName() . ':process', $this->getCacheTags());
-  }
-
-  /**
-   * Global #process callback for form elements.
-   *
-   * @param array $element
-   *   The element render array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   * @param array $complete_form
-   *   The complete form structure.
-   *
-   * @return array
-   *   The altered element array.
-   *
-   * @see \Drupal\bootstrap\Plugin\Alter\ElementInfo::alter
-   */
-  public static function process(array $element, FormStateInterface $form_state, array &$complete_form) {
-    if (!empty($element['#bootstrap_ignore_process'])) {
-      return $element;
-    }
-
-    static $theme;
-    if (!isset($theme)) {
-      $theme = Bootstrap::getTheme();
-    }
-
-    $e = Element::create($element, $form_state);
-
-    // Process AJAX.
-    if (($e->getProperty('ajax') && !$e->isButton()) || $e->getProperty('autocomplete_route_name')) {
-      static::processAjax($e, $form_state, $complete_form);
-    }
-
-    // Add "form-inline" class.
-    if ($e->hasClass('container-inline')) {
-      $e->replaceClass('container-inline', 'form-inline');
-    }
-    if ($e->isType(['color', 'date', 'number', 'range', 'tel', 'weight'])) {
-      $e->addClass('form-inline', 'wrapper_attributes');
-    }
-
-    // Process input groups.
-    if ($e->getProperty('input') && ($e->getProperty('input_group') || $e->getProperty('input_group_button'))) {
-      static::processInputGroups($e, $form_state, $complete_form);
-    }
-
-    return $element;
-  }
-
-  /**
-   * Processes elements with AJAX properties.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $element
-   *   The element object.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   * @param array $complete_form
-   *   The complete form structure.
-   */
-  public static function processAjax(Element $element, FormStateInterface $form_state, array &$complete_form) {
-    $ajax = $element->getProperty('ajax');
-
-    // Show throbber AJAX requests in an input button group.
-    if (!$element->isType('hidden') && (!isset($ajax['progress']['type']) || $ajax['progress']['type'] === 'throbber')) {
-      // Use an icon for autocomplete "throbber".
-      $icon = Bootstrap::glyphicon('refresh');
-      $element->appendProperty('field_suffix', Element::create($icon)->addClass(['ajax-progress', 'ajax-progress-throbber']));
-      $element->setProperty('input_group', TRUE);
-    }
-  }
-
-  /**
-   * Processes elements that have input groups.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $element
-   *   The element object.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   * @param array $complete_form
-   *   The complete form structure.
-   */
-  protected static function processInputGroups(Element $element, FormStateInterface $form_state, array &$complete_form) {
-    // Automatically inject the nearest button found after this element if
-    // #input_group_button exists.
-    if ($element->getProperty('input_group_button')) {
-      // Obtain the parent array to limit search.
-      $array_parents = $element->getProperty('array_parents', []);
-
-      // Remove the current element from the array.
-      array_pop($array_parents);
-
-      // Retrieve the parent element.
-      $parent = Element::create(NestedArray::getValue($complete_form, $array_parents), $form_state);
-
-      // Find the closest button.
-      if ($button = self::findButton($parent)) {
-        // Since this button is technically being "moved", it needs to be
-        // rendered now, so it doesn't get printed twice (in the original spot).
-        $element->appendProperty('field_suffix', $button->setIcon()->render());
-      }
-    }
-
-    $input_group_attributes = ['class' => ['input-group-' . ($element->getProperty('input_group_button') ? 'btn' : 'addon')]];
-    if ($prefix = $element->getProperty('field_prefix')) {
-      $element->setProperty('field_prefix', [
-        '#type' => 'html_tag',
-        '#tag' => 'span',
-        '#attributes' => $input_group_attributes,
-        '#value' => Element::create($prefix)->renderPlain(),
-        '#weight' => -1,
-      ]);
-    }
-    if ($suffix = $element->getProperty('field_suffix')) {
-      $element->setProperty('field_suffix', [
-        '#type' => 'html_tag',
-        '#tag' => 'span',
-        '#attributes' => $input_group_attributes,
-        '#value' => Element::create($suffix)->renderPlain(),
-        '#weight' => 1,
-      ]);
-    }
-  }
-
-  /**
-   * Traverses an element to find the closest button.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $element
-   *   The element to iterate over.
-   *
-   * @return \Drupal\bootstrap\Utility\Element|FALSE
-   *   The first button element or FALSE if no button could be found.
-   */
-  protected static function &findButton(Element $element) {
-    $button = FALSE;
-    foreach ($element->children() as $child) {
-      if ($child->isButton()) {
-        $button = $child;
-      }
-      if ($result = &self::findButton($child)) {
-        $button = $result;
-      }
-    }
-    return $button;
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Provider/Custom.php b/themes/bootstrap/src/Plugin/Provider/Custom.php
deleted file mode 100644
index 0156d6e..0000000
--- a/themes/bootstrap/src/Plugin/Provider/Custom.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Provider\Custom.
- */
-
-namespace Drupal\bootstrap\Plugin\Provider;
-
-use Drupal\bootstrap\Annotation\BootstrapProvider;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "custom" CDN provider plugin.
- *
- * @ingroup plugins_provider
- *
- * @BootstrapProvider(
- *   id = "custom",
- *   label = @Translation("Custom"),
- * )
- */
-class Custom extends ProviderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAssets($types = NULL) {
-    $this->assets = [];
-
-    // If no type is set, return all CSS and JS.
-    if (!isset($types)) {
-      $types = ['css', 'js'];
-    }
-    $types = is_array($types) ? $types : [$types];
-
-    foreach ($types as $type) {
-      if ($setting = $this->theme->getSetting('cdn_custom_' . $type)) {
-        $this->assets[$type][] = $setting;
-      }
-      if ($setting = $this->theme->getSetting('cdn_custom_' . $type . '_min')) {
-        $this->assets['min'][$type][] = $setting;
-      }
-    }
-    return parent::getAssets($types);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Provider/JsDelivr.php b/themes/bootstrap/src/Plugin/Provider/JsDelivr.php
deleted file mode 100644
index 2b1f34e..0000000
--- a/themes/bootstrap/src/Plugin/Provider/JsDelivr.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Provider\JsDelivr.
- */
-
-namespace Drupal\bootstrap\Plugin\Provider;
-
-use Drupal\bootstrap\Annotation\BootstrapProvider;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "jsdelivr" CDN provider plugin.
- *
- * @ingroup plugins_provider
- *
- * @BootstrapProvider(
- *   id = "jsdelivr",
- *   label = @Translation("jsDelivr"),
- *   api = "http://api.jsdelivr.com/v1/bootstrap/libraries",
- *   themes = { },
- *   versions = { },
- * )
- */
-class JsDelivr extends ProviderBase {
-
-  /**
-   * Extracts theme information from files provided by the jsDelivr API.
-   *
-   * This will place the raw files into proper "css", "js" and "min" arrays
-   * (if they exist) and prepends them with a base URL provided.
-   *
-   * @param array $files
-   *   An array of files to process.
-   * @param string $base_url
-   *   The base URL each one of the $files are relative to, this usually
-   *   should also include the version path prefix as well.
-   *
-   * @return array
-   *   An associative array containing the following keys, if there were
-   *   matching files found:
-   *   - css
-   *   - js
-   *   - min:
-   *     - css
-   *     - js
-   */
-  protected function extractThemes(array $files, $base_url = '') {
-    $themes = [];
-    foreach ($files as $file) {
-      preg_match('`([^/]*)/bootstrap(-theme)?(\.min)?\.(js|css)$`', $file, $matches);
-      if (!empty($matches[1]) && !empty($matches[4])) {
-        $path = $matches[1];
-        $min = $matches[3];
-        $filetype = $matches[4];
-
-        // Determine the "theme" name.
-        if ($path === 'css' || $path === 'js') {
-          $theme = 'bootstrap';
-          $title = (string) t('Bootstrap');
-        }
-        else {
-          $theme = $path;
-          $title = ucfirst($path);
-        }
-        if ($matches[2]) {
-          $theme = 'bootstrap_theme';
-          $title = (string) t('Bootstrap Theme');
-        }
-
-        $themes[$theme]['title'] = $title;
-        if ($min) {
-          $themes[$theme]['min'][$filetype][] = "$base_url/$path/bootstrap{$matches[2]}$min.$filetype";
-        }
-        else {
-          $themes[$theme][$filetype][] = "$base_url/$path/bootstrap{$matches[2]}$min.$filetype";
-        }
-      }
-    }
-    return $themes;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAssets($types = NULL) {
-    $this->assets = [];
-    $error = !empty($provider['error']);
-    $version = $error ? Bootstrap::FRAMEWORK_VERSION : $this->theme->getSetting('cdn_jsdelivr_version');
-    $theme = $error ? 'bootstrap' : $this->theme->getSetting('cdn_jsdelivr_theme');
-    if (isset($this->pluginDefinition['themes'][$version][$theme])) {
-      $this->assets = $this->pluginDefinition['themes'][$version][$theme];
-    }
-    return parent::getAssets($types);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processApi(array $json, array &$definition) {
-    $definition['description'] = t('<p style="background:#EB4C36"><a href=":jsdelivr" target="_blank"><img src="http://www.jsdelivr.com/img/logo-34.png" alt="jsDelivr Logo"/></a></p><p><a href=":jsdelivr" target="_blank">jsDelivr</a> is a free multi-CDN infrastructure that uses <a href=":maxcdn" target="_blank">MaxCDN</a>, <a href=":cloudflare" target="_blank">Cloudflare</a> and many others to combine their powers for the good of the open source community... <a href=":jsdelivr_about" target="_blank">read more</a></p>', [
-      ':jsdelivr' => 'http://www.jsdelivr.com',
-      ':jsdelivr_about' => 'http://www.jsdelivr.com/about',
-      ':maxcdn' => 'http://www.maxcdn.com',
-      ':cloudflare' => 'http://www.cloudflare.com',
-    ]);
-
-    // Expected library names from jsDelivr API v1. Must use "twitter-bootstrap"
-    // instead of "bootstrap" (which is just a directory alias).
-    // @see https://www.drupal.org/node/2504343
-    // @see https://github.com/jsdelivr/api/issues/94
-    $bootstrap = 'twitter-bootstrap';
-    $bootswatch = 'bootswatch';
-
-    // Extract the raw asset files from the JSON data for each framework.
-    $libraries = [];
-    if ($json) {
-      foreach ($json as $data) {
-        if ($data['name'] === $bootstrap || $data['name'] === $bootswatch) {
-          foreach ($data['assets'] as $asset) {
-            if (preg_match('/^' . substr(Bootstrap::FRAMEWORK_VERSION, 0, 1) . '\.\d\.\d$/', $asset['version'])) {
-              $libraries[$data['name']][$asset['version']] = $asset['files'];
-            }
-          }
-        }
-      }
-    }
-
-    // If the main bootstrap library could not be found, then provide defaults.
-    if (!isset($libraries[$bootstrap])) {
-      $definition['error'] = TRUE;
-      $definition['versions'][Bootstrap::FRAMEWORK_VERSION] = Bootstrap::FRAMEWORK_VERSION;
-      $definition['themes'][Bootstrap::FRAMEWORK_VERSION] = [
-        'bootstrap' => [
-          'title' => (string) t('Bootstrap'),
-          'css' => ['//cdn.jsdelivr.net/bootstrap/' . Bootstrap::FRAMEWORK_VERSION . '/css/bootstrap.css'],
-          'js' => ['//cdn.jsdelivr.net/bootstrap/' . Bootstrap::FRAMEWORK_VERSION . '/js/bootstrap.js'],
-          'min' => [
-            'css' => ['//cdn.jsdelivr.net/bootstrap/' . Bootstrap::FRAMEWORK_VERSION . '/css/bootstrap.min.css'],
-            'js' => ['//cdn.jsdelivr.net/bootstrap/' . Bootstrap::FRAMEWORK_VERSION . '/js/bootstrap.min.js'],
-          ],
-        ],
-      ];
-      return;
-    }
-
-    // Populate the provider array with the versions and themes available.
-    foreach (array_keys($libraries[$bootstrap]) as $version) {
-      $definition['versions'][$version] = $version;
-
-      if (!isset($definition['themes'][$version])) {
-        $definition['themes'][$version] = [];
-      }
-
-      // Extract Bootstrap themes.
-      $definition['themes'][$version] = NestedArray::mergeDeep($definition['themes'][$version], $this->extractThemes($libraries[$bootstrap][$version], "//cdn.jsdelivr.net/bootstrap/$version"));
-
-      // Extract Bootswatch themes.
-      if (isset($libraries[$bootswatch][$version])) {
-        $definition['themes'][$version] = NestedArray::mergeDeep($definition['themes'][$version], $this->extractThemes($libraries[$bootswatch][$version], "//cdn.jsdelivr.net/bootswatch/$version"));
-      }
-    }
-
-    // Post process the themes to fill in any missing assets.
-    foreach (array_keys($definition['themes']) as $version) {
-      foreach (array_keys($definition['themes'][$version]) as $theme) {
-        // Some themes actually require Bootstrap framework assets to still
-        // function properly.
-        if ($theme !== 'bootstrap') {
-          foreach (['css', 'js'] as $type) {
-            // Bootswatch themes include the Bootstrap framework in their CSS.
-            // Skip the CSS portions.
-            if ($theme !== 'bootstrap_theme' && $type === 'css') {
-              continue;
-            }
-            if (!isset($definition['themes'][$version][$theme][$type]) && !empty($definition['themes'][$version]['bootstrap'][$type])) {
-              $definition['themes'][$version][$theme][$type] = [];
-            }
-            $definition['themes'][$version][$theme][$type] = NestedArray::mergeDeep($definition['themes'][$version]['bootstrap'][$type], $definition['themes'][$version][$theme][$type]);
-            if (!isset($definition['themes'][$version][$theme]['min'][$type]) && !empty($definition['themes'][$version]['bootstrap']['min'][$type])) {
-              $definition['themes'][$version][$theme]['min'][$type] = [];
-            }
-            $definition['themes'][$version][$theme]['min'][$type] = NestedArray::mergeDeep($definition['themes'][$version]['bootstrap']['min'][$type], $definition['themes'][$version][$theme]['min'][$type]);
-          }
-        }
-        // Some themes do not have a non-minified version, clone them to the
-        // "normal" css/js arrays to ensure that the theme still loads if
-        // aggregation (minification) is disabled.
-        foreach (['css', 'js'] as $type) {
-          if (!isset($definition['themes'][$version][$theme][$type]) && isset($definition['themes'][$version][$theme]['min'][$type])) {
-            $definition['themes'][$version][$theme][$type] = $definition['themes'][$version][$theme]['min'][$type];
-          }
-        }
-      }
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Provider/ProviderBase.php b/themes/bootstrap/src/Plugin/Provider/ProviderBase.php
deleted file mode 100644
index 385c110..0000000
--- a/themes/bootstrap/src/Plugin/Provider/ProviderBase.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Provider\ProviderBase.
- */
-
-namespace Drupal\bootstrap\Plugin\Provider;
-
-use Drupal\bootstrap\Plugin\PluginBase;
-use Drupal\bootstrap\Plugin\ProviderManager;
-use Drupal\Component\Serialization\Json;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Psr7\Response;
-
-/**
- * CDN provider base class.
- *
- * @ingroup plugins_provider
- */
-class ProviderBase extends PluginBase implements ProviderInterface {
-
-  /**
-   * The currently set assets.
-   *
-   * @var array
-   */
-  protected $assets = [];
-
-  /**
-   * The versions supplied by the CDN provider.
-   *
-   * @var array
-   */
-  protected $versions;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getApi() {
-    return $this->pluginDefinition['api'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAssets($types = NULL) {
-    // Immediately return if there are no assets.
-    if (!$this->assets) {
-      return $this->assets;
-    }
-
-    $assets = [];
-
-    // If no type is set, return all CSS and JS.
-    if (!isset($types)) {
-      $types = ['css', 'js'];
-    }
-    $types = is_array($types) ? $types : [$types];
-
-    // Ensure default arrays exist for the requested types.
-    foreach ($types as $type) {
-      $assets[$type] = [];
-    }
-
-    // Retrieve the system performance config.
-    $config = \Drupal::config('system.performance');
-
-    // Iterate over each type.
-    foreach ($types as $type) {
-      $min = $config->get("$type.preprocess");
-      $files = $min && isset($this->assets['min'][$type]) ? $this->assets['min'][$type] : (isset($this->assets[$type]) ? $this->assets[$type] : []);
-      foreach ($files as $asset) {
-        $data = [
-          'data' => $asset,
-          'type' => 'external',
-          'weight' => -19.999,
-        ];
-        // CSS library assets use "SMACSS" categorization, assign it to "base".
-        if ($type === 'css') {
-          $assets[$type]['base'][$asset] = $data;
-        }
-        else {
-          $assets[$type][$asset] = $data;
-        }
-      }
-    }
-
-    return count($types) === 1 ? $assets[$types[0]] : $assets;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return $this->pluginDefinition['description'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLabel() {
-    return $this->pluginDefinition['label'] ?: $this->getPluginId();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getThemes() {
-    return $this->pluginDefinition['themes'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getVersions() {
-    return $this->pluginDefinition['versions'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasError() {
-    return $this->pluginDefinition['error'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isImported() {
-    return $this->pluginDefinition['imported'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processDefinition(array &$definition, $plugin_id) {
-    $provider_path = ProviderManager::FILE_PATH;
-    file_prepare_directory($provider_path, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
-
-    // Process API data.
-    if ($api = $this->getApi()) {
-      // Use manually imported API data, if it exists.
-      if (file_exists("$provider_path/$plugin_id.json") && ($imported_data = file_get_contents("$provider_path/$plugin_id.json"))) {
-        $definition['imported'] = TRUE;
-        $response = new Response(200, [], $imported_data);
-      }
-      // Otherwise, attempt to request API data if the provider has specified
-      // an "api" URL to use.
-      else {
-        $client = \Drupal::httpClient();
-        $request = new Request('GET', $api);
-        try {
-          $response = $client->send($request);
-        }
-        catch (RequestException $e) {
-          $response = new Response(400);
-        }
-      }
-      $contents = $response->getBody(TRUE)->getContents();
-      $json = Json::decode($contents) ?: [];
-      $this->processApi($json, $definition);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processApi(array $json, array &$definition) {}
-
-}
diff --git a/themes/bootstrap/src/Plugin/Provider/ProviderInterface.php b/themes/bootstrap/src/Plugin/Provider/ProviderInterface.php
deleted file mode 100644
index eb97a13..0000000
--- a/themes/bootstrap/src/Plugin/Provider/ProviderInterface.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Provider\ProviderInterface.
- */
-
-namespace Drupal\bootstrap\Plugin\Provider;
-
-use Drupal\Component\Plugin\DerivativeInspectionInterface;
-use Drupal\Component\Plugin\PluginInspectionInterface;
-
-/**
- * ProviderInterface.
- *
- * @ingroup plugins_provider
- */
-interface ProviderInterface extends PluginInspectionInterface, DerivativeInspectionInterface {
-
-  /**
-   * Retrieves the API URL if set.
-   *
-   * @return string
-   *   The API URL.
-   */
-  public function getApi();
-
-  /**
-   * Retrieves Provider assets for the active provider, if any.
-   *
-   * @param string|array $types
-   *   The type of asset to retrieve: "css" or "js", defaults to an array
-   *   array containing both if not set.
-   *
-   * @return array
-   *   If $type is a string or an array with only one (1) item in it, the
-   *   assets are returned as an indexed array of files. Otherwise, an
-   *   associative array is returned keyed by the type.
-   */
-  public function getAssets($types = NULL);
-
-  /**
-   * Retrieves the provider description.
-   *
-   * @return string
-   *   The provider description.
-   */
-  public function getDescription();
-
-  /**
-   * Retrieves the provider human-readable label.
-   *
-   * @return string
-   *   The provider human-readable label.
-   */
-  public function getLabel();
-
-  /**
-   * Retrieves the themes supported by the CDN provider.
-   *
-   * @return array
-   *   An array of themes. If the CDN provider does not support any it will
-   *   just be an empty array.
-   */
-  public function getThemes();
-
-  /**
-   * Retrieves the versions supported by the CDN provider.
-   *
-   * @return array
-   *   An array of versions. If the CDN provider does not support any it will
-   *   just be an empty array.
-   */
-  public function getVersions();
-
-  /**
-   * Flag indicating that the API data parsing failed.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   */
-  public function hasError();
-
-  /**
-   * Flag indicating that the API data was manually imported.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   */
-  public function isImported();
-
-  /**
-   * Processes the provider plugin definition upon discovery.
-   *
-   * @param array $definition
-   *   The provider plugin definition.
-   * @param string $plugin_id
-   *   The plugin identifier.
-   */
-  public function processDefinition(array &$definition, $plugin_id);
-
-  /**
-   * Processes the provider plugin definition upon discovery.
-   *
-   * @param array $json
-   *   The JSON data retrieved from the API request.
-   * @param array $definition
-   *   The provider plugin definition.
-   */
-  public function processApi(array $json, array &$definition);
-
-}
diff --git a/themes/bootstrap/src/Plugin/ProviderManager.php b/themes/bootstrap/src/Plugin/ProviderManager.php
deleted file mode 100644
index 41a259d..0000000
--- a/themes/bootstrap/src/Plugin/ProviderManager.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\ProviderManager.
- */
-
-namespace Drupal\bootstrap\Plugin;
-
-use Drupal\bootstrap\Plugin\Provider\ProviderInterface;
-use Drupal\bootstrap\Theme;
-
-/**
- * Manages discovery and instantiation of Bootstrap CDN providers.
- *
- * @ingroup plugins_provider
- */
-class ProviderManager extends PluginManager {
-  /**
-   * The base file system path for CDN providers.
-   *
-   * @var string
-   */
-  const FILE_PATH = 'public://bootstrap/provider';
-
-  /**
-   * Constructs a new \Drupal\bootstrap\Plugin\ProviderManager object.
-   *
-   * @param \Drupal\bootstrap\Theme $theme
-   *   The theme to use for discovery.
-   */
-  public function __construct(Theme $theme) {
-    parent::__construct($theme, 'Plugin/Provider', 'Drupal\bootstrap\Plugin\Provider\ProviderInterface', 'Drupal\bootstrap\Annotation\BootstrapProvider');
-    $this->setCacheBackend(\Drupal::cache('discovery'), 'theme:' . $theme->getName() . ':provider', $this->getCacheTags());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processDefinition(&$definition, $plugin_id) {
-    parent::processDefinition($definition, $plugin_id);
-    /** @var ProviderInterface $provider */
-    $provider = new $definition['class'](['theme' => $this->theme], $plugin_id, $definition);
-    $provider->processDefinition($definition, $plugin_id);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomCss.php b/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomCss.php
deleted file mode 100644
index ecd5712..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomCss.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Advanced\Cdn\CdnCustomCss.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Advanced\Cdn;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "cdn_custom_css" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   cdn_provider = "custom",
- *   id = "cdn_custom_css",
- *   type = "textfield",
- *   weight = 1,
- *   title = @Translation("Bootstrap CSS URL"),
- *   defaultValue = "https://cdn.jsdelivr.net/bootstrap/3.3.7/css/bootstrap.css",
- *   description = @Translation("It is best to use <code>https</code> protocols here as it will allow more flexibility if the need ever arises."),
- *   groups = {
- *     "advanced" = @Translation("Advanced"),
- *     "cdn" = @Translation("CDN (Content Delivery Network)"),
- *     "custom" = false,
- *   },
- * )
- */
-class CdnCustomCss extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return ['library_info'];
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomCssMin.php b/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomCssMin.php
deleted file mode 100644
index 4f6c2c1..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomCssMin.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Advanced\Cdn\CdnCustomCssMin.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Advanced\Cdn;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "cdn_custom_css_min" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   cdn_provider = "custom",
- *   id = "cdn_custom_css_min",
- *   type = "textfield",
- *   weight = 2,
- *   title = @Translation("Minified Bootstrap CSS URL"),
- *   defaultValue = "https://cdn.jsdelivr.net/bootstrap/3.3.7/css/bootstrap.min.css",
- *   description = @Translation("Additionally, you can provide the minimized version of the file. It will be used instead if site aggregation is enabled."),
- *   groups = {
- *     "advanced" = @Translation("Advanced"),
- *     "cdn" = @Translation("CDN (Content Delivery Network)"),
- *     "custom" = false,
- *   },
- * )
- */
-class CdnCustomCssMin extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return ['library_info'];
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomJs.php b/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomJs.php
deleted file mode 100644
index 2b9d5ee..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomJs.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Advanced\Cdn\CdnCustomJs.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Advanced\Cdn;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "cdn_custom_js" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   cdn_provider = "custom",
- *   id = "cdn_custom_js",
- *   type = "textfield",
- *   weight = 3,
- *   title = @Translation("Bootstrap JavaScript URL"),
- *   defaultValue = "https://cdn.jsdelivr.net/bootstrap/3.3.7/js/bootstrap.js",
- *   description = @Translation("It is best to use <code>https</code> protocols here as it will allow more flexibility if the need ever arises."),
- *   groups = {
- *     "advanced" = @Translation("Advanced"),
- *     "cdn" = @Translation("CDN (Content Delivery Network)"),
- *     "custom" = false,
- *   },
- * )
- */
-class CdnCustomJs extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return ['library_info'];
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomJsMin.php b/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomJsMin.php
deleted file mode 100644
index e7ce71d..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnCustomJsMin.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Advanced\Cdn\CdnCustomJsMin.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Advanced\Cdn;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "cdn_custom_js_min" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   cdn_provider = "custom",
- *   id = "cdn_custom_js_min",
- *   type = "textfield",
- *   weight = 4,
- *   title = @Translation("Minified Bootstrap JavaScript URL"),
- *   defaultValue = "https://cdn.jsdelivr.net/bootstrap/3.3.7/js/bootstrap.min.js",
- *   description = @Translation("Additionally, you can provide the minimized version of the file. It will be used instead if site aggregation is enabled."),
- *   groups = {
- *     "advanced" = @Translation("Advanced"),
- *     "cdn" = @Translation("CDN (Content Delivery Network)"),
- *     "custom" = false,
- *   },
- * )
- */
-class CdnCustomJsMin extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return ['library_info'];
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnJsdelivrTheme.php b/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnJsdelivrTheme.php
deleted file mode 100644
index ea31a5a..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnJsdelivrTheme.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Advanced\Cdn\CdnJsdelivrTheme.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Advanced\Cdn;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "cdn_jsdelivr_theme" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   cdn_provider = "jsdelivr",
- *   id = "cdn_jsdelivr_theme",
- *   type = "select",
- *   title = @Translation("Theme"),
- *   description = @Translation("Choose the example Bootstrap Theme provided by Bootstrap or one of the Bootswatch themes."),
- *   defaultValue = "bootstrap",
- *   empty_option = @Translation("Bootstrap (default)"),
- *   empty_value = "bootstrap",
- *   groups = {
- *     "advanced" = @Translation("Advanced"),
- *     "cdn" = @Translation("CDN (Content Delivery Network)"),
- *     "jsdelivr" = false,
- *   },
- * )
- */
-class CdnJsdelivrTheme extends CdnProvider {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $setting = $this->getSettingElement($form, $form_state);
-    $themes = $this->provider->getThemes();
-    $version = $form_state->getValue('cdn_jsdelivr_version', $this->theme->getSetting('cdn_jsdelivr_version'));
-
-    $setting->setProperty('suffix', '<div id="bootstrap-theme-preview"></div>');
-    $setting->setProperty('description', t('Choose the example <a href=":bootstrap_theme" target="_blank">Bootstrap Theme</a> provided by Bootstrap or one of the many, many <a href=":bootswatch" target="_blank">Bootswatch</a> themes!', [
-      ':bootswatch' => 'https://bootswatch.com',
-      ':bootstrap_theme' => 'http://getbootstrap.com/examples/theme/',
-    ]));
-
-    $options = [];
-    if (isset($themes[$version])) {
-      foreach ($themes[$version] as $theme => $data) {
-        $options[$theme] = $data['title'];
-      }
-    }
-    $setting->setProperty('options', $options);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnJsdelivrVersion.php b/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnJsdelivrVersion.php
deleted file mode 100644
index 644e21e..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnJsdelivrVersion.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Advanced\Cdn\CdnJsdelivrVersion.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Advanced\Cdn;
-
-use Drupal\bootstrap\Annotation\BootstrapConstant;
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "cdn_jsdelivr_version" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   cdn_provider = "jsdelivr",
- *   id = "cdn_jsdelivr_version",
- *   type = "select",
- *   weight = -1,
- *   title = @Translation("Version"),
- *   description = @Translation("Choose the Bootstrap version from jsdelivr"),
- *   defaultValue = @BootstrapConstant("Drupal\bootstrap\Bootstrap::FRAMEWORK_VERSION"),
- *   groups = {
- *     "advanced" = @Translation("Advanced"),
- *     "cdn" = @Translation("CDN (Content Delivery Network)"),
- *     "jsdelivr" = false,
- *   },
- * )
- */
-class CdnJsdelivrVersion extends CdnProvider {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $plugin_id = Html::cleanCssIdentifier($this->provider->getPluginId());
-    $setting = $this->getSettingElement($form, $form_state);
-
-    $setting->setProperty('options', $this->provider->getVersions());
-    $setting->setProperty('ajax', [
-      'callback' => [get_class($this), 'ajaxCallback'],
-      'wrapper' => 'cdn-provider-' . $plugin_id,
-    ]);
-
-    if (!$this->provider->hasError() && !$this->provider->isImported()) {
-      $setting->setProperty('description', t('These versions are automatically populated by the @provider API upon cache clear and newer versions may appear over time. It is highly recommended the version that the site was built with stays at that version. Until a newer version has been properly tested for updatability by the site maintainer, you should not arbitrarily "update" just because there is a newer version. This can cause many inconsistencies and undesired effects with an existing site.', [
-        '@provider' => $this->provider->getLabel(),
-      ]));
-    }
-  }
-
-  /**
-   * AJAX callback for reloading CDN provider elements.
-   *
-   * @param array $form
-   *   Nested array of form elements that comprise the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public static function ajaxCallback(array $form, FormStateInterface $form_state) {
-    return $form['advanced']['cdn'][$form_state->getValue('cdn_provider', Bootstrap::getTheme()->getSetting('cdn_provider'))];
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnProvider.php b/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnProvider.php
deleted file mode 100644
index 452bbc4..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Advanced/Cdn/CdnProvider.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Advanced\Cdn\CdnProvider.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Advanced\Cdn;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Plugin\Provider\ProviderInterface;
-use Drupal\bootstrap\Plugin\ProviderManager;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "cdn_provider" theme setting.
- *
- * @ingroup plugins_provider
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "cdn_provider",
- *   type = "select",
- *   title = @Translation("CDN Provider"),
- *   description = @Translation("Choose between jsdelivr or a custom cdn source."),
- *   defaultValue = "jsdelivr",
- *   empty_value = "",
- *   weight = -1,
- *   groups = {
- *     "advanced" = @Translation("Advanced"),
- *     "cdn" = @Translation("CDN (Content Delivery Network)"),
- *   },
- *   options = { },
- * )
- */
-class CdnProvider extends SettingBase {
-
-  /**
-   * The current provider.
-   *
-   * @var \Drupal\bootstrap\Plugin\Provider\ProviderInterface
-   */
-  protected $provider;
-
-  /**
-   * The current provider manager instance.
-   *
-   * @var \Drupal\bootstrap\Plugin\ProviderManager
-   */
-  protected $providerManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->providerManager = new ProviderManager($this->theme);
-    if (isset($plugin_definition['cdn_provider'])) {
-      $this->provider = $this->theme->getProvider($plugin_definition['cdn_provider']);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    // Retrieve the provider from form values or the setting.
-    $default_provider = $form_state->getValue('cdn_provider', $this->theme->getSetting('cdn_provider'));
-
-    $group = $this->getGroupElement($form, $form_state);
-    $group->setProperty('description', '<div class="alert alert-info messages warning"><strong>' . t('NOTE') . ':</strong> ' . t('Using one of the "CDN Provider" options below is the preferred method for loading Bootstrap CSS and JS on simpler sites that do not use a site-wide CDN. Using a "CDN Provider" for loading Bootstrap, however, does mean that it depends on a third-party service. There is no obligation or commitment by these third-parties that guarantees any up-time or service quality. If you need to customize Bootstrap and have chosen to compile the source code locally (served from this site), you must disable the "CDN Provider" option below by choosing "- None -" and alternatively enable a site-wide CDN implementation. All local (served from this site) versions of Bootstrap will be superseded by any enabled "CDN Provider" below. <strong>Do not do both</strong>.') . '</div>');
-    $group->setProperty('open', !!$default_provider);
-
-    // Intercept possible manual import of API data via AJAX callback.
-    $this->importProviderData($form_state);
-
-    $providers = $this->theme->getProviders();
-
-    $options = [];
-    foreach ($providers as $plugin_id => $provider) {
-      $options[$plugin_id] = $provider->getLabel();
-      $this->createProviderGroup($group, $provider);
-    }
-
-    // Override the options with the provider manager discovery.
-    $setting = $this->getSettingElement($form, $form_state);
-    $setting->setProperty('options', $options);
-  }
-
-  /**
-   * AJAX callback for reloading CDN provider elements.
-   *
-   * @param array $form
-   *   Nested array of form elements that comprise the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public static function ajaxCallback(array $form, FormStateInterface $form_state) {
-    return $form['advanced']['cdn'][$form_state->getValue('cdn_provider', Bootstrap::getTheme()->getSetting('cdn_provider'))];
-  }
-
-  /**
-   * Creates the necessary containers for each provider.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $group
-   *   The group element instance.
-   * @param \Drupal\bootstrap\Plugin\Provider\ProviderInterface $provider
-   *   The provider instance.
-   */
-  private function createProviderGroup(Element $group, ProviderInterface $provider) {
-    $plugin_id = Html::cleanCssIdentifier($provider->getPluginId());
-
-    // Create the provider container.
-    $group->$plugin_id = [
-      '#type' => 'container',
-      '#prefix' => '<div id="cdn-provider-' . $plugin_id . '">',
-      '#suffix' => '</div>',
-      '#states' => [
-        'visible' => [
-          ':input[name="cdn_provider"]' => ['value' => $plugin_id],
-        ],
-      ],
-    ];
-
-    // Add in the provider description.
-    if ($description = $provider->getDescription()) {
-      $group->$plugin_id->description = [
-        '#markup' => '<div class="lead">' . $description . '</div>',
-        '#weight' => -99,
-      ];
-    }
-
-    // Indicate there was an error retrieving the provider's API data.
-    if ($provider->hasError() || $provider->isImported()) {
-      if ($provider->hasError()) {
-        $group->$plugin_id->error = [
-          '#markup' => '<div class="alert alert-danger messages error"><strong>' . t('ERROR') . ':</strong> ' . t('Unable to reach or parse the data provided by the @title API. Ensure the server this website is hosted on is able to initiate HTTP requests. If the request consistently fails, it is likely that there are certain PHP functions that have been disabled by the hosting provider for security reasons. It is possible to manually copy and paste the contents of the following URL into the "Imported @title data" section below.<br /><br /><a href=":provider_api" target="_blank">:provider_api</a>.', [
-              '@title' => $provider->getLabel(),
-              ':provider_api' => $provider->getApi(),
-            ]) . '</div>',
-          '#weight' => -20,
-        ];
-      }
-
-      $group->$plugin_id->import = [
-        '#type' => 'details',
-        '#title' => t('Imported @title data', ['@title' => $provider->getLabel()]),
-        '#description' => t('The provider will attempt to parse the data entered here each time it is saved. If no data has been entered, any saved files associated with this provider will be removed and the provider will again attempt to request the API data normally through the following URL: <a href=":provider_api" target="_blank">:provider_api</a>.', [
-          ':provider_api' => $provider->getPluginDefinition()['api'],
-        ]),
-        '#weight' => 10,
-        '#open' => FALSE,
-      ];
-
-      $group->$plugin_id->import->cdn_provider_import_data = [
-        '#type' => 'textarea',
-        '#default_value' => file_exists(ProviderManager::FILE_PATH . '/' . $plugin_id . '.json') ? file_get_contents(ProviderManager::FILE_PATH . '/' . $plugin_id . '.json') : NULL,
-      ];
-
-      $group->$plugin_id->import->submit = [
-        '#type' => 'submit',
-        '#value' => t('Save provider data'),
-        '#executes_submit_callback' => FALSE,
-        '#ajax' => [
-          'callback' => [get_class($this), 'ajaxCallback'],
-          'wrapper' => 'cdn-provider-' . $plugin_id,
-        ],
-      ];
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return ['library_info'];
-  }
-
-  /**
-   * Imports data for a provider that was manually uploaded in theme settings.
-   *
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  private function importProviderData(FormStateInterface $form_state) {
-    if ($form_state->getValue('clicked_button') === t('Save provider data')->render()) {
-      $provider_path = ProviderManager::FILE_PATH;
-      file_prepare_directory($provider_path, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
-
-      $provider = $form_state->getValue('cdn_provider', $this->theme->getSetting('cdn_provider'));
-      $file = "$provider_path/$provider.json";
-
-      if ($import_data = $form_state->getValue('cdn_provider_import_data', FALSE)) {
-        file_unmanaged_save_data($import_data, $file, FILE_EXISTS_REPLACE);
-      }
-      elseif ($file && file_exists($file)) {
-        file_unmanaged_delete($file);
-      }
-
-      // Clear the cached definitions so they can get rebuilt.
-      $this->providerManager->clearCachedDefinitions();
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Advanced/IncludeDeprecated.php b/themes/bootstrap/src/Plugin/Setting/Advanced/IncludeDeprecated.php
deleted file mode 100644
index 74990da..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Advanced/IncludeDeprecated.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Advanced\IncludeDeprecated.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Advanced;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "include_deprecated" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "include_deprecated",
- *   type = "checkbox",
- *   weight = -3,
- *   title = @Translation("Include deprecated functions"),
- *   defaultValue = 0,
- *   description = @Translation("Enabling this setting will include any <code>deprecated.php</code> file found in your theme or base themes."),
- *   groups = {
- *     "advanced" = @Translation("Advanced"),
- *   },
- * )
- */
-class IncludeDeprecated extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/Advanced/SuppressDeprecatedWarnings.php b/themes/bootstrap/src/Plugin/Setting/Advanced/SuppressDeprecatedWarnings.php
deleted file mode 100644
index 0b46983..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Advanced/SuppressDeprecatedWarnings.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Advanced\SuppressDeprecatedWarnings.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Advanced;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "suppress_deprecated_warnings" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "suppress_deprecated_warnings",
- *   type = "checkbox",
- *   weight = -2,
- *   title = @Translation("Suppress deprecated warnings"),
- *   defaultValue = 0,
- *   description = @Translation("Enable this setting if you wish to suppress deprecated warning messages. <strong class='error text-error'>WARNING: Suppressing these messages does not &quote;fix&quote; the problem and you will inevitably encounter issues when they are removed in future updates. Only use this setting in extreme and necessary circumstances.</strong>"),
- *   groups = {
- *     "advanced" = @Translation("Advanced"),
- *   },
- * )
- */
-class SuppressDeprecatedWarnings extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $setting = $this->getSettingElement($form, $form_state);
-    $setting->setProperty('states', [
-      'visible' => [
-        ':input[name="include_deprecated"]' => ['checked' => TRUE],
-      ],
-    ]);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/Breadcrumb.php b/themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/Breadcrumb.php
deleted file mode 100644
index 71ba054..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/Breadcrumb.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Components\Breadcrumbs\Breadcrumb.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Components\Breadcrumbs;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "breadcrumb" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "breadcrumb",
- *   type = "select",
- *   title = @Translation("Breadcrumb visibility"),
- *   description = @Translation("Show or hide the Breadcrumbs"),
- *   defaultValue = "1",
- *   groups = {
- *     "components" = @Translation("Components"),
- *     "breadcrumbs" = @Translation("Breadcrumbs"),
- *   },
- *   options = {
- *     0 = @Translation("Hidden"),
- *     1 = @Translation("Visible"),
- *     2 = @Translation("Only in admin areas"),
- *   },
- * )
- */
-class Breadcrumb extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/BreadcrumbHome.php b/themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/BreadcrumbHome.php
deleted file mode 100644
index b180d3d..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/BreadcrumbHome.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Components\Breadcrumbs\BreadcrumbHome.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Components\Breadcrumbs;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "breadcrumb_home" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "breadcrumb_home",
- *   type = "checkbox",
- *   title = @Translation("Show 'Home' breadcrumb link"),
- *   description = @Translation("If your site has a module dedicated to handling breadcrumbs already, ensure this setting is enabled."),
- *   defaultValue = 0,
- *   groups = {
- *     "components" = @Translation("Components"),
- *     "breadcrumbs" = @Translation("Breadcrumbs"),
- *   },
- * )
- */
-class BreadcrumbHome extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $setting = $this->getSettingElement($form, $form_state);
-    $setting->setProperty('states', [
-      'invisible' => [
-        ':input[name="breadcrumb"]' => ['value' => 0],
-      ],
-    ]);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/BreadcrumbTitle.php b/themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/BreadcrumbTitle.php
deleted file mode 100644
index 7aeb105..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Components/Breadcrumbs/BreadcrumbTitle.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Components\Breadcrumbs\BreadcrumbTitle.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Components\Breadcrumbs;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "breadcrumb_title" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "breadcrumb_title",
- *   type = "checkbox",
- *   title = @Translation("Show current page title at end"),
- *   description = @Translation("If your site has a module dedicated to handling breadcrumbs already, ensure this setting is disabled."),
- *   defaultValue = 1,
- *   groups = {
- *     "components" = @Translation("Components"),
- *     "breadcrumbs" = @Translation("Breadcrumbs"),
- *   },
- * )
- */
-class BreadcrumbTitle extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $setting = $this->getSettingElement($form, $form_state);
-    $setting->setProperty('states', [
-      'invisible' => [
-        ':input[name="breadcrumb"]' => ['value' => 0],
-      ],
-    ]);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Components/Navbar/NavbarInverse.php b/themes/bootstrap/src/Plugin/Setting/Components/Navbar/NavbarInverse.php
deleted file mode 100644
index 0339018..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Components/Navbar/NavbarInverse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Components\Navbar\NavbarInverse.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Components\Navbar;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "navbar_inverse" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "navbar_inverse",
- *   type = "checkbox",
- *   title = @Translation("Inverse navbar style"),
- *   description = @Translation("Select if you want the inverse navbar style."),
- *   defaultValue = 0,
- *   groups = {
- *     "components" = @Translation("Components"),
- *     "navbar" = @Translation("Navbar"),
- *   },
- * )
- */
-class NavbarInverse extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/Components/Navbar/NavbarPosition.php b/themes/bootstrap/src/Plugin/Setting/Components/Navbar/NavbarPosition.php
deleted file mode 100644
index c1a7682..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Components/Navbar/NavbarPosition.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Components\Navbar\NavbarPosition.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Components\Navbar;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "navbar_position" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "navbar_position",
- *   type = "select",
- *   title = @Translation("Navbar Position"),
- *   description = @Translation("Determines where the navbar is positioned on the page."),
- *   defaultValue = "",
- *   groups = {
- *     "components" = @Translation("Components"),
- *     "navbar" = @Translation("Navbar"),
- *   },
- *   empty_option = @Translation("Normal"),
- *   options = {
- *     "static-top" = @Translation("Static Top"),
- *     "fixed-top" = @Translation("Fixed Top"),
- *     "fixed-bottom" = @Translation("Fixed Bottom"),
- *   },
- * )
- */
-class NavbarPosition extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/Components/Region/RegionWells.php b/themes/bootstrap/src/Plugin/Setting/Components/Region/RegionWells.php
deleted file mode 100644
index d3d213f..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Components/Region/RegionWells.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Components\Region\RegionWells.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\Components\Region;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "region_wells" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "region_wells",
- *   type = "container",
- *   description = @Translation("Enable the <code>.well</code>, <code>.well-sm</code> or <code>.well-lg</code> classes for specified regions."),
- *   defaultValue = {
- *     "navigation" = "",
- *     "navigation_collapsible" = "",
- *     "header" = "",
- *     "highlighted" = "",
- *     "help" = "",
- *     "content" = "",
- *     "sidebar_first" = "",
- *     "sidebar_second" = "well",
- *     "footer" = "",
- *   },
- *   groups = {
- *     "components" = @Translation("Components"),
- *     "region_wells" = @Translation("Region Wells"),
- *   },
- *   see = {
- *     "http://getbootstrap.com/components/#wells" = @Translation("Bootstrap Wells"),
- *   },
- * )
- */
-class RegionWells extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    parent::alterFormElement($form, $form_state, $form_id);
-
-    $group = $this->getGroupElement($form, $form_state);
-    $setting = $this->getSettingElement($form, $form_state);
-
-    // Move description.
-    $group->setProperty('description', $setting->getProperty('description'));
-
-    // Retrieve the current default values.
-    $default_values = $setting->getProperty('default_value', $this->getDefaultValue());
-
-    $wells = [
-      '' => t('None'),
-      'well' => t('.well (normal)'),
-      'well well-sm' => t('.well-sm (small)'),
-      'well well-lg' => t('.well-lg (large)'),
-    ];
-    // Create dynamic well settings for each region.
-    $regions = system_region_list($this->theme->getName());
-    foreach ($regions as $name => $title) {
-      if (in_array($name, ['page_top', 'page_bottom'])) {
-        continue;
-      }
-      $setting->{'region_well-' . $name} = [
-        '#title' => $title,
-        '#type' => 'select',
-        '#attributes' => [
-          'class' => ['input-sm'],
-        ],
-        '#options' => $wells,
-        '#default_value' => isset($default_values[$name]) ? $default_values[$name] : '',
-      ];
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function submitFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $values = $form_state->getValues();
-
-    // Extract the regions from individual dynamic settings.
-    $regex = '/^region_well-/';
-    $region_wells = [];
-    foreach ($values as $key => $value) {
-      if (!preg_match($regex, $key)) {
-        continue;
-      }
-      $region_wells[preg_replace($regex, '', $key)] = $value;
-      unset($values[$key]);
-    }
-
-    // Store the new values.
-    $values['region_wells'] = $region_wells;
-    $form_state->setValues($values);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonColorize.php b/themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonColorize.php
deleted file mode 100644
index f975f95..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonColorize.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Buttons\ButtonColorize.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Buttons;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "button_colorize" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "button_colorize",
- *   type = "checkbox",
- *   title = @Translation("Colorize Buttons"),
- *   defaultValue = 1,
- *   description = @Translation("Adds classes to buttons based on their text value."),
- *   groups = {
- *     "general" = @Translation("General"),
- *     "button" = @Translation("Buttons"),
- *   },
- *   see = {
- *     "http://getbootstrap.com/css/#buttons" = @Translation("Buttons"),
- *     "http://drupal-bootstrap.org/apis/hook_bootstrap_colorize_text_alter" = @Translation("hook_bootstrap_colorize_text_alter()"),
- *   },
- * )
- */
-class ButtonColorize extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonIconize.php b/themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonIconize.php
deleted file mode 100644
index 3bcc28f..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonIconize.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Buttons\ButtonIconize.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Buttons;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "button_iconize" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "button_iconize",
- *   type = "checkbox",
- *   title = @Translation("Iconize Buttons"),
- *   defaultValue = 1,
- *   description = @Translation("Adds icons to buttons based on the text value"),
- *   groups = {
- *     "general" = @Translation("General"),
- *     "button" = @Translation("Buttons"),
- *   },
- *   see = {
- *     "http://drupal-bootstrap.org/apis/hook_bootstrap_iconize_text_alter" = @Translation("hook_bootstrap_iconize_text_alter()"),
- *   },
- * )
- */
-class ButtonIconize extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonSize.php b/themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonSize.php
deleted file mode 100644
index 89d485c..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Buttons/ButtonSize.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Buttons\ButtonSize.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Buttons;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "button_size" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "button_size",
- *   type = "select",
- *   title = @Translation("Default button size"),
- *   defaultValue = "",
- *   description = @Translation("Defines the Bootstrap Buttons specific size"),
- *   empty_option = @Translation("Normal"),
- *   groups = {
- *     "general" = @Translation("General"),
- *     "button" = @Translation("Buttons"),
- *   },
- *   options = {
- *     "btn-xs" = @Translation("Extra Small"),
- *     "btn-sm" = @Translation("Small"),
- *     "btn-lg" = @Translation("Large"),
- *   },
- * )
- */
-class ButtonSize extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Container/FluidContainer.php b/themes/bootstrap/src/Plugin/Setting/General/Container/FluidContainer.php
deleted file mode 100644
index 784e20e..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Container/FluidContainer.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Container\FluidContainer.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Container;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * Container theme settings.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "fluid_container",
- *   type = "checkbox",
- *   title = @Translation("Fluid container"),
- *   defaultValue = 0,
- *   description = @Translation("Uses the <code>.container-fluid</code> class instead of <code>.container</code>."),
- *   groups = {
- *     "general" = @Translation("General"),
- *     "container" = @Translation("Container"),
- *   },
- *   see = {
- *     "http://getbootstrap.com/css/#grid-example-fluid" = @Translation("Fluid container"),
- *   },
- * )
- */
-class FluidContainer extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsHasErrorValueToggle.php b/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsHasErrorValueToggle.php
deleted file mode 100644
index 7411401..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsHasErrorValueToggle.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Forms\FormsHasErrorValueToggle.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Forms;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "forms_has_error_value_toggle" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "forms_has_error_value_toggle",
- *   type = "checkbox",
- *   title = @Translation("Automatically remove error classes when values have been entered"),
- *   description = @Translation("If an element has a <code>.has-error</code> class attached to it, enabling this will automatically remove that class when a value is entered."),
- *   defaultValue = 1,
- *   groups = {
- *     "general" = @Translation("General"),
- *     "forms" = @Translation("Forms"),
- *   },
- * )
- */
-class FormsHasErrorValueToggle extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return TRUE;
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsRequiredHasError.php b/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsRequiredHasError.php
deleted file mode 100644
index c29f844..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsRequiredHasError.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Forms\FormsRequiredHasError.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Forms;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "forms_required_has_error" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "forms_required_has_error",
- *   type = "checkbox",
- *   title = @Translation("Make required elements display as an error"),
- *   defaultValue = 0,
- *   description = @Translation("If an element in a form is required, enabling this will always display the element with a <code>.has-error</code> class. This turns the element red and helps in usability for determining which form elements are required to submit the form."),
- *   groups = {
- *     "general" = @Translation("General"),
- *     "forms" = @Translation("Forms"),
- *   },
- * )
- */
-class FormsRequiredHasError extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptions.php b/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptions.php
deleted file mode 100644
index 57824dc..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptions.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Forms\FormsSmartDescriptions.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Forms;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "forms_smart_descriptions" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "forms_smart_descriptions",
- *   type = "checkbox",
- *   title = @Translation("Smart form descriptions (via Tooltips)"),
- *   defaultValue = 1,
- *   description = @Translation("Convert descriptions into tooltips (must be enabled) automatically based on certain criteria. This helps reduce the, sometimes unnecessary, amount of noise on a page full of form elements."),
- *   groups = {
- *     "general" = @Translation("General"),
- *     "forms" = @Translation("Forms"),
- *   },
- * )
- */
-class FormsSmartDescriptions extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptionsAllowedTags.php b/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptionsAllowedTags.php
deleted file mode 100644
index 6781c8f..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptionsAllowedTags.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Forms\FormsSmartDescriptionsAllowedTags.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Forms;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "forms_smart_descriptions_allowed_tags" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "forms_smart_descriptions_allowed_tags",
- *   type = "textfield",
- *   title = @Translation("Smart form descriptions allowed (HTML) tags"),
- *   defaultValue = "b, code, em, i, kbd, span, strong",
- *   description = @Translation("Prevents descriptions from becoming tooltips by checking for HTML not in the list above (i.e. links). Separate by commas. To disable this filtering criteria, leave an empty value."),
- *   groups = {
- *     "general" = @Translation("General"),
- *     "forms" = @Translation("Forms"),
- *   },
- * )
- */
-class FormsSmartDescriptionsAllowedTags extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $setting = $this->getSettingElement($form, $form_state);
-    $setting->setProperty('states', [
-      'visible' => [
-        ':input[name="forms_smart_descriptions"]' => ['checked' => TRUE],
-      ],
-    ]);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptionsLimit.php b/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptionsLimit.php
deleted file mode 100644
index 3315f41..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Forms/FormsSmartDescriptionsLimit.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Forms\FormsSmartDescriptionsLimit.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Forms;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "forms_smart_descriptions_limit" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "forms_smart_descriptions_limit",
- *   type = "textfield",
- *   title = @Translation("Smart form descriptions maximum character limit"),
- *   defaultValue = "250",
- *   description = @Translation("Prevents descriptions from becoming tooltips by checking the character length of the description (HTML is not counted towards this limit). To disable this filtering criteria, leave an empty value."),
- *   groups = {
- *     "general" = @Translation("General"),
- *     "forms" = @Translation("Forms"),
- *   },
- * )
- */
-class FormsSmartDescriptionsLimit extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $setting = $this->getSettingElement($form, $form_state);
-    $setting->setProperty('states', [
-      'visible' => [
-        ':input[name="forms_smart_descriptions"]' => ['checked' => TRUE],
-      ],
-    ]);
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Images/ImageResponsive.php b/themes/bootstrap/src/Plugin/Setting/General/Images/ImageResponsive.php
deleted file mode 100644
index a9d3d95..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Images/ImageResponsive.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Images\ImageResponsive.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Images;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "image_responsive" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "image_responsive",
- *   type = "checkbox",
- *   title = @Translation("Responsive Images"),
- *   description = @Translation("Images in Bootstrap 3 can be made responsive-friendly via the addition of the <code>.img-responsive</code> class. This applies <code>max-width: 100%;</code> and <code>height: auto;</code> to the image so that it scales nicely to the parent element."),
- *   defaultValue = 1,
- *   groups = {
- *     "general" = @Translation("General"),
- *     "images" = @Translation("Images"),
- *   },
- * )
- */
-class ImageResponsive extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Images/ImageShape.php b/themes/bootstrap/src/Plugin/Setting/General/Images/ImageShape.php
deleted file mode 100644
index accba6b..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Images/ImageShape.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Images\ImageShape.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Images;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "image_shape" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "image_shape",
- *   type = "select",
- *   title = @Translation("Default image shape"),
- *   description = @Translation("Add classes to an <code>&lt;img&gt;</code> element to easily style images in any project."),
- *   defaultValue = "",
- *   empty_option = @Translation("None"),
- *   groups = {
- *     "general" = @Translation("General"),
- *     "images" = @Translation("Images"),
- *   },
- *   options = {
- *     "img-rounded" = @Translation("Rounded"),
- *     "img-circle" = @Translation("Circle"),
- *     "img-thumbnail" = @Translation("Thumbnail"),
- *   },
- *   see = {
- *     "http://getbootstrap.com/css/#images-shapes" = @Translation("Image Shapes"),
- *   },
- * )
- */
-class ImageShape extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Tables/TableBordered.php b/themes/bootstrap/src/Plugin/Setting/General/Tables/TableBordered.php
deleted file mode 100644
index 03a1ae2..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Tables/TableBordered.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Tables\TableBordered.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Tables;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "table_bordered" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "table_bordered",
- *   type = "checkbox",
- *   title = @Translation("Bordered table"),
- *   description = @Translation("Add borders on all sides of the table and cells."),
- *   defaultValue = 0,
- *   groups = {
- *     "general" = @Translation("General"),
- *     "tables" = @Translation("Tables"),
- *   },
- * )
- */
-class TableBordered extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Tables/TableCondensed.php b/themes/bootstrap/src/Plugin/Setting/General/Tables/TableCondensed.php
deleted file mode 100644
index 75ba3b9..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Tables/TableCondensed.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Tables\TableCondensed.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Tables;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "table_condensed" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "table_condensed",
- *   type = "checkbox",
- *   title = @Translation("Condensed table"),
- *   description = @Translation("Make tables more compact by cutting cell padding in half."),
- *   defaultValue = 0,
- *   groups = {
- *     "general" = @Translation("General"),
- *     "tables" = @Translation("Tables"),
- *   },
- * )
- */
-class TableCondensed extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Tables/TableHover.php b/themes/bootstrap/src/Plugin/Setting/General/Tables/TableHover.php
deleted file mode 100644
index 53b0b67..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Tables/TableHover.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Tables\TableHover.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Tables;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "table_hover" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "table_hover",
- *   type = "checkbox",
- *   title = @Translation("Hover rows"),
- *   description = @Translation("Enable a hover state on table rows."),
- *   defaultValue = 1,
- *   groups = {
- *     "general" = @Translation("General"),
- *     "tables" = @Translation("Tables"),
- *   },
- * )
- */
-class TableHover extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Tables/TableResponsive.php b/themes/bootstrap/src/Plugin/Setting/General/Tables/TableResponsive.php
deleted file mode 100644
index ebbafe3..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Tables/TableResponsive.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Tables\TableResponsive.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Tables;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "table_responsive" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "table_responsive",
- *   type = "select",
- *   title = @Translation("Responsive tables"),
- *   description = @Translation("Wraps tables with <code>.table-responsive</code> to make them horizontally scroll when viewing them on devices under 768px. When viewing on devices larger than 768px, you will not see a difference in the presentational aspect of these tables. The <code>Automatic</code> option will only apply this setting for front-end facing tables, not the tables in administrative areas."),
- *   defaultValue = -1,
- *   weight = 1,
- *   groups = {
- *     "general" = @Translation("General"),
- *     "tables" = @Translation("Tables"),
- *   },
- *   options = {
- *     "-1" = @Translation("Automatic"),
- *     "0" = @Translation("Disabled"),
- *     "1" = @Translation("Enabled"),
- *   },
- * )
- */
-class TableResponsive extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/General/Tables/TableStriped.php b/themes/bootstrap/src/Plugin/Setting/General/Tables/TableStriped.php
deleted file mode 100644
index 31b97ed..0000000
--- a/themes/bootstrap/src/Plugin/Setting/General/Tables/TableStriped.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\General\Tables\TableStriped.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\General\Tables;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "table_striped" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "table_striped",
- *   type = "checkbox",
- *   title = @Translation("Striped rows"),
- *   description = @Translation("Add zebra-striping to any table row within the <code>&lt;tbody&gt;</code>."),
- *   defaultValue = 1,
- *   groups = {
- *     "general" = @Translation("General"),
- *     "tables" = @Translation("Tables"),
- *   },
- * )
- */
-class TableStriped extends SettingBase {}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalAnimation.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalAnimation.php
deleted file mode 100644
index 7e4658f..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalAnimation.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Modals\ModalAnimation.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Modals;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "modal_animation" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "modal_animation",
- *   type = "checkbox",
- *   title = @Translation("animation"),
- *   description = @Translation("Apply a CSS fade transition to modals."),
- *   defaultValue = 1,
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "modals" = @Translation("Modals"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class ModalAnimation extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    parent::alterFormElement($form, $form_state, $form_id);
-    $group = $this->getGroupElement($form, $form_state);
-    $group->setProperty('description', t('These are global options. Each modal can independently override desired settings by appending the option name to <code>data-</code>. Example: <code>data-backdrop="false"</code>.'));
-    $group->setProperty('states', [
-      'visible' => [
-        ':input[name="modal_enabled"]' => ['checked' => TRUE],
-      ],
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('modal_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalBackdrop.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalBackdrop.php
deleted file mode 100644
index cff6411..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalBackdrop.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Modals\ModalBackdrop.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Modals;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "modal_backdrop" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "modal_backdrop",
- *   type = "select",
- *   title = @Translation("backdrop"),
- *   description = @Translation("Includes a modal-backdrop element. Alternatively, specify <code>static</code> for a backdrop which doesn't close the modal on click."),
- *   defaultValue = "true",
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "modals" = @Translation("Modals"),
- *     "options" = @Translation("Options"),
- *   },
- *   options = {
- *     "false" = @Translation("Disabled"),
- *     "true" = @Translation("Enabled"),
- *     "static" = @Translation("Static"),
- *   },
- * )
- */
-class ModalBackdrop extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('modal_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalEnabled.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalEnabled.php
deleted file mode 100644
index 2c28ba9..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalEnabled.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Modals\ModalEnabled.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Modals;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "modal_enabled" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "modal_enabled",
- *   type = "checkbox",
- *   title = @Translation("Enable Bootstrap Modals"),
- *   description = @Translation("Enabling this will replace core's jQuery UI Dialog implementations with modals from the Bootstrap Framework."),
- *   defaultValue = 1,
- *   weight = -1,
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "modals" = @Translation("Modals"),
- *   },
- * )
- */
-class ModalEnabled extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    parent::alterFormElement($form, $form_state, $form_id);
-    $group = $this->getGroupElement($form, $form_state);
-    $group->setProperty('description', t('Modals are streamlined, but flexible, dialog prompts with the minimum required functionality and smart defaults. See <a href=":url" target="_blank">Bootstrap Modals</a> for more documentation.', [
-      ':url' => 'http://getbootstrap.com/javascript/#modals',
-    ]));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return ['rendered', 'library_info'];
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalKeyboard.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalKeyboard.php
deleted file mode 100644
index 7c730ea..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalKeyboard.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Modals\ModalKeyboard.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Modals;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "modal_keyboard" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "modal_keyboard",
- *   type = "checkbox",
- *   title = @Translation("keyboard"),
- *   description = @Translation("Closes the modal when escape key is pressed."),
- *   defaultValue = 1,
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "modals" = @Translation("Modals"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class ModalKeyboard extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('modal_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalShow.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalShow.php
deleted file mode 100644
index 9ed049b..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalShow.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Modals\ModalShow.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Modals;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "modal_show" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "modal_show",
- *   type = "checkbox",
- *   title = @Translation("show"),
- *   description = @Translation("Shows the modal when initialized."),
- *   defaultValue = 1,
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "modals" = @Translation("Modals"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class ModalShow extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('modal_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalSize.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalSize.php
deleted file mode 100644
index 0382635..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Modals/ModalSize.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Modals\ModalSize.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Modals;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "modal_size" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "modal_size",
- *   type = "select",
- *   title = @Translation("Default modal size"),
- *   defaultValue = "",
- *   description = @Translation("Defines the modal size between the default, <code>modal-sm</code> and <code>modal-lg</code>."),
- *   empty_option = @Translation("Normal"),
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "modals" = @Translation("Modals"),
- *     "options" = @Translation("Options"),
- *   },
- *   options = {
- *     "modal-sm" = @Translation("Small"),
- *     "modal-lg" = @Translation("Large"),
- *   },
- * )
- */
-class ModalSize extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('modal_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverAnimation.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverAnimation.php
deleted file mode 100644
index 59a78f6..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverAnimation.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverAnimation.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "popover_animation" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "popover_animation",
- *   type = "checkbox",
- *   title = @Translation("animation"),
- *   description = @Translation("Apply a CSS fade transition to the popover."),
- *   defaultValue = 1,
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "popovers" = @Translation("Popovers"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class PopoverAnimation extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    parent::alterFormElement($form, $form_state, $form_id);
-
-    $group = $this->getGroupElement($form, $form_state);
-    $group->setProperty('description', t('These are global options. Each popover can independently override desired settings by appending the option name to <code>data-</code>. Example: <code>data-animation="false"</code>.'));
-    $group->setProperty('states', [
-      'visible' => [
-        ':input[name="popover_enabled"]' => ['checked' => TRUE],
-      ],
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('popover_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverContainer.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverContainer.php
deleted file mode 100644
index b1ab61c..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverContainer.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverContainer.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "popover_container" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "popover_container",
- *   type = "textfield",
- *   title = @Translation("container"),
- *   description = @Translation("Appends the popover to a specific element. Example: <code>body</code>. This option is particularly useful in that it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize."),
- *   defaultValue = "body",
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "popovers" = @Translation("Popovers"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class PopoverContainer extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('popover_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverContent.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverContent.php
deleted file mode 100644
index fae1866..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverContent.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverContent.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "popover_content" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "popover_content",
- *   type = "textfield",
- *   title = @Translation("content"),
- *   description = @Translation("Default content value if <code>data-content</code> or <code>data-target</code> attributes are not present."),
- *   defaultValue = "",
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "popovers" = @Translation("Popovers"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class PopoverContent extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('popover_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverDelay.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverDelay.php
deleted file mode 100644
index c2735b5..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverDelay.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverDelay.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "popover_delay" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "popover_delay",
- *   type = "textfield",
- *   title = @Translation("delay"),
- *   description = @Translation("The amount of time to delay showing and hiding the popover (in milliseconds). Does not apply to manual trigger type."),
- *   defaultValue = "0",
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "popovers" = @Translation("Popovers"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class PopoverDelay extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('popover_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverEnabled.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverEnabled.php
deleted file mode 100644
index 80f5e77..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverEnabled.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverEnabled.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "popover_enabled" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "popover_enabled",
- *   type = "checkbox",
- *   title = @Translation("Enable Bootstrap Popovers"),
- *   description = @Translation("Elements that have the <code>data-toggle=&quot;popover&quot;</code> attribute set will automatically initialize the popover upon page load. <strong class='error text-error'>WARNING: This feature can sometimes impact performance. Disable if pages appear to hang after initial load.</strong>"),
- *   defaultValue = 1,
- *   weight = -1,
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "popovers" = @Translation("Popovers"),
- *   },
- * )
- */
-class PopoverEnabled extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    parent::alterFormElement($form, $form_state, $form_id);
-
-    $group = $this->getGroupElement($form, $form_state);
-    $group->setProperty('description', t('Add small overlays of content, like those on the iPad, to any element for housing secondary information.'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('popover_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverHtml.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverHtml.php
deleted file mode 100644
index 69594d0..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverHtml.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverHtml.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "popover_html" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "popover_html",
- *   type = "checkbox",
- *   title = @Translation("HTML"),
- *   description = @Translation("Insert HTML into the popover. If false, jQuery's text method will be used to insert content into the DOM. Use text if you're worried about XSS attacks."),
- *   defaultValue = 0,
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "popovers" = @Translation("Popovers"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class PopoverHtml extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('popover_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverPlacement.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverPlacement.php
deleted file mode 100644
index 9f8480e..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverPlacement.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverPlacement.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "popover_placement" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "popover_placement",
- *   type = "select",
- *   title = @Translation("placement"),
- *   description = @Translation("Where to position the popover. When <code>auto</code> is specified, it will dynamically reorient the popover. For example, if placement is <code>auto left</code>, the popover will display to the left when possible, otherwise it will display right."),
- *   defaultValue = "right",
- *   options = {
- *     "top" = @Translation("top"),
- *     "bottom" = @Translation("bottom"),
- *     "left" = @Translation("left"),
- *     "right" = @Translation("right"),
- *     "auto" = @Translation("auto"),
- *     "auto top" = @Translation("auto top"),
- *     "auto bottom" = @Translation("auto bottom"),
- *     "auto left" = @Translation("auto left"),
- *     "auto right" = @Translation("auto right"),
- *   },
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "popovers" = @Translation("Popovers"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class PopoverPlacement extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('popover_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverSelector.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverSelector.php
deleted file mode 100644
index 0ea0a11..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverSelector.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverSelector.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "popover_selector" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "popover_selector",
- *   type = "textfield",
- *   title = @Translation("selector"),
- *   description = @Translation("If a selector is provided, tooltip objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have popovers added."),
- *   defaultValue = "",
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "popovers" = @Translation("Popovers"),
- *     "options" = @Translation("Options"),
- *   },
- *   see = {
- *     "https://github.com/twbs/bootstrap/issues/4215" = @Translation("Issue #4215"),
- *     "http://jsfiddle.net/fScua/" = @Translation("JSFiddle Example"),
- *   },
- * )
- */
-class PopoverSelector extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('popover_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTitle.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTitle.php
deleted file mode 100644
index d3030de..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTitle.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverTitle.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "popover_title" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "popover_title",
- *   type = "textfield",
- *   title = @Translation("title"),
- *   description = @Translation("Default title value if <code>title</code> attribute isn't present."),
- *   defaultValue = "",
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "popovers" = @Translation("Popovers"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class PopoverTitle extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('popover_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTrigger.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTrigger.php
deleted file mode 100644
index 43e007c..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTrigger.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverTrigger.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "popover_trigger" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "popover_trigger",
- *   type = "select",
- *   title = @Translation("trigger"),
- *   description = @Translation("How a popover is triggered."),
- *   defaultValue = "click",
- *   options = {
- *     "click" = @Translation("click"),
- *     "hover" = @Translation("hover"),
- *     "focus" = @Translation("focus"),
- *     "manual" = @Translation("manual"),
- *   },
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "popovers" = @Translation("Popovers"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class PopoverTrigger extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('popover_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTriggerAutoclose.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTriggerAutoclose.php
deleted file mode 100644
index ec9a859..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Popovers/PopoverTriggerAutoclose.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers\PopoverTriggerAutoclose.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Popovers;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "popover_trigger_autoclose" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "popover_trigger_autoclose",
- *   type = "checkbox",
- *   title = @Translation("Auto-close on document click"),
- *   description = @Translation("Will automatically close the current popover if a click occurs anywhere else other than the popover element."),
- *   defaultValue = 1,
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "popovers" = @Translation("Popovers"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class PopoverTriggerAutoclose extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('popover_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipAnimation.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipAnimation.php
deleted file mode 100644
index 147c446..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipAnimation.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips\TooltipAnimation.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "tooltip_animation" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "tooltip_animation",
- *   type = "checkbox",
- *   title = @Translation("animation"),
- *   description = @Translation("Apply a CSS fade transition to the tooltip."),
- *   defaultValue = 1,
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "tooltips" = @Translation("Tooltips"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class TooltipAnimation extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    parent::alterFormElement($form, $form_state, $form_id);
-
-    $group = $this->getGroupElement($form, $form_state);
-    $group->setProperty('description', t('These are global options. Each tooltip can independently override desired settings by appending the option name to <code>data-</code>. Example: <code>data-animation="false"</code>.'));
-    $group->setProperty('states', [
-      'visible' => [
-        ':input[name="tooltip_enabled"]' => ['checked' => TRUE],
-      ],
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('tooltip_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipContainer.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipContainer.php
deleted file mode 100644
index 54bb6b7..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipContainer.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips\TooltipContainer.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "tooltip_container" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "tooltip_container",
- *   type = "textfield",
- *   title = @Translation("container"),
- *   description = @Translation("Appends the tooltip to a specific element. Example: <code>body</code>."),
- *   defaultValue = "body",
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "tooltips" = @Translation("Tooltips"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class TooltipContainer extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('tooltip_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipDelay.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipDelay.php
deleted file mode 100644
index b1cc8ea..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipDelay.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips\TooltipDelay.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "tooltip_delay" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "tooltip_delay",
- *   type = "textfield",
- *   title = @Translation("delay"),
- *   description = @Translation("The amount of time to delay showing and hiding the tooltip (in milliseconds). Does not apply to manual trigger type."),
- *   defaultValue = "0",
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "tooltips" = @Translation("Tooltips"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class TooltipDelay extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('tooltip_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipEnabled.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipEnabled.php
deleted file mode 100644
index 04e5711..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipEnabled.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips\TooltipEnabled.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "tooltip_enabled" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "tooltip_enabled",
- *   type = "checkbox",
- *   title = @Translation("Enable Bootstrap Tooltips"),
- *   description = @Translation("Elements that have the <code>data-toggle=&quote;tooltip&quote;</code> attribute set will automatically initialize the tooltip upon page load. <strong class='error text-error'>WARNING: This feature can sometimes impact performance. Disable if pages appear to &quote;hang&quote; after initial load.</strong>"),
- *   defaultValue = 1,
- *   weight = -1,
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "tooltips" = @Translation("Tooltips"),
- *   },
- * )
- */
-class TooltipEnabled extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    parent::alterFormElement($form, $form_state, $form_id);
-
-    $group = $this->getGroupElement($form, $form_state);
-    $group->setProperty('description', t('Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don\'t rely on images, use CSS3 for animations, and data-attributes for local title storage. See <a href=":url" target="_blank">Bootstrap tooltips</a> for more documentation.', [
-      ':url' => 'http://getbootstrap.com/javascript/#tooltips',
-    ]));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('tooltip_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipHtml.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipHtml.php
deleted file mode 100644
index 7c561c2..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipHtml.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips\TooltipHtml.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "tooltip_html" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "tooltip_html",
- *   type = "checkbox",
- *   title = @Translation("HTML"),
- *   description = @Translation("Insert HTML into the tooltip. If false, jQuery's text method will be used to insert content into the DOM. Use text if you're worried about XSS attacks."),
- *   defaultValue = 0,
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "tooltips" = @Translation("Tooltips"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class TooltipHtml extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('tooltip_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipPlacement.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipPlacement.php
deleted file mode 100644
index 5bb93d0..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipPlacement.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips\TooltipPlacement.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "tooltip_placement" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "tooltip_placement",
- *   type = "select",
- *   title = @Translation("placement"),
- *   description = @Translation("Where to position the tooltip. When <code>auto</code> is specified, it will dynamically reorient the tooltip. For example, if placement is <code>auto left</code>, the tooltip will display to the left when possible, otherwise it will display right."),
- *   defaultValue = "auto left",
- *   options = {
- *     "top" = @Translation("top"),
- *     "bottom" = @Translation("bottom"),
- *     "left" = @Translation("left"),
- *     "right" = @Translation("right"),
- *     "auto" = @Translation("auto"),
- *     "auto top" = @Translation("auto top"),
- *     "auto bottom" = @Translation("auto bottom"),
- *     "auto left" = @Translation("auto left"),
- *     "auto right" = @Translation("auto right"),
- *   },
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "tooltips" = @Translation("Tooltips"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class TooltipPlacement extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('tooltip_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipSelector.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipSelector.php
deleted file mode 100644
index 0ceb816..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipSelector.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips\TooltipSelector.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "tooltip_selector" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "tooltip_selector",
- *   type = "textfield",
- *   title = @Translation("selector"),
- *   description = @Translation("If a selector is provided, tooltip objects will be delegated to the specified targets."),
- *   defaultValue = "",
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "tooltips" = @Translation("Tooltips"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class TooltipSelector extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('tooltip_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipTrigger.php b/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipTrigger.php
deleted file mode 100644
index 3d9729e..0000000
--- a/themes/bootstrap/src/Plugin/Setting/JavaScript/Tooltips/TooltipTrigger.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips\TooltipTrigger.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting\JavaScript\Tooltips;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Plugin\Setting\SettingBase;
-use Drupal\Core\Annotation\Translation;
-
-/**
- * The "tooltip_trigger" theme setting.
- *
- * @ingroup plugins_setting
- *
- * @BootstrapSetting(
- *   id = "tooltip_trigger",
- *   type = "select",
- *   title = @Translation("trigger"),
- *   description = @Translation("How a tooltip is triggered."),
- *   defaultValue = "hover",
- *   options = {
- *     "click" = @Translation("click"),
- *     "hover" = @Translation("hover"),
- *     "focus" = @Translation("focus"),
- *     "manual" = @Translation("manual"),
- *   },
- *   groups = {
- *     "javascript" = @Translation("JavaScript"),
- *     "tooltips" = @Translation("Tooltips"),
- *     "options" = @Translation("Options"),
- *   },
- * )
- */
-class TooltipTrigger extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return !!$this->theme->getSetting('tooltip_enabled');
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/Schemas.php b/themes/bootstrap/src/Plugin/Setting/Schemas.php
deleted file mode 100644
index d11b40c..0000000
--- a/themes/bootstrap/src/Plugin/Setting/Schemas.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\Schemas.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting;
-
-use Drupal\bootstrap\Annotation\BootstrapSetting;
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Plugin\Form\SystemThemeSettings;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * The "schemas" theme setting.
- *
- * @ingroup plugins_setting
- * @ingroup plugins_update
- *
- * @BootstrapSetting(
- *   id = "schemas",
- *   type = "hidden",
- *   weight = -20,
- *   groups = false,
- * )
- */
-class Schemas extends SettingBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    parent::alterFormElement($form, $form_state, $form_id);
-
-    $updates = [];
-    foreach ($this->theme->getPendingUpdates() as $version => $update) {
-      $row = [];
-      $row[] = $update->getSchema();
-      $row[] = new FormattableMarkup('<strong>@title</strong><p class="help-block">@description</p>', [
-        '@title' => $update->getLabel(),
-        '@description' => $update->getDescription(),
-      ]);
-      $row[] = $update->getTheme()->getTitle();
-      $updates[] = [
-        'class' => [$update->getSeverity() ?: 'default'],
-        'data' => $row,
-      ];
-    }
-
-    $form['update'] = [
-      '#type' => 'details',
-      '#title' => $this->t('Theme Updates'),
-      '#panel_type' => !!$updates ? 'primary' : 'default',
-      '#open' => !!$updates,
-      '#weight' => -20,
-    ];
-
-    $form['update']['table'] = [
-      '#type' => 'table',
-      '#header' => [t('Schema'), t('Description'), t('Provider')],
-      '#empty' => t('There are currently no pending updates for this theme.'),
-      '#rows' => $updates,
-    ];
-
-    if ($updates) {
-      $form['update']['actions'] = ['#type' => 'actions'];
-      $form['update']['actions']['update'] = [
-        '#type' => 'submit',
-        '#value' => t('Update theme'),
-        '#icon' => Bootstrap::glyphicon('open'),
-        // @todo Setting a class like this is undesirable, create a suggestion.
-        '#attributes' => [
-          'class' => ['btn-primary'],
-        ],
-        '#submit' => [[get_class($this), 'updateTheme']],
-      ];
-    }
-  }
-
-  /**
-   * Callback for updating a theme.
-   *
-   * @param array $form
-   *   Nested array of form elements that comprise the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public static function updateTheme(array $form, FormStateInterface $form_state) {
-    if ($theme = SystemThemeSettings::getTheme($form, $form_state)) {
-      // Due to the fact that the batch API stores it's arguments in DB storage,
-      // theme based objects cannot be passed as an operation argument here.
-      // During _batch_page(), the DB item will attempt to restore the arguments
-      // using unserialize() and the autoload fix include added below may not
-      // yet have been invoked to register the theme namespaces. So instead,
-      // we capture the relevant information needed to reconstruct these objects
-      // in the batch processing callback.
-      $theme_name = $theme->getName();
-
-      // Create an operation for each update.
-      $operations = [];
-      foreach ($theme->getPendingUpdates() as $update) {
-        $operations[] = [[__CLASS__, 'batchProcessUpdate'], [$theme_name, $update->getProvider() . ':' . $update->getSchema()]];
-      }
-
-      if ($operations) {
-        $variables = ['@theme_title' => $theme->getTitle()];
-        batch_set([
-          'operations' => $operations,
-          'finished' => [__CLASS__, 'batchFinished'],
-          'title' => t('Updating @theme_title', $variables),
-          'init_message' => \Drupal::translation()->formatPlural(count($operations), 'Initializing 1 theme update for @theme_title...', 'Initializing @count theme updates for @theme_title...', $variables),
-          'progress_message' => t('Processing update @current of @total...', $variables),
-          'error_message' => t('An error was encountered while attempting to update the @theme_title theme.', $variables),
-          'file' => Bootstrap::autoloadFixInclude(),
-        ]);
-      }
-    }
-  }
-
-  /**
-   * Processes an update in a batch operation.
-   *
-   * @param string $theme_name
-   *  The machine name of the theme this update is being applied to.
-   * @param string $update_id
-   *   The combined identifier of the update being applied, e.g.
-   *   provider:schema.
-   * @param array $context
-   *   The batch context.
-   */
-  public static function batchProcessUpdate($theme_name, $update_id, array &$context) {
-    // Reconstruct the theme object this update is being applied to.
-    $theme = Bootstrap::getTheme($theme_name);
-
-    // Reconstruct the update plugin that is being applied.
-    list($provider, $plugin_id) = explode(':', $update_id);
-    $provider = Bootstrap::getTheme($provider);
-
-    /** @type \Drupal\bootstrap\Plugin\Update\UpdateInterface $update */
-    $update = $provider->getUpdateManager()->createInstance($plugin_id, ['theme' => $provider]);
-
-    // Initialize results with theme name and installed schemas.
-    if (!isset($context['results']['theme_name'])) {
-      $context['results']['theme_name'] = $theme_name;
-    }
-    if (!isset($context['results']['schemas'])) {
-      $context['results']['schemas'] = $theme->getSetting('schemas', []);
-    }
-
-    $schemas = &$context['results']['schemas'];
-
-    $variables = [
-      '@theme' => $update->getTheme()->getName(),
-      '@schema' => $update->getSchema(),
-      '@label' => $update->getLabel(),
-    ];
-
-    // Perform the update.
-    try {
-      // Attempt to perform the update.
-      if ($update->update($theme, $context) === FALSE) {
-        throw new \Exception(t('Update failed'));
-      }
-
-      // Store the results.
-      $schemas[$update->getTheme()->getName()] = $update->getSchema();
-
-      $context['results']['success'][] = t('<strong>[@theme][@schema] @label</strong>', $variables);
-    }
-      // Capture any errors.
-    catch (\Exception $e) {
-      $variables['@message'] = $e->getMessage();
-      $context['results']['errors'][] = t('<strong>[@theme][@schema] @label</strong> - @message', $variables);
-    }
-  }
-
-  /**
-   * Batch 'finished' callback
-   *
-   * @param bool $success
-   *   A boolean indicating whether the batch has completed successfully.
-   * @param array $results
-   *   The value(s) set in $context['results'] in
-   *   \Drupal\bootstrap\Plugin\Setting\Update::batchProcess().
-   * @param $operations
-   *   If $success is FALSE, contains the operations that remained unprocessed.
-   */
-  public static function batchFinished($success, $results, $operations) {
-    /** @type \Drupal\bootstrap\Theme $theme */
-    // Reconstruct the theme object this update is being applied to.
-    $theme = Bootstrap::getTheme($results['theme_name']);
-
-    // Save the current state of the installed schemas.
-    $theme->setSetting('schemas', $results['schemas']);
-
-    // Show successful updates.
-    if (!empty($results['success'])) {
-      $list = Element::createStandalone([
-        '#theme' => 'item_list__theme_update',
-        '#items' => $results['success'],
-        '#context' => ['type' => 'success'],
-      ]);
-      drupal_set_message(new FormattableMarkup('@message' . $list->renderPlain(), [
-        '@message' => t('Successfully completed the following theme updates:'),
-      ]));
-    }
-
-    // Show failed errors.
-    if (!empty($results['errors'])) {
-      $list = Element::createStandalone([
-        '#theme' => 'item_list__theme_update',
-        '#items' => $results['errors'],
-        '#context' => ['type' => 'errors'],
-      ]);
-      drupal_set_message(new FormattableMarkup('@message' . $list->renderPlain(), [
-        '@message' => t('The following theme updates could not be completed:'),
-      ]), 'error');
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/SettingBase.php b/themes/bootstrap/src/Plugin/Setting/SettingBase.php
deleted file mode 100644
index 2908eae..0000000
--- a/themes/bootstrap/src/Plugin/Setting/SettingBase.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\SettingBase.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting;
-
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Plugin\PluginBase;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Base class for a setting.
- *
- * @ingroup plugins_setting
- */
-class SettingBase extends PluginBase implements SettingInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterForm(array &$form, FormStateInterface $form_state, $form_id = NULL) {
-    $this->alterFormElement(Element::create($form), $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterFormElement(Element $form, FormStateInterface $form_state, $form_id = NULL) {
-    $this->getSettingElement($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function drupalSettings() {
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return ['rendered'];
-  }
-
-  /**
-   * Retrieves all the form properties from the setting definition.
-   *
-   * @return array
-   *   The form properties.
-   */
-  public function getElementProperties() {
-    $properties = $this->getPluginDefinition();
-    foreach ($properties as $name => $value) {
-      if (in_array($name, ['class', 'defaultValue', 'definition', 'groups', 'id', 'provider', 'see'])) {
-        unset($properties[$name]);
-      }
-    }
-    return $properties;
-  }
-
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefaultValue() {
-    return isset($this->pluginDefinition['defaultValue']) ? $this->pluginDefinition['defaultValue'] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated Will be removed in a future release. Use \Drupal\bootstrap\Plugin\Setting\SettingInterface::getGroupElement
-   */
-  public function getGroup(array &$form, FormStateInterface $form_state) {
-    Bootstrap::deprecated();
-    return $this->getGroupElement(Element::create($form), $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getGroupElement(Element $form, FormStateInterface $form_state) {
-    $groups = $this->getGroups();
-    $group = $form;
-    $first = TRUE;
-    foreach ($groups as $key => $title) {
-      if (!isset($group->$key)) {
-        if ($title) {
-          $group->$key = ['#type' => 'details', '#title' => $title];
-        }
-        else {
-          $group->$key = ['#type' => 'container'];
-        }
-        $group = Element::create($group->$key->getArray());
-        if ($first) {
-          $group->setProperty('group', 'bootstrap');
-        }
-        else {
-          $group->setProperty('open', FALSE);
-        }
-      }
-      else {
-        $group = Element::create($group->$key->getArray());
-      }
-      $first = FALSE;
-    }
-    return $group;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getGroups() {
-    return !empty($this->pluginDefinition['groups']) ? $this->pluginDefinition['groups'] : [];
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated Will be removed in a future release. Use \Drupal\bootstrap\Plugin\Setting\SettingInterface::getSettingElement
-   */
-  public function getElement(array &$form, FormStateInterface $form_state) {
-    Bootstrap::deprecated();
-    return $this->getSettingElement(Element::create($form), $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOptions() {
-    return isset($this->pluginDefinition['options']) ? (array) $this->pluginDefinition['options'] : [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSettingElement(Element $form, FormStateInterface $form_state) {
-    // Construct the group elements.
-    $group = $this->getGroupElement($form, $form_state);
-    $plugin_id = $this->getPluginId();
-    if (!isset($group->$plugin_id)) {
-      // Set properties from the plugin definition.
-      foreach ($this->getElementProperties() as $name => $value) {
-        $group->$plugin_id->setProperty($name, $value);
-      }
-
-      // Set default value from the stored form state value or theme setting.
-      $default_value = $form_state->getValue($plugin_id, $this->theme->getSetting($plugin_id));
-      $group->$plugin_id->setProperty('default_value', $default_value);
-
-      // Append additional "see" link references to the description.
-      $description = (string) $group->$plugin_id->getProperty('description') ?: '';
-      $links = [];
-      foreach ($this->pluginDefinition['see'] as $url => $title) {
-        $link = Element::createStandalone([
-          '#type' => 'link',
-          '#url' => Url::fromUri($url),
-          '#title' => $title,
-          '#attributes' => [
-            'target' => '_blank',
-          ],
-        ]);
-        $links[] = (string) $link->renderPlain();
-      }
-      if (!empty($links)) {
-        $description .= '<br>';
-        $description .= t('See also:');
-        $description .= ' ' . implode(', ', $links);
-        $group->$plugin_id->setProperty('description', $description);
-      }
-    }
-    return $group->$plugin_id;
-  }
-  /**
-   * {@inheritdoc}
-   */
-  public function getTitle() {
-    return !empty($this->pluginDefinition['title']) ? $this->pluginDefinition['title'] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function submitForm(array &$form, FormStateInterface $form_state) {
-    static::submitFormElement(Element::create($form), $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function submitFormElement(Element $form, FormStateInterface $form_state) {}
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function validateForm(array &$form, FormStateInterface $form_state) {
-    static::validateFormElement(Element::create($form), $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function validateFormElement(Element $form, FormStateInterface $form_state) {}
-
-}
diff --git a/themes/bootstrap/src/Plugin/Setting/SettingInterface.php b/themes/bootstrap/src/Plugin/Setting/SettingInterface.php
deleted file mode 100644
index 3f64371..0000000
--- a/themes/bootstrap/src/Plugin/Setting/SettingInterface.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Setting\SettingInterface.
- */
-
-namespace Drupal\bootstrap\Plugin\Setting;
-
-use Drupal\bootstrap\Plugin\Form\FormInterface;
-use Drupal\bootstrap\Utility\Element;
-use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Defines the interface for an object oriented theme setting plugin.
- *
- * @ingroup plugins_setting
- */
-interface SettingInterface extends PluginInspectionInterface, FormInterface {
-
-  /**
-   * Determines whether a theme setting should added to drupalSettings.
-   *
-   * By default, this value will be FALSE unless the method is overridden. This
-   * is to ensure that no sensitive information can be potientially leaked.
-   *
-   * @see \Drupal\bootstrap\Plugin\Setting\SettingBase::drupalSettings()
-   *
-   * @return bool
-   *   TRUE or FALSE
-   */
-  public function drupalSettings();
-
-  /**
-   * The cache tags associated with this object.
-   *
-   * When this object is modified, these cache tags will be invalidated.
-   *
-   * @return string[]
-   *   A set of cache tags.
-   */
-  public function getCacheTags();
-
-  /**
-   * Retrieves the setting's default value.
-   *
-   * @return string
-   *   The setting's default value.
-   */
-  public function getDefaultValue();
-
-  /**
-   * Retrieves the group form element the setting belongs to.
-   *
-   * @param array $form
-   *   Nested array of form elements that comprise the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return \Drupal\bootstrap\Utility\Element
-   *   The group element object.
-   *
-   * @deprecated Will be removed in a future release. Use \Drupal\bootstrap\Plugin\Setting\SettingInterface::getGroupElement
-   */
-  public function getGroup(array &$form, FormStateInterface $form_state);
-
-  /**
-   * Retrieves the group form element the setting belongs to.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $form
-   *   The Element object that comprises the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return \Drupal\bootstrap\Utility\Element
-   *   The group element object.
-   */
-  public function getGroupElement(Element $form, FormStateInterface $form_state);
-
-  /**
-   * Retrieves the setting's groups.
-   *
-   * @return array
-   *   The setting's group.
-   */
-  public function getGroups();
-
-  /**
-   * Retrieves the form element for the setting.
-   *
-   * @param array $form
-   *   Nested array of form elements that comprise the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return \Drupal\bootstrap\Utility\Element
-   *   The setting element object.
-   *
-   * @deprecated Will be removed in a future release. Use \Drupal\bootstrap\Plugin\Setting\SettingInterface::getSettingElement
-   */
-  public function getElement(array &$form, FormStateInterface $form_state);
-
-  /**
-   * Retrieves the settings options, if set.
-   *
-   * @return array
-   *   An array of options.
-   */
-  public function getOptions();
-
-  /**
-   * Retrieves the form element for the setting.
-   *
-   * @param \Drupal\bootstrap\Utility\Element $form
-   *   The Element object that comprises the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return \Drupal\bootstrap\Utility\Element
-   *   The setting element object.
-   */
-  public function getSettingElement(Element $form, FormStateInterface $form_state);
-
-  /**
-   * Retrieves the setting's human-readable title.
-   *
-   * @return string
-   *   The setting's type.
-   */
-  public function getTitle();
-
-}
diff --git a/themes/bootstrap/src/Plugin/SettingManager.php b/themes/bootstrap/src/Plugin/SettingManager.php
deleted file mode 100644
index 0e4d91e..0000000
--- a/themes/bootstrap/src/Plugin/SettingManager.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\SettingManager.
- */
-
-namespace Drupal\bootstrap\Plugin;
-
-use Drupal\bootstrap\Theme;
-use Drupal\Component\Utility\SortArray;
-
-/**
- * Manages discovery and instantiation of Bootstrap theme settings.
- *
- * @ingroup plugins_setting
- */
-class SettingManager extends PluginManager {
-
-  /**
-   * Constructs a new \Drupal\bootstrap\Plugin\SettingManager object.
-   *
-   * @param \Drupal\bootstrap\Theme $theme
-   *   The theme to use for discovery.
-   */
-  public function __construct(Theme $theme) {
-    parent::__construct($theme, 'Plugin/Setting', 'Drupal\bootstrap\Plugin\Setting\SettingInterface', 'Drupal\bootstrap\Annotation\BootstrapSetting');
-    $this->setCacheBackend(\Drupal::cache('discovery'), 'theme:' . $theme->getName() . ':setting', $this->getCacheTags());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefinitions($sorted = TRUE) {
-    $definitions = parent::getDefinitions(FALSE);
-    if ($sorted) {
-      $groups = [];
-      foreach ($definitions as $plugin_id => $definition) {
-        $key = !empty($definition['groups']) ? implode(':', array_keys($definition['groups'])) : '_default';
-        $groups[$key][$plugin_id] = $definition;
-      }
-      ksort($groups);
-      $definitions = [];
-      foreach ($groups as $settings) {
-        uasort($settings, [$this, 'sort']);
-        $definitions = array_merge($definitions, $settings);
-
-      }
-    }
-    return $definitions;
-  }
-
-  /**
-   * Sorts a structured array by either a set 'weight' property or by the ID.
-   *
-   * @param array $a
-   *   First item for comparison.
-   * @param array $b
-   *   Second item for comparison.
-   *
-   * @return int
-   *   The comparison result for uasort().
-   */
-  public static function sort(array $a, array $b) {
-    if (isset($a['weight']) || isset($b['weight'])) {
-      return SortArray::sortByWeightElement($a, $b);
-    }
-    else {
-      return SortArray::sortByKeyString($a, $b, 'id');
-    }
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Update/UpdateBase.php b/themes/bootstrap/src/Plugin/Update/UpdateBase.php
deleted file mode 100644
index 1828184..0000000
--- a/themes/bootstrap/src/Plugin/Update/UpdateBase.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Update\UpdateBase.
- */
-
-namespace Drupal\bootstrap\Plugin\Update;
-
-use Drupal\bootstrap\Bootstrap;
-use Drupal\bootstrap\Plugin\PluginBase;
-use Drupal\bootstrap\Theme;
-
-/**
- * Base class for an update.
- *
- * @ingroup plugins_update
- */
-class UpdateBase extends PluginBase implements UpdateInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return isset($this->pluginDefinition['description']) ? $this->pluginDefinition['description'] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLabel() {
-    return !empty($this->pluginDefinition['label']) ? $this->pluginDefinition['label'] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getProvider() {
-    return isset($this->pluginDefinition['provider']) ? $this->pluginDefinition['provider'] : FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSchema() {
-    return (int) $this->getPluginId();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSeverity() {
-    return isset($this->pluginDefinition['severity']) ? $this->pluginDefinition['severity'] : FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTheme() {
-    return Bootstrap::getTheme($this->pluginDefinition['provider']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isPrivate() {
-    return !empty($this->pluginDefinition['private']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function process(Theme $theme, array &$context) {}
-
-  /*************************
-   * Deprecated methods.
-   *************************/
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated 8.x-3.0-rc2, will be removed before 8.x-3.0 is released.
-   *
-   * @see \Drupal\bootstrap\Plugin\Update\UpdateBase::getSeverity
-   */
-  public function getLevel() {
-    return $this->getSeverity();
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated 8.x-3.0-rc2, will be removed before 8.x-3.0 is released.
-   *
-   * @see \Drupal\bootstrap\Plugin\Update\UpdateBase::getLabel
-   */
-  public function getTitle() {
-    return $this->getLabel();
-  }
-
-}
diff --git a/themes/bootstrap/src/Plugin/Update/UpdateInterface.php b/themes/bootstrap/src/Plugin/Update/UpdateInterface.php
deleted file mode 100644
index 85840ff..0000000
--- a/themes/bootstrap/src/Plugin/Update/UpdateInterface.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\Update\UpdateInterface.
- */
-
-namespace Drupal\bootstrap\Plugin\Update;
-
-use Drupal\bootstrap\Theme;
-
-/**
- * Defines the interface for an object oriented preprocess plugin.
- *
- * @ingroup plugins_update
- */
-interface UpdateInterface {
-
-  /**
-   * Retrieves the update description, if any.
-   *
-   * @return string
-   *   The update description.
-   */
-  public function getDescription();
-
-  /**
-   * Retrieves the human-readable label for the update.
-   *
-   * @return string
-   *   The update label.
-   */
-  public function getLabel();
-
-  /**
-   * Retrieves the update schema.
-   *
-   * @return int
-   */
-  public function getProvider();
-
-  /**
-   * Retrieves the update schema.
-   *
-   * @return int
-   */
-  public function getSchema();
-
-  /**
-   * Retrieves the update severity level.
-   *
-   * @return string
-   *   The update severity level.
-   */
-  public function getSeverity();
-
-  /**
-   * Retrieves the theme that provided the update.
-   *
-   * Used to determine whether or not the update should apply only to itself
-   * (the theme that implemented the plugin) and none of its sub-themes.
-   *
-   * @return \Drupal\bootstrap\Theme
-   */
-  public function getTheme();
-
-  /**
-   * Indicates whether or not the update is private.
-   *
-   * @return bool
-   */
-  public function isPrivate();
-
-  /**
-   * The batch process callback for the update.
-   *
-   * This is the bulk of the update plugin. Be careful to no fill it will a
-   * lot of heavily intensive processing. If you need to do a lot of things,
-   * split it up into multiple updates so the Batch API can handle it.
-   *
-   * You can throw an exception from this method in case your processing fails.
-   * Its message will be conveyed to the user to indicate what went wrong. If
-   * the update has failed, but do not wish to throw an exception, simply
-   * return FALSE and a generic "Update failed" message will appear.
-   *
-   * @param \Drupal\bootstrap\Theme $theme
-   *   The theme that the update is being applied to.
-   * @param array $context
-   *   The Batch API context array, passed by reference. Note: be very careful
-   *   to not store any instances created from a theme. The Batch API stores
-   *   this in the DB between each "request" and it may not be able to fully
-   *   reconstitute the object upon un-serialization. If you need to pass a
-   *   theme object between instances, you should instead use an identifier
-   *   (string) that can be used to reconstitute the object when needed.
-   *
-   * @return bool
-   *   FALSE if the update failed, otherwise any other return will be
-   *   interpreted as TRUE.
-   */
-  public function process(Theme $theme, array &$context);
-
-}
diff --git a/themes/bootstrap/src/Plugin/UpdateManager.php b/themes/bootstrap/src/Plugin/UpdateManager.php
deleted file mode 100644
index 0cf8caf..0000000
--- a/themes/bootstrap/src/Plugin/UpdateManager.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Plugin\UpdateManager.
- */
-
-namespace Drupal\bootstrap\Plugin;
-
-use Drupal\bootstrap\Theme;
-use Drupal\Component\Utility\SortArray;
-
-/**
- * Manages discovery and instantiation of Bootstrap updates.
- *
- * @ingroup plugins_update
- */
-class UpdateManager extends PluginManager {
-
-  /**
-   * Constructs a new \Drupal\bootstrap\Plugin\UpdateManager object.
-   *
-   * @param \Drupal\bootstrap\Theme $theme
-   *   The theme to use for discovery.
-   */
-  public function __construct(Theme $theme) {
-    // Unlike other plugins in this base theme, this one should only discover
-    // update plugins that are unique to its own theme to avoid plugin ID
-    // collision (e.g. base and sub-theme both implement an update plugin
-    // with the id "8001").
-    $this->namespaces = new \ArrayObject(['Drupal\\' . $theme->getName() => [DRUPAL_ROOT . '/' . $theme->getPath() . '/src']]);
-
-    $this->theme = $theme;
-    $this->subdir = 'Plugin/Update';
-    $this->pluginDefinitionAnnotationName = 'Drupal\bootstrap\Annotation\BootstrapUpdate';
-    $this->pluginInterface = 'Drupal\bootstrap\Plugin\Update\UpdateInterface';
-    $this->themeHandler = \Drupal::service('theme_handler');
-    $this->themeManager = \Drupal::service('theme.manager');
-    $this->setCacheBackend(\Drupal::cache('discovery'), 'theme:' . $theme->getName() . ':update', $this->getCacheTags());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefinitions($sorted = TRUE) {
-    $definitions = parent::getDefinitions();
-
-    // Sort by the schema number (a.k.a. plugin ID).
-    if ($sorted) {
-      uasort($definitions, function ($a, $b) {
-        return SortArray::sortByKeyInt($a, $b, 'id');
-      });
-    }
-
-    return $definitions;
-  }
-
-  /**
-   * Retrieves the latest update schema.
-   *
-   * @return int|array
-   *   The latest update schema.
-   */
-  public function getLatestSchema() {
-    $schema = \Drupal::CORE_MINIMUM_SCHEMA_VERSION;
-    if ($schemas = $this->getSchemas()) {
-      $schema = max(max($schemas), $schema);
-    }
-    return $schema;
-  }
-
-  /**
-   * Retrieves any pending updates.
-   *
-   * @param bool $private
-   *   Toggle determining whether or not to include private updates, intended
-   *   for only the theme that created it. Defaults to: FALSE.
-   *
-   * @return \Drupal\bootstrap\Plugin\Update\UpdateInterface[]
-   *   An associative array containing update objects, keyed by their version.
-   */
-  public function getPendingUpdates($private = FALSE) {
-    $pending = [];
-    $installed = $this->theme->getSetting('schemas', []);
-    foreach ($this->getUpdates($private) as $version => $update) {
-      if ($version > $installed) {
-        $pending[$version] = $update;
-      }
-    }
-    return $pending;
-  }
-
-  /**
-   * Retrieves update plugins for the theme.
-   *
-   * @param bool $private
-   *   Toggle determining whether or not to include private updates, intended
-   *   for only the theme that created it. Defaults to: FALSE.
-   *
-   * @return \Drupal\bootstrap\Plugin\Update\UpdateInterface[]
-   *   An associative array containing update objects, keyed by their version.
-   */
-  public function getUpdates($private = FALSE) {
-    $updates = [];
-    foreach ($this->getSchemas($private) as $schema) {
-      $updates[$schema] = $this->createInstance($schema, ['theme' => $this->theme]);
-    }
-    return $updates;
-  }
-
-  /**
-   * Retrieves the update schema identifiers.
-   *
-   * @param bool $private
-   *   Toggle determining whether or not to include private updates, intended
-   *   for only the theme that created it. Defaults to: FALSE.
-   *
-   * @return array
-   *   An indexed array of schema identifiers.
-   */
-  protected function getSchemas($private = FALSE) {
-    $definitions = $this->getDefinitions();
-
-    // Remove private updates.
-    if (!$private) {
-      foreach ($definitions as $plugin_id => $definition) {
-        if (!empty($definition['private'])) {
-          unset($definitions[$plugin_id]);
-        }
-      }
-    }
-
-    return array_keys($definitions);
-  }
-
-  /*************************
-   * Deprecated methods.
-   *************************/
-
-  /**
-   * Retrieves the latest update schema.
-   *
-   * @return int
-   *   The latest update schema.
-   *
-   * @deprecated 8.x-3.0-rc2, will be removed before 8.x-3.0 is released.
-   *
-   * @see \Drupal\bootstrap\Plugin\UpdateManager::getLatestSchema
-   */
-  public function getLatestVersion() {
-    return $this->getLatestSchema();
-  }
-
-}
diff --git a/themes/bootstrap/src/Theme.php b/themes/bootstrap/src/Theme.php
deleted file mode 100644
index aec2c60..0000000
--- a/themes/bootstrap/src/Theme.php
+++ /dev/null
@@ -1,766 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap.
- */
-
-namespace Drupal\bootstrap;
-
-use Drupal\bootstrap\Plugin\ProviderManager;
-use Drupal\bootstrap\Plugin\SettingManager;
-use Drupal\bootstrap\Plugin\UpdateManager;
-use Drupal\bootstrap\Utility\Crypt;
-use Drupal\bootstrap\Utility\Storage;
-use Drupal\bootstrap\Utility\StorageItem;
-use Drupal\Core\Extension\Extension;
-use Drupal\Core\Extension\ThemeHandlerInterface;
-use Drupal\Core\Site\Settings;
-use Drupal\Core\Url;
-
-/**
- * Defines a theme object.
- *
- * @ingroup utility
- */
-class Theme {
-
-  /**
-   * Ignores the following directories during file scans of a theme.
-   *
-   * @see \Drupal\bootstrap\Theme::IGNORE_ASSETS
-   * @see \Drupal\bootstrap\Theme::IGNORE_CORE
-   * @see \Drupal\bootstrap\Theme::IGNORE_DOCS
-   * @see \Drupal\bootstrap\Theme::IGNORE_DEV
-   */
-  const IGNORE_DEFAULT = -1;
-
-  /**
-   * Ignores the directories "assets", "css", "images" and "js".
-   */
-  const IGNORE_ASSETS = 0x1;
-
-  /**
-   * Ignores the directories "config", "lib" and "src".
-   */
-  const IGNORE_CORE = 0x2;
-
-  /**
-   * Ignores the directories "docs" and "documentation".
-   */
-  const IGNORE_DOCS = 0x4;
-
-  /**
-   * Ignores "bower_components", "grunt", "node_modules" and "starterkits".
-   */
-  const IGNORE_DEV = 0x8;
-
-  /**
-   * Ignores the directories "templates" and "theme".
-   */
-  const IGNORE_TEMPLATES = 0x16;
-
-  /**
-   * Flag indicating if the theme is Bootstrap based.
-   *
-   * @var bool
-   */
-  protected $bootstrap;
-
-  /**
-   * Flag indicating if the theme is in "development" mode.
-   *
-   * This property can only be set via `settings.local.php`:
-   *
-   * @code
-   * $settings['theme.dev'] = TRUE;
-   * @endcode
-   *
-   * @var bool
-   */
-  protected $dev;
-
-  /**
-   * The current theme info.
-   *
-   * @var array
-   */
-  protected $info;
-
-  /**
-   * A URL for where a livereload instance is listening, if set.
-   *
-   * This property can only be set via `settings.local.php`:
-   *
-   * @code
-   * // Enable default value: //127.0.0.1:35729/livereload.js.
-   * $settings['theme.livereload'] = TRUE;
-   *
-   * // Or, set just the port number: //127.0.0.1:12345/livereload.js.
-   * $settings['theme.livereload'] = 12345;
-   *
-   * // Or, Set an explicit URL.
-   * $settings['theme.livereload'] = '//127.0.0.1:35729/livereload.js';
-   * @endcode
-   *
-   * @var string
-   */
-  protected $livereload;
-
-  /**
-   * The theme machine name.
-   *
-   * @var string
-   */
-  protected $name;
-
-  /**
-   * The current theme Extension object.
-   *
-   * @var \Drupal\Core\Extension\Extension
-   */
-  protected $theme;
-
-  /**
-   * An array of installed themes.
-   *
-   * @var array
-   */
-  protected $themes;
-
-  /**
-   * Theme handler object.
-   *
-   * @var \Drupal\Core\Extension\ThemeHandlerInterface
-   */
-  protected $themeHandler;
-
-  /**
-   * The update plugin manager.
-   *
-   * @var \Drupal\bootstrap\Plugin\UpdateManager
-   */
-  protected $updateManager;
-
-  /**
-   * Theme constructor.
-   *
-   * @param \Drupal\Core\Extension\Extension $theme
-   *   A theme \Drupal\Core\Extension\Extension object.
-   * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
-   *   The theme handler object.
-   */
-  public function __construct(Extension $theme, ThemeHandlerInterface $theme_handler) {
-    // Determine if "development mode" is set.
-    $this->dev = !!Settings::get('theme.dev');
-
-    // Determine the URL for livereload, if set.
-    $this->livereload = '';
-    if ($livereload = Settings::get('theme.livereload')) {
-      // If TRUE, then set the port to the default used by grunt-contrib-watch.
-      if ($livereload === TRUE) {
-        $livereload = '//127.0.0.1:35729/livereload.js';
-      }
-      // If an integer, assume it's a port.
-      else if (is_int($livereload)) {
-        $livereload = "//127.0.0.1:$livereload/livereload.js";
-      }
-      // If it's scalar, attempt to parse the URL.
-      elseif (is_scalar($livereload)) {
-        try {
-          $livereload = Url::fromUri($livereload)->toString();
-        }
-        catch (\Exception $e) {
-          $livereload = '';
-        }
-      }
-
-      // Typecast livereload URL to a string.
-      $this->livereload = "$livereload" ?: '';
-    }
-
-    $this->name = $theme->getName();
-    $this->theme = $theme;
-    $this->themeHandler = $theme_handler;
-    $this->themes = $this->themeHandler->listInfo();
-    $this->info = isset($this->themes[$this->name]->info) ? $this->themes[$this->name]->info : [];
-    $this->bootstrap = $this->subthemeOf('bootstrap');
-
-    // Only install the theme if it's Bootstrap based and there are no schemas
-    // currently set.
-    if ($this->isBootstrap() && !$this->getSetting('schemas')) {
-      try {
-        $this->install();
-      }
-      catch (\Exception $e) {
-        // Intentionally left blank.
-        // @see https://www.drupal.org/node/2697075
-      }
-    }
-  }
-
-  /**
-   * Serialization method.
-   */
-  public function __sleep() {
-    // Only store the theme name.
-    return ['name'];
-  }
-
-  /**
-   * Unserialize method.
-   */
-  public function __wakeup() {
-    $theme_handler = Bootstrap::getThemeHandler();
-    $theme = $theme_handler->getTheme($this->name);
-    $this->__construct($theme, $theme_handler);
-  }
-
-  /**
-   * Returns the theme machine name.
-   *
-   * @return string
-   *   Theme machine name.
-   */
-  public function __toString() {
-    return $this->getName();
-  }
-
-  /**
-   * Retrieves the theme's settings array appropriate for drupalSettings.
-   *
-   * @return array
-   *   The theme settings for drupalSettings.
-   */
-  public function drupalSettings() {
-    // Immediately return if theme is not Bootstrap based.
-    if (!$this->isBootstrap()) {
-      return [];
-    }
-
-    $cache = $this->getCache('drupalSettings');
-    $drupal_settings = $cache->getAll();
-    if (!$drupal_settings) {
-      foreach ($this->getSettingPlugin() as $name => $setting) {
-        if ($setting->drupalSettings()) {
-          $drupal_settings[$name] = TRUE;
-        }
-      }
-      $cache->setMultiple($drupal_settings);
-    }
-
-    $drupal_settings = array_intersect_key($this->settings()->get(), $drupal_settings);
-
-    // Indicate that theme is in dev mode.
-    if ($this->isDev()) {
-      $drupal_settings['dev'] = TRUE;
-    }
-
-    return $drupal_settings;
-  }
-
-  /**
-   * Wrapper for the core file_scan_directory() function.
-   *
-   * Finds all files that match a given mask in the given directories and then
-   * caches the results. A general site cache clear will force new scans to be
-   * initiated for already cached directories.
-   *
-   * @param string $mask
-   *   The preg_match() regular expression of the files to find.
-   * @param string $subdir
-   *   Sub-directory in the theme to start the scan, without trailing slash. If
-   *   not set, the base path of the current theme will be used.
-   * @param array $options
-   *   Options to pass, see file_scan_directory() for addition options:
-   *   - ignore_flags: (int|FALSE) A bitmask to indicate which directories (if
-   *     any) should be skipped during the scan. Must also not contain a
-   *     "nomask" property in $options. Value can be any of the following:
-   *     - \Drupal\bootstrap::IGNORE_CORE
-   *     - \Drupal\bootstrap::IGNORE_ASSETS
-   *     - \Drupal\bootstrap::IGNORE_DOCS
-   *     - \Drupal\bootstrap::IGNORE_DEV
-   *     - \Drupal\bootstrap::IGNORE_THEME
-   *     Pass FALSE to iterate over all directories in $dir.
-   *
-   * @return array
-   *   An associative array (keyed on the chosen key) of objects with 'uri',
-   *   'filename', and 'name' members corresponding to the matching files.
-   *
-   * @see file_scan_directory()
-   */
-  public function fileScan($mask, $subdir = NULL, array $options = []) {
-    $path = $this->getPath();
-
-    // Append addition sub-directories to the path if they were provided.
-    if (isset($subdir)) {
-      $path .= '/' . $subdir;
-    }
-
-    // Default ignore flags.
-    $options += [
-      'ignore_flags' => self::IGNORE_DEFAULT,
-    ];
-    $flags = $options['ignore_flags'];
-    if ($flags === self::IGNORE_DEFAULT) {
-      $flags = self::IGNORE_CORE | self::IGNORE_ASSETS | self::IGNORE_DOCS | self::IGNORE_DEV;
-    }
-
-    // Save effort by skipping directories that are flagged.
-    if (!isset($options['nomask']) && $flags) {
-      $ignore_directories = [];
-      if ($flags & self::IGNORE_ASSETS) {
-        $ignore_directories += ['assets', 'css', 'images', 'js'];
-      }
-      if ($flags & self::IGNORE_CORE) {
-        $ignore_directories += ['config', 'lib', 'src'];
-      }
-      if ($flags & self::IGNORE_DOCS) {
-        $ignore_directories += ['docs', 'documentation'];
-      }
-      if ($flags & self::IGNORE_DEV) {
-        $ignore_directories += ['bower_components', 'grunt', 'node_modules', 'starterkits'];
-      }
-      if ($flags & self::IGNORE_TEMPLATES) {
-        $ignore_directories += ['templates', 'theme'];
-      }
-      if (!empty($ignore_directories)) {
-        $options['nomask'] = '/^' . implode('|', $ignore_directories) . '$/';
-      }
-    }
-
-    // Retrieve cache.
-    $files = $this->getCache('files');
-
-    // Generate a unique hash for all parameters passed as a change in any of
-    // them could potentially return different results.
-    $hash = Crypt::generateHash($mask, $path, $options);
-
-    if (!$files->has($hash)) {
-      $files->set($hash, file_scan_directory($path, $mask, $options));
-    }
-    return $files->get($hash, []);
-  }
-
-  /**
-   * Retrieves the full base/sub-theme ancestry of a theme.
-   *
-   * @param bool $reverse
-   *   Whether or not to return the array of themes in reverse order, where the
-   *   active theme is the first entry.
-   *
-   * @return \Drupal\bootstrap\Theme[]
-   *   An associative array of \Drupal\bootstrap objects (theme), keyed
-   *   by machine name.
-   */
-  public function getAncestry($reverse = FALSE) {
-    $ancestry = $this->themeHandler->getBaseThemes($this->themes, $this->getName());
-    foreach (array_keys($ancestry) as $name) {
-      $ancestry[$name] = Bootstrap::getTheme($name, $this->themeHandler);
-    }
-    $ancestry[$this->getName()] = $this;
-    return $reverse ? array_reverse($ancestry) : $ancestry;
-  }
-
-  /**
-   * Retrieves an individual item from a theme's cache in the database.
-   *
-   * @param string $name
-   *   The name of the item to retrieve from the theme cache.
-   * @param array $context
-   *   Optional. An array of additional context to use for retrieving the
-   *   cached storage.
-   * @param mixed $default
-   *   Optional. The default value to use if $name does not exist.
-   *
-   * @return mixed|\Drupal\bootstrap\Utility\StorageItem
-   *   The cached value for $name.
-   */
-  public function getCache($name, array $context = [], $default = []) {
-    static $cache = [];
-
-    // Prepend the theme name as the first context item, followed by cache name.
-    array_unshift($context, $name);
-    array_unshift($context, $this->getName());
-
-    // Join context together with ":" and use it as the name.
-    $name = implode(':', $context);
-
-    if (!isset($cache[$name])) {
-      $storage = self::getStorage();
-      $value = $storage->get($name);
-      if (!isset($value)) {
-        $value  = is_array($default) ? new StorageItem($default, $storage) : $default;
-        $storage->set($name, $value);
-      }
-      $cache[$name] = $value;
-    }
-
-    return $cache[$name];
-  }
-
-  /**
-   * Retrieves the theme info.
-   *
-   * @param string $property
-   *   A specific property entry from the theme's info array to return.
-   *
-   * @return array
-   *   The entire theme info or a specific item if $property was passed.
-   */
-  public function getInfo($property = NULL) {
-    if (isset($property)) {
-      return isset($this->info[$property]) ? $this->info[$property] : NULL;
-    }
-    return $this->info;
-  }
-
-  /**
-   * Returns the machine name of the theme.
-   *
-   * @return string
-   *   The machine name of the theme.
-   */
-  public function getName() {
-    return $this->theme->getName();
-  }
-
-  /**
-   * Returns the relative path of the theme.
-   *
-   * @return string
-   *   The relative path of the theme.
-   */
-  public function getPath() {
-    return $this->theme->getPath();
-  }
-
-  /**
-   * Retrieves pending updates for the theme.
-   *
-   * @return \Drupal\bootstrap\Plugin\Update\UpdateInterface[]
-   *   An array of update plugin objects.
-   */
-  public function getPendingUpdates() {
-    $pending = [];
-
-    // Only continue if the theme is Bootstrap based.
-    if ($this->isBootstrap()) {
-      $current_theme = $this->getName();
-      $schemas = $this->getSetting('schemas', []);
-      foreach ($this->getAncestry() as $ancestor) {
-        $ancestor_name = $ancestor->getName();
-        if (!isset($schemas[$ancestor_name])) {
-          $schemas[$ancestor_name] = \Drupal::CORE_MINIMUM_SCHEMA_VERSION;
-          $this->setSetting('schemas', $schemas);
-        }
-        $pending_updates = $ancestor->getUpdateManager()->getPendingUpdates($current_theme === $ancestor_name);
-        foreach ($pending_updates as $schema => $update) {
-          if ((int) $schema > (int) $schemas[$ancestor_name]) {
-            $pending[] = $update;
-          }
-        }
-      }
-    }
-
-    return $pending;
-  }
-
-  /**
-   * Retrieves the CDN provider.
-   *
-   * @param string $provider
-   *   A CDN provider name. Defaults to the provider set in the theme settings.
-   *
-   * @return \Drupal\bootstrap\Plugin\Provider\ProviderInterface|FALSE
-   *   A provider instance or FALSE if there is no provider.
-   */
-  public function getProvider($provider = NULL) {
-    // Only continue if the theme is Bootstrap based.
-    if ($this->isBootstrap()) {
-      $provider = $provider ?: $this->getSetting('cdn_provider');
-      $provider_manager = new ProviderManager($this);
-      if ($provider_manager->hasDefinition($provider)) {
-        return $provider_manager->createInstance($provider, ['theme' => $this]);
-      }
-    }
-    return FALSE;
-  }
-
-  /**
-   * Retrieves all CDN providers.
-   *
-   * @return \Drupal\bootstrap\Plugin\Provider\ProviderInterface[]
-   *   All provider instances.
-   */
-  public function getProviders() {
-    $providers = [];
-
-    // Only continue if the theme is Bootstrap based.
-    if ($this->isBootstrap()) {
-      $provider_manager = new ProviderManager($this);
-      foreach (array_keys($provider_manager->getDefinitions()) as $provider) {
-        if ($provider === 'none') {
-          continue;
-        }
-        $providers[$provider] = $provider_manager->createInstance($provider, ['theme' => $this]);
-      }
-    }
-
-    return $providers;
-  }
-
-  /**
-   * Retrieves a theme setting.
-   *
-   * @param string $name
-   *   The name of the setting to be retrieved.
-   * @param mixed $default
-   *   A default value to provide if the setting is not found or if the plugin
-   *   does not have a "defaultValue" annotation key/value pair. Typically,
-   *   you will likely never need to use this unless in rare circumstances
-   *   where the setting plugin exists but needs a default value not able to
-   *   be set by conventional means (e.g. empty array).
-   *
-   * @return mixed
-   *   The value of the requested setting, NULL if the setting does not exist
-   *   and no $default value was provided.
-   *
-   * @see theme_get_setting()
-   */
-  public function getSetting($name, $default = NULL) {
-    $value = $this->settings()->get($name);
-    return !isset($value) ? $default : $value;
-  }
-
-  /**
-   * Retrieves a theme's setting plugin instance(s).
-   *
-   * @param string $name
-   *   Optional. The name of a specific setting plugin instance to return.
-   *
-   * @return \Drupal\bootstrap\Plugin\Setting\SettingInterface|\Drupal\bootstrap\Plugin\Setting\SettingInterface[]|NULL
-   *   If $name was provided, it will either return a specific setting plugin
-   *   instance or NULL if not set. If $name was omitted it will return an array
-   *   of setting plugin instances, keyed by their name.
-   */
-  public function getSettingPlugin($name = NULL) {
-    $settings = [];
-
-    // Only continue if the theme is Bootstrap based.
-    if ($this->isBootstrap()) {
-      $setting_manager = new SettingManager($this);
-      foreach (array_keys($setting_manager->getDefinitions()) as $setting) {
-        $settings[$setting] = $setting_manager->createInstance($setting);
-      }
-    }
-
-    // Return a specific setting plugin.
-    if (isset($name)) {
-      return isset($settings[$name]) ? $settings[$name] : NULL;
-    }
-
-    // Return all setting plugins.
-    return $settings;
-  }
-
-  /**
-   * Retrieves the theme's setting plugin instances.
-   *
-   * @return \Drupal\bootstrap\Plugin\Setting\SettingInterface[]
-   *   An associative array of setting objects, keyed by their name.
-   *
-   * @deprecated Will be removed in a future release. Use \Drupal\bootstrap\Theme::getSettingPlugin instead.
-   */
-  public function getSettingPlugins() {
-    Bootstrap::deprecated();
-    return $this->getSettingPlugin();
-  }
-
-  /**
-   * Retrieves the theme's cache from the database.
-   *
-   * @return \Drupal\bootstrap\Utility\Storage
-   *   The cache object.
-   */
-  public function getStorage() {
-    static $cache = [];
-    $theme = $this->getName();
-    if (!isset($cache[$theme])) {
-      $cache[$theme] = new Storage($theme);
-    }
-    return $cache[$theme];
-  }
-
-  /**
-   * Retrieves the human-readable title of the theme.
-   *
-   * @return string
-   *   The theme title or machine name as a fallback.
-   */
-  public function getTitle() {
-    return $this->getInfo('name') ?: $this->getName();
-  }
-
-  /**
-   * Retrieves the update plugin manager for the theme.
-   *
-   * @return \Drupal\bootstrap\Plugin\UpdateManager|FALSE
-   *   The Update plugin manager or FALSE if theme is not Bootstrap based.
-   */
-  public function getUpdateManager() {
-    // Immediately return if theme is not Bootstrap based.
-    if (!$this->isBootstrap()) {
-      return FALSE;
-    }
-
-    if (!$this->updateManager) {
-      $this->updateManager = new UpdateManager($this);
-    }
-    return $this->updateManager;
-  }
-
-  /**
-   * Determines whether or not if the theme has Bootstrap Framework Glyphicons.
-   */
-  public function hasGlyphicons() {
-    $glyphicons = $this->getCache('glyphicons');
-    if (!$glyphicons->has($this->getName())) {
-      $exists = FALSE;
-      foreach ($this->getAncestry(TRUE) as $ancestor) {
-        if ($ancestor->getSetting('cdn_provider') || $ancestor->fileScan('/glyphicons-halflings-regular\.(eot|svg|ttf|woff)$/', NULL, ['ignore_flags' => FALSE])) {
-          $exists = TRUE;
-          break;
-        }
-      }
-      $glyphicons->set($this->getName(), $exists);
-    }
-    return $glyphicons->get($this->getName(), FALSE);
-  }
-
-  /**
-   * Includes a file from the theme.
-   *
-   * @param string $file
-   *   The file name, including the extension.
-   * @param string $path
-   *   The path to the file in the theme. Defaults to: "includes". Set to FALSE
-   *   or and empty string if the file resides in the theme's root directory.
-   *
-   * @return bool
-   *   TRUE if the file exists and is included successfully, FALSE otherwise.
-   */
-  public function includeOnce($file, $path = 'includes') {
-    static $includes = [];
-    $file = preg_replace('`^/?' . $this->getPath() . '/?`', '', $file);
-    $file = strpos($file, '/') !== 0 ? $file = "/$file" : $file;
-    $path = is_string($path) && !empty($path) && strpos($path, '/') !== 0 ? $path = "/$path" : '';
-    $include = DRUPAL_ROOT . '/' . $this->getPath() . $path . $file;
-    if (!isset($includes[$include])) {
-      $includes[$include] = !!@include_once $include;
-      if (!$includes[$include]) {
-        drupal_set_message(t('Could not include file: @include', ['@include' => $include]), 'error');
-      }
-    }
-    return $includes[$include];
-  }
-
-  /**
-   * Installs a Bootstrap based theme.
-   */
-  protected function install() {
-    // Immediately return if theme is not Bootstrap based.
-    if (!$this->isBootstrap()) {
-      return;
-    }
-
-    $schemas = [];
-    foreach ($this->getAncestry() as $ancestor) {
-      $schemas[$ancestor->getName()] = $ancestor->getUpdateManager()->getLatestSchema();
-    }
-    $this->setSetting('schemas', $schemas);
-  }
-
-  /**
-   * Indicates whether the theme is bootstrap based.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   */
-  public function isBootstrap() {
-    return $this->bootstrap;
-  }
-
-  /**
-   * Indicates whether the theme is in "development mode".
-   *
-   * @return bool
-   *   TRUE or FALSE
-   *
-   * @see \Drupal\bootstrap\Theme::dev
-   */
-  public function isDev() {
-    return $this->dev;
-  }
-
-  /**
-   * Returns the livereload URL set, if any.
-   *
-   * @return string
-   *
-   * @see \Drupal\bootstrap\Theme::livereload
-   */
-  public function livereloadUrl() {
-    return $this->livereload;
-  }
-
-  /**
-   * Removes a theme setting.
-   *
-   * @param string $name
-   *   Name of the theme setting to remove.
-   */
-  public function removeSetting($name) {
-    $this->settings()->clear($name)->save();
-  }
-
-  /**
-   * Sets a value for a theme setting.
-   *
-   * @param string $name
-   *   Name of the theme setting.
-   * @param mixed $value
-   *   Value to associate with the theme setting.
-   */
-  public function setSetting($name, $value) {
-    $this->settings()->set($name, $value)->save();
-  }
-
-  /**
-   * Retrieves the theme settings instance.
-   *
-   * @return \Drupal\bootstrap\ThemeSettings
-   *   All settings.
-   */
-  public function settings() {
-    static $themes = [];
-    $name = $this->getName();
-    if (!isset($themes[$name])) {
-      $themes[$name] = new ThemeSettings($this, $this->themeHandler);
-    }
-    return $themes[$name];
-  }
-
-  /**
-   * Determines whether or not a theme is a sub-theme of another.
-   *
-   * @param string|\Drupal\bootstrap\Theme $theme
-   *   The name or theme Extension object to check.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   */
-  public function subthemeOf($theme) {
-    return (string) $theme === $this->getName() || in_array($theme, array_keys(self::getAncestry()));
-  }
-
-}
diff --git a/themes/bootstrap/src/ThemeSettings.php b/themes/bootstrap/src/ThemeSettings.php
deleted file mode 100644
index c5c9fb6..0000000
--- a/themes/bootstrap/src/ThemeSettings.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\ThemeSettings.
- */
-
-namespace Drupal\bootstrap;
-
-use Drupal\Component\Utility\DiffArray;
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Config\Config;
-use Drupal\Core\Config\StorageException;
-
-/**
- * Provides a configuration API wrapper for runtime merged theme settings.
- *
- * This is a wrapper around theme_get_setting() since it does not inherit
- * base theme config nor handle default/overridden values very well.
- *
- * @ingroup utility
- */
-class ThemeSettings extends Config {
-
-  /**
-   * The default settings.
-   *
-   * @var array
-   */
-  protected $defaults;
-
-  /**
-   * The current theme object.
-   *
-   * @var \Drupal\bootstrap\Theme
-   */
-  protected $theme;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(Theme $theme) {
-    parent::__construct($theme->getName() . '.settings', \Drupal::service('config.storage'), \Drupal::service('event_dispatcher'), \Drupal::service('config.typed'));
-    $this->theme = $theme;
-
-    // Retrieve cache.
-    $cache = $theme->getCache('settings');
-
-    // Use cached settings.
-    if ($defaults = $cache->get('defaults')) {
-      $this->defaults = $defaults;
-      $this->initWithData($cache->get('data', []));
-      return;
-    }
-
-    // Retrieve the global settings from configuration.
-    $this->defaults = \Drupal::config('system.theme.global')->get();
-
-    // Retrieve the theme setting plugin discovery defaults (code).
-    foreach ($theme->getSettingPlugin() as $name => $setting) {
-      $this->defaults[$name] = $setting->getDefaultValue();
-    }
-
-    // Retrieve the theme ancestry.
-    $ancestry = $theme->getAncestry();
-
-    // Remove the active theme from the ancestry.
-    $active_theme = array_pop($ancestry);
-
-    // Iterate and merge all ancestor theme config into the defaults.
-    foreach ($ancestry as $ancestor) {
-      $this->defaults = NestedArray::mergeDeepArray([$this->defaults, $this->getThemeConfig($ancestor)], TRUE);
-    }
-
-    // Merge the active theme config.
-    $this->initWithData($this->getThemeConfig($active_theme, TRUE));
-
-    // Cache the data and defaults.
-    $cache->set('data', $this->data);
-    $cache->set('defaults', $this->defaults);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return ['rendered'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function get($key = '') {
-    if (empty($key)) {
-      return NestedArray::mergeDeepArray([$this->defaults, $this->data], TRUE);
-    }
-    else {
-      $value = parent::get($key);
-      if (!isset($value)) {
-        $value = $this->getOriginal($key);
-      }
-    }
-    return $value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOriginal($key = '', $apply_overrides = TRUE) {
-    $original_data = $this->defaults;
-    if ($apply_overrides) {
-      // Apply overrides.
-      if (isset($this->moduleOverrides) && is_array($this->moduleOverrides)) {
-        $original_data = NestedArray::mergeDeepArray(array($original_data, $this->moduleOverrides), TRUE);
-      }
-      if (isset($this->settingsOverrides) && is_array($this->settingsOverrides)) {
-        $original_data = NestedArray::mergeDeepArray(array($original_data, $this->settingsOverrides), TRUE);
-      }
-    }
-
-    if (empty($key)) {
-      return $original_data;
-    }
-    else {
-      $parts = explode('.', $key);
-      if (count($parts) == 1) {
-        return isset($original_data[$key]) ? $original_data[$key] : NULL;
-      }
-      else {
-        $value = NestedArray::getValue($original_data, $parts, $key_exists);
-        return $key_exists ? $value : NULL;
-      }
-    }
-  }
-
-  /**
-   * Retrieves a specific theme's stored config settings.
-   *
-   * @param \Drupal\bootstrap\Theme $theme
-   *   A theme object.
-   * @param bool $active_theme
-   *   Flag indicating whether or not $theme is the active theme.
-   *
-   * @return array
-   *   A array diff of overridden config theme settings.
-   */
-  public function getThemeConfig(Theme $theme, $active_theme = FALSE) {
-    $config = new \Drupal\Core\Theme\ThemeSettings($theme->getName());
-
-    // Retrieve configured theme-specific settings, if any.
-    try {
-      if ($theme_settings = \Drupal::config($theme->getName() . '.settings')->get()) {
-        // Remove schemas if not the active theme.
-        if (!$active_theme) {
-          unset($theme_settings['schemas']);
-        }
-        $config->merge($theme_settings);
-      }
-    }
-    catch (StorageException $e) {
-    }
-
-    // If the theme does not support a particular feature, override the
-    // global setting and set the value to NULL.
-    $info = $theme->getInfo();
-    if (!empty($info['features'])) {
-      foreach (_system_default_theme_features() as $feature) {
-        if (!in_array($feature, $info['features'])) {
-          $config->set('features.' . $feature, NULL);
-        }
-      }
-    }
-
-    // Generate the path to the logo image.
-    if ($config->get('features.logo')) {
-      $logo_url = FALSE;
-      foreach (['svg', 'png', 'jpg'] as $type) {
-        if (file_exists($theme->getPath() . "/logo.$type")) {
-          $logo_url = file_create_url($theme->getPath() . "/logo.$type");
-          break;
-        }
-      }
-      if ($config->get('logo.use_default') && $logo_url) {
-        $config->set('logo.url', $logo_url);
-      }
-      elseif (($logo_path = $config->get('logo.path')) && file_exists($logo_path)) {
-        $config->set('logo.url', file_create_url($logo_path));
-      }
-    }
-
-    // Generate the path to the favicon.
-    if ($config->get('features.favicon')) {
-      $favicon_url = $theme->getPath() . '/favicon.ico';
-      if ($config->get('favicon.use_default') && file_exists($favicon_url)) {
-        $config->set('favicon.url', file_create_url($favicon_url));
-      }
-      elseif ($favicon_path = $config->get('favicon.path')) {
-        $config->set('favicon.url', file_create_url($favicon_path));
-      }
-    }
-
-    // Retrieve the config data.
-    $data = $config->get();
-
-    // Retrieve a diff of settings that override the defaults.
-    $diff = DiffArray::diffAssocRecursive($data, $this->defaults);
-
-    // Ensure core features are always present in the diff. The theme settings
-    // form will not work properly otherwise.
-    // @todo Just rebuild the features section of the form?
-    foreach (['favicon', 'features', 'logo'] as $key) {
-      $arrays = [];
-      $arrays[] = isset($this->defaults[$key]) ? $this->defaults[$key] : [];
-      $arrays[] = isset($data[$key]) ? $data[$key] : [];
-      $diff[$key] = NestedArray::mergeDeepArray($arrays, TRUE);
-    }
-
-    return $diff;
-  }
-
-  /**
-   * Determines if a setting overrides the default value.
-   *
-   * @param string $name
-   *   The name of the setting to check.
-   * @param mixed $value
-   *   The new value to check.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   */
-  public function overridesValue($name, $value) {
-    // Retrieve the currently stored value for comparison purposes.
-    $current_value = $this->get($name);
-
-    // Due to the nature of DiffArray::diffAssocRecursive, if the provided
-    // value is an empty array, it cannot be iterated over to determine if
-    // the values are different. Instead, it must be checked explicitly.
-    // @see https://www.drupal.org/node/2771121
-    if ($value === [] && $current_value !== []) {
-      return TRUE;
-    }
-
-    // Otherwise, determine if value is overridden by any array differences.
-    return !!DiffArray::diffAssocRecursive([$name => $value], [$name => $current_value]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save($has_trusted_data = FALSE) {
-    parent::save($has_trusted_data);
-    $this->theme->getCache('settings')->deleteAll();
-    return $this;
-  }
-
-}
diff --git a/themes/bootstrap/src/Utility/ArrayObject.php b/themes/bootstrap/src/Utility/ArrayObject.php
deleted file mode 100644
index 069f05e..0000000
--- a/themes/bootstrap/src/Utility/ArrayObject.php
+++ /dev/null
@@ -1,404 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Utility\ArrayObject.
- */
-
-namespace Drupal\bootstrap\Utility;
-
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
-use Drupal\Core\Render\AttachmentsInterface;
-use Drupal\Core\Render\BubbleableMetadata;
-
-/**
- * Custom ArrayObject implementation.
- *
- * The native ArrayObject is unnecessarily complicated.
- *
- * @ingroup utility
- */
-class ArrayObject implements \IteratorAggregate, \ArrayAccess, \Serializable, \Countable, AttachmentsInterface, RefinableCacheableDependencyInterface {
-
-  /**
-   * The array.
-   *
-   * @var array
-   */
-  protected $array;
-
-  /**
-   * Array object constructor.
-   *
-   * @param array $array
-   *   An array.
-   */
-  public function __construct(array $array = []) {
-    $this->array = $array;
-  }
-
-  /**
-   * Returns whether the requested key exists.
-   *
-   * @param mixed $key
-   *   A key.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   */
-  public function __isset($key) {
-    return $this->offsetExists($key);
-  }
-
-  /**
-   * Sets the value at the specified key to value.
-   *
-   * @param mixed $key
-   *   A key.
-   * @param mixed $value
-   *   A value.
-   */
-  public function __set($key, $value) {
-    $this->offsetSet($key, $value);
-  }
-
-  /**
-   * Unsets the value at the specified key.
-   *
-   * @param mixed $key
-   *   A key.
-   */
-  public function __unset($key) {
-    $this->offsetUnset($key);
-  }
-
-  /**
-   * Returns the value at the specified key by reference.
-   *
-   * @param mixed $key
-   *   A key.
-   *
-   * @return mixed
-   *   The stored value.
-   */
-  public function &__get($key) {
-    $ret =& $this->offsetGet($key);
-    return $ret;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addAttachments(array $attachments) {
-    BubbleableMetadata::createFromRenderArray($this->array)->addAttachments($attachments)->applyTo($this->array);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addCacheContexts(array $cache_contexts) {
-    BubbleableMetadata::createFromRenderArray($this->array)->addCacheContexts($cache_contexts)->applyTo($this->array);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addCacheTags(array $cache_tags) {
-    BubbleableMetadata::createFromRenderArray($this->array)->addCacheTags($cache_tags)->applyTo($this->array);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addCacheableDependency($other_object) {
-    BubbleableMetadata::createFromRenderArray($this->array)->addCacheableDependency($other_object)->applyTo($this->array);
-    return $this;
-  }
-
-  /**
-   * Appends the value.
-   *
-   * @param mixed $value
-   *   A value.
-   */
-  public function append($value) {
-    $this->array[] = $value;
-  }
-
-  /**
-   * Sort the entries by value.
-   */
-  public function asort() {
-    asort($this->array);
-  }
-
-  /**
-   * Merges an object's cacheable metadata into the variables array.
-   *
-   * @param \Drupal\Core\Cache\CacheableDependencyInterface|mixed $object
-   *   The object whose cacheability metadata to retrieve. If it implements
-   *   CacheableDependencyInterface, its cacheability metadata will be used,
-   *   otherwise, the passed in object must be assumed to be uncacheable, so
-   *   max-age 0 is set.
-   *
-   * @return $this
-   */
-  public function bubbleObject($object) {
-    BubbleableMetadata::createFromRenderArray($this->array)->merge(BubbleableMetadata::createFromObject($object))->applyTo($this->array);
-    return $this;
-  }
-
-  /**
-   * Merges a render array's cacheable metadata into the variables array.
-   *
-   * @param array $build
-   *   A render array.
-   *
-   * @return $this
-   */
-  public function bubbleRenderArray(array $build) {
-    BubbleableMetadata::createFromRenderArray($this->array)->merge(BubbleableMetadata::createFromRenderArray($build))->applyTo($this->array);
-    return $this;
-  }
-
-  /**
-   * Get the number of public properties in the ArrayObject.
-   *
-   * @return int
-   *   The count.
-   */
-  public function count() {
-    return count($this->array);
-  }
-
-  /**
-   * Exchange the array for another one.
-   *
-   * @param array|ArrayObject $data
-   *   New data.
-   *
-   * @return array
-   *   The old array.
-   *
-   * @throws \InvalidArgumentException
-   *   When the passed data is not an array or an instance of ArrayObject.
-   */
-  public function exchangeArray($data) {
-    if (!is_array($data) && is_object($data) && !($data instanceof ArrayObject)) {
-      throw new \InvalidArgumentException('Passed variable is not an array or an instance of \Drupal\bootstrap\Utility\ArrayObject.');
-    }
-    if (is_object($data) && $data instanceof ArrayObject) {
-      $data = $data->getArrayCopy();
-    }
-    $old = $this->array;
-    $this->array = $data;
-    return $old;
-  }
-
-  /**
-   * Creates a copy of the ArrayObject.
-   *
-   * @return array
-   *   A copy of the array.
-   */
-  public function getArrayCopy() {
-    return $this->array;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAttachments() {
-    return BubbleableMetadata::createFromRenderArray($this->array)->getAttachments();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheContexts() {
-    return BubbleableMetadata::createFromRenderArray($this->array)->getCacheContexts();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return BubbleableMetadata::createFromRenderArray($this->array)->getCacheTags();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheMaxAge() {
-    return BubbleableMetadata::createFromRenderArray($this->array)->getCacheMaxAge();
-  }
-
-  /**
-   * Creates a new iterator from an ArrayObject instance.
-   *
-   * @return \ArrayIterator
-   *   An array iterator.
-   */
-  public function getIterator() {
-    return new \ArrayIterator($this->array);
-  }
-
-  /**
-   * Sort the entries by key.
-   */
-  public function ksort() {
-    ksort($this->array);
-  }
-
-  /**
-   * Merges multiple values into the array.
-   *
-   * @param array $values
-   *   An associative key/value array.
-   * @param bool $recursive
-   *   Flag determining whether or not to recursively merge key/value pairs.
-   */
-  public function merge(array $values, $recursive = TRUE) {
-    if ($recursive) {
-      $this->array = NestedArray::mergeDeepArray([$this->array, $values], TRUE);
-    }
-    else {
-      $this->array += $values;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function mergeCacheMaxAge($max_age) {
-    BubbleableMetadata::createFromRenderArray($this->array)->mergeCacheMaxAge($max_age)->applyTo($this->array);
-    return $this;
-  }
-
-  /**
-   * Sort an array using a case insensitive "natural order" algorithm.
-   */
-  public function natcasesort() {
-    natcasesort($this->array);
-  }
-
-  /**
-   * Sort entries using a "natural order" algorithm.
-   */
-  public function natsort() {
-    natsort($this->array);
-  }
-
-  /**
-   * Returns whether the requested key exists.
-   *
-   * @param mixed $key
-   *   A key.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   */
-  public function offsetExists($key) {
-    return isset($this->array[$key]);
-  }
-
-  /**
-   * Returns the value at the specified key.
-   *
-   * @param mixed $key
-   *   A key.
-   * @param mixed $default
-   *   The default value to set if $key does not exist.
-   *
-   * @return mixed
-   *   The value.
-   */
-  public function &offsetGet($key, $default = NULL) {
-    if (!$this->offsetExists($key)) {
-      $this->array[$key] = $default;
-    }
-    $ret = &$this->array[$key];
-    return $ret;
-  }
-
-  /**
-   * Sets the value at the specified key to value.
-   *
-   * @param mixed $key
-   *   A key.
-   * @param mixed $value
-   *   A value.
-   */
-  public function offsetSet($key, $value) {
-    $this->array[$key] = $value;
-  }
-
-  /**
-   * Unsets the value at the specified key.
-   *
-   * @param mixed $key
-   *   A key.
-   */
-  public function offsetUnset($key) {
-    if ($this->offsetExists($key)) {
-      unset($this->array[$key]);
-    }
-  }
-
-  /**
-   * Serialize an ArrayObject.
-   *
-   * @return string
-   *   The serialized value.
-   */
-  public function serialize() {
-    return serialize(get_object_vars($this));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setAttachments(array $attachments) {
-    BubbleableMetadata::createFromRenderArray($this->array)->setAttachments($attachments)->applyTo($this->array);
-    return $this;
-  }
-
-  /**
-   * Sort entries with a user-defined function and maintain key association.
-   *
-   * @param mixed $function
-   *   A callable function.
-   */
-  public function uasort($function) {
-    if (is_callable($function)) {
-      uasort($this->array, $function);
-    }
-  }
-
-  /**
-   * Sort the entries by keys using a user-defined comparison function.
-   *
-   * @param mixed $function
-   *   A callable function.
-   */
-  public function uksort($function) {
-    if (is_callable($function)) {
-      uksort($this->array, $function);
-    }
-  }
-
-  /**
-   * Unserialize an ArrayObject.
-   *
-   * @param string $data
-   *   The serialized data.
-   */
-  public function unserialize($data) {
-    $data = unserialize($data);
-    $this->exchangeArray($data['array']);
-  }
-
-}
diff --git a/themes/bootstrap/src/Utility/Attributes.php b/themes/bootstrap/src/Utility/Attributes.php
deleted file mode 100644
index 91bc2cb..0000000
--- a/themes/bootstrap/src/Utility/Attributes.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Utility\Attributes.
- */
-
-namespace Drupal\bootstrap\Utility;
-
-/**
- * Class to help modify attributes.
- *
- * @ingroup utility
- */
-class Attributes extends ArrayObject {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array &$array = []) {
-    $this->array = &$array;
-  }
-
-  /**
-   * Add class(es) to the array.
-   *
-   * @param string|array $class
-   *   An individual class or an array of classes to add.
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::getClasses()
-   */
-  public function addClass($class) {
-    $classes = &$this->getClasses();
-    $classes = array_unique(array_merge($classes, (array) $class));
-  }
-
-  /**
-   * Retrieve a specific attribute from the array.
-   *
-   * @param string $name
-   *   The specific attribute to retrieve.
-   * @param mixed $default
-   *   (optional) The default value to set if the attribute does not exist.
-   *
-   * @return mixed
-   *   A specific attribute value, passed by reference.
-   *
-   * @see \Drupal\bootstrap\Utility\ArrayObject::offsetGet()
-   */
-  public function &getAttribute($name, $default = NULL) {
-    return $this->offsetGet($name, $default);
-  }
-
-  /**
-   * Retrieves classes from the array.
-   *
-   * @return array
-   *   The classes array, passed by reference.
-   *
-   * @see \Drupal\bootstrap\Utility\ArrayObject::offsetGet()
-   */
-  public function &getClasses() {
-    $classes = &$this->offsetGet('class', []);
-    $classes = array_unique($classes);
-    return $classes;
-  }
-
-  /**
-   * Indicates whether a specific attribute is set.
-   *
-   * @param string $name
-   *   The attribute to search for.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   *
-   * @see \Drupal\bootstrap\Utility\ArrayObject::offsetExists()
-   */
-  public function hasAttribute($name) {
-    return $this->offsetExists($name);
-  }
-
-  /**
-   * Indicates whether a class is present in the array.
-   *
-   * @param string|array $class
-   *   The class or array of classes to search for.
-   * @param bool $all
-   *   Flag determining to check if all classes are present.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::getClasses()
-   */
-  public function hasClass($class, $all = FALSE) {
-    $classes = (array) $class;
-    $result = array_intersect($classes, $this->getClasses());
-    return $all ? $result && count($classes) === count($result) : !!$result;
-  }
-
-  /**
-   * Removes an attribute from the array.
-   *
-   * @param string|array $name
-   *   The name of the attribute to remove.
-   *
-   * @see \Drupal\bootstrap\Utility\ArrayObject::offsetUnset()
-   */
-  public function removeAttribute($name) {
-    $this->offsetUnset($name);
-  }
-
-  /**
-   * Removes a class from the attributes array.
-   *
-   * @param string|array $class
-   *   An individual class or an array of classes to remove.
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::getClasses()
-   */
-  public function removeClass($class) {
-    $classes = &$this->getClasses();
-    $classes = array_values(array_diff($classes, (array) $class));
-  }
-
-  /**
-   * Replaces a class in the attributes array.
-   *
-   * @param string $old
-   *   The old class to remove.
-   * @param string $new
-   *   The new class. It will not be added if the $old class does not exist.
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::getClasses()
-   */
-  public function replaceClass($old, $new) {
-    $classes = &$this->getClasses();
-    $key = array_search($old, $classes);
-    if ($key !== FALSE) {
-      $classes[$key] = $new;
-    }
-  }
-
-  /**
-   * Sets an attribute on the array.
-   *
-   * @param string $name
-   *   The name of the attribute to set.
-   * @param mixed $value
-   *   The value of the attribute to set.
-   *
-   * @see \Drupal\bootstrap\Utility\ArrayObject::offsetSet()
-   */
-  public function setAttribute($name, $value) {
-    $this->offsetSet($name, $value);
-  }
-
-  /**
-   * Sets multiple attributes on the array.
-   *
-   * @param array $values
-   *   An associative key/value array of attributes to set.
-   *
-   * @see \Drupal\bootstrap\Utility\ArrayObject::merge()
-   */
-  public function setAttributes(array $values) {
-    $this->merge($values);
-  }
-
-}
diff --git a/themes/bootstrap/src/Utility/Crypt.php b/themes/bootstrap/src/Utility/Crypt.php
deleted file mode 100644
index 34793fa..0000000
--- a/themes/bootstrap/src/Utility/Crypt.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Utility\Crypt.
- */
-
-namespace Drupal\bootstrap\Utility;
-
-/**
- * Extends \Drupal\Component\Utility\Crypt.
- *
- * @ingroup utility
- */
-class Crypt extends \Drupal\Component\Utility\Crypt {
-
-  /**
-   * Generates a unique hash name.
-   *
-   * @param ...
-   *   All arguments passed will be serialized and used to generate the hash.
-   *
-   * @return string
-   *   The generated hash identifier.
-   */
-  public static function generateHash() {
-    $args = func_get_args();
-    $hash = '';
-    if (is_string($args[0])) {
-      $hash = $args[0] . ':';
-    }
-    elseif (is_array($args[0])) {
-      $hash = implode(':', $args[0]) . ':';
-    }
-    $hash .= self::hashBase64(serialize($args));
-    return $hash;
-  }
-}
diff --git a/themes/bootstrap/src/Utility/DrupalAttributes.php b/themes/bootstrap/src/Utility/DrupalAttributes.php
deleted file mode 100644
index 6856a37..0000000
--- a/themes/bootstrap/src/Utility/DrupalAttributes.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Utility\DrupalAttributes.
- */
-
-namespace Drupal\bootstrap\Utility;
-
-use Drupal\Core\Template\Attribute;
-
-/**
- * Class for managing multiple types of attributes commonly found in Drupal.
- *
- * @ingroup utility
- *
- * @see \Drupal\bootstrap\Utility\Attributes
- * @see \Drupal\bootstrap\Utility\Element
- * @see \Drupal\bootstrap\Utility\Variables
- */
-class DrupalAttributes extends ArrayObject {
-
-  /**
-   * Defines the "attributes" storage type constant.
-   *
-   * @var string
-   */
-  const ATTRIBUTES = 'attributes';
-
-  /**
-   * Defines the "body_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const BODY = 'body_attributes';
-
-  /**
-   * Defines the "content_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const CONTENT = 'content_attributes';
-
-  /**
-   * Defines the "description_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const DESCRIPTION = 'description_attributes';
-
-  /**
-   * Defines the "footer_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const FOOTER = 'footer_attributes';
-
-  /**
-   * Defines the "header_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const HEADER = 'header_attributes';
-
-  /**
-   * Defines the "heading_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const HEADING = 'heading_attributes';
-
-  /**
-   * Defines the "input_group_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const INPUT_GROUP = 'input_group_attributes';
-
-  /**
-   * Defines the "label_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const LABEL = 'label_attributes';
-
-  /**
-   * Defines the "navbar_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const NAVBAR = 'navbar_attributes';
-
-  /**
-   * Defines the "split_button_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const SPLIT_BUTTON = 'split_button_attributes';
-
-  /**
-   * Defines the "title_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const TITLE = 'title_attributes';
-
-  /**
-   * Defines the "wrapper_attributes" storage type constant.
-   *
-   * @var string
-   */
-  const WRAPPER = 'wrapper_attributes';
-
-  /**
-   * Stored attribute instances.
-   *
-   * @var \Drupal\bootstrap\Utility\Attributes[]
-   */
-  protected $attributes = [];
-
-  /**
-   * A prefix to use for retrieving attribute keys from the array.
-   *
-   * @var string
-   */
-  protected $attributePrefix = '';
-
-  /**
-   * Add class(es) to an attributes object.
-   *
-   * This is a wrapper method to retrieve the correct attributes storage object
-   * and then add the class(es) to it.
-   *
-   * @param string|array $class
-   *   An individual class or an array of classes to add.
-   * @param string $type
-   *   (optional) The type of attributes to use for this method.
-   *
-   * @return $this
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::addClass()
-   */
-  public function addClass($class, $type = DrupalAttributes::ATTRIBUTES) {
-    $this->getAttributes($type)->addClass($class);
-    return $this;
-  }
-
-  /**
-   * Retrieve a specific attribute from an attributes object.
-   *
-   * This is a wrapper method to retrieve the correct attributes storage object
-   * and then retrieve the attribute from it.
-   *
-   * @param string $name
-   *   The specific attribute to retrieve.
-   * @param mixed $default
-   *   (optional) The default value to set if the attribute does not exist.
-   * @param string $type
-   *   (optional) The type of attributes to use for this method.
-   *
-   * @return mixed
-   *   A specific attribute value, passed by reference.
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::getAttribute()
-   */
-  public function &getAttribute($name, $default = NULL, $type = DrupalAttributes::ATTRIBUTES) {
-    return $this->getAttributes($type)->getAttribute($name, $default);
-  }
-
-  /**
-   * Retrieves a specific attributes object.
-   *
-   * @param string $type
-   *   (optional) The type of attributes to use for this method.
-   *
-   * @return \Drupal\bootstrap\Utility\Attributes
-   *   An attributes object for $type.
-   */
-  public function getAttributes($type = DrupalAttributes::ATTRIBUTES) {
-    if (!isset($this->attributes[$type])) {
-      $attributes = &$this->offsetGet($this->attributePrefix . $type, []);
-      if ($attributes instanceof Attribute) {
-        $attributes = $attributes->toArray();
-      }
-      $this->attributes[$type] = new Attributes($attributes);
-    }
-    return $this->attributes[$type];
-  }
-
-  /**
-   * Retrieves classes from an attributes object.
-   *
-   * This is a wrapper method to retrieve the correct attributes storage object
-   * and then retrieve the set classes from it.
-   *
-   * @param string $type
-   *   (optional) The type of attributes to use for this method.
-   *
-   * @return array
-   *   The classes array, passed by reference.
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::getClasses()
-   */
-  public function &getClasses($type = DrupalAttributes::ATTRIBUTES) {
-    return $this->getAttributes($type)->getClasses();
-  }
-
-  /**
-   * Indicates whether an attributes object has a specific attribute set.
-   *
-   * This is a wrapper method to retrieve the correct attributes storage object
-   * and then check there if the attribute exists.
-   *
-   * @param string $name
-   *   The attribute to search for.
-   * @param string $type
-   *   (optional) The type of attributes to use for this method.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::hasAttribute()
-   */
-  public function hasAttribute($name, $type = DrupalAttributes::ATTRIBUTES) {
-    return $this->getAttributes($type)->hasAttribute($name);
-  }
-
-  /**
-   * Indicates whether an attributes object has a specific class.
-   *
-   * This is a wrapper method to retrieve the correct attributes storage object
-   * and then check there if a class exists in the attributes object.
-   *
-   * @param string $class
-   *   The class to search for.
-   * @param string $type
-   *   (optional) The type of attributes to use for this method.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::hasClass()
-   */
-  public function hasClass($class, $type = DrupalAttributes::ATTRIBUTES) {
-    return $this->getAttributes($type)->hasClass($class);
-  }
-
-  /**
-   * Removes an attribute from an attributes object.
-   *
-   * This is a wrapper method to retrieve the correct attributes storage object
-   * and then remove an attribute from it.
-   *
-   * @param string|array $name
-   *   The name of the attribute to remove.
-   * @param string $type
-   *   (optional) The type of attributes to use for this method.
-   *
-   * @return $this
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::removeAttribute()
-   */
-  public function removeAttribute($name, $type = DrupalAttributes::ATTRIBUTES) {
-    $this->getAttributes($type)->removeAttribute($name);
-    return $this;
-  }
-
-  /**
-   * Removes a class from an attributes object.
-   *
-   * This is a wrapper method to retrieve the correct attributes storage object
-   * and then remove the class(es) from it.
-   *
-   * @param string|array $class
-   *   An individual class or an array of classes to remove.
-   * @param string $type
-   *   (optional) The type of attributes to use for this method.
-   *
-   * @return $this
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::removeClass()
-   */
-  public function removeClass($class, $type = DrupalAttributes::ATTRIBUTES) {
-    $this->getAttributes($type)->removeClass($class);
-    return $this;
-  }
-
-  /**
-   * Replaces a class in an attributes object.
-   *
-   * This is a wrapper method to retrieve the correct attributes storage object
-   * and then replace the class(es) in it.
-   *
-   * @param string $old
-   *   The old class to remove.
-   * @param string $new
-   *   The new class. It will not be added if the $old class does not exist.
-   * @param string $type
-   *   (optional) The type of attributes to use for this method.
-   *
-   * @return $this
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::replaceClass()
-   */
-  public function replaceClass($old, $new, $type = DrupalAttributes::ATTRIBUTES) {
-    $this->getAttributes($type)->replaceClass($old, $new);
-    return $this;
-  }
-
-  /**
-   * Sets an attribute on an attributes object.
-   *
-   * This is a wrapper method to retrieve the correct attributes storage object
-   * and then set an attribute on it.
-   *
-   * @param string $name
-   *   The name of the attribute to set.
-   * @param mixed $value
-   *   The value of the attribute to set.
-   * @param string $type
-   *   (optional) The type of attributes to use for this method.
-   *
-   * @return $this
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::setAttribute()
-   */
-  public function setAttribute($name, $value, $type = DrupalAttributes::ATTRIBUTES) {
-    $this->getAttributes($type)->setAttribute($name, $value);
-    return $this;
-  }
-
-  /**
-   * Sets multiple attributes on an attributes object.
-   *
-   * This is a wrapper method to retrieve the correct attributes storage object
-   * and then merge multiple attributes into it.
-   *
-   * @param array $values
-   *   An associative key/value array of attributes to set.
-   * @param string $type
-   *   (optional) The type of attributes to use for this method.
-   *
-   * @return $this
-   *
-   * @see \Drupal\bootstrap\Utility\Attributes::setAttributes()
-   */
-  public function setAttributes(array $values, $type = DrupalAttributes::ATTRIBUTES) {
-    $this->getAttributes($type)->setAttributes($values);
-    return $this;
-  }
-
-
-}
diff --git a/themes/bootstrap/src/Utility/Element.php b/themes/bootstrap/src/Utility/Element.php
deleted file mode 100644
index 49309a0..0000000
--- a/themes/bootstrap/src/Utility/Element.php
+++ /dev/null
@@ -1,835 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Utility\Element.
- */
-
-namespace Drupal\bootstrap\Utility;
-
-use Drupal\bootstrap\Bootstrap;
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Component\Render\MarkupInterface;
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Provides helper methods for Drupal render elements.
- *
- * @ingroup utility
- *
- * @see \Drupal\Core\Render\Element
- */
-class Element extends DrupalAttributes {
-
-  /**
-   * The current state of the form.
-   *
-   * @var \Drupal\Core\Form\FormStateInterface
-   */
-  protected $formState;
-
-  /**
-   * The element type.
-   *
-   * @var string
-   */
-  protected $type = FALSE;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $attributePrefix = '#';
-
-  /**
-   * Element constructor.
-   *
-   * @param array|string $element
-   *   A render array element.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function __construct(&$element = [], FormStateInterface $form_state = NULL) {
-    if (!is_array($element)) {
-      $element = ['#markup' => $element instanceof MarkupInterface ? $element : new FormattableMarkup($element, [])];
-    }
-    $this->array = &$element;
-    $this->formState = $form_state;
-  }
-
-  /**
-   * Magic get method.
-   *
-   * This is only for child elements, not properties.
-   *
-   * @param string $key
-   *   The name of the child element to retrieve.
-   *
-   * @return \Drupal\bootstrap\Utility\Element
-   *   The child element object.
-   *
-   * @throws \InvalidArgumentException
-   *   Throws this error when the name is a property (key starting with #).
-   */
-  public function &__get($key) {
-    if (\Drupal\Core\Render\Element::property($key)) {
-      throw new \InvalidArgumentException('Cannot dynamically retrieve element property. Please use \Drupal\bootstrap\Utility\Element::getProperty instead.');
-    }
-    $instance = new self($this->offsetGet($key, []));
-    return $instance;
-  }
-
-  /**
-   * Magic set method.
-   *
-   * This is only for child elements, not properties.
-   *
-   * @param string $key
-   *   The name of the child element to set.
-   * @param mixed $value
-   *   The value of $name to set.
-   *
-   * @throws \InvalidArgumentException
-   *   Throws this error when the name is a property (key starting with #).
-   */
-  public function __set($key, $value) {
-    if (\Drupal\Core\Render\Element::property($key)) {
-      throw new \InvalidArgumentException('Cannot dynamically retrieve element property. Use \Drupal\bootstrap\Utility\Element::setProperty instead.');
-    }
-    $this->offsetSet($key, ($value instanceof Element ? $value->getArray() : $value));
-  }
-
-  /**
-   * Magic isset method.
-   *
-   * This is only for child elements, not properties.
-   *
-   * @param string $name
-   *   The name of the child element to check.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   *
-   * @throws \InvalidArgumentException
-   *   Throws this error when the name is a property (key starting with #).
-   */
-  public function __isset($name) {
-    if (\Drupal\Core\Render\Element::property($name)) {
-      throw new \InvalidArgumentException('Cannot dynamically check if an element has a property. Use \Drupal\bootstrap\Utility\Element::unsetProperty instead.');
-    }
-    return parent::__isset($name);
-  }
-
-  /**
-   * Magic unset method.
-   *
-   * This is only for child elements, not properties.
-   *
-   * @param mixed $name
-   *   The name of the child element to unset.
-   *
-   * @throws \InvalidArgumentException
-   *   Throws this error when the name is a property (key starting with #).
-   */
-  public function __unset($name) {
-    if (\Drupal\Core\Render\Element::property($name)) {
-      throw new \InvalidArgumentException('Cannot dynamically unset an element property. Use \Drupal\bootstrap\Utility\Element::hasProperty instead.');
-    }
-    parent::__unset($name);
-  }
-
-  /**
-   * Appends a property with a value.
-   *
-   * @param string $name
-   *   The name of the property to set.
-   * @param mixed $value
-   *   The value of the property to set.
-   *
-   * @return $this
-   */
-  public function appendProperty($name, $value) {
-    $property = &$this->getProperty($name);
-    $value = $value instanceof Element ? $value->getArray() : $value;
-
-    // If property isn't set, just set it.
-    if (!isset($property)) {
-      $property = $value;
-      return $this;
-    }
-
-    if (is_array($property)) {
-      $property[] = Element::create($value)->getArray();
-    }
-    else {
-      $property .= (string) $value;
-    }
-
-    return $this;
-  }
-
-  /**
-   * Identifies the children of an element array, optionally sorted by weight.
-   *
-   * The children of a element array are those key/value pairs whose key does
-   * not start with a '#'. See drupal_render() for details.
-   *
-   * @param bool $sort
-   *   Boolean to indicate whether the children should be sorted by weight.
-   *
-   * @return array
-   *   The array keys of the element's children.
-   */
-  public function childKeys($sort = FALSE) {
-    return \Drupal\Core\Render\Element::children($this->array, $sort);
-  }
-
-  /**
-   * Retrieves the children of an element array, optionally sorted by weight.
-   *
-   * The children of a element array are those key/value pairs whose key does
-   * not start with a '#'. See drupal_render() for details.
-   *
-   * @param bool $sort
-   *   Boolean to indicate whether the children should be sorted by weight.
-   *
-   * @return \Drupal\bootstrap\Utility\Element[]
-   *   An array child elements.
-   */
-  public function children($sort = FALSE) {
-    $children = [];
-    foreach ($this->childKeys($sort) as $child) {
-      $children[$child] = new self($this->array[$child]);
-    }
-    return $children;
-  }
-
-  /**
-   * Adds a specific Bootstrap class to color a button based on its text value.
-   *
-   * @param bool $override
-   *   Flag determining whether or not to override any existing set class.
-   *
-   * @return $this
-   */
-  public function colorize($override = TRUE) {
-    $button = $this->isButton();
-
-    // @todo refactor this more so it's not just "button" specific.
-    $prefix = $button ? 'btn' : 'has';
-
-    // List of classes, based on the prefix.
-    $classes = [
-      "$prefix-primary", "$prefix-success", "$prefix-info",
-      "$prefix-warning", "$prefix-danger", "$prefix-link",
-      // Default should be last.
-      "$prefix-default"
-    ];
-
-    // Set the class to "btn-default" if it shouldn't be colorized.
-    $class = $button && !Bootstrap::getTheme()->getSetting('button_colorize') ? 'btn-default' : FALSE;
-
-    // Search for an existing class.
-    if (!$class || !$override) {
-      foreach ($classes as $value) {
-        if ($this->hasClass($value)) {
-          $class = $value;
-          break;
-        }
-      }
-    }
-
-    // Find a class based on the value of "value", "title" or "button_type".
-    if (!$class) {
-      $value = $this->getProperty('value', $this->getProperty('title', ''));
-      $class = "$prefix-" . Bootstrap::cssClassFromString($value, $button ? $this->getProperty('button_type', 'default') : 'default');
-    }
-
-    // Remove any existing classes and add the specified class.
-    if ($class) {
-      $this->removeClass($classes)->addClass($class);
-      if ($button && $this->getProperty('split')) {
-        $this->removeClass($classes, $this::SPLIT_BUTTON)->addClass($class, $this::SPLIT_BUTTON);
-      }
-    }
-
-    return $this;
-  }
-
-  /**
-   * Creates a new \Drupal\bootstrap\Utility\Element instance.
-   *
-   * @param array|string $element
-   *   A render array element or a string.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   A current FormState instance, if any.
-   *
-   * @return \Drupal\bootstrap\Utility\Element
-   *   The newly created element instance.
-   */
-  public static function create(&$element = [], FormStateInterface $form_state = NULL) {
-    return $element instanceof self ? $element : new self($element, $form_state);
-  }
-
-  /**
-   * Creates a new standalone \Drupal\bootstrap\Utility\Element instance.
-   *
-   * It does not reference the original element passed. If an Element instance
-   * is passed, it will clone it so it doesn't affect the original element.
-   *
-   * @param array|string|\Drupal\bootstrap\Utility\Element $element
-   *   A render array element, string or Element instance.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   A current FormState instance, if any.
-   *
-   * @return \Drupal\bootstrap\Utility\Element
-   *   The newly created element instance.
-   */
-  public static function createStandalone($element = [], FormStateInterface $form_state = NULL) {
-    // Immediately return a cloned version if element is already an Element.
-    if ($element instanceof self) {
-      return clone $element;
-    }
-    $standalone = is_object($element) ? clone $element : $element;
-    return static::create($standalone, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function exchangeArray($data) {
-    $old = parent::exchangeArray($data);
-    return $old;
-  }
-
-  /**
-   * Retrieves the render array for the element.
-   *
-   * @return array
-   *   The element render array, passed by reference.
-   */
-  public function &getArray() {
-    return $this->array;
-  }
-
-  /**
-   * Retrieves a context value from the #context element property, if any.
-   *
-   * @param string $name
-   *   The name of the context key to retrieve.
-   * @param mixed $default
-   *   Optional. The default value to use if the context $name isn't set.
-   *
-   * @return mixed|NULL
-   *   The context value or the $default value if not set.
-   */
-  public function &getContext($name, $default = NULL) {
-    $context = &$this->getProperty('context', []);
-    if (!isset($context[$name])) {
-      $context[$name] = $default;
-    }
-    return $context[$name];
-  }
-
-  /**
-   * Returns the error message filed against the given form element.
-   *
-   * Form errors higher up in the form structure override deeper errors as well
-   * as errors on the element itself.
-   *
-   * @return string|null
-   *   Either the error message for this element or NULL if there are no errors.
-   *
-   * @throws \BadMethodCallException
-   *   When the element instance was not constructed with a valid form state
-   *   object.
-   */
-  public function getError() {
-    if (!$this->formState) {
-      throw new \BadMethodCallException('The element instance must be constructed with a valid form state object to use this method.');
-    }
-    return $this->formState->getError($this->array);
-  }
-
-  /**
-   * Retrieves the render array for the element.
-   *
-   * @param string $name
-   *   The name of the element property to retrieve, not including the # prefix.
-   * @param mixed $default
-   *   The default to set if property does not exist.
-   *
-   * @return mixed
-   *   The property value, NULL if not set.
-   */
-  public function &getProperty($name, $default = NULL) {
-    return $this->offsetGet("#$name", $default);
-  }
-
-  /**
-   * Returns the visible children of an element.
-   *
-   * @return array
-   *   The array keys of the element's visible children.
-   */
-  public function getVisibleChildren() {
-    return \Drupal\Core\Render\Element::getVisibleChildren($this->array);
-  }
-
-  /**
-   * Indicates whether the element has an error set.
-   *
-   * @throws \BadMethodCallException
-   *   When the element instance was not constructed with a valid form state
-   *   object.
-   */
-  public function hasError() {
-    $error = $this->getError();
-    return isset($error);
-  }
-
-  /**
-   * Indicates whether the element has a specific property.
-   *
-   * @param string $name
-   *   The property to check.
-   */
-  public function hasProperty($name) {
-    return $this->offsetExists("#$name");
-  }
-
-  /**
-   * Indicates whether the element is a button.
-   *
-   * @return bool
-   *   TRUE or FALSE.
-   */
-  public function isButton() {
-    return !empty($this->array['#is_button']) || $this->isType(['button', 'submit', 'reset', 'image_button']) || $this->hasClass('btn');
-  }
-
-  /**
-   * Indicates whether the given element is empty.
-   *
-   * An element that only has #cache set is considered empty, because it will
-   * render to the empty string.
-   *
-   * @return bool
-   *   Whether the given element is empty.
-   */
-  public function isEmpty() {
-    return \Drupal\Core\Render\Element::isEmpty($this->array);
-  }
-
-  /**
-   * Indicates whether a property on the element is empty.
-   *
-   * @param string $name
-   *   The property to check.
-   *
-   * @return bool
-   *   Whether the given property on the element is empty.
-   */
-  public function isPropertyEmpty($name) {
-    return $this->hasProperty($name) && empty($this->getProperty($name));
-  }
-
-  /**
-   * Checks if a value is a render array.
-   *
-   * @param mixed $value
-   *   The value to check.
-   *
-   * @return bool
-   *   TRUE if the given value is a render array, otherwise FALSE.
-   */
-  public static function isRenderArray($value) {
-    return is_array($value) && (isset($value['#type']) ||
-      isset($value['#theme']) || isset($value['#theme_wrappers']) ||
-      isset($value['#markup']) || isset($value['#attached']) ||
-      isset($value['#cache']) || isset($value['#lazy_builder']) ||
-      isset($value['#create_placeholder']) || isset($value['#pre_render']) ||
-      isset($value['#post_render']) || isset($value['#process']));
-  }
-
-  /**
-   * Checks if the element is a specific type of element.
-   *
-   * @param string|array $type
-   *   The element type(s) to check.
-   *
-   * @return bool
-   *   TRUE if element is or one of $type.
-   */
-  public function isType($type) {
-    $property = $this->getProperty('type');
-    return $property && in_array($property, (is_array($type) ? $type : [$type]));
-  }
-
-  /**
-   * Determines if an element is visible.
-   *
-   * @return bool
-   *   TRUE if the element is visible, otherwise FALSE.
-   */
-  public function isVisible() {
-    return \Drupal\Core\Render\Element::isVisibleElement($this->array);
-  }
-
-  /**
-   * Maps an element's properties to its attributes array.
-   *
-   * @param array $map
-   *   An associative array whose keys are element property names and whose
-   *   values are the HTML attribute names to set on the corresponding
-   *   property; e.g., array('#propertyname' => 'attributename'). If both names
-   *   are identical except for the leading '#', then an attribute name value is
-   *   sufficient and no property name needs to be specified.
-   *
-   * @return $this
-   */
-  public function map(array $map) {
-    \Drupal\Core\Render\Element::setAttributes($this->array, $map);
-    return $this;
-  }
-
-  /**
-   * Prepends a property with a value.
-   *
-   * @param string $name
-   *   The name of the property to set.
-   * @param mixed $value
-   *   The value of the property to set.
-   *
-   * @return $this
-   */
-  public function prependProperty($name, $value) {
-    $property = &$this->getProperty($name);
-    $value = $value instanceof Element ? $value->getArray() : $value;
-
-    // If property isn't set, just set it.
-    if (!isset($property)) {
-      $property = $value;
-      return $this;
-    }
-
-    if (is_array($property)) {
-      array_unshift($property, Element::create($value)->getArray());
-    }
-    else {
-      $property = (string) $value . (string) $property;
-    }
-
-    return $this;
-  }
-
-  /**
-   * Gets properties of a structured array element (keys beginning with '#').
-   *
-   * @return array
-   *   An array of property keys for the element.
-   */
-  public function properties() {
-    return \Drupal\Core\Render\Element::properties($this->array);
-  }
-
-  /**
-   * Renders the final element HTML.
-   *
-   * @return \Drupal\Component\Render\MarkupInterface
-   *   The rendered HTML.
-   */
-  public function render() {
-    /** @var \Drupal\Core\Render\Renderer $renderer */
-    $renderer = \Drupal::service('renderer');
-    return $renderer->render($this->array);
-  }
-
-  /**
-   * Renders the final element HTML.
-   *
-   * @return \Drupal\Component\Render\MarkupInterface
-   *   The rendered HTML.
-   */
-  public function renderPlain() {
-    /** @var \Drupal\Core\Render\Renderer $renderer */
-    $renderer = \Drupal::service('renderer');
-    return $renderer->renderPlain($this->array);
-  }
-
-  /**
-   * Renders the final element HTML.
-   *
-   * (Cannot be executed within another render context.)
-   *
-   * @return \Drupal\Component\Render\MarkupInterface
-   *   The rendered HTML.
-   */
-  public function renderRoot() {
-    /** @var \Drupal\Core\Render\Renderer $renderer */
-    $renderer = \Drupal::service('renderer');
-    return $renderer->renderRoot($this->array);
-  }
-
-  /**
-   * Adds Bootstrap button size class to the element.
-   *
-   * @param string $class
-   *   The full button size class to add. If none is provided, it will default
-   *   to any set theme setting.
-   * @param bool $override
-   *   Flag indicating if the passed $class should be forcibly set. Setting
-   *   this to FALSE allows any existing set class to persist.
-   *
-   * @return $this
-   */
-  public function setButtonSize($class = NULL, $override = TRUE) {
-    // Immediately return if element is not a button.
-    if (!$this->isButton()) {
-      return $this;
-    }
-
-    // Retrieve the button size classes from the specific setting's options.
-    static $classes;
-    if (!isset($classes)) {
-      $classes = [];
-      if ($button_size = Bootstrap::getTheme()->getSettingPlugin('button_size')) {
-        $classes = array_keys($button_size->getOptions());
-      }
-    }
-
-    // Search for an existing class.
-    if (!$class || !$override) {
-      foreach ($classes as $value) {
-        if ($this->hasClass($value)) {
-          $class = $value;
-          break;
-        }
-      }
-    }
-
-    // Attempt to get the default button size, if set.
-    if (!$class) {
-      $class = Bootstrap::getTheme()->getSetting('button_size');
-    }
-
-    // Remove any existing classes and add the specified class.
-    if ($class) {
-      $this->removeClass($classes)->addClass($class);
-      if ($this->getProperty('split')) {
-        $this->removeClass($classes, $this::SPLIT_BUTTON)->addClass($class, $this::SPLIT_BUTTON);
-      }
-    }
-
-    return $this;
-  }
-
-  /**
-   * Flags an element as having an error.
-   *
-   * @param string $message
-   *   (optional) The error message to present to the user.
-   *
-   * @return $this
-   *
-   * @throws \BadMethodCallException
-   *   When the element instance was not constructed with a valid form state
-   *   object.
-   */
-  public function setError($message = '') {
-    if (!$this->formState) {
-      throw new \BadMethodCallException('The element instance must be constructed with a valid form state object to use this method.');
-    }
-    $this->formState->setError($this->array, $message);
-    return $this;
-  }
-
-  /**
-   * Adds an icon to button element based on its text value.
-   *
-   * @param array $icon
-   *   An icon render array.
-   *
-   * @return $this
-   *
-   * @see \Drupal\bootstrap\Bootstrap::glyphicon()
-   */
-  public function setIcon(array $icon = NULL) {
-    if ($this->isButton() && !Bootstrap::getTheme()->getSetting('button_iconize')) {
-      return $this;
-    }
-    if ($value = $this->getProperty('value', $this->getProperty('title'))) {
-      $icon = isset($icon) ? $icon : Bootstrap::glyphiconFromString($value);
-      $this->setProperty('icon', $icon);
-    }
-    return $this;
-  }
-
-  /**
-   * Sets the value for a property.
-   *
-   * @param string $name
-   *   The name of the property to set.
-   * @param mixed $value
-   *   The value of the property to set.
-   * @param bool $recurse
-   *   Flag indicating wither to set the same property on child elements.
-   *
-   * @return $this
-   */
-  public function setProperty($name, $value, $recurse = FALSE) {
-    $this->array["#$name"] = $value instanceof Element ? $value->getArray() : $value;
-    if ($recurse) {
-      foreach ($this->children() as $child) {
-        $child->setProperty($name, $value, $recurse);
-      }
-    }
-    return $this;
-  }
-
-  /**
-   * Converts an element description into a tooltip based on certain criteria.
-   *
-   * @param array|\Drupal\bootstrap\Utility\Element|NULL $target_element
-   *   The target element render array the tooltip is to be attached to, passed
-   *   by reference or an existing Element object. If not set, it will default
-   *   this Element instance.
-   * @param bool $input_only
-   *   Toggle determining whether or not to only convert input elements.
-   * @param int $length
-   *   The length of characters to determine if description is "simple".
-   *
-   * @return $this
-   */
-  public function smartDescription(&$target_element = NULL, $input_only = TRUE, $length = NULL) {
-    static $theme;
-    if (!isset($theme)) {
-      $theme = Bootstrap::getTheme();
-    }
-
-    // Determine if tooltips are enabled.
-    static $enabled;
-    if (!isset($enabled)) {
-      $enabled = $theme->getSetting('tooltip_enabled') && $theme->getSetting('forms_smart_descriptions');
-    }
-
-    // Immediately return if tooltip descriptions are not enabled.
-    if (!$enabled) {
-      return $this;
-    }
-
-    // Allow a different element to attach the tooltip.
-    /** @var Element $target */
-    if (is_object($target_element) && $target_element instanceof self) {
-      $target = $target_element;
-    }
-    elseif (isset($target_element) && is_array($target_element)) {
-      $target = new self($target_element, $this->formState);
-    }
-    else {
-      $target = $this;
-    }
-
-    // For "password_confirm" element types, move the target to the first
-    // textfield.
-    if ($target->isType('password_confirm')) {
-      $target = $target->pass1;
-    }
-
-    // Retrieve the length limit for smart descriptions.
-    if (!isset($length)) {
-      // Disable length checking by setting it to FALSE if empty.
-      $length = (int) $theme->getSetting('forms_smart_descriptions_limit') ?: FALSE;
-    }
-
-    // Retrieve the allowed tags for smart descriptions. This is primarily used
-    // for display purposes only (i.e. non-UI/UX related elements that wouldn't
-    // require a user to "click", like a link). Disable length checking by
-    // setting it to FALSE if empty.
-    static $allowed_tags;
-    if (!isset($allowed_tags)) {
-      $allowed_tags = array_filter(array_unique(array_map('trim', explode(',', $theme->getSetting('forms_smart_descriptions_allowed_tags') . '')))) ?: FALSE;
-    }
-
-    // Return if element or target shouldn't have "simple" tooltip descriptions.
-    $html = FALSE;
-
-    // If the description is a render array, it must first be pre-rendered so
-    // it can be later passed to Unicode::isSimple() if needed.
-    $description = $this->hasProperty('description') ? $this->getProperty('description') : FALSE;
-    if (static::isRenderArray($description)) {
-      $description = static::createStandalone($description)->renderPlain();
-    }
-
-    if (
-      // Ignore if element has no #description.
-      !$description
-
-      // Ignore if description is not a simple string or MarkupInterface.
-      || (!is_string($description) && !($description instanceof MarkupInterface))
-
-      // Ignore if element is not an input.
-      || ($input_only && !$target->hasProperty('input'))
-
-      // Ignore if the target element already has a "data-toggle" attribute set.
-      || $target->hasAttribute('data-toggle')
-
-      // Ignore if the target element is #disabled.
-      || $target->hasProperty('disabled')
-
-      // Ignore if either the actual element or target element has an explicit
-      // #smart_description property set to FALSE.
-      || !$this->getProperty('smart_description', TRUE)
-      || !$target->getProperty('smart_description', TRUE)
-
-      // Ignore if the description is not "simple".
-      || !Unicode::isSimple($description, $length, $allowed_tags, $html)
-    ) {
-      // Set the both the actual element and the target element
-      // #smart_description property to FALSE.
-      $this->setProperty('smart_description', FALSE);
-      $target->setProperty('smart_description', FALSE);
-      return $this;
-    }
-
-    // Default attributes type.
-    $type = DrupalAttributes::ATTRIBUTES;
-
-    // Use #label_attributes for 'checkbox' and 'radio' elements.
-    if ($this->isType(['checkbox', 'radio'])) {
-      $type = DrupalAttributes::LABEL;
-    }
-    // Use #wrapper_attributes for 'checkboxes' and 'radios' elements.
-    elseif ($this->isType(['checkboxes', 'radios'])) {
-      $type = DrupalAttributes::WRAPPER;
-    }
-
-    // Retrieve the proper attributes array.
-    $attributes = $target->getAttributes($type);
-
-    // Set the tooltip attributes.
-    $attributes['title'] = $allowed_tags !== FALSE ? Xss::filter((string) $description, $allowed_tags) : $description;
-    $attributes['data-toggle'] = 'tooltip';
-    if ($html || $allowed_tags === FALSE) {
-      $attributes['data-html'] = 'true';
-    }
-
-    // Remove the element description so it isn't (re-)rendered later.
-    $this->unsetProperty('description');
-
-    return $this;
-  }
-
-  /**
-   * Removes a property from the element.
-   *
-   * @param string $name
-   *   The name of the property to unset.
-   *
-   * @return $this
-   */
-  public function unsetProperty($name) {
-    unset($this->array["#$name"]);
-    return $this;
-  }
-
-}
diff --git a/themes/bootstrap/src/Utility/Storage.php b/themes/bootstrap/src/Utility/Storage.php
deleted file mode 100644
index cbcef47..0000000
--- a/themes/bootstrap/src/Utility/Storage.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Utility\Storage.
- */
-
-namespace Drupal\bootstrap\Utility;
-
-use Drupal\bootstrap\Bootstrap;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\KeyValueStore\MemoryStorage;
-
-/**
- * Theme Storage.
- *
- * A hybrid storage solution that utilizes the cache system for complex and
- * expensive operations performed by a [base] theme.
- *
- * Instead of using multiple cache identifiers, which increases the number of
- * database calls, this storage only executes a single cache call and stores
- * individual entries in memory as an associative array.
- *
- * It also tracks when the data has been modified so it can be saved back to
- * cache before the system fully shuts down.
- *
- * This storage object can be used in `foreach` loops.
- *
- * @ingroup utility
- *
- * @see \Drupal\bootstrap\Utility\StorageItem
- */
-class Storage extends MemoryStorage implements \Iterator {
-
-  /**
-   * The bin (table) data should be stored in (not prefixed with "cache_").
-   *
-   * @var string
-   */
-  protected $bin;
-
-  /**
-   * Flag determining whether or not the cache should be saved to the database.
-   *
-   * @var bool
-   */
-  protected $changed;
-
-  /**
-   * The cache identifier.
-   *
-   * @var string
-   */
-  protected $cid;
-
-  /**
-   * Indicates when the cache should expire.
-   *
-   * @var string
-   */
-  protected $expire;
-
-  /**
-   * Flag determining whether or not object has been initialized yet.
-   *
-   * @var bool
-   */
-  protected $initialized = FALSE;
-
-  /**
-   * Tags to associate with the cached data so it can be properly invalidated.
-   *
-   * @var string
-   */
-  protected $tags;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct($cid, $bin = 'default', $expire = Cache::PERMANENT, $tags = [Bootstrap::CACHE_TAG]) {
-    $this->cid = "theme_registry:storage:$cid";
-    $this->bin = $bin;
-    $this->changed = FALSE;
-    $this->expire = $expire;
-    $this->tags = $tags;
-
-    // Register the cache object to save, if it's needed, on shutdown.
-    drupal_register_shutdown_function([$this, 'save']);
-
-    // Retrieve the cached data.
-    $data = ($cached = \Drupal::cache($bin)->get($this->cid)) && !empty($cached->data) ? $cached->data : [];
-
-    // Set the data.
-    $this->setMultiple($data);
-
-    // Cache has been initialized.
-    $this->initialized = TRUE;
-  }
-
-  /**
-   * Notifies the object that data has changed.
-   */
-  public function changed() {
-    if ($this->initialized) {
-      $this->changed = TRUE;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function current() {
-    return current($this->data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function delete($key) {
-    parent::delete($key);
-    $this->changed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteAll() {
-    parent::deleteAll();
-    $this->changed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteMultiple(array $keys) {
-    parent::deleteMultiple($keys);
-    $this->changed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAll($arrays = TRUE) {
-    $data = $this->data;
-    if ($arrays) {
-      foreach ($data as $key => $value) {
-        if ($value instanceof StorageItem) {
-          $data[$key] = $value->getAll();
-        }
-      }
-    }
-    return $data;
-  }
-
-  /**
-   * Determines if the cache is empty.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   */
-  public function isEmpty() {
-    return empty($this->data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function key() {
-    return key($this->data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function next() {
-    return next($this->data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function rename($key, $new_key) {
-    parent::rename($key, $new_key);
-    $this->changed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function rewind() {
-    return reset($this->data);
-  }
-
-  /**
-   * Saves the data back to the database, if necessary, on shutdown.
-   *
-   * This method is automatically invoked during PHP shutdown.
-   *
-   * @internal
-   *
-   * @see \Drupal\bootstrap\Utility\Storage::__construct
-   */
-  public function save() {
-    if ($this->changed) {
-      \Drupal::cache($this->bin)->set($this->cid, $this->getAll(), $this->expire, $this->tags);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function set($key, $value) {
-    if (is_array($value)) {
-      $value = new StorageItem($value, $this);
-    }
-    parent::set($key, $value);
-    $this->changed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setIfNotExists($key, $value) {
-    if (!isset($this->data[$key])) {
-      if (is_array($value)) {
-        $value = new StorageItem($value, $this);
-      }
-      $this->data[$key] = $value;
-      $this->changed();
-      return TRUE;
-    }
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setMultiple(array $data) {
-    foreach ($data as $key => $value) {
-      if (is_array($value)) {
-        $data[$key] = new StorageItem($value, $this);
-      }
-    }
-    parent::setMultiple($data);
-    $this->changed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function valid() {
-    return key($this->data) !== NULL;
-  }
-
-}
diff --git a/themes/bootstrap/src/Utility/StorageItem.php b/themes/bootstrap/src/Utility/StorageItem.php
deleted file mode 100644
index 3f593f2..0000000
--- a/themes/bootstrap/src/Utility/StorageItem.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Utility\StorageItem.
- */
-
-namespace Drupal\bootstrap\Utility;
-
-use Drupal\Core\KeyValueStore\MemoryStorage;
-
-/**
- * Theme Storage Item.
- *
- * This is essentially the same object as Storage. The only exception is
- * delegating any data changes to the primary Storage object this
- * StorageItem object lives in.
- *
- * This storage object can be used in `foreach` loops.
- *
- * @ingroup utility
- *
- * @see \Drupal\bootstrap\Utility\Storage
- */
-class StorageItem extends MemoryStorage implements \Iterator {
-
-  /**
-   * Flag determining whether or not object has been initialized yet.
-   *
-   * @var bool
-   */
-  protected $initialized = FALSE;
-
-  /**
-   * The \Drupal\bootstrap\Storage instance this item belongs to.
-   *
-   * @var \Drupal\bootstrap\Utility\Storage
-   */
-  protected $storage;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct($data, Storage $storage) {
-    $this->storage = $storage;
-    $this->setMultiple($data);
-    $this->initialized = TRUE;
-  }
-
-  /**
-   * Notifies the main Storage object that data has changed.
-   */
-  public function changed() {
-    if ($this->initialized) {
-      $this->storage->changed();
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function current() {
-    return current($this->data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function delete($key) {
-    parent::delete($key);
-    $this->changed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteMultiple(array $keys) {
-    parent::deleteMultiple($keys);
-    $this->changed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteAll() {
-    parent::deleteAll();
-    $this->changed();
-  }
-
-  /**
-   * Determines if the cache is empty.
-   *
-   * @return bool
-   *   TRUE or FALSE
-   */
-  public function isEmpty() {
-    return empty($this->data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function key() {
-    return key($this->data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function next() {
-    return next($this->data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function rename($key, $new_key) {
-    parent::rename($key, $new_key);
-    $this->changed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function rewind() {
-    return reset($this->data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function set($key, $value) {
-    parent::set($key, $value);
-    $this->changed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setIfNotExists($key, $value) {
-    if (!isset($this->data[$key])) {
-      $this->data[$key] = $value;
-      $this->changed();
-      return TRUE;
-    }
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setMultiple(array $data) {
-    parent::setMultiple($data);
-    $this->changed();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function valid() {
-    return key($this->data) !== NULL;
-  }
-
-}
diff --git a/themes/bootstrap/src/Utility/Unicode.php b/themes/bootstrap/src/Utility/Unicode.php
deleted file mode 100644
index 685476e..0000000
--- a/themes/bootstrap/src/Utility/Unicode.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Utility\Unicode.
- */
-
-namespace Drupal\bootstrap\Utility;
-
-use Drupal\bootstrap\Bootstrap;
-use Drupal\Component\Utility\Xss;
-
-/**
- * Extends \Drupal\Component\Utility\Unicode.
- *
- * @ingroup utility
- */
-class Unicode extends \Drupal\Component\Utility\Unicode {
-
-  /**
-   * Extracts the hook name from a function name.
-   *
-   * @param string $string
-   *   The function name to extract the hook name from.
-   * @param string $suffix
-   *   A suffix hook ending (like "alter") to also remove.
-   * @param string $prefix
-   *   A prefix hook beginning (like "form") to also remove.
-   *
-   * @return string
-   *   The extracted hook name.
-   */
-  public static function extractHook($string, $suffix = NULL, $prefix = NULL) {
-    $regex = '^(' . implode('|', array_keys(Bootstrap::getTheme()->getAncestry())) . ')';
-    $regex .= $prefix ? '_' . $prefix : '';
-    $regex .= $suffix ? '_|_' . $suffix . '$' : '';
-    return preg_replace("/$regex/", '', $string);
-  }
-
-  /**
-   * Converts a callback to a string representation.
-   *
-   * @param array|string $callback
-   *   The callback to convert.
-   * @param bool $array
-   *   Flag determining whether or not to convert the callback to an array.
-   *
-   * @return string
-   *   The converted callback as a string or an array if $array is specified.
-   *
-   * @see \Drupal\bootstrap\Bootstrap::addCallback()
-   */
-  public static function convertCallback($callback, $array = FALSE) {
-    if (is_array($callback)) {
-      if (is_object($callback[0])) {
-        $callback[0] = get_class($callback[0]);
-      }
-      $callback = implode('::', $callback);
-    }
-    if ($callback[0] === '\\') {
-      $callback = self::substr($callback, 1);
-    }
-    if ($array && self::strpos($callback, '::') !== FALSE) {
-      $callback = explode('::', $callback);
-    }
-    return $callback;
-  }
-
-  /**
-   * Determines if a string of text is considered "simple".
-   *
-   * @param string $string
-   *   The string of text to check "simple" criteria on.
-   * @param int|FALSE $length
-   *   The length of characters used to determine whether or not $string is
-   *   considered "simple". Set explicitly to FALSE to disable this criteria.
-   * @param array|FALSE $allowed_tags
-   *   An array of allowed tag elements. Set explicitly to FALSE to disable this
-   *   criteria.
-   * @param bool $html
-   *   A variable, passed by reference, that indicates whether or not the
-   *   string contains HTML.
-   *
-   * @return bool
-   *   Returns TRUE if the $string is considered "simple", FALSE otherwise.
-   */
-  public static function isSimple($string, $length = 250, $allowed_tags = NULL, &$html = FALSE) {
-    // Typecast to a string (if an object).
-    $string_clone = (string) $string;
-
-    // Use the advanced drupal_static() pattern.
-    static $drupal_static_fast;
-    if (!isset($drupal_static_fast)) {
-      $drupal_static_fast['strings'] = &drupal_static(__METHOD__);
-    }
-    $strings = &$drupal_static_fast['strings'];
-    if (!isset($strings[$string_clone])) {
-      $plain_string = strip_tags($string_clone);
-      $simple = TRUE;
-      if ($allowed_tags !== FALSE) {
-        $filtered_string = Xss::filter($string_clone, $allowed_tags);
-        $html = $filtered_string !== $plain_string;
-        $simple = $simple && $string_clone === $filtered_string;
-      }
-      if ($length !== FALSE) {
-        $simple = $simple && strlen($plain_string) <= intval($length);
-      }
-      $strings[$string_clone] = $simple;
-    }
-    return $strings[$string_clone];
-  }
-
-}
diff --git a/themes/bootstrap/src/Utility/Variables.php b/themes/bootstrap/src/Utility/Variables.php
deleted file mode 100644
index d738cdc..0000000
--- a/themes/bootstrap/src/Utility/Variables.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\bootstrap\Utility\Variables.
- */
-
-namespace Drupal\bootstrap\Utility;
-
-/**
- * Class to help modify template variables.
- *
- * @ingroup utility
- */
-class Variables extends DrupalAttributes {
-
-  /**
-   * An element object.
-   *
-   * @var \Drupal\bootstrap\Utility\Element|FALSE
-   */
-  public $element = FALSE;
-
-  /**
-   * Element constructor.
-   *
-   * @param array $variables
-   *   A theme hook variables array.
-   */
-  public function __construct(array &$variables) {
-    $this->array = &$variables;
-    if (isset($variables['element']) && Element::isRenderArray($variables['element'])) {
-      $this->element = Element::create($variables['element']);
-    }
-    elseif (isset($variables['elements']) && Element::isRenderArray($variables['elements'])) {
-      $this->element = Element::create($variables['elements']);
-    }
-  }
-
-  /**
-   * Creates a new \Drupal\bootstrap\Utility\Variables instance.
-   *
-   * @param array $variables
-   *   A theme hook variables array.
-   *
-   * @return \Drupal\bootstrap\Utility\Variables
-   *   The newly created variables instance.
-   */
-  public static function create(array &$variables) {
-    return new self($variables);
-  }
-
-  /**
-   * Retrieves a context value from the variables array or its element, if any.
-   *
-   * @param string $name
-   *   The name of the context key to retrieve.
-   * @param mixed $default
-   *   Optional. The default value to use if the context $name isn't set.
-   *
-   * @return mixed|NULL
-   *   The context value or the $default value if not set.
-   */
-  public function &getContext($name, $default = NULL) {
-    $context = &$this->offsetGet($this->attributePrefix . 'context', []);
-    if (!isset($context[$name])) {
-      // If there is no context on the variables array but there is an element
-      // present, proxy the method to the element.
-      if ($this->element) {
-        return $this->element->getContext($name, $default);
-      }
-      $context[$name] = $default;
-    }
-    return $context[$name];
-  }
-
-  /**
-   * Maps an element's properties to the variables attributes array.
-   *
-   * @param array $map
-   *   An associative array whose keys are element property names and whose
-   *   values are the variable names to set in the variables array; e.g.,
-   *   array('#property_name' => 'variable_name'). If both names are identical
-   *   except for the leading '#', then an attribute name value is sufficient
-   *   and no property name needs to be specified.
-   * @param bool $overwrite
-   *   If the variable exists, it will be overwritten. This does not apply to
-   *   attribute arrays, they will always be merged recursively.
-   *
-   * @return $this
-   */
-  public function map(array $map, $overwrite = TRUE) {
-    // Immediately return if there is no element in the variable array.
-    if (!$this->element) {
-      return $this;
-    }
-
-    // Iterate over each map item.
-    foreach ($map as $property => $variable) {
-      // If the key is numeric, the attribute name needs to be taken over.
-      if (is_int($property)) {
-        $property = $variable;
-      }
-
-      // Merge attributes from the element.
-      if (strpos($property, 'attributes') !== FALSE) {
-        $this->setAttributes($this->element->getAttributes($property)->getArrayCopy(), $variable);
-      }
-      // Set normal variable.
-      elseif ($overwrite || !$this->offsetExists($variable)) {
-        $this->offsetSet($variable, $this->element->getProperty($property));
-      }
-    }
-    return $this;
-  }
-
-}
diff --git a/themes/bootstrap/starterkits/cdn/README.md b/themes/bootstrap/starterkits/cdn/README.md
deleted file mode 100644
index 519d89e..0000000
--- a/themes/bootstrap/starterkits/cdn/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- @file Instructions on how to sub-theme the Drupal Bootstrap base theme using the CDN Starterkit. -->
-<!-- @defgroup sub_theming_cdn -->
-<!-- @ingroup sub_theming -->
-# CDN Starterkit
-
-The CDN Starterkit is rather simple to set up. You don't have to do anything
-until you wish to override the default [Drupal Bootstrap] base theme settings
-or provide additional custom CSS.
-
-- [Prerequisite](#prerequisite)
-- [Override Styles](#styles)
-- [Override Settings](#settings)
-- [Override Templates and Theme Functions](#registry)
-
-## Prerequisite
-Read the @link subtheme Sub-theming @endlink parent topic.
-
-## Override Styles {#styles}
-Open `./THEMENAME/css/style.css` and modify the file to your liking.
-
-## Override Settings {#settings}
-Please refer to the @link theme_settings Sub-theme Settings @endlink topic.
-
-## Override Templates and Theme Functions {#registry}
-Please refer to the @link registry Theme Registry @endlink topic.
-
-[Drupal Bootstrap]: https://www.drupal.org/project/bootstrap
-[Bootstrap Framework]: http://getbootstrap.com
-[jsDelivr CDN]: http://www.jsdelivr.com
diff --git a/themes/bootstrap/starterkits/cdn/THEMENAME.libraries.yml b/themes/bootstrap/starterkits/cdn/THEMENAME.libraries.yml
deleted file mode 100644
index 7e123cd..0000000
--- a/themes/bootstrap/starterkits/cdn/THEMENAME.libraries.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-global-styling:
-  css:
-    theme:
-      css/style.css: {}
diff --git a/themes/bootstrap/starterkits/cdn/THEMENAME.starterkit.yml b/themes/bootstrap/starterkits/cdn/THEMENAME.starterkit.yml
deleted file mode 100644
index 1893439..0000000
--- a/themes/bootstrap/starterkits/cdn/THEMENAME.starterkit.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-core: 8.x
-type: theme
-base theme: bootstrap
-
-name: 'THEMETITLE'
-description: 'Uses the jsDelivr CDN for all CSS and JavaScript. No source files or compiling is necessary and is recommended for simple sites or beginners.'
-package: 'Bootstrap'
-
-regions:
-  navigation: 'Navigation'
-  navigation_collapsible: 'Navigation (Collapsible)'
-  header: 'Top Bar'
-  highlighted: 'Highlighted'
-  help: 'Help'
-  content: 'Content'
-  sidebar_first: 'Primary'
-  sidebar_second: 'Secondary'
-  footer: 'Footer'
-  page_top: 'Page top'
-  page_bottom: 'Page bottom'
-
-libraries:
-  - 'THEMENAME/global-styling'
diff --git a/themes/bootstrap/starterkits/cdn/THEMENAME.theme b/themes/bootstrap/starterkits/cdn/THEMENAME.theme
deleted file mode 100644
index 72cf6d4..0000000
--- a/themes/bootstrap/starterkits/cdn/THEMENAME.theme
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @file
- * Bootstrap sub-theme.
- *
- * Place your custom PHP code in this file.
- */
diff --git a/themes/bootstrap/starterkits/cdn/config/install/THEMENAME.settings.yml b/themes/bootstrap/starterkits/cdn/config/install/THEMENAME.settings.yml
deleted file mode 100644
index c2375f0..0000000
--- a/themes/bootstrap/starterkits/cdn/config/install/THEMENAME.settings.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Default settings should not be located here. This file is only used to
-# initially install a theme's "settings".
-#
-# Instead, the Drupal Bootstrap base theme uses the @BootstrapSetting
-# annotated plugin discovery process. This ensures that sub-theme settings are
-# inherited from base themes themes properly and to determine when a setting
-# should be saved to config as "overridden".
-#
-# @see \Drupal\bootstrap\Plugin\SettingBase
-# @see \Drupal\bootstrap\Plugin\SettingInterface
-# @see \Drupal\bootstrap\Plugin\SettingManager
-# @see \Drupal\bootstrap\Plugin\Form\SystemThemeSettings
-# @see \Drupal\bootstrap\ThemeSettings
-
-# This file cannot be empty, so install an initial empty array for "schemas".
-# @see https://www.drupal.org/node/2813829
-schemas: []
diff --git a/themes/bootstrap/starterkits/cdn/config/schema/THEMENAME.schema.yml b/themes/bootstrap/starterkits/cdn/config/schema/THEMENAME.schema.yml
deleted file mode 100644
index 25dc483..0000000
--- a/themes/bootstrap/starterkits/cdn/config/schema/THEMENAME.schema.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-# Schema for the theme setting configuration file of the THEMETITLE theme.
-
-THEMENAME.settings:
-  type: theme_settings
-  label: 'THEMETITLE settings'
diff --git a/themes/bootstrap/starterkits/cdn/css/style.css b/themes/bootstrap/starterkits/cdn/css/style.css
deleted file mode 100644
index e316585..0000000
--- a/themes/bootstrap/starterkits/cdn/css/style.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/**
- * Place your custom styles here.
- */
diff --git a/themes/bootstrap/starterkits/cdn/favicon.ico b/themes/bootstrap/starterkits/cdn/favicon.ico
deleted file mode 100644
index dea57407b73dfba672728a845f4f722e34657732..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmaiyyGjF55QZm2urwrSsX`jD2*k!p;;l{<B%KHr7Ah8A5F$owByXSy!A`*k5G;(n
zFJNa81iOHpMB_Kcf#GmA+2!Av`7g7FWkpilnT+t9maP$y2@#nAP%wR-B8zDGLLWL0
zx@rq+OW+YS!7(Tf@|%Wl7R-SXcmchCyi(WA7pv$;&i_oG1`WsQuB(LXa^O?%mwKt~
zK-=^?&~o5C@YuOG;CBP<n|ac9(C-DhWwl;_N<^=@d^4ikjw+h}F2*-q{w5*cRu5Vy
zqF=lGenh{8%YwUzrf1l3`Elltz_-d=4mdmeCw$iOTA5b@ul_HEfU|tXXRXJ3;QU4U
zZ8uxCVg6XfukV}(he1~Vk7_Iv<M3X({7K9+j3fU5%ENp~I@x@ZW_))_>YXu>w^5PS
exkx>w=sf+^Gwttl+PBhuk9xZ$k)Ko06Zr+B?k)5H

diff --git a/themes/bootstrap/starterkits/cdn/logo.svg b/themes/bootstrap/starterkits/cdn/logo.svg
deleted file mode 100644
index a5daf56..0000000
--- a/themes/bootstrap/starterkits/cdn/logo.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<svg
-     version="1.1"
-     xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     width="32px" height="32px"
-     viewBox="0 0 32 32" preserveAspectRatio="none">
-   <g>
-<image width="32" height="32" xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
-bWFnZVJlYWR5ccllPAAAAohJREFUeNrEl1tIVGEQx12L0BQjoXwpoRfxIQUJuhAIvVRLIRQELYj1
-oKDgpQgVNQhBChQfLFDLoovVS0RQYuqLPUgFgTcQia5CSBBERUiKuv0+GGGJPd/l7Nkc+DNn98w3
-8/++mXNmTigajaasp4T8Ejhx+GIWavOTkbaviRBITWBtIbgDkfT1InAGHAGDkNj2X1NAwFLU3ZgN
-fATnSMezpBIgcAaqWRBPHoFLEJlNVgpWRC943D8FJiDaA3IDOQEc5aNK5Ocou3vDf3u5HgFbNEu/
-gzrs7/smQKAa1BWQEfN3L06ruFcmdWCSa+A8a1acUkCAetTVf4IrqeReBIf3pPhMojbR41QDBDiO
-atc4LRU9ZVk7FXKaZgLyhus2OExbS6FDAV+OV5jxTqAa7DQ4e4qzTegiBwKZoFFLAKdqZ+UGR8Pk
-vwu9A7i+AU8TY6vuBNTjtcvgJB0nJyGhCvAgeO9AIBsc0hHYb+GkGDyGxG1ITHIdlmfeVop1BAoc
-HJ2FxENIqBOodVhXoCOw3TGnEfVCgsQDrmcc0uBJYNVHR20S3R/EPDDvw0c+p6AK94Wl/aKOwLTP
-uSIPfAHLFrYfdAReJzBZ2abvpY7ABHjrg8AcyAEbDXZL4LknAapZGdxyDD4vpPdZ2A7JC0zbC3pl
-R7bSJ70+YjFNtVoNJNKObQbMcXAA7AFjhhGvA6INVvMAhgOoBkNwNQsck5Z8wxB8wGuQ9VwEiQ7U
-BSmcWPkGOiXnv2QS3q0Jru6rCWrZ71BaKH0/JLXxCmd/+F8RuKkJ/gO0YNsd6IcJgcPSfI56mLxT
-3RJcJ/jnoD9MNsg3oZobcqWxqGf/J/gkdTFJ4N9J/zoOSv4KMAC++teHNUg1rQAAAABJRU5ErkJg
-gg==
-"/>
-   </g>
-</svg>
-
diff --git a/themes/bootstrap/starterkits/cdn/screenshot.png b/themes/bootstrap/starterkits/cdn/screenshot.png
deleted file mode 100644
index 7b6893a5375032059254f64e26fb1e1391ffe2d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19493
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
IM6N<$g8C0hasU7T

diff --git a/themes/bootstrap/starterkits/cdn/templates/README.md b/themes/bootstrap/starterkits/cdn/templates/README.md
deleted file mode 100644
index 5258e7c..0000000
--- a/themes/bootstrap/starterkits/cdn/templates/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Use this directory to override template, theme and \[pre\]process functions.
-
-Please refer to the @link registry Theme Registry @endlink topic for more info.
diff --git a/themes/bootstrap/starterkits/less/README.md b/themes/bootstrap/starterkits/less/README.md
deleted file mode 100644
index d323fe3..0000000
--- a/themes/bootstrap/starterkits/less/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- @file Instructions for subtheming using the Less Starterkit. -->
-<!-- @defgroup sub_theming_less -->
-<!-- @ingroup sub_theming -->
-# Less Starterkit
-
-Below are instructions on how to create a Bootstrap sub-theme using a Less
-preprocessor.
-
-- [Prerequisites](#prerequisites)
-- [Additional Setup](#setup)
-- [Overrides](#overrides)
-
-## Prerequisites
-- Read the @link getting_started Getting Started @endlink and @link sub_theming Sub-theming @endlink documentation topics.
-- You must understand the basic concept of using the [Less] CSS pre-processor.
-- You must use a **[local Less compiler](https://www.google.com/search?q=less+compiler)**.
-- You must use the [Bootstrap Framework Source Files] ending in the `.less`
-  extension, not files ending in `.css`.
-
-## Additional Setup {#setup}
-Download and extract the **latest** 3.x.x version of
-[Bootstrap Framework Source Files] into the root of your new sub-theme. After
-it has been extracted, the directory should be renamed (if needed) so it reads
-`./THEMENAME/bootstrap`.
-
-If for whatever reason you have an additional `bootstrap` directory wrapping the
-first `bootstrap` directory (e.g. `./THEMENAME/bootstrap/bootstrap`), remove the
-wrapping `bootstrap` directory. You will only ever need to touch these files if
-or when you upgrade your version of the [Bootstrap Framework].
-
-{.alert.alert-warning} **WARNING:** Do not modify the files inside of
-`./THEMENAME/bootstrap` directly. Doing so may cause issues when upgrading the
-[Bootstrap Framework] in the future.
-
-## Overrides {#overrides}
-The `./THEMENAME/less/variable-overrides.less` file is generally where you will
-the majority of your time overriding the variables provided by the [Bootstrap
-Framework].
-
-The `./THEMENAME/less/bootstrap.less` file is nearly an exact copy from the
-[Bootstrap Framework Source Files]. The only difference is that it injects the
-`variable-overrides.less` file directly after it has imported the [Bootstrap
-Framework]'s `variables.less` file. This allows you to easily override variables
-without having to constantly keep up with newer or missing variables during an
-upgrade.
-
-The `./THEMENAME/less/overrides.less` file contains various Drupal overrides to
-properly integrate with the [Bootstrap Framework]. It may contain a few
-enhancements, feel free to edit this file as you see fit.
-
-The `./THEMENAME/less/style.less` file is the glue that combines the
-[Bootstrap Framework Source Files] and `overrides.less` files together.
-Generally, you will not need to modify this file unless you need to add or
-remove files to be imported. This is the file that you should compile to
-`./THEMENAME/css/styles.css` (note the same file name, using a different
-extension of course).
-
-#### See also:
-- @link theme_settings Theme Settings @endlink
-- @link templates Templates @endlink
-- @link plugins Plugin System @endlink
-
-[Bootstrap Framework]: http://getbootstrap.com
-[Bootstrap Framework Source Files]: https://github.com/twbs/bootstrap/releases
-[Less]: http://lesscss.org
diff --git a/themes/bootstrap/starterkits/less/THEMENAME.libraries.yml b/themes/bootstrap/starterkits/less/THEMENAME.libraries.yml
deleted file mode 100644
index c2a26b9..0000000
--- a/themes/bootstrap/starterkits/less/THEMENAME.libraries.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-global-styling:
-  css:
-    theme:
-      css/style.css: {}
-
-bootstrap-scripts:
-  js:
-    bootstrap/js/affix.js: {}
-    bootstrap/js/alert.js: {}
-    bootstrap/js/button.js: {}
-    bootstrap/js/carousel.js: {}
-    bootstrap/js/collapse.js: {}
-    bootstrap/js/dropdown.js: {}
-    bootstrap/js/modal.js: {}
-    bootstrap/js/tooltip.js: {}
-    bootstrap/js/popover.js: {}
-    bootstrap/js/scrollspy.js: {}
-    bootstrap/js/tab.js: {}
-    bootstrap/js/transition.js: {}
diff --git a/themes/bootstrap/starterkits/less/THEMENAME.starterkit.yml b/themes/bootstrap/starterkits/less/THEMENAME.starterkit.yml
deleted file mode 100644
index 1ac9670..0000000
--- a/themes/bootstrap/starterkits/less/THEMENAME.starterkit.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-core: 8.x
-type: theme
-base theme: bootstrap
-
-name: 'THEMETITLE'
-description: 'Uses the Bootstrap framework LESS source files and must be compiled (not for beginners).'
-package: 'Bootstrap'
-
-regions:
-  navigation: 'Navigation'
-  navigation_collapsible: 'Navigation (Collapsible)'
-  header: 'Top Bar'
-  highlighted: 'Highlighted'
-  help: 'Help'
-  content: 'Content'
-  sidebar_first: 'Primary'
-  sidebar_second: 'Secondary'
-  footer: 'Footer'
-  page_top: 'Page top'
-  page_bottom: 'Page bottom'
-
-libraries:
-  - 'THEMENAME/global-styling'
-  - 'THEMENAME/bootstrap-scripts'
diff --git a/themes/bootstrap/starterkits/less/THEMENAME.theme b/themes/bootstrap/starterkits/less/THEMENAME.theme
deleted file mode 100644
index 72cf6d4..0000000
--- a/themes/bootstrap/starterkits/less/THEMENAME.theme
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @file
- * Bootstrap sub-theme.
- *
- * Place your custom PHP code in this file.
- */
diff --git a/themes/bootstrap/starterkits/less/config/install/THEMENAME.settings.yml b/themes/bootstrap/starterkits/less/config/install/THEMENAME.settings.yml
deleted file mode 100644
index ff874ac..0000000
--- a/themes/bootstrap/starterkits/less/config/install/THEMENAME.settings.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Default settings should not be located here. This file is only used to
-# override existing settings. If your theme is the one that introduces a new
-# theme setting, it should use the Drupal Bootstrap base theme's
-# @BootstrapSetting annotation discovery process. This ensures that sub-theme
-# settings are inherited from base themes themes properly and to determine when
-# a setting should be saved to config as "overridden".
-#
-# @see \Drupal\bootstrap\Plugin\SettingBase
-# @see \Drupal\bootstrap\Plugin\SettingInterface
-# @see \Drupal\bootstrap\Plugin\SettingManager
-# @see \Drupal\bootstrap\Plugin\Form\SystemThemeSettings
-# @see \Drupal\bootstrap\ThemeSettings
-
-# Disable the CDN provider so compiled LESS source files can be used.
-cdn_provider: ''
diff --git a/themes/bootstrap/starterkits/less/config/schema/THEMENAME.schema.yml b/themes/bootstrap/starterkits/less/config/schema/THEMENAME.schema.yml
deleted file mode 100644
index 25dc483..0000000
--- a/themes/bootstrap/starterkits/less/config/schema/THEMENAME.schema.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-# Schema for the theme setting configuration file of the THEMETITLE theme.
-
-THEMENAME.settings:
-  type: theme_settings
-  label: 'THEMETITLE settings'
diff --git a/themes/bootstrap/starterkits/less/css/style.css b/themes/bootstrap/starterkits/less/css/style.css
deleted file mode 100644
index 6f88231..0000000
--- a/themes/bootstrap/starterkits/less/css/style.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * This file will be overwritten when the Bootstrap Framework source files
- * are compiled using the LESS CSS pre-processor.
- */
diff --git a/themes/bootstrap/starterkits/less/favicon.ico b/themes/bootstrap/starterkits/less/favicon.ico
deleted file mode 100644
index dea57407b73dfba672728a845f4f722e34657732..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmaiyyGjF55QZm2urwrSsX`jD2*k!p;;l{<B%KHr7Ah8A5F$owByXSy!A`*k5G;(n
zFJNa81iOHpMB_Kcf#GmA+2!Av`7g7FWkpilnT+t9maP$y2@#nAP%wR-B8zDGLLWL0
zx@rq+OW+YS!7(Tf@|%Wl7R-SXcmchCyi(WA7pv$;&i_oG1`WsQuB(LXa^O?%mwKt~
zK-=^?&~o5C@YuOG;CBP<n|ac9(C-DhWwl;_N<^=@d^4ikjw+h}F2*-q{w5*cRu5Vy
zqF=lGenh{8%YwUzrf1l3`Elltz_-d=4mdmeCw$iOTA5b@ul_HEfU|tXXRXJ3;QU4U
zZ8uxCVg6XfukV}(he1~Vk7_Iv<M3X({7K9+j3fU5%ENp~I@x@ZW_))_>YXu>w^5PS
exkx>w=sf+^Gwttl+PBhuk9xZ$k)Ko06Zr+B?k)5H

diff --git a/themes/bootstrap/starterkits/less/images/required.svg b/themes/bootstrap/starterkits/less/images/required.svg
deleted file mode 100644
index e69de29..0000000
diff --git a/themes/bootstrap/starterkits/less/less/bootstrap.less b/themes/bootstrap/starterkits/less/less/bootstrap.less
deleted file mode 100644
index caf03c0..0000000
--- a/themes/bootstrap/starterkits/less/less/bootstrap.less
+++ /dev/null
@@ -1,61 +0,0 @@
-// This is almost an exact duplication of the bootstrap.less file provided
-// by the Bootstrap Framework itself. The only difference from that file and
-// this one are the first two @import statements for the original framework's
-// variables and this theme's overrides of those variables. This is necessary
-// due to the fact that the Less pre-compiler language does not have the
-// concept of "default" variables.
-//
-// @see https://www.drupal.org/node/2775481
-@import "../bootstrap/less/variables.less";
-@import "variable-overrides.less";
-
-// Mixins.
-@import "../bootstrap/less/mixins.less";
-
-// Reset and dependencies
-@import "../bootstrap/less/normalize.less";
-@import "../bootstrap/less/print.less";
-@import "../bootstrap/less/glyphicons.less";
-
-// Core CSS
-@import "../bootstrap/less/scaffolding.less";
-@import "../bootstrap/less/type.less";
-@import "../bootstrap/less/code.less";
-@import "../bootstrap/less/grid.less";
-
-@import "../bootstrap/less/tables.less";
-@import "../bootstrap/less/forms.less";
-@import "../bootstrap/less/buttons.less";
-
-// Components
-@import "../bootstrap/less/component-animations.less";
-@import "../bootstrap/less/dropdowns.less";
-@import "../bootstrap/less/button-groups.less";
-@import "../bootstrap/less/input-groups.less";
-@import "../bootstrap/less/navs.less";
-@import "../bootstrap/less/navbar.less";
-@import "../bootstrap/less/breadcrumbs.less";
-@import "../bootstrap/less/pagination.less";
-@import "../bootstrap/less/pager.less";
-@import "../bootstrap/less/labels.less";
-@import "../bootstrap/less/badges.less";
-@import "../bootstrap/less/jumbotron.less";
-@import "../bootstrap/less/thumbnails.less";
-@import "../bootstrap/less/alerts.less";
-@import "../bootstrap/less/progress-bars.less";
-@import "../bootstrap/less/media.less";
-@import "../bootstrap/less/list-group.less";
-@import "../bootstrap/less/panels.less";
-@import "../bootstrap/less/responsive-embed.less";
-@import "../bootstrap/less/wells.less";
-@import "../bootstrap/less/close.less";
-
-// Components w/ JavaScript
-@import "../bootstrap/less/modals.less";
-@import "../bootstrap/less/tooltip.less";
-@import "../bootstrap/less/popovers.less";
-@import "../bootstrap/less/carousel.less";
-
-// Utility classes
-@import "../bootstrap/less/utilities.less";
-@import "../bootstrap/less/responsive-utilities.less";
diff --git a/themes/bootstrap/starterkits/less/less/component/ajax.less b/themes/bootstrap/starterkits/less/less/component/ajax.less
deleted file mode 100644
index 4e46137..0000000
--- a/themes/bootstrap/starterkits/less/less/component/ajax.less
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * AJAX (throbber) styling.
- */
-
-// @todo This should probably be it's own mixin/component?
-@keyframes glyphicon-spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(359deg); }
-}
-.glyphicon-spin {
-  display: inline-block;
-  animation: glyphicon-spin 1s infinite linear;
-}
-a .glyphicon-spin {
-  display: inline-block;
-  text-decoration: none;
-}
-
-html.js {
-  .btn .ajax-throbber {
-    margin-left: .5em;
-    margin-right: -.25em;
-  }
-
-  .form-item .input-group-addon {
-    .glyphicon {
-      color: @gray-light;
-      opacity: .5;
-      transition: 150ms color, 150ms opacity;
-      &.glyphicon-spin {
-        color: @brand-primary;
-        opacity: 1;
-      }
-    }
-    .input-group-addon {
-      background-color: rgb(255, 255, 255);
-    }
-  }
-
-  // Hide empty wrappers from AJAX/Field APIs.
-  .ajax-new-content:empty {
-    display: none !important;
-  }
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/alert.less b/themes/bootstrap/starterkits/less/less/component/alert.less
deleted file mode 100644
index c4e0202..0000000
--- a/themes/bootstrap/starterkits/less/less/component/alert.less
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Alert styling.
- */
-.alert-sm {
-  padding: 5px 10px;
-}
-
-// Treat all links inside alert as .alert-link
-.alert a {
-  font-weight: @alert-link-font-weight;
-}
-.alert-success {
-  a, a:hover, a:focus {
-    color: darken(@alert-success-text, 10%);
-  }
-}
-.alert-info {
-  a, a:hover, a:focus {
-    color: darken(@alert-info-text, 10%);
-  }
-}
-.alert-warning {
-  a, a:hover, a:focus {
-    color: darken(@alert-warning-text, 10%);
-  }
-}
-.alert-danger {
-  a, a:hover, a:focus {
-    color: darken(@alert-danger-text, 10%);
-  }
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/field.less b/themes/bootstrap/starterkits/less/less/component/field.less
deleted file mode 100644
index a21bd29..0000000
--- a/themes/bootstrap/starterkits/less/less/component/field.less
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file
- * Visual styles for fields.
- */
-
-.field--label {
-  font-weight: bold;
-}
-.field--label-inline .field--label,
-.field--label-inline .field--items {
-  float: left; /*LTR*/
-}
-.field--label-inline .field--label,
-.field--label-inline > .field--item,
-.field--label-inline .field--items {
-  padding-right: 0.5em;
-}
-[dir="rtl"] .field--label-inline .field--label,
-[dir="rtl"] .field--label-inline .field--items {
-  padding-left: 0.5em;
-  padding-right: 0;
-}
-.field--label-inline .field--label::after {
-  content: ':';
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/file.less b/themes/bootstrap/starterkits/less/less/component/file.less
deleted file mode 100644
index b328850..0000000
--- a/themes/bootstrap/starterkits/less/less/component/file.less
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * File (and Image Widget) styles.
- */
-.file {
-  display: table;
-  font-size: 75%;
-  font-weight: 700;
-  margin: 5px 0;
-  width: 100%;
-  > span {
-    background: #fff;
-    color: @brand-primary;
-    border-bottom: 1px solid @input-border;
-    border-top: 1px solid @input-border;
-    &:first-child {
-      border-left: 1px solid @input-border;
-    }
-    &:last-child {
-      border-right: 1px solid @input-border;
-    }
-  }
-  > .tabledrag-changed {
-    &, &:last-child {
-      border: 1px solid darken(@alert-warning-border, 5%);
-    }
-    background: @alert-warning-bg;
-    border-radius: 0;
-    color: @alert-warning-text;
-    display: table-cell;
-    padding: 0 1em;
-    top: 0;
-    vertical-align: middle;
-    border-left: 1px solid inherit;
-  }
-}
-.file-icon {
-  display: table-cell;
-  font-size: 150%;
-  padding: .25em .5em;
-  text-align: center;
-  vertical-align: middle;
-}
-.file-link {
-  display: table-cell;
-  vertical-align: middle;
-  width: 100%;
-  a, a:hover, a:focus, a:active {
-    color: inherit;
-  }
-}
-.file-size {
-  display: table-cell;
-  padding: 0 1em;
-  text-align: right;
-  white-space: pre;
-  vertical-align: middle;
-}
-
-.image-widget.row {
-  overflow: hidden;
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/filter.less b/themes/bootstrap/starterkits/less/less/component/filter.less
deleted file mode 100644
index 597cd36..0000000
--- a/themes/bootstrap/starterkits/less/less/component/filter.less
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Filter styles.
- */
-
-// Mimic .panel-default styling.
-.filter-wrapper {
-  background-color: @panel-bg;
-  border: 1px solid @panel-default-border;
-  border-top: 0;
-  border-radius: 0 0 @panel-border-radius @panel-border-radius;
-  box-shadow: 0 1px 1px rgba(0,0,0,.05);
-  margin-bottom: 0;
-  padding: 10px;
-  height: 51px;
-  &:extend(.clearfix all);
-}
-.filter-help {
-  float: right;
-  line-height: 1;
-  margin: .5em 0 0;
-}
-
-// Full list page.
-.nav.nav-tabs.filter-formats {
-  margin-bottom: 15px;
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/form.less b/themes/bootstrap/starterkits/less/less/component/form.less
deleted file mode 100644
index c96d613..0000000
--- a/themes/bootstrap/starterkits/less/less/component/form.less
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Form styles.
- */
-
-// Checkboxes / radio buttons.
-.checkbox, .radio {
-  // Remove top/bottom margins when in table context, because this is most
-  // likely a tableselect checkbox element.
-  table &.form-no-label {
-    margin-bottom: 0;
-    margin-top: 0;
-  }
-}
-
-// Browsers do not recognize pseudo :after selectors, we must create a wrapper
-// around the select element to style it properly.
-// @see http://stackoverflow.com/q/21103542
-.select-wrapper {
-  display: inline-block;
-  position: relative;
-  width: 100%;
-  .form-inline & {
-    width: auto;
-  }
-  .input-group & {
-    display: table-cell;
-    // Reset rounded corners
-    &:first-child .form-control:first-child {
-      .border-left-radius(@border-radius-base);
-    }
-    &:last-child .form-control:first-child {
-      .border-right-radius(@border-radius-base);
-    }
-  }
-  select {
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    appearance: none;
-    line-height: 1;
-    padding-right: 2em;
-    &::-ms-expand {
-      opacity: 0;
-    }
-  }
-  &:after {
-    color: @brand-primary;
-    content: '▼';
-    font-style: normal;
-    font-weight: 400;
-    line-height: 1;
-    margin-top: -.5em;
-    padding-right: .5em;
-    pointer-events: none;
-    position: absolute;
-    right: 0;
-    top: 50%;
-    z-index: 10;
-
-    // Use a more stylish icon if the theme uses glyphicons.
-    .has-glyphicons & {
-      -webkit-font-smoothing: antialiased;
-      -moz-osx-font-smoothing: grayscale;
-      content: '\e114'; // .glyphicon-chevron-down
-      display: inline-block;
-      font-family: 'Glyphicons Halflings';
-    }
-    .has-error & {
-      color: @state-danger-text;
-    }
-    .has-success & {
-      color: @state-success-text;
-    }
-    .has-warning & {
-      color: @state-warning-text;
-    }
-  }
-}
-
-// Use CSS/SVG image for required mark.
-// @see https://www.drupal.org/node/2152217
-// @see https://www.drupal.org/node/2274631
-.form-required:after {
-  background-image: url(../images/required.svg);
-  background-size: 10px 7px;
-  content:"";
-  display: inline-block;
-  line-height:1;
-  height: 7px;
-  width: 10px;
-}
-
-// Form action buttons.
-.form-actions {
-  .btn, .btn-group {
-    margin-right: 10px;
-  }
-  .btn-group {
-    .btn {
-      margin-right: 0;
-    }
-  }
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/icon.less b/themes/bootstrap/starterkits/less/less/component/icon.less
deleted file mode 100644
index a40a74e..0000000
--- a/themes/bootstrap/starterkits/less/less/component/icon.less
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Icon styles.
- */
-a {
-  &.icon-before .glyphicon {
-    margin-right: .25em;
-  }
-  &.icon-after .glyphicon {
-    margin-left: .25em;
-  }
-}
-
-.btn {
-  &.icon-before .glyphicon {
-    margin-left: -.25em;
-    margin-right: .25em;
-  }
-  &.icon-after .glyphicon {
-    margin-left: .25em;
-    margin-right: -.25em;
-  }
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/navbar.less b/themes/bootstrap/starterkits/less/less/component/navbar.less
deleted file mode 100644
index 252700f..0000000
--- a/themes/bootstrap/starterkits/less/less/component/navbar.less
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Navbar styling.
- */
-@mobile:          ~"screen and (max-width: @{screen-xs-max})";
-@tablet:          ~"screen and (min-width: @{screen-sm-min})";
-@normal:          ~"screen and (min-width: @{screen-md-min})";
-@wide:            ~"screen and (min-width: @{screen-lg-min})";
-@grid-breakpoint: ~"screen and (min-width: @{grid-float-breakpoint})";
-
-body {
-  // Fix horizontal scrolling on iOS devices.
-  // http://drupal.org/node/1870076
-  position: relative;
-
-  &.navbar-is-static-top {
-    margin-top: 0;
-  }
-  &.navbar-is-fixed-top {
-    margin-top: (@navbar-height + (@grid-gutter-width / 2));
-  }
-  &.navbar-is-fixed-bottom {
-    padding-bottom: (@navbar-height + (@grid-gutter-width / 2));
-  }
-
-  @media @tablet {
-    margin-top: (@grid-gutter-width / 2);
-  }
-  @media @mobile {
-    &.toolbar-vertical {
-      &.navbar-is-fixed-top,
-      &.navbar-is-fixed-bottom {
-        .toolbar-bar {
-          position: fixed;
-        }
-        header {
-          z-index: 500;
-        }
-      }
-      // Default toolbar fixed height value.
-      // @see core/modules/toolbar/css/toolbar.icons.theme.css@261
-      &.navbar-is-fixed-top header {
-        top: 39px;
-      }
-    }
-  }
-}
-.navbar.container {
-  @media @tablet {
-    max-width: ((@container-sm - @grid-gutter-width));
-  }
-  @media @normal {
-    max-width: ((@container-md - @grid-gutter-width));
-  }
-  @media @wide {
-    max-width: ((@container-lg - @grid-gutter-width));
-  }
-}
-
-// Branding.
-.navbar .logo {
-  margin-right: -(@grid-gutter-width / 2);
-  padding-left: (@grid-gutter-width / 2);
-  padding-right: (@grid-gutter-width / 2);
-  @media @grid-breakpoint {
-    margin-right: 0;
-    padding-left: 0;
-  }
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/node.less b/themes/bootstrap/starterkits/less/less/component/node.less
deleted file mode 100644
index 6012c1b..0000000
--- a/themes/bootstrap/starterkits/less/less/component/node.less
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Node styling.
- */
-
-.node-preview-container {
-  margin-top: -(@grid-gutter-width / 2);
-}
-
-.node-preview-form-select {
-  padding: (@grid-gutter-width / 2);
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/panel.less b/themes/bootstrap/starterkits/less/less/component/panel.less
deleted file mode 100644
index 1fce624..0000000
--- a/themes/bootstrap/starterkits/less/less/component/panel.less
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Panel styling.
- */
-.panel-title {
-  display: block;
-  margin: -10px -15px;
-  padding: 10px 15px;
-  &, &:hover, &:focus, &:hover:focus {
-    color: inherit;
-  }
-  &:focus, &:hover {
-    text-decoration: none;
-  }
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/progress-bar.less b/themes/bootstrap/starterkits/less/less/component/progress-bar.less
deleted file mode 100644
index 9957d46..0000000
--- a/themes/bootstrap/starterkits/less/less/component/progress-bar.less
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Progress bar styles.
- */
-.progress-wrapper {
-  margin-bottom: @form-group-margin-bottom;
-
-  &:last-child .progress {
-    margin-bottom: 5px;
-  }
-
-  .message {
-    font-weight: 700;
-    margin-bottom: 5px;
-  }
-
-  .percentage,
-  .progress-label {
-    font-size: @font-size-small;
-  }
-
-  .progress-bar {
-    min-width: 2em;
-  }
-
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/table-drag.less b/themes/bootstrap/starterkits/less/less/component/table-drag.less
deleted file mode 100644
index 5a4e009..0000000
--- a/themes/bootstrap/starterkits/less/less/component/table-drag.less
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Table drag styles.
- */
-.tabledrag-toggle-weight {
-  float: right;
-  margin: 1px 2px 1px 10px;
-}
-.tabledrag-changed-warning {
-  margin: 0;
-  overflow: hidden;
-}
-.tabledrag-handle {
-  color: @gray-light;
-  cursor: move;
-  float: left;
-  font-size: 125%;
-  line-height: 1;
-  margin: -10px 0 0 -10px;
-  padding: 10px;
-  &:hover, &:focus {
-    color: @brand-primary;
-  }
-}
-.indentation {
-  float: left; /* LTR */
-  height: 1.7em;
-  margin: -0.4em 0.2em -0.4em -0.4em; /* LTR */
-  padding: 0.42em 0 0.42em 0.6em; /* LTR */
-  width: 20px;
-  [dir="rtl"] & {
-    float: right;
-    margin: -0.4em -0.4em -0.4em 0.2em;
-    padding: 0.42em 0.6em 0.42em 0;
-  }
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/tabs.less b/themes/bootstrap/starterkits/less/less/component/tabs.less
deleted file mode 100644
index 33118c7..0000000
--- a/themes/bootstrap/starterkits/less/less/component/tabs.less
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Tabs and local action styles.
- */
-.local-actions {
-  margin: 10px 0 10px -5px;
-}
-.tabs--secondary {
-  margin: 10px 0 5px;
-}
-
-/**
- * Missing Bootstrap 2 tab styling.
- * @see http://stackoverflow.com/questions/18432577/stacked-tabs-in-bootstrap-3
- * @see http://bootply.com/74926
- */
-.tabbable {
-  margin-bottom: 20px;
-}
-.tabs-below, .tabs-left, .tabs-right {
-  > .nav-tabs {
-    border-bottom: 0;
-    .summary {
-      color: @nav-disabled-link-color;
-      font-size: @font-size-small;
-    }
-  }
-}
-.tab-pane > .panel-heading {
-  display: none;
-}
-.tab-content > .active {
-  display: block;
-}
-
-// Below.
-.tabs-below {
-  > .nav-tabs {
-    border-top: 1px solid @nav-tabs-border-color;
-    > li {
-      margin-top: -1px;
-      margin-bottom: 0;
-      > a {
-        border-radius: 0 0 @border-radius-base @border-radius-base;
-        &:hover,
-        &:focus {
-          border-top-color: @nav-tabs-border-color;
-          border-bottom-color: transparent;
-        }
-      }
-    }
-    > .active {
-      > a,
-      > a:hover,
-      > a:focus {
-        border-color: transparent @nav-tabs-border-color @nav-tabs-border-color @nav-tabs-border-color;
-      }
-    }
-  }
-}
-
-// Left and right tabs.
-.tabs-left,
-.tabs-right {
-  > .nav-tabs {
-    padding-bottom: 20px;
-    width: 220px;
-    > li {
-      float: none;
-      &:focus {
-        outline: 0;
-      }
-      > a {
-        margin-right: 0;
-        margin-bottom: 3px;
-        &:focus {
-          outline: 0;
-        }
-      }
-    }
-  }
-  > .tab-content {
-    border-radius: 0 @border-radius-base @border-radius-base @border-radius-base;
-    border: 1px solid @nav-tabs-border-color;
-    box-shadow: 0 1px 1px rgba(0,0,0,.05);
-    overflow: hidden;
-    padding: 10px 15px;
-  }
-}
-
-// Left tabs.
-.tabs-left {
-  > .nav-tabs {
-    float: left;
-    margin-right: -1px;
-    > li > a {
-      border-radius: @border-radius-base 0 0 @border-radius-base;
-      &:hover,
-      &:focus {
-        border-color: @nav-tabs-link-hover-border-color @nav-tabs-border-color @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color;
-      }
-    }
-    > .active > a,
-    > .active > a:hover,
-    > .active > a:focus {
-      border-color: @nav-tabs-border-color transparent @nav-tabs-border-color @nav-tabs-border-color;
-      box-shadow: -1px 1px 1px rgba(0,0,0,.05);
-    }
-  }
-}
-
-// Right tabs.
-.tabs-right {
-  > .nav-tabs {
-    float: right;
-    margin-left: -1px;
-    > li > a {
-      border-radius: 0 @border-radius-base @border-radius-base 0;
-      &:hover,
-      &:focus {
-        border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;
-        box-shadow: 1px 1px 1px rgba(0,0,0,.05);
-      }
-    }
-    > .active > a,
-    > .active > a:hover,
-    > .active > a:focus {
-      border-color: @nav-tabs-border-color @nav-tabs-border-color @nav-tabs-border-color transparent;
-    }
-  }
-}
diff --git a/themes/bootstrap/starterkits/less/less/component/toolbar.less b/themes/bootstrap/starterkits/less/less/component/toolbar.less
deleted file mode 100644
index c25b26d..0000000
--- a/themes/bootstrap/starterkits/less/less/component/toolbar.less
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Toolbar module styling.
- */
-
-@toolbar-width: 240px;
-
-body.toolbar-fixed {
-
-  // Fix z-index.
-  .toolbar-oriented .toolbar-bar {
-    z-index: (@zindex-navbar-fixed + 1);
-  }
-
-  .navbar-fixed-top {
-    top: 39px;
-  }
-
-  // Horizontal.
-  &.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top {
-    top: 79px;
-  }
-
-  // Vertical Open.
-  &.toolbar-vertical.toolbar-tray-open {
-
-    .navbar-fixed-top {
-      left: @toolbar-width;
-    }
-
-    &.toolbar-fixed {
-      margin-left: @toolbar-width;
-
-      .toolbar-tray {
-        padding-bottom: 40px;
-        &, > .toolbar-lining:before {
-          width: @toolbar-width;
-        }
-      }
-
-    }
-
-  }
-
-}
diff --git a/themes/bootstrap/starterkits/less/less/jquery-ui/autocomplete.less b/themes/bootstrap/starterkits/less/less/jquery-ui/autocomplete.less
deleted file mode 100644
index df30751..0000000
--- a/themes/bootstrap/starterkits/less/less/jquery-ui/autocomplete.less
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * jQuery UI autocomplete widget style overrides.
- *
- * @todo Remove once jQuery UI is no longer used?
- */
-
-// Mimics .dropdown-menu styles.
-.ui-autocomplete {
-  background: @dropdown-bg;
-  background-clip: padding-box;
-  border: 1px solid @dropdown-fallback-border;
-  border: 1px solid @dropdown-border;
-  border-radius: @border-radius-base;
-  box-shadow: 0 6px 12px rgba(0,0,0,.175);
-  color: inherit;
-  font-family: @font-family-base;
-  font-size: @font-size-base;
-  list-style: none;
-  min-width: 160px;
-  padding: 5px 0;
-  text-align: left;
-  z-index: @zindex-dropdown;
-
-  .ui-menu-item {
-    border: 0;
-    border-radius: 0;
-    clear: both;
-    color: @dropdown-link-color;
-    cursor: pointer;
-    display: block;
-    font-weight: normal;
-    line-height: @line-height-base;
-    margin: 0;
-    outline: 0;
-    padding: 3px 20px;
-    text-decoration: none;
-    white-space: nowrap;
-
-    &.ui-state-hover {
-      background: @dropdown-link-hover-bg;
-      color: @dropdown-link-hover-color;
-    }
-
-    &.ui-state-active, &.ui-state-focus {
-      background: @dropdown-link-active-bg;
-      color: @dropdown-link-active-color;
-    }
-
-  }
-
-}
diff --git a/themes/bootstrap/starterkits/less/less/overrides.less b/themes/bootstrap/starterkits/less/less/overrides.less
deleted file mode 100644
index bad67fa..0000000
--- a/themes/bootstrap/starterkits/less/less/overrides.less
+++ /dev/null
@@ -1,69 +0,0 @@
-// @todo these should be their own CSS files and only included when
-// specific Drupal libraries are used.
-@import "component/alert";
-@import "component/ajax";
-@import "component/field";
-@import "component/file";
-@import "component/filter";
-@import "component/form";
-@import "component/icon";
-@import "component/navbar";
-@import "component/node";
-@import "component/panel";
-@import "component/progress-bar";
-@import "component/table-drag";
-@import "component/tabs";
-@import "component/toolbar";
-
-// jQuery UI style overrides.
-@import "jquery-ui/autocomplete";
-
-ol, ul {
-  padding-left: 1.5em;
-  .popover &:last-child {
-    margin-bottom: 0;
-  }
-}
-
-// Page header.
-.page-header {
-  margin-top: 0;
-}
-
-// Footer.
-.footer {
-  margin-top: 45px;
-  padding-top: 35px;
-  padding-bottom: 36px;
-  border-top: 1px solid #E5E5E5;
-}
-
-// Paragraphs.
-p:last-child,
-.form-group:last-child,
-.panel:last-child {
-  margin-bottom: 0;
-}
-
-// Help region.
-.region-help {
-  > .glyphicon {
-    font-size: @font-size-large;
-    float: left;
-    margin: -0.05em 0.5em 0 0;
-  }
-  .block {
-    overflow: hidden;
-  }
-}
-
-
-.help-block, .control-group .help-inline {
-  color: @gray-light;
-  font-size: 12px;
-  margin: 5px 0 10px;
-  padding: 0;
-  &:first-child {
-    margin-top: 0;
-  }
-}
diff --git a/themes/bootstrap/starterkits/less/less/style.less b/themes/bootstrap/starterkits/less/less/style.less
deleted file mode 100644
index 31ef265..0000000
--- a/themes/bootstrap/starterkits/less/less/style.less
+++ /dev/null
@@ -1,5 +0,0 @@
-// Bootstrap Framework.
-@import 'bootstrap';
-
-// Base-theme overrides.
-@import 'overrides';
diff --git a/themes/bootstrap/starterkits/less/less/variable-overrides.less b/themes/bootstrap/starterkits/less/less/variable-overrides.less
deleted file mode 100644
index 7ded595..0000000
--- a/themes/bootstrap/starterkits/less/less/variable-overrides.less
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Variable Overrides.
- *
- * Modify this file to override the Bootstrap Framework variables. You can copy
- * these variables directly from ../bootstrap/less/variables.less to this file.
- */
-
-// Set the proper directory for the Bootstrap Glyphicon font.
-@icon-font-path: '../bootstrap/fonts/';
diff --git a/themes/bootstrap/starterkits/less/logo.svg b/themes/bootstrap/starterkits/less/logo.svg
deleted file mode 100644
index a5daf56..0000000
--- a/themes/bootstrap/starterkits/less/logo.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<svg
-     version="1.1"
-     xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     width="32px" height="32px"
-     viewBox="0 0 32 32" preserveAspectRatio="none">
-   <g>
-<image width="32" height="32" xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
-bWFnZVJlYWR5ccllPAAAAohJREFUeNrEl1tIVGEQx12L0BQjoXwpoRfxIQUJuhAIvVRLIRQELYj1
-oKDgpQgVNQhBChQfLFDLoovVS0RQYuqLPUgFgTcQia5CSBBERUiKuv0+GGGJPd/l7Nkc+DNn98w3
-8/++mXNmTigajaasp4T8Ejhx+GIWavOTkbaviRBITWBtIbgDkfT1InAGHAGDkNj2X1NAwFLU3ZgN
-fATnSMezpBIgcAaqWRBPHoFLEJlNVgpWRC943D8FJiDaA3IDOQEc5aNK5Ocou3vDf3u5HgFbNEu/
-gzrs7/smQKAa1BWQEfN3L06ruFcmdWCSa+A8a1acUkCAetTVf4IrqeReBIf3pPhMojbR41QDBDiO
-atc4LRU9ZVk7FXKaZgLyhus2OExbS6FDAV+OV5jxTqAa7DQ4e4qzTegiBwKZoFFLAKdqZ+UGR8Pk
-vwu9A7i+AU8TY6vuBNTjtcvgJB0nJyGhCvAgeO9AIBsc0hHYb+GkGDyGxG1ITHIdlmfeVop1BAoc
-HJ2FxENIqBOodVhXoCOw3TGnEfVCgsQDrmcc0uBJYNVHR20S3R/EPDDvw0c+p6AK94Wl/aKOwLTP
-uSIPfAHLFrYfdAReJzBZ2abvpY7ABHjrg8AcyAEbDXZL4LknAapZGdxyDD4vpPdZ2A7JC0zbC3pl
-R7bSJ70+YjFNtVoNJNKObQbMcXAA7AFjhhGvA6INVvMAhgOoBkNwNQsck5Z8wxB8wGuQ9VwEiQ7U
-BSmcWPkGOiXnv2QS3q0Jru6rCWrZ71BaKH0/JLXxCmd/+F8RuKkJ/gO0YNsd6IcJgcPSfI56mLxT
-3RJcJ/jnoD9MNsg3oZobcqWxqGf/J/gkdTFJ4N9J/zoOSv4KMAC++teHNUg1rQAAAABJRU5ErkJg
-gg==
-"/>
-   </g>
-</svg>
-
diff --git a/themes/bootstrap/starterkits/less/screenshot.png b/themes/bootstrap/starterkits/less/screenshot.png
deleted file mode 100644
index 7b6893a5375032059254f64e26fb1e1391ffe2d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19493
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
IM6N<$g8C0hasU7T

diff --git a/themes/bootstrap/starterkits/less/templates/README.md b/themes/bootstrap/starterkits/less/templates/README.md
deleted file mode 100644
index 5258e7c..0000000
--- a/themes/bootstrap/starterkits/less/templates/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Use this directory to override template, theme and \[pre\]process functions.
-
-Please refer to the @link registry Theme Registry @endlink topic for more info.
diff --git a/themes/bootstrap/starterkits/sass/README.md b/themes/bootstrap/starterkits/sass/README.md
deleted file mode 100644
index eefe74c..0000000
--- a/themes/bootstrap/starterkits/sass/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- @file Instructions for subtheming using the Sass Starterkit. -->
-<!-- @defgroup sub_theming_sass -->
-<!-- @ingroup sub_theming -->
-# Sass Starterkit
-
-Below are instructions on how to create a Bootstrap sub-theme using a Sass
-preprocessor.
-
-- [Prerequisites](#prerequisites)
-- [Additional Setup](#setup)
-- [Overrides](#overrides)
-
-## Prerequisites
-- Read the @link getting_started Getting Started @endlink and @link sub_theming Sub-theming @endlink documentation topics.
-- You must understand the basic concept of using the [Sass] CSS pre-processor.
-- You must use a **[local Sass compiler](https://www.google.com/search?q=sass+compiler)**.
-- You must use the [Bootstrap Framework Source Files] ending in the `.scss`
-  extension, not files ending in `.css`.
-
-## Additional Setup {#setup}
-Download and extract the **latest** 3.x.x version of
-[Bootstrap Framework Source Files] into the root of your new sub-theme. After
-it has been extracted, the directory should be renamed (if needed) so it reads
-`./THEMENAME/bootstrap`.
-
-If for whatever reason you have an additional `bootstrap` directory wrapping the
-first `bootstrap` directory (e.g. `./THEMENAME/bootstrap/bootstrap`), remove the
-wrapping `bootstrap` directory. You will only ever need to touch these files if
-or when you upgrade your version of the [Bootstrap Framework].
-
-{.alert.alert-warning} **WARNING:** Do not modify the files inside of
-`./THEMENAME/bootstrap` directly. Doing so may cause issues when upgrading the
-[Bootstrap Framework] in the future.
-
-## Overrides {#overrides}
-The `./THEMENAME/scss/_default-variables.scss` file is generally where you will
-spend the majority of your time providing any default variables that should be
-used by the [Bootstrap Framework] instead of its own.
-
-The `./THEMENAME/scss/overrides.scss` file contains various Drupal overrides to
-properly integrate with the [Bootstrap Framework]. It may contain a few
-enhancements, feel free to edit this file as you see fit.
-
-The `./THEMENAME/scss/style.scss` file is the glue that combines:
-`_default-variables.scss`, [Bootstrap Framework Source Files] and the 
-`overrides.scss` file together. Generally, you will not need to modify this
-file unless you need to add or remove files to be imported. This is the file
-that you should compile to `./THEMENAME/css/style.css` (note the same file
-name, using a different extension of course).
-
-#### See also:
-- @link theme_settings Theme Settings @endlink
-- @link templates Templates @endlink
-- @link plugins Plugin System @endlink
-
-[Bootstrap Framework]: http://getbootstrap.com
-[Bootstrap Framework Source Files]: https://github.com/twbs/bootstrap-sass
-[Sass]: http://sass-lang.com
diff --git a/themes/bootstrap/starterkits/sass/THEMENAME.libraries.yml b/themes/bootstrap/starterkits/sass/THEMENAME.libraries.yml
deleted file mode 100644
index c12ea59..0000000
--- a/themes/bootstrap/starterkits/sass/THEMENAME.libraries.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-global-styling:
-  css:
-    theme:
-      css/style.css: {}
-
-bootstrap-scripts:
-  js:
-    bootstrap/assets/javascripts/bootstrap/affix.js: {}
-    bootstrap/assets/javascripts/bootstrap/alert.js: {}
-    bootstrap/assets/javascripts/bootstrap/button.js: {}
-    bootstrap/assets/javascripts/bootstrap/carousel.js: {}
-    bootstrap/assets/javascripts/bootstrap/collapse.js: {}
-    bootstrap/assets/javascripts/bootstrap/dropdown.js: {}
-    bootstrap/assets/javascripts/bootstrap/modal.js: {}
-    bootstrap/assets/javascripts/bootstrap/tooltip.js: {}
-    bootstrap/assets/javascripts/bootstrap/popover.js: {}
-    bootstrap/assets/javascripts/bootstrap/scrollspy.js: {}
-    bootstrap/assets/javascripts/bootstrap/tab.js: {}
-    bootstrap/assets/javascripts/bootstrap/transition.js: {}
diff --git a/themes/bootstrap/starterkits/sass/THEMENAME.starterkit.yml b/themes/bootstrap/starterkits/sass/THEMENAME.starterkit.yml
deleted file mode 100644
index 80f8a90..0000000
--- a/themes/bootstrap/starterkits/sass/THEMENAME.starterkit.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-core: 8.x
-type: theme
-base theme: bootstrap
-
-name: 'THEMETITLE'
-description: 'Uses the Bootstrap framework Sass source files and must be compiled (not for beginners).'
-package: 'Bootstrap'
-
-regions:
-  navigation: 'Navigation'
-  navigation_collapsible: 'Navigation (Collapsible)'
-  header: 'Top Bar'
-  highlighted: 'Highlighted'
-  help: 'Help'
-  content: 'Content'
-  sidebar_first: 'Primary'
-  sidebar_second: 'Secondary'
-  footer: 'Footer'
-  page_top: 'Page top'
-  page_bottom: 'Page bottom'
-
-libraries:
-  - 'THEMENAME/global-styling'
-  - 'THEMENAME/bootstrap-scripts'
diff --git a/themes/bootstrap/starterkits/sass/THEMENAME.theme b/themes/bootstrap/starterkits/sass/THEMENAME.theme
deleted file mode 100644
index 72cf6d4..0000000
--- a/themes/bootstrap/starterkits/sass/THEMENAME.theme
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @file
- * Bootstrap sub-theme.
- *
- * Place your custom PHP code in this file.
- */
diff --git a/themes/bootstrap/starterkits/sass/config/install/THEMENAME.settings.yml b/themes/bootstrap/starterkits/sass/config/install/THEMENAME.settings.yml
deleted file mode 100644
index 440ca28..0000000
--- a/themes/bootstrap/starterkits/sass/config/install/THEMENAME.settings.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Default settings should not be located here. This file is only used to
-# override existing settings. If your theme is the one that introduces a new
-# theme setting, it should use the Drupal Bootstrap base theme's
-# @BootstrapSetting annotation discovery process. This ensures that sub-theme
-# settings are inherited from base themes themes properly and to determine when
-# a setting should be saved to config as "overridden".
-#
-# @see \Drupal\bootstrap\Plugin\SettingBase
-# @see \Drupal\bootstrap\Plugin\SettingInterface
-# @see \Drupal\bootstrap\Plugin\SettingManager
-# @see \Drupal\bootstrap\Plugin\Form\SystemThemeSettings
-# @see \Drupal\bootstrap\ThemeSettings
-
-# Disable the CDN provider so compiled source files can be used.
-cdn_provider: ''
diff --git a/themes/bootstrap/starterkits/sass/config/schema/THEMENAME.schema.yml b/themes/bootstrap/starterkits/sass/config/schema/THEMENAME.schema.yml
deleted file mode 100644
index 25dc483..0000000
--- a/themes/bootstrap/starterkits/sass/config/schema/THEMENAME.schema.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-# Schema for the theme setting configuration file of the THEMETITLE theme.
-
-THEMENAME.settings:
-  type: theme_settings
-  label: 'THEMETITLE settings'
diff --git a/themes/bootstrap/starterkits/sass/favicon.ico b/themes/bootstrap/starterkits/sass/favicon.ico
deleted file mode 100644
index dea57407b73dfba672728a845f4f722e34657732..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmaiyyGjF55QZm2urwrSsX`jD2*k!p;;l{<B%KHr7Ah8A5F$owByXSy!A`*k5G;(n
zFJNa81iOHpMB_Kcf#GmA+2!Av`7g7FWkpilnT+t9maP$y2@#nAP%wR-B8zDGLLWL0
zx@rq+OW+YS!7(Tf@|%Wl7R-SXcmchCyi(WA7pv$;&i_oG1`WsQuB(LXa^O?%mwKt~
zK-=^?&~o5C@YuOG;CBP<n|ac9(C-DhWwl;_N<^=@d^4ikjw+h}F2*-q{w5*cRu5Vy
zqF=lGenh{8%YwUzrf1l3`Elltz_-d=4mdmeCw$iOTA5b@ul_HEfU|tXXRXJ3;QU4U
zZ8uxCVg6XfukV}(he1~Vk7_Iv<M3X({7K9+j3fU5%ENp~I@x@ZW_))_>YXu>w^5PS
exkx>w=sf+^Gwttl+PBhuk9xZ$k)Ko06Zr+B?k)5H

diff --git a/themes/bootstrap/starterkits/sass/images/required.svg b/themes/bootstrap/starterkits/sass/images/required.svg
deleted file mode 100644
index f7882d6..0000000
--- a/themes/bootstrap/starterkits/sass/images/required.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#EE0000"  d="M0,7.562l1.114-3.438c2.565,0.906,4.43,1.688,5.59,2.35C6.398,3.553,6.237,1.544,6.22,0.447h3.511 c-0.05,1.597-0.234,3.6-0.558,6.003c1.664-0.838,3.566-1.613,5.714-2.325L16,7.562c-2.05,0.678-4.06,1.131-6.028,1.356 c0.984,0.856,2.372,2.381,4.166,4.575l-2.906,2.059c-0.935-1.274-2.041-3.009-3.316-5.206c-1.194,2.275-2.244,4.013-3.147,5.206 l-2.856-2.059c1.872-2.307,3.211-3.832,4.017-4.575C3.849,8.516,1.872,8.062,0,7.562"/></svg>
diff --git a/themes/bootstrap/starterkits/sass/logo.svg b/themes/bootstrap/starterkits/sass/logo.svg
deleted file mode 100644
index a5daf56..0000000
--- a/themes/bootstrap/starterkits/sass/logo.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<svg
-     version="1.1"
-     xmlns="http://www.w3.org/2000/svg"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     width="32px" height="32px"
-     viewBox="0 0 32 32" preserveAspectRatio="none">
-   <g>
-<image width="32" height="32" xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
-bWFnZVJlYWR5ccllPAAAAohJREFUeNrEl1tIVGEQx12L0BQjoXwpoRfxIQUJuhAIvVRLIRQELYj1
-oKDgpQgVNQhBChQfLFDLoovVS0RQYuqLPUgFgTcQia5CSBBERUiKuv0+GGGJPd/l7Nkc+DNn98w3
-8/++mXNmTigajaasp4T8Ejhx+GIWavOTkbaviRBITWBtIbgDkfT1InAGHAGDkNj2X1NAwFLU3ZgN
-fATnSMezpBIgcAaqWRBPHoFLEJlNVgpWRC943D8FJiDaA3IDOQEc5aNK5Ocou3vDf3u5HgFbNEu/
-gzrs7/smQKAa1BWQEfN3L06ruFcmdWCSa+A8a1acUkCAetTVf4IrqeReBIf3pPhMojbR41QDBDiO
-atc4LRU9ZVk7FXKaZgLyhus2OExbS6FDAV+OV5jxTqAa7DQ4e4qzTegiBwKZoFFLAKdqZ+UGR8Pk
-vwu9A7i+AU8TY6vuBNTjtcvgJB0nJyGhCvAgeO9AIBsc0hHYb+GkGDyGxG1ITHIdlmfeVop1BAoc
-HJ2FxENIqBOodVhXoCOw3TGnEfVCgsQDrmcc0uBJYNVHR20S3R/EPDDvw0c+p6AK94Wl/aKOwLTP
-uSIPfAHLFrYfdAReJzBZ2abvpY7ABHjrg8AcyAEbDXZL4LknAapZGdxyDD4vpPdZ2A7JC0zbC3pl
-R7bSJ70+YjFNtVoNJNKObQbMcXAA7AFjhhGvA6INVvMAhgOoBkNwNQsck5Z8wxB8wGuQ9VwEiQ7U
-BSmcWPkGOiXnv2QS3q0Jru6rCWrZ71BaKH0/JLXxCmd/+F8RuKkJ/gO0YNsd6IcJgcPSfI56mLxT
-3RJcJ/jnoD9MNsg3oZobcqWxqGf/J/gkdTFJ4N9J/zoOSv4KMAC++teHNUg1rQAAAABJRU5ErkJg
-gg==
-"/>
-   </g>
-</svg>
-
diff --git a/themes/bootstrap/starterkits/sass/screenshot.png b/themes/bootstrap/starterkits/sass/screenshot.png
deleted file mode 100644
index f188b520ed41923c4575277ce07cb38148f6b95b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32370
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
XY)kn{M9q_!00000NkvXXu0mjflq*Jx

diff --git a/themes/bootstrap/starterkits/sass/scss/_default-variables.scss b/themes/bootstrap/starterkits/sass/scss/_default-variables.scss
deleted file mode 100644
index dd7abb3..0000000
--- a/themes/bootstrap/starterkits/sass/scss/_default-variables.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Default Variables.
- *
- * Modify this file to provide default Bootstrap Framework variables. The
- * Bootstrap Framework will not override any variables defined here because it
- * uses the `!default` flag which will only set their default if not already
- * defined here.
- *
- * You can copy existing variables directly from the following file:
- * ./THEMENAME/bootstrap/assets/stylesheets/bootstrap/_variables.scss
- */
-
-// Set the proper directory for the Bootstrap Glyphicon font.
-$icon-font-path: '../bootstrap/assets/fonts/bootstrap/';
diff --git a/themes/bootstrap/starterkits/sass/scss/_overrides.scss b/themes/bootstrap/starterkits/sass/scss/_overrides.scss
deleted file mode 100644
index 4814669..0000000
--- a/themes/bootstrap/starterkits/sass/scss/_overrides.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-// @todo these should be their own CSS files and only included when
-// specific Drupal libraries are used.
-@import "component/alert";
-@import "component/ajax";
-@import "component/field";
-@import "component/file";
-@import "component/filter";
-@import "component/form";
-@import "component/icon";
-@import "component/navbar";
-@import "component/node";
-@import "component/panel";
-@import "component/progress-bar";
-@import "component/table-drag";
-@import "component/tabs";
-@import "component/toolbar";
-
-// jQuery UI style overrides.
-@import "jquery-ui/autocomplete";
-
-ol, ul {
-  padding-left: 1.5em;
-  .popover &:last-child {
-    margin-bottom: 0;
-  }
-}
-
-// Page header.
-.page-header {
-  margin-top: 0;
-}
-
-// Footer.
-.footer {
-  margin-top: 45px;
-  padding-top: 35px;
-  padding-bottom: 36px;
-  border-top: 1px solid #E5E5E5;
-}
-
-// Paragraphs.
-p:last-child,
-.form-group:last-child,
-.panel:last-child {
-  margin-bottom: 0;
-}
-
-// Help region.
-.region-help {
-  > .glyphicon {
-    font-size: $font-size-large;
-    float: left;
-    margin: -0.05em 0.5em 0 0;
-  }
-  .block {
-    overflow: hidden;
-  }
-}
-
-
-.help-block, .control-group .help-inline {
-  color: $gray-light;
-  font-size: 12px;
-  margin: 5px 0 10px;
-  padding: 0;
-  &:first-child {
-    margin-top: 0;
-  }
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_ajax.scss b/themes/bootstrap/starterkits/sass/scss/component/_ajax.scss
deleted file mode 100644
index c1f9d4d..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_ajax.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * AJAX (throbber) styling.
- */
-
-// $todo This should probably be it's own mixin/component?
-@keyframes glyphicon-spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(359deg); }
-}
-.glyphicon-spin {
-  display: inline-block;
-  animation: glyphicon-spin 1s infinite linear;
-}
-a .glyphicon-spin {
-  display: inline-block;
-  text-decoration: none;
-}
-
-html.js {
-  .btn .ajax-throbber {
-    margin-left: .5em;
-    margin-right: -.25em;
-  }
-
-  .form-item .input-group-addon {
-    .glyphicon {
-      color: $gray-light;
-      opacity: .5;
-      transition: 150ms color, 150ms opacity;
-      &.glyphicon-spin {
-        color: $brand-primary;
-        opacity: 1;
-      }
-    }
-    .input-group-addon {
-      background-color: rgb(255, 255, 255);
-    }
-  }
-
-  // Hide empty wrappers from AJAX/Field APIs.
-  .ajax-new-content:empty {
-    display: none !important;
-  }
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_alert.scss b/themes/bootstrap/starterkits/sass/scss/component/_alert.scss
deleted file mode 100644
index 5a0f9be..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_alert.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Alert styling.
- */
-.alert-sm {
-  padding: 5px 10px;
-}
-
-// Treat all links inside alert as .alert-link
-.alert a {
-  font-weight: $alert-link-font-weight;
-}
-.alert-success {
-  a, a:hover, a:focus {
-    color: darken($alert-success-text, 10%);
-  }
-}
-.alert-info {
-  a, a:hover, a:focus {
-    color: darken($alert-info-text, 10%);
-  }
-}
-.alert-warning {
-  a, a:hover, a:focus {
-    color: darken($alert-warning-text, 10%);
-  }
-}
-.alert-danger {
-  a, a:hover, a:focus {
-    color: darken($alert-danger-text, 10%);
-  }
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_field.scss b/themes/bootstrap/starterkits/sass/scss/component/_field.scss
deleted file mode 100644
index 15aea71..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_field.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * $file
- * Visual styles for fields.
- */
-
-.field--label {
-  font-weight: bold;
-}
-.field--label-inline .field--label,
-.field--label-inline .field--items {
-  float: left; /*LTR*/
-}
-.field--label-inline .field--label,
-.field--label-inline > .field--item,
-.field--label-inline .field--items {
-  padding-right: 0.5em;
-}
-[dir="rtl"] .field--label-inline .field--label,
-[dir="rtl"] .field--label-inline .field--items {
-  padding-left: 0.5em;
-  padding-right: 0;
-}
-.field--label-inline .field--label::after {
-  content: ':';
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_file.scss b/themes/bootstrap/starterkits/sass/scss/component/_file.scss
deleted file mode 100644
index 6c86e71..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_file.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * File (and Image Widget) styles.
- */
-.file {
-  display: table;
-  font-size: 75%;
-  font-weight: 700;
-  margin: 5px 0;
-  width: 100%;
-  > span {
-    background: #fff;
-    color: $brand-primary;
-    border-bottom: 1px solid $input-border;
-    border-top: 1px solid $input-border;
-    &:first-child {
-      border-left: 1px solid $input-border;
-    }
-    &:last-child {
-      border-right: 1px solid $input-border;
-    }
-  }
-  > .tabledrag-changed {
-    &, &:last-child {
-      border: 1px solid darken($alert-warning-border, 5%);
-    }
-    background: $alert-warning-bg;
-    border-radius: 0;
-    color: $alert-warning-text;
-    display: table-cell;
-    padding: 0 1em;
-    top: 0;
-    vertical-align: middle;
-    border-left: 1px solid inherit;
-  }
-}
-.file-icon {
-  display: table-cell;
-  font-size: 150%;
-  padding: .25em .5em;
-  text-align: center;
-  vertical-align: middle;
-}
-.file-link {
-  display: table-cell;
-  vertical-align: middle;
-  width: 100%;
-  a, a:hover, a:focus, a:active {
-    color: inherit;
-  }
-}
-.file-size {
-  display: table-cell;
-  padding: 0 1em;
-  text-align: right;
-  white-space: pre;
-  vertical-align: middle;
-}
-
-.image-widget.row {
-  overflow: hidden;
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_filter.scss b/themes/bootstrap/starterkits/sass/scss/component/_filter.scss
deleted file mode 100644
index 6a4692f..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_filter.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Filter styles.
- */
-
-// Mimic .panel-default styling.
-.filter-wrapper {
-  background-color: $panel-bg;
-  border: 1px solid $panel-default-border;
-  border-top: 0;
-  border-radius: 0 0 $panel-border-radius $panel-border-radius;
-  box-shadow: 0 1px 1px rgba(0,0,0,.05);
-  margin-bottom: 0;
-  padding: 10px;
-  height: 51px;
-  @extend .clearfix;
-}
-.filter-help {
-  float: right;
-  line-height: 1;
-  margin: .5em 0 0;
-}
-
-// Full list page.
-.nav.nav-tabs.filter-formats {
-  margin-bottom: 15px;
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_form.scss b/themes/bootstrap/starterkits/sass/scss/component/_form.scss
deleted file mode 100644
index cc9f70e..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_form.scss
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Form styles.
- */
-
-// Checkboxes / radio buttons.
-.checkbox, .radio {
-  // Remove top/bottom margins when in table context, because this is most
-  // likely a tableselect checkbox element.
-  table &.form-no-label {
-    margin-bottom: 0;
-    margin-top: 0;
-  }
-}
-
-// Browsers do not recognize pseudo :after selectors, we must create a wrapper
-// around the select element to style it properly.
-// $see http://stackoverflow.com/q/21103542
-.select-wrapper {
-  display: inline-block;
-  position: relative;
-  width: 100%;
-  .form-inline & {
-    width: auto;
-  }
-  .input-group & {
-    display: table-cell;
-    // Reset rounded corners
-    &:first-child .form-control:first-child {
-      @include border-left-radius($border-radius-base);
-    }
-    &:last-child .form-control:first-child {
-      @include border-right-radius($border-radius-base);
-    }
-  }
-  select {
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    appearance: none;
-    line-height: 1;
-    padding-right: 2em;
-    &::-ms-expand {
-      opacity: 0;
-    }
-  }
-  &:after {
-    color: $brand-primary;
-    content: '▼';
-    font-style: normal;
-    font-weight: 400;
-    line-height: 1;
-    margin-top: -.5em;
-    padding-right: .5em;
-    pointer-events: none;
-    position: absolute;
-    right: 0;
-    top: 50%;
-    z-index: 10;
-
-    // Use a more stylish icon if the theme uses glyphicons.
-    .has-glyphicons & {
-      -webkit-font-smoothing: antialiased;
-      -moz-osx-font-smoothing: grayscale;
-      content: '\e114'; // .glyphicon-chevron-down
-      display: inline-block;
-      font-family: 'Glyphicons Halflings';
-    }
-    .has-error & {
-      color: $state-danger-text;
-    }
-    .has-success & {
-      color: $state-success-text;
-    }
-    .has-warning & {
-      color: $state-warning-text;
-    }
-  }
-}
-
-// Use CSS/SVG image for required mark.
-// @see https://www.drupal.org/node/2152217
-// @see https://www.drupal.org/node/2274631
-.form-required:after {
-  background-image: url(../images/required.svg);
-  background-size: 10px 7px;
-  content:"";
-  display: inline-block;
-  line-height:1;
-  height: 7px;
-  width: 10px;
-}
-
-// Form action buttons.
-.form-actions {
-  .btn, .btn-group {
-    margin-right: 10px;
-  }
-  .btn-group {
-    .btn {
-      margin-right: 0;
-    }
-  }
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_icon.scss b/themes/bootstrap/starterkits/sass/scss/component/_icon.scss
deleted file mode 100644
index a40a74e..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_icon.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Icon styles.
- */
-a {
-  &.icon-before .glyphicon {
-    margin-right: .25em;
-  }
-  &.icon-after .glyphicon {
-    margin-left: .25em;
-  }
-}
-
-.btn {
-  &.icon-before .glyphicon {
-    margin-left: -.25em;
-    margin-right: .25em;
-  }
-  &.icon-after .glyphicon {
-    margin-left: .25em;
-    margin-right: -.25em;
-  }
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_navbar.scss b/themes/bootstrap/starterkits/sass/scss/component/_navbar.scss
deleted file mode 100644
index 3130142..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_navbar.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Navbar styling.
- */
-$mobile:          "screen and (max-width: #{$screen-xs-max})";
-$tablet:          "screen and (min-width: #{$screen-sm-min})";
-$normal:          "screen and (min-width: #{$screen-md-min})";
-$wide:            "screen and (min-width: #{$screen-lg-min})";
-$grid-breakpoint: "screen and (min-width: #{$grid-float-breakpoint})";
-
-body {
-  // Fix horizontal scrolling on iOS devices.
-  // http://drupal.org/node/1870076
-  position: relative;
-
-  &.navbar-is-static-top {
-    margin-top: 0;
-  }
-  &.navbar-is-fixed-top {
-    margin-top: ($navbar-height + ($grid-gutter-width / 2));
-  }
-  &.navbar-is-fixed-bottom {
-    padding-bottom: ($navbar-height + ($grid-gutter-width / 2));
-  }
-
-  @media #{$tablet} {
-    margin-top: ($grid-gutter-width / 2);
-  }
-  @media #{$mobile} {
-    &.toolbar-vertical {
-      &.navbar-is-fixed-top,
-      &.navbar-is-fixed-bottom {
-        .toolbar-bar {
-          position: fixed;
-        }
-        header {
-          z-index: 500;
-        }
-      }
-      // Default toolbar fixed height value.
-      // @see core/modules/toolbar/css/toolbar.icons.theme.css@261
-      &.navbar-is-fixed-top header {
-        top: 39px;
-      }
-    }
-  }
-}
-.navbar.container {
-  @media #{$tablet} {
-    max-width: (($container-sm - $grid-gutter-width));
-  }
-  @media #{$normal} {
-    max-width: (($container-md - $grid-gutter-width));
-  }
-  @media #{$wide} {
-    max-width: (($container-lg - $grid-gutter-width));
-  }
-}
-
-// Branding.
-.navbar .logo {
-  margin-right: -($grid-gutter-width / 2);
-  padding-left: ($grid-gutter-width / 2);
-  padding-right: ($grid-gutter-width / 2);
-  @media #{$grid-breakpoint} {
-    margin-right: 0;
-    padding-left: 0;
-  }
-}
-
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_node.scss b/themes/bootstrap/starterkits/sass/scss/component/_node.scss
deleted file mode 100644
index 4b9d867..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_node.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Node styling.
- */
-
-.node-preview-container {
-  margin-top: -($grid-gutter-width / 2);
-}
-
-.node-preview-form-select {
-  padding: ($grid-gutter-width / 2);
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_panel.scss b/themes/bootstrap/starterkits/sass/scss/component/_panel.scss
deleted file mode 100644
index 1fce624..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_panel.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Panel styling.
- */
-.panel-title {
-  display: block;
-  margin: -10px -15px;
-  padding: 10px 15px;
-  &, &:hover, &:focus, &:hover:focus {
-    color: inherit;
-  }
-  &:focus, &:hover {
-    text-decoration: none;
-  }
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_progress-bar.scss b/themes/bootstrap/starterkits/sass/scss/component/_progress-bar.scss
deleted file mode 100644
index 415186a..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_progress-bar.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Progress bar styles.
- */
-.progress-wrapper {
-  margin-bottom: $form-group-margin-bottom;
-
-  &:last-child .progress {
-    margin-bottom: 5px;
-  }
-
-  .message {
-    font-weight: 700;
-    margin-bottom: 5px;
-  }
-
-  .percentage,
-  .progress-label {
-    font-size: $font-size-small;
-  }
-
-  .progress-bar {
-    min-width: 2em;
-  }
-
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_table-drag.scss b/themes/bootstrap/starterkits/sass/scss/component/_table-drag.scss
deleted file mode 100644
index 78a368f..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_table-drag.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Table drag styles.
- */
-.tabledrag-toggle-weight {
-  float: right;
-  margin: 1px 2px 1px 10px;
-}
-.tabledrag-changed-warning {
-  margin: 0;
-  overflow: hidden;
-}
-.tabledrag-handle {
-  color: $gray-light;
-  cursor: move;
-  float: left;
-  font-size: 125%;
-  line-height: 1;
-  margin: -10px 0 0 -10px;
-  padding: 10px;
-  &:hover, &:focus {
-    color: $brand-primary;
-  }
-}
-.indentation {
-  float: left; /* LTR */
-  height: 1.7em;
-  margin: -0.4em 0.2em -0.4em -0.4em; /* LTR */
-  padding: 0.42em 0 0.42em 0.6em; /* LTR */
-  width: 20px;
-  [dir="rtl"] & {
-    float: right;
-    margin: -0.4em -0.4em -0.4em 0.2em;
-    padding: 0.42em 0.6em 0.42em 0;
-  }
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_tabs.scss b/themes/bootstrap/starterkits/sass/scss/component/_tabs.scss
deleted file mode 100644
index e2ed476..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_tabs.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Tabs and local action styles.
- */
-.local-actions {
-  margin: 10px 0 10px -5px;
-}
-.tabs--secondary {
-  margin: 10px 0 5px;
-}
-
-/**
- * Missing Bootstrap 2 tab styling.
- * $see http://stackoverflow.com/questions/18432577/stacked-tabs-in-bootstrap-3
- * $see http://bootply.com/74926
- */
-.tabbable {
-  margin-bottom: 20px;
-}
-.tabs-below, .tabs-left, .tabs-right {
-  > .nav-tabs {
-    border-bottom: 0;
-    .summary {
-      color: $nav-disabled-link-color;
-      font-size: $font-size-small;
-    }
-  }
-}
-.tab-pane > .panel-heading {
-  display: none;
-}
-.tab-content > .active {
-  display: block;
-}
-
-// Below.
-.tabs-below {
-  > .nav-tabs {
-    border-top: 1px solid $nav-tabs-border-color;
-    > li {
-      margin-top: -1px;
-      margin-bottom: 0;
-      > a {
-        border-radius: 0 0 $border-radius-base $border-radius-base;
-        &:hover,
-        &:focus {
-          border-top-color: $nav-tabs-border-color;
-          border-bottom-color: transparent;
-        }
-      }
-    }
-    > .active {
-      > a,
-      > a:hover,
-      > a:focus {
-        border-color: transparent $nav-tabs-border-color $nav-tabs-border-color $nav-tabs-border-color;
-      }
-    }
-  }
-}
-
-// Left and right tabs.
-.tabs-left,
-.tabs-right {
-  > .nav-tabs {
-    padding-bottom: 20px;
-    width: 220px;
-    > li {
-      float: none;
-      &:focus {
-        outline: 0;
-      }
-      > a {
-        margin-right: 0;
-        margin-bottom: 3px;
-        &:focus {
-          outline: 0;
-        }
-      }
-    }
-  }
-  > .tab-content {
-    border-radius: 0 $border-radius-base $border-radius-base $border-radius-base;
-    border: 1px solid $nav-tabs-border-color;
-    box-shadow: 0 1px 1px rgba(0,0,0,.05);
-    overflow: hidden;
-    padding: 10px 15px;
-  }
-}
-
-// Left tabs.
-.tabs-left {
-  > .nav-tabs {
-    float: left;
-    margin-right: -1px;
-    > li > a {
-      border-radius: $border-radius-base 0 0 $border-radius-base;
-      &:hover,
-      &:focus {
-        border-color: $nav-tabs-link-hover-border-color $nav-tabs-border-color $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color;
-      }
-    }
-    > .active > a,
-    > .active > a:hover,
-    > .active > a:focus {
-      border-color: $nav-tabs-border-color transparent $nav-tabs-border-color $nav-tabs-border-color;
-      box-shadow: -1px 1px 1px rgba(0,0,0,.05);
-    }
-  }
-}
-
-// Right tabs.
-.tabs-right {
-  > .nav-tabs {
-    float: right;
-    margin-left: -1px;
-    > li > a {
-      border-radius: 0 $border-radius-base $border-radius-base 0;
-      &:hover,
-      &:focus {
-        border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color;
-        box-shadow: 1px 1px 1px rgba(0,0,0,.05);
-      }
-    }
-    > .active > a,
-    > .active > a:hover,
-    > .active > a:focus {
-      border-color: $nav-tabs-border-color $nav-tabs-border-color $nav-tabs-border-color transparent;
-    }
-  }
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/component/_toolbar.scss b/themes/bootstrap/starterkits/sass/scss/component/_toolbar.scss
deleted file mode 100644
index c8debd0..0000000
--- a/themes/bootstrap/starterkits/sass/scss/component/_toolbar.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Toolbar module styling.
- */
-
-$toolbar-width: 240px;
-
-body.toolbar-fixed {
-
-  // Fix z-index.
-  .toolbar-oriented .toolbar-bar {
-    z-index: ($zindex-navbar-fixed + 1);
-  }
-
-  .navbar-fixed-top {
-    top: 39px;
-  }
-
-  // Horizontal.
-  &.toolbar-horizontal.toolbar-tray-open .navbar-fixed-top {
-    top: 79px;
-  }
-
-  // Vertical Open.
-  &.toolbar-vertical.toolbar-tray-open {
-
-    .navbar-fixed-top {
-      left: $toolbar-width;
-    }
-
-    &.toolbar-fixed {
-      margin-left: $toolbar-width;
-
-      .toolbar-tray {
-        padding-bottom: 40px;
-        &, > .toolbar-lining:before {
-          width: $toolbar-width;
-        }
-      }
-
-    }
-
-  }
-
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/jquery-ui/_autocomplete.scss b/themes/bootstrap/starterkits/sass/scss/jquery-ui/_autocomplete.scss
deleted file mode 100644
index 0ef75ab..0000000
--- a/themes/bootstrap/starterkits/sass/scss/jquery-ui/_autocomplete.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * jQuery UI autocomplete widget style overrides.
- *
- * $todo Remove once jQuery UI is no longer used?
- */
-
-// Mimics .dropdown-menu styles.
-.ui-autocomplete {
-  background: $dropdown-bg;
-  background-clip: padding-box;
-  border: 1px solid $dropdown-fallback-border;
-  border: 1px solid $dropdown-border;
-  border-radius: $border-radius-base;
-  box-shadow: 0 6px 12px rgba(0,0,0,.175);
-  color: inherit;
-  font-family: $font-family-base;
-  font-size: $font-size-base;
-  list-style: none;
-  min-width: 160px;
-  padding: 5px 0;
-  text-align: left;
-  z-index: $zindex-dropdown;
-
-  .ui-menu-item {
-    border: 0;
-    border-radius: 0;
-    clear: both;
-    color: $dropdown-link-color;
-    cursor: pointer;
-    display: block;
-    font-weight: normal;
-    line-height: $line-height-base;
-    margin: 0;
-    outline: 0;
-    padding: 3px 20px;
-    text-decoration: none;
-    white-space: nowrap;
-
-    &.ui-state-hover {
-      background: $dropdown-link-hover-bg;
-      color: $dropdown-link-hover-color;
-    }
-
-    &.ui-state-active, &.ui-state-focus {
-      background: $dropdown-link-active-bg;
-      color: $dropdown-link-active-color;
-    }
-
-  }
-
-}
diff --git a/themes/bootstrap/starterkits/sass/scss/style.scss b/themes/bootstrap/starterkits/sass/scss/style.scss
deleted file mode 100644
index 0fd60e0..0000000
--- a/themes/bootstrap/starterkits/sass/scss/style.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-// Default variables.
-@import "default-variables";
-
-// Bootstrap Framework.
-@import '../bootstrap/assets/stylesheets/bootstrap';
-
-// Base-theme overrides.
-@import 'overrides';
diff --git a/themes/bootstrap/starterkits/sass/templates/README.md b/themes/bootstrap/starterkits/sass/templates/README.md
deleted file mode 100644
index 5258e7c..0000000
--- a/themes/bootstrap/starterkits/sass/templates/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Use this directory to override template, theme and \[pre\]process functions.
-
-Please refer to the @link registry Theme Registry @endlink topic for more info.
diff --git a/themes/bootstrap/templates/block/block--bare.html.twig b/themes/bootstrap/templates/block/block--bare.html.twig
deleted file mode 100644
index fda3890..0000000
--- a/themes/bootstrap/templates/block/block--bare.html.twig
+++ /dev/null
@@ -1,50 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a bare minimum block.
- *
- * Available variables:
- * - $block->subject: Block title.
- * - $content: Block content.
- * - $block->module: Module that generated the block.
- * - $block->delta: An ID for the block, unique within each module.
- * - $block->region: The block region embedding the current block.
- * - $classes: String of classes that can be used to style contextually through
- *   CSS. It can be manipulated through the variable $classes_array from
- *   preprocess functions. The default values can be one or more of the
- *   following:
- *   - block: The current template type, i.e., "theming hook".
- *   - block-[module]: The module generating the block. For example, the user
- *     module is responsible for handling the default user navigation block. In
- *     that case the class would be 'block-user'.
- * - $title_prefix (array): An array containing additional output populated by
- *   modules, intended to be displayed in front of the main title tag that
- *   appears in the template.
- * - $title_suffix (array): An array containing additional output populated by
- *   modules, intended to be displayed after the main title tag that appears in
- *   the template.
- *
- * Helper variables:
- * - $classes_array: Array of html class attribute values. It is flattened
- *   into a string within the variable $classes.
- * - $block_zebra: Outputs 'odd' and 'even' dependent on each block region.
- * - $zebra: Same output as $block_zebra but independent of any block region.
- * - $block_id: Counter dependent on each block region.
- * - $id: Same output as $block_id but independent of any block region.
- * - $is_front: Flags true when presented in the front page.
- * - $logged_in: Flags true when the current user is a logged-in member.
- * - $is_admin: Flags true when the current user is an administrator.
- * - $block_html_id: A valid HTML ID and guaranteed unique.
- *
- * @ingroup templates
- *
- * @see bootstrap_preprocess_block()
- * @see template_preprocess()
- * @see template_preprocess_block()
- * @see bootstrap_process_block()
- * @see template_process()
- */
-#}
-{% block content %}
-  {{ content }}
-{% endblock %}
diff --git a/themes/bootstrap/templates/block/block--local-actions-block.html.twig b/themes/bootstrap/templates/block/block--local-actions-block.html.twig
deleted file mode 100644
index 8bc3420..0000000
--- a/themes/bootstrap/templates/block/block--local-actions-block.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "block--bare.html.twig" %}
-{#
-/**
- * @file
- * Theme override for local actions (primary admin actions.)
- *
- * @ingroup templates
- */
-#}
-{% block content %}
-  {% if content %}
-    <ul class="list-inline local-actions">{{ content }}</ul>
-  {% endif %}
-{% endblock %}
diff --git a/themes/bootstrap/templates/block/block--local-tasks-block.html.twig b/themes/bootstrap/templates/block/block--local-tasks-block.html.twig
deleted file mode 100644
index d12d177..0000000
--- a/themes/bootstrap/templates/block/block--local-tasks-block.html.twig
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "block--bare.html.twig" %}
-{#
-/**
- * @file
- * Theme override for tabs.
- *
- * @ingroup templates
- */
-#}
-{% block content %}
-  {% if content %}
-    <nav class="tabs" role="navigation" aria-label="{{ 'Tabs'|t }}">
-      {{ content }}
-    </nav>
-  {% endif %}
-{% endblock %}
diff --git a/themes/bootstrap/templates/block/block--page-title-block.html.twig b/themes/bootstrap/templates/block/block--page-title-block.html.twig
deleted file mode 100644
index e7d996c..0000000
--- a/themes/bootstrap/templates/block/block--page-title-block.html.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-{#
-/**
- * @file
- * Theme override for page title block.
- *
- * @ingroup templates
- */
-#}
-{% extends "block--bare.html.twig" %}
diff --git a/themes/bootstrap/templates/block/block--search.html.twig b/themes/bootstrap/templates/block/block--search.html.twig
deleted file mode 100644
index b5597ec..0000000
--- a/themes/bootstrap/templates/block/block--search.html.twig
+++ /dev/null
@@ -1,53 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a search block.
- *
- * Available variables:
- * - plugin_id: The ID of the block implementation.
- * - label: The configured label of the block if visible.
- * - configuration: A list of the block's configuration values.
- *   - label: The configured label for the block.
- *   - label_display: The display settings for the label.
- *   - module: The module that provided this block plugin.
- *   - cache: The cache settings.
- *   - Block plugin specific settings will also be stored here.
- * - block - The full block entity.
- *   - label_hidden: The hidden block title value if the block was
- *     configured to hide the title ('label' is empty in this case).
- *   - module: The module that generated the block.
- *   - delta: An ID for the block, unique within each module.
- *   - region: The block region embedding the current block.
- * - content: The content of this block.
- * - attributes: array of HTML attributes populated by modules, intended to
- *   be added to the main container tag of this template.
- *   - id: A valid HTML ID and guaranteed unique.
- * - title_attributes: Same as attributes, except applied to the main title
- *   tag that appears in the template.
- * - title_prefix: Additional output populated by modules, intended to be
- *   displayed in front of the main title tag that appears in the template.
- * - title_suffix: Additional output populated by modules, intended to be
- *   displayed after the main title tag that appears in the template.
- *
- * @ingroup templates
- *
- * @see template_preprocess_block()
- */
-#}
-{%
-  set classes = [
-    'block',
-    'block-' ~ configuration.provider|clean_class,
-    'block-' ~ plugin_id|clean_class,
-  ]
-%}
-<div{{ attributes.addClass(classes) }}>
-  {{ title_prefix }}
-  {% if label %}
-    <h2{{ title_attributes.addClass('visually-hidden') }}>{{ label }}</h2>
-  {% endif %}
-  {{ title_suffix }}
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-</div>
diff --git a/themes/bootstrap/templates/block/block--system-branding-block.html.twig b/themes/bootstrap/templates/block/block--system-branding-block.html.twig
deleted file mode 100644
index 6e0141e..0000000
--- a/themes/bootstrap/templates/block/block--system-branding-block.html.twig
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "block--bare.html.twig" %}
-{#
-/**
- * @file
- * Default theme implementation for a branding block.
- *
- * Each branding element variable (logo, name, slogan) is only available if
- * enabled in the block configuration.
- *
- * Available variables:
- * - site_logo: Logo for site as defined in Appearance or theme settings.
- * - site_name: Name for site as defined in Site information settings.
- * - site_slogan: Slogan for site as defined in Site information settings.
- *
- * @ingroup templates
- */
-#}
-{% block content %}
-  {% if site_logo %}
-    <a class="logo navbar-btn pull-left" href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">
-      <img src="{{ site_logo }}" alt="{{ 'Home'|t }}" />
-    </a>
-  {% endif %}
-  {% if site_name %}
-    <a class="name navbar-brand" href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
-  {% endif %}
-  {% if site_slogan %}
-    <p class="navbar-text">{{ site_slogan }}</p>
-  {% endif %}
-{% endblock %}
diff --git a/themes/bootstrap/templates/block/block--system-menu-block--account.html.twig b/themes/bootstrap/templates/block/block--system-menu-block--account.html.twig
deleted file mode 100644
index 5809d98..0000000
--- a/themes/bootstrap/templates/block/block--system-menu-block--account.html.twig
+++ /dev/null
@@ -1,47 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a menu block.
- *
- * Available variables:
- * - plugin_id: The ID of the block implementation.
- * - label: The configured label of the block if visible.
- * - configuration: A list of the block's configuration values.
- *   - label: The configured label for the block.
- *   - label_display: The display settings for the label.
- *   - provider: The module or other provider that provided this block plugin.
- *   - Block plugin specific settings will also be stored here.
- * - content: The content of this block.
- * - attributes: HTML attributes for the containing element.
- *   - id: A valid HTML ID and guaranteed unique.
- * - title_attributes: HTML attributes for the title element.
- * - content_attributes: HTML attributes for the content element.
- * - title_prefix: Additional output populated by modules, intended to be
- *   displayed in front of the main title tag that appears in the template.
- * - title_suffix: Additional output populated by modules, intended to be
- *   displayed after the main title tag that appears in the template.
- *
- * Headings should be used on navigation menus that consistently appear on
- * multiple pages. When this menu block's label is configured to not be
- * displayed, it is automatically made invisible using the 'visually-hidden' CSS
- * class, which still keeps it visible for screen-readers and assistive
- * technology. Headings allow screen-reader and keyboard only users to navigate
- * to or skip the links.
- * See http://juicystudio.com/article/screen-readers-display-none.php and
- * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
- *
- * @ingroup templates
- */
-#}
-{% set heading_id = attributes.id ~ '-menu'|clean_id %}
-<nav role="navigation" aria-labelledby="{{ heading_id }}"{{ attributes.removeClass('clearfix')|without('role', 'aria-labelledby') }}>
-  {# Label. If not displayed, we still provide it for screen readers. #}
-  {% if not configuration.label_display %}
-    {% set title_attributes = title_attributes.addClass('sr-only') %}
-  {% endif %}
-  <h2{{ title_attributes.setAttribute('id', heading_id) }}>{{ configuration.label }}</h2>
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-</nav>
diff --git a/themes/bootstrap/templates/block/block--system-menu-block--main.html.twig b/themes/bootstrap/templates/block/block--system-menu-block--main.html.twig
deleted file mode 100644
index 5809d98..0000000
--- a/themes/bootstrap/templates/block/block--system-menu-block--main.html.twig
+++ /dev/null
@@ -1,47 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a menu block.
- *
- * Available variables:
- * - plugin_id: The ID of the block implementation.
- * - label: The configured label of the block if visible.
- * - configuration: A list of the block's configuration values.
- *   - label: The configured label for the block.
- *   - label_display: The display settings for the label.
- *   - provider: The module or other provider that provided this block plugin.
- *   - Block plugin specific settings will also be stored here.
- * - content: The content of this block.
- * - attributes: HTML attributes for the containing element.
- *   - id: A valid HTML ID and guaranteed unique.
- * - title_attributes: HTML attributes for the title element.
- * - content_attributes: HTML attributes for the content element.
- * - title_prefix: Additional output populated by modules, intended to be
- *   displayed in front of the main title tag that appears in the template.
- * - title_suffix: Additional output populated by modules, intended to be
- *   displayed after the main title tag that appears in the template.
- *
- * Headings should be used on navigation menus that consistently appear on
- * multiple pages. When this menu block's label is configured to not be
- * displayed, it is automatically made invisible using the 'visually-hidden' CSS
- * class, which still keeps it visible for screen-readers and assistive
- * technology. Headings allow screen-reader and keyboard only users to navigate
- * to or skip the links.
- * See http://juicystudio.com/article/screen-readers-display-none.php and
- * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
- *
- * @ingroup templates
- */
-#}
-{% set heading_id = attributes.id ~ '-menu'|clean_id %}
-<nav role="navigation" aria-labelledby="{{ heading_id }}"{{ attributes.removeClass('clearfix')|without('role', 'aria-labelledby') }}>
-  {# Label. If not displayed, we still provide it for screen readers. #}
-  {% if not configuration.label_display %}
-    {% set title_attributes = title_attributes.addClass('sr-only') %}
-  {% endif %}
-  <h2{{ title_attributes.setAttribute('id', heading_id) }}>{{ configuration.label }}</h2>
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-</nav>
diff --git a/themes/bootstrap/templates/block/block--system.html.twig b/themes/bootstrap/templates/block/block--system.html.twig
deleted file mode 100644
index 4a9ba2a..0000000
--- a/themes/bootstrap/templates/block/block--system.html.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-{#
-/**
- * @file
- * Theme override for system blocks.
- *
- * @ingroup templates
- */
-#}
-{% extends "block--bare.html.twig" %}
diff --git a/themes/bootstrap/templates/block/block-list.html.twig b/themes/bootstrap/templates/block/block-list.html.twig
deleted file mode 100644
index eb9afd8..0000000
--- a/themes/bootstrap/templates/block/block-list.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{#
-/**
- * @file
- * Two column template for the block add/edit form.
- *
- * This template will be used when a block edit form specifies 'block_edit_form'
- * as its #theme callback.  Otherwise, by default, block add/edit forms will be
- * themed by form.html.twig.
- *
- * Available variables:
- * - form: The block add/edit form.
- *
- * @ingroup templates
- */
-#}
-<div class="row">
-  <div class="col-xs-9">
-    {{ form|without('place_blocks') }}
-  </div>
-  <div class="col-xs-3">
-    {{ form.place_blocks }}
-  </div>
-</div>
diff --git a/themes/bootstrap/templates/block/block.html.twig b/themes/bootstrap/templates/block/block.html.twig
deleted file mode 100644
index eeab01c..0000000
--- a/themes/bootstrap/templates/block/block.html.twig
+++ /dev/null
@@ -1,67 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a block.
- *
- * Available variables:
- * - $block->subject: Block title.
- * - $content: Block content.
- * - $block->module: Module that generated the block.
- * - $block->delta: An ID for the block, unique within each module.
- * - $block->region: The block region embedding the current block.
- * - $classes: String of classes that can be used to style contextually through
- *   CSS. It can be manipulated through the variable $classes_array from
- *   preprocess functions. The default values can be one or more of the
- *   following:
- *   - block: The current template type, i.e., "theming hook".
- *   - block-[module]: The module generating the block. For example, the user
- *     module is responsible for handling the default user navigation block. In
- *     that case the class would be 'block-user'.
- * - $title_prefix (array): An array containing additional output populated by
- *   modules, intended to be displayed in front of the main title tag that
- *   appears in the template.
- * - $title_suffix (array): An array containing additional output populated by
- *   modules, intended to be displayed after the main title tag that appears in
- *   the template.
- *
- * Helper variables:
- * - $classes_array: Array of html class attribute values. It is flattened
- *   into a string within the variable $classes.
- * - $block_zebra: Outputs 'odd' and 'even' dependent on each block region.
- * - $zebra: Same output as $block_zebra but independent of any block region.
- * - $block_id: Counter dependent on each block region.
- * - $id: Same output as $block_id but independent of any block region.
- * - $is_front: Flags true when presented in the front page.
- * - $logged_in: Flags true when the current user is a logged-in member.
- * - $is_admin: Flags true when the current user is an administrator.
- * - $block_html_id: A valid HTML ID and guaranteed unique.
- *
- * @ingroup templates
- *
- * @see bootstrap_preprocess_block()
- * @see template_preprocess()
- * @see template_preprocess_block()
- * @see bootstrap_process_block()
- * @see template_process()
- */
-#}
-{%
-  set classes = [
-    'block',
-    'block-' ~ configuration.provider|clean_class,
-    'block-' ~ plugin_id|clean_class,
-    'clearfix',
-  ]
-%}
-<section{{ attributes.addClass(classes) }}>
-  {{ title_prefix }}
-  {% if label %}
-    <h2{{ title_attributes.addClass('block-title') }}>{{ label }}</h2>
-  {% endif %}
-  {{ title_suffix }}
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-</section>
-
diff --git a/themes/bootstrap/templates/bootstrap/bootstrap-carousel.html.twig b/themes/bootstrap/templates/bootstrap/bootstrap-carousel.html.twig
deleted file mode 100644
index 7c4fc2b..0000000
--- a/themes/bootstrap/templates/bootstrap/bootstrap-carousel.html.twig
+++ /dev/null
@@ -1,58 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a Bootstrap Carousel component.
- *
- * Available variables:
- * - attributes: An array of HTML attributes intended to be added to the main
- *   container tag of this template.
- *   - id: A valid HTML ID and guaranteed to be unique.
- * - controls: Flag indicating whether or not to show the carousel controls.
- * - indicators: Flag indicating whether or not to show the carousel indicators.
- * - interval: The amount of time to delay between automatically cycling a
- *   slide item. If false, carousel will not automatically cycle.
- * - pause: (optional) Pauses the cycling of the carousel on mouseenter and
- *   resumes the cycling of the carousel on mouseleave.
- * - slides: A list of carousel slide items containing:
- *    - image: (required) The image to display in the slide item.
- *    - attributes: (optional) An array of HTML attributes intended to be added
- *      to the slide item.
- *    - title: (optional) A title to display for the slide item.
- *    - description: (optional) Additional helpful text to display for a slide
- *      item.
- * - start_index: (optional) Alters the slide position relative to its current
- *   position.
- * - wrap: (optional) Whether the carousel should cycle continuously or have
- *   hard stops.
- *
- * @ingroup templates
- */
-#}
-{% set classes = ['carousel', 'slide'] %}
-<div{{ attributes.addClass(classes) }} data-ride="carousel" data-interval="{{ interval }}" data-pause="{{ pause }}" data-wrap="{{ wrap }}">
-  {% if indicators %}
-    {{ indicators }}
-  {% endif %}
-  <div class="carousel-inner" role="listbox">
-  {% for slide in slides %}
-    {% set slide_classes = ['item', start_index == loop.index0 ? 'active'] %}
-    <div{{ slide.attributes.addClass(slide_classes) }}>
-      {{ slide.image }}
-      {% if slide.title or slide.description %}
-        <div class="carousel-caption">
-          {% if slide.title %}
-            <h3>{{ slide.title }}</h3>
-          {% endif %}
-          {% if slide.description %}
-            <p>{{ slide.description }}</p>
-          {% endif %}
-        </div>
-      {% endif %}
-    </div>
-  {% endfor %}
-  </div>
-  {% if controls %}
-    {{ controls.left }}
-    {{ controls.right }}
-  {% endif %}
-</div>
diff --git a/themes/bootstrap/templates/bootstrap/bootstrap-dropdown.html.twig b/themes/bootstrap/templates/bootstrap/bootstrap-dropdown.html.twig
deleted file mode 100644
index e6ae2e4..0000000
--- a/themes/bootstrap/templates/bootstrap/bootstrap-dropdown.html.twig
+++ /dev/null
@@ -1,25 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a Bootstrap Dropdown component.
- *
- * Available variables:
- * - alignment: (optional) The alignment of the dropdown menu.
- * - attributes: An array of HTML attributes intended to be added to the main
- *   container tag of this template.
- * - items: The dropdown menu items.
- * - toggle: The toggle element.
- *
- * @ingroup templates
- */
-#}
-{%
-  set classes = [
-    'btn-group',
-    alignment ? 'drop' ~ alignment|clean_class : 'dropdown',
-  ]
-%}
-<div{{ attributes.addClass(classes) }}>
-  {{ toggle }}
-  {{ items }}
-</div>
diff --git a/themes/bootstrap/templates/bootstrap/bootstrap-modal.html.twig b/themes/bootstrap/templates/bootstrap/bootstrap-modal.html.twig
deleted file mode 100644
index d6df831..0000000
--- a/themes/bootstrap/templates/bootstrap/bootstrap-modal.html.twig
+++ /dev/null
@@ -1,95 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a Bootstrap Modal component.
- *
- * Available variables:
- * - attributes: Attributes for the outer modal div.
- * - body: The body of the modal.
- * - body_attributes: Attributes for the modal body div.
- * - close_button: Flag indicating whether or not to show the close button in
- *   the header.
- * - content_attributes: Attributes for the modal content div.
- * - description: (optional) A list of description properties containing:
- *    - content: (optional) A description of the modal, may not be set.
- *    - attributes: (optional) A list of HTML attributes to apply to the
- *      modal description div. Will only be set when description is set.
- *    - position: (optional) A display setting that can have these values:
- *      - before: The description is displayed before the body. This is the
- *        default value.
- *      - after: The description is display after the body.
- *      - invisible: The description is displayed after the element, hidden
- *        visually but available to screen readers.
- * - dialog_attributes: Attributes for the inner modal div.
- * - footer: The footer of the modal.
- * - footer_attributes: Attributes for the modal footer div.
- * - header_attributes: Attributes for the modal header div.
- * - size: The size of the modal. Can be empty, "modal-sm" or "modal-lg".
- * - title: The title for the modal.
- * - title_attributes: Attributes for the modal title.
- *
- * @ingroup templates
- */
-#}
-{% if theme.settings.modal_enabled %}
-  {{ attach_library('bootstrap/modal') }}
-  {%
-    set classes = [
-      'modal',
-      theme.settings.modal_animation ? 'fade',
-    ]
-  %}
-  <div{{ attributes.addClass(classes) }} tabindex="-1" role="dialog">
-    {%
-      set dialog_classes = [
-        'modal-dialog',
-        size ? size|clean_class,
-      ]
-    -%}
-    <div{{ dialog_attributes.addClass(dialog_classes) }} role="document">
-      {% set content_classes = ['modal-content'] -%}
-      <div{{ content_attributes.addClass(content_classes) }}>
-        {% if title -%}
-          {% block title -%}
-            {% set header_classes = ['modal-header'] -%}
-            {% set title_classes = ['modal-title'] -%}
-            <div{{ header_attributes.addClass(header_classes) }}>
-              {% if close_button -%}
-                <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'Close'|t }}"><span aria-hidden="true">&times;</span></button>
-              {% endif -%}
-              <h4{{ title_attributes.addClass(title_classes) }}>{{ title }}</h4>
-            </div>
-          {% endblock -%}
-        {% endif -%}
-
-        {% block body -%}
-          {% set body_classes = ['modal-body'] -%}
-          {%
-            set description_classes = [
-              'help-block',
-              description and description.position == 'invisible' ? 'sr-only',
-            ]
-          %}
-          <div{{ body_attributes.addClass(body_classes) }}>
-            {% if description and description.position == 'before' %}
-              <p{{ description.attributes.addClass(description_classes) }}>{{ description.content }}</p>
-            {% endif %}
-            {{ body }}
-            {% if description and description.position == 'after' or description.position == 'invisible' %}
-              <p{{ description.attributes.addClass(description_classes) }}>{{ description.content }}</p>
-            {% endif %}
-          </div>
-        {% endblock -%}
-
-        {% if footer is not empty -%}
-          {% block footer -%}
-            {% set footer_classes = ['modal-footer'] -%}
-            <div{{ footer_attributes.addClass(footer_classes) }}>
-              {{ footer }}
-            </div>
-          {% endblock -%}
-        {% endif -%}
-      </div>
-    </div>
-  </div>
-{% endif %}
diff --git a/themes/bootstrap/templates/bootstrap/bootstrap-panel.html.twig b/themes/bootstrap/templates/bootstrap/bootstrap-panel.html.twig
deleted file mode 100644
index 60df20b..0000000
--- a/themes/bootstrap/templates/bootstrap/bootstrap-panel.html.twig
+++ /dev/null
@@ -1,118 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a Bootstrap Panel component.
- *
- * Available variables:
- * - attributes: An array of HTML attributes intended to be added to the main
- *   container tag of this template.
- *   - id: A valid HTML ID and guaranteed to be unique.
- * - body: The primary content of the panel.
- * - body_attributes: (optional) Same as attributes, except applied to the body
- *   container that appears in the template.
- * - collapsible: Flag indicating whether the panel is collapsible.
- * - collapsed: Flag indicating whether the panel is collapsed.
- * - description: (optional) A list of description properties containing:
- *    - content: (optional) A description of the form element, may not be set.
- *    - attributes: (optional) A list of HTML attributes to apply to the
- *      description content wrapper. Will only be set when description is set.
- *    - position: (optional) A display setting that can have these values:
- *      - before: The description is output before the element. This is the
- *        default value.
- *      - after: The description is output after the element.
- *      - invisible: The description is output after the element, hidden
- *        visually but available to screen readers.
- * - errors: (optional) Any errors for panel, may not be set.
- * - footer: (optional) Additional contents intended to be placed at the bottom.
- * - footer_attributes: (optional) Same as attributes, except applied to the
- *   footer container that appears in the template.
- * - heading: (optional) The title of the panel, may not be set.
- * - heading_attributes: (optional) Same as attributes, except applied to the
- *   heading container that appears in the template.
- * - panel_type: (optional) A contextual state. Will be one of these values:
- *   - danger
- *   - default (default value)
- *   - info
- *   - primary
- *   - success
- *   - warning
- * - target: (optional) The target of the collapsible container.
- *
- * @ingroup templates
- */
-#}
-{%
-  set classes = [
-    'panel',
-    errors ? 'panel-danger' : 'panel-' ~ panel_type|clean_class,
-  ]
-%}
-<div{{ attributes.addClass(classes) }}>
-
-  {# Heading #}
-  {% if heading %}
-    {% block heading %}
-      <div class="panel-heading">
-        {%
-          set heading_classes = [
-            'panel-title',
-            required ? 'form-required' : '',
-          ]
-        %}
-        {% if collapsible %}
-          <a{{ heading_attributes.addClass(heading_classes) }} href="{{ target }}">{{ heading }}</a>
-        {% else %}
-          <div{{ heading_attributes.addClass(heading_classes) }}>{{ heading }}</div>
-        {% endif %}
-      </div>
-    {% endblock %}
-  {% endif %}
-
-  {# Body #}
-  {% block body %}
-    {%
-      set body_classes = [
-      'panel-body',
-      collapsible ? 'panel-collapse',
-      collapsible ? 'collapse',
-      collapsible ? 'fade',
-      errors or collapsible and not collapsed ? 'in',
-      ]
-    %}
-    {%
-      set description_classes = [
-        'help-block',
-        description and description.position == 'invisible' ? 'sr-only',
-      ]
-    %}
-
-    {% if errors %}
-      <div class="alert alert-danger" role="alert">
-        <strong>{{ errors }}</strong>
-      </div>
-    {% endif %}
-
-    <div{{ body_attributes.addClass(body_classes) }}>
-      {% if description and description.position == 'before' %}
-        <p{{ description.attributes.addClass(description_classes) }}>{{ description.content }}</p>
-      {% endif %}
-      {{ body }}
-      {% if description and description.position == 'after' or description.position == 'invisible' %}
-        <p{{ description.attributes.addClass(description_classes) }}>{{ description.content }}</p>
-      {% endif %}
-    </div>
-  {% endblock %}
-
-  {# Footer #}
-  {% if footer %}
-    {% block footer %}
-      {%
-        set footer_classes = [
-          'panel-footer',
-        ]
-      %}
-      <div{{ footer_attributes.addClass(footer_classes) }}>{{ footer }}</div>
-    {% endblock %}
-  {% endif %}
-
-</div>
diff --git a/themes/bootstrap/templates/bootstrap/item-list--bootstrap-carousel-indicators.html.twig b/themes/bootstrap/templates/bootstrap/item-list--bootstrap-carousel-indicators.html.twig
deleted file mode 100644
index bc6103f..0000000
--- a/themes/bootstrap/templates/bootstrap/item-list--bootstrap-carousel-indicators.html.twig
+++ /dev/null
@@ -1,28 +0,0 @@
-{#
-/**
- * @file
- * Theme override for an item list.
- *
- * Available variables:
- * - attributes: HTML attributes to be applied to the list.
- * - items: A list of items. Each item contains:
- *   - attributes: HTML attributes to be applied to each list item.
- * - list_type: The tag for list element ("ul" or "ol").
- * - start_index: (optional) Alters the slide position relative to its current
- *   position.
- * - target: A valid HTML ID for the carousel container.
- *
- * @ingroup templates
- *
- * @see template_preprocess_item_list()
- */
-#}
-{% set classes = ['carousel-indicators'] %}
-{% if items %}
-  <{{ list_type }}{{ attributes.addClass(classes) }} role="menu">
-    {% for item in items %}
-      {% set item_classes = [start_index == loop.index0 ? 'active'] %}
-      <li{{ item.attributes.addClass(item_classes) }} data-target="{{ target }}" data-slide-to="{{ loop.index0 }}"></li>
-    {% endfor %}
-  </{{ list_type }}>
-{% endif %}
diff --git a/themes/bootstrap/templates/bootstrap/item-list--dropdown.html.twig b/themes/bootstrap/templates/bootstrap/item-list--dropdown.html.twig
deleted file mode 100644
index a9cee12..0000000
--- a/themes/bootstrap/templates/bootstrap/item-list--dropdown.html.twig
+++ /dev/null
@@ -1,42 +0,0 @@
-{#
-/**
- * @file
- * Theme override for an item list.
- *
- * Available variables:
- * - alignment: (optional) The alignment of the dropdown menu.
- * - items: A list of items. Each item contains:
- *   - attributes: HTML attributes to be applied to each list item.
- *   - value: The content of the list element.
- * - title: The title of the list.
- * - list_type: The tag for list element ("ul" or "ol").
- * - wrapper_attributes: HTML attributes to be applied to the list wrapper.
- * - attributes: HTML attributes to be applied to the list.
- * - empty: A message to display when there are no items. Allowed value is a
- *   string or render array.
- * - context: A list of contextual data associated with the list. May contain:
- *   - list_style: The custom list style.
- *
- * @ingroup templates
- *
- * @see template_preprocess_item_list()
- */
-#}
-{%
-  set classes = [
-    'dropdown-menu',
-    alignment == 'left' ? 'dropdown-menu-left',
-    alignment == 'right' ? 'dropdown-menu-right',
-  ]
-%}
-{% if items or empty -%}
-  {%- if items -%}
-    <{{ list_type }}{{ attributes.addClass(classes) }} role="menu">
-      {%- for item in items -%}
-        <li{{ item.attributes }}>{{ item.value }}</li>
-      {%- endfor -%}
-    </{{ list_type }}>
-  {%- else -%}
-    {{- empty -}}
-  {%- endif -%}
-{%- endif %}
diff --git a/themes/bootstrap/templates/field/field-multiple-value-form.html.twig b/themes/bootstrap/templates/field/field-multiple-value-form.html.twig
deleted file mode 100644
index 5c645f7..0000000
--- a/themes/bootstrap/templates/field/field-multiple-value-form.html.twig
+++ /dev/null
@@ -1,36 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for an individual form element.
- *
- * Available variables for all fields:
- * - multiple: Whether there are multiple instances of the field.
- *
- * Available variables for single cardinality fields:
- * - elements: Form elements to be rendered.
- *
- * Available variables when there are multiple fields.
- * - table: Table of field items.
- * - description: Description text for the form element.
- * - button: "Add another item" button.
- *
- * @ingroup templates
- *
- * @see template_preprocess_field_multiple_value_form()
- */
-#}
-{% if multiple %}
-  <div class="form-item">
-    {{ table }}
-    {% if description.content %}
-      <div class="description help-block">{{ description.content }}</div>
-    {% endif %}
-    {% if button %}
-      <div class="clearfix">{{ button }}</div>
-    {% endif %}
-  </div>
-{% else %}
-  {% for element in elements %}
-    {{ element }}
-  {% endfor %}
-{% endif %}
diff --git a/themes/bootstrap/templates/field/field.html.twig b/themes/bootstrap/templates/field/field.html.twig
deleted file mode 100644
index 10e842f..0000000
--- a/themes/bootstrap/templates/field/field.html.twig
+++ /dev/null
@@ -1,81 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a field.
- *
- * To override output, copy the "field.html.twig" from the templates directory
- * to your theme's directory and customize it, just like customizing other
- * Drupal templates such as page.html.twig or node.html.twig.
- *
- * Instead of overriding the theming for all fields, you can also just override
- * theming for a subset of fields using
- * @link themeable Theme hook suggestions. @endlink For example,
- * here are some theme hook suggestions that can be used for a field_foo field
- * on an article node type:
- * - field--node--field-foo--article.html.twig
- * - field--node--field-foo.html.twig
- * - field--node--article.html.twig
- * - field--field-foo.html.twig
- * - field--text-with-summary.html.twig
- * - field.html.twig
- *
- * Available variables:
- * - attributes: HTML attributes for the containing element.
- * - label_hidden: Whether to show the field label or not.
- * - title_attributes: HTML attributes for the title.
- * - label: The label for the field.
- * - multiple: TRUE if a field can contain multiple items.
- * - items: List of all the field items. Each item contains:
- *   - attributes: List of HTML attributes for each item.
- *   - content: The field item's content.
- * - entity_type: The entity type to which the field belongs.
- * - field_name: The name of the field.
- * - field_type: The type of the field.
- * - label_display: The display settings for the label.
- *
- * @ingroup templates
- *
- * @see template_preprocess_field()
- */
-#}
-{%
-  set classes = [
-    'field',
-    'field--name-' ~ field_name|clean_class,
-    'field--type-' ~ field_type|clean_class,
-    'field--label-' ~ label_display,
-  ]
-%}
-{%
-  set title_classes = [
-    'field--label',
-    label_display == 'visually_hidden' ? 'sr-only',
-  ]
-%}
-
-{% if label_hidden %}
-  {% if multiple %}
-    <div{{ attributes.addClass(classes, 'field--items') }}>
-      {% for item in items %}
-        <div{{ item.attributes.addClass('field--item') }}>{{ item.content }}</div>
-      {% endfor %}
-    </div>
-  {% else %}
-    {% for item in items %}
-      <div{{ attributes.addClass(classes, 'field--item') }}>{{ item.content }}</div>
-    {% endfor %}
-  {% endif %}
-{% else %}
-  <div{{ attributes.addClass(classes) }}>
-    <div{{ title_attributes.addClass(title_classes) }}>{{ label }}</div>
-    {% if multiple %}
-      <div class="field__items">
-    {% endif %}
-    {% for item in items %}
-      <div{{ item.attributes.addClass('field--item') }}>{{ item.content }}</div>
-    {% endfor %}
-    {% if multiple %}
-      </div>
-    {% endif %}
-  </div>
-{% endif %}
diff --git a/themes/bootstrap/templates/file/file-link.html.twig b/themes/bootstrap/templates/file/file-link.html.twig
deleted file mode 100644
index 54ae38b..0000000
--- a/themes/bootstrap/templates/file/file-link.html.twig
+++ /dev/null
@@ -1,40 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a link to a file.
- *
- * Available variables:
- * - attributes: The HTML attributes for the containing element.
- * - link: A link to the file.
- * - icon: An icon.
- * - icon_only: Flag to display only the icon and not the label.
- * - icon_position: Where an icon should be displayed.
- *
- * @ingroup templates
- *
- * @see \Drupal\bootstrap\Plugin\Preprocess\FileLink::preprocessVariables
- */
-#}
-{% spaceless %}
-  {%
-    set classes = [
-      icon_only ? 'icon-only',
-      not icon_only ? 'icon-' ~ icon_position|clean_class
-    ]
-  %}
-  <span{{ attributes.addClass(classes) }}>
-    {% if icon_only %}
-      <span class="file-icon">{{ icon }}</span>
-      <span class="sr-only">
-        <span class="file-link">{{ link }}</span>
-        <span class="file-size">{{ file_size }}</span>
-      </span>
-    {% else %}
-      {% if icon_position == 'after' %}
-        <span class="file-link">{{ link }}</span><span class="file-size">{{ file_size }}</span><span class="file-icon">{{ icon }}</span>
-      {% else %}
-        <span class="file-icon">{{ icon }}</span><span class="file-link">{{ link }}</span><span class="file-size">{{ file_size }}</span>
-      {% endif %}
-    {% endif %}
-  </span>
-{% endspaceless %}
diff --git a/themes/bootstrap/templates/file/file-upload-help.html.twig b/themes/bootstrap/templates/file/file-upload-help.html.twig
deleted file mode 100644
index daee893..0000000
--- a/themes/bootstrap/templates/file/file-upload-help.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{#
-/**
- * @file
- * Theme override to display help text for file fields.
- *
- * Available variables:
- * - description: The normal description for this field, specified by the user.
- * - descriptions: Lines of help text for uploading a file.
- * - popover: Markup to display the descriptions as a popover instead.
- *
- * @ingroup templates
- *
- * @see template_preprocess_file_upload_help()
- */
-#}
-{% if description %}
-  {{ description }}<br>
-{% endif %}
-{% if popover %}
-  {{ popover }}
-{% else %}
-  {{ descriptions|safe_join('<br>') }}
-{% endif %}
diff --git a/themes/bootstrap/templates/file/image-widget.html.twig b/themes/bootstrap/templates/file/image-widget.html.twig
deleted file mode 100644
index 43e52ba..0000000
--- a/themes/bootstrap/templates/file/image-widget.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{#
-/**
- * @file
- * Theme override for an image field widget.
- *
- * Available variables:
- * - attributes: HTML attributes for the containing element.
- * - data: Render elements of the image widget.
- *
- * @ingroup templates
- *
- * @see template_preprocess_image_widget()
- */
-#}
-{% if data.preview %}
-  <div{{ attributes.addClass('row') }}>
-    <div class="preview col-sm-2">
-      {{ data.preview }}
-    </div>
-    <div class="data col-sm-10">
-      {# Render widget data without the image preview that was output already. #}
-      {{ data|without('preview') }}
-    </div>
-  </div>
-{% else %}
-  <div{{ attributes.addClass(classes) }}>
-    {{ data }}
-  </div>
-{% endif %}
diff --git a/themes/bootstrap/templates/filter/filter-tips.html.twig b/themes/bootstrap/templates/filter/filter-tips.html.twig
deleted file mode 100644
index 8495b84..0000000
--- a/themes/bootstrap/templates/filter/filter-tips.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a set of filter tips.
- *
- * Available variables:
- * - tips: A pre-constructed list of tips.
- *
- * @ingroup templates
- *
- * @see \Drupal\bootstrap\Plugin\Preprocess\FilterTips::preprocessVariables()
- */
-#}
-{{ tips }}
diff --git a/themes/bootstrap/templates/filter/text-format-wrapper.html.twig b/themes/bootstrap/templates/filter/text-format-wrapper.html.twig
deleted file mode 100644
index 31ee45c..0000000
--- a/themes/bootstrap/templates/filter/text-format-wrapper.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a text format-enabled form element.
- *
- * Available variables:
- * - children: Text format element children.
- * - description: Text format element description.
- * - attributes: HTML attributes for the containing element.
- * - aria_description: Flag for whether or not an ARIA description has been
- *   added to the description container.
- *
- * @see template_preprocess_text_format_wrapper()
- */
-#}
-<div class="js-text-format-wrapper text-format-wrapper js-form-item form-item">
-  {{ children }}
-  {% if description %}
-    {%
-      set classes = [
-        'help-block',
-        aria_description ? 'description',
-      ]
-    %}
-    <div{{ attributes.addClass(classes) }}>{{ description }}</div>
-  {% endif %}
-</div>
diff --git a/themes/bootstrap/templates/input/datetime-form.html.twig b/themes/bootstrap/templates/input/datetime-form.html.twig
deleted file mode 100644
index dc1ff54..0000000
--- a/themes/bootstrap/templates/input/datetime-form.html.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation of a datetime form element.
- *
- * Available variables:
- * - attributes: HTML attributes for the datetime form element.
- * - content: The datelist form element to be output.
- *
- * @see template_preprocess_datetime_form()
- *
- * @ingroup templates
- */
-#}
-<div{{ attributes.addClass('container-inline', 'form-inline') }}>
-  {{ content }}
-</div>
diff --git a/themes/bootstrap/templates/input/datetime-wrapper.html.twig b/themes/bootstrap/templates/input/datetime-wrapper.html.twig
deleted file mode 100644
index 3a392c9..0000000
--- a/themes/bootstrap/templates/input/datetime-wrapper.html.twig
+++ /dev/null
@@ -1,30 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation of a datetime form wrapper.
- *
- * Available variables:
- * - content: The form element to be output, usually a datelist, or datetime.
- * - title: The title of the form element.
- * - title_attributes: HTML attributes for the title wrapper.
- * - description: Description text for the form element.
- * - required: An indicator for whether the associated form element is required.
- *
- * @ingroup templates
- *
- * @see template_preprocess_datetime_wrapper()
- */
-#}
-{%
-  set title_classes = [
-    'control-label',
-    required ? 'form-required',
-  ]
-%}
-{% if title %}
-  <label{{ title_attributes.addClass(title_classes) }}>{{ title }}</label>
-{% endif %}
-{{ content }}
-{% if description %}
-  <p class="help-block">{{ description }}</p>
-{% endif %}
diff --git a/themes/bootstrap/templates/input/form-element-label.html.twig b/themes/bootstrap/templates/input/form-element-label.html.twig
deleted file mode 100644
index bc82bf5..0000000
--- a/themes/bootstrap/templates/input/form-element-label.html.twig
+++ /dev/null
@@ -1,48 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a form element label.
- *
- * Available variables:
- * - element: an input element.
- * - title: The label's text.
- * - title_display: Elements title_display setting.
- * - description: element description.
- * - required: An indicator for whether the associated form element is required.
- * - is_checkbox: Whether the label is outputted in checkbox context.
- * - is_radio: Whether the label is outputted in radio button context.
- * - attributes: A list of HTML attributes for the label.
- *
- * @ingroup templates
- *
- * @see template_preprocess_form_element_label()
- */
-#}
-{%-
-  set classes = [
-    'control-label',
-    title_display == 'after' ? 'option',
-    title_display == 'invisible' and not (is_checkbox or is_radio) ? 'sr-only',
-    required ? 'js-form-required',
-    required ? 'form-required',
-  ]
--%}
-{% if title is not empty and title_display == 'invisible' and (is_checkbox or is_radio) -%}
-  {#
-  Clear but preserve label text as attribute (e.g. for screen readers) for
-  checkboxes/radio buttons when it actually should be invisible.
-  #}
-  {%- set attributes = attributes.setAttribute('title', title) -%}
-  {%- set title = null -%}
-{%- endif -%}
-{#
-Labels for single checkboxes/radios contain the element itself and thus have
-always to be rendered regardless of whether they have a title or not.
-#}
-{%- if title is not empty or is_checkbox or is_radio -%}
-  <label{{ attributes.addClass(classes) }}>{{ element }}{{ title }}
-    {%- if description -%}
-      <p class="help-block">{{ description }}</p>
-    {%- endif -%}
-  </label>
-{%- endif -%}
diff --git a/themes/bootstrap/templates/input/form-element.html.twig b/themes/bootstrap/templates/input/form-element.html.twig
deleted file mode 100644
index 7d1d2e8..0000000
--- a/themes/bootstrap/templates/input/form-element.html.twig
+++ /dev/null
@@ -1,101 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a form element.
- *
- * Available variables:
- * - attributes: HTML attributes for the containing element.
- * - errors: (optional) Any inline error messages to display for this form
- *   element; may not be set.
- * - has_error: (optional) Flag indicating whether to add the "has_error"
- *   Bootstrap class for this form element.
- * - required: The required marker, or empty if the associated form element is
- *   not required.
- * - type: The type of the element.
- * - name: The name of the element.
- * - label: A rendered label element.
- * - label_display: Label display setting. It can have these values:
- *   - before: The label is output before the element. This is the default.
- *     The label includes the #title and the required marker, if #required.
- *   - after: The label is output after the element. For example, this is used
- *     for radio and checkbox #type elements. If the #title is empty but the
- *     field is #required, the label will contain only the required marker.
- *   - invisible: Labels are critical for screen readers to enable them to
- *     properly navigate through forms but can be visually distracting. This
- *     property hides the label for everyone except screen readers.
- *   - attribute: Set the title attribute on the element to create a tooltip but
- *     output no label element. This is supported only for checkboxes and radios
- *     in \Drupal\Core\Render\Element\CompositeFormElementTrait::preRenderCompositeFormElement().
- *     It is used where a visual label is not needed, such as a table of
- *     checkboxes where the row and column provide the context. The tooltip will
- *     include the title and required marker.
- * - description: (optional) A list of description properties containing:
- *    - content: A description of the form element, may not be set.
- *    - attributes: (optional) A list of HTML attributes to apply to the
- *      description content wrapper. Will only be set when description is set.
- * - description_display: Description display setting. It can have these values:
- *   - before: The description is output before the element.
- *   - after: The description is output after the element. This is the default
- *     value.
- *   - invisible: The description is output after the element, hidden visually
- *     but available to screen readers.
- * - disabled: True if the element is disabled.
- * - title_display: Title display setting.
- *
- * @ingroup templates
- *
- * @see template_preprocess_form_element()
- */
-#}
-{%
-  set classes = [
-    'form-item',
-    'js-form-item',
-    'form-type-' ~ type|clean_class,
-    'js-form-type-' ~ type|clean_class,
-    'form-item-' ~ name|clean_class,
-    'js-form-item-' ~ name|clean_class,
-    title_display not in ['after', 'before'] ? 'form-no-label',
-    disabled == 'disabled' ? 'form-disabled',
-    is_form_group ? 'form-group',
-    is_radio ? 'radio',
-    is_checkbox ? 'checkbox',
-    is_autocomplete ? 'form-autocomplete',
-    has_error ? 'error has-error'
-  ]
-%}{%
-  set description_classes = [
-    'description',
-    'help-block',
-    description_display == 'invisible' ? 'visually-hidden',
-  ]
-%}
-<div{{ attributes.addClass(classes) }}>
-  {% if label_display in ['before', 'invisible'] %}
-    {{ label }}
-  {% endif %}
-
-  {% if description_display == 'before' and description.content %}
-    <div{{ description.attributes }}>
-      {{ description.content }}
-    </div>
-  {% endif %}
-
-  {{ children }}
-
-  {% if label_display == 'after' %}
-    {{ label }}
-  {% endif %}
-
-  {% if errors %}
-    <div class="form-item--error-message alert alert-danger alert-sm">
-      {{ errors }}
-    </div>
-  {% endif %}
-
-  {% if description_display in ['after', 'invisible'] and description.content %}
-    <div{{ description.attributes.addClass(description_classes) }}>
-      {{ description.content }}
-    </div>
-  {% endif %}
-</div>
diff --git a/themes/bootstrap/templates/input/input--button--split.html.twig b/themes/bootstrap/templates/input/input--button--split.html.twig
deleted file mode 100644
index c7d6f01..0000000
--- a/themes/bootstrap/templates/input/input--button--split.html.twig
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends "input--button.html.twig" %}
-{#
-/**
- * @file
- * Theme suggestion for "button__split" input form element.
- *
- * Available variables:
- * - attributes: A list of HTML attributes for the input element.
- * - children: Optional additional rendered elements.
- * - icon: An icon.
- * - icon_only: Flag to display only the icon and not the label.
- * - icon_position: Where an icon should be displayed.
- * - label: button label.
- * - prefix: Markup to display before the input element.
- * - suffix: Markup to display after the input element.
- * - type: The type of input.
- *
- * @ingroup templates
- *
- * @see \Drupal\bootstrap\Plugin\Preprocess\InputButton
- * @see \Drupal\bootstrap\Plugin\Preprocess\Input
- * @see template_preprocess_input()
- */
-#}
-{% spaceless %}
-  {%
-    set classes = [
-      'btn',
-      type == 'submit' ? 'js-form-submit',
-      icon and icon_position and not icon_only ? 'icon-' ~ icon_position,
-    ]
-  %}
-  {% block input %}
-    {% if icon_only %}
-      <button{{ attributes.addClass(classes, 'icon-only') }}>
-        <span class="sr-only">{{ label }}</span>
-        {{ icon }}
-      </button>
-    {% else %}
-      {% if icon_position == 'after' %}
-        <button{{ attributes.addClass(classes) }}>{{ label }}{{ icon }}</button>{{ children }}
-      {% else %}
-        <button{{ attributes.addClass(classes) }}>{{ icon }}{{ label }}</button>{{ children }}
-      {% endif %}
-    {% endif %}
-    {%
-      set classes = [
-        'btn',
-        'dropdown-toggle',
-      ]
-    %}
-    <button{{ split_button_attributes.addClass(classes) }} type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-      <span class="caret"></span>
-      <span class="sr-only">{{ 'Toggle Dropdown'|t }}</span>
-    </button>
-    {{ children }}
-  {% endblock %}
-{% endspaceless %}
diff --git a/themes/bootstrap/templates/input/input--button.html.twig b/themes/bootstrap/templates/input/input--button.html.twig
deleted file mode 100644
index 7166b1a..0000000
--- a/themes/bootstrap/templates/input/input--button.html.twig
+++ /dev/null
@@ -1,48 +0,0 @@
-{% extends "input.html.twig" %}
-{#
-/**
- * @file
- * Theme suggestion for "button" input form element.
- *
- * Available variables:
- * - attributes: A list of HTML attributes for the input element.
- * - children: Optional additional rendered elements.
- * - icon: An icon.
- * - icon_only: Flag to display only the icon and not the label.
- * - icon_position: Where an icon should be displayed.
- * - label: button label.
- * - prefix: Markup to display before the input element.
- * - suffix: Markup to display after the input element.
- * - type: The type of input.
- *
- * @ingroup templates
- *
- * @see \Drupal\bootstrap\Plugin\Preprocess\InputButton
- * @see \Drupal\bootstrap\Plugin\Preprocess\Input
- * @see template_preprocess_input()
- */
-#}
-{% spaceless %}
-  {%
-    set classes = [
-      'btn',
-      type == 'submit' ? 'js-form-submit',
-      icon and icon_position and not icon_only ? 'icon-' ~ icon_position,
-    ]
-  %}
-  {% block input %}
-    {% if icon and icon_only %}
-      <button{{ attributes.addClass(classes, 'icon-only') }}>
-        <span class="sr-only">{{ label }}</span>
-        {{ icon }}
-      </button>
-    {% else %}
-      {% if icon_position == 'after' %}
-        <button{{ attributes.addClass(classes) }}>{{ label }}{{ icon }}</button>{{ children }}
-      {% else %}
-        <button{{ attributes.addClass(classes) }}>{{ icon }}{{ label }}</button>{{ children }}
-      {% endif %}
-    {% endif %}
-    {{ children }}
-  {% endblock %}
-{% endspaceless %}
diff --git a/themes/bootstrap/templates/input/input--form-control.html.twig b/themes/bootstrap/templates/input/input--form-control.html.twig
deleted file mode 100644
index 5694480..0000000
--- a/themes/bootstrap/templates/input/input--form-control.html.twig
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends "input.html.twig" %}
-{#
-/**
- * @file
- * Default theme implementation for an 'input__textfield' #type form element.
- *
- * Available variables:
- * - attributes: A list of HTML attributes for the input element.
- * - children: Optional additional rendered elements.
- * - icon: An icon.
- * - input_group: Flag to display as an input group.
- * - icon_position: Where an icon should be displayed.
- * - prefix: Markup to display before the input element.
- * - suffix: Markup to display after the input element.
- * - type: The type of input.
- *
- * @ingroup templates
- *
- * @see \Drupal\bootstrap\Plugin\Preprocess\Input
- * @see template_preprocess_input()
- */
-#}
-{% spaceless %}
-  {%
-    set classes = [
-      'form-control',
-    ]
-  %}
-  {% block input %}
-    <input{{ attributes.addClass(classes) }} />
-  {% endblock %}
-{% endspaceless %}
diff --git a/themes/bootstrap/templates/input/input.html.twig b/themes/bootstrap/templates/input/input.html.twig
deleted file mode 100644
index 662a6ab..0000000
--- a/themes/bootstrap/templates/input/input.html.twig
+++ /dev/null
@@ -1,44 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for an 'input' #type form element.
- *
- * Available variables:
- * - attributes: A list of HTML attributes for the input element.
- * - children: Optional additional rendered elements.
- * - icon: An icon.
- * - input_group: Flag to display as an input group.
- * - icon_position: Where an icon should be displayed.
- * - prefix: Markup to display before the input element.
- * - suffix: Markup to display after the input element.
- * - type: The type of input.
- *
- * @ingroup templates
- *
- * @see \Drupal\bootstrap\Plugin\Preprocess\Input
- * @see template_preprocess_input()
- */
-#}
-{% spaceless %}
-  {% if input_group %}
-    <div class="input-group">
-  {% endif %}
-
-  {% if prefix %}
-    {{ prefix }}
-  {% endif %}
-
-  {% block input %}
-    <input{{ attributes }} />
-  {% endblock %}
-
-  {% if suffix %}
-    {{ suffix }}
-  {% endif %}
-
-  {% if input_group %}
-    </div>
-  {% endif %}
-
-  {{ children }}
-{% endspaceless %}
diff --git a/themes/bootstrap/templates/input/select.html.twig b/themes/bootstrap/templates/input/select.html.twig
deleted file mode 100644
index 8d75f0e..0000000
--- a/themes/bootstrap/templates/input/select.html.twig
+++ /dev/null
@@ -1,61 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a select element.
- *
- * Available variables:
- * - attributes: HTML attributes for the select tag.
- * - input_group: Flag to display as an input group.
- * - options: The option element children.
- * - prefix: Markup to display before the input element.
- * - suffix: Markup to display after the input element.
- *
- * @ingroup templates
- *
- * @see template_preprocess_select()
- */
-#}
-{% spaceless %}
-  {% if input_group %}
-    <div class="input-group">
-  {% endif %}
-
-  {% if prefix %}
-    {{ prefix }}
-  {% endif %}
-
-  {# Browsers do not recognize pseudo :after selectors, we must create a wrapper
-   # around the select element to style it properly.
-   # @see http://stackoverflow.com/q/21103542
-   #}
-  {% if not attributes.offsetExists('multiple') %}
-    <div class="select-wrapper">
-  {% endif %}
-    {% set classes = ['form-control'] %}
-    <select{{ attributes.addClass(classes) }}>
-      {% for option in options %}
-        {% if option.type == 'optgroup' %}
-          <optgroup label="{{ option.label }}">
-            {% for sub_option in option.options %}
-              <option
-                value="{{ sub_option.value }}"{{ sub_option.selected ? ' selected="selected"' }}>{{ sub_option.label }}</option>
-            {% endfor %}
-          </optgroup>
-        {% elseif option.type == 'option' %}
-          <option
-            value="{{ option.value }}"{{ option.selected ? ' selected="selected"' }}>{{ option.label }}</option>
-        {% endif %}
-      {% endfor %}
-    </select>
-  {% if not attributes.offsetExists('multiple') %}
-    </div>
-  {% endif %}
-
-  {% if suffix %}
-    {{ suffix }}
-  {% endif %}
-
-  {% if input_group %}
-    </div>
-  {% endif %}
-{% endspaceless %}
diff --git a/themes/bootstrap/templates/input/textarea.html.twig b/themes/bootstrap/templates/input/textarea.html.twig
deleted file mode 100644
index 3b8d5c8..0000000
--- a/themes/bootstrap/templates/input/textarea.html.twig
+++ /dev/null
@@ -1,28 +0,0 @@
-{#
-/**
- * @file
- * Bootstrap theme implementation for a 'textarea' #type form element.
- *
- * Available variables
- * - wrapper_attributes: A list of HTML attributes for the wrapper element.
- * - attributes: A list of HTML attributes for the textarea element.
- * - resizable: An indicator for whether the textarea is resizable.
- * - required: An indicator for whether the textarea is required.
- * - value: The textarea content.
- *
- * @ingroup templates
- *
- * @see template_preprocess_textarea()
- */
-#}
-{%
-  set classes = [
-    'form-textarea',
-    'form-control',
-    resizable ? 'resize-' ~ resizable,
-    required ? 'required',
-  ]
-%}
-<div{{ wrapper_attributes.addClass('form-textarea-wrapper') }}>
-  <textarea{{ attributes.addClass(classes) }}>{{ value }}</textarea>
-</div>
diff --git a/themes/bootstrap/templates/menu/menu--account.html.twig b/themes/bootstrap/templates/menu/menu--account.html.twig
deleted file mode 100644
index d66d5cb..0000000
--- a/themes/bootstrap/templates/menu/menu--account.html.twig
+++ /dev/null
@@ -1,56 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a menu.
- *
- * Available variables:
- * - menu_name: The machine name of the menu.
- * - items: A nested list of menu items. Each menu item contains:
- *   - attributes: HTML attributes for the menu item.
- *   - below: The menu item child items.
- *   - title: The menu link title.
- *   - url: The menu link url, instance of \Drupal\Core\Url
- *   - localized_options: Menu link localized options.
- *
- * @ingroup templates
- */
-#}
-{% import _self as menus %}
-
-{#
-  We call a macro which calls itself to render the full tree.
-  @see http://twig.sensiolabs.org/doc/tags/macro.html
-#}
-{{ menus.menu_links(items, attributes, 0) }}
-
-{% macro menu_links(items, attributes, menu_level) %}
-  {% import _self as menus %}
-  {% if items %}
-    {% if menu_level == 0 %}
-      <ul{{ attributes.addClass('menu', 'nav', 'navbar-nav', 'navbar-right') }}>
-    {% else %}
-      <ul{{ attributes.addClass('dropdown-menu') }}>
-    {% endif %}
-    {% for item in items %}
-      {%
-        set item_classes = [
-          item.is_expanded? 'expanded',
-          item.is_expanded and menu_level == 0 ? 'dropdown',
-          item.in_active_trail ? 'active',
-        ]
-      %}
-      {% if menu_level == 0 and item.is_expanded %}
-        <li{{ item.attributes.addClass(item_classes) }}>
-        <a href="{{ item.url }}" class="dropdown-toggle" data-target="#" data-toggle="dropdown">{{ item.title }} <span class="caret"></span></a>
-      {% else %}
-        <li{{ item.attributes.addClass(item_classes) }}>
-        {{ link(item.title, item.url) }}
-      {% endif %}
-      {% if item.below %}
-        {{ menus.menu_links(item.below, attributes.removeClass('nav', 'navbar-nav', 'navbar-right'), menu_level + 1) }}
-      {% endif %}
-      </li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-{% endmacro %}
diff --git a/themes/bootstrap/templates/menu/menu--main.html.twig b/themes/bootstrap/templates/menu/menu--main.html.twig
deleted file mode 100644
index 20f5a85..0000000
--- a/themes/bootstrap/templates/menu/menu--main.html.twig
+++ /dev/null
@@ -1,56 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a menu.
- *
- * Available variables:
- * - menu_name: The machine name of the menu.
- * - items: A nested list of menu items. Each menu item contains:
- *   - attributes: HTML attributes for the menu item.
- *   - below: The menu item child items.
- *   - title: The menu link title.
- *   - url: The menu link url, instance of \Drupal\Core\Url
- *   - localized_options: Menu link localized options.
- *
- * @ingroup templates
- */
-#}
-{% import _self as menus %}
-
-{#
-  We call a macro which calls itself to render the full tree.
-  @see http://twig.sensiolabs.org/doc/tags/macro.html
-#}
-{{ menus.menu_links(items, attributes, 0) }}
-
-{% macro menu_links(items, attributes, menu_level) %}
-  {% import _self as menus %}
-  {% if items %}
-    {% if menu_level == 0 %}
-      <ul{{ attributes.addClass('menu', 'nav', 'navbar-nav') }}>
-    {% else %}
-      <ul{{ attributes.addClass('dropdown-menu') }}>
-    {% endif %}
-    {% for item in items %}
-      {%
-        set item_classes = [
-          item.is_expanded? 'expanded',
-          item.is_expanded and menu_level == 0 ? 'dropdown',
-          item.in_active_trail ? 'active',
-        ]
-      %}
-      {% if menu_level == 0 and item.is_expanded %}
-        <li{{ item.attributes.addClass(item_classes) }}>
-        <a href="{{ item.url }}" class="dropdown-toggle" data-target="#" data-toggle="dropdown">{{ item.title }} <span class="caret"></span></a>
-      {% else %}
-        <li{{ item.attributes.addClass(item_classes) }}>
-        {{ link(item.title, item.url) }}
-      {% endif %}
-      {% if item.below %}
-        {{ menus.menu_links(item.below, attributes.removeClass('nav', 'navbar-nav'), menu_level + 1) }}
-      {% endif %}
-      </li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-{% endmacro %}
diff --git a/themes/bootstrap/templates/menu/menu-local-task.html.twig b/themes/bootstrap/templates/menu/menu-local-task.html.twig
deleted file mode 100644
index f9b4516..0000000
--- a/themes/bootstrap/templates/menu/menu-local-task.html.twig
+++ /dev/null
@@ -1,22 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a local task link.
- *
- * Available variables:
- * - attributes: HTML attributes for the wrapper element.
- * - is_active: Whether the task item is an active tab.
- * - link: A rendered link element.
- *
- * Note: This template renders the content for each task item in
- * menu-local-tasks.html.twig.
- *
- * @ingroup templates
- *
- * @see template_preprocess_menu_local_task()
- */
-#}
-{% set classes = [
-  is_active ? 'active',
-] %}
-<li{{ attributes.addClass(classes) }}>{{ link }}</li>
diff --git a/themes/bootstrap/templates/menu/menu-local-tasks.html.twig b/themes/bootstrap/templates/menu/menu-local-tasks.html.twig
deleted file mode 100644
index e2c9bdc..0000000
--- a/themes/bootstrap/templates/menu/menu-local-tasks.html.twig
+++ /dev/null
@@ -1,25 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display primary and secondary local tasks.
- *
- * Available variables:
- * - primary: HTML list items representing primary tasks.
- * - secondary: HTML list items representing primary tasks.
- *
- * Each item in these variables (primary and secondary) can be individually
- * themed in menu-local-task.html.twig.
- *
- * @ingroup templates
- *
- * @see template_preprocess_menu_local_tasks()
- */
-#}
-{% if primary %}
-  <h2 class="visually-hidden">{{ 'Primary tabs'|t }}</h2>
-  <ul class="tabs--primary nav nav-tabs">{{ primary }}</ul>
-{% endif %}
-{% if secondary %}
-  <h2 class="visually-hidden">{{ 'Secondary tabs'|t }}</h2>
-  <ul class="tabs--secondary pagination pagination-sm">{{ secondary }}</ul>
-{% endif %}
diff --git a/themes/bootstrap/templates/menu/menu.html.twig b/themes/bootstrap/templates/menu/menu.html.twig
deleted file mode 100644
index cbc5be8..0000000
--- a/themes/bootstrap/templates/menu/menu.html.twig
+++ /dev/null
@@ -1,56 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a menu.
- *
- * Available variables:
- * - menu_name: The machine name of the menu.
- * - items: A nested list of menu items. Each menu item contains:
- *   - attributes: HTML attributes for the menu item.
- *   - below: The menu item child items.
- *   - title: The menu link title.
- *   - url: The menu link url, instance of \Drupal\Core\Url
- *   - localized_options: Menu link localized options.
- *
- * @ingroup templates
- */
-#}
-{% import _self as menus %}
-
-{#
-  We call a macro which calls itself to render the full tree.
-  @see http://twig.sensiolabs.org/doc/tags/macro.html
-#}
-{{ menus.menu_links(items, attributes, 0) }}
-
-{% macro menu_links(items, attributes, menu_level) %}
-  {% import _self as menus %}
-  {% if items %}
-    {% if menu_level == 0 %}
-      <ul{{ attributes.addClass('menu', 'nav') }}>
-    {% else %}
-      <ul{{ attributes.addClass('dropdown-menu') }}>
-    {% endif %}
-    {% for item in items %}
-      {%
-        set item_classes = [
-          item.is_expanded? 'expanded',
-          item.is_expanded and menu_level == 0 ? 'dropdown',
-          item.in_active_trail ? 'active',
-        ]
-      %}
-      {% if menu_level == 0 and item.is_expanded %}
-        <li{{ item.attributes.addClass(item_classes) }}>
-        <a href="{{ item.url }}" class="dropdown-toggle" data-target="#" data-toggle="dropdown">{{ item.title }} <span class="caret"></span></a>
-      {% else %}
-        <li{{ item.attributes.addClass(item_classes) }}>
-        {{ link(item.title, item.url) }}
-      {% endif %}
-      {% if item.below %}
-        {{ menus.menu_links(item.below, attributes.removeClass('nav'), menu_level + 1) }}
-      {% endif %}
-      </li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-{% endmacro %}
diff --git a/themes/bootstrap/templates/node/node.html.twig b/themes/bootstrap/templates/node/node.html.twig
deleted file mode 100644
index b39e178..0000000
--- a/themes/bootstrap/templates/node/node.html.twig
+++ /dev/null
@@ -1,102 +0,0 @@
-{#
-/**
- * @file
- * Theme override to display a node.
- *
- * Available variables:
- * - node: The node entity with limited access to object properties and methods.
-     Only "getter" methods (method names starting with "get", "has", or "is")
-     and a few common methods such as "id" and "label" are available. Calling
-     other methods (such as node.delete) will result in an exception.
- * - label: The title of the node.
- * - content: All node items. Use {{ content }} to print them all,
- *   or print a subset such as {{ content.field_example }}. Use
- *   {{ content|without('field_example') }} to temporarily suppress the printing
- *   of a given child element.
- * - author_picture: The node author user entity, rendered using the "compact"
- *   view mode.
- * - metadata: Metadata for this node.
- * - date: Themed creation date field.
- * - author_name: Themed author name field.
- * - url: Direct URL of the current node.
- * - display_submitted: Whether submission information should be displayed.
- * - attributes: HTML attributes for the containing element.
- *   The attributes.class element may contain one or more of the following
- *   classes:
- *   - node: The current template type (also known as a "theming hook").
- *   - node--type-[type]: The current node type. For example, if the node is an
- *     "Article" it would result in "node--type-article". Note that the machine
- *     name will often be in a short form of the human readable label.
- *   - node--view-mode-[view_mode]: The View Mode of the node; for example, a
- *     teaser would result in: "node--view-mode-teaser", and
- *     full: "node--view-mode-full".
- *   The following are controlled through the node publishing options.
- *   - node--promoted: Appears on nodes promoted to the front page.
- *   - node--sticky: Appears on nodes ordered above other non-sticky nodes in
- *     teaser listings.
- *   - node--unpublished: Appears on unpublished nodes visible only to site
- *     admins.
- * - title_attributes: Same as attributes, except applied to the main title
- *   tag that appears in the template.
- * - content_attributes: Same as attributes, except applied to the main
- *   content tag that appears in the template.
- * - author_attributes: Same as attributes, except applied to the author of
- *   the node tag that appears in the template.
- * - title_prefix: Additional output populated by modules, intended to be
- *   displayed in front of the main title tag that appears in the template.
- * - title_suffix: Additional output populated by modules, intended to be
- *   displayed after the main title tag that appears in the template.
- * - view_mode: View mode; for example, "teaser" or "full".
- * - teaser: Flag for the teaser state. Will be true if view_mode is 'teaser'.
- * - page: Flag for the full page state. Will be true if view_mode is 'full'.
- * - readmore: Flag for more state. Will be true if the teaser content of the
- *   node cannot hold the main body content.
- * - logged_in: Flag for authenticated user status. Will be true when the
- *   current user is a logged-in member.
- * - is_admin: Flag for admin user status. Will be true when the current user
- *   is an administrator.
- *
- * @ingroup templates
- *
- * @see template_preprocess_node()
- *
- * @todo Remove the id attribute (or make it a class), because if that gets
- *   rendered twice on a page this is invalid CSS for example: two lists
- *   in different view modes.
- */
-#}
-{%
-  set classes = [
-    node.bundle|clean_class,
-    node.isPromoted() ? 'is-promoted',
-    node.isSticky() ? 'is-sticky',
-    not node.isPublished() ? 'is-unpublished',
-    view_mode ? view_mode|clean_class,
-    'clearfix',
-  ]
-%}
-<article{{ attributes.addClass(classes) }}>
-
-  {{ title_prefix }}
-  {% if not page %}
-    <h2{{ title_attributes }}>
-      <a href="{{ url }}" rel="bookmark">{{ label }}</a>
-    </h2>
-  {% endif %}
-  {{ title_suffix }}
-
-  {% if display_submitted %}
-    <footer>
-      {{ author_picture }}
-      <div{{ author_attributes.addClass('author') }}>
-        {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %}
-        {{ metadata }}
-      </div>
-    </footer>
-  {% endif %}
-
-  <div{{ content_attributes.addClass('content') }}>
-    {{ content }}
-  </div>
-
-</article>
diff --git a/themes/bootstrap/templates/system/breadcrumb.html.twig b/themes/bootstrap/templates/system/breadcrumb.html.twig
deleted file mode 100644
index b161dcb..0000000
--- a/themes/bootstrap/templates/system/breadcrumb.html.twig
+++ /dev/null
@@ -1,24 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a breadcrumb trail.
- *
- * Available variables:
- * - breadcrumb: Breadcrumb trail items.
- *
- * @ingroup templates
- */
-#}
-{% if breadcrumb %}
-  <ol class="breadcrumb">
-    {% for item in breadcrumb %}
-      <li {{ item.attributes }}>
-        {% if item.url %}
-          <a href="{{ item.url }}">{{ item.text }}</a>
-        {% else %}
-          {{ item.text }}
-        {% endif %}
-      </li>
-    {% endfor %}
-  </ol>
-{% endif %}
diff --git a/themes/bootstrap/templates/system/container.html.twig b/themes/bootstrap/templates/system/container.html.twig
deleted file mode 100644
index 915e826..0000000
--- a/themes/bootstrap/templates/system/container.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{#
-/**
- * @file
- * Theme override of a container used to wrap child elements.
- *
- * Used for grouped form items. Can also be used as a theme wrapper for any
- * renderable element, to surround it with a <div> and HTML attributes.
- * See the @link forms_api_reference.html Form API reference @endlink for more
- * information on the #theme_wrappers render array property.
- *
- * Available variables:
- * - attributes: HTML attributes for the containing element.
- * - children: The rendered child elements of the container.
- * - has_parent: A flag to indicate that the container has one or more parent
- *   containers.
- *
- * @ingroup templates
- *
- * @see template_preprocess_container()
- */
-#}
-{%
-  set classes = [
-    not attributes.hasClass('toolbar-menu-administration') ? 'form-group',
-    has_parent ? 'js-form-wrapper',
-    has_parent ? 'form-wrapper',
-  ]
-%}
-<div{{ attributes.addClass(classes) }}>{{ children }}</div>
diff --git a/themes/bootstrap/templates/system/html.html.twig b/themes/bootstrap/templates/system/html.html.twig
deleted file mode 100644
index b6f22d4..0000000
--- a/themes/bootstrap/templates/system/html.html.twig
+++ /dev/null
@@ -1,74 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display the basic html structure of a single
- * Drupal page.
- *
- * Variables:
- * - $css: An array of CSS files for the current page.
- * - $language: (object) The language the site is being displayed in.
- *   $language->language contains its textual representation.
- *   $language->dir contains the language direction. It will either be 'ltr' or
- *   'rtl'.
- * - $rdf_namespaces: All the RDF namespace prefixes used in the HTML document.
- * - $grddl_profile: A GRDDL profile allowing agents to extract the RDF data.
- * - $head_title: A modified version of the page title, for use in the TITLE
- *   tag.
- * - $head_title_array: (array) An associative array containing the string parts
- *   that were used to generate the $head_title variable, already prepared to be
- *   output as TITLE tag. The key/value pairs may contain one or more of the
- *   following, depending on conditions:
- *   - title: The title of the current page, if any.
- *   - name: The name of the site.
- *   - slogan: The slogan of the site, if any, and if there is no title.
- * - $head: Markup for the HEAD section (including meta tags, keyword tags, and
- *   so on).
- * - $styles: Style tags necessary to import all CSS files for the page.
- * - $scripts: Script tags necessary to load the JavaScript files and settings
- *   for the page.
- * - $page_top: Initial markup from any modules that have altered the
- *   page. This variable should always be output first, before all other dynamic
- *   content.
- * - $page: The rendered page content.
- * - $page_bottom: Final closing markup from any modules that have altered the
- *   page. This variable should always be output last, after all other dynamic
- *   content.
- * - $classes String of classes that can be used to style contextually through
- *   CSS.
- *
- * @ingroup templates
- *
- * @see bootstrap_preprocess_html()
- * @see template_preprocess()
- * @see template_preprocess_html()
- * @see template_process()
- */
-#}
-{%
-  set body_classes = [
-    logged_in ? 'user-logged-in',
-    not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
-    node_type ? 'page-node-type-' ~ node_type|clean_class,
-    db_offline ? 'db-offline',
-    theme.settings.navbar_position ? 'navbar-is-' ~ theme.settings.navbar_position,
-    theme.has_glyphicons ? 'has-glyphicons',
-  ]
-%}
-<!DOCTYPE html>
-<html {{ html_attributes }}>
-  <head>
-    <head-placeholder token="{{ placeholder_token|raw }}">
-    <title>{{ head_title|safe_join(' | ') }}</title>
-    <css-placeholder token="{{ placeholder_token|raw }}">
-    <js-placeholder token="{{ placeholder_token|raw }}">
-  </head>
-  <body{{ attributes.addClass(body_classes) }}>
-    <a href="#main-content" class="visually-hidden focusable skip-link">
-      {{ 'Skip to main content'|t }}
-    </a>
-    {{ page_top }}
-    {{ page }}
-    {{ page_bottom }}
-    <js-bottom-placeholder token="{{ placeholder_token|raw }}">
-  </body>
-</html>
diff --git a/themes/bootstrap/templates/system/image.html.twig b/themes/bootstrap/templates/system/image.html.twig
deleted file mode 100644
index aac916c..0000000
--- a/themes/bootstrap/templates/system/image.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation of an image.
- *
- * Available variables:
- * - attributes: HTML attributes for the img tag.
- * - style_name: (optional) The name of the image style applied.
- *
- * @ingroup templates
- *
- * @see template_preprocess_image()
- */
-#}
-{% set classes = [
-  theme.settings.image_shape ? theme.settings.image_shape,
-  theme.settings.image_responsive ? 'img-responsive',
-] %}
-<img{{ attributes.addClass(classes) }} />
diff --git a/themes/bootstrap/templates/system/links.html.twig b/themes/bootstrap/templates/system/links.html.twig
deleted file mode 100644
index fbe5266..0000000
--- a/themes/bootstrap/templates/system/links.html.twig
+++ /dev/null
@@ -1,62 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a set of links.
- *
- * Available variables:
- * - attributes: Attributes for the UL containing the list of links.
- * - links: Links to be output.
- *   Each link will have the following elements:
- *   - title: The link text.
- *   - href: The link URL. If omitted, the 'title' is shown as a plain text
- *     item in the links list. If 'href' is supplied, the entire link is passed
- *     to l() as its $options parameter.
- *   - attributes: (optional) HTML attributes for the anchor, or for the <span>
- *     tag if no 'href' is supplied.
- *   - link_key: The link CSS class.
- * - heading: (optional) A heading to precede the links.
- *   - text: The heading text.
- *   - level: The heading level (e.g. 'h2', 'h3').
- *   - attributes: (optional) A keyed list of attributes for the heading.
- *   If the heading is a string, it will be used as the text of the heading and
- *   the level will default to 'h2'.
- *
- *   Headings should be used on navigation menus and any list of links that
- *   consistently appears on multiple pages. To make the heading invisible use
- *   the 'visually-hidden' CSS class. Do not use 'display:none', which
- *   removes it from screen readers and assistive technology. Headings allow
- *   screen reader and keyboard only users to navigate to or skip the links.
- *   See http://juicystudio.com/article/screen-readers-display-none.php and
- *   http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
- *
- * @ingroup templates
- *
- * @see template_preprocess_links()
- */
-#}
-{% if links -%}
-  {%- if heading -%}
-    {%- if heading.level -%}
-      <{{ heading.level }}{{ heading.attributes }}>{{ heading.text }}</{{ heading.level }}>
-    {%- else -%}
-      <h2{{ heading.attributes }}>{{ heading.text }}</h2>
-    {%- endif -%}
-  {%- endif -%}
-  {%- if attributes.hasClass('inline') -%}
-  <ul{{ attributes.addClass('list-inline') }}>
-  {%- else -%}
-  <ul{{ attributes }}>
-  {%- endif -%}
-    {%- for key, item in links -%}
-      <li{{ item.attributes.addClass(key|clean_class) }}>
-        {%- if item.link -%}
-          {{ item.link }}
-        {%- elseif item.text_attributes -%}
-          <span{{ item.text_attributes }}>{{ item.text }}</span>
-        {%- else -%}
-          {{ item.text }}
-        {%- endif -%}
-      </li>
-    {%- endfor -%}
-  </ul>
-{%- endif %}
diff --git a/themes/bootstrap/templates/system/page-title.html.twig b/themes/bootstrap/templates/system/page-title.html.twig
deleted file mode 100644
index 1ae0e76..0000000
--- a/themes/bootstrap/templates/system/page-title.html.twig
+++ /dev/null
@@ -1,21 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for page titles.
- *
- * Available variables:
- * - title_attributes: HTML attributes for the page title element.
- * - title_prefix: Additional output populated by modules, intended to be
- *   displayed in front of the main title tag that appears in the template.
- * - title: The page title, for use in the actual content.
- * - title_suffix: Additional output populated by modules, intended to be
- *   displayed after the main title tag that appears in the template.
- *
- * @ingroup templates
- *
- * @see template_preprocess_page_title()
- */
-#}
-{% if title %}
-  <h1{{ title_attributes.addClass('page-header') }}>{{ title }}</h1>
-{% endif %}
diff --git a/themes/bootstrap/templates/system/page.html.twig b/themes/bootstrap/templates/system/page.html.twig
deleted file mode 100644
index 70f8c1d..0000000
--- a/themes/bootstrap/templates/system/page.html.twig
+++ /dev/null
@@ -1,168 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a single page.
- *
- * The doctype, html, head and body tags are not in this template. Instead they
- * can be found in the html.html.twig template in this directory.
- *
- * Available variables:
- *
- * General utility variables:
- * - base_path: The base URL path of the Drupal installation. Will usually be
- *   "/" unless you have installed Drupal in a sub-directory.
- * - is_front: A flag indicating if the current page is the front page.
- * - logged_in: A flag indicating if the user is registered and signed in.
- * - is_admin: A flag indicating if the user has permission to access
- *   administration pages.
- *
- * Site identity:
- * - front_page: The URL of the front page. Use this instead of base_path when
- *   linking to the front page. This includes the language domain or prefix.
- *
- * Page content (in order of occurrence in the default page.html.twig):
- * - title_prefix: Additional output populated by modules, intended to be
- *   displayed in front of the main title tag that appears in the template.
- * - title: The page title, for use in the actual content.
- * - title_suffix: Additional output populated by modules, intended to be
- *   displayed after the main title tag that appears in the template.
- * - messages: Status and error messages. Should be displayed prominently.
- * - tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
- *   view and edit tabs when displaying a node).
- * - node: Fully loaded node, if there is an automatically-loaded node
- *   associated with the page and the node ID is the second argument in the
- *   page's path (e.g. node/12345 and node/12345/revisions, but not
- *   comment/reply/12345).
- *
- * Regions:
- * - page.header: Items for the header region.
- * - page.navigation: Items for the navigation region.
- * - page.navigation_collapsible: Items for the navigation (collapsible) region.
- * - page.highlighted: Items for the highlighted content region.
- * - page.help: Dynamic help text, mostly for admin pages.
- * - page.content: The main content of the current page.
- * - page.sidebar_first: Items for the first sidebar.
- * - page.sidebar_second: Items for the second sidebar.
- * - page.footer: Items for the footer region.
- *
- * @ingroup templates
- *
- * @see template_preprocess_page()
- * @see html.html.twig
- */
-#}
-{% set container = theme.settings.fluid_container ? 'container-fluid' : 'container' %}
-{# Navbar #}
-{% if page.navigation or page.navigation_collapsible %}
-  {% block navbar %}
-    {%
-      set navbar_classes = [
-        'navbar',
-        theme.settings.navbar_inverse ? 'navbar-inverse' : 'navbar-default',
-        theme.settings.navbar_position ? 'navbar-' ~ theme.settings.navbar_position|clean_class : container,
-      ]
-    %}
-    <header{{ navbar_attributes.addClass(navbar_classes) }} id="navbar" role="banner">
-      {% if not navbar_attributes.hasClass(container) %}
-        <div class="{{ container }}">
-      {% endif %}
-      <div class="navbar-header">
-        {{ page.navigation }}
-        {# .btn-navbar is used as the toggle for collapsed navbar content #}
-        {% if page.navigation_collapsible %}
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">
-            <span class="sr-only">{{ 'Toggle navigation'|t }}</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-        {% endif %}
-      </div>
-
-      {# Navigation (collapsible) #}
-      {% if page.navigation_collapsible %}
-        <div id="navbar-collapse" class="navbar-collapse collapse">
-          {{ page.navigation_collapsible }}
-        </div>
-      {% endif %}
-      {% if not navbar_attributes.hasClass(container) %}
-        </div>
-      {% endif %}
-    </header>
-  {% endblock %}
-{% endif %}
-
-{# Main #}
-{% block main %}
-  <div role="main" class="main-container {{ container }} js-quickedit-main-content">
-    <div class="row">
-
-      {# Header #}
-      {% if page.header %}
-        {% block header %}
-          <div class="col-sm-12" role="heading">
-            {{ page.header }}
-          </div>
-        {% endblock %}
-      {% endif %}
-
-      {# Sidebar First #}
-      {% if page.sidebar_first %}
-        {% block sidebar_first %}
-          <aside class="col-sm-3" role="complementary">
-            {{ page.sidebar_first }}
-          </aside>
-        {% endblock %}
-      {% endif %}
-
-      {# Content #}
-      {%
-        set content_classes = [
-          page.sidebar_first and page.sidebar_second ? 'col-sm-6',
-          page.sidebar_first and page.sidebar_second is empty ? 'col-sm-9',
-          page.sidebar_second and page.sidebar_first is empty ? 'col-sm-9',
-          page.sidebar_first is empty and page.sidebar_second is empty ? 'col-sm-12'
-        ]
-      %}
-      <section{{ content_attributes.addClass(content_classes) }}>
-
-        {# Highlighted #}
-        {% if page.highlighted %}
-          {% block highlighted %}
-            <div class="highlighted">{{ page.highlighted }}</div>
-          {% endblock %}
-        {% endif %}
-
-        {# Help #}
-        {% if page.help %}
-          {% block help %}
-            {{ page.help }}
-          {% endblock %}
-        {% endif %}
-
-        {# Content #}
-        {% block content %}
-          <a id="main-content"></a>
-          {{ page.content }}
-        {% endblock %}
-      </section>
-
-      {# Sidebar Second #}
-      {% if page.sidebar_second %}
-        {% block sidebar_second %}
-          <aside class="col-sm-3" role="complementary">
-            {{ page.sidebar_second }}
-          </aside>
-        {% endblock %}
-      {% endif %}
-    </div>
-  </div>
-{% endblock %}
-
-{% if page.footer %}
-  {% block footer %}
-    <footer class="footer {{ container }}" role="contentinfo">
-      {{ page.footer }}
-    </footer>
-  {% endblock %}
-{% endif %}
diff --git a/themes/bootstrap/templates/system/pager.html.twig b/themes/bootstrap/templates/system/pager.html.twig
deleted file mode 100644
index e65b599..0000000
--- a/themes/bootstrap/templates/system/pager.html.twig
+++ /dev/null
@@ -1,98 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a pager.
- *
- * Available variables:
- * - items: List of pager items.
- *   The list is keyed by the following elements:
- *   - first: Item for the first page; not present on the first page of results.
- *   - previous: Item for the previous page; not present on the first page
- *     of results.
- *   - next: Item for the next page; not present on the last page of results.
- *   - last: Item for the last page; not present on the last page of results.
- *   - pages: List of pages, keyed by page number.
- *   Sub-sub elements:
- *   items.first, items.previous, items.next, items.last, and each item inside
- *   items.pages contain the following elements:
- *   - href: URL with appropriate query parameters for the item.
- *   - attributes: A keyed list of HTML attributes for the item.
- *   - text: The visible text used for the item link, such as "‹ previous"
- *     or "next ›".
- * - current: The page number of the current page.
- * - ellipses: If there are more pages than the quantity allows, then an
- *   ellipsis before or after the listed pages may be present.
- *   - previous: Present if the currently visible list of pages does not start
- *     at the first page.
- *   - next: Present if the visible list of pages ends before the last page.
- *
- * @ingroup templates
- *
- * @see template_preprocess_pager()
- */
-#}
-{% if items %}
-  <nav class="pager-nav text-center" role="navigation" aria-labelledby="pagination-heading">
-    <h4 id="pagination-heading" class="visually-hidden">{{ 'Pagination'|t }}</h4>
-    <ul class="pagination js-pager__items">
-
-      {# Print first item if we are not on the first page. #}
-      {% if items.first %}
-        <li class="pager__item pager__item--first">
-          <a href="{{ items.first.href }}" title="{{ 'Go to first page'|t }}" rel="prev"{{ items.first.attributes }}>
-            <span class="visually-hidden">{{ 'First page'|t }}</span>
-            <span aria-hidden="true">{{ items.first.text|default('first'|t) }}</span>
-          </a>
-        </li>
-      {% endif %}
-
-      {# Print previous item if we are not on the first page. #}
-      {% if items.previous %}
-        <li class="pager__item pager__item--previous">
-          <a href="{{ items.previous.href }}" title="{{ 'Go to previous page'|t }}" rel="prev"{{ items.previous.attributes }}>
-            <span class="visually-hidden">{{ 'Previous page'|t }}</span>
-            <span aria-hidden="true">{{ items.previous.text|default('previous'|t) }}</span>
-          </a>
-        </li>
-      {% endif %}
-
-      {# Now generate the actual pager piece. #}
-      {% for key, item in items.pages %}
-        <li class="pager__item{{ current == key ? ' is-active active' : '' }}">
-          {% if current == key %}
-            {% set title = 'Current page'|t %}
-          {% else %}
-            {% set title = 'Go to page @key'|t({'@key': key}) %}
-          {% endif %}
-          <a href="{{ item.href }}" title="{{ title }}"{{ item.attributes }}>
-            <span class="visually-hidden">
-              {{ current == key ? 'Current page'|t : 'Page'|t }}
-            </span>
-            {{- key -}}
-          </a>
-        </li>
-      {% endfor %}
-
-      {# Print next item if we are not on the last page. #}
-      {% if items.next %}
-        <li class="pager__item pager__item--next">
-          <a href="{{ items.next.href }}" title="{{ 'Go to next page'|t }}" rel="next"{{ items.next.attributes }}>
-            <span class="visually-hidden">{{ 'Next page'|t }}</span>
-            <span aria-hidden="true">{{ items.next.text|default('next'|t) }}</span>
-          </a>
-        </li>
-      {% endif %}
-
-      {# Print last item if we are not on the last page. #}
-      {% if items.last %}
-      <li class="pager__item pager__item--last">
-        <a href="{{ items.last.href }}" title="{{ 'Go to last page'|t }}" rel="last"{{ items.last.attributes }}>
-          <span class="visually-hidden">{{ 'Last page'|t }}</span>
-          <span aria-hidden="true">{{ items.last.text|default('last'|t) }}</span>
-        </a>
-      </li>
-      {% endif %}
-
-    </ul>
-  </nav>
-{% endif %}
diff --git a/themes/bootstrap/templates/system/progress-bar.html.twig b/themes/bootstrap/templates/system/progress-bar.html.twig
deleted file mode 100644
index bcd5034..0000000
--- a/themes/bootstrap/templates/system/progress-bar.html.twig
+++ /dev/null
@@ -1,38 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a progress bar.
- *
- * Note that the core Batch API uses this only for non-JavaScript batch jobs.
- *
- * Available variables:
- * - attributes: An array of HTML attributes intended to be added to the
-     progress bar container of this template.
- *   - id: A valid HTML ID and guaranteed to be unique.
- * - label: The label of the working task.
- * - percent: The percentage of the progress.
- * - message: A string containing information to be displayed.
- *
- * @ingroup templates
- */
-#}
-<div class="progress-wrapper" aria-live="polite" data-drupal-progress>
-  {% if message %}
-    <div class="message">{{ message }}</div>
-  {% endif %}
-  {%
-    set classes = [
-      'progress',
-      'progress-striped',
-      'active',
-    ]
-  %}
-  <div{{ attributes.addClass(classes) }}>
-    <div class="progress-bar" role="progressbar" style="width: {{ percent }}%" aria-valuemin="0" aria-valuemax="100" aria-valuenow="{{ percent }}">
-      <span class="percentage">{{ percent }}%</span>
-    </div>
-  </div>
-  {% if label %}
-    <div class="progress-label">{{ label }}</div>
-  {% endif %}
-</div>
diff --git a/themes/bootstrap/templates/system/region--no-wrapper.html.twig b/themes/bootstrap/templates/system/region--no-wrapper.html.twig
deleted file mode 100644
index 0a9fe63..0000000
--- a/themes/bootstrap/templates/system/region--no-wrapper.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a region.
- *
- * Available variables:
- * - content: The content for this region, typically blocks.
- * - attributes: HTML attributes for the region div.
- * - region: The name of the region variable as defined in the theme's
- *   .info.yml file.
- *
- * @ingroup templates
- *
- * @see template_preprocess_region()
- */
-#}
-{% if content %}
-  {{ content }}
-{% endif %}
diff --git a/themes/bootstrap/templates/system/region.html.twig b/themes/bootstrap/templates/system/region.html.twig
deleted file mode 100644
index d868789..0000000
--- a/themes/bootstrap/templates/system/region.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-{#
-/**
- * @file
- * Theme override to display a region.
- *
- * Available variables:
- * - content: The content for this region, typically blocks.
- * - attributes: HTML attributes for the region div.
- * - region: The name of the region variable as defined in the theme's
- *   .info.yml file.
- *
- * @ingroup templates
- *
- * @see template_preprocess_region()
- */
-#}
-{%
-  set classes = [
-    'region',
-    'region-' ~ region|clean_class,
-  ]
-%}
-{% if content %}
-  <div{{ attributes.addClass(classes) }}>
-    {{ content }}
-  </div>
-{% endif %}
diff --git a/themes/bootstrap/templates/system/status-messages.html.twig b/themes/bootstrap/templates/system/status-messages.html.twig
deleted file mode 100644
index 327bfb5..0000000
--- a/themes/bootstrap/templates/system/status-messages.html.twig
+++ /dev/null
@@ -1,67 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for status messages.
- *
- * Displays status, error, and warning messages, grouped by type.
- *
- * An invisible heading identifies the messages for assistive technology.
- * Sighted users see a colored box. See http://www.w3.org/TR/WCAG-TECHS/H69.html
- * for info.
- *
- * Add an ARIA label to the contentinfo area so that assistive technology
- * user agents will better describe this landmark.
- *
- * Available variables:
- * - message_list: List of messages to be displayed, grouped by type.
- * - status_headings: List of all status types.
- * - display: (optional) May have a value of 'status' or 'error' when only
- *   displaying messages of that specific type.
- * - attributes: HTML attributes for the element, including:
- *   - class: HTML classes.
- *
- * @ingroup templates
- *
- * @see template_preprocess_status_messages()
- */
-#}
-{%
-  set status_heading = {
-    'status': 'Status message'|t,
-    'error': 'Error message'|t,
-    'warning': 'Warning message'|t,
-    'info': 'Informative message'|t,
-  }
-%}
-{%
-  set status_classes = {
-    'status': 'success',
-    'error': 'danger',
-    'warning': 'warning',
-    'info': 'info',
-  }
-%}
-{% for type, messages in message_list %}
-{%
-  set classes = [
-    'alert',
-    'alert-' ~ status_classes[type],
-    'alert-dismissible',
-  ]
-%}
-<div{{ attributes.addClass(classes) }} role="alert">
-  <a href="#" role="button" class="close" data-dismiss="alert" aria-label="{{ 'Close'|t }}"><span aria-hidden="true">&times;</span></a>
-  {% if status_headings[type] %}
-    <h4 class="sr-only">{{ status_headings[type] }}</h4>
-  {% endif %}
-  {% if messages|length > 1 %}
-    <ul class="item-list item-list--messages">
-      {% for message in messages %}
-        <li class="item item--message">{{ message }}</li>
-      {% endfor %}
-    </ul>
-  {% else %}
-    {{ messages|first }}
-  {% endif %}
-</div>
-{% endfor %}
diff --git a/themes/bootstrap/templates/system/system-themes-page.html.twig b/themes/bootstrap/templates/system/system-themes-page.html.twig
deleted file mode 100644
index ac3f6bf..0000000
--- a/themes/bootstrap/templates/system/system-themes-page.html.twig
+++ /dev/null
@@ -1,95 +0,0 @@
-{#
-/**
- * @file
- * Theme override for the Appearance page.
- *
- * Available variables:
- * - attributes: HTML attributes for the main container.
- * - theme_groups: A list of theme groups. Each theme group contains:
- *   - attributes: HTML attributes specific to this theme group.
- *   - title: Title for the theme group.
- *   - state: State of the theme group, e.g. installed or uninstalled.
- *   - themes: A list of themes within the theme group. Each theme contains:
- *     - attributes: HTML attributes specific to this theme.
- *     - screenshot: A screenshot representing the theme.
- *     - description: Description of the theme.
- *     - name: Theme name.
- *     - version: The theme's version number.
- *     - is_default: Boolean indicating whether the theme is the default theme
- *       or not.
- *     - is_admin: Boolean indicating whether the theme is the admin theme or
- *       not.
- *     - notes: Identifies what context this theme is being used in, e.g.,
- *       default theme, admin theme.
- *     - incompatible: Text describing any compatibility issues.
- *     - operations: A list of operation links, e.g., Settings, Enable, Disable,
- *       etc. these links should only be displayed if the theme is compatible.
- *
- * @ingroup templates
- *
- * @see template_preprocess_system_themes_page()
- */
-#}
-<div{{ attributes.addClass('form-group') }}>
-  {% for theme_group in theme_groups %}
-    {%
-      set theme_group_classes = [
-        'system-themes-list',
-        'system-themes-list-' ~ theme_group.state,
-        'clearfix',
-        'panel',
-        'panel-default',
-      ]
-    %}
-    <div{{ theme_group.attributes.addClass(theme_group_classes) }}>
-      <div class="panel-heading">
-        <a class="panel-title" href="#system-themes-list--{{ theme_group.state }}" aria-controls="#system-themes-list--{{ theme_group.state }}" aria-expanded="false" aria-pressed="false" data-toggle="collapse" role="button">
-          {{ theme_group.title }} ({{ theme_group.themes|length }})
-        </a>
-      </div>
-      {%
-        set table_classes = [
-          'table',
-          'panel-collapse',
-          theme_group.state == 'uninstalled' ? 'collapse',
-          'fade',
-          theme_group.state != 'uninstalled' ? 'in',
-      ]
-      %}
-      <table id="system-themes-list--{{ theme_group.state }}" class="{{ table_classes|join(' ')}}">
-        {% for theme in theme_group.themes %}
-          {%
-            set theme_classes = [
-              theme.is_default ? 'theme-default',
-              theme.is_admin ? 'theme-admin',
-              'theme-selector',
-              'clearfix',
-            ]
-          %}
-          <tr{{ theme.attributes.addClass(theme_classes) }}>
-            <td class="col-sm-3">
-              {% if theme.screenshot %}
-                {{ theme.screenshot }}
-              {% endif %}
-            </td>
-            <td class="theme-info col-sm-9">
-              <h4 class="theme-info__header">
-                {{- theme.name }} {{ theme.version -}}
-                {% if theme.notes %}
-                  ({{ theme.notes|safe_join(', ') }})
-                {%- endif -%}
-              </h4>
-              <div class="theme-info__description help-block">{{ theme.description }}</div>
-              {# Display operation links if the theme is compatible. #}
-              {% if theme.incompatible %}
-                <div class="incompatible">{{ theme.incompatible }}</div>
-              {% else %}
-                {{ theme.operations }}
-              {% endif %}
-            </td>
-          </tr>
-        {% endfor %}
-      </table>
-    </div>
-  {% endfor %}
-</div>
diff --git a/themes/bootstrap/templates/system/table.html.twig b/themes/bootstrap/templates/system/table.html.twig
deleted file mode 100644
index 7528624..0000000
--- a/themes/bootstrap/templates/system/table.html.twig
+++ /dev/null
@@ -1,132 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to display a table.
- *
- * Available variables:
- * - attributes: HTML attributes to apply to the <table> tag.
- * - caption: A localized string for the <caption> tag.
- * - colgroups: Column groups. Each group contains the following properties:
- *   - attributes: HTML attributes to apply to the <col> tag.
- *     Note: Drupal currently supports only one table header row, see
- *     http://drupal.org/node/893530 and
- *     http://api.drupal.org/api/drupal/includes!theme.inc/function/theme_table/7#comment-5109.
- * - header: Table header cells. Each cell contains the following properties:
- *   - tag: The HTML tag name to use; either TH or TD.
- *   - attributes: HTML attributes to apply to the tag.
- *   - content: A localized string for the title of the column.
- *   - field: Field name (required for column sorting).
- *   - sort: Default sort order for this column ("asc" or "desc").
- * - sticky: A flag indicating whether to use a "sticky" table header.
- * - rows: Table rows. Each row contains the following properties:
- *   - attributes: HTML attributes to apply to the <tr> tag.
- *   - data: Table cells.
- *   - no_striping: A flag indicating that the row should receive no
- *     'even / odd' styling. Defaults to FALSE.
- *   - cells: Table cells of the row. Each cell contains the following keys:
- *     - tag: The HTML tag name to use; either TH or TD.
- *     - attributes: Any HTML attributes, such as "colspan", to apply to the
- *       table cell.
- *     - content: The string to display in the table cell.
- *     - active_table_sort: A boolean indicating whether the cell is the active
- *       table sort.
- * - footer: Table footer rows, in the same format as the rows variable.
- * - empty: The message to display in an extra row if table does not have
- *   any rows.
- * - header_columns: The number of columns in the header.
- * - bordered: Flag indicating whether or not the table should be bordered.
- * - condensed: Flag indicating whether or not the table should be condensed.
- * - hover: Flag indicating whether or not table rows should be hoverable.
- * - striped: Flag indicating whether or not table rows should be striped.
- * - responsive: Flag indicating whether or not the table should be wrapped to
- *   be responsive (using the Bootstrap Framework .table-responsive wrapper).
- *
- * @ingroup templates
- *
- * @see template_preprocess_table()
- */
-#}
-{% if responsive %}
-  <div class="table-responsive">
-{% endif %}
-{%
-  set classes = [
-    'table',
-    bordered ? 'table-bordered',
-    condensed ? 'table-condensed',
-    hover ? 'table-hover',
-    striped ? 'table-striped',
-    sticky ? 'sticky-enabled',
-  ]
-%}
-<table{{ attributes.addClass(classes) }}>
-  {% if caption %}
-    <caption>{{ caption }}</caption>
-  {% endif %}
-
-  {% for colgroup in colgroups %}
-    {% if colgroup.cols %}
-      <colgroup{{ colgroup.attributes }}>
-        {% for col in colgroup.cols %}
-          <col{{ col.attributes }} />
-        {% endfor %}
-      </colgroup>
-    {% else %}
-      <colgroup{{ colgroup.attributes }} />
-    {% endif %}
-  {% endfor %}
-
-  {% if header %}
-    <thead>
-      <tr>
-        {% for cell in header %}
-        {%
-        set cell_classes = [
-          cell.active_table_sort ? 'active',
-        ]
-        %}
-        <{{ cell.tag }}{{ cell.attributes.addClass(cell_classes) }}>
-        {{- cell.content -}}
-      </{{ cell.tag }}>
-      {% endfor %}
-      </tr>
-    </thead>
-  {% endif %}
-
-  {% if rows %}
-    <tbody>
-      {% for row in rows %}
-        {% set row_classes = [cycle(['odd', 'even'], loop.index0)] %}
-        <tr{{ row.attributes.addClass(row_classes) }}>
-          {% for cell in row.cells %}
-            <{{ cell.tag }}{{ cell.attributes }}>
-              {{- cell.content -}}
-            </{{ cell.tag }}>
-          {% endfor %}
-        </tr>
-      {% endfor %}
-    </tbody>
-  {% elseif empty %}
-    <tbody>
-      <tr class="odd">
-        <td colspan="{{ header_columns }}" class="empty message">{{ empty }}</td>
-      </tr>
-    </tbody>
-  {% endif %}
-  {% if footer %}
-    <tfoot>
-      {% for row in footer %}
-        <tr{{ row.attributes }}>
-          {% for cell in row.cells %}
-            <{{ cell.tag }}{{ cell.attributes }}>
-              {{- cell.content -}}
-            </{{ cell.tag }}>
-          {% endfor %}
-        </tr>
-      {% endfor %}
-    </tfoot>
-  {% endif %}
-</table>
-{% if responsive %}
-  </div>
-{% endif %}
diff --git a/themes/bootstrap/templates/views/views-exposed-form.html.twig b/themes/bootstrap/templates/views/views-exposed-form.html.twig
deleted file mode 100644
index 2bbc8a1..0000000
--- a/themes/bootstrap/templates/views/views-exposed-form.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation of a views exposed form.
- *
- * Available variables:
- * - form: A render element representing the form.
- *
- * @ingroup templates
- *
- * @see template_preprocess_views_exposed_form()
- */
-#}
-{% if q is not empty %}
-  {#
-    This ensures that, if clean URLs are off, the 'q' is added first,
-    as a hidden form element, so that it shows up first in the POST URL.
-  #}
-  {{ q }}
-{% endif %}
-<div class="form--inline form-inline clearfix">
-  {{ form }}
-</div>
diff --git a/themes/bootstrap/templates/views/views-mini-pager.html.twig b/themes/bootstrap/templates/views/views-mini-pager.html.twig
deleted file mode 100644
index 9658dc1..0000000
--- a/themes/bootstrap/templates/views/views-mini-pager.html.twig
+++ /dev/null
@@ -1,36 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a views mini-pager.
- *
- * Available variables:
- * - items: List of pager items.
- *
- * @ingroup templates
- *
- * @see template_preprocess_views_mini_pager()
- */
-#}
-{% if items.previous or items.next %}
-  <nav role="navigation" aria-labelledby="pagination-heading">
-    <h4 class="sr-only">{{ 'Pagination'|t }}</h4>
-    <ul class="pager js-pager__items">
-      {% if items.previous %}
-        <li class="previous">
-          <a href="{{ items.previous.href }}" title="{{ 'Go to previous page'|t }}" rel="prev"{{ items.previous.attributes|without('href', 'title', 'rel') }}>
-            <span class="sr-only">{{ 'Previous page'|t }}</span>
-            <span aria-hidden="true">{{ items.previous.text|default('‹‹'|t) }}</span>
-          </a>
-        </li>
-      {% endif %}
-      {% if items.next %}
-        <li class="next">
-          <a href="{{ items.next.href }}" title="{{ 'Go to next page'|t }}" rel="next"{{ items.next.attributes|without('href', 'title', 'rel') }}>
-            <span class="sr-only">{{ 'Next page'|t }}</span>
-            <span aria-hidden="true">{{ items.next.text|default('››'|t) }}</span>
-          </a>
-        </li>
-      {% endif %}
-    </ul>
-  </nav>
-{% endif %}
diff --git a/themes/bootstrap/templates/views/views-view-table.html.twig b/themes/bootstrap/templates/views/views-view-table.html.twig
deleted file mode 100644
index 08f2fab..0000000
--- a/themes/bootstrap/templates/views/views-view-table.html.twig
+++ /dev/null
@@ -1,132 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for displaying a view as a table.
- *
- * Available variables:
- * - attributes: Remaining HTML attributes for the element.
- *   - class: HTML classes that can be used to style contextually through CSS.
- * - title : The title of this group of rows.
- * - header: The table header columns.
- *   - attributes: Remaining HTML attributes for the element.
- *   - content: HTML classes to apply to each header cell, indexed by
- *   the header's key.
- * - caption_needed: Is the caption tag needed.
- * - caption: The caption for this table.
- * - accessibility_description: Extended description for the table details.
- * - accessibility_summary: Summary for the table details.
- * - responsive: Whether or not to use the .table-responsive wrapper.
- * - rows: Table row items. Rows are keyed by row number.
- *   - attributes: HTML classes to apply to each row.
- *   - columns: Row column items. Columns are keyed by column number.
- *     - attributes: HTML classes to apply to each column.
- *     - content: The column content.
- * - bordered: Flag indicating whether or not the table should be bordered.
- * - condensed: Flag indicating whether or not the table should be condensed.
- * - hover: Flag indicating whether or not table rows should be hoverable.
- * - striped: Flag indicating whether or not table rows should be striped.
- * - responsive: Flag indicating whether or not the table should be wrapped to
- *   be responsive (using the Bootstrap Framework .table-responsive wrapper).
- *
- * @ingroup templates
- *
- * @see template_preprocess_views_view_table()
- */
-#}
-{% if responsive %}
-  <div class="table-responsive">
-{% endif %}
-{%
-  set classes = [
-    'table',
-    bordered ? 'table-bordered',
-    condensed ? 'table-condensed',
-    hover ? 'table-hover',
-    striped ? 'table-striped',
-    sticky ? 'sticky-enabled',
-  ]
-%}
-<table{{ attributes.addClass(classes) }}>
-  {% if caption_needed %}
-    <caption>
-      {% if caption %}
-        {{ caption }}
-      {% else %}
-        {{ title }}
-      {% endif %}
-      {% if (summary is not empty) or (description is not empty) %}
-        <details>
-          {% if summary is not empty %}
-            <summary>{{ summary }}</summary>
-          {% endif %}
-          {% if description is not empty %}
-            {{ description }}
-          {% endif %}
-        </details>
-      {% endif %}
-    </caption>
-  {% endif %}
-  {% if header %}
-    <thead>
-    <tr>
-      {% for key, column in header %}
-        {% if column.default_classes %}
-          {%
-          set column_classes = [
-          'views-field',
-          'views-field-' ~ fields[key],
-          ]
-          %}
-        {% endif %}
-      <th{{ column.attributes.addClass(column_classes).setAttribute('scope', 'col') }}>
-        {%- if column.wrapper_element -%}
-          <{{ column.wrapper_element }}>
-          {%- if column.url -%}
-            <a href="{{ column.url }}" title="{{ column.title }}">{{ column.content }}{{ column.sort_indicator }}</a>
-          {%- else -%}
-            {{ column.content }}{{ column.sort_indicator }}
-          {%- endif -%}
-          </{{ column.wrapper_element }}>
-        {%- else -%}
-          {%- if column.url -%}
-            <a href="{{ column.url }}" title="{{ column.title }}">{{ column.content }}{{ column.sort_indicator }}</a>
-          {%- else -%}
-            {{- column.content }}{{ column.sort_indicator }}
-          {%- endif -%}
-        {%- endif -%}
-        </th>
-      {% endfor %}
-    </tr>
-    </thead>
-  {% endif %}
-  <tbody>
-  {% for row in rows %}
-    <tr{{ row.attributes }}>
-      {% for key, column in row.columns %}
-        {% if column.default_classes %}
-          {% set column_classes = [ 'views-field' ] %}
-          {% for field in column.fields %}
-            {% set column_classes = column_classes|merge(['views-field-' ~ field]) %}
-          {% endfor %}
-        {% endif %}
-      <td{{ column.attributes.addClass(column_classes) }}>
-        {%- if column.wrapper_element -%}
-          <{{ column.wrapper_element }}>
-          {% for content in column.content %}
-            {{ content.separator }}{{ content.field_output }}
-          {% endfor %}
-          </{{ column.wrapper_element }}>
-        {%- else -%}
-          {% for content in column.content %}
-            {{- content.separator }}{{ content.field_output -}}
-          {% endfor %}
-        {%- endif %}
-        </td>
-      {% endfor %}
-    </tr>
-  {% endfor %}
-  </tbody>
-</table>
-{% if responsive %}
-  </div>
-{% endif %}
diff --git a/themes/bootstrap/templates/views/views-view.html.twig b/themes/bootstrap/templates/views/views-view.html.twig
deleted file mode 100644
index 9a59f50..0000000
--- a/themes/bootstrap/templates/views/views-view.html.twig
+++ /dev/null
@@ -1,97 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for main view template.
- *
- * Available variables:
- * - attributes: Remaining HTML attributes for the element.
- * - css_name: A css-safe version of the view name.
- * - css_class: The user-specified classes names, if any.
- * - header: The optional header.
- * - footer: The optional footer.
- * - rows: The results of the view query, if any.
- * - empty: The content to display if there are no rows.
- * - pager: The optional pager next/prev links to display.
- * - exposed: Exposed widget form/info to display.
- * - feed_icons: Optional feed icons to display.
- * - more: An optional link to the next page of results.
- * - title: Title of the view, only used when displaying in the admin preview.
- * - title_prefix: Additional output populated by modules, intended to be
- *   displayed in front of the view title.
- * - title_suffix: Additional output populated by modules, intended to be
- *   displayed after the view title.
- * - attachment_before: An optional attachment view to be displayed before the
- *   view content.
- * - attachment_after: An optional attachment view to be displayed after the
- *   view content.
- * - dom_id: Unique id for every view being printed to give unique class for
- *   JavaScript.
- *
- * @ingroup templates
- *
- * @see template_preprocess_views_view()
- */
-#}
-{%
-  set classes = [
-    'view',
-    'view-' ~ id|clean_class,
-    'view-id-' ~ id,
-    'view-display-id-' ~ display_id,
-    dom_id ? 'js-view-dom-id-' ~ dom_id,
-  ]
-%}
-<div{{ attributes.addClass(classes) }}>
-  {{ title_prefix }}
-  {% if title %}
-    {{ title }}
-  {% endif %}
-  {{ title_suffix }}
-  {% if header %}
-    <div class="view-header">
-      {{ header }}
-    </div>
-  {% endif %}
-  {% if exposed %}
-    <div class="view-filters form-group">
-      {{ exposed }}
-    </div>
-  {% endif %}
-  {% if attachment_before %}
-    <div class="attachment attachment-before">
-      {{ attachment_before }}
-    </div>
-  {% endif %}
-
-  {% if rows %}
-    <div class="view-content">
-      {{ rows }}
-    </div>
-  {% elseif empty %}
-    <div class="view-empty">
-      {{ empty }}
-    </div>
-  {% endif %}
-
-  {% if pager %}
-    {{ pager }}
-  {% endif %}
-  {% if attachment_after %}
-    <div class="attachment attachment-after">
-      {{ attachment_after }}
-    </div>
-  {% endif %}
-  {% if more %}
-    {{ more }}
-  {% endif %}
-  {% if footer %}
-    <div class="view-footer">
-      {{ footer }}
-    </div>
-  {% endif %}
-  {% if feed_icons %}
-    <div class="feed-icons">
-      {{ feed_icons }}
-    </div>
-  {% endif %}
-</div>

From 299aa00624a4d7fd56c8f007d0c00f67f4173088 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 9 Mar 2018 10:29:39 -0800
Subject: [PATCH 004/143] Add several files required for deployment

Drawn from github.com/18F/cf-ex-drupal/. h/t @pburkholder
---
 apt.yml                            |   3 +
 bootstrap.sh                       |  38 +++++++++++
 config/sync/.htaccess              |  23 +++++++
 config/sync/README.txt             |   1 +
 drush/README.md                    |   1 +
 drush/policy.drush.inc             |  38 +++++++++++
 phpunit.xml.dist                   |  15 +++++
 scripts/composer/ScriptHandler.php | 100 +++++++++++++++++++++++++++++
 8 files changed, 219 insertions(+)
 create mode 100644 apt.yml
 create mode 100755 bootstrap.sh
 create mode 100644 config/sync/.htaccess
 create mode 100644 config/sync/README.txt
 create mode 100644 drush/README.md
 create mode 100644 drush/policy.drush.inc
 create mode 100644 phpunit.xml.dist
 create mode 100644 scripts/composer/ScriptHandler.php

diff --git a/apt.yml b/apt.yml
new file mode 100644
index 0000000..ac076e1
--- /dev/null
+++ b/apt.yml
@@ -0,0 +1,3 @@
+---
+packages:
+- mysql-client
\ No newline at end of file
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 0000000..6b9db0a
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,38 @@
+#!/bin/bash 
+set -euxo pipefail
+
+: ${ACCOUNT_NAME?} ${ACCOUNT_PASS?}
+
+fail() {
+    echo FAIL $@
+    exit 1
+}
+
+bootstrap() {
+    creds=$(echo $VCAP_SERVICES | jq -r '.["aws-rds"][0].credentials')
+    [ $creds = "null" ] && fail "creds are null; need to bind database?"
+
+    db_type=mysql
+    db_user=$(echo $creds | jq -r '.username')
+    db_pass=$(echo $creds | jq -r '.password')
+    db_port=$(echo $creds | jq -r '.port')
+    db_host=$(echo $creds | jq -r '.host')
+    db_name=$(echo $creds | jq -r '.db_name')
+
+    drupal site:install standard --root=$HOME/web --no-interaction \
+        --account-name=${ACCOUNT_NAME:-$(gen_cred ACCOUNT_NAME)} \
+        --account-pass=${ACCOUNT_PASS:-$(gen_cred ACCOUNT_PASS)} \
+        --langcode="en" \
+        --db-type=$db_type \
+        --db-user=$db_user \
+        --db-pass=$db_pass \
+        --db-port=$db_port \
+        --db-host=$db_host \
+        --db-name=$db_name 
+}
+
+drush --root=$HOME/web core-status bootstrap | grep -q "Successful" || bootstrap
+
+drush --root=$HOME/web pm-info flysystem_s3 --fields=Status | grep -q enabled ||
+    drush --root=$HOME/web pm-enable --yes flysystem_s3
+
diff --git a/config/sync/.htaccess b/config/sync/.htaccess
new file mode 100644
index 0000000..1238c0d
--- /dev/null
+++ b/config/sync/.htaccess
@@ -0,0 +1,23 @@
+# Deny all requests from Apache 2.4+.
+<IfModule mod_authz_core.c>
+  Require all denied
+</IfModule>
+
+# Deny all requests from Apache 2.0-2.2.
+<IfModule !mod_authz_core.c>
+  Deny from all
+</IfModule>
+# Turn off all options we don't need.
+Options -Indexes -ExecCGI -Includes -MultiViews
+
+# Set the catch-all handler to prevent scripts from being executed.
+SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
+<Files *>
+  # Override the handler again if we're run later in the evaluation list.
+  SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
+</Files>
+
+# If we know how to do it safely, disable the PHP engine entirely.
+<IfModule mod_php5.c>
+  php_flag engine off
+</IfModule>
\ No newline at end of file
diff --git a/config/sync/README.txt b/config/sync/README.txt
new file mode 100644
index 0000000..37874bd
--- /dev/null
+++ b/config/sync/README.txt
@@ -0,0 +1 @@
+This directory contains configuration to be imported into your Drupal site. To make this configuration active, visit admin/config/development/configuration/sync. For information about deploying configuration between servers, see https://www.drupal.org/documentation/administer/config
\ No newline at end of file
diff --git a/drush/README.md b/drush/README.md
new file mode 100644
index 0000000..9d7bd39
--- /dev/null
+++ b/drush/README.md
@@ -0,0 +1 @@
+This directory contains commands, configuration and site aliases for Drush. See https://packagist.org/search/?type=drupal-drush for a directory of Drush commands installable via Composer.
diff --git a/drush/policy.drush.inc b/drush/policy.drush.inc
new file mode 100644
index 0000000..64cd62d
--- /dev/null
+++ b/drush/policy.drush.inc
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * Customize this file as desired. See https://github.com/drush-ops/drush/blob/8.x/examples/policy.drush.inc for documentation.
+ */
+
+/**
+ * Implements drush_hook_COMMAND_validate().
+ *
+ * Encourage folks to use `composer` instead of Drush pm commands
+ */
+function drush_policy_pm_updatecode_validate() {
+  return _deny_message();
+}
+
+function drush_policy_pm_update_validate() {
+  return _deny_message();
+}
+
+function drush_policy_pm_download_validate() {
+  return _deny_message();
+}
+
+function _deny_message() {
+  if (!drush_get_option('pm-force')) {
+    $msg = 'This codebase is assembled with Composer instead of Drush. Use `composer update` and `composer require` instead of `drush pm-updatecode` and `drush pm-download`. You may override this error by using the --pm-force option.';
+    return drush_set_error('POLICY_PM_DENY', dt($msg));
+  }
+}
+
+/**
+ * Implements hook_drush_help_alter().
+ */
+function policy_drush_help_alter(&$command) {
+  if (in_array($command['command'], array('pm-updatecode', 'pm-update', 'pm-download'))) {
+    $command['options']['pm-force'] = 'Override site policy and allow Drush codebase management (pm-* commands)';
+  }
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..ce29746
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         verbose="true"
+        >
+    <testsuites>
+        <testsuite name="drupal-composer-project tests">
+            <directory>./test/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/scripts/composer/ScriptHandler.php b/scripts/composer/ScriptHandler.php
new file mode 100644
index 0000000..a75e4d3
--- /dev/null
+++ b/scripts/composer/ScriptHandler.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * @file
+ * Contains \DrupalProject\composer\ScriptHandler.
+ */
+
+namespace DrupalProject\composer;
+
+use Composer\Script\Event;
+use Composer\Semver\Comparator;
+use DrupalFinder\DrupalFinder;
+use Symfony\Component\Filesystem\Filesystem;
+use Webmozart\PathUtil\Path;
+
+class ScriptHandler {
+
+  public static function createRequiredFiles(Event $event) {
+    $fs = new Filesystem();
+    $drupalFinder = new DrupalFinder();
+    $drupalFinder->locateRoot(getcwd());
+    $drupalRoot = $drupalFinder->getDrupalRoot();
+
+    $dirs = [
+      'modules',
+      'profiles',
+      'themes',
+    ];
+
+    // Required for unit testing
+    foreach ($dirs as $dir) {
+      if (!$fs->exists($drupalRoot . '/'. $dir)) {
+        $fs->mkdir($drupalRoot . '/'. $dir);
+        $fs->touch($drupalRoot . '/'. $dir . '/.gitkeep');
+      }
+    }
+
+    // Prepare the settings file for installation
+    if (!$fs->exists($drupalRoot . '/sites/default/settings.php') and $fs->exists($drupalRoot . '/sites/default/default.settings.php')) {
+      $fs->copy($drupalRoot . '/sites/default/default.settings.php', $drupalRoot . '/sites/default/settings.php');
+      require_once $drupalRoot . '/core/includes/bootstrap.inc';
+      require_once $drupalRoot . '/core/includes/install.inc';
+      $settings['config_directories'] = [
+        CONFIG_SYNC_DIRECTORY => (object) [
+          'value' => Path::makeRelative($drupalFinder->getComposerRoot() . '/config/sync', $drupalRoot),
+          'required' => TRUE,
+        ],
+      ];
+      drupal_rewrite_settings($settings, $drupalRoot . '/sites/default/settings.php');
+      $fs->chmod($drupalRoot . '/sites/default/settings.php', 0666);
+      $event->getIO()->write("Create a sites/default/settings.php file with chmod 0666");
+    }
+
+    // Create the files directory with chmod 0777
+    if (!$fs->exists($drupalRoot . '/sites/default/files')) {
+      $oldmask = umask(0);
+      $fs->mkdir($drupalRoot . '/sites/default/files', 0777);
+      umask($oldmask);
+      $event->getIO()->write("Create a sites/default/files directory with chmod 0777");
+    }
+  }
+
+  /**
+   * Checks if the installed version of Composer is compatible.
+   *
+   * Composer 1.0.0 and higher consider a `composer install` without having a
+   * lock file present as equal to `composer update`. We do not ship with a lock
+   * file to avoid merge conflicts downstream, meaning that if a project is
+   * installed with an older version of Composer the scaffolding of Drupal will
+   * not be triggered. We check this here instead of in drupal-scaffold to be
+   * able to give immediate feedback to the end user, rather than failing the
+   * installation after going through the lengthy process of compiling and
+   * downloading the Composer dependencies.
+   *
+   * @see https://github.com/composer/composer/pull/5035
+   */
+  public static function checkComposerVersion(Event $event) {
+    $composer = $event->getComposer();
+    $io = $event->getIO();
+
+    $version = $composer::VERSION;
+
+    // The dev-channel of composer uses the git revision as version number,
+    // try to the branch alias instead.
+    if (preg_match('/^[0-9a-f]{40}$/i', $version)) {
+      $version = $composer::BRANCH_ALIAS_VERSION;
+    }
+
+    // If Composer is installed through git we have no easy way to determine if
+    // it is new enough, just display a warning.
+    if ($version === '@package_version@' || $version === '@package_branch_alias_version@') {
+      $io->writeError('<warning>You are running a development version of Composer. If you experience problems, please update Composer to the latest stable version.</warning>');
+    }
+    elseif (Comparator::lessThan($version, '1.0.0')) {
+      $io->writeError('<error>Drupal-project requires Composer version 1.0.0 or higher. Please update your Composer before continuing</error>.');
+      exit(1);
+    }
+  }
+
+}

From 85629b0b5853ab0f71b601aec1efbe8a9c63efa5 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 9 Mar 2018 10:36:13 -0800
Subject: [PATCH 005/143] Add sample manifest.yml

---
 manifest.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 manifest.yml

diff --git a/manifest.yml b/manifest.yml
new file mode 100644
index 0000000..ac3c88b
--- /dev/null
+++ b/manifest.yml
@@ -0,0 +1,14 @@
+---
+applications:
+- name: nsf
+  buildpack: php_buildpack
+  memory: 512M
+  disk_quota: 512M
+  timeout: 180
+  services:
+    - # s3 bucket
+    - # db
+  env:
+    AWS_S3_ENDPOINT: ''
+    ACCOUNT_NAME: ''
+    HASH_SALT: ''

From 37d3b010a9162eef4696d68519d9ea8dae6a81fc Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 9 Mar 2018 10:52:37 -0800
Subject: [PATCH 006/143] Add .cfignore file from cf-ex-drupal

---
 .cfignore | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .cfignore

diff --git a/.cfignore b/.cfignore
new file mode 100644
index 0000000..ede54e6
--- /dev/null
+++ b/.cfignore
@@ -0,0 +1,29 @@
+# Ignore directories generated by Composer
+/drush/contrib/
+/vendor/
+/web/core/
+/web/modules/contrib/
+/web/themes/contrib/
+/web/profiles/contrib/
+/web/libraries/
+
+# Typically, composer generates a .gitignore to ignore the 
+# `settings.php` files.  For cloud.gov and Cloud Foundry, no sensitive 
+# information is stored in the settings files. Instead, those files
+# have code that parses environment variables for DB and S3
+#
+# Ignore sensitive information [This is a `composer` default]
+# /web/sites/*/settings.php
+# /web/sites/*/settings.local.php
+
+
+# Ignore Drupal's file directory
+/web/sites/*/files/
+
+# Ignore SimpleTest multi-site environment.
+/web/sites/simpletest
+
+# Ignore files generated by PhpStorm
+/.idea/
+
+.DS_Store
\ No newline at end of file

From eac11c728cfb74c451879412f719af2c223eb93c Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Mon, 12 Mar 2018 15:00:06 -0700
Subject: [PATCH 007/143] Add .htaccess file

Drawn from github.com/18F/cf-ex-drupal/
---
 sites/default/config/.htaccess  | 23 +++++++++++++++++++++++
 sites/default/config/README.txt |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 sites/default/config/.htaccess
 create mode 100644 sites/default/config/README.txt

diff --git a/sites/default/config/.htaccess b/sites/default/config/.htaccess
new file mode 100644
index 0000000..91883a3
--- /dev/null
+++ b/sites/default/config/.htaccess
@@ -0,0 +1,23 @@
+# Deny all requests from Apache 2.4+.
+<IfModule mod_authz_core.c>
+  Require all denied
+</IfModule>
+
+# Deny all requests from Apache 2.0-2.2.
+<IfModule !mod_authz_core.c>
+  Deny from all
+</IfModule># Turn off all options we don't need.
+Options None
+Options +FollowSymLinks
+
+# Set the catch-all handler to prevent scripts from being executed.
+SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
+<Files *>
+  # Override the handler again if we're run later in the evaluation list.
+  SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
+</Files>
+
+# If we know how to do it safely, disable the PHP engine entirely.
+<IfModule mod_php5.c>
+  php_flag engine off
+</IfModule>
\ No newline at end of file
diff --git a/sites/default/config/README.txt b/sites/default/config/README.txt
new file mode 100644
index 0000000..e2f9754
--- /dev/null
+++ b/sites/default/config/README.txt
@@ -0,0 +1 @@
+This directory structure contains the staging config for your site.

From a10ded275598b46de21b6b6cbdde0306aae06d46 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Mon, 12 Mar 2018 14:57:47 -0700
Subject: [PATCH 008/143] Add all local modules to .gitignore

Theoretically this precludes the addition of custom modules. May
want to scale back to /contrib at some point.
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6f7029b..8603770 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@ core
 vendor
 
 # Ignore local versions of modules.
-modules/contrib/*
+modules/*
 
 # Ignore local database dumps.
 db_dumps

From 20d48ee7445643c5e2d332695a18fa2dca1d4aee Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 16 Mar 2018 01:19:32 -0700
Subject: [PATCH 009/143] Add exported configuration

Brightcove API credentials have been redacted.
---
 web/sites/default/config/.htaccess            |   23 +
 web/sites/default/config/README.txt           |    1 +
 web/sites/default/config/action.settings.yml  |    3 +
 .../default/config/aggregator.settings.yml    |   12 +
 .../config/automated_cron.settings.yml        |    3 +
 .../block.block.bootstrap_account_menu.yml    |   26 +
 .../config/block.block.bootstrap_branding.yml |   25 +
 .../block.block.bootstrap_breadcrumbs.yml     |   22 +
 .../config/block.block.bootstrap_content.yml  |   22 +
 .../config/block.block.bootstrap_footer.yml   |   26 +
 .../config/block.block.bootstrap_help.yml     |   22 +
 .../block.block.bootstrap_local_actions.yml   |   20 +
 .../block.block.bootstrap_local_tasks.yml     |   22 +
 .../block.block.bootstrap_main_menu.yml       |   26 +
 .../config/block.block.bootstrap_messages.yml |   22 +
 .../block.block.bootstrap_page_title.yml      |   20 +
 .../config/block.block.bootstrap_search.yml   |   22 +
 .../config/block.block.bootstrap_tools.yml    |   26 +
 .../config/block.block.nsf_account_menu.yml   |   35 +
 ...ck.nsf_blockdemonstratingstaticcontent.yml |   40 +
 .../config/block.block.nsf_branding.yml       |   25 +
 .../config/block.block.nsf_breadcrumbs.yml    |   22 +
 .../config/block.block.nsf_content.yml        |   22 +
 .../default/config/block.block.nsf_footer.yml |   26 +
 .../default/config/block.block.nsf_help.yml   |   22 +
 .../config/block.block.nsf_local_actions.yml  |   20 +
 .../config/block.block.nsf_local_tasks.yml    |   22 +
 .../config/block.block.nsf_main_menu.yml      |   26 +
 .../config/block.block.nsf_messages.yml       |   22 +
 .../config/block.block.nsf_page_title.yml     |   20 +
 .../default/config/block.block.nsf_search.yml |   22 +
 .../default/config/block.block.nsf_tools.yml  |   26 +
 ...ck.block.nsf_views_block__news_block_1.yml |   30 +
 .../config/block.block.seven_breadcrumbs.yml  |   22 +
 .../config/block.block.seven_content.yml      |   22 +
 .../default/config/block.block.seven_help.yml |   22 +
 .../block.block.seven_local_actions.yml       |   20 +
 .../config/block.block.seven_login.yml        |   22 +
 .../config/block.block.seven_messages.yml     |   22 +
 .../config/block.block.seven_page_title.yml   |   20 +
 .../block.block.seven_primary_local_tasks.yml |   22 +
 ...lock.block.seven_secondary_local_tasks.yml |   22 +
 .../config/block.block.uswds_account_menu.yml |   26 +
 ....uswds_blockdemonstratingstaticcontent.yml |   40 +
 .../config/block.block.uswds_branding.yml     |   25 +
 .../config/block.block.uswds_breadcrumbs.yml  |   22 +
 .../config/block.block.uswds_content.yml      |   22 +
 .../config/block.block.uswds_footer.yml       |   26 +
 .../default/config/block.block.uswds_help.yml |   22 +
 .../block.block.uswds_local_actions.yml       |   20 +
 .../config/block.block.uswds_local_tasks.yml  |   22 +
 .../config/block.block.uswds_main_menu.yml    |   26 +
 .../config/block.block.uswds_messages.yml     |   22 +
 .../config/block.block.uswds_page_title.yml   |   20 +
 .../config/block.block.uswds_search.yml       |   22 +
 .../config/block.block.uswds_tools.yml        |   26 +
 ....block.uswds_views_block__news_block_1.yml |   30 +
 ...block.block.views_block__blogs_block_2.yml |   30 +
 ...block.block.views_block__blogs_block_3.yml |   30 +
 ...block.block.views_block__blogs_block_4.yml |   30 +
 ...block.block.views_block__blogs_block_5.yml |   30 +
 .../block.block.views_block__news_block_1.yml |   30 +
 .../block.block.views_block__news_block_2.yml |   24 +
 .../block.block.views_block__news_block_3.yml |   48 +
 .../config/block_content.type.basic.yml       |   10 +
 .../default/config/bootstrap.settings.yml     |   20 +
 ...e.brightcove_api_client.nsf_brightcove.yml |   13 +
 .../default/config/brightcove.settings.yml    |    6 +
 .../default/config/comment.type.comment.yml   |   10 +
 .../default/config/contact.form.feedback.yml  |   14 +
 .../default/config/contact.form.personal.yml  |   13 +
 web/sites/default/config/contact.settings.yml |    7 +
 ....base_field_override.node.news.promote.yml |   22 +
 ....base_field_override.node.page.promote.yml |   24 +
 .../config/core.date_format.fallback.yml      |   10 +
 .../config/core.date_format.html_date.yml     |   10 +
 .../config/core.date_format.html_datetime.yml |   10 +
 .../config/core.date_format.html_month.yml    |   10 +
 .../config/core.date_format.html_time.yml     |   10 +
 .../config/core.date_format.html_week.yml     |   10 +
 .../config/core.date_format.html_year.yml     |   10 +
 .../core.date_format.html_yearless_date.yml   |   10 +
 .../default/config/core.date_format.long.yml  |   10 +
 .../config/core.date_format.medium.yml        |   10 +
 .../default/config/core.date_format.short.yml |   10 +
 ...rm_display.block_content.basic.default.yml |   34 +
 ...y_form_display.comment.comment.default.yml |   36 +
 ....entity_form_display.node.news.default.yml |  145 ++
 ....entity_form_display.node.page.default.yml |   77 +
 ...omy_term.brightcove_video_tags.default.yml |   39 +
 ....entity_form_display.user.user.default.yml |   38 +
 .../core.entity_form_mode.user.register.yml   |   12 +
 ...ggregator_feed.aggregator_feed.default.yml |   41 +
 ...ggregator_feed.aggregator_feed.summary.yml |   27 +
 ...ggregator_item.aggregator_item.summary.yml |   23 +
 ...ew_display.block_content.basic.default.yml |   24 +
 ...ghtcove_video.brightcove_video.default.yml |   49 +
 ...rightcove_video.brightcove_video.embed.yml |   51 +
 ...y_view_display.comment.comment.default.yml |   27 +
 ....entity_view_display.node.news.default.yml |   70 +
 ...e.entity_view_display.node.news.teaser.yml |   28 +
 ....entity_view_display.node.page.default.yml |   28 +
 ...e.entity_view_display.node.page.teaser.yml |   30 +
 ...omy_term.brightcove_video_tags.default.yml |   23 +
 ....entity_view_display.user.user.compact.yml |   29 +
 ....entity_view_display.user.user.default.yml |   30 +
 ...low_transition.news_and_events.default.yml |   12 +
 ...tity_view_mode.aggregator_feed.summary.yml |   12 +
 ...tity_view_mode.aggregator_item.summary.yml |   12 +
 .../core.entity_view_mode.block.token.yml     |   10 +
 ...re.entity_view_mode.block_content.full.yml |   12 +
 ...e.entity_view_mode.block_content.token.yml |   10 +
 ...ntity_view_mode.brightcove_video.embed.yml |   12 +
 .../core.entity_view_mode.comment.full.yml    |   12 +
 .../core.entity_view_mode.comment.token.yml   |   10 +
 ...entity_view_mode.contact_message.token.yml |   10 +
 .../core.entity_view_mode.file.token.yml      |   10 +
 ...tity_view_mode.menu_link_content.token.yml |   10 +
 .../core.entity_view_mode.node.diff.yml       |   16 +
 .../core.entity_view_mode.node.full.yml       |   12 +
 .../config/core.entity_view_mode.node.rss.yml |   12 +
 ...ore.entity_view_mode.node.search_index.yml |   12 +
 ...re.entity_view_mode.node.search_result.yml |   12 +
 .../core.entity_view_mode.node.teaser.yml     |   12 +
 .../core.entity_view_mode.node.token.yml      |   10 +
 .../core.entity_view_mode.shortcut.token.yml  |   10 +
 ...re.entity_view_mode.taxonomy_term.full.yml |   12 +
 ...e.entity_view_mode.taxonomy_term.token.yml |   10 +
 .../core.entity_view_mode.tour.token.yml      |   10 +
 .../core.entity_view_mode.user.compact.yml    |   12 +
 .../core.entity_view_mode.user.full.yml       |   12 +
 .../core.entity_view_mode.user.token.yml      |   10 +
 ...de.workflow_scheduled_transition.token.yml |   10 +
 ...ty_view_mode.workflow_transition.token.yml |   10 +
 web/sites/default/config/core.extension.yml   |   85 +
 .../core.menu.static_menu_link_overrides.yml  |   27 +
 web/sites/default/config/dblog.settings.yml   |    3 +
 web/sites/default/config/devel.settings.yml   |   10 +
 .../default/config/devel.toolbar.settings.yml |   11 +
 web/sites/default/config/diff.plugins.yml     |  135 ++
 web/sites/default/config/diff.settings.yml    |   18 +
 .../config/editor.editor.basic_html.yml       |   62 +
 .../config/editor.editor.full_html.yml        |   63 +
 .../config/editor.editor.restricted_html.yml  |   54 +
 .../config/embed.button.brightcove_video.yml  |   23 +
 .../default/config/embed.button.node.yml      |   17 +
 web/sites/default/config/embed.settings.yml   |    4 +
 ...rowser.brightcove_video_browser_widget.yml |   35 +
 .../default/config/entity_embed.settings.yml  |    3 +
 .../config/features.bundle.default.yml        |  100 ++
 .../default/config/features.bundle.nsf.yml    |  100 ++
 .../default/config/features.settings.yml      |    5 +
 .../field.field.block_content.basic.body.yml  |   24 +
 ...eld.field.comment.comment.comment_body.yml |   23 +
 .../config/field.field.node.news.body.yml     |   22 +
 .../field.field.node.news.field_caption.yml   |   21 +
 ...d.field.node.news.field_featured_image.yml |   38 +
 .../field.field.node.news.field_funding.yml   |   23 +
 ...ld.field.node.news.field_media_queries.yml |   24 +
 ...d.node.news.field_press_release_number.yml |   19 +
 ...field.node.news.field_publication_date.yml |   24 +
 .../field.field.node.news.field_subtitle.yml  |   19 +
 .../config/field.field.node.page.body.yml     |   24 +
 .../field.field.user.user.user_picture.yml    |   40 +
 web/sites/default/config/field.settings.yml   |    3 +
 .../field.storage.block_content.body.yml      |   21 +
 .../field.storage.comment.comment_body.yml    |   21 +
 .../config/field.storage.node.body.yml        |   21 +
 .../field.storage.node.field_caption.yml      |   20 +
 ...ield.storage.node.field_featured_image.yml |   30 +
 .../field.storage.node.field_funding.yml      |   20 +
 ...field.storage.node.field_media_queries.yml |   20 +
 ...torage.node.field_press_release_number.yml |   21 +
 ...ld.storage.node.field_publication_date.yml |   20 +
 .../field.storage.node.field_subtitle.yml     |   21 +
 .../field.storage.user.user_picture.yml       |   34 +
 .../default/config/field_ui.settings.yml      |    3 +
 web/sites/default/config/file.settings.yml    |    8 +
 .../config/filter.format.basic_html.yml       |   77 +
 .../config/filter.format.full_html.yml        |   36 +
 .../config/filter.format.plain_text.yml       |   29 +
 .../config/filter.format.restricted_html.yml  |   77 +
 web/sites/default/config/filter.settings.yml  |    4 +
 web/sites/default/config/image.settings.yml   |    5 +
 ...style.brightcove_videos_list_thumbnail.yml |   16 +
 .../default/config/image.style.large.yml      |   17 +
 .../default/config/image.style.medium.yml     |   17 +
 .../config/image.style.news_main_story.yml    |   14 +
 .../config/image.style.news_thumbnail.yml     |   14 +
 .../default/config/image.style.thumbnail.yml  |   17 +
 .../default/config/media_entity.settings.yml  |    3 +
 web/sites/default/config/menu_ui.settings.yml |    3 +
 web/sites/default/config/node.settings.yml    |    3 +
 web/sites/default/config/node.type.news.yml   |   30 +
 web/sites/default/config/node.type.page.yml   |   32 +
 web/sites/default/config/nsf.settings.yml     |   34 +
 .../default/config/pathauto.pattern.news.yml  |   22 +
 .../default/config/pathauto.pattern.page.yml  |   22 +
 .../default/config/pathauto.settings.yml      |   15 +
 .../config/rdf.mapping.comment.comment.yml    |   36 +
 .../default/config/rdf.mapping.node.page.yml  |   43 +
 .../config/rdf.mapping.taxonomy_term.tags.yml |   22 +
 .../default/config/rdf.mapping.user.user.yml  |   17 +
 .../rules.reaction.submit_for_review.yml      |   15 +
 web/sites/default/config/rules.settings.yml   |    6 +
 .../default/config/scheduler.settings.yml     |   21 +
 .../config/search.page.node_search.yml        |   15 +
 .../config/search.page.user_search.yml        |   14 +
 web/sites/default/config/search.settings.yml  |   22 +
 web/sites/default/config/seven.settings.yml   |    3 +
 .../default/config/shortcut.set.default.yml   |    8 +
 ...n.change_a_node_to_next_workflow_state.yml |   25 +
 .../system.action.comment_delete_action.yml   |   13 +
 .../system.action.comment_publish_action.yml  |   13 +
 .../system.action.comment_save_action.yml     |   13 +
 ...system.action.comment_unpublish_action.yml |   13 +
 .../system.action.media_delete_action.yml     |   13 +
 .../system.action.media_publish_action.yml    |   13 +
 .../system.action.media_save_action.yml       |   13 +
 .../system.action.media_unpublish_action.yml  |   13 +
 .../system.action.node_delete_action.yml      |   13 +
 .../system.action.node_make_sticky_action.yml |   13 +
 ...ystem.action.node_make_unsticky_action.yml |   13 +
 .../system.action.node_promote_action.yml     |   13 +
 .../system.action.node_publish_action.yml     |   13 +
 .../config/system.action.node_save_action.yml |   13 +
 .../system.action.node_unpromote_action.yml   |   13 +
 .../system.action.node_unpublish_action.yml   |   13 +
 ...stem.action.pathauto_update_alias_node.yml |   13 +
 ...stem.action.pathauto_update_alias_user.yml |   13 +
 ...ion.user_add_role_action.administrator.yml |   14 +
 ...ser_add_role_action.olpa_content_admin.yml |   14 +
 ...er_add_role_action.olpa_content_editor.yml |   14 +
 ...action.user_add_role_action.wig_member.yml |   14 +
 .../system.action.user_block_user_action.yml  |   13 +
 .../system.action.user_cancel_user_action.yml |   13 +
 ....user_remove_role_action.administrator.yml |   14 +
 ..._remove_role_action.olpa_content_admin.yml |   14 +
 ...remove_role_action.olpa_content_editor.yml |   14 +
 ...ion.user_remove_role_action.wig_member.yml |   14 +
 ...system.action.user_unblock_user_action.yml |   13 +
 web/sites/default/config/system.authorize.yml |    3 +
 web/sites/default/config/system.cron.yml      |    6 +
 web/sites/default/config/system.date.yml      |   11 +
 web/sites/default/config/system.diff.yml      |    5 +
 web/sites/default/config/system.file.yml      |    7 +
 web/sites/default/config/system.image.gd.yml  |    3 +
 web/sites/default/config/system.image.yml     |    3 +
 web/sites/default/config/system.logging.yml   |    3 +
 web/sites/default/config/system.mail.yml      |    4 +
 .../default/config/system.maintenance.yml     |    4 +
 .../default/config/system.menu.account.yml    |   10 +
 .../default/config/system.menu.admin.yml      |   10 +
 .../default/config/system.menu.devel.yml      |   13 +
 .../default/config/system.menu.footer.yml     |   10 +
 web/sites/default/config/system.menu.main.yml |   10 +
 .../default/config/system.menu.tools.yml      |   10 +
 .../default/config/system.performance.yml     |   17 +
 web/sites/default/config/system.rss.yml       |    8 +
 web/sites/default/config/system.site.yml      |   14 +
 .../default/config/system.theme.global.yml    |   16 +
 web/sites/default/config/system.theme.yml     |    4 +
 .../default/config/taxonomy.settings.yml      |    5 +
 ...onomy.vocabulary.brightcove_video_tags.yml |   11 +
 .../config/taxonomy.vocabulary.news_types.yml |    9 +
 .../config/taxonomy.vocabulary.tags.yml       |   11 +
 web/sites/default/config/text.settings.yml    |    3 +
 .../default/config/tour.tour.views-ui.yml     |   97 +
 web/sites/default/config/update.settings.yml  |   13 +
 web/sites/default/config/user.flood.yml       |    7 +
 web/sites/default/config/user.mail.yml        |   30 +
 .../config/user.role.administrator.yml        |   11 +
 .../default/config/user.role.anonymous.yml    |   17 +
 .../config/user.role.authenticated.yml        |   25 +
 .../config/user.role.olpa_content_admin.yml   |   33 +
 .../config/user.role.olpa_content_editor.yml  |   24 +
 .../default/config/user.role.wig_member.yml   |   20 +
 web/sites/default/config/user.settings.yml    |   18 +
 web/sites/default/config/uswds.settings.yml   |   34 +
 web/sites/default/config/views.settings.yml   |   48 +
 .../config/views.view.aggregator_rss_feed.yml |  164 ++
 .../config/views.view.aggregator_sources.yml  |  433 +++++
 .../default/config/views.view.archive.yml     |  243 +++
 .../config/views.view.block_content.yml       |  500 ++++++
 web/sites/default/config/views.view.blogs.yml | 1397 +++++++++++++++
 .../config/views.view.brightcove_video.yml    |  646 +++++++
 .../views.view.brightcove_video_browser.yml   |  372 ++++
 ...s.view.brightcove_videos_by_api_client.yml |  251 +++
 .../default/config/views.view.comment.yml     | 1582 +++++++++++++++++
 .../config/views.view.comments_recent.yml     |  263 +++
 .../default/config/views.view.content.yml     |  600 +++++++
 .../config/views.view.content_recent.yml      |  319 ++++
 web/sites/default/config/views.view.files.yml | 1124 ++++++++++++
 .../default/config/views.view.frontpage.yml   |  294 +++
 .../default/config/views.view.glossary.yml    |  459 +++++
 web/sites/default/config/views.view.media.yml |  859 +++++++++
 .../default/config/views.view.my_content.yml  |  403 +++++
 web/sites/default/config/views.view.news.yml  | 1024 +++++++++++
 .../default/config/views.view.nsf_blog.yml    |  379 ++++
 ...views.view.scheduler_scheduled_content.yml |  855 +++++++++
 .../config/views.view.taxonomy_term.yml       |  314 ++++
 .../config/views.view.user_admin_people.yml   |  915 ++++++++++
 .../default/config/views.view.watchdog.yml    |  712 ++++++++
 .../default/config/views.view.who_s_new.yml   |  193 ++
 .../config/views.view.who_s_online.yml        |  222 +++
 .../default/config/workflow.settings.yml      |    3 +
 ...orkflow.state.news_and_events_approved.yml |   10 +
 ...orkflow.state.news_and_events_creation.yml |   10 +
 ...low.state.news_and_events_under_review.yml |   10 +
 ...tion.news_and_events_approved_approved.yml |   10 +
 ....news_and_events_approved_under_review.yml |   16 +
 ...tion.news_and_events_creation_approved.yml |   16 +
 ....news_and_events_creation_under_review.yml |   16 +
 ....news_and_events_under_review_approved.yml |   16 +
 ...s_and_events_under_review_under_review.yml |   10 +
 .../workflow.workflow.news_and_events.yml     |   14 +
 .../config/workflows.workflow.editorial.yml   |   81 +
 317 files changed, 20694 insertions(+)
 create mode 100644 web/sites/default/config/.htaccess
 create mode 100644 web/sites/default/config/README.txt
 create mode 100644 web/sites/default/config/action.settings.yml
 create mode 100644 web/sites/default/config/aggregator.settings.yml
 create mode 100644 web/sites/default/config/automated_cron.settings.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_account_menu.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_branding.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_breadcrumbs.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_content.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_footer.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_help.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_local_actions.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_local_tasks.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_main_menu.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_messages.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_page_title.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_search.yml
 create mode 100644 web/sites/default/config/block.block.bootstrap_tools.yml
 create mode 100644 web/sites/default/config/block.block.nsf_account_menu.yml
 create mode 100644 web/sites/default/config/block.block.nsf_blockdemonstratingstaticcontent.yml
 create mode 100644 web/sites/default/config/block.block.nsf_branding.yml
 create mode 100644 web/sites/default/config/block.block.nsf_breadcrumbs.yml
 create mode 100644 web/sites/default/config/block.block.nsf_content.yml
 create mode 100644 web/sites/default/config/block.block.nsf_footer.yml
 create mode 100644 web/sites/default/config/block.block.nsf_help.yml
 create mode 100644 web/sites/default/config/block.block.nsf_local_actions.yml
 create mode 100644 web/sites/default/config/block.block.nsf_local_tasks.yml
 create mode 100644 web/sites/default/config/block.block.nsf_main_menu.yml
 create mode 100644 web/sites/default/config/block.block.nsf_messages.yml
 create mode 100644 web/sites/default/config/block.block.nsf_page_title.yml
 create mode 100644 web/sites/default/config/block.block.nsf_search.yml
 create mode 100644 web/sites/default/config/block.block.nsf_tools.yml
 create mode 100644 web/sites/default/config/block.block.nsf_views_block__news_block_1.yml
 create mode 100644 web/sites/default/config/block.block.seven_breadcrumbs.yml
 create mode 100644 web/sites/default/config/block.block.seven_content.yml
 create mode 100644 web/sites/default/config/block.block.seven_help.yml
 create mode 100644 web/sites/default/config/block.block.seven_local_actions.yml
 create mode 100644 web/sites/default/config/block.block.seven_login.yml
 create mode 100644 web/sites/default/config/block.block.seven_messages.yml
 create mode 100644 web/sites/default/config/block.block.seven_page_title.yml
 create mode 100644 web/sites/default/config/block.block.seven_primary_local_tasks.yml
 create mode 100644 web/sites/default/config/block.block.seven_secondary_local_tasks.yml
 create mode 100644 web/sites/default/config/block.block.uswds_account_menu.yml
 create mode 100644 web/sites/default/config/block.block.uswds_blockdemonstratingstaticcontent.yml
 create mode 100644 web/sites/default/config/block.block.uswds_branding.yml
 create mode 100644 web/sites/default/config/block.block.uswds_breadcrumbs.yml
 create mode 100644 web/sites/default/config/block.block.uswds_content.yml
 create mode 100644 web/sites/default/config/block.block.uswds_footer.yml
 create mode 100644 web/sites/default/config/block.block.uswds_help.yml
 create mode 100644 web/sites/default/config/block.block.uswds_local_actions.yml
 create mode 100644 web/sites/default/config/block.block.uswds_local_tasks.yml
 create mode 100644 web/sites/default/config/block.block.uswds_main_menu.yml
 create mode 100644 web/sites/default/config/block.block.uswds_messages.yml
 create mode 100644 web/sites/default/config/block.block.uswds_page_title.yml
 create mode 100644 web/sites/default/config/block.block.uswds_search.yml
 create mode 100644 web/sites/default/config/block.block.uswds_tools.yml
 create mode 100644 web/sites/default/config/block.block.uswds_views_block__news_block_1.yml
 create mode 100644 web/sites/default/config/block.block.views_block__blogs_block_2.yml
 create mode 100644 web/sites/default/config/block.block.views_block__blogs_block_3.yml
 create mode 100644 web/sites/default/config/block.block.views_block__blogs_block_4.yml
 create mode 100644 web/sites/default/config/block.block.views_block__blogs_block_5.yml
 create mode 100644 web/sites/default/config/block.block.views_block__news_block_1.yml
 create mode 100644 web/sites/default/config/block.block.views_block__news_block_2.yml
 create mode 100644 web/sites/default/config/block.block.views_block__news_block_3.yml
 create mode 100644 web/sites/default/config/block_content.type.basic.yml
 create mode 100644 web/sites/default/config/bootstrap.settings.yml
 create mode 100644 web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
 create mode 100644 web/sites/default/config/brightcove.settings.yml
 create mode 100644 web/sites/default/config/comment.type.comment.yml
 create mode 100644 web/sites/default/config/contact.form.feedback.yml
 create mode 100644 web/sites/default/config/contact.form.personal.yml
 create mode 100644 web/sites/default/config/contact.settings.yml
 create mode 100644 web/sites/default/config/core.base_field_override.node.news.promote.yml
 create mode 100644 web/sites/default/config/core.base_field_override.node.page.promote.yml
 create mode 100644 web/sites/default/config/core.date_format.fallback.yml
 create mode 100644 web/sites/default/config/core.date_format.html_date.yml
 create mode 100644 web/sites/default/config/core.date_format.html_datetime.yml
 create mode 100644 web/sites/default/config/core.date_format.html_month.yml
 create mode 100644 web/sites/default/config/core.date_format.html_time.yml
 create mode 100644 web/sites/default/config/core.date_format.html_week.yml
 create mode 100644 web/sites/default/config/core.date_format.html_year.yml
 create mode 100644 web/sites/default/config/core.date_format.html_yearless_date.yml
 create mode 100644 web/sites/default/config/core.date_format.long.yml
 create mode 100644 web/sites/default/config/core.date_format.medium.yml
 create mode 100644 web/sites/default/config/core.date_format.short.yml
 create mode 100644 web/sites/default/config/core.entity_form_display.block_content.basic.default.yml
 create mode 100644 web/sites/default/config/core.entity_form_display.comment.comment.default.yml
 create mode 100644 web/sites/default/config/core.entity_form_display.node.news.default.yml
 create mode 100644 web/sites/default/config/core.entity_form_display.node.page.default.yml
 create mode 100644 web/sites/default/config/core.entity_form_display.taxonomy_term.brightcove_video_tags.default.yml
 create mode 100644 web/sites/default/config/core.entity_form_display.user.user.default.yml
 create mode 100644 web/sites/default/config/core.entity_form_mode.user.register.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.aggregator_item.aggregator_item.summary.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.block_content.basic.default.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.brightcove_video.brightcove_video.default.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.brightcove_video.brightcove_video.embed.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.comment.comment.default.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.node.news.default.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.node.news.teaser.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.node.page.default.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.node.page.teaser.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.taxonomy_term.brightcove_video_tags.default.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.user.user.compact.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.user.user.default.yml
 create mode 100644 web/sites/default/config/core.entity_view_display.workflow_transition.news_and_events.default.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.aggregator_feed.summary.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.aggregator_item.summary.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.block.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.block_content.full.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.block_content.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.brightcove_video.embed.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.comment.full.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.comment.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.contact_message.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.file.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.menu_link_content.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.node.diff.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.node.full.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.node.rss.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.node.search_index.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.node.search_result.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.node.teaser.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.node.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.shortcut.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.taxonomy_term.full.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.taxonomy_term.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.tour.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.user.compact.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.user.full.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.user.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.workflow_scheduled_transition.token.yml
 create mode 100644 web/sites/default/config/core.entity_view_mode.workflow_transition.token.yml
 create mode 100644 web/sites/default/config/core.extension.yml
 create mode 100644 web/sites/default/config/core.menu.static_menu_link_overrides.yml
 create mode 100644 web/sites/default/config/dblog.settings.yml
 create mode 100644 web/sites/default/config/devel.settings.yml
 create mode 100644 web/sites/default/config/devel.toolbar.settings.yml
 create mode 100644 web/sites/default/config/diff.plugins.yml
 create mode 100644 web/sites/default/config/diff.settings.yml
 create mode 100644 web/sites/default/config/editor.editor.basic_html.yml
 create mode 100644 web/sites/default/config/editor.editor.full_html.yml
 create mode 100644 web/sites/default/config/editor.editor.restricted_html.yml
 create mode 100644 web/sites/default/config/embed.button.brightcove_video.yml
 create mode 100644 web/sites/default/config/embed.button.node.yml
 create mode 100644 web/sites/default/config/embed.settings.yml
 create mode 100644 web/sites/default/config/entity_browser.browser.brightcove_video_browser_widget.yml
 create mode 100644 web/sites/default/config/entity_embed.settings.yml
 create mode 100644 web/sites/default/config/features.bundle.default.yml
 create mode 100644 web/sites/default/config/features.bundle.nsf.yml
 create mode 100644 web/sites/default/config/features.settings.yml
 create mode 100644 web/sites/default/config/field.field.block_content.basic.body.yml
 create mode 100644 web/sites/default/config/field.field.comment.comment.comment_body.yml
 create mode 100644 web/sites/default/config/field.field.node.news.body.yml
 create mode 100644 web/sites/default/config/field.field.node.news.field_caption.yml
 create mode 100644 web/sites/default/config/field.field.node.news.field_featured_image.yml
 create mode 100644 web/sites/default/config/field.field.node.news.field_funding.yml
 create mode 100644 web/sites/default/config/field.field.node.news.field_media_queries.yml
 create mode 100644 web/sites/default/config/field.field.node.news.field_press_release_number.yml
 create mode 100644 web/sites/default/config/field.field.node.news.field_publication_date.yml
 create mode 100644 web/sites/default/config/field.field.node.news.field_subtitle.yml
 create mode 100644 web/sites/default/config/field.field.node.page.body.yml
 create mode 100644 web/sites/default/config/field.field.user.user.user_picture.yml
 create mode 100644 web/sites/default/config/field.settings.yml
 create mode 100644 web/sites/default/config/field.storage.block_content.body.yml
 create mode 100644 web/sites/default/config/field.storage.comment.comment_body.yml
 create mode 100644 web/sites/default/config/field.storage.node.body.yml
 create mode 100644 web/sites/default/config/field.storage.node.field_caption.yml
 create mode 100644 web/sites/default/config/field.storage.node.field_featured_image.yml
 create mode 100644 web/sites/default/config/field.storage.node.field_funding.yml
 create mode 100644 web/sites/default/config/field.storage.node.field_media_queries.yml
 create mode 100644 web/sites/default/config/field.storage.node.field_press_release_number.yml
 create mode 100644 web/sites/default/config/field.storage.node.field_publication_date.yml
 create mode 100644 web/sites/default/config/field.storage.node.field_subtitle.yml
 create mode 100644 web/sites/default/config/field.storage.user.user_picture.yml
 create mode 100644 web/sites/default/config/field_ui.settings.yml
 create mode 100644 web/sites/default/config/file.settings.yml
 create mode 100644 web/sites/default/config/filter.format.basic_html.yml
 create mode 100644 web/sites/default/config/filter.format.full_html.yml
 create mode 100644 web/sites/default/config/filter.format.plain_text.yml
 create mode 100644 web/sites/default/config/filter.format.restricted_html.yml
 create mode 100644 web/sites/default/config/filter.settings.yml
 create mode 100644 web/sites/default/config/image.settings.yml
 create mode 100644 web/sites/default/config/image.style.brightcove_videos_list_thumbnail.yml
 create mode 100644 web/sites/default/config/image.style.large.yml
 create mode 100644 web/sites/default/config/image.style.medium.yml
 create mode 100644 web/sites/default/config/image.style.news_main_story.yml
 create mode 100644 web/sites/default/config/image.style.news_thumbnail.yml
 create mode 100644 web/sites/default/config/image.style.thumbnail.yml
 create mode 100644 web/sites/default/config/media_entity.settings.yml
 create mode 100644 web/sites/default/config/menu_ui.settings.yml
 create mode 100644 web/sites/default/config/node.settings.yml
 create mode 100644 web/sites/default/config/node.type.news.yml
 create mode 100644 web/sites/default/config/node.type.page.yml
 create mode 100644 web/sites/default/config/nsf.settings.yml
 create mode 100644 web/sites/default/config/pathauto.pattern.news.yml
 create mode 100644 web/sites/default/config/pathauto.pattern.page.yml
 create mode 100644 web/sites/default/config/pathauto.settings.yml
 create mode 100644 web/sites/default/config/rdf.mapping.comment.comment.yml
 create mode 100644 web/sites/default/config/rdf.mapping.node.page.yml
 create mode 100644 web/sites/default/config/rdf.mapping.taxonomy_term.tags.yml
 create mode 100644 web/sites/default/config/rdf.mapping.user.user.yml
 create mode 100644 web/sites/default/config/rules.reaction.submit_for_review.yml
 create mode 100644 web/sites/default/config/rules.settings.yml
 create mode 100644 web/sites/default/config/scheduler.settings.yml
 create mode 100644 web/sites/default/config/search.page.node_search.yml
 create mode 100644 web/sites/default/config/search.page.user_search.yml
 create mode 100644 web/sites/default/config/search.settings.yml
 create mode 100644 web/sites/default/config/seven.settings.yml
 create mode 100644 web/sites/default/config/shortcut.set.default.yml
 create mode 100644 web/sites/default/config/system.action.change_a_node_to_next_workflow_state.yml
 create mode 100644 web/sites/default/config/system.action.comment_delete_action.yml
 create mode 100644 web/sites/default/config/system.action.comment_publish_action.yml
 create mode 100644 web/sites/default/config/system.action.comment_save_action.yml
 create mode 100644 web/sites/default/config/system.action.comment_unpublish_action.yml
 create mode 100644 web/sites/default/config/system.action.media_delete_action.yml
 create mode 100644 web/sites/default/config/system.action.media_publish_action.yml
 create mode 100644 web/sites/default/config/system.action.media_save_action.yml
 create mode 100644 web/sites/default/config/system.action.media_unpublish_action.yml
 create mode 100644 web/sites/default/config/system.action.node_delete_action.yml
 create mode 100644 web/sites/default/config/system.action.node_make_sticky_action.yml
 create mode 100644 web/sites/default/config/system.action.node_make_unsticky_action.yml
 create mode 100644 web/sites/default/config/system.action.node_promote_action.yml
 create mode 100644 web/sites/default/config/system.action.node_publish_action.yml
 create mode 100644 web/sites/default/config/system.action.node_save_action.yml
 create mode 100644 web/sites/default/config/system.action.node_unpromote_action.yml
 create mode 100644 web/sites/default/config/system.action.node_unpublish_action.yml
 create mode 100644 web/sites/default/config/system.action.pathauto_update_alias_node.yml
 create mode 100644 web/sites/default/config/system.action.pathauto_update_alias_user.yml
 create mode 100644 web/sites/default/config/system.action.user_add_role_action.administrator.yml
 create mode 100644 web/sites/default/config/system.action.user_add_role_action.olpa_content_admin.yml
 create mode 100644 web/sites/default/config/system.action.user_add_role_action.olpa_content_editor.yml
 create mode 100644 web/sites/default/config/system.action.user_add_role_action.wig_member.yml
 create mode 100644 web/sites/default/config/system.action.user_block_user_action.yml
 create mode 100644 web/sites/default/config/system.action.user_cancel_user_action.yml
 create mode 100644 web/sites/default/config/system.action.user_remove_role_action.administrator.yml
 create mode 100644 web/sites/default/config/system.action.user_remove_role_action.olpa_content_admin.yml
 create mode 100644 web/sites/default/config/system.action.user_remove_role_action.olpa_content_editor.yml
 create mode 100644 web/sites/default/config/system.action.user_remove_role_action.wig_member.yml
 create mode 100644 web/sites/default/config/system.action.user_unblock_user_action.yml
 create mode 100644 web/sites/default/config/system.authorize.yml
 create mode 100644 web/sites/default/config/system.cron.yml
 create mode 100644 web/sites/default/config/system.date.yml
 create mode 100644 web/sites/default/config/system.diff.yml
 create mode 100644 web/sites/default/config/system.file.yml
 create mode 100644 web/sites/default/config/system.image.gd.yml
 create mode 100644 web/sites/default/config/system.image.yml
 create mode 100644 web/sites/default/config/system.logging.yml
 create mode 100644 web/sites/default/config/system.mail.yml
 create mode 100644 web/sites/default/config/system.maintenance.yml
 create mode 100644 web/sites/default/config/system.menu.account.yml
 create mode 100644 web/sites/default/config/system.menu.admin.yml
 create mode 100644 web/sites/default/config/system.menu.devel.yml
 create mode 100644 web/sites/default/config/system.menu.footer.yml
 create mode 100644 web/sites/default/config/system.menu.main.yml
 create mode 100644 web/sites/default/config/system.menu.tools.yml
 create mode 100644 web/sites/default/config/system.performance.yml
 create mode 100644 web/sites/default/config/system.rss.yml
 create mode 100644 web/sites/default/config/system.site.yml
 create mode 100644 web/sites/default/config/system.theme.global.yml
 create mode 100644 web/sites/default/config/system.theme.yml
 create mode 100644 web/sites/default/config/taxonomy.settings.yml
 create mode 100644 web/sites/default/config/taxonomy.vocabulary.brightcove_video_tags.yml
 create mode 100644 web/sites/default/config/taxonomy.vocabulary.news_types.yml
 create mode 100644 web/sites/default/config/taxonomy.vocabulary.tags.yml
 create mode 100644 web/sites/default/config/text.settings.yml
 create mode 100644 web/sites/default/config/tour.tour.views-ui.yml
 create mode 100644 web/sites/default/config/update.settings.yml
 create mode 100644 web/sites/default/config/user.flood.yml
 create mode 100644 web/sites/default/config/user.mail.yml
 create mode 100644 web/sites/default/config/user.role.administrator.yml
 create mode 100644 web/sites/default/config/user.role.anonymous.yml
 create mode 100644 web/sites/default/config/user.role.authenticated.yml
 create mode 100644 web/sites/default/config/user.role.olpa_content_admin.yml
 create mode 100644 web/sites/default/config/user.role.olpa_content_editor.yml
 create mode 100644 web/sites/default/config/user.role.wig_member.yml
 create mode 100644 web/sites/default/config/user.settings.yml
 create mode 100644 web/sites/default/config/uswds.settings.yml
 create mode 100644 web/sites/default/config/views.settings.yml
 create mode 100644 web/sites/default/config/views.view.aggregator_rss_feed.yml
 create mode 100644 web/sites/default/config/views.view.aggregator_sources.yml
 create mode 100644 web/sites/default/config/views.view.archive.yml
 create mode 100644 web/sites/default/config/views.view.block_content.yml
 create mode 100644 web/sites/default/config/views.view.blogs.yml
 create mode 100644 web/sites/default/config/views.view.brightcove_video.yml
 create mode 100644 web/sites/default/config/views.view.brightcove_video_browser.yml
 create mode 100644 web/sites/default/config/views.view.brightcove_videos_by_api_client.yml
 create mode 100644 web/sites/default/config/views.view.comment.yml
 create mode 100644 web/sites/default/config/views.view.comments_recent.yml
 create mode 100644 web/sites/default/config/views.view.content.yml
 create mode 100644 web/sites/default/config/views.view.content_recent.yml
 create mode 100644 web/sites/default/config/views.view.files.yml
 create mode 100644 web/sites/default/config/views.view.frontpage.yml
 create mode 100644 web/sites/default/config/views.view.glossary.yml
 create mode 100644 web/sites/default/config/views.view.media.yml
 create mode 100644 web/sites/default/config/views.view.my_content.yml
 create mode 100644 web/sites/default/config/views.view.news.yml
 create mode 100644 web/sites/default/config/views.view.nsf_blog.yml
 create mode 100644 web/sites/default/config/views.view.scheduler_scheduled_content.yml
 create mode 100644 web/sites/default/config/views.view.taxonomy_term.yml
 create mode 100644 web/sites/default/config/views.view.user_admin_people.yml
 create mode 100644 web/sites/default/config/views.view.watchdog.yml
 create mode 100644 web/sites/default/config/views.view.who_s_new.yml
 create mode 100644 web/sites/default/config/views.view.who_s_online.yml
 create mode 100644 web/sites/default/config/workflow.settings.yml
 create mode 100644 web/sites/default/config/workflow.state.news_and_events_approved.yml
 create mode 100644 web/sites/default/config/workflow.state.news_and_events_creation.yml
 create mode 100644 web/sites/default/config/workflow.state.news_and_events_under_review.yml
 create mode 100644 web/sites/default/config/workflow.transition.news_and_events_approved_approved.yml
 create mode 100644 web/sites/default/config/workflow.transition.news_and_events_approved_under_review.yml
 create mode 100644 web/sites/default/config/workflow.transition.news_and_events_creation_approved.yml
 create mode 100644 web/sites/default/config/workflow.transition.news_and_events_creation_under_review.yml
 create mode 100644 web/sites/default/config/workflow.transition.news_and_events_under_review_approved.yml
 create mode 100644 web/sites/default/config/workflow.transition.news_and_events_under_review_under_review.yml
 create mode 100644 web/sites/default/config/workflow.workflow.news_and_events.yml
 create mode 100644 web/sites/default/config/workflows.workflow.editorial.yml

diff --git a/web/sites/default/config/.htaccess b/web/sites/default/config/.htaccess
new file mode 100644
index 0000000..91883a3
--- /dev/null
+++ b/web/sites/default/config/.htaccess
@@ -0,0 +1,23 @@
+# Deny all requests from Apache 2.4+.
+<IfModule mod_authz_core.c>
+  Require all denied
+</IfModule>
+
+# Deny all requests from Apache 2.0-2.2.
+<IfModule !mod_authz_core.c>
+  Deny from all
+</IfModule># Turn off all options we don't need.
+Options None
+Options +FollowSymLinks
+
+# Set the catch-all handler to prevent scripts from being executed.
+SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
+<Files *>
+  # Override the handler again if we're run later in the evaluation list.
+  SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
+</Files>
+
+# If we know how to do it safely, disable the PHP engine entirely.
+<IfModule mod_php5.c>
+  php_flag engine off
+</IfModule>
\ No newline at end of file
diff --git a/web/sites/default/config/README.txt b/web/sites/default/config/README.txt
new file mode 100644
index 0000000..e2f9754
--- /dev/null
+++ b/web/sites/default/config/README.txt
@@ -0,0 +1 @@
+This directory structure contains the staging config for your site.
diff --git a/web/sites/default/config/action.settings.yml b/web/sites/default/config/action.settings.yml
new file mode 100644
index 0000000..e0bbed9
--- /dev/null
+++ b/web/sites/default/config/action.settings.yml
@@ -0,0 +1,3 @@
+recursion_limit: 35
+_core:
+  default_config_hash: X4YpfA5OdcR0yUAF6UsJxqmOdrviYYj45h_SAH_p4oU
diff --git a/web/sites/default/config/aggregator.settings.yml b/web/sites/default/config/aggregator.settings.yml
new file mode 100644
index 0000000..81d7156
--- /dev/null
+++ b/web/sites/default/config/aggregator.settings.yml
@@ -0,0 +1,12 @@
+fetcher: aggregator
+parser: aggregator
+processors:
+  - aggregator
+items:
+  allowed_html: '<a> <b> <br> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul> <img> <video> <figure>'
+  teaser_length: 800
+  expire: 0
+source:
+  list_max: 3
+_core:
+  default_config_hash: oqQElnvorzLoHb68o4B3zFkGuMV5_GQEGi7pHfUseVM
diff --git a/web/sites/default/config/automated_cron.settings.yml b/web/sites/default/config/automated_cron.settings.yml
new file mode 100644
index 0000000..2418a00
--- /dev/null
+++ b/web/sites/default/config/automated_cron.settings.yml
@@ -0,0 +1,3 @@
+interval: 10800
+_core:
+  default_config_hash: fUksROt4FfkAU9BV4hV2XvhTBSS2nTNrZS4U7S-tKrs
diff --git a/web/sites/default/config/block.block.bootstrap_account_menu.yml b/web/sites/default/config/block.block.bootstrap_account_menu.yml
new file mode 100644
index 0000000..511a0f7
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_account_menu.yml
@@ -0,0 +1,26 @@
+uuid: 4cd45a03-4aed-4f28-b4f3-73cef3a2babd
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.account
+  module:
+    - system
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: R2K_qX0ZUMbUL6ie_-S9tZVjvqmlWKlscikgeRv9vhw
+id: bootstrap_account_menu
+theme: bootstrap
+region: navigation_collapsible
+weight: -7
+provider: null
+plugin: 'system_menu_block:account'
+settings:
+  id: 'system_menu_block:account'
+  label: 'User account menu'
+  provider: system
+  label_display: '0'
+  level: 1
+  depth: 2
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_branding.yml b/web/sites/default/config/block.block.bootstrap_branding.yml
new file mode 100644
index 0000000..e2bc7a5
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_branding.yml
@@ -0,0 +1,25 @@
+uuid: f5f39fe9-30f0-4d4e-9df1-3ec2a5e2de26
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: Cy3vkpYrD1O5JG-BeEnokF0bByHYDEa8CBfWivB4_SQ
+id: bootstrap_branding
+theme: bootstrap
+region: navigation
+weight: 0
+provider: null
+plugin: system_branding_block
+settings:
+  id: system_branding_block
+  label: 'Site branding'
+  provider: system
+  label_display: '0'
+  use_site_logo: true
+  use_site_name: true
+  use_site_slogan: false
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_breadcrumbs.yml b/web/sites/default/config/block.block.bootstrap_breadcrumbs.yml
new file mode 100644
index 0000000..d560df2
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_breadcrumbs.yml
@@ -0,0 +1,22 @@
+uuid: 4b656153-100e-4e67-8162-964054f71802
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: wDR9JKEATSWldBjw8du8s3G2zjEYeQf88nlld11hMLo
+id: bootstrap_breadcrumbs
+theme: bootstrap
+region: header
+weight: -7
+provider: null
+plugin: system_breadcrumb_block
+settings:
+  id: system_breadcrumb_block
+  label: Breadcrumbs
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_content.yml b/web/sites/default/config/block.block.bootstrap_content.yml
new file mode 100644
index 0000000..8e29e67
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_content.yml
@@ -0,0 +1,22 @@
+uuid: 3c70b9dd-8975-4ddf-8ab6-d477468ceedc
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: fNNLN48MSGSLiqwIFywCuxH2Dk_IxDbaP0kYhg_IPrg
+id: bootstrap_content
+theme: bootstrap
+region: content
+weight: -3
+provider: null
+plugin: system_main_block
+settings:
+  id: system_main_block
+  label: 'Main page content'
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_footer.yml b/web/sites/default/config/block.block.bootstrap_footer.yml
new file mode 100644
index 0000000..dd9b36c
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_footer.yml
@@ -0,0 +1,26 @@
+uuid: ab59092e-097d-40ae-be6d-4085972addf8
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.footer
+  module:
+    - system
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: h06zhb3xV9_2_3Zy9NsyylL7YBaEDlMwMEqNwAn8kMo
+id: bootstrap_footer
+theme: bootstrap
+region: footer
+weight: 0
+provider: null
+plugin: 'system_menu_block:footer'
+settings:
+  id: 'system_menu_block:footer'
+  label: 'Footer menu'
+  provider: system
+  label_display: '0'
+  level: 1
+  depth: 0
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_help.yml b/web/sites/default/config/block.block.bootstrap_help.yml
new file mode 100644
index 0000000..235caad
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_help.yml
@@ -0,0 +1,22 @@
+uuid: a5b85665-0139-4541-9946-8949a63af22c
+langcode: en
+status: true
+dependencies:
+  module:
+    - help
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: MhtNdV__HKRTab0ZPjkPNfYL4Ng4UPBucDLoC7Rg5Eo
+id: bootstrap_help
+theme: bootstrap
+region: help
+weight: -7
+provider: null
+plugin: help_block
+settings:
+  id: help_block
+  label: Help
+  provider: help
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_local_actions.yml b/web/sites/default/config/block.block.bootstrap_local_actions.yml
new file mode 100644
index 0000000..33fd0c6
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_local_actions.yml
@@ -0,0 +1,20 @@
+uuid: 86cc2867-b14f-4e80-a940-6a66467472cf
+langcode: en
+status: true
+dependencies:
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: ffxthelqQF8xcr4GTG4HlaNNsluiHftN0pujmQpW0bQ
+id: bootstrap_local_actions
+theme: bootstrap
+region: header
+weight: -7
+provider: null
+plugin: local_actions_block
+settings:
+  id: local_actions_block
+  label: 'Primary admin actions'
+  provider: core
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_local_tasks.yml b/web/sites/default/config/block.block.bootstrap_local_tasks.yml
new file mode 100644
index 0000000..80f579f
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_local_tasks.yml
@@ -0,0 +1,22 @@
+uuid: f45958f6-9305-4067-bddc-74f102c5993a
+langcode: en
+status: true
+dependencies:
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: qHdtze2DZ2mFfaJadxjZz6epm92_SN9SAFY4yJGl8Fo
+id: bootstrap_local_tasks
+theme: bootstrap
+region: header
+weight: -7
+provider: null
+plugin: local_tasks_block
+settings:
+  id: local_tasks_block
+  label: Tabs
+  provider: core
+  label_display: '0'
+  primary: true
+  secondary: true
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_main_menu.yml b/web/sites/default/config/block.block.bootstrap_main_menu.yml
new file mode 100644
index 0000000..c0a3e34
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_main_menu.yml
@@ -0,0 +1,26 @@
+uuid: 285f0a0f-3c11-4a07-9181-ee08d825babc
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.main
+  module:
+    - system
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: GT_zYl7I9VAILH8OxMRe-VDvFadCDHxRcnmBc5xEmf0
+id: bootstrap_main_menu
+theme: bootstrap
+region: navigation_collapsible
+weight: -7
+provider: null
+plugin: 'system_menu_block:main'
+settings:
+  id: 'system_menu_block:main'
+  label: 'Main navigation'
+  provider: system
+  label_display: '0'
+  level: 1
+  depth: 2
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_messages.yml b/web/sites/default/config/block.block.bootstrap_messages.yml
new file mode 100644
index 0000000..dfa97ff
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_messages.yml
@@ -0,0 +1,22 @@
+uuid: 10afad52-b146-4c18-b7c5-92771b1d3628
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: 9RnnTUBcn0WRWXfrGOnId2H0Q31uQUeu_F5TnDxl2yg
+id: bootstrap_messages
+theme: bootstrap
+region: header
+weight: -7
+provider: null
+plugin: system_messages_block
+settings:
+  id: system_messages_block
+  label: 'Status messages'
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_page_title.yml b/web/sites/default/config/block.block.bootstrap_page_title.yml
new file mode 100644
index 0000000..1a6ceb5
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_page_title.yml
@@ -0,0 +1,20 @@
+uuid: 08613bc2-f2c1-4852-84bb-3a81e31848b6
+langcode: en
+status: true
+dependencies:
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: 1TQP4b3ZnlzvIH9bj6cpCz_SyUHdJjLQkZnHpikjjhw
+id: bootstrap_page_title
+theme: bootstrap
+region: header
+weight: 0
+provider: null
+plugin: page_title_block
+settings:
+  id: page_title_block
+  label: 'Page title'
+  provider: core
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_search.yml b/web/sites/default/config/block.block.bootstrap_search.yml
new file mode 100644
index 0000000..0c415a5
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_search.yml
@@ -0,0 +1,22 @@
+uuid: 8e1ac23f-e4bd-4820-a8d8-d6cd3f1257a3
+langcode: en
+status: true
+dependencies:
+  module:
+    - search
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: F3d5hyAFunLh4PhGviJF019fHn1Z3_zy5gzsQ0tX1K0
+id: bootstrap_search
+theme: bootstrap
+region: sidebar_first
+weight: -6
+provider: null
+plugin: search_form_block
+settings:
+  id: search_form_block
+  label: Search
+  provider: search
+  label_display: visible
+visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_tools.yml b/web/sites/default/config/block.block.bootstrap_tools.yml
new file mode 100644
index 0000000..f42b5bd
--- /dev/null
+++ b/web/sites/default/config/block.block.bootstrap_tools.yml
@@ -0,0 +1,26 @@
+uuid: 927a86bf-7a91-4f91-8518-0a37154636a6
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.tools
+  module:
+    - system
+  theme:
+    - bootstrap
+_core:
+  default_config_hash: f3Dd5TnUiFDjFZp9yEGJInwt6cUzs7O6SvLTFTATSlU
+id: bootstrap_tools
+theme: bootstrap
+region: sidebar_first
+weight: -5
+provider: null
+plugin: 'system_menu_block:tools'
+settings:
+  id: 'system_menu_block:tools'
+  label: Tools
+  provider: system
+  label_display: visible
+  level: 1
+  depth: 0
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_account_menu.yml b/web/sites/default/config/block.block.nsf_account_menu.yml
new file mode 100644
index 0000000..2fd953e
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_account_menu.yml
@@ -0,0 +1,35 @@
+uuid: 7aae90ad-403c-4150-a032-cf5fdfc15d7d
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.account
+  module:
+    - system
+    - user
+  theme:
+    - nsf
+_core:
+  default_config_hash: R2K_qX0ZUMbUL6ie_-S9tZVjvqmlWKlscikgeRv9vhw
+id: nsf_account_menu
+theme: nsf
+region: primary_menu
+weight: -6
+provider: null
+plugin: 'system_menu_block:account'
+settings:
+  id: 'system_menu_block:account'
+  label: 'User account menu'
+  provider: system
+  label_display: '0'
+  level: 1
+  depth: 2
+visibility:
+  user_role:
+    id: user_role
+    roles:
+      anonymous: anonymous
+      authenticated: authenticated
+    negate: false
+    context_mapping:
+      user: '@user.current_user_context:current_user'
diff --git a/web/sites/default/config/block.block.nsf_blockdemonstratingstaticcontent.yml b/web/sites/default/config/block.block.nsf_blockdemonstratingstaticcontent.yml
new file mode 100644
index 0000000..2b6d4da
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_blockdemonstratingstaticcontent.yml
@@ -0,0 +1,40 @@
+uuid: da98c879-0877-4788-ab57-c83fef0ee7a8
+langcode: en
+status: true
+dependencies:
+  content:
+    - 'block_content:basic:58243bab-93b1-4b4d-a3b5-6410a345f692'
+  module:
+    - block_content
+    - system
+    - user
+  theme:
+    - nsf
+id: nsf_blockdemonstratingstaticcontent
+theme: nsf
+region: sidebar_first
+weight: -7
+provider: null
+plugin: 'block_content:58243bab-93b1-4b4d-a3b5-6410a345f692'
+settings:
+  id: 'block_content:58243bab-93b1-4b4d-a3b5-6410a345f692'
+  label: 'Block demonstrating static content'
+  provider: block_content
+  label_display: visible
+  status: true
+  info: ''
+  view_mode: full
+visibility:
+  user_role:
+    id: user_role
+    roles:
+      olpa_content_editor: olpa_content_editor
+      olpa_content_admin: olpa_content_admin
+    negate: false
+    context_mapping:
+      user: '@user.current_user_context:current_user'
+  request_path:
+    id: request_path
+    pages: ''
+    negate: true
+    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.nsf_branding.yml b/web/sites/default/config/block.block.nsf_branding.yml
new file mode 100644
index 0000000..f692850
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_branding.yml
@@ -0,0 +1,25 @@
+uuid: b6510551-a4c4-4c7f-99c6-08cd4c00b042
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - nsf
+_core:
+  default_config_hash: Cy3vkpYrD1O5JG-BeEnokF0bByHYDEa8CBfWivB4_SQ
+id: nsf_branding
+theme: nsf
+region: header
+weight: -8
+provider: null
+plugin: system_branding_block
+settings:
+  id: system_branding_block
+  label: 'Site branding'
+  provider: system
+  label_display: '0'
+  use_site_logo: true
+  use_site_name: true
+  use_site_slogan: false
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_breadcrumbs.yml b/web/sites/default/config/block.block.nsf_breadcrumbs.yml
new file mode 100644
index 0000000..d112d4d
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_breadcrumbs.yml
@@ -0,0 +1,22 @@
+uuid: c593185b-aa6d-4e54-ba60-89c0ef8d78f6
+langcode: en
+status: false
+dependencies:
+  module:
+    - system
+  theme:
+    - nsf
+_core:
+  default_config_hash: wDR9JKEATSWldBjw8du8s3G2zjEYeQf88nlld11hMLo
+id: nsf_breadcrumbs
+theme: nsf
+region: breadcrumb
+weight: -8
+provider: null
+plugin: system_breadcrumb_block
+settings:
+  id: system_breadcrumb_block
+  label: Breadcrumbs
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_content.yml b/web/sites/default/config/block.block.nsf_content.yml
new file mode 100644
index 0000000..86e8ac0
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_content.yml
@@ -0,0 +1,22 @@
+uuid: d6cef2b5-9a92-4478-80f2-2d6347de3294
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - nsf
+_core:
+  default_config_hash: fNNLN48MSGSLiqwIFywCuxH2Dk_IxDbaP0kYhg_IPrg
+id: nsf_content
+theme: nsf
+region: content
+weight: -3
+provider: null
+plugin: system_main_block
+settings:
+  id: system_main_block
+  label: 'Main page content'
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_footer.yml b/web/sites/default/config/block.block.nsf_footer.yml
new file mode 100644
index 0000000..f45b6f6
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_footer.yml
@@ -0,0 +1,26 @@
+uuid: 55389443-45a7-429a-9c06-7f834d48388d
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.footer
+  module:
+    - system
+  theme:
+    - nsf
+_core:
+  default_config_hash: h06zhb3xV9_2_3Zy9NsyylL7YBaEDlMwMEqNwAn8kMo
+id: nsf_footer
+theme: nsf
+region: footer_menu
+weight: -7
+provider: null
+plugin: 'system_menu_block:footer'
+settings:
+  id: 'system_menu_block:footer'
+  label: 'Footer menu'
+  provider: system
+  label_display: '0'
+  level: 1
+  depth: 0
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_help.yml b/web/sites/default/config/block.block.nsf_help.yml
new file mode 100644
index 0000000..9a1b402
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_help.yml
@@ -0,0 +1,22 @@
+uuid: f75abdcd-369b-4aaf-b85b-0323a8e377cd
+langcode: en
+status: true
+dependencies:
+  module:
+    - help
+  theme:
+    - nsf
+_core:
+  default_config_hash: MhtNdV__HKRTab0ZPjkPNfYL4Ng4UPBucDLoC7Rg5Eo
+id: nsf_help
+theme: nsf
+region: help
+weight: -7
+provider: null
+plugin: help_block
+settings:
+  id: help_block
+  label: Help
+  provider: help
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_local_actions.yml b/web/sites/default/config/block.block.nsf_local_actions.yml
new file mode 100644
index 0000000..c75ca7d
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_local_actions.yml
@@ -0,0 +1,20 @@
+uuid: f3798361-aa5d-4c23-8a0a-95b28c3d4248
+langcode: en
+status: true
+dependencies:
+  theme:
+    - nsf
+_core:
+  default_config_hash: ffxthelqQF8xcr4GTG4HlaNNsluiHftN0pujmQpW0bQ
+id: nsf_local_actions
+theme: nsf
+region: header
+weight: -7
+provider: null
+plugin: local_actions_block
+settings:
+  id: local_actions_block
+  label: 'Primary admin actions'
+  provider: core
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_local_tasks.yml b/web/sites/default/config/block.block.nsf_local_tasks.yml
new file mode 100644
index 0000000..d376863
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_local_tasks.yml
@@ -0,0 +1,22 @@
+uuid: 2fbac584-354c-4bac-b4b3-f85f891a75af
+langcode: en
+status: true
+dependencies:
+  theme:
+    - nsf
+_core:
+  default_config_hash: qHdtze2DZ2mFfaJadxjZz6epm92_SN9SAFY4yJGl8Fo
+id: nsf_local_tasks
+theme: nsf
+region: content
+weight: -7
+provider: null
+plugin: local_tasks_block
+settings:
+  id: local_tasks_block
+  label: Tabs
+  provider: core
+  label_display: '0'
+  primary: true
+  secondary: true
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_main_menu.yml b/web/sites/default/config/block.block.nsf_main_menu.yml
new file mode 100644
index 0000000..17f74b7
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_main_menu.yml
@@ -0,0 +1,26 @@
+uuid: dcb68f31-915e-41e9-ae37-f6a971f3c43b
+langcode: en
+status: false
+dependencies:
+  config:
+    - system.menu.main
+  module:
+    - system
+  theme:
+    - nsf
+_core:
+  default_config_hash: GT_zYl7I9VAILH8OxMRe-VDvFadCDHxRcnmBc5xEmf0
+id: nsf_main_menu
+theme: nsf
+region: primary_menu
+weight: -4
+provider: null
+plugin: 'system_menu_block:main'
+settings:
+  id: 'system_menu_block:main'
+  label: 'Main navigation'
+  provider: system
+  label_display: '0'
+  level: 1
+  depth: 2
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_messages.yml b/web/sites/default/config/block.block.nsf_messages.yml
new file mode 100644
index 0000000..801c32c
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_messages.yml
@@ -0,0 +1,22 @@
+uuid: 06dc3dcb-95e8-4fe2-8952-e726a39e1b47
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - nsf
+_core:
+  default_config_hash: 9RnnTUBcn0WRWXfrGOnId2H0Q31uQUeu_F5TnDxl2yg
+id: nsf_messages
+theme: nsf
+region: content
+weight: -6
+provider: null
+plugin: system_messages_block
+settings:
+  id: system_messages_block
+  label: 'Status messages'
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_page_title.yml b/web/sites/default/config/block.block.nsf_page_title.yml
new file mode 100644
index 0000000..8ab51af
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_page_title.yml
@@ -0,0 +1,20 @@
+uuid: 1f8d24dc-a5d7-4f72-b183-4432efefea2b
+langcode: en
+status: true
+dependencies:
+  theme:
+    - nsf
+_core:
+  default_config_hash: 1TQP4b3ZnlzvIH9bj6cpCz_SyUHdJjLQkZnHpikjjhw
+id: nsf_page_title
+theme: nsf
+region: content
+weight: -5
+provider: null
+plugin: page_title_block
+settings:
+  id: page_title_block
+  label: 'Page title'
+  provider: core
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_search.yml b/web/sites/default/config/block.block.nsf_search.yml
new file mode 100644
index 0000000..4244b54
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_search.yml
@@ -0,0 +1,22 @@
+uuid: e3b69afc-55e4-4f59-97e6-8d5726c91706
+langcode: en
+status: false
+dependencies:
+  module:
+    - search
+  theme:
+    - nsf
+_core:
+  default_config_hash: F3d5hyAFunLh4PhGviJF019fHn1Z3_zy5gzsQ0tX1K0
+id: nsf_search
+theme: nsf
+region: primary_menu
+weight: -5
+provider: null
+plugin: search_form_block
+settings:
+  id: search_form_block
+  label: Search
+  provider: search
+  label_display: visible
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_tools.yml b/web/sites/default/config/block.block.nsf_tools.yml
new file mode 100644
index 0000000..086a44e
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_tools.yml
@@ -0,0 +1,26 @@
+uuid: da5409d7-18d2-4248-837c-4dacf41ab21b
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.tools
+  module:
+    - system
+  theme:
+    - nsf
+_core:
+  default_config_hash: f3Dd5TnUiFDjFZp9yEGJInwt6cUzs7O6SvLTFTATSlU
+id: nsf_tools
+theme: nsf
+region: primary_menu
+weight: -7
+provider: null
+plugin: 'system_menu_block:tools'
+settings:
+  id: 'system_menu_block:tools'
+  label: Tools
+  provider: system
+  label_display: visible
+  level: 1
+  depth: 0
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_views_block__news_block_1.yml b/web/sites/default/config/block.block.nsf_views_block__news_block_1.yml
new file mode 100644
index 0000000..07390ce
--- /dev/null
+++ b/web/sites/default/config/block.block.nsf_views_block__news_block_1.yml
@@ -0,0 +1,30 @@
+uuid: 752757ae-7a4b-4aa5-a5db-6b2648b8ec35
+langcode: en
+status: false
+dependencies:
+  config:
+    - views.view.news
+  module:
+    - system
+    - views
+  theme:
+    - nsf
+id: nsf_views_block__news_block_1
+theme: nsf
+region: content
+weight: -4
+provider: null
+plugin: 'views_block:news-block_1'
+settings:
+  id: 'views_block:news-block_1'
+  label: ''
+  provider: views
+  label_display: '0'
+  views_label: ''
+  items_per_page: none
+visibility:
+  request_path:
+    id: request_path
+    pages: '<front>'
+    negate: false
+    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.seven_breadcrumbs.yml b/web/sites/default/config/block.block.seven_breadcrumbs.yml
new file mode 100644
index 0000000..e33e882
--- /dev/null
+++ b/web/sites/default/config/block.block.seven_breadcrumbs.yml
@@ -0,0 +1,22 @@
+uuid: 4bf98a86-e630-45dd-bb1e-0cf8d8c43b99
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - seven
+_core:
+  default_config_hash: WWu2OQswgCztl9OeXjD1stexIEMZsSgPMYIdC-JHx9c
+id: seven_breadcrumbs
+theme: seven
+region: breadcrumb
+weight: 0
+provider: null
+plugin: system_breadcrumb_block
+settings:
+  id: system_breadcrumb_block
+  label: Breadcrumbs
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.seven_content.yml b/web/sites/default/config/block.block.seven_content.yml
new file mode 100644
index 0000000..0cfd3da
--- /dev/null
+++ b/web/sites/default/config/block.block.seven_content.yml
@@ -0,0 +1,22 @@
+uuid: dac134c0-d1dc-4ea6-87ba-78beebde1622
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - seven
+_core:
+  default_config_hash: YRY68JWkaUiGeZlWMv1nzeIgDm0ZZwXYgpqUpLFzwAY
+id: seven_content
+theme: seven
+region: content
+weight: 0
+provider: null
+plugin: system_main_block
+settings:
+  id: system_main_block
+  label: 'Main page content'
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.seven_help.yml b/web/sites/default/config/block.block.seven_help.yml
new file mode 100644
index 0000000..b696887
--- /dev/null
+++ b/web/sites/default/config/block.block.seven_help.yml
@@ -0,0 +1,22 @@
+uuid: 7b93a822-eadd-411d-9eb8-c0e0b4907f24
+langcode: en
+status: true
+dependencies:
+  module:
+    - help
+  theme:
+    - seven
+_core:
+  default_config_hash: NU5A_49mwLHfs5xFzMFrZ850w9pgUolxMS9NNF3vv4c
+id: seven_help
+theme: seven
+region: help
+weight: 0
+provider: null
+plugin: help_block
+settings:
+  id: help_block
+  label: Help
+  provider: help
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.seven_local_actions.yml b/web/sites/default/config/block.block.seven_local_actions.yml
new file mode 100644
index 0000000..f55ea61
--- /dev/null
+++ b/web/sites/default/config/block.block.seven_local_actions.yml
@@ -0,0 +1,20 @@
+uuid: f388fe8a-5abf-4d9d-8a15-a90a36378bac
+langcode: en
+status: true
+dependencies:
+  theme:
+    - seven
+_core:
+  default_config_hash: HHryZVJbeKi9WnuBGC8FOhBZmBnk2G1H6KxFuy-rC9A
+id: seven_local_actions
+theme: seven
+region: content
+weight: -10
+provider: null
+plugin: local_actions_block
+settings:
+  id: local_actions_block
+  label: 'Primary admin actions'
+  provider: core
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.seven_login.yml b/web/sites/default/config/block.block.seven_login.yml
new file mode 100644
index 0000000..8fb75ff
--- /dev/null
+++ b/web/sites/default/config/block.block.seven_login.yml
@@ -0,0 +1,22 @@
+uuid: 1c4d3cf7-1a3a-4b8d-85d4-ef24134a247c
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+  theme:
+    - seven
+_core:
+  default_config_hash: IItlF4SKHgxduIysVQdvirDJ_v3HGuAviOkidAOJYRE
+id: seven_login
+theme: seven
+region: content
+weight: 10
+provider: null
+plugin: user_login_block
+settings:
+  id: user_login_block
+  label: 'User login'
+  provider: user
+  label_display: visible
+visibility: {  }
diff --git a/web/sites/default/config/block.block.seven_messages.yml b/web/sites/default/config/block.block.seven_messages.yml
new file mode 100644
index 0000000..673bc52
--- /dev/null
+++ b/web/sites/default/config/block.block.seven_messages.yml
@@ -0,0 +1,22 @@
+uuid: 7bd6bee8-eb30-4e44-b6d9-1c5e4d479e51
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - seven
+_core:
+  default_config_hash: XJqWwLt1LDCnazcEN6QkJmCLjk4R0__-8s0OO9xeNjg
+id: seven_messages
+theme: seven
+region: highlighted
+weight: 0
+provider: null
+plugin: system_messages_block
+settings:
+  id: system_messages_block
+  label: 'Status messages'
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.seven_page_title.yml b/web/sites/default/config/block.block.seven_page_title.yml
new file mode 100644
index 0000000..840d50a
--- /dev/null
+++ b/web/sites/default/config/block.block.seven_page_title.yml
@@ -0,0 +1,20 @@
+uuid: 471e7ddb-92e1-4ed8-9504-87f1dac7f099
+langcode: en
+status: true
+dependencies:
+  theme:
+    - seven
+_core:
+  default_config_hash: ZSpc3IoSaLd0PkB02nxjVPBMztIdsTdHek9SiGaqZ_c
+id: seven_page_title
+theme: seven
+region: header
+weight: -30
+provider: null
+plugin: page_title_block
+settings:
+  id: page_title_block
+  label: 'Page title'
+  provider: core
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.seven_primary_local_tasks.yml b/web/sites/default/config/block.block.seven_primary_local_tasks.yml
new file mode 100644
index 0000000..430c41a
--- /dev/null
+++ b/web/sites/default/config/block.block.seven_primary_local_tasks.yml
@@ -0,0 +1,22 @@
+uuid: a4bb502f-e962-466e-b07d-c926b14fe3b1
+langcode: en
+status: true
+dependencies:
+  theme:
+    - seven
+_core:
+  default_config_hash: ddy1OsBbWxjwEI8VL1viD4I69qcLHOkul4BxbTqLBTs
+id: seven_primary_local_tasks
+theme: seven
+region: header
+weight: 0
+provider: null
+plugin: local_tasks_block
+settings:
+  id: local_tasks_block
+  label: 'Primary tabs'
+  provider: core
+  label_display: '0'
+  primary: true
+  secondary: false
+visibility: {  }
diff --git a/web/sites/default/config/block.block.seven_secondary_local_tasks.yml b/web/sites/default/config/block.block.seven_secondary_local_tasks.yml
new file mode 100644
index 0000000..45d3384
--- /dev/null
+++ b/web/sites/default/config/block.block.seven_secondary_local_tasks.yml
@@ -0,0 +1,22 @@
+uuid: 21139be7-bd8f-46a0-821c-144444b821f5
+langcode: en
+status: true
+dependencies:
+  theme:
+    - seven
+_core:
+  default_config_hash: QeZBeCilQfeET3GeW6ZtJkEiwROADTZktFgKWwPieD4
+id: seven_secondary_local_tasks
+theme: seven
+region: pre_content
+weight: 0
+provider: null
+plugin: local_tasks_block
+settings:
+  id: local_tasks_block
+  label: 'Secondary tabs'
+  provider: core
+  label_display: '0'
+  primary: false
+  secondary: true
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_account_menu.yml b/web/sites/default/config/block.block.uswds_account_menu.yml
new file mode 100644
index 0000000..f240c15
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_account_menu.yml
@@ -0,0 +1,26 @@
+uuid: 1fd7adfa-779c-4a00-91c4-89f7c64ac695
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.account
+  module:
+    - system
+  theme:
+    - uswds
+_core:
+  default_config_hash: R2K_qX0ZUMbUL6ie_-S9tZVjvqmlWKlscikgeRv9vhw
+id: uswds_account_menu
+theme: uswds
+region: header_top
+weight: -8
+provider: null
+plugin: 'system_menu_block:account'
+settings:
+  id: 'system_menu_block:account'
+  label: 'User account menu'
+  provider: system
+  label_display: '0'
+  level: 1
+  depth: 2
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_blockdemonstratingstaticcontent.yml b/web/sites/default/config/block.block.uswds_blockdemonstratingstaticcontent.yml
new file mode 100644
index 0000000..4c763ea
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_blockdemonstratingstaticcontent.yml
@@ -0,0 +1,40 @@
+uuid: a8920614-b8c5-4819-87eb-6ebce67b644b
+langcode: en
+status: true
+dependencies:
+  content:
+    - 'block_content:basic:58243bab-93b1-4b4d-a3b5-6410a345f692'
+  module:
+    - block_content
+    - system
+    - user
+  theme:
+    - uswds
+id: uswds_blockdemonstratingstaticcontent
+theme: uswds
+region: sidebar_first
+weight: -6
+provider: null
+plugin: 'block_content:58243bab-93b1-4b4d-a3b5-6410a345f692'
+settings:
+  id: 'block_content:58243bab-93b1-4b4d-a3b5-6410a345f692'
+  label: 'Block demonstrating static content'
+  provider: block_content
+  label_display: visible
+  status: true
+  info: ''
+  view_mode: full
+visibility:
+  user_role:
+    id: user_role
+    roles:
+      olpa_content_editor: olpa_content_editor
+      olpa_content_admin: olpa_content_admin
+    negate: false
+    context_mapping:
+      user: '@user.current_user_context:current_user'
+  request_path:
+    id: request_path
+    pages: ''
+    negate: true
+    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.uswds_branding.yml b/web/sites/default/config/block.block.uswds_branding.yml
new file mode 100644
index 0000000..d489cb5
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_branding.yml
@@ -0,0 +1,25 @@
+uuid: adbd77bf-26a7-48fa-b777-f10e12ab1d42
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - uswds
+_core:
+  default_config_hash: Cy3vkpYrD1O5JG-BeEnokF0bByHYDEa8CBfWivB4_SQ
+id: uswds_branding
+theme: uswds
+region: header_top
+weight: -7
+provider: null
+plugin: system_branding_block
+settings:
+  id: system_branding_block
+  label: 'Site branding'
+  provider: system
+  label_display: '0'
+  use_site_logo: true
+  use_site_name: true
+  use_site_slogan: false
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_breadcrumbs.yml b/web/sites/default/config/block.block.uswds_breadcrumbs.yml
new file mode 100644
index 0000000..77f478b
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_breadcrumbs.yml
@@ -0,0 +1,22 @@
+uuid: c9157b87-c74e-4b5e-89a7-090218562889
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - uswds
+_core:
+  default_config_hash: wDR9JKEATSWldBjw8du8s3G2zjEYeQf88nlld11hMLo
+id: uswds_breadcrumbs
+theme: uswds
+region: header
+weight: -7
+provider: null
+plugin: system_breadcrumb_block
+settings:
+  id: system_breadcrumb_block
+  label: Breadcrumbs
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_content.yml b/web/sites/default/config/block.block.uswds_content.yml
new file mode 100644
index 0000000..f4c37e5
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_content.yml
@@ -0,0 +1,22 @@
+uuid: cab66abf-2284-42ad-9675-e3d25f5a3b24
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - uswds
+_core:
+  default_config_hash: fNNLN48MSGSLiqwIFywCuxH2Dk_IxDbaP0kYhg_IPrg
+id: uswds_content
+theme: uswds
+region: content
+weight: -6
+provider: null
+plugin: system_main_block
+settings:
+  id: system_main_block
+  label: 'Main page content'
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_footer.yml b/web/sites/default/config/block.block.uswds_footer.yml
new file mode 100644
index 0000000..c47e7f2
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_footer.yml
@@ -0,0 +1,26 @@
+uuid: 86058f99-d9d5-48a7-97c1-148493c95958
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.footer
+  module:
+    - system
+  theme:
+    - uswds
+_core:
+  default_config_hash: h06zhb3xV9_2_3Zy9NsyylL7YBaEDlMwMEqNwAn8kMo
+id: uswds_footer
+theme: uswds
+region: footer
+weight: -7
+provider: null
+plugin: 'system_menu_block:footer'
+settings:
+  id: 'system_menu_block:footer'
+  label: 'Footer menu'
+  provider: system
+  label_display: '0'
+  level: 1
+  depth: 0
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_help.yml b/web/sites/default/config/block.block.uswds_help.yml
new file mode 100644
index 0000000..1b02762
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_help.yml
@@ -0,0 +1,22 @@
+uuid: bbf675f2-6f75-430f-92b8-40f4f1405c27
+langcode: en
+status: true
+dependencies:
+  module:
+    - help
+  theme:
+    - uswds
+_core:
+  default_config_hash: MhtNdV__HKRTab0ZPjkPNfYL4Ng4UPBucDLoC7Rg5Eo
+id: uswds_help
+theme: uswds
+region: help
+weight: -7
+provider: null
+plugin: help_block
+settings:
+  id: help_block
+  label: Help
+  provider: help
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_local_actions.yml b/web/sites/default/config/block.block.uswds_local_actions.yml
new file mode 100644
index 0000000..2093c34
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_local_actions.yml
@@ -0,0 +1,20 @@
+uuid: fc636193-5a04-40e4-a259-8fa85ee51492
+langcode: en
+status: true
+dependencies:
+  theme:
+    - uswds
+_core:
+  default_config_hash: ffxthelqQF8xcr4GTG4HlaNNsluiHftN0pujmQpW0bQ
+id: uswds_local_actions
+theme: uswds
+region: header
+weight: -7
+provider: null
+plugin: local_actions_block
+settings:
+  id: local_actions_block
+  label: 'Primary admin actions'
+  provider: core
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_local_tasks.yml b/web/sites/default/config/block.block.uswds_local_tasks.yml
new file mode 100644
index 0000000..bbd9891
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_local_tasks.yml
@@ -0,0 +1,22 @@
+uuid: b1f2662d-7626-466c-a09f-5e213b7ca51a
+langcode: en
+status: true
+dependencies:
+  theme:
+    - uswds
+_core:
+  default_config_hash: qHdtze2DZ2mFfaJadxjZz6epm92_SN9SAFY4yJGl8Fo
+id: uswds_local_tasks
+theme: uswds
+region: header
+weight: -7
+provider: null
+plugin: local_tasks_block
+settings:
+  id: local_tasks_block
+  label: Tabs
+  provider: core
+  label_display: '0'
+  primary: true
+  secondary: true
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_main_menu.yml b/web/sites/default/config/block.block.uswds_main_menu.yml
new file mode 100644
index 0000000..f8dfcd1
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_main_menu.yml
@@ -0,0 +1,26 @@
+uuid: 83ef494f-48b5-433f-9223-32392cbb93f9
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.main
+  module:
+    - system
+  theme:
+    - uswds
+_core:
+  default_config_hash: GT_zYl7I9VAILH8OxMRe-VDvFadCDHxRcnmBc5xEmf0
+id: uswds_main_menu
+theme: uswds
+region: primary_menu
+weight: -7
+provider: null
+plugin: 'system_menu_block:main'
+settings:
+  id: 'system_menu_block:main'
+  label: 'Main navigation'
+  provider: system
+  label_display: '0'
+  level: 1
+  depth: 2
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_messages.yml b/web/sites/default/config/block.block.uswds_messages.yml
new file mode 100644
index 0000000..142776d
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_messages.yml
@@ -0,0 +1,22 @@
+uuid: 8bfe1719-096a-41af-8457-3df6d87c6ca0
+langcode: en
+status: true
+dependencies:
+  module:
+    - system
+  theme:
+    - uswds
+_core:
+  default_config_hash: 9RnnTUBcn0WRWXfrGOnId2H0Q31uQUeu_F5TnDxl2yg
+id: uswds_messages
+theme: uswds
+region: header
+weight: -7
+provider: null
+plugin: system_messages_block
+settings:
+  id: system_messages_block
+  label: 'Status messages'
+  provider: system
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_page_title.yml b/web/sites/default/config/block.block.uswds_page_title.yml
new file mode 100644
index 0000000..5b6a4a1
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_page_title.yml
@@ -0,0 +1,20 @@
+uuid: f5f4c764-18d9-46e2-8059-a0e9d6670ae6
+langcode: en
+status: true
+dependencies:
+  theme:
+    - uswds
+_core:
+  default_config_hash: 1TQP4b3ZnlzvIH9bj6cpCz_SyUHdJjLQkZnHpikjjhw
+id: uswds_page_title
+theme: uswds
+region: header
+weight: 0
+provider: null
+plugin: page_title_block
+settings:
+  id: page_title_block
+  label: 'Page title'
+  provider: core
+  label_display: '0'
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_search.yml b/web/sites/default/config/block.block.uswds_search.yml
new file mode 100644
index 0000000..421cc61
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_search.yml
@@ -0,0 +1,22 @@
+uuid: 9772e1e5-eb9c-45c8-8479-97d9593a1c7d
+langcode: en
+status: true
+dependencies:
+  module:
+    - search
+  theme:
+    - uswds
+_core:
+  default_config_hash: F3d5hyAFunLh4PhGviJF019fHn1Z3_zy5gzsQ0tX1K0
+id: uswds_search
+theme: uswds
+region: sidebar_second
+weight: -6
+provider: null
+plugin: search_form_block
+settings:
+  id: search_form_block
+  label: Search
+  provider: search
+  label_display: visible
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_tools.yml b/web/sites/default/config/block.block.uswds_tools.yml
new file mode 100644
index 0000000..4126acd
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_tools.yml
@@ -0,0 +1,26 @@
+uuid: 39fc9ee2-53e1-42f9-b6b5-d745d51440cf
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.tools
+  module:
+    - system
+  theme:
+    - uswds
+_core:
+  default_config_hash: f3Dd5TnUiFDjFZp9yEGJInwt6cUzs7O6SvLTFTATSlU
+id: uswds_tools
+theme: uswds
+region: sidebar_first
+weight: -5
+provider: null
+plugin: 'system_menu_block:tools'
+settings:
+  id: 'system_menu_block:tools'
+  label: Tools
+  provider: system
+  label_display: visible
+  level: 1
+  depth: 0
+visibility: {  }
diff --git a/web/sites/default/config/block.block.uswds_views_block__news_block_1.yml b/web/sites/default/config/block.block.uswds_views_block__news_block_1.yml
new file mode 100644
index 0000000..df3df42
--- /dev/null
+++ b/web/sites/default/config/block.block.uswds_views_block__news_block_1.yml
@@ -0,0 +1,30 @@
+uuid: 43ed9592-1ba4-464f-a9a2-4846ba1b2046
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.news
+  module:
+    - system
+    - views
+  theme:
+    - uswds
+id: uswds_views_block__news_block_1
+theme: uswds
+region: content
+weight: -7
+provider: null
+plugin: 'views_block:news-block_1'
+settings:
+  id: 'views_block:news-block_1'
+  label: ''
+  provider: views
+  label_display: '0'
+  views_label: ''
+  items_per_page: none
+visibility:
+  request_path:
+    id: request_path
+    pages: '<front>'
+    negate: false
+    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__blogs_block_2.yml b/web/sites/default/config/block.block.views_block__blogs_block_2.yml
new file mode 100644
index 0000000..452391d
--- /dev/null
+++ b/web/sites/default/config/block.block.views_block__blogs_block_2.yml
@@ -0,0 +1,30 @@
+uuid: 4d843c77-dc7b-407f-80a7-bcdcb6497f93
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.blogs
+  module:
+    - system
+    - views
+  theme:
+    - bootstrap
+id: views_block__blogs_block_2
+theme: bootstrap
+region: content
+weight: -8
+provider: null
+plugin: 'views_block:blogs-block_2'
+settings:
+  id: 'views_block:blogs-block_2'
+  label: ''
+  provider: views
+  label_display: visible
+  views_label: ''
+  items_per_page: none
+visibility:
+  request_path:
+    id: request_path
+    pages: /blogs
+    negate: false
+    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__blogs_block_3.yml b/web/sites/default/config/block.block.views_block__blogs_block_3.yml
new file mode 100644
index 0000000..fee3d39
--- /dev/null
+++ b/web/sites/default/config/block.block.views_block__blogs_block_3.yml
@@ -0,0 +1,30 @@
+uuid: de06a058-5870-454a-bd2f-723a096888bd
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.blogs
+  module:
+    - system
+    - views
+  theme:
+    - bootstrap
+id: views_block__blogs_block_3
+theme: bootstrap
+region: content
+weight: -7
+provider: null
+plugin: 'views_block:blogs-block_3'
+settings:
+  id: 'views_block:blogs-block_3'
+  label: 'BIO Buzz'
+  provider: views
+  label_display: visible
+  views_label: 'BIO Buzz'
+  items_per_page: none
+visibility:
+  request_path:
+    id: request_path
+    pages: /blogs
+    negate: false
+    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__blogs_block_4.yml b/web/sites/default/config/block.block.views_block__blogs_block_4.yml
new file mode 100644
index 0000000..83be09a
--- /dev/null
+++ b/web/sites/default/config/block.block.views_block__blogs_block_4.yml
@@ -0,0 +1,30 @@
+uuid: 8b50cf33-a16a-4d72-a89d-96a7157f2100
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.blogs
+  module:
+    - system
+    - views
+  theme:
+    - bootstrap
+id: views_block__blogs_block_4
+theme: bootstrap
+region: content
+weight: -6
+provider: null
+plugin: 'views_block:blogs-block_4'
+settings:
+  id: 'views_block:blogs-block_4'
+  label: DEBrief
+  provider: views
+  label_display: visible
+  views_label: DEBrief
+  items_per_page: none
+visibility:
+  request_path:
+    id: request_path
+    pages: /blogs
+    negate: false
+    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__blogs_block_5.yml b/web/sites/default/config/block.block.views_block__blogs_block_5.yml
new file mode 100644
index 0000000..0319765
--- /dev/null
+++ b/web/sites/default/config/block.block.views_block__blogs_block_5.yml
@@ -0,0 +1,30 @@
+uuid: 9fc47b43-e735-4a3f-89b1-5bf06a0502fa
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.blogs
+  module:
+    - system
+    - views
+  theme:
+    - bootstrap
+id: views_block__blogs_block_5
+theme: bootstrap
+region: content
+weight: -4
+provider: null
+plugin: 'views_block:blogs-block_5'
+settings:
+  id: 'views_block:blogs-block_5'
+  label: 'MCB Blog'
+  provider: views
+  label_display: visible
+  views_label: 'MCB Blog'
+  items_per_page: none
+visibility:
+  request_path:
+    id: request_path
+    pages: /blogs
+    negate: false
+    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__news_block_1.yml b/web/sites/default/config/block.block.views_block__news_block_1.yml
new file mode 100644
index 0000000..e43d710
--- /dev/null
+++ b/web/sites/default/config/block.block.views_block__news_block_1.yml
@@ -0,0 +1,30 @@
+uuid: 31837708-d3b4-4cd4-b1d7-a4f83c9f51d9
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.news
+  module:
+    - system
+    - views
+  theme:
+    - bootstrap
+id: views_block__news_block_1
+theme: bootstrap
+region: content
+weight: -5
+provider: null
+plugin: 'views_block:news-block_1'
+settings:
+  id: 'views_block:news-block_1'
+  label: ''
+  provider: views
+  label_display: '0'
+  views_label: ''
+  items_per_page: none
+visibility:
+  request_path:
+    id: request_path
+    pages: '<front>'
+    negate: false
+    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__news_block_2.yml b/web/sites/default/config/block.block.views_block__news_block_2.yml
new file mode 100644
index 0000000..bc455c7
--- /dev/null
+++ b/web/sites/default/config/block.block.views_block__news_block_2.yml
@@ -0,0 +1,24 @@
+uuid: 2787e407-fec7-4ea1-b875-55b184821221
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.news
+  module:
+    - views
+  theme:
+    - bootstrap
+id: views_block__news_block_2
+theme: bootstrap
+region: sidebar_first
+weight: 0
+provider: null
+plugin: 'views_block:news-block_2'
+settings:
+  id: 'views_block:news-block_2'
+  label: 'Recent news'
+  provider: views
+  label_display: visible
+  views_label: 'Recent news'
+  items_per_page: none
+visibility: {  }
diff --git a/web/sites/default/config/block.block.views_block__news_block_3.yml b/web/sites/default/config/block.block.views_block__news_block_3.yml
new file mode 100644
index 0000000..dd13ce7
--- /dev/null
+++ b/web/sites/default/config/block.block.views_block__news_block_3.yml
@@ -0,0 +1,48 @@
+uuid: b1401ddf-6cbe-4aa1-ab79-4e0cc55c51cb
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.news
+  module:
+    - ctools
+    - node
+    - system
+    - views
+  theme:
+    - nsf
+id: views_block__news_block_3
+theme: nsf
+region: sidebar_second
+weight: -7
+provider: null
+plugin: 'views_block:news-block_3'
+settings:
+  id: 'views_block:news-block_3'
+  label: ''
+  provider: views
+  label_display: '0'
+  views_label: ''
+  items_per_page: none
+  context_mapping:
+    nid: '@node.node_route_context:node'
+visibility:
+  node_type:
+    id: node_type
+    bundles:
+      news: news
+    negate: false
+    context_mapping:
+      node: '@node.node_route_context:node'
+  request_path:
+    id: request_path
+    pages: '/node/*/edit'
+    negate: true
+    context_mapping: {  }
+  'entity_bundle:node':
+    id: 'entity_bundle:node'
+    bundles:
+      news: news
+    negate: false
+    context_mapping:
+      node: '@node.node_route_context:node'
diff --git a/web/sites/default/config/block_content.type.basic.yml b/web/sites/default/config/block_content.type.basic.yml
new file mode 100644
index 0000000..623bfd3
--- /dev/null
+++ b/web/sites/default/config/block_content.type.basic.yml
@@ -0,0 +1,10 @@
+uuid: ff9ffd23-6fd2-4283-b451-dbf882f7e2e8
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: zglzjmYxi0G0ag9MZ02y0LSJOdpWRwJxyP_OvFojFyo
+id: basic
+label: 'Basic block'
+revision: 0
+description: 'A basic block contains a title and a body.'
diff --git a/web/sites/default/config/bootstrap.settings.yml b/web/sites/default/config/bootstrap.settings.yml
new file mode 100644
index 0000000..b274600
--- /dev/null
+++ b/web/sites/default/config/bootstrap.settings.yml
@@ -0,0 +1,20 @@
+schemas:
+  bootstrap: 8000
+_core:
+  default_config_hash: 1uFogeFphl0Hg6oVCacZZ8mM_0wMZ7PS_RrmLbK5tf0
+favicon:
+  mimetype: image/vnd.microsoft.icon
+  path: ''
+  url: 'http://nsf-demo.kbox.site/themes/bootstrap/favicon.ico'
+  use_default: false
+features:
+  comment_user_picture: false
+  comment_user_verification: false
+  favicon: true
+  node_user_picture: false
+logo:
+  path: ''
+  url: ''
+  use_default: true
+table_responsive: '-1'
+table: ''
diff --git a/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml b/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
new file mode 100644
index 0000000..9e68a34
--- /dev/null
+++ b/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
@@ -0,0 +1,13 @@
+uuid: ''
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: mJhmisLlSYTJccOgeEcFWivzXD9BrliG8wDm1TmuNdA
+id: nsf_brightcove
+label: 'NSF Brightcove'
+account_id: ''
+client_id: ''
+default_player: default
+secret_key: ''
+max_custom_fields: 10
diff --git a/web/sites/default/config/brightcove.settings.yml b/web/sites/default/config/brightcove.settings.yml
new file mode 100644
index 0000000..8ff5b65
--- /dev/null
+++ b/web/sites/default/config/brightcove.settings.yml
@@ -0,0 +1,6 @@
+defaultAPIClient: nsf_brightcove
+notification:
+  callbackExpirationTime: 86400
+disable_cron: 0
+_core:
+  default_config_hash: Zx0kBJgBN1RCrHyE_UtwiCHBQx3i4LKJCoryyY5Lu_s
diff --git a/web/sites/default/config/comment.type.comment.yml b/web/sites/default/config/comment.type.comment.yml
new file mode 100644
index 0000000..247944d
--- /dev/null
+++ b/web/sites/default/config/comment.type.comment.yml
@@ -0,0 +1,10 @@
+uuid: 32c855d7-3ed8-412d-8df7-460dbc3dd164
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: bqZsN31T2n0UjcbyCpOPi9D2iO0sAOHR7FnEs9qMvaA
+id: comment
+label: 'Default comments'
+target_entity_type_id: node
+description: 'Allows commenting on content'
diff --git a/web/sites/default/config/contact.form.feedback.yml b/web/sites/default/config/contact.form.feedback.yml
new file mode 100644
index 0000000..be5afc7
--- /dev/null
+++ b/web/sites/default/config/contact.form.feedback.yml
@@ -0,0 +1,14 @@
+uuid: 45dbb9b8-18c5-491b-827a-27fcb7c4d119
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: vymHlgJy26BuI5GGj9-IXjwR3dRC5C0tij4BpWJnoqw
+id: feedback
+label: 'Website feedback'
+recipients:
+  - rhys.fureigh@gsa.gov
+reply: ''
+weight: 0
+message: 'Your message has been sent.'
+redirect: ''
diff --git a/web/sites/default/config/contact.form.personal.yml b/web/sites/default/config/contact.form.personal.yml
new file mode 100644
index 0000000..7e8da0d
--- /dev/null
+++ b/web/sites/default/config/contact.form.personal.yml
@@ -0,0 +1,13 @@
+uuid: d7b275f4-88b8-4c3e-afdf-00d34efccc22
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: jonvgt3CkUM2eMLTFwWfHileWWDC4YtXCuIlCahTk_I
+id: personal
+label: 'Personal contact form'
+recipients: {  }
+reply: ''
+weight: 0
+message: 'Your message has been sent.'
+redirect: ''
diff --git a/web/sites/default/config/contact.settings.yml b/web/sites/default/config/contact.settings.yml
new file mode 100644
index 0000000..a2903f5
--- /dev/null
+++ b/web/sites/default/config/contact.settings.yml
@@ -0,0 +1,7 @@
+default_form: feedback
+flood:
+  limit: 5
+  interval: 3600
+user_default_enabled: true
+_core:
+  default_config_hash: U69DBeuvXuNVOC15rVNaBjDPK2fWFbo9v4takdYSSO8
diff --git a/web/sites/default/config/core.base_field_override.node.news.promote.yml b/web/sites/default/config/core.base_field_override.node.news.promote.yml
new file mode 100644
index 0000000..f6f3d3f
--- /dev/null
+++ b/web/sites/default/config/core.base_field_override.node.news.promote.yml
@@ -0,0 +1,22 @@
+uuid: 5c330d9a-03f6-4aed-8d4b-6bf233ef65d2
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.news
+id: node.news.promote
+field_name: promote
+entity_type: node
+bundle: news
+label: 'Promoted to front page'
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
diff --git a/web/sites/default/config/core.base_field_override.node.page.promote.yml b/web/sites/default/config/core.base_field_override.node.page.promote.yml
new file mode 100644
index 0000000..9e4a5a2
--- /dev/null
+++ b/web/sites/default/config/core.base_field_override.node.page.promote.yml
@@ -0,0 +1,24 @@
+uuid: d9dc4ac2-8e1a-450e-992a-0bd8b1d95f7a
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.page
+_core:
+  default_config_hash: fPUEnm4T5zfZRr3ttDUqq7yCDd2uW3clWD-pvos4tlQ
+id: node.page.promote
+field_name: promote
+entity_type: node
+bundle: page
+label: 'Promoted to front page'
+description: ''
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
diff --git a/web/sites/default/config/core.date_format.fallback.yml b/web/sites/default/config/core.date_format.fallback.yml
new file mode 100644
index 0000000..aeb0654
--- /dev/null
+++ b/web/sites/default/config/core.date_format.fallback.yml
@@ -0,0 +1,10 @@
+uuid: 000210d3-7f7b-4674-a1f8-e8093fd8bd85
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: 7klS5IWXrwzVaPpYZFAs6wcx8U2FF1X73OfrtTsvuvE
+id: fallback
+label: 'Fallback date format'
+locked: true
+pattern: 'D, m/d/Y - H:i'
diff --git a/web/sites/default/config/core.date_format.html_date.yml b/web/sites/default/config/core.date_format.html_date.yml
new file mode 100644
index 0000000..3593c5c
--- /dev/null
+++ b/web/sites/default/config/core.date_format.html_date.yml
@@ -0,0 +1,10 @@
+uuid: eff53e6a-e124-4edd-947a-e0240f09c530
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: EOQltUQPmgc6UQ2rcJ4Xi_leCEJj5ui0TR-12duS-Tk
+id: html_date
+label: 'HTML Date'
+locked: true
+pattern: Y-m-d
diff --git a/web/sites/default/config/core.date_format.html_datetime.yml b/web/sites/default/config/core.date_format.html_datetime.yml
new file mode 100644
index 0000000..8a4f071
--- /dev/null
+++ b/web/sites/default/config/core.date_format.html_datetime.yml
@@ -0,0 +1,10 @@
+uuid: 86300248-7090-4aae-bac4-9ed780f24dcb
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: jxfClwZIRXIdcvMrE--WkcZxDGUVoOIE3Sm2NRZlFuE
+id: html_datetime
+label: 'HTML Datetime'
+locked: true
+pattern: 'Y-m-d\TH:i:sO'
diff --git a/web/sites/default/config/core.date_format.html_month.yml b/web/sites/default/config/core.date_format.html_month.yml
new file mode 100644
index 0000000..239df91
--- /dev/null
+++ b/web/sites/default/config/core.date_format.html_month.yml
@@ -0,0 +1,10 @@
+uuid: 1b12ffb2-bfab-47d3-8af5-9ea436b317a0
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: Z7KuCUwM_WdTNvLcoltuX3_8d-s-8FZkTN6KgNwF0eM
+id: html_month
+label: 'HTML Month'
+locked: true
+pattern: Y-m
diff --git a/web/sites/default/config/core.date_format.html_time.yml b/web/sites/default/config/core.date_format.html_time.yml
new file mode 100644
index 0000000..712734c
--- /dev/null
+++ b/web/sites/default/config/core.date_format.html_time.yml
@@ -0,0 +1,10 @@
+uuid: 11030b56-a873-413f-a25e-d9627cbda10d
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: M7yqicYkU36hRy5p9drAaGBBihhUD1OyujFrAaQ93ZE
+id: html_time
+label: 'HTML Time'
+locked: true
+pattern: 'H:i:s'
diff --git a/web/sites/default/config/core.date_format.html_week.yml b/web/sites/default/config/core.date_format.html_week.yml
new file mode 100644
index 0000000..143c5ae
--- /dev/null
+++ b/web/sites/default/config/core.date_format.html_week.yml
@@ -0,0 +1,10 @@
+uuid: d90d05fb-bd7d-42bf-838c-f8c7980b6cd7
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: wKD4WsoV_wFgv2vgI4mcAAFSIzrye17ykzdwrnApkfY
+id: html_week
+label: 'HTML Week'
+locked: true
+pattern: Y-\WW
diff --git a/web/sites/default/config/core.date_format.html_year.yml b/web/sites/default/config/core.date_format.html_year.yml
new file mode 100644
index 0000000..c83ed9d
--- /dev/null
+++ b/web/sites/default/config/core.date_format.html_year.yml
@@ -0,0 +1,10 @@
+uuid: 16bb294f-3224-4669-ba9b-c1536a02d6e8
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: OjekiQuX9RbVQ2_8jOHBL94RgYLePqX7wpfNGgcQzrk
+id: html_year
+label: 'HTML Year'
+locked: true
+pattern: 'Y'
diff --git a/web/sites/default/config/core.date_format.html_yearless_date.yml b/web/sites/default/config/core.date_format.html_yearless_date.yml
new file mode 100644
index 0000000..2d70fae
--- /dev/null
+++ b/web/sites/default/config/core.date_format.html_yearless_date.yml
@@ -0,0 +1,10 @@
+uuid: 958f016c-663b-4257-b7e1-182c5a1d2304
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: 5VpawMrKPEPCkoO4YpPa0TDFO2dgiIHfTziJtwlmUxc
+id: html_yearless_date
+label: 'HTML Yearless date'
+locked: true
+pattern: m-d
diff --git a/web/sites/default/config/core.date_format.long.yml b/web/sites/default/config/core.date_format.long.yml
new file mode 100644
index 0000000..33c399b
--- /dev/null
+++ b/web/sites/default/config/core.date_format.long.yml
@@ -0,0 +1,10 @@
+uuid: c8ca0a0d-c2c5-4f6b-bb3c-1da2a1cfcb49
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: og8sWXhBuHbLMw3CoiBEZjgqSyhFBFmcbUW_wLcfNbo
+id: long
+label: 'Default long date'
+locked: false
+pattern: 'l, F j, Y - H:i'
diff --git a/web/sites/default/config/core.date_format.medium.yml b/web/sites/default/config/core.date_format.medium.yml
new file mode 100644
index 0000000..0ac4b4e
--- /dev/null
+++ b/web/sites/default/config/core.date_format.medium.yml
@@ -0,0 +1,10 @@
+uuid: bfecf863-aa97-495a-82a0-4d2fbcb71c7c
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: nzL5d024NjXIX_8TlT6uFAu973lmfkmHklJC-2i9rAE
+id: medium
+label: 'Default medium date'
+locked: false
+pattern: 'D, m/d/Y - H:i'
diff --git a/web/sites/default/config/core.date_format.short.yml b/web/sites/default/config/core.date_format.short.yml
new file mode 100644
index 0000000..0011846
--- /dev/null
+++ b/web/sites/default/config/core.date_format.short.yml
@@ -0,0 +1,10 @@
+uuid: c3be64ee-fd89-4a32-ae0f-ad237aee3972
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: AlzeyytA8InBgxIG9H2UDJYs3CG98Zj6yRsDKmlbZwA
+id: short
+label: 'Default short date'
+locked: false
+pattern: 'm/d/Y - H:i'
diff --git a/web/sites/default/config/core.entity_form_display.block_content.basic.default.yml b/web/sites/default/config/core.entity_form_display.block_content.basic.default.yml
new file mode 100644
index 0000000..8e24fcc
--- /dev/null
+++ b/web/sites/default/config/core.entity_form_display.block_content.basic.default.yml
@@ -0,0 +1,34 @@
+uuid: 07da487e-062a-4d31-9dd7-dc98df0b3690
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.basic
+    - field.field.block_content.basic.body
+  module:
+    - text
+_core:
+  default_config_hash: e1Nu5xXAuF_QplbBUhQBPLnYWvHtDX0MkZnpuCiY8uM
+id: block_content.basic.default
+targetEntityType: block_content
+bundle: basic
+mode: default
+content:
+  body:
+    type: text_textarea_with_summary
+    weight: -4
+    region: content
+    settings:
+      rows: 9
+      summary_rows: 3
+      placeholder: ''
+    third_party_settings: {  }
+  info:
+    type: string_textfield
+    weight: -5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_form_display.comment.comment.default.yml b/web/sites/default/config/core.entity_form_display.comment.comment.default.yml
new file mode 100644
index 0000000..8efa88b
--- /dev/null
+++ b/web/sites/default/config/core.entity_form_display.comment.comment.default.yml
@@ -0,0 +1,36 @@
+uuid: c3fe43f8-7333-4169-a12a-cf81ff32d21f
+langcode: en
+status: true
+dependencies:
+  config:
+    - comment.type.comment
+    - field.field.comment.comment.comment_body
+  module:
+    - text
+_core:
+  default_config_hash: I0Pa0aQvT_jawlPo9oz4FE3h_ickc55dYKTPl6gILes
+id: comment.comment.default
+targetEntityType: comment
+bundle: comment
+mode: default
+content:
+  author:
+    weight: -2
+    region: content
+  comment_body:
+    type: text_textarea
+    weight: 11
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  subject:
+    type: string_textfield
+    weight: 10
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_form_display.node.news.default.yml b/web/sites/default/config/core.entity_form_display.node.news.default.yml
new file mode 100644
index 0000000..fbc57ad
--- /dev/null
+++ b/web/sites/default/config/core.entity_form_display.node.news.default.yml
@@ -0,0 +1,145 @@
+uuid: cc373040-fae3-4964-93d4-8af029c4b5ab
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.node.news.body
+    - field.field.node.news.field_caption
+    - field.field.node.news.field_featured_image
+    - field.field.node.news.field_funding
+    - field.field.node.news.field_media_queries
+    - field.field.node.news.field_press_release_number
+    - field.field.node.news.field_publication_date
+    - field.field.node.news.field_subtitle
+    - image.style.news_main_story
+    - node.type.news
+  module:
+    - content_moderation
+    - datetime
+    - image
+    - path
+    - scheduler
+    - text
+id: node.news.default
+targetEntityType: node
+bundle: news
+mode: default
+content:
+  body:
+    type: text_textarea_with_summary
+    weight: 5
+    settings:
+      rows: 9
+      summary_rows: 3
+      placeholder: ''
+    third_party_settings: {  }
+    region: content
+  field_caption:
+    weight: 4
+    settings:
+      size: 200
+      placeholder: ''
+    third_party_settings: {  }
+    type: text_textfield
+    region: content
+  field_featured_image:
+    weight: 3
+    settings:
+      preview_image_style: news_main_story
+      progress_indicator: throbber
+    third_party_settings: {  }
+    type: image_image
+    region: content
+  field_funding:
+    weight: 8
+    settings:
+      placeholder: ''
+    third_party_settings: {  }
+    type: number
+    region: content
+  field_media_queries:
+    weight: 7
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: text_textfield
+    region: content
+  field_publication_date:
+    weight: 6
+    settings: {  }
+    third_party_settings: {  }
+    type: datetime_default
+    region: content
+  field_subtitle:
+    weight: 2
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: string_textfield
+    region: content
+  moderation_state:
+    type: moderation_state_default
+    weight: 12
+    settings: {  }
+    region: content
+    third_party_settings: {  }
+  path:
+    type: path
+    weight: 11
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  publish_on:
+    type: datetime_timestamp_no_default
+    weight: 13
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  scheduler_settings:
+    weight: 15
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 9
+    region: content
+    third_party_settings: {  }
+  sticky:
+    type: boolean_checkbox
+    weight: 10
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+  title:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 0
+    region: content
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  unpublish_on:
+    type: datetime_timestamp_no_default
+    weight: 14
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+hidden:
+  created: true
+  field_press_release_number: true
+  promote: true
diff --git a/web/sites/default/config/core.entity_form_display.node.page.default.yml b/web/sites/default/config/core.entity_form_display.node.page.default.yml
new file mode 100644
index 0000000..efe86e8
--- /dev/null
+++ b/web/sites/default/config/core.entity_form_display.node.page.default.yml
@@ -0,0 +1,77 @@
+uuid: 1c40a5a4-748e-434d-b9b9-1ebd00b1411a
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.node.page.body
+    - node.type.page
+  module:
+    - path
+    - text
+_core:
+  default_config_hash: sb0qCkzU_8mNq29NehYAU8jCBXWPLeX0UN8sYFVGVcw
+id: node.page.default
+targetEntityType: node
+bundle: page
+mode: default
+content:
+  body:
+    type: text_textarea_with_summary
+    weight: 31
+    region: content
+    settings:
+      rows: 9
+      summary_rows: 3
+      placeholder: ''
+    third_party_settings: {  }
+  created:
+    type: datetime_timestamp
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  promote:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 15
+    region: content
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 120
+    region: content
+    third_party_settings: {  }
+  sticky:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 16
+    region: content
+    third_party_settings: {  }
+  title:
+    type: string_textfield
+    weight: -5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    region: content
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_form_display.taxonomy_term.brightcove_video_tags.default.yml b/web/sites/default/config/core.entity_form_display.taxonomy_term.brightcove_video_tags.default.yml
new file mode 100644
index 0000000..9c30a2b
--- /dev/null
+++ b/web/sites/default/config/core.entity_form_display.taxonomy_term.brightcove_video_tags.default.yml
@@ -0,0 +1,39 @@
+uuid: 20d221af-3c9e-4003-84ff-f04d5be2eb82
+langcode: en
+status: true
+dependencies:
+  config:
+    - taxonomy.vocabulary.brightcove_video_tags
+  module:
+    - path
+    - text
+_core:
+  default_config_hash: 3-h8ZT97oXuvqoXsXrR1b2t4L0aCzZGkostlkhjcTDg
+id: taxonomy_term.brightcove_video_tags.default
+targetEntityType: taxonomy_term
+bundle: brightcove_video_tags
+mode: default
+content:
+  description:
+    type: text_textarea
+    weight: 2
+    settings:
+      placeholder: ''
+      rows: 5
+    third_party_settings: {  }
+    region: content
+  name:
+    type: string_textfield
+    weight: 0
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    region: content
+  path:
+    type: path
+    weight: 3
+    settings: {  }
+    third_party_settings: {  }
+    region: content
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_form_display.user.user.default.yml b/web/sites/default/config/core.entity_form_display.user.user.default.yml
new file mode 100644
index 0000000..d1fd7df
--- /dev/null
+++ b/web/sites/default/config/core.entity_form_display.user.user.default.yml
@@ -0,0 +1,38 @@
+uuid: 66938550-40f1-4e40-b05a-c1d3b25a41ab
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.user.user.user_picture
+    - image.style.thumbnail
+  module:
+    - image
+    - user
+_core:
+  default_config_hash: K-1rBM8mTIkFp9RqOC2tMRUukOQ1xbRCfSKK8dEddnA
+id: user.user.default
+targetEntityType: user
+bundle: user
+mode: default
+content:
+  account:
+    weight: -10
+    region: content
+  contact:
+    weight: 5
+    region: content
+  language:
+    weight: 0
+    region: content
+  timezone:
+    weight: 6
+    region: content
+  user_picture:
+    type: image_image
+    settings:
+      progress_indicator: throbber
+      preview_image_style: thumbnail
+    third_party_settings: {  }
+    weight: -1
+    region: content
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_form_mode.user.register.yml b/web/sites/default/config/core.entity_form_mode.user.register.yml
new file mode 100644
index 0000000..ed03d84
--- /dev/null
+++ b/web/sites/default/config/core.entity_form_mode.user.register.yml
@@ -0,0 +1,12 @@
+uuid: 90ed1205-9a6f-44ba-b7db-de50a5a5d9ba
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+_core:
+  default_config_hash: flXhTcp55yLcyy7ZLOhPGKGZobZQJdkAFVWV3LseiuI
+id: user.register
+label: Register
+targetEntityType: user
+cache: true
diff --git a/web/sites/default/config/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml b/web/sites/default/config/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml
new file mode 100644
index 0000000..6ebede1
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml
@@ -0,0 +1,41 @@
+uuid: 503d79a0-ff24-4b2d-b71c-062ba2aaefdf
+langcode: en
+status: true
+dependencies:
+  module:
+    - aggregator
+_core:
+  default_config_hash: ORtH44CMbYMb3_0zumUPwVhPmaLBiImWpZa_hO3qmhU
+id: aggregator_feed.aggregator_feed.default
+targetEntityType: aggregator_feed
+bundle: aggregator_feed
+mode: default
+content:
+  checked:
+    type: timestamp_ago
+    weight: 1
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+    label: inline
+  description:
+    weight: 3
+    region: content
+  feed_icon:
+    weight: 5
+    region: content
+  image:
+    weight: 2
+    region: content
+  items:
+    weight: 0
+    region: content
+  link:
+    type: uri_link
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+    label: inline
+hidden:
+  more_link: true
diff --git a/web/sites/default/config/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml b/web/sites/default/config/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml
new file mode 100644
index 0000000..3b39c58
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml
@@ -0,0 +1,27 @@
+uuid: 9a5715db-2761-4732-9a69-8b04e5329857
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.aggregator_feed.summary
+  module:
+    - aggregator
+_core:
+  default_config_hash: OCl6AtoDUvFAsnvg1fosqsjFuoUvnIWQ28b_0Nc14Cg
+id: aggregator_feed.aggregator_feed.summary
+targetEntityType: aggregator_feed
+bundle: aggregator_feed
+mode: summary
+content:
+  items:
+    weight: 0
+    region: content
+  more_link:
+    weight: 1
+    region: content
+hidden:
+  checked: true
+  description: true
+  feed_icon: true
+  image: true
+  link: true
diff --git a/web/sites/default/config/core.entity_view_display.aggregator_item.aggregator_item.summary.yml b/web/sites/default/config/core.entity_view_display.aggregator_item.aggregator_item.summary.yml
new file mode 100644
index 0000000..f68cb68
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.aggregator_item.aggregator_item.summary.yml
@@ -0,0 +1,23 @@
+uuid: 6ef2ca2a-a80b-4dfd-adc9-1fe05f36951d
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.aggregator_item.summary
+  module:
+    - aggregator
+_core:
+  default_config_hash: ei8DNHu3HVLFFuKrr2Y4MsxuHR8ZMt0kHQly-qfkTAU
+id: aggregator_item.aggregator_item.summary
+targetEntityType: aggregator_item
+bundle: aggregator_item
+mode: summary
+content:
+  timestamp:
+    weight: 0
+    region: content
+hidden:
+  author: true
+  description: true
+  feed: true
+  link: true
diff --git a/web/sites/default/config/core.entity_view_display.block_content.basic.default.yml b/web/sites/default/config/core.entity_view_display.block_content.basic.default.yml
new file mode 100644
index 0000000..ade80d8
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.block_content.basic.default.yml
@@ -0,0 +1,24 @@
+uuid: 42630163-bff6-42d0-82cb-ab87acee7f56
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.basic
+    - field.field.block_content.basic.body
+  module:
+    - text
+_core:
+  default_config_hash: orJpHUlAc_wiQLMUjIgEJXGeiqylGHMPcmNRjGtct-M
+id: block_content.basic.default
+targetEntityType: block_content
+bundle: basic
+mode: default
+content:
+  body:
+    label: hidden
+    type: text_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_view_display.brightcove_video.brightcove_video.default.yml b/web/sites/default/config/core.entity_view_display.brightcove_video.brightcove_video.default.yml
new file mode 100644
index 0000000..0cdf6fc
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.brightcove_video.brightcove_video.default.yml
@@ -0,0 +1,49 @@
+uuid: cd95843e-df50-4f9d-8de8-c30867d8dc05
+langcode: en
+status: true
+dependencies:
+  module:
+    - brightcove
+_core:
+  default_config_hash: VfDn9vTeEtunHzLn2b0uOl0dbwDJIYz6hJbTynHTFOM
+id: brightcove_video.brightcove_video.default
+targetEntityType: brightcove_video
+bundle: brightcove_video
+mode: default
+content:
+  brightcove_video_player:
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+hidden:
+  api_client: true
+  brightcove_custom_fields: true
+  bumper_video: true
+  created: true
+  description: true
+  duration: true
+  economics: true
+  geo_countries: true
+  geo_exclude_countries: true
+  geo_restricted: true
+  logo_alignment: true
+  logo_image: true
+  logo_tooltip: true
+  logo_url: true
+  long_description: true
+  player: true
+  poster: true
+  reference_id: true
+  related_link: true
+  schedule_ends_at: true
+  schedule_starts_at: true
+  status: true
+  tags: true
+  text_tracks: true
+  thumbnail: true
+  uid: true
+  video_file: true
+  video_id: true
+  video_url: true
+  viral: true
diff --git a/web/sites/default/config/core.entity_view_display.brightcove_video.brightcove_video.embed.yml b/web/sites/default/config/core.entity_view_display.brightcove_video.brightcove_video.embed.yml
new file mode 100644
index 0000000..95231bc
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.brightcove_video.brightcove_video.embed.yml
@@ -0,0 +1,51 @@
+uuid: af3eec52-b629-46a8-9b78-709efb56ff68
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.brightcove_video.embed
+  module:
+    - brightcove
+_core:
+  default_config_hash: uF4Q1vgu8Xe230JXfUzg9EABEiEoZlkxjnXFiKadI-8
+id: brightcove_video.brightcove_video.embed
+targetEntityType: brightcove_video
+bundle: brightcove_video
+mode: embed
+content:
+  brightcove_video_player:
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+hidden:
+  api_client: true
+  brightcove_custom_fields: true
+  bumper_video: true
+  created: true
+  description: true
+  duration: true
+  economics: true
+  geo_countries: true
+  geo_exclude_countries: true
+  geo_restricted: true
+  logo_alignment: true
+  logo_image: true
+  logo_tooltip: true
+  logo_url: true
+  long_description: true
+  player: true
+  poster: true
+  reference_id: true
+  related_link: true
+  schedule_ends_at: true
+  schedule_starts_at: true
+  status: true
+  tags: true
+  text_tracks: true
+  thumbnail: true
+  uid: true
+  video_file: true
+  video_id: true
+  video_url: true
+  viral: true
diff --git a/web/sites/default/config/core.entity_view_display.comment.comment.default.yml b/web/sites/default/config/core.entity_view_display.comment.comment.default.yml
new file mode 100644
index 0000000..2307aa5
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.comment.comment.default.yml
@@ -0,0 +1,27 @@
+uuid: f06fb8f4-cf7f-425a-9277-99f2b630fbeb
+langcode: en
+status: true
+dependencies:
+  config:
+    - comment.type.comment
+    - field.field.comment.comment.comment_body
+  module:
+    - text
+_core:
+  default_config_hash: 77Ye1kR-P6AaiGfEO8mnXNSr7nqtnP3PiiVBwJeGGMI
+id: comment.comment.default
+targetEntityType: comment
+bundle: comment
+mode: default
+content:
+  comment_body:
+    label: hidden
+    type: text_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  links:
+    weight: 100
+    region: content
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_view_display.node.news.default.yml b/web/sites/default/config/core.entity_view_display.node.news.default.yml
new file mode 100644
index 0000000..58e97bf
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.node.news.default.yml
@@ -0,0 +1,70 @@
+uuid: 4c945ff4-4483-477e-86b6-ded2ccc3cde7
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.node.news.body
+    - field.field.node.news.field_caption
+    - field.field.node.news.field_featured_image
+    - field.field.node.news.field_funding
+    - field.field.node.news.field_media_queries
+    - field.field.node.news.field_press_release_number
+    - field.field.node.news.field_publication_date
+    - field.field.node.news.field_subtitle
+    - image.style.news_main_story
+    - node.type.news
+  module:
+    - image
+    - text
+    - user
+id: node.news.default
+targetEntityType: node
+bundle: news
+mode: default
+content:
+  body:
+    label: hidden
+    type: text_default
+    weight: 3
+    settings: {  }
+    third_party_settings: {  }
+    region: content
+  content_moderation_control:
+    weight: 5
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_caption:
+    weight: 1
+    label: visually_hidden
+    settings: {  }
+    third_party_settings: {  }
+    type: text_default
+    region: content
+  field_featured_image:
+    weight: 0
+    label: visually_hidden
+    settings:
+      image_style: news_main_story
+      image_link: ''
+    third_party_settings: {  }
+    type: image
+    region: content
+  field_subtitle:
+    weight: 2
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    type: string
+    region: content
+  links:
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+hidden:
+  field_funding: true
+  field_media_queries: true
+  field_press_release_number: true
+  field_publication_date: true
diff --git a/web/sites/default/config/core.entity_view_display.node.news.teaser.yml b/web/sites/default/config/core.entity_view_display.node.news.teaser.yml
new file mode 100644
index 0000000..d3bf7dc
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.node.news.teaser.yml
@@ -0,0 +1,28 @@
+uuid: aaca2d60-73ec-4725-8233-24982d6505bf
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.teaser
+    - field.field.node.news.body
+    - node.type.news
+  module:
+    - text
+    - user
+id: node.news.teaser
+targetEntityType: node
+bundle: news
+mode: teaser
+content:
+  body:
+    label: hidden
+    type: text_summary_or_trimmed
+    weight: 101
+    settings:
+      trim_length: 600
+    third_party_settings: {  }
+    region: content
+  links:
+    weight: 100
+    region: content
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_view_display.node.page.default.yml b/web/sites/default/config/core.entity_view_display.node.page.default.yml
new file mode 100644
index 0000000..330c0ec
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.node.page.default.yml
@@ -0,0 +1,28 @@
+uuid: 21a8b2df-ebad-4760-b6a5-60b1832b9dc0
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.node.page.body
+    - node.type.page
+  module:
+    - text
+    - user
+_core:
+  default_config_hash: g1S3_GLaxq4l3I9RIca5Mlz02MxI2KmOquZpHw59akM
+id: node.page.default
+targetEntityType: node
+bundle: page
+mode: default
+content:
+  body:
+    label: hidden
+    type: text_default
+    weight: 100
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  links:
+    weight: 101
+    region: content
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_view_display.node.page.teaser.yml b/web/sites/default/config/core.entity_view_display.node.page.teaser.yml
new file mode 100644
index 0000000..6d600fd
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.node.page.teaser.yml
@@ -0,0 +1,30 @@
+uuid: d33c5d37-6953-4c4d-b4da-384f0a27c81b
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.teaser
+    - field.field.node.page.body
+    - node.type.page
+  module:
+    - text
+    - user
+_core:
+  default_config_hash: cSv5lDnbIgDug475Hdz3woED2XMqYv3awI-J9u1JLbY
+id: node.page.teaser
+targetEntityType: node
+bundle: page
+mode: teaser
+content:
+  body:
+    label: hidden
+    type: text_summary_or_trimmed
+    weight: 100
+    region: content
+    settings:
+      trim_length: 600
+    third_party_settings: {  }
+  links:
+    weight: 101
+    region: content
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_view_display.taxonomy_term.brightcove_video_tags.default.yml b/web/sites/default/config/core.entity_view_display.taxonomy_term.brightcove_video_tags.default.yml
new file mode 100644
index 0000000..2d0e331
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.taxonomy_term.brightcove_video_tags.default.yml
@@ -0,0 +1,23 @@
+uuid: 7478cbff-7c2d-4dc5-aef3-a9b401f2e97c
+langcode: en
+status: true
+dependencies:
+  config:
+    - taxonomy.vocabulary.brightcove_video_tags
+  module:
+    - text
+_core:
+  default_config_hash: pQ_wPJ7EN59_nTxSk7YC7ZDqCJBBcD7D9XBPKKdHQ5w
+id: taxonomy_term.brightcove_video_tags.default
+targetEntityType: taxonomy_term
+bundle: brightcove_video_tags
+mode: default
+content:
+  description:
+    label: hidden
+    type: text_default
+    weight: 1
+    settings: {  }
+    third_party_settings: {  }
+    region: content
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_view_display.user.user.compact.yml b/web/sites/default/config/core.entity_view_display.user.user.compact.yml
new file mode 100644
index 0000000..bedb162
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.user.user.compact.yml
@@ -0,0 +1,29 @@
+uuid: 9c4e6899-ea6f-406b-9916-2972879a2eaf
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.user.compact
+    - field.field.user.user.user_picture
+    - image.style.thumbnail
+  module:
+    - image
+    - user
+_core:
+  default_config_hash: '-cLsS3M3JycipXQt9rEb81_HxKneReoGuRh8ijcOPXs'
+id: user.user.compact
+targetEntityType: user
+bundle: user
+mode: compact
+content:
+  user_picture:
+    type: image
+    weight: 0
+    region: content
+    settings:
+      image_style: thumbnail
+      image_link: content
+    third_party_settings: {  }
+    label: hidden
+hidden:
+  member_for: true
diff --git a/web/sites/default/config/core.entity_view_display.user.user.default.yml b/web/sites/default/config/core.entity_view_display.user.user.default.yml
new file mode 100644
index 0000000..175e51b
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.user.user.default.yml
@@ -0,0 +1,30 @@
+uuid: 4a0a2025-8f02-4f06-aa53-389158d6a00a
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.user.user.user_picture
+    - image.style.thumbnail
+  module:
+    - image
+    - user
+_core:
+  default_config_hash: V51QPCKkgNREKtSmB9Iu2wmAMEpktVpnzklWaZV8UYo
+id: user.user.default
+targetEntityType: user
+bundle: user
+mode: default
+content:
+  member_for:
+    weight: 5
+    region: content
+  user_picture:
+    type: image
+    weight: 0
+    region: content
+    settings:
+      image_style: thumbnail
+      image_link: content
+    third_party_settings: {  }
+    label: hidden
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_view_display.workflow_transition.news_and_events.default.yml b/web/sites/default/config/core.entity_view_display.workflow_transition.news_and_events.default.yml
new file mode 100644
index 0000000..877d8b9
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_display.workflow_transition.news_and_events.default.yml
@@ -0,0 +1,12 @@
+uuid: 9e842269-29c1-419c-9dbb-3c45419719e6
+langcode: en
+status: true
+dependencies:
+  config:
+    - workflow.workflow.news_and_events
+id: workflow_transition.news_and_events.default
+targetEntityType: workflow_transition
+bundle: news_and_events
+mode: default
+content: {  }
+hidden: {  }
diff --git a/web/sites/default/config/core.entity_view_mode.aggregator_feed.summary.yml b/web/sites/default/config/core.entity_view_mode.aggregator_feed.summary.yml
new file mode 100644
index 0000000..ddd5947
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.aggregator_feed.summary.yml
@@ -0,0 +1,12 @@
+uuid: 13f53422-a261-47b1-b88f-f937db073d0c
+langcode: en
+status: true
+dependencies:
+  module:
+    - aggregator
+_core:
+  default_config_hash: QBUcStGTLulHMyYgLwZWdHfUqj-YCQFT-TW0ojsw8pw
+id: aggregator_feed.summary
+label: Summary
+targetEntityType: aggregator_feed
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.aggregator_item.summary.yml b/web/sites/default/config/core.entity_view_mode.aggregator_item.summary.yml
new file mode 100644
index 0000000..19ea8fe
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.aggregator_item.summary.yml
@@ -0,0 +1,12 @@
+uuid: 5f3381a0-d514-4dba-952f-2c6bf13b5644
+langcode: en
+status: true
+dependencies:
+  module:
+    - aggregator
+_core:
+  default_config_hash: 0LZvohlEB6FpI9Irz7wHVLBVKGcjHzhvI8mCzjHndrc
+id: aggregator_item.summary
+label: Summary
+targetEntityType: aggregator_item
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.block.token.yml b/web/sites/default/config/core.entity_view_mode.block.token.yml
new file mode 100644
index 0000000..8e5fef0
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.block.token.yml
@@ -0,0 +1,10 @@
+uuid: 4b4fd645-832f-4a59-92b0-02b91618bb02
+langcode: en
+status: true
+dependencies:
+  module:
+    - block
+id: block.token
+label: Token
+targetEntityType: block
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.block_content.full.yml b/web/sites/default/config/core.entity_view_mode.block_content.full.yml
new file mode 100644
index 0000000..6e300c5
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.block_content.full.yml
@@ -0,0 +1,12 @@
+uuid: cf2335b5-8216-4697-bf99-fe0b8a57d6a8
+langcode: en
+status: false
+dependencies:
+  module:
+    - block_content
+_core:
+  default_config_hash: 4tedlMuvQjDOdvHdw86_e-2Rt78aR7TGFMfOK8Ejppg
+id: block_content.full
+label: Full
+targetEntityType: block_content
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.block_content.token.yml b/web/sites/default/config/core.entity_view_mode.block_content.token.yml
new file mode 100644
index 0000000..aa96247
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.block_content.token.yml
@@ -0,0 +1,10 @@
+uuid: 158f8198-38d1-4cbb-91c2-5f61b141eb68
+langcode: en
+status: true
+dependencies:
+  module:
+    - block_content
+id: block_content.token
+label: Token
+targetEntityType: block_content
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.brightcove_video.embed.yml b/web/sites/default/config/core.entity_view_mode.brightcove_video.embed.yml
new file mode 100644
index 0000000..639a06a
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.brightcove_video.embed.yml
@@ -0,0 +1,12 @@
+uuid: b4549e09-1c04-4e52-8d99-5241dd9f2d30
+langcode: en
+status: true
+dependencies:
+  module:
+    - brightcove
+_core:
+  default_config_hash: rffJwFhpGXup8AAIcrZhF9Z3O9M39VxWwRggIwn4kmY
+id: brightcove_video.embed
+label: Embed
+targetEntityType: brightcove_video
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.comment.full.yml b/web/sites/default/config/core.entity_view_mode.comment.full.yml
new file mode 100644
index 0000000..b33bec3
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.comment.full.yml
@@ -0,0 +1,12 @@
+uuid: afb9202a-dcd6-4258-9d97-b70454d85b46
+langcode: en
+status: false
+dependencies:
+  module:
+    - comment
+_core:
+  default_config_hash: K7eNlfU7NEUajz01wItywZklr2oaPgL6s1_97fmDXLA
+id: comment.full
+label: 'Full comment'
+targetEntityType: comment
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.comment.token.yml b/web/sites/default/config/core.entity_view_mode.comment.token.yml
new file mode 100644
index 0000000..33c28e2
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.comment.token.yml
@@ -0,0 +1,10 @@
+uuid: 751a5cfe-94f5-40e7-b831-d49232db4133
+langcode: en
+status: true
+dependencies:
+  module:
+    - comment
+id: comment.token
+label: Token
+targetEntityType: comment
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.contact_message.token.yml b/web/sites/default/config/core.entity_view_mode.contact_message.token.yml
new file mode 100644
index 0000000..9355bbf
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.contact_message.token.yml
@@ -0,0 +1,10 @@
+uuid: e4ae1ab4-e9ce-4d6c-bbb1-4ed10980d056
+langcode: en
+status: true
+dependencies:
+  module:
+    - contact
+id: contact_message.token
+label: Token
+targetEntityType: contact_message
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.file.token.yml b/web/sites/default/config/core.entity_view_mode.file.token.yml
new file mode 100644
index 0000000..878acb8
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.file.token.yml
@@ -0,0 +1,10 @@
+uuid: dfa56890-d711-4533-8a20-45f2b1dd69f6
+langcode: en
+status: true
+dependencies:
+  module:
+    - file
+id: file.token
+label: Token
+targetEntityType: file
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.menu_link_content.token.yml b/web/sites/default/config/core.entity_view_mode.menu_link_content.token.yml
new file mode 100644
index 0000000..9ba802b
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.menu_link_content.token.yml
@@ -0,0 +1,10 @@
+uuid: 5daf1668-c46d-4bcd-924b-075112eadcac
+langcode: en
+status: true
+dependencies:
+  module:
+    - menu_link_content
+id: menu_link_content.token
+label: Token
+targetEntityType: menu_link_content
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.node.diff.yml b/web/sites/default/config/core.entity_view_mode.node.diff.yml
new file mode 100644
index 0000000..b1d9efe
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.node.diff.yml
@@ -0,0 +1,16 @@
+uuid: 5e43054c-a01b-4b3c-8c99-d6b857c34d1a
+langcode: en
+status: false
+dependencies:
+  enforced:
+    module:
+      - node
+      - diff
+  module:
+    - node
+_core:
+  default_config_hash: q75Otzlypu_5TghImH1cxuN6umtka1UE4GdONTsPaD8
+id: node.diff
+label: 'Revision comparison'
+targetEntityType: node
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.node.full.yml b/web/sites/default/config/core.entity_view_mode.node.full.yml
new file mode 100644
index 0000000..cf30ca7
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.node.full.yml
@@ -0,0 +1,12 @@
+uuid: 45e415b6-6e42-4206-aca6-d3551c2becbe
+langcode: en
+status: false
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: ElrtInxGjZd7GaapJ5O9n-ugi2hG2IxFivtgn0tHOsk
+id: node.full
+label: 'Full content'
+targetEntityType: node
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.node.rss.yml b/web/sites/default/config/core.entity_view_mode.node.rss.yml
new file mode 100644
index 0000000..c01e123
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.node.rss.yml
@@ -0,0 +1,12 @@
+uuid: 4c93d66b-e6b9-4c2d-bcbf-1daff3c9112a
+langcode: en
+status: false
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: vlYzr-rp2f9NMp-Qlr4sFjlqRq-90mco5-afLNGwCrU
+id: node.rss
+label: RSS
+targetEntityType: node
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.node.search_index.yml b/web/sites/default/config/core.entity_view_mode.node.search_index.yml
new file mode 100644
index 0000000..50aa8e3
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.node.search_index.yml
@@ -0,0 +1,12 @@
+uuid: 55d092ad-55c3-4959-8ff2-5a3bca996727
+langcode: en
+status: false
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: fVFfJv_GzBRE-wpRHbfD5a3VjnhbEOXG6lvRd3uaccY
+id: node.search_index
+label: 'Search index'
+targetEntityType: node
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.node.search_result.yml b/web/sites/default/config/core.entity_view_mode.node.search_result.yml
new file mode 100644
index 0000000..c165143
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.node.search_result.yml
@@ -0,0 +1,12 @@
+uuid: c844a525-2caf-4ea8-9556-38dc2cbb2c65
+langcode: en
+status: false
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: 6GCOQ-jP2RbdbHA5YWQ6bT8CfGbqrBYKOSC_XY4E3ZM
+id: node.search_result
+label: 'Search result highlighting input'
+targetEntityType: node
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.node.teaser.yml b/web/sites/default/config/core.entity_view_mode.node.teaser.yml
new file mode 100644
index 0000000..348b3b7
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.node.teaser.yml
@@ -0,0 +1,12 @@
+uuid: 088b9eb4-4ca4-4fe6-aec6-9c19ebd42dea
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: Mz9qWr1kUYK0mjRAGDsr5XS6PvtZ24en_7ndt-pyWe4
+id: node.teaser
+label: Teaser
+targetEntityType: node
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.node.token.yml b/web/sites/default/config/core.entity_view_mode.node.token.yml
new file mode 100644
index 0000000..048af12
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.node.token.yml
@@ -0,0 +1,10 @@
+uuid: 0b84f145-13e4-44e4-a3af-2719b428ec35
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: node.token
+label: Token
+targetEntityType: node
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.shortcut.token.yml b/web/sites/default/config/core.entity_view_mode.shortcut.token.yml
new file mode 100644
index 0000000..bc7acef
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.shortcut.token.yml
@@ -0,0 +1,10 @@
+uuid: 1adfea39-e446-4beb-be0d-30bf9bfbb58b
+langcode: en
+status: true
+dependencies:
+  module:
+    - shortcut
+id: shortcut.token
+label: Token
+targetEntityType: shortcut
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.taxonomy_term.full.yml b/web/sites/default/config/core.entity_view_mode.taxonomy_term.full.yml
new file mode 100644
index 0000000..e786984
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.taxonomy_term.full.yml
@@ -0,0 +1,12 @@
+uuid: a051cd79-214d-41c5-af2e-1da765563feb
+langcode: en
+status: true
+dependencies:
+  module:
+    - taxonomy
+_core:
+  default_config_hash: '-PPKjsNQPvoIDjOuUAvlLocYD976MNjb9Zpgyz5_BWE'
+id: taxonomy_term.full
+label: 'Taxonomy term page'
+targetEntityType: taxonomy_term
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.taxonomy_term.token.yml b/web/sites/default/config/core.entity_view_mode.taxonomy_term.token.yml
new file mode 100644
index 0000000..092fa65
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.taxonomy_term.token.yml
@@ -0,0 +1,10 @@
+uuid: 798c705e-6ba6-4ff4-815f-93e2b0ae2ea4
+langcode: en
+status: true
+dependencies:
+  module:
+    - taxonomy
+id: taxonomy_term.token
+label: Token
+targetEntityType: taxonomy_term
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.tour.token.yml b/web/sites/default/config/core.entity_view_mode.tour.token.yml
new file mode 100644
index 0000000..e1780c6
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.tour.token.yml
@@ -0,0 +1,10 @@
+uuid: da92a397-98fe-4eb1-835b-7f74d0192bcf
+langcode: en
+status: true
+dependencies:
+  module:
+    - tour
+id: tour.token
+label: Token
+targetEntityType: tour
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.user.compact.yml b/web/sites/default/config/core.entity_view_mode.user.compact.yml
new file mode 100644
index 0000000..0077126
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.user.compact.yml
@@ -0,0 +1,12 @@
+uuid: 327ed6a3-c9a8-4a25-8bb3-c9a387be3c07
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+_core:
+  default_config_hash: 71CSAr_LNPcgu6D6jI4INl1KATkahmeyUFBETAWya8g
+id: user.compact
+label: Compact
+targetEntityType: user
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.user.full.yml b/web/sites/default/config/core.entity_view_mode.user.full.yml
new file mode 100644
index 0000000..4f8caef
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.user.full.yml
@@ -0,0 +1,12 @@
+uuid: 1b0fe973-b689-4bd0-b878-6eefe1e27a5c
+langcode: en
+status: false
+dependencies:
+  module:
+    - user
+_core:
+  default_config_hash: mQIF_foYjmnVSr9MpcD4CTaJE_FpO1AyDd_DskztGhM
+id: user.full
+label: 'User account'
+targetEntityType: user
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.user.token.yml b/web/sites/default/config/core.entity_view_mode.user.token.yml
new file mode 100644
index 0000000..3cb0352
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.user.token.yml
@@ -0,0 +1,10 @@
+uuid: bb5b769d-a358-494b-87a3-448383731073
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+id: user.token
+label: Token
+targetEntityType: user
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.workflow_scheduled_transition.token.yml b/web/sites/default/config/core.entity_view_mode.workflow_scheduled_transition.token.yml
new file mode 100644
index 0000000..0fbfc97
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.workflow_scheduled_transition.token.yml
@@ -0,0 +1,10 @@
+uuid: 1991c0e5-e6f3-4793-90e9-d07fa5ab962e
+langcode: en
+status: true
+dependencies:
+  module:
+    - workflow
+id: workflow_scheduled_transition.token
+label: Token
+targetEntityType: workflow_scheduled_transition
+cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.workflow_transition.token.yml b/web/sites/default/config/core.entity_view_mode.workflow_transition.token.yml
new file mode 100644
index 0000000..1dd760c
--- /dev/null
+++ b/web/sites/default/config/core.entity_view_mode.workflow_transition.token.yml
@@ -0,0 +1,10 @@
+uuid: 82f021ae-e153-4270-8ac4-0c236fa010fd
+langcode: en
+status: true
+dependencies:
+  module:
+    - workflow
+id: workflow_transition.token
+label: Token
+targetEntityType: workflow_transition
+cache: true
diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
new file mode 100644
index 0000000..e6fcbce
--- /dev/null
+++ b/web/sites/default/config/core.extension.yml
@@ -0,0 +1,85 @@
+module:
+  action: 0
+  aggregator: 0
+  automated_cron: 0
+  block: 0
+  block_content: 0
+  breakpoint: 0
+  brightcove: 0
+  brightcove_proxy: 0
+  ckeditor: 0
+  color: 0
+  comment: 0
+  config: 0
+  config_update: 0
+  contact: 0
+  content_moderation: 0
+  contextual: 0
+  ctools: 0
+  datetime: 0
+  dblog: 0
+  devel: 0
+  devel_generate: 0
+  diff: 0
+  dynamic_page_cache: 0
+  editor: 0
+  embed: 0
+  entity: 0
+  entity_browser: 0
+  entity_embed: 0
+  features: 0
+  features_ui: 0
+  field: 0
+  field_ui: 0
+  file: 0
+  filter: 0
+  help: 0
+  history: 0
+  image: 0
+  inline_entity_form: 0
+  inline_form_errors: 0
+  link: 0
+  masquerade: 0
+  media_entity: 0
+  media_entity_brightcove: 0
+  menu_ui: 0
+  node: 0
+  nsf_brightcove: 0
+  options: 0
+  page_cache: 0
+  path: 0
+  quickedit: 0
+  rdf: 0
+  rules: 0
+  scheduler: 0
+  scheduler_rules_integration: 0
+  search: 0
+  shortcut: 0
+  system: 0
+  taxonomy: 0
+  text: 0
+  time_formatter: 0
+  token: 0
+  toolbar: 0
+  tour: 0
+  tour_ui: 0
+  typed_data: 0
+  update: 0
+  user: 0
+  views_ui: 0
+  workflow: 0
+  workflows: 0
+  menu_link_content: 1
+  pathauto: 1
+  views: 10
+  standard: 1000
+theme:
+  stable: 0
+  classy: 0
+  seven: 0
+  uswds: 0
+  nsf: 0
+  bootstrap: 0
+profile: standard
+_core:
+  default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc
diff --git a/web/sites/default/config/core.menu.static_menu_link_overrides.yml b/web/sites/default/config/core.menu.static_menu_link_overrides.yml
new file mode 100644
index 0000000..b64756b
--- /dev/null
+++ b/web/sites/default/config/core.menu.static_menu_link_overrides.yml
@@ -0,0 +1,27 @@
+definitions:
+  contact__site_page:
+    enabled: true
+    menu_name: footer
+    parent: ''
+    weight: 0
+    expanded: false
+  standard__front_page:
+    weight: -50
+    menu_name: main
+    parent: ''
+    expanded: false
+    enabled: true
+  aggregator__feed_add:
+    enabled: false
+    menu_name: tools
+    parent: ''
+    expanded: false
+    weight: 0
+  aggregator__page_last:
+    enabled: false
+    menu_name: tools
+    parent: ''
+    weight: 5
+    expanded: false
+_core:
+  default_config_hash: jdY7AU0tU-QsjmiOw3W8vwpYMb-By--_MSFgbqKUTYM
diff --git a/web/sites/default/config/dblog.settings.yml b/web/sites/default/config/dblog.settings.yml
new file mode 100644
index 0000000..cf06e3f
--- /dev/null
+++ b/web/sites/default/config/dblog.settings.yml
@@ -0,0 +1,3 @@
+row_limit: 1000
+_core:
+  default_config_hash: e883aGsrt1wFrsydlYU584PZONCSfRy0DtkZ9KzHb58
diff --git a/web/sites/default/config/devel.settings.yml b/web/sites/default/config/devel.settings.yml
new file mode 100644
index 0000000..4db0ea7
--- /dev/null
+++ b/web/sites/default/config/devel.settings.yml
@@ -0,0 +1,10 @@
+page_alter: false
+raw_names: false
+error_handlers:
+  1: 1
+rebuild_theme: false
+debug_mail_file_format: '%to-%subject-%datetime.mail.txt'
+debug_mail_directory: 'temporary://devel-mails'
+devel_dumper: default
+_core:
+  default_config_hash: 8SYa5OOpQGdg4wnttb0LFNuG6GmivsS2qNv9sTH9gDI
diff --git a/web/sites/default/config/devel.toolbar.settings.yml b/web/sites/default/config/devel.toolbar.settings.yml
new file mode 100644
index 0000000..3c8d0fc
--- /dev/null
+++ b/web/sites/default/config/devel.toolbar.settings.yml
@@ -0,0 +1,11 @@
+toolbar_items:
+  - devel.admin_settings_link
+  - devel.cache_clear
+  - devel.container_info.service
+  - devel.execute_php
+  - devel.menu_rebuild
+  - devel.reinstall
+  - devel.route_info
+  - devel.run_cron
+_core:
+  default_config_hash: ysHEvvazIuaJ5BdY0dUw2_my_Q5hM8ypdXwFfaIrvMw
diff --git a/web/sites/default/config/diff.plugins.yml b/web/sites/default/config/diff.plugins.yml
new file mode 100644
index 0000000..8124478
--- /dev/null
+++ b/web/sites/default/config/diff.plugins.yml
@@ -0,0 +1,135 @@
+fields:
+  block_content:
+    langcode:
+      type: core_field_diff_builder
+      settings:
+        show_header: 1
+        markdown: drupal_html_to_text
+    info:
+      type: hidden
+      settings: {  }
+    changed:
+      type: hidden
+      settings: {  }
+    revision_created:
+      type: hidden
+      settings: {  }
+    revision_user:
+      type: hidden
+      settings: {  }
+    default_langcode:
+      type: hidden
+      settings: {  }
+    revision_translation_affected:
+      type: hidden
+      settings: {  }
+    body:
+      type: text_field_diff_builder
+      settings:
+        compare_format: 0
+        show_header: 1
+        markdown: drupal_html_to_text
+  node:
+    langcode:
+      type: core_field_diff_builder
+      settings:
+        show_header: 1
+        markdown: drupal_html_to_text
+    revision_timestamp:
+      type: hidden
+      settings: {  }
+    status:
+      type: hidden
+      settings: {  }
+    title:
+      type: core_field_diff_builder
+      settings:
+        show_header: 1
+        markdown: drupal_html_to_text
+    uid:
+      type: entity_reference_field_diff_builder
+      settings:
+        compare_entity_reference: 1
+        show_header: 1
+        markdown: drupal_html_to_text
+    created:
+      type: core_field_diff_builder
+      settings:
+        show_header: 1
+        markdown: drupal_html_to_text
+    changed:
+      type: hidden
+      settings: {  }
+    promote:
+      type: core_field_diff_builder
+      settings:
+        show_header: 1
+        markdown: drupal_html_to_text
+    sticky:
+      type: core_field_diff_builder
+      settings:
+        show_header: 1
+        markdown: drupal_html_to_text
+    default_langcode:
+      type: hidden
+      settings: {  }
+    revision_translation_affected:
+      type: hidden
+      settings: {  }
+    body:
+      type: text_field_diff_builder
+      settings:
+        compare_format: 0
+        show_header: 1
+        markdown: drupal_html_to_text
+    comment:
+      type: comment_field_diff_builder
+      settings:
+        compare_key: 0
+        compare_string: 1
+        show_header: 1
+        markdown: drupal_html_to_text
+    field_featured_image:
+      type: image_field_diff_builder
+      settings:
+        show_id: 0
+        compare_alt_field: 1
+        compare_title_field: 1
+        property_separator: nl
+        show_thumbnail: 1
+        show_header: 1
+        markdown: drupal_html_to_text
+    field_image:
+      type: image_field_diff_builder
+      settings:
+        show_id: 0
+        compare_alt_field: 1
+        compare_title_field: 1
+        property_separator: nl
+        show_thumbnail: 1
+        show_header: 1
+        markdown: drupal_html_to_text
+    field_press_release_number:
+      type: core_field_diff_builder
+      settings:
+        show_header: 1
+        markdown: drupal_html_to_text
+    field_publication_date:
+      type: core_field_diff_builder
+      settings:
+        show_header: 1
+        markdown: drupal_html_to_text
+    field_subtitle:
+      type: core_field_diff_builder
+      settings:
+        show_header: 1
+        markdown: drupal_html_to_text
+    field_tags:
+      type: entity_reference_field_diff_builder
+      settings:
+        compare_entity_reference: 1
+        show_header: 1
+        markdown: drupal_html_to_text
+    field_workflow_state:
+      type: hidden
+      settings: {  }
diff --git a/web/sites/default/config/diff.settings.yml b/web/sites/default/config/diff.settings.yml
new file mode 100644
index 0000000..698dc62
--- /dev/null
+++ b/web/sites/default/config/diff.settings.yml
@@ -0,0 +1,18 @@
+general_settings:
+  radio_behavior: simple
+  context_lines_leading: 1
+  context_lines_trailing: 1
+  revision_pager_limit: 50
+  layout_plugins:
+    visual_inline:
+      enabled: false
+      weight: 0
+    split_fields:
+      enabled: true
+      weight: 1
+    unified_fields:
+      enabled: true
+      weight: 2
+  visual_inline_theme: default
+_core:
+  default_config_hash: oXwX3NzLv9QK_LbNEvpQ9OPwH9tqtMSJzq5y8t63Q8w
diff --git a/web/sites/default/config/editor.editor.basic_html.yml b/web/sites/default/config/editor.editor.basic_html.yml
new file mode 100644
index 0000000..4f01bb0
--- /dev/null
+++ b/web/sites/default/config/editor.editor.basic_html.yml
@@ -0,0 +1,62 @@
+uuid: 32503eb7-4ab6-4c9c-b109-af2df0a87b2c
+langcode: en
+status: true
+dependencies:
+  config:
+    - filter.format.basic_html
+  module:
+    - ckeditor
+_core:
+  default_config_hash: AqlPmO16LvJI4D0Ih6u4GFQIzqr5OnLgAUSjcUGWk2g
+format: basic_html
+editor: ckeditor
+settings:
+  toolbar:
+    rows:
+      -
+        -
+          name: Formatting
+          items:
+            - Bold
+            - Italic
+            - Subscript
+            - Superscript
+        -
+          name: Linking
+          items:
+            - DrupalLink
+            - DrupalUnlink
+        -
+          name: Lists
+          items:
+            - BulletedList
+            - NumberedList
+        -
+          name: Media
+          items:
+            - Blockquote
+            - DrupalImage
+            - brightcove_video
+        -
+          name: 'Block Formatting'
+          items:
+            - Format
+        -
+          name: Tools
+          items:
+            - PasteFromWord
+            - RemoveFormat
+            - Source
+  plugins:
+    stylescombo:
+      styles: ''
+    language:
+      language_list: un
+image_upload:
+  status: true
+  scheme: public
+  directory: inline-images
+  max_size: ''
+  max_dimensions:
+    width: null
+    height: null
diff --git a/web/sites/default/config/editor.editor.full_html.yml b/web/sites/default/config/editor.editor.full_html.yml
new file mode 100644
index 0000000..b26422f
--- /dev/null
+++ b/web/sites/default/config/editor.editor.full_html.yml
@@ -0,0 +1,63 @@
+uuid: 5ba639a3-5f86-480a-a8ae-f1074591d096
+langcode: en
+status: true
+dependencies:
+  config:
+    - filter.format.full_html
+  module:
+    - ckeditor
+_core:
+  default_config_hash: 967ijj7p6i7rwrYl7r08WQFeCY_c23YAh0h8u-w_CXM
+format: full_html
+editor: ckeditor
+settings:
+  toolbar:
+    rows:
+      -
+        -
+          name: Formatting
+          items:
+            - Bold
+            - Italic
+            - Strike
+            - Superscript
+            - Subscript
+            - '-'
+            - RemoveFormat
+        -
+          name: Linking
+          items:
+            - DrupalLink
+            - DrupalUnlink
+        -
+          name: Lists
+          items:
+            - BulletedList
+            - NumberedList
+        -
+          name: Media
+          items:
+            - Blockquote
+            - DrupalImage
+            - Table
+            - HorizontalRule
+        -
+          name: 'Block Formatting'
+          items:
+            - Format
+        -
+          name: Tools
+          items:
+            - ShowBlocks
+            - Source
+  plugins:
+    stylescombo:
+      styles: ''
+image_upload:
+  status: true
+  scheme: public
+  directory: inline-images
+  max_size: ''
+  max_dimensions:
+    width: 0
+    height: 0
diff --git a/web/sites/default/config/editor.editor.restricted_html.yml b/web/sites/default/config/editor.editor.restricted_html.yml
new file mode 100644
index 0000000..e84453f
--- /dev/null
+++ b/web/sites/default/config/editor.editor.restricted_html.yml
@@ -0,0 +1,54 @@
+uuid: 3c023b28-9cf4-4472-95d8-d1e95a8a64c3
+langcode: en
+status: true
+dependencies:
+  config:
+    - filter.format.restricted_html
+  module:
+    - ckeditor
+_core:
+  default_config_hash: NFw-FV4pj6uSSrPKk6hukCnh_HMtC5PPEFYjLWGmPlc
+format: restricted_html
+editor: ckeditor
+settings:
+  toolbar:
+    rows:
+      -
+        -
+          name: Formatting
+          items:
+            - Bold
+            - Italic
+        -
+          name: Links
+          items:
+            - DrupalLink
+            - DrupalUnlink
+        -
+          name: Lists
+          items:
+            - BulletedList
+            - NumberedList
+        -
+          name: Media
+          items:
+            - Blockquote
+            - brightcove_video
+            - DrupalImage
+        -
+          name: Tools
+          items:
+            - Source
+  plugins:
+    stylescombo:
+      styles: ''
+    language:
+      language_list: un
+image_upload:
+  status: false
+  scheme: public
+  directory: inline-images
+  max_size: ''
+  max_dimensions:
+    width: null
+    height: null
diff --git a/web/sites/default/config/embed.button.brightcove_video.yml b/web/sites/default/config/embed.button.brightcove_video.yml
new file mode 100644
index 0000000..c3b6709
--- /dev/null
+++ b/web/sites/default/config/embed.button.brightcove_video.yml
@@ -0,0 +1,23 @@
+uuid: b4de79c1-71bb-42dd-bf97-e52400b78b00
+langcode: en
+status: true
+dependencies:
+  content:
+    - 'file:file:47a61fbb-b309-4f02-9213-46cf42042ff0'
+  module:
+    - brightcove
+    - entity_embed
+_core:
+  default_config_hash: NeUn1hwC27Dugk6IPWQDE_MfGC-gX3esTR0owIwosVI
+label: 'Brightcove video'
+id: brightcove_video
+type_id: entity
+type_settings:
+  entity_type: brightcove_video
+  bundles: {  }
+  display_plugins:
+    - 'view_mode:brightcove_video.embed'
+  entity_browser: brightcove_video_browser_widget
+  entity_browser_settings:
+    display_review: true
+icon_uuid: 47a61fbb-b309-4f02-9213-46cf42042ff0
diff --git a/web/sites/default/config/embed.button.node.yml b/web/sites/default/config/embed.button.node.yml
new file mode 100644
index 0000000..4decc0c
--- /dev/null
+++ b/web/sites/default/config/embed.button.node.yml
@@ -0,0 +1,17 @@
+uuid: c9228a8e-290c-4521-93ad-e501e4fe16ab
+langcode: en
+status: true
+dependencies:
+  module:
+    - entity_embed
+    - node
+_core:
+  default_config_hash: xgvZUh-eaMilacE1XYCQ9nLH-2-meOjCyofXSO82gqg
+label: Node
+id: node
+type_id: entity
+type_settings:
+  entity_type: node
+  bundles: {  }
+  display_plugins: {  }
+icon_uuid: null
diff --git a/web/sites/default/config/embed.settings.yml b/web/sites/default/config/embed.settings.yml
new file mode 100644
index 0000000..6ad6f80
--- /dev/null
+++ b/web/sites/default/config/embed.settings.yml
@@ -0,0 +1,4 @@
+file_scheme: public
+upload_directory: embed_buttons
+_core:
+  default_config_hash: Ed6LXVlKotwVS4tx7_rnsL-6NlBoD-PLu3KFPAvpNMc
diff --git a/web/sites/default/config/entity_browser.browser.brightcove_video_browser_widget.yml b/web/sites/default/config/entity_browser.browser.brightcove_video_browser_widget.yml
new file mode 100644
index 0000000..d9bebcc
--- /dev/null
+++ b/web/sites/default/config/entity_browser.browser.brightcove_video_browser_widget.yml
@@ -0,0 +1,35 @@
+uuid: 41742439-ef9a-4ae5-841f-cb861fb27cdb
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.brightcove_video_browser
+  module:
+    - views
+_core:
+  default_config_hash: vpnnr5NLAk0iXkf2NsXcOCAq0oB4pmi-M6cOfe-mgsk
+name: brightcove_video_browser_widget
+label: 'Brightcove video browser widget'
+display: iframe
+display_configuration:
+  width: '800'
+  height: '500'
+  link_text: 'Select video'
+  auto_open: true
+selection_display: no_display
+selection_display_configuration:
+  view: brightcove_video_browser
+  view_display: entity_browser_1
+widget_selector: single
+widget_selector_configuration: {  }
+widgets:
+  3ae3c3bd-4b7b-4c7f-83c0-d7bdf0856ba7:
+    settings:
+      view: brightcove_video_browser
+      view_display: entity_browser_1
+      submit_text: 'Select video'
+      auto_select: false
+    uuid: 3ae3c3bd-4b7b-4c7f-83c0-d7bdf0856ba7
+    weight: 1
+    label: Select
+    id: view
diff --git a/web/sites/default/config/entity_embed.settings.yml b/web/sites/default/config/entity_embed.settings.yml
new file mode 100644
index 0000000..a96c108
--- /dev/null
+++ b/web/sites/default/config/entity_embed.settings.yml
@@ -0,0 +1,3 @@
+rendered_entity_mode: false
+_core:
+  default_config_hash: 2qpyZdlgcQidJq1yw1VHXLCl5jDi4dKBWFWLQR4VDfw
diff --git a/web/sites/default/config/features.bundle.default.yml b/web/sites/default/config/features.bundle.default.yml
new file mode 100644
index 0000000..aff1ded
--- /dev/null
+++ b/web/sites/default/config/features.bundle.default.yml
@@ -0,0 +1,100 @@
+uuid: 1bdb1ea7-7e40-4c74-add0-c1d60dcc6b4f
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: Eu8CvZYqHh4Zx02qu1Xf9a7QC3JnDQTOZmSWkD8h4ic
+name: Default
+machine_name: default
+description: ''
+assignments:
+  alter:
+    core: true
+    uuid: true
+    user_permissions: true
+    enabled: true
+    weight: 0
+  base:
+    types:
+      config:
+        comment_type: comment_type
+        node_type: node_type
+      content:
+        user: user
+    enabled: true
+    weight: -2
+  core:
+    types:
+      config:
+        date_format: date_format
+        field_storage_config: field_storage_config
+        entity_form_mode: entity_form_mode
+        image_style: image_style
+        menu: menu
+        responsive_image_style: responsive_image_style
+        user_role: user_role
+        entity_view_mode: entity_view_mode
+    enabled: true
+    weight: 5
+  dependency:
+    enabled: true
+    weight: 15
+  exclude:
+    types:
+      config:
+        features_bundle: features_bundle
+    curated: true
+    module:
+      installed: true
+      profile: true
+      namespace: true
+      namespace_any: false
+    enabled: true
+    weight: -5
+  existing:
+    enabled: true
+    weight: 12
+  forward_dependency:
+    enabled: true
+    weight: 4
+  namespace:
+    enabled: true
+    weight: 0
+  optional:
+    types:
+      config: {  }
+    enabled: true
+    weight: 0
+  packages:
+    enabled: true
+    weight: -20
+  profile:
+    curated: true
+    standard:
+      files: true
+      dependencies: true
+    types:
+      config:
+        block: block
+        language_content_settings: language_content_settings
+        configurable_language: configurable_language
+        migration: migration
+        shortcut_set: shortcut_set
+        tour: tour
+    enabled: true
+    weight: 10
+  site:
+    types:
+      config:
+        action: action
+        contact_form: contact_form
+        block_content_type: block_content_type
+        rdf_mapping: rdf_mapping
+        search_page: search_page
+        taxonomy_vocabulary: taxonomy_vocabulary
+        editor: editor
+        filter_format: filter_format
+    enabled: true
+    weight: 7
+profile_name: ''
+is_profile: false
diff --git a/web/sites/default/config/features.bundle.nsf.yml b/web/sites/default/config/features.bundle.nsf.yml
new file mode 100644
index 0000000..fd97b31
--- /dev/null
+++ b/web/sites/default/config/features.bundle.nsf.yml
@@ -0,0 +1,100 @@
+uuid: f265866f-0323-48bf-97e3-6f7cf8d084b3
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: MWsbkIO1L_GJkFAeU0dhkgWNSX5McF_-rCJSARwzG_4
+name: NSF
+machine_name: nsf
+description: 'NSF Features.'
+assignments:
+  alter:
+    core: true
+    uuid: true
+    user_permissions: true
+    enabled: true
+    weight: 0
+  base:
+    types:
+      config:
+        comment_type: comment_type
+        node_type: node_type
+      content:
+        user: user
+    enabled: true
+    weight: -2
+  core:
+    types:
+      config:
+        date_format: date_format
+        field_storage_config: field_storage_config
+        entity_form_mode: entity_form_mode
+        image_style: image_style
+        menu: menu
+        responsive_image_style: responsive_image_style
+        user_role: user_role
+        entity_view_mode: entity_view_mode
+    enabled: true
+    weight: 5
+  dependency:
+    enabled: true
+    weight: 15
+  exclude:
+    types:
+      config:
+        features_bundle: features_bundle
+    curated: true
+    module:
+      installed: true
+      profile: true
+      namespace: true
+      namespace_any: false
+    enabled: true
+    weight: -5
+  existing:
+    enabled: true
+    weight: 12
+  forward_dependency:
+    enabled: true
+    weight: 4
+  namespace:
+    enabled: true
+    weight: 0
+  optional:
+    types:
+      config: {  }
+    enabled: true
+    weight: 0
+  packages:
+    enabled: true
+    weight: -20
+  profile:
+    curated: true
+    standard:
+      files: true
+      dependencies: true
+    types:
+      config:
+        block: block
+        language_content_settings: language_content_settings
+        configurable_language: configurable_language
+        migration: migration
+        shortcut_set: shortcut_set
+        tour: tour
+    enabled: true
+    weight: 10
+  site:
+    types:
+      config:
+        action: action
+        contact_form: contact_form
+        block_content_type: block_content_type
+        rdf_mapping: rdf_mapping
+        search_page: search_page
+        taxonomy_vocabulary: taxonomy_vocabulary
+        editor: editor
+        filter_format: filter_format
+    enabled: true
+    weight: 7
+profile_name: ''
+is_profile: false
diff --git a/web/sites/default/config/features.settings.yml b/web/sites/default/config/features.settings.yml
new file mode 100644
index 0000000..35fadfa
--- /dev/null
+++ b/web/sites/default/config/features.settings.yml
@@ -0,0 +1,5 @@
+export:
+  folder: custom
+langcode: en
+_core:
+  default_config_hash: YS8SFNy6Qff2UEsQ5zXWEj-ABeRS-jCgcHJrXHJhtJ0
diff --git a/web/sites/default/config/field.field.block_content.basic.body.yml b/web/sites/default/config/field.field.block_content.basic.body.yml
new file mode 100644
index 0000000..64c114a
--- /dev/null
+++ b/web/sites/default/config/field.field.block_content.basic.body.yml
@@ -0,0 +1,24 @@
+uuid: f0328f58-cca6-4028-8682-e02c50d58841
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.basic
+    - field.storage.block_content.body
+  module:
+    - text
+_core:
+  default_config_hash: R__6wc-rMfFMO8d7jcgqnqiA92j8spKhcc5MiqecrMc
+id: block_content.basic.body
+field_name: body
+entity_type: block_content
+bundle: basic
+label: Body
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  display_summary: false
+field_type: text_with_summary
diff --git a/web/sites/default/config/field.field.comment.comment.comment_body.yml b/web/sites/default/config/field.field.comment.comment.comment_body.yml
new file mode 100644
index 0000000..70700e4
--- /dev/null
+++ b/web/sites/default/config/field.field.comment.comment.comment_body.yml
@@ -0,0 +1,23 @@
+uuid: 3affeaac-efad-43f9-b335-cb4ba23427ca
+langcode: en
+status: true
+dependencies:
+  config:
+    - comment.type.comment
+    - field.storage.comment.comment_body
+  module:
+    - text
+_core:
+  default_config_hash: TmAKjNrJ7RR60YpqvJq_QqEewYe_S8Kd23n8VRCqiWs
+id: comment.comment.comment_body
+field_name: comment_body
+entity_type: comment
+bundle: comment
+label: Comment
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: text_long
diff --git a/web/sites/default/config/field.field.node.news.body.yml b/web/sites/default/config/field.field.node.news.body.yml
new file mode 100644
index 0000000..c627ce9
--- /dev/null
+++ b/web/sites/default/config/field.field.node.news.body.yml
@@ -0,0 +1,22 @@
+uuid: e2894a3e-a709-453c-a217-3e8825c1dcd6
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.body
+    - node.type.news
+  module:
+    - text
+id: node.news.body
+field_name: body
+entity_type: node
+bundle: news
+label: Body
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  display_summary: false
+field_type: text_with_summary
diff --git a/web/sites/default/config/field.field.node.news.field_caption.yml b/web/sites/default/config/field.field.node.news.field_caption.yml
new file mode 100644
index 0000000..0dc0334
--- /dev/null
+++ b/web/sites/default/config/field.field.node.news.field_caption.yml
@@ -0,0 +1,21 @@
+uuid: b04bf031-b9af-4f46-b304-e160963bf6a0
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_caption
+    - node.type.news
+  module:
+    - text
+id: node.news.field_caption
+field_name: field_caption
+entity_type: node
+bundle: news
+label: 'Caption for featured image'
+description: 'The photo credit and caption for the featured image.'
+required: true
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: text
diff --git a/web/sites/default/config/field.field.node.news.field_featured_image.yml b/web/sites/default/config/field.field.node.news.field_featured_image.yml
new file mode 100644
index 0000000..041889f
--- /dev/null
+++ b/web/sites/default/config/field.field.node.news.field_featured_image.yml
@@ -0,0 +1,38 @@
+uuid: c42bcd1a-283c-4647-a77b-c638b25e702e
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_featured_image
+    - node.type.news
+  module:
+    - image
+id: node.news.field_featured_image
+field_name: field_featured_image
+entity_type: node
+bundle: news
+label: 'Featured image'
+description: ''
+required: true
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: news
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  max_resolution: 2400x2400
+  min_resolution: 350x220
+  alt_field: true
+  alt_field_required: true
+  title_field: false
+  title_field_required: false
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
diff --git a/web/sites/default/config/field.field.node.news.field_funding.yml b/web/sites/default/config/field.field.node.news.field_funding.yml
new file mode 100644
index 0000000..54ec812
--- /dev/null
+++ b/web/sites/default/config/field.field.node.news.field_funding.yml
@@ -0,0 +1,23 @@
+uuid: 025c96d6-1b52-4523-8ce8-3abb3ec8ca3b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_funding
+    - node.type.news
+id: node.news.field_funding
+field_name: field_funding
+entity_type: node
+bundle: news
+label: Funding
+description: 'The amount of funding that''s been allocated, in dollars.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  min: 0
+  max: null
+  prefix: $
+  suffix: ''
+field_type: integer
diff --git a/web/sites/default/config/field.field.node.news.field_media_queries.yml b/web/sites/default/config/field.field.node.news.field_media_queries.yml
new file mode 100644
index 0000000..1f04c2f
--- /dev/null
+++ b/web/sites/default/config/field.field.node.news.field_media_queries.yml
@@ -0,0 +1,24 @@
+uuid: 7d62c14a-fdee-469c-8739-53b48d618fc8
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_media_queries
+    - node.type.news
+  module:
+    - text
+id: node.news.field_media_queries
+field_name: field_media_queries
+entity_type: node
+bundle: news
+label: 'Media queries'
+description: ''
+required: false
+translatable: false
+default_value:
+  -
+    value: 'For questions about this piece, contact Cheryl Dybas at NSF. <br />Phone: (703) 292-7734<br /> Email: <a href="mailto:cydbas@nsf.gov">cydbas@nsf.gov</a>'
+    format: basic_html
+default_value_callback: ''
+settings: {  }
+field_type: text
diff --git a/web/sites/default/config/field.field.node.news.field_press_release_number.yml b/web/sites/default/config/field.field.node.news.field_press_release_number.yml
new file mode 100644
index 0000000..4a79841
--- /dev/null
+++ b/web/sites/default/config/field.field.node.news.field_press_release_number.yml
@@ -0,0 +1,19 @@
+uuid: c72c8c4f-8e74-4ceb-b279-3561bf175525
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_press_release_number
+    - node.type.news
+id: node.news.field_press_release_number
+field_name: field_press_release_number
+entity_type: node
+bundle: news
+label: 'Press release number'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/web/sites/default/config/field.field.node.news.field_publication_date.yml b/web/sites/default/config/field.field.node.news.field_publication_date.yml
new file mode 100644
index 0000000..cc742bd
--- /dev/null
+++ b/web/sites/default/config/field.field.node.news.field_publication_date.yml
@@ -0,0 +1,24 @@
+uuid: f9b669fc-3197-4bba-b508-daf3f4a15a45
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_publication_date
+    - node.type.news
+  module:
+    - datetime
+id: node.news.field_publication_date
+field_name: field_publication_date
+entity_type: node
+bundle: news
+label: Published
+description: 'Date of publication.'
+required: true
+translatable: false
+default_value:
+  -
+    default_date_type: now
+    default_date: now
+default_value_callback: ''
+settings: {  }
+field_type: datetime
diff --git a/web/sites/default/config/field.field.node.news.field_subtitle.yml b/web/sites/default/config/field.field.node.news.field_subtitle.yml
new file mode 100644
index 0000000..ca22fdf
--- /dev/null
+++ b/web/sites/default/config/field.field.node.news.field_subtitle.yml
@@ -0,0 +1,19 @@
+uuid: 2e4c2527-6ebc-48da-b4e1-855c337aeb94
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_subtitle
+    - node.type.news
+id: node.news.field_subtitle
+field_name: field_subtitle
+entity_type: node
+bundle: news
+label: Subtitle
+description: ''
+required: true
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/web/sites/default/config/field.field.node.page.body.yml b/web/sites/default/config/field.field.node.page.body.yml
new file mode 100644
index 0000000..e560490
--- /dev/null
+++ b/web/sites/default/config/field.field.node.page.body.yml
@@ -0,0 +1,24 @@
+uuid: 91cc1609-54af-490e-8903-90aca56a997c
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.body
+    - node.type.page
+  module:
+    - text
+_core:
+  default_config_hash: rUop-8b6hvxxDYbv-KobTfNIBNbPY9qOPl8f6kBNSpw
+id: node.page.body
+field_name: body
+entity_type: node
+bundle: page
+label: Body
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  display_summary: false
+field_type: text_with_summary
diff --git a/web/sites/default/config/field.field.user.user.user_picture.yml b/web/sites/default/config/field.field.user.user.user_picture.yml
new file mode 100644
index 0000000..8b3ca07
--- /dev/null
+++ b/web/sites/default/config/field.field.user.user.user_picture.yml
@@ -0,0 +1,40 @@
+uuid: e2e5bc2c-9884-46db-9fc7-e3ed7d1dd7e3
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.user.user_picture
+  module:
+    - image
+    - user
+_core:
+  default_config_hash: Iiq0AttdhgbebJwabSFwQQ1ORn64GoGz0xSZ_eyCJ8A
+id: user.user.user_picture
+field_name: user_picture
+entity_type: user
+bundle: user
+label: Picture
+description: 'Your virtual face or picture.'
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_extensions: 'png gif jpg jpeg'
+  file_directory: 'pictures/[date:custom:Y]-[date:custom:m]'
+  max_filesize: ''
+  alt_field: false
+  title_field: false
+  max_resolution: ''
+  min_resolution: ''
+  default_image:
+    uuid: null
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  alt_field_required: false
+  title_field_required: false
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
diff --git a/web/sites/default/config/field.settings.yml b/web/sites/default/config/field.settings.yml
new file mode 100644
index 0000000..95c042d
--- /dev/null
+++ b/web/sites/default/config/field.settings.yml
@@ -0,0 +1,3 @@
+purge_batch_size: 50
+_core:
+  default_config_hash: nJk0TAQBzlNo52ehiHI7bIEPLGi0BYqZvPdEn7Chfu0
diff --git a/web/sites/default/config/field.storage.block_content.body.yml b/web/sites/default/config/field.storage.block_content.body.yml
new file mode 100644
index 0000000..10c36b7
--- /dev/null
+++ b/web/sites/default/config/field.storage.block_content.body.yml
@@ -0,0 +1,21 @@
+uuid: b07313c3-2f79-4d05-9a62-16464c9d3358
+langcode: en
+status: true
+dependencies:
+  module:
+    - block_content
+    - text
+_core:
+  default_config_hash: eS0snV_L3dx9shtWRTzm5eblwOJ7qKWC9IE-4GMTDFc
+id: block_content.body
+field_name: body
+entity_type: block_content
+type: text_with_summary
+settings: {  }
+module: text
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: true
+custom_storage: false
diff --git a/web/sites/default/config/field.storage.comment.comment_body.yml b/web/sites/default/config/field.storage.comment.comment_body.yml
new file mode 100644
index 0000000..f4860cb
--- /dev/null
+++ b/web/sites/default/config/field.storage.comment.comment_body.yml
@@ -0,0 +1,21 @@
+uuid: 65a8ac41-d132-4255-84fe-b92fdf8cfd1d
+langcode: en
+status: true
+dependencies:
+  module:
+    - comment
+    - text
+_core:
+  default_config_hash: swYoCch_hY8QO5uwr4FURplfnUCUlpPB4idF8WGVCpw
+id: comment.comment_body
+field_name: comment_body
+entity_type: comment
+type: text_long
+settings: {  }
+module: text
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: true
+custom_storage: false
diff --git a/web/sites/default/config/field.storage.node.body.yml b/web/sites/default/config/field.storage.node.body.yml
new file mode 100644
index 0000000..1c20587
--- /dev/null
+++ b/web/sites/default/config/field.storage.node.body.yml
@@ -0,0 +1,21 @@
+uuid: d80aeeba-69da-480e-8f13-6be99c1350b0
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - text
+_core:
+  default_config_hash: EBUo7qOWqaiZaQ_RC9sLY5IoDKphS34v77VIHSACmVY
+id: node.body
+field_name: body
+entity_type: node
+type: text_with_summary
+settings: {  }
+module: text
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: true
+custom_storage: false
diff --git a/web/sites/default/config/field.storage.node.field_caption.yml b/web/sites/default/config/field.storage.node.field_caption.yml
new file mode 100644
index 0000000..20bada4
--- /dev/null
+++ b/web/sites/default/config/field.storage.node.field_caption.yml
@@ -0,0 +1,20 @@
+uuid: 2b080a21-e169-4775-ad3c-6d1bad06a039
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - text
+id: node.field_caption
+field_name: field_caption
+entity_type: node
+type: text
+settings:
+  max_length: 255
+module: text
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/web/sites/default/config/field.storage.node.field_featured_image.yml b/web/sites/default/config/field.storage.node.field_featured_image.yml
new file mode 100644
index 0000000..b849e37
--- /dev/null
+++ b/web/sites/default/config/field.storage.node.field_featured_image.yml
@@ -0,0 +1,30 @@
+uuid: 6a96e82f-291b-4d41-98a1-bf4085846896
+langcode: en
+status: true
+dependencies:
+  module:
+    - file
+    - image
+    - node
+id: node.field_featured_image
+field_name: field_featured_image
+entity_type: node
+type: image
+settings:
+  uri_scheme: public
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  target_type: file
+  display_field: false
+  display_default: false
+module: image
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/web/sites/default/config/field.storage.node.field_funding.yml b/web/sites/default/config/field.storage.node.field_funding.yml
new file mode 100644
index 0000000..5915f07
--- /dev/null
+++ b/web/sites/default/config/field.storage.node.field_funding.yml
@@ -0,0 +1,20 @@
+uuid: cd7b1f98-ccd5-4f4f-ac71-f2dc26ae27fd
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: node.field_funding
+field_name: field_funding
+entity_type: node
+type: integer
+settings:
+  unsigned: false
+  size: normal
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/web/sites/default/config/field.storage.node.field_media_queries.yml b/web/sites/default/config/field.storage.node.field_media_queries.yml
new file mode 100644
index 0000000..5cb2633
--- /dev/null
+++ b/web/sites/default/config/field.storage.node.field_media_queries.yml
@@ -0,0 +1,20 @@
+uuid: ea65babd-5f97-4b0d-bcea-0f586b8c09ab
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - text
+id: node.field_media_queries
+field_name: field_media_queries
+entity_type: node
+type: text
+settings:
+  max_length: 500
+module: text
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/web/sites/default/config/field.storage.node.field_press_release_number.yml b/web/sites/default/config/field.storage.node.field_press_release_number.yml
new file mode 100644
index 0000000..1188b49
--- /dev/null
+++ b/web/sites/default/config/field.storage.node.field_press_release_number.yml
@@ -0,0 +1,21 @@
+uuid: 027671f5-5ee3-4e38-8776-1584511e82ac
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: node.field_press_release_number
+field_name: field_press_release_number
+entity_type: node
+type: string
+settings:
+  max_length: 20
+  is_ascii: false
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/web/sites/default/config/field.storage.node.field_publication_date.yml b/web/sites/default/config/field.storage.node.field_publication_date.yml
new file mode 100644
index 0000000..8024dcc
--- /dev/null
+++ b/web/sites/default/config/field.storage.node.field_publication_date.yml
@@ -0,0 +1,20 @@
+uuid: b3bfa099-c359-4d83-a004-885902884c95
+langcode: en
+status: true
+dependencies:
+  module:
+    - datetime
+    - node
+id: node.field_publication_date
+field_name: field_publication_date
+entity_type: node
+type: datetime
+settings:
+  datetime_type: date
+module: datetime
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/web/sites/default/config/field.storage.node.field_subtitle.yml b/web/sites/default/config/field.storage.node.field_subtitle.yml
new file mode 100644
index 0000000..f7bb480
--- /dev/null
+++ b/web/sites/default/config/field.storage.node.field_subtitle.yml
@@ -0,0 +1,21 @@
+uuid: baf1bdd0-2e8e-4214-bde4-868242a1c544
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: node.field_subtitle
+field_name: field_subtitle
+entity_type: node
+type: string
+settings:
+  max_length: 255
+  is_ascii: false
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/web/sites/default/config/field.storage.user.user_picture.yml b/web/sites/default/config/field.storage.user.user_picture.yml
new file mode 100644
index 0000000..dfa52f4
--- /dev/null
+++ b/web/sites/default/config/field.storage.user.user_picture.yml
@@ -0,0 +1,34 @@
+uuid: d1327a2d-c4d9-478f-80a9-5320ead41265
+langcode: en
+status: true
+dependencies:
+  module:
+    - file
+    - image
+    - user
+_core:
+  default_config_hash: 6k-VBFilDLuzgSOT-77CFgHFlcd5D-kqRixtH89EShU
+id: user.user_picture
+field_name: user_picture
+entity_type: user
+type: image
+settings:
+  uri_scheme: public
+  default_image:
+    uuid: null
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  target_type: file
+  display_field: false
+  display_default: false
+module: image
+locked: false
+cardinality: 1
+translatable: true
+indexes:
+  target_id:
+    - target_id
+persist_with_no_fields: false
+custom_storage: false
diff --git a/web/sites/default/config/field_ui.settings.yml b/web/sites/default/config/field_ui.settings.yml
new file mode 100644
index 0000000..2743969
--- /dev/null
+++ b/web/sites/default/config/field_ui.settings.yml
@@ -0,0 +1,3 @@
+field_prefix: field_
+_core:
+  default_config_hash: Q1nMi90W6YQxKzZAgJQw7Ag9U4JrsEUwkomF0lhvbIM
diff --git a/web/sites/default/config/file.settings.yml b/web/sites/default/config/file.settings.yml
new file mode 100644
index 0000000..3315165
--- /dev/null
+++ b/web/sites/default/config/file.settings.yml
@@ -0,0 +1,8 @@
+description:
+  type: textfield
+  length: 128
+icon:
+  directory: core/modules/file/icons
+make_unused_managed_files_temporary: false
+_core:
+  default_config_hash: 0aMkoXYnax5_tHI9C9zHs-K48KJ6K75PHtD9x-0nbgM
diff --git a/web/sites/default/config/filter.format.basic_html.yml b/web/sites/default/config/filter.format.basic_html.yml
new file mode 100644
index 0000000..532a8a8
--- /dev/null
+++ b/web/sites/default/config/filter.format.basic_html.yml
@@ -0,0 +1,77 @@
+uuid: ca594055-9af6-42ab-9814-d119adc71c6c
+langcode: en
+status: true
+dependencies:
+  module:
+    - editor
+    - entity_embed
+_core:
+  default_config_hash: P8ddpAIKtawJDi5SzOwCzVnnNYqONewSTJ6Xn0dW_aQ
+name: 'Basic HTML'
+format: basic_html
+weight: 0
+filters:
+  filter_html:
+    id: filter_html
+    provider: filter
+    status: true
+    weight: -50
+    settings:
+      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p> <br> <span> <img src alt height width data-entity-type data-entity-uuid data-align data-caption> <drupal-entity data-entity-type data-entity-uuid data-entity-embed-display data-entity-embed-display-settings data-align data-caption data-embed-button> <sup> <sub>'
+      filter_html_help: false
+      filter_html_nofollow: true
+  filter_align:
+    id: filter_align
+    provider: filter
+    status: true
+    weight: -49
+    settings: {  }
+  filter_caption:
+    id: filter_caption
+    provider: filter
+    status: true
+    weight: -48
+    settings: {  }
+  editor_file_reference:
+    id: editor_file_reference
+    provider: editor
+    status: true
+    weight: -46
+    settings: {  }
+  filter_html_image_secure:
+    id: filter_html_image_secure
+    provider: filter
+    status: false
+    weight: -47
+    settings: {  }
+  entity_embed:
+    id: entity_embed
+    provider: entity_embed
+    status: true
+    weight: -45
+    settings: {  }
+  filter_htmlcorrector:
+    id: filter_htmlcorrector
+    provider: filter
+    status: false
+    weight: -41
+    settings: {  }
+  filter_autop:
+    id: filter_autop
+    provider: filter
+    status: false
+    weight: -43
+    settings: {  }
+  filter_url:
+    id: filter_url
+    provider: filter
+    status: false
+    weight: -42
+    settings:
+      filter_url_length: 72
+  filter_html_escape:
+    id: filter_html_escape
+    provider: filter
+    status: false
+    weight: -44
+    settings: {  }
diff --git a/web/sites/default/config/filter.format.full_html.yml b/web/sites/default/config/filter.format.full_html.yml
new file mode 100644
index 0000000..a8cf753
--- /dev/null
+++ b/web/sites/default/config/filter.format.full_html.yml
@@ -0,0 +1,36 @@
+uuid: a19db88b-fcb5-4b3e-94b0-4823a44be409
+langcode: en
+status: true
+dependencies:
+  module:
+    - editor
+_core:
+  default_config_hash: hewPmBgni9jlDK_IjLxUx1HsTbinK-hdl0lOwjbteIY
+name: 'Full HTML'
+format: full_html
+weight: 1
+filters:
+  filter_align:
+    id: filter_align
+    provider: filter
+    status: true
+    weight: 8
+    settings: {  }
+  filter_caption:
+    id: filter_caption
+    provider: filter
+    status: true
+    weight: 9
+    settings: {  }
+  filter_htmlcorrector:
+    id: filter_htmlcorrector
+    provider: filter
+    status: true
+    weight: 10
+    settings: {  }
+  editor_file_reference:
+    id: editor_file_reference
+    provider: editor
+    status: true
+    weight: 11
+    settings: {  }
diff --git a/web/sites/default/config/filter.format.plain_text.yml b/web/sites/default/config/filter.format.plain_text.yml
new file mode 100644
index 0000000..7df622a
--- /dev/null
+++ b/web/sites/default/config/filter.format.plain_text.yml
@@ -0,0 +1,29 @@
+uuid: d6220508-1409-46db-8958-5d601a1786fb
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: NIKBt6kw_uPhNI0qtR2DnRf7mSOgAQdx7Q94SKMjXbQ
+name: 'Plain text'
+format: plain_text
+weight: 10
+filters:
+  filter_html_escape:
+    id: filter_html_escape
+    provider: filter
+    status: true
+    weight: -10
+    settings: {  }
+  filter_url:
+    id: filter_url
+    provider: filter
+    status: true
+    weight: 0
+    settings:
+      filter_url_length: 72
+  filter_autop:
+    id: filter_autop
+    provider: filter
+    status: true
+    weight: 0
+    settings: {  }
diff --git a/web/sites/default/config/filter.format.restricted_html.yml b/web/sites/default/config/filter.format.restricted_html.yml
new file mode 100644
index 0000000..6c5a38a
--- /dev/null
+++ b/web/sites/default/config/filter.format.restricted_html.yml
@@ -0,0 +1,77 @@
+uuid: 33b67154-0909-47bc-97c3-bc0b1d5a22bc
+langcode: en
+status: true
+dependencies:
+  module:
+    - editor
+    - entity_embed
+_core:
+  default_config_hash: KUjJ8Ti_ZJSlhGM88E_mhJP-8mmQRNUB6RFof615Kt0
+name: 'Restricted HTML'
+format: restricted_html
+weight: 0
+filters:
+  filter_html:
+    id: filter_html
+    provider: filter
+    status: true
+    weight: -50
+    settings:
+      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <drupal-entity data-entity-type data-entity-uuid data-entity-embed-display data-entity-embed-display-settings data-align data-caption data-embed-button> <img src alt data-entity-type data-entity-uuid>'
+      filter_html_help: true
+      filter_html_nofollow: false
+  filter_autop:
+    id: filter_autop
+    provider: filter
+    status: true
+    weight: -49
+    settings: {  }
+  filter_url:
+    id: filter_url
+    provider: filter
+    status: true
+    weight: -48
+    settings:
+      filter_url_length: 72
+  editor_file_reference:
+    id: editor_file_reference
+    provider: editor
+    status: false
+    weight: -46
+    settings: {  }
+  entity_embed:
+    id: entity_embed
+    provider: entity_embed
+    status: true
+    weight: -43
+    settings: {  }
+  filter_htmlcorrector:
+    id: filter_htmlcorrector
+    provider: filter
+    status: false
+    weight: -41
+    settings: {  }
+  filter_align:
+    id: filter_align
+    provider: filter
+    status: true
+    weight: -45
+    settings: {  }
+  filter_html_image_secure:
+    id: filter_html_image_secure
+    provider: filter
+    status: false
+    weight: -42
+    settings: {  }
+  filter_caption:
+    id: filter_caption
+    provider: filter
+    status: true
+    weight: -44
+    settings: {  }
+  filter_html_escape:
+    id: filter_html_escape
+    provider: filter
+    status: false
+    weight: -47
+    settings: {  }
diff --git a/web/sites/default/config/filter.settings.yml b/web/sites/default/config/filter.settings.yml
new file mode 100644
index 0000000..dfcfed3
--- /dev/null
+++ b/web/sites/default/config/filter.settings.yml
@@ -0,0 +1,4 @@
+fallback_format: plain_text
+always_show_fallback_choice: false
+_core:
+  default_config_hash: FiPjM3WdB__ruFA7B6TLwni_UcZbmek5G4b2dxQItxA
diff --git a/web/sites/default/config/image.settings.yml b/web/sites/default/config/image.settings.yml
new file mode 100644
index 0000000..52ee4a8
--- /dev/null
+++ b/web/sites/default/config/image.settings.yml
@@ -0,0 +1,5 @@
+preview_image: core/modules/image/sample.png
+allow_insecure_derivatives: false
+suppress_itok_output: false
+_core:
+  default_config_hash: k-yDFHbqNfpe-Srg4sdCSqaosCl2D8uwyEY5esF8gEw
diff --git a/web/sites/default/config/image.style.brightcove_videos_list_thumbnail.yml b/web/sites/default/config/image.style.brightcove_videos_list_thumbnail.yml
new file mode 100644
index 0000000..acbbe96
--- /dev/null
+++ b/web/sites/default/config/image.style.brightcove_videos_list_thumbnail.yml
@@ -0,0 +1,16 @@
+uuid: 03b3e32c-5fad-4cab-8b5f-42be2af6da72
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: h01yu5kyiS3SDj7IjihWpsBAl-BaeqYsIWEFMHEA_TM
+name: brightcove_videos_list_thumbnail
+label: 'Brightcove Videos list thumbnail'
+effects:
+  c5f45224-6710-4023-a377-449acc3b2468:
+    uuid: c5f45224-6710-4023-a377-449acc3b2468
+    id: image_scale_and_crop
+    weight: 1
+    data:
+      width: 68
+      height: 45
diff --git a/web/sites/default/config/image.style.large.yml b/web/sites/default/config/image.style.large.yml
new file mode 100644
index 0000000..6bb3757
--- /dev/null
+++ b/web/sites/default/config/image.style.large.yml
@@ -0,0 +1,17 @@
+uuid: bcd00987-1ef4-4c81-a158-a4ac2b687294
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: J2n0RpFzS0-bgSyxjs6rSdgxB1rb-bTAgqywNx_964M
+name: large
+label: 'Large (480×480)'
+effects:
+  ddd73aa7-4bd6-4c85-b600-bdf2b1628d1d:
+    uuid: ddd73aa7-4bd6-4c85-b600-bdf2b1628d1d
+    id: image_scale
+    weight: 0
+    data:
+      width: 480
+      height: 480
+      upscale: false
diff --git a/web/sites/default/config/image.style.medium.yml b/web/sites/default/config/image.style.medium.yml
new file mode 100644
index 0000000..65bcc7f
--- /dev/null
+++ b/web/sites/default/config/image.style.medium.yml
@@ -0,0 +1,17 @@
+uuid: 7538f4af-fef9-4843-876a-ad0afd2bfb18
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: Y9NmnZHQq20ASSyTNA6JnwtWrJJiSajOehGDtmUFdM0
+name: medium
+label: 'Medium (220×220)'
+effects:
+  bddf0d06-42f9-4c75-a700-a33cafa25ea0:
+    uuid: bddf0d06-42f9-4c75-a700-a33cafa25ea0
+    id: image_scale
+    weight: 0
+    data:
+      width: 220
+      height: 220
+      upscale: false
diff --git a/web/sites/default/config/image.style.news_main_story.yml b/web/sites/default/config/image.style.news_main_story.yml
new file mode 100644
index 0000000..c4182a1
--- /dev/null
+++ b/web/sites/default/config/image.style.news_main_story.yml
@@ -0,0 +1,14 @@
+uuid: 1b0fc8b1-cc5f-451d-ba83-77742370ab4f
+langcode: en
+status: true
+dependencies: {  }
+name: news_main_story
+label: 'News (main story)'
+effects:
+  70e624f7-f22f-4204-aaf2-17497e0db849:
+    uuid: 70e624f7-f22f-4204-aaf2-17497e0db849
+    id: image_scale_and_crop
+    weight: 2
+    data:
+      width: 820
+      height: 525
diff --git a/web/sites/default/config/image.style.news_thumbnail.yml b/web/sites/default/config/image.style.news_thumbnail.yml
new file mode 100644
index 0000000..133e86e
--- /dev/null
+++ b/web/sites/default/config/image.style.news_thumbnail.yml
@@ -0,0 +1,14 @@
+uuid: 3ece18a6-e265-4500-9a84-60a9f23d39d3
+langcode: en
+status: true
+dependencies: {  }
+name: news_thumbnail
+label: 'News thumbnail'
+effects:
+  c8299c6c-8e10-43f2-988d-7cbabd8a6c90:
+    uuid: c8299c6c-8e10-43f2-988d-7cbabd8a6c90
+    id: image_scale_and_crop
+    weight: 1
+    data:
+      width: 85
+      height: 65
diff --git a/web/sites/default/config/image.style.thumbnail.yml b/web/sites/default/config/image.style.thumbnail.yml
new file mode 100644
index 0000000..1238c3f
--- /dev/null
+++ b/web/sites/default/config/image.style.thumbnail.yml
@@ -0,0 +1,17 @@
+uuid: 81334f8e-c364-4302-92f9-e0b1691178ad
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: cCiWdBHgLwj5omG35lsKc4LkW4MBdmcctkVop4ol5x0
+name: thumbnail
+label: 'Thumbnail (100×100)'
+effects:
+  1cfec298-8620-4749-b100-ccb6c4500779:
+    uuid: 1cfec298-8620-4749-b100-ccb6c4500779
+    id: image_scale
+    weight: 0
+    data:
+      width: 100
+      height: 100
+      upscale: false
diff --git a/web/sites/default/config/media_entity.settings.yml b/web/sites/default/config/media_entity.settings.yml
new file mode 100644
index 0000000..9484736
--- /dev/null
+++ b/web/sites/default/config/media_entity.settings.yml
@@ -0,0 +1,3 @@
+icon_base: 'public://media-icons/generic'
+_core:
+  default_config_hash: YMsgn0Y9ZO0Iu9iTMqqw6_Uev6-rVAdgxpJSy1s4-zc
diff --git a/web/sites/default/config/menu_ui.settings.yml b/web/sites/default/config/menu_ui.settings.yml
new file mode 100644
index 0000000..c9fe099
--- /dev/null
+++ b/web/sites/default/config/menu_ui.settings.yml
@@ -0,0 +1,3 @@
+override_parent_selector: false
+_core:
+  default_config_hash: SqMarzIjxC3F8dZo9FEOxfqDKD_sdW1tbcFTV1BA2zU
diff --git a/web/sites/default/config/node.settings.yml b/web/sites/default/config/node.settings.yml
new file mode 100644
index 0000000..1657c1c
--- /dev/null
+++ b/web/sites/default/config/node.settings.yml
@@ -0,0 +1,3 @@
+use_admin_theme: true
+_core:
+  default_config_hash: 2OMXCScXUOLSYID9-phjO4q36nnnaMWNUlDxEqZzG1U
diff --git a/web/sites/default/config/node.type.news.yml b/web/sites/default/config/node.type.news.yml
new file mode 100644
index 0000000..94b2195
--- /dev/null
+++ b/web/sites/default/config/node.type.news.yml
@@ -0,0 +1,30 @@
+uuid: 68f76735-9610-4b8d-ad4b-47801e71a05d
+langcode: en
+status: true
+dependencies:
+  module:
+    - menu_ui
+    - scheduler
+third_party_settings:
+  menu_ui:
+    available_menus:
+      - main
+    parent: 'main:'
+  scheduler:
+    expand_fieldset: when_required
+    fields_display_mode: fieldset
+    publish_enable: true
+    publish_past_date: publish
+    publish_required: false
+    publish_revision: true
+    publish_touch: true
+    unpublish_enable: true
+    unpublish_required: false
+    unpublish_revision: true
+name: Article
+type: news
+description: 'A news release, press statement, etc.'
+help: ''
+new_revision: false
+preview_mode: 1
+display_submitted: false
diff --git a/web/sites/default/config/node.type.page.yml b/web/sites/default/config/node.type.page.yml
new file mode 100644
index 0000000..62b4e2b
--- /dev/null
+++ b/web/sites/default/config/node.type.page.yml
@@ -0,0 +1,32 @@
+uuid: 7394d1ba-289a-4fa6-b952-d61aba767c53
+langcode: en
+status: true
+dependencies:
+  module:
+    - menu_ui
+    - scheduler
+third_party_settings:
+  menu_ui:
+    available_menus:
+      - main
+    parent: 'main:'
+  scheduler:
+    expand_fieldset: when_required
+    fields_display_mode: vertical_tab
+    publish_enable: false
+    publish_past_date: error
+    publish_required: false
+    publish_revision: false
+    publish_touch: false
+    unpublish_enable: false
+    unpublish_required: false
+    unpublish_revision: false
+_core:
+  default_config_hash: KuyA4NHPXcmKAjRtwa0vQc2ZcyrUJy6IlS2TAyMNRbc
+name: Webpage
+type: page
+description: 'Use <em>webpages</em> for your static content, such as an ''About us'' page.'
+help: ''
+new_revision: false
+preview_mode: 1
+display_submitted: false
diff --git a/web/sites/default/config/nsf.settings.yml b/web/sites/default/config/nsf.settings.yml
new file mode 100644
index 0000000..fc21f0a
--- /dev/null
+++ b/web/sites/default/config/nsf.settings.yml
@@ -0,0 +1,34 @@
+features:
+  node_user_picture: 0
+  comment_user_picture: 0
+  comment_user_verification: 0
+  favicon: 0
+logo:
+  use_default: 0
+  path: 'public://nsf_logo-orig_0.png'
+favicon:
+  use_default: 1
+uswds_header_style: basic
+uswds_header_mega: 0
+uswds_search: 0
+uswds_government_banner: 0
+uswds_footer_style: slim
+uswds_footer_agency: 0
+uswds_footer_agency_name: ''
+uswds_footer_agency_url: ''
+uswds_footer_agency_logo: ''
+uswds_contact_center: ''
+uswds_email: ''
+uswds_phone: ''
+uswds_facebook: ''
+uswds_twitter: ''
+uswds_youtube: ''
+uswds_rss: ''
+uswds_paragraphs_edge_to_edge: 0
+uswds_menu_accordion_duplicate_parent: 0
+uswds_menu_bypass:
+  primary_menu: 0
+  secondary_menu: 0
+  mobile_menu: 0
+  sidebar_first: 0
+  footer_menu: 0
diff --git a/web/sites/default/config/pathauto.pattern.news.yml b/web/sites/default/config/pathauto.pattern.news.yml
new file mode 100644
index 0000000..eadddd8
--- /dev/null
+++ b/web/sites/default/config/pathauto.pattern.news.yml
@@ -0,0 +1,22 @@
+uuid: 1e6518a1-f0fb-4234-a90b-9390075acb88
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: news
+label: News
+type: 'canonical_entities:node'
+pattern: 'news/[node:title]'
+selection_criteria:
+  755cac68-5850-494d-8975-a8d0bdbd0b30:
+    id: node_type
+    bundles:
+      news: news
+    negate: false
+    context_mapping:
+      node: node
+    uuid: 755cac68-5850-494d-8975-a8d0bdbd0b30
+selection_logic: and
+weight: -5
+relationships: {  }
diff --git a/web/sites/default/config/pathauto.pattern.page.yml b/web/sites/default/config/pathauto.pattern.page.yml
new file mode 100644
index 0000000..184d943
--- /dev/null
+++ b/web/sites/default/config/pathauto.pattern.page.yml
@@ -0,0 +1,22 @@
+uuid: a8e6324a-9fc1-43e0-bfe4-611480c399b0
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: page
+label: Page
+type: 'canonical_entities:node'
+pattern: '[node:menu-link:parent]/[node:title]'
+selection_criteria:
+  3a361ea7-a27f-47f1-80ca-3938879e13c0:
+    id: node_type
+    bundles:
+      page: page
+    negate: false
+    context_mapping:
+      node: node
+    uuid: 3a361ea7-a27f-47f1-80ca-3938879e13c0
+selection_logic: and
+weight: -5
+relationships: {  }
diff --git a/web/sites/default/config/pathauto.settings.yml b/web/sites/default/config/pathauto.settings.yml
new file mode 100644
index 0000000..cfaf2d6
--- /dev/null
+++ b/web/sites/default/config/pathauto.settings.yml
@@ -0,0 +1,15 @@
+enabled_entity_types:
+  - user
+punctuation:
+  hyphen: 1
+verbose: false
+separator: '-'
+max_length: 100
+max_component_length: 100
+transliterate: true
+reduce_ascii: false
+case: true
+ignore_words: 'a, an, as, at, before, but, by, for, from, is, in, into, like, of, off, on, onto, per, since, than, the, this, that, to, up, via, with'
+update_action: 2
+_core:
+  default_config_hash: GcMSgi6uAfG5R_FGEsWUVCvRPkNIzPUH2bNVcx6H0JA
diff --git a/web/sites/default/config/rdf.mapping.comment.comment.yml b/web/sites/default/config/rdf.mapping.comment.comment.yml
new file mode 100644
index 0000000..262d4ce
--- /dev/null
+++ b/web/sites/default/config/rdf.mapping.comment.comment.yml
@@ -0,0 +1,36 @@
+uuid: a8b5949b-e91b-4fda-96a0-80eb098c4b41
+langcode: en
+status: true
+dependencies:
+  config:
+    - comment.type.comment
+  module:
+    - comment
+_core:
+  default_config_hash: uETe6XupRGKDForx2MpY0pMOEu6CzGgdCAZZOKkbgmk
+id: comment.comment
+targetEntityType: comment
+bundle: comment
+types:
+  - 'schema:Comment'
+fieldMappings:
+  subject:
+    properties:
+      - 'schema:name'
+  created:
+    properties:
+      - 'schema:dateCreated'
+    datatype_callback:
+      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
+  changed:
+    properties:
+      - 'schema:dateModified'
+    datatype_callback:
+      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
+  comment_body:
+    properties:
+      - 'schema:text'
+  uid:
+    properties:
+      - 'schema:author'
+    mapping_type: rel
diff --git a/web/sites/default/config/rdf.mapping.node.page.yml b/web/sites/default/config/rdf.mapping.node.page.yml
new file mode 100644
index 0000000..53935c7
--- /dev/null
+++ b/web/sites/default/config/rdf.mapping.node.page.yml
@@ -0,0 +1,43 @@
+uuid: 95ffb0b6-6172-4cd5-a44d-7cb2902f2aca
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.page
+  module:
+    - node
+_core:
+  default_config_hash: 32LxRnl4Wesvzqyfp7HnD0-U9-wxrLBn76pqY5XGNAE
+id: node.page
+targetEntityType: node
+bundle: page
+types:
+  - 'schema:WebPage'
+fieldMappings:
+  title:
+    properties:
+      - 'schema:name'
+  created:
+    properties:
+      - 'schema:dateCreated'
+    datatype_callback:
+      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
+  changed:
+    properties:
+      - 'schema:dateModified'
+    datatype_callback:
+      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
+  body:
+    properties:
+      - 'schema:text'
+  uid:
+    properties:
+      - 'schema:author'
+    mapping_type: rel
+  comment_count:
+    properties:
+      - 'schema:interactionCount'
+    datatype_callback:
+      callable: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount'
+      arguments:
+        interaction_type: UserComments
diff --git a/web/sites/default/config/rdf.mapping.taxonomy_term.tags.yml b/web/sites/default/config/rdf.mapping.taxonomy_term.tags.yml
new file mode 100644
index 0000000..b590366
--- /dev/null
+++ b/web/sites/default/config/rdf.mapping.taxonomy_term.tags.yml
@@ -0,0 +1,22 @@
+uuid: 71bde781-0c6f-45ca-86a1-8a58a03be06e
+langcode: en
+status: true
+dependencies:
+  config:
+    - taxonomy.vocabulary.tags
+  module:
+    - taxonomy
+_core:
+  default_config_hash: o5duwyS1CTHx3tYOZhuu91kspe8VQjQsnwZjAJv9njk
+id: taxonomy_term.tags
+targetEntityType: taxonomy_term
+bundle: tags
+types:
+  - 'schema:Thing'
+fieldMappings:
+  name:
+    properties:
+      - 'schema:name'
+  description:
+    properties:
+      - 'schema:description'
diff --git a/web/sites/default/config/rdf.mapping.user.user.yml b/web/sites/default/config/rdf.mapping.user.user.yml
new file mode 100644
index 0000000..57803c1
--- /dev/null
+++ b/web/sites/default/config/rdf.mapping.user.user.yml
@@ -0,0 +1,17 @@
+uuid: e18a7232-05f4-44e5-bd9e-afe6d3397c2f
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+_core:
+  default_config_hash: TGTlmpYAtXxjtYMFA_A0vosE2c4R5MCQwLviIA5HUM0
+id: user.user
+targetEntityType: user
+bundle: user
+types:
+  - 'schema:Person'
+fieldMappings:
+  name:
+    properties:
+      - 'schema:name'
diff --git a/web/sites/default/config/rules.reaction.submit_for_review.yml b/web/sites/default/config/rules.reaction.submit_for_review.yml
new file mode 100644
index 0000000..1087c44
--- /dev/null
+++ b/web/sites/default/config/rules.reaction.submit_for_review.yml
@@ -0,0 +1,15 @@
+uuid: bdc86e8a-cb4f-41c1-9bb4-5b7a07e465d7
+langcode: en
+status: true
+dependencies: {  }
+id: submit_for_review
+label: 'Submit for review'
+events:
+  -
+    event_name: 'rules_entity_presave:node'
+description: ''
+tags:
+  - ''
+config_version: '3'
+expression:
+  id: rules_rule
diff --git a/web/sites/default/config/rules.settings.yml b/web/sites/default/config/rules.settings.yml
new file mode 100644
index 0000000..62231ee
--- /dev/null
+++ b/web/sites/default/config/rules.settings.yml
@@ -0,0 +1,6 @@
+log: false
+debug_screen: false
+log_level_system: warning
+log_level_screen: warning
+_core:
+  default_config_hash: alE0QceCqKyU2plA8_LELZeCByMYgh2CnTfuBeINp4g
diff --git a/web/sites/default/config/scheduler.settings.yml b/web/sites/default/config/scheduler.settings.yml
new file mode 100644
index 0000000..ca74d6a
--- /dev/null
+++ b/web/sites/default/config/scheduler.settings.yml
@@ -0,0 +1,21 @@
+allow_date_only: true
+date_format: 'Y-m-d H:i:s'
+date_letters: djmnFMyY
+date_only_format: Y-m-d
+default_expand_fieldset: when_required
+default_fields_display_mode: vertical_tab
+default_publish_enable: false
+default_publish_past_date: error
+default_publish_required: false
+default_publish_revision: false
+default_publish_touch: false
+default_time: '09:00:00'
+default_unpublish_enable: false
+default_unpublish_required: false
+default_unpublish_revision: false
+lightweight_cron_access_key: 0f18f312c39cb2e0ab85
+log: true
+time_letters: hHgGisaA
+time_only_format: 'H:i:s'
+_core:
+  default_config_hash: JOzWPTQNpL0mkZGbvh0o7T1wKYyGfC3DHHiwhjw2YhU
diff --git a/web/sites/default/config/search.page.node_search.yml b/web/sites/default/config/search.page.node_search.yml
new file mode 100644
index 0000000..3f0bd15
--- /dev/null
+++ b/web/sites/default/config/search.page.node_search.yml
@@ -0,0 +1,15 @@
+uuid: 7cf4aaae-a514-44a7-9d39-5e4ee1e6e734
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: 97tvtzGOa8_flb22CzSjgtm_YkiGMHvEBO-6q2K9V_U
+id: node_search
+label: Content
+path: node
+weight: -10
+plugin: node_search
+configuration:
+  rankings: {  }
diff --git a/web/sites/default/config/search.page.user_search.yml b/web/sites/default/config/search.page.user_search.yml
new file mode 100644
index 0000000..5af0010
--- /dev/null
+++ b/web/sites/default/config/search.page.user_search.yml
@@ -0,0 +1,14 @@
+uuid: 1b402618-3d4a-41af-a4f0-277549b65093
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+_core:
+  default_config_hash: k3aUaZXGDuhkek2TZIee0PApOPTvYZLadziekdyHA5A
+id: user_search
+label: Users
+path: user
+weight: 0
+plugin: user_search
+configuration: {  }
diff --git a/web/sites/default/config/search.settings.yml b/web/sites/default/config/search.settings.yml
new file mode 100644
index 0000000..52301dd
--- /dev/null
+++ b/web/sites/default/config/search.settings.yml
@@ -0,0 +1,22 @@
+and_or_limit: 7
+default_page: node_search
+index:
+  cron_limit: 100
+  overlap_cjk: true
+  minimum_word_size: 3
+  tag_weights:
+    h1: 25
+    h2: 18
+    h3: 15
+    h4: 14
+    h5: 9
+    h6: 6
+    u: 3
+    b: 3
+    i: 3
+    strong: 3
+    em: 3
+    a: 10
+logging: false
+_core:
+  default_config_hash: hvVxL1G-ZCxaq32IZws0YsfuhvaDiQE_np-0g35KjUk
diff --git a/web/sites/default/config/seven.settings.yml b/web/sites/default/config/seven.settings.yml
new file mode 100644
index 0000000..6bba58b
--- /dev/null
+++ b/web/sites/default/config/seven.settings.yml
@@ -0,0 +1,3 @@
+third_party_settings:
+  shortcut:
+    module_link: true
diff --git a/web/sites/default/config/shortcut.set.default.yml b/web/sites/default/config/shortcut.set.default.yml
new file mode 100644
index 0000000..774a9ff
--- /dev/null
+++ b/web/sites/default/config/shortcut.set.default.yml
@@ -0,0 +1,8 @@
+uuid: d32ba6a2-2b70-46a4-98c0-6f4f515cea06
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: U5VlGjd_SfV0Qm_EfnaynOfc549cNscFAx48JfYoMRI
+id: default
+label: Default
diff --git a/web/sites/default/config/system.action.change_a_node_to_next_workflow_state.yml b/web/sites/default/config/system.action.change_a_node_to_next_workflow_state.yml
new file mode 100644
index 0000000..8b92aa1
--- /dev/null
+++ b/web/sites/default/config/system.action.change_a_node_to_next_workflow_state.yml
@@ -0,0 +1,25 @@
+uuid: c0a8d1df-1da3-44e5-a1c9-411abd9694d8
+langcode: nl
+status: true
+dependencies:
+  module:
+    - node
+    - workflow
+_core:
+  default_config_hash: M98hvuYlwD42D6FTasB41hR2kTUpVtEB407qW4Ne1Ww
+id: change_a_node_to_next_workflow_state
+label: 'Change a node to next Workflow state'
+type: node
+plugin: workflow_node_next_state_action
+configuration:
+  label: 'Change a node to next Workflow state'
+  id: change_a_node_to_next_workflow_state
+  plugin: workflow_node_next_state_action
+  type: node
+  workflow_scheduling:
+    scheduled: '0'
+  comment: 'New state is set by a triggered Action.'
+  force: 0
+  actions: {  }
+  field_name: ''
+  to_sid: ''
diff --git a/web/sites/default/config/system.action.comment_delete_action.yml b/web/sites/default/config/system.action.comment_delete_action.yml
new file mode 100644
index 0000000..9520fa3
--- /dev/null
+++ b/web/sites/default/config/system.action.comment_delete_action.yml
@@ -0,0 +1,13 @@
+uuid: f9bd83c6-c9ae-49a7-b097-5ef3a782ca93
+langcode: en
+status: true
+dependencies:
+  module:
+    - comment
+_core:
+  default_config_hash: VetuwpecspsjqMCd8e7wKyr2l-AZEh1UNYWNtNywHXM
+id: comment_delete_action
+label: 'Delete comment'
+type: comment
+plugin: comment_delete_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.comment_publish_action.yml b/web/sites/default/config/system.action.comment_publish_action.yml
new file mode 100644
index 0000000..2e4df6b
--- /dev/null
+++ b/web/sites/default/config/system.action.comment_publish_action.yml
@@ -0,0 +1,13 @@
+uuid: 75a38a69-c913-47d9-8119-1a76607a4700
+langcode: en
+status: true
+dependencies:
+  module:
+    - comment
+_core:
+  default_config_hash: f6w_Pd30AyyDIoMkD4QpPMM2-I8FTEHICchFVOpjiCI
+id: comment_publish_action
+label: 'Publish comment'
+type: comment
+plugin: comment_publish_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.comment_save_action.yml b/web/sites/default/config/system.action.comment_save_action.yml
new file mode 100644
index 0000000..930591a
--- /dev/null
+++ b/web/sites/default/config/system.action.comment_save_action.yml
@@ -0,0 +1,13 @@
+uuid: b37050d6-af74-4762-9d8c-7fb8004a3bfb
+langcode: en
+status: true
+dependencies:
+  module:
+    - comment
+_core:
+  default_config_hash: TSkg_gUZvk-39yXFrIFnKjsxuEzO0qBH82TdDxOMMr4
+id: comment_save_action
+label: 'Save comment'
+type: comment
+plugin: comment_save_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.comment_unpublish_action.yml b/web/sites/default/config/system.action.comment_unpublish_action.yml
new file mode 100644
index 0000000..e10855e
--- /dev/null
+++ b/web/sites/default/config/system.action.comment_unpublish_action.yml
@@ -0,0 +1,13 @@
+uuid: 556f9b49-3db2-43f7-a380-76b2f6f66828
+langcode: en
+status: true
+dependencies:
+  module:
+    - comment
+_core:
+  default_config_hash: MLin6S_PsJ7Oo480DxS46D46IM8tqFkkWOLyH7TGByI
+id: comment_unpublish_action
+label: 'Unpublish comment'
+type: comment
+plugin: comment_unpublish_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.media_delete_action.yml b/web/sites/default/config/system.action.media_delete_action.yml
new file mode 100644
index 0000000..f52f664
--- /dev/null
+++ b/web/sites/default/config/system.action.media_delete_action.yml
@@ -0,0 +1,13 @@
+uuid: 53964ad2-63af-4858-be0f-6070a679148e
+langcode: en
+status: true
+dependencies:
+  module:
+    - media_entity
+_core:
+  default_config_hash: YySSG7rYaI3f0ewfZXcbdWR7gp4cgMhW-4IoGNvUlKg
+id: media_delete_action
+label: 'Delete media'
+type: media
+plugin: media_delete_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.media_publish_action.yml b/web/sites/default/config/system.action.media_publish_action.yml
new file mode 100644
index 0000000..17b7c21
--- /dev/null
+++ b/web/sites/default/config/system.action.media_publish_action.yml
@@ -0,0 +1,13 @@
+uuid: 644bc8ca-deac-4fbf-be57-0391906b4111
+langcode: en
+status: true
+dependencies:
+  module:
+    - media_entity
+_core:
+  default_config_hash: Bis1eEetH6KGAgrwR3i4JT3gZfQjRg6RnXMCJdlkhGU
+id: media_publish_action
+label: 'Publish media'
+type: media
+plugin: media_publish_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.media_save_action.yml b/web/sites/default/config/system.action.media_save_action.yml
new file mode 100644
index 0000000..c63e1b0
--- /dev/null
+++ b/web/sites/default/config/system.action.media_save_action.yml
@@ -0,0 +1,13 @@
+uuid: cb9ca2f3-8fa0-49b3-b4de-7d2e9d4fc4e1
+langcode: en
+status: true
+dependencies:
+  module:
+    - media_entity
+_core:
+  default_config_hash: RLKvR-W0Kn7PZPAKSvcuVp2615NX0vxfxBRfPzlI0N0
+id: media_save_action
+label: 'Save media'
+type: media
+plugin: media_save_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.media_unpublish_action.yml b/web/sites/default/config/system.action.media_unpublish_action.yml
new file mode 100644
index 0000000..77d718e
--- /dev/null
+++ b/web/sites/default/config/system.action.media_unpublish_action.yml
@@ -0,0 +1,13 @@
+uuid: cefd379d-fe43-4ec6-896f-879b1ef17ec3
+langcode: en
+status: true
+dependencies:
+  module:
+    - media_entity
+_core:
+  default_config_hash: fm7okggWKhZ4XPDOu2aXXYCUaki4GxFH4sR4WkSCq-8
+id: media_unpublish_action
+label: 'Unpublish media'
+type: media
+plugin: media_unpublish_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.node_delete_action.yml b/web/sites/default/config/system.action.node_delete_action.yml
new file mode 100644
index 0000000..035a523
--- /dev/null
+++ b/web/sites/default/config/system.action.node_delete_action.yml
@@ -0,0 +1,13 @@
+uuid: 64c8de82-07a7-4d7c-acf8-0a4cae04c4a4
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: Zx0jD1Klh5tZaGJy8uOeR_2MCu9FDM4xg7TaUJUEbkI
+id: node_delete_action
+label: 'Delete content'
+type: node
+plugin: node_delete_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.node_make_sticky_action.yml b/web/sites/default/config/system.action.node_make_sticky_action.yml
new file mode 100644
index 0000000..99fba80
--- /dev/null
+++ b/web/sites/default/config/system.action.node_make_sticky_action.yml
@@ -0,0 +1,13 @@
+uuid: 9fa98037-5052-427b-9d83-331bf1e70ace
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: sOb26JSy3fGpWkvR0WYN6_hMqj_6d1rvbvrkzp1yya0
+id: node_make_sticky_action
+label: 'Make content sticky'
+type: node
+plugin: node_make_sticky_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.node_make_unsticky_action.yml b/web/sites/default/config/system.action.node_make_unsticky_action.yml
new file mode 100644
index 0000000..363e667
--- /dev/null
+++ b/web/sites/default/config/system.action.node_make_unsticky_action.yml
@@ -0,0 +1,13 @@
+uuid: 3549cd19-ebb1-4660-9a61-8334c97166b8
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: lDM9mvIGAu8Sw8rt-uCO4Sr7yX5VPrDPxYcawkbKd6k
+id: node_make_unsticky_action
+label: 'Make content unsticky'
+type: node
+plugin: node_make_unsticky_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.node_promote_action.yml b/web/sites/default/config/system.action.node_promote_action.yml
new file mode 100644
index 0000000..fa255d6
--- /dev/null
+++ b/web/sites/default/config/system.action.node_promote_action.yml
@@ -0,0 +1,13 @@
+uuid: cbc315d0-4112-4853-930c-6958400e4bea
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: N0RDBTqiK4dKoN4p4oW2j0SGWycdHyALUe9M-Ofp89U
+id: node_promote_action
+label: 'Promote content to front page'
+type: node
+plugin: node_promote_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.node_publish_action.yml b/web/sites/default/config/system.action.node_publish_action.yml
new file mode 100644
index 0000000..76bf1f7
--- /dev/null
+++ b/web/sites/default/config/system.action.node_publish_action.yml
@@ -0,0 +1,13 @@
+uuid: c77de2b8-24c7-4067-82e8-362b99a34dcd
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: lsQkbo4njZ-Q_oGKCPGXGWFjWF1I7QpgA6m-t9rcRoA
+id: node_publish_action
+label: 'Publish content'
+type: node
+plugin: node_publish_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.node_save_action.yml b/web/sites/default/config/system.action.node_save_action.yml
new file mode 100644
index 0000000..4bd73e9
--- /dev/null
+++ b/web/sites/default/config/system.action.node_save_action.yml
@@ -0,0 +1,13 @@
+uuid: 18c3f5d1-beb7-4d65-ab65-76bd62dddb21
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: U9HspszLxcw6pZmRacFa6yDbbheyMN-We4fPbrWWHGg
+id: node_save_action
+label: 'Save content'
+type: node
+plugin: node_save_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.node_unpromote_action.yml b/web/sites/default/config/system.action.node_unpromote_action.yml
new file mode 100644
index 0000000..0448500
--- /dev/null
+++ b/web/sites/default/config/system.action.node_unpromote_action.yml
@@ -0,0 +1,13 @@
+uuid: 3bcd7466-9533-4038-af87-3b606d5b02f7
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: JBptjnfuOMtsdKygklXxoOgeOCTMtQxlkymjnnj-cC0
+id: node_unpromote_action
+label: 'Remove content from front page'
+type: node
+plugin: node_unpromote_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.node_unpublish_action.yml b/web/sites/default/config/system.action.node_unpublish_action.yml
new file mode 100644
index 0000000..9db8cdd
--- /dev/null
+++ b/web/sites/default/config/system.action.node_unpublish_action.yml
@@ -0,0 +1,13 @@
+uuid: f9907a41-f8f6-4abc-aad6-057fdfd4142e
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+_core:
+  default_config_hash: gGQXiSspwGl0lyOS6w_HCPpvGAPDciqDNLFwWOydVtI
+id: node_unpublish_action
+label: 'Unpublish content'
+type: node
+plugin: node_unpublish_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.pathauto_update_alias_node.yml b/web/sites/default/config/system.action.pathauto_update_alias_node.yml
new file mode 100644
index 0000000..48e48a5
--- /dev/null
+++ b/web/sites/default/config/system.action.pathauto_update_alias_node.yml
@@ -0,0 +1,13 @@
+uuid: 904efbb6-4081-4ef7-9095-216a2a72d9e5
+langcode: en
+status: true
+dependencies:
+  module:
+    - pathauto
+_core:
+  default_config_hash: '-SdRoSbsl_FULjbX8mgESZdeoEOjgi7rDhHNdLOJ8n8'
+id: pathauto_update_alias_node
+label: 'Update URL alias'
+type: node
+plugin: pathauto_update_alias
+configuration: {  }
diff --git a/web/sites/default/config/system.action.pathauto_update_alias_user.yml b/web/sites/default/config/system.action.pathauto_update_alias_user.yml
new file mode 100644
index 0000000..9d1093a
--- /dev/null
+++ b/web/sites/default/config/system.action.pathauto_update_alias_user.yml
@@ -0,0 +1,13 @@
+uuid: 705c9adb-5fcd-4a91-a0dd-c7a4fc886762
+langcode: en
+status: true
+dependencies:
+  module:
+    - pathauto
+_core:
+  default_config_hash: fWszFHPeJ_dhZ8kJEEWo4w-FQH_etR4AxTQkQCW9OLk
+id: pathauto_update_alias_user
+label: 'Update URL alias'
+type: user
+plugin: pathauto_update_alias
+configuration: {  }
diff --git a/web/sites/default/config/system.action.user_add_role_action.administrator.yml b/web/sites/default/config/system.action.user_add_role_action.administrator.yml
new file mode 100644
index 0000000..cd81d8e
--- /dev/null
+++ b/web/sites/default/config/system.action.user_add_role_action.administrator.yml
@@ -0,0 +1,14 @@
+uuid: 2ff15f74-236b-46f6-800a-cfbb3aecd459
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.administrator
+  module:
+    - user
+id: user_add_role_action.administrator
+label: 'Add the Administrator role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: administrator
diff --git a/web/sites/default/config/system.action.user_add_role_action.olpa_content_admin.yml b/web/sites/default/config/system.action.user_add_role_action.olpa_content_admin.yml
new file mode 100644
index 0000000..e2cb556
--- /dev/null
+++ b/web/sites/default/config/system.action.user_add_role_action.olpa_content_admin.yml
@@ -0,0 +1,14 @@
+uuid: 8ff78462-b09b-4a14-9358-67c134037eb8
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.olpa_content_admin
+  module:
+    - user
+id: user_add_role_action.olpa_content_admin
+label: 'Add the OLPA content admin role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: olpa_content_admin
diff --git a/web/sites/default/config/system.action.user_add_role_action.olpa_content_editor.yml b/web/sites/default/config/system.action.user_add_role_action.olpa_content_editor.yml
new file mode 100644
index 0000000..f773fc4
--- /dev/null
+++ b/web/sites/default/config/system.action.user_add_role_action.olpa_content_editor.yml
@@ -0,0 +1,14 @@
+uuid: a76d53c6-da34-4cc4-824b-f90bbe56aa0b
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.olpa_content_editor
+  module:
+    - user
+id: user_add_role_action.olpa_content_editor
+label: 'Add the OLPA content editor role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: olpa_content_editor
diff --git a/web/sites/default/config/system.action.user_add_role_action.wig_member.yml b/web/sites/default/config/system.action.user_add_role_action.wig_member.yml
new file mode 100644
index 0000000..236296f
--- /dev/null
+++ b/web/sites/default/config/system.action.user_add_role_action.wig_member.yml
@@ -0,0 +1,14 @@
+uuid: 52524c13-b7a2-49ac-89aa-be5ac0e082c0
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.wig_member
+  module:
+    - user
+id: user_add_role_action.wig_member
+label: 'Add the WIG member role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: wig_member
diff --git a/web/sites/default/config/system.action.user_block_user_action.yml b/web/sites/default/config/system.action.user_block_user_action.yml
new file mode 100644
index 0000000..9d9ac0f
--- /dev/null
+++ b/web/sites/default/config/system.action.user_block_user_action.yml
@@ -0,0 +1,13 @@
+uuid: 0c001cc9-f6d6-429d-bda5-3d819dc9703d
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+_core:
+  default_config_hash: DyypzTfThX10FFQw-399qPfEbLLyrhXgQrKPVsmAoJ4
+id: user_block_user_action
+label: 'Block the selected user(s)'
+type: user
+plugin: user_block_user_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.user_cancel_user_action.yml b/web/sites/default/config/system.action.user_cancel_user_action.yml
new file mode 100644
index 0000000..14a2021
--- /dev/null
+++ b/web/sites/default/config/system.action.user_cancel_user_action.yml
@@ -0,0 +1,13 @@
+uuid: 5339327c-eb19-4647-aff9-931b9c49bc13
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+_core:
+  default_config_hash: nvrL9bFilzBvm2bjO9rQnFDpBA7dBBUjShSSt6NS-DU
+id: user_cancel_user_action
+label: 'Cancel the selected user account(s)'
+type: user
+plugin: user_cancel_user_action
+configuration: {  }
diff --git a/web/sites/default/config/system.action.user_remove_role_action.administrator.yml b/web/sites/default/config/system.action.user_remove_role_action.administrator.yml
new file mode 100644
index 0000000..5a91274
--- /dev/null
+++ b/web/sites/default/config/system.action.user_remove_role_action.administrator.yml
@@ -0,0 +1,14 @@
+uuid: 440418ba-e0ab-46a5-b10e-ac41ef8128a6
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.administrator
+  module:
+    - user
+id: user_remove_role_action.administrator
+label: 'Remove the Administrator role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: administrator
diff --git a/web/sites/default/config/system.action.user_remove_role_action.olpa_content_admin.yml b/web/sites/default/config/system.action.user_remove_role_action.olpa_content_admin.yml
new file mode 100644
index 0000000..085227e
--- /dev/null
+++ b/web/sites/default/config/system.action.user_remove_role_action.olpa_content_admin.yml
@@ -0,0 +1,14 @@
+uuid: c7326725-fa3c-4129-9270-0fde01f65e53
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.olpa_content_admin
+  module:
+    - user
+id: user_remove_role_action.olpa_content_admin
+label: 'Remove the OLPA content admin role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: olpa_content_admin
diff --git a/web/sites/default/config/system.action.user_remove_role_action.olpa_content_editor.yml b/web/sites/default/config/system.action.user_remove_role_action.olpa_content_editor.yml
new file mode 100644
index 0000000..a4c0eea
--- /dev/null
+++ b/web/sites/default/config/system.action.user_remove_role_action.olpa_content_editor.yml
@@ -0,0 +1,14 @@
+uuid: dabc3057-6878-4c0a-8b35-6b40a0d58a77
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.olpa_content_editor
+  module:
+    - user
+id: user_remove_role_action.olpa_content_editor
+label: 'Remove the OLPA content editor role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: olpa_content_editor
diff --git a/web/sites/default/config/system.action.user_remove_role_action.wig_member.yml b/web/sites/default/config/system.action.user_remove_role_action.wig_member.yml
new file mode 100644
index 0000000..57f5359
--- /dev/null
+++ b/web/sites/default/config/system.action.user_remove_role_action.wig_member.yml
@@ -0,0 +1,14 @@
+uuid: 674c4ab4-f21b-47fa-9845-e0bf87f6050e
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.wig_member
+  module:
+    - user
+id: user_remove_role_action.wig_member
+label: 'Remove the WIG member role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: wig_member
diff --git a/web/sites/default/config/system.action.user_unblock_user_action.yml b/web/sites/default/config/system.action.user_unblock_user_action.yml
new file mode 100644
index 0000000..561c3d3
--- /dev/null
+++ b/web/sites/default/config/system.action.user_unblock_user_action.yml
@@ -0,0 +1,13 @@
+uuid: 1f29908e-f90f-400f-a76b-cd9e70b15727
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+_core:
+  default_config_hash: SPsUXsR3Rc8d1y3gewzaAKWa1ncea_ywXX3f7LTn7k0
+id: user_unblock_user_action
+label: 'Unblock the selected user(s)'
+type: user
+plugin: user_unblock_user_action
+configuration: {  }
diff --git a/web/sites/default/config/system.authorize.yml b/web/sites/default/config/system.authorize.yml
new file mode 100644
index 0000000..c469cae
--- /dev/null
+++ b/web/sites/default/config/system.authorize.yml
@@ -0,0 +1,3 @@
+filetransfer_default: null
+_core:
+  default_config_hash: z63ds8M4zPrylEgFRkRcOlfcsXWwfITzjD4cj1kRdfg
diff --git a/web/sites/default/config/system.cron.yml b/web/sites/default/config/system.cron.yml
new file mode 100644
index 0000000..6801fb5
--- /dev/null
+++ b/web/sites/default/config/system.cron.yml
@@ -0,0 +1,6 @@
+threshold:
+  requirements_warning: 172800
+  requirements_error: 1209600
+logging: 1
+_core:
+  default_config_hash: 5Pw921y1EPfFN98wykliBBLArm51pC-SmrXeYCe7d0Y
diff --git a/web/sites/default/config/system.date.yml b/web/sites/default/config/system.date.yml
new file mode 100644
index 0000000..47ec22a
--- /dev/null
+++ b/web/sites/default/config/system.date.yml
@@ -0,0 +1,11 @@
+country:
+  default: US
+first_day: 0
+timezone:
+  default: UTC
+  user:
+    configurable: true
+    warn: false
+    default: 0
+_core:
+  default_config_hash: V9UurX2GPT05NWKG9f2GWQqFG2TRG8vczidwjpy7Woo
diff --git a/web/sites/default/config/system.diff.yml b/web/sites/default/config/system.diff.yml
new file mode 100644
index 0000000..c43dd91
--- /dev/null
+++ b/web/sites/default/config/system.diff.yml
@@ -0,0 +1,5 @@
+context:
+  lines_leading: 2
+  lines_trailing: 2
+_core:
+  default_config_hash: 1WanmaEhxW_vM8_5Ktsdntj8MaO9UBHXg0lN603PsWM
diff --git a/web/sites/default/config/system.file.yml b/web/sites/default/config/system.file.yml
new file mode 100644
index 0000000..39ee4cb
--- /dev/null
+++ b/web/sites/default/config/system.file.yml
@@ -0,0 +1,7 @@
+allow_insecure_uploads: false
+default_scheme: public
+path:
+  temporary: /tmp
+temporary_maximum_age: 21600
+_core:
+  default_config_hash: t48gCU9DzYfjb3bAOIqHLzhL0ChBlXh6_5B5Pyo9t8g
diff --git a/web/sites/default/config/system.image.gd.yml b/web/sites/default/config/system.image.gd.yml
new file mode 100644
index 0000000..487982a
--- /dev/null
+++ b/web/sites/default/config/system.image.gd.yml
@@ -0,0 +1,3 @@
+jpeg_quality: 100
+_core:
+  default_config_hash: eNXaHfkJJUThHeF0nvkoXyPLRrKYGxgHRjORvT4F5rQ
diff --git a/web/sites/default/config/system.image.yml b/web/sites/default/config/system.image.yml
new file mode 100644
index 0000000..990d3dc
--- /dev/null
+++ b/web/sites/default/config/system.image.yml
@@ -0,0 +1,3 @@
+toolkit: gd
+_core:
+  default_config_hash: durWHaKeBaq4d9Wpi4RqwADj1OufDepcnJuhVLmKN24
diff --git a/web/sites/default/config/system.logging.yml b/web/sites/default/config/system.logging.yml
new file mode 100644
index 0000000..e95b28a
--- /dev/null
+++ b/web/sites/default/config/system.logging.yml
@@ -0,0 +1,3 @@
+error_level: hide
+_core:
+  default_config_hash: u3-njszl92FaxjrCMiq0yDcjAfcdx72w1zT1O9dx6aA
diff --git a/web/sites/default/config/system.mail.yml b/web/sites/default/config/system.mail.yml
new file mode 100644
index 0000000..60ed34d
--- /dev/null
+++ b/web/sites/default/config/system.mail.yml
@@ -0,0 +1,4 @@
+interface:
+  default: php_mail
+_core:
+  default_config_hash: rYgt7uhPafP2ngaN_ZUPFuyI4KdE0zU868zLNSlzKoE
diff --git a/web/sites/default/config/system.maintenance.yml b/web/sites/default/config/system.maintenance.yml
new file mode 100644
index 0000000..79501fb
--- /dev/null
+++ b/web/sites/default/config/system.maintenance.yml
@@ -0,0 +1,4 @@
+message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.'
+langcode: en
+_core:
+  default_config_hash: Z5MXifrF77GEAgx0GQ6iWT8wStjFuY8BD9OruofWTJ8
diff --git a/web/sites/default/config/system.menu.account.yml b/web/sites/default/config/system.menu.account.yml
new file mode 100644
index 0000000..b76efdd
--- /dev/null
+++ b/web/sites/default/config/system.menu.account.yml
@@ -0,0 +1,10 @@
+uuid: 28ff2999-883b-450b-b51d-66a958746086
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: M_Bh81osDyUQ4wV0GgU_NdBNqkzM87sLxjaCdFj9mnw
+id: account
+label: 'User account menu'
+description: 'Links related to the active user account'
+locked: true
diff --git a/web/sites/default/config/system.menu.admin.yml b/web/sites/default/config/system.menu.admin.yml
new file mode 100644
index 0000000..e241afe
--- /dev/null
+++ b/web/sites/default/config/system.menu.admin.yml
@@ -0,0 +1,10 @@
+uuid: f09127b7-56e5-43e5-897b-669eac320319
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: sapEi2YDGoI9yQIT_WgIV2vUdQ6DScH0V3fAyTadAL0
+id: admin
+label: Administration
+description: 'Administrative task links'
+locked: true
diff --git a/web/sites/default/config/system.menu.devel.yml b/web/sites/default/config/system.menu.devel.yml
new file mode 100644
index 0000000..0bb9886
--- /dev/null
+++ b/web/sites/default/config/system.menu.devel.yml
@@ -0,0 +1,13 @@
+uuid: ff0d19fb-a740-48e7-9d85-2e4ba9426aa4
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - devel
+_core:
+  default_config_hash: mYceWZ4FHflXMWwxiO7ePCeXvKMl9F-ARIQ9p4IpvWE
+id: devel
+label: Development
+description: 'Links related to Devel module.'
+locked: true
diff --git a/web/sites/default/config/system.menu.footer.yml b/web/sites/default/config/system.menu.footer.yml
new file mode 100644
index 0000000..19bd5b4
--- /dev/null
+++ b/web/sites/default/config/system.menu.footer.yml
@@ -0,0 +1,10 @@
+uuid: 58438958-544a-43b4-8310-58f03eec473c
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: 7yrlW5z9zdg2eBucB2GPqXKSMQfH9lSRSO4DbWF7AFc
+id: footer
+label: Footer
+description: 'Site information links'
+locked: true
diff --git a/web/sites/default/config/system.menu.main.yml b/web/sites/default/config/system.menu.main.yml
new file mode 100644
index 0000000..6d0ad24
--- /dev/null
+++ b/web/sites/default/config/system.menu.main.yml
@@ -0,0 +1,10 @@
+uuid: b907a286-2993-42a6-ad29-e1d95ffe9acc
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: Q2Ra3jfoIVk0f3SjxJX61byRQFVBAbpzYDQOiY-kno8
+id: main
+label: 'Main navigation'
+description: 'Site section links'
+locked: true
diff --git a/web/sites/default/config/system.menu.tools.yml b/web/sites/default/config/system.menu.tools.yml
new file mode 100644
index 0000000..37ff0ee
--- /dev/null
+++ b/web/sites/default/config/system.menu.tools.yml
@@ -0,0 +1,10 @@
+uuid: 2a74d888-de74-438a-b2bf-990fefa8d84c
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: BCM-vV1zzRaLHN18dqAR_CuGOj8AFJvTx7BKl_8Gcxc
+id: tools
+label: Tools
+description: 'User tool links, often added by modules'
+locked: true
diff --git a/web/sites/default/config/system.performance.yml b/web/sites/default/config/system.performance.yml
new file mode 100644
index 0000000..65d6e1a
--- /dev/null
+++ b/web/sites/default/config/system.performance.yml
@@ -0,0 +1,17 @@
+cache:
+  page:
+    max_age: 0
+css:
+  preprocess: false
+  gzip: true
+fast_404:
+  enabled: true
+  paths: '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i'
+  exclude_paths: '/\/(?:styles|imagecache)\//'
+  html: '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'
+js:
+  preprocess: false
+  gzip: true
+stale_file_threshold: 2592000
+_core:
+  default_config_hash: b2cssrj-lOmATIbdehfCqfCFgVR0qCdxxWhwqa2KBVQ
diff --git a/web/sites/default/config/system.rss.yml b/web/sites/default/config/system.rss.yml
new file mode 100644
index 0000000..858f127
--- /dev/null
+++ b/web/sites/default/config/system.rss.yml
@@ -0,0 +1,8 @@
+channel:
+  description: ''
+items:
+  limit: 10
+  view_mode: rss
+langcode: en
+_core:
+  default_config_hash: TlH7NNk46phfxu1mSUfwg1C0YqaGsUCeD4l9JQnQlDU
diff --git a/web/sites/default/config/system.site.yml b/web/sites/default/config/system.site.yml
new file mode 100644
index 0000000..4a18e17
--- /dev/null
+++ b/web/sites/default/config/system.site.yml
@@ -0,0 +1,14 @@
+uuid: f047fa5b-89c8-4f6b-80de-7ea36c91cf55
+name: 'nsf demo'
+mail: rhys.fureigh@gsa.gov
+slogan: ''
+page:
+  403: ''
+  404: ''
+  front: /node
+admin_compact_mode: false
+weight_select_max: 100
+langcode: en
+default_langcode: en
+_core:
+  default_config_hash: AyT9s8OUcclfALRE_imByOMgtZ19eOlqdF6zI3p7yqo
diff --git a/web/sites/default/config/system.theme.global.yml b/web/sites/default/config/system.theme.global.yml
new file mode 100644
index 0000000..547a27f
--- /dev/null
+++ b/web/sites/default/config/system.theme.global.yml
@@ -0,0 +1,16 @@
+favicon:
+  mimetype: image/vnd.microsoft.icon
+  path: ''
+  url: ''
+  use_default: false
+features:
+  comment_user_picture: false
+  comment_user_verification: false
+  favicon: true
+  node_user_picture: false
+logo:
+  path: 'public://nsf_logo.png'
+  url: ''
+  use_default: false
+_core:
+  default_config_hash: 9rAU4Pku7eMBQxauQqAgjzlcicFZ2As6zEa6zvTlCB8
diff --git a/web/sites/default/config/system.theme.yml b/web/sites/default/config/system.theme.yml
new file mode 100644
index 0000000..f0ab73b
--- /dev/null
+++ b/web/sites/default/config/system.theme.yml
@@ -0,0 +1,4 @@
+admin: seven
+default: nsf
+_core:
+  default_config_hash: fOjer9hADYYnbCJVZMFZIIM1azTFWyg84ZkFDHfAbUg
diff --git a/web/sites/default/config/taxonomy.settings.yml b/web/sites/default/config/taxonomy.settings.yml
new file mode 100644
index 0000000..c98a316
--- /dev/null
+++ b/web/sites/default/config/taxonomy.settings.yml
@@ -0,0 +1,5 @@
+maintain_index_table: true
+override_selector: false
+terms_per_page_admin: 100
+_core:
+  default_config_hash: zKpaWT6cJc1tVQQaTqatGELaCqU_oyRym6zTl27Yias
diff --git a/web/sites/default/config/taxonomy.vocabulary.brightcove_video_tags.yml b/web/sites/default/config/taxonomy.vocabulary.brightcove_video_tags.yml
new file mode 100644
index 0000000..5dd6891
--- /dev/null
+++ b/web/sites/default/config/taxonomy.vocabulary.brightcove_video_tags.yml
@@ -0,0 +1,11 @@
+uuid: 9a5574cf-dc47-45b6-b10e-2648f1b4cb8c
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: sSTb4ZGZ_kEPAM3fG5GyeJaVW2aKXuXhk6doQpX1kTU
+name: 'Brightcove video tags'
+vid: brightcove_video_tags
+description: null
+hierarchy: 0
+weight: 0
diff --git a/web/sites/default/config/taxonomy.vocabulary.news_types.yml b/web/sites/default/config/taxonomy.vocabulary.news_types.yml
new file mode 100644
index 0000000..1379830
--- /dev/null
+++ b/web/sites/default/config/taxonomy.vocabulary.news_types.yml
@@ -0,0 +1,9 @@
+uuid: 2a11f5eb-c52d-4f4c-95cb-d2d4979c2e8e
+langcode: en
+status: true
+dependencies: {  }
+name: 'News types'
+vid: news_types
+description: ''
+hierarchy: 0
+weight: 0
diff --git a/web/sites/default/config/taxonomy.vocabulary.tags.yml b/web/sites/default/config/taxonomy.vocabulary.tags.yml
new file mode 100644
index 0000000..27fbd80
--- /dev/null
+++ b/web/sites/default/config/taxonomy.vocabulary.tags.yml
@@ -0,0 +1,11 @@
+uuid: a734bc30-cff9-4ba4-887f-54a29a2790da
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: lO5ziR5dVI1PpEeHZsSOfQ-Y7NWihSDKW8-MMf6uoms
+name: Tags
+vid: tags
+description: 'Use tags to group articles on similar topics into categories.'
+hierarchy: 0
+weight: 0
diff --git a/web/sites/default/config/text.settings.yml b/web/sites/default/config/text.settings.yml
new file mode 100644
index 0000000..ef751a5
--- /dev/null
+++ b/web/sites/default/config/text.settings.yml
@@ -0,0 +1,3 @@
+default_summary_length: 600
+_core:
+  default_config_hash: Bkewb77RBOK3_aXMPsp8p87gbc03NvmC5gBLzPl7hVA
diff --git a/web/sites/default/config/tour.tour.views-ui.yml b/web/sites/default/config/tour.tour.views-ui.yml
new file mode 100644
index 0000000..27afd53
--- /dev/null
+++ b/web/sites/default/config/tour.tour.views-ui.yml
@@ -0,0 +1,97 @@
+uuid: 7b5caba3-a300-44ed-b984-8c4d487370cc
+langcode: en
+status: true
+dependencies:
+  module:
+    - views_ui
+_core:
+  default_config_hash: c-HMyZwgeP8H6AITDcq4hznePkd7azpe8xl_WTnx2O0
+id: views-ui
+label: 'View edit page'
+module: views_ui
+routes:
+  -
+    route_name: entity.view.edit_form
+  -
+    route_name: entity.view.edit_display_form
+tips:
+  views-main:
+    id: views-main
+    plugin: text
+    label: 'Manage view settings'
+    body: 'View or edit the configuration.'
+    weight: 1
+  views-ui-displays:
+    id: views-ui-displays
+    plugin: text
+    label: 'Displays in this view'
+    body: 'A display is a way of outputting the results, e.g., as a page or a block. A view can contain multiple displays, which are listed here. The active display is highlighted.'
+    weight: 2
+    attributes:
+      data-id: views-display-top
+  views-ui-view-admin:
+    id: views-ui-view-admin
+    plugin: text
+    label: 'View administration'
+    body: 'Perform administrative tasks, including adding a description and creating a clone. Click the drop-down button to view the available options.'
+    weight: 3
+    location: left
+    attributes:
+      data-id: views-display-extra-actions
+  views-ui-format:
+    id: views-ui-format
+    plugin: text
+    label: 'Output format'
+    body: 'Choose how to output results. E.g., choose <em>Content</em> to output each item completely, using your configured display settings. Or choose <em>Fields</em>, which allows you to output only specific fields for each result. Additional formats can be added by installing modules to <em>extend</em> Drupal''s base functionality.'
+    weight: 4
+    attributes:
+      data-class: views-ui-display-tab-bucket.format
+  views-ui-fields:
+    id: views-ui-fields
+    plugin: text
+    label: Fields
+    body: 'If this view uses fields, they are listed here. You can click on a field to configure it.'
+    weight: 5
+    attributes:
+      data-class: views-ui-display-tab-bucket.field
+  views-ui-filter:
+    id: views-ui-filter
+    plugin: text
+    label: 'Filter your view'
+    body: 'Add filters to limit the results in the output. E.g., to only show content that is <em>published</em>, you would add a filter for <em>Published</em> and select <em>Yes</em>.'
+    weight: 6
+    attributes:
+      data-class: views-ui-display-tab-bucket.filter
+  views-ui-filter-operations:
+    id: views-ui-filter-operations
+    plugin: text
+    label: 'Filter actions'
+    body: 'Add, rearrange or remove filters.'
+    weight: 7
+    attributes:
+      data-class: 'views-ui-display-tab-bucket.filter .dropbutton-widget'
+  views-ui-sorts:
+    id: views-ui-sorts
+    plugin: text
+    label: 'Sort Criteria'
+    body: 'Control the order in which the results are output. Click on an active sort rule to configure it.'
+    weight: 8
+    attributes:
+      data-class: views-ui-display-tab-bucket.sort
+  views-ui-sorts-operations:
+    id: views-ui-sorts-operations
+    plugin: text
+    label: 'Sort actions'
+    body: 'Add, rearrange or remove sorting rules.'
+    weight: 9
+    attributes:
+      data-class: 'views-ui-display-tab-bucket.sort .dropbutton-widget'
+  views-ui-preview:
+    id: views-ui-preview
+    plugin: text
+    label: Preview
+    body: 'Show a preview of the view output.'
+    weight: 10
+    location: left
+    attributes:
+      data-id: preview-submit
diff --git a/web/sites/default/config/update.settings.yml b/web/sites/default/config/update.settings.yml
new file mode 100644
index 0000000..94078f0
--- /dev/null
+++ b/web/sites/default/config/update.settings.yml
@@ -0,0 +1,13 @@
+check:
+  disabled_extensions: false
+  interval_days: 1
+fetch:
+  url: ''
+  max_attempts: 2
+  timeout: 30
+notification:
+  emails:
+    - rhys.fureigh@gsa.gov
+  threshold: all
+_core:
+  default_config_hash: 2QzULf0zovJQx3J06Y9rufzzfi-CY2CTTlEfJJh2Qyw
diff --git a/web/sites/default/config/user.flood.yml b/web/sites/default/config/user.flood.yml
new file mode 100644
index 0000000..f165c95
--- /dev/null
+++ b/web/sites/default/config/user.flood.yml
@@ -0,0 +1,7 @@
+uid_only: false
+ip_limit: 50
+ip_window: 3600
+user_limit: 5
+user_window: 21600
+_core:
+  default_config_hash: UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs
diff --git a/web/sites/default/config/user.mail.yml b/web/sites/default/config/user.mail.yml
new file mode 100644
index 0000000..9180844
--- /dev/null
+++ b/web/sites/default/config/user.mail.yml
@@ -0,0 +1,30 @@
+cancel_confirm:
+  body: "[user:display-name],\n\nA request to cancel your account has been made at [site:name].\n\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\n\n[user:cancel-url]\n\nNOTE: The cancellation of your account is not reversible.\n\nThis link expires in one day and nothing will happen if it is not used.\n\n--  [site:name] team"
+  subject: 'Account cancellation request for [user:display-name] at [site:name]'
+password_reset:
+  body: "[user:display-name],\n\nA request to reset the password for your account has been made at [site:name].\n\nYou may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\n\n--  [site:name] team"
+  subject: 'Replacement login information for [user:display-name] at [site:name]'
+register_admin_created:
+  body: "[user:display-name],\n\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n--  [site:name] team"
+  subject: 'An administrator created an account for you at [site:name]'
+register_no_approval_required:
+  body: "[user:display-name],\n\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n--  [site:name] team"
+  subject: 'Account details for [user:display-name] at [site:name]'
+register_pending_approval:
+  body: "[user:display-name],\n\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\n\n\n--  [site:name] team"
+  subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
+register_pending_approval_admin:
+  body: "[user:display-name] has applied for an account.\n\n[user:edit-url]"
+  subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
+status_activated:
+  body: "[user:display-name],\n\nYour account at [site:name] has been activated.\n\nYou may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:account-name]\npassword: Your password\n\n--  [site:name] team"
+  subject: 'Account details for [user:display-name] at [site:name] (approved)'
+status_blocked:
+  body: "[user:display-name],\n\nYour account on [site:name] has been blocked.\n\n--  [site:name] team"
+  subject: 'Account details for [user:display-name] at [site:name] (blocked)'
+status_canceled:
+  body: "[user:display-name],\n\nYour account on [site:name] has been canceled.\n\n--  [site:name] team"
+  subject: 'Account details for [user:display-name] at [site:name] (canceled)'
+langcode: en
+_core:
+  default_config_hash: m4J3ROov32OEquRYGLbx3SpdDGuqx9l_zJtNvihqdCg
diff --git a/web/sites/default/config/user.role.administrator.yml b/web/sites/default/config/user.role.administrator.yml
new file mode 100644
index 0000000..e4fab33
--- /dev/null
+++ b/web/sites/default/config/user.role.administrator.yml
@@ -0,0 +1,11 @@
+uuid: 00817fb0-2bc9-4981-9597-5e8674368608
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: Om6FEO7vZZMkPIbVvfxtdkWerQ2PvQM4sWUd6Q3ZnfI
+id: administrator
+label: Administrator
+weight: -8
+is_admin: true
+permissions: {  }
diff --git a/web/sites/default/config/user.role.anonymous.yml b/web/sites/default/config/user.role.anonymous.yml
new file mode 100644
index 0000000..52f3bbe
--- /dev/null
+++ b/web/sites/default/config/user.role.anonymous.yml
@@ -0,0 +1,17 @@
+uuid: ad0ed9b7-1543-41dd-8bdc-ef67326fd795
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: j5zLMOdJBqC0bMvSdth5UebkprJB8g_2FXHqhfpJzow
+id: anonymous
+label: 'Anonymous user'
+weight: -10
+is_admin: false
+permissions:
+  - 'access comments'
+  - 'access content'
+  - 'access news feeds'
+  - 'access site-wide contact form'
+  - 'use text format restricted_html'
+  - 'view published brightcove videos'
diff --git a/web/sites/default/config/user.role.authenticated.yml b/web/sites/default/config/user.role.authenticated.yml
new file mode 100644
index 0000000..4867a0f
--- /dev/null
+++ b/web/sites/default/config/user.role.authenticated.yml
@@ -0,0 +1,25 @@
+uuid: f1db358e-79c7-4521-b2be-b5d80b770f0a
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: dJ0L2DNSj5q6XVZAGsuVDpJTh5UeYkIPwKrUOOpr8YI
+id: authenticated
+label: 'Authenticated user'
+weight: -9
+is_admin: false
+permissions:
+  - 'access brightcove videos overview page'
+  - 'access brightcove_video_browser_widget entity browser pages'
+  - 'access comments'
+  - 'access content'
+  - 'access news feeds'
+  - 'access shortcuts'
+  - 'access site-wide contact form'
+  - 'access tour'
+  - 'post comments'
+  - 'skip comment approval'
+  - 'use text format basic_html'
+  - 'view own unpublished content'
+  - 'view published brightcove videos'
+  - 'view unpublished brightcove videos'
diff --git a/web/sites/default/config/user.role.olpa_content_admin.yml b/web/sites/default/config/user.role.olpa_content_admin.yml
new file mode 100644
index 0000000..af29911
--- /dev/null
+++ b/web/sites/default/config/user.role.olpa_content_admin.yml
@@ -0,0 +1,33 @@
+uuid: 0b71900d-e4a8-4421-9396-7614cc7c3bbe
+langcode: en
+status: true
+dependencies: {  }
+id: olpa_content_admin
+label: 'OLPA content admin'
+weight: -6
+is_admin: null
+permissions:
+  - 'access content overview'
+  - 'access in-place editing'
+  - 'administer nodes'
+  - 'create news content'
+  - 'create news_and_events workflow_transition'
+  - 'create page content'
+  - 'edit any news content'
+  - 'edit any page content'
+  - 'edit own news content'
+  - 'edit own page content'
+  - 'revert all revisions'
+  - 'revert news revisions'
+  - 'revert page revisions'
+  - 'use editorial transition archive'
+  - 'use editorial transition archived_draft'
+  - 'use editorial transition archived_published'
+  - 'use editorial transition create_new_draft'
+  - 'use editorial transition publish'
+  - 'use editorial transition submit_for_review'
+  - 'view all revisions'
+  - 'view any unpublished content'
+  - 'view latest version'
+  - 'view news revisions'
+  - 'view page revisions'
diff --git a/web/sites/default/config/user.role.olpa_content_editor.yml b/web/sites/default/config/user.role.olpa_content_editor.yml
new file mode 100644
index 0000000..b27a242
--- /dev/null
+++ b/web/sites/default/config/user.role.olpa_content_editor.yml
@@ -0,0 +1,24 @@
+uuid: 2363a241-dcaf-4dd8-bc82-90ddd7382072
+langcode: en
+status: true
+dependencies: {  }
+id: olpa_content_editor
+label: 'OLPA content editor'
+weight: -7
+is_admin: null
+permissions:
+  - 'access in-place editing'
+  - 'create news content'
+  - 'create news_and_events workflow_transition'
+  - 'create page content'
+  - 'edit any news content'
+  - 'edit any page content'
+  - 'edit own news content'
+  - 'edit own page content'
+  - 'revert page revisions'
+  - 'use editorial transition archived_draft'
+  - 'use editorial transition create_new_draft'
+  - 'use editorial transition submit_for_review'
+  - 'view latest version'
+  - 'view news revisions'
+  - 'view page revisions'
diff --git a/web/sites/default/config/user.role.wig_member.yml b/web/sites/default/config/user.role.wig_member.yml
new file mode 100644
index 0000000..060a1df
--- /dev/null
+++ b/web/sites/default/config/user.role.wig_member.yml
@@ -0,0 +1,20 @@
+uuid: 3386185e-82f7-4376-84d2-3542a5ba517c
+langcode: en
+status: true
+dependencies: {  }
+id: wig_member
+label: 'WIG member'
+weight: -5
+is_admin: null
+permissions:
+  - 'access in-place editing'
+  - 'create news_and_events workflow_transition'
+  - 'create page content'
+  - 'edit any page content'
+  - 'edit own page content'
+  - 'revert page revisions'
+  - 'use editorial transition archived_draft'
+  - 'use editorial transition create_new_draft'
+  - 'use editorial transition submit_for_review'
+  - 'view latest version'
+  - 'view page revisions'
diff --git a/web/sites/default/config/user.settings.yml b/web/sites/default/config/user.settings.yml
new file mode 100644
index 0000000..7627c6b
--- /dev/null
+++ b/web/sites/default/config/user.settings.yml
@@ -0,0 +1,18 @@
+anonymous: Anonymous
+verify_mail: true
+notify:
+  cancel_confirm: true
+  password_reset: true
+  status_activated: true
+  status_blocked: false
+  status_canceled: false
+  register_admin_created: true
+  register_no_approval_required: true
+  register_pending_approval: true
+register: visitors_admin_approval
+cancel_method: user_cancel_block
+password_reset_timeout: 86400
+password_strength: true
+langcode: en
+_core:
+  default_config_hash: r4kwhOM0IWXVMUZDz744Yc16EOh37ZhYbA8kGOhSmLk
diff --git a/web/sites/default/config/uswds.settings.yml b/web/sites/default/config/uswds.settings.yml
new file mode 100644
index 0000000..eea9949
--- /dev/null
+++ b/web/sites/default/config/uswds.settings.yml
@@ -0,0 +1,34 @@
+features:
+  node_user_picture: 1
+  comment_user_picture: 1
+  comment_user_verification: 1
+  favicon: 1
+logo:
+  use_default: 0
+  path: ''
+favicon:
+  use_default: 1
+uswds_header_style: basic
+uswds_header_mega: 0
+uswds_search: 0
+uswds_government_banner: 1
+uswds_footer_style: slim
+uswds_footer_agency: 1
+uswds_footer_agency_name: 'National Science Foundation'
+uswds_footer_agency_url: nsf.gov
+uswds_footer_agency_logo: ''
+uswds_contact_center: ''
+uswds_email: ''
+uswds_phone: ''
+uswds_facebook: ''
+uswds_twitter: ''
+uswds_youtube: ''
+uswds_rss: ''
+uswds_paragraphs_edge_to_edge: 0
+uswds_menu_accordion_duplicate_parent: 0
+uswds_menu_bypass:
+  primary_menu: 0
+  secondary_menu: 0
+  mobile_menu: 0
+  sidebar_first: 0
+  footer_menu: 0
diff --git a/web/sites/default/config/views.settings.yml b/web/sites/default/config/views.settings.yml
new file mode 100644
index 0000000..fbda2e6
--- /dev/null
+++ b/web/sites/default/config/views.settings.yml
@@ -0,0 +1,48 @@
+display_extenders: {  }
+skip_cache: false
+sql_signature: false
+ui:
+  show:
+    additional_queries: false
+    advanced_column: false
+    master_display: false
+    performance_statistics: false
+    preview_information: true
+    sql_query:
+      enabled: false
+      where: above
+    display_embed: false
+  always_live_preview: true
+  exposed_filter_any_label: old_any
+field_rewrite_elements:
+  div: DIV
+  span: SPAN
+  h1: H1
+  h2: H2
+  h3: H3
+  h4: H4
+  h5: H5
+  h6: H6
+  p: P
+  header: HEADER
+  footer: FOOTER
+  article: ARTICLE
+  section: SECTION
+  aside: ASIDE
+  details: DETAILS
+  blockquote: BLOCKQUOTE
+  figure: FIGURE
+  address: ADDRESS
+  code: CODE
+  pre: PRE
+  var: VAR
+  samp: SAMP
+  kbd: KBD
+  strong: STRONG
+  em: EM
+  del: DEL
+  ins: INS
+  q: Q
+  s: S
+_core:
+  default_config_hash: RaRd9EIcwA4u3qCSRLL8EnCicbda1kV__ASmVbyehvQ
diff --git a/web/sites/default/config/views.view.aggregator_rss_feed.yml b/web/sites/default/config/views.view.aggregator_rss_feed.yml
new file mode 100644
index 0000000..270a247
--- /dev/null
+++ b/web/sites/default/config/views.view.aggregator_rss_feed.yml
@@ -0,0 +1,164 @@
+uuid: 43bdcb2b-bb90-4d99-bf64-00565710f5a8
+langcode: en
+status: true
+dependencies:
+  module:
+    - aggregator
+    - user
+_core:
+  default_config_hash: 2uV1-bP-4ZwdUPr4BsJG_vxcEg_Half6UjEvYStWZsA
+id: aggregator_rss_feed
+label: 'Aggregator RSS feed'
+module: aggregator
+description: ''
+tag: aggregator
+base_table: aggregator_item
+base_field: iid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access news feeds'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: 0
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+            first: '« First'
+            last: 'Last »'
+          quantity: 9
+      style:
+        type: default
+      row:
+        type: 'entity:aggregator_item'
+      fields:
+        iid:
+          table: aggregator_item
+          field: iid
+          id: iid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Item ID'
+          exclude: false
+          plugin_id: field
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: number_integer
+          entity_type: aggregator_item
+          entity_field: iid
+      filters: {  }
+      sorts: {  }
+      title: 'Aggregator RSS feed'
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      cacheable: false
+      max-age: -1
+      tags: {  }
+  feed_items:
+    display_plugin: feed
+    id: feed_items
+    display_title: Feed
+    position: 1
+    display_options:
+      path: aggregator/rss
+      display_description: ''
+      defaults:
+        arguments: true
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user.permissions
+      cacheable: false
+      max-age: -1
+      tags: {  }
diff --git a/web/sites/default/config/views.view.aggregator_sources.yml b/web/sites/default/config/views.view.aggregator_sources.yml
new file mode 100644
index 0000000..3930651
--- /dev/null
+++ b/web/sites/default/config/views.view.aggregator_sources.yml
@@ -0,0 +1,433 @@
+uuid: 020161d2-c6d2-4d12-b73c-f10e6c47baa2
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.aggregator_feed.summary
+    - system.menu.tools
+  module:
+    - aggregator
+    - user
+_core:
+  default_config_hash: 0JhSbClCFgLQkyLCjxydZDoTOGs_qu-yyy_a77m8EcM
+id: aggregator_sources
+label: 'Aggregator sources'
+module: aggregator
+description: ''
+tag: aggregator
+base_table: aggregator_feed
+base_field: fid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access news feeds'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+            first: '« First'
+            last: 'Last »'
+          quantity: 9
+      style:
+        type: default
+      row:
+        type: 'entity:aggregator_feed'
+        options:
+          relationship: none
+          view_mode: summary
+      fields:
+        fid:
+          table: aggregator_feed
+          field: fid
+          id: fid
+          plugin_id: field
+          type: number_integer
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          entity_type: aggregator_feed
+          entity_field: fid
+      filters: {  }
+      sorts: {  }
+      title: Sources
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  feed_1:
+    display_plugin: feed
+    id: feed_1
+    display_title: Feed
+    position: 2
+    display_options:
+      style:
+        type: opml
+        options:
+          grouping: {  }
+      path: aggregator/opml
+      fields:
+        title:
+          id: title
+          table: aggregator_feed
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: aggregator_title
+          settings:
+            display_as_link: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+          entity_type: aggregator_feed
+          entity_field: title
+        url:
+          id: url
+          table: aggregator_feed
+          field: url
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          display_as_link: false
+          plugin_id: url
+          entity_type: aggregator_feed
+          entity_field: url
+        description:
+          id: description
+          table: aggregator_feed
+          field: description
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: xss
+          entity_type: aggregator_feed
+          entity_field: description
+        link:
+          id: link
+          table: aggregator_feed
+          field: link
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          display_as_link: false
+          plugin_id: url
+          entity_type: aggregator_feed
+          entity_field: link
+      defaults:
+        fields: false
+        title: false
+      row:
+        type: opml_fields
+        options:
+          type_field: rss
+          text_field: title
+          created_field: ''
+          description_field: description
+          html_url_field: link
+          language_field: ''
+          xml_url_field: url
+          url_field: ''
+      displays:
+        page_1: page_1
+        default: '0'
+      title: 'OPML feed'
+      sitename_title: true
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      path: aggregator/sources
+      menu:
+        type: normal
+        title: Sources
+        description: ''
+        weight: 0
+        context: '0'
+        menu_name: tools
+        enabled: false
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      max-age: -1
+      tags: {  }
diff --git a/web/sites/default/config/views.view.archive.yml b/web/sites/default/config/views.view.archive.yml
new file mode 100644
index 0000000..4ad0239
--- /dev/null
+++ b/web/sites/default/config/views.view.archive.yml
@@ -0,0 +1,243 @@
+uuid: 8c210411-3f36-4527-9c6a-aade6457c2b5
+langcode: en
+status: false
+dependencies:
+  config:
+    - core.entity_view_mode.node.teaser
+  module:
+    - node
+    - user
+_core:
+  default_config_hash: SRH1EhxAiIRj01P9xYv0h_LfIfWxjll0Yq-eDfjziFI
+id: archive
+label: Archive
+module: node
+description: 'All content, by month.'
+tag: default
+base_table: node_field_data
+base_field: nid
+core: '8'
+display:
+  default:
+    id: default
+    display_title: Master
+    display_plugin: default
+    position: 0
+    display_options:
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      title: 'Monthly archive'
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: 0
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      sorts:
+        created:
+          id: created
+          table: node_field_data
+          field: created
+          order: DESC
+          plugin_id: date
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          entity_type: node
+          entity_field: created
+      arguments:
+        created_year_month:
+          id: created_year_month
+          table: node_field_data
+          field: created_year_month
+          default_action: summary
+          exception:
+            title_enable: true
+          title_enable: true
+          title: '{{ arguments.created_year_month }}'
+          default_argument_type: fixed
+          summary:
+            sort_order: desc
+            format: default_summary
+          summary_options:
+            override: true
+            items_per_page: 30
+          specify_validation: true
+          plugin_id: date_year_month
+          entity_type: node
+      filters:
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          value: '1'
+          group: 0
+          expose:
+            operator: '0'
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value:
+            '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: language
+          entity_type: node
+          entity_field: langcode
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: 'entity:node'
+        options:
+          view_mode: teaser
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      fields: {  }
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  block_1:
+    id: block_1
+    display_title: Block
+    display_plugin: block
+    position: 1
+    display_options:
+      query:
+        type: views_query
+        options: {  }
+      defaults:
+        arguments: false
+      arguments:
+        created_year_month:
+          id: created_year_month
+          table: node_field_data
+          field: created_year_month
+          default_action: summary
+          exception:
+            title_enable: true
+          title_enable: true
+          title: '{{ arguments.created_year_month }}'
+          default_argument_type: fixed
+          summary:
+            format: default_summary
+          summary_options:
+            items_per_page: 30
+          specify_validation: true
+          plugin_id: date_year_month
+          entity_type: node
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: 2
+    display_options:
+      query:
+        type: views_query
+        options: {  }
+      path: archive
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
diff --git a/web/sites/default/config/views.view.block_content.yml b/web/sites/default/config/views.view.block_content.yml
new file mode 100644
index 0000000..fba9024
--- /dev/null
+++ b/web/sites/default/config/views.view.block_content.yml
@@ -0,0 +1,500 @@
+uuid: 3c8d94b9-d865-4a32-962d-eeba4449d608
+langcode: en
+status: true
+dependencies:
+  module:
+    - block_content
+    - user
+_core:
+  default_config_hash: msYnighLW1IbiBfyQbwbQwb2cU-5LECiFryt60k0Nfk
+id: block_content
+label: 'Custom block library'
+module: views
+description: 'Find and manage custom blocks.'
+tag: default
+base_table: block_content_field_data
+base_field: id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'administer blocks'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 50
+          offset: 0
+          id: 0
+          total_pages: null
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            info: info
+            type: type
+            changed: changed
+            operations: operations
+          info:
+            info:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            operations:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: changed
+          empty_table: true
+      row:
+        type: fields
+      fields:
+        info:
+          id: info
+          table: block_content_field_data
+          field: info
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Block description'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: null
+          entity_field: info
+          plugin_id: field
+        type:
+          id: type
+          table: block_content_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Block type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: block_content
+          entity_field: type
+          plugin_id: field
+        changed:
+          id: changed
+          table: block_content_field_data
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Updated
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          entity_type: block_content
+          entity_field: changed
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          plugin_id: field
+        operations:
+          id: operations
+          table: block_content
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: true
+          entity_type: block_content
+          plugin_id: entity_operations
+      filters:
+        info:
+          id: info
+          table: block_content_field_data
+          field: info
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: info_op
+            label: 'Block description'
+            description: ''
+            use_operator: false
+            operator: info_op
+            identifier: info
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: block_content
+          entity_field: info
+          plugin_id: string
+        type:
+          id: type
+          table: block_content_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: 'Block type'
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: block_content
+          entity_field: type
+          plugin_id: bundle
+      sorts: {  }
+      title: 'Custom block library'
+      header: {  }
+      footer: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'There are no custom blocks available. '
+          plugin_id: text_custom
+        block_content_listing_empty:
+          admin_label: ''
+          empty: true
+          field: block_content_listing_empty
+          group_type: group
+          id: block_content_listing_empty
+          label: ''
+          relationship: none
+          table: block_content
+          plugin_id: block_content_listing_empty
+          entity_type: block_content
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      max-age: 0
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: admin/structure/block/block-content
+      menu:
+        type: tab
+        title: 'Custom block library'
+        description: ''
+        parent: block.admin_display
+        weight: 0
+        context: '0'
+        menu_name: admin
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      max-age: 0
+      tags: {  }
diff --git a/web/sites/default/config/views.view.blogs.yml b/web/sites/default/config/views.view.blogs.yml
new file mode 100644
index 0000000..1f22b92
--- /dev/null
+++ b/web/sites/default/config/views.view.blogs.yml
@@ -0,0 +1,1397 @@
+uuid: 9e668116-1ae8-4464-bb32-04108d5efd25
+langcode: en
+status: false
+dependencies:
+  module:
+    - aggregator
+id: blogs
+label: Blogs
+module: views
+description: 'NSF custom view. Displays blog entries imported from external blogs. Separable by department/source.'
+tag: ''
+base_table: aggregator_item
+base_field: iid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: none
+        options: {  }
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: default
+      row:
+        type: 'entity:aggregator_item'
+      fields:
+        title:
+          table: aggregator_item
+          field: title
+          id: title
+          entity_type: null
+          entity_field: title
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: aggregator_title
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      filters: {  }
+      sorts:
+        timestamp:
+          id: timestamp
+          table: aggregator_item
+          field: timestamp
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          entity_type: aggregator_item
+          entity_field: timestamp
+          plugin_id: date
+      title: Blogs
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+      tags: {  }
+  block_1:
+    display_plugin: block
+    id: block_1
+    display_title: Block
+    position: 3
+    display_options:
+      display_extenders: {  }
+      style:
+        type: default
+      defaults:
+        style: false
+        row: false
+        pager: false
+        fields: false
+      row:
+        type: fields
+      pager:
+        type: some
+        options:
+          items_per_page: 5
+          offset: 0
+      block_description: 'Blog entries (all)'
+      fields:
+        title:
+          table: aggregator_item
+          field: title
+          id: title
+          entity_type: null
+          entity_field: title
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: aggregator_title
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        timestamp:
+          id: timestamp
+          table: aggregator_item
+          field: timestamp
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: custom
+            custom_date_format: 'F j, Y'
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: aggregator_item
+          entity_field: timestamp
+          plugin_id: field
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+      tags: {  }
+  block_2:
+    display_plugin: block
+    id: block_2
+    display_title: 'Block - Notes from the Field'
+    position: 3
+    display_options:
+      display_extenders: {  }
+      style:
+        type: default
+      defaults:
+        style: false
+        row: false
+        pager: false
+        fields: false
+        filters: false
+        filter_groups: false
+        title: false
+        use_more: false
+        use_more_always: false
+        use_more_text: false
+        link_display: false
+        link_url: false
+        footer: false
+      row:
+        type: fields
+      pager:
+        type: some
+        options:
+          items_per_page: 5
+          offset: 0
+      block_description: 'Blog entries (Notes from the Field)'
+      fields:
+        title:
+          table: aggregator_item
+          field: title
+          id: title
+          entity_type: null
+          entity_field: title
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: aggregator_title
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        timestamp:
+          id: timestamp
+          table: aggregator_item
+          field: timestamp
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: custom
+            custom_date_format: 'F j, Y'
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: aggregator_item
+          entity_field: timestamp
+          plugin_id: field
+      filters:
+        fid:
+          id: fid
+          table: aggregator_feed
+          field: fid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value:
+            min: ''
+            max: ''
+            value: '1'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: aggregator_feed
+          entity_field: fid
+          plugin_id: numeric
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      title: 'Notes from the Field'
+      display_description: ''
+      use_more: false
+      use_more_always: false
+      use_more_text: more
+      link_display: '0'
+      link_url: ''
+      footer:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: false
+          content:
+            value: '<a href="/blogs/[view:title]">more</a>'
+            format: basic_html
+          plugin_id: text
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+      tags: {  }
+  block_3:
+    display_plugin: block
+    id: block_3
+    display_title: 'Block - BIO Buzz'
+    position: 3
+    display_options:
+      display_extenders: {  }
+      style:
+        type: default
+      defaults:
+        style: false
+        row: false
+        pager: false
+        fields: false
+        filters: false
+        filter_groups: false
+        title: false
+        use_more: false
+        use_more_always: false
+        use_more_text: false
+        link_display: false
+        link_url: false
+        footer: false
+      row:
+        type: fields
+      pager:
+        type: some
+        options:
+          items_per_page: 5
+          offset: 0
+      block_description: 'Blog entries (BIO Buzz)'
+      fields:
+        title:
+          table: aggregator_item
+          field: title
+          id: title
+          entity_type: null
+          entity_field: title
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: aggregator_title
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        timestamp:
+          id: timestamp
+          table: aggregator_item
+          field: timestamp
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: custom
+            custom_date_format: 'F j, Y'
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: aggregator_item
+          entity_field: timestamp
+          plugin_id: field
+      filters:
+        fid:
+          id: fid
+          table: aggregator_feed
+          field: fid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value:
+            min: ''
+            max: ''
+            value: '2'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: aggregator_feed
+          entity_field: fid
+          plugin_id: numeric
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      title: 'BIO Buzz'
+      display_description: ''
+      use_more: false
+      use_more_always: false
+      use_more_text: more
+      link_display: '0'
+      link_url: ''
+      footer:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: false
+          content:
+            value: '<a href="/blogs/[view:title]">more</a>'
+            format: basic_html
+          plugin_id: text
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+      tags: {  }
+  block_4:
+    display_plugin: block
+    id: block_4
+    display_title: 'Block - DEBrief'
+    position: 3
+    display_options:
+      display_extenders: {  }
+      style:
+        type: default
+      defaults:
+        style: false
+        row: false
+        pager: false
+        fields: false
+        filters: false
+        filter_groups: false
+        title: false
+        use_more: false
+        use_more_always: false
+        use_more_text: false
+        link_display: false
+        link_url: false
+        footer: false
+      row:
+        type: fields
+      pager:
+        type: some
+        options:
+          items_per_page: 5
+          offset: 0
+      block_description: 'Blog entries (DEBrief)'
+      fields:
+        title:
+          table: aggregator_item
+          field: title
+          id: title
+          entity_type: null
+          entity_field: title
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: aggregator_title
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        timestamp:
+          id: timestamp
+          table: aggregator_item
+          field: timestamp
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: custom
+            custom_date_format: 'F j, Y'
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: aggregator_item
+          entity_field: timestamp
+          plugin_id: field
+      filters:
+        fid:
+          id: fid
+          table: aggregator_feed
+          field: fid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value:
+            min: ''
+            max: ''
+            value: '3'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: aggregator_feed
+          entity_field: fid
+          plugin_id: numeric
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      title: DEBrief
+      display_description: ''
+      use_more: false
+      use_more_always: false
+      use_more_text: more
+      link_display: '0'
+      link_url: ''
+      footer:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: false
+          content:
+            value: '<a href="/blogs/[view:title]">more</a>'
+            format: basic_html
+          plugin_id: text
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+      tags: {  }
+  block_5:
+    display_plugin: block
+    id: block_5
+    display_title: 'Block - MCB Blog'
+    position: 3
+    display_options:
+      display_extenders: {  }
+      style:
+        type: default
+      defaults:
+        style: false
+        row: false
+        pager: false
+        fields: false
+        filters: false
+        filter_groups: false
+        title: false
+        use_more: false
+        use_more_always: false
+        use_more_text: false
+        link_display: false
+        link_url: false
+        footer: false
+      row:
+        type: fields
+      pager:
+        type: some
+        options:
+          items_per_page: 5
+          offset: 0
+      block_description: 'Blog entries (MCB Blog)'
+      fields:
+        title:
+          table: aggregator_item
+          field: title
+          id: title
+          entity_type: null
+          entity_field: title
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: aggregator_title
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        timestamp:
+          id: timestamp
+          table: aggregator_item
+          field: timestamp
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: custom
+            custom_date_format: 'F j, Y'
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: aggregator_item
+          entity_field: timestamp
+          plugin_id: field
+      filters:
+        fid:
+          id: fid
+          table: aggregator_feed
+          field: fid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value:
+            min: ''
+            max: ''
+            value: '4'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: aggregator_feed
+          entity_field: fid
+          plugin_id: numeric
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      title: 'MCB Blog'
+      display_description: ''
+      use_more: false
+      use_more_always: false
+      use_more_text: more
+      link_display: '0'
+      link_url: ''
+      footer:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: false
+          content:
+            value: '<a href="/blogs/[view:title]">more</a>'
+            format: basic_html
+          plugin_id: text
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+      tags: {  }
+  feed_1:
+    display_plugin: feed
+    id: feed_1
+    display_title: Feed
+    position: 2
+    display_options:
+      display_extenders: {  }
+      row:
+        type: aggregator_rss
+      pager:
+        type: some
+      style:
+        type: rss
+      path: blogs.xml
+      displays:
+        default: default
+        page_1: page_1
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: blogs
+      filters: {  }
+      defaults:
+        filters: false
+        filter_groups: false
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      enabled: false
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+      tags: {  }
+  page_2:
+    display_plugin: page
+    id: page_2
+    display_title: 'Page - Department-Specific'
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: blogs/%
+      display_description: 'Blog entries filtered by source.'
+      filters: {  }
+      defaults:
+        filters: false
+        filter_groups: false
+        arguments: false
+        empty: false
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      arguments:
+        title:
+          id: title
+          table: aggregator_feed
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: empty
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: true
+          title: '{{ arguments.title }}'
+          default_argument_type: fixed
+          default_argument_options:
+            argument: ''
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            items_per_page: 25
+            override: false
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          glossary: false
+          limit: 0
+          case: none
+          path_case: lower
+          transform_dash: true
+          break_phrase: false
+          entity_type: aggregator_feed
+          entity_field: title
+          plugin_id: string
+      empty:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content:
+            value: 'No posts from that blog were found. Check out our <a href="/blogs">main blog</a> instead.'
+            format: basic_html
+          plugin_id: text
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+      tags: {  }
diff --git a/web/sites/default/config/views.view.brightcove_video.yml b/web/sites/default/config/views.view.brightcove_video.yml
new file mode 100644
index 0000000..7912991
--- /dev/null
+++ b/web/sites/default/config/views.view.brightcove_video.yml
@@ -0,0 +1,646 @@
+uuid: 65fb7be6-4129-42e3-9ef5-0c65ffef9159
+langcode: en
+status: true
+dependencies:
+  config:
+    - image.style.brightcove_videos_list_thumbnail
+  module:
+    - brightcove
+    - image
+    - user
+_core:
+  default_config_hash: fGopW01-CAUPQP3ZXUQEsjT-xEHh6IT2o-pC6Ncq8uY
+id: brightcove_video
+label: 'Brightcove Videos'
+module: views
+description: ''
+tag: ''
+base_table: brightcove_video
+base_field: bcvid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access brightcove videos overview page'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 50
+          offset: 0
+          id: 0
+          total_pages: null
+          tags:
+            previous: ‹‹
+            next: ››
+            first: '« First'
+            last: 'Last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            thumbnail__target_id: thumbnail__target_id
+            name: name
+            status: status
+            changed: changed
+            reference_id: reference_id
+            created: created
+            operations: operations
+          info:
+            thumbnail__target_id:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            status:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            reference_id:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            created:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            operations:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: changed
+          empty_table: false
+      row:
+        type: fields
+      fields:
+        thumbnail__target_id:
+          id: thumbnail__target_id
+          table: brightcove_video
+          field: thumbnail__target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Video
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: image
+          settings:
+            image_style: brightcove_videos_list_thumbnail
+            image_link: ''
+          group_column: ''
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: brightcove_video
+          entity_field: thumbnail
+          plugin_id: field
+        name:
+          id: name
+          table: brightcove_video
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Name
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: brightcove_video
+          entity_field: name
+          plugin_id: field
+        status:
+          id: status
+          table: brightcove_video
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Status
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: boolean
+          settings:
+            format: default
+            format_custom_true: ''
+            format_custom_false: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: brightcove_video
+          entity_field: status
+          plugin_id: field
+        changed:
+          id: changed
+          table: brightcove_video
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Updated
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: brightcove_video
+          entity_field: changed
+          plugin_id: field
+        reference_id:
+          id: reference_id
+          table: brightcove_video
+          field: reference_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Reference ID'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: brightcove_video
+          entity_field: reference_id
+          plugin_id: field
+        created:
+          id: created
+          table: brightcove_video
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Created
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: long
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: brightcove_video
+          entity_field: created
+          plugin_id: field
+        operations:
+          id: operations
+          table: brightcove_video
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: false
+          entity_type: brightcove_video
+          plugin_id: entity_operations
+      filters: {  }
+      sorts: {  }
+      title: 'Brightcove Videos'
+      header: {  }
+      footer: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'No content available.'
+          plugin_id: text_custom
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: admin/content/brightcove_video
+      menu:
+        type: tab
+        title: 'Brightcove Videos'
+        description: ''
+        expanded: false
+        parent: ''
+        weight: 0
+        context: '0'
+        menu_name: main
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags: {  }
diff --git a/web/sites/default/config/views.view.brightcove_video_browser.yml b/web/sites/default/config/views.view.brightcove_video_browser.yml
new file mode 100644
index 0000000..0b6c082
--- /dev/null
+++ b/web/sites/default/config/views.view.brightcove_video_browser.yml
@@ -0,0 +1,372 @@
+uuid: 1534420f-4f9d-4fc4-a92c-f8bc262c9b61
+langcode: en
+status: true
+dependencies:
+  config:
+    - image.style.brightcove_videos_list_thumbnail
+  module:
+    - brightcove
+    - entity_browser
+    - image
+_core:
+  default_config_hash: QhijKsaFWb3FufdDHJ59ClxrOhkvIOgW1SfwGokn_Vo
+id: brightcove_video_browser
+label: 'Brightcove video browser'
+module: views
+description: 'A browser for the NSF''s Brightcove videos.'
+tag: ''
+base_table: brightcove_video
+base_field: bcvid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: none
+        options: {  }
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+          columns: {  }
+          default: ''
+          info: {  }
+          override: true
+          sticky: false
+          order: asc
+          caption: ''
+          summary: ''
+          description: ''
+          empty_table: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      fields:
+        entity_browser_select:
+          id: entity_browser_select
+          table: brightcove_video
+          field: entity_browser_select
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          entity_type: brightcove_video
+          plugin_id: entity_browser_select
+        name:
+          id: name
+          table: brightcove_video
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Name
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: brightcove_video
+          entity_field: name
+          plugin_id: field
+        thumbnail__target_id:
+          id: thumbnail__target_id
+          table: brightcove_video
+          field: thumbnail__target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Thumbnail
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: image
+          settings:
+            image_style: brightcove_videos_list_thumbnail
+            image_link: ''
+          group_column: ''
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: brightcove_video
+          entity_field: thumbnail
+          plugin_id: field
+        created:
+          id: created
+          table: brightcove_video
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Created
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: brightcove_video
+          entity_field: created
+          plugin_id: field
+      filters: {  }
+      sorts: {  }
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+      title: 'Brightcove video browser'
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+      tags: {  }
+  entity_browser_1:
+    display_plugin: entity_browser
+    id: entity_browser_1
+    display_title: 'Entity browser'
+    position: 1
+    display_options:
+      display_extenders: {  }
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+      tags: {  }
diff --git a/web/sites/default/config/views.view.brightcove_videos_by_api_client.yml b/web/sites/default/config/views.view.brightcove_videos_by_api_client.yml
new file mode 100644
index 0000000..1e0d645
--- /dev/null
+++ b/web/sites/default/config/views.view.brightcove_videos_by_api_client.yml
@@ -0,0 +1,251 @@
+uuid: 833a3afd-6008-43d1-ad16-62e53c6f5439
+langcode: en
+status: true
+dependencies:
+  module:
+    - brightcove
+_core:
+  default_config_hash: X6o0fxU-Vjk9F45B1YgGKcUqUOTB9RIbDrYc91zCTE0
+id: brightcove_videos_by_api_client
+label: 'Brightcove Videos By API Client'
+module: views
+description: ''
+tag: ''
+base_table: brightcove_video
+base_field: bcvid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: none
+        options: {  }
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      fields:
+        name:
+          id: name
+          table: brightcove_video
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: brightcove_video
+          entity_field: name
+          plugin_id: field
+      filters: {  }
+      sorts:
+        name:
+          id: name
+          table: brightcove_video
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: ASC
+          exposed: false
+          expose:
+            label: ''
+          entity_type: brightcove_video
+          entity_field: name
+          plugin_id: standard
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments:
+        api_client:
+          id: api_client
+          table: brightcove_video
+          field: api_client
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: empty
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: fixed
+          default_argument_options:
+            argument: ''
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            items_per_page: 25
+            override: false
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: true
+          validate:
+            type: 'entity:brightcove_api_client'
+            fail: empty
+          validate_options:
+            access: true
+            operation: view
+            multiple: 0
+            bundles: null
+          glossary: false
+          limit: 0
+          case: none
+          path_case: none
+          transform_dash: false
+          break_phrase: false
+          entity_type: brightcove_video
+          entity_field: api_client
+          plugin_id: string
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+      tags: {  }
+  videos_entity_reference:
+    display_plugin: entity_reference
+    id: videos_entity_reference
+    display_title: 'Entity Reference'
+    position: 1
+    display_options:
+      display_extenders: {  }
+      style:
+        type: entity_reference
+        options:
+          search_fields:
+            name: name
+      row:
+        type: entity_reference
+        options:
+          default_field_elements: true
+          inline: {  }
+          separator: '-'
+          hide_empty: false
+      pager:
+        type: some
+        options:
+          items_per_page: 10
+          offset: 0
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+      tags: {  }
diff --git a/web/sites/default/config/views.view.comment.yml b/web/sites/default/config/views.view.comment.yml
new file mode 100644
index 0000000..31e5c39
--- /dev/null
+++ b/web/sites/default/config/views.view.comment.yml
@@ -0,0 +1,1582 @@
+uuid: dba94a0c-9250-4061-9ee2-c676e27b4a30
+langcode: en
+status: true
+dependencies:
+  module:
+    - comment
+    - user
+_core:
+  default_config_hash: cCq1vjj1qmyd39oBIUyOe8YPDsobJ5fZRhp2Xy5O7lA
+id: comment
+label: Comments
+module: comment
+description: 'Find and manage comments.'
+tag: default
+base_table: comment_field_data
+base_field: cid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'administer comments'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 50
+          offset: 0
+          id: 0
+          total_pages: null
+          tags:
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: true
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            comment_bulk_form: comment_bulk_form
+            subject: subject
+            uid: uid
+            entity_id: entity_id
+            changed: changed
+            operations: operations
+          info:
+            comment_bulk_form:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            subject:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            uid:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            entity_id:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            operations:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: changed
+          empty_table: true
+      row:
+        type: fields
+      fields:
+        comment_bulk_form:
+          id: comment_bulk_form
+          table: comment
+          field: comment_bulk_form
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          action_title: Action
+          include_exclude: include
+          selected_actions:
+            - comment_delete_action
+            - comment_unpublish_action
+          plugin_id: comment_bulk_form
+          entity_type: comment
+        subject:
+          id: subject
+          table: comment_field_data
+          field: subject
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Subject
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: comment_permalink
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: comment
+          entity_field: subject
+          plugin_id: field
+        uid:
+          id: uid
+          table: comment_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: comment
+          entity_field: uid
+          plugin_id: field
+        name:
+          id: name
+          table: comment_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Author
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: '{{ uid }}'
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: comment_username
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: comment
+          entity_field: name
+          plugin_id: field
+        entity_id:
+          id: entity_id
+          table: comment_field_data
+          field: entity_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Posted in'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: comment
+          entity_field: entity_id
+          plugin_id: commented_entity
+        changed:
+          id: changed
+          table: comment_field_data
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Updated
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: comment
+          entity_field: changed
+          plugin_id: field
+        operations:
+          id: operations
+          table: comment
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: true
+          entity_type: comment
+          plugin_id: entity_operations
+        name_1:
+          id: name_1
+          table: users_field_data
+          field: name
+          relationship: uid
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: user_name
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: user
+          entity_field: name
+          plugin_id: field
+      filters:
+        status:
+          id: status
+          table: comment_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: comment
+          entity_field: status
+          plugin_id: boolean
+        subject:
+          id: subject
+          table: comment_field_data
+          field: subject
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: subject_op
+            label: Subject
+            description: ''
+            use_operator: false
+            operator: subject_op
+            identifier: subject
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: comment
+          entity_field: subject
+          plugin_id: string
+        combine:
+          id: combine
+          table: views
+          field: combine
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: combine_op
+            label: 'Author name'
+            description: ''
+            use_operator: false
+            operator: combine_op
+            identifier: author_name
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          fields:
+            name: name
+            name_1: name_1
+          plugin_id: combine
+        langcode:
+          id: langcode
+          table: comment_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: langcode_op
+            label: Language
+            description: ''
+            use_operator: false
+            operator: langcode_op
+            identifier: langcode
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: comment
+          entity_field: langcode
+          plugin_id: language
+      sorts:
+        changed:
+          id: changed
+          table: comment_field_data
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          entity_type: comment
+          entity_field: changed
+          plugin_id: date
+      title: Comments
+      header: {  }
+      footer: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'No comments available.'
+          plugin_id: text_custom
+      arguments: {  }
+      display_extenders: {  }
+      use_more: false
+      use_more_always: true
+      use_more_text: more
+      use_ajax: false
+      hide_attachment_summary: false
+      show_admin_links: true
+      group_by: false
+      css_class: ''
+      relationships:
+        uid:
+          id: uid
+          table: comment_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: author
+          required: false
+          entity_type: comment
+          entity_field: uid
+          plugin_id: standard
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      cacheable: false
+      max-age: 0
+      tags: {  }
+  page_published:
+    display_plugin: page
+    id: page_published
+    display_title: 'Published comments'
+    position: 1
+    display_options:
+      path: admin/content/comment
+      menu:
+        type: tab
+        title: Comments
+        description: 'Comments published'
+        parent: ''
+        weight: 0
+        context: '0'
+        menu_name: admin
+      display_description: 'The approved comments listing.'
+      display_extenders: {  }
+      exposed_block: false
+      display_comment: ''
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      cacheable: false
+      max-age: 0
+      tags: {  }
+  page_unapproved:
+    display_plugin: page
+    id: page_unapproved
+    display_title: 'Unapproved comments'
+    position: 2
+    display_options:
+      path: admin/content/comment/approval
+      menu:
+        type: tab
+        title: 'Unapproved comments'
+        description: 'Comments unapproved'
+        parent: ''
+        weight: 1
+        context: '0'
+        menu_name: admin
+      display_description: 'The unapproved comments listing.'
+      filters:
+        status:
+          id: status
+          table: comment_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '0'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: comment
+          entity_field: status
+          plugin_id: boolean
+        subject:
+          id: subject
+          table: comment_field_data
+          field: subject
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: subject_op
+            label: Subject
+            description: ''
+            use_operator: false
+            operator: subject_op
+            identifier: subject
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: comment
+          entity_field: subject
+          plugin_id: string
+        combine:
+          id: combine
+          table: views
+          field: combine
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: combine_op
+            label: 'Author Name'
+            description: ''
+            use_operator: false
+            operator: combine_op
+            identifier: author_name
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          fields:
+            name: name
+            name_1: name_1
+          plugin_id: combine
+        langcode:
+          id: langcode
+          table: comment_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: langcode_op
+            label: Language
+            description: ''
+            use_operator: false
+            operator: langcode_op
+            identifier: langcode
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: comment
+          entity_field: langcode
+          plugin_id: language
+      defaults:
+        filters: false
+        filter_groups: false
+        fields: false
+      display_extenders: {  }
+      fields:
+        comment_bulk_form:
+          id: comment_bulk_form
+          table: comment
+          field: comment_bulk_form
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          action_title: Action
+          include_exclude: include
+          selected_actions:
+            - comment_delete_action
+            - comment_publish_action
+          plugin_id: comment_bulk_form
+          entity_type: comment
+        subject:
+          id: subject
+          table: comment_field_data
+          field: subject
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Subject
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: comment_permalink
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: comment
+          entity_field: subject
+          plugin_id: field
+        uid:
+          id: uid
+          table: comment_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: comment
+          entity_field: uid
+          plugin_id: field
+        name:
+          id: name
+          table: comment_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Author
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: '{{ uid }}'
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: comment_username
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: comment
+          entity_field: name
+          plugin_id: field
+        entity_id:
+          id: entity_id
+          table: comment_field_data
+          field: entity_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Posted in'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: comment
+          entity_field: entity_id
+          plugin_id: commented_entity
+        changed:
+          id: changed
+          table: comment_field_data
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Updated
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: comment
+          entity_field: changed
+          plugin_id: field
+        operations:
+          id: operations
+          table: comment
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: true
+          entity_type: comment
+          plugin_id: entity_operations
+        name_1:
+          id: name_1
+          table: users_field_data
+          field: name
+          relationship: uid
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: user_name
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: user
+          entity_field: name
+          plugin_id: field
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      cacheable: false
+      max-age: 0
+      tags: {  }
diff --git a/web/sites/default/config/views.view.comments_recent.yml b/web/sites/default/config/views.view.comments_recent.yml
new file mode 100644
index 0000000..6231c75
--- /dev/null
+++ b/web/sites/default/config/views.view.comments_recent.yml
@@ -0,0 +1,263 @@
+uuid: f4a12b2f-5067-49e3-8462-b45fb0b15221
+langcode: en
+status: true
+dependencies:
+  module:
+    - comment
+    - node
+    - user
+_core:
+  default_config_hash: HacS-nsDH7uyoKhQHNyV_MNRClmPVuhU_fWZgNuEyIs
+id: comments_recent
+label: 'Recent comments'
+module: views
+description: 'Recent comments.'
+tag: default
+base_table: comment_field_data
+base_field: cid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access comments'
+      cache:
+        type: tag
+      query:
+        type: views_query
+      exposed_form:
+        type: basic
+      pager:
+        type: some
+        options:
+          items_per_page: 10
+          offset: 0
+      style:
+        type: html_list
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          type: ul
+          wrapper_class: item-list
+          class: ''
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          hide_empty: false
+      relationships:
+        node:
+          field: node
+          id: node
+          table: comment_field_data
+          required: true
+          plugin_id: standard
+      fields:
+        subject:
+          id: subject
+          table: comment_field_data
+          field: subject
+          relationship: none
+          type: string
+          settings:
+            link_to_entity: true
+          plugin_id: field
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: false
+            ellipsis: false
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          entity_type: comment
+          entity_field: subject
+        changed:
+          id: changed
+          table: comment_field_data
+          field: changed
+          relationship: none
+          plugin_id: field
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: timestamp_ago
+          settings:
+            future_format: '@interval hence'
+            past_format: '@interval ago'
+            granularity: 2
+          entity_type: comment
+          entity_field: changed
+      filters:
+        status:
+          value: '1'
+          table: comment_field_data
+          field: status
+          id: status
+          plugin_id: boolean
+          expose:
+            operator: ''
+          group: 1
+          entity_type: comment
+          entity_field: status
+        status_node:
+          value: '1'
+          table: node_field_data
+          field: status
+          relationship: node
+          id: status_node
+          plugin_id: boolean
+          expose:
+            operator: ''
+          group: 1
+          entity_type: node
+          entity_field: status
+      sorts:
+        created:
+          id: created
+          table: comment_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          plugin_id: date
+          entity_type: comment
+          entity_field: created
+        cid:
+          id: cid
+          table: comment_field_data
+          field: cid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          plugin_id: field
+          entity_type: comment
+          entity_field: cid
+      title: 'Recent comments'
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          empty: true
+          content: 'No comments available.'
+          tokenize: false
+          plugin_id: text_custom
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  block_1:
+    display_plugin: block
+    id: block_1
+    display_title: Block
+    position: 1
+    display_options:
+      block_description: 'Recent comments'
+      block_category: 'Lists (Views)'
+      allow:
+        items_per_page: true
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user.permissions
+      max-age: -1
+      tags: {  }
diff --git a/web/sites/default/config/views.view.content.yml b/web/sites/default/config/views.view.content.yml
new file mode 100644
index 0000000..b6fd483
--- /dev/null
+++ b/web/sites/default/config/views.view.content.yml
@@ -0,0 +1,600 @@
+uuid: d249acf8-8ae6-488b-b267-b5c22fb6db31
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - user
+_core:
+  default_config_hash: tS8PbpJX90aRFC3-UTgXzdqkq7_2frk2pz4TMijEebM
+id: content
+label: Content
+module: node
+description: 'Find and manage content.'
+tag: default
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content overview'
+      cache:
+        type: tag
+      query:
+        type: views_query
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: true
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 50
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+            first: '« First'
+            last: 'Last »'
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: true
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            node_bulk_form: node_bulk_form
+            title: title
+            type: type
+            name: name
+            status: status
+            changed: changed
+            edit_node: edit_node
+            delete_node: delete_node
+            dropbutton: dropbutton
+            timestamp: title
+          info:
+            node_bulk_form:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            title:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            status:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            edit_node:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            delete_node:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            dropbutton:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            timestamp:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: changed
+          empty_table: true
+      row:
+        type: fields
+      fields:
+        node_bulk_form:
+          id: node_bulk_form
+          table: node
+          field: node_bulk_form
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: node_bulk_form
+          entity_type: node
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          label: Title
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          entity_type: node
+          entity_field: title
+          type: string
+          settings:
+            link_to_entity: true
+          plugin_id: field
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Content type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: type
+          plugin_id: field
+        name:
+          id: name
+          table: users_field_data
+          field: name
+          relationship: uid
+          label: Author
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: field
+          type: user_name
+          entity_type: user
+          entity_field: name
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          label: Status
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: boolean
+          settings:
+            format: custom
+            format_custom_true: Published
+            format_custom_false: Unpublished
+          plugin_id: field
+          entity_type: node
+          entity_field: status
+        changed:
+          id: changed
+          table: node_field_data
+          field: changed
+          label: Updated
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          plugin_id: field
+          entity_type: node
+          entity_field: changed
+        operations:
+          id: operations
+          table: node
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: true
+          plugin_id: entity_operations
+      filters:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: title_op
+            label: Title
+            description: ''
+            use_operator: false
+            operator: title_op
+            identifier: title
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: string
+          entity_type: node
+          entity_field: title
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: 'Content type'
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: bundle
+          entity_type: node
+          entity_field: type
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: true
+          expose:
+            operator_id: ''
+            label: Status
+            description: ''
+            use_operator: false
+            operator: status_op
+            identifier: status
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: true
+          group_info:
+            label: 'Published status'
+            description: ''
+            identifier: status
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1:
+                title: Published
+                operator: '='
+                value: '1'
+              2:
+                title: Unpublished
+                operator: '='
+                value: '0'
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+        status_extra:
+          id: status_extra
+          table: node_field_data
+          field: status_extra
+          operator: '='
+          value: false
+          plugin_id: node_status
+          group: 1
+          entity_type: node
+      sorts: {  }
+      title: Content
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          empty: true
+          content: 'No content available.'
+          plugin_id: text_custom
+      arguments: {  }
+      relationships:
+        uid:
+          id: uid
+          table: node_field_data
+          field: uid
+          admin_label: author
+          required: true
+          plugin_id: standard
+      show_admin_links: false
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      display_extenders: {  }
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: 0
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: 0
+      tags: {  }
+  page_1:
+    display_options:
+      path: admin/content/node
+      menu:
+        type: 'default tab'
+        title: Content
+        description: ''
+        menu_name: admin
+        weight: -10
+        context: ''
+      tab_options:
+        type: normal
+        title: Content
+        description: 'Find and manage content'
+        menu_name: admin
+        weight: -10
+      display_extenders: {  }
+      enabled: false
+    display_plugin: page
+    display_title: Page
+    id: page_1
+    position: 1
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: 0
+      tags: {  }
+  page_2:
+    display_options:
+      path: admin/content/node
+      menu:
+        type: 'default tab'
+        title: Content
+        description: ''
+        menu_name: admin
+        weight: -10
+        context: ''
+      tab_options:
+        type: normal
+        title: Content
+        description: 'Find and manage content'
+        menu_name: admin
+        weight: -10
+      display_extenders: {  }
+      display_description: 'Custom content admin view for NSF.'
+    display_plugin: page
+    display_title: 'Page (custom)'
+    id: page_2
+    position: 1
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: 0
+      tags: {  }
diff --git a/web/sites/default/config/views.view.content_recent.yml b/web/sites/default/config/views.view.content_recent.yml
new file mode 100644
index 0000000..5a55b1d
--- /dev/null
+++ b/web/sites/default/config/views.view.content_recent.yml
@@ -0,0 +1,319 @@
+uuid: 9f58b912-d162-4782-b4f3-802c5b56fb79
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - user
+_core:
+  default_config_hash: sqwEJaSgef4rCaRMf-JdNAdV_kCICU1SfQh5Wl2sUrc
+id: content_recent
+label: 'Recent content'
+module: node
+description: 'Recent content.'
+tag: default
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: some
+        options:
+          items_per_page: 10
+          offset: 0
+      style:
+        type: html_list
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          type: ul
+          wrapper_class: item-list
+          class: ''
+      row:
+        type: fields
+      fields:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          entity_type: node
+          entity_field: title
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          relationship: none
+          group_type: group
+          admin_label: ''
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_alter_empty: true
+          type: string
+          settings:
+            link_to_entity: true
+          plugin_id: field
+        changed:
+          id: changed
+          table: node_field_data
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp_ago
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: changed
+          plugin_id: field
+      filters:
+        status_extra:
+          id: status_extra
+          table: node_field_data
+          field: status_extra
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: false
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          plugin_id: node_status
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value:
+            '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
+      sorts:
+        changed:
+          id: changed
+          table: node_field_data
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          entity_type: node
+          entity_field: changed
+          plugin_id: date
+      title: 'Recent content'
+      header: {  }
+      footer: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'No content available.'
+          plugin_id: text_custom
+      relationships:
+        uid:
+          id: uid
+          table: node_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: author
+          required: true
+          entity_type: node
+          entity_field: uid
+          plugin_id: standard
+      arguments: {  }
+      display_extenders: {  }
+      use_more: false
+      use_more_always: false
+      use_more_text: More
+      link_url: ''
+      link_display: '0'
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  block_1:
+    display_plugin: block
+    id: block_1
+    display_title: Block
+    position: 1
+    display_options:
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
diff --git a/web/sites/default/config/views.view.files.yml b/web/sites/default/config/views.view.files.yml
new file mode 100644
index 0000000..ccb9f6e
--- /dev/null
+++ b/web/sites/default/config/views.view.files.yml
@@ -0,0 +1,1124 @@
+uuid: 17f474f2-32d6-4d51-adfa-e7c8e6b6718e
+langcode: en
+status: true
+dependencies:
+  module:
+    - file
+    - user
+_core:
+  default_config_hash: rRWxAX-IQkJ5viACQRovRkC784EyCl9493GU_G23n2Q
+id: files
+label: Files
+module: file
+description: 'Find and manage files.'
+tag: default
+base_table: file_managed
+base_field: fid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access files overview'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 50
+          offset: 0
+          id: 0
+          total_pages: 0
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            fid: fid
+            filename: filename
+            filemime: filemime
+            filesize: filesize
+            status: status
+            created: created
+            changed: changed
+            count: count
+          info:
+            fid:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            filename:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            filemime:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            filesize:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            status:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            created:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            count:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+          default: changed
+          empty_table: true
+      row:
+        type: fields
+      fields:
+        fid:
+          id: fid
+          table: file_managed
+          field: fid
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Fid
+          exclude: true
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_alter_empty: true
+          plugin_id: field
+          entity_type: file
+          entity_field: fid
+        filename:
+          id: filename
+          table: file_managed
+          field: filename
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Name
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: false
+            ellipsis: false
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: file_link
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+          entity_type: file
+          entity_field: filename
+        filemime:
+          id: filemime
+          table: file_managed
+          field: filemime
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'MIME type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: file_filemime
+          plugin_id: field
+          entity_type: file
+          entity_field: filemime
+        filesize:
+          id: filesize
+          table: file_managed
+          field: filesize
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Size
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: file_size
+          plugin_id: field
+          entity_type: file
+          entity_field: filesize
+        status:
+          id: status
+          table: file_managed
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Status
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: boolean
+          settings:
+            format: custom
+            format_custom_false: Temporary
+            format_custom_true: Permanent
+          plugin_id: field
+          entity_type: file
+          entity_field: status
+        created:
+          id: created
+          table: file_managed
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Upload date'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: timestamp
+          settings:
+            date_format: medium
+            custom_date_format: ''
+            timezone: ''
+          plugin_id: field
+          entity_type: file
+          entity_field: created
+        changed:
+          id: changed
+          table: file_managed
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Changed date'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: timestamp
+          settings:
+            date_format: medium
+            custom_date_format: ''
+            timezone: ''
+          plugin_id: field
+          entity_type: file
+          entity_field: changed
+        count:
+          id: count
+          table: file_usage
+          field: count
+          relationship: fid
+          group_type: sum
+          admin_label: ''
+          label: 'Used in'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: true
+            path: 'admin/content/files/usage/{{ fid }}'
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          set_precision: false
+          precision: 0
+          decimal: .
+          separator: ','
+          format_plural: true
+          format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
+          prefix: ''
+          suffix: ''
+          plugin_id: numeric
+      filters:
+        filename:
+          id: filename
+          table: file_managed
+          field: filename
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: word
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: filemime_op
+            label: Filename
+            description: ''
+            use_operator: false
+            operator: filename_op
+            identifier: filename
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: string
+          entity_type: file
+          entity_field: filename
+        filemime:
+          id: filemime
+          table: file_managed
+          field: filemime
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: word
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: filemime_op
+            label: 'MIME type'
+            description: ''
+            use_operator: false
+            operator: filemime_op
+            identifier: filemime
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: string
+          entity_type: file
+          entity_field: filemime
+        status:
+          id: status
+          table: file_managed
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: status_op
+            label: Status
+            description: ''
+            use_operator: false
+            operator: status_op
+            identifier: status
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: file_status
+          entity_type: file
+          entity_field: status
+      sorts: {  }
+      title: Files
+      header: {  }
+      footer: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          empty: true
+          content: 'No files available.'
+          plugin_id: text_custom
+      relationships:
+        fid:
+          id: fid
+          table: file_managed
+          field: fid
+          relationship: none
+          group_type: group
+          admin_label: 'File usage'
+          required: true
+      arguments: {  }
+      group_by: true
+      show_admin_links: true
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      max-age: 0
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: 'Files overview'
+    position: 1
+    display_options:
+      path: admin/content/files
+      menu:
+        type: tab
+        title: Files
+        description: ''
+        menu_name: admin
+        weight: 0
+        context: ''
+      display_description: ''
+      defaults:
+        pager: true
+        relationships: false
+      relationships:
+        fid:
+          id: fid
+          table: file_managed
+          field: fid
+          relationship: none
+          group_type: group
+          admin_label: 'File usage'
+          required: false
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      max-age: 0
+      tags: {  }
+  page_2:
+    display_plugin: page
+    id: page_2
+    display_title: 'File usage'
+    position: 2
+    display_options:
+      display_description: ''
+      path: admin/content/files/usage/%
+      empty: {  }
+      defaults:
+        empty: false
+        pager: false
+        filters: false
+        filter_groups: false
+        fields: false
+        group_by: false
+        title: false
+        arguments: false
+        style: false
+        row: false
+        relationships: false
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: 0
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      filters: {  }
+      filter_groups:
+        operator: AND
+        groups: {  }
+      fields:
+        entity_label:
+          id: entity_label
+          table: file_usage
+          field: entity_label
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Entity
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          link_to_entity: true
+          plugin_id: entity_label
+        type:
+          id: type
+          table: file_usage
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Entity type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: standard
+        module:
+          id: module
+          table: file_usage
+          field: module
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Registering module'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: standard
+        count:
+          id: count
+          table: file_usage
+          field: count
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Use count'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          set_precision: false
+          precision: 0
+          decimal: .
+          separator: ','
+          format_plural: false
+          format_plural_string: !!binary MQNAY291bnQ=
+          prefix: ''
+          suffix: ''
+          plugin_id: numeric
+      group_by: false
+      title: 'File usage'
+      arguments:
+        fid:
+          id: fid
+          table: file_managed
+          field: fid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: 'not found'
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: true
+          title: 'File usage information for {{ arguments.fid }}'
+          default_argument_type: fixed
+          default_argument_options:
+            argument: ''
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            items_per_page: 25
+            override: false
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          break_phrase: false
+          not: false
+          plugin_id: file_fid
+          entity_type: file
+          entity_field: fid
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            entity_label: entity_label
+            type: type
+            module: module
+            count: count
+          info:
+            entity_label:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            module:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            count:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: entity_label
+          empty_table: true
+      row:
+        type: fields
+        options: {  }
+      relationships:
+        fid:
+          id: fid
+          table: file_managed
+          field: fid
+          relationship: none
+          group_type: group
+          admin_label: 'File usage'
+          required: true
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      max-age: 0
+      tags: {  }
diff --git a/web/sites/default/config/views.view.frontpage.yml b/web/sites/default/config/views.view.frontpage.yml
new file mode 100644
index 0000000..39af6b2
--- /dev/null
+++ b/web/sites/default/config/views.view.frontpage.yml
@@ -0,0 +1,294 @@
+uuid: 98266e3f-e293-4d42-82bf-49e6d5469326
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.rss
+    - core.entity_view_mode.node.teaser
+  module:
+    - node
+    - user
+_core:
+  default_config_hash: GNfx9kN8-0_KgQ-xf3fjdXCCzZwXCI8T0IPFW8SIe7g
+id: frontpage
+label: Frontpage
+module: node
+description: 'All content promoted to the front page.'
+tag: default
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      empty:
+        node_listing_empty:
+          admin_label: ''
+          empty: true
+          field: node_listing_empty
+          group_type: group
+          id: node_listing_empty
+          label: ''
+          relationship: none
+          table: node
+          plugin_id: node_listing_empty
+          entity_type: node
+        title:
+          id: title
+          table: views
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          empty: true
+          title: 'Welcome to [site:name]'
+          plugin_id: title
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      filters:
+        promote:
+          admin_label: ''
+          expose:
+            description: ''
+            identifier: ''
+            label: ''
+            multiple: false
+            operator: ''
+            operator_id: ''
+            remember: false
+            remember_roles:
+              authenticated: authenticated
+            required: false
+            use_operator: false
+          exposed: false
+          field: promote
+          group: 1
+          group_info:
+            default_group: All
+            default_group_multiple: {  }
+            description: ''
+            group_items: {  }
+            identifier: ''
+            label: ''
+            multiple: false
+            optional: true
+            remember: false
+            widget: select
+          group_type: group
+          id: promote
+          is_grouped: false
+          operator: '='
+          relationship: none
+          table: node_field_data
+          value: '1'
+          plugin_id: boolean
+          entity_type: node
+          entity_field: promote
+        status:
+          expose:
+            operator: ''
+          field: status
+          group: 1
+          id: status
+          table: node_field_data
+          value: '1'
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value:
+            '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: language
+          entity_type: node
+          entity_field: langcode
+      pager:
+        type: full
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: 0
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+            first: '« First'
+            last: 'Last »'
+          quantity: 9
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      row:
+        type: 'entity:node'
+        options:
+          view_mode: teaser
+      sorts:
+        sticky:
+          admin_label: ''
+          expose:
+            label: ''
+          exposed: false
+          field: sticky
+          group_type: group
+          id: sticky
+          order: DESC
+          relationship: none
+          table: node_field_data
+          plugin_id: boolean
+          entity_type: node
+          entity_field: sticky
+        created:
+          field: created
+          id: created
+          order: DESC
+          table: node_field_data
+          plugin_id: date
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          entity_type: node
+          entity_field: created
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      title: ''
+      header: {  }
+      footer: {  }
+      relationships: {  }
+      fields: {  }
+      arguments: {  }
+      display_extenders: {  }
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: 0
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  feed_1:
+    display_plugin: feed
+    id: feed_1
+    display_title: Feed
+    position: 2
+    display_options:
+      sitename_title: true
+      path: rss.xml
+      displays:
+        page_1: page_1
+        default: ''
+      pager:
+        type: some
+        options:
+          items_per_page: 10
+          offset: 0
+      style:
+        type: rss
+        options:
+          description: ''
+          grouping: {  }
+          uses_fields: false
+      row:
+        type: node_rss
+        options:
+          relationship: none
+          view_mode: rss
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  page_1:
+    display_options:
+      path: node
+      display_extenders: {  }
+      enabled: false
+    display_plugin: page
+    display_title: Page
+    id: page_1
+    position: 1
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
diff --git a/web/sites/default/config/views.view.glossary.yml b/web/sites/default/config/views.view.glossary.yml
new file mode 100644
index 0000000..957d733
--- /dev/null
+++ b/web/sites/default/config/views.view.glossary.yml
@@ -0,0 +1,459 @@
+uuid: 62d4d8dc-e664-480e-b02a-f4dec6ec37f1
+langcode: en
+status: false
+dependencies:
+  config:
+    - system.menu.main
+  module:
+    - node
+    - user
+_core:
+  default_config_hash: _12Vkw1VGBz_s0_W_LLVCrBPpioNSnB6zcd1lUAQubM
+id: glossary
+label: Glossary
+module: node
+description: 'All content, by letter.'
+tag: default
+base_table: node_field_data
+base_field: nid
+core: '8'
+display:
+  default:
+    id: default
+    display_title: Master
+    display_plugin: default
+    position: 0
+    display_options:
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      use_ajax: true
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 36
+          offset: 0
+          id: 0
+          total_pages: 0
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      fields:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Title
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          entity_type: node
+          entity_field: title
+        name:
+          id: name
+          table: users_field_data
+          field: name
+          label: Author
+          relationship: uid
+          plugin_id: field
+          type: user_name
+          group_type: group
+          admin_label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          entity_type: user
+          entity_field: name
+        changed:
+          id: changed
+          table: node_field_data
+          field: changed
+          label: 'Last update'
+          type: timestamp
+          settings:
+            date_format: long
+            custom_date_format: ''
+            timezone: ''
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          entity_type: node
+          entity_field: changed
+      arguments:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          default_action: default
+          exception:
+            title_enable: true
+          default_argument_type: fixed
+          default_argument_options:
+            argument: a
+          summary:
+            format: default_summary
+          specify_validation: true
+          glossary: true
+          limit: 1
+          case: upper
+          path_case: lower
+          transform_dash: false
+          plugin_id: string
+          relationship: none
+          group_type: group
+          admin_label: ''
+          title_enable: false
+          title: ''
+          default_argument_skip_url: false
+          summary_options: {  }
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          break_phrase: false
+          entity_type: node
+          entity_field: title
+      relationships:
+        uid:
+          id: uid
+          table: node_field_data
+          field: uid
+          plugin_id: standard
+          relationship: none
+          group_type: group
+          admin_label: author
+          required: false
+      style:
+        type: table
+        options:
+          columns:
+            title: title
+            name: name
+            changed: changed
+          default: title
+          info:
+            title:
+              sortable: true
+              separator: ''
+            name:
+              sortable: true
+              separator: ''
+            changed:
+              sortable: true
+              separator: ''
+          override: true
+          sticky: false
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+          order: asc
+          summary: ''
+          empty_table: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      header: {  }
+      footer: {  }
+      empty: {  }
+      sorts: {  }
+      filters:
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value:
+            '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: language
+          entity_type: node
+          entity_field: langcode
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: 0
+      tags: {  }
+  attachment_1:
+    id: attachment_1
+    display_title: Attachment
+    display_plugin: attachment
+    position: 2
+    display_options:
+      query:
+        type: views_query
+        options: {  }
+      pager:
+        type: none
+        options:
+          offset: 0
+          items_per_page: 0
+      defaults:
+        arguments: false
+      arguments:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          default_action: summary
+          exception:
+            title_enable: true
+          default_argument_type: fixed
+          default_argument_options:
+            argument: a
+          summary:
+            format: unformatted_summary
+          summary_options:
+            items_per_page: 25
+            inline: true
+            separator: ' | '
+          specify_validation: true
+          glossary: true
+          limit: 1
+          case: upper
+          path_case: lower
+          transform_dash: false
+          plugin_id: string
+          relationship: none
+          group_type: group
+          admin_label: ''
+          title_enable: false
+          title: ''
+          default_argument_skip_url: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          break_phrase: false
+          entity_type: node
+          entity_field: title
+      displays:
+        default: default
+        page_1: page_1
+      inherit_arguments: false
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: 0
+      tags: {  }
+  page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: 1
+    display_options:
+      query:
+        type: views_query
+        options: {  }
+      path: glossary
+      menu:
+        type: normal
+        title: Glossary
+        weight: 0
+        menu_name: main
+        parent: ''
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: 0
+      tags: {  }
diff --git a/web/sites/default/config/views.view.media.yml b/web/sites/default/config/views.view.media.yml
new file mode 100644
index 0000000..dc927c1
--- /dev/null
+++ b/web/sites/default/config/views.view.media.yml
@@ -0,0 +1,859 @@
+uuid: 8a5fe596-58ca-46f7-a634-6a7bedd57c3b
+langcode: en
+status: true
+dependencies:
+  config:
+    - image.style.thumbnail
+  module:
+    - image
+    - media_entity
+    - user
+_core:
+  default_config_hash: '-fJpPBLfGRPa6VPFiBweHcjlSOTqltsw5cbz8VVqXAI'
+id: media
+label: Media
+module: views
+description: ''
+tag: ''
+base_table: media_field_data
+base_field: mid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access media overview'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 50
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+            first: '« First'
+            last: 'Last »'
+          quantity: 9
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            name: name
+            bundle: bundle
+            changed: changed
+            uid: uid
+            status: status
+            thumbnail__target_id: thumbnail__target_id
+          info:
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            bundle:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            uid:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            status:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            thumbnail__target_id:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: changed
+          empty_table: false
+      row:
+        type: fields
+      fields:
+        media_bulk_form:
+          id: media_bulk_form
+          table: media
+          field: media_bulk_form
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          action_title: Action
+          include_exclude: exclude
+          selected_actions: {  }
+          entity_type: media
+          plugin_id: media_bulk_form
+        thumbnail__target_id:
+          id: thumbnail__target_id
+          table: media_field_data
+          field: thumbnail__target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Thumbnail
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: image
+          settings:
+            image_style: thumbnail
+            image_link: ''
+          group_column: ''
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: media
+          entity_field: thumbnail
+          plugin_id: field
+        name:
+          id: name
+          table: media_field_data
+          field: name
+          entity_type: media
+          entity_field: media
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          settings:
+            link_to_entity: true
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Media name'
+          exclude: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        bundle:
+          id: bundle
+          table: media_field_data
+          field: bundle
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Provider
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: media
+          entity_field: bundle
+          plugin_id: field
+        uid:
+          id: uid
+          table: media_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Author
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: media
+          entity_field: uid
+          plugin_id: field
+        status:
+          id: status
+          table: media_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Status
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: boolean
+          settings:
+            format: custom
+            format_custom_true: Published
+            format_custom_false: Unpublished
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: media
+          entity_field: status
+          plugin_id: field
+        changed:
+          id: changed
+          table: media_field_data
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Updated
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: short
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: media
+          entity_field: changed
+          plugin_id: field
+        operations:
+          id: operations
+          table: media
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: true
+          entity_type: media
+          plugin_id: entity_operations
+      filters:
+        status:
+          id: status
+          table: media_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: true
+          expose:
+            operator_id: ''
+            label: 'True'
+            description: null
+            use_operator: false
+            operator: status_op
+            identifier: status
+            required: true
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: true
+          group_info:
+            label: 'Publishing status'
+            description: ''
+            identifier: status
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1:
+                title: Published
+                operator: '='
+                value: '1'
+              2:
+                title: Unpublished
+                operator: '='
+                value: '0'
+          plugin_id: boolean
+          entity_type: media
+          entity_field: status
+        bundle:
+          id: bundle
+          table: media_field_data
+          field: bundle
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: bundle_op
+            label: Provider
+            description: ''
+            use_operator: false
+            operator: bundle_op
+            identifier: provider
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: media
+          entity_field: bundle
+          plugin_id: bundle
+        name:
+          id: name
+          table: media_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: name_op
+            label: 'Media name'
+            description: ''
+            use_operator: false
+            operator: name_op
+            identifier: name
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: media
+          entity_field: name
+          plugin_id: string
+        langcode:
+          id: langcode
+          table: media_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: langcode_op
+            label: Language
+            description: ''
+            use_operator: false
+            operator: langcode_op
+            identifier: langcode
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: media
+          entity_field: langcode
+          plugin_id: language
+      sorts:
+        created:
+          id: created
+          table: media_field_data
+          field: created
+          order: DESC
+          entity_type: media
+          entity_field: created
+          plugin_id: date
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+      title: Media
+      header: {  }
+      footer: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'No content available.'
+          plugin_id: text_custom
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }
+  media_page_list:
+    display_plugin: page
+    id: media_page_list
+    display_title: Media
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: admin/content/media
+      menu:
+        type: tab
+        title: Media
+        description: ''
+        expanded: false
+        parent: ''
+        weight: 0
+        context: '0'
+        menu_name: main
+      display_description: ''
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }
diff --git a/web/sites/default/config/views.view.my_content.yml b/web/sites/default/config/views.view.my_content.yml
new file mode 100644
index 0000000..06e4c6c
--- /dev/null
+++ b/web/sites/default/config/views.view.my_content.yml
@@ -0,0 +1,403 @@
+uuid: 1ebbe296-44b9-4039-a752-18e87de8a31a
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.tools
+  module:
+    - node
+    - user
+id: my_content
+label: 'My content'
+module: views
+description: 'Content authored by this user.'
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'view own unpublished content'
+      cache:
+        type: none
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: html_list
+      row:
+        type: fields
+      fields:
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: type
+          plugin_id: field
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          entity_type: node
+          entity_field: title
+          label: ''
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          settings:
+            link_to_entity: true
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exclude: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: boolean
+          settings:
+            format: custom
+            format_custom_true: Published
+            format_custom_false: 'Not Published'
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: status
+          plugin_id: field
+      filters:
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: All
+          group: 1
+          exposed: true
+          expose:
+            operator_id: ''
+            label: 'Published status'
+            description: ''
+            use_operator: false
+            operator: status_op
+            identifier: status
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              olpa_content_editor: '0'
+              olpa_content_admin: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+        uid_current:
+          id: uid_current
+          table: users
+          field: uid_current
+          relationship: uid
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: user
+          plugin_id: user_current
+      sorts:
+        created:
+          id: created
+          table: node_field_data
+          field: created
+          order: DESC
+          entity_type: node
+          entity_field: created
+          plugin_id: date
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+      title: 'My content'
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships:
+        uid:
+          id: uid
+          table: node_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: author
+          required: true
+          entity_type: node
+          entity_field: uid
+          plugin_id: standard
+      arguments: {  }
+      display_extenders: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: my-content
+      menu:
+        type: normal
+        title: 'My content'
+        menu_name: tools
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }
diff --git a/web/sites/default/config/views.view.news.yml b/web/sites/default/config/views.view.news.yml
new file mode 100644
index 0000000..48aeba1
--- /dev/null
+++ b/web/sites/default/config/views.view.news.yml
@@ -0,0 +1,1024 @@
+uuid: fea6240d-263f-40b6-93f4-305a39bbefa0
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_featured_image
+    - field.storage.node.field_funding
+    - field.storage.node.field_media_queries
+    - field.storage.node.field_publication_date
+    - image.style.news_thumbnail
+    - node.type.news
+    - system.menu.main
+  module:
+    - datetime
+    - image
+    - node
+    - text
+    - user
+id: news
+label: News
+module: views
+description: 'The main news page.'
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: none
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 5
+          offset: 0
+          id: 0
+          total_pages: null
+          tags:
+            previous: ‹‹
+            next: ››
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+          columns: {  }
+          default: ''
+          info: {  }
+          override: true
+          sticky: false
+          order: asc
+          caption: ''
+          summary: ''
+          description: ''
+          empty_table: false
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline:
+            field_featured_image: field_featured_image
+            field_publication_date: field_publication_date
+          separator: ''
+          hide_empty: false
+      fields:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          entity_type: node
+          entity_field: title
+          label: ''
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          settings:
+            link_to_entity: true
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exclude: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        field_publication_date:
+          id: field_publication_date
+          table: node__field_publication_date
+          field: field_publication_date
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: true
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: datetime_custom
+          settings:
+            timezone_override: ''
+            date_format: 'F j, Y'
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+      filters:
+        status:
+          value: '1'
+          table: node_field_data
+          field: status
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+          id: status
+          expose:
+            operator: ''
+          group: 1
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          value:
+            news: news
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
+      sorts:
+        field_publication_date_value:
+          id: field_publication_date_value
+          table: node__field_publication_date
+          field: field_publication_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          plugin_id: datetime
+      title: News
+      header: {  }
+      footer: {  }
+      empty:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content:
+            value: 'No news items were found.'
+            format: basic_html
+          plugin_id: text
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.field_publication_date'
+  block_1:
+    display_plugin: block
+    id: block_1
+    display_title: 'Homepage block'
+    position: 2
+    display_options:
+      display_extenders: {  }
+      display_description: ''
+      style:
+        type: html_list
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          type: ul
+          wrapper_class: item-list
+          class: ''
+      defaults:
+        style: false
+        row: false
+        fields: false
+        filters: false
+        filter_groups: false
+        pager: false
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline:
+            field_featured_image: field_featured_image
+            field_publication_date: field_publication_date
+          separator: ''
+          hide_empty: false
+      fields:
+        field_featured_image:
+          id: field_featured_image
+          table: node__field_featured_image
+          field: field_featured_image
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: image
+          settings:
+            image_style: news_thumbnail
+            image_link: content
+          group_column: ''
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          entity_type: node
+          entity_field: title
+          label: ''
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          settings:
+            link_to_entity: true
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exclude: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        field_publication_date:
+          id: field_publication_date
+          table: node__field_publication_date
+          field: field_publication_date
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: true
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: datetime_custom
+          settings:
+            timezone_override: ''
+            date_format: 'F j, Y'
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+      filters:
+        status:
+          value: '1'
+          table: node_field_data
+          field: status
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+          id: status
+          expose:
+            operator: ''
+          group: 1
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          value:
+            news: news
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          entity_field: sticky
+          plugin_id: boolean
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      pager:
+        type: some
+        options:
+          items_per_page: 6
+          offset: 0
+      allow:
+        items_per_page: true
+      block_hide_empty: true
+      block_description: 'Featured News (for homepage)'
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.field_featured_image'
+        - 'config:field.storage.node.field_publication_date'
+  block_2:
+    display_plugin: block
+    id: block_2
+    display_title: 'Recent news'
+    position: 3
+    display_options:
+      display_extenders: {  }
+      display_description: ''
+      style:
+        type: html_list
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          type: ul
+          wrapper_class: item-list
+          class: ''
+      defaults:
+        style: false
+        row: false
+        empty: false
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline:
+            field_featured_image: field_featured_image
+            field_publication_date: field_publication_date
+          separator: ''
+          hide_empty: false
+      empty:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content:
+            value: 'No news items were found.'
+            format: basic_html
+          plugin_id: text
+      allow:
+        items_per_page: true
+      enabled: false
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.field_publication_date'
+  block_3:
+    display_plugin: block
+    id: block_3
+    display_title: 'Fields for sidebar'
+    position: 4
+    display_options:
+      display_extenders: {  }
+      display_description: ''
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+      defaults:
+        style: false
+        row: false
+        fields: false
+        sorts: false
+        arguments: false
+        title: false
+        pager: false
+        empty: false
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline:
+            field_featured_image: field_featured_image
+            field_publication_date: field_publication_date
+          separator: ''
+          hide_empty: false
+      fields:
+        field_publication_date:
+          id: field_publication_date
+          table: node__field_publication_date
+          field: field_publication_date
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Published
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: p
+          element_class: ''
+          element_label_type: h4
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: true
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: datetime_custom
+          settings:
+            timezone_override: ''
+            date_format: 'F j, Y'
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+        uid:
+          id: uid
+          table: node_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Written By'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: p
+          element_class: ''
+          element_label_type: h4
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: uid
+          plugin_id: field
+        field_media_queries:
+          id: field_media_queries
+          table: node__field_media_queries
+          field: field_media_queries
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Media queries'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: h4
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: text_default
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+        field_funding:
+          id: field_funding
+          table: node__field_funding
+          field: field_funding
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Funding
+          exclude: false
+          alter:
+            alter_text: false
+            text: '${{ field_funding }}'
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: p
+          element_class: ''
+          element_label_type: h4
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: number_integer
+          settings:
+            thousand_separator: ','
+            prefix_suffix: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+      sorts: {  }
+      arguments:
+        nid:
+          id: nid
+          table: node_field_data
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: default
+          exception:
+            value: ''
+            title_enable: false
+            title: All
+          title_enable: true
+          title: ''
+          default_argument_type: node
+          default_argument_options: {  }
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            items_per_page: 25
+            override: false
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: true
+          validate:
+            type: 'entity:node'
+            fail: 'not found'
+          validate_options:
+            bundles:
+              news: news
+            operation: view
+            multiple: 0
+            access: false
+          break_phrase: false
+          not: false
+          entity_type: node
+          entity_field: nid
+          plugin_id: node_nid
+      title: ''
+      pager:
+        type: none
+        options:
+          offset: 0
+      enabled: true
+      allow:
+        items_per_page: false
+      block_category: Content
+      block_hide_empty: true
+      empty: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.field_funding'
+        - 'config:field.storage.node.field_media_queries'
+        - 'config:field.storage.node.field_publication_date'
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: news
+      menu:
+        type: normal
+        title: News
+        description: ''
+        expanded: false
+        parent: ''
+        weight: -45
+        context: '0'
+        menu_name: main
+      header:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: false
+          content:
+            value: 'Filter by news type and research area. Get news updates by <a href="http://service.govdelivery.com/service/subscribe.html?code=USNSF_51">email</a> or by <a href="https://nsf.gov/rss/rss_www_news.xml">RSS</a>.'
+            format: basic_html
+          plugin_id: text
+      defaults:
+        header: false
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      tags:
+        - 'config:field.storage.node.field_publication_date'
diff --git a/web/sites/default/config/views.view.nsf_blog.yml b/web/sites/default/config/views.view.nsf_blog.yml
new file mode 100644
index 0000000..e8f5b84
--- /dev/null
+++ b/web/sites/default/config/views.view.nsf_blog.yml
@@ -0,0 +1,379 @@
+uuid: f61f1908-0db8-426a-97fa-2eeca597871b
+langcode: en
+status: true
+dependencies:
+  module:
+    - aggregator
+id: nsf_blog
+label: Blog
+module: views
+description: 'NSF custom view. Displays blog entries imported from external blog.'
+tag: ''
+base_table: aggregator_item
+base_field: iid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: none
+        options: {  }
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: default
+      row:
+        type: 'entity:aggregator_item'
+      fields:
+        title:
+          table: aggregator_item
+          field: title
+          id: title
+          entity_type: null
+          entity_field: title
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: aggregator_title
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+      filters: {  }
+      sorts:
+        timestamp:
+          id: timestamp
+          table: aggregator_item
+          field: timestamp
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          entity_type: aggregator_item
+          entity_field: timestamp
+          plugin_id: date
+      title: 'Blog entries'
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+      tags: {  }
+  block_1:
+    display_plugin: block
+    id: block_1
+    display_title: Block
+    position: 3
+    display_options:
+      display_extenders: {  }
+      style:
+        type: default
+      defaults:
+        style: false
+        row: false
+        pager: false
+        fields: false
+      row:
+        type: fields
+      pager:
+        type: some
+        options:
+          items_per_page: 5
+          offset: 0
+      block_description: 'Blog entries (all)'
+      fields:
+        title:
+          table: aggregator_item
+          field: title
+          id: title
+          entity_type: null
+          entity_field: title
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: aggregator_title
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        timestamp:
+          id: timestamp
+          table: aggregator_item
+          field: timestamp
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: custom
+            custom_date_format: 'F j, Y'
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: aggregator_item
+          entity_field: timestamp
+          plugin_id: field
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+      tags: {  }
+  feed_1:
+    display_plugin: feed
+    id: feed_1
+    display_title: Feed
+    position: 2
+    display_options:
+      display_extenders: {  }
+      row:
+        type: aggregator_rss
+      pager:
+        type: none
+        options:
+          offset: 0
+      style:
+        type: rss
+      path: blog.xml
+      displays:
+        default: default
+        page_1: page_1
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: blog
+      filters: {  }
+      defaults:
+        filters: false
+        filter_groups: false
+        use_more: false
+        use_more_always: false
+        use_more_text: false
+        title: true
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      enabled: true
+      use_more: true
+      use_more_always: false
+      use_more_text: more
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+      tags: {  }
diff --git a/web/sites/default/config/views.view.scheduler_scheduled_content.yml b/web/sites/default/config/views.view.scheduler_scheduled_content.yml
new file mode 100644
index 0000000..bc85ea6
--- /dev/null
+++ b/web/sites/default/config/views.view.scheduler_scheduled_content.yml
@@ -0,0 +1,855 @@
+uuid: 74a047a5-cbc6-48a3-bb6c-4a3f9eea632d
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - scheduler
+    - user
+_core:
+  default_config_hash: 76OtYhIMKqji7okkzD9dtqaYCZyBjJdRFOsqJB1DDls
+id: scheduler_scheduled_content
+label: 'Scheduled content'
+module: node
+description: 'Find and manage scheduled content.'
+tag: default
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_options:
+      access:
+        type: scheduler
+      cache:
+        type: tag
+      query:
+        type: views_query
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: true
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 50
+          tags:
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: true
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            node_bulk_form: node_bulk_form
+            title: title
+            type: type
+            name: name
+            status: status
+            publish_on: publish_on
+            unpublish_on: unpublish_on
+            operations: operations
+          info:
+            node_bulk_form:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            title:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            status:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            publish_on:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            unpublish_on:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            operations:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: '-1'
+          empty_table: true
+      row:
+        type: fields
+      fields:
+        node_bulk_form:
+          id: node_bulk_form
+          table: node
+          field: node_bulk_form
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: node_bulk_form
+          entity_type: node
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          label: Title
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          entity_type: node
+          entity_field: title
+          type: string
+          settings:
+            link_to_entity: true
+          plugin_id: field
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Content Type'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: node
+          entity_field: type
+          plugin_id: field
+        name:
+          id: name
+          table: users_field_data
+          field: name
+          relationship: uid
+          label: Author
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: field
+          type: user_name
+          entity_type: user
+          entity_field: name
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          label: Status
+          exclude: false
+          alter:
+            alter_text: false
+          element_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: boolean
+          settings:
+            format: custom
+            format_custom_true: Published
+            format_custom_false: Unpublished
+          plugin_id: field
+          entity_type: node
+          entity_field: status
+        publish_on:
+          id: publish_on
+          table: node_field_data
+          field: publish_on
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Publish on'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          date_format: short
+          custom_date_format: ''
+          timezone: ''
+          entity_type: node
+          entity_field: publish_on
+          plugin_id: date
+        unpublish_on:
+          id: unpublish_on
+          table: node_field_data
+          field: unpublish_on
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Unpublish on'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          date_format: short
+          custom_date_format: ''
+          timezone: ''
+          entity_type: node
+          entity_field: unpublish_on
+          plugin_id: date
+        operations:
+          id: operations
+          table: node
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: true
+          plugin_id: entity_operations
+      filters:
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: true
+          expose:
+            operator_id: ''
+            label: Status
+            description: ''
+            use_operator: false
+            operator: status_op
+            identifier: status
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: true
+          group_info:
+            label: 'Published status'
+            description: ''
+            identifier: status
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1:
+                title: Published
+                operator: '='
+                value: '1'
+              2:
+                title: Unpublished
+                operator: '='
+                value: '0'
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: Type
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: bundle
+          entity_type: node
+          entity_field: type
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: title_op
+            label: Title
+            description: ''
+            use_operator: false
+            operator: title_op
+            identifier: title
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: string
+          entity_type: node
+          entity_field: title
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: langcode_op
+            label: Language
+            description: ''
+            use_operator: false
+            operator: langcode_op
+            identifier: langcode
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: language
+          entity_type: node
+          entity_field: langcode
+        publish_on:
+          id: publish_on
+          table: node_field_data
+          field: publish_on
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: 'not empty'
+          value:
+            min: ''
+            max: ''
+            value: ''
+            type: date
+          group: 2
+          exposed: false
+          expose:
+            operator_id: publish_on_op
+            label: 'Publish on'
+            description: ''
+            use_operator: true
+            operator: publish_on_op
+            identifier: publish_on
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: 'Publish on'
+            description: null
+            identifier: publish_on
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1: {  }
+              2: {  }
+              3: {  }
+          entity_type: node
+          entity_field: publish_on
+          plugin_id: date
+        unpublish_on:
+          id: unpublish_on
+          table: node_field_data
+          field: unpublish_on
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: 'not empty'
+          value:
+            min: ''
+            max: ''
+            value: ''
+            type: date
+          group: 2
+          exposed: false
+          expose:
+            operator_id: unpublish_on_op
+            label: 'Unpublish on'
+            description: ''
+            use_operator: false
+            operator: unpublish_on_op
+            identifier: unpublish_on
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: node
+          entity_field: unpublish_on
+          plugin_id: date
+      sorts: {  }
+      title: 'Scheduled Content'
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'No scheduled content.'
+          plugin_id: text_custom
+      arguments: {  }
+      relationships:
+        uid:
+          id: uid
+          table: node_field_data
+          field: uid
+          admin_label: author
+          required: true
+          plugin_id: standard
+      show_admin_links: false
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+          2: OR
+      display_extenders: {  }
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: 0
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - 'user.node_grants:view'
+      cacheable: false
+      max-age: 0
+      tags: {  }
+  overview:
+    display_options:
+      path: admin/content/scheduled
+      menu:
+        type: tab
+        title: Scheduled
+        description: ''
+        parent: system.admin_content
+        weight: -10
+        context: '0'
+        menu_name: admin
+      tab_options:
+        type: normal
+        title: Content
+        description: 'Find and manage scheduled content'
+        menu_name: admin
+        weight: -10
+      display_extenders: {  }
+      display_description: 'Overview of all scheduled content, as a tab on main ''content admin'' page'
+    display_plugin: page
+    display_title: 'Content Overview'
+    id: overview
+    position: 1
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - 'user.node_grants:view'
+      cacheable: false
+      max-age: 0
+      tags: {  }
+  user_page:
+    display_options:
+      path: user/%user/scheduled
+      menu:
+        type: tab
+        title: Scheduled
+        description: ''
+        parent: system.admin_content
+        weight: -10
+        context: '0'
+        menu_name: admin
+      tab_options:
+        type: normal
+        title: Content
+        description: 'Find and manage scheduled content'
+        menu_name: admin
+        weight: -10
+      display_extenders: {  }
+      display_description: 'Scheduled content tab on user profile, showing just that user''s scheduled content'
+      defaults:
+        filters: true
+        filter_groups: true
+        arguments: false
+        access: true
+        empty: false
+      arguments:
+        uid:
+          id: uid
+          table: node_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: empty
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: fixed
+          default_argument_options:
+            argument: ''
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            items_per_page: 25
+            override: false
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          break_phrase: false
+          not: false
+          entity_type: node
+          entity_field: uid
+          plugin_id: numeric
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: true
+          content: 'No scheduled content for user {{ arguments.uid }}'
+          plugin_id: text_custom
+    display_plugin: page
+    display_title: 'User profile tab'
+    id: user_page
+    position: 2
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user
+        - 'user.node_grants:view'
+      cacheable: false
+      max-age: 0
+      tags: {  }
diff --git a/web/sites/default/config/views.view.taxonomy_term.yml b/web/sites/default/config/views.view.taxonomy_term.yml
new file mode 100644
index 0000000..ce93c2a
--- /dev/null
+++ b/web/sites/default/config/views.view.taxonomy_term.yml
@@ -0,0 +1,314 @@
+uuid: 50fa6930-62bd-4a7c-aa1f-8910d09532ed
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.teaser
+  module:
+    - node
+    - taxonomy
+    - user
+_core:
+  default_config_hash: Gy5PaLdfFhtFSRqJxV-DBTF5AocKgNA2CsCNNEbvx4c
+id: taxonomy_term
+label: 'Taxonomy term'
+module: taxonomy
+description: 'Content belonging to a certain taxonomy term.'
+tag: default
+base_table: node_field_data
+base_field: nid
+core: '8'
+display:
+  default:
+    id: default
+    display_title: Master
+    display_plugin: default
+    position: 0
+    display_options:
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: 0
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      sorts:
+        sticky:
+          id: sticky
+          table: taxonomy_index
+          field: sticky
+          order: DESC
+          plugin_id: standard
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exposed: false
+          expose:
+            label: ''
+        created:
+          id: created
+          table: taxonomy_index
+          field: created
+          order: DESC
+          plugin_id: date
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+      arguments:
+        tid:
+          id: tid
+          table: taxonomy_index
+          field: tid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: 'not found'
+          exception:
+            value: ''
+            title_enable: false
+            title: All
+          title_enable: true
+          title: '{{ arguments.tid }}'
+          default_argument_type: fixed
+          default_argument_options:
+            argument: ''
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            items_per_page: 25
+            override: false
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: true
+          validate:
+            type: 'entity:taxonomy_term'
+            fail: 'not found'
+          validate_options:
+            access: true
+            operation: view
+            multiple: 0
+            bundles: {  }
+          break_phrase: false
+          add_table: false
+          require_value: false
+          reduce_duplicates: false
+          plugin_id: taxonomy_index_tid
+      filters:
+        langcode:
+          id: langcode
+          table: node_field_data
+          field: langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value:
+            '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: language
+          entity_type: node
+          entity_field: langcode
+        status:
+          id: status
+          table: taxonomy_index
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: boolean
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: 'entity:node'
+        options:
+          view_mode: teaser
+      header:
+        entity_taxonomy_term:
+          id: entity_taxonomy_term
+          table: views
+          field: entity_taxonomy_term
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: true
+          target: '{{ raw_arguments.tid }}'
+          view_mode: full
+          bypass_access: false
+          plugin_id: entity
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      fields: {  }
+      display_extenders: {  }
+      link_url: ''
+      link_display: page_1
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  feed_1:
+    id: feed_1
+    display_title: Feed
+    display_plugin: feed
+    position: 2
+    display_options:
+      query:
+        type: views_query
+        options: {  }
+      pager:
+        type: some
+        options:
+          items_per_page: 10
+          offset: 0
+      path: taxonomy/term/%/feed
+      displays:
+        page_1: page_1
+        default: '0'
+      style:
+        type: rss
+        options:
+          description: ''
+          grouping: {  }
+          uses_fields: false
+      row:
+        type: node_rss
+        options:
+          relationship: none
+          view_mode: default
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: 1
+    display_options:
+      query:
+        type: views_query
+        options: {  }
+      path: taxonomy/term/%
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
+        - user.permissions
+      max-age: -1
+      tags: {  }
diff --git a/web/sites/default/config/views.view.user_admin_people.yml b/web/sites/default/config/views.view.user_admin_people.yml
new file mode 100644
index 0000000..9f30000
--- /dev/null
+++ b/web/sites/default/config/views.view.user_admin_people.yml
@@ -0,0 +1,915 @@
+uuid: cb10b59e-e013-4178-abfe-76a5265ef06e
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+_core:
+  default_config_hash: wTJRNzsLVTenCALONNlVfgm_pBOlqucSPuVFLOD56ck
+id: user_admin_people
+label: People
+module: user
+description: 'Find and manage people interacting with your site.'
+tag: default
+base_table: users_field_data
+base_field: uid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'administer users'
+      cache:
+        type: tag
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: true
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 50
+          offset: 0
+          id: 0
+          total_pages: 0
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+            first: '« First'
+            last: 'Last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          summary: ''
+          columns:
+            user_bulk_form: user_bulk_form
+            name: name
+            status: status
+            rid: rid
+            created: created
+            access: access
+            edit_node: edit_node
+            dropbutton: dropbutton
+          info:
+            user_bulk_form:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            status:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            rid:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            created:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            access:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            edit_node:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            dropbutton:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: created
+          empty_table: true
+      row:
+        type: fields
+      fields:
+        user_bulk_form:
+          id: user_bulk_form
+          table: users
+          field: user_bulk_form
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Bulk update'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: user_bulk_form
+          entity_type: user
+        name:
+          id: name
+          table: users_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Username
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: field
+          type: user_name
+          entity_type: user
+          entity_field: name
+        status:
+          id: status
+          table: users_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Status
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: field
+          type: boolean
+          settings:
+            format: custom
+            format_custom_true: Active
+            format_custom_false: Blocked
+          entity_type: user
+          entity_field: status
+        roles_target_id:
+          id: roles_target_id
+          table: user__roles
+          field: roles_target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Roles
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: ul
+          separator: ', '
+          plugin_id: user_roles
+        created:
+          id: created
+          table: users_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Member for'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: timestamp_ago
+          settings:
+            future_format: '@interval'
+            past_format: '@interval'
+            granularity: 2
+          plugin_id: field
+          entity_type: user
+          entity_field: created
+        access:
+          id: access
+          table: users_field_data
+          field: access
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Last access'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: timestamp_ago
+          settings:
+            future_format: '@interval hence'
+            past_format: '@interval ago'
+            granularity: 2
+          plugin_id: field
+          entity_type: user
+          entity_field: access
+        operations:
+          id: operations
+          table: users
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: true
+          entity_type: user
+          plugin_id: entity_operations
+        mail:
+          id: mail
+          table: users_field_data
+          field: mail
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: basic_string
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
+          entity_type: user
+          entity_field: mail
+      filters:
+        combine:
+          id: combine
+          table: views
+          field: combine
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: combine_op
+            label: 'Name or email contains'
+            description: ''
+            use_operator: false
+            operator: combine_op
+            identifier: user
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          fields:
+            name: name
+            mail: mail
+          plugin_id: combine
+        status:
+          id: status
+          table: users_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: true
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: status_op
+            identifier: status
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: true
+          group_info:
+            label: Status
+            description: ''
+            identifier: status
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1:
+                title: Active
+                operator: '='
+                value: '1'
+              2:
+                title: Blocked
+                operator: '='
+                value: '0'
+          plugin_id: boolean
+          entity_type: user
+          entity_field: status
+        roles_target_id:
+          id: roles_target_id
+          table: user__roles
+          field: roles_target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: roles_target_id_op
+            label: Role
+            description: ''
+            use_operator: false
+            operator: roles_target_id_op
+            identifier: role
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          plugin_id: user_roles
+        permission:
+          id: permission
+          table: user__roles
+          field: permission
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: permission_op
+            label: Permission
+            description: ''
+            use_operator: false
+            operator: permission_op
+            identifier: permission
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          plugin_id: user_permissions
+        default_langcode:
+          id: default_langcode
+          table: users_field_data
+          field: default_langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: user
+          entity_field: default_langcode
+          plugin_id: boolean
+        uid_raw:
+          id: uid_raw
+          table: users_field_data
+          field: uid_raw
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '!='
+          value:
+            min: ''
+            max: ''
+            value: '0'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: '0'
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: numeric
+          entity_type: user
+      sorts:
+        created:
+          id: created
+          table: users_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          plugin_id: date
+          entity_type: user
+          entity_field: created
+      title: People
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'No people available.'
+          plugin_id: text_custom
+      use_more: false
+      use_more_always: false
+      use_more_text: more
+      display_comment: ''
+      use_ajax: false
+      hide_attachment_summary: false
+      show_admin_links: true
+      group_by: false
+      link_url: ''
+      link_display: page_1
+      css_class: ''
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      max-age: 0
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      path: admin/people/list
+      show_admin_links: false
+      menu:
+        type: 'default tab'
+        title: List
+        description: 'Find and manage people interacting with your site.'
+        menu_name: admin
+        weight: -10
+        context: ''
+      tab_options:
+        type: normal
+        title: People
+        description: 'Manage user accounts, roles, and permissions.'
+        menu_name: admin
+        weight: 0
+      defaults:
+        show_admin_links: false
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      max-age: 0
+      tags: {  }
diff --git a/web/sites/default/config/views.view.watchdog.yml b/web/sites/default/config/views.view.watchdog.yml
new file mode 100644
index 0000000..e3cd9ef
--- /dev/null
+++ b/web/sites/default/config/views.view.watchdog.yml
@@ -0,0 +1,712 @@
+uuid: 8b95dee6-61e9-420c-a6fe-3498ebdbcd80
+langcode: en
+status: true
+dependencies:
+  module:
+    - dblog
+    - user
+_core:
+  default_config_hash: 3QZ9apklK6mQ7BzodmxzOxqO---2BCPtOLE3k9eQ0Is
+id: watchdog
+label: Watchdog
+module: views
+description: 'Recent log messages'
+tag: ''
+base_table: watchdog
+base_field: wid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access site reports'
+      cache:
+        type: none
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: true
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: false
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 50
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: '{{ type }} {{ severity }}'
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            nothing: nothing
+            wid: wid
+            severity: severity
+            type: type
+            timestamp: timestamp
+            message: message
+            name: name
+            link: link
+          info:
+            nothing:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            wid:
+              sortable: false
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            severity:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            timestamp:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            message:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            link:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+          default: wid
+          empty_table: false
+      row:
+        type: fields
+      fields:
+        nothing:
+          id: nothing
+          table: views
+          field: nothing
+          relationship: none
+          group_type: group
+          admin_label: Icon
+          label: ''
+          exclude: false
+          alter:
+            alter_text: true
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: icon
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: false
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: false
+          plugin_id: custom
+        wid:
+          id: wid
+          table: watchdog
+          field: wid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: WID
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: standard
+        severity:
+          id: severity
+          table: watchdog
+          field: severity
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Severity
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          machine_name: false
+          plugin_id: machine_name
+        type:
+          id: type
+          table: watchdog
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Type
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: standard
+        timestamp:
+          id: timestamp
+          table: watchdog
+          field: timestamp
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Date
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          date_format: short
+          custom_date_format: ''
+          timezone: ''
+          plugin_id: date
+        message:
+          id: message
+          table: watchdog
+          field: message
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Message
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: true
+            path: 'admin/reports/dblog/event/{{ wid }}'
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: '{{ message }}'
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 56
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: true
+            trim: true
+            preserve_tags: ''
+            html: true
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          replace_variables: true
+          plugin_id: dblog_message
+        name:
+          id: name
+          table: users_field_data
+          field: name
+          relationship: uid
+          group_type: group
+          admin_label: ''
+          label: User
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: user_name
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: user
+          entity_field: name
+          plugin_id: field
+        link:
+          id: link
+          table: watchdog
+          field: link
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: dblog_operations
+      filters:
+        type:
+          id: type
+          table: watchdog
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: Type
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            required: false
+            remember: false
+            multiple: true
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: dblog_types
+        severity:
+          id: severity
+          table: watchdog
+          field: severity
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: severity_op
+            label: Severity
+            description: ''
+            use_operator: false
+            operator: severity_op
+            identifier: severity
+            required: false
+            remember: false
+            multiple: true
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: in_operator
+      sorts:
+        wid:
+          id: wid
+          table: watchdog
+          field: wid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          plugin_id: standard
+      title: 'Recent log messages'
+      header: {  }
+      footer: {  }
+      empty:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content:
+            value: 'No log messages available.'
+            format: basic_html
+          plugin_id: text
+      relationships:
+        uid:
+          id: uid
+          table: watchdog
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: User
+          required: false
+          plugin_id: standard
+      arguments: {  }
+      display_extenders: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      css_class: admin-dblog
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }
+  page:
+    display_plugin: page
+    id: page
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: admin/reports/dblog
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }
diff --git a/web/sites/default/config/views.view.who_s_new.yml b/web/sites/default/config/views.view.who_s_new.yml
new file mode 100644
index 0000000..93a2d09
--- /dev/null
+++ b/web/sites/default/config/views.view.who_s_new.yml
@@ -0,0 +1,193 @@
+uuid: 3f13916a-5e84-4e40-a1e2-73e0e13f7228
+langcode: en
+status: false
+dependencies:
+  module:
+    - user
+_core:
+  default_config_hash: o_8fSWHZOVIbydZACGsSX09DtuJhqkRmNOzcVj-4bQI
+id: who_s_new
+label: 'Who''s new'
+module: user
+description: 'Shows a list of the newest user accounts on the site.'
+tag: default
+base_table: users_field_data
+base_field: uid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: some
+        options:
+          items_per_page: 5
+          offset: 0
+      style:
+        type: html_list
+      row:
+        type: fields
+      fields:
+        name:
+          id: name
+          table: users_field_data
+          field: name
+          label: ''
+          plugin_id: field
+          type: user_name
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exclude: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_alter_empty: true
+          entity_type: user
+          entity_field: name
+      filters:
+        status:
+          value: '1'
+          table: users_field_data
+          field: status
+          id: status
+          expose:
+            operator: '0'
+          group: 1
+          plugin_id: boolean
+          entity_type: user
+          entity_field: status
+        access:
+          id: access
+          table: users_field_data
+          field: access
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '>'
+          value:
+            min: ''
+            max: ''
+            value: '1970-01-01'
+            type: date
+          group: 1
+          exposed: false
+          expose:
+            operator_id: '0'
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: date
+          entity_type: user
+          entity_field: access
+      sorts:
+        created:
+          id: created
+          table: users_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          plugin_id: date
+          entity_type: user
+          entity_field: created
+      title: 'Who''s new'
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  block_1:
+    display_plugin: block
+    id: block_1
+    display_title: 'Who''s new'
+    position: 1
+    display_options:
+      display_description: 'A list of new users'
+      block_description: 'Who''s new'
+      block_category: User
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user.permissions
+      max-age: -1
+      tags: {  }
diff --git a/web/sites/default/config/views.view.who_s_online.yml b/web/sites/default/config/views.view.who_s_online.yml
new file mode 100644
index 0000000..cfd4b0b
--- /dev/null
+++ b/web/sites/default/config/views.view.who_s_online.yml
@@ -0,0 +1,222 @@
+uuid: 8075664f-841b-411c-afb4-2fe6cbd5ffae
+langcode: en
+status: false
+dependencies:
+  module:
+    - user
+_core:
+  default_config_hash: m0vmYmhrzMR6S_IC0UlK0Cl-q5lEvL8-EbxbbcDtk34
+id: who_s_online
+label: 'Who''s online block'
+module: user
+description: 'Shows the user names of the most recently active users, and the total number of active users.'
+tag: default
+base_table: users_field_data
+base_field: uid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access user profiles'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: some
+        options:
+          items_per_page: 10
+          offset: 0
+      style:
+        type: html_list
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          type: ul
+          wrapper_class: item-list
+          class: ''
+      row:
+        type: fields
+      fields:
+        name:
+          id: name
+          table: users_field_data
+          field: name
+          label: ''
+          plugin_id: field
+          type: user_name
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exclude: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_alter_empty: true
+          entity_type: user
+          entity_field: name
+      filters:
+        status:
+          value: '1'
+          table: users_field_data
+          field: status
+          id: status
+          expose:
+            operator: '0'
+          group: 1
+          plugin_id: boolean
+          entity_type: user
+          entity_field: status
+        access:
+          id: access
+          table: users_field_data
+          field: access
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '>='
+          value:
+            min: ''
+            max: ''
+            value: '-15 minutes'
+            type: offset
+          group: 1
+          exposed: false
+          expose:
+            operator_id: access_op
+            label: 'Last access'
+            description: 'A user is considered online for this long after they have last viewed a page.'
+            use_operator: false
+            operator: access_op
+            identifier: access
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: date
+          entity_type: user
+          entity_field: access
+      sorts:
+        access:
+          id: access
+          table: users_field_data
+          field: access
+          order: DESC
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          plugin_id: date
+          entity_type: user
+          entity_field: access
+      title: 'Who''s online'
+      header:
+        result:
+          id: result
+          table: views
+          field: result
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          content: 'There are currently @total users online.'
+          plugin_id: result
+      footer: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'There are currently 0 users online.'
+          plugin_id: text_custom
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user.permissions
+      max-age: -1
+      tags: {  }
+  who_s_online_block:
+    display_plugin: block
+    id: who_s_online_block
+    display_title: 'Who''s online'
+    position: 1
+    display_options:
+      block_description: 'Who''s online'
+      display_description: 'A list of users that are currently logged in.'
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - user.permissions
+      max-age: -1
+      tags: {  }
diff --git a/web/sites/default/config/workflow.settings.yml b/web/sites/default/config/workflow.settings.yml
new file mode 100644
index 0000000..26753af
--- /dev/null
+++ b/web/sites/default/config/workflow.settings.yml
@@ -0,0 +1,3 @@
+workflow_states_per_page: 20
+_core:
+  default_config_hash: ne-hLr6xAfj-y7himkP4sQpLeAsTLAzt9YuxlQCk8N8
diff --git a/web/sites/default/config/workflow.state.news_and_events_approved.yml b/web/sites/default/config/workflow.state.news_and_events_approved.yml
new file mode 100644
index 0000000..c6398bf
--- /dev/null
+++ b/web/sites/default/config/workflow.state.news_and_events_approved.yml
@@ -0,0 +1,10 @@
+uuid: 4c217c63-6746-40b9-92db-a9c17c9eaa64
+langcode: en
+status: true
+dependencies: {  }
+id: news_and_events_approved
+label: Approved
+module: null
+wid: news_and_events
+weight: -7
+sysid: 0
diff --git a/web/sites/default/config/workflow.state.news_and_events_creation.yml b/web/sites/default/config/workflow.state.news_and_events_creation.yml
new file mode 100644
index 0000000..1f64b32
--- /dev/null
+++ b/web/sites/default/config/workflow.state.news_and_events_creation.yml
@@ -0,0 +1,10 @@
+uuid: 81a13e00-2a2d-494a-abf7-3395778eef4e
+langcode: en
+status: true
+dependencies: {  }
+id: news_and_events_creation
+label: (Creation)
+module: null
+wid: news_and_events
+weight: -11
+sysid: 1
diff --git a/web/sites/default/config/workflow.state.news_and_events_under_review.yml b/web/sites/default/config/workflow.state.news_and_events_under_review.yml
new file mode 100644
index 0000000..42532b1
--- /dev/null
+++ b/web/sites/default/config/workflow.state.news_and_events_under_review.yml
@@ -0,0 +1,10 @@
+uuid: 2824207b-2428-431a-9722-afd747a20686
+langcode: en
+status: true
+dependencies: {  }
+id: news_and_events_under_review
+label: 'Under Review'
+module: null
+wid: news_and_events
+weight: -8
+sysid: 0
diff --git a/web/sites/default/config/workflow.transition.news_and_events_approved_approved.yml b/web/sites/default/config/workflow.transition.news_and_events_approved_approved.yml
new file mode 100644
index 0000000..191e7f9
--- /dev/null
+++ b/web/sites/default/config/workflow.transition.news_and_events_approved_approved.yml
@@ -0,0 +1,10 @@
+uuid: 7db2c6c9-520c-4d9b-a2d9-3e24d11fbaa1
+langcode: en
+status: true
+dependencies: {  }
+id: news_and_events_approved_approved
+label: null
+module: null
+from_sid: news_and_events_approved
+to_sid: news_and_events_approved
+roles: {  }
diff --git a/web/sites/default/config/workflow.transition.news_and_events_approved_under_review.yml b/web/sites/default/config/workflow.transition.news_and_events_approved_under_review.yml
new file mode 100644
index 0000000..a0c7b45
--- /dev/null
+++ b/web/sites/default/config/workflow.transition.news_and_events_approved_under_review.yml
@@ -0,0 +1,16 @@
+uuid: 3e2f5444-85d4-463e-9e23-ffff1fe3ba2d
+langcode: en
+status: true
+dependencies: {  }
+id: news_and_events_approved_under_review
+label: null
+module: null
+from_sid: news_and_events_approved
+to_sid: news_and_events_under_review
+roles:
+  administrator: administrator
+  olpa_content_admin: olpa_content_admin
+  workflow_author: '0'
+  anonymous: '0'
+  authenticated: '0'
+  olpa_content_editor: '0'
diff --git a/web/sites/default/config/workflow.transition.news_and_events_creation_approved.yml b/web/sites/default/config/workflow.transition.news_and_events_creation_approved.yml
new file mode 100644
index 0000000..7bd9339
--- /dev/null
+++ b/web/sites/default/config/workflow.transition.news_and_events_creation_approved.yml
@@ -0,0 +1,16 @@
+uuid: 7e10f667-7a37-46ba-b6c3-fb48e4b24197
+langcode: en
+status: true
+dependencies: {  }
+id: news_and_events_creation_approved
+label: null
+module: null
+from_sid: news_and_events_creation
+to_sid: news_and_events_approved
+roles:
+  administrator: administrator
+  olpa_content_admin: olpa_content_admin
+  workflow_author: '0'
+  anonymous: '0'
+  authenticated: '0'
+  olpa_content_editor: '0'
diff --git a/web/sites/default/config/workflow.transition.news_and_events_creation_under_review.yml b/web/sites/default/config/workflow.transition.news_and_events_creation_under_review.yml
new file mode 100644
index 0000000..b8c00ff
--- /dev/null
+++ b/web/sites/default/config/workflow.transition.news_and_events_creation_under_review.yml
@@ -0,0 +1,16 @@
+uuid: ad96aed4-717d-4cf9-988e-b63e1964b40a
+langcode: en
+status: true
+dependencies: {  }
+id: news_and_events_creation_under_review
+label: null
+module: null
+from_sid: news_and_events_creation
+to_sid: news_and_events_under_review
+roles:
+  workflow_author: workflow_author
+  administrator: administrator
+  olpa_content_admin: olpa_content_admin
+  anonymous: '0'
+  authenticated: '0'
+  olpa_content_editor: '0'
diff --git a/web/sites/default/config/workflow.transition.news_and_events_under_review_approved.yml b/web/sites/default/config/workflow.transition.news_and_events_under_review_approved.yml
new file mode 100644
index 0000000..2a943c9
--- /dev/null
+++ b/web/sites/default/config/workflow.transition.news_and_events_under_review_approved.yml
@@ -0,0 +1,16 @@
+uuid: e103e830-1bfa-43b6-81d8-2a044a8bd0b5
+langcode: en
+status: true
+dependencies: {  }
+id: news_and_events_under_review_approved
+label: null
+module: null
+from_sid: news_and_events_under_review
+to_sid: news_and_events_approved
+roles:
+  administrator: administrator
+  olpa_content_admin: olpa_content_admin
+  workflow_author: '0'
+  anonymous: '0'
+  authenticated: '0'
+  olpa_content_editor: '0'
diff --git a/web/sites/default/config/workflow.transition.news_and_events_under_review_under_review.yml b/web/sites/default/config/workflow.transition.news_and_events_under_review_under_review.yml
new file mode 100644
index 0000000..92df3c5
--- /dev/null
+++ b/web/sites/default/config/workflow.transition.news_and_events_under_review_under_review.yml
@@ -0,0 +1,10 @@
+uuid: 34f4d766-6b6f-4cc5-a6fb-7c28754ca9ba
+langcode: en
+status: true
+dependencies: {  }
+id: news_and_events_under_review_under_review
+label: null
+module: null
+from_sid: news_and_events_under_review
+to_sid: news_and_events_under_review
+roles: {  }
diff --git a/web/sites/default/config/workflow.workflow.news_and_events.yml b/web/sites/default/config/workflow.workflow.news_and_events.yml
new file mode 100644
index 0000000..2abee6a
--- /dev/null
+++ b/web/sites/default/config/workflow.workflow.news_and_events.yml
@@ -0,0 +1,14 @@
+uuid: fceba506-0709-4c16-be5a-2db9a7bdc327
+langcode: en
+status: true
+dependencies: {  }
+id: news_and_events
+label: 'News and events'
+module: null
+options:
+  name_as_title: 0
+  fieldset: 2
+  options: radios
+  schedule_timezone: 1
+  comment_log_node: 1
+  watchdog_log: 1
diff --git a/web/sites/default/config/workflows.workflow.editorial.yml b/web/sites/default/config/workflows.workflow.editorial.yml
new file mode 100644
index 0000000..63b1df7
--- /dev/null
+++ b/web/sites/default/config/workflows.workflow.editorial.yml
@@ -0,0 +1,81 @@
+uuid: 12c5d5ce-8297-42b1-a069-0ad0e9ad10c2
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.news
+    - node.type.page
+  module:
+    - content_moderation
+_core:
+  default_config_hash: T_JxNjYlfoRBi7Bj1zs5Xv9xv1btuBkKp5C1tNrjMhI
+id: editorial
+label: Editorial
+type: content_moderation
+type_settings:
+  states:
+    archived:
+      label: Archived
+      weight: -7
+      published: false
+      default_revision: true
+    draft:
+      label: Draft
+      published: false
+      default_revision: false
+      weight: -10
+    published:
+      label: Published
+      published: true
+      default_revision: true
+      weight: -8
+    ready_for_review:
+      published: false
+      default_revision: false
+      label: 'Ready for review'
+      weight: -9
+  transitions:
+    archive:
+      label: Archive
+      from:
+        - published
+      to: archived
+      weight: -7
+    archived_draft:
+      label: 'Restore to Draft'
+      from:
+        - archived
+        - ready_for_review
+      to: draft
+      weight: -6
+    archived_published:
+      label: Restore
+      from:
+        - archived
+      to: published
+      weight: -5
+    create_new_draft:
+      label: 'Create New Draft'
+      to: draft
+      weight: -10
+      from:
+        - draft
+        - published
+    publish:
+      label: Publish
+      to: published
+      weight: -8
+      from:
+        - draft
+        - published
+        - ready_for_review
+    submit_for_review:
+      label: 'Submit for Review'
+      from:
+        - draft
+      to: ready_for_review
+      weight: -9
+  entity_types:
+    node:
+      - news
+      - page

From 3d8e5fe31b1910dde96c00b0133702cf09d3f349 Mon Sep 17 00:00:00 2001
From: CM Lubinski <cmc333333@gmail.com>
Date: Fri, 16 Mar 2018 08:22:54 -0400
Subject: [PATCH 010/143] Remove irrelevant references from PR template

We were referencing nsf-sbir, Federalist, and Circle; none of which are used in this project.
---
 PULL_REQUEST_TEMPLATE.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index ee9ef44..dd16d7a 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,5 @@
 Fixes issue(s) # .
 
-[![CircleCI](https://circleci.com/gh/18F/nsf-sbir/tree/BRANCH_NAME.svg?style=svg)](https://circleci.com/gh/18F/nsf-sbir/tree/BRANCH_NAME)
-
-[:sunglasses: PREVIEW](https://federalist.fr.cloud.gov/preview/18f/nsf-sbir/BRANCH_NAME/)
-
-[Preview README for this branch](https://github.com/18F/nsf-sbir/blob/BRANCH_NAME/README.md)
-
 Changes proposed in this pull request:
 -
 -

From 2b6101d645c43ee0f9a04f070125fd531bfb6259 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 14 Mar 2018 15:59:52 -0400
Subject: [PATCH 011/143] Tweak manifest file to include s3, db, secrets.

This doesn't include multiple instances and only covers the demo app, but
should be enough to get us started.
---
 manifest.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/manifest.yml b/manifest.yml
index ac3c88b..60e8f74 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,14 +1,12 @@
 ---
 applications:
-- name: nsf
+- name: nsf-demo
   buildpack: php_buildpack
+  instances: 1
   memory: 512M
   disk_quota: 512M
   timeout: 180
   services:
-    - # s3 bucket
-    - # db
-  env:
-    AWS_S3_ENDPOINT: ''
-    ACCOUNT_NAME: ''
-    HASH_SALT: ''
+    - database # cf create-service aws-rds medium-mysql database
+    - secrets  # cf create-user-provided-service secrets -p '{"ROOT_USER_NAME": ..., "ROOT_USER_PASS": ..., "HASH_SALT": ...}'
+    - storage  # cf create-service s3 basic storage

From e6355748acd698e31d9872742c9751a90411e6fe Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 14 Mar 2018 16:01:21 -0400
Subject: [PATCH 012/143] Rebuild composer file based on cf-ex-drupal.

In an effort to closer align with the cloud.gov Drupal example, this adds a
handful of dependencies. It looks like the previous code was also built with a
generator, so this shouldn't be a big issue. All of the previous Drupal
modules should still be present.

Notably, however, this *does* declare that we're using PHP 7.1.
---
 composer.json |  122 ++-
 composer.lock | 2746 ++++++++++++++++++++++++++++++++++---------------
 2 files changed, 2012 insertions(+), 856 deletions(-)

diff --git a/composer.json b/composer.json
index 1a3ac52..592a0f0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,75 +1,87 @@
 {
-    "name": "drupal/drupal",
-    "description": "Drupal is an open source content management platform powering millions of websites and applications.",
+    "name": "18f/nsf",
+    "description": "Project template for Drupal 8 projects with composer",
     "type": "project",
     "license": "GPL-2.0+",
+    "authors": [
+        {
+            "name": "",
+            "role": ""
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://packages.drupal.org/8"
+        }
+    ],
     "require": {
-        "composer/installers": "^1.0.24",
-        "wikimedia/composer-merge-plugin": "^1.4",
-        "drush/drush": "^9.1",
-        "drupal/features": "^3.5",
+        "php": "^7.1.0",
+        "composer/installers": "^1.2",
+        "cweagans/composer-patches": "^1.6",
+        "drupal-composer/drupal-scaffold": "^2.2",
         "drupal/brightcove": "^1.3",
-        "drupal/inline_entity_form": "^1.0@beta",
-        "drupal/time_formatter": "1.x-dev",
-        "drupal/entity_embed": "^1.0",
+        "drupal/console": "^1.0.2",
+        "drupal/core": "~8.4",
+        "drupal/ctools": "^3.0",
         "drupal/embed": "^1.0",
         "drupal/entity_browser": "^2.0",
-        "drupal/ctools": "^3.0",
-        "drupal/media_entity": "^1.7"
+        "drupal/features": "^3.5",
+        "drupal/flysystem_s3": "^1.0@alpha",
+        "drupal/inline_entity_form": "^1.0@beta",
+        "drupal/media_entity": "^1.7",
+        "drupal/time_formatter": "1.x-dev",
+        "drush/drush": "~8.0|^9.0.0-beta8",
+        "webflo/drupal-finder": "^1.0.0",
+        "webmozart/path-util": "^2.3"
     },
-    "replace": {
-        "drupal/core": "^8.4"
+    "require-dev": {
+        "behat/mink": "~1.7",
+        "behat/mink-goutte-driver": "~1.2",
+        "jcalderonzumba/gastonjs": "~1.0.2",
+        "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
+        "mikey179/vfsstream": "~1.2",
+        "phpunit/phpunit": ">=4.8.28 <5",
+        "symfony/css-selector": "~2.8|~3.0"
+    },
+    "conflict": {
+        "drupal/drupal": "*"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "preferred-install": "dist",
-        "autoloader-suffix": "Drupal8"
-    },
-    "extra": {
-        "_readme": [
-            "By default Drupal loads the autoloader from ./vendor/autoload.php.",
-            "To change the autoloader you can edit ./autoload.php.",
-            "This file specifies the packages.drupal.org repository.",
-            "You can read more about this composer repository at:",
-            "https://www.drupal.org/node/2718229"
-        ],
-        "merge-plugin": {
-            "include": [
-                "core/composer.json",
-                "modules/brightcove/composer.json"
-            ],
-            "recurse": false,
-            "replace": false,
-            "merge-extra": false
-        },
-        "installer-paths": {
-            "core": ["type:drupal-core"],
-            "modules/contrib/{$name}": ["type:drupal-module"],
-            "profiles/contrib/{$name}": ["type:drupal-profile"],
-            "themes/contrib/{$name}": ["type:drupal-theme"],
-            "drush/contrib/{$name}": ["type:drupal-drush"],
-            "modules/custom/{$name}": ["type:drupal-custom-module"],
-            "themes/custom/{$name}": ["type:drupal-custom-theme"]
-        }
+        "sort-packages": true
     },
     "autoload": {
-        "psr-4": {
-            "Drupal\\Core\\Composer\\": "core/lib/Drupal/Core/Composer"
-        }
+        "classmap": [
+            "scripts/composer/ScriptHandler.php"
+        ]
     },
     "scripts": {
-        "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
-        "post-autoload-dump": [
-          "Drupal\\Core\\Composer\\Composer::ensureHtaccess"
+        "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
+        "pre-install-cmd": [
+            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
+        ],
+        "pre-update-cmd": [
+            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
         ],
-        "post-package-install": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup",
-        "post-package-update": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup"
+        "post-install-cmd": [
+            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
+        ],
+        "post-update-cmd": [
+            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
+        ]
     },
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://packages.drupal.org/8"
+    "extra": {
+        "installer-paths": {
+            "web/core": ["type:drupal-core"],
+            "web/libraries/{$name}": ["type:drupal-library"],
+            "web/modules/contrib/{$name}": ["type:drupal-module"],
+            "web/profiles/contrib/{$name}": ["type:drupal-profile"],
+            "web/themes/contrib/{$name}": ["type:drupal-theme"],
+            "web/drush/contrib/{$name}": ["type:drupal-drush"],
+            "web/modules/custom/{$name}": ["type:drupal-custom-module"],
+            "web/themes/custom/{$name}": ["type:drupal-custom-theme"]
         }
-    ]
+    }
 }
diff --git a/composer.lock b/composer.lock
index 42f2097..a84e043 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,72 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "7c856527a00bb5aef597d25176e357b5",
+    "content-hash": "ae64323942ce64e6e5d539ad1f16c42b",
     "packages": [
+        {
+            "name": "alchemy/zippy",
+            "version": "0.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/alchemy-fr/Zippy.git",
+                "reference": "5ffdc93de0af2770d396bf433d8b2667c77277ea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/alchemy-fr/Zippy/zipball/5ffdc93de0af2770d396bf433d8b2667c77277ea",
+                "reference": "5ffdc93de0af2770d396bf433d8b2667c77277ea",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/collections": "~1.0",
+                "ext-mbstring": "*",
+                "php": ">=5.5",
+                "symfony/filesystem": "^2.0.5|^3.0",
+                "symfony/process": "^2.1|^3.0"
+            },
+            "require-dev": {
+                "ext-zip": "*",
+                "guzzle/guzzle": "~3.0",
+                "guzzlehttp/guzzle": "^6.0",
+                "phpunit/phpunit": "^4.0|^5.0",
+                "symfony/finder": "^2.0.5|^3.0"
+            },
+            "suggest": {
+                "ext-zip": "To use the ZipExtensionAdapter",
+                "guzzle/guzzle": "To use the GuzzleTeleporter with Guzzle 3",
+                "guzzlehttp/guzzle": "To use the GuzzleTeleporter with Guzzle 6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Alchemy\\Zippy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alchemy",
+                    "email": "dev.team@alchemy.fr",
+                    "homepage": "http://www.alchemy.fr/"
+                }
+            ],
+            "description": "Zippy, the archive manager companion",
+            "keywords": [
+                "bzip",
+                "compression",
+                "tar",
+                "zip"
+            ],
+            "time": "2016-11-03T16:10:31+00:00"
+        },
         {
             "name": "asm89/stack-cors",
             "version": "1.2.0",
@@ -58,6 +122,86 @@
             ],
             "time": "2017-12-20T14:37:45+00:00"
         },
+        {
+            "name": "aws/aws-sdk-php",
+            "version": "3.52.25",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/aws/aws-sdk-php.git",
+                "reference": "c1ce16adeeb9a47270f6ba8fb7aef5e1d62fa7d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c1ce16adeeb9a47270f6ba8fb7aef5e1d62fa7d0",
+                "reference": "c1ce16adeeb9a47270f6ba8fb7aef5e1d62fa7d0",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-simplexml": "*",
+                "ext-spl": "*",
+                "guzzlehttp/guzzle": "^5.3.1|^6.2.1",
+                "guzzlehttp/promises": "~1.0",
+                "guzzlehttp/psr7": "^1.4.1",
+                "mtdowling/jmespath.php": "~2.2",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "andrewsville/php-token-reflection": "^1.4",
+                "aws/aws-php-sns-message-validator": "~1.0",
+                "behat/behat": "~3.0",
+                "doctrine/cache": "~1.4",
+                "ext-dom": "*",
+                "ext-openssl": "*",
+                "nette/neon": "^2.3",
+                "phpunit/phpunit": "^4.8.35|^5.4.3",
+                "psr/cache": "^1.0"
+            },
+            "suggest": {
+                "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications",
+                "doctrine/cache": "To use the DoctrineCacheAdapter",
+                "ext-curl": "To send requests using cURL",
+                "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Aws\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Amazon Web Services",
+                    "homepage": "http://aws.amazon.com"
+                }
+            ],
+            "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project",
+            "homepage": "http://aws.amazon.com/sdkforphp",
+            "keywords": [
+                "amazon",
+                "aws",
+                "cloud",
+                "dynamodb",
+                "ec2",
+                "glacier",
+                "s3",
+                "sdk"
+            ],
+            "time": "2018-03-13T19:14:00+00:00"
+        },
         {
             "name": "brightcove/api",
             "version": "1.1.0",
@@ -117,16 +261,16 @@
         },
         {
             "name": "chi-teck/drupal-code-generator",
-            "version": "1.22.0",
+            "version": "1.23.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Chi-teck/drupal-code-generator.git",
-                "reference": "c7e3018ebcbdb5befcfe928c792146078c8c2d05"
+                "reference": "b157b38c8c148c67d5b80c7c349b1a446115ea0e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/c7e3018ebcbdb5befcfe928c792146078c8c2d05",
-                "reference": "c7e3018ebcbdb5befcfe928c792146078c8c2d05",
+                "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/b157b38c8c148c67d5b80c7c349b1a446115ea0e",
+                "reference": "b157b38c8c148c67d5b80c7c349b1a446115ea0e",
                 "shasum": ""
             },
             "require": {
@@ -149,10 +293,10 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "GPL2"
+                "GPL-2.0-or-later"
             ],
             "description": "Drupal code generator",
-            "time": "2018-01-06T15:54:30+00:00"
+            "time": "2018-03-03T04:17:26+00:00"
         },
         {
             "name": "composer/installers",
@@ -338,16 +482,16 @@
         },
         {
             "name": "consolidation/annotated-command",
-            "version": "2.8.2",
+            "version": "2.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "e97c38717eae23a2bafcf3f09438290eee6ebeb4"
+                "reference": "8f8f5da2ca06fbd3a85f7d551c49f844b7c59437"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/e97c38717eae23a2bafcf3f09438290eee6ebeb4",
-                "reference": "e97c38717eae23a2bafcf3f09438290eee6ebeb4",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/8f8f5da2ca06fbd3a85f7d551c49f844b7c59437",
+                "reference": "8f8f5da2ca06fbd3a85f7d551c49f844b7c59437",
                 "shasum": ""
             },
             "require": {
@@ -359,6 +503,7 @@
                 "symfony/finder": "^2.5|^3|^4"
             },
             "require-dev": {
+                "greg-1-anderson/composer-test-scenarios": "^1",
                 "phpunit/phpunit": "^4.8",
                 "satooshi/php-coveralls": "^1.0.2 | dev-master",
                 "squizlabs/php_codesniffer": "^2.7"
@@ -385,7 +530,7 @@
                 }
             ],
             "description": "Initialize Symfony Console commands from annotated command class methods.",
-            "time": "2017-11-29T16:23:23+00:00"
+            "time": "2018-02-23T16:32:04+00:00"
         },
         {
             "name": "consolidation/config",
@@ -540,16 +685,16 @@
         },
         {
             "name": "consolidation/robo",
-            "version": "1.2.1",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/Robo.git",
-                "reference": "b6296f1cf1088f1a11b0b819f9e42ef6f00b79a9"
+                "reference": "9ef2724f72feb017517a755564516dbde99e15e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/b6296f1cf1088f1a11b0b819f9e42ef6f00b79a9",
-                "reference": "b6296f1cf1088f1a11b0b819f9e42ef6f00b79a9",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/9ef2724f72feb017517a755564516dbde99e15e4",
+                "reference": "9ef2724f72feb017517a755564516dbde99e15e4",
                 "shasum": ""
             },
             "require": {
@@ -573,6 +718,7 @@
                 "codeception/aspect-mock": "^1|^2.1.1",
                 "codeception/base": "^2.3.7",
                 "codeception/verify": "^0.3.2",
+                "goaop/framework": "~2.1.2",
                 "greg-1-anderson/composer-test-scenarios": "^1",
                 "natxet/cssmin": "3.0.4",
                 "patchwork/jsqueeze": "~2",
@@ -613,7 +759,7 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2017-12-29T06:48:35+00:00"
+            "time": "2018-02-28T01:03:54+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -646,6 +792,110 @@
             "homepage": "https://github.com/container-interop/container-interop",
             "time": "2017-02-14T19:40:03+00:00"
         },
+        {
+            "name": "cweagans/composer-patches",
+            "version": "1.6.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/cweagans/composer-patches.git",
+                "reference": "462e65061606dc6149349535d4322241515d1b16"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/462e65061606dc6149349535d4322241515d1b16",
+                "reference": "462e65061606dc6149349535d4322241515d1b16",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0",
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "composer/composer": "~1.0",
+                "phpunit/phpunit": "~4.6"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "cweagans\\Composer\\Patches"
+            },
+            "autoload": {
+                "psr-4": {
+                    "cweagans\\Composer\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Cameron Eagans",
+                    "email": "me@cweagans.net"
+                }
+            ],
+            "description": "Provides a way to patch Composer packages.",
+            "time": "2017-12-07T16:16:31+00:00"
+        },
+        {
+            "name": "dflydev/dot-access-configuration",
+            "version": "v1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dflydev/dflydev-dot-access-configuration.git",
+                "reference": "ae6e7138b1d9063d343322cca63994ee1ac5161d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-configuration/zipball/ae6e7138b1d9063d343322cca63994ee1ac5161d",
+                "reference": "ae6e7138b1d9063d343322cca63994ee1ac5161d",
+                "shasum": ""
+            },
+            "require": {
+                "dflydev/dot-access-data": "1.*",
+                "dflydev/placeholder-resolver": "1.*",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "symfony/yaml": "~2.1"
+            },
+            "suggest": {
+                "symfony/yaml": "Required for using the YAML Configuration Builders"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Dflydev\\DotAccessConfiguration": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Dragonfly Development Inc.",
+                    "email": "info@dflydev.com",
+                    "homepage": "http://dflydev.com"
+                },
+                {
+                    "name": "Beau Simensen",
+                    "email": "beau@dflydev.com",
+                    "homepage": "http://beausimensen.com"
+                }
+            ],
+            "description": "Given a deep data structure representing a configuration, access configuration by dot notation.",
+            "homepage": "https://github.com/dflydev/dflydev-dot-access-configuration",
+            "keywords": [
+                "config",
+                "configuration"
+            ],
+            "time": "2016-12-12T17:43:40+00:00"
+        },
         {
             "name": "dflydev/dot-access-data",
             "version": "v1.1.0",
@@ -705,6 +955,58 @@
             ],
             "time": "2017-01-20T21:14:22+00:00"
         },
+        {
+            "name": "dflydev/placeholder-resolver",
+            "version": "v1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dflydev/dflydev-placeholder-resolver.git",
+                "reference": "c498d0cae91b1bb36cc7d60906dab8e62bb7c356"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dflydev/dflydev-placeholder-resolver/zipball/c498d0cae91b1bb36cc7d60906dab8e62bb7c356",
+                "reference": "c498d0cae91b1bb36cc7d60906dab8e62bb7c356",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Dflydev\\PlaceholderResolver": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Dragonfly Development Inc.",
+                    "email": "info@dflydev.com",
+                    "homepage": "http://dflydev.com"
+                },
+                {
+                    "name": "Beau Simensen",
+                    "email": "beau@dflydev.com",
+                    "homepage": "http://beausimensen.com"
+                }
+            ],
+            "description": "Given a data source representing key => value pairs, resolve placeholders like ${foo.bar} to the value associated with the 'foo.bar' key in the data source.",
+            "homepage": "https://github.com/dflydev/dflydev-placeholder-resolver",
+            "keywords": [
+                "placeholder",
+                "resolver"
+            ],
+            "time": "2012-10-28T21:08:28+00:00"
+        },
         {
             "name": "dnoegel/php-xdg-base-dir",
             "version": "0.1",
@@ -740,30 +1042,30 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "v1.4.0",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "54cacc9b81758b14e3ce750f205a393d52339e97"
+                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97",
-                "reference": "54cacc9b81758b14e3ce750f205a393d52339e97",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
+                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
                 "shasum": ""
             },
             "require": {
                 "doctrine/lexer": "1.*",
-                "php": "^5.6 || ^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
                 "doctrine/cache": "1.*",
-                "phpunit/phpunit": "^5.7"
+                "phpunit/phpunit": "^6.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "1.6.x-dev"
                 }
             },
             "autoload": {
@@ -804,37 +1106,41 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2017-02-24T16:22:25+00:00"
+            "time": "2017-12-06T07:11:42+00:00"
         },
         {
             "name": "doctrine/cache",
-            "version": "v1.6.2",
+            "version": "v1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b"
+                "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b",
-                "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a",
+                "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a",
                 "shasum": ""
             },
             "require": {
-                "php": "~5.5|~7.0"
+                "php": "~7.1"
             },
             "conflict": {
                 "doctrine/common": ">2.2,<2.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8|~5.0",
-                "predis/predis": "~1.0",
-                "satooshi/php-coveralls": "~0.6"
+                "alcaeus/mongo-php-adapter": "^1.1",
+                "mongodb/mongodb": "^1.1",
+                "phpunit/phpunit": "^5.7",
+                "predis/predis": "~1.0"
+            },
+            "suggest": {
+                "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6.x-dev"
+                    "dev-master": "1.7.x-dev"
                 }
             },
             "autoload": {
@@ -874,24 +1180,24 @@
                 "cache",
                 "caching"
             ],
-            "time": "2017-07-22T12:49:21+00:00"
+            "time": "2017-08-25T07:02:50+00:00"
         },
         {
             "name": "doctrine/collections",
-            "version": "v1.4.0",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/collections.git",
-                "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
+                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
-                "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
+                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
                 "doctrine/coding-standard": "~0.1@dev",
@@ -941,20 +1247,20 @@
                 "collections",
                 "iterator"
             ],
-            "time": "2017-01-03T10:49:41+00:00"
+            "time": "2017-07-22T10:37:32+00:00"
         },
         {
             "name": "doctrine/common",
-            "version": "v2.7.3",
+            "version": "v2.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common.git",
-                "reference": "4acb8f89626baafede6ee5475bc5844096eba8a9"
+                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/4acb8f89626baafede6ee5475bc5844096eba8a9",
-                "reference": "4acb8f89626baafede6ee5475bc5844096eba8a9",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
+                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
                 "shasum": ""
             },
             "require": {
@@ -963,15 +1269,15 @@
                 "doctrine/collections": "1.*",
                 "doctrine/inflector": "1.*",
                 "doctrine/lexer": "1.*",
-                "php": "~5.6|~7.0"
+                "php": "~7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.4.6"
+                "phpunit/phpunit": "^5.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7.x-dev"
+                    "dev-master": "2.8.x-dev"
                 }
             },
             "autoload": {
@@ -1014,37 +1320,37 @@
                 "persistence",
                 "spl"
             ],
-            "time": "2017-07-22T08:35:12+00:00"
+            "time": "2017-08-31T08:43:38+00:00"
         },
         {
             "name": "doctrine/inflector",
-            "version": "v1.1.0",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
+                "reference": "5527a48b7313d15261292c149e55e26eae771b0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
-                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
+                "reference": "5527a48b7313d15261292c149e55e26eae771b0a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.*"
+                "phpunit/phpunit": "^6.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Inflector\\": "lib/"
+                "psr-4": {
+                    "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1081,7 +1387,7 @@
                 "singularize",
                 "string"
             ],
-            "time": "2015-11-06T14:35:42+00:00"
+            "time": "2018-01-09T20:05:19+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -1137,6 +1443,48 @@
             ],
             "time": "2014-09-09T13:34:57+00:00"
         },
+        {
+            "name": "drupal-composer/drupal-scaffold",
+            "version": "2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/drupal-composer/drupal-scaffold.git",
+                "reference": "745f0a2d4141fc83d3b42222beff43d66afb3dc6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/drupal-composer/drupal-scaffold/zipball/745f0a2d4141fc83d3b42222beff43d66afb3dc6",
+                "reference": "745f0a2d4141fc83d3b42222beff43d66afb3dc6",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0.0",
+                "composer/semver": "^1.4",
+                "php": ">=5.4.5"
+            },
+            "require-dev": {
+                "composer/composer": "dev-master",
+                "phpunit/phpunit": "^4.4.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "DrupalComposer\\DrupalScaffold\\Plugin",
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "DrupalComposer\\DrupalScaffold\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "description": "Composer Plugin for updating the Drupal scaffold files when using drupal/core",
+            "time": "2017-12-08T22:53:11+00:00"
+        },
         {
             "name": "drupal/brightcove",
             "version": "1.3.0",
@@ -1168,7 +1516,7 @@
                 },
                 "drupal": {
                     "version": "8.x-1.3",
-                    "datestamp": "1517305384",
+                    "datestamp": "1517314382",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -1257,7 +1605,7 @@
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
             "license": [
-                "GPL-2.0+"
+                "GPL-2.0-or-later"
             ],
             "authors": [
                 {
@@ -1276,18 +1624,509 @@
             }
         },
         {
-            "name": "drupal/ctools",
-            "version": "3.0.0",
+            "name": "drupal/console",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
-                "url": "https://git.drupal.org/project/ctools",
-                "reference": "8.x-3.0"
+                "url": "https://github.com/hechoendrupal/drupal-console.git",
+                "reference": "f4edcad048bd70fa2e74a6858c061425117c1ace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/ctools-8.x-3.0.zip",
-                "reference": "8.x-3.0",
-                "shasum": "302e869ecd1e59fe55663673999fee2ccac5daa8"
+                "url": "https://api.github.com/repos/hechoendrupal/drupal-console/zipball/f4edcad048bd70fa2e74a6858c061425117c1ace",
+                "reference": "f4edcad048bd70fa2e74a6858c061425117c1ace",
+                "shasum": ""
+            },
+            "require": {
+                "alchemy/zippy": "0.4.3",
+                "composer/installers": "~1.0",
+                "doctrine/annotations": "^1.2",
+                "doctrine/collections": "^1.3",
+                "drupal/console-core": "1.7.0",
+                "drupal/console-extend-plugin": "~0",
+                "guzzlehttp/guzzle": "~6.1",
+                "php": "^5.5.9 || ^7.0",
+                "psy/psysh": "0.6.* || ~0.8",
+                "symfony/css-selector": "~2.8|~3.0",
+                "symfony/dom-crawler": "~2.8|~3.0",
+                "symfony/http-foundation": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/thanks": "Thank your favorite PHP projects on Github using the CLI!",
+                "vlucas/phpdotenv": "Loads environment variables from .env to getenv(), $_ENV and $_SERVER automagically."
+            },
+            "bin": [
+                "bin/drupal"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Drupal\\Console\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "David Flores",
+                    "email": "dmousex@gmail.com",
+                    "homepage": "http://dmouse.net"
+                },
+                {
+                    "name": "Jesus Manuel Olivas",
+                    "email": "jesus.olivas@gmail.com",
+                    "homepage": "http://jmolivas.com"
+                },
+                {
+                    "name": "Eduardo Garcia",
+                    "email": "enzo@enzolutions.com",
+                    "homepage": "http://enzolutions.com/"
+                },
+                {
+                    "name": "Omar Aguirre",
+                    "email": "omersguchigu@gmail.com"
+                },
+                {
+                    "name": "Drupal Console Contributors",
+                    "homepage": "https://github.com/hechoendrupal/drupal-console/graphs/contributors"
+                }
+            ],
+            "description": "The Drupal CLI. A tool to generate boilerplate code, interact with and debug Drupal.",
+            "homepage": "http://drupalconsole.com/",
+            "keywords": [
+                "console",
+                "development",
+                "drupal",
+                "symfony"
+            ],
+            "time": "2018-03-06T21:58:52+00:00"
+        },
+        {
+            "name": "drupal/console-core",
+            "version": "1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hechoendrupal/drupal-console-core.git",
+                "reference": "af8b3e42d225a2782f14163aafdeebbc486fd3e5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/af8b3e42d225a2782f14163aafdeebbc486fd3e5",
+                "reference": "af8b3e42d225a2782f14163aafdeebbc486fd3e5",
+                "shasum": ""
+            },
+            "require": {
+                "dflydev/dot-access-configuration": "^1.0",
+                "drupal/console-en": "1.7.0",
+                "php": "^5.5.9 || ^7.0",
+                "stecman/symfony-console-completion": "~0.7",
+                "symfony/config": "~2.8|~3.0",
+                "symfony/console": "~2.8|~3.0",
+                "symfony/debug": "~2.8|~3.0",
+                "symfony/dependency-injection": "~2.8|~3.0",
+                "symfony/event-dispatcher": "~2.8|~3.0",
+                "symfony/filesystem": "~2.8|~3.0",
+                "symfony/finder": "~2.8|~3.0",
+                "symfony/process": "~2.8|~3.0",
+                "symfony/translation": "~2.8|~3.0",
+                "symfony/yaml": "~2.8|~3.0",
+                "twig/twig": "^1.23.1",
+                "webflo/drupal-finder": "^1.0",
+                "webmozart/path-util": "^2.3"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Drupal\\Console\\Core\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "David Flores",
+                    "email": "dmousex@gmail.com",
+                    "homepage": "http://dmouse.net"
+                },
+                {
+                    "name": "Jesus Manuel Olivas",
+                    "email": "jesus.olivas@gmail.com",
+                    "homepage": "http://jmolivas.com"
+                },
+                {
+                    "name": "Drupal Console Contributors",
+                    "homepage": "https://github.com/hechoendrupal/DrupalConsole/graphs/contributors"
+                },
+                {
+                    "name": "Eduardo Garcia",
+                    "email": "enzo@enzolutions.com",
+                    "homepage": "http://enzolutions.com/"
+                },
+                {
+                    "name": "Omar Aguirre",
+                    "email": "omersguchigu@gmail.com"
+                }
+            ],
+            "description": "Drupal Console Core",
+            "homepage": "http://drupalconsole.com/",
+            "keywords": [
+                "console",
+                "development",
+                "drupal",
+                "symfony"
+            ],
+            "time": "2018-03-06T21:34:03+00:00"
+        },
+        {
+            "name": "drupal/console-en",
+            "version": "1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hechoendrupal/drupal-console-en.git",
+                "reference": "916e121fad50155fc96d1fc98fed2e4aa0d6cd85"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/916e121fad50155fc96d1fc98fed2e4aa0d6cd85",
+                "reference": "916e121fad50155fc96d1fc98fed2e4aa0d6cd85",
+                "shasum": ""
+            },
+            "type": "drupal-console-language",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "David Flores",
+                    "email": "dmousex@gmail.com",
+                    "homepage": "http://dmouse.net"
+                },
+                {
+                    "name": "Jesus Manuel Olivas",
+                    "email": "jesus.olivas@gmail.com",
+                    "homepage": "http://jmolivas.com"
+                },
+                {
+                    "name": "Drupal Console Contributors",
+                    "homepage": "https://github.com/hechoendrupal/DrupalConsole/graphs/contributors"
+                },
+                {
+                    "name": "Eduardo Garcia",
+                    "email": "enzo@enzolutions.com",
+                    "homepage": "http://enzolutions.com/"
+                },
+                {
+                    "name": "Omar Aguirre",
+                    "email": "omersguchigu@gmail.com"
+                }
+            ],
+            "description": "Drupal Console English Language",
+            "homepage": "http://drupalconsole.com/",
+            "keywords": [
+                "console",
+                "development",
+                "drupal",
+                "symfony"
+            ],
+            "time": "2018-03-06T15:51:54+00:00"
+        },
+        {
+            "name": "drupal/console-extend-plugin",
+            "version": "0.9.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hechoendrupal/drupal-console-extend-plugin.git",
+                "reference": "f3bac233fd305359c33e96621443b3bd065555cc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hechoendrupal/drupal-console-extend-plugin/zipball/f3bac233fd305359c33e96621443b3bd065555cc",
+                "reference": "f3bac233fd305359c33e96621443b3bd065555cc",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0",
+                "symfony/finder": "~2.7|~3.0",
+                "symfony/yaml": "~2.7|~3.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Drupal\\Console\\Composer\\Plugin\\Extender"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Drupal\\Console\\Composer\\Plugin\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Jesus Manuel Olivas",
+                    "email": "jesus.olivas@gmail.com"
+                }
+            ],
+            "description": "Drupal Console Extend Plugin",
+            "time": "2017-07-28T17:11:54+00:00"
+        },
+        {
+            "name": "drupal/core",
+            "version": "8.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/drupal/core.git",
+                "reference": "0b9070370e272da441b4be52561c559c05f4553d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/drupal/core/zipball/0b9070370e272da441b4be52561c559c05f4553d",
+                "reference": "0b9070370e272da441b4be52561c559c05f4553d",
+                "shasum": ""
+            },
+            "require": {
+                "asm89/stack-cors": "^1.1",
+                "composer/semver": "^1.0",
+                "doctrine/annotations": "^1.2",
+                "doctrine/common": "^2.5",
+                "easyrdf/easyrdf": "^0.9",
+                "egulias/email-validator": "^1.2",
+                "ext-date": "*",
+                "ext-dom": "*",
+                "ext-filter": "*",
+                "ext-gd": "*",
+                "ext-hash": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-pdo": "*",
+                "ext-session": "*",
+                "ext-simplexml": "*",
+                "ext-spl": "*",
+                "ext-tokenizer": "*",
+                "ext-xml": "*",
+                "guzzlehttp/guzzle": "^6.2.1",
+                "masterminds/html5": "^2.1",
+                "paragonie/random_compat": "^1.0|^2.0",
+                "php": "^5.5.9|>=7.0.8",
+                "stack/builder": "^1.0",
+                "symfony-cmf/routing": "^1.4",
+                "symfony/class-loader": "~3.4.0",
+                "symfony/console": "~3.4.0",
+                "symfony/dependency-injection": "~3.4.0",
+                "symfony/event-dispatcher": "~3.4.0",
+                "symfony/http-foundation": "~3.4.0",
+                "symfony/http-kernel": "~3.4.0",
+                "symfony/polyfill-iconv": "^1.0",
+                "symfony/process": "~3.4.0",
+                "symfony/psr-http-message-bridge": "^1.0",
+                "symfony/routing": "~3.4.0",
+                "symfony/serializer": "~3.4.0",
+                "symfony/translation": "~3.4.0",
+                "symfony/validator": "~3.4.0",
+                "symfony/yaml": "~3.4.5",
+                "twig/twig": "^1.35.0",
+                "zendframework/zend-diactoros": "^1.1",
+                "zendframework/zend-feed": "^2.4"
+            },
+            "conflict": {
+                "drush/drush": "<8.1.10"
+            },
+            "replace": {
+                "drupal/action": "self.version",
+                "drupal/aggregator": "self.version",
+                "drupal/automated_cron": "self.version",
+                "drupal/ban": "self.version",
+                "drupal/bartik": "self.version",
+                "drupal/basic_auth": "self.version",
+                "drupal/big_pipe": "self.version",
+                "drupal/block": "self.version",
+                "drupal/block_content": "self.version",
+                "drupal/block_place": "self.version",
+                "drupal/book": "self.version",
+                "drupal/breakpoint": "self.version",
+                "drupal/ckeditor": "self.version",
+                "drupal/classy": "self.version",
+                "drupal/color": "self.version",
+                "drupal/comment": "self.version",
+                "drupal/config": "self.version",
+                "drupal/config_translation": "self.version",
+                "drupal/contact": "self.version",
+                "drupal/content_moderation": "self.version",
+                "drupal/content_translation": "self.version",
+                "drupal/contextual": "self.version",
+                "drupal/core-annotation": "self.version",
+                "drupal/core-assertion": "self.version",
+                "drupal/core-bridge": "self.version",
+                "drupal/core-class-finder": "self.version",
+                "drupal/core-datetime": "self.version",
+                "drupal/core-dependency-injection": "self.version",
+                "drupal/core-diff": "self.version",
+                "drupal/core-discovery": "self.version",
+                "drupal/core-event-dispatcher": "self.version",
+                "drupal/core-file-cache": "self.version",
+                "drupal/core-filesystem": "self.version",
+                "drupal/core-gettext": "self.version",
+                "drupal/core-graph": "self.version",
+                "drupal/core-http-foundation": "self.version",
+                "drupal/core-php-storage": "self.version",
+                "drupal/core-plugin": "self.version",
+                "drupal/core-proxy-builder": "self.version",
+                "drupal/core-render": "self.version",
+                "drupal/core-serialization": "self.version",
+                "drupal/core-transliteration": "self.version",
+                "drupal/core-utility": "self.version",
+                "drupal/core-uuid": "self.version",
+                "drupal/datetime": "self.version",
+                "drupal/datetime_range": "self.version",
+                "drupal/dblog": "self.version",
+                "drupal/dynamic_page_cache": "self.version",
+                "drupal/editor": "self.version",
+                "drupal/entity_reference": "self.version",
+                "drupal/field": "self.version",
+                "drupal/field_layout": "self.version",
+                "drupal/field_ui": "self.version",
+                "drupal/file": "self.version",
+                "drupal/filter": "self.version",
+                "drupal/forum": "self.version",
+                "drupal/hal": "self.version",
+                "drupal/help": "self.version",
+                "drupal/history": "self.version",
+                "drupal/image": "self.version",
+                "drupal/inline_form_errors": "self.version",
+                "drupal/language": "self.version",
+                "drupal/layout_builder": "self.version",
+                "drupal/layout_discovery": "self.version",
+                "drupal/link": "self.version",
+                "drupal/locale": "self.version",
+                "drupal/media": "self.version",
+                "drupal/menu_link_content": "self.version",
+                "drupal/menu_ui": "self.version",
+                "drupal/migrate": "self.version",
+                "drupal/migrate_drupal": "self.version",
+                "drupal/migrate_drupal_ui": "self.version",
+                "drupal/minimal": "self.version",
+                "drupal/node": "self.version",
+                "drupal/options": "self.version",
+                "drupal/page_cache": "self.version",
+                "drupal/path": "self.version",
+                "drupal/quickedit": "self.version",
+                "drupal/rdf": "self.version",
+                "drupal/responsive_image": "self.version",
+                "drupal/rest": "self.version",
+                "drupal/search": "self.version",
+                "drupal/serialization": "self.version",
+                "drupal/settings_tray": "self.version",
+                "drupal/seven": "self.version",
+                "drupal/shortcut": "self.version",
+                "drupal/simpletest": "self.version",
+                "drupal/standard": "self.version",
+                "drupal/stark": "self.version",
+                "drupal/statistics": "self.version",
+                "drupal/syslog": "self.version",
+                "drupal/system": "self.version",
+                "drupal/taxonomy": "self.version",
+                "drupal/telephone": "self.version",
+                "drupal/text": "self.version",
+                "drupal/toolbar": "self.version",
+                "drupal/tour": "self.version",
+                "drupal/tracker": "self.version",
+                "drupal/update": "self.version",
+                "drupal/user": "self.version",
+                "drupal/views": "self.version",
+                "drupal/views_ui": "self.version",
+                "drupal/workflows": "self.version"
+            },
+            "require-dev": {
+                "behat/mink": "1.7.x-dev",
+                "behat/mink-goutte-driver": "^1.2",
+                "behat/mink-selenium2-driver": "1.3.x-dev",
+                "drupal/coder": "^8.2.12",
+                "jcalderonzumba/gastonjs": "^1.0.2",
+                "jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
+                "mikey179/vfsstream": "^1.2",
+                "phpspec/prophecy": "^1.4",
+                "phpunit/phpunit": "^4.8.35 || ^6.1",
+                "symfony/css-selector": "^3.4.0",
+                "symfony/debug": "^3.4.0",
+                "symfony/phpunit-bridge": "^3.4.3"
+            },
+            "type": "drupal-core",
+            "extra": {
+                "merge-plugin": {
+                    "require": [
+                        "core/lib/Drupal/Component/Annotation/composer.json",
+                        "core/lib/Drupal/Component/Assertion/composer.json",
+                        "core/lib/Drupal/Component/Bridge/composer.json",
+                        "core/lib/Drupal/Component/ClassFinder/composer.json",
+                        "core/lib/Drupal/Component/Datetime/composer.json",
+                        "core/lib/Drupal/Component/DependencyInjection/composer.json",
+                        "core/lib/Drupal/Component/Diff/composer.json",
+                        "core/lib/Drupal/Component/Discovery/composer.json",
+                        "core/lib/Drupal/Component/EventDispatcher/composer.json",
+                        "core/lib/Drupal/Component/FileCache/composer.json",
+                        "core/lib/Drupal/Component/FileSystem/composer.json",
+                        "core/lib/Drupal/Component/Gettext/composer.json",
+                        "core/lib/Drupal/Component/Graph/composer.json",
+                        "core/lib/Drupal/Component/HttpFoundation/composer.json",
+                        "core/lib/Drupal/Component/PhpStorage/composer.json",
+                        "core/lib/Drupal/Component/Plugin/composer.json",
+                        "core/lib/Drupal/Component/ProxyBuilder/composer.json",
+                        "core/lib/Drupal/Component/Render/composer.json",
+                        "core/lib/Drupal/Component/Serialization/composer.json",
+                        "core/lib/Drupal/Component/Transliteration/composer.json",
+                        "core/lib/Drupal/Component/Utility/composer.json",
+                        "core/lib/Drupal/Component/Uuid/composer.json"
+                    ],
+                    "recurse": false,
+                    "replace": false,
+                    "merge-extra": false
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Drupal\\Core\\": "lib/Drupal/Core",
+                    "Drupal\\Component\\": "lib/Drupal/Component",
+                    "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
+                },
+                "classmap": [
+                    "lib/Drupal.php",
+                    "lib/Drupal/Component/Utility/Timer.php",
+                    "lib/Drupal/Component/Utility/Unicode.php",
+                    "lib/Drupal/Core/Database/Database.php",
+                    "lib/Drupal/Core/DrupalKernel.php",
+                    "lib/Drupal/Core/DrupalKernelInterface.php",
+                    "lib/Drupal/Core/Site/Settings.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "description": "Drupal is an open source content management platform powering millions of websites and applications.",
+            "time": "2018-03-07T21:10:20+00:00"
+        },
+        {
+            "name": "drupal/ctools",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/ctools",
+                "reference": "8.x-3.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/ctools-8.x-3.0.zip",
+                "reference": "8.x-3.0",
+                "shasum": "302e869ecd1e59fe55663673999fee2ccac5daa8"
             },
             "require": {
                 "drupal/core": "~8.0"
@@ -1435,20 +2274,20 @@
         },
         {
             "name": "drupal/entity",
-            "version": "1.0.0-beta1",
+            "version": "1.0.0-beta3",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/entity",
-                "reference": "8.x-1.0-beta1"
+                "reference": "8.x-1.0-beta3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/entity-8.x-1.0-beta1.zip",
-                "reference": "8.x-1.0-beta1",
-                "shasum": "6965349818de8cb820113b6841076162190c1a4c"
+                "url": "https://ftp.drupal.org/files/projects/entity-8.x-1.0-beta3.zip",
+                "reference": "8.x-1.0-beta3",
+                "shasum": "5d74dbef7bff0db099517b2c7aad14312eb02afa"
             },
             "require": {
-                "drupal/core": "~8.3"
+                "drupal/core": "~8.5"
             },
             "type": "drupal-module",
             "extra": {
@@ -1456,8 +2295,8 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.0-beta1",
-                    "datestamp": "1505895844",
+                    "version": "8.x-1.0-beta3",
+                    "datestamp": "1520958485",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Beta releases are not covered by Drupal security advisories."
@@ -1580,37 +2419,34 @@
             }
         },
         {
-            "name": "drupal/entity_embed",
-            "version": "1.0.0-beta2",
+            "name": "drupal/features",
+            "version": "3.7.0",
             "source": {
                 "type": "git",
-                "url": "https://git.drupal.org/project/entity_embed",
-                "reference": "8.x-1.0-beta2"
+                "url": "https://git.drupal.org/project/features",
+                "reference": "8.x-3.7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/entity_embed-8.x-1.0-beta2.zip",
-                "reference": "8.x-1.0-beta2",
-                "shasum": "21cdeb2b058efce461683aed9a8951053512dca7"
+                "url": "https://ftp.drupal.org/files/projects/features-8.x-3.7.zip",
+                "reference": "8.x-3.7",
+                "shasum": "1a832002f47f32a83eae789e42e4f06225de9e43"
             },
             "require": {
-                "drupal/core": "*",
-                "drupal/embed": "*"
-            },
-            "require-dev": {
-                "drupal/entity_browser": "*"
+                "drupal/config_update": "^1.4",
+                "drupal/core": "*"
             },
             "type": "drupal-module",
             "extra": {
                 "branch-alias": {
-                    "dev-1.x": "1.x-dev"
+                    "dev-3.x": "3.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.0-beta2",
-                    "datestamp": "1476698339",
+                    "version": "8.x-3.7",
+                    "datestamp": "1519763284",
                     "security-coverage": {
-                        "status": "not-covered",
-                        "message": "Beta releases are not covered by Drupal security advisories."
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
                     }
                 }
             },
@@ -1620,104 +2456,158 @@
             ],
             "authors": [
                 {
-                    "name": "Dave Reid",
-                    "homepage": "https://www.drupal.org/user/53892"
+                    "name": "dawehner",
+                    "homepage": "https://www.drupal.org/user/99340"
                 },
                 {
-                    "name": "Devin Carlson",
-                    "homepage": "https://www.drupal.org/user/290182"
+                    "name": "e2thex",
+                    "homepage": "https://www.drupal.org/user/189123"
                 },
                 {
-                    "name": "Drupal Media Team",
-                    "homepage": "https://www.drupal.org/user/3260690"
+                    "name": "febbraro",
+                    "homepage": "https://www.drupal.org/user/43670"
                 },
                 {
-                    "name": "cs_shadow",
-                    "homepage": "https://www.drupal.org/user/2828287"
+                    "name": "jmiccolis",
+                    "homepage": "https://www.drupal.org/user/31731"
                 },
                 {
-                    "name": "slashrsm",
-                    "homepage": "https://www.drupal.org/user/744628"
+                    "name": "mpotter",
+                    "homepage": "https://www.drupal.org/user/616192"
+                },
+                {
+                    "name": "nedjo",
+                    "homepage": "https://www.drupal.org/user/4481"
+                },
+                {
+                    "name": "tim.plunkett",
+                    "homepage": "https://www.drupal.org/user/241634"
                 }
             ],
-            "description": "Allows any entity to be embedded within a text area using a WYSIWYG editor.",
-            "homepage": "https://www.drupal.org/project/entity_embed",
+            "description": "Enables administrators to package configuration into modules",
+            "homepage": "https://www.drupal.org/project/features",
             "support": {
-                "source": "http://cgit.drupalcode.org/entity_embed",
-                "issues": "https://www.drupal.org/project/issues/entity_embed",
-                "irc": "irc://irc.freenode.org/drupal-media"
+                "source": "http://cgit.drupalcode.org/features"
             }
         },
         {
-            "name": "drupal/features",
-            "version": "3.5.0",
+            "name": "drupal/flysystem",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://git.drupal.org/project/features",
-                "reference": "8.x-3.5"
+                "url": "https://git.drupal.org/project/flysystem",
+                "reference": "8.x-1.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/features-8.x-3.5.zip",
-                "reference": "8.x-3.5",
-                "shasum": "546b34387018f9adbe742b6992c4d473f9447c41"
+                "url": "https://ftp.drupal.org/files/projects/flysystem-8.x-1.0.zip",
+                "reference": "8.x-1.0",
+                "shasum": "8b6bd358c24e7ec8504d324f6a50bdc11ac1dc14"
             },
             "require": {
-                "drupal/config_update": "*",
-                "drupal/core": "*"
+                "drupal/core": "~8.0",
+                "league/flysystem": "^1.0.3",
+                "league/flysystem-replicate-adapter": "~1.0",
+                "twistor/flysystem-stream-wrapper": "^1.0.5"
+            },
+            "require-dev": {
+                "league/flysystem-memory": "~1.0"
             },
             "type": "drupal-module",
             "extra": {
                 "branch-alias": {
-                    "dev-3.x": "3.x-dev"
+                    "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-3.5",
-                    "datestamp": "1488908583",
+                    "version": "8.x-1.0",
+                    "datestamp": "1497585842",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
                     }
                 }
             },
+            "autoload": {
+                "psr-4": {
+                    "Drupal\\flysystem\\": "src/"
+                }
+            },
             "notification-url": "https://packages.drupal.org/8/downloads",
             "license": [
-                "GPL-2.0+"
+                "GPL-2.0-or-later"
             ],
             "authors": [
                 {
-                    "name": "dawehner",
-                    "homepage": "https://www.drupal.org/user/99340"
+                    "name": "twistor",
+                    "homepage": "https://www.drupal.org/user/473738"
                 },
                 {
-                    "name": "e2thex",
-                    "homepage": "https://www.drupal.org/user/189123"
-                },
-                {
-                    "name": "febbraro",
-                    "homepage": "https://www.drupal.org/user/43670"
-                },
-                {
-                    "name": "jmiccolis",
-                    "homepage": "https://www.drupal.org/user/31731"
+                    "name": "vijaycs85",
+                    "homepage": "https://www.drupal.org/user/93488"
+                }
+            ],
+            "description": "Provides access to various filesystem backends using Flysystem.",
+            "homepage": "https://www.drupal.org/project/flysystem",
+            "support": {
+                "source": "http://cgit.drupalcode.org/flysystem"
+            }
+        },
+        {
+            "name": "drupal/flysystem_s3",
+            "version": "1.0.0-alpha2",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/flysystem_s3",
+                "reference": "8.x-1.0-alpha2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/flysystem_s3-8.x-1.0-alpha2.zip",
+                "reference": "8.x-1.0-alpha2",
+                "shasum": "8793c4324e561c0dfe99acf164fc0883b880f348"
+            },
+            "require": {
+                "drupal/core": "~8.0",
+                "drupal/flysystem": "*",
+                "league/flysystem": "^1.0.20",
+                "league/flysystem-aws-s3-v3": "^1.0, !=1.0.12, !=1.0.13"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
                 },
+                "drupal": {
+                    "version": "8.x-1.0-alpha2",
+                    "datestamp": "1469068442",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Alpha releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
                 {
-                    "name": "mpotter",
-                    "homepage": "https://www.drupal.org/user/616192"
+                    "name": "cweagans",
+                    "homepage": "https://www.drupal.org/user/404732"
                 },
                 {
-                    "name": "nedjo",
-                    "homepage": "https://www.drupal.org/user/4481"
+                    "name": "twistor",
+                    "homepage": "https://www.drupal.org/user/473738"
                 },
                 {
-                    "name": "tim.plunkett",
-                    "homepage": "https://www.drupal.org/user/241634"
+                    "name": "vijaycs85",
+                    "homepage": "https://www.drupal.org/user/93488"
                 }
             ],
-            "description": "Enables administrators to package configuration into modules.",
-            "homepage": "https://www.drupal.org/project/features",
+            "description": "Provides an Amazon S3 plugin for Flysystem.",
+            "homepage": "https://www.drupal.org/project/flysystem_s3",
             "support": {
-                "source": "http://cgit.drupalcode.org/features"
+                "source": "http://cgit.drupalcode.org/flysystem_s3"
             }
         },
         {
@@ -1824,7 +2714,7 @@
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
             "license": [
-                "GPL-2.0+"
+                "GPL-2.0-or-later"
             ],
             "authors": [
                 {
@@ -1981,7 +2871,7 @@
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
             "license": [
-                "GPL-2.0+"
+                "GPL-2.0-or-later"
             ],
             "authors": [
                 {
@@ -2017,16 +2907,16 @@
         },
         {
             "name": "drush/drush",
-            "version": "9.1.0",
+            "version": "9.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drush-ops/drush.git",
-                "reference": "0380bba1ba88271caab8239edd640ee4ebaac3ee"
+                "reference": "e40f5bb6a291f643d4699a95ef6873ac40ae8302"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drush-ops/drush/zipball/0380bba1ba88271caab8239edd640ee4ebaac3ee",
-                "reference": "0380bba1ba88271caab8239edd640ee4ebaac3ee",
+                "url": "https://api.github.com/repos/drush-ops/drush/zipball/e40f5bb6a291f643d4699a95ef6873ac40ae8302",
+                "reference": "e40f5bb6a291f643d4699a95ef6873ac40ae8302",
                 "shasum": ""
             },
             "require": {
@@ -2114,7 +3004,7 @@
             ],
             "description": "Drush is a command line shell and scripting interface for Drupal, a veritable Swiss Army knife designed to make life easier for those of us who spend some of our working hours hacking away at the command prompt.",
             "homepage": "http://www.drush.org",
-            "time": "2018-02-06T20:02:10+00:00"
+            "time": "2018-02-27T21:26:53+00:00"
         },
         {
             "name": "easyrdf/easyrdf",
@@ -2538,46 +3428,242 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-2-Clause"
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jakub Onderka",
+                    "email": "jakub.onderka@gmail.com",
+                    "homepage": "http://www.acci.cz"
+                }
+            ],
+            "time": "2014-04-08T15:00:19+00:00"
+        },
+        {
+            "name": "jakub-onderka/php-console-highlighter",
+            "version": "v0.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
+                "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5",
+                "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
+                "shasum": ""
+            },
+            "require": {
+                "jakub-onderka/php-console-color": "~0.1",
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "jakub-onderka/php-code-style": "~1.0",
+                "jakub-onderka/php-parallel-lint": "~0.5",
+                "jakub-onderka/php-var-dump-check": "~0.1",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~1.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "JakubOnderka\\PhpConsoleHighlighter": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jakub Onderka",
+                    "email": "acci@acci.cz",
+                    "homepage": "http://www.acci.cz/"
+                }
+            ],
+            "time": "2015-04-20T18:58:01+00:00"
+        },
+        {
+            "name": "league/container",
+            "version": "2.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/container.git",
+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
+                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "^1.2",
+                "php": "^5.4.0 || ^7.0"
+            },
+            "provide": {
+                "container-interop/container-interop-implementation": "^1.2",
+                "psr/container-implementation": "^1.0"
+            },
+            "replace": {
+                "orno/di": "~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev",
+                    "dev-1.x": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Container\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Phil Bennett",
+                    "email": "philipobenito@gmail.com",
+                    "homepage": "http://www.philipobenito.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A fast and intuitive dependency injection container.",
+            "homepage": "https://github.com/thephpleague/container",
+            "keywords": [
+                "container",
+                "dependency",
+                "di",
+                "injection",
+                "league",
+                "provider",
+                "service"
+            ],
+            "time": "2017-05-10T09:20:27+00:00"
+        },
+        {
+            "name": "league/flysystem",
+            "version": "1.0.43",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/flysystem.git",
+                "reference": "1ce7cc142d906ba58dc54c82915d355a9191c8a8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/1ce7cc142d906ba58dc54c82915d355a9191c8a8",
+                "reference": "1ce7cc142d906ba58dc54c82915d355a9191c8a8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "conflict": {
+                "league/flysystem-sftp": "<1.0.6"
+            },
+            "require-dev": {
+                "ext-fileinfo": "*",
+                "phpspec/phpspec": "^3.4",
+                "phpunit/phpunit": "^5.7"
+            },
+            "suggest": {
+                "ext-fileinfo": "Required for MimeType",
+                "ext-ftp": "Allows you to use FTP server storage",
+                "ext-openssl": "Allows you to use FTPS server storage",
+                "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
+                "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
+                "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
+                "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
+                "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
+                "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
+                "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
+                "league/flysystem-webdav": "Allows you to use WebDAV storage",
+                "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
+                "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
+                "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Flysystem\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Jakub Onderka",
-                    "email": "jakub.onderka@gmail.com",
-                    "homepage": "http://www.acci.cz"
+                    "name": "Frank de Jonge",
+                    "email": "info@frenky.net"
                 }
             ],
-            "time": "2014-04-08T15:00:19+00:00"
+            "description": "Filesystem abstraction: Many filesystems, one API.",
+            "keywords": [
+                "Cloud Files",
+                "WebDAV",
+                "abstraction",
+                "aws",
+                "cloud",
+                "copy.com",
+                "dropbox",
+                "file systems",
+                "files",
+                "filesystem",
+                "filesystems",
+                "ftp",
+                "rackspace",
+                "remote",
+                "s3",
+                "sftp",
+                "storage"
+            ],
+            "time": "2018-03-01T10:27:04+00:00"
         },
         {
-            "name": "jakub-onderka/php-console-highlighter",
-            "version": "v0.3.2",
+            "name": "league/flysystem-aws-s3-v3",
+            "version": "1.0.18",
             "source": {
                 "type": "git",
-                "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
-                "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
+                "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
+                "reference": "dc09b19f455750663b922ed52dcc0ff215bed284"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5",
-                "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/dc09b19f455750663b922ed52dcc0ff215bed284",
+                "reference": "dc09b19f455750663b922ed52dcc0ff215bed284",
                 "shasum": ""
             },
             "require": {
-                "jakub-onderka/php-console-color": "~0.1",
-                "php": ">=5.3.0"
+                "aws/aws-sdk-php": "^3.0.0",
+                "league/flysystem": "^1.0.40",
+                "php": ">=5.5.0"
             },
             "require-dev": {
-                "jakub-onderka/php-code-style": "~1.0",
-                "jakub-onderka/php-parallel-lint": "~0.5",
-                "jakub-onderka/php-var-dump-check": "~0.1",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~1.5"
+                "henrikbjorn/phpspec-code-coverage": "~1.0.1",
+                "phpspec/phpspec": "^2.0.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
             "autoload": {
-                "psr-0": {
-                    "JakubOnderka\\PhpConsoleHighlighter": "src/"
+                "psr-4": {
+                    "League\\Flysystem\\AwsS3v3\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2586,51 +3672,44 @@
             ],
             "authors": [
                 {
-                    "name": "Jakub Onderka",
-                    "email": "acci@acci.cz",
-                    "homepage": "http://www.acci.cz/"
+                    "name": "Frank de Jonge",
+                    "email": "info@frenky.net"
                 }
             ],
-            "time": "2015-04-20T18:58:01+00:00"
+            "description": "Flysystem adapter for the AWS S3 SDK v3.x",
+            "time": "2017-06-30T06:29:25+00:00"
         },
         {
-            "name": "league/container",
-            "version": "2.4.1",
+            "name": "league/flysystem-replicate-adapter",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/thephpleague/container.git",
-                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
+                "url": "https://github.com/thephpleague/flysystem-replicate-adapter.git",
+                "reference": "864e80409c0918b0ed6921c3941247017d9db77c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
-                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-replicate-adapter/zipball/864e80409c0918b0ed6921c3941247017d9db77c",
+                "reference": "864e80409c0918b0ed6921c3941247017d9db77c",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.2",
-                "php": "^5.4.0 || ^7.0"
-            },
-            "provide": {
-                "container-interop/container-interop-implementation": "^1.2",
-                "psr/container-implementation": "^1.0"
-            },
-            "replace": {
-                "orno/di": "~2.0"
+                "league/flysystem": "~1.0",
+                "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.*"
+                "mockery/mockery": "0.9.*",
+                "phpunit/phpunit": "~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-2.x": "2.x-dev",
-                    "dev-1.x": "1.x-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "League\\Container\\": "src"
+                    "League\\Flysystem\\Replicate\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2639,24 +3718,12 @@
             ],
             "authors": [
                 {
-                    "name": "Phil Bennett",
-                    "email": "philipobenito@gmail.com",
-                    "homepage": "http://www.philipobenito.com",
-                    "role": "Developer"
+                    "name": "Frank de Jonge",
+                    "email": "info@frenky.net"
                 }
             ],
-            "description": "A fast and intuitive dependency injection container.",
-            "homepage": "https://github.com/thephpleague/container",
-            "keywords": [
-                "container",
-                "dependency",
-                "di",
-                "injection",
-                "league",
-                "provider",
-                "service"
-            ],
-            "time": "2017-05-10T09:20:27+00:00"
+            "description": "Flysystem adapter for Replica's",
+            "time": "2015-08-18T21:07:17+00:00"
         },
         {
             "name": "masterminds/html5",
@@ -2723,18 +3790,73 @@
             ],
             "time": "2017-09-04T12:26:28+00:00"
         },
+        {
+            "name": "mtdowling/jmespath.php",
+            "version": "2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jmespath/jmespath.php.git",
+                "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/adcc9531682cf87dfda21e1fd5d0e7a41d292fac",
+                "reference": "adcc9531682cf87dfda21e1fd5d0e7a41d292fac",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "bin": [
+                "bin/jp.php"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "JmesPath\\": "src/"
+                },
+                "files": [
+                    "src/JmesPath.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Declaratively specify how to extract elements from a JSON document",
+            "keywords": [
+                "json",
+                "jsonpath"
+            ],
+            "time": "2016-12-03T22:08:25+00:00"
+        },
         {
             "name": "nikic/php-parser",
-            "version": "v3.1.4",
+            "version": "v3.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "e57b3a09784f846411aa7ed664eedb73e3399078"
+                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e57b3a09784f846411aa7ed664eedb73e3399078",
-                "reference": "e57b3a09784f846411aa7ed664eedb73e3399078",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
+                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
                 "shasum": ""
             },
             "require": {
@@ -2772,7 +3894,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2018-01-25T21:31:33+00:00"
+            "time": "2018-02-28T20:30:58+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -3124,6 +4246,51 @@
             ],
             "time": "2017-11-18T14:57:29+00:00"
         },
+        {
+            "name": "stecman/symfony-console-completion",
+            "version": "0.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/stecman/symfony-console-completion.git",
+                "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/stecman/symfony-console-completion/zipball/5461d43e53092b3d3b9dbd9d999f2054730f4bbb",
+                "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2",
+                "symfony/console": "~2.3 || ~3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Stecman\\Component\\Symfony\\Console\\BashCompletion\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Stephen Holdaway",
+                    "email": "stephen@stecman.co.nz"
+                }
+            ],
+            "description": "Automatic BASH completion for Symfony Console Component based applications.",
+            "time": "2016-02-24T05:08:54+00:00"
+        },
         {
             "name": "symfony-cmf/routing",
             "version": "1.4.1",
@@ -3185,23 +4352,23 @@
         },
         {
             "name": "symfony/class-loader",
-            "version": "v3.2.14",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
-                "reference": "e192d96b15fdd168bdb1c91001d26c93ba4af482"
+                "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/e192d96b15fdd168bdb1c91001d26c93ba4af482",
-                "reference": "e192d96b15fdd168bdb1c91001d26c93ba4af482",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/e63c12699822bb3b667e7216ba07fbcc3a3e203e",
+                "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
             },
             "require-dev": {
-                "symfony/finder": "~2.8|~3.0",
+                "symfony/finder": "~2.8|~3.0|~4.0",
                 "symfony/polyfill-apcu": "~1.1"
             },
             "suggest": {
@@ -3210,7 +4377,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -3237,41 +4404,166 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-01T21:00:24+00:00"
+            "time": "2018-01-03T07:37:34+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v3.2.14",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "e5533fcc0b3dd377626153b2852707878f363728"
+                "reference": "05e10567b529476a006b00746c5f538f1636810e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/e5533fcc0b3dd377626153b2852707878f363728",
-                "reference": "e5533fcc0b3dd377626153b2852707878f363728",
+                "url": "https://api.github.com/repos/symfony/config/zipball/05e10567b529476a006b00746c5f538f1636810e",
+                "reference": "05e10567b529476a006b00746c5f538f1636810e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
-                "symfony/filesystem": "~2.8|~3.0"
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/filesystem": "~2.8|~3.0|~4.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.3",
+                "symfony/finder": "<3.3"
+            },
+            "require-dev": {
+                "symfony/dependency-injection": "~3.3|~4.0",
+                "symfony/event-dispatcher": "~3.3|~4.0",
+                "symfony/finder": "~3.3|~4.0",
+                "symfony/yaml": "~3.0|~4.0"
+            },
+            "suggest": {
+                "symfony/yaml": "To use the yaml reference dumper"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Config\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Config Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-02-14T10:03:57+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v3.4.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/067339e9b8ec30d5f19f5950208893ff026b94f7",
+                "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/debug": "~2.8|~3.0|~4.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4",
+                "symfony/process": "<3.3"
             },
             "require-dev": {
-                "symfony/yaml": "~3.0"
+                "psr/log": "~1.0",
+                "symfony/config": "~3.3|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+                "symfony/lock": "~3.4|~4.0",
+                "symfony/process": "~3.3|~4.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-02-26T15:46:28+00:00"
+        },
+        {
+            "name": "symfony/css-selector",
+            "version": "v3.4.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/css-selector.git",
+                "reference": "544655f1fc078a9cd839fdda2b7b1e64627c826a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/544655f1fc078a9cd839fdda2b7b1e64627c826a",
+                "reference": "544655f1fc078a9cd839fdda2b7b1e64627c826a",
+                "shasum": ""
             },
-            "suggest": {
-                "symfony/yaml": "To use the yaml reference dumper"
+            "require": {
+                "php": "^5.5.9|>=7.0.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Config\\": ""
+                    "Symfony\\Component\\CssSelector\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -3282,6 +4574,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
@@ -3291,50 +4587,43 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Config Component",
+            "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:13:17+00:00"
+            "time": "2018-02-03T14:55:07+00:00"
         },
         {
-            "name": "symfony/console",
-            "version": "v3.2.14",
+            "name": "symfony/debug",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "eced439413608647aeff243038a33ea246b2b33a"
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "9b1071f86e79e1999b3d3675d2e0e7684268b9bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/eced439413608647aeff243038a33ea246b2b33a",
-                "reference": "eced439413608647aeff243038a33ea246b2b33a",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/9b1071f86e79e1999b3d3675d2e0e7684268b9bc",
+                "reference": "9b1071f86e79e1999b3d3675d2e0e7684268b9bc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
-                "symfony/debug": "~2.8|~3.0",
-                "symfony/polyfill-mbstring": "~1.0"
+                "php": "^5.5.9|>=7.0.8",
+                "psr/log": "~1.0"
             },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.8|~3.0",
-                "symfony/filesystem": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0"
+            "conflict": {
+                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
             },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/filesystem": "",
-                "symfony/process": ""
+            "require-dev": {
+                "symfony/http-kernel": "~2.8|~3.0|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
+                    "Symfony\\Component\\Debug\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -3354,33 +4643,48 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Console Component",
+            "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:27:41+00:00"
+            "time": "2018-02-28T21:49:22+00:00"
         },
         {
-            "name": "symfony/debug",
-            "version": "v3.4.4",
+            "name": "symfony/dependency-injection",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "53f6af2805daf52a43b393b93d2f24925d35c937"
+                "url": "https://github.com/symfony/dependency-injection.git",
+                "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/53f6af2805daf52a43b393b93d2f24925d35c937",
-                "reference": "53f6af2805daf52a43b393b93d2f24925d35c937",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/12e901abc1cb0d637a0e5abe9923471361d96b07",
+                "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
-                "psr/log": "~1.0"
+                "psr/container": "^1.0"
             },
             "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+                "symfony/config": "<3.3.7",
+                "symfony/finder": "<3.3",
+                "symfony/proxy-manager-bridge": "<3.4",
+                "symfony/yaml": "<3.4"
+            },
+            "provide": {
+                "psr/container-implementation": "1.0"
             },
             "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0|~4.0"
+                "symfony/config": "~3.3|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/config": "",
+                "symfony/expression-language": "For using expressions in service container configuration",
+                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+                "symfony/yaml": ""
             },
             "type": "library",
             "extra": {
@@ -3390,7 +4694,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
+                    "Symfony\\Component\\DependencyInjection\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -3410,50 +4714,43 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Debug Component",
+            "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2018-01-18T22:16:57+00:00"
+            "time": "2018-03-04T03:54:53+00:00"
         },
         {
-            "name": "symfony/dependency-injection",
-            "version": "v3.2.14",
+            "name": "symfony/dom-crawler",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761"
+                "url": "https://github.com/symfony/dom-crawler.git",
+                "reference": "2bb5d3101cc01f4fe580e536daf4f1959bc2d24d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761",
-                "reference": "d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2bb5d3101cc01f4fe580e536daf4f1959bc2d24d",
+                "reference": "2bb5d3101cc01f4fe580e536daf4f1959bc2d24d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
-            },
-            "conflict": {
-                "symfony/yaml": "<3.2"
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
-                "symfony/config": "~2.8|~3.0",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/yaml": "~3.2"
+                "symfony/css-selector": "~2.8|~3.0|~4.0"
             },
             "suggest": {
-                "symfony/config": "",
-                "symfony/expression-language": "For using expressions in service container configuration",
-                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-                "symfony/yaml": ""
+                "symfony/css-selector": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\DependencyInjection\\": ""
+                    "Symfony\\Component\\DomCrawler\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -3473,33 +4770,36 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony DependencyInjection Component",
+            "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-28T15:22:55+00:00"
+            "time": "2018-02-22T10:48:49+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.2.14",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "b8de6ee252af19330dd72ad5fc0dd4658a1d6325"
+                "reference": "58990682ac3fdc1f563b7e705452921372aad11d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b8de6ee252af19330dd72ad5fc0dd4658a1d6325",
-                "reference": "b8de6ee252af19330dd72ad5fc0dd4658a1d6325",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/58990682ac3fdc1f563b7e705452921372aad11d",
+                "reference": "58990682ac3fdc1f563b7e705452921372aad11d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.3"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/dependency-injection": "~2.8|~3.0",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/stopwatch": "~2.8|~3.0"
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "~3.3|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/stopwatch": "~2.8|~3.0|~4.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -3508,7 +4808,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -3535,20 +4835,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-02T08:26:05+00:00"
+            "time": "2018-02-14T10:03:57+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.4.4",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "e078773ad6354af38169faf31c21df0f18ace03d"
+                "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e078773ad6354af38169faf31c21df0f18ace03d",
-                "reference": "e078773ad6354af38169faf31c21df0f18ace03d",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/253a4490b528597aa14d2bf5aeded6f5e5e4a541",
+                "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541",
                 "shasum": ""
             },
             "require": {
@@ -3584,20 +4884,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2018-01-03T07:37:34+00:00"
+            "time": "2018-02-22T10:48:49+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.4",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f"
+                "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f",
-                "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/a479817ce0a9e4adfd7d39c6407c95d97c254625",
+                "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625",
                 "shasum": ""
             },
             "require": {
@@ -3633,33 +4933,34 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-01-03T07:37:34+00:00"
+            "time": "2018-03-05T18:28:11+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.2.14",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "107b7e6c2372ad4859b8a8c8c5b4fb9d7a208fe1"
+                "reference": "6f5935723c11b4125fc9927db6ad2feaa196e175"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/107b7e6c2372ad4859b8a8c8c5b4fb9d7a208fe1",
-                "reference": "107b7e6c2372ad4859b8a8c8c5b4fb9d7a208fe1",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6f5935723c11b4125fc9927db6ad2feaa196e175",
+                "reference": "6f5935723c11b4125fc9927db6ad2feaa196e175",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
-                "symfony/polyfill-mbstring": "~1.1"
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-mbstring": "~1.1",
+                "symfony/polyfill-php70": "~1.6"
             },
             "require-dev": {
-                "symfony/expression-language": "~2.8|~3.0"
+                "symfony/expression-language": "~2.8|~3.0|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -3686,53 +4987,58 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-20T07:58:49+00:00"
+            "time": "2018-02-22T10:48:49+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.2.14",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "18ec42e19ec676d7da5ddff13f1eed68d88fb460"
+                "reference": "a443bbbd93682aa08e623fade4c94edd586ed2de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/18ec42e19ec676d7da5ddff13f1eed68d88fb460",
-                "reference": "18ec42e19ec676d7da5ddff13f1eed68d88fb460",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a443bbbd93682aa08e623fade4c94edd586ed2de",
+                "reference": "a443bbbd93682aa08e623fade4c94edd586ed2de",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",
                 "psr/log": "~1.0",
-                "symfony/debug": "~2.8|~3.0",
-                "symfony/event-dispatcher": "~2.8|~3.0",
-                "symfony/http-foundation": "~2.8.13|~3.1.6|~3.2"
+                "symfony/debug": "~2.8|~3.0|~4.0",
+                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+                "symfony/http-foundation": "^3.4.4|^4.0.4"
             },
             "conflict": {
                 "symfony/config": "<2.8",
+                "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4",
+                "symfony/var-dumper": "<3.3",
                 "twig/twig": "<1.34|<2.4,>=2"
             },
+            "provide": {
+                "psr/log-implementation": "1.0"
+            },
             "require-dev": {
-                "symfony/browser-kit": "~2.8|~3.0",
+                "psr/cache": "~1.0",
+                "symfony/browser-kit": "~2.8|~3.0|~4.0",
                 "symfony/class-loader": "~2.8|~3.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/console": "~2.8|~3.0",
-                "symfony/css-selector": "~2.8|~3.0",
-                "symfony/dependency-injection": "~2.8|~3.0",
-                "symfony/dom-crawler": "~2.8|~3.0",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/finder": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0",
-                "symfony/routing": "~2.8|~3.0",
-                "symfony/stopwatch": "~2.8|~3.0",
-                "symfony/templating": "~2.8|~3.0",
-                "symfony/translation": "~2.8|~3.0",
-                "symfony/var-dumper": "~3.2"
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/console": "~2.8|~3.0|~4.0",
+                "symfony/css-selector": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "^3.4.5|^4.0.5",
+                "symfony/dom-crawler": "~2.8|~3.0|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/finder": "~2.8|~3.0|~4.0",
+                "symfony/process": "~2.8|~3.0|~4.0",
+                "symfony/routing": "~3.4|~4.0",
+                "symfony/stopwatch": "~2.8|~3.0|~4.0",
+                "symfony/templating": "~2.8|~3.0|~4.0",
+                "symfony/translation": "~2.8|~3.0|~4.0",
+                "symfony/var-dumper": "~3.3|~4.0"
             },
             "suggest": {
                 "symfony/browser-kit": "",
-                "symfony/class-loader": "",
                 "symfony/config": "",
                 "symfony/console": "",
                 "symfony/dependency-injection": "",
@@ -3742,7 +5048,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -3769,7 +5075,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-01T09:40:19+00:00"
+            "time": "2018-03-05T19:41:07+00:00"
         },
         {
             "name": "symfony/polyfill-iconv",
@@ -3889,27 +5195,86 @@
             ],
             "time": "2018-01-30T19:27:44+00:00"
         },
+        {
+            "name": "symfony/polyfill-php70",
+            "version": "v1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f",
+                "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": "~1.0|~2.0",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php70\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2018-01-30T19:27:44+00:00"
+        },
         {
             "name": "symfony/process",
-            "version": "v3.2.14",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "b39d805dd6c4d1cba1f00cd80361ec80eed0d7bc"
+                "reference": "cc4aea21f619116aaf1c58016a944e4821c8e8af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/b39d805dd6c4d1cba1f00cd80361ec80eed0d7bc",
-                "reference": "b39d805dd6c4d1cba1f00cd80361ec80eed0d7bc",
+                "url": "https://api.github.com/repos/symfony/process/zipball/cc4aea21f619116aaf1c58016a944e4821c8e8af",
+                "reference": "cc4aea21f619116aaf1c58016a944e4821c8e8af",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -3936,7 +5301,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-03T08:06:20+00:00"
+            "time": "2018-02-12T17:55:00+00:00"
         },
         {
             "name": "symfony/psr-http-message-bridge",
@@ -4000,32 +5365,35 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v3.2.14",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "b382d7c4f443372c118efcd0cd2bf1028434f2f5"
+                "reference": "8773a9d52715f1a579576ce0e60213de34f5ef3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/b382d7c4f443372c118efcd0cd2bf1028434f2f5",
-                "reference": "b382d7c4f443372c118efcd0cd2bf1028434f2f5",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/8773a9d52715f1a579576ce0e60213de34f5ef3e",
+                "reference": "8773a9d52715f1a579576ce0e60213de34f5ef3e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
             },
             "conflict": {
-                "symfony/config": "<2.8"
+                "symfony/config": "<2.8",
+                "symfony/dependency-injection": "<3.3",
+                "symfony/yaml": "<3.4"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/common": "~2.2",
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/http-foundation": "~2.8|~3.0",
-                "symfony/yaml": "~2.8|~3.0"
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "~3.3|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/http-foundation": "~2.8|~3.0|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation loader",
@@ -4038,7 +5406,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -4071,40 +5439,43 @@
                 "uri",
                 "url"
             ],
-            "time": "2017-06-23T06:35:45+00:00"
+            "time": "2018-02-28T21:49:22+00:00"
         },
         {
             "name": "symfony/serializer",
-            "version": "v3.2.14",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "dc98d5ab4ae29dc47bfb1507b39806bfe13d3477"
+                "reference": "11bea1aebe9c8d506f47c01931b0df9f18629a8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/dc98d5ab4ae29dc47bfb1507b39806bfe13d3477",
-                "reference": "dc98d5ab4ae29dc47bfb1507b39806bfe13d3477",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/11bea1aebe9c8d506f47c01931b0df9f18629a8f",
+                "reference": "11bea1aebe9c8d506f47c01931b0df9f18629a8f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
             },
             "conflict": {
+                "phpdocumentor/type-resolver": "<0.2.1",
+                "symfony/dependency-injection": "<3.2",
                 "symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
                 "symfony/property-info": "<3.1",
-                "symfony/yaml": "<3.1"
+                "symfony/yaml": "<3.4"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/cache": "~1.0",
-                "phpdocumentor/reflection-docblock": "~3.0",
-                "symfony/cache": "~3.1",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/http-foundation": "~2.8|~3.0",
-                "symfony/property-access": "~2.8|~3.0",
-                "symfony/property-info": "~3.1",
-                "symfony/yaml": "~3.1"
+                "phpdocumentor/reflection-docblock": "^3.0|^4.0",
+                "symfony/cache": "~3.1|~4.0",
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "~3.2|~4.0",
+                "symfony/http-foundation": "~2.8|~3.0|~4.0",
+                "symfony/property-access": "~2.8|~3.0|~4.0",
+                "symfony/property-info": "~3.1|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
@@ -4119,7 +5490,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -4146,34 +5517,38 @@
             ],
             "description": "Symfony Serializer Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-06T07:39:51+00:00"
+            "time": "2018-02-14T14:07:03+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.2.14",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "df36a48672b929bf3995eb62c58d83004b1d0d50"
+                "reference": "80e19eaf12cbb546ac40384e5c55c36306823e57"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/df36a48672b929bf3995eb62c58d83004b1d0d50",
-                "reference": "df36a48672b929bf3995eb62c58d83004b1d0d50",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/80e19eaf12cbb546ac40384e5c55c36306823e57",
+                "reference": "80e19eaf12cbb546ac40384e5c55c36306823e57",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/config": "<2.8"
+                "symfony/config": "<2.8",
+                "symfony/dependency-injection": "<3.4",
+                "symfony/yaml": "<3.4"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/intl": "^2.8.18|^3.2.5",
-                "symfony/yaml": "~2.8|~3.0"
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/finder": "~2.8|~3.0|~4.0",
+                "symfony/intl": "^2.8.18|^3.2.5|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "psr/log": "To use logging capability in translator",
@@ -4183,7 +5558,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -4210,40 +5585,47 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-24T16:45:17+00:00"
+            "time": "2018-02-22T06:28:18+00:00"
         },
         {
             "name": "symfony/validator",
-            "version": "v3.2.14",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "39244fbf580e01acc3f5df01238a8f69b1b3e46f"
+                "reference": "b0dcfa428168b381ac0340e5209a47780799e393"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/39244fbf580e01acc3f5df01238a8f69b1b3e46f",
-                "reference": "39244fbf580e01acc3f5df01238a8f69b1b3e46f",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/b0dcfa428168b381ac0340e5209a47780799e393",
+                "reference": "b0dcfa428168b381ac0340e5209a47780799e393",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/translation": "~2.8|~3.0"
+                "symfony/translation": "~2.8|~3.0|~4.0"
             },
             "conflict": {
-                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
+                "symfony/dependency-injection": "<3.3",
+                "symfony/http-kernel": "<3.3.5",
+                "symfony/yaml": "<3.4"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/cache": "~1.0",
                 "egulias/email-validator": "^1.2.8|~2.0",
-                "symfony/cache": "~3.1",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/http-foundation": "~2.8|~3.0",
-                "symfony/intl": "^2.8.18|^3.2.5",
-                "symfony/yaml": "~2.8|~3.0"
+                "symfony/cache": "~3.1|~4.0",
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "~3.3|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/http-foundation": "~2.8|~3.0|~4.0",
+                "symfony/http-kernel": "^3.3.5|~4.0",
+                "symfony/intl": "^2.8.18|^3.2.5|~4.0",
+                "symfony/property-access": "~2.8|~3.0|~4.0",
+                "symfony/var-dumper": "~3.3|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
@@ -4254,12 +5636,13 @@
                 "symfony/expression-language": "For using the Expression validator",
                 "symfony/http-foundation": "",
                 "symfony/intl": "",
+                "symfony/property-access": "For accessing properties within comparison constraints",
                 "symfony/yaml": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -4286,20 +5669,20 @@
             ],
             "description": "Symfony Validator Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-26T06:34:07+00:00"
+            "time": "2018-03-01T10:20:19+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.4.4",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "472a9849930cf21f73abdb02240f17cf5b5bd1a7"
+                "reference": "80964679d81da3d5618519e0e4be488c3d7ecd7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/472a9849930cf21f73abdb02240f17cf5b5bd1a7",
-                "reference": "472a9849930cf21f73abdb02240f17cf5b5bd1a7",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/80964679d81da3d5618519e0e4be488c3d7ecd7d",
+                "reference": "80964679d81da3d5618519e0e4be488c3d7ecd7d",
                 "shasum": ""
             },
             "require": {
@@ -4355,27 +5738,30 @@
                 "debug",
                 "dump"
             ],
-            "time": "2018-01-29T09:03:43+00:00"
+            "time": "2018-02-22T17:29:24+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.2.14",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "78a0c5d7d43713212aac73d7c6a56754a5c26cea"
+                "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/78a0c5d7d43713212aac73d7c6a56754a5c26cea",
-                "reference": "78a0c5d7d43713212aac73d7c6a56754a5c26cea",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/6af42631dcf89e9c616242c900d6c52bd53bd1bb",
+                "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
+            },
+            "conflict": {
+                "symfony/console": "<3.4"
             },
             "require-dev": {
-                "symfony/console": "~2.8|~3.0"
+                "symfony/console": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
@@ -4383,7 +5769,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -4410,20 +5796,20 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-02T09:43:35+00:00"
+            "time": "2018-02-16T09:50:28+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v1.35.0",
+            "version": "v1.35.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f"
+                "reference": "9c24f2cd39dc1906b76879e099970b7e53724601"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/daa657073e55b0a78cce8fdd22682fddecc6385f",
-                "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/9c24f2cd39dc1906b76879e099970b7e53724601",
+                "reference": "9c24f2cd39dc1906b76879e099970b7e53724601",
                 "shasum": ""
             },
             "require": {
@@ -4470,12 +5856,93 @@
                     "role": "Contributors"
                 }
             ],
-            "description": "Twig, the flexible, fast, and secure template language for PHP",
-            "homepage": "http://twig.sensiolabs.org",
-            "keywords": [
-                "templating"
-            ],
-            "time": "2017-09-27T18:06:46+00:00"
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "http://twig.sensiolabs.org",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2018-03-03T16:21:29+00:00"
+        },
+        {
+            "name": "twistor/flysystem-stream-wrapper",
+            "version": "v1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twistor/flysystem-stream-wrapper.git",
+                "reference": "00278abc16bc4bd759e1ec4f2eadb0432fe8d5ac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twistor/flysystem-stream-wrapper/zipball/00278abc16bc4bd759e1ec4f2eadb0432fe8d5ac",
+                "reference": "00278abc16bc4bd759e1ec4f2eadb0432fe8d5ac",
+                "shasum": ""
+            },
+            "require": {
+                "league/flysystem": "~1.0",
+                "twistor/stream-util": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Twistor\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Leppanen",
+                    "email": "chris.leppanen@gmail.com"
+                }
+            ],
+            "description": "Adapts Flysystem filesystems to PHP stream wrappers.",
+            "homepage": "http://github.com/twistor/flysystem-stream-wrapper",
+            "time": "2017-11-06T05:32:20+00:00"
+        },
+        {
+            "name": "twistor/stream-util",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twistor/stream-util.git",
+                "reference": "226e74e6234508a53639b960c4a2752aee61799a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twistor/stream-util/zipball/226e74e6234508a53639b960c4a2752aee61799a",
+                "reference": "226e74e6234508a53639b960c4a2752aee61799a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Twistor\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Leppanen",
+                    "email": "chris.leppanen@gmail.com"
+                }
+            ],
+            "description": "Helper utilities for dealing with streams.",
+            "homepage": "http://github.com/twistor/stream-util",
+            "time": "2015-06-12T11:33:28+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -4610,67 +6077,18 @@
             "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.",
             "time": "2015-12-17T08:42:14+00:00"
         },
-        {
-            "name": "wikimedia/composer-merge-plugin",
-            "version": "v1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/wikimedia/composer-merge-plugin.git",
-                "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/81c6ac72a24a67383419c7eb9aa2b3437f2ab100",
-                "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0",
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "composer/composer": "~1.0.0",
-                "jakub-onderka/php-parallel-lint": "~0.8",
-                "phpunit/phpunit": "~4.8|~5.0",
-                "squizlabs/php_codesniffer": "~2.1.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                },
-                "class": "Wikimedia\\Composer\\MergePlugin"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Wikimedia\\Composer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bryan Davis",
-                    "email": "bd808@wikimedia.org"
-                }
-            ],
-            "description": "Composer plugin to merge multiple composer.json files",
-            "time": "2017-04-25T02:31:25+00:00"
-        },
         {
             "name": "zendframework/zend-diactoros",
-            "version": "1.7.0",
+            "version": "1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-diactoros.git",
-                "reference": "ed6ce7e2105c400ca10277643a8327957c0384b7"
+                "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/ed6ce7e2105c400ca10277643a8327957c0384b7",
-                "reference": "ed6ce7e2105c400ca10277643a8327957c0384b7",
+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/bf26aff803a11c5cc8eb7c4878a702c403ec67f1",
+                "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1",
                 "shasum": ""
             },
             "require": {
@@ -4709,7 +6127,7 @@
                 "psr",
                 "psr-7"
             ],
-            "time": "2018-01-04T18:21:48+00:00"
+            "time": "2018-02-26T15:44:50+00:00"
         },
         {
             "name": "zendframework/zend-escaper",
@@ -4865,24 +6283,24 @@
     "packages-dev": [
         {
             "name": "behat/mink",
-            "version": "dev-master",
+            "version": "v1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/Mink.git",
-                "reference": "04ab7af68536ac2c80fd6c08a6fd3620d3409891"
+                "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/04ab7af68536ac2c80fd6c08a6fd3620d3409891",
-                "reference": "04ab7af68536ac2c80fd6c08a6fd3620d3409891",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/e6930b9c74693dff7f4e58577e1b1743399f3ff9",
+                "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.1",
-                "symfony/css-selector": "^2.7|^3.0|^4.0"
+                "symfony/css-selector": "~2.1|~3.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^3.3|^4.0"
+                "symfony/phpunit-bridge": "~2.7|~3.0"
             },
             "suggest": {
                 "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
@@ -4919,7 +6337,7 @@
                 "testing",
                 "web"
             ],
-            "time": "2018-01-07T17:25:05+00:00"
+            "time": "2016-03-05T08:26:18+00:00"
         },
         {
             "name": "behat/mink-browserkit-driver",
@@ -5034,32 +6452,32 @@
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.0.5",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
+                "php": "^7.1"
             },
             "require-dev": {
                 "athletic/athletic": "~0.1.8",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "phpunit/phpunit": "^6.2.3",
+                "squizlabs/php_codesniffer": "^3.0.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -5084,38 +6502,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
-        },
-        {
-            "name": "drupal/coder",
-            "version": "8.2.12",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupal.org/project/coder.git",
-                "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f"
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "php": ">=5.4.0",
-                "squizlabs/php_codesniffer": ">=2.8.1 <3.0",
-                "symfony/yaml": ">=2.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": ">=3.7 <6"
-            },
-            "type": "phpcodesniffer-standard",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0+"
-            ],
-            "description": "Coder is a library to review Drupal code.",
-            "homepage": "https://www.drupal.org/project/coder",
-            "keywords": [
-                "code review",
-                "phpcs",
-                "standards"
-            ],
-            "time": "2017-03-18T10:28:49+00:00"
+            "time": "2017-07-22T11:58:36+00:00"
         },
         {
             "name": "fabpot/goutte",
@@ -5174,16 +6561,16 @@
         },
         {
             "name": "jcalderonzumba/gastonjs",
-            "version": "v1.2.0",
+            "version": "v1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jcalderonzumba/gastonjs.git",
-                "reference": "575a9c18d8b87990c37252e8d9707b29f0a313f3"
+                "reference": "4ff4a788d4995ae0d4b45fdcb1b76650e2eec72a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/575a9c18d8b87990c37252e8d9707b29f0a313f3",
-                "reference": "575a9c18d8b87990c37252e8d9707b29f0a313f3",
+                "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/4ff4a788d4995ae0d4b45fdcb1b76650e2eec72a",
+                "reference": "4ff4a788d4995ae0d4b45fdcb1b76650e2eec72a",
                 "shasum": ""
             },
             "require": {
@@ -5227,7 +6614,7 @@
                 "headless",
                 "phantomjs"
             ],
-            "time": "2017-03-31T07:31:47+00:00"
+            "time": "2016-05-04T16:27:07+00:00"
         },
         {
             "name": "jcalderonzumba/mink-phantomjs-driver",
@@ -5389,29 +6776,35 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "3.3.2",
+            "version": "4.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2"
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2",
-                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
+                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
+                "php": "^7.0",
                 "phpdocumentor/reflection-common": "^1.0.0",
                 "phpdocumentor/type-resolver": "^0.4.0",
                 "webmozart/assert": "^1.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^4.4"
+                "doctrine/instantiator": "~1.0.5",
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^6.4"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "phpDocumentor\\Reflection\\": [
@@ -5430,7 +6823,7 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-10T14:09:06+00:00"
+            "time": "2017-11-30T07:14:17+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -5481,16 +6874,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.7.3",
+            "version": "1.7.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf"
+                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
-                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
+                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
                 "shasum": ""
             },
             "require": {
@@ -5502,7 +6895,7 @@
             },
             "require-dev": {
                 "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
             },
             "type": "library",
             "extra": {
@@ -5540,7 +6933,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2017-11-24T13:59:53+00:00"
+            "time": "2018-02-19T10:16:54+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -6255,87 +7648,9 @@
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             "time": "2016-10-03T07:41:43+00:00"
         },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "2.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62",
-                "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62",
-                "shasum": ""
-            },
-            "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "bin": [
-                "scripts/phpcs",
-                "scripts/phpcbf"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "CodeSniffer.php",
-                    "CodeSniffer/CLI.php",
-                    "CodeSniffer/Exception.php",
-                    "CodeSniffer/File.php",
-                    "CodeSniffer/Fixer.php",
-                    "CodeSniffer/Report.php",
-                    "CodeSniffer/Reporting.php",
-                    "CodeSniffer/Sniff.php",
-                    "CodeSniffer/Tokens.php",
-                    "CodeSniffer/Reports/",
-                    "CodeSniffer/Tokenizers/",
-                    "CodeSniffer/DocGenerators/",
-                    "CodeSniffer/Standards/AbstractPatternSniff.php",
-                    "CodeSniffer/Standards/AbstractScopeSniff.php",
-                    "CodeSniffer/Standards/AbstractVariableSniff.php",
-                    "CodeSniffer/Standards/IncorrectPatternException.php",
-                    "CodeSniffer/Standards/Generic/Sniffs/",
-                    "CodeSniffer/Standards/MySource/Sniffs/",
-                    "CodeSniffer/Standards/PEAR/Sniffs/",
-                    "CodeSniffer/Standards/PSR1/Sniffs/",
-                    "CodeSniffer/Standards/PSR2/Sniffs/",
-                    "CodeSniffer/Standards/Squiz/Sniffs/",
-                    "CodeSniffer/Standards/Zend/Sniffs/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "http://www.squizlabs.com/php-codesniffer",
-            "keywords": [
-                "phpcs",
-                "standards"
-            ],
-            "time": "2017-05-22T02:43:20+00:00"
-        },
         {
             "name": "symfony/browser-kit",
-            "version": "v3.4.4",
+            "version": "v3.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
@@ -6389,190 +7704,19 @@
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
             "time": "2018-01-03T07:37:34+00:00"
-        },
-        {
-            "name": "symfony/css-selector",
-            "version": "v3.2.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/css-selector.git",
-                "reference": "02983c144038e697c959e6b06ef6666de759ccbc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/02983c144038e697c959e6b06ef6666de759ccbc",
-                "reference": "02983c144038e697c959e6b06ef6666de759ccbc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\CssSelector\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony CssSelector Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-05-01T14:55:58+00:00"
-        },
-        {
-            "name": "symfony/dom-crawler",
-            "version": "v3.4.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "09bd97b844b3151fab82f2fdd62db9c464b3910a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/09bd97b844b3151fab82f2fdd62db9c464b3910a",
-                "reference": "09bd97b844b3151fab82f2fdd62db9c464b3910a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0|~4.0"
-            },
-            "suggest": {
-                "symfony/css-selector": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\DomCrawler\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony DomCrawler Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-01-03T07:37:34+00:00"
-        },
-        {
-            "name": "symfony/phpunit-bridge",
-            "version": "v3.2.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "9e5c470da4b1e3e9cd8e29fecbd7c91eb961d15f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/9e5c470da4b1e3e9cd8e29fecbd7c91eb961d15f",
-                "reference": "9e5c470da4b1e3e9cd8e29fecbd7c91eb961d15f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "conflict": {
-                "phpunit/phpunit": ">=6.0"
-            },
-            "suggest": {
-                "ext-zip": "Zip support is required when using bin/simple-phpunit",
-                "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
-            },
-            "bin": [
-                "bin/simple-phpunit"
-            ],
-            "type": "symfony-bridge",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Bridge\\PhpUnit\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony PHPUnit Bridge",
-            "homepage": "https://symfony.com",
-            "time": "2017-06-02T09:43:35+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
+        "drupal/flysystem_s3": 15,
         "drupal/inline_entity_form": 10,
-        "drupal/time_formatter": 20,
-        "behat/mink": 20
+        "drupal/time_formatter": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.5.9"
+        "php": "^7.1.0"
     },
     "platform-dev": []
 }

From 680112e51de439ddaaa37cf8691b87324f853012 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 14 Mar 2018 16:14:08 -0400
Subject: [PATCH 013/143] Add settings files.

These are largely auto-generated, but we don't want to recreate them every
time an instance restarts, so we'll commit them to the repository.

The exception is the settings.cf.php file, which configures the database
connection, flysystem, and the hash salt based on values injected by cloud.gov
services. The values can be missing (e.g. if running locally), and a local
settings file can be used instead.
---
 web/sites/default/default.services.yml | 174 ++++++
 web/sites/default/default.settings.php | 787 ++++++++++++++++++++++++
 web/sites/default/settings.cf.php      |  51 ++
 web/sites/default/settings.php         | 790 +++++++++++++++++++++++++
 4 files changed, 1802 insertions(+)
 create mode 100644 web/sites/default/default.services.yml
 create mode 100644 web/sites/default/default.settings.php
 create mode 100644 web/sites/default/settings.cf.php
 create mode 100644 web/sites/default/settings.php

diff --git a/web/sites/default/default.services.yml b/web/sites/default/default.services.yml
new file mode 100644
index 0000000..e1bbbc7
--- /dev/null
+++ b/web/sites/default/default.services.yml
@@ -0,0 +1,174 @@
+parameters:
+  session.storage.options:
+    # Default ini options for sessions.
+    #
+    # Some distributions of Linux (most notably Debian) ship their PHP
+    # installations with garbage collection (gc) disabled. Since Drupal depends
+    # on PHP's garbage collection for clearing sessions, ensure that garbage
+    # collection occurs by using the most common settings.
+    # @default 1
+    gc_probability: 1
+    # @default 100
+    gc_divisor: 100
+    #
+    # Set session lifetime (in seconds), i.e. the time from the user's last
+    # visit to the active session may be deleted by the session garbage
+    # collector. When a session is deleted, authenticated users are logged out,
+    # and the contents of the user's $_SESSION variable is discarded.
+    # @default 200000
+    gc_maxlifetime: 200000
+    #
+    # Set session cookie lifetime (in seconds), i.e. the time from the session
+    # is created to the cookie expires, i.e. when the browser is expected to
+    # discard the cookie. The value 0 means "until the browser is closed".
+    # @default 2000000
+    cookie_lifetime: 2000000
+    #
+    # Drupal automatically generates a unique session cookie name based on the
+    # full domain name used to access the site. This mechanism is sufficient
+    # for most use-cases, including multi-site deployments. However, if it is
+    # desired that a session can be reused across different subdomains, the
+    # cookie domain needs to be set to the shared base domain. Doing so assures
+    # that users remain logged in as they cross between various subdomains.
+    # To maximize compatibility and normalize the behavior across user agents,
+    # the cookie domain should start with a dot.
+    #
+    # @default none
+    # cookie_domain: '.example.com'
+    #
+  twig.config:
+    # Twig debugging:
+    #
+    # When debugging is enabled:
+    # - The markup of each Twig template is surrounded by HTML comments that
+    #   contain theming information, such as template file name suggestions.
+    # - Note that this debugging markup will cause automated tests that directly
+    #   check rendered HTML to fail. When running automated tests, 'debug'
+    #   should be set to FALSE.
+    # - The dump() function can be used in Twig templates to output information
+    #   about template variables.
+    # - Twig templates are automatically recompiled whenever the source code
+    #   changes (see auto_reload below).
+    #
+    # For more information about debugging Twig templates, see
+    # https://www.drupal.org/node/1906392.
+    #
+    # Not recommended in production environments
+    # @default false
+    debug: false
+    # Twig auto-reload:
+    #
+    # Automatically recompile Twig templates whenever the source code changes.
+    # If you don't provide a value for auto_reload, it will be determined
+    # based on the value of debug.
+    #
+    # Not recommended in production environments
+    # @default null
+    auto_reload: null
+    # Twig cache:
+    #
+    # By default, Twig templates will be compiled and stored in the filesystem
+    # to increase performance. Disabling the Twig cache will recompile the
+    # templates from source each time they are used. In most cases the
+    # auto_reload setting above should be enabled rather than disabling the
+    # Twig cache.
+    #
+    # Not recommended in production environments
+    # @default true
+    cache: true
+  renderer.config:
+    # Renderer required cache contexts:
+    #
+    # The Renderer will automatically associate these cache contexts with every
+    # render array, hence varying every render array by these cache contexts.
+    #
+    # @default ['languages:language_interface', 'theme', 'user.permissions']
+    required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions']
+    # Renderer automatic placeholdering conditions:
+    #
+    # Drupal allows portions of the page to be automatically deferred when
+    # rendering to improve cache performance. That is especially helpful for
+    # cache contexts that vary widely, such as the active user. On some sites
+    # those may be different, however, such as sites with only a handful of
+    # users. If you know what the high-cardinality cache contexts are for your
+    # site, specify those here. If you're not sure, the defaults are fairly safe
+    # in general.
+    #
+    # For more information about rendering optimizations see
+    # https://www.drupal.org/developing/api/8/render/arrays/cacheability#optimizing
+    auto_placeholder_conditions:
+      # Max-age at or below which caching is not considered worthwhile.
+      #
+      # Disable by setting to -1.
+      #
+      # @default 0
+      max-age: 0
+      # Cache contexts with a high cardinality.
+      #
+      # Disable by setting to [].
+      #
+      # @default ['session', 'user']
+      contexts: ['session', 'user']
+      # Tags with a high invalidation frequency.
+      #
+      # Disable by setting to [].
+      #
+      # @default []
+      tags: []
+  # Cacheability debugging:
+  #
+  # Responses with cacheability metadata (CacheableResponseInterface instances)
+  # get X-Drupal-Cache-Tags and X-Drupal-Cache-Contexts headers.
+  #
+  # For more information about debugging cacheable responses, see
+  # https://www.drupal.org/developing/api/8/response/cacheable-response-interface
+  #
+  # Not recommended in production environments
+  # @default false
+  http.response.debug_cacheability_headers: false
+  factory.keyvalue:
+    {}
+    # Default key/value storage service to use.
+    # @default keyvalue.database
+    # default: keyvalue.database
+    # Collection-specific overrides.
+    # state: keyvalue.database
+  factory.keyvalue.expirable:
+    {}
+    # Default key/value expirable storage service to use.
+    # @default keyvalue.database.expirable
+    # default: keyvalue.database.expirable
+  # Allowed protocols for URL generation.
+  filter_protocols:
+    - http
+    - https
+    - ftp
+    - news
+    - nntp
+    - tel
+    - telnet
+    - mailto
+    - irc
+    - ssh
+    - sftp
+    - webcal
+    - rtsp
+
+   # Configure Cross-Site HTTP requests (CORS).
+   # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
+   # for more information about the topic in general.
+   # Note: By default the configuration is disabled.
+  cors.config:
+    enabled: false
+    # Specify allowed headers, like 'x-allowed-header'.
+    allowedHeaders: []
+    # Specify allowed request methods, specify ['*'] to allow all possible ones.
+    allowedMethods: []
+    # Configure requests allowed from specific origins.
+    allowedOrigins: ['*']
+    # Sets the Access-Control-Expose-Headers header.
+    exposedHeaders: false
+    # Sets the Access-Control-Max-Age header.
+    maxAge: false
+    # Sets the Access-Control-Allow-Credentials header.
+    supportsCredentials: false
diff --git a/web/sites/default/default.settings.php b/web/sites/default/default.settings.php
new file mode 100644
index 0000000..0e7caa3
--- /dev/null
+++ b/web/sites/default/default.settings.php
@@ -0,0 +1,787 @@
+<?php
+
+// @codingStandardsIgnoreFile
+
+/**
+ * @file
+ * Drupal site-specific configuration file.
+ *
+ * IMPORTANT NOTE:
+ * This file may have been set to read-only by the Drupal installation program.
+ * If you make changes to this file, be sure to protect it again after making
+ * your modifications. Failure to remove write permissions to this file is a
+ * security risk.
+ *
+ * In order to use the selection rules below the multisite aliasing file named
+ * sites/sites.php must be present. Its optional settings will be loaded, and
+ * the aliases in the array $sites will override the default directory rules
+ * below. See sites/example.sites.php for more information about aliases.
+ *
+ * The configuration directory will be discovered by stripping the website's
+ * hostname from left to right and pathname from right to left. The first
+ * configuration file found will be used and any others will be ignored. If no
+ * other configuration file is found then the default configuration file at
+ * 'sites/default' will be used.
+ *
+ * For example, for a fictitious site installed at
+ * https://www.drupal.org:8080/mysite/test/, the 'settings.php' file is searched
+ * for in the following directories:
+ *
+ * - sites/8080.www.drupal.org.mysite.test
+ * - sites/www.drupal.org.mysite.test
+ * - sites/drupal.org.mysite.test
+ * - sites/org.mysite.test
+ *
+ * - sites/8080.www.drupal.org.mysite
+ * - sites/www.drupal.org.mysite
+ * - sites/drupal.org.mysite
+ * - sites/org.mysite
+ *
+ * - sites/8080.www.drupal.org
+ * - sites/www.drupal.org
+ * - sites/drupal.org
+ * - sites/org
+ *
+ * - sites/default
+ *
+ * Note that if you are installing on a non-standard port number, prefix the
+ * hostname with that number. For example,
+ * https://www.drupal.org:8080/mysite/test/ could be loaded from
+ * sites/8080.www.drupal.org.mysite.test/.
+ *
+ * @see example.sites.php
+ * @see \Drupal\Core\DrupalKernel::getSitePath()
+ *
+ * In addition to customizing application settings through variables in
+ * settings.php, you can create a services.yml file in the same directory to
+ * register custom, site-specific service definitions and/or swap out default
+ * implementations with custom ones.
+ */
+
+/**
+ * Database settings:
+ *
+ * The $databases array specifies the database connection or
+ * connections that Drupal may use.  Drupal is able to connect
+ * to multiple databases, including multiple types of databases,
+ * during the same request.
+ *
+ * One example of the simplest connection array is shown below. To use the
+ * sample settings, copy and uncomment the code below between the @code and
+ * @endcode lines and paste it after the $databases declaration. You will need
+ * to replace the database username and password and possibly the host and port
+ * with the appropriate credentials for your database system.
+ *
+ * The next section describes how to customize the $databases array for more
+ * specific needs.
+ *
+ * @code
+ * $databases['default']['default'] = array (
+ *   'database' => 'databasename',
+ *   'username' => 'sqlusername',
+ *   'password' => 'sqlpassword',
+ *   'host' => 'localhost',
+ *   'port' => '3306',
+ *   'driver' => 'mysql',
+ *   'prefix' => '',
+ *   'collation' => 'utf8mb4_general_ci',
+ * );
+ * @endcode
+ */
+$databases = array();
+
+/**
+ * Customizing database settings.
+ *
+ * Many of the values of the $databases array can be customized for your
+ * particular database system. Refer to the sample in the section above as a
+ * starting point.
+ *
+ * The "driver" property indicates what Drupal database driver the
+ * connection should use.  This is usually the same as the name of the
+ * database type, such as mysql or sqlite, but not always.  The other
+ * properties will vary depending on the driver.  For SQLite, you must
+ * specify a database file name in a directory that is writable by the
+ * webserver.  For most other drivers, you must specify a
+ * username, password, host, and database name.
+ *
+ * Transaction support is enabled by default for all drivers that support it,
+ * including MySQL. To explicitly disable it, set the 'transactions' key to
+ * FALSE.
+ * Note that some configurations of MySQL, such as the MyISAM engine, don't
+ * support it and will proceed silently even if enabled. If you experience
+ * transaction related crashes with such configuration, set the 'transactions'
+ * key to FALSE.
+ *
+ * For each database, you may optionally specify multiple "target" databases.
+ * A target database allows Drupal to try to send certain queries to a
+ * different database if it can but fall back to the default connection if not.
+ * That is useful for primary/replica replication, as Drupal may try to connect
+ * to a replica server when appropriate and if one is not available will simply
+ * fall back to the single primary server (The terms primary/replica are
+ * traditionally referred to as master/slave in database server documentation).
+ *
+ * The general format for the $databases array is as follows:
+ * @code
+ * $databases['default']['default'] = $info_array;
+ * $databases['default']['replica'][] = $info_array;
+ * $databases['default']['replica'][] = $info_array;
+ * $databases['extra']['default'] = $info_array;
+ * @endcode
+ *
+ * In the above example, $info_array is an array of settings described above.
+ * The first line sets a "default" database that has one primary database
+ * (the second level default).  The second and third lines create an array
+ * of potential replica databases.  Drupal will select one at random for a given
+ * request as needed.  The fourth line creates a new database with a name of
+ * "extra".
+ *
+ * You can optionally set prefixes for some or all database table names
+ * by using the 'prefix' setting. If a prefix is specified, the table
+ * name will be prepended with its value. Be sure to use valid database
+ * characters only, usually alphanumeric and underscore. If no prefixes
+ * are desired, leave it as an empty string ''.
+ *
+ * To have all database names prefixed, set 'prefix' as a string:
+ * @code
+ *   'prefix' => 'main_',
+ * @endcode
+ *
+ * Per-table prefixes are deprecated as of Drupal 8.2, and will be removed in
+ * Drupal 9.0. After that, only a single prefix for all tables will be
+ * supported.
+ *
+ * To provide prefixes for specific tables, set 'prefix' as an array.
+ * The array's keys are the table names and the values are the prefixes.
+ * The 'default' element is mandatory and holds the prefix for any tables
+ * not specified elsewhere in the array. Example:
+ * @code
+ *   'prefix' => array(
+ *     'default'   => 'main_',
+ *     'users'     => 'shared_',
+ *     'sessions'  => 'shared_',
+ *     'role'      => 'shared_',
+ *     'authmap'   => 'shared_',
+ *   ),
+ * @endcode
+ * You can also use a reference to a schema/database as a prefix. This may be
+ * useful if your Drupal installation exists in a schema that is not the default
+ * or you want to access several databases from the same code base at the same
+ * time.
+ * Example:
+ * @code
+ *   'prefix' => array(
+ *     'default'   => 'main.',
+ *     'users'     => 'shared.',
+ *     'sessions'  => 'shared.',
+ *     'role'      => 'shared.',
+ *     'authmap'   => 'shared.',
+ *   );
+ * @endcode
+ * NOTE: MySQL and SQLite's definition of a schema is a database.
+ *
+ * Advanced users can add or override initial commands to execute when
+ * connecting to the database server, as well as PDO connection settings. For
+ * example, to enable MySQL SELECT queries to exceed the max_join_size system
+ * variable, and to reduce the database connection timeout to 5 seconds:
+ * @code
+ * $databases['default']['default'] = array(
+ *   'init_commands' => array(
+ *     'big_selects' => 'SET SQL_BIG_SELECTS=1',
+ *   ),
+ *   'pdo' => array(
+ *     PDO::ATTR_TIMEOUT => 5,
+ *   ),
+ * );
+ * @endcode
+ *
+ * WARNING: The above defaults are designed for database portability. Changing
+ * them may cause unexpected behavior, including potential data loss. See
+ * https://www.drupal.org/developing/api/database/configuration for more
+ * information on these defaults and the potential issues.
+ *
+ * More details can be found in the constructor methods for each driver:
+ * - \Drupal\Core\Database\Driver\mysql\Connection::__construct()
+ * - \Drupal\Core\Database\Driver\pgsql\Connection::__construct()
+ * - \Drupal\Core\Database\Driver\sqlite\Connection::__construct()
+ *
+ * Sample Database configuration format for PostgreSQL (pgsql):
+ * @code
+ *   $databases['default']['default'] = array(
+ *     'driver' => 'pgsql',
+ *     'database' => 'databasename',
+ *     'username' => 'sqlusername',
+ *     'password' => 'sqlpassword',
+ *     'host' => 'localhost',
+ *     'prefix' => '',
+ *   );
+ * @endcode
+ *
+ * Sample Database configuration format for SQLite (sqlite):
+ * @code
+ *   $databases['default']['default'] = array(
+ *     'driver' => 'sqlite',
+ *     'database' => '/path/to/databasefilename',
+ *   );
+ * @endcode
+ */
+
+/**
+ * Location of the site configuration files.
+ *
+ * The $config_directories array specifies the location of file system
+ * directories used for configuration data. On install, the "sync" directory is
+ * created. This is used for configuration imports. The "active" directory is
+ * not created by default since the default storage for active configuration is
+ * the database rather than the file system. (This can be changed. See "Active
+ * configuration settings" below).
+ *
+ * The default location for the "sync" directory is inside a randomly-named
+ * directory in the public files path. The setting below allows you to override
+ * the "sync" location.
+ *
+ * If you use files for the "active" configuration, you can tell the
+ * Configuration system where this directory is located by adding an entry with
+ * array key CONFIG_ACTIVE_DIRECTORY.
+ *
+ * Example:
+ * @code
+ *   $config_directories = array(
+ *     CONFIG_SYNC_DIRECTORY => '/directory/outside/webroot',
+ *   );
+ * @endcode
+ */
+$config_directories = array();
+
+/**
+ * Settings:
+ *
+ * $settings contains environment-specific configuration, such as the files
+ * directory and reverse proxy address, and temporary configuration, such as
+ * security overrides.
+ *
+ * @see \Drupal\Core\Site\Settings::get()
+ */
+
+/**
+ * The active installation profile.
+ *
+ * Changing this after installation is not recommended as it changes which
+ * directories are scanned during extension discovery. If this is set prior to
+ * installation this value will be rewritten according to the profile selected
+ * by the user.
+ *
+ * @see install_select_profile()
+ *
+ * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. The
+ *   install profile is written to the core.extension configuration. If a
+ *   service requires the install profile use the 'install_profile' container
+ *   parameter. Functional code can use \Drupal::installProfile().
+ */
+# $settings['install_profile'] = '';
+
+/**
+ * Salt for one-time login links, cancel links, form tokens, etc.
+ *
+ * This variable will be set to a random value by the installer. All one-time
+ * login links will be invalidated if the value is changed. Note that if your
+ * site is deployed on a cluster of web servers, you must ensure that this
+ * variable has the same value on each server.
+ *
+ * For enhanced security, you may set this variable to the contents of a file
+ * outside your document root; you should also ensure that this file is not
+ * stored with backups of your database.
+ *
+ * Example:
+ * @code
+ *   $settings['hash_salt'] = file_get_contents('/home/example/salt.txt');
+ * @endcode
+ */
+$settings['hash_salt'] = '';
+
+/**
+ * Deployment identifier.
+ *
+ * Drupal's dependency injection container will be automatically invalidated and
+ * rebuilt when the Drupal core version changes. When updating contributed or
+ * custom code that changes the container, changing this identifier will also
+ * allow the container to be invalidated as soon as code is deployed.
+ */
+# $settings['deployment_identifier'] = \Drupal::VERSION;
+
+/**
+ * Access control for update.php script.
+ *
+ * If you are updating your Drupal installation using the update.php script but
+ * are not logged in using either an account with the "Administer software
+ * updates" permission or the site maintenance account (the account that was
+ * created during installation), you will need to modify the access check
+ * statement below. Change the FALSE to a TRUE to disable the access check.
+ * After finishing the upgrade, be sure to open this file again and change the
+ * TRUE back to a FALSE!
+ */
+$settings['update_free_access'] = FALSE;
+
+/**
+ * External access proxy settings:
+ *
+ * If your site must access the Internet via a web proxy then you can enter the
+ * proxy settings here. Set the full URL of the proxy, including the port, in
+ * variables:
+ * - $settings['http_client_config']['proxy']['http']: The proxy URL for HTTP
+ *   requests.
+ * - $settings['http_client_config']['proxy']['https']: The proxy URL for HTTPS
+ *   requests.
+ * You can pass in the user name and password for basic authentication in the
+ * URLs in these settings.
+ *
+ * You can also define an array of host names that can be accessed directly,
+ * bypassing the proxy, in $settings['http_client_config']['proxy']['no'].
+ */
+# $settings['http_client_config']['proxy']['http'] = 'http://proxy_user:proxy_pass@example.com:8080';
+# $settings['http_client_config']['proxy']['https'] = 'http://proxy_user:proxy_pass@example.com:8080';
+# $settings['http_client_config']['proxy']['no'] = ['127.0.0.1', 'localhost'];
+
+/**
+ * Reverse Proxy Configuration:
+ *
+ * Reverse proxy servers are often used to enhance the performance
+ * of heavily visited sites and may also provide other site caching,
+ * security, or encryption benefits. In an environment where Drupal
+ * is behind a reverse proxy, the real IP address of the client should
+ * be determined such that the correct client IP address is available
+ * to Drupal's logging, statistics, and access management systems. In
+ * the most simple scenario, the proxy server will add an
+ * X-Forwarded-For header to the request that contains the client IP
+ * address. However, HTTP headers are vulnerable to spoofing, where a
+ * malicious client could bypass restrictions by setting the
+ * X-Forwarded-For header directly. Therefore, Drupal's proxy
+ * configuration requires the IP addresses of all remote proxies to be
+ * specified in $settings['reverse_proxy_addresses'] to work correctly.
+ *
+ * Enable this setting to get Drupal to determine the client IP from
+ * the X-Forwarded-For header (or $settings['reverse_proxy_header'] if set).
+ * If you are unsure about this setting, do not have a reverse proxy,
+ * or Drupal operates in a shared hosting environment, this setting
+ * should remain commented out.
+ *
+ * In order for this setting to be used you must specify every possible
+ * reverse proxy IP address in $settings['reverse_proxy_addresses'].
+ * If a complete list of reverse proxies is not available in your
+ * environment (for example, if you use a CDN) you may set the
+ * $_SERVER['REMOTE_ADDR'] variable directly in settings.php.
+ * Be aware, however, that it is likely that this would allow IP
+ * address spoofing unless more advanced precautions are taken.
+ */
+# $settings['reverse_proxy'] = TRUE;
+
+/**
+ * Specify every reverse proxy IP address in your environment.
+ * This setting is required if $settings['reverse_proxy'] is TRUE.
+ */
+# $settings['reverse_proxy_addresses'] = array('a.b.c.d', ...);
+
+/**
+ * Set this value if your proxy server sends the client IP in a header
+ * other than X-Forwarded-For.
+ */
+# $settings['reverse_proxy_header'] = 'X_CLUSTER_CLIENT_IP';
+
+/**
+ * Set this value if your proxy server sends the client protocol in a header
+ * other than X-Forwarded-Proto.
+ */
+# $settings['reverse_proxy_proto_header'] = 'X_FORWARDED_PROTO';
+
+/**
+ * Set this value if your proxy server sends the client protocol in a header
+ * other than X-Forwarded-Host.
+ */
+# $settings['reverse_proxy_host_header'] = 'X_FORWARDED_HOST';
+
+/**
+ * Set this value if your proxy server sends the client protocol in a header
+ * other than X-Forwarded-Port.
+ */
+# $settings['reverse_proxy_port_header'] = 'X_FORWARDED_PORT';
+
+/**
+ * Set this value if your proxy server sends the client protocol in a header
+ * other than Forwarded.
+ */
+# $settings['reverse_proxy_forwarded_header'] = 'FORWARDED';
+
+/**
+ * Page caching:
+ *
+ * By default, Drupal sends a "Vary: Cookie" HTTP header for anonymous page
+ * views. This tells a HTTP proxy that it may return a page from its local
+ * cache without contacting the web server, if the user sends the same Cookie
+ * header as the user who originally requested the cached page. Without "Vary:
+ * Cookie", authenticated users would also be served the anonymous page from
+ * the cache. If the site has mostly anonymous users except a few known
+ * editors/administrators, the Vary header can be omitted. This allows for
+ * better caching in HTTP proxies (including reverse proxies), i.e. even if
+ * clients send different cookies, they still get content served from the cache.
+ * However, authenticated users should access the site directly (i.e. not use an
+ * HTTP proxy, and bypass the reverse proxy if one is used) in order to avoid
+ * getting cached pages from the proxy.
+ */
+# $settings['omit_vary_cookie'] = TRUE;
+
+
+/**
+ * Cache TTL for client error (4xx) responses.
+ *
+ * Items cached per-URL tend to result in a large number of cache items, and
+ * this can be problematic on 404 pages which by their nature are unbounded. A
+ * fixed TTL can be set for these items, defaulting to one hour, so that cache
+ * backends which do not support LRU can purge older entries. To disable caching
+ * of client error responses set the value to 0. Currently applies only to
+ * page_cache module.
+ */
+# $settings['cache_ttl_4xx'] = 3600;
+
+/**
+ * Expiration of cached forms.
+ *
+ * Drupal's Form API stores details of forms in a cache and these entries are
+ * kept for at least 6 hours by default. Expired entries are cleared by cron.
+ *
+ * @see \Drupal\Core\Form\FormCache::setCache()
+ */
+# $settings['form_cache_expiration'] = 21600;
+
+/**
+ * Class Loader.
+ *
+ * If the APC extension is detected, the Symfony APC class loader is used for
+ * performance reasons. Detection can be prevented by setting
+ * class_loader_auto_detect to false, as in the example below.
+ */
+# $settings['class_loader_auto_detect'] = FALSE;
+
+/*
+ * If the APC extension is not detected, either because APC is missing or
+ * because auto-detection has been disabled, auto-loading falls back to
+ * Composer's ClassLoader, which is good for development as it does not break
+ * when code is moved in the file system. You can also decorate the base class
+ * loader with another cached solution than the Symfony APC class loader, as
+ * all production sites should have a cached class loader of some sort enabled.
+ *
+ * To do so, you may decorate and replace the local $class_loader variable. For
+ * example, to use Symfony's APC class loader without automatic detection,
+ * uncomment the code below.
+ */
+/*
+if ($settings['hash_salt']) {
+  $prefix = 'drupal.' . hash('sha256', 'drupal.' . $settings['hash_salt']);
+  $apc_loader = new \Symfony\Component\ClassLoader\ApcClassLoader($prefix, $class_loader);
+  unset($prefix);
+  $class_loader->unregister();
+  $apc_loader->register();
+  $class_loader = $apc_loader;
+}
+*/
+
+/**
+ * Authorized file system operations:
+ *
+ * The Update Manager module included with Drupal provides a mechanism for
+ * site administrators to securely install missing updates for the site
+ * directly through the web user interface. On securely-configured servers,
+ * the Update manager will require the administrator to provide SSH or FTP
+ * credentials before allowing the installation to proceed; this allows the
+ * site to update the new files as the user who owns all the Drupal files,
+ * instead of as the user the webserver is running as. On servers where the
+ * webserver user is itself the owner of the Drupal files, the administrator
+ * will not be prompted for SSH or FTP credentials (note that these server
+ * setups are common on shared hosting, but are inherently insecure).
+ *
+ * Some sites might wish to disable the above functionality, and only update
+ * the code directly via SSH or FTP themselves. This setting completely
+ * disables all functionality related to these authorized file operations.
+ *
+ * @see https://www.drupal.org/node/244924
+ *
+ * Remove the leading hash signs to disable.
+ */
+# $settings['allow_authorize_operations'] = FALSE;
+
+/**
+ * Default mode for directories and files written by Drupal.
+ *
+ * Value should be in PHP Octal Notation, with leading zero.
+ */
+# $settings['file_chmod_directory'] = 0775;
+# $settings['file_chmod_file'] = 0664;
+
+/**
+ * Public file base URL:
+ *
+ * An alternative base URL to be used for serving public files. This must
+ * include any leading directory path.
+ *
+ * A different value from the domain used by Drupal to be used for accessing
+ * public files. This can be used for a simple CDN integration, or to improve
+ * security by serving user-uploaded files from a different domain or subdomain
+ * pointing to the same server. Do not include a trailing slash.
+ */
+# $settings['file_public_base_url'] = 'http://downloads.example.com/files';
+
+/**
+ * Public file path:
+ *
+ * A local file system path where public files will be stored. This directory
+ * must exist and be writable by Drupal. This directory must be relative to
+ * the Drupal installation directory and be accessible over the web.
+ */
+# $settings['file_public_path'] = 'sites/default/files';
+
+/**
+ * Private file path:
+ *
+ * A local file system path where private files will be stored. This directory
+ * must be absolute, outside of the Drupal installation directory and not
+ * accessible over the web.
+ *
+ * Note: Caches need to be cleared when this value is changed to make the
+ * private:// stream wrapper available to the system.
+ *
+ * See https://www.drupal.org/documentation/modules/file for more information
+ * about securing private files.
+ */
+# $settings['file_private_path'] = '';
+
+/**
+ * Session write interval:
+ *
+ * Set the minimum interval between each session write to database.
+ * For performance reasons it defaults to 180.
+ */
+# $settings['session_write_interval'] = 180;
+
+/**
+ * String overrides:
+ *
+ * To override specific strings on your site with or without enabling the Locale
+ * module, add an entry to this list. This functionality allows you to change
+ * a small number of your site's default English language interface strings.
+ *
+ * Remove the leading hash signs to enable.
+ *
+ * The "en" part of the variable name, is dynamic and can be any langcode of
+ * any added language. (eg locale_custom_strings_de for german).
+ */
+# $settings['locale_custom_strings_en'][''] = array(
+#   'forum'      => 'Discussion board',
+#   '@count min' => '@count minutes',
+# );
+
+/**
+ * A custom theme for the offline page:
+ *
+ * This applies when the site is explicitly set to maintenance mode through the
+ * administration page or when the database is inactive due to an error.
+ * The template file should also be copied into the theme. It is located inside
+ * 'core/modules/system/templates/maintenance-page.html.twig'.
+ *
+ * Note: This setting does not apply to installation and update pages.
+ */
+# $settings['maintenance_theme'] = 'bartik';
+
+/**
+ * PHP settings:
+ *
+ * To see what PHP settings are possible, including whether they can be set at
+ * runtime (by using ini_set()), read the PHP documentation:
+ * http://php.net/manual/ini.list.php
+ * See \Drupal\Core\DrupalKernel::bootEnvironment() for required runtime
+ * settings and the .htaccess file for non-runtime settings.
+ * Settings defined there should not be duplicated here so as to avoid conflict
+ * issues.
+ */
+
+/**
+ * If you encounter a situation where users post a large amount of text, and
+ * the result is stripped out upon viewing but can still be edited, Drupal's
+ * output filter may not have sufficient memory to process it.  If you
+ * experience this issue, you may wish to uncomment the following two lines
+ * and increase the limits of these variables.  For more information, see
+ * http://php.net/manual/pcre.configuration.php.
+ */
+# ini_set('pcre.backtrack_limit', 200000);
+# ini_set('pcre.recursion_limit', 200000);
+
+/**
+ * Active configuration settings.
+ *
+ * By default, the active configuration is stored in the database in the
+ * {config} table. To use a different storage mechanism for the active
+ * configuration, do the following prior to installing:
+ * - Create an "active" directory and declare its path in $config_directories
+ *   as explained under the 'Location of the site configuration files' section
+ *   above in this file. To enhance security, you can declare a path that is
+ *   outside your document root.
+ * - Override the 'bootstrap_config_storage' setting here. It must be set to a
+ *   callable that returns an object that implements
+ *   \Drupal\Core\Config\StorageInterface.
+ * - Override the service definition 'config.storage.active'. Put this
+ *   override in a services.yml file in the same directory as settings.php
+ *   (definitions in this file will override service definition defaults).
+ */
+# $settings['bootstrap_config_storage'] = array('Drupal\Core\Config\BootstrapConfigStorageFactory', 'getFileStorage');
+
+/**
+ * Configuration overrides.
+ *
+ * To globally override specific configuration values for this site,
+ * set them here. You usually don't need to use this feature. This is
+ * useful in a configuration file for a vhost or directory, rather than
+ * the default settings.php.
+ *
+ * Note that any values you provide in these variable overrides will not be
+ * viewable from the Drupal administration interface. The administration
+ * interface displays the values stored in configuration so that you can stage
+ * changes to other environments that don't have the overrides.
+ *
+ * There are particular configuration values that are risky to override. For
+ * example, overriding the list of installed modules in 'core.extension' is not
+ * supported as module install or uninstall has not occurred. Other examples
+ * include field storage configuration, because it has effects on database
+ * structure, and 'core.menu.static_menu_link_overrides' since this is cached in
+ * a way that is not config override aware. Also, note that changing
+ * configuration values in settings.php will not fire any of the configuration
+ * change events.
+ */
+# $config['system.file']['path']['temporary'] = '/tmp';
+# $config['system.site']['name'] = 'My Drupal site';
+# $config['system.theme']['default'] = 'stark';
+# $config['user.settings']['anonymous'] = 'Visitor';
+
+/**
+ * Fast 404 pages:
+ *
+ * Drupal can generate fully themed 404 pages. However, some of these responses
+ * are for images or other resource files that are not displayed to the user.
+ * This can waste bandwidth, and also generate server load.
+ *
+ * The options below return a simple, fast 404 page for URLs matching a
+ * specific pattern:
+ * - $config['system.performance']['fast_404']['exclude_paths']: A regular
+ *   expression to match paths to exclude, such as images generated by image
+ *   styles, or dynamically-resized images. The default pattern provided below
+ *   also excludes the private file system. If you need to add more paths, you
+ *   can add '|path' to the expression.
+ * - $config['system.performance']['fast_404']['paths']: A regular expression to
+ *   match paths that should return a simple 404 page, rather than the fully
+ *   themed 404 page. If you don't have any aliases ending in htm or html you
+ *   can add '|s?html?' to the expression.
+ * - $config['system.performance']['fast_404']['html']: The html to return for
+ *   simple 404 pages.
+ *
+ * Remove the leading hash signs if you would like to alter this functionality.
+ */
+# $config['system.performance']['fast_404']['exclude_paths'] = '/\/(?:styles)|(?:system\/files)\//';
+# $config['system.performance']['fast_404']['paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i';
+# $config['system.performance']['fast_404']['html'] = '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>';
+
+/**
+ * Load services definition file.
+ */
+$settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.yml';
+
+/**
+ * Override the default service container class.
+ *
+ * This is useful for example to trace the service container for performance
+ * tracking purposes, for testing a service container with an error condition or
+ * to test a service container that throws an exception.
+ */
+# $settings['container_base_class'] = '\Drupal\Core\DependencyInjection\Container';
+
+/**
+ * Override the default yaml parser class.
+ *
+ * Provide a fully qualified class name here if you would like to provide an
+ * alternate implementation YAML parser. The class must implement the
+ * \Drupal\Component\Serialization\SerializationInterface interface.
+ */
+# $settings['yaml_parser_class'] = NULL;
+
+/**
+ * Trusted host configuration.
+ *
+ * Drupal core can use the Symfony trusted host mechanism to prevent HTTP Host
+ * header spoofing.
+ *
+ * To enable the trusted host mechanism, you enable your allowable hosts
+ * in $settings['trusted_host_patterns']. This should be an array of regular
+ * expression patterns, without delimiters, representing the hosts you would
+ * like to allow.
+ *
+ * For example:
+ * @code
+ * $settings['trusted_host_patterns'] = array(
+ *   '^www\.example\.com$',
+ * );
+ * @endcode
+ * will allow the site to only run from www.example.com.
+ *
+ * If you are running multisite, or if you are running your site from
+ * different domain names (eg, you don't redirect http://www.example.com to
+ * http://example.com), you should specify all of the host patterns that are
+ * allowed by your site.
+ *
+ * For example:
+ * @code
+ * $settings['trusted_host_patterns'] = array(
+ *   '^example\.com$',
+ *   '^.+\.example\.com$',
+ *   '^example\.org$',
+ *   '^.+\.example\.org$',
+ * );
+ * @endcode
+ * will allow the site to run off of all variants of example.com and
+ * example.org, with all subdomains included.
+ */
+
+/**
+ * The default list of directories that will be ignored by Drupal's file API.
+ *
+ * By default ignore node_modules and bower_components folders to avoid issues
+ * with common frontend tools and recursive scanning of directories looking for
+ * extensions.
+ *
+ * @see file_scan_directory()
+ * @see \Drupal\Core\Extension\ExtensionDiscovery::scanDirectory()
+ */
+$settings['file_scan_ignore_directories'] = [
+  'node_modules',
+  'bower_components',
+];
+
+/**
+ * The default number of entities to update in a batch process.
+ *
+ * This is used by update and post-update functions that need to go through and
+ * change all the entities on a site, so it is useful to increase this number
+ * if your hosting configuration (i.e. RAM allocation, CPU speed) allows for a
+ * larger number of entities to be processed in a single batch run.
+ */
+$settings['entity_update_batch_size'] = 50;
+
+/**
+ * Load local development override configuration, if available.
+ *
+ * Use settings.local.php to override variables on secondary (staging,
+ * development, etc) installations of this site. Typically used to disable
+ * caching, JavaScript/CSS compression, re-routing of outgoing emails, and
+ * other things that should not happen on development and testing sites.
+ *
+ * Keep this code block at the end of this file to take full effect.
+ */
+#
+# if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
+#   include $app_root . '/' . $site_path . '/settings.local.php';
+# }
diff --git a/web/sites/default/settings.cf.php b/web/sites/default/settings.cf.php
new file mode 100644
index 0000000..aded671
--- /dev/null
+++ b/web/sites/default/settings.cf.php
@@ -0,0 +1,51 @@
+<?php
+/** 
+ * Collect external service information from environment. 
+ * Cloud Foundry places all service credentials in VCAP_SERVICES
+ */
+
+$cf_service_data = json_decode($_ENV['VCAP_SERVICES'] ?? '{}', true);
+
+foreach ($cf_service_data as $service_provider => $service_list) {
+  foreach ($service_list as $service) {
+    if ($service['name'] === 'database') {
+      $databases['default']['default'] = array (
+        'database' => $service['credentials']['db_name'],
+        'username' => $service['credentials']['username'],
+        'password' => $service['credentials']['password'],
+        'prefix' => '',
+        'host' => $service['credentials']['host'],
+        'port' => $service['credentials']['port'],
+        'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
+        'driver' => 'mysql',
+      );
+    }
+    if ($service['name'] === 'secrets') {
+      $settings['hash_salt'] = $service['credentials']['HASH_SALT'];
+    }
+    if ($service['name'] === 'storage') {
+      $settings['flysystem']['s3'] = array(
+        'driver' => 's3',
+        'config' => array(
+          'key'    => $service['credentials']['access_key_id'],
+          'secret' => $service['credentials']['secret_access_key'],
+          'region' => $service['credentials']['region'],
+          'bucket' => $service['credentials']['bucket'],
+          // Optional configuration settings.
+          'options' => array(
+            'ACL' => 'public-read',
+            'ServerSideEncryption' => 'AES256',
+          ),
+          'protocol' => 'https',      // Will be autodetected based on the current request.
+          'prefix' => 'flysystem-s3', // Directory prefix for all uploaded/viewed files.
+        ),
+        'cache' => TRUE, // Creates a metadata cache to speed up lookups.
+      );
+    }
+  }
+}
+
+// CSS and JS aggregation need per dyno/container cache.
+// This is from https://www.fomfus.com/articles/how-to-create-a-drupal-8-project-for-heroku-part-1
+// included here without fully understanding implications:
+$settings['cache']['bins']['data'] = 'cache.backend.php';
diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php
new file mode 100644
index 0000000..8bde4e3
--- /dev/null
+++ b/web/sites/default/settings.php
@@ -0,0 +1,790 @@
+<?php
+
+// @codingStandardsIgnoreFile
+
+/**
+ * @file
+ * Drupal site-specific configuration file.
+ *
+ * IMPORTANT NOTE:
+ * This file may have been set to read-only by the Drupal installation program.
+ * If you make changes to this file, be sure to protect it again after making
+ * your modifications. Failure to remove write permissions to this file is a
+ * security risk.
+ *
+ * In order to use the selection rules below the multisite aliasing file named
+ * sites/sites.php must be present. Its optional settings will be loaded, and
+ * the aliases in the array $sites will override the default directory rules
+ * below. See sites/example.sites.php for more information about aliases.
+ *
+ * The configuration directory will be discovered by stripping the website's
+ * hostname from left to right and pathname from right to left. The first
+ * configuration file found will be used and any others will be ignored. If no
+ * other configuration file is found then the default configuration file at
+ * 'sites/default' will be used.
+ *
+ * For example, for a fictitious site installed at
+ * https://www.drupal.org:8080/mysite/test/, the 'settings.php' file is searched
+ * for in the following directories:
+ *
+ * - sites/8080.www.drupal.org.mysite.test
+ * - sites/www.drupal.org.mysite.test
+ * - sites/drupal.org.mysite.test
+ * - sites/org.mysite.test
+ *
+ * - sites/8080.www.drupal.org.mysite
+ * - sites/www.drupal.org.mysite
+ * - sites/drupal.org.mysite
+ * - sites/org.mysite
+ *
+ * - sites/8080.www.drupal.org
+ * - sites/www.drupal.org
+ * - sites/drupal.org
+ * - sites/org
+ *
+ * - sites/default
+ *
+ * Note that if you are installing on a non-standard port number, prefix the
+ * hostname with that number. For example,
+ * https://www.drupal.org:8080/mysite/test/ could be loaded from
+ * sites/8080.www.drupal.org.mysite.test/.
+ *
+ * @see example.sites.php
+ * @see \Drupal\Core\DrupalKernel::getSitePath()
+ *
+ * In addition to customizing application settings through variables in
+ * settings.php, you can create a services.yml file in the same directory to
+ * register custom, site-specific service definitions and/or swap out default
+ * implementations with custom ones.
+ */
+
+/**
+ * Database settings:
+ *
+ * The $databases array specifies the database connection or
+ * connections that Drupal may use.  Drupal is able to connect
+ * to multiple databases, including multiple types of databases,
+ * during the same request.
+ *
+ * One example of the simplest connection array is shown below. To use the
+ * sample settings, copy and uncomment the code below between the @code and
+ * @endcode lines and paste it after the $databases declaration. You will need
+ * to replace the database username and password and possibly the host and port
+ * with the appropriate credentials for your database system.
+ *
+ * The next section describes how to customize the $databases array for more
+ * specific needs.
+ *
+ * @code
+ * $databases['default']['default'] = array (
+ *   'database' => 'databasename',
+ *   'username' => 'sqlusername',
+ *   'password' => 'sqlpassword',
+ *   'host' => 'localhost',
+ *   'port' => '3306',
+ *   'driver' => 'mysql',
+ *   'prefix' => '',
+ *   'collation' => 'utf8mb4_general_ci',
+ * );
+ * @endcode
+ */
+$databases = array();
+
+/**
+ * Customizing database settings.
+ *
+ * Many of the values of the $databases array can be customized for your
+ * particular database system. Refer to the sample in the section above as a
+ * starting point.
+ *
+ * The "driver" property indicates what Drupal database driver the
+ * connection should use.  This is usually the same as the name of the
+ * database type, such as mysql or sqlite, but not always.  The other
+ * properties will vary depending on the driver.  For SQLite, you must
+ * specify a database file name in a directory that is writable by the
+ * webserver.  For most other drivers, you must specify a
+ * username, password, host, and database name.
+ *
+ * Transaction support is enabled by default for all drivers that support it,
+ * including MySQL. To explicitly disable it, set the 'transactions' key to
+ * FALSE.
+ * Note that some configurations of MySQL, such as the MyISAM engine, don't
+ * support it and will proceed silently even if enabled. If you experience
+ * transaction related crashes with such configuration, set the 'transactions'
+ * key to FALSE.
+ *
+ * For each database, you may optionally specify multiple "target" databases.
+ * A target database allows Drupal to try to send certain queries to a
+ * different database if it can but fall back to the default connection if not.
+ * That is useful for primary/replica replication, as Drupal may try to connect
+ * to a replica server when appropriate and if one is not available will simply
+ * fall back to the single primary server (The terms primary/replica are
+ * traditionally referred to as master/slave in database server documentation).
+ *
+ * The general format for the $databases array is as follows:
+ * @code
+ * $databases['default']['default'] = $info_array;
+ * $databases['default']['replica'][] = $info_array;
+ * $databases['default']['replica'][] = $info_array;
+ * $databases['extra']['default'] = $info_array;
+ * @endcode
+ *
+ * In the above example, $info_array is an array of settings described above.
+ * The first line sets a "default" database that has one primary database
+ * (the second level default).  The second and third lines create an array
+ * of potential replica databases.  Drupal will select one at random for a given
+ * request as needed.  The fourth line creates a new database with a name of
+ * "extra".
+ *
+ * You can optionally set prefixes for some or all database table names
+ * by using the 'prefix' setting. If a prefix is specified, the table
+ * name will be prepended with its value. Be sure to use valid database
+ * characters only, usually alphanumeric and underscore. If no prefixes
+ * are desired, leave it as an empty string ''.
+ *
+ * To have all database names prefixed, set 'prefix' as a string:
+ * @code
+ *   'prefix' => 'main_',
+ * @endcode
+ *
+ * Per-table prefixes are deprecated as of Drupal 8.2, and will be removed in
+ * Drupal 9.0. After that, only a single prefix for all tables will be
+ * supported.
+ *
+ * To provide prefixes for specific tables, set 'prefix' as an array.
+ * The array's keys are the table names and the values are the prefixes.
+ * The 'default' element is mandatory and holds the prefix for any tables
+ * not specified elsewhere in the array. Example:
+ * @code
+ *   'prefix' => array(
+ *     'default'   => 'main_',
+ *     'users'     => 'shared_',
+ *     'sessions'  => 'shared_',
+ *     'role'      => 'shared_',
+ *     'authmap'   => 'shared_',
+ *   ),
+ * @endcode
+ * You can also use a reference to a schema/database as a prefix. This may be
+ * useful if your Drupal installation exists in a schema that is not the default
+ * or you want to access several databases from the same code base at the same
+ * time.
+ * Example:
+ * @code
+ *   'prefix' => array(
+ *     'default'   => 'main.',
+ *     'users'     => 'shared.',
+ *     'sessions'  => 'shared.',
+ *     'role'      => 'shared.',
+ *     'authmap'   => 'shared.',
+ *   );
+ * @endcode
+ * NOTE: MySQL and SQLite's definition of a schema is a database.
+ *
+ * Advanced users can add or override initial commands to execute when
+ * connecting to the database server, as well as PDO connection settings. For
+ * example, to enable MySQL SELECT queries to exceed the max_join_size system
+ * variable, and to reduce the database connection timeout to 5 seconds:
+ * @code
+ * $databases['default']['default'] = array(
+ *   'init_commands' => array(
+ *     'big_selects' => 'SET SQL_BIG_SELECTS=1',
+ *   ),
+ *   'pdo' => array(
+ *     PDO::ATTR_TIMEOUT => 5,
+ *   ),
+ * );
+ * @endcode
+ *
+ * WARNING: The above defaults are designed for database portability. Changing
+ * them may cause unexpected behavior, including potential data loss. See
+ * https://www.drupal.org/developing/api/database/configuration for more
+ * information on these defaults and the potential issues.
+ *
+ * More details can be found in the constructor methods for each driver:
+ * - \Drupal\Core\Database\Driver\mysql\Connection::__construct()
+ * - \Drupal\Core\Database\Driver\pgsql\Connection::__construct()
+ * - \Drupal\Core\Database\Driver\sqlite\Connection::__construct()
+ *
+ * Sample Database configuration format for PostgreSQL (pgsql):
+ * @code
+ *   $databases['default']['default'] = array(
+ *     'driver' => 'pgsql',
+ *     'database' => 'databasename',
+ *     'username' => 'sqlusername',
+ *     'password' => 'sqlpassword',
+ *     'host' => 'localhost',
+ *     'prefix' => '',
+ *   );
+ * @endcode
+ *
+ * Sample Database configuration format for SQLite (sqlite):
+ * @code
+ *   $databases['default']['default'] = array(
+ *     'driver' => 'sqlite',
+ *     'database' => '/path/to/databasefilename',
+ *   );
+ * @endcode
+ */
+
+/**
+ * Location of the site configuration files.
+ *
+ * The $config_directories array specifies the location of file system
+ * directories used for configuration data. On install, the "sync" directory is
+ * created. This is used for configuration imports. The "active" directory is
+ * not created by default since the default storage for active configuration is
+ * the database rather than the file system. (This can be changed. See "Active
+ * configuration settings" below).
+ *
+ * The default location for the "sync" directory is inside a randomly-named
+ * directory in the public files path. The setting below allows you to override
+ * the "sync" location.
+ *
+ * If you use files for the "active" configuration, you can tell the
+ * Configuration system where this directory is located by adding an entry with
+ * array key CONFIG_ACTIVE_DIRECTORY.
+ *
+ * Example:
+ * @code
+ *   $config_directories = array(
+ *     CONFIG_SYNC_DIRECTORY => '/directory/outside/webroot',
+ *   );
+ * @endcode
+ */
+$config_directories = array();
+
+/**
+ * Settings:
+ *
+ * $settings contains environment-specific configuration, such as the files
+ * directory and reverse proxy address, and temporary configuration, such as
+ * security overrides.
+ *
+ * @see \Drupal\Core\Site\Settings::get()
+ */
+
+/**
+ * The active installation profile.
+ *
+ * Changing this after installation is not recommended as it changes which
+ * directories are scanned during extension discovery. If this is set prior to
+ * installation this value will be rewritten according to the profile selected
+ * by the user.
+ *
+ * @see install_select_profile()
+ *
+ * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. The
+ *   install profile is written to the core.extension configuration. If a
+ *   service requires the install profile use the 'install_profile' container
+ *   parameter. Functional code can use \Drupal::installProfile().
+ */
+# $settings['install_profile'] = '';
+
+/**
+ * Salt for one-time login links, cancel links, form tokens, etc.
+ *
+ * This variable will be set to a random value by the installer. All one-time
+ * login links will be invalidated if the value is changed. Note that if your
+ * site is deployed on a cluster of web servers, you must ensure that this
+ * variable has the same value on each server.
+ *
+ * For enhanced security, you may set this variable to the contents of a file
+ * outside your document root; you should also ensure that this file is not
+ * stored with backups of your database.
+ *
+ * Example:
+ * @code
+ *   $settings['hash_salt'] = file_get_contents('/home/example/salt.txt');
+ * @endcode
+ */
+$settings['hash_salt'] = 'sA51ewzJYcoqJ2YPKNHVvjD43fCZAgJfcEuilLEBpfHKHgy2ZACgSfccbW_cRgH9orAVtjioZg';
+
+/**
+ * Deployment identifier.
+ *
+ * Drupal's dependency injection container will be automatically invalidated and
+ * rebuilt when the Drupal core version changes. When updating contributed or
+ * custom code that changes the container, changing this identifier will also
+ * allow the container to be invalidated as soon as code is deployed.
+ */
+# $settings['deployment_identifier'] = \Drupal::VERSION;
+
+/**
+ * Access control for update.php script.
+ *
+ * If you are updating your Drupal installation using the update.php script but
+ * are not logged in using either an account with the "Administer software
+ * updates" permission or the site maintenance account (the account that was
+ * created during installation), you will need to modify the access check
+ * statement below. Change the FALSE to a TRUE to disable the access check.
+ * After finishing the upgrade, be sure to open this file again and change the
+ * TRUE back to a FALSE!
+ */
+$settings['update_free_access'] = FALSE;
+
+/**
+ * External access proxy settings:
+ *
+ * If your site must access the Internet via a web proxy then you can enter the
+ * proxy settings here. Set the full URL of the proxy, including the port, in
+ * variables:
+ * - $settings['http_client_config']['proxy']['http']: The proxy URL for HTTP
+ *   requests.
+ * - $settings['http_client_config']['proxy']['https']: The proxy URL for HTTPS
+ *   requests.
+ * You can pass in the user name and password for basic authentication in the
+ * URLs in these settings.
+ *
+ * You can also define an array of host names that can be accessed directly,
+ * bypassing the proxy, in $settings['http_client_config']['proxy']['no'].
+ */
+# $settings['http_client_config']['proxy']['http'] = 'http://proxy_user:proxy_pass@example.com:8080';
+# $settings['http_client_config']['proxy']['https'] = 'http://proxy_user:proxy_pass@example.com:8080';
+# $settings['http_client_config']['proxy']['no'] = ['127.0.0.1', 'localhost'];
+
+/**
+ * Reverse Proxy Configuration:
+ *
+ * Reverse proxy servers are often used to enhance the performance
+ * of heavily visited sites and may also provide other site caching,
+ * security, or encryption benefits. In an environment where Drupal
+ * is behind a reverse proxy, the real IP address of the client should
+ * be determined such that the correct client IP address is available
+ * to Drupal's logging, statistics, and access management systems. In
+ * the most simple scenario, the proxy server will add an
+ * X-Forwarded-For header to the request that contains the client IP
+ * address. However, HTTP headers are vulnerable to spoofing, where a
+ * malicious client could bypass restrictions by setting the
+ * X-Forwarded-For header directly. Therefore, Drupal's proxy
+ * configuration requires the IP addresses of all remote proxies to be
+ * specified in $settings['reverse_proxy_addresses'] to work correctly.
+ *
+ * Enable this setting to get Drupal to determine the client IP from
+ * the X-Forwarded-For header (or $settings['reverse_proxy_header'] if set).
+ * If you are unsure about this setting, do not have a reverse proxy,
+ * or Drupal operates in a shared hosting environment, this setting
+ * should remain commented out.
+ *
+ * In order for this setting to be used you must specify every possible
+ * reverse proxy IP address in $settings['reverse_proxy_addresses'].
+ * If a complete list of reverse proxies is not available in your
+ * environment (for example, if you use a CDN) you may set the
+ * $_SERVER['REMOTE_ADDR'] variable directly in settings.php.
+ * Be aware, however, that it is likely that this would allow IP
+ * address spoofing unless more advanced precautions are taken.
+ */
+# $settings['reverse_proxy'] = TRUE;
+
+/**
+ * Specify every reverse proxy IP address in your environment.
+ * This setting is required if $settings['reverse_proxy'] is TRUE.
+ */
+# $settings['reverse_proxy_addresses'] = array('a.b.c.d', ...);
+
+/**
+ * Set this value if your proxy server sends the client IP in a header
+ * other than X-Forwarded-For.
+ */
+# $settings['reverse_proxy_header'] = 'X_CLUSTER_CLIENT_IP';
+
+/**
+ * Set this value if your proxy server sends the client protocol in a header
+ * other than X-Forwarded-Proto.
+ */
+# $settings['reverse_proxy_proto_header'] = 'X_FORWARDED_PROTO';
+
+/**
+ * Set this value if your proxy server sends the client protocol in a header
+ * other than X-Forwarded-Host.
+ */
+# $settings['reverse_proxy_host_header'] = 'X_FORWARDED_HOST';
+
+/**
+ * Set this value if your proxy server sends the client protocol in a header
+ * other than X-Forwarded-Port.
+ */
+# $settings['reverse_proxy_port_header'] = 'X_FORWARDED_PORT';
+
+/**
+ * Set this value if your proxy server sends the client protocol in a header
+ * other than Forwarded.
+ */
+# $settings['reverse_proxy_forwarded_header'] = 'FORWARDED';
+
+/**
+ * Page caching:
+ *
+ * By default, Drupal sends a "Vary: Cookie" HTTP header for anonymous page
+ * views. This tells a HTTP proxy that it may return a page from its local
+ * cache without contacting the web server, if the user sends the same Cookie
+ * header as the user who originally requested the cached page. Without "Vary:
+ * Cookie", authenticated users would also be served the anonymous page from
+ * the cache. If the site has mostly anonymous users except a few known
+ * editors/administrators, the Vary header can be omitted. This allows for
+ * better caching in HTTP proxies (including reverse proxies), i.e. even if
+ * clients send different cookies, they still get content served from the cache.
+ * However, authenticated users should access the site directly (i.e. not use an
+ * HTTP proxy, and bypass the reverse proxy if one is used) in order to avoid
+ * getting cached pages from the proxy.
+ */
+# $settings['omit_vary_cookie'] = TRUE;
+
+
+/**
+ * Cache TTL for client error (4xx) responses.
+ *
+ * Items cached per-URL tend to result in a large number of cache items, and
+ * this can be problematic on 404 pages which by their nature are unbounded. A
+ * fixed TTL can be set for these items, defaulting to one hour, so that cache
+ * backends which do not support LRU can purge older entries. To disable caching
+ * of client error responses set the value to 0. Currently applies only to
+ * page_cache module.
+ */
+# $settings['cache_ttl_4xx'] = 3600;
+
+/**
+ * Expiration of cached forms.
+ *
+ * Drupal's Form API stores details of forms in a cache and these entries are
+ * kept for at least 6 hours by default. Expired entries are cleared by cron.
+ *
+ * @see \Drupal\Core\Form\FormCache::setCache()
+ */
+# $settings['form_cache_expiration'] = 21600;
+
+/**
+ * Class Loader.
+ *
+ * If the APC extension is detected, the Symfony APC class loader is used for
+ * performance reasons. Detection can be prevented by setting
+ * class_loader_auto_detect to false, as in the example below.
+ */
+# $settings['class_loader_auto_detect'] = FALSE;
+
+/*
+ * If the APC extension is not detected, either because APC is missing or
+ * because auto-detection has been disabled, auto-loading falls back to
+ * Composer's ClassLoader, which is good for development as it does not break
+ * when code is moved in the file system. You can also decorate the base class
+ * loader with another cached solution than the Symfony APC class loader, as
+ * all production sites should have a cached class loader of some sort enabled.
+ *
+ * To do so, you may decorate and replace the local $class_loader variable. For
+ * example, to use Symfony's APC class loader without automatic detection,
+ * uncomment the code below.
+ */
+/*
+if ($settings['hash_salt']) {
+  $prefix = 'drupal.' . hash('sha256', 'drupal.' . $settings['hash_salt']);
+  $apc_loader = new \Symfony\Component\ClassLoader\ApcClassLoader($prefix, $class_loader);
+  unset($prefix);
+  $class_loader->unregister();
+  $apc_loader->register();
+  $class_loader = $apc_loader;
+}
+*/
+
+/**
+ * Authorized file system operations:
+ *
+ * The Update Manager module included with Drupal provides a mechanism for
+ * site administrators to securely install missing updates for the site
+ * directly through the web user interface. On securely-configured servers,
+ * the Update manager will require the administrator to provide SSH or FTP
+ * credentials before allowing the installation to proceed; this allows the
+ * site to update the new files as the user who owns all the Drupal files,
+ * instead of as the user the webserver is running as. On servers where the
+ * webserver user is itself the owner of the Drupal files, the administrator
+ * will not be prompted for SSH or FTP credentials (note that these server
+ * setups are common on shared hosting, but are inherently insecure).
+ *
+ * Some sites might wish to disable the above functionality, and only update
+ * the code directly via SSH or FTP themselves. This setting completely
+ * disables all functionality related to these authorized file operations.
+ *
+ * @see https://www.drupal.org/node/244924
+ *
+ * Remove the leading hash signs to disable.
+ */
+# $settings['allow_authorize_operations'] = FALSE;
+
+/**
+ * Default mode for directories and files written by Drupal.
+ *
+ * Value should be in PHP Octal Notation, with leading zero.
+ */
+# $settings['file_chmod_directory'] = 0775;
+# $settings['file_chmod_file'] = 0664;
+
+/**
+ * Public file base URL:
+ *
+ * An alternative base URL to be used for serving public files. This must
+ * include any leading directory path.
+ *
+ * A different value from the domain used by Drupal to be used for accessing
+ * public files. This can be used for a simple CDN integration, or to improve
+ * security by serving user-uploaded files from a different domain or subdomain
+ * pointing to the same server. Do not include a trailing slash.
+ */
+# $settings['file_public_base_url'] = 'http://downloads.example.com/files';
+
+/**
+ * Public file path:
+ *
+ * A local file system path where public files will be stored. This directory
+ * must exist and be writable by Drupal. This directory must be relative to
+ * the Drupal installation directory and be accessible over the web.
+ */
+# $settings['file_public_path'] = 'sites/default/files';
+
+/**
+ * Private file path:
+ *
+ * A local file system path where private files will be stored. This directory
+ * must be absolute, outside of the Drupal installation directory and not
+ * accessible over the web.
+ *
+ * Note: Caches need to be cleared when this value is changed to make the
+ * private:// stream wrapper available to the system.
+ *
+ * See https://www.drupal.org/documentation/modules/file for more information
+ * about securing private files.
+ */
+# $settings['file_private_path'] = '';
+
+/**
+ * Session write interval:
+ *
+ * Set the minimum interval between each session write to database.
+ * For performance reasons it defaults to 180.
+ */
+# $settings['session_write_interval'] = 180;
+
+/**
+ * String overrides:
+ *
+ * To override specific strings on your site with or without enabling the Locale
+ * module, add an entry to this list. This functionality allows you to change
+ * a small number of your site's default English language interface strings.
+ *
+ * Remove the leading hash signs to enable.
+ *
+ * The "en" part of the variable name, is dynamic and can be any langcode of
+ * any added language. (eg locale_custom_strings_de for german).
+ */
+# $settings['locale_custom_strings_en'][''] = array(
+#   'forum'      => 'Discussion board',
+#   '@count min' => '@count minutes',
+# );
+
+/**
+ * A custom theme for the offline page:
+ *
+ * This applies when the site is explicitly set to maintenance mode through the
+ * administration page or when the database is inactive due to an error.
+ * The template file should also be copied into the theme. It is located inside
+ * 'core/modules/system/templates/maintenance-page.html.twig'.
+ *
+ * Note: This setting does not apply to installation and update pages.
+ */
+# $settings['maintenance_theme'] = 'bartik';
+
+/**
+ * PHP settings:
+ *
+ * To see what PHP settings are possible, including whether they can be set at
+ * runtime (by using ini_set()), read the PHP documentation:
+ * http://php.net/manual/ini.list.php
+ * See \Drupal\Core\DrupalKernel::bootEnvironment() for required runtime
+ * settings and the .htaccess file for non-runtime settings.
+ * Settings defined there should not be duplicated here so as to avoid conflict
+ * issues.
+ */
+
+/**
+ * If you encounter a situation where users post a large amount of text, and
+ * the result is stripped out upon viewing but can still be edited, Drupal's
+ * output filter may not have sufficient memory to process it.  If you
+ * experience this issue, you may wish to uncomment the following two lines
+ * and increase the limits of these variables.  For more information, see
+ * http://php.net/manual/pcre.configuration.php.
+ */
+# ini_set('pcre.backtrack_limit', 200000);
+# ini_set('pcre.recursion_limit', 200000);
+
+/**
+ * Active configuration settings.
+ *
+ * By default, the active configuration is stored in the database in the
+ * {config} table. To use a different storage mechanism for the active
+ * configuration, do the following prior to installing:
+ * - Create an "active" directory and declare its path in $config_directories
+ *   as explained under the 'Location of the site configuration files' section
+ *   above in this file. To enhance security, you can declare a path that is
+ *   outside your document root.
+ * - Override the 'bootstrap_config_storage' setting here. It must be set to a
+ *   callable that returns an object that implements
+ *   \Drupal\Core\Config\StorageInterface.
+ * - Override the service definition 'config.storage.active'. Put this
+ *   override in a services.yml file in the same directory as settings.php
+ *   (definitions in this file will override service definition defaults).
+ */
+# $settings['bootstrap_config_storage'] = array('Drupal\Core\Config\BootstrapConfigStorageFactory', 'getFileStorage');
+
+/**
+ * Configuration overrides.
+ *
+ * To globally override specific configuration values for this site,
+ * set them here. You usually don't need to use this feature. This is
+ * useful in a configuration file for a vhost or directory, rather than
+ * the default settings.php.
+ *
+ * Note that any values you provide in these variable overrides will not be
+ * viewable from the Drupal administration interface. The administration
+ * interface displays the values stored in configuration so that you can stage
+ * changes to other environments that don't have the overrides.
+ *
+ * There are particular configuration values that are risky to override. For
+ * example, overriding the list of installed modules in 'core.extension' is not
+ * supported as module install or uninstall has not occurred. Other examples
+ * include field storage configuration, because it has effects on database
+ * structure, and 'core.menu.static_menu_link_overrides' since this is cached in
+ * a way that is not config override aware. Also, note that changing
+ * configuration values in settings.php will not fire any of the configuration
+ * change events.
+ */
+# $config['system.file']['path']['temporary'] = '/tmp';
+# $config['system.site']['name'] = 'My Drupal site';
+# $config['system.theme']['default'] = 'stark';
+# $config['user.settings']['anonymous'] = 'Visitor';
+
+/**
+ * Fast 404 pages:
+ *
+ * Drupal can generate fully themed 404 pages. However, some of these responses
+ * are for images or other resource files that are not displayed to the user.
+ * This can waste bandwidth, and also generate server load.
+ *
+ * The options below return a simple, fast 404 page for URLs matching a
+ * specific pattern:
+ * - $config['system.performance']['fast_404']['exclude_paths']: A regular
+ *   expression to match paths to exclude, such as images generated by image
+ *   styles, or dynamically-resized images. The default pattern provided below
+ *   also excludes the private file system. If you need to add more paths, you
+ *   can add '|path' to the expression.
+ * - $config['system.performance']['fast_404']['paths']: A regular expression to
+ *   match paths that should return a simple 404 page, rather than the fully
+ *   themed 404 page. If you don't have any aliases ending in htm or html you
+ *   can add '|s?html?' to the expression.
+ * - $config['system.performance']['fast_404']['html']: The html to return for
+ *   simple 404 pages.
+ *
+ * Remove the leading hash signs if you would like to alter this functionality.
+ */
+# $config['system.performance']['fast_404']['exclude_paths'] = '/\/(?:styles)|(?:system\/files)\//';
+# $config['system.performance']['fast_404']['paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i';
+# $config['system.performance']['fast_404']['html'] = '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>';
+
+/**
+ * Load services definition file.
+ */
+$settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.yml';
+
+/**
+ * Override the default service container class.
+ *
+ * This is useful for example to trace the service container for performance
+ * tracking purposes, for testing a service container with an error condition or
+ * to test a service container that throws an exception.
+ */
+# $settings['container_base_class'] = '\Drupal\Core\DependencyInjection\Container';
+
+/**
+ * Override the default yaml parser class.
+ *
+ * Provide a fully qualified class name here if you would like to provide an
+ * alternate implementation YAML parser. The class must implement the
+ * \Drupal\Component\Serialization\SerializationInterface interface.
+ */
+# $settings['yaml_parser_class'] = NULL;
+
+/**
+ * Trusted host configuration.
+ *
+ * Drupal core can use the Symfony trusted host mechanism to prevent HTTP Host
+ * header spoofing.
+ *
+ * To enable the trusted host mechanism, you enable your allowable hosts
+ * in $settings['trusted_host_patterns']. This should be an array of regular
+ * expression patterns, without delimiters, representing the hosts you would
+ * like to allow.
+ *
+ * For example:
+ * @code
+ * $settings['trusted_host_patterns'] = array(
+ *   '^www\.example\.com$',
+ * );
+ * @endcode
+ * will allow the site to only run from www.example.com.
+ *
+ * If you are running multisite, or if you are running your site from
+ * different domain names (eg, you don't redirect http://www.example.com to
+ * http://example.com), you should specify all of the host patterns that are
+ * allowed by your site.
+ *
+ * For example:
+ * @code
+ * $settings['trusted_host_patterns'] = array(
+ *   '^example\.com$',
+ *   '^.+\.example\.com$',
+ *   '^example\.org$',
+ *   '^.+\.example\.org$',
+ * );
+ * @endcode
+ * will allow the site to run off of all variants of example.com and
+ * example.org, with all subdomains included.
+ */
+
+/**
+ * The default list of directories that will be ignored by Drupal's file API.
+ *
+ * By default ignore node_modules and bower_components folders to avoid issues
+ * with common frontend tools and recursive scanning of directories looking for
+ * extensions.
+ *
+ * @see file_scan_directory()
+ * @see \Drupal\Core\Extension\ExtensionDiscovery::scanDirectory()
+ */
+$settings['file_scan_ignore_directories'] = [
+  'node_modules',
+  'bower_components',
+];
+
+/**
+ * The default number of entities to update in a batch process.
+ *
+ * This is used by update and post-update functions that need to go through and
+ * change all the entities on a site, so it is useful to increase this number
+ * if your hosting configuration (i.e. RAM allocation, CPU speed) allows for a
+ * larger number of entities to be processed in a single batch run.
+ */
+$settings['entity_update_batch_size'] = 50;
+
+$config_directories['sync'] = '../config/sync';
+$settings['install_profile'] = 'standard';
+include $app_root . '/' . $site_path . '/settings.cf.php';
+
+/**
+ * Load local development override configuration, if available.
+ *
+ * Use settings.local.php to override variables on secondary (staging,
+ * development, etc) installations of this site. Typically used to disable
+ * caching, JavaScript/CSS compression, re-routing of outgoing emails, and
+ * other things that should not happen on development and testing sites.
+ *
+ * Keep this code block at the end of this file to take full effect.
+ */
+if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
+  include $app_root . '/' . $site_path . '/settings.local.php';
+}

From a28b560d4db717e71eeaa3002e142114a0fae7cf Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 14 Mar 2018 16:18:41 -0400
Subject: [PATCH 014/143] Add a bootstrap script, more config options.

This pulls in more configuration from the cloud.gov example. It uses their
bootstrap.sh as a guide, but ends up rewriting it to leak less information and
to make use of our settings files.
---
 .bp-config/options.json                   | 11 +++++
 .bp-config/php/php.ini.d/memory_limit.ini |  3 ++
 bootstrap.sh                              | 49 ++++++++---------------
 web/autoload.php                          |  2 +-
 4 files changed, 32 insertions(+), 33 deletions(-)
 create mode 100644 .bp-config/options.json
 create mode 100644 .bp-config/php/php.ini.d/memory_limit.ini

diff --git a/.bp-config/options.json b/.bp-config/options.json
new file mode 100644
index 0000000..566b5db
--- /dev/null
+++ b/.bp-config/options.json
@@ -0,0 +1,11 @@
+{
+  "COMPOSER_INSTALL_OPTIONS": [
+    "--no-dev --optimize-autoloader --no-progress --no-interaction"
+  ],
+  "COMPOSER_VENDOR_DIR": "vendor",
+  "WEBDIR": "web",
+  "PHP_EXTENSIONS": ["bz2", "zlib", "curl", "mcrypt", "gd", "pdo", "pdo_mysql", "mbstring"],
+  "ADDITIONAL_PREPROCESS_CMDS": [
+    "$HOME/bootstrap.sh"
+  ]
+}
diff --git a/.bp-config/php/php.ini.d/memory_limit.ini b/.bp-config/php/php.ini.d/memory_limit.ini
new file mode 100644
index 0000000..8f744af
--- /dev/null
+++ b/.bp-config/php/php.ini.d/memory_limit.ini
@@ -0,0 +1,3 @@
+; Maximum amount of memory a script may consume (128MB)
+; http://php.net/memory-limit
+memory_limit = 512M
diff --git a/bootstrap.sh b/bootstrap.sh
index 6b9db0a..cc08022 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,38 +1,23 @@
 #!/bin/bash 
-set -euxo pipefail
+set -euo pipefail
 
-: ${ACCOUNT_NAME?} ${ACCOUNT_PASS?}
+install_drupal() {
+    ACCOUNT_NAME=$(echo $VCAP_SERVICES | jq -r '.["user-provided"][] | select(.name == "secrets") | .credentials.ROOT_USER_NAME')
+    ACCOUNT_PASS=$(echo $VCAP_SERVICES | jq -r '.["user-provided"][] | select(.name == "secrets") | .credentials.ROOT_USER_PASS')
 
-fail() {
-    echo FAIL $@
-    exit 1
-}
-
-bootstrap() {
-    creds=$(echo $VCAP_SERVICES | jq -r '.["aws-rds"][0].credentials')
-    [ $creds = "null" ] && fail "creds are null; need to bind database?"
-
-    db_type=mysql
-    db_user=$(echo $creds | jq -r '.username')
-    db_pass=$(echo $creds | jq -r '.password')
-    db_port=$(echo $creds | jq -r '.port')
-    db_host=$(echo $creds | jq -r '.host')
-    db_name=$(echo $creds | jq -r '.db_name')
+    : "${ACCOUNT_NAME:?Need and root user name for Drupal}"
+    : "${ACCOUNT_PASS:?Need and root user pass for Drupal}"
 
-    drupal site:install standard --root=$HOME/web --no-interaction \
-        --account-name=${ACCOUNT_NAME:-$(gen_cred ACCOUNT_NAME)} \
-        --account-pass=${ACCOUNT_PASS:-$(gen_cred ACCOUNT_PASS)} \
-        --langcode="en" \
-        --db-type=$db_type \
-        --db-user=$db_user \
-        --db-pass=$db_pass \
-        --db-port=$db_port \
-        --db-host=$db_host \
-        --db-name=$db_name 
+    drupal site:install \
+        --root=$HOME/web \
+        --no-interaction \
+        --account-name="$ACCOUNT_NAME" \
+        --account-pass="$ACCOUNT_PASS" \
+        --langcode="en"
 }
 
-drush --root=$HOME/web core-status bootstrap | grep -q "Successful" || bootstrap
-
-drush --root=$HOME/web pm-info flysystem_s3 --fields=Status | grep -q enabled ||
-    drush --root=$HOME/web pm-enable --yes flysystem_s3
-
+if [ "$CF_INSTANCE_INDEX" == "0" ]; then
+  drupal --root=$HOME/web list | grep database > /dev/null || install_drupal
+  # load configs here
+  # drupal --root=$HOME/web config:import ...
+fi
diff --git a/web/autoload.php b/web/autoload.php
index 1e5ad34..7d2408d 100644
--- a/web/autoload.php
+++ b/web/autoload.php
@@ -11,4 +11,4 @@
  * @see core/modules/statistics/statistics.php
  */
 
-return require __DIR__ . '/vendor/autoload.php';
+return require __DIR__ . '/../vendor/autoload.php';

From 4b02fff32cda6620125a1585ddb83c49c264cd7b Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 16 Mar 2018 08:42:29 -0400
Subject: [PATCH 015/143] Remove config/sync dir.

It's not used and now misleading.
---
 config/sync/.htaccess  | 23 -----------------------
 config/sync/README.txt |  1 -
 2 files changed, 24 deletions(-)
 delete mode 100644 config/sync/.htaccess
 delete mode 100644 config/sync/README.txt

diff --git a/config/sync/.htaccess b/config/sync/.htaccess
deleted file mode 100644
index 1238c0d..0000000
--- a/config/sync/.htaccess
+++ /dev/null
@@ -1,23 +0,0 @@
-# Deny all requests from Apache 2.4+.
-<IfModule mod_authz_core.c>
-  Require all denied
-</IfModule>
-
-# Deny all requests from Apache 2.0-2.2.
-<IfModule !mod_authz_core.c>
-  Deny from all
-</IfModule>
-# Turn off all options we don't need.
-Options -Indexes -ExecCGI -Includes -MultiViews
-
-# Set the catch-all handler to prevent scripts from being executed.
-SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
-<Files *>
-  # Override the handler again if we're run later in the evaluation list.
-  SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
-</Files>
-
-# If we know how to do it safely, disable the PHP engine entirely.
-<IfModule mod_php5.c>
-  php_flag engine off
-</IfModule>
\ No newline at end of file
diff --git a/config/sync/README.txt b/config/sync/README.txt
deleted file mode 100644
index 37874bd..0000000
--- a/config/sync/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains configuration to be imported into your Drupal site. To make this configuration active, visit admin/config/development/configuration/sync. For information about deploying configuration between servers, see https://www.drupal.org/documentation/administer/config
\ No newline at end of file

From f10e9b4d34de14594b1c02e598ad6a0d4c6bc8e9 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 16 Mar 2018 08:42:59 -0400
Subject: [PATCH 016/143] Tweaks to brightcove and remove nsf_brightcove.

The uuid isn't sensitive, so we're safe to include it (it might be referenced
by other configs in the future). This also removes the nsf-brightcove module,
which we don't have anymore.
---
 .../config/brightcove.brightcove_api_client.nsf_brightcove.yml  | 2 +-
 web/sites/default/config/core.extension.yml                     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml b/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
index 9e68a34..1f043c8 100644
--- a/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
+++ b/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
@@ -1,4 +1,4 @@
-uuid: ''
+uuid: f316d502-987f-40bd-bd64-f40440eda1e1
 langcode: en
 status: true
 dependencies: {  }
diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
index e6fcbce..e471ed4 100644
--- a/web/sites/default/config/core.extension.yml
+++ b/web/sites/default/config/core.extension.yml
@@ -44,7 +44,6 @@ module:
   media_entity_brightcove: 0
   menu_ui: 0
   node: 0
-  nsf_brightcove: 0
   options: 0
   page_cache: 0
   path: 0

From dc073d11156142adf5aee2672dd5153db627e3ff Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 15 Mar 2018 18:47:23 -0400
Subject: [PATCH 017/143] Add modules from dev site.

These are needed for the current config import. We'll likely remove some of
these in the future.
---
 composer.json |  10 +
 composer.lock | 966 ++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 955 insertions(+), 21 deletions(-)

diff --git a/composer.json b/composer.json
index 592a0f0..cf4062a 100644
--- a/composer.json
+++ b/composer.json
@@ -20,17 +20,27 @@
         "composer/installers": "^1.2",
         "cweagans/composer-patches": "^1.6",
         "drupal-composer/drupal-scaffold": "^2.2",
+        "drupal/bootstrap": "^3.11",
         "drupal/brightcove": "^1.3",
         "drupal/console": "^1.0.2",
         "drupal/core": "~8.4",
         "drupal/ctools": "^3.0",
+        "drupal/devel": "^1.2",
+        "drupal/diff": "^1.0@RC",
         "drupal/embed": "^1.0",
         "drupal/entity_browser": "^2.0",
+        "drupal/entity_embed": "^1.0@beta",
         "drupal/features": "^3.5",
         "drupal/flysystem_s3": "^1.0@alpha",
         "drupal/inline_entity_form": "^1.0@beta",
+        "drupal/masquerade": "^2.0@beta",
         "drupal/media_entity": "^1.7",
+        "drupal/pathauto": "^1.1",
+        "drupal/rules": "^3.0@alpha",
+        "drupal/scheduler": "^1.0",
         "drupal/time_formatter": "1.x-dev",
+        "drupal/tour_ui": "^1.0@alpha",
+        "drupal/workflow": "^1.0",
         "drush/drush": "~8.0|^9.0.0-beta8",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3"
diff --git a/composer.lock b/composer.lock
index a84e043..78cc147 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "ae64323942ce64e6e5d539ad1f16c42b",
+    "content-hash": "287a9d79b653b3dd88b2e1c3eefc99b6",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -259,6 +259,62 @@
             ],
             "time": "2018-01-19T11:00:22+00:00"
         },
+        {
+            "name": "caxy/php-htmldiff",
+            "version": "v0.1.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/caxy/php-htmldiff.git",
+                "reference": "231250a7a5358cbe9af5e2379a7f23d5c5bba2a2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/231250a7a5358cbe9af5e2379a7f23d5c5bba2a2",
+                "reference": "231250a7a5358cbe9af5e2379a7f23d5c5bba2a2",
+                "shasum": ""
+            },
+            "require": {
+                "ezyang/htmlpurifier": "^4.7",
+                "php": ">=5.3.3",
+                "sunra/php-simple-html-dom-parser": "^1.5"
+            },
+            "require-dev": {
+                "doctrine/cache": "~1.0",
+                "phpunit/phpunit": "~5.0"
+            },
+            "suggest": {
+                "doctrine/cache": "Used for caching the calculated diffs using a Doctrine Cache Provider"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Caxy\\HtmlDiff": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Josh Schroeder",
+                    "email": "jschroeder@caxy.com",
+                    "homepage": "http://www.caxy.com"
+                }
+            ],
+            "description": "A library for comparing two HTML files/snippets and highlighting the differences using simple HTML.",
+            "homepage": "https://github.com/caxy/php-htmldiff",
+            "keywords": [
+                "diff",
+                "html"
+            ],
+            "time": "2018-01-06T17:58:46+00:00"
+        },
         {
             "name": "chi-teck/drupal-code-generator",
             "version": "1.23.2",
@@ -1485,6 +1541,71 @@
             "description": "Composer Plugin for updating the Drupal scaffold files when using drupal/core",
             "time": "2017-12-08T22:53:11+00:00"
         },
+        {
+            "name": "drupal/bootstrap",
+            "version": "3.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/bootstrap",
+                "reference": "8.x-3.11"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/bootstrap-8.x-3.11.zip",
+                "reference": "8.x-3.11",
+                "shasum": "6ff80e37e2e1f916646300889f3392764c9cdb32"
+            },
+            "require": {
+                "drupal/core": "~8.0"
+            },
+            "type": "drupal-theme",
+            "extra": {
+                "branch-alias": {
+                    "dev-3.x": "3.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-3.11",
+                    "datestamp": "1520792884",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Carver (markcarver)",
+                    "homepage": "https://www.drupal.org/u/markcarver",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "John McCormick (neardark)",
+                    "homepage": "https://www.drupal.org/u/neardark",
+                    "role": "Co-maintainer"
+                },
+                {
+                    "name": "Fabiano Sant'Ana (wundo)",
+                    "homepage": "https://www.drupal.org/u/wundo",
+                    "role": "Co-maintainer"
+                },
+                {
+                    "name": "wundo",
+                    "homepage": "https://www.drupal.org/user/25523"
+                }
+            ],
+            "description": "Built to use Bootstrap, a sleek, intuitive, and powerful front-end framework for faster and easier web development.",
+            "homepage": "https://www.drupal.org/project/bootstrap",
+            "support": {
+                "source": "http://cgit.drupalcode.org/bootstrap",
+                "docs": "https://drupal-bootstrap.org",
+                "issues": "https://www.drupal.org/project/issues/bootstrap",
+                "irc": "irc://irc.freenode.org/drupal-bootstrap"
+            }
+        },
         {
             "name": "drupal/brightcove",
             "version": "1.3.0",
@@ -2207,6 +2328,174 @@
                 "issues": "https://www.drupal.org/project/issues/ctools"
             }
         },
+        {
+            "name": "drupal/devel",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/devel",
+                "reference": "8.x-1.2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/devel-8.x-1.2.zip",
+                "reference": "8.x-1.2",
+                "shasum": "01f3349ef75f6e21fceef24be9d3d6506ca29647"
+            },
+            "require": {
+                "drupal/core": "~8.0"
+            },
+            "suggest": {
+                "symfony/var-dumper": "Pretty print complex values better with var-dumper available"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.2",
+                    "datestamp": "1507197844",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Moshe Weitzman",
+                    "homepage": "https://github.com/weitzman",
+                    "email": "weitzman@tejasa.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Hans Salvisberg",
+                    "homepage": "https://www.drupal.org/u/salvis",
+                    "email": "drupal@salvisberg.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Luca Lusso",
+                    "homepage": "https://www.drupal.org/u/lussoluca",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Marco (willzyx)",
+                    "homepage": "https://www.drupal.org/u/willzyx",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "See contributors",
+                    "homepage": "https://www.drupal.org/node/3236/committers"
+                },
+                {
+                    "name": "salvis",
+                    "homepage": "https://www.drupal.org/user/82964"
+                },
+                {
+                    "name": "willzyx",
+                    "homepage": "https://www.drupal.org/user/1043862"
+                }
+            ],
+            "description": "Various blocks, pages, and functions for developers.",
+            "homepage": "http://drupal.org/project/devel",
+            "support": {
+                "source": "http://cgit.drupalcode.org/devel",
+                "issues": "http://drupal.org/project/devel",
+                "irc": "irc://irc.freenode.org/drupal-contribute"
+            }
+        },
+        {
+            "name": "drupal/diff",
+            "version": "1.0.0-rc1",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/diff",
+                "reference": "8.x-1.0-rc1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/diff-8.x-1.0-rc1.zip",
+                "reference": "8.x-1.0-rc1",
+                "shasum": "4945154c2c07444195a7ae07011a3b3db941c72a"
+            },
+            "require": {
+                "drupal/core": "~8.0",
+                "mkalkbrenner/php-htmldiff-advanced": "~0.0.8"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0-rc1",
+                    "datestamp": "1484566683",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "RC releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Miro Dietiker (miro_dietiker)",
+                    "homepage": "https://www.drupal.org/u/miro_dietiker",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Juampy NR (juampynr)",
+                    "homepage": "https://www.drupal.org/u/juampynr",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Lucian Hangea (lhangea)",
+                    "homepage": "https://www.drupal.org/u/lhangea",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Alan D.",
+                    "homepage": "https://www.drupal.org/u/alan-d.",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Brian Gilbert (realityloop).",
+                    "homepage": "https://www.drupal.org/u/realityloop",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "miro_dietiker",
+                    "homepage": "https://www.drupal.org/user/227761"
+                },
+                {
+                    "name": "realityloop",
+                    "homepage": "https://www.drupal.org/user/139189"
+                },
+                {
+                    "name": "rötzi",
+                    "homepage": "https://www.drupal.org/user/73064"
+                },
+                {
+                    "name": "yhahn",
+                    "homepage": "https://www.drupal.org/user/264833"
+                }
+            ],
+            "description": "Compares two entity revisions",
+            "homepage": "https://www.drupal.org/project/diff",
+            "support": {
+                "source": "http://cgit.drupalcode.org/diff",
+                "issues": "https://www.drupal.org/project/issues/diff"
+            }
+        },
         {
             "name": "drupal/embed",
             "version": "1.0.0",
@@ -2418,6 +2707,75 @@
                 "irc": "irc://irc.freenode.org/drupal-contribute"
             }
         },
+        {
+            "name": "drupal/entity_embed",
+            "version": "1.0.0-beta2",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/entity_embed",
+                "reference": "8.x-1.0-beta2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/entity_embed-8.x-1.0-beta2.zip",
+                "reference": "8.x-1.0-beta2",
+                "shasum": "21cdeb2b058efce461683aed9a8951053512dca7"
+            },
+            "require": {
+                "drupal/core": "*",
+                "drupal/embed": "*"
+            },
+            "require-dev": {
+                "drupal/entity_browser": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0-beta2",
+                    "datestamp": "1476698339",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Beta releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Dave Reid",
+                    "homepage": "https://www.drupal.org/user/53892"
+                },
+                {
+                    "name": "Devin Carlson",
+                    "homepage": "https://www.drupal.org/user/290182"
+                },
+                {
+                    "name": "Drupal Media Team",
+                    "homepage": "https://www.drupal.org/user/3260690"
+                },
+                {
+                    "name": "cs_shadow",
+                    "homepage": "https://www.drupal.org/user/2828287"
+                },
+                {
+                    "name": "slashrsm",
+                    "homepage": "https://www.drupal.org/user/744628"
+                }
+            ],
+            "description": "Allows any entity to be embedded within a text area using a WYSIWYG editor.",
+            "homepage": "https://www.drupal.org/project/entity_embed",
+            "support": {
+                "source": "http://cgit.drupalcode.org/entity_embed",
+                "issues": "https://www.drupal.org/project/issues/entity_embed",
+                "irc": "irc://irc.freenode.org/drupal-media"
+            }
+        },
         {
             "name": "drupal/features",
             "version": "3.7.0",
@@ -2677,38 +3035,33 @@
             }
         },
         {
-            "name": "drupal/media_entity",
-            "version": "1.7.0",
+            "name": "drupal/masquerade",
+            "version": "2.0.0-beta1",
             "source": {
                 "type": "git",
-                "url": "https://git.drupal.org/project/media_entity",
-                "reference": "8.x-1.7"
+                "url": "https://git.drupal.org/project/masquerade",
+                "reference": "8.x-2.0-beta1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/media_entity-8.x-1.7.zip",
-                "reference": "8.x-1.7",
-                "shasum": "5f7ccdf1db07732f3c94e642e60d88746e73cc86"
+                "url": "https://ftp.drupal.org/files/projects/masquerade-8.x-2.0-beta1.zip",
+                "reference": "8.x-2.0-beta1",
+                "shasum": "d8071c2b01db9a3cc5d5bc8ecd570276e12840d4"
             },
             "require": {
-                "drupal/core": "*",
-                "drupal/entity": "*"
-            },
-            "require-dev": {
-                "drupal/entity": "*",
-                "drupal/inline_entity_form": "*"
+                "drupal/core": "*"
             },
             "type": "drupal-module",
             "extra": {
                 "branch-alias": {
-                    "dev-1.x": "1.x-dev"
+                    "dev-2.x": "2.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.7",
-                    "datestamp": "1510737185",
+                    "version": "8.x-2.0-beta1",
+                    "datestamp": "1481184923",
                     "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
+                        "status": "not-covered",
+                        "message": "Project has not opted into security advisory coverage!"
                     }
                 }
             },
@@ -2718,7 +3071,79 @@
             ],
             "authors": [
                 {
-                    "name": "Berdir",
+                    "name": "Gurpartap Singh",
+                    "homepage": "https://www.drupal.org/user/41470"
+                },
+                {
+                    "name": "andypost",
+                    "homepage": "https://www.drupal.org/user/118908"
+                },
+                {
+                    "name": "deekayen",
+                    "homepage": "https://www.drupal.org/user/972"
+                },
+                {
+                    "name": "deviantintegral",
+                    "homepage": "https://www.drupal.org/user/71291"
+                },
+                {
+                    "name": "shrop",
+                    "homepage": "https://www.drupal.org/user/14767"
+                },
+                {
+                    "name": "sun",
+                    "homepage": "https://www.drupal.org/user/54136"
+                }
+            ],
+            "description": "Allows privileged users to masquerade as another user.",
+            "homepage": "https://www.drupal.org/project/masquerade",
+            "support": {
+                "source": "http://cgit.drupalcode.org/masquerade"
+            }
+        },
+        {
+            "name": "drupal/media_entity",
+            "version": "1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/media_entity",
+                "reference": "8.x-1.7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/media_entity-8.x-1.7.zip",
+                "reference": "8.x-1.7",
+                "shasum": "5f7ccdf1db07732f3c94e642e60d88746e73cc86"
+            },
+            "require": {
+                "drupal/core": "*",
+                "drupal/entity": "*"
+            },
+            "require-dev": {
+                "drupal/entity": "*",
+                "drupal/inline_entity_form": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.7",
+                    "datestamp": "1510737185",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Berdir",
                     "homepage": "https://www.drupal.org/user/214652"
                 },
                 {
@@ -2776,6 +3201,187 @@
                 "source": "http://cgit.drupalcode.org/media_entity"
             }
         },
+        {
+            "name": "drupal/pathauto",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/pathauto",
+                "reference": "8.x-1.1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.1.zip",
+                "reference": "8.x-1.1",
+                "shasum": "3e24c9ff419c1f4bbe9d638eb7477a2169777a11"
+            },
+            "require": {
+                "drupal/core": "*",
+                "drupal/ctools": "*",
+                "drupal/token": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.1",
+                    "datestamp": "1520092685",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Berdir",
+                    "homepage": "https://www.drupal.org/user/214652"
+                },
+                {
+                    "name": "Dave Reid",
+                    "homepage": "https://www.drupal.org/user/53892"
+                },
+                {
+                    "name": "Freso",
+                    "homepage": "https://www.drupal.org/user/27504"
+                },
+                {
+                    "name": "greggles",
+                    "homepage": "https://www.drupal.org/user/36762"
+                }
+            ],
+            "description": "Provides a mechanism for modules to automatically generate aliases for the content they manage.",
+            "homepage": "https://www.drupal.org/project/pathauto",
+            "support": {
+                "source": "http://cgit.drupalcode.org/pathauto"
+            }
+        },
+        {
+            "name": "drupal/rules",
+            "version": "3.0.0-alpha3",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/rules",
+                "reference": "8.x-3.0-alpha3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/rules-8.x-3.0-alpha3.zip",
+                "reference": "8.x-3.0-alpha3",
+                "shasum": "e8cf4212479a6f8418b519c93b08a8bd22cf00d3"
+            },
+            "require": {
+                "drupal/core": "~8.0",
+                "drupal/typed_data": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-3.x": "3.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-3.0-alpha3",
+                    "datestamp": "1495743783",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Alpha releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "fago",
+                    "homepage": "https://www.drupal.org/user/16747"
+                },
+                {
+                    "name": "klausi",
+                    "homepage": "https://www.drupal.org/user/262198"
+                }
+            ],
+            "description": "React on events and conditionally evaluate actions.",
+            "homepage": "https://www.drupal.org/project/rules",
+            "support": {
+                "source": "http://cgit.drupalcode.org/rules"
+            }
+        },
+        {
+            "name": "drupal/scheduler",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/scheduler",
+                "reference": "8.x-1.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/scheduler-8.x-1.0.zip",
+                "reference": "8.x-1.0",
+                "shasum": "213025b64b417f459b73d260d7287ca1f916d587"
+            },
+            "require": {
+                "drupal/core": "*"
+            },
+            "require-dev": {
+                "drupal/devel_generate": "*",
+                "drupal/rules": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0",
+                    "datestamp": "1510690385",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Eric Schaefer (Eric Schaefer)",
+                    "homepage": "https://www.drupal.org/u/eric-schaefer",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Jonathan Smith (jonathan1055)",
+                    "homepage": "https://www.drupal.org/u/jonathan1055",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Pieter Frenssen (pfrenssen)",
+                    "homepage": "https://www.drupal.org/u/pfrenssen",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Rick Manelius (rickmanelius)",
+                    "homepage": "https://www.drupal.org/u/rickmanelius",
+                    "role": "Maintainer"
+                }
+            ],
+            "description": "Automatically publish and unpublish content at specified dates and times.",
+            "homepage": "https://drupal.org/project/scheduler",
+            "support": {
+                "source": "http://cgit.drupalcode.org/scheduler",
+                "issues": "https://www.drupal.org/project/issues/scheduler"
+            }
+        },
         {
             "name": "drupal/time_formatter",
             "version": "dev-1.x",
@@ -2905,6 +3511,187 @@
                 "source": "http://cgit.drupalcode.org/token"
             }
         },
+        {
+            "name": "drupal/tour_ui",
+            "version": "1.0.0-alpha1",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/tour_ui",
+                "reference": "8.x-1.0-alpha1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/tour_ui-8.x-1.0-alpha1.zip",
+                "reference": "8.x-1.0-alpha1",
+                "shasum": "3c60a163c5699ad31c1a5fb349d5cb639e65e9f0"
+            },
+            "require": {
+                "drupal/core": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0-alpha1",
+                    "datestamp": "1496774342",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Alpha releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "GoZ",
+                    "homepage": "https://www.drupal.org/user/226961"
+                },
+                {
+                    "name": "clemens.tolboom",
+                    "homepage": "https://www.drupal.org/user/125814"
+                },
+                {
+                    "name": "nick_schuch",
+                    "homepage": "https://www.drupal.org/user/1412036"
+                }
+            ],
+            "description": "Provides a UI to manage guided tours.",
+            "homepage": "https://www.drupal.org/project/tour_ui",
+            "support": {
+                "source": "http://cgit.drupalcode.org/tour_ui"
+            }
+        },
+        {
+            "name": "drupal/typed_data",
+            "version": "1.0.0-alpha1",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/typed_data",
+                "reference": "8.x-1.0-alpha1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/typed_data-8.x-1.0-alpha1.zip",
+                "reference": "8.x-1.0-alpha1",
+                "shasum": "69b7230546bfea53d57f8923183e964137f5a456"
+            },
+            "require": {
+                "drupal/core": "~8.0"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0-alpha1",
+                    "datestamp": "1475245822",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Alpha releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "fago",
+                    "homepage": "https://www.drupal.org/user/16747"
+                }
+            ],
+            "description": "Extends the core Typed Data API with new APIS and features.",
+            "homepage": "https://www.drupal.org/project/typed_data",
+            "support": {
+                "source": "http://cgit.drupalcode.org/typed_data"
+            }
+        },
+        {
+            "name": "drupal/workflow",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/workflow",
+                "reference": "8.x-1.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/workflow-8.x-1.0.zip",
+                "reference": "8.x-1.0",
+                "shasum": "2c439aab3f92b476cb88dbc517e131ea3cd7be47"
+            },
+            "require": {
+                "drupal/core": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0",
+                    "datestamp": "1513552385",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Bastlynn",
+                    "homepage": "https://www.drupal.org/user/275249"
+                },
+                {
+                    "name": "Heine",
+                    "homepage": "https://www.drupal.org/user/17943"
+                },
+                {
+                    "name": "JacobSingh",
+                    "homepage": "https://www.drupal.org/user/68912"
+                },
+                {
+                    "name": "NancyDru",
+                    "homepage": "https://www.drupal.org/user/101412"
+                },
+                {
+                    "name": "eaton",
+                    "homepage": "https://www.drupal.org/user/16496"
+                },
+                {
+                    "name": "johnv",
+                    "homepage": "https://www.drupal.org/user/591042"
+                },
+                {
+                    "name": "jvandyk",
+                    "homepage": "https://www.drupal.org/user/2375"
+                },
+                {
+                    "name": "mfredrickson",
+                    "homepage": "https://www.drupal.org/user/31994"
+                },
+                {
+                    "name": "q0rban",
+                    "homepage": "https://www.drupal.org/user/31022"
+                }
+            ],
+            "description": "Defines a field type with Workflows, containing customizable state transitions.",
+            "homepage": "https://www.drupal.org/project/workflow",
+            "support": {
+                "source": "http://cgit.drupalcode.org/workflow"
+            }
+        },
         {
             "name": "drush/drush",
             "version": "9.2.1",
@@ -3120,6 +3907,53 @@
             ],
             "time": "2017-02-03T22:48:59+00:00"
         },
+        {
+            "name": "ezyang/htmlpurifier",
+            "version": "v4.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ezyang/htmlpurifier.git",
+                "reference": "d85d39da4576a6934b72480be6978fb10c860021"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d85d39da4576a6934b72480be6978fb10c860021",
+                "reference": "d85d39da4576a6934b72480be6978fb10c860021",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2"
+            },
+            "require-dev": {
+                "simpletest/simpletest": "^1.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "HTMLPurifier": "library/"
+                },
+                "files": [
+                    "library/HTMLPurifier.composer.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL"
+            ],
+            "authors": [
+                {
+                    "name": "Edward Z. Yang",
+                    "email": "admin@htmlpurifier.org",
+                    "homepage": "http://ezyang.com"
+                }
+            ],
+            "description": "Standards compliant HTML filter written in PHP",
+            "homepage": "http://htmlpurifier.org/",
+            "keywords": [
+                "html"
+            ],
+            "time": "2018-02-23T01:58:20+00:00"
+        },
         {
             "name": "grasmash/expander",
             "version": "1.0.0",
@@ -3790,6 +4624,43 @@
             ],
             "time": "2017-09-04T12:26:28+00:00"
         },
+        {
+            "name": "mkalkbrenner/php-htmldiff-advanced",
+            "version": "0.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mkalkbrenner/php-htmldiff.git",
+                "reference": "3a714b48c9c3d3730baaf6d3949691e654cd37c9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mkalkbrenner/php-htmldiff/zipball/3a714b48c9c3d3730baaf6d3949691e654cd37c9",
+                "reference": "3a714b48c9c3d3730baaf6d3949691e654cd37c9",
+                "shasum": ""
+            },
+            "require": {
+                "caxy/php-htmldiff": ">=0.0.6",
+                "php": ">=5.5.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/HtmlDiffAdvancedInterface.php",
+                    "src/HtmlDiffAdvanced.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GNU General Public License V2"
+            ],
+            "description": "An add-on for the php-htmldiff library for comparing two HTML files/snippets and highlighting the differences using simple HTML.",
+            "homepage": "https://github.com/mkalkbrenner/php-htmldiff",
+            "keywords": [
+                "diff",
+                "html"
+            ],
+            "time": "2016-07-25T17:07:32+00:00"
+        },
         {
             "name": "mtdowling/jmespath.php",
             "version": "2.4.0",
@@ -4291,6 +5162,54 @@
             "description": "Automatic BASH completion for Symfony Console Component based applications.",
             "time": "2016-02-24T05:08:54+00:00"
         },
+        {
+            "name": "sunra/php-simple-html-dom-parser",
+            "version": "v1.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sunra/php-simple-html-dom-parser.git",
+                "reference": "75b9b1cb64502d8f8c04dc11b5906b969af247c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sunra/php-simple-html-dom-parser/zipball/75b9b1cb64502d8f8c04dc11b5906b969af247c6",
+                "reference": "75b9b1cb64502d8f8c04dc11b5906b969af247c6",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Sunra\\PhpSimple\\HtmlDomParser": "Src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sunra",
+                    "email": "sunra@yandex.ru",
+                    "homepage": "https://github.com/sunra"
+                },
+                {
+                    "name": "S.C. Chen",
+                    "homepage": "http://sourceforge.net/projects/simplehtmldom/"
+                }
+            ],
+            "description": "Composer adaptation of: A HTML DOM parser written in PHP5+ let you manipulate HTML in a very easy way! Require PHP 5+. Supports invalid HTML. Find tags on an HTML page with selectors just like jQuery. Extract contents from HTML in a single line.",
+            "homepage": "https://github.com/sunra/php-simple-html-dom-parser",
+            "keywords": [
+                "dom",
+                "html",
+                "parser"
+            ],
+            "time": "2016-11-22T22:57:47+00:00"
+        },
         {
             "name": "symfony-cmf/routing",
             "version": "1.4.1",
@@ -7709,9 +8628,14 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
+        "drupal/diff": 5,
+        "drupal/entity_embed": 10,
         "drupal/flysystem_s3": 15,
         "drupal/inline_entity_form": 10,
-        "drupal/time_formatter": 20
+        "drupal/masquerade": 10,
+        "drupal/rules": 15,
+        "drupal/time_formatter": 20,
+        "drupal/tour_ui": 15
     },
     "prefer-stable": true,
     "prefer-lowest": false,

From 192c979715bf9769ec12b41a2cd2dc2fb72a3551 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 15 Mar 2018 18:48:44 -0400
Subject: [PATCH 018/143] Ignore additional local development files.

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8603770..69b6639 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,8 @@ vendor
 
 # Ignore local versions of modules.
 modules/*
+web/modules/contrib/*
+web/themes/contrib/*
 
 # Ignore local database dumps.
 db_dumps

From bf15e16a6d595f0a7e19154f5281bec5c4ae8ca1 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 15 Mar 2018 18:53:37 -0400
Subject: [PATCH 019/143] Cleanup when installing Drupal for the first time.

The "standard" install profile adds a "shortcut_set" that conflicts with our
configs, so we need to remove it. Similarly, we need to indicate that our
Drupal install is downstream from a set of configurations (by giving it the
same UUID as those configs).
---
 bootstrap.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bootstrap.sh b/bootstrap.sh
index cc08022..f71f800 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -14,6 +14,12 @@ install_drupal() {
         --account-name="$ACCOUNT_NAME" \
         --account-pass="$ACCOUNT_PASS" \
         --langcode="en"
+    # Delete some data created in the "standard" install profile
+    # See https://www.drupal.org/project/drupal/issues/2583113
+    drupal --root=$HOME/web entity:delete shortcut_set default --no-interaction
+    # Set site uuid to match our config
+    UUID=$(grep uuid web/sites/default/config/system.site.yml | cut -d' ' -f2)
+    drupal --root=$HOME/web config:override system.site uuid $UUID
 }
 
 if [ "$CF_INSTANCE_INDEX" == "0" ]; then

From 3318f5c2070ca824fa2d6aa998e1f2357756c1f4 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 15 Mar 2018 18:58:46 -0400
Subject: [PATCH 020/143] Load configs when bootstrapping.

This will effectively duplicate the latest config changes. It also clears the
cache, in case it'd have been affected by code/theme changes.
---
 bootstrap.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index f71f800..fbecd14 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -24,6 +24,8 @@ install_drupal() {
 
 if [ "$CF_INSTANCE_INDEX" == "0" ]; then
   drupal --root=$HOME/web list | grep database > /dev/null || install_drupal
-  # load configs here
-  # drupal --root=$HOME/web config:import ...
+  # Sync configs from code
+  drupal --root=$HOME/web config:import --directory $HOME/web/sites/default/config
+  # Clear the cache
+  drupal --root=$HOME/web cache:rebuild --no-interaction
 fi

From 228b62f482f890e3cb83ad4082f46ec2fc3ac5b6 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 16 Mar 2018 08:26:17 -0400
Subject: [PATCH 021/143] Load secrets in bootstrap script.

We'll fetch these from the "secrets" service and set them via drupal
config:override. Note that this sends its output to /dev/null, lest the
sensitive data become part of the app longs.
---
 bootstrap.sh | 23 ++++++++++++++++++-----
 manifest.yml |  9 ++++++++-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index fbecd14..01db844 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,9 +1,11 @@
 #!/bin/bash 
 set -euo pipefail
 
+SECRETS=$(echo $VCAP_SERVICES | jq -r '.["user-provided"][] | select(.name == "secrets") | .credentials')
+
 install_drupal() {
-    ACCOUNT_NAME=$(echo $VCAP_SERVICES | jq -r '.["user-provided"][] | select(.name == "secrets") | .credentials.ROOT_USER_NAME')
-    ACCOUNT_PASS=$(echo $VCAP_SERVICES | jq -r '.["user-provided"][] | select(.name == "secrets") | .credentials.ROOT_USER_PASS')
+    ROOT_USER_NAME=$(echo $SECRETS | jq -r '.ROOT_USER_NAME')
+    ROOT_USER_PASS=$(echo $SECRETS | jq -r '.ROOT_USER_PASS')
 
     : "${ACCOUNT_NAME:?Need and root user name for Drupal}"
     : "${ACCOUNT_PASS:?Need and root user pass for Drupal}"
@@ -11,8 +13,8 @@ install_drupal() {
     drupal site:install \
         --root=$HOME/web \
         --no-interaction \
-        --account-name="$ACCOUNT_NAME" \
-        --account-pass="$ACCOUNT_PASS" \
+        --account-name="$ROOT_USER_NAME" \
+        --account-pass="$ROOT_USER_PASS" \
         --langcode="en"
     # Delete some data created in the "standard" install profile
     # See https://www.drupal.org/project/drupal/issues/2583113
@@ -22,10 +24,21 @@ install_drupal() {
     drupal --root=$HOME/web config:override system.site uuid $UUID
 }
 
-if [ "$CF_INSTANCE_INDEX" == "0" ]; then
+if [ "${CF_INSTANCE_INDEX:-''}" == "0" ]; then
   drupal --root=$HOME/web list | grep database > /dev/null || install_drupal
   # Sync configs from code
   drupal --root=$HOME/web config:import --directory $HOME/web/sites/default/config
+
+  # Secrets
+  CRON_KEY=$(openssl rand -base64 32)  # Not used, so we set it to a random val
+  BRIGHTCOVE_ACCOUNT=$(echo $SECRETS | jq -r '.BRIGHTCOVE_ACCOUNT')
+  BRIGHTCOVE_CLIENT=$(echo $SECRETS | jq -r '.BRIGHTCOVE_CLIENT')
+  BRIGHTCOVE_SECRET=$(echo $SECRETS | jq -r '.BRIGHTCOVE_SECRET')
+  drupal --root=$HOME/web config:override scheduler.settings lightweight_cron_access_key $CRON_KEY > /dev/null
+  drupal --root=$HOME/web config:override brightcove.brightcove_api_client.nsf_brightcove account_id $BRIGHTCOVE_ACCOUNT > /dev/null
+  drupal --root=$HOME/web config:override brightcove.brightcove_api_client.nsf_brightcove client_id $BRIGHTCOVE_CLIENT > /dev/null
+  drupal --root=$HOME/web config:override brightcove.brightcove_api_client.nsf_brightcove secret_key $BRIGHTCOVE_SECRET > /dev/null
+
   # Clear the cache
   drupal --root=$HOME/web cache:rebuild --no-interaction
 fi
diff --git a/manifest.yml b/manifest.yml
index 60e8f74..976bf3c 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -8,5 +8,12 @@ applications:
   timeout: 180
   services:
     - database # cf create-service aws-rds medium-mysql database
-    - secrets  # cf create-user-provided-service secrets -p '{"ROOT_USER_NAME": ..., "ROOT_USER_PASS": ..., "HASH_SALT": ...}'
+    - secrets  # cf create-user-provided-service secrets -p '{
+               # "BRIGHTCOVE_ACCOUNT": ...
+               # "BRIGHTCOVE_CLIENT": ...
+               # "BRIGHTCOVE_SECRET": ...
+               # "HASH_SALT": ...
+               # "ROOT_USER_NAME": ...,
+               # "ROOT_USER_PASS": ...,
+               # }'
     - storage  # cf create-service s3 basic storage

From 08e4409649945b787962e0f73cf3973b65fd810d Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 16 Mar 2018 08:27:47 -0400
Subject: [PATCH 022/143] Move htaccess to an accessible location.

---
 .htaccess => web/.htaccess | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .htaccess => web/.htaccess (100%)

diff --git a/.htaccess b/web/.htaccess
similarity index 100%
rename from .htaccess
rename to web/.htaccess

From 52407386330665ea004b343a6d04f790bff3a117 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 16 Mar 2018 09:15:50 -0400
Subject: [PATCH 023/143] Remove dev reqs; tweak composer description.

---
 composer.json |   11 +-
 composer.lock | 1467 +------------------------------------------------
 2 files changed, 26 insertions(+), 1452 deletions(-)

diff --git a/composer.json b/composer.json
index cf4062a..cb54389 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "18f/nsf",
-    "description": "Project template for Drupal 8 projects with composer",
+    "description": "The National Science Foundation's beta site",
     "type": "project",
     "license": "GPL-2.0+",
     "authors": [
@@ -45,15 +45,6 @@
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3"
     },
-    "require-dev": {
-        "behat/mink": "~1.7",
-        "behat/mink-goutte-driver": "~1.2",
-        "jcalderonzumba/gastonjs": "~1.0.2",
-        "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
-        "mikey179/vfsstream": "~1.2",
-        "phpunit/phpunit": ">=4.8.28 <5",
-        "symfony/css-selector": "~2.8|~3.0"
-    },
     "conflict": {
         "drupal/drupal": "*"
     },
diff --git a/composer.lock b/composer.lock
index 78cc147..f458f9f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "287a9d79b653b3dd88b2e1c3eefc99b6",
+    "content-hash": "1e8f381c09766b5590557d88c592e396",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -124,16 +124,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.52.25",
+            "version": "3.52.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "c1ce16adeeb9a47270f6ba8fb7aef5e1d62fa7d0"
+                "reference": "2ff982460d5c5eb0a57b7c38bd9ad4e9c2f05c86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c1ce16adeeb9a47270f6ba8fb7aef5e1d62fa7d0",
-                "reference": "c1ce16adeeb9a47270f6ba8fb7aef5e1d62fa7d0",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2ff982460d5c5eb0a57b7c38bd9ad4e9c2f05c86",
+                "reference": "2ff982460d5c5eb0a57b7c38bd9ad4e9c2f05c86",
                 "shasum": ""
             },
             "require": {
@@ -200,7 +200,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2018-03-13T19:14:00+00:00"
+            "time": "2018-03-15T19:43:26+00:00"
         },
         {
             "name": "brightcove/api",
@@ -261,16 +261,16 @@
         },
         {
             "name": "caxy/php-htmldiff",
-            "version": "v0.1.6",
+            "version": "v0.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/caxy/php-htmldiff.git",
-                "reference": "231250a7a5358cbe9af5e2379a7f23d5c5bba2a2"
+                "reference": "48c70a963e803b93fe68a191e62d0770b5446f0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/231250a7a5358cbe9af5e2379a7f23d5c5bba2a2",
-                "reference": "231250a7a5358cbe9af5e2379a7f23d5c5bba2a2",
+                "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/48c70a963e803b93fe68a191e62d0770b5446f0b",
+                "reference": "48c70a963e803b93fe68a191e62d0770b5446f0b",
                 "shasum": ""
             },
             "require": {
@@ -313,7 +313,7 @@
                 "diff",
                 "html"
             ],
-            "time": "2018-01-06T17:58:46+00:00"
+            "time": "2018-03-15T21:23:44+00:00"
         },
         {
             "name": "chi-teck/drupal-code-generator",
@@ -5035,19 +5035,27 @@
         },
         {
             "name": "sebastian/version",
-            "version": "1.0.6",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=5.6"
+            },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -5066,7 +5074,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21T13:59:46+00:00"
+            "time": "2016-10-03T07:35:21+00:00"
         },
         {
             "name": "stack/builder",
@@ -7199,1432 +7207,7 @@
             "time": "2016-09-13T14:38:50+00:00"
         }
     ],
-    "packages-dev": [
-        {
-            "name": "behat/mink",
-            "version": "v1.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/minkphp/Mink.git",
-                "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/e6930b9c74693dff7f4e58577e1b1743399f3ff9",
-                "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1",
-                "symfony/css-selector": "~2.1|~3.0"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7|~3.0"
-            },
-            "suggest": {
-                "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
-                "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
-                "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
-                "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Behat\\Mink\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Browser controller/emulator abstraction for PHP",
-            "homepage": "http://mink.behat.org/",
-            "keywords": [
-                "browser",
-                "testing",
-                "web"
-            ],
-            "time": "2016-03-05T08:26:18+00:00"
-        },
-        {
-            "name": "behat/mink-browserkit-driver",
-            "version": "v1.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
-                "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/10e67fb4a295efcd62ea0bf16025a85ea19534fb",
-                "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb",
-                "shasum": ""
-            },
-            "require": {
-                "behat/mink": "^1.7.1@dev",
-                "php": ">=5.3.6",
-                "symfony/browser-kit": "~2.3|~3.0",
-                "symfony/dom-crawler": "~2.3|~3.0"
-            },
-            "require-dev": {
-                "silex/silex": "~1.2",
-                "symfony/phpunit-bridge": "~2.7|~3.0"
-            },
-            "type": "mink-driver",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Behat\\Mink\\Driver\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Symfony2 BrowserKit driver for Mink framework",
-            "homepage": "http://mink.behat.org/",
-            "keywords": [
-                "Mink",
-                "Symfony2",
-                "browser",
-                "testing"
-            ],
-            "time": "2016-03-05T08:59:47+00:00"
-        },
-        {
-            "name": "behat/mink-goutte-driver",
-            "version": "v1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/minkphp/MinkGoutteDriver.git",
-                "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
-                "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
-                "shasum": ""
-            },
-            "require": {
-                "behat/mink": "~1.6@dev",
-                "behat/mink-browserkit-driver": "~1.2@dev",
-                "fabpot/goutte": "~1.0.4|~2.0|~3.1",
-                "php": ">=5.3.1"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7|~3.0"
-            },
-            "type": "mink-driver",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Behat\\Mink\\Driver\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Goutte driver for Mink framework",
-            "homepage": "http://mink.behat.org/",
-            "keywords": [
-                "browser",
-                "goutte",
-                "headless",
-                "testing"
-            ],
-            "time": "2016-03-05T09:04:22+00:00"
-        },
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "^6.2.3",
-                "squizlabs/php_codesniffer": "^3.0.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2017-07-22T11:58:36+00:00"
-        },
-        {
-            "name": "fabpot/goutte",
-            "version": "v3.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FriendsOfPHP/Goutte.git",
-                "reference": "395f61d7c2e15a813839769553a4de16fa3b3c96"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/395f61d7c2e15a813839769553a4de16fa3b3c96",
-                "reference": "395f61d7c2e15a813839769553a4de16fa3b3c96",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/guzzle": "^6.0",
-                "php": ">=5.5.0",
-                "symfony/browser-kit": "~2.1|~3.0|~4.0",
-                "symfony/css-selector": "~2.1|~3.0|~4.0",
-                "symfony/dom-crawler": "~2.1|~3.0|~4.0"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "^3.3 || ^4"
-            },
-            "type": "application",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Goutte\\": "Goutte"
-                },
-                "exclude-from-classmap": [
-                    "Goutte/Tests"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "A simple PHP Web Scraper",
-            "homepage": "https://github.com/FriendsOfPHP/Goutte",
-            "keywords": [
-                "scraper"
-            ],
-            "time": "2017-11-19T08:45:40+00:00"
-        },
-        {
-            "name": "jcalderonzumba/gastonjs",
-            "version": "v1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/jcalderonzumba/gastonjs.git",
-                "reference": "4ff4a788d4995ae0d4b45fdcb1b76650e2eec72a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/4ff4a788d4995ae0d4b45fdcb1b76650e2eec72a",
-                "reference": "4ff4a788d4995ae0d4b45fdcb1b76650e2eec72a",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/guzzle": "~5.0|~6.0",
-                "php": ">=5.4"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.6",
-                "silex/silex": "~1.2",
-                "symfony/phpunit-bridge": "~2.7",
-                "symfony/process": "~2.1"
-            },
-            "type": "phantomjs-api",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zumba\\GastonJS\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Juan Francisco Calderón Zumba",
-                    "email": "juanfcz@gmail.com",
-                    "homepage": "http://github.com/jcalderonzumba"
-                }
-            ],
-            "description": "PhantomJS API based server for webpage automation",
-            "homepage": "https://github.com/jcalderonzumba/gastonjs",
-            "keywords": [
-                "api",
-                "automation",
-                "browser",
-                "headless",
-                "phantomjs"
-            ],
-            "time": "2016-05-04T16:27:07+00:00"
-        },
-        {
-            "name": "jcalderonzumba/mink-phantomjs-driver",
-            "version": "v0.3.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/jcalderonzumba/MinkPhantomJSDriver.git",
-                "reference": "008f43670e94acd39273d15add1e7348eb23848d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/008f43670e94acd39273d15add1e7348eb23848d",
-                "reference": "008f43670e94acd39273d15add1e7348eb23848d",
-                "shasum": ""
-            },
-            "require": {
-                "behat/mink": "~1.7",
-                "jcalderonzumba/gastonjs": "~1.0",
-                "php": ">=5.4",
-                "twig/twig": "~1.20|~2.0"
-            },
-            "require-dev": {
-                "mink/driver-testsuite": "dev-master",
-                "phpunit/phpunit": "~4.6"
-            },
-            "type": "mink-driver",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zumba\\Mink\\Driver\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Juan Francisco Calderón Zumba",
-                    "email": "juanfcz@gmail.com",
-                    "homepage": "http://github.com/jcalderonzumba"
-                }
-            ],
-            "description": "PhantomJS driver for Mink framework",
-            "homepage": "http://mink.behat.org/",
-            "keywords": [
-                "ajax",
-                "browser",
-                "headless",
-                "javascript",
-                "phantomjs",
-                "testing"
-            ],
-            "time": "2016-12-01T10:57:30+00:00"
-        },
-        {
-            "name": "mikey179/vfsStream",
-            "version": "v1.6.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/mikey179/vfsStream.git",
-                "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
-                "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "org\\bovigo\\vfs\\": "src/main/php"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Frank Kleine",
-                    "homepage": "http://frankkleine.de/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Virtual file system to mock the real file system in unit tests.",
-            "homepage": "http://vfs.bovigo.org/",
-            "time": "2017-08-01T08:02:14+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2017-09-11T18:02:19+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "doctrine/instantiator": "~1.0.5",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-30T07:14:17+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "time": "2017-07-14T14:27:02+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "1.7.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
-                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2018-02-19T10:16:54+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "^1.3.2",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-10-06T15:47:00+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2017-11-27T13:52:08+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2017-02-26T11:10:40+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
-                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2017-12-04T08:55:13+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.8.36",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517",
-                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "~2.1",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.2.2",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.3",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.8.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2017-06-21T08:07:12+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2015-10-02T06:51:40+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2 || ~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2017-01-29T09:50:25+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2017-05-22T07:24:03+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8 || ^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2016-08-18T05:49:44+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2016-06-17T09:04:28+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2015-10-12T03:26:01+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2016-10-03T07:41:43+00:00"
-        },
-        {
-            "name": "symfony/browser-kit",
-            "version": "v3.4.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "490f27762705c8489bd042fe3e9377a191dba9b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/490f27762705c8489bd042fe3e9377a191dba9b4",
-                "reference": "490f27762705c8489bd042fe3e9377a191dba9b4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/dom-crawler": "~2.8|~3.0|~4.0"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0|~4.0",
-                "symfony/process": "~2.8|~3.0|~4.0"
-            },
-            "suggest": {
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\BrowserKit\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony BrowserKit Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-01-03T07:37:34+00:00"
-        }
-    ],
+    "packages-dev": [],
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {

From abf71e89d3e0f3aafa329e6f8c45f8ba913588ec Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Mon, 19 Mar 2018 02:13:50 -0700
Subject: [PATCH 024/143] Remove vestigial sites/default directory

The sites/default directory now lives inside `web`. This commit is
follow-up on #159 and #167.
---
 sites/default/config/.htaccess     |  23 -
 sites/default/config/README.txt    |   1 -
 sites/default/default.services.yml | 174 -------
 sites/default/default.settings.php | 785 -----------------------------
 4 files changed, 983 deletions(-)
 delete mode 100644 sites/default/config/.htaccess
 delete mode 100644 sites/default/config/README.txt
 delete mode 100644 sites/default/default.services.yml
 delete mode 100644 sites/default/default.settings.php

diff --git a/sites/default/config/.htaccess b/sites/default/config/.htaccess
deleted file mode 100644
index 91883a3..0000000
--- a/sites/default/config/.htaccess
+++ /dev/null
@@ -1,23 +0,0 @@
-# Deny all requests from Apache 2.4+.
-<IfModule mod_authz_core.c>
-  Require all denied
-</IfModule>
-
-# Deny all requests from Apache 2.0-2.2.
-<IfModule !mod_authz_core.c>
-  Deny from all
-</IfModule># Turn off all options we don't need.
-Options None
-Options +FollowSymLinks
-
-# Set the catch-all handler to prevent scripts from being executed.
-SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
-<Files *>
-  # Override the handler again if we're run later in the evaluation list.
-  SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
-</Files>
-
-# If we know how to do it safely, disable the PHP engine entirely.
-<IfModule mod_php5.c>
-  php_flag engine off
-</IfModule>
\ No newline at end of file
diff --git a/sites/default/config/README.txt b/sites/default/config/README.txt
deleted file mode 100644
index e2f9754..0000000
--- a/sites/default/config/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory structure contains the staging config for your site.
diff --git a/sites/default/default.services.yml b/sites/default/default.services.yml
deleted file mode 100644
index e1bbbc7..0000000
--- a/sites/default/default.services.yml
+++ /dev/null
@@ -1,174 +0,0 @@
-parameters:
-  session.storage.options:
-    # Default ini options for sessions.
-    #
-    # Some distributions of Linux (most notably Debian) ship their PHP
-    # installations with garbage collection (gc) disabled. Since Drupal depends
-    # on PHP's garbage collection for clearing sessions, ensure that garbage
-    # collection occurs by using the most common settings.
-    # @default 1
-    gc_probability: 1
-    # @default 100
-    gc_divisor: 100
-    #
-    # Set session lifetime (in seconds), i.e. the time from the user's last
-    # visit to the active session may be deleted by the session garbage
-    # collector. When a session is deleted, authenticated users are logged out,
-    # and the contents of the user's $_SESSION variable is discarded.
-    # @default 200000
-    gc_maxlifetime: 200000
-    #
-    # Set session cookie lifetime (in seconds), i.e. the time from the session
-    # is created to the cookie expires, i.e. when the browser is expected to
-    # discard the cookie. The value 0 means "until the browser is closed".
-    # @default 2000000
-    cookie_lifetime: 2000000
-    #
-    # Drupal automatically generates a unique session cookie name based on the
-    # full domain name used to access the site. This mechanism is sufficient
-    # for most use-cases, including multi-site deployments. However, if it is
-    # desired that a session can be reused across different subdomains, the
-    # cookie domain needs to be set to the shared base domain. Doing so assures
-    # that users remain logged in as they cross between various subdomains.
-    # To maximize compatibility and normalize the behavior across user agents,
-    # the cookie domain should start with a dot.
-    #
-    # @default none
-    # cookie_domain: '.example.com'
-    #
-  twig.config:
-    # Twig debugging:
-    #
-    # When debugging is enabled:
-    # - The markup of each Twig template is surrounded by HTML comments that
-    #   contain theming information, such as template file name suggestions.
-    # - Note that this debugging markup will cause automated tests that directly
-    #   check rendered HTML to fail. When running automated tests, 'debug'
-    #   should be set to FALSE.
-    # - The dump() function can be used in Twig templates to output information
-    #   about template variables.
-    # - Twig templates are automatically recompiled whenever the source code
-    #   changes (see auto_reload below).
-    #
-    # For more information about debugging Twig templates, see
-    # https://www.drupal.org/node/1906392.
-    #
-    # Not recommended in production environments
-    # @default false
-    debug: false
-    # Twig auto-reload:
-    #
-    # Automatically recompile Twig templates whenever the source code changes.
-    # If you don't provide a value for auto_reload, it will be determined
-    # based on the value of debug.
-    #
-    # Not recommended in production environments
-    # @default null
-    auto_reload: null
-    # Twig cache:
-    #
-    # By default, Twig templates will be compiled and stored in the filesystem
-    # to increase performance. Disabling the Twig cache will recompile the
-    # templates from source each time they are used. In most cases the
-    # auto_reload setting above should be enabled rather than disabling the
-    # Twig cache.
-    #
-    # Not recommended in production environments
-    # @default true
-    cache: true
-  renderer.config:
-    # Renderer required cache contexts:
-    #
-    # The Renderer will automatically associate these cache contexts with every
-    # render array, hence varying every render array by these cache contexts.
-    #
-    # @default ['languages:language_interface', 'theme', 'user.permissions']
-    required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions']
-    # Renderer automatic placeholdering conditions:
-    #
-    # Drupal allows portions of the page to be automatically deferred when
-    # rendering to improve cache performance. That is especially helpful for
-    # cache contexts that vary widely, such as the active user. On some sites
-    # those may be different, however, such as sites with only a handful of
-    # users. If you know what the high-cardinality cache contexts are for your
-    # site, specify those here. If you're not sure, the defaults are fairly safe
-    # in general.
-    #
-    # For more information about rendering optimizations see
-    # https://www.drupal.org/developing/api/8/render/arrays/cacheability#optimizing
-    auto_placeholder_conditions:
-      # Max-age at or below which caching is not considered worthwhile.
-      #
-      # Disable by setting to -1.
-      #
-      # @default 0
-      max-age: 0
-      # Cache contexts with a high cardinality.
-      #
-      # Disable by setting to [].
-      #
-      # @default ['session', 'user']
-      contexts: ['session', 'user']
-      # Tags with a high invalidation frequency.
-      #
-      # Disable by setting to [].
-      #
-      # @default []
-      tags: []
-  # Cacheability debugging:
-  #
-  # Responses with cacheability metadata (CacheableResponseInterface instances)
-  # get X-Drupal-Cache-Tags and X-Drupal-Cache-Contexts headers.
-  #
-  # For more information about debugging cacheable responses, see
-  # https://www.drupal.org/developing/api/8/response/cacheable-response-interface
-  #
-  # Not recommended in production environments
-  # @default false
-  http.response.debug_cacheability_headers: false
-  factory.keyvalue:
-    {}
-    # Default key/value storage service to use.
-    # @default keyvalue.database
-    # default: keyvalue.database
-    # Collection-specific overrides.
-    # state: keyvalue.database
-  factory.keyvalue.expirable:
-    {}
-    # Default key/value expirable storage service to use.
-    # @default keyvalue.database.expirable
-    # default: keyvalue.database.expirable
-  # Allowed protocols for URL generation.
-  filter_protocols:
-    - http
-    - https
-    - ftp
-    - news
-    - nntp
-    - tel
-    - telnet
-    - mailto
-    - irc
-    - ssh
-    - sftp
-    - webcal
-    - rtsp
-
-   # Configure Cross-Site HTTP requests (CORS).
-   # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
-   # for more information about the topic in general.
-   # Note: By default the configuration is disabled.
-  cors.config:
-    enabled: false
-    # Specify allowed headers, like 'x-allowed-header'.
-    allowedHeaders: []
-    # Specify allowed request methods, specify ['*'] to allow all possible ones.
-    allowedMethods: []
-    # Configure requests allowed from specific origins.
-    allowedOrigins: ['*']
-    # Sets the Access-Control-Expose-Headers header.
-    exposedHeaders: false
-    # Sets the Access-Control-Max-Age header.
-    maxAge: false
-    # Sets the Access-Control-Allow-Credentials header.
-    supportsCredentials: false
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
deleted file mode 100644
index c7dd194..0000000
--- a/sites/default/default.settings.php
+++ /dev/null
@@ -1,785 +0,0 @@
-<?php
-
-/**
- * @file
- * Drupal site-specific configuration file.
- *
- * IMPORTANT NOTE:
- * This file may have been set to read-only by the Drupal installation program.
- * If you make changes to this file, be sure to protect it again after making
- * your modifications. Failure to remove write permissions to this file is a
- * security risk.
- *
- * In order to use the selection rules below the multisite aliasing file named
- * sites/sites.php must be present. Its optional settings will be loaded, and
- * the aliases in the array $sites will override the default directory rules
- * below. See sites/example.sites.php for more information about aliases.
- *
- * The configuration directory will be discovered by stripping the website's
- * hostname from left to right and pathname from right to left. The first
- * configuration file found will be used and any others will be ignored. If no
- * other configuration file is found then the default configuration file at
- * 'sites/default' will be used.
- *
- * For example, for a fictitious site installed at
- * https://www.drupal.org:8080/mysite/test/, the 'settings.php' file is searched
- * for in the following directories:
- *
- * - sites/8080.www.drupal.org.mysite.test
- * - sites/www.drupal.org.mysite.test
- * - sites/drupal.org.mysite.test
- * - sites/org.mysite.test
- *
- * - sites/8080.www.drupal.org.mysite
- * - sites/www.drupal.org.mysite
- * - sites/drupal.org.mysite
- * - sites/org.mysite
- *
- * - sites/8080.www.drupal.org
- * - sites/www.drupal.org
- * - sites/drupal.org
- * - sites/org
- *
- * - sites/default
- *
- * Note that if you are installing on a non-standard port number, prefix the
- * hostname with that number. For example,
- * https://www.drupal.org:8080/mysite/test/ could be loaded from
- * sites/8080.www.drupal.org.mysite.test/.
- *
- * @see example.sites.php
- * @see \Drupal\Core\DrupalKernel::getSitePath()
- *
- * In addition to customizing application settings through variables in
- * settings.php, you can create a services.yml file in the same directory to
- * register custom, site-specific service definitions and/or swap out default
- * implementations with custom ones.
- */
-
-/**
- * Database settings:
- *
- * The $databases array specifies the database connection or
- * connections that Drupal may use.  Drupal is able to connect
- * to multiple databases, including multiple types of databases,
- * during the same request.
- *
- * One example of the simplest connection array is shown below. To use the
- * sample settings, copy and uncomment the code below between the @code and
- * @endcode lines and paste it after the $databases declaration. You will need
- * to replace the database username and password and possibly the host and port
- * with the appropriate credentials for your database system.
- *
- * The next section describes how to customize the $databases array for more
- * specific needs.
- *
- * @code
- * $databases['default']['default'] = array (
- *   'database' => 'databasename',
- *   'username' => 'sqlusername',
- *   'password' => 'sqlpassword',
- *   'host' => 'localhost',
- *   'port' => '3306',
- *   'driver' => 'mysql',
- *   'prefix' => '',
- *   'collation' => 'utf8mb4_general_ci',
- * );
- * @endcode
- */
-$databases = array();
-
-/**
- * Customizing database settings.
- *
- * Many of the values of the $databases array can be customized for your
- * particular database system. Refer to the sample in the section above as a
- * starting point.
- *
- * The "driver" property indicates what Drupal database driver the
- * connection should use.  This is usually the same as the name of the
- * database type, such as mysql or sqlite, but not always.  The other
- * properties will vary depending on the driver.  For SQLite, you must
- * specify a database file name in a directory that is writable by the
- * webserver.  For most other drivers, you must specify a
- * username, password, host, and database name.
- *
- * Transaction support is enabled by default for all drivers that support it,
- * including MySQL. To explicitly disable it, set the 'transactions' key to
- * FALSE.
- * Note that some configurations of MySQL, such as the MyISAM engine, don't
- * support it and will proceed silently even if enabled. If you experience
- * transaction related crashes with such configuration, set the 'transactions'
- * key to FALSE.
- *
- * For each database, you may optionally specify multiple "target" databases.
- * A target database allows Drupal to try to send certain queries to a
- * different database if it can but fall back to the default connection if not.
- * That is useful for primary/replica replication, as Drupal may try to connect
- * to a replica server when appropriate and if one is not available will simply
- * fall back to the single primary server (The terms primary/replica are
- * traditionally referred to as master/slave in database server documentation).
- *
- * The general format for the $databases array is as follows:
- * @code
- * $databases['default']['default'] = $info_array;
- * $databases['default']['replica'][] = $info_array;
- * $databases['default']['replica'][] = $info_array;
- * $databases['extra']['default'] = $info_array;
- * @endcode
- *
- * In the above example, $info_array is an array of settings described above.
- * The first line sets a "default" database that has one primary database
- * (the second level default).  The second and third lines create an array
- * of potential replica databases.  Drupal will select one at random for a given
- * request as needed.  The fourth line creates a new database with a name of
- * "extra".
- *
- * You can optionally set prefixes for some or all database table names
- * by using the 'prefix' setting. If a prefix is specified, the table
- * name will be prepended with its value. Be sure to use valid database
- * characters only, usually alphanumeric and underscore. If no prefixes
- * are desired, leave it as an empty string ''.
- *
- * To have all database names prefixed, set 'prefix' as a string:
- * @code
- *   'prefix' => 'main_',
- * @endcode
- *
- * Per-table prefixes are deprecated as of Drupal 8.2, and will be removed in
- * Drupal 9.0. After that, only a single prefix for all tables will be
- * supported.
- *
- * To provide prefixes for specific tables, set 'prefix' as an array.
- * The array's keys are the table names and the values are the prefixes.
- * The 'default' element is mandatory and holds the prefix for any tables
- * not specified elsewhere in the array. Example:
- * @code
- *   'prefix' => array(
- *     'default'   => 'main_',
- *     'users'     => 'shared_',
- *     'sessions'  => 'shared_',
- *     'role'      => 'shared_',
- *     'authmap'   => 'shared_',
- *   ),
- * @endcode
- * You can also use a reference to a schema/database as a prefix. This may be
- * useful if your Drupal installation exists in a schema that is not the default
- * or you want to access several databases from the same code base at the same
- * time.
- * Example:
- * @code
- *   'prefix' => array(
- *     'default'   => 'main.',
- *     'users'     => 'shared.',
- *     'sessions'  => 'shared.',
- *     'role'      => 'shared.',
- *     'authmap'   => 'shared.',
- *   );
- * @endcode
- * NOTE: MySQL and SQLite's definition of a schema is a database.
- *
- * Advanced users can add or override initial commands to execute when
- * connecting to the database server, as well as PDO connection settings. For
- * example, to enable MySQL SELECT queries to exceed the max_join_size system
- * variable, and to reduce the database connection timeout to 5 seconds:
- * @code
- * $databases['default']['default'] = array(
- *   'init_commands' => array(
- *     'big_selects' => 'SET SQL_BIG_SELECTS=1',
- *   ),
- *   'pdo' => array(
- *     PDO::ATTR_TIMEOUT => 5,
- *   ),
- * );
- * @endcode
- *
- * WARNING: The above defaults are designed for database portability. Changing
- * them may cause unexpected behavior, including potential data loss. See
- * https://www.drupal.org/developing/api/database/configuration for more
- * information on these defaults and the potential issues.
- *
- * More details can be found in the constructor methods for each driver:
- * - \Drupal\Core\Database\Driver\mysql\Connection::__construct()
- * - \Drupal\Core\Database\Driver\pgsql\Connection::__construct()
- * - \Drupal\Core\Database\Driver\sqlite\Connection::__construct()
- *
- * Sample Database configuration format for PostgreSQL (pgsql):
- * @code
- *   $databases['default']['default'] = array(
- *     'driver' => 'pgsql',
- *     'database' => 'databasename',
- *     'username' => 'sqlusername',
- *     'password' => 'sqlpassword',
- *     'host' => 'localhost',
- *     'prefix' => '',
- *   );
- * @endcode
- *
- * Sample Database configuration format for SQLite (sqlite):
- * @code
- *   $databases['default']['default'] = array(
- *     'driver' => 'sqlite',
- *     'database' => '/path/to/databasefilename',
- *   );
- * @endcode
- */
-
-/**
- * Location of the site configuration files.
- *
- * The $config_directories array specifies the location of file system
- * directories used for configuration data. On install, the "sync" directory is
- * created. This is used for configuration imports. The "active" directory is
- * not created by default since the default storage for active configuration is
- * the database rather than the file system. (This can be changed. See "Active
- * configuration settings" below).
- *
- * The default location for the "sync" directory is inside a randomly-named
- * directory in the public files path. The setting below allows you to override
- * the "sync" location.
- *
- * If you use files for the "active" configuration, you can tell the
- * Configuration system where this directory is located by adding an entry with
- * array key CONFIG_ACTIVE_DIRECTORY.
- *
- * Example:
- * @code
- *   $config_directories = array(
- *     CONFIG_SYNC_DIRECTORY => '/directory/outside/webroot',
- *   );
- * @endcode
- */
-$config_directories = array();
-
-/**
- * Settings:
- *
- * $settings contains environment-specific configuration, such as the files
- * directory and reverse proxy address, and temporary configuration, such as
- * security overrides.
- *
- * @see \Drupal\Core\Site\Settings::get()
- */
-
-/**
- * The active installation profile.
- *
- * Changing this after installation is not recommended as it changes which
- * directories are scanned during extension discovery. If this is set prior to
- * installation this value will be rewritten according to the profile selected
- * by the user.
- *
- * @see install_select_profile()
- *
- * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. The
- *   install profile is written to the core.extension configuration. If a
- *   service requires the install profile use the 'install_profile' container
- *   parameter. Functional code can use \Drupal::installProfile().
- */
-# $settings['install_profile'] = '';
-
-/**
- * Salt for one-time login links, cancel links, form tokens, etc.
- *
- * This variable will be set to a random value by the installer. All one-time
- * login links will be invalidated if the value is changed. Note that if your
- * site is deployed on a cluster of web servers, you must ensure that this
- * variable has the same value on each server.
- *
- * For enhanced security, you may set this variable to the contents of a file
- * outside your document root; you should also ensure that this file is not
- * stored with backups of your database.
- *
- * Example:
- * @code
- *   $settings['hash_salt'] = file_get_contents('/home/example/salt.txt');
- * @endcode
- */
-$settings['hash_salt'] = '';
-
-/**
- * Deployment identifier.
- *
- * Drupal's dependency injection container will be automatically invalidated and
- * rebuilt when the Drupal core version changes. When updating contributed or
- * custom code that changes the container, changing this identifier will also
- * allow the container to be invalidated as soon as code is deployed.
- */
-# $settings['deployment_identifier'] = \Drupal::VERSION;
-
-/**
- * Access control for update.php script.
- *
- * If you are updating your Drupal installation using the update.php script but
- * are not logged in using either an account with the "Administer software
- * updates" permission or the site maintenance account (the account that was
- * created during installation), you will need to modify the access check
- * statement below. Change the FALSE to a TRUE to disable the access check.
- * After finishing the upgrade, be sure to open this file again and change the
- * TRUE back to a FALSE!
- */
-$settings['update_free_access'] = FALSE;
-
-/**
- * External access proxy settings:
- *
- * If your site must access the Internet via a web proxy then you can enter the
- * proxy settings here. Set the full URL of the proxy, including the port, in
- * variables:
- * - $settings['http_client_config']['proxy']['http']: The proxy URL for HTTP
- *   requests.
- * - $settings['http_client_config']['proxy']['https']: The proxy URL for HTTPS
- *   requests.
- * You can pass in the user name and password for basic authentication in the
- * URLs in these settings.
- *
- * You can also define an array of host names that can be accessed directly,
- * bypassing the proxy, in $settings['http_client_config']['proxy']['no'].
- */
-# $settings['http_client_config']['proxy']['http'] = 'http://proxy_user:proxy_pass@example.com:8080';
-# $settings['http_client_config']['proxy']['https'] = 'http://proxy_user:proxy_pass@example.com:8080';
-# $settings['http_client_config']['proxy']['no'] = ['127.0.0.1', 'localhost'];
-
-/**
- * Reverse Proxy Configuration:
- *
- * Reverse proxy servers are often used to enhance the performance
- * of heavily visited sites and may also provide other site caching,
- * security, or encryption benefits. In an environment where Drupal
- * is behind a reverse proxy, the real IP address of the client should
- * be determined such that the correct client IP address is available
- * to Drupal's logging, statistics, and access management systems. In
- * the most simple scenario, the proxy server will add an
- * X-Forwarded-For header to the request that contains the client IP
- * address. However, HTTP headers are vulnerable to spoofing, where a
- * malicious client could bypass restrictions by setting the
- * X-Forwarded-For header directly. Therefore, Drupal's proxy
- * configuration requires the IP addresses of all remote proxies to be
- * specified in $settings['reverse_proxy_addresses'] to work correctly.
- *
- * Enable this setting to get Drupal to determine the client IP from
- * the X-Forwarded-For header (or $settings['reverse_proxy_header'] if set).
- * If you are unsure about this setting, do not have a reverse proxy,
- * or Drupal operates in a shared hosting environment, this setting
- * should remain commented out.
- *
- * In order for this setting to be used you must specify every possible
- * reverse proxy IP address in $settings['reverse_proxy_addresses'].
- * If a complete list of reverse proxies is not available in your
- * environment (for example, if you use a CDN) you may set the
- * $_SERVER['REMOTE_ADDR'] variable directly in settings.php.
- * Be aware, however, that it is likely that this would allow IP
- * address spoofing unless more advanced precautions are taken.
- */
-# $settings['reverse_proxy'] = TRUE;
-
-/**
- * Specify every reverse proxy IP address in your environment.
- * This setting is required if $settings['reverse_proxy'] is TRUE.
- */
-# $settings['reverse_proxy_addresses'] = array('a.b.c.d', ...);
-
-/**
- * Set this value if your proxy server sends the client IP in a header
- * other than X-Forwarded-For.
- */
-# $settings['reverse_proxy_header'] = 'X_CLUSTER_CLIENT_IP';
-
-/**
- * Set this value if your proxy server sends the client protocol in a header
- * other than X-Forwarded-Proto.
- */
-# $settings['reverse_proxy_proto_header'] = 'X_FORWARDED_PROTO';
-
-/**
- * Set this value if your proxy server sends the client protocol in a header
- * other than X-Forwarded-Host.
- */
-# $settings['reverse_proxy_host_header'] = 'X_FORWARDED_HOST';
-
-/**
- * Set this value if your proxy server sends the client protocol in a header
- * other than X-Forwarded-Port.
- */
-# $settings['reverse_proxy_port_header'] = 'X_FORWARDED_PORT';
-
-/**
- * Set this value if your proxy server sends the client protocol in a header
- * other than Forwarded.
- */
-# $settings['reverse_proxy_forwarded_header'] = 'FORWARDED';
-
-/**
- * Page caching:
- *
- * By default, Drupal sends a "Vary: Cookie" HTTP header for anonymous page
- * views. This tells a HTTP proxy that it may return a page from its local
- * cache without contacting the web server, if the user sends the same Cookie
- * header as the user who originally requested the cached page. Without "Vary:
- * Cookie", authenticated users would also be served the anonymous page from
- * the cache. If the site has mostly anonymous users except a few known
- * editors/administrators, the Vary header can be omitted. This allows for
- * better caching in HTTP proxies (including reverse proxies), i.e. even if
- * clients send different cookies, they still get content served from the cache.
- * However, authenticated users should access the site directly (i.e. not use an
- * HTTP proxy, and bypass the reverse proxy if one is used) in order to avoid
- * getting cached pages from the proxy.
- */
-# $settings['omit_vary_cookie'] = TRUE;
-
-
-/**
- * Cache TTL for client error (4xx) responses.
- *
- * Items cached per-URL tend to result in a large number of cache items, and
- * this can be problematic on 404 pages which by their nature are unbounded. A
- * fixed TTL can be set for these items, defaulting to one hour, so that cache
- * backends which do not support LRU can purge older entries. To disable caching
- * of client error responses set the value to 0. Currently applies only to
- * page_cache module.
- */
-# $settings['cache_ttl_4xx'] = 3600;
-
-/**
- * Expiration of cached forms.
- *
- * Drupal's Form API stores details of forms in a cache and these entries are
- * kept for at least 6 hours by default. Expired entries are cleared by cron.
- *
- * @see \Drupal\Core\Form\FormCache::setCache()
- */
-# $settings['form_cache_expiration'] = 21600;
-
-/**
- * Class Loader.
- *
- * If the APC extension is detected, the Symfony APC class loader is used for
- * performance reasons. Detection can be prevented by setting
- * class_loader_auto_detect to false, as in the example below.
- */
-# $settings['class_loader_auto_detect'] = FALSE;
-
-/*
- * If the APC extension is not detected, either because APC is missing or
- * because auto-detection has been disabled, auto-loading falls back to
- * Composer's ClassLoader, which is good for development as it does not break
- * when code is moved in the file system. You can also decorate the base class
- * loader with another cached solution than the Symfony APC class loader, as
- * all production sites should have a cached class loader of some sort enabled.
- *
- * To do so, you may decorate and replace the local $class_loader variable. For
- * example, to use Symfony's APC class loader without automatic detection,
- * uncomment the code below.
- */
-/*
-if ($settings['hash_salt']) {
-  $prefix = 'drupal.' . hash('sha256', 'drupal.' . $settings['hash_salt']);
-  $apc_loader = new \Symfony\Component\ClassLoader\ApcClassLoader($prefix, $class_loader);
-  unset($prefix);
-  $class_loader->unregister();
-  $apc_loader->register();
-  $class_loader = $apc_loader;
-}
-*/
-
-/**
- * Authorized file system operations:
- *
- * The Update Manager module included with Drupal provides a mechanism for
- * site administrators to securely install missing updates for the site
- * directly through the web user interface. On securely-configured servers,
- * the Update manager will require the administrator to provide SSH or FTP
- * credentials before allowing the installation to proceed; this allows the
- * site to update the new files as the user who owns all the Drupal files,
- * instead of as the user the webserver is running as. On servers where the
- * webserver user is itself the owner of the Drupal files, the administrator
- * will not be prompted for SSH or FTP credentials (note that these server
- * setups are common on shared hosting, but are inherently insecure).
- *
- * Some sites might wish to disable the above functionality, and only update
- * the code directly via SSH or FTP themselves. This setting completely
- * disables all functionality related to these authorized file operations.
- *
- * @see https://www.drupal.org/node/244924
- *
- * Remove the leading hash signs to disable.
- */
-# $settings['allow_authorize_operations'] = FALSE;
-
-/**
- * Default mode for directories and files written by Drupal.
- *
- * Value should be in PHP Octal Notation, with leading zero.
- */
-# $settings['file_chmod_directory'] = 0775;
-# $settings['file_chmod_file'] = 0664;
-
-/**
- * Public file base URL:
- *
- * An alternative base URL to be used for serving public files. This must
- * include any leading directory path.
- *
- * A different value from the domain used by Drupal to be used for accessing
- * public files. This can be used for a simple CDN integration, or to improve
- * security by serving user-uploaded files from a different domain or subdomain
- * pointing to the same server. Do not include a trailing slash.
- */
-# $settings['file_public_base_url'] = 'http://downloads.example.com/files';
-
-/**
- * Public file path:
- *
- * A local file system path where public files will be stored. This directory
- * must exist and be writable by Drupal. This directory must be relative to
- * the Drupal installation directory and be accessible over the web.
- */
-# $settings['file_public_path'] = 'sites/default/files';
-
-/**
- * Private file path:
- *
- * A local file system path where private files will be stored. This directory
- * must be absolute, outside of the Drupal installation directory and not
- * accessible over the web.
- *
- * Note: Caches need to be cleared when this value is changed to make the
- * private:// stream wrapper available to the system.
- *
- * See https://www.drupal.org/documentation/modules/file for more information
- * about securing private files.
- */
-# $settings['file_private_path'] = '';
-
-/**
- * Session write interval:
- *
- * Set the minimum interval between each session write to database.
- * For performance reasons it defaults to 180.
- */
-# $settings['session_write_interval'] = 180;
-
-/**
- * String overrides:
- *
- * To override specific strings on your site with or without enabling the Locale
- * module, add an entry to this list. This functionality allows you to change
- * a small number of your site's default English language interface strings.
- *
- * Remove the leading hash signs to enable.
- *
- * The "en" part of the variable name, is dynamic and can be any langcode of
- * any added language. (eg locale_custom_strings_de for german).
- */
-# $settings['locale_custom_strings_en'][''] = array(
-#   'forum'      => 'Discussion board',
-#   '@count min' => '@count minutes',
-# );
-
-/**
- * A custom theme for the offline page:
- *
- * This applies when the site is explicitly set to maintenance mode through the
- * administration page or when the database is inactive due to an error.
- * The template file should also be copied into the theme. It is located inside
- * 'core/modules/system/templates/maintenance-page.html.twig'.
- *
- * Note: This setting does not apply to installation and update pages.
- */
-# $settings['maintenance_theme'] = 'bartik';
-
-/**
- * PHP settings:
- *
- * To see what PHP settings are possible, including whether they can be set at
- * runtime (by using ini_set()), read the PHP documentation:
- * http://php.net/manual/ini.list.php
- * See \Drupal\Core\DrupalKernel::bootEnvironment() for required runtime
- * settings and the .htaccess file for non-runtime settings.
- * Settings defined there should not be duplicated here so as to avoid conflict
- * issues.
- */
-
-/**
- * If you encounter a situation where users post a large amount of text, and
- * the result is stripped out upon viewing but can still be edited, Drupal's
- * output filter may not have sufficient memory to process it.  If you
- * experience this issue, you may wish to uncomment the following two lines
- * and increase the limits of these variables.  For more information, see
- * http://php.net/manual/pcre.configuration.php.
- */
-# ini_set('pcre.backtrack_limit', 200000);
-# ini_set('pcre.recursion_limit', 200000);
-
-/**
- * Active configuration settings.
- *
- * By default, the active configuration is stored in the database in the
- * {config} table. To use a different storage mechanism for the active
- * configuration, do the following prior to installing:
- * - Create an "active" directory and declare its path in $config_directories
- *   as explained under the 'Location of the site configuration files' section
- *   above in this file. To enhance security, you can declare a path that is
- *   outside your document root.
- * - Override the 'bootstrap_config_storage' setting here. It must be set to a
- *   callable that returns an object that implements
- *   \Drupal\Core\Config\StorageInterface.
- * - Override the service definition 'config.storage.active'. Put this
- *   override in a services.yml file in the same directory as settings.php
- *   (definitions in this file will override service definition defaults).
- */
-# $settings['bootstrap_config_storage'] = array('Drupal\Core\Config\BootstrapConfigStorageFactory', 'getFileStorage');
-
-/**
- * Configuration overrides.
- *
- * To globally override specific configuration values for this site,
- * set them here. You usually don't need to use this feature. This is
- * useful in a configuration file for a vhost or directory, rather than
- * the default settings.php.
- *
- * Note that any values you provide in these variable overrides will not be
- * viewable from the Drupal administration interface. The administration
- * interface displays the values stored in configuration so that you can stage
- * changes to other environments that don't have the overrides.
- *
- * There are particular configuration values that are risky to override. For
- * example, overriding the list of installed modules in 'core.extension' is not
- * supported as module install or uninstall has not occurred. Other examples
- * include field storage configuration, because it has effects on database
- * structure, and 'core.menu.static_menu_link_overrides' since this is cached in
- * a way that is not config override aware. Also, note that changing
- * configuration values in settings.php will not fire any of the configuration
- * change events.
- */
-# $config['system.file']['path']['temporary'] = '/tmp';
-# $config['system.site']['name'] = 'My Drupal site';
-# $config['system.theme']['default'] = 'stark';
-# $config['user.settings']['anonymous'] = 'Visitor';
-
-/**
- * Fast 404 pages:
- *
- * Drupal can generate fully themed 404 pages. However, some of these responses
- * are for images or other resource files that are not displayed to the user.
- * This can waste bandwidth, and also generate server load.
- *
- * The options below return a simple, fast 404 page for URLs matching a
- * specific pattern:
- * - $config['system.performance']['fast_404']['exclude_paths']: A regular
- *   expression to match paths to exclude, such as images generated by image
- *   styles, or dynamically-resized images. The default pattern provided below
- *   also excludes the private file system. If you need to add more paths, you
- *   can add '|path' to the expression.
- * - $config['system.performance']['fast_404']['paths']: A regular expression to
- *   match paths that should return a simple 404 page, rather than the fully
- *   themed 404 page. If you don't have any aliases ending in htm or html you
- *   can add '|s?html?' to the expression.
- * - $config['system.performance']['fast_404']['html']: The html to return for
- *   simple 404 pages.
- *
- * Remove the leading hash signs if you would like to alter this functionality.
- */
-# $config['system.performance']['fast_404']['exclude_paths'] = '/\/(?:styles)|(?:system\/files)\//';
-# $config['system.performance']['fast_404']['paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i';
-# $config['system.performance']['fast_404']['html'] = '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>';
-
-/**
- * Load services definition file.
- */
-$settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.yml';
-
-/**
- * Override the default service container class.
- *
- * This is useful for example to trace the service container for performance
- * tracking purposes, for testing a service container with an error condition or
- * to test a service container that throws an exception.
- */
-# $settings['container_base_class'] = '\Drupal\Core\DependencyInjection\Container';
-
-/**
- * Override the default yaml parser class.
- *
- * Provide a fully qualified class name here if you would like to provide an
- * alternate implementation YAML parser. The class must implement the
- * \Drupal\Component\Serialization\SerializationInterface interface.
- */
-# $settings['yaml_parser_class'] = NULL;
-
-/**
- * Trusted host configuration.
- *
- * Drupal core can use the Symfony trusted host mechanism to prevent HTTP Host
- * header spoofing.
- *
- * To enable the trusted host mechanism, you enable your allowable hosts
- * in $settings['trusted_host_patterns']. This should be an array of regular
- * expression patterns, without delimiters, representing the hosts you would
- * like to allow.
- *
- * For example:
- * @code
- * $settings['trusted_host_patterns'] = array(
- *   '^www\.example\.com$',
- * );
- * @endcode
- * will allow the site to only run from www.example.com.
- *
- * If you are running multisite, or if you are running your site from
- * different domain names (eg, you don't redirect http://www.example.com to
- * http://example.com), you should specify all of the host patterns that are
- * allowed by your site.
- *
- * For example:
- * @code
- * $settings['trusted_host_patterns'] = array(
- *   '^example\.com$',
- *   '^.+\.example\.com$',
- *   '^example\.org$',
- *   '^.+\.example\.org$',
- * );
- * @endcode
- * will allow the site to run off of all variants of example.com and
- * example.org, with all subdomains included.
- */
-
-/**
- * The default list of directories that will be ignored by Drupal's file API.
- *
- * By default ignore node_modules and bower_components folders to avoid issues
- * with common frontend tools and recursive scanning of directories looking for
- * extensions.
- *
- * @see file_scan_directory()
- * @see \Drupal\Core\Extension\ExtensionDiscovery::scanDirectory()
- */
-$settings['file_scan_ignore_directories'] = [
-  'node_modules',
-  'bower_components',
-];
-
-/**
- * The default number of entities to update in a batch process.
- *
- * This is used by update and post-update functions that need to go through and
- * change all the entities on a site, so it is useful to increase this number
- * if your hosting configuration (i.e. RAM allocation, CPU speed) allows for a
- * larger number of entities to be processed in a single batch run.
- */
-$settings['entity_update_batch_size'] = 50;
-
-/**
- * Load local development override configuration, if available.
- *
- * Use settings.local.php to override variables on secondary (staging,
- * development, etc) installations of this site. Typically used to disable
- * caching, JavaScript/CSS compression, re-routing of outgoing emails, and
- * other things that should not happen on development and testing sites.
- *
- * Keep this code block at the end of this file to take full effect.
- */
-#
-# if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
-#   include $app_root . '/' . $site_path . '/settings.local.php';
-# }

From e73356c45d160b0fab48ca95426efa698c4cc7c5 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Mon, 19 Mar 2018 12:56:03 -0400
Subject: [PATCH 025/143] Add a "cronish" worker to call cron every 15m.

Cloud.gov doesn't offer time-based task execution yet; luckily, it's very easy
to imitate with a loop in bash. This'll execute the `cron:execute` command
roughly every 15m (there's a slight skew due to amount of time processing that
command).

It also moves app configuration up a level in the manifest, as most of these
configs are shared.
---
 cronish.sh   |  8 ++++++++
 manifest.yml | 35 ++++++++++++++++++++---------------
 2 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100755 cronish.sh

diff --git a/cronish.sh b/cronish.sh
new file mode 100755
index 0000000..8f0c852
--- /dev/null
+++ b/cronish.sh
@@ -0,0 +1,8 @@
+#!/bin/bash 
+set -euo pipefail
+
+while true
+do
+  drupal --root=$HOME/web cron:execute
+  sleep 15m
+done
diff --git a/manifest.yml b/manifest.yml
index 976bf3c..9276823 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,19 +1,24 @@
 ---
+buildpack: php_buildpack
+memory: 512M
+disk_quota: 512M
+timeout: 180
+services:
+  - database # cf create-service aws-rds medium-mysql database
+  - secrets  # cf create-user-provided-service secrets -p '{
+             # "BRIGHTCOVE_ACCOUNT": ...
+             # "BRIGHTCOVE_CLIENT": ...
+             # "BRIGHTCOVE_SECRET": ...
+             # "HASH_SALT": ...
+             # "ROOT_USER_NAME": ...,
+             # "ROOT_USER_PASS": ...,
+             # }'
+  - storage  # cf create-service s3 basic storage
+
 applications:
 - name: nsf-demo
-  buildpack: php_buildpack
   instances: 1
-  memory: 512M
-  disk_quota: 512M
-  timeout: 180
-  services:
-    - database # cf create-service aws-rds medium-mysql database
-    - secrets  # cf create-user-provided-service secrets -p '{
-               # "BRIGHTCOVE_ACCOUNT": ...
-               # "BRIGHTCOVE_CLIENT": ...
-               # "BRIGHTCOVE_SECRET": ...
-               # "HASH_SALT": ...
-               # "ROOT_USER_NAME": ...,
-               # "ROOT_USER_PASS": ...,
-               # }'
-    - storage  # cf create-service s3 basic storage
+- name: cronish
+  no-route: true
+  command: ./cronish.sh
+  health-check-type: process

From 81c60fff48b81763b78cc161bc440fa60814cf2c Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Mon, 19 Mar 2018 15:27:37 -0400
Subject: [PATCH 026/143] Reduce memory consumption.

The cloud.gov quota is limited to 2G of memory across our environments.
Thankfully, our instances don't use too much memory, so we can ratchet that
down to get more instances.
---
 manifest.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifest.yml b/manifest.yml
index 9276823..4cf7276 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,6 +1,5 @@
 ---
 buildpack: php_buildpack
-memory: 512M
 disk_quota: 512M
 timeout: 180
 services:
@@ -17,8 +16,10 @@ services:
 
 applications:
 - name: nsf-demo
+  memory: 256M
   instances: 1
 - name: cronish
   no-route: true
   command: ./cronish.sh
   health-check-type: process
+  memory: 128M

From e669bcec8f84094439b2e65abbe8539a241610ce Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 11:51:37 -0400
Subject: [PATCH 027/143] Avoid running sync when in cronish script.

---
 bootstrap.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 01db844..b106c4d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,6 +2,7 @@
 set -euo pipefail
 
 SECRETS=$(echo $VCAP_SERVICES | jq -r '.["user-provided"][] | select(.name == "secrets") | .credentials')
+APP_NAME=$(echo $VCAP_APPLICATION | jq -r '.name')
 
 install_drupal() {
     ROOT_USER_NAME=$(echo $SECRETS | jq -r '.ROOT_USER_NAME')
@@ -24,7 +25,7 @@ install_drupal() {
     drupal --root=$HOME/web config:override system.site uuid $UUID
 }
 
-if [ "${CF_INSTANCE_INDEX:-''}" == "0" ]; then
+if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   drupal --root=$HOME/web list | grep database > /dev/null || install_drupal
   # Sync configs from code
   drupal --root=$HOME/web config:import --directory $HOME/web/sites/default/config

From 635d18afb9b17d326da7349f7fe0254e564bc6a6 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 15:56:20 -0400
Subject: [PATCH 028/143] Fix initial install error.

When running the prod install for the first time, I ran into an error around
a missing variable. Looks like I forgot I missed a few instances when
switching between variable names. This resolves.
---
 bootstrap.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index b106c4d..c1d9395 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -8,8 +8,8 @@ install_drupal() {
     ROOT_USER_NAME=$(echo $SECRETS | jq -r '.ROOT_USER_NAME')
     ROOT_USER_PASS=$(echo $SECRETS | jq -r '.ROOT_USER_PASS')
 
-    : "${ACCOUNT_NAME:?Need and root user name for Drupal}"
-    : "${ACCOUNT_PASS:?Need and root user pass for Drupal}"
+    : "${ROOT_USER_NAME:?Need and root user name for Drupal}"
+    : "${ROOT_USER_PASS:?Need and root user pass for Drupal}"
 
     drupal site:install \
         --root=$HOME/web \

From 7d8bfb5024bb07c48c71d3b86115d7c53e09ab7a Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 15:56:48 -0400
Subject: [PATCH 029/143] Switch "web" to "nsf-demo".

We'll switch back in #172, but we want to merge this first.
---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index c1d9395..e1c4329 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -25,7 +25,7 @@ install_drupal() {
     drupal --root=$HOME/web config:override system.site uuid $UUID
 }
 
-if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
+if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "nsf-demo" ]; then
   drupal --root=$HOME/web list | grep database > /dev/null || install_drupal
   # Sync configs from code
   drupal --root=$HOME/web config:import --directory $HOME/web/sites/default/config

From a39bf849d73a24912c27ac38e9a357ce39e2e7ed Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 15:57:46 -0400
Subject: [PATCH 030/143] Switch to YAML reference/alias style.

Putting buildpack, disk_quota, etc. on the top level is now a deprecated
feature of cloud foundry. Their recommended approach is to use YAML
reference/aliases as shown here.

See http://docs.cloudfoundry.org/devguide/deploy-apps/manifest.html#deprecated
---
 manifest.yml | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/manifest.yml b/manifest.yml
index 4cf7276..081a808 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,24 +1,27 @@
 ---
-buildpack: php_buildpack
-disk_quota: 512M
-timeout: 180
-services:
-  - database # cf create-service aws-rds medium-mysql database
-  - secrets  # cf create-user-provided-service secrets -p '{
-             # "BRIGHTCOVE_ACCOUNT": ...
-             # "BRIGHTCOVE_CLIENT": ...
-             # "BRIGHTCOVE_SECRET": ...
-             # "HASH_SALT": ...
-             # "ROOT_USER_NAME": ...,
-             # "ROOT_USER_PASS": ...,
-             # }'
-  - storage  # cf create-service s3 basic storage
+default_config: &defaults
+  buildpack: php_buildpack
+  disk_quota: 512M
+  timeout: 180
+  services:
+    - database # cf create-service aws-rds medium-mysql database
+    - secrets  # cf create-user-provided-service secrets -p '{
+               # "BRIGHTCOVE_ACCOUNT": ...
+               # "BRIGHTCOVE_CLIENT": ...
+               # "BRIGHTCOVE_SECRET": ...
+               # "HASH_SALT": ...
+               # "ROOT_USER_NAME": ...,
+               # "ROOT_USER_PASS": ...,
+               # }'
+    - storage  # cf create-service s3 basic storage
 
 applications:
 - name: nsf-demo
+  <<: *defaults
   memory: 256M
   instances: 1
 - name: cronish
+  <<: *defaults
   no-route: true
   command: ./cronish.sh
   health-check-type: process

From df1e7165dc770e629ac008cf35e278add2a54053 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Mon, 19 Mar 2018 16:01:44 -0400
Subject: [PATCH 031/143] Add production manifest; rename web app.

This prepares us for the production environment by creating a new,
production-specific manifest file. It's a duplicate of manifest.yml, changing
only the "domains" key. Cloud Foundry's manifest inheritance is deprecated,
but they haven't implemented their variable substitution strategy yet, so this
duplication seems like the best path forward.

This renames the application to "web" so there isn't an "nsf-demo" app in the
"prod" space.

To deploy to prod, we'll run:
cf target -o nsf-prototyping -s prod
cf push -f manifest-prod.yml
---
 bootstrap.sh      |  2 +-
 manifest-prod.yml | 31 +++++++++++++++++++++++++++++++
 manifest.yml      |  4 +++-
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 manifest-prod.yml

diff --git a/bootstrap.sh b/bootstrap.sh
index e1c4329..c1d9395 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -25,7 +25,7 @@ install_drupal() {
     drupal --root=$HOME/web config:override system.site uuid $UUID
 }
 
-if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "nsf-demo" ]; then
+if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   drupal --root=$HOME/web list | grep database > /dev/null || install_drupal
   # Sync configs from code
   drupal --root=$HOME/web config:import --directory $HOME/web/sites/default/config
diff --git a/manifest-prod.yml b/manifest-prod.yml
new file mode 100644
index 0000000..51fc78f
--- /dev/null
+++ b/manifest-prod.yml
@@ -0,0 +1,31 @@
+---
+default_config: &defaults
+  buildpack: php_buildpack
+  disk_quota: 512M
+  timeout: 180
+  services:
+    - database # cf create-service aws-rds medium-mysql database
+    - secrets  # cf create-user-provided-service secrets -p '{
+               # "BRIGHTCOVE_ACCOUNT": ...
+               # "BRIGHTCOVE_CLIENT": ...
+               # "BRIGHTCOVE_SECRET": ...
+               # "HASH_SALT": ...
+               # "ROOT_USER_NAME": ...,
+               # "ROOT_USER_PASS": ...,
+               # }'
+    - storage  # cf create-service s3 basic storage
+
+applications:
+- name: web
+  <<: *defaults
+  memory: 256M
+  instances: 1
+  routes:
+    - route: beta.nsf.gov
+    - route: nsf-beta.app.cloud.gov
+- name: cronish
+  <<: *defaults
+  no-route: true
+  command: ./cronish.sh
+  health-check-type: process
+  memory: 128M
diff --git a/manifest.yml b/manifest.yml
index 081a808..335a2a9 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -16,10 +16,12 @@ default_config: &defaults
     - storage  # cf create-service s3 basic storage
 
 applications:
-- name: nsf-demo
+- name: web
   <<: *defaults
   memory: 256M
   instances: 1
+  routes:
+    - route: nsf-demo.app.cloud.gov
 - name: cronish
   <<: *defaults
   no-route: true

From 6011c3f4e83959da03757ebc2fbd2bc8eefcd3a8 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 11:49:43 -0400
Subject: [PATCH 032/143] Use script location rather than HOME in bootstrap.

The bootstrap.sh script referenced $HOME several times, which makes sense in
the cloud.gov environment, but won't when running locally. By using the
script's location instead, we make this portable.
---
 bootstrap.sh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index e1c4329..2914dc3 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,6 +3,7 @@ set -euo pipefail
 
 SECRETS=$(echo $VCAP_SERVICES | jq -r '.["user-provided"][] | select(.name == "secrets") | .credentials')
 APP_NAME=$(echo $VCAP_APPLICATION | jq -r '.name')
+APP_ROOT=$(dirname "${BASH_SOURCE[0]}")
 
 install_drupal() {
     ROOT_USER_NAME=$(echo $SECRETS | jq -r '.ROOT_USER_NAME')
@@ -12,34 +13,34 @@ install_drupal() {
     : "${ROOT_USER_PASS:?Need and root user pass for Drupal}"
 
     drupal site:install \
-        --root=$HOME/web \
+        --root=$APP_ROOT/web \
         --no-interaction \
         --account-name="$ROOT_USER_NAME" \
         --account-pass="$ROOT_USER_PASS" \
         --langcode="en"
     # Delete some data created in the "standard" install profile
     # See https://www.drupal.org/project/drupal/issues/2583113
-    drupal --root=$HOME/web entity:delete shortcut_set default --no-interaction
+    drupal --root=$APP_ROOT/web entity:delete shortcut_set default --no-interaction
     # Set site uuid to match our config
-    UUID=$(grep uuid web/sites/default/config/system.site.yml | cut -d' ' -f2)
-    drupal --root=$HOME/web config:override system.site uuid $UUID
+    UUID=$(grep uuid $APP_ROOT/web/sites/default/config/system.site.yml | cut -d' ' -f2)
+    drupal --root=$APP_ROOT/web config:override system.site uuid $UUID
 }
 
 if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "nsf-demo" ]; then
-  drupal --root=$HOME/web list | grep database > /dev/null || install_drupal
+  drupal --root=$APP_ROOT/web list | grep database > /dev/null || install_drupal
   # Sync configs from code
-  drupal --root=$HOME/web config:import --directory $HOME/web/sites/default/config
+  drupal --root=$APP_ROOT/web config:import --directory $APP_ROOT/web/sites/default/config
 
   # Secrets
   CRON_KEY=$(openssl rand -base64 32)  # Not used, so we set it to a random val
   BRIGHTCOVE_ACCOUNT=$(echo $SECRETS | jq -r '.BRIGHTCOVE_ACCOUNT')
   BRIGHTCOVE_CLIENT=$(echo $SECRETS | jq -r '.BRIGHTCOVE_CLIENT')
   BRIGHTCOVE_SECRET=$(echo $SECRETS | jq -r '.BRIGHTCOVE_SECRET')
-  drupal --root=$HOME/web config:override scheduler.settings lightweight_cron_access_key $CRON_KEY > /dev/null
-  drupal --root=$HOME/web config:override brightcove.brightcove_api_client.nsf_brightcove account_id $BRIGHTCOVE_ACCOUNT > /dev/null
-  drupal --root=$HOME/web config:override brightcove.brightcove_api_client.nsf_brightcove client_id $BRIGHTCOVE_CLIENT > /dev/null
-  drupal --root=$HOME/web config:override brightcove.brightcove_api_client.nsf_brightcove secret_key $BRIGHTCOVE_SECRET > /dev/null
+  drupal --root=$APP_ROOT/web config:override scheduler.settings lightweight_cron_access_key $CRON_KEY > /dev/null
+  drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove account_id $BRIGHTCOVE_ACCOUNT > /dev/null
+  drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove client_id $BRIGHTCOVE_CLIENT > /dev/null
+  drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove secret_key $BRIGHTCOVE_SECRET > /dev/null
 
   # Clear the cache
-  drupal --root=$HOME/web cache:rebuild --no-interaction
+  drupal --root=$APP_ROOT/web cache:rebuild --no-interaction
 fi

From 98478152b6a4e87f8bdc7b29dabc1ac149aa09bb Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 12:36:08 -0400
Subject: [PATCH 033/143] Add initial docker-for-local setup.

This uses the stock mysql image and builds off the stock php image. It adds
necessary PHP modules and composer to the php image. In terms of
configuration, we're setting cloud.gov-centric env variables to imitate that
environment.
---
 .docker/Dockerfile          | 20 ++++++++++++++++
 .docker/install-composer.sh | 20 ++++++++++++++++
 .docker/startup             |  5 ++++
 .docker/wait_for_db_then    | 17 ++++++++++++++
 docker-compose.yml          | 47 +++++++++++++++++++++++++++++++++++++
 5 files changed, 109 insertions(+)
 create mode 100644 .docker/Dockerfile
 create mode 100755 .docker/install-composer.sh
 create mode 100755 .docker/startup
 create mode 100755 .docker/wait_for_db_then
 create mode 100644 docker-compose.yml

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
new file mode 100644
index 0000000..56d434c
--- /dev/null
+++ b/.docker/Dockerfile
@@ -0,0 +1,20 @@
+FROM php:7.1-apache
+
+# Set the DocumentRoot to /var/www/web instead of /var/www/html
+RUN sed -i 's/html/web/g' /etc/apache2/sites-available/000-default.conf
+
+RUN apt-get update &&\
+    apt-get install -y \
+      libbz2-dev libcurl4-openssl-dev libmcrypt-dev \
+      libwebp-dev libjpeg-dev libpng12-dev \
+      git jq wget &&\
+    docker-php-ext-install bz2 curl gd mbstring mcrypt pdo pdo_mysql zip &&\
+    apt-get autoremove -y &&\
+    rm -rf /var/lib/apt/lists/* &&\
+    rm -rf /var/cache/apt/*
+
+COPY ["install-composer.sh", "/tmp"]
+RUN "/tmp/install-composer.sh"
+
+# Add composer-installed libs to path
+ENV PATH=/var/www/vendor/bin:$PATH
diff --git a/.docker/install-composer.sh b/.docker/install-composer.sh
new file mode 100755
index 0000000..fbb239a
--- /dev/null
+++ b/.docker/install-composer.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# from https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md
+set -e
+
+EXPECTED_SIGNATURE=$(wget -q -O - https://composer.github.io/installer.sig)
+php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', 'composer-setup.php');")
+
+if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]
+then
+    >&2 echo 'ERROR: Invalid installer signature'
+    rm composer-setup.php
+    exit 1
+fi
+
+php composer-setup.php --quiet
+RESULT=$?
+rm composer-setup.php
+mv composer.phar /usr/local/bin/composer
+exit $RESULT
diff --git a/.docker/startup b/.docker/startup
new file mode 100755
index 0000000..8599cb8
--- /dev/null
+++ b/.docker/startup
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+/var/www/.docker/wait_for_db_then /var/www/bootstrap.sh
+apache2-foreground
diff --git a/.docker/wait_for_db_then b/.docker/wait_for_db_then
new file mode 100755
index 0000000..8ebed08
--- /dev/null
+++ b/.docker/wait_for_db_then
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+FIRST_RUN=true
+
+until (echo 2>/dev/null > /dev/tcp/database/3306)
+do
+  echo "Startup: Waiting for MySQL..."
+  if $FIRST_RUN; then
+    echo "\tTo track progress, run:"
+    echo "\tdocker-compose logs -f database"
+    FIRST_RUN=false
+  fi
+  sleep 1
+done
+
+exec "$@"
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..3b415a8
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,47 @@
+version: '3.3'
+services:
+  database:
+    image: mysql:5.7
+    volumes:
+      - database_data:/var/lib/mysql:delegated
+    environment:
+      MYSQL_ROOT_PASSWORD: mysql
+      MYSQL_DATABASE: mysql
+  web:
+    build: .docker
+    ports:
+      - 8080:80
+    volumes:
+      - .:/var/www/:delegated
+    command: "/var/www/.docker/startup"
+    environment:
+      CF_INSTANCE_INDEX: '0'
+      VCAP_APPLICATION: >
+        {"name": "web"}
+      VCAP_SERVICES: >
+        { "aws-rds": [{
+            "name": "database",
+            "credentials": {
+              "db_name": "mysql",
+              "host": "database",
+              "password": "mysql",
+              "port": "3306",
+              "username": "root"
+            }
+          }],
+          "user-provided": [{
+            "name": "secrets",
+            "credentials": {
+              "BRIGHTCOVE_ACCOUNT": "SECRET",
+              "BRIGHTCOVE_CLIENT": "SECRET",
+              "BRIGHTCOVE_SECRET": "SECRET",
+              "HASH_SALT": "SECRET",
+              "ROOT_USER_NAME": "root",
+              "ROOT_USER_PASS": "root"
+            }
+          }]
+        }
+    depends_on:
+      - database
+volumes:
+  database_data:

From 7f3376b10a7b90587a2311145bbeed295d00b0f3 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 12:39:57 -0400
Subject: [PATCH 034/143] Define same extensions in cloud.gov as in Docker.

---
 .bp-config/options.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bp-config/options.json b/.bp-config/options.json
index 566b5db..8ffb585 100644
--- a/.bp-config/options.json
+++ b/.bp-config/options.json
@@ -4,7 +4,7 @@
   ],
   "COMPOSER_VENDOR_DIR": "vendor",
   "WEBDIR": "web",
-  "PHP_EXTENSIONS": ["bz2", "zlib", "curl", "mcrypt", "gd", "pdo", "pdo_mysql", "mbstring"],
+  "PHP_EXTENSIONS": ["bz2", "curl", "gd", "mbstring", "mcrypt", "pdo", "pdo_mysql", "zip"],
   "ADDITIONAL_PREPROCESS_CMDS": [
     "$HOME/bootstrap.sh"
   ]

From da6f240106345832655990a8818fc2c7e64c0c9a Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 12:40:47 -0400
Subject: [PATCH 035/143] Add helper scripts for running commands in Docker.

These require bash, but should make interacting with the app locally easier.
As an added benefit, the Drush and Drupal scripts automatically set the "root"
argument.
---
 bin/composer | 9 +++++++++
 bin/drupal   | 8 ++++++++
 bin/drush    | 8 ++++++++
 3 files changed, 25 insertions(+)
 create mode 100755 bin/composer
 create mode 100755 bin/drupal
 create mode 100755 bin/drush

diff --git a/bin/composer b/bin/composer
new file mode 100755
index 0000000..9dc8040
--- /dev/null
+++ b/bin/composer
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+docker-compose run \
+  --rm \
+  --no-deps \
+  --workdir /var/www \
+  web \
+  composer "$@"
diff --git a/bin/drupal b/bin/drupal
new file mode 100755
index 0000000..ce3539d
--- /dev/null
+++ b/bin/drupal
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+docker-compose run \
+  --rm \
+  --workdir /var/www \
+  web \
+  .docker/wait_for_db_then drupal --root=/var/www/web "$@"
diff --git a/bin/drush b/bin/drush
new file mode 100755
index 0000000..5541aaf
--- /dev/null
+++ b/bin/drush
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+docker-compose run \
+  --rm \
+  --workdir /var/www \
+  web \
+  .docker/wait_for_db_then drush --root=/var/www/web "$@"

From fa565b3bdbcba0ab3c706fdbc861ce730d0a2828 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 13:52:04 -0400
Subject: [PATCH 036/143] Add Drupal-based local development to README.

Also removes the README.txt that came with Drupal.
---
 README.md  |  51 ++++++++++++++++++++
 README.txt | 139 -----------------------------------------------------
 2 files changed, 51 insertions(+), 139 deletions(-)
 delete mode 100644 README.txt

diff --git a/README.md b/README.md
index bc2e899..201061e 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,53 @@
 # nsf
 This is the working repository for the NSF Site Redesign &amp; Content Discovery project. 
+
+## Developing locally
+
+We use [Docker](https://www.docker.com/) to get a local environment running
+quickly. Once we have cloned this repository to a local directory and have
+[installed
+Docker](https://store.docker.com/search?type=edition&offering=community), we
+can download PHP dependencies. We'll be using the bash-friendly scripts in
+`bin`, but they wouldn't need to be modified substantially for Windows or
+other environments.
+
+```
+cd path/to/nsf
+bin/composer install
+```
+
+This command will start by building a Docker image with the PHP modules we
+need, unless the image already exists. It will then use
+[Composer](https://getcomposer.org/) to install dependencies from our
+`composer.lock` file. We can ignore the warning about running as root, as the
+"root" in question is the root user _within_ the container. Should we need to
+add dependencies in the future, we can use `bin/composer require` as described
+in Composer's [docs](https://getcomposer.org/doc/03-cli.md#require).
+
+Next, we can start our application:
+
+```
+docker-compose up
+```
+
+This will start up the database (MySQL) and then run our bootstrap script to
+install Drupal. The initial installation and configuration import will take
+several minutes, but we should see status updates in the terminal.
+
+After we see a message about `apache2 -D FOREGROUND`, we're good to go.
+Navigate to [http://localhost:8080/](http://localhost:8080) and log in as the
+root user (username and password are both "root").
+
+To stop the service, press `ctrl-c` in the terminal. The next time we start
+it, we'll see a similar bootstrap process, but it should be significantly
+faster.
+
+As the service runs, we can directly modify the PHP files in our app and see
+our changes in near-real time.
+
+### Other commands
+
+Within the `bin` directory, there are a handful of helpful scripts to make
+running `drupal`, `drush`, etc. within the context of our Dockerized app
+easier. As noted above, they are written with bash in mind, but should be easy
+to port to other environments.
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 0bafcc1..0000000
--- a/README.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-
-CONTENTS OF THIS FILE
----------------------
-
- * About Drupal
- * Configuration and features
- * Installation profiles
- * Appearance
- * Developing for Drupal
- * More information
-
-ABOUT DRUPAL
-------------
-
-Drupal is an open source content management platform supporting a variety of
-websites ranging from personal weblogs to large community-driven websites. For
-more information, see the Drupal website at https://www.drupal.org, and join
-the Drupal community at https://www.drupal.org/community.
-
-Legal information about Drupal:
- * Know your rights when using Drupal:
-   See LICENSE.txt in the "core" directory.
- * Learn about the Drupal trademark and logo policy:
-   https://www.drupal.com/trademark
-
-CONFIGURATION AND FEATURES
---------------------------
-
-Drupal core (what you get when you download and extract a drupal-x.y.tar.gz or
-drupal-x.y.zip file from https://www.drupal.org/project/drupal) has what you
-need to get started with your website. It includes several modules (extensions
-that add functionality) for common website features, such as managing content,
-user accounts, image uploading, and search. Core comes with many options that
-allow site-specific configuration. In addition to the core modules, there are
-thousands of contributed modules (for functionality not included with Drupal
-core) available for download.
-
-More about configuration:
- * Install, update, and maintain Drupal:
-   See INSTALL.txt and UPDATE.txt in the "core" directory.
- * Learn about how to use Drupal to create your site:
-   https://www.drupal.org/documentation
- * Follow best practices:
-   https://www.drupal.org/best-practices
- * Download contributed modules to /modules to extend Drupal's functionality:
-   https://www.drupal.org/project/modules
- * See also: "Developing for Drupal" for writing your own modules, below.
-
-
-INSTALLATION PROFILES
----------------------
-
-Installation profiles define additional steps (such as enabling modules,
-defining content types, etc.) that run after the base installation provided
-by core when Drupal is first installed. There are two basic installation
-profiles provided with Drupal core.
-
-Installation profiles from the Drupal community modify the installation process
-to provide a website for a specific use case, such as a CMS for media
-publishers, a web-based project tracking tool, or a full-fledged CRM for
-non-profit organizations raising money and accepting donations. They can be
-distributed as bare installation profiles or as "distributions". Distributions
-include Drupal core, the installation profile, and all other required
-extensions, such as contributed and custom modules, themes, and third-party
-libraries. Bare installation profiles require you to download Drupal Core and
-the required extensions separately; place the downloaded profile in the
-/profiles directory before you start the installation process.
-
-More about installation profiles and distributions:
- * Read about the difference between installation profiles and distributions:
-   https://www.drupal.org/node/1089736
- * Download contributed installation profiles and distributions:
-   https://www.drupal.org/project/distributions
- * Develop your own installation profile or distribution:
-   https://www.drupal.org/developing/distributions
-
-
-APPEARANCE
-----------
-
-In Drupal, the appearance of your site is set by the theme (themes are
-extensions that set fonts, colors, and layout). Drupal core comes with several
-themes. More themes are available for download, and you can also create your own
-custom theme.
-
-More about themes:
- * Download contributed themes to /themes to modify Drupal's appearance:
-   https://www.drupal.org/project/themes
- * Develop your own theme:
-   https://www.drupal.org/documentation/theme
-
-DEVELOPING FOR DRUPAL
----------------------
-
-Drupal contains an extensive API that allows you to add to and modify the
-functionality of your site. The API consists of "hooks", which allow modules to
-react to system events and customize Drupal's behavior, and functions that
-standardize common operations such as database queries and form generation. The
-flexible hook architecture means that you should never need to directly modify
-the files that come with Drupal core to achieve the functionality you want;
-instead, functionality modifications take the form of modules.
-
-When you need new functionality for your Drupal site, search for existing
-contributed modules. If you find a module that matches except for a bug or an
-additional needed feature, change the module and contribute your improvements
-back to the project in the form of a "patch". Create new custom modules only
-when nothing existing comes close to what you need.
-
-More about developing:
- * Search for existing contributed modules:
-   https://www.drupal.org/project/modules
- * Contribute a patch:
-   https://www.drupal.org/patch/submit
- * Develop your own module:
-   https://www.drupal.org/developing/modules
- * Follow programming best practices:
-   https://www.drupal.org/developing/best-practices
- * Refer to the API documentation:
-   https://api.drupal.org/api/drupal/8
- * Learn from documented Drupal API examples:
-   https://www.drupal.org/project/examples
-
-MORE INFORMATION
-----------------
-
- * See the Drupal.org online documentation:
-   https://www.drupal.org/documentation
-
- * For a list of security announcements, see the "Security advisories" page at
-   https://www.drupal.org/security (available as an RSS feed). This page also
-   describes how to subscribe to these announcements via email.
-
- * For information about the Drupal security process, or to find out how to
-   report a potential security issue to the Drupal security team, see the
-   "Security team" page at https://www.drupal.org/security-team
-
- * For information about the wide range of available support options, visit
-   https://www.drupal.org and click on Community and Support in the top or
-   bottom navigation.

From d61655f0822cb4cd60d2136c946b8762b1e6f39c Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 16:41:07 -0400
Subject: [PATCH 037/143] Display real tabs instead of "\t" in echo command.

---
 .docker/wait_for_db_then | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.docker/wait_for_db_then b/.docker/wait_for_db_then
index 8ebed08..cc359ea 100755
--- a/.docker/wait_for_db_then
+++ b/.docker/wait_for_db_then
@@ -7,8 +7,8 @@ until (echo 2>/dev/null > /dev/tcp/database/3306)
 do
   echo "Startup: Waiting for MySQL..."
   if $FIRST_RUN; then
-    echo "\tTo track progress, run:"
-    echo "\tdocker-compose logs -f database"
+    echo -e "\tTo track progress, run:"
+    echo -e "\tdocker-compose logs -f database"
     FIRST_RUN=false
   fi
   sleep 1

From a5a4a94cdf72b3f290db6c0335f587655b6758ec Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 16:42:13 -0400
Subject: [PATCH 038/143] Downgrade docker compose file version.

We aren't using any of the features of 3.1, .2, or .3, so we can downgrade to
3.0 support more developers.
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3b415a8..fe79840 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.3'
+version: '3.0'
 services:
   database:
     image: mysql:5.7

From 4fc66fd3ccc78e2c942adf8e847caf6861ea4f77 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 16:43:24 -0400
Subject: [PATCH 039/143] Add helper script for running the mysql console.

---
 bin/mysql | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100755 bin/mysql

diff --git a/bin/mysql b/bin/mysql
new file mode 100755
index 0000000..a514eab
--- /dev/null
+++ b/bin/mysql
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+docker-compose run \
+  --rm \
+  database \
+  mysql --host=database --user=root --password=mysql mysql \
+  "$@"

From 29af56b819a6c170bc750bc76fc62f21c0c7bbc0 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 21:19:44 -0400
Subject: [PATCH 040/143] Fix variable rename that got lost in a merge.

---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 4a1e3b7..029af70 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -27,7 +27,7 @@ install_drupal() {
 }
 
 if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
-  drupal --root=$HOME/web list | grep database > /dev/null || install_drupal
+  drupal --root=$APP_ROOT/web list | grep database > /dev/null || install_drupal
   # Sync configs from code
   drupal --root=$APP_ROOT/web config:import --directory $APP_ROOT/web/sites/default/config
 

From e353c610c3a99386a3fd441720604441b148d108 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 18:39:22 -0400
Subject: [PATCH 041/143] Update the config import/export directory to match.

---
 bootstrap.sh                   | 2 +-
 web/sites/default/settings.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 029af70..514f000 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -29,7 +29,7 @@ install_drupal() {
 if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   drupal --root=$APP_ROOT/web list | grep database > /dev/null || install_drupal
   # Sync configs from code
-  drupal --root=$APP_ROOT/web config:import --directory $APP_ROOT/web/sites/default/config
+  drupal --root=$APP_ROOT/web config:import
 
   # Secrets
   CRON_KEY=$(openssl rand -base64 32)  # Not used, so we set it to a random val
diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php
index 8bde4e3..7e4b6fc 100644
--- a/web/sites/default/settings.php
+++ b/web/sites/default/settings.php
@@ -771,7 +771,7 @@
  */
 $settings['entity_update_batch_size'] = 50;
 
-$config_directories['sync'] = '../config/sync';
+$config_directories['sync'] = './sites/default/config/';
 $settings['install_profile'] = 'standard';
 include $app_root . '/' . $site_path . '/settings.cf.php';
 

From cdfb4df67d092886019e665a58b87ba792f40e62 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 21 Mar 2018 11:11:46 -0400
Subject: [PATCH 042/143] Fix htaccess typo.

When I tried to access a config from the web, I got a 500 due to an error
parsing the htaccess file. This resolves the typo, so we now receive a 403.
---
 web/sites/default/config/.htaccess | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/sites/default/config/.htaccess b/web/sites/default/config/.htaccess
index 91883a3..50d210b 100644
--- a/web/sites/default/config/.htaccess
+++ b/web/sites/default/config/.htaccess
@@ -6,7 +6,8 @@
 # Deny all requests from Apache 2.0-2.2.
 <IfModule !mod_authz_core.c>
   Deny from all
-</IfModule># Turn off all options we don't need.
+</IfModule>
+# Turn off all options we don't need.
 Options None
 Options +FollowSymLinks
 
@@ -20,4 +21,4 @@ SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
 # If we know how to do it safely, disable the PHP engine entirely.
 <IfModule mod_php5.c>
   php_flag engine off
-</IfModule>
\ No newline at end of file
+</IfModule>

From edc76c5c17c23bc7458b9cc3e7b23fb1446cf965 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Tue, 20 Mar 2018 18:47:41 -0400
Subject: [PATCH 043/143] Set logs to store indefinitely.

As part of our SSR, we're claiming to store logs for at least a year. We've
also noted that the logs are stored (for now) in the database.

As @fureigh pointed out, this is a frequent performance bottleneck for Drupal
sites. Unfortunately, there's not enough runway to create a longer term
solution (like writing to syslog) as we know from our users that they want to
see subsets of the logs within the application. We're kicking that can down
the road a bit.
---
 web/sites/default/config/dblog.settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/sites/default/config/dblog.settings.yml b/web/sites/default/config/dblog.settings.yml
index cf06e3f..dbe7f2a 100644
--- a/web/sites/default/config/dblog.settings.yml
+++ b/web/sites/default/config/dblog.settings.yml
@@ -1,3 +1,3 @@
-row_limit: 1000
+row_limit: 0
 _core:
   default_config_hash: e883aGsrt1wFrsydlYU584PZONCSfRy0DtkZ9KzHb58

From c5dee198aa15836d680c3562d787a892459857fc Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 21 Mar 2018 13:17:45 -0400
Subject: [PATCH 044/143] Remote Workflow module.

Per discussion with @fureigh, this module isn't needed anymore, so let's
remove it and its configs.
---
 composer.json                                 |  1 -
 composer.lock                                 | 81 +------------------
 ...low_transition.news_and_events.default.yml | 12 ---
 ...de.workflow_scheduled_transition.token.yml | 10 ---
 ...ty_view_mode.workflow_transition.token.yml | 10 ---
 web/sites/default/config/core.extension.yml   |  1 -
 ...n.change_a_node_to_next_workflow_state.yml | 25 ------
 .../default/config/workflow.settings.yml      |  3 -
 ...orkflow.state.news_and_events_approved.yml | 10 ---
 ...orkflow.state.news_and_events_creation.yml | 10 ---
 ...low.state.news_and_events_under_review.yml | 10 ---
 ...tion.news_and_events_approved_approved.yml | 10 ---
 ....news_and_events_approved_under_review.yml | 16 ----
 ...tion.news_and_events_creation_approved.yml | 16 ----
 ....news_and_events_creation_under_review.yml | 16 ----
 ....news_and_events_under_review_approved.yml | 16 ----
 ...s_and_events_under_review_under_review.yml | 10 ---
 .../workflow.workflow.news_and_events.yml     | 14 ----
 18 files changed, 1 insertion(+), 270 deletions(-)
 delete mode 100644 web/sites/default/config/core.entity_view_display.workflow_transition.news_and_events.default.yml
 delete mode 100644 web/sites/default/config/core.entity_view_mode.workflow_scheduled_transition.token.yml
 delete mode 100644 web/sites/default/config/core.entity_view_mode.workflow_transition.token.yml
 delete mode 100644 web/sites/default/config/system.action.change_a_node_to_next_workflow_state.yml
 delete mode 100644 web/sites/default/config/workflow.settings.yml
 delete mode 100644 web/sites/default/config/workflow.state.news_and_events_approved.yml
 delete mode 100644 web/sites/default/config/workflow.state.news_and_events_creation.yml
 delete mode 100644 web/sites/default/config/workflow.state.news_and_events_under_review.yml
 delete mode 100644 web/sites/default/config/workflow.transition.news_and_events_approved_approved.yml
 delete mode 100644 web/sites/default/config/workflow.transition.news_and_events_approved_under_review.yml
 delete mode 100644 web/sites/default/config/workflow.transition.news_and_events_creation_approved.yml
 delete mode 100644 web/sites/default/config/workflow.transition.news_and_events_creation_under_review.yml
 delete mode 100644 web/sites/default/config/workflow.transition.news_and_events_under_review_approved.yml
 delete mode 100644 web/sites/default/config/workflow.transition.news_and_events_under_review_under_review.yml
 delete mode 100644 web/sites/default/config/workflow.workflow.news_and_events.yml

diff --git a/composer.json b/composer.json
index cb54389..f872069 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,6 @@
         "drupal/scheduler": "^1.0",
         "drupal/time_formatter": "1.x-dev",
         "drupal/tour_ui": "^1.0@alpha",
-        "drupal/workflow": "^1.0",
         "drush/drush": "~8.0|^9.0.0-beta8",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3"
diff --git a/composer.lock b/composer.lock
index f458f9f..fbb2708 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "1e8f381c09766b5590557d88c592e396",
+    "content-hash": "a38e22dee1a5803303548ab5fec7dfa3",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -3613,85 +3613,6 @@
                 "source": "http://cgit.drupalcode.org/typed_data"
             }
         },
-        {
-            "name": "drupal/workflow",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupal.org/project/workflow",
-                "reference": "8.x-1.0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/workflow-8.x-1.0.zip",
-                "reference": "8.x-1.0",
-                "shasum": "2c439aab3f92b476cb88dbc517e131ea3cd7be47"
-            },
-            "require": {
-                "drupal/core": "*"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                },
-                "drupal": {
-                    "version": "8.x-1.0",
-                    "datestamp": "1513552385",
-                    "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Bastlynn",
-                    "homepage": "https://www.drupal.org/user/275249"
-                },
-                {
-                    "name": "Heine",
-                    "homepage": "https://www.drupal.org/user/17943"
-                },
-                {
-                    "name": "JacobSingh",
-                    "homepage": "https://www.drupal.org/user/68912"
-                },
-                {
-                    "name": "NancyDru",
-                    "homepage": "https://www.drupal.org/user/101412"
-                },
-                {
-                    "name": "eaton",
-                    "homepage": "https://www.drupal.org/user/16496"
-                },
-                {
-                    "name": "johnv",
-                    "homepage": "https://www.drupal.org/user/591042"
-                },
-                {
-                    "name": "jvandyk",
-                    "homepage": "https://www.drupal.org/user/2375"
-                },
-                {
-                    "name": "mfredrickson",
-                    "homepage": "https://www.drupal.org/user/31994"
-                },
-                {
-                    "name": "q0rban",
-                    "homepage": "https://www.drupal.org/user/31022"
-                }
-            ],
-            "description": "Defines a field type with Workflows, containing customizable state transitions.",
-            "homepage": "https://www.drupal.org/project/workflow",
-            "support": {
-                "source": "http://cgit.drupalcode.org/workflow"
-            }
-        },
         {
             "name": "drush/drush",
             "version": "9.2.1",
diff --git a/web/sites/default/config/core.entity_view_display.workflow_transition.news_and_events.default.yml b/web/sites/default/config/core.entity_view_display.workflow_transition.news_and_events.default.yml
deleted file mode 100644
index 877d8b9..0000000
--- a/web/sites/default/config/core.entity_view_display.workflow_transition.news_and_events.default.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 9e842269-29c1-419c-9dbb-3c45419719e6
-langcode: en
-status: true
-dependencies:
-  config:
-    - workflow.workflow.news_and_events
-id: workflow_transition.news_and_events.default
-targetEntityType: workflow_transition
-bundle: news_and_events
-mode: default
-content: {  }
-hidden: {  }
diff --git a/web/sites/default/config/core.entity_view_mode.workflow_scheduled_transition.token.yml b/web/sites/default/config/core.entity_view_mode.workflow_scheduled_transition.token.yml
deleted file mode 100644
index 0fbfc97..0000000
--- a/web/sites/default/config/core.entity_view_mode.workflow_scheduled_transition.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 1991c0e5-e6f3-4793-90e9-d07fa5ab962e
-langcode: en
-status: true
-dependencies:
-  module:
-    - workflow
-id: workflow_scheduled_transition.token
-label: Token
-targetEntityType: workflow_scheduled_transition
-cache: true
diff --git a/web/sites/default/config/core.entity_view_mode.workflow_transition.token.yml b/web/sites/default/config/core.entity_view_mode.workflow_transition.token.yml
deleted file mode 100644
index 1dd760c..0000000
--- a/web/sites/default/config/core.entity_view_mode.workflow_transition.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 82f021ae-e153-4270-8ac4-0c236fa010fd
-langcode: en
-status: true
-dependencies:
-  module:
-    - workflow
-id: workflow_transition.token
-label: Token
-targetEntityType: workflow_transition
-cache: true
diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
index e471ed4..3f26751 100644
--- a/web/sites/default/config/core.extension.yml
+++ b/web/sites/default/config/core.extension.yml
@@ -66,7 +66,6 @@ module:
   update: 0
   user: 0
   views_ui: 0
-  workflow: 0
   workflows: 0
   menu_link_content: 1
   pathauto: 1
diff --git a/web/sites/default/config/system.action.change_a_node_to_next_workflow_state.yml b/web/sites/default/config/system.action.change_a_node_to_next_workflow_state.yml
deleted file mode 100644
index 8b92aa1..0000000
--- a/web/sites/default/config/system.action.change_a_node_to_next_workflow_state.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: c0a8d1df-1da3-44e5-a1c9-411abd9694d8
-langcode: nl
-status: true
-dependencies:
-  module:
-    - node
-    - workflow
-_core:
-  default_config_hash: M98hvuYlwD42D6FTasB41hR2kTUpVtEB407qW4Ne1Ww
-id: change_a_node_to_next_workflow_state
-label: 'Change a node to next Workflow state'
-type: node
-plugin: workflow_node_next_state_action
-configuration:
-  label: 'Change a node to next Workflow state'
-  id: change_a_node_to_next_workflow_state
-  plugin: workflow_node_next_state_action
-  type: node
-  workflow_scheduling:
-    scheduled: '0'
-  comment: 'New state is set by a triggered Action.'
-  force: 0
-  actions: {  }
-  field_name: ''
-  to_sid: ''
diff --git a/web/sites/default/config/workflow.settings.yml b/web/sites/default/config/workflow.settings.yml
deleted file mode 100644
index 26753af..0000000
--- a/web/sites/default/config/workflow.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-workflow_states_per_page: 20
-_core:
-  default_config_hash: ne-hLr6xAfj-y7himkP4sQpLeAsTLAzt9YuxlQCk8N8
diff --git a/web/sites/default/config/workflow.state.news_and_events_approved.yml b/web/sites/default/config/workflow.state.news_and_events_approved.yml
deleted file mode 100644
index c6398bf..0000000
--- a/web/sites/default/config/workflow.state.news_and_events_approved.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 4c217c63-6746-40b9-92db-a9c17c9eaa64
-langcode: en
-status: true
-dependencies: {  }
-id: news_and_events_approved
-label: Approved
-module: null
-wid: news_and_events
-weight: -7
-sysid: 0
diff --git a/web/sites/default/config/workflow.state.news_and_events_creation.yml b/web/sites/default/config/workflow.state.news_and_events_creation.yml
deleted file mode 100644
index 1f64b32..0000000
--- a/web/sites/default/config/workflow.state.news_and_events_creation.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 81a13e00-2a2d-494a-abf7-3395778eef4e
-langcode: en
-status: true
-dependencies: {  }
-id: news_and_events_creation
-label: (Creation)
-module: null
-wid: news_and_events
-weight: -11
-sysid: 1
diff --git a/web/sites/default/config/workflow.state.news_and_events_under_review.yml b/web/sites/default/config/workflow.state.news_and_events_under_review.yml
deleted file mode 100644
index 42532b1..0000000
--- a/web/sites/default/config/workflow.state.news_and_events_under_review.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 2824207b-2428-431a-9722-afd747a20686
-langcode: en
-status: true
-dependencies: {  }
-id: news_and_events_under_review
-label: 'Under Review'
-module: null
-wid: news_and_events
-weight: -8
-sysid: 0
diff --git a/web/sites/default/config/workflow.transition.news_and_events_approved_approved.yml b/web/sites/default/config/workflow.transition.news_and_events_approved_approved.yml
deleted file mode 100644
index 191e7f9..0000000
--- a/web/sites/default/config/workflow.transition.news_and_events_approved_approved.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 7db2c6c9-520c-4d9b-a2d9-3e24d11fbaa1
-langcode: en
-status: true
-dependencies: {  }
-id: news_and_events_approved_approved
-label: null
-module: null
-from_sid: news_and_events_approved
-to_sid: news_and_events_approved
-roles: {  }
diff --git a/web/sites/default/config/workflow.transition.news_and_events_approved_under_review.yml b/web/sites/default/config/workflow.transition.news_and_events_approved_under_review.yml
deleted file mode 100644
index a0c7b45..0000000
--- a/web/sites/default/config/workflow.transition.news_and_events_approved_under_review.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-uuid: 3e2f5444-85d4-463e-9e23-ffff1fe3ba2d
-langcode: en
-status: true
-dependencies: {  }
-id: news_and_events_approved_under_review
-label: null
-module: null
-from_sid: news_and_events_approved
-to_sid: news_and_events_under_review
-roles:
-  administrator: administrator
-  olpa_content_admin: olpa_content_admin
-  workflow_author: '0'
-  anonymous: '0'
-  authenticated: '0'
-  olpa_content_editor: '0'
diff --git a/web/sites/default/config/workflow.transition.news_and_events_creation_approved.yml b/web/sites/default/config/workflow.transition.news_and_events_creation_approved.yml
deleted file mode 100644
index 7bd9339..0000000
--- a/web/sites/default/config/workflow.transition.news_and_events_creation_approved.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-uuid: 7e10f667-7a37-46ba-b6c3-fb48e4b24197
-langcode: en
-status: true
-dependencies: {  }
-id: news_and_events_creation_approved
-label: null
-module: null
-from_sid: news_and_events_creation
-to_sid: news_and_events_approved
-roles:
-  administrator: administrator
-  olpa_content_admin: olpa_content_admin
-  workflow_author: '0'
-  anonymous: '0'
-  authenticated: '0'
-  olpa_content_editor: '0'
diff --git a/web/sites/default/config/workflow.transition.news_and_events_creation_under_review.yml b/web/sites/default/config/workflow.transition.news_and_events_creation_under_review.yml
deleted file mode 100644
index b8c00ff..0000000
--- a/web/sites/default/config/workflow.transition.news_and_events_creation_under_review.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-uuid: ad96aed4-717d-4cf9-988e-b63e1964b40a
-langcode: en
-status: true
-dependencies: {  }
-id: news_and_events_creation_under_review
-label: null
-module: null
-from_sid: news_and_events_creation
-to_sid: news_and_events_under_review
-roles:
-  workflow_author: workflow_author
-  administrator: administrator
-  olpa_content_admin: olpa_content_admin
-  anonymous: '0'
-  authenticated: '0'
-  olpa_content_editor: '0'
diff --git a/web/sites/default/config/workflow.transition.news_and_events_under_review_approved.yml b/web/sites/default/config/workflow.transition.news_and_events_under_review_approved.yml
deleted file mode 100644
index 2a943c9..0000000
--- a/web/sites/default/config/workflow.transition.news_and_events_under_review_approved.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-uuid: e103e830-1bfa-43b6-81d8-2a044a8bd0b5
-langcode: en
-status: true
-dependencies: {  }
-id: news_and_events_under_review_approved
-label: null
-module: null
-from_sid: news_and_events_under_review
-to_sid: news_and_events_approved
-roles:
-  administrator: administrator
-  olpa_content_admin: olpa_content_admin
-  workflow_author: '0'
-  anonymous: '0'
-  authenticated: '0'
-  olpa_content_editor: '0'
diff --git a/web/sites/default/config/workflow.transition.news_and_events_under_review_under_review.yml b/web/sites/default/config/workflow.transition.news_and_events_under_review_under_review.yml
deleted file mode 100644
index 92df3c5..0000000
--- a/web/sites/default/config/workflow.transition.news_and_events_under_review_under_review.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 34f4d766-6b6f-4cc5-a6fb-7c28754ca9ba
-langcode: en
-status: true
-dependencies: {  }
-id: news_and_events_under_review_under_review
-label: null
-module: null
-from_sid: news_and_events_under_review
-to_sid: news_and_events_under_review
-roles: {  }
diff --git a/web/sites/default/config/workflow.workflow.news_and_events.yml b/web/sites/default/config/workflow.workflow.news_and_events.yml
deleted file mode 100644
index 2abee6a..0000000
--- a/web/sites/default/config/workflow.workflow.news_and_events.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: fceba506-0709-4c16-be5a-2db9a7bdc327
-langcode: en
-status: true
-dependencies: {  }
-id: news_and_events
-label: 'News and events'
-module: null
-options:
-  name_as_title: 0
-  fieldset: 2
-  options: radios
-  schedule_timezone: 1
-  comment_log_node: 1
-  watchdog_log: 1

From 9e1a666c4f9948d4d9f74dd7825b3faa3cad3c09 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 21 Mar 2018 13:11:15 -0700
Subject: [PATCH 045/143] Update site name to beta.nsf.gov

---
 web/sites/default/config/system.site.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/sites/default/config/system.site.yml b/web/sites/default/config/system.site.yml
index 4a18e17..89cc77b 100644
--- a/web/sites/default/config/system.site.yml
+++ b/web/sites/default/config/system.site.yml
@@ -1,5 +1,5 @@
 uuid: f047fa5b-89c8-4f6b-80de-7ea36c91cf55
-name: 'nsf demo'
+name: beta.nsf.gov
 mail: rhys.fureigh@gsa.gov
 slogan: ''
 page:

From f9be9fa5e25505065779b1dc6499a9f9fe6ea66b Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 21 Mar 2018 13:11:52 -0700
Subject: [PATCH 046/143] Make the social media page the homepage

---
 web/sites/default/config/system.site.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/sites/default/config/system.site.yml b/web/sites/default/config/system.site.yml
index 89cc77b..bcbc0d4 100644
--- a/web/sites/default/config/system.site.yml
+++ b/web/sites/default/config/system.site.yml
@@ -5,7 +5,7 @@ slogan: ''
 page:
   403: ''
   404: ''
-  front: /node
+  front: /blog
 admin_compact_mode: false
 weight_select_max: 100
 langcode: en

From 06f0a5405dd90d2ed88cc91a43b81b51fd6ac383 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 21 Mar 2018 17:25:20 -0400
Subject: [PATCH 047/143] Enable S3 storage for our image fields.

We had been including the flysystem dependencies but hadn't configured its
use. This sets our two image fields to store their content in s3 (as the local
file system is volatile and may disappear between app restarts).
---
 web/sites/default/config/core.extension.yml                   | 2 ++
 .../config/field.storage.node.field_featured_image.yml        | 2 +-
 web/sites/default/config/field.storage.user.user_picture.yml  | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
index e471ed4..209eb87 100644
--- a/web/sites/default/config/core.extension.yml
+++ b/web/sites/default/config/core.extension.yml
@@ -33,6 +33,8 @@ module:
   field_ui: 0
   file: 0
   filter: 0
+  flysystem: 0
+  flysystem_s3: 0
   help: 0
   history: 0
   image: 0
diff --git a/web/sites/default/config/field.storage.node.field_featured_image.yml b/web/sites/default/config/field.storage.node.field_featured_image.yml
index b849e37..cc86876 100644
--- a/web/sites/default/config/field.storage.node.field_featured_image.yml
+++ b/web/sites/default/config/field.storage.node.field_featured_image.yml
@@ -11,7 +11,7 @@ field_name: field_featured_image
 entity_type: node
 type: image
 settings:
-  uri_scheme: public
+  uri_scheme: s3
   default_image:
     uuid: ''
     alt: ''
diff --git a/web/sites/default/config/field.storage.user.user_picture.yml b/web/sites/default/config/field.storage.user.user_picture.yml
index dfa52f4..3ebf0a8 100644
--- a/web/sites/default/config/field.storage.user.user_picture.yml
+++ b/web/sites/default/config/field.storage.user.user_picture.yml
@@ -13,9 +13,9 @@ field_name: user_picture
 entity_type: user
 type: image
 settings:
-  uri_scheme: public
+  uri_scheme: s3
   default_image:
-    uuid: null
+    uuid: ''
     alt: ''
     title: ''
     width: null

From 414bf5eb71147a12b92a57e393bda0282a44cff0 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 21 Mar 2018 17:25:43 -0400
Subject: [PATCH 048/143] Update README and docker-compose for S3.

---
 README.md          | 29 +++++++++++++++++++++++++++++
 docker-compose.yml |  9 +++++++++
 2 files changed, 38 insertions(+)

diff --git a/README.md b/README.md
index 201061e..3eff0fb 100644
--- a/README.md
+++ b/README.md
@@ -51,3 +51,32 @@ Within the `bin` directory, there are a handful of helpful scripts to make
 running `drupal`, `drush`, etc. within the context of our Dockerized app
 easier. As noted above, they are written with bash in mind, but should be easy
 to port to other environments.
+
+### File storage
+
+We've configured our file fields to store content in S3; in this way, they
+persist between app restarts and deploys. Unfortunately, those configurations
+are therefore also present locally, which can lead to unexpected results (we
+*don't* include sensitive bucket credentials, so we'll see "The file could not
+be uploaded."). If needing to work with  file uploads locally, modify the
+relevant field's "storage" away from "Flysystem: S3" to "Public files" (which
+means the local disk). This can be configured in the Drupal administration
+interface, or by editing the configuration files in
+`web/sites/default/config`. Notably, all instances of
+
+```yaml
+uri_scheme: s3
+```
+
+should become
+
+```yaml
+uri_scheme: public
+```
+
+and Docker restarted.
+
+Alternatively, if testing S3 integration, it's possible to configure Docker to
+use a real S3 bucket by editing `docker-compose.yml`. That file holds a series
+of values under the "s3" key which will need to be modified with your access
+credentials.
diff --git a/docker-compose.yml b/docker-compose.yml
index fe79840..eabde25 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,6 +29,15 @@ services:
               "username": "root"
             }
           }],
+          "s3": [{
+            "name": "storage",
+            "credentials": {
+             "access_key_id": "SECRET",
+             "bucket": "SECRET",
+             "region": "SECRET",
+             "secret_access_key": "SECRET"
+            }
+          }],
           "user-provided": [{
             "name": "secrets",
             "credentials": {

From fcf8cc77a4fe428abc3da63fa24df8505dddf232 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 21 Mar 2018 20:56:29 -0700
Subject: [PATCH 049/143] Uninstall and remove the Bootstrap theme

The Bootstrap theme was used for demonstration before creating an
NSF-specific theme, but it's no longer needed.

https://github.com/18F/nsf/issues/158
---
 composer.json                                 |  1 -
 composer.lock                                 | 67 +------------------
 .../block.block.bootstrap_account_menu.yml    | 26 -------
 .../config/block.block.bootstrap_branding.yml | 25 -------
 .../block.block.bootstrap_breadcrumbs.yml     | 22 ------
 .../config/block.block.bootstrap_content.yml  | 22 ------
 .../config/block.block.bootstrap_footer.yml   | 26 -------
 .../config/block.block.bootstrap_help.yml     | 22 ------
 .../block.block.bootstrap_local_actions.yml   | 20 ------
 .../block.block.bootstrap_local_tasks.yml     | 22 ------
 .../block.block.bootstrap_main_menu.yml       | 26 -------
 .../config/block.block.bootstrap_messages.yml | 22 ------
 .../block.block.bootstrap_page_title.yml      | 20 ------
 .../config/block.block.bootstrap_search.yml   | 22 ------
 .../config/block.block.bootstrap_tools.yml    | 26 -------
 .../default/config/bootstrap.settings.yml     | 20 ------
 web/sites/default/config/core.extension.yml   |  1 -
 17 files changed, 1 insertion(+), 389 deletions(-)
 delete mode 100644 web/sites/default/config/block.block.bootstrap_account_menu.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_branding.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_breadcrumbs.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_content.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_footer.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_help.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_local_actions.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_local_tasks.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_main_menu.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_messages.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_page_title.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_search.yml
 delete mode 100644 web/sites/default/config/block.block.bootstrap_tools.yml
 delete mode 100644 web/sites/default/config/bootstrap.settings.yml

diff --git a/composer.json b/composer.json
index f872069..451d28c 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,6 @@
         "composer/installers": "^1.2",
         "cweagans/composer-patches": "^1.6",
         "drupal-composer/drupal-scaffold": "^2.2",
-        "drupal/bootstrap": "^3.11",
         "drupal/brightcove": "^1.3",
         "drupal/console": "^1.0.2",
         "drupal/core": "~8.4",
diff --git a/composer.lock b/composer.lock
index fbb2708..7ef74f0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "a38e22dee1a5803303548ab5fec7dfa3",
+    "content-hash": "e6840ffe2cb46efaa986a060c08dde41",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -1541,71 +1541,6 @@
             "description": "Composer Plugin for updating the Drupal scaffold files when using drupal/core",
             "time": "2017-12-08T22:53:11+00:00"
         },
-        {
-            "name": "drupal/bootstrap",
-            "version": "3.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupal.org/project/bootstrap",
-                "reference": "8.x-3.11"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/bootstrap-8.x-3.11.zip",
-                "reference": "8.x-3.11",
-                "shasum": "6ff80e37e2e1f916646300889f3392764c9cdb32"
-            },
-            "require": {
-                "drupal/core": "~8.0"
-            },
-            "type": "drupal-theme",
-            "extra": {
-                "branch-alias": {
-                    "dev-3.x": "3.x-dev"
-                },
-                "drupal": {
-                    "version": "8.x-3.11",
-                    "datestamp": "1520792884",
-                    "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Mark Carver (markcarver)",
-                    "homepage": "https://www.drupal.org/u/markcarver",
-                    "role": "Maintainer"
-                },
-                {
-                    "name": "John McCormick (neardark)",
-                    "homepage": "https://www.drupal.org/u/neardark",
-                    "role": "Co-maintainer"
-                },
-                {
-                    "name": "Fabiano Sant'Ana (wundo)",
-                    "homepage": "https://www.drupal.org/u/wundo",
-                    "role": "Co-maintainer"
-                },
-                {
-                    "name": "wundo",
-                    "homepage": "https://www.drupal.org/user/25523"
-                }
-            ],
-            "description": "Built to use Bootstrap, a sleek, intuitive, and powerful front-end framework for faster and easier web development.",
-            "homepage": "https://www.drupal.org/project/bootstrap",
-            "support": {
-                "source": "http://cgit.drupalcode.org/bootstrap",
-                "docs": "https://drupal-bootstrap.org",
-                "issues": "https://www.drupal.org/project/issues/bootstrap",
-                "irc": "irc://irc.freenode.org/drupal-bootstrap"
-            }
-        },
         {
             "name": "drupal/brightcove",
             "version": "1.3.0",
diff --git a/web/sites/default/config/block.block.bootstrap_account_menu.yml b/web/sites/default/config/block.block.bootstrap_account_menu.yml
deleted file mode 100644
index 511a0f7..0000000
--- a/web/sites/default/config/block.block.bootstrap_account_menu.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 4cd45a03-4aed-4f28-b4f3-73cef3a2babd
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.account
-  module:
-    - system
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: R2K_qX0ZUMbUL6ie_-S9tZVjvqmlWKlscikgeRv9vhw
-id: bootstrap_account_menu
-theme: bootstrap
-region: navigation_collapsible
-weight: -7
-provider: null
-plugin: 'system_menu_block:account'
-settings:
-  id: 'system_menu_block:account'
-  label: 'User account menu'
-  provider: system
-  label_display: '0'
-  level: 1
-  depth: 2
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_branding.yml b/web/sites/default/config/block.block.bootstrap_branding.yml
deleted file mode 100644
index e2bc7a5..0000000
--- a/web/sites/default/config/block.block.bootstrap_branding.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: f5f39fe9-30f0-4d4e-9df1-3ec2a5e2de26
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: Cy3vkpYrD1O5JG-BeEnokF0bByHYDEa8CBfWivB4_SQ
-id: bootstrap_branding
-theme: bootstrap
-region: navigation
-weight: 0
-provider: null
-plugin: system_branding_block
-settings:
-  id: system_branding_block
-  label: 'Site branding'
-  provider: system
-  label_display: '0'
-  use_site_logo: true
-  use_site_name: true
-  use_site_slogan: false
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_breadcrumbs.yml b/web/sites/default/config/block.block.bootstrap_breadcrumbs.yml
deleted file mode 100644
index d560df2..0000000
--- a/web/sites/default/config/block.block.bootstrap_breadcrumbs.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 4b656153-100e-4e67-8162-964054f71802
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: wDR9JKEATSWldBjw8du8s3G2zjEYeQf88nlld11hMLo
-id: bootstrap_breadcrumbs
-theme: bootstrap
-region: header
-weight: -7
-provider: null
-plugin: system_breadcrumb_block
-settings:
-  id: system_breadcrumb_block
-  label: Breadcrumbs
-  provider: system
-  label_display: '0'
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_content.yml b/web/sites/default/config/block.block.bootstrap_content.yml
deleted file mode 100644
index 8e29e67..0000000
--- a/web/sites/default/config/block.block.bootstrap_content.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 3c70b9dd-8975-4ddf-8ab6-d477468ceedc
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: fNNLN48MSGSLiqwIFywCuxH2Dk_IxDbaP0kYhg_IPrg
-id: bootstrap_content
-theme: bootstrap
-region: content
-weight: -3
-provider: null
-plugin: system_main_block
-settings:
-  id: system_main_block
-  label: 'Main page content'
-  provider: system
-  label_display: '0'
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_footer.yml b/web/sites/default/config/block.block.bootstrap_footer.yml
deleted file mode 100644
index dd9b36c..0000000
--- a/web/sites/default/config/block.block.bootstrap_footer.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: ab59092e-097d-40ae-be6d-4085972addf8
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.footer
-  module:
-    - system
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: h06zhb3xV9_2_3Zy9NsyylL7YBaEDlMwMEqNwAn8kMo
-id: bootstrap_footer
-theme: bootstrap
-region: footer
-weight: 0
-provider: null
-plugin: 'system_menu_block:footer'
-settings:
-  id: 'system_menu_block:footer'
-  label: 'Footer menu'
-  provider: system
-  label_display: '0'
-  level: 1
-  depth: 0
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_help.yml b/web/sites/default/config/block.block.bootstrap_help.yml
deleted file mode 100644
index 235caad..0000000
--- a/web/sites/default/config/block.block.bootstrap_help.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: a5b85665-0139-4541-9946-8949a63af22c
-langcode: en
-status: true
-dependencies:
-  module:
-    - help
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: MhtNdV__HKRTab0ZPjkPNfYL4Ng4UPBucDLoC7Rg5Eo
-id: bootstrap_help
-theme: bootstrap
-region: help
-weight: -7
-provider: null
-plugin: help_block
-settings:
-  id: help_block
-  label: Help
-  provider: help
-  label_display: '0'
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_local_actions.yml b/web/sites/default/config/block.block.bootstrap_local_actions.yml
deleted file mode 100644
index 33fd0c6..0000000
--- a/web/sites/default/config/block.block.bootstrap_local_actions.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 86cc2867-b14f-4e80-a940-6a66467472cf
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: ffxthelqQF8xcr4GTG4HlaNNsluiHftN0pujmQpW0bQ
-id: bootstrap_local_actions
-theme: bootstrap
-region: header
-weight: -7
-provider: null
-plugin: local_actions_block
-settings:
-  id: local_actions_block
-  label: 'Primary admin actions'
-  provider: core
-  label_display: '0'
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_local_tasks.yml b/web/sites/default/config/block.block.bootstrap_local_tasks.yml
deleted file mode 100644
index 80f579f..0000000
--- a/web/sites/default/config/block.block.bootstrap_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: f45958f6-9305-4067-bddc-74f102c5993a
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: qHdtze2DZ2mFfaJadxjZz6epm92_SN9SAFY4yJGl8Fo
-id: bootstrap_local_tasks
-theme: bootstrap
-region: header
-weight: -7
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: Tabs
-  provider: core
-  label_display: '0'
-  primary: true
-  secondary: true
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_main_menu.yml b/web/sites/default/config/block.block.bootstrap_main_menu.yml
deleted file mode 100644
index c0a3e34..0000000
--- a/web/sites/default/config/block.block.bootstrap_main_menu.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 285f0a0f-3c11-4a07-9181-ee08d825babc
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.main
-  module:
-    - system
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: GT_zYl7I9VAILH8OxMRe-VDvFadCDHxRcnmBc5xEmf0
-id: bootstrap_main_menu
-theme: bootstrap
-region: navigation_collapsible
-weight: -7
-provider: null
-plugin: 'system_menu_block:main'
-settings:
-  id: 'system_menu_block:main'
-  label: 'Main navigation'
-  provider: system
-  label_display: '0'
-  level: 1
-  depth: 2
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_messages.yml b/web/sites/default/config/block.block.bootstrap_messages.yml
deleted file mode 100644
index dfa97ff..0000000
--- a/web/sites/default/config/block.block.bootstrap_messages.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 10afad52-b146-4c18-b7c5-92771b1d3628
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: 9RnnTUBcn0WRWXfrGOnId2H0Q31uQUeu_F5TnDxl2yg
-id: bootstrap_messages
-theme: bootstrap
-region: header
-weight: -7
-provider: null
-plugin: system_messages_block
-settings:
-  id: system_messages_block
-  label: 'Status messages'
-  provider: system
-  label_display: '0'
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_page_title.yml b/web/sites/default/config/block.block.bootstrap_page_title.yml
deleted file mode 100644
index 1a6ceb5..0000000
--- a/web/sites/default/config/block.block.bootstrap_page_title.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 08613bc2-f2c1-4852-84bb-3a81e31848b6
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: 1TQP4b3ZnlzvIH9bj6cpCz_SyUHdJjLQkZnHpikjjhw
-id: bootstrap_page_title
-theme: bootstrap
-region: header
-weight: 0
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  provider: core
-  label_display: '0'
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_search.yml b/web/sites/default/config/block.block.bootstrap_search.yml
deleted file mode 100644
index 0c415a5..0000000
--- a/web/sites/default/config/block.block.bootstrap_search.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 8e1ac23f-e4bd-4820-a8d8-d6cd3f1257a3
-langcode: en
-status: true
-dependencies:
-  module:
-    - search
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: F3d5hyAFunLh4PhGviJF019fHn1Z3_zy5gzsQ0tX1K0
-id: bootstrap_search
-theme: bootstrap
-region: sidebar_first
-weight: -6
-provider: null
-plugin: search_form_block
-settings:
-  id: search_form_block
-  label: Search
-  provider: search
-  label_display: visible
-visibility: {  }
diff --git a/web/sites/default/config/block.block.bootstrap_tools.yml b/web/sites/default/config/block.block.bootstrap_tools.yml
deleted file mode 100644
index f42b5bd..0000000
--- a/web/sites/default/config/block.block.bootstrap_tools.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 927a86bf-7a91-4f91-8518-0a37154636a6
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.tools
-  module:
-    - system
-  theme:
-    - bootstrap
-_core:
-  default_config_hash: f3Dd5TnUiFDjFZp9yEGJInwt6cUzs7O6SvLTFTATSlU
-id: bootstrap_tools
-theme: bootstrap
-region: sidebar_first
-weight: -5
-provider: null
-plugin: 'system_menu_block:tools'
-settings:
-  id: 'system_menu_block:tools'
-  label: Tools
-  provider: system
-  label_display: visible
-  level: 1
-  depth: 0
-visibility: {  }
diff --git a/web/sites/default/config/bootstrap.settings.yml b/web/sites/default/config/bootstrap.settings.yml
deleted file mode 100644
index b274600..0000000
--- a/web/sites/default/config/bootstrap.settings.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-schemas:
-  bootstrap: 8000
-_core:
-  default_config_hash: 1uFogeFphl0Hg6oVCacZZ8mM_0wMZ7PS_RrmLbK5tf0
-favicon:
-  mimetype: image/vnd.microsoft.icon
-  path: ''
-  url: 'http://nsf-demo.kbox.site/themes/bootstrap/favicon.ico'
-  use_default: false
-features:
-  comment_user_picture: false
-  comment_user_verification: false
-  favicon: true
-  node_user_picture: false
-logo:
-  path: ''
-  url: ''
-  use_default: true
-table_responsive: '-1'
-table: ''
diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
index 3f26751..cc7c077 100644
--- a/web/sites/default/config/core.extension.yml
+++ b/web/sites/default/config/core.extension.yml
@@ -77,7 +77,6 @@ theme:
   seven: 0
   uswds: 0
   nsf: 0
-  bootstrap: 0
 profile: standard
 _core:
   default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc

From 954726c2de9cbfc30d07247086d40f31287acbbf Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 21 Mar 2018 21:15:38 -0700
Subject: [PATCH 050/143] Update NSF theme to use default logo

This commit also changes the global theme settings to use each
theme's default logo.

https://github.com/18F/nsf/issues/157
---
 web/sites/default/config/nsf.settings.yml        | 3 ++-
 web/sites/default/config/system.theme.global.yml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/sites/default/config/nsf.settings.yml b/web/sites/default/config/nsf.settings.yml
index fc21f0a..c1e51c6 100644
--- a/web/sites/default/config/nsf.settings.yml
+++ b/web/sites/default/config/nsf.settings.yml
@@ -5,9 +5,10 @@ features:
   favicon: 0
 logo:
   use_default: 0
-  path: 'public://nsf_logo-orig_0.png'
+  path: 'themes/nsf/logo.png'
 favicon:
   use_default: 1
+  path: ''
 uswds_header_style: basic
 uswds_header_mega: 0
 uswds_search: 0
diff --git a/web/sites/default/config/system.theme.global.yml b/web/sites/default/config/system.theme.global.yml
index 547a27f..3b72eb6 100644
--- a/web/sites/default/config/system.theme.global.yml
+++ b/web/sites/default/config/system.theme.global.yml
@@ -9,8 +9,8 @@ features:
   favicon: true
   node_user_picture: false
 logo:
-  path: 'public://nsf_logo.png'
+  path: ''
   url: ''
-  use_default: false
+  use_default: true
 _core:
   default_config_hash: 9rAU4Pku7eMBQxauQqAgjzlcicFZ2As6zEa6zvTlCB8

From 15808e12d77a5c6556dd6164df2ad2a646390837 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 21 Mar 2018 21:40:27 -0700
Subject: [PATCH 051/143] Update USWDS asset import to match new location

https://github.com/18F/nsf/issues/157
---
 web/themes/nsf/assets/css/uswds.css.map | 4 ++--
 web/themes/nsf/sass/uswds.scss          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/themes/nsf/assets/css/uswds.css.map b/web/themes/nsf/assets/css/uswds.css.map
index 7025d95..e717e74 100644
--- a/web/themes/nsf/assets/css/uswds.css.map
+++ b/web/themes/nsf/assets/css/uswds.css.map
@@ -1,7 +1,7 @@
 {
 "version": 3,
-"mappings": "AAAA,qBAAqB;ACGnB,IAAK;EACH,UAAU,EAAE,UAAU;;AAItB,sBAEU;EACR,UAAU,EAAE,OAAO;;ACXzB,4EAA4E;AAE5E;;;;GAIG;AAEH,IAAK;EACH,WAAW,EAAE,UAAU;EAAE,OAAO;EAChC,oBAAoB,EAAE,IAAI;EAAE,OAAO;EACnC,wBAAwB,EAAE,IAAI;EAAE,OAAO;;AAGzC;;GAEG;AAEH,IAAK;EACH,MAAM,EAAE,CAAC;;AAGX;gFACgF;AAEhF;;;;;GAKG;AAEH;;;;;;;;;;;;OAYQ;EACN,OAAO,EAAE,KAAK;;AAGhB;;;GAGG;AAEH;;;KAGM;EACJ,OAAO,EAAE,YAAY;EAAE,OAAO;EAC9B,cAAc,EAAE,QAAQ;EAAE,OAAO;;AAGnC;;;GAGG;AAEH,qBAAsB;EACpB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,CAAC;;AAGX;;;GAGG;AAEH;QACS;EACP,OAAO,EAAE,IAAI;;AAGf;gFACgF;AAEhF;;GAEG;AAEH,CAAE;EACA,gBAAgB,EAAE,WAAW;;AAG/B;;;GAGG;AAEH;OACQ;EACN,OAAO,EAAE,CAAC;;AAGZ;gFACgF;AAEhF;;GAEG;AAEH,WAAY;EACV,aAAa,EAAE,UAAU;;AAG3B;;GAEG;AAEH;MACO;EACL,WAAW,EAAE,IAAI;;AAGnB;;GAEG;AAEH,GAAI;EACF,UAAU,EAAE,MAAM;;AAGpB;;;GAGG;AAEH,EAAG;EACD,SAAS,EAAE,GAAG;EACd,MAAM,EAAE,QAAQ;;AAGlB;;GAEG;AAEH,IAAK;EACH,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,IAAI;;AAGb;;GAEG;AAEH,KAAM;EACJ,SAAS,EAAE,GAAG;;AAGhB;;GAEG;AAEH;GACI;EACF,SAAS,EAAE,GAAG;EACd,WAAW,EAAE,CAAC;EACd,QAAQ,EAAE,QAAQ;EAClB,cAAc,EAAE,QAAQ;;AAG1B,GAAI;EACF,GAAG,EAAE,MAAM;;AAGb,GAAI;EACF,MAAM,EAAE,OAAO;;AAGjB;gFACgF;AAEhF;;GAEG;AAEH,GAAI;EACF,MAAM,EAAE,CAAC;;AAGX;;GAEG;AAEH,cAAe;EACb,QAAQ,EAAE,MAAM;;AAGlB;gFACgF;AAEhF;;GAEG;AAEH,MAAO;EACL,MAAM,EAAE,QAAQ;;AAGlB;;GAEG;AAEH,EAAG;EACD,UAAU,EAAE,WAAW;EACvB,MAAM,EAAE,CAAC;;AAGX;;GAEG;AAEH,GAAI;EACF,QAAQ,EAAE,IAAI;;AAGhB;;GAEG;AAEH;;;IAGK;EACH,WAAW,EAAE,oBAAoB;EACjC,SAAS,EAAE,GAAG;;AAGhB;gFACgF;AAEhF;;;GAGG;AAEH;;;;;GAKG;AAEH;;;;QAIS;EACP,KAAK,EAAE,OAAO;EAAE,OAAO;EACvB,IAAI,EAAE,OAAO;EAAE,OAAO;EACtB,MAAM,EAAE,CAAC;EAAE,OAAO;;AAGpB;;GAEG;AAEH,MAAO;EACL,QAAQ,EAAE,OAAO;;AAGnB;;;;;GAKG;AAEH;MACO;EACL,cAAc,EAAE,IAAI;;AAGtB;;;;;;GAMG;AAEH;;;oBAGqB;EACnB,kBAAkB,EAAE,MAAM;EAAE,OAAO;EACnC,MAAM,EAAE,OAAO;EAAE,OAAO;;AAG1B;;GAEG;AAEH;oBACqB;EACnB,MAAM,EAAE,OAAO;;AAGjB;;GAEG;AAEH;uBACwB;EACtB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;;AAGZ;;;GAGG;AAEH,KAAM;EACJ,WAAW,EAAE,MAAM;;AAGrB;;;;;;GAMG;AAEH;mBACoB;EAClB,UAAU,EAAE,UAAU;EAAE,OAAO;EAC/B,OAAO,EAAE,CAAC;EAAE,OAAO;;AAGrB;;;;GAIG;AAEH;+CACgD;EAC9C,MAAM,EAAE,IAAI;;AAGd;;;GAGG;AAEH,oBAAqB;EACnB,kBAAkB,EAAE,SAAS;EAAE,OAAO;EACtC,UAAU,EAAE,WAAW;EAAE,OAAO;;AAGlC;;;;GAIG;AAEH;+CACgD;EAC9C,kBAAkB,EAAE,IAAI;;AAG1B;;GAEG;AAEH,QAAS;EACP,MAAM,EAAE,iBAAiB;EACzB,MAAM,EAAE,KAAK;EACb,OAAO,EAAE,qBAAqB;;AAGhC;;;GAGG;AAEH,MAAO;EACL,MAAM,EAAE,CAAC;EAAE,OAAO;EAClB,OAAO,EAAE,CAAC;EAAE,OAAO;;AAGrB;;GAEG;AAEH,QAAS;EACP,QAAQ,EAAE,IAAI;;AAGhB;;;GAGG;AAEH,QAAS;EACP,WAAW,EAAE,IAAI;;AAGnB;gFACgF;AAEhF;;GAEG;AAEH,KAAM;EACJ,eAAe,EAAE,QAAQ;EACzB,cAAc,EAAE,CAAC;;AAGnB;EACG;EACD,OAAO,EAAE,CAAC;;ACtaZ,iDAAiD;ACU/C,UAYC;EAXC,WAAW,EDTb,iBAAiB;ECUf,UAAU,EDPZ,MAAM;ECQJ,WAAW,EDTb,GAAG;ECWD,GAAG,ECqBO,0RAAiD;AD1B7D,UAYC;EAXC,WAAW,EDDb,iBAAiB;ECEf,UAAU,EDCZ,MAAM;ECAJ,WAAW,EDDb,GAAG;ECGD,GAAG,ECqBO,kSAAiD;AD1B7D,UAYC;EAXC,WAAW,EDOb,iBAAiB;ECNf,UAAU,EDSZ,MAAM;ECRJ,WAAW,EDOb,GAAG;ECLD,GAAG,ECqBO,8RAAiD;AD1B7D,UAYC;EAXC,WAAW,EDeb,iBAAiB;ECdf,UAAU,EDiBZ,MAAM;EChBJ,WAAW,EDeb,GAAG;ECbD,GAAG,ECqBO,sRAAiD;AD1B7D,UAYC;EAXC,WAAW,EDuBb,cAAc;ECtBZ,UAAU,EDyBZ,MAAM;ECxBJ,WAAW,EDuBb,GAAG;ECrBD,GAAG,ECqBO,sRAAiD;AD1B7D,UAYC;EAXC,WAAW,ED+Bb,cAAc;EC9BZ,UAAU,EDiCZ,MAAM;EChCJ,WAAW,ED+Bb,GAAG;EC7BD,GAAG,ECqBO,8RAAiD;AD1B7D,UAYC;EAXC,WAAW,EDuCb,cAAc;ECtCZ,UAAU,EDyCZ,MAAM;ECxCJ,WAAW,EDuCb,GAAG;ECrCD,GAAG,ECqBO,0RAAiD;AD1B7D,UAYC;EAXC,WAAW,ED+Cb,cAAc;EC9CZ,UAAU,EDiDZ,MAAM;EChDJ,WAAW,ED+Cb,GAAG;EC7CD,GAAG,ECqBO,kRAAiD;AF4B/D,sBAAsB;AG/DtB;cACe;EC0Bb,SAAS,ECJC,MAAM;EDMd,WAAI,EAAE,IAAI;EACV,YAAK,EAAE,IAAI;ED3Bb,SAAS,EGgIe,MAAM;ECjH9B;uBAAS;IACP,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;;AJflB,SAAU;EKwEgB,aAAS,EA/C7B,MAAwC;EAoDpB,YAAQ,EApD5B,MAAwC;EC0B1C,oCAAqD;INnDzD,SAAU;MKwEgB,aAAS,EA/C7B,IAAwC;MAoDpB,YAAQ,EApD5B,IAAwC;;ALjB9C,cAAe;EACb,OAAO,EAAE,CAAC;;AMsER,oCAAuB;ENjEzB,oBAAqB;IO8CnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,IAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;;EPhE7B,mBAAoB;IO0ClB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,8BAAa;MACX,YAAoB,EAAE,CAAC;;EP5D7B,oBAAqB;IOsCnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;;EPxD7B,qBAAsB;IOkCpB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,gCAAa;MACX,YAAoB,EAAE,CAAC;;EPpD7B,qBAAsB;IO8BpB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,gCAAa;MACX,YAAoB,EAAE,CAAC;IPjD3B,mCAAgB;MACd,YAAY,EAAE,CAAC;;EAInB,wBAAyB;IOsBvB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,IAAuC;IAE9C,mCAAa;MACX,YAAoB,EAAE,CAAC;;EPxC7B,oBAAqB;IOkBnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;IPrC3B,kCAAgB;MACd,YAAY,EAAE,CAAC;;EAInB,sBAAuB;IOUrB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,iCAAa;MACX,YAAoB,EAAE,CAAC;;EP5B7B,sBAAuB;IOMrB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,iCAAa;MACX,YAAoB,EAAE,CAAC;IPzB3B,oCAAgB;MACd,YAAY,EAAE,CAAC;;EAInB,wBAAyB;IOFvB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,mCAAa;MACX,YAAoB,EAAE,CAAC;;EPhB7B,yBAA0B;IONxB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,oCAAa;MACX,YAAoB,EAAE,CAAC;ADH3B,qCAAuB;ENPzB,oBAAqB;IOZnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,IAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;;EPN7B,mBAAoB;IOhBlB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,8BAAa;MACX,YAAoB,EAAE,CAAC;;EPF7B,oBAAqB;IOpBnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;;EPE7B,qBAAsB;IOxBpB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,gCAAa;MACX,YAAoB,EAAE,CAAC;;EPM7B,qBAAsB;IO5BpB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,gCAAa;MACX,YAAoB,EAAE,CAAC;IPS3B,mCAAgB;MO/BhB,KAAK,EAAE,IAAsB;MAG3B,OAAO,EAAE,KAAK;MAed,YAAoB,EAAE,aAA+B;MACrD,KAAK,EAAE,cAAuC;MAE9C,8CAAa;QACX,YAAoB,EAAE,CAAC;IPa3B,mCAAgB;MACd,YAAY,EAAE,CAAC;;EAInB,wBAAyB;IOxCvB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,mCAAa;MACX,YAAoB,EAAE,CAAC;;EPsB7B,oBAAqB;IO5CnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;IPyB3B,kCAAgB;MO/ChB,KAAK,EAAE,IAAsB;MAG3B,OAAO,EAAE,KAAK;MAed,YAAoB,EAAE,aAA+B;MACrD,KAAK,EAAE,cAAuC;MAE9C,6CAAa;QACX,YAAoB,EAAE,CAAC;IP6B3B,kCAAgB;MACd,YAAY,EAAE,CAAC;;EAInB,sBAAuB;IOxDrB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,iCAAa;MACX,YAAoB,EAAE,CAAC;;EPsC7B,sBAAuB;IO5DrB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,aAAuC;IAE9C,iCAAa;MACX,YAAoB,EAAE,CAAC;IPyC3B,oCAAgB;MO/DhB,KAAK,EAAE,IAAsB;MAG3B,OAAO,EAAE,KAAK;MAed,YAAoB,EAAE,aAA+B;MACrD,KAAK,EAAE,aAAuC;MAE9C,+CAAa;QACX,YAAoB,EAAE,CAAC;IP6C3B,qCAAiB;MACf,YAAY,EAAE,CAAC;;EAInB,wBAAyB;IOxEvB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,aAAuC;IAE9C,mCAAa;MACX,YAAoB,EAAE,CAAC;;EPsD7B,yBAA0B;IO5ExB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,oCAAa;MACX,YAAoB,EAAE,CAAC;AP8D/B,YAAa;EQhGP,YAAoB,EAAE,CAAC;;ARqG7B,uBAAwB;ES/GtB,WAA6B,EAAE,aAAsF;;ATmHvH,qBAAsB;ESnHpB,WAA6B,EAAE,cAAsF;;ATuHvH,sBAAuB;ESvHrB,WAA6B,EAAE,cAAsF;;AT2HvH,qBAAsB;ES3HpB,WAA6B,EAAE,cAAsF;;AT+HvH,yBAA0B;ES/HxB,WAA6B,EAAE,cAAsF;;ATmIvH,oBAAqB;ESnInB,WAA6B,EAAE,cAAsF;;ATuIvH,0BAA2B;ESvIzB,WAA6B,EAAE,aAAsF;;AT2IvH,sBAAuB;ES3IrB,WAA6B,EAAE,cAAsF;;AT+IvH,yBAA0B;ES/IxB,WAA6B,EAAE,cAAsF;;ATmJvH,uBAAwB;ESnJtB,WAA6B,EAAE,cAAsF;;ATuJvH,2BAA4B;ESvJ1B,WAA6B,EAAE,cAAsF;;ACqBvH,YAAa;EAbX,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,MAAM;;ACnDd,IAAK;EACH,UAAU,EAAE,UAAU;;AAGxB;;QAES;EACP,UAAU,EAAE,OAAO;;AAGrB,IAAK;EACH,gBAAgB,ERqCW,OAAO;EQpClC,UAAU,EAAE,MAAM;;AAKlB,SAAE;EACA,MAAM,EAAE,eAAe;EAAE,qDAAqD;;AAMlF,QAAS;EACP,OAAO,EAAE,eAAe;EAAE,qDAAqD;;AAGjF;UACW;EDQT,OAAO,EPsGiB,kBAA4B;EOrGpD,cAAc,EPsGU,GAAG;;ASvH7B,mDAAmD;AACnD;;;;;;;;YAQa;EF2DX,uBAAuB,EAAE,SAAS;EAClC,sBAAsB,EAAE,WAAW;ELnBb,UAAO,EA3CzB,KAAa;EAgDO,YAAS,EA/C7B,KAAwC;EAyDpB,aAAU,EAxD9B,KAAwC;EOG5C,UAAU,EAAE,IAAI;EAChB,gBAAgB,ECpCF,OAAO;EDqCrB,MAAM,EAAE,CAAC;EACT,aAAa,ETqGW,GAAG;ESpG3B,KAAK,ETWsB,OAAO;ESVlC,MAAM,EAAE,OAAO;EACf,OAAO,EAAE,YAAY;EACrB,WAAW,ECpBS,iBAAiB;EDqBrC,SAAS,ET/BW,MAAM;ESgC1B,WAAW,ETbS,GAAG;EScvB,WAAW,EAAE,CAAC;EACd,OAAO,EAAE,SAAS;EAClB,UAAU,EAAE,MAAM;EAClB,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,IAAI;EFJX,oCAAsC;IErBxC;;;;;;;;gBAQa;MAoBT,KAAK,EAAE,IAAI;EAGb;;;;;;;;;;;;;;;;+BACmB;IACjB,gBAAgB,ECxDG,OAAO;IDyD1B,aAAa,EAAE,CAAC;IAChB,KAAK,ETToB,OAAO;ISUhC,eAAe,EAAE,IAAI;EAGvB;;;;;;;;;;;;;;;;gCACoB;IAClB,gBAAgB,EC/DI,OAAO;EDkE7B;;;;;;;;qCAAyB;IACvB,gBAAgB,ECcS,OAAO;IDbhC,KAAK,EC0BoB,OAAO;IDxBhC;;;;;;;;;;;;;;;;wDACmB;MACjB,gBAAgB,ECUO,OAAO;IDPhC;;;;;;;;;;;;;;;;yDACoB;MAClB,gBAAgB,ETUO,OAAmB;MST1C,KAAK,ET9BkB,OAAO;ESkClC;;;;;;;;mCAAuB;IACrB,gBAAgB,ETnCS,OAAO;ISoChC,UAAU,EAAE,uBAA6B;IACzC,KAAK,ECvFO,OAAO;IDyFnB;;;;;;;;;;;;;;;;sDACmB;MACjB,UAAU,EAAE,uBAAoC;MAChD,KAAK,EC3FY,OAAO;ID8F1B;;;;;;;;;;;;;;;;uDACoB;MAClB,UAAU,EAAE,uBAAqC;MACjD,KAAK,EChGa,OAAO;EDoG7B;;;;;;;;;;;;;;;;yCAC6B;IAC3B,UAAU,EAAE,WAAW;IACvB,UAAU,EAAE,uBAA2B;IACvC,KAAK,ETxDoB,OAAO;IS0DhC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4DACmB;MACjB,UAAU,EAAE,uBAAkC;MAC9C,KAAK,ECzDkB,OAAO;ID4DhC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6DACoB;MAClB,UAAU,EAAE,uBAAgC;MAC5C,KAAK,EC/DkB,OAAO;EDmElC;;;;;;;;8BAAkB;IAChB,gBAAgB,ECvES,OAAO;IDyEhC;;;;;;;;;;;;;;;;iDACmB;MACjB,gBAAgB,EC5EO,OAAO;ID+EhC;;;;;;;;;;;;;;;;kDACoB;MAClB,gBAAgB,ECnCO,OAAO;EDuClC;;;;;;;;6BAAiB;IACf,gBAAgB,EC/CS,OAAO;IDiDhC;;;;;;;;;;;;;;;;gDACmB;MACjB,gBAAgB,ECjDO,OAAO;IDoDhC;;;;;;;;;;;;;;;;iDACoB;MAClB,gBAAgB,ECrDO,OAAO;EDyDlC;;;;;;;;6BAAiB;IACf,aAAa,EAAE,GAAG;IAClB,SAAS,EAAE,MAAM;IACjB,OAAO,EAAE,WAAW;EAGtB;;;;;;;;uBAAW;IAnJX,gBAAgB,EC8CW,OAAO;ID7ClC,cAAc,EAAE,IAAI;IAEpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCAKY;MACV,gBAAgB,ECqCS,OAAO;MDpChC,MAAM,EAAE,CAAC;MACT,UAAU,EAAE,IAAI;;AA4IpB,uBAAuB;AAEvB,oBACA;EA1JE,gBAAgB,EC8CW,OAAO;ED7ClC,cAAc,EAAE,IAAI;EAEpB,kMAKY;IACV,gBAAgB,ECqCS,OAAO;IDpChC,MAAM,EAAE,CAAC;IACT,UAAU,EAAE,IAAI;;AAmJpB;;;;oCAIqC;EACnC,UAAU,EAAE,uBAAkC;EAC9C,cAAc,EAAE,IAAI;EACpB,KAAK,ECvHsB,OAAO;EDyHlC;;;;;;;;;;;;;;;;;;;;;;;;gDAKY;IACV,gBAAgB,ETnIS,OAAO;ISoIhC,MAAM,EAAE,CAAC;;AAIb;8BAC+B;EAC7B,gBAAgB,ET1IW,OAAO;;AS6IpC;sCACuC;EACrC,gBAAgB,EAAE,WAAW;EAC7B,KAAK,EC/IsB,OAAO;EDgJlC,UAAU,EAAE,uBAA0B;;AAkBxC,oBAAqB;EAdnB,gBAAgB,EAAE,WAAW;EAC7B,MAAM,EAAE,CAAC;EACT,aAAa,EAAE,CAAC;EAChB,WAAW,ET5KS,GAAG;ES6KvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAChB,sBAAsB,EAAE,IAAI;EAE5B,0BAAQ;IACN,gBAAgB,EAAE,WAAW;;AE1M/B;;0BAEM;EACJ,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;EACN,IAAI,EAAE,CAAC;EACP,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;;AAIhB,oBAAqB;EAfnB,cAAc,EAAE,MAA0B;EAiB1C,QAAQ,EAAE,QAAQ;EAClB,MAAM,EAAE,CAAC;EACT,QAAQ,EAAE,MAAM;EAChB,SAAS,EAAE,IAAI;;ACxBjB,GAAI;EACF,SAAS,EAAE,IAAI;;AASjB,WAAY;EAJV,OAAO,EAAE,YAAY;EACrB,WAAW,EAAE,CAAC;;ACYhB,mDAAmD;AACnD;;MAEO;EACL,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,oBAAqC;EAC7C,aAAa,EAAE,CAAC;EAChB,UAAU,EAAE,UAAU;EACtB,KAAK,EHsEsB,OAAO;EGrElC,OAAO,EAAE,KAAK;EACd,SAAS,EbhBW,MAAM;EaiB1B,MAAM,EAdO,MAAoC;EAejD,WAAW,EA7BO,GAAG;EA8BrB,MAAM,EAAE,OAAO;EACf,SAAS,EbuGe,KAAK;EatG7B,OAAO,EAAE,UAA6B;EACtC,KAAK,EAAE,IAAI;EAEX;;0BAAoB;IAClB,MAAM,EAAE,iBAA4B;;AAGxC,sBAAsB;AAEtB,gBAAiB;EACf,WAAW,EAAE,iBAA+B;EAC5C,UAAU,EAAE,IAAI;EAChB,cAAc,EAAE,MAAM;EACtB,YAAY,EAAE,MAAM;EACpB,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,MAAM;EAEb;;yBAEO;IACL,MAAM,EAAE,iBAA+B;IACvC,KAAK,EAAE,mBAAmB;EAG5B,sBAAM;IACJ,UAAU,EAAE,CAAC;EAGf,kCAAkB;IAChB,MAAM,EAAE,oBAAqC;IAC7C,KAAK,EAAE,OAAO;EAGhB,wCAAwB;IACtB,MAAM,EAAE,iBAA+B;;AAI3C,sBAAuB;EACrB,OAAO,EAAE,KAAK;EACd,SAAS,Eb9DW,MAAM;Ea+D1B,WAAW,Eb5CS,GAAG;;Aa+CzB,wBAAyB;EACvB,KAAK,EHYsB,OAAO;EGXlC,OAAO,EAAE,KAAK;EACd,SAAS,EbrEW,MAAM;EasE1B,WAAW,EbnDS,GAAG;EaoDvB,cAAc,EAAE,GAAG;EACnB,WAAW,EAAE,GAAG;;AAGlB,yBAA0B;EACxB,KAAK,EHIsB,OAAO;EGHlC,OAAO,EAAE,cAAc;;AAGzB,yBAA0B;EACxB,KAAK,EbrCsB,OAAO;EasClC,OAAO,EAAE,aAAa;;AAGxB,KAAM;EACJ,OAAO,EAAE,KAAK;EACd,UAAU,EAAE,IAAI;EAChB,SAAS,EbmCe,KAAK;;AahC/B,QAAS;EACP,MAAM,EAAE,KAAK;;AAGf,MAAO;EACL,eAAe,EAAE,IAAI;EACrB,kBAAkB,EAAE,IAAI;EACxB,UAAU,EAAE,IAAI;EAChB,gBAAgB,Eb7DW,OAAO;Ea8DlC,gBAAgB,EAAE,4BAAoC;EACtD,gBAAgB,EAAE,4BAAoC;EACtD,mBAAmB,EAAE,mBAAmB;EACxC,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,IAAI;EACrB,aAAa,EAAE,IAAI;EAEnB,kBAAc;IACZ,OAAO,EAAE,IAAI;EAIf,uBAAmB;IACjB,UAAU,EAAE,QAAQ;EAItB,qBAAiB;IACf,KAAK,EAAE,WAAW;IAClB,WAAW,EAAE,aAAkB;;AAInC,kBAAmB;EACjB,WAAW,EbzGS,GAAG;;Aa4GzB,MAAO;EACL,SAAS,Eb3HW,IAAI;Ea4HxB,WAAW,Eb9GS,GAAG;;AakHvB,0BAAM;EACJ,UAAU,EAAE,CAAC;;AAMjB,cAAe;EACb,KAAK,EbjGsB,OAAO;EakGlC,WAAW,EHpIS,iBAAiB;EGqIrC,aAAa,EAAE,CAAC;;AAKlB,6BACa;EN7GX,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,MAAM;EMiHZ;sBAAU;IACR,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,eAAe;IACvB,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,IAAI;;AAIf;oBACqB;EACnB,MAAM,EAAE,OAAO;EACf,WAAW,EAAE,GAAG;EAChB,aAAa,EAAE,MAAM;;AAGvB;4BAC6B;EAC3B,UAAU,EbtIiB,OAAO;EauIlC,aAAa,EbhDW,GAAG;EaiD3B,UAAU,EAAE,iBAA4B;EACxC,OAAO,EAAE,KAAK;EACd,OAAO,EAAE,YAAY;EACrB,MAAM,EbrCS,IAAI;EasCnB,WAAW,EbtCI,IAAI;EauCnB,YAAY,EAAE,KAAK;EACnB,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,QAAQ;EACxB,KAAK,Eb1CU,IAAI;;Aa6CrB,4BAA6B;EAC3B,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,oCAAoD;EAChE,MAAM,EAAE,MAAM;EACd,WAAW,EAAE,MAAM;EACnB,YAAY,EAAE,MAAM;EACpB,KAAK,EAAE,MAAM;;AAGf;oCACqC;EACnC,gBAAgB,EHhNF,OAAO;EGiNrB,UAAU,EAAE,iBAAwB;;AAGtC,oCAAqC;EACnC,UAAU,EAAE,oCAAgD;;AAG9D;gDACiD;EAC/C,gBAAgB,EAAE,0BAAkC;EACpD,gBAAgB,EAAE,0BAAkC;EACpD,mBAAmB,EAAE,GAAG;EACxB,iBAAiB,EAAE,SAAS;;AAG9B,kCAAmC;EACjC,OAAO,EbpFiB,kBAA4B;EaqFpD,cAAc,EAAE,GAAkB;;AAGpC,gCAAiC;EAC/B,KAAK,EHhLsB,OAAO;;AGmLpC,qCAAsC;EACpC,OAAO,Eb7FiB,kBAA4B;Ea8FpD,cAAc,Eb7FU,GAAG;;AagG7B;qCACsC;EACpC,UAAU,EHzLiB,OAAO;EG0LlC,UAAU,EAAE,iBAA2B;EACvC,MAAM,EAAE,WAAW;;AAKrB,YAAa;EACX,kBAAkB,EAAE,IAAI;EACxB,MAAM,EAAE,IAAI;EACZ,YAAY,EAAE,CAAC;EACf,KAAK,EAAE,IAAI;;AAGb,2CAA4C;EAC1C,UAAU,EH1MiB,OAAO;EG2MlC,MAAM,EAAE,iBAA4B;EACpC,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,IAAI;;AAGb,8BAA+B;EAC7B,UAAU,EHvQI,OAAO;EGwQrB,MAAM,EAAE,iBAA4B;EACpC,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,IAAI;;AAGb,uBAAwB;EACtB,UAAU,EAAE,WAAW;EACvB,KAAK,EAAE,WAAW;EAClB,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,IAAI;;AAGb,kCAAmC;EACjC,kBAAkB,EAAE,IAAI;EACxB,MAAM,EAAE,iBAA4B;EACpC,MAAM,EAAE,MAAM;EACd,aAAa,EAAE,MAAM;EACrB,UAAU,EHpOiB,OAAO;EGqOlC,MAAM,EAAE,OAAO;EACf,UAAU,EAAE,OAAO;EACnB,KAAK,EAAE,MAAM;;AAGf,8BAA+B;EAC7B,UAAU,EH3OiB,OAAO;EG4OlC,MAAM,EAAE,iBAA4B;EACpC,aAAa,EAAE,MAAM;EACrB,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,MAAM;;AAGf,uBAAwB;EACtB,UAAU,EHpPiB,OAAO;EGqPlC,MAAM,EAAE,iBAA4B;EACpC,aAAa,EAAE,MAAM;EACrB,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,MAAM;;AAGf,4BAA6B;EAC3B,UAAU,EH/PiB,OAAO;EGgQlC,MAAM,EAAE,iBAA4B;EACpC,aAAa,EAAE,IAAI;;AAGrB,4BAA6B;EAC3B,UAAU,EHrQiB,OAAO;EGsQlC,MAAM,EAAE,iBAA4B;EACpC,aAAa,EAAE,IAAI;;AAMnB,wBAAM;EACJ,UAAU,EAAE,CAAC;AAGf;2DACyC;EACvC,kBAAkB,EAAE,IAAI;EACxB,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,CAAC;AAGX,gCAAc;EACZ,eAAe,EAAE,SAAS;;AAI9B;;oBAEqB;EACnB,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,IAAI;EACX,YAAY,EAAE,MAAM;EACpB,KAAK,EAAE,IAAI;;AAGb,oBAAqB;EACnB,KAAK,EAAE,IAAI;;AC7Vb,0BAAW;EACT,gBAAgB,EJmDW,OAAO;EIlDlC,aAAa,EduIW,GAAG;EctI3B,KAAK,EdgDsB,OAAO;Ec/ClC,SAAS,EdiBW,MAAM;EchB1B,YAAY,EAAE,MAAM;EACpB,OAAO,EAAE,aAAa;EACtB,cAAc,EAAE,SAAS;EAEzB,oDAAe;IACb,YAAY,EAAE,CAAC;;AAInB,cAAe;EAEb,SAAS,EdHW,MAAM;EcI1B,YAAY,EAAE,MAAM;EACpB,aAAa,EAAE,MAAM;;AClBvB;EACG;EbyEqB,UAAO,EA3CzB,GAAa;EAoDO,aAAU,EApD9B,GAAa;Ea5BjB,YAAY,EAAE,MAAM;;AAGtB,EAAG;EACD,WAAW,EfgBS,GAAG;EefvB,aAAa,EAAE,KAAK;EAEpB,aAAa;IACX,aAAa,EAAE,CAAC;;AAWlB;;;;;;;;;;;;;MACK;EACH,UAAU,EAAE,CAAC;;AAKjB,kBAAmB;Eb6CK,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EAEf,uBAAK;IACH,aAAa,EAAE,CAAC;;ASpFpB,KAAM;EACJ,cAAc,EAAE,CAAC;EACjB,MAAM,EAAE,KAAK;;AAIb,QAAG;EACD,WAAW,EhByBO,GAAG;AgBtBvB;QACG;EACD,gBAAgB,EN4CS,OAAO;;AMxCpC,EAAG;EACD,UAAU,EAAE,IAAI;;AAGlB;EACG;EACD,gBAAgB,EhB6BW,OAAO;EgB5BlC,MAAM,EAAE,iBAAqB;EAC7B,WAAW,EhBOS,GAAG;EgBNvB,OAAO,EAAE,WAAW;;AAKlB,8BAAG;EACD,gBAAgB,EAAE,WAAW;EAC7B,UAAU,EAAE,CAAC;AAIjB;wBACG;EACD,WAAW,EAAE,CAAC;EACd,YAAY,EAAE,CAAC;AAIf,oCAAc;EACZ,YAAY,EAAE,CAAC;;AAKrB,OAAQ;ETtBN,SAAS,EPNW,MAAM;EOO1B,WAAW,EPIS,GAAG;EgBmBvB,WAAW,EN3BS,cAAc;EM4BlC,aAAa,EAAE,MAAM;EACrB,UAAU,EAAE,IAAI;;ACrDlB,IAAK;EACH,WAAW,EPsBS,iBAAiB;EOrBrC,SAAS,EjBUW,IAAI;;AiBP1B,IAAK;EACH,SAAS,EjBOW,MAAM;;AiBJ5B,CAAE;EACA,WAAW,EjBaS,GAAG;EiBZvB,aAAa,EAAE,GAAG;EAClB,UAAU,EAAE,GAAG;;AAGjB,CAAE;EACA,KAAK,EPfS,OAAO;EOgBrB,eAAe,EAAE,SAAS;EAE1B,iBACS;IACP,KAAK,EPnBc,OAAO;EOsB5B,OAAQ;IVgBR,OAAO,EPsGiB,kBAA4B;IOrGpD,cAAc,EPsGU,GAAG;EiBnH3B,SAAU;IACR,KAAK,EPsEoB,OAAO;;AOjElC,yBAAS;EACP,UAAU,EAAE,6CAAyD;EACrE,UAAU,EAAE,6CAAyD;EACrE,eAAe,EAAE,IAAI;EACrB,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,YAAY;EACrB,MAAM,EAAE,MAAM;EACd,aAAa,EAAE,IAAI;EACnB,WAAW,EAAE,GAAG;EAChB,KAAK,EAAE,MAAM;AAGf,+BAAe;EACb,gBAAgB,EAAE,qCAAiD;EACnE,gBAAgB,EAAE,qCAAiD;;AAdrE,6BAAS;EACP,UAAU,EAAE,iDAAyD;EACrE,UAAU,EAAE,iDAAyD;EACrE,eAAe,EAAE,IAAI;EACrB,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,YAAY;EACrB,MAAM,EAAE,MAAM;EACd,aAAa,EAAE,IAAI;EACnB,WAAW,EAAE,GAAG;EAChB,KAAK,EAAE,MAAM;AAGf,mCAAe;EACb,gBAAgB,EAAE,yCAAiD;EACnE,gBAAgB,EAAE,yCAAiD;;AAgBvE;;;;EAIG;EACD,KAAK,EAAE,IAAI;EACX,WAAW,EP9CS,cAAc;EO+ClC,WAAW,EjB/CS,GAAG;EiBgDvB,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,KAAK;;AAGnB,EAAG;EACD,WAAW,EPtDS,iBAAiB;;AOyDvC,EAAG;EVzED,SAAS,EPUW,IAAI;EOTxB,WAAW,EPwBS,GAAG;;AiBoDzB,EAAG;EVxED,SAAS,EPMW,IAAI;EOLxB,WAAW,EPmBS,GAAG;;AiBwDzB,EAAG;EVvED,SAAS,EGFc,IAAI;EHG3B,WAAW,EPcS,GAAG;;AiB4DzB,EAAG;EVtED,SAAS,EGNc,MAAM;EHO7B,WAAW,EPSS,GAAG;;AiBgEzB,EAAG;EVrED,SAAS,EPNW,MAAM;EOO1B,WAAW,EPIS,GAAG;;AiBoEzB,EAAG;EVpED,SAAS,EPVW,MAAM;EOW1B,WAAW,EPFS,GAAG;EOGvB,WAAW,EPXS,GAAG;EOYvB,cAAc,EAAE,SAAS;;AUuE3B;;;GAGI;EACF,UAAU,EAAE,MAAM;;AAMlB;;gEAEoD;EAClD,SAAS,EjBWa,IAAI;;AiBP9B,iBAAkB;EAChB,SAAS,EjBMe,IAAI;;AiBF5B;;;cAGK;EACH,WAAW,EP7GO,iBAAiB;AOgHrC,WAAE;EACA,aAAa,EAAE,IAAI;EACnB,WAAW,EjBzGO,GAAG;;AiB8GvB;;;eAGK;EACH,WAAW,EP1HO,cAAc;;AO8HpC,YAAa;EVrIX,SAAS,EGFc,IAAI;EHG3B,WAAW,EPcS,GAAG;EiBwHvB,aAAa,EAAE,CAAC;EV1GhB,oCAAsC;IUwGxC,YAAa;MV/IX,SAAS,EPUW,IAAI;MOTxB,WAAW,EPwBS,GAAG;EOcvB,oCAAsC;IUwGxC,YAAa;MVpJX,SAAS,EPcW,MAAM;MOb1B,WAAW,EP6BS,GAAG;;AiBmIzB,cAAe;EACb,WAAW,EP5IS,cAAc;EO6IlC,SAAS,EjBtJW,IAAI;EiBuJxB,WAAW,EjBvIS,GAAG;EiBwIvB,WAAW,EjB9IS,GAAG;EiB+IvB,SAAS,EjBrCe,KAAK;;AiBwC/B,gBAAiB;EACf,QAAQ,EAAE,QAAQ;;AAGpB,qBAAsB;EACpB,KAAK,EjB7HsB,OAAO;EiB8HlC,IAAI,EAAE,CAAC;EACP,WAAW,EAAE,EAAE;EACf,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;;AAGR,eAAgB;EACd,UAAU,EAAE,CAAC;;AAGf,cAAe;EACb,aAAa,EAAE,CAAC;;AAGlB,oBAAqB;EACnB,gBAAgB,EP7IW,OAAO;EO+IlC;2BACK;IACH,KAAK,EjBjJoB,OAAO;EiBoJlC,sBAAE;IACA,KAAK,EPjJoB,OAAO;IOmJhC,4BAAQ;MACN,KAAK,EjBxJkB,OAAO;;AiB6JpC,eAAgB;EACd,SAAS,EjB3LW,MAAM;EiB4L1B,UAAU,EAAE,CAAC;;AAQb;;6BAAe;EACb,UAAU,EAAE,CAAC;AAGf;;4BAAc;EACZ,aAAa,EAAE,CAAC;;AAchB;;;;;;;;iDAAe;EACb,UAAU,EAAE,CAAC;AVhMjB,oCAAsC;EUoMtC;;;;;;;;uCAAe;IAEX,UAAU,EAAE,CAAC;AAKf;;;;;;;;+CAAc;EACZ,aAAa,EAAE,CAAC;AV5MpB,oCAAsC;EUgNtC;;;;;;;;sCAAc;IAEV,aAAa,EAAE,CAAC;;ACjLtB;uBACwB;EhBNA,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EWrEf,KAAK,ERqFsB,OAAO;EQpFlC,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,KAAK,EAAE,IAAI;EXoEX;8BAAK;IACH,aAAa,EAAE,CAAC;EWhBlB;oCAAW;IACT,UAAU,EAAE,IAAI;IAChB;gDAAU;MACR,UAAU,EAAE,MAAM;MAClB;4DAAU;QACR,UAAU,EAAE,MAAM;EAWxB;;;mDAC0B;IACxB,UAAU,ElBiEE,IAAI;EkB7DlB;8BAAK;IhBhBiB,UAAO,EAtCX,CAAC;IA+CK,aAAU,EA/ChB,CAAC;IK4CnB,eAAe,EAAE,IAAI;IACrB,YAAY,EAAE,CAAC;IWrEf,KAAK,ERqFsB,OAAO;IQpFlC,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,IAAI;IXoEX;qCAAK;MACH,aAAa,EAAE,CAAC;IWUhB;qCAAK;MA3EP,gBAAgB,ERqCW,OAAO;MQpClC,WAAW,ERGS,iBAAiB;MQFrC,UAAU,EAAE,IAAI;MAChB,aAAa,ElBgIG,MAAM;MkB/HtB,KAAK,EAAE,IAAI;IA4ET;uCAAO;MTqGT,gBAAgB,EAAE,WAAW;MAC7B,MAAM,EAAE,CAAC;MACT,aAAa,EAAE,CAAC;MAChB,WAAW,ET5KS,GAAG;MS6KvB,MAAM,EAAE,CAAC;MACT,OAAO,EAAE,CAAC;MACV,UAAU,EAAE,IAAI;MAChB,sBAAsB,EAAE,IAAI;MSlL5B,gBAAgB,ER2BW,OAAO;MQ1BlC,gBAAgB,EAAE,uBAA+B;MACjD,gBAAgB,EAAE,uBAA+B;MACjD,mBAAmB,EAAE,iBAAuB;MAC5C,iBAAiB,EAAE,SAAS;MAC5B,eAAe,EA5BL,MAAiB;MA6B3B,KAAK,ER8DsB,OAAO;MQ7DlC,MAAM,EAAE,OAAO;MACf,OAAO,EAAE,YAAY;MACrB,WAAW,ERfS,iBAAiB;MQgBrC,WAAW,ElBPS,GAAG;MkBQvB,MAAM,EAAE,CAAC;MACT,OAAO,EAAE,yBAA8D;MACvE,KAAK,EAAE,IAAI;MTuKX;+CAAQ;QACN,gBAAgB,EAAE,WAAW;MStK/B;+CAAQ;QACN,gBAAgB,ERUS,OAAO;QQThC,KAAK,ERmDoB,OAAO;MQhDlC;;;;;;;;;;;4CAKG;QACD,MAAM,EAAE,CAAC;IAiDT;sDAAsB;MA3CxB,gBAAgB,EAAE,sBAA8B;MAChD,gBAAgB,EAAE,sBAA8B;MAChD,iBAAiB,EAAE,SAAS;MAC5B,eAAe,EA1DL,MAAiB;EAuG3B;8BAAK;IA1FL,gBAAgB,ERqCW,OAAO;IQpClC,WAAW,ERGS,iBAAiB;IQFrC,UAAU,EAAE,IAAI;IAChB,aAAa,ElBgIG,MAAM;IkB/HtB,KAAK,EAAE,IAAI;;AA6FX,8CAAuB;EACrB,aAAa,EAnHE,iBAA8B;EAoH7C,WAAW,EApHI,iBAA8B;EAqH7C,YAAY,EArHG,iBAA8B;;AAyHjD,sBAAuB;EACrB,gBAAgB,ElBzEW,OAAO;EkB0ElC,QAAQ,EAAE,IAAI;EACd,OAAO,EAAE,WAAiC;EAE1C,sCAAgB;IACd,UAAU,EAAE,CAAC;EAGf,qCAAe;IACb,aAAa,EAAE,CAAC;EAGlB,yCAAqB;IXnFrB,QAAQ,EAAE,QAAQ;IAClB,IAAI,EAAE,MAAM;EAkBZ,wCAAoB;IAClB,OAAO,EAAE,IAAI;;AWsEjB,qBAAsB;ETyDpB,gBAAgB,EAAE,WAAW;EAC7B,MAAM,EAAE,CAAC;EACT,aAAa,EAAE,CAAC;EAChB,WAAW,ET5KS,GAAG;ES6KvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAChB,sBAAsB,EAAE,IAAI;ESlL5B,gBAAgB,ER2BW,OAAO;EQ1BlC,gBAAgB,EAAE,uBAA+B;EACjD,gBAAgB,EAAE,uBAA+B;EACjD,mBAAmB,EAAE,iBAAuB;EAC5C,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EA5BL,MAAiB;EA6B3B,KAAK,ER8DsB,OAAO;EQ7DlC,MAAM,EAAE,OAAO;EACf,OAAO,EAAE,YAAY;EACrB,WAAW,ERfS,iBAAiB;EQgBrC,WAAW,ElBPS,GAAG;EkBQvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,yBAA8D;EACvE,KAAK,EAAE,IAAI;ETuKX,2BAAQ;IACN,gBAAgB,EAAE,WAAW;EStK/B,2BAAQ;IACN,gBAAgB,ERUS,OAAO;IQThC,KAAK,ERmDoB,OAAO;EQhDlC;;;;;0BAKG;IACD,MAAM,EAAE,CAAC;;AA4Fb,0CAA2C;EAtFzC,gBAAgB,EAAE,sBAA8B;EAChD,gBAAgB,EAAE,sBAA8B;EAChD,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EA1DL,MAAiB;;ACoB7B,UAAW;EACT,gBAAgB,ET6BW,OAAO;ES5BlC,mBAAmB,EAAE,SAAqB;EAC1C,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,MAAM;EACvB,cAAc,EAAE,MAAgB;EAChC,YAAY,EATC,IAAsB;EAUnC,aAAa,EAZH,IAAe;EAazB,WAAW,EAbD,IAAe;EAczB,QAAQ,EAAE,QAAQ;EAElB,kBAAU;IACR,gBAAgB,EAAE,OAAiC;IACnD,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,CAAC;IACP,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,CAAC;IACN,KAAK,EAtBE,IAAc;EAyBvB,YAAE;IACA,KAAK,ET9Cc,OAAO;ISgD1B,sCACQ;MACN,KAAK,ETjDa,OAAO;ESqD7B,aAAG;IACD,aAAa,EAAE,CAAC;IAChB,UAAU,EnB6FE,IAAI;ImB5FhB,YAAY,EnB4FA,IAAI;;AmBxFpB,eAAgB;EACd,mBAAmB,EAAE,SAAyB;EAC9C,cAAc,EnBsFA,IAAI;EmBrFlB,WAAW,EnBqFG,IAAI;EmBnFlB,0CAA2B;IACzB,aAAa,EnBiFC,MAAM;ImBhFpB,WAAW,EnBgFG,MAAM;;AmB5ExB,eAAgB;EACd,OAAO,EAAE,UAAU;EACnB,aAAa,EnB2EC,IAAI;;AmBxEpB,eAAgB;EACd,OAAO,EAAE,UAAU;EACnB,YAAY,EAAE,IAAuB;EACrC,cAAc,EAAE,GAAG;;AAGrB,kBAAmB;EACjB,UAAU,EAAE,CAAC;EACb,aAAa,EAAE,CAAC;;AAGlB,eAAgB;EACd,WAAW,ETpES,iBAAiB;ESqErC,aAAa,EAAE,CAAC;EAChB,UAAU,EAAE,CAAC;;AAGf,0BAA2B;EACzB,aAAa,EnBsDC,IAAI;EmBrDlB,WAAW,EnBoDK,MAAM;;AmBhDtB,kBAAoB;EAClB,gBAAgB,EnB7BS,OAAO;EmB8BhC,gBAAgB,EAAE,gCAAyC;EAC3D,gBAAgB,EAAE,gCAAyC;EAE3D,0BAAU;IACR,gBAAgB,EnBrCO,OAAO;;AmB+BlC,kBAAoB;EAClB,gBAAgB,EnBlCS,OAAO;EmBmChC,gBAAgB,EAAE,gCAAyC;EAC3D,gBAAgB,EAAE,gCAAyC;EAE3D,0BAAU;IACR,gBAAgB,EnB1CO,OAAO;;AmBoClC,gBAAoB;EAClB,gBAAgB,ETRS,OAAO;ESShC,gBAAgB,EAAE,8BAAyC;EAC3D,gBAAgB,EAAE,8BAAyC;EAE3D,wBAAU;IACR,gBAAgB,ETlBO,OAAO;;ASYlC,eAAoB;EAClB,gBAAgB,ETfS,OAAO;ESgBhC,gBAAgB,EAAE,6BAAyC;EAC3D,gBAAgB,EAAE,6BAAyC;EAE3D,uBAAU;IACR,gBAAgB,ETxBO,OAAO;;AS6BpC,kBAAmB;EACjB,gBAAgB,EAAE,IAAI;;AAGxB,oBAAqB;EACnB,KAAK,EnBYmB,IAAI;;AmBR9B,UAAW;EACT,UAAU,EAAE,KAAK;;AC3HnB,WAAY;EACV,gBAAgB,EVuDW,OAAO;EUtDlC,cAAc,EAAE,MAAM;Eb4CtB,oCAAsC;Ia9CxC,WAAY;MAKR,SAAS,EpBiBS,MAAM;MoBhBxB,cAAc,EAAE,CAAC;;AAIrB,mBAAoB;ElBqEM,aAAS,EA/C7B,MAAwC;EAsDpB,cAAU,EArD9B,GAAwC;EAsDpB,YAAQ,EAvD5B,MAAwC;EkBpB5C,gBAAgB,EAAE,WAAW;EAC7B,SAAS,EpBQW,MAAM;EoBP1B,WAAW,EAAE,IAAI;EACjB,KAAK,EAAE,IAAI;Eb+BX,oCAAsC;IapCxC,mBAAoB;MAQhB,cAAc,EAAE,MAAM;MACtB,WAAW,EAAE,IAAI;Eb2BnB,oCAAsC;IapCxC,mBAAoB;MlBqEM,aAAS,EA/C7B,IAAwC;MAoDpB,YAAQ,EApD5B,IAAwC;EkBL1C,iCAAc;IACZ,UAAU,EAAE,IAAI;IbkBpB,oCAAsC;ManBpC,iCAAc;QAIV,UAAU,EAAE,CAAC;;AAMrB,iBAAkB;EtBThB,SAAS,ECJC,MAAM;EDMd,WAAI,EAAE,IAAI;EACV,YAAK,EAAE,IAAI;EIgDW,aAAS,EA/C7B,MAAwC;EAoDpB,YAAQ,EApD5B,MAAwC;EkBQ5C,SAAS,EpB4Fe,MAAM;ECjH9B,wBAAS;IACP,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;EMwBhB,oCAAsC;IaTxC,iBAAkB;MlB0CQ,aAAS,EA/C7B,IAAwC;MAoDpB,YAAQ,EApD5B,IAAwC;;AkBe9C,kBAAmB;ElB2BK,WAAO,EA3CzB,OAAa;EAoDO,cAAU,EApD9B,OAAa;EkBkBjB,SAAS,EAAE,MAAM;EACjB,WAAW,EpBnBS,GAAG;EOevB,oCAAsC;IaCxC,kBAAmB;MlB2BK,WAAO,EAtCX,CAAC;MA+CK,cAAU,EA/ChB,CAAC;EkBoBnB,oBAAE;IlBkBoB,UAAO,EAtCX,CAAC;IA+CK,aAAU,EA/ChB,CAAC;IkBsBjB,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,MAAM;IAChB,cAAc,EAAE,MAAM;IbdxB,oCAAsC;MaUtC,oBAAE;QlBkBoB,UAAO,EA3CzB,GAAa;QAoDO,aAAU,EApD9B,GAAa;QkBiCb,OAAO,EAAE,YAAY;EAIzB,sBAAI;IACF,KAAK,EAAE,IAAI;IACX,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,GAAG;IACf,KAAK,EAAE,MAAM;Ib1Bf,oCAAsC;MasBtC,sBAAI;QAOA,YAAY,EAAE,MAAM;QACpB,KAAK,EAAE,IAAI;;AAKjB,2BAA4B;EAC1B,WAAW,EAAE,MAAM;EACnB,aAAa,EAAE,iBAA2B;EAC1C,OAAO,EAAE,IAAI;EACb,SAAS,EpBhEW,MAAM;EoBiE1B,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,IAAI;EbzCnB,oCAAsC;IamCxC,2BAA4B;MASxB,aAAa,EAAE,IAAI;MACnB,OAAO,EAAE,KAAK;MACd,SAAS,EAAE,MAAM;MACjB,WAAW,EpB9DO,GAAG;MoB+DrB,UAAU,EAAE,CAAC;MACb,aAAa,EAAE,CAAC;EAGlB,+CAAoB;IAClB,WAAW,EAAE,CAAC;IbrDhB,oCAAsC;MaoDtC,+CAAoB;QAIhB,WAAW,EAAE,IAAI;EAIrB,+BAAI;IACF,YAAY,EAAE,MAAM;Ib7DtB,oCAAsC;Ma4DtC,+BAAI;QAIA,YAAY,EAAE,MAAM;EAIxB,6BAAE;IACA,WAAW,EpB3FO,GAAG;IoB4FrB,cAAc,EAAE,GAAG;IbtErB,oCAAsC;MaoEtC,6BAAE;QAKE,WAAW,EpBhGK,GAAG;QoBiGnB,cAAc,EAAE,MAAM;;AAK5B,kBAAmB;EX2EjB,gBAAgB,EAAE,WAAW;EAC7B,MAAM,EAAE,CAAC;EACT,aAAa,EAAE,CAAC;EAChB,WAAW,ET5KS,GAAG;ES6KvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAChB,sBAAsB,EAAE,IAAI;EPrIN,WAAO,EA3CzB,MAAa;EA2DO,YAAQ,EAxD5B,MAAkE;EkB8FtE,qBAAqB,EAAE,KAAK;EAC5B,KAAK,EVhIS,OAAO;EUiIrB,OAAO,EAAE,KAAK;EACd,SAAS,EAAE,MAAM;EACjB,MAAM,EAAE,MAAM;EACd,IAAI,EAAE,CAAC;EACP,QAAQ,EAAE,QAAQ;EAClB,eAAe,EAAE,SAAS;EAC1B,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,IAAI;EXwEX,wBAAQ;IACN,gBAAgB,EAAE,WAAW;EFpK/B,oCAAsC;Ia+ExC,kBAAmB;MlBnDK,WAAO,EAtCX,CAAC;MAsDK,YAAQ,EAnDd,CAAC;MkBsGjB,+DAA+D;MAC/D,OAAO,EAAE,MAAM;MACf,MAAM,EAAE,OAAO;MACf,WAAW,EAAE,GAAG;MAChB,QAAQ,EAAE,QAAQ;MAClB,cAAc,EAAE,MAAM;MACtB,KAAK,EAAE,OAAO;MACd,sBAAsB;EAGxB,wBAAQ;IACN,KAAK,EVtJc,OAAO;IUuJ1B,eAAe,EAAE,SAAS;EAG5B,uCAAuB;IAErB,gBAAgB,EAAE,IAAI;IbVxB,8CAAiB;MACf,gBAAgB,EAAE,0CAAkC;MACpD,gBAAgB,EAAE,0CAAkC;MACpD,eAAe,EAAE,IAAI;MACrB,OAAO,EAAE,EAAE;MACX,OAAO,EAAE,YAAY;MACrB,MAAM,EaGiD,IAAI;MbF3D,KAAK,EaEkD,IAAI;MbA3D,oFAAoF;MAElF,WAAW,EaFgD,CAAC;MbM9D,sBAAsB;IAItB,oDAAuB;MACrB,gBAAgB,EAAE,gDAAwC;MAC1D,gBAAgB,EAAE,gDAAwC;IaT5D,8CAAS;MACP,qBAAqB,EAAE,GAAG;EAI9B,sCAAsB;IAEpB,gBAAgB,EAAE,IAAI;IACtB,MAAM,EAAE,MAAM;IbpBhB,6CAAiB;MACf,gBAAgB,EAAE,uBAAkC;MACpD,gBAAgB,EAAE,uBAAkC;MACpD,eAAe,EAAE,IAAI;MACrB,OAAO,EAAE,EAAE;MACX,OAAO,EAAE,YAAY;MACrB,MAAM,EaY8B,MAAM;MbX1C,KAAK,EaW+B,MAAM;MbT1C,oFAAoF;MAElF,WAAW,EaO+B,CAAC;MbH7C,sBAAsB;IArHxB,oCAAsC;MauHtC,sCAAsB;QAOlB,MAAM,EAAE,OAAO;QACf,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,QAAQ;Qb1BtB,6CAAiB;UACf,gBAAgB,EAAE,wCAAkC;UACpD,gBAAgB,EAAE,wCAAkC;UACpD,eAAe,EAAE,IAAI;UACrB,OAAO,EAAE,EAAE;UACX,OAAO,EAAE,YAAY;UACrB,MAAM,EaiBiD,IAAI;UbhB3D,KAAK,EagBkD,IAAI;Ubd3D,oFAAoF;UAElF,WAAW,EaYgD,CAAC;UbR9D,sBAAsB;QAItB,mDAAuB;UACrB,gBAAgB,EAAE,8CAAwC;UAC1D,gBAAgB,EAAE,8CAAwC;QaO1D,6CAAS;UACP,qBAAqB,EAAE,GAAG;IAI9B,6CAAS;MACP,QAAQ,EAAE,QAAQ;MAClB,KAAK,EAAE,MAAM;MACb,GAAG,EAAE,OAAO;Mb1IhB,oCAAsC;QauIpC,6CAAS;UAML,QAAQ,EAAE,MAAM;IAIpB,8DAAwB;MACtB,OAAO,EAAE,IAAI;MblJjB,oCAAsC;QaiJpC,8DAAwB;UAIpB,OAAO,EAAE,MAAM;;AAMvB,gBAAiB;EACf,KAAK,EAAE,MAAM;;ACzMb,8BAAmB;EACjB,OAAO,EAAE,KAAK;AAGhB,oCAAyB;EACvB,KAAK,EX2FoB,OAAO;EW1FhC,OAAO,EAAE,KAAK;EACd,WAAW,ErBwBO,GAAG;EqBvBrB,UAAU,EAAE,CAAC;EACb,cAAc,ErB+ID,IAAI;EqB9IjB,WAAW,ErB8IE,IAAI;EqB7IjB,eAAe,EAAE,IAAI;EdkCvB,oCAAsC;IczCtC,oCAAyB;MAUrB,UAAU,EAAE,IAAI;EAGlB,0CAAQ;IACN,eAAe,EAAE,SAAS;AAI9B;sCAC2B;EACzB,eAAe,EAAE,IAAI;;AAIzB,wBAAyB;EACvB,OAAO,EAAE,YAAY;EAErB,0BAAE;IACA,KAAK,EXgEoB,OAAO;IW/DhC,eAAe,EAAE,IAAI;EAGvB,8BAAQ;IACN,eAAe,EAAE,SAAS;;AAI9B,yBAA0B;EACxB,KAAK,EX1CS,OAAO;EW2CrB,cAAc,ErB6GC,IAAI;EqB5GnB,WAAW,ErB4GI,IAAI;EqB3GnB,eAAe,EAAE,SAAS;;AAG5B,2BAA4B;EAC1B,gBAAgB,EXMW,OAAO;EWJlC,uDAA4B;IAC1B,YAAY,EAAE,MAAM;IACpB,aAAa,EAAE,MAAM;IdRvB,oCAAsC;McMtC,uDAA4B;QAKxB,YAAY,EAAE,CAAC;QACf,aAAa,EAAE,CAAC;IAGlB,0DAAG;MACD,WAAW,EAAE,IAAI;MdhBrB,oCAAsC;QcepC,0DAAG;UAIC,WAAW,EAAE,CAAC;EdnBpB,oCAAsC;IcwBtC,0CAAe;MAEX,YAAY,EAAE,MAAM;MACpB,aAAa,EAAE,MAAM;;AAOvB,6CAAE;EACA,MAAM,EAAE,UAAoB;EdnChC,oCAAsC;IckCpC,6CAAE;MAIE,MAAM,EAAE,UAAoB;AAKlC,8CAA4B;EAC1B,UAAU,EAAE,CAAC;Ed5Cf,oCAAsC;Ic2CtC,8CAA4B;MAIxB,UAAU,ErByDE,MAAM;MqBxDlB,aAAa,ErBwDD,MAAM;AqBpDtB,mCAAiB;EACf,OAAO,EAAE,MAAgB;EdrD3B,oCAAsC;IcoDtC,mCAAiB;MAIb,OAAO,EAAE,MAAiB;AAI9B,2CAAyB;EACvB,cAAc,ErB6CC,MAAM;EqB5CrB,WAAW,ErB4CI,MAAM;AqBxCrB,0DAAY;EACV,OAAO,EAAE,CAAC;EdnEd,oCAAsC;IckEpC,0DAAY;MAIR,YAAY,ErBsCJ,IAAI;MqBrCZ,aAAa,ErBqCL,IAAI;AO5GlB,qCAAsC;Ec2EpC,0EAA4B;IAExB,YAAY,EAAE,EAAE;IAChB,KAAK,EAAE,OAAO;Ad9EpB,qCAAsC;EciFlC,qFAAa;IAET,YAAY,EAAE,CAAC;AdnFvB,oCAAsC;EcyFtC,qCAAmB;IAEf,WAAW,EAAE,MAAM;;AAOrB,kCAAE;EACA,OAAO,EAAE,KAAK;AdnGlB,qCAAsC;EcsGpC,4DAA4B;IAExB,YAAY,EAAE,EAAE;IAChB,KAAK,EAAE,OAAO;AdzGpB,qCAAsC;Ec4GlC,uEAAa;IAET,YAAY,EAAE,CAAC;AAMvB,yCAAyB;EACvB,cAAc,ErBXC,MAAM;EqBYrB,WAAW,ErBZI,MAAM;AqBgBrB,wDAAY;EACV,OAAO,EAAE,CAAC;Ed3Hd,oCAAsC;Ic0HpC,wDAAY;MAIR,YAAY,ErBlBJ,IAAI;MqBmBZ,aAAa,ErBnBL,IAAI;AO5GlB,oCAAsC;EcyHtC,4CAA4B;IAWxB,cAAc,EAAE,CAAC;IACjB,WAAW,EAAE,CAAC;IAEd,2DAAe;MACb,WAAW,EAAE,MAAM;AdxIzB,oCAAsC;Ec8IpC,6CAAI;IAEA,MAAM,EAAE,CAAC;AdhJf,oCAAsC;Ec6ItC,yCAAyB;InBjHH,WAAO,EA3CzB,MAAa;IAoDO,cAAU,EApD9B,MAAa;AKejB,oCAAsC;Ec6ItC,yCAAyB;IAYrB,KAAK,EAAE,IAAI;AdzJf,qCAAsC;Ec6ItC,yCAAyB;IjBxHvB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,oDAAa;MACX,YAAoB,EAAE,CAAC;;AiBuH/B,mDAAmD;AACnD;;6BAE8B;EAC5B,UAAU,EAAE,iBAA2B;EdtKvC,oCAAsC;IcmKxC;;iCAE8B;MAI1B,MAAM,EAAE,IAAI;EAGd;;0CAAa;IACX,aAAa,EAAE,iBAA2B;Id7K5C,oCAAsC;Mc4KtC;;8CAAa;QAIT,aAAa,EAAE,IAAI;;AAIzB,sBAAsB;AAEtB,kBAAmB;EACjB,cAAc,EAAE,MAAM;EACtB,YAAY,EAAE,MAAM;EACpB,aAAa,EAAE,MAAM;EdzLrB,oCAAsC;IcsLxC,kBAAmB;MAMf,KAAK,EAAE,KAAK;MACZ,OAAO,EAAE,CAAC;EAGZ,sCAAoB;IAClB,UAAU,EAAE,CAAC;EAGf,yBAAO;IACL,KAAK,EAAE,IAAI;IACX,YAAY,EAAE,CAAC;IACf,UAAU,EAAE,MAAM;EAGpB,wBAAM;IACJ,KAAK,EAAE,IAAI;;AAIf,6BAA8B;EAC5B,gBAAgB,EXvMW,OAAO;EWwMlC,cAAc,ErBtGC,IAAI;EqBuGnB,WAAW,ErBvGI,IAAI;EqByGnB,+BAAE;IACA,KAAK,EXlKoB,OAAO;;AHnDlC,oCAAsC;EcyNxC,iCAAkC;IAE9B,WAAW,ErBhHE,IAAI;IqBiHjB,cAAc,ErBjHD,IAAI;;AO3GnB,oCAAsC;EcgOxC,yBAA0B;IAEtB,UAAU,EAAE,KAAK;;AAKnB,mBAAE;EACA,eAAe,EAAE,IAAI;;AAKvB,wCAAyB;EACvB,OAAO,EAAE,KAAK;EAEd,0CAAE;IACA,MAAM,EAAE,UAAoB;IdjPhC,oCAAsC;McgPpC,0CAAE;QAIE,MAAM,EAAE,eAAmC;AdpPjD,oCAAsC;EcyPtC,yCAA0B;IAEtB,WAAW,ErBhJA,IAAI;AqBoJnB,gCAAiB;EACf,OAAO,EAAE,MAAgB;EdhQ3B,oCAAsC;Ic+PtC,gCAAiB;MAIb,OAAO,EAAE,MAAiB;AdnQ9B,oCAAsC;EcuQtC,2CAA4B;IAExB,cAAc,EAAE,IAAI;IACpB,WAAW,EAAE,IAAI;AAGnB,uDAAY;EACV,OAAO,EAAE,CAAC;Ed9Qd,oCAAsC;Ic6QpC,uDAAY;MAIR,YAAY,ErBrKJ,IAAI;MqBsKZ,aAAa,ErBtKL,IAAI;AqB0KhB,uEAA4B;EAC1B,YAAY,EAAE,CAAC;EACf,aAAa,EAAE,CAAC;EAEhB,0EAAG;IACD,WAAW,ErBjLA,MAAM;IO1GvB,oCAAsC;Mc0RlC,0EAAG;QAIC,WAAW,EAAE,CAAC;EAIlB,gGAAyB;IACvB,WAAW,EAAE,CAAC;AAKpB,kBAAG;EACD,cAAc,EAAE,MAAM;EdzSxB,oCAAsC;IcwStC,kBAAG;MAIC,cAAc,EAAE,CAAC;EAGnB,6BAAa;IACX,aAAa,EAAE,iBAA2B;IdhT9C,oCAAsC;Mc+SpC,6BAAa;QAIT,aAAa,EAAE,IAAI;EAIvB,mDAAiC;IAC/B,WAAW,ErB9UK,GAAG;IqB+UnB,cAAc,EAAE,MAAM;IACtB,WAAW,EAAE,MAAM;EAGrB,2CAAyB;IACvB,gBAAgB,EAAE,4BAAoC;IACtD,gBAAgB,EAAE,4BAAoC;IACtD,mBAAmB,EAAE,aAAa;IAClC,iBAAiB,EAAE,SAAS;IAC5B,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,MAAM;IdpUxB,oCAAsC;Mc6TpC,2CAAyB;QAUrB,UAAU,EAAE,IAAI;QAChB,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,CAAC;QACjB,YAAY,EAAE,CAAC;IAGjB,+CAAI;MnBjTc,UAAO,EAtCX,CAAC;MA+CK,aAAU,EA/ChB,CAAC;EmB4VjB,yBAAS;IAAE,wDAAwD;IACjE,cAAc,EAAE,CAAC;IAEjB,4BAAG;MACD,OAAO,EAAE,IAAI;IAGf,kDAAyB;MAAE,wDAAwD;MACjF,gBAAgB,EAAE,6BAAqC;MACvD,gBAAgB,EAAE,6BAAqC;MACvD,MAAM,EAAE,OAAO;MACf,OAAO,EAAE,KAAK;Md7VpB,oCAAsC;QcyVlC,kDAAyB;UAOrB,UAAU,EAAE,IAAI;UAChB,YAAY,EAAE,CAAC;;AAOzB,iBAAkB;EAChB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,MAAM;;Ad1Wf,oCAAsC;Ec6WxC,mBAAoB;IAEhB,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,MAAM;;AAInB,oBAAqB;EACnB,SAAS,EAAE,IAAI;EdrXf,oCAAsC;IcoXxC,oBAAqB;MAIjB,KAAK,EAAE,IAAI;;AAIf,wBAAyB;EACvB,SAAS,EAAE,KAAK;;AAGlB,yBAA0B;EACxB,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,IAAI;;AAGjB,wBAAyB;EACvB,OAAO,EAAE,KAAK;EACd,UAAU,ErB9RI,IAAI;EOzGlB,oCAAsC;IcqYxC,wBAAyB;MAKrB,OAAO,EAAE,YAAY;MACrB,UAAU,ErB/RE,IAAI;MqBgShB,YAAY,ErBlSG,MAAM;;AqBsSzB,4BAA6B;EAC3B,UAAU,ErBvSO,MAAM;EO1GvB,oCAAsC;IcgZxC,4BAA6B;MAIzB,UAAU,ErBzSG,IAAI;;AqB6SrB,6BAA8B;EAC5B,OAAO,EAAE,YAAY;EACrB,UAAU,ErBhTO,MAAM;EqBiTvB,YAAY,ErBjTK,MAAM;;AqBoTzB,2BAA4B;EAC1B,UAAU,EAAE,CAAC;Ed/Zb,oCAAsC;Ic8ZxC,2BAA4B;MAIxB,UAAU,EAAE,IAAI;;AAIpB,yFAAiB;EnBvXb,MAAO,EAtBF,oBAA4B;EmBoZnC,mBAAmB,EAAE,aAAa;EAClC,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,SAAuB;EACxC,OAAO,EAAE,YAAY;EACrB,MAAM,EAPK,MAAM;EAQjB,IAAI,EAAE,OAAO;EACb,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,MAAM;EAClB,KAAK,EAXM,MAAM;Ed1ajB,oCAAsC;IcsaxC,yFAAiB;MnBvXb,MAAO,EAtBF,YAA4B;MmBgajC,IAAI,ErB/UW,MAAM;EqBkVvB,kHAAK;IdrbL,QAAQ,EAAE,QAAQ;IAClB,IAAI,EAAE,MAAM;;Acybd,kBAAmB;EAEjB,gBAAgB,EAAE,6CAAqD;EACvE,gBAAgB,EAAE,6CAAqD;;AAGzE,iBAAkB;EAEhB,gBAAgB,EAAE,4CAAoD;EACtE,gBAAgB,EAAE,4CAAoD;;AAGxE,iBAAkB;EAEhB,gBAAgB,EAAE,4CAAoD;EACtE,gBAAgB,EAAE,4CAAoD;;AAGxE,aAAc;EAEZ,gBAAgB,EAAE,wCAAgD;EAClE,gBAAgB,EAAE,wCAAgD;;ACjgBlE,MAAE;EACA,aAAa,EAAE,CAAC;AAGlB;kBACc;EACZ,OAAO,EAAE,KAAK;EACd,aAAa,EAAE,KAAK;EACpB,UAAU,EAAE,MAAM;EfmCpB,oCAAsC;IevCtC;sBACc;MAMV,YAAY,EAAE,KAAK;MACnB,aAAa,EAAE,KAAK;MACpB,KAAK,EAAE,IAAI;AAIf;2BACuB;EACrB,aAAa,EAAE,MAAM;;AfwBvB,oCAAsC;EepBxC,SAAU;IAEN,SAAS,EA5BI,KAAK;;AAgCtB,cAAe;EACb,KAAK,EAAE,KAAK;EACZ,WAAW,EZXS,iBAAiB;EYYrC,SAAS,EtBdW,MAAM;EsBe1B,MAAM,EAAE,UAAU;EAElB,kBAAI;IACF,KAAK,EAAE,IAAI;;AAIf,QAAS;EACP,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;;AfAV,oCAAsC;EeGxC,eAAgB;IAEZ,SAAS,EAAE,KAAK;;AAKlB,oBAAiB;EAAE,wDAAwD;EfV3E,oCAAsC;IeUtC,oBAAiB;MAEb,SAAS,EAAE,IAAI;AAInB,sBAAmB;EAAE,wDAAwD;EfhB7E,oCAAsC;IegBtC,sBAAmB;MAEf,SAAS,EAAE,KAAK;;AflBpB,oCAAsC;EeuBxC,eAAgB;IAEZ,aAAa,EAAE,EAAE;;AfzBnB,oCAAsC;Ee6BxC,4BAA6B;IAEzB,aAAa,EAAE,CAAC;;Af/BlB,oCAAsC;EemCxC,qBAAsB;IAElB,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,GAAG;AAGZ,2BAAM;EACJ,aAAa,EAAE,IAAI;AAGrB,4BAAO;EACL,aAAa,EAAE,IAAI;;Af9CrB,oCAAsC;EekDxC,sBAAuB;IAEnB,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,GAAG;AAGZ,4BAAM;EACJ,aAAa,EAAE,IAAI;AAGrB,6BAAO;EACL,aAAa,EAAE,IAAI;;Af7DrB,oCAAsC;EeiExC,qBAAsB;IAElB,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,IAAI;AAGb,2BAAM;EACJ,aAAa,EAAE,IAAI;AAGrB,4BAAO;EACL,aAAa,EAAE,IAAI;;AAIvB,oBAAqB;EACnB,WAAW,EAAE,MAAM;;AAKrB,cAAe;EACb,UAAU,EAAE,IAAI;EAChB,WAAW,EAAE,CAAC;EACd,YAAY,EAAE,CAAC;EAEf,iBAAG;IACD,OAAO,EAAE,YAAY;IACrB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,CAAC;IAChB,UAAU,EAAE,CAAC;IACb,YAAY,EAAE,GAAG;IACjB,WAAW,EAAE,IAAI;IAEjB,yBAAU;MACR,OAAO,EAAE,GAAG;MACZ,OAAO,EAAE,YAAY;MACrB,MAAM,EAAE,IAAI;MACZ,YAAY,EAAE,IAAI;MAClB,KAAK,EAAE,KAAK;;AAMhB,8BAAU;EACR,gBAAgB,EAAE,0BAAkC;EACpD,gBAAgB,EAAE,0BAAkC;EACpD,mBAAmB,EAAE,IAAI;EACzB,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,IAAI;;AC7JrB,wDAAiB;EACf,aAAa,EvBgIO,IAAI;EOvF5B,oCAAsC;IgB1CpC,wDAAiB;MAIb,aAAa,EAAE,IAAiB;AhBsCtC,oCAAsC;EgBjClC,mEAAiB;IAEb,aAAa,EAAE,CAAC;AAGlB,8EAAa;EACX,aAAa,EAAE,CAAC;AAMxB,sCAAqB;EACnB,YAAY,EvB2GU,IAAI;AuBvG1B,sDAAe;EACb,UAAU,EAAE,CAAC;;ACnBnB,WAAY;EACV,KAAK,EAAE,IAAI;EACX,OAAO,EARS,IAAI;EjBwCpB,oCAAsC;IiBlCxC,WAAY;MAKR,aAAa,EAAE,iBAA6B;EAG9C,aAAE;IACA,aAAa,EAAE,IAAI;EjByBrB,oCAAsC;IiBtBtC,uBAAY;MAER,KAAK,EAAE,KAAK;MACZ,SAAS,EAAE,OAAO;;AAKxB,SAAU;EACR,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,IAAI;EACjB,WAAW,EAAE,MAAM;EjBWnB,oCAAsC;IiBdxC,SAAU;MAMN,WAAW,EAAE,MAAM;MACnB,WAAW,EAAE,CAAC;EAGhB,WAAE;IACA,KAAK,EdsDoB,OAAO;IcrDhC,eAAe,EAAE,IAAI;EAGvB,YAAG;IACD,OAAO,EAAE,IAAI;IjBFf,oCAAsC;MiBCtC,YAAG;QAIC,OAAO,EAAE,KAAK;;AAKpB,cAAe;EACb,OAAO,EAAE,KAAK;EACd,SAAS,ExBrCW,MAAM;EwBsC1B,UAAU,EAAE,MAAM;EAClB,WAAW,ExB5BS,GAAG;EwB6BvB,MAAM,EAAE,CAAC;EjBfT,oCAAsC;IiBUxC,cAAe;MAQX,OAAO,EAAE,KAAK;MACd,SAAS,EAAE,MAAM;MACjB,WAAW,ExB1CO,GAAG;;AwB8CzB,aAAc;EACZ,+DAA+D;EfiI/D,gBAAgB,EAAE,WAAW;EAC7B,MAAM,EAAE,CAAC;EACT,aAAa,EAAE,CAAC;EAChB,WAAW,ET5KS,GAAG;ES6KvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAChB,sBAAsB,EAAE,IAAI;EetI5B,gBAAgB,EdxEF,OAAO;EcyErB,KAAK,ExBvBsB,OAAO;EwBwBlC,OAAO,EAAE,MAAM;EACf,KAAK,EAAE,KAAK;EACZ,SAAS,ExBvDW,MAAM;EwBwD1B,MAAM,EAAE,IAAI;EACZ,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,MAAM;EAClB,eAAe,EAAE,IAAI;EACrB,cAAc,EAAE,SAAS;EACzB,KAAK,EAAE,MAAM;EACb,sBAAsB;Ef6HtB,mBAAQ;IACN,gBAAgB,EAAE,WAAW;EFpK/B,oCAAsC;IiBwBxC,aAAc;MAiBV,OAAO,EAAE,IAAI;EAGf,mBAAQ;IACN,KAAK,ExBxCoB,OAAO;IwByChC,gBAAgB,Ed1FG,OAAO;Ec6F5B,qBAAU;IACR,KAAK,ExB7CoB,OAAO;;AwBiDpC,YAAa;EC5DX,QAAQ,ED6DU,KAAK;ECzDnB,GAAU,EDyDW,CAAC;ECzDtB,KAAU,EDyDW,CAAC;ECzDtB,MAAU,EDyDW,CAAC;ECzDtB,IAAU,EDyDW,CAAC;EAC1B,UAAU,ExBlDiB,OAAO;EwBmDlC,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,oBAAoB;EAChC,UAAU,EAAE,MAAM;EAClB,OAAO,EAnGS,IAAI;EAqGpB,uBAAa;IACX,OAAO,EAAE,GAAG;IACZ,UAAU,EAAE,OAAO;;AjBhErB,oCAAsC;EiBuEtC,2BAAU;IAEN,MAAM,EAAE,CAAC;IACT,QAAQ,EAAE,QAAQ;AjB1EtB,oCAAsC;EiB8EtC,6BAAY;IAER,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,GAAG;;AjBjFd,oCAAsC;EiByFtC,gCAAY;IAER,aAAa,EAAE,IAAI;AjB3FvB,oCAAsC;EiB+FtC,8BAAU;ItBnEY,UAAO,EA3CzB,IAAa;IAoDO,aAAU,EApD9B,IAAa;AKejB,oCAAsC;EiBqGtC,uBAAG;IAEC,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,CAAC;AjBxGlB,oCAAsC;EiB4GtC,gCAAY;I1B9HZ,SAAS,ECJC,MAAM;IDMd,WAAI,EAAE,IAAI;IACV,YAAK,EAAE,IAAI;IIgDW,aAAS,EA/C7B,IAAwC;IAoDpB,YAAQ,EApD5B,IAAwC;IsB8HxC,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,IAAI;IACZ,SAAS,ExB5BW,MAAM;ICjH9B,uCAAS;MACP,KAAK,EAAE,IAAI;MACX,OAAO,EAAE,EAAE;MACX,OAAO,EAAE,KAAK;AMwBhB,oCAAsC;EiBsHtC,6BAAS;IAEL,UAAU,EAAE,iBAA6B;IACzC,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,IAAI;AjB3Hf,oCAAsC;EiB+HtC,mCAAe;I1BjJf,SAAS,ECJC,MAAM;IDMd,WAAI,EAAE,IAAI;IACV,YAAK,EAAE,IAAI;IIgDW,aAAS,EA/C7B,IAAwC;IA0DpB,YAAQ,EAxD5B,MAAkE;IsB+IlE,UAAU,EAAE,IAAI;IAChB,SAAS,ExB9CW,MAAM;IwB+C1B,QAAQ,EAAE,QAAQ;IvBhKtB,0CAAS;MACP,KAAK,EAAE,IAAI;MACX,OAAO,EAAE,EAAE;MACX,OAAO,EAAE,KAAK;AMwBhB,oCAAsC;EN3BtC,4CAAS;IACP,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;AuBuKZ,mIACsB;EAAE,wDAAwD;EjBhJpF,oCAAsC;IiB+IlC,mIACsB;MACS,wDAAwD;MACnF,mBAAmB,EAAE,oBAAoB;AjBlJjD,oCAAsC;EiBwJtC,kCAAc;ItB5HQ,WAAO,EA3CzB,MAAa;IAoDO,cAAU,EApD9B,MAAa;AKejB,oCAAsC;EiB+JpC,oDAAe;IAEX,YAAY,EAAE,MAAM;AjBjK1B,oCAAsC;EiBsKtC,kCAAc;IAEV,YAAY,ExBjFQ,IAAI;;A0BlI9B,SAAU;ExBuEc,WAAO,EA3CzB,IAAa;EAoDO,cAAU,EApD9B,IAAa;EwB1BjB,gBAAgB,EAAE,sBAA8B;EAChD,mBAAmB,EAAE,MAAM;EAC3B,eAAe,EAAE,KAAK;EAEtB,qBAAY;IACV,KAAK,E1ByCoB,OAAO;;A0BpClC,gCAAe;EACb,KAAK,EhBoEoB,OAAO;;AgBhEpC,iBAAkB;EAChB,gBAAgB,EhBlBM,OAAO;EgBmB7B,OAAO,EAAE,IAAI;EnBwBb,oCAAsC;ImB1BxC,iBAAkB;MAKd,SAAS,EAAE,KAAK;EAGlB,iCAAgB;IxB8CM,UAAO,EAtCX,CAAC;IAkDK,aAAU,EArD9B,IAAwC;;AwBA9C,qBAAsB;EACpB,KAAK,E1BiBsB,OAAO;E0BhBlC,OAAO,EAAE,KAAK;;AClChB,gBAAiB;EACf,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EpB2CtB,qCAAsC;IoB7CxC,gBAAiB;MAKb,OAAO,EAAE,OAAO;EAIhB,2DAAiC;IAC/B,UAAU,EAAE,CAAC;EAGf,0DAAgC;IAC9B,aAAa,EAAE,CAAC;;AAKtB,wBAAyB;EACvB,KAAK,EAAE,CAAC;;AAGV,6BAA8B;EAC5B,aAAa,E3B4GW,IAAI;E2B3G5B,KAAK,EAAE,CAAC;EpBoBR,qCAAsC;IoBtBxC,6BAA8B;MAK1B,aAAa,EAAE,CAAC;EAGlB,4CAAe;IACb,UAAU,EAAE,CAAC;;AC5BjB,oBAAqB;EAJnB,KAAK,EAAE,IAAI;EACX,YAAY,EAFwB,IAAI;;AAS1C,qBAAsB;EACpB,QAAQ,EAAE,MAAM;;ACElB,WAAY;EACV,aAAa,EAAE,iBAA2B;EAC1C,MAAM,EAAE,IAAI;EtBgCZ,oCAAsC;IsBlCxC,WAAY;MAKR,aAAa,EAAE,IAAI;MACnB,OAAO,EAAE,YAAY;MACrB,MAAM,EAAE,MAAM;;AAIlB,aAAc;EtBqEZ,uBAAuB,EAAE,SAAS;EAClC,sBAAsB,EAAE,WAAW;EA/CnC,oCAAsC;IsBnBpC,wBAAK;MAxBP,aAAa,EAAE,oBAA2B;MAC1C,cAAc,EAAE,MAAM;EtB0CtB,oCAAsC;IsBXpC,uCAAK;MAED,YAAY,EAAE,CAAC;MACf,aAAa,EAAE,MAAM;;AtBQ3B,oCAAsC;EsBFxC,kBAAmB;I/BhBjB,SAAS,ECJC,MAAM;IDMd,WAAI,EAAE,IAAI;IACV,YAAK,EAAE,IAAI;IIgDW,aAAS,EA/C7B,IAAwC;IAoDpB,YAAQ,EApD5B,IAAwC;I2BgB1C,SAAS,E7BoFa,MAAM;ICjH9B,yBAAS;MACP,KAAK,EAAE,IAAI;MACX,OAAO,EAAE,EAAE;MACX,OAAO,EAAE,KAAK;;A4B8BlB,QAAS;EJZP,QAAQ,EIeU,KAAK;EJXnB,GAAU,EIWW,CAAC;EJXtB,KAAU,EIWa,CAAC;EJXxB,MAAU,EIWe,CAAC;EJX1B,IAAU,EIWiB,IAAI;EAEnC,UAAU,E7BNiB,OAAO;E6BOlC,WAAW,EAAE,iBAA2B;EACxC,YAAY,EAAE,CAAC;EACf,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,UAAU,EAAE,IAAI;EAChB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,iBAAgC;EAC3C,KAAK,EAZiB,KAAK;EAa3B,OAAO,EL1DS,IAAI;EjBsCpB,oCAAsC;IsBMxC,QAAS;M3BsBe,WAAO,EA3CzB,MAAa;MAgDO,aAAS,EA1Cf,CAAC;MAoDK,cAAU,EAnDhB,CAAC;M2BgCjB,WAAW,EAAE,IAAI;MACjB,OAAO,EAAE,KAAK;MACd,KAAK,EAAE,KAAK;MACZ,UAAU,EAAE,OAAO;MACnB,QAAQ,EAAE,QAAQ;MAClB,SAAS,EAAE,aAAa;MACxB,KAAK,EAAE,IAAI;EAGb,mBAAa;IACX,SAAS,EAAE,aAAa;IACxB,UAAU,EAAE,oBAAoB;EAGlC,YAAI;IACF,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;ItBxClB,oCAAsC;MsBsCtC,YAAI;QAKA,UAAU,EAAE,CAAC;EAIjB,qBAAa;IACX,WAAW,EAAE,iBAAwB;IACrC,KAAK,EnB9FO,OAAO;ImB+FnB,WAAW,E7BhEO,GAAG;I6BiErB,YAAY,EAAE,MAAM;ItBnDtB,oCAAsC;MsB+CtC,qBAAa;QAOT,KAAK,EnBHkB,OAAO;EmBOlC,oBAAY;IACV,KAAK,EAAE,IAAI;EtB3Db,oCAAsC;IsB8DtC,oBAAY;MAER,WAAW,EAAE,MAAM;MACnB,GAAG,EAAE,GAAG;;AAOd,gBAAiB;E3B5CO,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EsBuCf,UAAU,EAAE,MAAM;EAClB,KAAK,EAAE,CAAC;EtBtCR,qBAAK;IACH,aAAa,EAAE,CAAC;EA6FlB,qBAAK;IACH,gBAAgB,EAAE,WAAW;IAC7B,UAAU,EAAE,iBAAqB;IACjC,SAAS,EGpKY,MAAM;IHsK3B,iCAAc;MACZ,UAAU,EAAE,IAAI;EAIpB,kBAAE;IACA,MAAM,EAAE,IAAI;IACZ,KAAK,EG5FoB,OAAO;IH6FhC,OAAO,EAAE,KAAK;IACd,WAAW,EGxKO,iBAAiB;IHyKnC,WAAW,EAAE,GAAG;IAChB,OAAO,EAAE,2BAA2B;IACpC,eAAe,EAAE,IAAI;IAErB,wBAAQ;MACN,gBAAgB,EG7IO,OAAO;MH8I9B,KAAK,EGrMK,OAAO;MHsMjB,eAAe,EAAE,IAAI;IAGvB,wBAAQ;MACN,cAAc,EAAE,CAAC;MACjB,QAAQ,EAAE,QAAQ;MAClB,OAAO,EAAE,CAAC;IAGZ,8BAAc;MAAE,wDAAwD;MACtE,WAAW,EAAE,oBAA2B;MACxC,KAAK,EGjNK,OAAO;MHkNjB,WAAW,EPnLK,GAAG;MOoLnB,YAAY,EAAE,MAAM;EAtKxB,oCAAsC;IsBwExC,gBAAiB;MAMb,OAAO,EAAE,MAAM;EtB9EjB,oCAAsC;IsBiFtC,mBAAG;MAEC,UAAU,EAAE,IAAI;EAIpB,qBAAK;IACH,KAAK,EAAE,IAAI;ItBxFb,oCAAsC;MsBuFtC,qBAAK;QAID,OAAO,EAAE,YAAY;ItB3FzB,oCAAsC;MsB+FpC,yBAAI;Q3BhDJ,OAAO,EAtBF,oBAA4B;Q2ByE7B,KAAK,EnB5FgB,OAAO;QmB6F5B,SAAS,E7B5HK,MAAM;Q6B6HpB,WAAW,E7BlHG,GAAG;Q6BmHjB,WAAW,EAAE,CAAC;ItBrGpB,oCAAsC;MsBwGlC,+BAAQ;QAEJ,gBAAgB,EAAE,WAAW;EtB1GrC,oCAAsC;IsBgHtC,kBAAE;M3BpFoB,WAAO,EA3CzB,OAAa;MAoDO,cAAU,EApD9B,OAAa;E2B2IjB,uBAAO;IpB8BP,gBAAgB,EAAE,WAAW;IAC7B,MAAM,EAAE,CAAC;IACT,aAAa,EAAE,CAAC;IAChB,WAAW,ET5KS,GAAG;IS6KvB,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,IAAI;IAChB,sBAAsB,EAAE,IAAI;IFnH5B,uBAAuB,EAAE,SAAS;IAClC,sBAAsB,EAAE,WAAW;IsBkFjC,WAAW,E7BhJO,GAAG;I6BiJrB,WAAW,EAAE,GAAG;IAChB,OAAO,EAAE,6BAA6B;IpBgCxC,6BAAQ;MACN,gBAAgB,EAAE,WAAW;IFpK/B,oCAAsC;MsB4HtC,uBAAO;Q3B7EL,OAAO,EAtBF,oBAA4B;Q2B8G/B,KAAK,EnBjIkB,OAAO;QmBkI9B,SAAS,E7BjKO,MAAM;Q6BkKtB,WAAW,E7BvJK,GAAG;Q6BwJnB,WAAW,EAAE,CAAC;QACd,KAAK,EAAE,OAAO;IAGhB,6DACS;MACP,UAAU,E7BhDU,kBAA4B;I6BmDlD,6BAAQ;MACN,gBAAgB,EnB1IO,OAAO;MmB2I9B,KAAK,EnBlMK,OAAO;MH6CrB,oCAAsC;QsBmJpC,6BAAQ;UAKJ,gBAAgB,EAAE,WAAW;IAKjC,4CAAuB;MAAE,wDAAwD;MAC/E,gBAAgB,EAAE,0BAAkC;MACpD,gBAAgB,EAAE,0BAAkC;MACpD,iBAAiB,EAAE,SAAS;MAC5B,mBAAmB,EAAE,cAAc;MACnC,eAAe,EAAE,IAAI;MtBlKzB,oCAAsC;QsB6JpC,4CAAuB;UAQnB,gBAAgB,EAAE,kCAA0C;UAC5D,gBAAgB,EAAE,kCAA0C;UAC5D,mBAAmB,EAAE,oBAAwC;MtBvKnE,oCAAsC;QsB0KlC,kDAAQ;UAEJ,gBAAgB,EAAE,0CAAkD;UACpE,gBAAgB,EAAE,0CAAkD;IAK1E,2CAAsB;MAAE,wDAAwD;MAC9E,gBAAgB,EAAE,2BAAmC;MACrD,gBAAgB,EAAE,2BAAmC;MACrD,iBAAiB,EAAE,SAAS;MAC5B,mBAAmB,EAAE,cAAc;MACnC,eAAe,EAAE,IAAI;MtBvLzB,oCAAsC;QsBkLpC,2CAAsB;UAQlB,gBAAgB,EnBrOA,OAAO;UmBsOvB,KAAK,E7BtLgB,OAAO;U6BuL5B,gBAAgB,EAAE,wCAAgD;UAClE,gBAAgB,EAAE,wCAAgD;UAClE,mBAAmB,EAAE,oBAAwC;UAE7D,iDAAQ;YACN,gBAAgB,EnB5OF,OAAO;UmB+OvB,gDAAK;YA/OX,aAAa,EAAE,oBAA2B;YAC1C,cAAc,EAAE,MAAM;YAgPd,KAAK,E7BjMc,OAAO;EOLlC,oCAAsC;IsB6MpC;iCACa;MAEX,WAAW,EAAE,CAAC;MACd,YAAY,EAAE,MAAM;MAGlB;8CAAK;QACH,KAAK,EnBlQC,OAAO;MmBsQjB;wCAAK;QApQT,aAAa,EAAE,oBAA2B;QAC1C,cAAc,EAAE,MAAM;QAqQhB,KAAK,EnBxKgB,OAAO;;AHnDlC,oCAAsC;EsBsOlC,6CAAK;IA5QT,aAAa,EAAE,oBAA2B;IAC1C,cAAc,EAAE,MAAM;AAoRpB,gEAA2B;EAAE,wDAAwD;EtB/OvF,oCAAsC;IsBgPlC,qEAAK;MAtRT,aAAa,EAAE,oBAA2B;MAC1C,cAAc,EAAE,MAAM;AtBqCtB,oCAAsC;EsByPhC,uDAAK;IA/RX,aAAa,EAAE,oBAA2B;IAC1C,cAAc,EAAE,MAAM;;AAwSxB,kBAAmB;EACjB,UAAU,EAAE,MAAM;EtBpQlB,oCAAsC;IsBmQxC,kBAAmB;MAIf,UAAU,EAAE,CAAC;MACb,QAAQ,EAAE,QAAQ;MAClB,KAAK,E7BlLiB,IAAI;M6BmL1B,GAAG,EAAE,OAAO;EAGd,8BAAY;I3BjPU,UAAO,EA3CzB,MAAa;IAuDO,aAAU,EAhDhB,CAAC;IKQnB,oCAAsC;MsB6QtC,8BAAY;Q3BjPU,UAAO,EA3CzB,OAAa;QA0DO,aAAU,EAnDhB,CAAC;QAoDK,WAAQ,EAnDd,CAAC;Q2ByRf,KAAK,EAAE,IAAI;;AAKjB,wBAAyB;EACvB,UAAU,EAAE,MAAM;EtBxRlB,oCAAsC;IsBuRxC,wBAAyB;MAIrB,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,CAAC;EtB5Rf,oCAAsC;IsB+RtC,2BAAG;MAEC,OAAO,EAAE,MAAM;MACf,YAAY,EAAE,MAAM;EtBlSxB,oCAAsC;IsBqSpC,mDAA0B;MAEtB,KAAK,EnB9RgB,OAAO;MmB+R5B,OAAO,EAAE,GAAG;MACZ,YAAY,EAAE,MAAM;EAK1B;oDAC0B;IACxB,KAAK,EnB1SoB,OAAO;ImB2ShC,OAAO,EAAE,YAAY;IACrB,SAAS,E7B3US,MAAM;I6B4UxB,eAAe,EAAE,IAAI;IAErB;4DAAQ;MACN,KAAK,EnBnWK,OAAO;MmBoWjB,eAAe,EAAE,SAAS;EAI9B,kDAA0B;IpBjK1B,gBAAgB,EAAE,WAAW;IAC7B,MAAM,EAAE,CAAC;IACT,aAAa,EAAE,CAAC;IAChB,WAAW,ET5KS,GAAG;IS6KvB,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,IAAI;IAChB,sBAAsB,EAAE,IAAI;IoB4J1B,OAAO,EAAE,IAAI;IpB1Jf,wDAAQ;MACN,gBAAgB,EAAE,WAAW;IFpK/B,oCAAsC;MsB2TtC,kDAA0B;QAKtB,gBAAgB,EAAE,4BAAoC;QACtD,gBAAgB,EAAE,4BAAoC;QACtD,iBAAiB,EAAE,SAAS;QAC5B,mBAAmB,EAAE,WAAW;QAChC,eAAe,EAAE,MAAM;QACvB,OAAO,EAAE,YAAY;QACrB,YAAY,EAAE,MAAM;ItBtUxB,oCAAsC;MsByUpC,4DAAY;QAER,OAAO,EAAE,IAAI;EtB3UnB,oCAAsC;IsBiVpC,sCAAc;MAEZ,WAAW,EAAE,CAAC;MACd,YAAY,EAAE,CAAC;;AAOrB,gBAAiB;E3B/TO,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EA0If,MAAM,EAAE,CAAC;EACT,KAAK,EAAE,IAAI;EAzIX,qBAAK;IACH,aAAa,EAAE,CAAC;EA0IlB,mBAAG;IACD,MAAM,EAAE,IAAI;IACZ,SAAS,EP3MS,MAAM;EO8M1B,kBAAE;IACA,YAAY,EAAE,MAAM;IACpB,WAAW,EP7MO,GAAG;IO+MrB,wDACc;MAAE,wDAAwD;MACtE,MAAM,EAAE,IAAI;MACZ,YAAY,EAAE,MAAM;EAKtB,wCAAE;IACA,YAAY,EAAE,MAAM;IAEpB,8CAAQ;MACN,cAAc,EAAE,CAAC;IAGnB,8CAAQ;MACN,YAAY,EAAE,MAAM;EAzM1B,oCAAsC;IsB2VxC,gBAAiB;M3B/TO,UAAO,EAtCX,CAAC;MA+CK,aAAU,EA/ChB,CAAC;MK4CnB,eAAe,EAAE,IAAI;MACrB,YAAY,EAAE,CAAC;MLPO,WAAO,EA3CzB,OAAa;MAuDO,cAAU,EArD9B,MAAwC;M2B8W1C,gBAAgB,EnB5YI,OAAO;MmB6Y3B,KAAK,EAAE,OAAO;MACd,QAAQ,EAAE,QAAQ;MtB9TpB,qBAAK;QACH,aAAa,EAAE,CAAC;EsBgUlB,kCAAoB;IAClB,OAAO,EAAE,IAAI;EtBvWf,oCAAsC;IsB0WtC,kBAAE;MAEE,KAAK,E7BvWkB,OAAO;M6BwW9B,YAAY,EAAE,MAAM;EtB7WxB,oCAAsC;IsBgXpC,wBAAQ;MAEJ,gBAAgB,EnB7ZA,OAAO;MmB8ZvB,KAAK,E7B9WgB,OAAO;M6B+W5B,YAAY,EAAE,MAAM;MACpB,eAAe,EAAE,SAAS;EAchC,mBAAG;IACD,SAAS,E7B7ZS,MAAM;I6B8ZxB,aAAa,EAAE,CAAC;;AAMpB,cAAe;EpBjPb,gBAAgB,EAAE,WAAW;EAC7B,MAAM,EAAE,CAAC;EACT,aAAa,EAAE,CAAC;EAChB,WAAW,ET5KS,GAAG;ES6KvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAChB,sBAAsB,EAAE,IAAI;EPlH1B,MAAO,EAtBF,2BAA4B;E2BqXnC,KAAK,EAAE,KAAK;EACZ,MAAM,E7BzSG,MAAM;E6B0Sf,UAAU,EAAE,MAAM;EAClB,KAAK,E7B3SI,MAAM;ES6Df,oBAAQ;IACN,gBAAgB,EAAE,WAAW;EFpK/B,oCAAsC;IsB2YxC,cAAe;MASX,OAAO,EAAE,IAAI;EAGf,kBAAI;IACF,KAAK,EAAE,MAAM;EAGf,kBAAI;IACF,KAAK,EAAE,IAAI;;AAIf,sBAAuB;EACrB,QAAQ,EAAE,MAAM;;AtBjahB,oCAAsC;EsBgbxC,aAAc;I3BpZU,WAAO,EA3CzB,OAAa;IAoDO,cAAU,EApD9B,OAAa;I2Bqcf,IAAI,EAAE,KAAK;IACX,KAAK,EAAE,IAAI;AtBvbb,oCAAsC;EsB0btC,qBAAU;IAnBV,gBAAgB,EnBldM,OAAO;ImBmd7B,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,CAAC;IACN,KAAK,EAAE,KAAK;IAgBR,KAAK,EAAE,IAAI;AtB7bf,oCAAsC;EsBictC,oBAAS;IA1BT,gBAAgB,EnBldM,OAAO;ImBmd7B,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,CAAC;IACN,KAAK,EAAE,KAAK;IAuBR,IAAI,EAAE,IAAI;;AtBpcd,oCAAsC;EsB0ctC,mCAAS;IAEL,YAAY,EAAE,CAAC;IACf,WAAW,EAAE,CAAC;IACd,KAAK,EAAE,IAAI;AAIf,yCAAe;EACb,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EtBpdxB,oCAAsC;IsBkdtC,yCAAe;MAKX,OAAO,EAAE,KAAK;MACd,KAAK,EAAE,KAAK;MACZ,UAAU,EAAE,OAAO;AtBzdvB,oCAAsC;EsB8dpC,0DAAe;IAEX,WAAW,EAAE,OAAO;;AtBhe1B,oCAAsC;EsBsexC,iBAAkB;IzBjdd,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,4BAAa;MACX,YAAoB,EAAE,CAAC;IyB+b3B,+BAAgB;MzBrdhB,KAAK,EAAE,IAAsB;MAG3B,OAAO,EAAE,KAAK;MAed,YAAoB,EAAE,aAA+B;MACrD,KAAK,EAAE,cAAuC;MAE9C,0CAAa;QACX,YAAoB,EAAE,CAAC;IyBmc3B,+BAAgB;MACd,YAAY,EAAE,CAAC;AAInB,sBAAK;E3BvdiB,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EAEf,2BAAK;IACH,aAAa,EAAE,CAAC;;AuBzEpB,WAAY;EAEV,SAAS,EAAE,IAAI;EACf,QAAQ,EAAE,QAAQ;E7BKlB,kBAAS;IACP,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;E6BNhB;gCACmB;IAZnB,gBAAgB,EAAE,wBAAgC;IAClD,gBAAgB,EAAE,wBAAgC;IAClD,mBAAmB,EAAE,GAAG;IACxB,iBAAiB,EAAE,SAAS;IAW1B,yBAAyB,EAAE,CAAC;IAC5B,sBAAsB,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,KAAK,EAxBe,MAAM;IvB8C5B,oCAAsC;MuB9BtC;oCACmB;QAUf,gBAAgB,EAAE,IAAI;QACtB,KAAK,EA3Ba,MAAM;EvB6C5B,oCAAsC;IuBTlC;gDACkB;MAChB,SAAS,E9B1BK,MAAM;M8B2BpB,MAAM,EANC,MAAM;MAOb,KAAK,EAAE,oBAAsB;IAG/B;iDACmB;MACjB,SAAS,EpB/BQ,IAAI;MoBgCrB,MAAM,EAbC,MAAM;MAcb,KAAK,EAbC,OAAkB;EvBW9B,oCAAsC;IuBWlC;kDACkB;MAChB,KAAK,EAAE,mBAAsB;IAG/B;mDACmB;MA1DvB,gBAAgB,EAAE,wBAAgC;MAClD,gBAAgB,EAAE,wBAAgC;MAClD,mBAAmB,EAAE,GAAG;MACxB,iBAAiB,EAAE,SAAS;MAyDtB,KAAK,EAVC,MAAoB;EAgB9B,oCAA6C;IAC3C,wCAAc;MACZ,IAAI,EAAE,IAAI;MACV,QAAQ,EAAE,QAAQ;;AAO1B,kBAAmB;EAAE,wDAAwD;EAC3E,UAAU,EAAE,UAAU;EACtB,kBAAkB,EAAE,IAAI;;AAG1B;iBACkB;E5BbM,WAAO,EAtCX,CAAC;EA+CK,cAAU,EA/ChB,CAAC;E4BqDnB,0BAA0B,EAAE,CAAC;EAC7B,YAAY,EAAE,IAAI;EAClB,uBAAuB,EAAE,CAAC;EAC1B,UAAU,EAAE,UAAU;EACtB,KAAK,EAAE,IAAI;EACX,SAAS,E9BhFW,MAAM;E8BiF1B,MAAM,EAAE,MAAM;EACd,MAAM,EAAE,CAAC;EACT,KAAK,EAAE,mBAAoC;EvBnD3C,oCAAsC;IuBwCxC;qBACkB;MAad,KAAK,EAAE,mBAAqC;;AAIhD,uBAAwB;EvBnDtB,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,MAAM;EARZ,oCAAsC;IuB0DxC,uBAAwB;MvBzCtB,QAAQ,EAAE,MAAM;;AwB/DlB,YAAa;E7B0EW,WAAO,EA3CzB,IAAa;EAoDO,cAAU,EApD9B,IAAa;EKejB,oCAAsC;IwB9CxC,YAAa;M7B0EW,WAAO,EA3CzB,IAAa;MAoDO,cAAU,EApD9B,IAAa;;A6BvBnB,kBAAmB;EACjB,gBAAgB,ErB+CW,OAAO;;AqB5CpC,iBAAkB;EAChB,gBAAgB,ErBVM,OAAO;EqBW7B,KAAK,E/BqCsB,OAAO;E+BnClC;;;;;sBAKG;IACD,KAAK,ErB8DoB,OAAO;EqB3DlC,mBAAE;IACA,KAAK,E/ByBoB,OAAO;E+BtBlC,mBAAE;IACA,KAAK,ErByBoB,OAAO;IqBvBhC,yBAAQ;MACN,KAAK,E/BkBkB,OAAO;;AgClDpC,iBAAkB;E9ByEM,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EAEf,sBAAK;IACH,aAAa,EAAE,CAAC;EA6FlB,sBAAK;IACH,gBAAgB,EAAE,WAAW;IAC7B,UAAU,EAAE,iBAAqB;IACjC,SAAS,EGpKY,MAAM;IHsK3B,kCAAc;MACZ,UAAU,EAAE,IAAI;EAIpB,mBAAE;IACA,MAAM,EAAE,IAAI;IACZ,KAAK,EG5FoB,OAAO;IH6FhC,OAAO,EAAE,KAAK;IACd,WAAW,EGxKO,iBAAiB;IHyKnC,WAAW,EAAE,GAAG;IAChB,OAAO,EAAE,2BAA2B;IACpC,eAAe,EAAE,IAAI;IAErB,yBAAQ;MACN,gBAAgB,EG7IO,OAAO;MH8I9B,KAAK,EGrMK,OAAO;MHsMjB,eAAe,EAAE,IAAI;IAGvB,yBAAQ;MACN,cAAc,EAAE,CAAC;MACjB,QAAQ,EAAE,QAAQ;MAClB,OAAO,EAAE,CAAC;IAGZ,+BAAc;MAAE,wDAAwD;MACtE,WAAW,EAAE,oBAA2B;MACxC,KAAK,EGjNK,OAAO;MHkNjB,WAAW,EPnLK,GAAG;MOoLnB,YAAY,EAAE,MAAM;;AyB/M1B,qBAAsB;E9BqEE,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EA0If,MAAM,EAAE,CAAC;EACT,KAAK,EAAE,IAAI;EAzIX,0BAAK;IACH,aAAa,EAAE,CAAC;EA0IlB,wBAAG;IACD,MAAM,EAAE,IAAI;IACZ,SAAS,EP3MS,MAAM;EO8M1B,uBAAE;IACA,YAAY,EAAE,MAAM;IACpB,WAAW,EP7MO,GAAG;IO+MrB,kEACc;MAAE,wDAAwD;MACtE,MAAM,EAAE,IAAI;MACZ,YAAY,EAAE,MAAM;EAKtB,6CAAE;IACA,YAAY,EAAE,MAAM;IAEpB,mDAAQ;MACN,cAAc,EAAE,CAAC;IAGnB,mDAAQ;MACN,YAAY,EAAE,MAAM;;A0BvP5B,YAAa;EACX,UAAU,EAAE,WAAW;EACvB,KAAK,EvB+FsB,OAAO;EuB9FlC,IAAI,EAAE,CAAC;EACP,OAAO,EAAE,WAAW;EACpB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,OAAO;EACZ,UAAU,EAAE,oBAAoB;EAChC,OAAO,EAAE,GAAG;EAEZ,kBAAQ;IACN,UAAU,EjCwCe,OAAO;IiCvChC,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,CAAC;IACN,UAAU,EAAE,oBAAoB;;ACXpC,sBAAuB;EACnB,WAAW,ExBiBO,iBAAiB;EwBhBnC,WAAW,EAAE,IAAI;;AAGrB;sBACuB;EACnB,gBAAgB,ExB2ES,OAAO;;AwBxEpC,sBAAuB;EACnB,KAAK,EAAE,KAAK;EAQZ,OAAO,EAAE,OAAO;EANhB,yBAAG;IACC,cAAc,EAAE,SAAS;IACzB,KAAK,ExBkCgB,OAAO;IwBjC5B,WAAW,EAAE,MAAM;;AAM3B;;;;;;kBAMmB;EACf,KAAK,ExBkBoB,OAAO;;AwBfpC;;;kCAGmC;EAC/B,KAAK,ExByDoB,OAAO;;AwBrDpC,eAAgB;EACZ,OAAO,EAAE,IAAI;;AAIjB,eAAgB;EACZ,SAAS,EAAE,IAAI;;AAGnB,0CAA2C;EACvC,OAAO,EAAE,YAAY;;AAIzB,QAAS;EACL,MAAM,EAAE,IAAI;;AAGhB,KAAM;EACF,UAAU,EAAE,IAAI;;AAGpB,uBAAwB;EACpB,SAAS,EAAE,IAAI;;AAOf,sCAAG;EACC,MAAM,EAAE,MAAM;EACd,UAAU,EAAE,MAAM;AAGtB,sCAAG;EACC,OAAO,EAAE,YAAY;EACrB,cAAc,EAAE,GAAG;;AAI3B,+BAAgC;EAC5B,SAAS,EAAE,IAAI;;AAGnB,2BAA4B;EACxB,GAAG,EAAE,CAAC;EACN,MAAM,EAAE,IAAI;EACZ,+BAAI;IACA,SAAS,EAAE,IAAI",
-"sources": ["../../node_modules/uswds/src/stylesheets/uswds.scss","../../node_modules/uswds/src/stylesheets/lib/grid/_box-sizing.scss","../../node_modules/uswds/src/stylesheets/lib/_normalize.scss","../../node_modules/uswds/src/stylesheets/core/_fonts.scss","../../node_modules/uswds/src/stylesheets/lib/css3/_font-face.scss","../../node_modules/uswds/src/stylesheets/lib/helpers/_font-source-declaration.scss","../../node_modules/uswds/src/stylesheets/core/_grid.scss","../../node_modules/uswds/src/stylesheets/lib/grid/_outer-container.scss","../../node_modules/uswds/src/stylesheets/lib/settings/_grid.scss","../../node_modules/uswds/src/stylesheets/core/_variables.scss","../../node_modules/uswds/src/stylesheets/lib/mixins/_clearfix.scss","../../node_modules/uswds/src/stylesheets/lib/helpers/_directional-values.scss","../../node_modules/uswds/src/stylesheets/lib/grid/_media.scss","../../node_modules/uswds/src/stylesheets/lib/grid/_span-columns.scss","../../node_modules/uswds/src/stylesheets/lib/grid/_omega.scss","../../node_modules/uswds/src/stylesheets/lib/grid/_shift.scss","../../node_modules/uswds/src/stylesheets/core/_utilities.scss","../../node_modules/uswds/src/stylesheets/core/_base.scss","../../node_modules/uswds/src/stylesheets/elements/_buttons.scss","../../sass/_variables.scss","../../node_modules/uswds/src/stylesheets/elements/_embed.scss","../../node_modules/uswds/src/stylesheets/elements/_figure.scss","../../node_modules/uswds/src/stylesheets/elements/_inputs.scss","../../node_modules/uswds/src/stylesheets/elements/_labels.scss","../../node_modules/uswds/src/stylesheets/elements/_list.scss","../../node_modules/uswds/src/stylesheets/elements/_table.scss","../../node_modules/uswds/src/stylesheets/elements/_typography.scss","../../node_modules/uswds/src/stylesheets/components/_accordions.scss","../../node_modules/uswds/src/stylesheets/components/_alerts.scss","../../node_modules/uswds/src/stylesheets/components/_banner.scss","../../node_modules/uswds/src/stylesheets/components/_footer.scss","../../node_modules/uswds/src/stylesheets/components/_forms.scss","../../node_modules/uswds/src/stylesheets/components/_graphic-list.scss","../../node_modules/uswds/src/stylesheets/components/_header.scss","../../node_modules/uswds/src/stylesheets/lib/addons/_position.scss","../../node_modules/uswds/src/stylesheets/components/_hero.scss","../../node_modules/uswds/src/stylesheets/components/_layout.scss","../../node_modules/uswds/src/stylesheets/components/_media-block.scss","../../node_modules/uswds/src/stylesheets/components/_navigation.scss","../../node_modules/uswds/src/stylesheets/components/_search.scss","../../node_modules/uswds/src/stylesheets/components/_section.scss","../../node_modules/uswds/src/stylesheets/components/_sidenav.scss","../../node_modules/uswds/src/stylesheets/components/_skipnav.scss","../../sass/uswds.scss"],
+"mappings": "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",
+"sources": ["../scss/uswds.scss","../scss/lib/grid/_box-sizing.scss","../scss/lib/_normalize.scss","../scss/core/_fonts.scss","../scss/lib/css3/_font-face.scss","../scss/lib/helpers/_font-source-declaration.scss","../scss/core/_grid.scss","../scss/lib/grid/_outer-container.scss","../scss/lib/settings/_grid.scss","../scss/core/_variables.scss","../scss/lib/mixins/_clearfix.scss","../scss/lib/helpers/_directional-values.scss","../scss/lib/grid/_media.scss","../scss/lib/grid/_span-columns.scss","../scss/lib/grid/_omega.scss","../scss/lib/grid/_shift.scss","../scss/core/_utilities.scss","../scss/core/_base.scss","../scss/elements/_buttons.scss","../../sass/_variables.scss","../scss/elements/_embed.scss","../scss/elements/_figure.scss","../scss/elements/_inputs.scss","../scss/elements/_labels.scss","../scss/elements/_list.scss","../scss/elements/_table.scss","../scss/elements/_typography.scss","../scss/components/_accordions.scss","../scss/components/_alerts.scss","../scss/components/_banner.scss","../scss/components/_footer.scss","../scss/components/_forms.scss","../scss/components/_graphic-list.scss","../scss/components/_header.scss","../scss/lib/addons/_position.scss","../scss/components/_hero.scss","../scss/components/_layout.scss","../scss/components/_media-block.scss","../scss/components/_navigation.scss","../scss/components/_search.scss","../scss/components/_section.scss","../scss/components/_sidenav.scss","../scss/components/_skipnav.scss","../../sass/uswds.scss"],
 "names": [],
 "file": "uswds.css"
 }
\ No newline at end of file
diff --git a/web/themes/nsf/sass/uswds.scss b/web/themes/nsf/sass/uswds.scss
index 7b21471..7bf6b9e 100644
--- a/web/themes/nsf/sass/uswds.scss
+++ b/web/themes/nsf/sass/uswds.scss
@@ -1,7 +1,7 @@
 // Import overrides of USWDS variables.
 @import "_variables.scss";
 // Import the USWDS source.
-@import "../node_modules/uswds/src/stylesheets/uswds.scss";
+@import "../assets/scss/uswds.scss";
 
 h1, h2, h3, h4, h5, h6 {
     font-family: $font-sans;

From aecefa428f1081499f060a7a05a862da26b77938 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 21 Mar 2018 21:41:30 -0700
Subject: [PATCH 052/143] Hide site name from view but not from screen readers

https://github.com/18F/nsf/issues/157
---
 web/themes/nsf/assets/css/uswds.css | 3 +++
 web/themes/nsf/sass/uswds.scss      | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/web/themes/nsf/assets/css/uswds.css b/web/themes/nsf/assets/css/uswds.css
index 4bd920b..dcaf81f 100644
--- a/web/themes/nsf/assets/css/uswds.css
+++ b/web/themes/nsf/assets/css/uswds.css
@@ -3696,4 +3696,7 @@ img.image-style-news-main-story {
   .usa-header-basic .usa-logo img {
     max-width: none; }
 
+.usa-navbar em.usa-logo-text {
+  margin-left: -5000em; }
+
 /*# sourceMappingURL=uswds.css.map */
diff --git a/web/themes/nsf/sass/uswds.scss b/web/themes/nsf/sass/uswds.scss
index 7bf6b9e..197ba73 100644
--- a/web/themes/nsf/sass/uswds.scss
+++ b/web/themes/nsf/sass/uswds.scss
@@ -94,4 +94,8 @@ img.image-style-news-main-story {
     img {
         max-width: none;
     }
-}
\ No newline at end of file
+}
+
+.usa-navbar em.usa-logo-text {
+    margin-left: -5000em;
+}

From 1e9684be939883dc9890d1fa5574b71f4de9f8ca Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 21 Mar 2018 23:35:26 -0700
Subject: [PATCH 053/143] Reduce feed item length limit to 400 characters

https://github.com/18F/nsf/issues/160
---
 web/sites/default/config/aggregator.settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/sites/default/config/aggregator.settings.yml b/web/sites/default/config/aggregator.settings.yml
index 81d7156..ced8fcd 100644
--- a/web/sites/default/config/aggregator.settings.yml
+++ b/web/sites/default/config/aggregator.settings.yml
@@ -4,7 +4,7 @@ processors:
   - aggregator
 items:
   allowed_html: '<a> <b> <br> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul> <img> <video> <figure>'
-  teaser_length: 800
+  teaser_length: 400
   expire: 0
 source:
   list_max: 3

From 42f35e7fe18e0d1bb258902e42bc214e9256b28d Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 21 Mar 2018 23:36:46 -0700
Subject: [PATCH 054/143] Remove tag-based caching of Tumblr posts

The tag-based caching wouldn't actually take effect in this case.
Leaving caching off for the moment for the sake of active
development, but recommend implementing time-based caching in the
future.

https://github.com/18F/nsf/issues/160
---
 web/sites/default/config/views.view.nsf_blog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/sites/default/config/views.view.nsf_blog.yml b/web/sites/default/config/views.view.nsf_blog.yml
index e8f5b84..d2a40c1 100644
--- a/web/sites/default/config/views.view.nsf_blog.yml
+++ b/web/sites/default/config/views.view.nsf_blog.yml
@@ -23,7 +23,7 @@ display:
         type: none
         options: {  }
       cache:
-        type: tag
+        type: none
         options: {  }
       query:
         type: views_query

From 7ca815a4336e8e8d176c0cad6bcf24a9954b6781 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 21 Mar 2018 23:45:41 -0700
Subject: [PATCH 055/143] Change layout to two columns, update title to be
 Tumblr-specific

https://github.com/18F/nsf/issues/160
---
 web/sites/default/config/views.view.nsf_blog.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/web/sites/default/config/views.view.nsf_blog.yml b/web/sites/default/config/views.view.nsf_blog.yml
index d2a40c1..2cddb70 100644
--- a/web/sites/default/config/views.view.nsf_blog.yml
+++ b/web/sites/default/config/views.view.nsf_blog.yml
@@ -62,9 +62,21 @@ display:
             previous: ‹‹
             next: ››
       style:
-        type: default
+        type: grid
+        options:
+          uses_fields: false
+          columns: 2
+          automatic_width: true
+          alignment: vertical
+          col_class_default: true
+          col_class_custom: ''
+          row_class_default: true
+          row_class_custom: ''
       row:
         type: 'entity:aggregator_item'
+        options:
+          relationship: none
+          view_mode: default
       fields:
         title:
           table: aggregator_item
@@ -147,7 +159,7 @@ display:
           entity_type: aggregator_item
           entity_field: timestamp
           plugin_id: date
-      title: 'Blog entries'
+      title: 'NSF on Tumblr'
       header: {  }
       footer: {  }
       empty: {  }

From 1604d047b382f9fc52916b486e0295f92a125b2d Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 21 Mar 2018 23:48:09 -0700
Subject: [PATCH 056/143] Apply USWDS to column widths, remove default markup

https://github.com/18F/nsf/issues/160
---
 web/sites/default/config/views.view.nsf_blog.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/sites/default/config/views.view.nsf_blog.yml b/web/sites/default/config/views.view.nsf_blog.yml
index 2cddb70..9a6754c 100644
--- a/web/sites/default/config/views.view.nsf_blog.yml
+++ b/web/sites/default/config/views.view.nsf_blog.yml
@@ -66,11 +66,11 @@ display:
         options:
           uses_fields: false
           columns: 2
-          automatic_width: true
+          automatic_width: false
           alignment: vertical
-          col_class_default: true
-          col_class_custom: ''
-          row_class_default: true
+          col_class_default: false
+          col_class_custom: usa-width-one-half
+          row_class_default: false
           row_class_custom: ''
       row:
         type: 'entity:aggregator_item'

From 2667e315a528552de1eaf431ddc34e22f96d906b Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 22 Mar 2018 00:09:56 -0700
Subject: [PATCH 057/143] Update several color values to match the SBIR style
 guide

https://seedfund.nsf.gov/styleguide/colors/

https://github.com/18F/nsf/issues/160
---
 web/themes/nsf/assets/css/uswds.css     | 130 ++++++++++++------------
 web/themes/nsf/assets/css/uswds.css.map |   2 +-
 web/themes/nsf/sass/_variables.scss     |   8 +-
 3 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/web/themes/nsf/assets/css/uswds.css b/web/themes/nsf/assets/css/uswds.css
index dcaf81f..e97ea9a 100644
--- a/web/themes/nsf/assets/css/uswds.css
+++ b/web/themes/nsf/assets/css/uswds.css
@@ -715,7 +715,7 @@ button,
   margin-right: 0.5em;
   margin-bottom: 0.5em;
   appearance: none;
-  background-color: #313b52;
+  background-color: #0071BC;
   border: 0;
   border-radius: 5px;
   color: #ffffff;
@@ -757,7 +757,7 @@ button,
   [type=reset].usa-button-hover,
   [type=image]:hover,
   [type=image].usa-button-hover {
-    background-color: #1b2847;
+    background-color: #205493;
     border-bottom: 0;
     color: #ffffff;
     text-decoration: none; }
@@ -778,7 +778,7 @@ button,
   [type=reset].usa-button-active,
   [type=image]:active,
   [type=image].usa-button-active {
-    background-color: #03143d; }
+    background-color: #112E51; }
   .usa-button.usa-button-primary-alt,
   .usa-button-primary.usa-button-primary-alt,
   .usa-button:visited.usa-button-primary-alt,
@@ -789,7 +789,7 @@ button,
   [type=reset].usa-button-primary-alt,
   [type=image].usa-button-primary-alt {
     background-color: #c64b00;
-    color: #ffffff; }
+    color: #212121; }
     .usa-button.usa-button-primary-alt:hover, .usa-button.usa-button-primary-alt.usa-button-hover,
     .usa-button-primary.usa-button-primary-alt:hover,
     .usa-button-primary.usa-button-primary-alt.usa-button-hover,
@@ -837,8 +837,8 @@ button,
   [type=reset].usa-button-secondary,
   [type=image].usa-button-secondary {
     background-color: #ffffff;
-    box-shadow: inset 0 0 0 2px #313b52;
-    color: #313b52; }
+    box-shadow: inset 0 0 0 2px #0071BC;
+    color: #0071BC; }
     .usa-button.usa-button-secondary:hover, .usa-button.usa-button-secondary.usa-button-hover,
     .usa-button-primary.usa-button-secondary:hover,
     .usa-button-primary.usa-button-secondary.usa-button-hover,
@@ -856,8 +856,8 @@ button,
     [type=reset].usa-button-secondary.usa-button-hover,
     [type=image].usa-button-secondary:hover,
     [type=image].usa-button-secondary.usa-button-hover {
-      box-shadow: inset 0 0 0 2px #1b2847;
-      color: #1b2847; }
+      box-shadow: inset 0 0 0 2px #205493;
+      color: #205493; }
     .usa-button.usa-button-secondary:active, .usa-button.usa-button-secondary.usa-button-active,
     .usa-button-primary.usa-button-secondary:active,
     .usa-button-primary.usa-button-secondary.usa-button-active,
@@ -875,8 +875,8 @@ button,
     [type=reset].usa-button-secondary.usa-button-active,
     [type=image].usa-button-secondary:active,
     [type=image].usa-button-secondary.usa-button-active {
-      box-shadow: inset 0 0 0 2px #03143d;
-      color: #03143d; }
+      box-shadow: inset 0 0 0 2px #112E51;
+      color: #112E51; }
   .usa-button.usa-button-secondary-inverse, .usa-button.usa-button-outline-inverse,
   .usa-button-primary.usa-button-secondary-inverse,
   .usa-button-primary.usa-button-outline-inverse,
@@ -1012,7 +1012,7 @@ button,
     [type=reset].usa-button-gray.usa-button-active,
     [type=image].usa-button-gray:active,
     [type=image].usa-button-gray.usa-button-active {
-      background-color: #ffffff; }
+      background-color: #212121; }
   .usa-button.usa-button-red,
   .usa-button-primary.usa-button-red,
   .usa-button:visited.usa-button-red,
@@ -1233,7 +1233,7 @@ select {
   border: 0.1rem solid #666666;
   border-radius: 0;
   box-sizing: border-box;
-  color: #ffffff;
+  color: #212121;
   display: block;
   font-size: 1.7rem;
   height: 4.4rem;
@@ -1373,11 +1373,11 @@ legend {
 
 [type=checkbox]:checked + label::before,
 [type=radio]:checked + label::before {
-  background-color: #313b52;
-  box-shadow: 0 0 0 1px #313b52; }
+  background-color: #0071BC;
+  box-shadow: 0 0 0 1px #0071BC; }
 
 [type=radio]:checked + label::before {
-  box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #313b52; }
+  box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #0071BC; }
 
 [type=checkbox]:checked + label::before,
 [type=checkbox]:checked:disabled + label::before {
@@ -1417,7 +1417,7 @@ legend {
   width: 100%; }
 
 [type=range]::-moz-range-track {
-  background: #313b52;
+  background: #0071BC;
   border: 1px solid #757575;
   cursor: pointer;
   height: 1.2rem;
@@ -1589,10 +1589,10 @@ p {
   margin-top: 1em; }
 
 a {
-  color: #313b52;
+  color: #0071BC;
   text-decoration: underline; }
   a:hover, a:active {
-    color: #1b2847; }
+    color: #205493; }
   a:focus {
     outline: 2px dotted #999999;
     outline-offset: 3px; }
@@ -1804,7 +1804,7 @@ dfn {
   margin-bottom: 0;
   list-style-type: none;
   padding-left: 0;
-  color: #ffffff;
+  color: #212121;
   margin: 0;
   padding: 0;
   width: 100%; }
@@ -1831,7 +1831,7 @@ dfn {
     margin-bottom: 0;
     list-style-type: none;
     padding-left: 0;
-    color: #ffffff;
+    color: #212121;
     margin: 0;
     padding: 0;
     width: 100%; }
@@ -1861,7 +1861,7 @@ dfn {
       background-position: right 2rem center;
       background-repeat: no-repeat;
       background-size: 1.5rem;
-      color: #ffffff;
+      color: #212121;
       cursor: pointer;
       display: inline-block;
       font-family: "Source Sans Pro";
@@ -1875,7 +1875,7 @@ dfn {
       .usa-accordion > ul button:hover,
       .usa-accordion-bordered > ul button:hover {
         background-color: #c9c9c9;
-        color: #ffffff; }
+        color: #212121; }
       .usa-accordion > ul button h1,
       .usa-accordion > ul button h2,
       .usa-accordion > ul button h3,
@@ -1937,7 +1937,7 @@ dfn {
   background-position: right 2rem center;
   background-repeat: no-repeat;
   background-size: 1.5rem;
-  color: #ffffff;
+  color: #212121;
   cursor: pointer;
   display: inline-block;
   font-family: "Source Sans Pro";
@@ -1949,7 +1949,7 @@ dfn {
     background-color: transparent; }
   .usa-accordion-button:hover {
     background-color: #c9c9c9;
-    color: #ffffff; }
+    color: #212121; }
   .usa-accordion-button h1,
   .usa-accordion-button h2,
   .usa-accordion-button h3,
@@ -1983,9 +1983,9 @@ dfn {
     top: 0;
     width: 1rem; }
   .usa-alert a {
-    color: #1b2847; }
+    color: #205493; }
     .usa-alert a:focus, .usa-alert a:hover {
-      color: #03143d; }
+      color: #112E51; }
   .usa-alert ul {
     margin-bottom: 0;
     margin-top: 1rem;
@@ -2179,7 +2179,7 @@ dfn {
   padding-top: 1.3rem;
   padding-left: 4.8rem;
   background-position-x: right;
-  color: #313b52;
+  color: #0071BC;
   display: block;
   font-size: 1.2rem;
   height: 4.3rem;
@@ -2203,7 +2203,7 @@ dfn {
       width: initial;
       /* stylelint-enable */ } }
   .usa-banner-button:hover {
-    color: #1b2847;
+    color: #205493;
     text-decoration: underline; }
   .usa-banner-button[aria-expanded=false] {
     background-image: none; }
@@ -2277,7 +2277,7 @@ dfn {
 .usa-footer .usa-unstyled-list {
   display: block; }
 .usa-footer .usa-footer-primary-link {
-  color: #ffffff;
+  color: #212121;
   display: block;
   font-weight: 700;
   margin-top: 0;
@@ -2296,13 +2296,13 @@ dfn {
 .usa-footer-contact_info {
   display: inline-block; }
   .usa-footer-contact_info a {
-    color: #ffffff;
+    color: #212121;
     text-decoration: none; }
   .usa-footer-contact_info:hover {
     text-decoration: underline; }
 
 .usa-footer-return-to-top {
-  color: #313b52;
+  color: #0071BC;
   padding-bottom: 2rem;
   padding-top: 2rem;
   text-decoration: underline; }
@@ -2448,7 +2448,7 @@ li.usa-footer-primary-content {
   padding-bottom: 2rem;
   padding-top: 2rem; }
   .usa-footer-secondary_section a {
-    color: #ffffff; }
+    color: #212121; }
 
 @media screen and (min-width: 600px) {
   .usa-footer-big-secondary-section {
@@ -2776,7 +2776,7 @@ input.usa-input-medium {
       line-height: 7.5rem;
       margin-left: 0; } }
   .usa-logo a {
-    color: #ffffff;
+    color: #212121;
     text-decoration: none; }
   .usa-logo br {
     display: none; }
@@ -2806,7 +2806,7 @@ input.usa-input-medium {
   padding: 0;
   text-align: left;
   -webkit-font-smoothing: auto;
-  background-color: #313b52;
+  background-color: #0071BC;
   color: #ffffff;
   display: inline;
   float: right;
@@ -2825,7 +2825,7 @@ input.usa-input-medium {
       display: none; } }
   .usa-menu-btn:hover {
     color: #ffffff;
-    background-color: #1b2847; }
+    background-color: #205493; }
   .usa-menu-btn:visited {
     color: #ffffff; }
 
@@ -2933,7 +2933,7 @@ input.usa-input-medium {
   color: #c64b00; }
 
 .usa-hero-callout {
-  background-color: #03143d;
+  background-color: #112E51;
   padding: 3rem; }
   @media screen and (min-width: 481px) {
     .usa-hero-callout {
@@ -2990,7 +2990,7 @@ input.usa-input-medium {
   -webkit-font-smoothing: antialiased; }
   @media screen and (min-width: 951px) {
     .usa-nav-link:hover span {
-      border-bottom: 0.4rem solid #313b52;
+      border-bottom: 0.4rem solid #0071BC;
       padding-bottom: 0.6rem; } }
   @media screen and (min-width: 951px) {
     .usa-nav-link.usa-accordion-button span {
@@ -3048,13 +3048,13 @@ input.usa-input-medium {
       .usa-nav nav {
         margin-top: 0; } }
   .usa-nav .usa-current {
-    border-left: 4px solid #313b52;
-    color: #313b52;
+    border-left: 4px solid #0071BC;
+    color: #0071BC;
     font-weight: 700;
     padding-left: 1.4rem; }
     @media screen and (min-width: 951px) {
       .usa-nav .usa-current {
-        color: #ffffff; } }
+        color: #212121; } }
   .usa-nav .usa-button {
     width: 100%; }
   @media screen and (min-width: 951px) {
@@ -3079,7 +3079,7 @@ input.usa-input-medium {
       border-top: none; }
   .usa-nav-primary a {
     border: none;
-    color: #ffffff;
+    color: #212121;
     display: block;
     font-family: "Source Sans Pro";
     line-height: 1.3;
@@ -3087,7 +3087,7 @@ input.usa-input-medium {
     text-decoration: none; }
     .usa-nav-primary a:hover {
       background-color: #e4e4e4;
-      color: #313b52;
+      color: #0071BC;
       text-decoration: none; }
     .usa-nav-primary a:focus {
       outline-offset: 0;
@@ -3095,8 +3095,8 @@ input.usa-input-medium {
       z-index: 1; }
     .usa-nav-primary a.usa-current {
       /* stylelint-disable-line selector-no-qualifying-type */
-      border-left: 0.4rem solid #313b52;
-      color: #313b52;
+      border-left: 0.4rem solid #0071BC;
+      color: #0071BC;
       font-weight: 700;
       padding-left: 1.4rem; }
   @media screen and (min-width: 951px) {
@@ -3152,7 +3152,7 @@ input.usa-input-medium {
       box-shadow: 2px dotted #999999; }
     .usa-nav-primary button:hover {
       background-color: #e4e4e4;
-      color: #313b52; }
+      color: #0071BC; }
       @media screen and (min-width: 951px) {
         .usa-nav-primary button:hover {
           background-color: transparent; } }
@@ -3181,15 +3181,15 @@ input.usa-input-medium {
       background-size: 1rem; }
       @media screen and (min-width: 951px) {
         .usa-nav-primary button[aria-expanded=true] {
-          background-color: #03143d;
+          background-color: #112E51;
           color: #ffffff;
           background-image: url("../img/angle-arrow-down-hover.png");
           background-image: url("../img/angle-arrow-down-hover.svg");
           background-position: right 1.5rem top 40%; }
           .usa-nav-primary button[aria-expanded=true]:hover {
-            background-color: #03143d; }
+            background-color: #112E51; }
           .usa-nav-primary button[aria-expanded=true] span {
-            border-bottom: 0.4rem solid #313b52;
+            border-bottom: 0.4rem solid #0071BC;
             padding-bottom: 0.6rem;
             color: #ffffff; } }
   @media screen and (min-width: 951px) {
@@ -3199,26 +3199,26 @@ input.usa-input-medium {
       padding-left: 1.5rem; }
       .usa-nav-primary a.usa-current:hover span,
       .usa-nav-primary .usa-current:hover span {
-        color: #313b52; }
+        color: #0071BC; }
       .usa-nav-primary a.usa-current span,
       .usa-nav-primary .usa-current span {
-        border-bottom: 0.4rem solid #313b52;
+        border-bottom: 0.4rem solid #0071BC;
         padding-bottom: 0.6rem;
-        color: #ffffff; } }
+        color: #212121; } }
 
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-nav-link:hover span {
-    border-bottom: 0.7rem solid #313b52;
+    border-bottom: 0.7rem solid #0071BC;
     padding-bottom: 0.9rem; } }
 .usa-header-extended .usa-nav-primary button[aria-expanded=true] {
   /* stylelint-disable-line selector-no-qualifying-type */ }
   @media screen and (min-width: 951px) {
     .usa-header-extended .usa-nav-primary button[aria-expanded=true] span {
-      border-bottom: 0.7rem solid #313b52;
+      border-bottom: 0.7rem solid #0071BC;
       padding-bottom: 0.9rem; } }
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-nav-primary .usa-current span {
-    border-bottom: 0.7rem solid #313b52;
+    border-bottom: 0.7rem solid #0071BC;
     padding-bottom: 0.9rem; } }
 
 .usa-nav-secondary {
@@ -3262,7 +3262,7 @@ input.usa-input-medium {
     text-decoration: none; }
     .usa-nav-secondary-links a:hover,
     .usa-nav-secondary-links .usa-header-search-button:hover {
-      color: #313b52;
+      color: #0071BC;
       text-decoration: underline; }
   .usa-nav-secondary-links .usa-header-search-button {
     background-color: transparent;
@@ -3326,7 +3326,7 @@ input.usa-input-medium {
       padding-left: 0;
       padding-top: 0.75rem;
       padding-bottom: 0.9rem;
-      background-color: #03143d;
+      background-color: #112E51;
       width: 21.5rem;
       position: absolute; }
       .usa-nav-submenu > li {
@@ -3339,7 +3339,7 @@ input.usa-input-medium {
       padding-left: 1.5rem; } }
   @media screen and (min-width: 951px) {
     .usa-nav-submenu a:hover {
-      background-color: #03143d;
+      background-color: #112E51;
       color: #ffffff;
       padding-left: 1.5rem;
       text-decoration: underline; } }
@@ -3382,7 +3382,7 @@ input.usa-input-medium {
     width: 100%; } }
 @media screen and (min-width: 951px) {
   .usa-megamenu::before {
-    background-color: #03143d;
+    background-color: #112E51;
     content: '';
     display: block;
     height: 100%;
@@ -3392,7 +3392,7 @@ input.usa-input-medium {
     right: 100%; } }
 @media screen and (min-width: 951px) {
   .usa-megamenu::after {
-    background-color: #03143d;
+    background-color: #112E51;
     content: '';
     display: block;
     height: 100%;
@@ -3536,7 +3536,7 @@ input[type=search] {
   background-color: #e4e4e4; }
 
 .usa-section-dark {
-  background-color: #03143d;
+  background-color: #112E51;
   color: #ffffff; }
   .usa-section-dark h1,
   .usa-section-dark h2,
@@ -3567,7 +3567,7 @@ input[type=search] {
       border-top: none; }
   .usa-sidenav-list a {
     border: none;
-    color: #ffffff;
+    color: #212121;
     display: block;
     font-family: "Source Sans Pro";
     line-height: 1.3;
@@ -3575,7 +3575,7 @@ input[type=search] {
     text-decoration: none; }
     .usa-sidenav-list a:hover {
       background-color: #e4e4e4;
-      color: #313b52;
+      color: #0071BC;
       text-decoration: none; }
     .usa-sidenav-list a:focus {
       outline-offset: 0;
@@ -3583,8 +3583,8 @@ input[type=search] {
       z-index: 1; }
     .usa-sidenav-list a.usa-current {
       /* stylelint-disable-line selector-no-qualifying-type */
-      border-left: 0.4rem solid #313b52;
-      color: #313b52;
+      border-left: 0.4rem solid #0071BC;
+      color: #0071BC;
       font-weight: 700;
       padding-left: 1.4rem; }
 
@@ -3616,7 +3616,7 @@ input[type=search] {
 
 .usa-skipnav {
   background: transparent;
-  color: #ffffff;
+  color: #212121;
   left: 0;
   padding: 1rem 1.5rem;
   position: absolute;
diff --git a/web/themes/nsf/assets/css/uswds.css.map b/web/themes/nsf/assets/css/uswds.css.map
index e717e74..cae8a62 100644
--- a/web/themes/nsf/assets/css/uswds.css.map
+++ b/web/themes/nsf/assets/css/uswds.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../scss/uswds.scss","../scss/lib/grid/_box-sizing.scss","../scss/lib/_normalize.scss","../scss/core/_fonts.scss","../scss/lib/css3/_font-face.scss","../scss/lib/helpers/_font-source-declaration.scss","../scss/core/_grid.scss","../scss/lib/grid/_outer-container.scss","../scss/lib/settings/_grid.scss","../scss/core/_variables.scss","../scss/lib/mixins/_clearfix.scss","../scss/lib/helpers/_directional-values.scss","../scss/lib/grid/_media.scss","../scss/lib/grid/_span-columns.scss","../scss/lib/grid/_omega.scss","../scss/lib/grid/_shift.scss","../scss/core/_utilities.scss","../scss/core/_base.scss","../scss/elements/_buttons.scss","../../sass/_variables.scss","../scss/elements/_embed.scss","../scss/elements/_figure.scss","../scss/elements/_inputs.scss","../scss/elements/_labels.scss","../scss/elements/_list.scss","../scss/elements/_table.scss","../scss/elements/_typography.scss","../scss/components/_accordions.scss","../scss/components/_alerts.scss","../scss/components/_banner.scss","../scss/components/_footer.scss","../scss/components/_forms.scss","../scss/components/_graphic-list.scss","../scss/components/_header.scss","../scss/lib/addons/_position.scss","../scss/components/_hero.scss","../scss/components/_layout.scss","../scss/components/_media-block.scss","../scss/components/_navigation.scss","../scss/components/_search.scss","../scss/components/_section.scss","../scss/components/_sidenav.scss","../scss/components/_skipnav.scss","../../sass/uswds.scss"],
 "names": [],
 "file": "uswds.css"
diff --git a/web/themes/nsf/sass/_variables.scss b/web/themes/nsf/sass/_variables.scss
index cdd123e..fd2860d 100644
--- a/web/themes/nsf/sass/_variables.scss
+++ b/web/themes/nsf/sass/_variables.scss
@@ -1,7 +1,7 @@
 // Put any variable overrides here.
-$color-primary: #313b52;
-$color-primary-darker: #1b2847;
-$color-primary-darkest: #03143d;
+$color-primary: #0071BC;
+$color-primary-darker: #205493;
+$color-primary-darkest: #112E51;
 
 // Typography
 // Removing the !default from $em-base so we are not inheriting that
@@ -95,7 +95,7 @@ $color-secondary-darkest:    #cd2026;
 $color-secondary-light:      #e59393;
 $color-secondary-lightest:   #f9dede;
 
-$color-base:                 #ffffff;
+$color-base:                 #212121;
 $color-focus:                #3e94cf;
 $color-visited:              #4c2c92;
 

From 8e0aa9aa1f78ea2dee922bb082d96bfa9abad9f1 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 22 Mar 2018 00:13:04 -0700
Subject: [PATCH 058/143] Implement basic background colors etc.

https://github.com/18F/nsf/issues/160
---
 web/themes/nsf/assets/css/uswds.css | 11 ++++++++++-
 web/themes/nsf/sass/uswds.scss      | 13 ++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/web/themes/nsf/assets/css/uswds.css b/web/themes/nsf/assets/css/uswds.css
index e97ea9a..62d44b9 100644
--- a/web/themes/nsf/assets/css/uswds.css
+++ b/web/themes/nsf/assets/css/uswds.css
@@ -3635,10 +3635,19 @@ h1, h2, h3, h4, h5, h6 {
   font-family: "Source Sans Pro";
   font-weight: bold; }
 
+h3.feed-item-title a,
+article.aggregator-item .field--name-fid a {
+  text-decoration: none;
+  color: #112E51; }
+
 .region-sidebar-first,
-.region-sidebar-second {
+.region-sidebar-second,
+.uswds-middle-section {
   background-color: #E7F5FF; }
 
+.view-nsf-blog article.aggregator-item {
+  background-color: #ffffff; }
+
 .region-sidebar-second {
   float: right;
   padding: 1.25rem; }
diff --git a/web/themes/nsf/sass/uswds.scss b/web/themes/nsf/sass/uswds.scss
index 197ba73..0166ca5 100644
--- a/web/themes/nsf/sass/uswds.scss
+++ b/web/themes/nsf/sass/uswds.scss
@@ -8,11 +8,22 @@ h1, h2, h3, h4, h5, h6 {
     font-weight: bold;
 }
 
+h3.feed-item-title a,
+article.aggregator-item .field--name-fid a {
+    text-decoration: none;
+    color: $color-primary-darkest;
+}
+
 .region-sidebar-first,
-.region-sidebar-second {
+.region-sidebar-second,
+.uswds-middle-section {
     background-color: $color-primary-alt-light;
 }
 
+.view-nsf-blog article.aggregator-item {
+    background-color: $color-white;
+}
+
 .region-sidebar-second {
     float: right;
 

From 670e224ebd9df6809e6c3eb18642d7c1f59788bc Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 22 Mar 2018 00:19:01 -0700
Subject: [PATCH 059/143] Update font specifications to match the SBIR style
 guide

https://seedfund.nsf.gov/styleguide/typography/#font-family

https://github.com/18F/nsf/issues/160
---
 web/themes/nsf/assets/css/uswds.css     | 36 ++++++++++++-------------
 web/themes/nsf/assets/css/uswds.css.map |  2 +-
 web/themes/nsf/sass/_variables.scss     |  5 ++--
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/web/themes/nsf/assets/css/uswds.css b/web/themes/nsf/assets/css/uswds.css
index 62d44b9..8b1b691 100644
--- a/web/themes/nsf/assets/css/uswds.css
+++ b/web/themes/nsf/assets/css/uswds.css
@@ -721,7 +721,7 @@ button,
   color: #ffffff;
   cursor: pointer;
   display: inline-block;
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   font-size: 1.7rem;
   font-weight: 700;
   line-height: 1;
@@ -1329,7 +1329,7 @@ legend {
 
 .usa-form-hint {
   color: #757575;
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   margin-bottom: 0; }
 
 [type=checkbox], [type=radio] {
@@ -1572,12 +1572,12 @@ td {
 caption {
   font-size: 1.5rem;
   font-weight: 700;
-  font-family: "Merriweather";
+  font-family: "Work Sans", sans-serif;
   margin-bottom: 1.2rem;
   text-align: left; }
 
 html {
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   font-size: 10px; }
 
 body {
@@ -1633,13 +1633,13 @@ h3,
 h4,
 h5 {
   clear: both;
-  font-family: "Merriweather";
+  font-family: "Work Sans", sans-serif;
   line-height: 1.3;
   margin-bottom: .5em;
   margin-top: 1.5em; }
 
 h6 {
-  font-family: "Source Sans Pro"; }
+  font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif; }
 
 h1 {
   font-size: 4rem;
@@ -1685,7 +1685,7 @@ dfn {
 .usa-sans a,
 .usa-sans li,
 .usa-sans span {
-  font-family: "Source Sans Pro"; }
+  font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif; }
 .usa-sans a {
   border-bottom: none;
   font-weight: 700; }
@@ -1694,7 +1694,7 @@ dfn {
 .usa-serif a,
 .usa-serif li,
 .usa-serif span {
-  font-family: "Merriweather"; }
+  font-family: "Work Sans", sans-serif; }
 
 .usa-display {
   font-size: 2rem;
@@ -1710,7 +1710,7 @@ dfn {
       font-weight: 700; } }
 
 .usa-font-lead {
-  font-family: "Merriweather";
+  font-family: "Work Sans", sans-serif;
   font-size: 2rem;
   font-weight: 400;
   line-height: 1.7;
@@ -1841,7 +1841,7 @@ dfn {
     .usa-accordion > ul > li,
     .usa-accordion-bordered > ul > li {
       background-color: #e4e4e4;
-      font-family: "Source Sans Pro";
+      font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
       list-style: none;
       margin-bottom: 0.5rem;
       width: 100%; }
@@ -1864,7 +1864,7 @@ dfn {
       color: #212121;
       cursor: pointer;
       display: inline-block;
-      font-family: "Source Sans Pro";
+      font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
       font-weight: 700;
       margin: 0;
       padding: 1.5rem 5.5rem 1.5rem 2rem;
@@ -1898,7 +1898,7 @@ dfn {
   .usa-accordion > li,
   .usa-accordion-bordered > li {
     background-color: #e4e4e4;
-    font-family: "Source Sans Pro";
+    font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
     list-style: none;
     margin-bottom: 0.5rem;
     width: 100%; }
@@ -1940,7 +1940,7 @@ dfn {
   color: #212121;
   cursor: pointer;
   display: inline-block;
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   font-weight: 700;
   margin: 0;
   padding: 1.5rem 5.5rem 1.5rem 2rem;
@@ -2013,7 +2013,7 @@ dfn {
   margin-bottom: 0; }
 
 .usa-alert-text {
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   margin-bottom: 0;
   margin-top: 0; }
 
@@ -2650,7 +2650,7 @@ form [name=confirmPassword] {
 
 .usa-form-note {
   float: right;
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   font-size: 1.5rem;
   margin: 0 0 1.5rem; }
   .usa-form-note + * {
@@ -3081,7 +3081,7 @@ input.usa-input-medium {
     border: none;
     color: #212121;
     display: block;
-    font-family: "Source Sans Pro";
+    font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
     line-height: 1.3;
     padding: 0.85rem 1rem 0.85rem 1.8rem;
     text-decoration: none; }
@@ -3569,7 +3569,7 @@ input[type=search] {
     border: none;
     color: #212121;
     display: block;
-    font-family: "Source Sans Pro";
+    font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
     line-height: 1.3;
     padding: 0.85rem 1rem 0.85rem 1.8rem;
     text-decoration: none; }
@@ -3632,7 +3632,7 @@ input[type=search] {
     transition: all 0.2s ease-in-out; }
 
 h1, h2, h3, h4, h5, h6 {
-  font-family: "Source Sans Pro";
+  font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   font-weight: bold; }
 
 h3.feed-item-title a,
diff --git a/web/themes/nsf/assets/css/uswds.css.map b/web/themes/nsf/assets/css/uswds.css.map
index cae8a62..b9114d6 100644
--- a/web/themes/nsf/assets/css/uswds.css.map
+++ b/web/themes/nsf/assets/css/uswds.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "AAAA,qBAAqB;ACGnB,IAAK;EACH,UAAU,EAAE,UAAU;;AAItB,sBAEU;EACR,UAAU,EAAE,OAAO;;ACXzB,4EAA4E;AAE5E;;;;GAIG;AAEH,IAAK;EACH,WAAW,EAAE,UAAU;EAAE,OAAO;EAChC,oBAAoB,EAAE,IAAI;EAAE,OAAO;EACnC,wBAAwB,EAAE,IAAI;EAAE,OAAO;;AAGzC;;GAEG;AAEH,IAAK;EACH,MAAM,EAAE,CAAC;;AAGX;gFACgF;AAEhF;;;;;GAKG;AAEH;;;;;;;;;;;;OAYQ;EACN,OAAO,EAAE,KAAK;;AAGhB;;;GAGG;AAEH;;;KAGM;EACJ,OAAO,EAAE,YAAY;EAAE,OAAO;EAC9B,cAAc,EAAE,QAAQ;EAAE,OAAO;;AAGnC;;;GAGG;AAEH,qBAAsB;EACpB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,CAAC;;AAGX;;;GAGG;AAEH;QACS;EACP,OAAO,EAAE,IAAI;;AAGf;gFACgF;AAEhF;;GAEG;AAEH,CAAE;EACA,gBAAgB,EAAE,WAAW;;AAG/B;;;GAGG;AAEH;OACQ;EACN,OAAO,EAAE,CAAC;;AAGZ;gFACgF;AAEhF;;GAEG;AAEH,WAAY;EACV,aAAa,EAAE,UAAU;;AAG3B;;GAEG;AAEH;MACO;EACL,WAAW,EAAE,IAAI;;AAGnB;;GAEG;AAEH,GAAI;EACF,UAAU,EAAE,MAAM;;AAGpB;;;GAGG;AAEH,EAAG;EACD,SAAS,EAAE,GAAG;EACd,MAAM,EAAE,QAAQ;;AAGlB;;GAEG;AAEH,IAAK;EACH,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,IAAI;;AAGb;;GAEG;AAEH,KAAM;EACJ,SAAS,EAAE,GAAG;;AAGhB;;GAEG;AAEH;GACI;EACF,SAAS,EAAE,GAAG;EACd,WAAW,EAAE,CAAC;EACd,QAAQ,EAAE,QAAQ;EAClB,cAAc,EAAE,QAAQ;;AAG1B,GAAI;EACF,GAAG,EAAE,MAAM;;AAGb,GAAI;EACF,MAAM,EAAE,OAAO;;AAGjB;gFACgF;AAEhF;;GAEG;AAEH,GAAI;EACF,MAAM,EAAE,CAAC;;AAGX;;GAEG;AAEH,cAAe;EACb,QAAQ,EAAE,MAAM;;AAGlB;gFACgF;AAEhF;;GAEG;AAEH,MAAO;EACL,MAAM,EAAE,QAAQ;;AAGlB;;GAEG;AAEH,EAAG;EACD,UAAU,EAAE,WAAW;EACvB,MAAM,EAAE,CAAC;;AAGX;;GAEG;AAEH,GAAI;EACF,QAAQ,EAAE,IAAI;;AAGhB;;GAEG;AAEH;;;IAGK;EACH,WAAW,EAAE,oBAAoB;EACjC,SAAS,EAAE,GAAG;;AAGhB;gFACgF;AAEhF;;;GAGG;AAEH;;;;;GAKG;AAEH;;;;QAIS;EACP,KAAK,EAAE,OAAO;EAAE,OAAO;EACvB,IAAI,EAAE,OAAO;EAAE,OAAO;EACtB,MAAM,EAAE,CAAC;EAAE,OAAO;;AAGpB;;GAEG;AAEH,MAAO;EACL,QAAQ,EAAE,OAAO;;AAGnB;;;;;GAKG;AAEH;MACO;EACL,cAAc,EAAE,IAAI;;AAGtB;;;;;;GAMG;AAEH;;;oBAGqB;EACnB,kBAAkB,EAAE,MAAM;EAAE,OAAO;EACnC,MAAM,EAAE,OAAO;EAAE,OAAO;;AAG1B;;GAEG;AAEH;oBACqB;EACnB,MAAM,EAAE,OAAO;;AAGjB;;GAEG;AAEH;uBACwB;EACtB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;;AAGZ;;;GAGG;AAEH,KAAM;EACJ,WAAW,EAAE,MAAM;;AAGrB;;;;;;GAMG;AAEH;mBACoB;EAClB,UAAU,EAAE,UAAU;EAAE,OAAO;EAC/B,OAAO,EAAE,CAAC;EAAE,OAAO;;AAGrB;;;;GAIG;AAEH;+CACgD;EAC9C,MAAM,EAAE,IAAI;;AAGd;;;GAGG;AAEH,oBAAqB;EACnB,kBAAkB,EAAE,SAAS;EAAE,OAAO;EACtC,UAAU,EAAE,WAAW;EAAE,OAAO;;AAGlC;;;;GAIG;AAEH;+CACgD;EAC9C,kBAAkB,EAAE,IAAI;;AAG1B;;GAEG;AAEH,QAAS;EACP,MAAM,EAAE,iBAAiB;EACzB,MAAM,EAAE,KAAK;EACb,OAAO,EAAE,qBAAqB;;AAGhC;;;GAGG;AAEH,MAAO;EACL,MAAM,EAAE,CAAC;EAAE,OAAO;EAClB,OAAO,EAAE,CAAC;EAAE,OAAO;;AAGrB;;GAEG;AAEH,QAAS;EACP,QAAQ,EAAE,IAAI;;AAGhB;;;GAGG;AAEH,QAAS;EACP,WAAW,EAAE,IAAI;;AAGnB;gFACgF;AAEhF;;GAEG;AAEH,KAAM;EACJ,eAAe,EAAE,QAAQ;EACzB,cAAc,EAAE,CAAC;;AAGnB;EACG;EACD,OAAO,EAAE,CAAC;;ACtaZ,iDAAiD;ACU/C,UAYC;EAXC,WAAW,EDTb,iBAAiB;ECUf,UAAU,EDPZ,MAAM;ECQJ,WAAW,EDTb,GAAG;ECWD,GAAG,ECqBO,0RAAiD;AD1B7D,UAYC;EAXC,WAAW,EDDb,iBAAiB;ECEf,UAAU,EDCZ,MAAM;ECAJ,WAAW,EDDb,GAAG;ECGD,GAAG,ECqBO,kSAAiD;AD1B7D,UAYC;EAXC,WAAW,EDOb,iBAAiB;ECNf,UAAU,EDSZ,MAAM;ECRJ,WAAW,EDOb,GAAG;ECLD,GAAG,ECqBO,8RAAiD;AD1B7D,UAYC;EAXC,WAAW,EDeb,iBAAiB;ECdf,UAAU,EDiBZ,MAAM;EChBJ,WAAW,EDeb,GAAG;ECbD,GAAG,ECqBO,sRAAiD;AD1B7D,UAYC;EAXC,WAAW,EDuBb,cAAc;ECtBZ,UAAU,EDyBZ,MAAM;ECxBJ,WAAW,EDuBb,GAAG;ECrBD,GAAG,ECqBO,sRAAiD;AD1B7D,UAYC;EAXC,WAAW,ED+Bb,cAAc;EC9BZ,UAAU,EDiCZ,MAAM;EChCJ,WAAW,ED+Bb,GAAG;EC7BD,GAAG,ECqBO,8RAAiD;AD1B7D,UAYC;EAXC,WAAW,EDuCb,cAAc;ECtCZ,UAAU,EDyCZ,MAAM;ECxCJ,WAAW,EDuCb,GAAG;ECrCD,GAAG,ECqBO,0RAAiD;AD1B7D,UAYC;EAXC,WAAW,ED+Cb,cAAc;EC9CZ,UAAU,EDiDZ,MAAM;EChDJ,WAAW,ED+Cb,GAAG;EC7CD,GAAG,ECqBO,kRAAiD;AF4B/D,sBAAsB;AG/DtB;cACe;EC0Bb,SAAS,ECJC,MAAM;EDMd,WAAI,EAAE,IAAI;EACV,YAAK,EAAE,IAAI;ED3Bb,SAAS,EGgIe,MAAM;ECjH9B;uBAAS;IACP,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;;AJflB,SAAU;EKwEgB,aAAS,EA/C7B,MAAwC;EAoDpB,YAAQ,EApD5B,MAAwC;EC0B1C,oCAAqD;INnDzD,SAAU;MKwEgB,aAAS,EA/C7B,IAAwC;MAoDpB,YAAQ,EApD5B,IAAwC;;ALjB9C,cAAe;EACb,OAAO,EAAE,CAAC;;AMsER,oCAAuB;ENjEzB,oBAAqB;IO8CnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,IAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;;EPhE7B,mBAAoB;IO0ClB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,8BAAa;MACX,YAAoB,EAAE,CAAC;;EP5D7B,oBAAqB;IOsCnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;;EPxD7B,qBAAsB;IOkCpB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,gCAAa;MACX,YAAoB,EAAE,CAAC;;EPpD7B,qBAAsB;IO8BpB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,gCAAa;MACX,YAAoB,EAAE,CAAC;IPjD3B,mCAAgB;MACd,YAAY,EAAE,CAAC;;EAInB,wBAAyB;IOsBvB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,IAAuC;IAE9C,mCAAa;MACX,YAAoB,EAAE,CAAC;;EPxC7B,oBAAqB;IOkBnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;IPrC3B,kCAAgB;MACd,YAAY,EAAE,CAAC;;EAInB,sBAAuB;IOUrB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,iCAAa;MACX,YAAoB,EAAE,CAAC;;EP5B7B,sBAAuB;IOMrB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,iCAAa;MACX,YAAoB,EAAE,CAAC;IPzB3B,oCAAgB;MACd,YAAY,EAAE,CAAC;;EAInB,wBAAyB;IOFvB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,mCAAa;MACX,YAAoB,EAAE,CAAC;;EPhB7B,yBAA0B;IONxB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,oCAAa;MACX,YAAoB,EAAE,CAAC;ADH3B,qCAAuB;ENPzB,oBAAqB;IOZnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,IAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;;EPN7B,mBAAoB;IOhBlB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,8BAAa;MACX,YAAoB,EAAE,CAAC;;EPF7B,oBAAqB;IOpBnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;;EPE7B,qBAAsB;IOxBpB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,gCAAa;MACX,YAAoB,EAAE,CAAC;;EPM7B,qBAAsB;IO5BpB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,gCAAa;MACX,YAAoB,EAAE,CAAC;IPS3B,mCAAgB;MO/BhB,KAAK,EAAE,IAAsB;MAG3B,OAAO,EAAE,KAAK;MAed,YAAoB,EAAE,aAA+B;MACrD,KAAK,EAAE,cAAuC;MAE9C,8CAAa;QACX,YAAoB,EAAE,CAAC;IPa3B,mCAAgB;MACd,YAAY,EAAE,CAAC;;EAInB,wBAAyB;IOxCvB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,mCAAa;MACX,YAAoB,EAAE,CAAC;;EPsB7B,oBAAqB;IO5CnB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,+BAAa;MACX,YAAoB,EAAE,CAAC;IPyB3B,kCAAgB;MO/ChB,KAAK,EAAE,IAAsB;MAG3B,OAAO,EAAE,KAAK;MAed,YAAoB,EAAE,aAA+B;MACrD,KAAK,EAAE,cAAuC;MAE9C,6CAAa;QACX,YAAoB,EAAE,CAAC;IP6B3B,kCAAgB;MACd,YAAY,EAAE,CAAC;;EAInB,sBAAuB;IOxDrB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,iCAAa;MACX,YAAoB,EAAE,CAAC;;EPsC7B,sBAAuB;IO5DrB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,aAAuC;IAE9C,iCAAa;MACX,YAAoB,EAAE,CAAC;IPyC3B,oCAAgB;MO/DhB,KAAK,EAAE,IAAsB;MAG3B,OAAO,EAAE,KAAK;MAed,YAAoB,EAAE,aAA+B;MACrD,KAAK,EAAE,aAAuC;MAE9C,+CAAa;QACX,YAAoB,EAAE,CAAC;IP6C3B,qCAAiB;MACf,YAAY,EAAE,CAAC;;EAInB,wBAAyB;IOxEvB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,aAAuC;IAE9C,mCAAa;MACX,YAAoB,EAAE,CAAC;;EPsD7B,yBAA0B;IO5ExB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,oCAAa;MACX,YAAoB,EAAE,CAAC;AP8D/B,YAAa;EQhGP,YAAoB,EAAE,CAAC;;ARqG7B,uBAAwB;ES/GtB,WAA6B,EAAE,aAAsF;;ATmHvH,qBAAsB;ESnHpB,WAA6B,EAAE,cAAsF;;ATuHvH,sBAAuB;ESvHrB,WAA6B,EAAE,cAAsF;;AT2HvH,qBAAsB;ES3HpB,WAA6B,EAAE,cAAsF;;AT+HvH,yBAA0B;ES/HxB,WAA6B,EAAE,cAAsF;;ATmIvH,oBAAqB;ESnInB,WAA6B,EAAE,cAAsF;;ATuIvH,0BAA2B;ESvIzB,WAA6B,EAAE,aAAsF;;AT2IvH,sBAAuB;ES3IrB,WAA6B,EAAE,cAAsF;;AT+IvH,yBAA0B;ES/IxB,WAA6B,EAAE,cAAsF;;ATmJvH,uBAAwB;ESnJtB,WAA6B,EAAE,cAAsF;;ATuJvH,2BAA4B;ESvJ1B,WAA6B,EAAE,cAAsF;;ACqBvH,YAAa;EAbX,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,MAAM;;ACnDd,IAAK;EACH,UAAU,EAAE,UAAU;;AAGxB;;QAES;EACP,UAAU,EAAE,OAAO;;AAGrB,IAAK;EACH,gBAAgB,ERqCW,OAAO;EQpClC,UAAU,EAAE,MAAM;;AAKlB,SAAE;EACA,MAAM,EAAE,eAAe;EAAE,qDAAqD;;AAMlF,QAAS;EACP,OAAO,EAAE,eAAe;EAAE,qDAAqD;;AAGjF;UACW;EDQT,OAAO,EPsGiB,kBAA4B;EOrGpD,cAAc,EPsGU,GAAG;;ASvH7B,mDAAmD;AACnD;;;;;;;;YAQa;EF2DX,uBAAuB,EAAE,SAAS;EAClC,sBAAsB,EAAE,WAAW;ELnBb,UAAO,EA3CzB,KAAa;EAgDO,YAAS,EA/C7B,KAAwC;EAyDpB,aAAU,EAxD9B,KAAwC;EOG5C,UAAU,EAAE,IAAI;EAChB,gBAAgB,ECpCF,OAAO;EDqCrB,MAAM,EAAE,CAAC;EACT,aAAa,ETqGW,GAAG;ESpG3B,KAAK,ETWsB,OAAO;ESVlC,MAAM,EAAE,OAAO;EACf,OAAO,EAAE,YAAY;EACrB,WAAW,ECpBS,+EAA+E;EDqBnG,SAAS,ET/BW,MAAM;ESgC1B,WAAW,ETbS,GAAG;EScvB,WAAW,EAAE,CAAC;EACd,OAAO,EAAE,SAAS;EAClB,UAAU,EAAE,MAAM;EAClB,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,IAAI;EFJX,oCAAsC;IErBxC;;;;;;;;gBAQa;MAoBT,KAAK,EAAE,IAAI;EAGb;;;;;;;;;;;;;;;;+BACmB;IACjB,gBAAgB,ECxDG,OAAO;IDyD1B,aAAa,EAAE,CAAC;IAChB,KAAK,ETToB,OAAO;ISUhC,eAAe,EAAE,IAAI;EAGvB;;;;;;;;;;;;;;;;gCACoB;IAClB,gBAAgB,EC/DI,OAAO;EDkE7B;;;;;;;;qCAAyB;IACvB,gBAAgB,ECeS,OAAO;IDdhC,KAAK,EC2BoB,OAAO;IDzBhC;;;;;;;;;;;;;;;;wDACmB;MACjB,gBAAgB,ECWO,OAAO;IDRhC;;;;;;;;;;;;;;;;yDACoB;MAClB,gBAAgB,ETUO,OAAmB;MST1C,KAAK,ET9BkB,OAAO;ESkClC;;;;;;;;mCAAuB;IACrB,gBAAgB,ETnCS,OAAO;ISoChC,UAAU,EAAE,uBAA6B;IACzC,KAAK,ECvFO,OAAO;IDyFnB;;;;;;;;;;;;;;;;sDACmB;MACjB,UAAU,EAAE,uBAAoC;MAChD,KAAK,EC3FY,OAAO;ID8F1B;;;;;;;;;;;;;;;;uDACoB;MAClB,UAAU,EAAE,uBAAqC;MACjD,KAAK,EChGa,OAAO;EDoG7B;;;;;;;;;;;;;;;;yCAC6B;IAC3B,UAAU,EAAE,WAAW;IACvB,UAAU,EAAE,uBAA2B;IACvC,KAAK,ETxDoB,OAAO;IS0DhC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4DACmB;MACjB,UAAU,EAAE,uBAAkC;MAC9C,KAAK,ECxDkB,OAAO;ID2DhC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6DACoB;MAClB,UAAU,EAAE,uBAAgC;MAC5C,KAAK,EC9DkB,OAAO;EDkElC;;;;;;;;8BAAkB;IAChB,gBAAgB,ECtES,OAAO;IDwEhC;;;;;;;;;;;;;;;;iDACmB;MACjB,gBAAgB,EC3EO,OAAO;ID8EhC;;;;;;;;;;;;;;;;kDACoB;MAClB,gBAAgB,EClCO,OAAO;EDsClC;;;;;;;;6BAAiB;IACf,gBAAgB,EC9CS,OAAO;IDgDhC;;;;;;;;;;;;;;;;gDACmB;MACjB,gBAAgB,EChDO,OAAO;IDmDhC;;;;;;;;;;;;;;;;iDACoB;MAClB,gBAAgB,ECpDO,OAAO;EDwDlC;;;;;;;;6BAAiB;IACf,aAAa,EAAE,GAAG;IAClB,SAAS,EAAE,MAAM;IACjB,OAAO,EAAE,WAAW;EAGtB;;;;;;;;uBAAW;IAnJX,gBAAgB,EC+CW,OAAO;ID9ClC,cAAc,EAAE,IAAI;IAEpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCAKY;MACV,gBAAgB,ECsCS,OAAO;MDrChC,MAAM,EAAE,CAAC;MACT,UAAU,EAAE,IAAI;;AA4IpB,uBAAuB;AAEvB,oBACA;EA1JE,gBAAgB,EC+CW,OAAO;ED9ClC,cAAc,EAAE,IAAI;EAEpB,kMAKY;IACV,gBAAgB,ECsCS,OAAO;IDrChC,MAAM,EAAE,CAAC;IACT,UAAU,EAAE,IAAI;;AAmJpB;;;;oCAIqC;EACnC,UAAU,EAAE,uBAAkC;EAC9C,cAAc,EAAE,IAAI;EACpB,KAAK,ECtHsB,OAAO;EDwHlC;;;;;;;;;;;;;;;;;;;;;;;;gDAKY;IACV,gBAAgB,ETnIS,OAAO;ISoIhC,MAAM,EAAE,CAAC;;AAIb;8BAC+B;EAC7B,gBAAgB,ET1IW,OAAO;;AS6IpC;sCACuC;EACrC,gBAAgB,EAAE,WAAW;EAC7B,KAAK,EC9IsB,OAAO;ED+IlC,UAAU,EAAE,uBAA0B;;AAkBxC,oBAAqB;EAdnB,gBAAgB,EAAE,WAAW;EAC7B,MAAM,EAAE,CAAC;EACT,aAAa,EAAE,CAAC;EAChB,WAAW,ET5KS,GAAG;ES6KvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAChB,sBAAsB,EAAE,IAAI;EAE5B,0BAAQ;IACN,gBAAgB,EAAE,WAAW;;AE1M/B;;0BAEM;EACJ,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;EACN,IAAI,EAAE,CAAC;EACP,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;;AAIhB,oBAAqB;EAfnB,cAAc,EAAE,MAA0B;EAiB1C,QAAQ,EAAE,QAAQ;EAClB,MAAM,EAAE,CAAC;EACT,QAAQ,EAAE,MAAM;EAChB,SAAS,EAAE,IAAI;;ACxBjB,GAAI;EACF,SAAS,EAAE,IAAI;;AASjB,WAAY;EAJV,OAAO,EAAE,YAAY;EACrB,WAAW,EAAE,CAAC;;ACYhB,mDAAmD;AACnD;;MAEO;EACL,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,oBAAqC;EAC7C,aAAa,EAAE,CAAC;EAChB,UAAU,EAAE,UAAU;EACtB,KAAK,EHuEsB,OAAO;EGtElC,OAAO,EAAE,KAAK;EACd,SAAS,EbhBW,MAAM;EaiB1B,MAAM,EAdO,MAAoC;EAejD,WAAW,EA7BO,GAAG;EA8BrB,MAAM,EAAE,OAAO;EACf,SAAS,EbuGe,KAAK;EatG7B,OAAO,EAAE,UAA6B;EACtC,KAAK,EAAE,IAAI;EAEX;;0BAAoB;IAClB,MAAM,EAAE,iBAA4B;;AAGxC,sBAAsB;AAEtB,gBAAiB;EACf,WAAW,EAAE,iBAA+B;EAC5C,UAAU,EAAE,IAAI;EAChB,cAAc,EAAE,MAAM;EACtB,YAAY,EAAE,MAAM;EACpB,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,MAAM;EAEb;;yBAEO;IACL,MAAM,EAAE,iBAA+B;IACvC,KAAK,EAAE,mBAAmB;EAG5B,sBAAM;IACJ,UAAU,EAAE,CAAC;EAGf,kCAAkB;IAChB,MAAM,EAAE,oBAAqC;IAC7C,KAAK,EAAE,OAAO;EAGhB,wCAAwB;IACtB,MAAM,EAAE,iBAA+B;;AAI3C,sBAAuB;EACrB,OAAO,EAAE,KAAK;EACd,SAAS,Eb9DW,MAAM;Ea+D1B,WAAW,Eb5CS,GAAG;;Aa+CzB,wBAAyB;EACvB,KAAK,EHasB,OAAO;EGZlC,OAAO,EAAE,KAAK;EACd,SAAS,EbrEW,MAAM;EasE1B,WAAW,EbnDS,GAAG;EaoDvB,cAAc,EAAE,GAAG;EACnB,WAAW,EAAE,GAAG;;AAGlB,yBAA0B;EACxB,KAAK,EHKsB,OAAO;EGJlC,OAAO,EAAE,cAAc;;AAGzB,yBAA0B;EACxB,KAAK,EbrCsB,OAAO;EasClC,OAAO,EAAE,aAAa;;AAGxB,KAAM;EACJ,OAAO,EAAE,KAAK;EACd,UAAU,EAAE,IAAI;EAChB,SAAS,EbmCe,KAAK;;AahC/B,QAAS;EACP,MAAM,EAAE,KAAK;;AAGf,MAAO;EACL,eAAe,EAAE,IAAI;EACrB,kBAAkB,EAAE,IAAI;EACxB,UAAU,EAAE,IAAI;EAChB,gBAAgB,Eb7DW,OAAO;Ea8DlC,gBAAgB,EAAE,4BAAoC;EACtD,gBAAgB,EAAE,4BAAoC;EACtD,mBAAmB,EAAE,mBAAmB;EACxC,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,IAAI;EACrB,aAAa,EAAE,IAAI;EAEnB,kBAAc;IACZ,OAAO,EAAE,IAAI;EAIf,uBAAmB;IACjB,UAAU,EAAE,QAAQ;EAItB,qBAAiB;IACf,KAAK,EAAE,WAAW;IAClB,WAAW,EAAE,aAAkB;;AAInC,kBAAmB;EACjB,WAAW,EbzGS,GAAG;;Aa4GzB,MAAO;EACL,SAAS,Eb3HW,IAAI;Ea4HxB,WAAW,Eb9GS,GAAG;;AakHvB,0BAAM;EACJ,UAAU,EAAE,CAAC;;AAMjB,cAAe;EACb,KAAK,EbjGsB,OAAO;EakGlC,WAAW,EHpIS,+EAA+E;EGqInG,aAAa,EAAE,CAAC;;AAKlB,6BACa;EN7GX,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,MAAM;EMiHZ;sBAAU;IACR,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,eAAe;IACvB,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,IAAI;;AAIf;oBACqB;EACnB,MAAM,EAAE,OAAO;EACf,WAAW,EAAE,GAAG;EAChB,aAAa,EAAE,MAAM;;AAGvB;4BAC6B;EAC3B,UAAU,EbtIiB,OAAO;EauIlC,aAAa,EbhDW,GAAG;EaiD3B,UAAU,EAAE,iBAA4B;EACxC,OAAO,EAAE,KAAK;EACd,OAAO,EAAE,YAAY;EACrB,MAAM,EbrCS,IAAI;EasCnB,WAAW,EbtCI,IAAI;EauCnB,YAAY,EAAE,KAAK;EACnB,WAAW,EAAE,MAAM;EACnB,cAAc,EAAE,QAAQ;EACxB,KAAK,Eb1CU,IAAI;;Aa6CrB,4BAA6B;EAC3B,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,oCAAoD;EAChE,MAAM,EAAE,MAAM;EACd,WAAW,EAAE,MAAM;EACnB,YAAY,EAAE,MAAM;EACpB,KAAK,EAAE,MAAM;;AAGf;oCACqC;EACnC,gBAAgB,EHhNF,OAAO;EGiNrB,UAAU,EAAE,iBAAwB;;AAGtC,oCAAqC;EACnC,UAAU,EAAE,oCAAgD;;AAG9D;gDACiD;EAC/C,gBAAgB,EAAE,0BAAkC;EACpD,gBAAgB,EAAE,0BAAkC;EACpD,mBAAmB,EAAE,GAAG;EACxB,iBAAiB,EAAE,SAAS;;AAG9B,kCAAmC;EACjC,OAAO,EbpFiB,kBAA4B;EaqFpD,cAAc,EAAE,GAAkB;;AAGpC,gCAAiC;EAC/B,KAAK,EH/KsB,OAAO;;AGkLpC,qCAAsC;EACpC,OAAO,Eb7FiB,kBAA4B;Ea8FpD,cAAc,Eb7FU,GAAG;;AagG7B;qCACsC;EACpC,UAAU,EHxLiB,OAAO;EGyLlC,UAAU,EAAE,iBAA2B;EACvC,MAAM,EAAE,WAAW;;AAKrB,YAAa;EACX,kBAAkB,EAAE,IAAI;EACxB,MAAM,EAAE,IAAI;EACZ,YAAY,EAAE,CAAC;EACf,KAAK,EAAE,IAAI;;AAGb,2CAA4C;EAC1C,UAAU,EHzMiB,OAAO;EG0MlC,MAAM,EAAE,iBAA4B;EACpC,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,IAAI;;AAGb,8BAA+B;EAC7B,UAAU,EHvQI,OAAO;EGwQrB,MAAM,EAAE,iBAA4B;EACpC,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,IAAI;;AAGb,uBAAwB;EACtB,UAAU,EAAE,WAAW;EACvB,KAAK,EAAE,WAAW;EAClB,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,IAAI;;AAGb,kCAAmC;EACjC,kBAAkB,EAAE,IAAI;EACxB,MAAM,EAAE,iBAA4B;EACpC,MAAM,EAAE,MAAM;EACd,aAAa,EAAE,MAAM;EACrB,UAAU,EHnOiB,OAAO;EGoOlC,MAAM,EAAE,OAAO;EACf,UAAU,EAAE,OAAO;EACnB,KAAK,EAAE,MAAM;;AAGf,8BAA+B;EAC7B,UAAU,EH1OiB,OAAO;EG2OlC,MAAM,EAAE,iBAA4B;EACpC,aAAa,EAAE,MAAM;EACrB,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,MAAM;;AAGf,uBAAwB;EACtB,UAAU,EHnPiB,OAAO;EGoPlC,MAAM,EAAE,iBAA4B;EACpC,aAAa,EAAE,MAAM;EACrB,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,MAAM;;AAGf,4BAA6B;EAC3B,UAAU,EH9PiB,OAAO;EG+PlC,MAAM,EAAE,iBAA4B;EACpC,aAAa,EAAE,IAAI;;AAGrB,4BAA6B;EAC3B,UAAU,EHpQiB,OAAO;EGqQlC,MAAM,EAAE,iBAA4B;EACpC,aAAa,EAAE,IAAI;;AAMnB,wBAAM;EACJ,UAAU,EAAE,CAAC;AAGf;2DACyC;EACvC,kBAAkB,EAAE,IAAI;EACxB,UAAU,EAAE,IAAI;EAChB,MAAM,EAAE,CAAC;AAGX,gCAAc;EACZ,eAAe,EAAE,SAAS;;AAI9B;;oBAEqB;EACnB,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,IAAI;EACX,YAAY,EAAE,MAAM;EACpB,KAAK,EAAE,IAAI;;AAGb,oBAAqB;EACnB,KAAK,EAAE,IAAI;;AC7Vb,0BAAW;EACT,gBAAgB,EJoDW,OAAO;EInDlC,aAAa,EduIW,GAAG;EctI3B,KAAK,EdgDsB,OAAO;Ec/ClC,SAAS,EdiBW,MAAM;EchB1B,YAAY,EAAE,MAAM;EACpB,OAAO,EAAE,aAAa;EACtB,cAAc,EAAE,SAAS;EAEzB,oDAAe;IACb,YAAY,EAAE,CAAC;;AAInB,cAAe;EAEb,SAAS,EdHW,MAAM;EcI1B,YAAY,EAAE,MAAM;EACpB,aAAa,EAAE,MAAM;;AClBvB;EACG;EbyEqB,UAAO,EA3CzB,GAAa;EAoDO,aAAU,EApD9B,GAAa;Ea5BjB,YAAY,EAAE,MAAM;;AAGtB,EAAG;EACD,WAAW,EfgBS,GAAG;EefvB,aAAa,EAAE,KAAK;EAEpB,aAAa;IACX,aAAa,EAAE,CAAC;;AAWlB;;;;;;;;;;;;;MACK;EACH,UAAU,EAAE,CAAC;;AAKjB,kBAAmB;Eb6CK,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EAEf,uBAAK;IACH,aAAa,EAAE,CAAC;;ASpFpB,KAAM;EACJ,cAAc,EAAE,CAAC;EACjB,MAAM,EAAE,KAAK;;AAIb,QAAG;EACD,WAAW,EhByBO,GAAG;AgBtBvB;QACG;EACD,gBAAgB,EN6CS,OAAO;;AMzCpC,EAAG;EACD,UAAU,EAAE,IAAI;;AAGlB;EACG;EACD,gBAAgB,EhB6BW,OAAO;EgB5BlC,MAAM,EAAE,iBAAqB;EAC7B,WAAW,EhBOS,GAAG;EgBNvB,OAAO,EAAE,WAAW;;AAKlB,8BAAG;EACD,gBAAgB,EAAE,WAAW;EAC7B,UAAU,EAAE,CAAC;AAIjB;wBACG;EACD,WAAW,EAAE,CAAC;EACd,YAAY,EAAE,CAAC;AAIf,oCAAc;EACZ,YAAY,EAAE,CAAC;;AAKrB,OAAQ;ETtBN,SAAS,EPNW,MAAM;EOO1B,WAAW,EPIS,GAAG;EgBmBvB,WAAW,EN3BS,uBAAuB;EM4B3C,aAAa,EAAE,MAAM;EACrB,UAAU,EAAE,IAAI;;ACrDlB,IAAK;EACH,WAAW,EPsBS,+EAA+E;EOrBnG,SAAS,EjBUW,IAAI;;AiBP1B,IAAK;EACH,SAAS,EjBOW,MAAM;;AiBJ5B,CAAE;EACA,WAAW,EjBaS,GAAG;EiBZvB,aAAa,EAAE,GAAG;EAClB,UAAU,EAAE,GAAG;;AAGjB,CAAE;EACA,KAAK,EPfS,OAAO;EOgBrB,eAAe,EAAE,SAAS;EAE1B,iBACS;IACP,KAAK,EPnBc,OAAO;EOsB5B,OAAQ;IVgBR,OAAO,EPsGiB,kBAA4B;IOrGpD,cAAc,EPsGU,GAAG;EiBnH3B,SAAU;IACR,KAAK,EPuEoB,OAAO;;AOlElC,yBAAS;EACP,UAAU,EAAE,6CAAyD;EACrE,UAAU,EAAE,6CAAyD;EACrE,eAAe,EAAE,IAAI;EACrB,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,YAAY;EACrB,MAAM,EAAE,MAAM;EACd,aAAa,EAAE,IAAI;EACnB,WAAW,EAAE,GAAG;EAChB,KAAK,EAAE,MAAM;AAGf,+BAAe;EACb,gBAAgB,EAAE,qCAAiD;EACnE,gBAAgB,EAAE,qCAAiD;;AAdrE,6BAAS;EACP,UAAU,EAAE,iDAAyD;EACrE,UAAU,EAAE,iDAAyD;EACrE,eAAe,EAAE,IAAI;EACrB,OAAO,EAAE,EAAE;EACX,OAAO,EAAE,YAAY;EACrB,MAAM,EAAE,MAAM;EACd,aAAa,EAAE,IAAI;EACnB,WAAW,EAAE,GAAG;EAChB,KAAK,EAAE,MAAM;AAGf,mCAAe;EACb,gBAAgB,EAAE,yCAAiD;EACnE,gBAAgB,EAAE,yCAAiD;;AAgBvE;;;;EAIG;EACD,KAAK,EAAE,IAAI;EACX,WAAW,EP9CS,uBAAuB;EO+C3C,WAAW,EjB/CS,GAAG;EiBgDvB,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,KAAK;;AAGnB,EAAG;EACD,WAAW,EPtDS,+EAA+E;;AOyDrG,EAAG;EVzED,SAAS,EPUW,IAAI;EOTxB,WAAW,EPwBS,GAAG;;AiBoDzB,EAAG;EVxED,SAAS,EPMW,IAAI;EOLxB,WAAW,EPmBS,GAAG;;AiBwDzB,EAAG;EVvED,SAAS,EGFc,IAAI;EHG3B,WAAW,EPcS,GAAG;;AiB4DzB,EAAG;EVtED,SAAS,EGNc,MAAM;EHO7B,WAAW,EPSS,GAAG;;AiBgEzB,EAAG;EVrED,SAAS,EPNW,MAAM;EOO1B,WAAW,EPIS,GAAG;;AiBoEzB,EAAG;EVpED,SAAS,EPVW,MAAM;EOW1B,WAAW,EPFS,GAAG;EOGvB,WAAW,EPXS,GAAG;EOYvB,cAAc,EAAE,SAAS;;AUuE3B;;;GAGI;EACF,UAAU,EAAE,MAAM;;AAMlB;;gEAEoD;EAClD,SAAS,EjBWa,IAAI;;AiBP9B,iBAAkB;EAChB,SAAS,EjBMe,IAAI;;AiBF5B;;;cAGK;EACH,WAAW,EP7GO,+EAA+E;AOgHnG,WAAE;EACA,aAAa,EAAE,IAAI;EACnB,WAAW,EjBzGO,GAAG;;AiB8GvB;;;eAGK;EACH,WAAW,EP1HO,uBAAuB;;AO8H7C,YAAa;EVrIX,SAAS,EGFc,IAAI;EHG3B,WAAW,EPcS,GAAG;EiBwHvB,aAAa,EAAE,CAAC;EV1GhB,oCAAsC;IUwGxC,YAAa;MV/IX,SAAS,EPUW,IAAI;MOTxB,WAAW,EPwBS,GAAG;EOcvB,oCAAsC;IUwGxC,YAAa;MVpJX,SAAS,EPcW,MAAM;MOb1B,WAAW,EP6BS,GAAG;;AiBmIzB,cAAe;EACb,WAAW,EP5IS,uBAAuB;EO6I3C,SAAS,EjBtJW,IAAI;EiBuJxB,WAAW,EjBvIS,GAAG;EiBwIvB,WAAW,EjB9IS,GAAG;EiB+IvB,SAAS,EjBrCe,KAAK;;AiBwC/B,gBAAiB;EACf,QAAQ,EAAE,QAAQ;;AAGpB,qBAAsB;EACpB,KAAK,EjB7HsB,OAAO;EiB8HlC,IAAI,EAAE,CAAC;EACP,WAAW,EAAE,EAAE;EACf,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,CAAC;;AAGR,eAAgB;EACd,UAAU,EAAE,CAAC;;AAGf,cAAe;EACb,aAAa,EAAE,CAAC;;AAGlB,oBAAqB;EACnB,gBAAgB,EP5IW,OAAO;EO8IlC;2BACK;IACH,KAAK,EjBjJoB,OAAO;EiBoJlC,sBAAE;IACA,KAAK,EPhJoB,OAAO;IOkJhC,4BAAQ;MACN,KAAK,EjBxJkB,OAAO;;AiB6JpC,eAAgB;EACd,SAAS,EjB3LW,MAAM;EiB4L1B,UAAU,EAAE,CAAC;;AAQb;;6BAAe;EACb,UAAU,EAAE,CAAC;AAGf;;4BAAc;EACZ,aAAa,EAAE,CAAC;;AAchB;;;;;;;;iDAAe;EACb,UAAU,EAAE,CAAC;AVhMjB,oCAAsC;EUoMtC;;;;;;;;uCAAe;IAEX,UAAU,EAAE,CAAC;AAKf;;;;;;;;+CAAc;EACZ,aAAa,EAAE,CAAC;AV5MpB,oCAAsC;EUgNtC;;;;;;;;sCAAc;IAEV,aAAa,EAAE,CAAC;;ACjLtB;uBACwB;EhBNA,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EWrEf,KAAK,ERsFsB,OAAO;EQrFlC,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,KAAK,EAAE,IAAI;EXoEX;8BAAK;IACH,aAAa,EAAE,CAAC;EWhBlB;oCAAW;IACT,UAAU,EAAE,IAAI;IAChB;gDAAU;MACR,UAAU,EAAE,MAAM;MAClB;4DAAU;QACR,UAAU,EAAE,MAAM;EAWxB;;;mDAC0B;IACxB,UAAU,ElBiEE,IAAI;EkB7DlB;8BAAK;IhBhBiB,UAAO,EAtCX,CAAC;IA+CK,aAAU,EA/ChB,CAAC;IK4CnB,eAAe,EAAE,IAAI;IACrB,YAAY,EAAE,CAAC;IWrEf,KAAK,ERsFsB,OAAO;IQrFlC,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,IAAI;IXoEX;qCAAK;MACH,aAAa,EAAE,CAAC;IWUhB;qCAAK;MA3EP,gBAAgB,ERsCW,OAAO;MQrClC,WAAW,ERGS,+EAA+E;MQFnG,UAAU,EAAE,IAAI;MAChB,aAAa,ElBgIG,MAAM;MkB/HtB,KAAK,EAAE,IAAI;IA4ET;uCAAO;MTqGT,gBAAgB,EAAE,WAAW;MAC7B,MAAM,EAAE,CAAC;MACT,aAAa,EAAE,CAAC;MAChB,WAAW,ET5KS,GAAG;MS6KvB,MAAM,EAAE,CAAC;MACT,OAAO,EAAE,CAAC;MACV,UAAU,EAAE,IAAI;MAChB,sBAAsB,EAAE,IAAI;MSlL5B,gBAAgB,ER4BW,OAAO;MQ3BlC,gBAAgB,EAAE,uBAA+B;MACjD,gBAAgB,EAAE,uBAA+B;MACjD,mBAAmB,EAAE,iBAAuB;MAC5C,iBAAiB,EAAE,SAAS;MAC5B,eAAe,EA5BL,MAAiB;MA6B3B,KAAK,ER+DsB,OAAO;MQ9DlC,MAAM,EAAE,OAAO;MACf,OAAO,EAAE,YAAY;MACrB,WAAW,ERfS,+EAA+E;MQgBnG,WAAW,ElBPS,GAAG;MkBQvB,MAAM,EAAE,CAAC;MACT,OAAO,EAAE,yBAA8D;MACvE,KAAK,EAAE,IAAI;MTuKX;+CAAQ;QACN,gBAAgB,EAAE,WAAW;MStK/B;+CAAQ;QACN,gBAAgB,ERWS,OAAO;QQVhC,KAAK,ERoDoB,OAAO;MQjDlC;;;;;;;;;;;4CAKG;QACD,MAAM,EAAE,CAAC;IAiDT;sDAAsB;MA3CxB,gBAAgB,EAAE,sBAA8B;MAChD,gBAAgB,EAAE,sBAA8B;MAChD,iBAAiB,EAAE,SAAS;MAC5B,eAAe,EA1DL,MAAiB;EAuG3B;8BAAK;IA1FL,gBAAgB,ERsCW,OAAO;IQrClC,WAAW,ERGS,+EAA+E;IQFnG,UAAU,EAAE,IAAI;IAChB,aAAa,ElBgIG,MAAM;IkB/HtB,KAAK,EAAE,IAAI;;AA6FX,8CAAuB;EACrB,aAAa,EAnHE,iBAA8B;EAoH7C,WAAW,EApHI,iBAA8B;EAqH7C,YAAY,EArHG,iBAA8B;;AAyHjD,sBAAuB;EACrB,gBAAgB,ElBzEW,OAAO;EkB0ElC,QAAQ,EAAE,IAAI;EACd,OAAO,EAAE,WAAiC;EAE1C,sCAAgB;IACd,UAAU,EAAE,CAAC;EAGf,qCAAe;IACb,aAAa,EAAE,CAAC;EAGlB,yCAAqB;IXnFrB,QAAQ,EAAE,QAAQ;IAClB,IAAI,EAAE,MAAM;EAkBZ,wCAAoB;IAClB,OAAO,EAAE,IAAI;;AWsEjB,qBAAsB;ETyDpB,gBAAgB,EAAE,WAAW;EAC7B,MAAM,EAAE,CAAC;EACT,aAAa,EAAE,CAAC;EAChB,WAAW,ET5KS,GAAG;ES6KvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAChB,sBAAsB,EAAE,IAAI;ESlL5B,gBAAgB,ER4BW,OAAO;EQ3BlC,gBAAgB,EAAE,uBAA+B;EACjD,gBAAgB,EAAE,uBAA+B;EACjD,mBAAmB,EAAE,iBAAuB;EAC5C,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EA5BL,MAAiB;EA6B3B,KAAK,ER+DsB,OAAO;EQ9DlC,MAAM,EAAE,OAAO;EACf,OAAO,EAAE,YAAY;EACrB,WAAW,ERfS,+EAA+E;EQgBnG,WAAW,ElBPS,GAAG;EkBQvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,yBAA8D;EACvE,KAAK,EAAE,IAAI;ETuKX,2BAAQ;IACN,gBAAgB,EAAE,WAAW;EStK/B,2BAAQ;IACN,gBAAgB,ERWS,OAAO;IQVhC,KAAK,ERoDoB,OAAO;EQjDlC;;;;;0BAKG;IACD,MAAM,EAAE,CAAC;;AA4Fb,0CAA2C;EAtFzC,gBAAgB,EAAE,sBAA8B;EAChD,gBAAgB,EAAE,sBAA8B;EAChD,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EA1DL,MAAiB;;ACoB7B,UAAW;EACT,gBAAgB,ET8BW,OAAO;ES7BlC,mBAAmB,EAAE,SAAqB;EAC1C,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,MAAM;EACvB,cAAc,EAAE,MAAgB;EAChC,YAAY,EATC,IAAsB;EAUnC,aAAa,EAZH,IAAe;EAazB,WAAW,EAbD,IAAe;EAczB,QAAQ,EAAE,QAAQ;EAElB,kBAAU;IACR,gBAAgB,EAAE,OAAiC;IACnD,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,CAAC;IACP,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,CAAC;IACN,KAAK,EAtBE,IAAc;EAyBvB,YAAE;IACA,KAAK,ET9Cc,OAAO;ISgD1B,sCACQ;MACN,KAAK,ETjDa,OAAO;ESqD7B,aAAG;IACD,aAAa,EAAE,CAAC;IAChB,UAAU,EnB6FE,IAAI;ImB5FhB,YAAY,EnB4FA,IAAI;;AmBxFpB,eAAgB;EACd,mBAAmB,EAAE,SAAyB;EAC9C,cAAc,EnBsFA,IAAI;EmBrFlB,WAAW,EnBqFG,IAAI;EmBnFlB,0CAA2B;IACzB,aAAa,EnBiFC,MAAM;ImBhFpB,WAAW,EnBgFG,MAAM;;AmB5ExB,eAAgB;EACd,OAAO,EAAE,UAAU;EACnB,aAAa,EnB2EC,IAAI;;AmBxEpB,eAAgB;EACd,OAAO,EAAE,UAAU;EACnB,YAAY,EAAE,IAAuB;EACrC,cAAc,EAAE,GAAG;;AAGrB,kBAAmB;EACjB,UAAU,EAAE,CAAC;EACb,aAAa,EAAE,CAAC;;AAGlB,eAAgB;EACd,WAAW,ETpES,+EAA+E;ESqEnG,aAAa,EAAE,CAAC;EAChB,UAAU,EAAE,CAAC;;AAGf,0BAA2B;EACzB,aAAa,EnBsDC,IAAI;EmBrDlB,WAAW,EnBoDK,MAAM;;AmBhDtB,kBAAoB;EAClB,gBAAgB,EnB7BS,OAAO;EmB8BhC,gBAAgB,EAAE,gCAAyC;EAC3D,gBAAgB,EAAE,gCAAyC;EAE3D,0BAAU;IACR,gBAAgB,EnBrCO,OAAO;;AmB+BlC,kBAAoB;EAClB,gBAAgB,EnBlCS,OAAO;EmBmChC,gBAAgB,EAAE,gCAAyC;EAC3D,gBAAgB,EAAE,gCAAyC;EAE3D,0BAAU;IACR,gBAAgB,EnB1CO,OAAO;;AmBoClC,gBAAoB;EAClB,gBAAgB,ETPS,OAAO;ESQhC,gBAAgB,EAAE,8BAAyC;EAC3D,gBAAgB,EAAE,8BAAyC;EAE3D,wBAAU;IACR,gBAAgB,ETjBO,OAAO;;ASWlC,eAAoB;EAClB,gBAAgB,ETdS,OAAO;ESehC,gBAAgB,EAAE,6BAAyC;EAC3D,gBAAgB,EAAE,6BAAyC;EAE3D,uBAAU;IACR,gBAAgB,ETvBO,OAAO;;AS4BpC,kBAAmB;EACjB,gBAAgB,EAAE,IAAI;;AAGxB,oBAAqB;EACnB,KAAK,EnBYmB,IAAI;;AmBR9B,UAAW;EACT,UAAU,EAAE,KAAK;;AC3HnB,WAAY;EACV,gBAAgB,EVwDW,OAAO;EUvDlC,cAAc,EAAE,MAAM;Eb4CtB,oCAAsC;Ia9CxC,WAAY;MAKR,SAAS,EpBiBS,MAAM;MoBhBxB,cAAc,EAAE,CAAC;;AAIrB,mBAAoB;ElBqEM,aAAS,EA/C7B,MAAwC;EAsDpB,cAAU,EArD9B,GAAwC;EAsDpB,YAAQ,EAvD5B,MAAwC;EkBpB5C,gBAAgB,EAAE,WAAW;EAC7B,SAAS,EpBQW,MAAM;EoBP1B,WAAW,EAAE,IAAI;EACjB,KAAK,EAAE,IAAI;Eb+BX,oCAAsC;IapCxC,mBAAoB;MAQhB,cAAc,EAAE,MAAM;MACtB,WAAW,EAAE,IAAI;Eb2BnB,oCAAsC;IapCxC,mBAAoB;MlBqEM,aAAS,EA/C7B,IAAwC;MAoDpB,YAAQ,EApD5B,IAAwC;EkBL1C,iCAAc;IACZ,UAAU,EAAE,IAAI;IbkBpB,oCAAsC;ManBpC,iCAAc;QAIV,UAAU,EAAE,CAAC;;AAMrB,iBAAkB;EtBThB,SAAS,ECJC,MAAM;EDMd,WAAI,EAAE,IAAI;EACV,YAAK,EAAE,IAAI;EIgDW,aAAS,EA/C7B,MAAwC;EAoDpB,YAAQ,EApD5B,MAAwC;EkBQ5C,SAAS,EpB4Fe,MAAM;ECjH9B,wBAAS;IACP,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;EMwBhB,oCAAsC;IaTxC,iBAAkB;MlB0CQ,aAAS,EA/C7B,IAAwC;MAoDpB,YAAQ,EApD5B,IAAwC;;AkBe9C,kBAAmB;ElB2BK,WAAO,EA3CzB,OAAa;EAoDO,cAAU,EApD9B,OAAa;EkBkBjB,SAAS,EAAE,MAAM;EACjB,WAAW,EpBnBS,GAAG;EOevB,oCAAsC;IaCxC,kBAAmB;MlB2BK,WAAO,EAtCX,CAAC;MA+CK,cAAU,EA/ChB,CAAC;EkBoBnB,oBAAE;IlBkBoB,UAAO,EAtCX,CAAC;IA+CK,aAAU,EA/ChB,CAAC;IkBsBjB,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,MAAM;IAChB,cAAc,EAAE,MAAM;IbdxB,oCAAsC;MaUtC,oBAAE;QlBkBoB,UAAO,EA3CzB,GAAa;QAoDO,aAAU,EApD9B,GAAa;QkBiCb,OAAO,EAAE,YAAY;EAIzB,sBAAI;IACF,KAAK,EAAE,IAAI;IACX,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,GAAG;IACf,KAAK,EAAE,MAAM;Ib1Bf,oCAAsC;MasBtC,sBAAI;QAOA,YAAY,EAAE,MAAM;QACpB,KAAK,EAAE,IAAI;;AAKjB,2BAA4B;EAC1B,WAAW,EAAE,MAAM;EACnB,aAAa,EAAE,iBAA2B;EAC1C,OAAO,EAAE,IAAI;EACb,SAAS,EpBhEW,MAAM;EoBiE1B,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,IAAI;EbzCnB,oCAAsC;IamCxC,2BAA4B;MASxB,aAAa,EAAE,IAAI;MACnB,OAAO,EAAE,KAAK;MACd,SAAS,EAAE,MAAM;MACjB,WAAW,EpB9DO,GAAG;MoB+DrB,UAAU,EAAE,CAAC;MACb,aAAa,EAAE,CAAC;EAGlB,+CAAoB;IAClB,WAAW,EAAE,CAAC;IbrDhB,oCAAsC;MaoDtC,+CAAoB;QAIhB,WAAW,EAAE,IAAI;EAIrB,+BAAI;IACF,YAAY,EAAE,MAAM;Ib7DtB,oCAAsC;Ma4DtC,+BAAI;QAIA,YAAY,EAAE,MAAM;EAIxB,6BAAE;IACA,WAAW,EpB3FO,GAAG;IoB4FrB,cAAc,EAAE,GAAG;IbtErB,oCAAsC;MaoEtC,6BAAE;QAKE,WAAW,EpBhGK,GAAG;QoBiGnB,cAAc,EAAE,MAAM;;AAK5B,kBAAmB;EX2EjB,gBAAgB,EAAE,WAAW;EAC7B,MAAM,EAAE,CAAC;EACT,aAAa,EAAE,CAAC;EAChB,WAAW,ET5KS,GAAG;ES6KvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAChB,sBAAsB,EAAE,IAAI;EPrIN,WAAO,EA3CzB,MAAa;EA2DO,YAAQ,EAxD5B,MAAkE;EkB8FtE,qBAAqB,EAAE,KAAK;EAC5B,KAAK,EVhIS,OAAO;EUiIrB,OAAO,EAAE,KAAK;EACd,SAAS,EAAE,MAAM;EACjB,MAAM,EAAE,MAAM;EACd,IAAI,EAAE,CAAC;EACP,QAAQ,EAAE,QAAQ;EAClB,eAAe,EAAE,SAAS;EAC1B,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,IAAI;EXwEX,wBAAQ;IACN,gBAAgB,EAAE,WAAW;EFpK/B,oCAAsC;Ia+ExC,kBAAmB;MlBnDK,WAAO,EAtCX,CAAC;MAsDK,YAAQ,EAnDd,CAAC;MkBsGjB,+DAA+D;MAC/D,OAAO,EAAE,MAAM;MACf,MAAM,EAAE,OAAO;MACf,WAAW,EAAE,GAAG;MAChB,QAAQ,EAAE,QAAQ;MAClB,cAAc,EAAE,MAAM;MACtB,KAAK,EAAE,OAAO;MACd,sBAAsB;EAGxB,wBAAQ;IACN,KAAK,EVtJc,OAAO;IUuJ1B,eAAe,EAAE,SAAS;EAG5B,uCAAuB;IAErB,gBAAgB,EAAE,IAAI;IbVxB,8CAAiB;MACf,gBAAgB,EAAE,0CAAkC;MACpD,gBAAgB,EAAE,0CAAkC;MACpD,eAAe,EAAE,IAAI;MACrB,OAAO,EAAE,EAAE;MACX,OAAO,EAAE,YAAY;MACrB,MAAM,EaGiD,IAAI;MbF3D,KAAK,EaEkD,IAAI;MbA3D,oFAAoF;MAElF,WAAW,EaFgD,CAAC;MbM9D,sBAAsB;IAItB,oDAAuB;MACrB,gBAAgB,EAAE,gDAAwC;MAC1D,gBAAgB,EAAE,gDAAwC;IaT5D,8CAAS;MACP,qBAAqB,EAAE,GAAG;EAI9B,sCAAsB;IAEpB,gBAAgB,EAAE,IAAI;IACtB,MAAM,EAAE,MAAM;IbpBhB,6CAAiB;MACf,gBAAgB,EAAE,uBAAkC;MACpD,gBAAgB,EAAE,uBAAkC;MACpD,eAAe,EAAE,IAAI;MACrB,OAAO,EAAE,EAAE;MACX,OAAO,EAAE,YAAY;MACrB,MAAM,EaY8B,MAAM;MbX1C,KAAK,EaW+B,MAAM;MbT1C,oFAAoF;MAElF,WAAW,EaO+B,CAAC;MbH7C,sBAAsB;IArHxB,oCAAsC;MauHtC,sCAAsB;QAOlB,MAAM,EAAE,OAAO;QACf,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,QAAQ;Qb1BtB,6CAAiB;UACf,gBAAgB,EAAE,wCAAkC;UACpD,gBAAgB,EAAE,wCAAkC;UACpD,eAAe,EAAE,IAAI;UACrB,OAAO,EAAE,EAAE;UACX,OAAO,EAAE,YAAY;UACrB,MAAM,EaiBiD,IAAI;UbhB3D,KAAK,EagBkD,IAAI;Ubd3D,oFAAoF;UAElF,WAAW,EaYgD,CAAC;UbR9D,sBAAsB;QAItB,mDAAuB;UACrB,gBAAgB,EAAE,8CAAwC;UAC1D,gBAAgB,EAAE,8CAAwC;QaO1D,6CAAS;UACP,qBAAqB,EAAE,GAAG;IAI9B,6CAAS;MACP,QAAQ,EAAE,QAAQ;MAClB,KAAK,EAAE,MAAM;MACb,GAAG,EAAE,OAAO;Mb1IhB,oCAAsC;QauIpC,6CAAS;UAML,QAAQ,EAAE,MAAM;IAIpB,8DAAwB;MACtB,OAAO,EAAE,IAAI;MblJjB,oCAAsC;QaiJpC,8DAAwB;UAIpB,OAAO,EAAE,MAAM;;AAMvB,gBAAiB;EACf,KAAK,EAAE,MAAM;;ACzMb,8BAAmB;EACjB,OAAO,EAAE,KAAK;AAGhB,oCAAyB;EACvB,KAAK,EX4FoB,OAAO;EW3FhC,OAAO,EAAE,KAAK;EACd,WAAW,ErBwBO,GAAG;EqBvBrB,UAAU,EAAE,CAAC;EACb,cAAc,ErB+ID,IAAI;EqB9IjB,WAAW,ErB8IE,IAAI;EqB7IjB,eAAe,EAAE,IAAI;EdkCvB,oCAAsC;IczCtC,oCAAyB;MAUrB,UAAU,EAAE,IAAI;EAGlB,0CAAQ;IACN,eAAe,EAAE,SAAS;AAI9B;sCAC2B;EACzB,eAAe,EAAE,IAAI;;AAIzB,wBAAyB;EACvB,OAAO,EAAE,YAAY;EAErB,0BAAE;IACA,KAAK,EXiEoB,OAAO;IWhEhC,eAAe,EAAE,IAAI;EAGvB,8BAAQ;IACN,eAAe,EAAE,SAAS;;AAI9B,yBAA0B;EACxB,KAAK,EX1CS,OAAO;EW2CrB,cAAc,ErB6GC,IAAI;EqB5GnB,WAAW,ErB4GI,IAAI;EqB3GnB,eAAe,EAAE,SAAS;;AAG5B,2BAA4B;EAC1B,gBAAgB,EXOW,OAAO;EWLlC,uDAA4B;IAC1B,YAAY,EAAE,MAAM;IACpB,aAAa,EAAE,MAAM;IdRvB,oCAAsC;McMtC,uDAA4B;QAKxB,YAAY,EAAE,CAAC;QACf,aAAa,EAAE,CAAC;IAGlB,0DAAG;MACD,WAAW,EAAE,IAAI;MdhBrB,oCAAsC;QcepC,0DAAG;UAIC,WAAW,EAAE,CAAC;EdnBpB,oCAAsC;IcwBtC,0CAAe;MAEX,YAAY,EAAE,MAAM;MACpB,aAAa,EAAE,MAAM;;AAOvB,6CAAE;EACA,MAAM,EAAE,UAAoB;EdnChC,oCAAsC;IckCpC,6CAAE;MAIE,MAAM,EAAE,UAAoB;AAKlC,8CAA4B;EAC1B,UAAU,EAAE,CAAC;Ed5Cf,oCAAsC;Ic2CtC,8CAA4B;MAIxB,UAAU,ErByDE,MAAM;MqBxDlB,aAAa,ErBwDD,MAAM;AqBpDtB,mCAAiB;EACf,OAAO,EAAE,MAAgB;EdrD3B,oCAAsC;IcoDtC,mCAAiB;MAIb,OAAO,EAAE,MAAiB;AAI9B,2CAAyB;EACvB,cAAc,ErB6CC,MAAM;EqB5CrB,WAAW,ErB4CI,MAAM;AqBxCrB,0DAAY;EACV,OAAO,EAAE,CAAC;EdnEd,oCAAsC;IckEpC,0DAAY;MAIR,YAAY,ErBsCJ,IAAI;MqBrCZ,aAAa,ErBqCL,IAAI;AO5GlB,qCAAsC;Ec2EpC,0EAA4B;IAExB,YAAY,EAAE,EAAE;IAChB,KAAK,EAAE,OAAO;Ad9EpB,qCAAsC;EciFlC,qFAAa;IAET,YAAY,EAAE,CAAC;AdnFvB,oCAAsC;EcyFtC,qCAAmB;IAEf,WAAW,EAAE,MAAM;;AAOrB,kCAAE;EACA,OAAO,EAAE,KAAK;AdnGlB,qCAAsC;EcsGpC,4DAA4B;IAExB,YAAY,EAAE,EAAE;IAChB,KAAK,EAAE,OAAO;AdzGpB,qCAAsC;Ec4GlC,uEAAa;IAET,YAAY,EAAE,CAAC;AAMvB,yCAAyB;EACvB,cAAc,ErBXC,MAAM;EqBYrB,WAAW,ErBZI,MAAM;AqBgBrB,wDAAY;EACV,OAAO,EAAE,CAAC;Ed3Hd,oCAAsC;Ic0HpC,wDAAY;MAIR,YAAY,ErBlBJ,IAAI;MqBmBZ,aAAa,ErBnBL,IAAI;AO5GlB,oCAAsC;EcyHtC,4CAA4B;IAWxB,cAAc,EAAE,CAAC;IACjB,WAAW,EAAE,CAAC;IAEd,2DAAe;MACb,WAAW,EAAE,MAAM;AdxIzB,oCAAsC;Ec8IpC,6CAAI;IAEA,MAAM,EAAE,CAAC;AdhJf,oCAAsC;Ec6ItC,yCAAyB;InBjHH,WAAO,EA3CzB,MAAa;IAoDO,cAAU,EApD9B,MAAa;AKejB,oCAAsC;Ec6ItC,yCAAyB;IAYrB,KAAK,EAAE,IAAI;AdzJf,qCAAsC;Ec6ItC,yCAAyB;IjBxHvB,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,oDAAa;MACX,YAAoB,EAAE,CAAC;;AiBuH/B,mDAAmD;AACnD;;6BAE8B;EAC5B,UAAU,EAAE,iBAA2B;EdtKvC,oCAAsC;IcmKxC;;iCAE8B;MAI1B,MAAM,EAAE,IAAI;EAGd;;0CAAa;IACX,aAAa,EAAE,iBAA2B;Id7K5C,oCAAsC;Mc4KtC;;8CAAa;QAIT,aAAa,EAAE,IAAI;;AAIzB,sBAAsB;AAEtB,kBAAmB;EACjB,cAAc,EAAE,MAAM;EACtB,YAAY,EAAE,MAAM;EACpB,aAAa,EAAE,MAAM;EdzLrB,oCAAsC;IcsLxC,kBAAmB;MAMf,KAAK,EAAE,KAAK;MACZ,OAAO,EAAE,CAAC;EAGZ,sCAAoB;IAClB,UAAU,EAAE,CAAC;EAGf,yBAAO;IACL,KAAK,EAAE,IAAI;IACX,YAAY,EAAE,CAAC;IACf,UAAU,EAAE,MAAM;EAGpB,wBAAM;IACJ,KAAK,EAAE,IAAI;;AAIf,6BAA8B;EAC5B,gBAAgB,EXtMW,OAAO;EWuMlC,cAAc,ErBtGC,IAAI;EqBuGnB,WAAW,ErBvGI,IAAI;EqByGnB,+BAAE;IACA,KAAK,EXjKoB,OAAO;;AHpDlC,oCAAsC;EcyNxC,iCAAkC;IAE9B,WAAW,ErBhHE,IAAI;IqBiHjB,cAAc,ErBjHD,IAAI;;AO3GnB,oCAAsC;EcgOxC,yBAA0B;IAEtB,UAAU,EAAE,KAAK;;AAKnB,mBAAE;EACA,eAAe,EAAE,IAAI;;AAKvB,wCAAyB;EACvB,OAAO,EAAE,KAAK;EAEd,0CAAE;IACA,MAAM,EAAE,UAAoB;IdjPhC,oCAAsC;McgPpC,0CAAE;QAIE,MAAM,EAAE,eAAmC;AdpPjD,oCAAsC;EcyPtC,yCAA0B;IAEtB,WAAW,ErBhJA,IAAI;AqBoJnB,gCAAiB;EACf,OAAO,EAAE,MAAgB;EdhQ3B,oCAAsC;Ic+PtC,gCAAiB;MAIb,OAAO,EAAE,MAAiB;AdnQ9B,oCAAsC;EcuQtC,2CAA4B;IAExB,cAAc,EAAE,IAAI;IACpB,WAAW,EAAE,IAAI;AAGnB,uDAAY;EACV,OAAO,EAAE,CAAC;Ed9Qd,oCAAsC;Ic6QpC,uDAAY;MAIR,YAAY,ErBrKJ,IAAI;MqBsKZ,aAAa,ErBtKL,IAAI;AqB0KhB,uEAA4B;EAC1B,YAAY,EAAE,CAAC;EACf,aAAa,EAAE,CAAC;EAEhB,0EAAG;IACD,WAAW,ErBjLA,MAAM;IO1GvB,oCAAsC;Mc0RlC,0EAAG;QAIC,WAAW,EAAE,CAAC;EAIlB,gGAAyB;IACvB,WAAW,EAAE,CAAC;AAKpB,kBAAG;EACD,cAAc,EAAE,MAAM;EdzSxB,oCAAsC;IcwStC,kBAAG;MAIC,cAAc,EAAE,CAAC;EAGnB,6BAAa;IACX,aAAa,EAAE,iBAA2B;IdhT9C,oCAAsC;Mc+SpC,6BAAa;QAIT,aAAa,EAAE,IAAI;EAIvB,mDAAiC;IAC/B,WAAW,ErB9UK,GAAG;IqB+UnB,cAAc,EAAE,MAAM;IACtB,WAAW,EAAE,MAAM;EAGrB,2CAAyB;IACvB,gBAAgB,EAAE,4BAAoC;IACtD,gBAAgB,EAAE,4BAAoC;IACtD,mBAAmB,EAAE,aAAa;IAClC,iBAAiB,EAAE,SAAS;IAC5B,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,MAAM;IdpUxB,oCAAsC;Mc6TpC,2CAAyB;QAUrB,UAAU,EAAE,IAAI;QAChB,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,CAAC;QACjB,YAAY,EAAE,CAAC;IAGjB,+CAAI;MnBjTc,UAAO,EAtCX,CAAC;MA+CK,aAAU,EA/ChB,CAAC;EmB4VjB,yBAAS;IAAE,wDAAwD;IACjE,cAAc,EAAE,CAAC;IAEjB,4BAAG;MACD,OAAO,EAAE,IAAI;IAGf,kDAAyB;MAAE,wDAAwD;MACjF,gBAAgB,EAAE,6BAAqC;MACvD,gBAAgB,EAAE,6BAAqC;MACvD,MAAM,EAAE,OAAO;MACf,OAAO,EAAE,KAAK;Md7VpB,oCAAsC;QcyVlC,kDAAyB;UAOrB,UAAU,EAAE,IAAI;UAChB,YAAY,EAAE,CAAC;;AAOzB,iBAAkB;EAChB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,MAAM;;Ad1Wf,oCAAsC;Ec6WxC,mBAAoB;IAEhB,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,MAAM;;AAInB,oBAAqB;EACnB,SAAS,EAAE,IAAI;EdrXf,oCAAsC;IcoXxC,oBAAqB;MAIjB,KAAK,EAAE,IAAI;;AAIf,wBAAyB;EACvB,SAAS,EAAE,KAAK;;AAGlB,yBAA0B;EACxB,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,IAAI;;AAGjB,wBAAyB;EACvB,OAAO,EAAE,KAAK;EACd,UAAU,ErB9RI,IAAI;EOzGlB,oCAAsC;IcqYxC,wBAAyB;MAKrB,OAAO,EAAE,YAAY;MACrB,UAAU,ErB/RE,IAAI;MqBgShB,YAAY,ErBlSG,MAAM;;AqBsSzB,4BAA6B;EAC3B,UAAU,ErBvSO,MAAM;EO1GvB,oCAAsC;IcgZxC,4BAA6B;MAIzB,UAAU,ErBzSG,IAAI;;AqB6SrB,6BAA8B;EAC5B,OAAO,EAAE,YAAY;EACrB,UAAU,ErBhTO,MAAM;EqBiTvB,YAAY,ErBjTK,MAAM;;AqBoTzB,2BAA4B;EAC1B,UAAU,EAAE,CAAC;Ed/Zb,oCAAsC;Ic8ZxC,2BAA4B;MAIxB,UAAU,EAAE,IAAI;;AAIpB,yFAAiB;EnBvXb,MAAO,EAtBF,oBAA4B;EmBoZnC,mBAAmB,EAAE,aAAa;EAClC,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,SAAuB;EACxC,OAAO,EAAE,YAAY;EACrB,MAAM,EAPK,MAAM;EAQjB,IAAI,EAAE,OAAO;EACb,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,MAAM;EAClB,KAAK,EAXM,MAAM;Ed1ajB,oCAAsC;IcsaxC,yFAAiB;MnBvXb,MAAO,EAtBF,YAA4B;MmBgajC,IAAI,ErB/UW,MAAM;EqBkVvB,kHAAK;IdrbL,QAAQ,EAAE,QAAQ;IAClB,IAAI,EAAE,MAAM;;Acybd,kBAAmB;EAEjB,gBAAgB,EAAE,6CAAqD;EACvE,gBAAgB,EAAE,6CAAqD;;AAGzE,iBAAkB;EAEhB,gBAAgB,EAAE,4CAAoD;EACtE,gBAAgB,EAAE,4CAAoD;;AAGxE,iBAAkB;EAEhB,gBAAgB,EAAE,4CAAoD;EACtE,gBAAgB,EAAE,4CAAoD;;AAGxE,aAAc;EAEZ,gBAAgB,EAAE,wCAAgD;EAClE,gBAAgB,EAAE,wCAAgD;;ACjgBlE,MAAE;EACA,aAAa,EAAE,CAAC;AAGlB;kBACc;EACZ,OAAO,EAAE,KAAK;EACd,aAAa,EAAE,KAAK;EACpB,UAAU,EAAE,MAAM;EfmCpB,oCAAsC;IevCtC;sBACc;MAMV,YAAY,EAAE,KAAK;MACnB,aAAa,EAAE,KAAK;MACpB,KAAK,EAAE,IAAI;AAIf;2BACuB;EACrB,aAAa,EAAE,MAAM;;AfwBvB,oCAAsC;EepBxC,SAAU;IAEN,SAAS,EA5BI,KAAK;;AAgCtB,cAAe;EACb,KAAK,EAAE,KAAK;EACZ,WAAW,EZXS,+EAA+E;EYYnG,SAAS,EtBdW,MAAM;EsBe1B,MAAM,EAAE,UAAU;EAElB,kBAAI;IACF,KAAK,EAAE,IAAI;;AAIf,QAAS;EACP,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;;AfAV,oCAAsC;EeGxC,eAAgB;IAEZ,SAAS,EAAE,KAAK;;AAKlB,oBAAiB;EAAE,wDAAwD;EfV3E,oCAAsC;IeUtC,oBAAiB;MAEb,SAAS,EAAE,IAAI;AAInB,sBAAmB;EAAE,wDAAwD;EfhB7E,oCAAsC;IegBtC,sBAAmB;MAEf,SAAS,EAAE,KAAK;;AflBpB,oCAAsC;EeuBxC,eAAgB;IAEZ,aAAa,EAAE,EAAE;;AfzBnB,oCAAsC;Ee6BxC,4BAA6B;IAEzB,aAAa,EAAE,CAAC;;Af/BlB,oCAAsC;EemCxC,qBAAsB;IAElB,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,GAAG;AAGZ,2BAAM;EACJ,aAAa,EAAE,IAAI;AAGrB,4BAAO;EACL,aAAa,EAAE,IAAI;;Af9CrB,oCAAsC;EekDxC,sBAAuB;IAEnB,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,GAAG;AAGZ,4BAAM;EACJ,aAAa,EAAE,IAAI;AAGrB,6BAAO;EACL,aAAa,EAAE,IAAI;;Af7DrB,oCAAsC;EeiExC,qBAAsB;IAElB,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,IAAI;AAGb,2BAAM;EACJ,aAAa,EAAE,IAAI;AAGrB,4BAAO;EACL,aAAa,EAAE,IAAI;;AAIvB,oBAAqB;EACnB,WAAW,EAAE,MAAM;;AAKrB,cAAe;EACb,UAAU,EAAE,IAAI;EAChB,WAAW,EAAE,CAAC;EACd,YAAY,EAAE,CAAC;EAEf,iBAAG;IACD,OAAO,EAAE,YAAY;IACrB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,CAAC;IAChB,UAAU,EAAE,CAAC;IACb,YAAY,EAAE,GAAG;IACjB,WAAW,EAAE,IAAI;IAEjB,yBAAU;MACR,OAAO,EAAE,GAAG;MACZ,OAAO,EAAE,YAAY;MACrB,MAAM,EAAE,IAAI;MACZ,YAAY,EAAE,IAAI;MAClB,KAAK,EAAE,KAAK;;AAMhB,8BAAU;EACR,gBAAgB,EAAE,0BAAkC;EACpD,gBAAgB,EAAE,0BAAkC;EACpD,mBAAmB,EAAE,IAAI;EACzB,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,IAAI;;AC7JrB,wDAAiB;EACf,aAAa,EvBgIO,IAAI;EOvF5B,oCAAsC;IgB1CpC,wDAAiB;MAIb,aAAa,EAAE,IAAiB;AhBsCtC,oCAAsC;EgBjClC,mEAAiB;IAEb,aAAa,EAAE,CAAC;AAGlB,8EAAa;EACX,aAAa,EAAE,CAAC;AAMxB,sCAAqB;EACnB,YAAY,EvB2GU,IAAI;AuBvG1B,sDAAe;EACb,UAAU,EAAE,CAAC;;ACnBnB,WAAY;EACV,KAAK,EAAE,IAAI;EACX,OAAO,EARS,IAAI;EjBwCpB,oCAAsC;IiBlCxC,WAAY;MAKR,aAAa,EAAE,iBAA6B;EAG9C,aAAE;IACA,aAAa,EAAE,IAAI;EjByBrB,oCAAsC;IiBtBtC,uBAAY;MAER,KAAK,EAAE,KAAK;MACZ,SAAS,EAAE,OAAO;;AAKxB,SAAU;EACR,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,IAAI;EACjB,WAAW,EAAE,MAAM;EjBWnB,oCAAsC;IiBdxC,SAAU;MAMN,WAAW,EAAE,MAAM;MACnB,WAAW,EAAE,CAAC;EAGhB,WAAE;IACA,KAAK,EduDoB,OAAO;IctDhC,eAAe,EAAE,IAAI;EAGvB,YAAG;IACD,OAAO,EAAE,IAAI;IjBFf,oCAAsC;MiBCtC,YAAG;QAIC,OAAO,EAAE,KAAK;;AAKpB,cAAe;EACb,OAAO,EAAE,KAAK;EACd,SAAS,ExBrCW,MAAM;EwBsC1B,UAAU,EAAE,MAAM;EAClB,WAAW,ExB5BS,GAAG;EwB6BvB,MAAM,EAAE,CAAC;EjBfT,oCAAsC;IiBUxC,cAAe;MAQX,OAAO,EAAE,KAAK;MACd,SAAS,EAAE,MAAM;MACjB,WAAW,ExB1CO,GAAG;;AwB8CzB,aAAc;EACZ,+DAA+D;EfiI/D,gBAAgB,EAAE,WAAW;EAC7B,MAAM,EAAE,CAAC;EACT,aAAa,EAAE,CAAC;EAChB,WAAW,ET5KS,GAAG;ES6KvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAChB,sBAAsB,EAAE,IAAI;EetI5B,gBAAgB,EdxEF,OAAO;EcyErB,KAAK,ExBvBsB,OAAO;EwBwBlC,OAAO,EAAE,MAAM;EACf,KAAK,EAAE,KAAK;EACZ,SAAS,ExBvDW,MAAM;EwBwD1B,MAAM,EAAE,IAAI;EACZ,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,MAAM;EAClB,eAAe,EAAE,IAAI;EACrB,cAAc,EAAE,SAAS;EACzB,KAAK,EAAE,MAAM;EACb,sBAAsB;Ef6HtB,mBAAQ;IACN,gBAAgB,EAAE,WAAW;EFpK/B,oCAAsC;IiBwBxC,aAAc;MAiBV,OAAO,EAAE,IAAI;EAGf,mBAAQ;IACN,KAAK,ExBxCoB,OAAO;IwByChC,gBAAgB,Ed1FG,OAAO;Ec6F5B,qBAAU;IACR,KAAK,ExB7CoB,OAAO;;AwBiDpC,YAAa;EC5DX,QAAQ,ED6DU,KAAK;ECzDnB,GAAU,EDyDW,CAAC;ECzDtB,KAAU,EDyDW,CAAC;ECzDtB,MAAU,EDyDW,CAAC;ECzDtB,IAAU,EDyDW,CAAC;EAC1B,UAAU,ExBlDiB,OAAO;EwBmDlC,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,oBAAoB;EAChC,UAAU,EAAE,MAAM;EAClB,OAAO,EAnGS,IAAI;EAqGpB,uBAAa;IACX,OAAO,EAAE,GAAG;IACZ,UAAU,EAAE,OAAO;;AjBhErB,oCAAsC;EiBuEtC,2BAAU;IAEN,MAAM,EAAE,CAAC;IACT,QAAQ,EAAE,QAAQ;AjB1EtB,oCAAsC;EiB8EtC,6BAAY;IAER,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,GAAG;;AjBjFd,oCAAsC;EiByFtC,gCAAY;IAER,aAAa,EAAE,IAAI;AjB3FvB,oCAAsC;EiB+FtC,8BAAU;ItBnEY,UAAO,EA3CzB,IAAa;IAoDO,aAAU,EApD9B,IAAa;AKejB,oCAAsC;EiBqGtC,uBAAG;IAEC,SAAS,EAAE,MAAM;IACjB,WAAW,EAAE,CAAC;AjBxGlB,oCAAsC;EiB4GtC,gCAAY;I1B9HZ,SAAS,ECJC,MAAM;IDMd,WAAI,EAAE,IAAI;IACV,YAAK,EAAE,IAAI;IIgDW,aAAS,EA/C7B,IAAwC;IAoDpB,YAAQ,EApD5B,IAAwC;IsB8HxC,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,IAAI;IACZ,SAAS,ExB5BW,MAAM;ICjH9B,uCAAS;MACP,KAAK,EAAE,IAAI;MACX,OAAO,EAAE,EAAE;MACX,OAAO,EAAE,KAAK;AMwBhB,oCAAsC;EiBsHtC,6BAAS;IAEL,UAAU,EAAE,iBAA6B;IACzC,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,IAAI;AjB3Hf,oCAAsC;EiB+HtC,mCAAe;I1BjJf,SAAS,ECJC,MAAM;IDMd,WAAI,EAAE,IAAI;IACV,YAAK,EAAE,IAAI;IIgDW,aAAS,EA/C7B,IAAwC;IA0DpB,YAAQ,EAxD5B,MAAkE;IsB+IlE,UAAU,EAAE,IAAI;IAChB,SAAS,ExB9CW,MAAM;IwB+C1B,QAAQ,EAAE,QAAQ;IvBhKtB,0CAAS;MACP,KAAK,EAAE,IAAI;MACX,OAAO,EAAE,EAAE;MACX,OAAO,EAAE,KAAK;AMwBhB,oCAAsC;EN3BtC,4CAAS;IACP,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;AuBuKZ,mIACsB;EAAE,wDAAwD;EjBhJpF,oCAAsC;IiB+IlC,mIACsB;MACS,wDAAwD;MACnF,mBAAmB,EAAE,oBAAoB;AjBlJjD,oCAAsC;EiBwJtC,kCAAc;ItB5HQ,WAAO,EA3CzB,MAAa;IAoDO,cAAU,EApD9B,MAAa;AKejB,oCAAsC;EiB+JpC,oDAAe;IAEX,YAAY,EAAE,MAAM;AjBjK1B,oCAAsC;EiBsKtC,kCAAc;IAEV,YAAY,ExBjFQ,IAAI;;A0BlI9B,SAAU;ExBuEc,WAAO,EA3CzB,IAAa;EAoDO,cAAU,EApD9B,IAAa;EwB1BjB,gBAAgB,EAAE,sBAA8B;EAChD,mBAAmB,EAAE,MAAM;EAC3B,eAAe,EAAE,KAAK;EAEtB,qBAAY;IACV,KAAK,E1ByCoB,OAAO;;A0BpClC,gCAAe;EACb,KAAK,EhBqEoB,OAAO;;AgBjEpC,iBAAkB;EAChB,gBAAgB,EhBlBM,OAAO;EgBmB7B,OAAO,EAAE,IAAI;EnBwBb,oCAAsC;ImB1BxC,iBAAkB;MAKd,SAAS,EAAE,KAAK;EAGlB,iCAAgB;IxB8CM,UAAO,EAtCX,CAAC;IAkDK,aAAU,EArD9B,IAAwC;;AwBA9C,qBAAsB;EACpB,KAAK,E1BiBsB,OAAO;E0BhBlC,OAAO,EAAE,KAAK;;AClChB,gBAAiB;EACf,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EpB2CtB,qCAAsC;IoB7CxC,gBAAiB;MAKb,OAAO,EAAE,OAAO;EAIhB,2DAAiC;IAC/B,UAAU,EAAE,CAAC;EAGf,0DAAgC;IAC9B,aAAa,EAAE,CAAC;;AAKtB,wBAAyB;EACvB,KAAK,EAAE,CAAC;;AAGV,6BAA8B;EAC5B,aAAa,E3B4GW,IAAI;E2B3G5B,KAAK,EAAE,CAAC;EpBoBR,qCAAsC;IoBtBxC,6BAA8B;MAK1B,aAAa,EAAE,CAAC;EAGlB,4CAAe;IACb,UAAU,EAAE,CAAC;;AC5BjB,oBAAqB;EAJnB,KAAK,EAAE,IAAI;EACX,YAAY,EAFwB,IAAI;;AAS1C,qBAAsB;EACpB,QAAQ,EAAE,MAAM;;ACElB,WAAY;EACV,aAAa,EAAE,iBAA2B;EAC1C,MAAM,EAAE,IAAI;EtBgCZ,oCAAsC;IsBlCxC,WAAY;MAKR,aAAa,EAAE,IAAI;MACnB,OAAO,EAAE,YAAY;MACrB,MAAM,EAAE,MAAM;;AAIlB,aAAc;EtBqEZ,uBAAuB,EAAE,SAAS;EAClC,sBAAsB,EAAE,WAAW;EA/CnC,oCAAsC;IsBnBpC,wBAAK;MAxBP,aAAa,EAAE,oBAA2B;MAC1C,cAAc,EAAE,MAAM;EtB0CtB,oCAAsC;IsBXpC,uCAAK;MAED,YAAY,EAAE,CAAC;MACf,aAAa,EAAE,MAAM;;AtBQ3B,oCAAsC;EsBFxC,kBAAmB;I/BhBjB,SAAS,ECJC,MAAM;IDMd,WAAI,EAAE,IAAI;IACV,YAAK,EAAE,IAAI;IIgDW,aAAS,EA/C7B,IAAwC;IAoDpB,YAAQ,EApD5B,IAAwC;I2BgB1C,SAAS,E7BoFa,MAAM;ICjH9B,yBAAS;MACP,KAAK,EAAE,IAAI;MACX,OAAO,EAAE,EAAE;MACX,OAAO,EAAE,KAAK;;A4B8BlB,QAAS;EJZP,QAAQ,EIeU,KAAK;EJXnB,GAAU,EIWW,CAAC;EJXtB,KAAU,EIWa,CAAC;EJXxB,MAAU,EIWe,CAAC;EJX1B,IAAU,EIWiB,IAAI;EAEnC,UAAU,E7BNiB,OAAO;E6BOlC,WAAW,EAAE,iBAA2B;EACxC,YAAY,EAAE,CAAC;EACf,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,UAAU,EAAE,IAAI;EAChB,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,iBAAgC;EAC3C,KAAK,EAZiB,KAAK;EAa3B,OAAO,EL1DS,IAAI;EjBsCpB,oCAAsC;IsBMxC,QAAS;M3BsBe,WAAO,EA3CzB,MAAa;MAgDO,aAAS,EA1Cf,CAAC;MAoDK,cAAU,EAnDhB,CAAC;M2BgCjB,WAAW,EAAE,IAAI;MACjB,OAAO,EAAE,KAAK;MACd,KAAK,EAAE,KAAK;MACZ,UAAU,EAAE,OAAO;MACnB,QAAQ,EAAE,QAAQ;MAClB,SAAS,EAAE,aAAa;MACxB,KAAK,EAAE,IAAI;EAGb,mBAAa;IACX,SAAS,EAAE,aAAa;IACxB,UAAU,EAAE,oBAAoB;EAGlC,YAAI;IACF,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;ItBxClB,oCAAsC;MsBsCtC,YAAI;QAKA,UAAU,EAAE,CAAC;EAIjB,qBAAa;IACX,WAAW,EAAE,iBAAwB;IACrC,KAAK,EnB9FO,OAAO;ImB+FnB,WAAW,E7BhEO,GAAG;I6BiErB,YAAY,EAAE,MAAM;ItBnDtB,oCAAsC;MsB+CtC,qBAAa;QAOT,KAAK,EnBFkB,OAAO;EmBMlC,oBAAY;IACV,KAAK,EAAE,IAAI;EtB3Db,oCAAsC;IsB8DtC,oBAAY;MAER,WAAW,EAAE,MAAM;MACnB,GAAG,EAAE,GAAG;;AAOd,gBAAiB;E3B5CO,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EsBuCf,UAAU,EAAE,MAAM;EAClB,KAAK,EAAE,CAAC;EtBtCR,qBAAK;IACH,aAAa,EAAE,CAAC;EA6FlB,qBAAK;IACH,gBAAgB,EAAE,WAAW;IAC7B,UAAU,EAAE,iBAAqB;IACjC,SAAS,EGpKY,MAAM;IHsK3B,iCAAc;MACZ,UAAU,EAAE,IAAI;EAIpB,kBAAE;IACA,MAAM,EAAE,IAAI;IACZ,KAAK,EG3FoB,OAAO;IH4FhC,OAAO,EAAE,KAAK;IACd,WAAW,EGxKO,+EAA+E;IHyKjG,WAAW,EAAE,GAAG;IAChB,OAAO,EAAE,2BAA2B;IACpC,eAAe,EAAE,IAAI;IAErB,wBAAQ;MACN,gBAAgB,EG5IO,OAAO;MH6I9B,KAAK,EGrMK,OAAO;MHsMjB,eAAe,EAAE,IAAI;IAGvB,wBAAQ;MACN,cAAc,EAAE,CAAC;MACjB,QAAQ,EAAE,QAAQ;MAClB,OAAO,EAAE,CAAC;IAGZ,8BAAc;MAAE,wDAAwD;MACtE,WAAW,EAAE,oBAA2B;MACxC,KAAK,EGjNK,OAAO;MHkNjB,WAAW,EPnLK,GAAG;MOoLnB,YAAY,EAAE,MAAM;EAtKxB,oCAAsC;IsBwExC,gBAAiB;MAMb,OAAO,EAAE,MAAM;EtB9EjB,oCAAsC;IsBiFtC,mBAAG;MAEC,UAAU,EAAE,IAAI;EAIpB,qBAAK;IACH,KAAK,EAAE,IAAI;ItBxFb,oCAAsC;MsBuFtC,qBAAK;QAID,OAAO,EAAE,YAAY;ItB3FzB,oCAAsC;MsB+FpC,yBAAI;Q3BhDJ,OAAO,EAtBF,oBAA4B;Q2ByE7B,KAAK,EnB3FgB,OAAO;QmB4F5B,SAAS,E7B5HK,MAAM;Q6B6HpB,WAAW,E7BlHG,GAAG;Q6BmHjB,WAAW,EAAE,CAAC;ItBrGpB,oCAAsC;MsBwGlC,+BAAQ;QAEJ,gBAAgB,EAAE,WAAW;EtB1GrC,oCAAsC;IsBgHtC,kBAAE;M3BpFoB,WAAO,EA3CzB,OAAa;MAoDO,cAAU,EApD9B,OAAa;E2B2IjB,uBAAO;IpB8BP,gBAAgB,EAAE,WAAW;IAC7B,MAAM,EAAE,CAAC;IACT,aAAa,EAAE,CAAC;IAChB,WAAW,ET5KS,GAAG;IS6KvB,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,IAAI;IAChB,sBAAsB,EAAE,IAAI;IFnH5B,uBAAuB,EAAE,SAAS;IAClC,sBAAsB,EAAE,WAAW;IsBkFjC,WAAW,E7BhJO,GAAG;I6BiJrB,WAAW,EAAE,GAAG;IAChB,OAAO,EAAE,6BAA6B;IpBgCxC,6BAAQ;MACN,gBAAgB,EAAE,WAAW;IFpK/B,oCAAsC;MsB4HtC,uBAAO;Q3B7EL,OAAO,EAtBF,oBAA4B;Q2B8G/B,KAAK,EnBhIkB,OAAO;QmBiI9B,SAAS,E7BjKO,MAAM;Q6BkKtB,WAAW,E7BvJK,GAAG;Q6BwJnB,WAAW,EAAE,CAAC;QACd,KAAK,EAAE,OAAO;IAGhB,6DACS;MACP,UAAU,E7BhDU,kBAA4B;I6BmDlD,6BAAQ;MACN,gBAAgB,EnBzIO,OAAO;MmB0I9B,KAAK,EnBlMK,OAAO;MH6CrB,oCAAsC;QsBmJpC,6BAAQ;UAKJ,gBAAgB,EAAE,WAAW;IAKjC,4CAAuB;MAAE,wDAAwD;MAC/E,gBAAgB,EAAE,0BAAkC;MACpD,gBAAgB,EAAE,0BAAkC;MACpD,iBAAiB,EAAE,SAAS;MAC5B,mBAAmB,EAAE,cAAc;MACnC,eAAe,EAAE,IAAI;MtBlKzB,oCAAsC;QsB6JpC,4CAAuB;UAQnB,gBAAgB,EAAE,kCAA0C;UAC5D,gBAAgB,EAAE,kCAA0C;UAC5D,mBAAmB,EAAE,oBAAwC;MtBvKnE,oCAAsC;QsB0KlC,kDAAQ;UAEJ,gBAAgB,EAAE,0CAAkD;UACpE,gBAAgB,EAAE,0CAAkD;IAK1E,2CAAsB;MAAE,wDAAwD;MAC9E,gBAAgB,EAAE,2BAAmC;MACrD,gBAAgB,EAAE,2BAAmC;MACrD,iBAAiB,EAAE,SAAS;MAC5B,mBAAmB,EAAE,cAAc;MACnC,eAAe,EAAE,IAAI;MtBvLzB,oCAAsC;QsBkLpC,2CAAsB;UAQlB,gBAAgB,EnBrOA,OAAO;UmBsOvB,KAAK,E7BtLgB,OAAO;U6BuL5B,gBAAgB,EAAE,wCAAgD;UAClE,gBAAgB,EAAE,wCAAgD;UAClE,mBAAmB,EAAE,oBAAwC;UAE7D,iDAAQ;YACN,gBAAgB,EnB5OF,OAAO;UmB+OvB,gDAAK;YA/OX,aAAa,EAAE,oBAA2B;YAC1C,cAAc,EAAE,MAAM;YAgPd,KAAK,E7BjMc,OAAO;EOLlC,oCAAsC;IsB6MpC;iCACa;MAEX,WAAW,EAAE,CAAC;MACd,YAAY,EAAE,MAAM;MAGlB;8CAAK;QACH,KAAK,EnBlQC,OAAO;MmBsQjB;wCAAK;QApQT,aAAa,EAAE,oBAA2B;QAC1C,cAAc,EAAE,MAAM;QAqQhB,KAAK,EnBvKgB,OAAO;;AHpDlC,oCAAsC;EsBsOlC,6CAAK;IA5QT,aAAa,EAAE,oBAA2B;IAC1C,cAAc,EAAE,MAAM;AAoRpB,gEAA2B;EAAE,wDAAwD;EtB/OvF,oCAAsC;IsBgPlC,qEAAK;MAtRT,aAAa,EAAE,oBAA2B;MAC1C,cAAc,EAAE,MAAM;AtBqCtB,oCAAsC;EsByPhC,uDAAK;IA/RX,aAAa,EAAE,oBAA2B;IAC1C,cAAc,EAAE,MAAM;;AAwSxB,kBAAmB;EACjB,UAAU,EAAE,MAAM;EtBpQlB,oCAAsC;IsBmQxC,kBAAmB;MAIf,UAAU,EAAE,CAAC;MACb,QAAQ,EAAE,QAAQ;MAClB,KAAK,E7BlLiB,IAAI;M6BmL1B,GAAG,EAAE,OAAO;EAGd,8BAAY;I3BjPU,UAAO,EA3CzB,MAAa;IAuDO,aAAU,EAhDhB,CAAC;IKQnB,oCAAsC;MsB6QtC,8BAAY;Q3BjPU,UAAO,EA3CzB,OAAa;QA0DO,aAAU,EAnDhB,CAAC;QAoDK,WAAQ,EAnDd,CAAC;Q2ByRf,KAAK,EAAE,IAAI;;AAKjB,wBAAyB;EACvB,UAAU,EAAE,MAAM;EtBxRlB,oCAAsC;IsBuRxC,wBAAyB;MAIrB,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,CAAC;EtB5Rf,oCAAsC;IsB+RtC,2BAAG;MAEC,OAAO,EAAE,MAAM;MACf,YAAY,EAAE,MAAM;EtBlSxB,oCAAsC;IsBqSpC,mDAA0B;MAEtB,KAAK,EnB7RgB,OAAO;MmB8R5B,OAAO,EAAE,GAAG;MACZ,YAAY,EAAE,MAAM;EAK1B;oDAC0B;IACxB,KAAK,EnBzSoB,OAAO;ImB0ShC,OAAO,EAAE,YAAY;IACrB,SAAS,E7B3US,MAAM;I6B4UxB,eAAe,EAAE,IAAI;IAErB;4DAAQ;MACN,KAAK,EnBnWK,OAAO;MmBoWjB,eAAe,EAAE,SAAS;EAI9B,kDAA0B;IpBjK1B,gBAAgB,EAAE,WAAW;IAC7B,MAAM,EAAE,CAAC;IACT,aAAa,EAAE,CAAC;IAChB,WAAW,ET5KS,GAAG;IS6KvB,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,IAAI;IAChB,sBAAsB,EAAE,IAAI;IoB4J1B,OAAO,EAAE,IAAI;IpB1Jf,wDAAQ;MACN,gBAAgB,EAAE,WAAW;IFpK/B,oCAAsC;MsB2TtC,kDAA0B;QAKtB,gBAAgB,EAAE,4BAAoC;QACtD,gBAAgB,EAAE,4BAAoC;QACtD,iBAAiB,EAAE,SAAS;QAC5B,mBAAmB,EAAE,WAAW;QAChC,eAAe,EAAE,MAAM;QACvB,OAAO,EAAE,YAAY;QACrB,YAAY,EAAE,MAAM;ItBtUxB,oCAAsC;MsByUpC,4DAAY;QAER,OAAO,EAAE,IAAI;EtB3UnB,oCAAsC;IsBiVpC,sCAAc;MAEZ,WAAW,EAAE,CAAC;MACd,YAAY,EAAE,CAAC;;AAOrB,gBAAiB;E3B/TO,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EA0If,MAAM,EAAE,CAAC;EACT,KAAK,EAAE,IAAI;EAzIX,qBAAK;IACH,aAAa,EAAE,CAAC;EA0IlB,mBAAG;IACD,MAAM,EAAE,IAAI;IACZ,SAAS,EP3MS,MAAM;EO8M1B,kBAAE;IACA,YAAY,EAAE,MAAM;IACpB,WAAW,EP7MO,GAAG;IO+MrB,wDACc;MAAE,wDAAwD;MACtE,MAAM,EAAE,IAAI;MACZ,YAAY,EAAE,MAAM;EAKtB,wCAAE;IACA,YAAY,EAAE,MAAM;IAEpB,8CAAQ;MACN,cAAc,EAAE,CAAC;IAGnB,8CAAQ;MACN,YAAY,EAAE,MAAM;EAzM1B,oCAAsC;IsB2VxC,gBAAiB;M3B/TO,UAAO,EAtCX,CAAC;MA+CK,aAAU,EA/ChB,CAAC;MK4CnB,eAAe,EAAE,IAAI;MACrB,YAAY,EAAE,CAAC;MLPO,WAAO,EA3CzB,OAAa;MAuDO,cAAU,EArD9B,MAAwC;M2B8W1C,gBAAgB,EnB5YI,OAAO;MmB6Y3B,KAAK,EAAE,OAAO;MACd,QAAQ,EAAE,QAAQ;MtB9TpB,qBAAK;QACH,aAAa,EAAE,CAAC;EsBgUlB,kCAAoB;IAClB,OAAO,EAAE,IAAI;EtBvWf,oCAAsC;IsB0WtC,kBAAE;MAEE,KAAK,E7BvWkB,OAAO;M6BwW9B,YAAY,EAAE,MAAM;EtB7WxB,oCAAsC;IsBgXpC,wBAAQ;MAEJ,gBAAgB,EnB7ZA,OAAO;MmB8ZvB,KAAK,E7B9WgB,OAAO;M6B+W5B,YAAY,EAAE,MAAM;MACpB,eAAe,EAAE,SAAS;EAchC,mBAAG;IACD,SAAS,E7B7ZS,MAAM;I6B8ZxB,aAAa,EAAE,CAAC;;AAMpB,cAAe;EpBjPb,gBAAgB,EAAE,WAAW;EAC7B,MAAM,EAAE,CAAC;EACT,aAAa,EAAE,CAAC;EAChB,WAAW,ET5KS,GAAG;ES6KvB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAChB,sBAAsB,EAAE,IAAI;EPlH1B,MAAO,EAtBF,2BAA4B;E2BqXnC,KAAK,EAAE,KAAK;EACZ,MAAM,E7BzSG,MAAM;E6B0Sf,UAAU,EAAE,MAAM;EAClB,KAAK,E7B3SI,MAAM;ES6Df,oBAAQ;IACN,gBAAgB,EAAE,WAAW;EFpK/B,oCAAsC;IsB2YxC,cAAe;MASX,OAAO,EAAE,IAAI;EAGf,kBAAI;IACF,KAAK,EAAE,MAAM;EAGf,kBAAI;IACF,KAAK,EAAE,IAAI;;AAIf,sBAAuB;EACrB,QAAQ,EAAE,MAAM;;AtBjahB,oCAAsC;EsBgbxC,aAAc;I3BpZU,WAAO,EA3CzB,OAAa;IAoDO,cAAU,EApD9B,OAAa;I2Bqcf,IAAI,EAAE,KAAK;IACX,KAAK,EAAE,IAAI;AtBvbb,oCAAsC;EsB0btC,qBAAU;IAnBV,gBAAgB,EnBldM,OAAO;ImBmd7B,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,CAAC;IACN,KAAK,EAAE,KAAK;IAgBR,KAAK,EAAE,IAAI;AtB7bf,oCAAsC;EsBictC,oBAAS;IA1BT,gBAAgB,EnBldM,OAAO;ImBmd7B,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,CAAC;IACN,KAAK,EAAE,KAAK;IAuBR,IAAI,EAAE,IAAI;;AtBpcd,oCAAsC;EsB0ctC,mCAAS;IAEL,YAAY,EAAE,CAAC;IACf,WAAW,EAAE,CAAC;IACd,KAAK,EAAE,IAAI;AAIf,yCAAe;EACb,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EtBpdxB,oCAAsC;IsBkdtC,yCAAe;MAKX,OAAO,EAAE,KAAK;MACd,KAAK,EAAE,KAAK;MACZ,UAAU,EAAE,OAAO;AtBzdvB,oCAAsC;EsB8dpC,0DAAe;IAEX,WAAW,EAAE,OAAO;;AtBhe1B,oCAAsC;EsBsexC,iBAAkB;IzBjdd,KAAK,EAAE,IAAsB;IAG3B,OAAO,EAAE,KAAK;IAed,YAAoB,EAAE,aAA+B;IACrD,KAAK,EAAE,cAAuC;IAE9C,4BAAa;MACX,YAAoB,EAAE,CAAC;IyB+b3B,+BAAgB;MzBrdhB,KAAK,EAAE,IAAsB;MAG3B,OAAO,EAAE,KAAK;MAed,YAAoB,EAAE,aAA+B;MACrD,KAAK,EAAE,cAAuC;MAE9C,0CAAa;QACX,YAAoB,EAAE,CAAC;IyBmc3B,+BAAgB;MACd,YAAY,EAAE,CAAC;AAInB,sBAAK;E3BvdiB,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EAEf,2BAAK;IACH,aAAa,EAAE,CAAC;;AuBzEpB,WAAY;EAEV,SAAS,EAAE,IAAI;EACf,QAAQ,EAAE,QAAQ;E7BKlB,kBAAS;IACP,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;E6BNhB;gCACmB;IAZnB,gBAAgB,EAAE,wBAAgC;IAClD,gBAAgB,EAAE,wBAAgC;IAClD,mBAAmB,EAAE,GAAG;IACxB,iBAAiB,EAAE,SAAS;IAW1B,yBAAyB,EAAE,CAAC;IAC5B,sBAAsB,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,KAAK,EAxBe,MAAM;IvB8C5B,oCAAsC;MuB9BtC;oCACmB;QAUf,gBAAgB,EAAE,IAAI;QACtB,KAAK,EA3Ba,MAAM;EvB6C5B,oCAAsC;IuBTlC;gDACkB;MAChB,SAAS,E9B1BK,MAAM;M8B2BpB,MAAM,EANC,MAAM;MAOb,KAAK,EAAE,oBAAsB;IAG/B;iDACmB;MACjB,SAAS,EpB/BQ,IAAI;MoBgCrB,MAAM,EAbC,MAAM;MAcb,KAAK,EAbC,OAAkB;EvBW9B,oCAAsC;IuBWlC;kDACkB;MAChB,KAAK,EAAE,mBAAsB;IAG/B;mDACmB;MA1DvB,gBAAgB,EAAE,wBAAgC;MAClD,gBAAgB,EAAE,wBAAgC;MAClD,mBAAmB,EAAE,GAAG;MACxB,iBAAiB,EAAE,SAAS;MAyDtB,KAAK,EAVC,MAAoB;EAgB9B,oCAA6C;IAC3C,wCAAc;MACZ,IAAI,EAAE,IAAI;MACV,QAAQ,EAAE,QAAQ;;AAO1B,kBAAmB;EAAE,wDAAwD;EAC3E,UAAU,EAAE,UAAU;EACtB,kBAAkB,EAAE,IAAI;;AAG1B;iBACkB;E5BbM,WAAO,EAtCX,CAAC;EA+CK,cAAU,EA/ChB,CAAC;E4BqDnB,0BAA0B,EAAE,CAAC;EAC7B,YAAY,EAAE,IAAI;EAClB,uBAAuB,EAAE,CAAC;EAC1B,UAAU,EAAE,UAAU;EACtB,KAAK,EAAE,IAAI;EACX,SAAS,E9BhFW,MAAM;E8BiF1B,MAAM,EAAE,MAAM;EACd,MAAM,EAAE,CAAC;EACT,KAAK,EAAE,mBAAoC;EvBnD3C,oCAAsC;IuBwCxC;qBACkB;MAad,KAAK,EAAE,mBAAqC;;AAIhD,uBAAwB;EvBnDtB,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,MAAM;EARZ,oCAAsC;IuB0DxC,uBAAwB;MvBzCtB,QAAQ,EAAE,MAAM;;AwB/DlB,YAAa;E7B0EW,WAAO,EA3CzB,IAAa;EAoDO,cAAU,EApD9B,IAAa;EKejB,oCAAsC;IwB9CxC,YAAa;M7B0EW,WAAO,EA3CzB,IAAa;MAoDO,cAAU,EApD9B,IAAa;;A6BvBnB,kBAAmB;EACjB,gBAAgB,ErBgDW,OAAO;;AqB7CpC,iBAAkB;EAChB,gBAAgB,ErBVM,OAAO;EqBW7B,KAAK,E/BqCsB,OAAO;E+BnClC;;;;;sBAKG;IACD,KAAK,ErB+DoB,OAAO;EqB5DlC,mBAAE;IACA,KAAK,E/ByBoB,OAAO;E+BtBlC,mBAAE;IACA,KAAK,ErB0BoB,OAAO;IqBxBhC,yBAAQ;MACN,KAAK,E/BkBkB,OAAO;;AgClDpC,iBAAkB;E9ByEM,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EAEf,sBAAK;IACH,aAAa,EAAE,CAAC;EA6FlB,sBAAK;IACH,gBAAgB,EAAE,WAAW;IAC7B,UAAU,EAAE,iBAAqB;IACjC,SAAS,EGpKY,MAAM;IHsK3B,kCAAc;MACZ,UAAU,EAAE,IAAI;EAIpB,mBAAE;IACA,MAAM,EAAE,IAAI;IACZ,KAAK,EG3FoB,OAAO;IH4FhC,OAAO,EAAE,KAAK;IACd,WAAW,EGxKO,+EAA+E;IHyKjG,WAAW,EAAE,GAAG;IAChB,OAAO,EAAE,2BAA2B;IACpC,eAAe,EAAE,IAAI;IAErB,yBAAQ;MACN,gBAAgB,EG5IO,OAAO;MH6I9B,KAAK,EGrMK,OAAO;MHsMjB,eAAe,EAAE,IAAI;IAGvB,yBAAQ;MACN,cAAc,EAAE,CAAC;MACjB,QAAQ,EAAE,QAAQ;MAClB,OAAO,EAAE,CAAC;IAGZ,+BAAc;MAAE,wDAAwD;MACtE,WAAW,EAAE,oBAA2B;MACxC,KAAK,EGjNK,OAAO;MHkNjB,WAAW,EPnLK,GAAG;MOoLnB,YAAY,EAAE,MAAM;;AyB/M1B,qBAAsB;E9BqEE,UAAO,EAtCX,CAAC;EA+CK,aAAU,EA/ChB,CAAC;EK4CnB,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,CAAC;EA0If,MAAM,EAAE,CAAC;EACT,KAAK,EAAE,IAAI;EAzIX,0BAAK;IACH,aAAa,EAAE,CAAC;EA0IlB,wBAAG;IACD,MAAM,EAAE,IAAI;IACZ,SAAS,EP3MS,MAAM;EO8M1B,uBAAE;IACA,YAAY,EAAE,MAAM;IACpB,WAAW,EP7MO,GAAG;IO+MrB,kEACc;MAAE,wDAAwD;MACtE,MAAM,EAAE,IAAI;MACZ,YAAY,EAAE,MAAM;EAKtB,6CAAE;IACA,YAAY,EAAE,MAAM;IAEpB,mDAAQ;MACN,cAAc,EAAE,CAAC;IAGnB,mDAAQ;MACN,YAAY,EAAE,MAAM;;A0BvP5B,YAAa;EACX,UAAU,EAAE,WAAW;EACvB,KAAK,EvBgGsB,OAAO;EuB/FlC,IAAI,EAAE,CAAC;EACP,OAAO,EAAE,WAAW;EACpB,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,OAAO;EACZ,UAAU,EAAE,oBAAoB;EAChC,OAAO,EAAE,GAAG;EAEZ,kBAAQ;IACN,UAAU,EjCwCe,OAAO;IiCvChC,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,QAAQ,EAAE,QAAQ;IAClB,GAAG,EAAE,CAAC;IACN,UAAU,EAAE,oBAAoB;;ACXpC,sBAAuB;EACnB,WAAW,ExBiBO,+EAA+E;EwBhBjG,WAAW,EAAE,IAAI;;AAGrB;0CAC2C;EACvC,eAAe,EAAE,IAAI;EACrB,KAAK,ExBVe,OAAO;;AwBa/B;;qBAEsB;EAClB,gBAAgB,ExBqES,OAAO;;AwBlEpC,sCAAuC;EACnC,gBAAgB,ElC4BS,OAAO;;AkCzBpC,sBAAuB;EACnB,KAAK,EAAE,KAAK;EAQZ,OAAO,EAAE,OAAO;EANhB,yBAAG;IACC,cAAc,EAAE,SAAS;IACzB,KAAK,ExBwBgB,OAAO;IwBvB5B,WAAW,EAAE,MAAM;;AAM3B;;;;;;kBAMmB;EACf,KAAK,ExBQoB,OAAO;;AwBLpC;;;kCAGmC;EAC/B,KAAK,ExB+CoB,OAAO;;AwB3CpC,eAAgB;EACZ,OAAO,EAAE,IAAI;;AAIjB,eAAgB;EACZ,SAAS,EAAE,IAAI;;AAGnB,0CAA2C;EACvC,OAAO,EAAE,YAAY;;AAIzB,QAAS;EACL,MAAM,EAAE,IAAI;;AAGhB,KAAM;EACF,UAAU,EAAE,IAAI;;AAGpB,uBAAwB;EACpB,SAAS,EAAE,IAAI;;AAOf,sCAAG;EACC,MAAM,EAAE,MAAM;EACd,UAAU,EAAE,MAAM;AAGtB,sCAAG;EACC,OAAO,EAAE,YAAY;EACrB,cAAc,EAAE,GAAG;;AAI3B,+BAAgC;EAC5B,SAAS,EAAE,IAAI;;AAGnB,2BAA4B;EACxB,GAAG,EAAE,CAAC;EACN,MAAM,EAAE,IAAI;EACZ,+BAAI;IACA,SAAS,EAAE,IAAI",
 "sources": ["../scss/uswds.scss","../scss/lib/grid/_box-sizing.scss","../scss/lib/_normalize.scss","../scss/core/_fonts.scss","../scss/lib/css3/_font-face.scss","../scss/lib/helpers/_font-source-declaration.scss","../scss/core/_grid.scss","../scss/lib/grid/_outer-container.scss","../scss/lib/settings/_grid.scss","../scss/core/_variables.scss","../scss/lib/mixins/_clearfix.scss","../scss/lib/helpers/_directional-values.scss","../scss/lib/grid/_media.scss","../scss/lib/grid/_span-columns.scss","../scss/lib/grid/_omega.scss","../scss/lib/grid/_shift.scss","../scss/core/_utilities.scss","../scss/core/_base.scss","../scss/elements/_buttons.scss","../../sass/_variables.scss","../scss/elements/_embed.scss","../scss/elements/_figure.scss","../scss/elements/_inputs.scss","../scss/elements/_labels.scss","../scss/elements/_list.scss","../scss/elements/_table.scss","../scss/elements/_typography.scss","../scss/components/_accordions.scss","../scss/components/_alerts.scss","../scss/components/_banner.scss","../scss/components/_footer.scss","../scss/components/_forms.scss","../scss/components/_graphic-list.scss","../scss/components/_header.scss","../scss/lib/addons/_position.scss","../scss/components/_hero.scss","../scss/components/_layout.scss","../scss/components/_media-block.scss","../scss/components/_navigation.scss","../scss/components/_search.scss","../scss/components/_section.scss","../scss/components/_sidenav.scss","../scss/components/_skipnav.scss","../../sass/uswds.scss"],
 "names": [],
 "file": "uswds.css"
diff --git a/web/themes/nsf/sass/_variables.scss b/web/themes/nsf/sass/_variables.scss
index fd2860d..7e86251 100644
--- a/web/themes/nsf/sass/_variables.scss
+++ b/web/themes/nsf/sass/_variables.scss
@@ -21,8 +21,9 @@ $h4-font-size:           1.7rem !default;
 // $heading-line-height: 1.3 !default;
 // $lead-line-height:    1.7 !default;
 //
-$font-sans:           'Source Sans Pro' !default;
-$font-serif:          'Merriweather' !default;
+$font-sans:           'Source Sans Pro', 'Helvetica Neue', 'Helvetica', 'Roboto', 'Arial', sans-serif !default;
+$font-serif:          'Work Sans', sans-serif !default;
+$font-mono:           'Overpass Mono', monospace !default;
 
 // TODO these should be called font-weight-${}
 // $font-normal:         400 !default;

From e8623900c0d357e9d08ab03349bd4faab54dfcd9 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 22 Mar 2018 00:36:33 -0700
Subject: [PATCH 060/143] Change header color, improve spacing of Tumblr
 entries

https://github.com/18F/nsf/issues/160
---
 web/themes/nsf/assets/css/uswds.css     | 7 +++++--
 web/themes/nsf/assets/css/uswds.css.map | 2 +-
 web/themes/nsf/sass/uswds.scss          | 5 ++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/web/themes/nsf/assets/css/uswds.css b/web/themes/nsf/assets/css/uswds.css
index 8b1b691..e575363 100644
--- a/web/themes/nsf/assets/css/uswds.css
+++ b/web/themes/nsf/assets/css/uswds.css
@@ -3638,7 +3638,7 @@ h1, h2, h3, h4, h5, h6 {
 h3.feed-item-title a,
 article.aggregator-item .field--name-fid a {
   text-decoration: none;
-  color: #112E51; }
+  color: #0071BC; }
 
 .region-sidebar-first,
 .region-sidebar-second,
@@ -3646,7 +3646,10 @@ article.aggregator-item .field--name-fid a {
   background-color: #E7F5FF; }
 
 .view-nsf-blog article.aggregator-item {
-  background-color: #ffffff; }
+  background-color: #ffffff;
+  padding: 2rem;
+  padding-top: 0.2rem;
+  margin-bottom: 3rem; }
 
 .region-sidebar-second {
   float: right;
diff --git a/web/themes/nsf/assets/css/uswds.css.map b/web/themes/nsf/assets/css/uswds.css.map
index b9114d6..1b3d454 100644
--- a/web/themes/nsf/assets/css/uswds.css.map
+++ b/web/themes/nsf/assets/css/uswds.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../scss/uswds.scss","../scss/lib/grid/_box-sizing.scss","../scss/lib/_normalize.scss","../scss/core/_fonts.scss","../scss/lib/css3/_font-face.scss","../scss/lib/helpers/_font-source-declaration.scss","../scss/core/_grid.scss","../scss/lib/grid/_outer-container.scss","../scss/lib/settings/_grid.scss","../scss/core/_variables.scss","../scss/lib/mixins/_clearfix.scss","../scss/lib/helpers/_directional-values.scss","../scss/lib/grid/_media.scss","../scss/lib/grid/_span-columns.scss","../scss/lib/grid/_omega.scss","../scss/lib/grid/_shift.scss","../scss/core/_utilities.scss","../scss/core/_base.scss","../scss/elements/_buttons.scss","../../sass/_variables.scss","../scss/elements/_embed.scss","../scss/elements/_figure.scss","../scss/elements/_inputs.scss","../scss/elements/_labels.scss","../scss/elements/_list.scss","../scss/elements/_table.scss","../scss/elements/_typography.scss","../scss/components/_accordions.scss","../scss/components/_alerts.scss","../scss/components/_banner.scss","../scss/components/_footer.scss","../scss/components/_forms.scss","../scss/components/_graphic-list.scss","../scss/components/_header.scss","../scss/lib/addons/_position.scss","../scss/components/_hero.scss","../scss/components/_layout.scss","../scss/components/_media-block.scss","../scss/components/_navigation.scss","../scss/components/_search.scss","../scss/components/_section.scss","../scss/components/_sidenav.scss","../scss/components/_skipnav.scss","../../sass/uswds.scss"],
 "names": [],
 "file": "uswds.css"
diff --git a/web/themes/nsf/sass/uswds.scss b/web/themes/nsf/sass/uswds.scss
index 0166ca5..964ab77 100644
--- a/web/themes/nsf/sass/uswds.scss
+++ b/web/themes/nsf/sass/uswds.scss
@@ -11,7 +11,7 @@ h1, h2, h3, h4, h5, h6 {
 h3.feed-item-title a,
 article.aggregator-item .field--name-fid a {
     text-decoration: none;
-    color: $color-primary-darkest;
+    color: $color-primary;
 }
 
 .region-sidebar-first,
@@ -22,6 +22,9 @@ article.aggregator-item .field--name-fid a {
 
 .view-nsf-blog article.aggregator-item {
     background-color: $color-white;
+    padding: 2rem;
+    padding-top: 0.2rem;
+    margin-bottom: 3rem;
 }
 
 .region-sidebar-second {

From 59d48644e47c345344c1b32235ac2abbafd891d6 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 22 Mar 2018 15:58:05 -0400
Subject: [PATCH 061/143] Implement approach to module/theme removal.

This should solve a complicated problem. As we add modules to our site,
they're rolled out via configuration synchronization. This'll run the
installation of new modules, including setting up database tables.
Unfortunately, removing modules isn't as simple as deleting the PHP lib and
deactivating the plugin. Modules and themes need to be fully uninstalled,
which will remove their content from the database and perform other sorts of
cleanup. Unfortunately, to do that, we need to have the PHP lib around to run
the cleanup.

So! What this does is add a step to our bootstrap script to run those
uninstall scripts when we deploy code. We will *keep* the PHP lib and a
reference to its Drupal uninstallation around until we're confident all
environments have been updated. At that point, we can remove the lib from
composer and remove the entry in this bootstrap script.
---
 bootstrap.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bootstrap.sh b/bootstrap.sh
index 514f000..7ed6626 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -28,6 +28,12 @@ install_drupal() {
 
 if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   drupal --root=$APP_ROOT/web list | grep database > /dev/null || install_drupal
+  # Mild data migration: fully delete database entries related to these
+  # modules. These plugins (and the dependencies) can be removed once they've
+  # been uninstalled in all environments
+  drupal --root=$APP_ROOT/web module:uninstall workflow
+  drupal --root=$APP_ROOT/web theme:uninstall bootstrap
+
   # Sync configs from code
   drupal --root=$APP_ROOT/web config:import
 

From 65a6b44968fa0fedb5b8dc3cc45653c74770ebaa Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 22 Mar 2018 16:03:33 -0400
Subject: [PATCH 062/143] Add back (for now) PHP libs we've removed.

They're not enabled, but the code must be present for us to uninstall them.
---
 composer.json |   2 +
 composer.lock | 146 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 147 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 451d28c..cb54389 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
         "composer/installers": "^1.2",
         "cweagans/composer-patches": "^1.6",
         "drupal-composer/drupal-scaffold": "^2.2",
+        "drupal/bootstrap": "^3.11",
         "drupal/brightcove": "^1.3",
         "drupal/console": "^1.0.2",
         "drupal/core": "~8.4",
@@ -39,6 +40,7 @@
         "drupal/scheduler": "^1.0",
         "drupal/time_formatter": "1.x-dev",
         "drupal/tour_ui": "^1.0@alpha",
+        "drupal/workflow": "^1.0",
         "drush/drush": "~8.0|^9.0.0-beta8",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3"
diff --git a/composer.lock b/composer.lock
index 7ef74f0..f458f9f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "e6840ffe2cb46efaa986a060c08dde41",
+    "content-hash": "1e8f381c09766b5590557d88c592e396",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -1541,6 +1541,71 @@
             "description": "Composer Plugin for updating the Drupal scaffold files when using drupal/core",
             "time": "2017-12-08T22:53:11+00:00"
         },
+        {
+            "name": "drupal/bootstrap",
+            "version": "3.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/bootstrap",
+                "reference": "8.x-3.11"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/bootstrap-8.x-3.11.zip",
+                "reference": "8.x-3.11",
+                "shasum": "6ff80e37e2e1f916646300889f3392764c9cdb32"
+            },
+            "require": {
+                "drupal/core": "~8.0"
+            },
+            "type": "drupal-theme",
+            "extra": {
+                "branch-alias": {
+                    "dev-3.x": "3.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-3.11",
+                    "datestamp": "1520792884",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Carver (markcarver)",
+                    "homepage": "https://www.drupal.org/u/markcarver",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "John McCormick (neardark)",
+                    "homepage": "https://www.drupal.org/u/neardark",
+                    "role": "Co-maintainer"
+                },
+                {
+                    "name": "Fabiano Sant'Ana (wundo)",
+                    "homepage": "https://www.drupal.org/u/wundo",
+                    "role": "Co-maintainer"
+                },
+                {
+                    "name": "wundo",
+                    "homepage": "https://www.drupal.org/user/25523"
+                }
+            ],
+            "description": "Built to use Bootstrap, a sleek, intuitive, and powerful front-end framework for faster and easier web development.",
+            "homepage": "https://www.drupal.org/project/bootstrap",
+            "support": {
+                "source": "http://cgit.drupalcode.org/bootstrap",
+                "docs": "https://drupal-bootstrap.org",
+                "issues": "https://www.drupal.org/project/issues/bootstrap",
+                "irc": "irc://irc.freenode.org/drupal-bootstrap"
+            }
+        },
         {
             "name": "drupal/brightcove",
             "version": "1.3.0",
@@ -3548,6 +3613,85 @@
                 "source": "http://cgit.drupalcode.org/typed_data"
             }
         },
+        {
+            "name": "drupal/workflow",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/workflow",
+                "reference": "8.x-1.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/workflow-8.x-1.0.zip",
+                "reference": "8.x-1.0",
+                "shasum": "2c439aab3f92b476cb88dbc517e131ea3cd7be47"
+            },
+            "require": {
+                "drupal/core": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0",
+                    "datestamp": "1513552385",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Bastlynn",
+                    "homepage": "https://www.drupal.org/user/275249"
+                },
+                {
+                    "name": "Heine",
+                    "homepage": "https://www.drupal.org/user/17943"
+                },
+                {
+                    "name": "JacobSingh",
+                    "homepage": "https://www.drupal.org/user/68912"
+                },
+                {
+                    "name": "NancyDru",
+                    "homepage": "https://www.drupal.org/user/101412"
+                },
+                {
+                    "name": "eaton",
+                    "homepage": "https://www.drupal.org/user/16496"
+                },
+                {
+                    "name": "johnv",
+                    "homepage": "https://www.drupal.org/user/591042"
+                },
+                {
+                    "name": "jvandyk",
+                    "homepage": "https://www.drupal.org/user/2375"
+                },
+                {
+                    "name": "mfredrickson",
+                    "homepage": "https://www.drupal.org/user/31994"
+                },
+                {
+                    "name": "q0rban",
+                    "homepage": "https://www.drupal.org/user/31022"
+                }
+            ],
+            "description": "Defines a field type with Workflows, containing customizable state transitions.",
+            "homepage": "https://www.drupal.org/project/workflow",
+            "support": {
+                "source": "http://cgit.drupalcode.org/workflow"
+            }
+        },
         {
             "name": "drush/drush",
             "version": "9.2.1",

From 609d413a1ff0246a6b7c480eb44fcf39e0c22ef2 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 22 Mar 2018 16:15:06 -0400
Subject: [PATCH 063/143] Remove configs which referenced bootstrap.

These were found by exporting the config after uninstalling the theme.
---
 ...block.block.views_block__blogs_block_2.yml | 30 -------------------
 ...block.block.views_block__blogs_block_3.yml | 30 -------------------
 ...block.block.views_block__blogs_block_4.yml | 30 -------------------
 ...block.block.views_block__blogs_block_5.yml | 30 -------------------
 .../block.block.views_block__news_block_1.yml | 30 -------------------
 .../block.block.views_block__news_block_2.yml | 24 ---------------
 6 files changed, 174 deletions(-)
 delete mode 100644 web/sites/default/config/block.block.views_block__blogs_block_2.yml
 delete mode 100644 web/sites/default/config/block.block.views_block__blogs_block_3.yml
 delete mode 100644 web/sites/default/config/block.block.views_block__blogs_block_4.yml
 delete mode 100644 web/sites/default/config/block.block.views_block__blogs_block_5.yml
 delete mode 100644 web/sites/default/config/block.block.views_block__news_block_1.yml
 delete mode 100644 web/sites/default/config/block.block.views_block__news_block_2.yml

diff --git a/web/sites/default/config/block.block.views_block__blogs_block_2.yml b/web/sites/default/config/block.block.views_block__blogs_block_2.yml
deleted file mode 100644
index 452391d..0000000
--- a/web/sites/default/config/block.block.views_block__blogs_block_2.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 4d843c77-dc7b-407f-80a7-bcdcb6497f93
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.blogs
-  module:
-    - system
-    - views
-  theme:
-    - bootstrap
-id: views_block__blogs_block_2
-theme: bootstrap
-region: content
-weight: -8
-provider: null
-plugin: 'views_block:blogs-block_2'
-settings:
-  id: 'views_block:blogs-block_2'
-  label: ''
-  provider: views
-  label_display: visible
-  views_label: ''
-  items_per_page: none
-visibility:
-  request_path:
-    id: request_path
-    pages: /blogs
-    negate: false
-    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__blogs_block_3.yml b/web/sites/default/config/block.block.views_block__blogs_block_3.yml
deleted file mode 100644
index fee3d39..0000000
--- a/web/sites/default/config/block.block.views_block__blogs_block_3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: de06a058-5870-454a-bd2f-723a096888bd
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.blogs
-  module:
-    - system
-    - views
-  theme:
-    - bootstrap
-id: views_block__blogs_block_3
-theme: bootstrap
-region: content
-weight: -7
-provider: null
-plugin: 'views_block:blogs-block_3'
-settings:
-  id: 'views_block:blogs-block_3'
-  label: 'BIO Buzz'
-  provider: views
-  label_display: visible
-  views_label: 'BIO Buzz'
-  items_per_page: none
-visibility:
-  request_path:
-    id: request_path
-    pages: /blogs
-    negate: false
-    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__blogs_block_4.yml b/web/sites/default/config/block.block.views_block__blogs_block_4.yml
deleted file mode 100644
index 83be09a..0000000
--- a/web/sites/default/config/block.block.views_block__blogs_block_4.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 8b50cf33-a16a-4d72-a89d-96a7157f2100
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.blogs
-  module:
-    - system
-    - views
-  theme:
-    - bootstrap
-id: views_block__blogs_block_4
-theme: bootstrap
-region: content
-weight: -6
-provider: null
-plugin: 'views_block:blogs-block_4'
-settings:
-  id: 'views_block:blogs-block_4'
-  label: DEBrief
-  provider: views
-  label_display: visible
-  views_label: DEBrief
-  items_per_page: none
-visibility:
-  request_path:
-    id: request_path
-    pages: /blogs
-    negate: false
-    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__blogs_block_5.yml b/web/sites/default/config/block.block.views_block__blogs_block_5.yml
deleted file mode 100644
index 0319765..0000000
--- a/web/sites/default/config/block.block.views_block__blogs_block_5.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 9fc47b43-e735-4a3f-89b1-5bf06a0502fa
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.blogs
-  module:
-    - system
-    - views
-  theme:
-    - bootstrap
-id: views_block__blogs_block_5
-theme: bootstrap
-region: content
-weight: -4
-provider: null
-plugin: 'views_block:blogs-block_5'
-settings:
-  id: 'views_block:blogs-block_5'
-  label: 'MCB Blog'
-  provider: views
-  label_display: visible
-  views_label: 'MCB Blog'
-  items_per_page: none
-visibility:
-  request_path:
-    id: request_path
-    pages: /blogs
-    negate: false
-    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__news_block_1.yml b/web/sites/default/config/block.block.views_block__news_block_1.yml
deleted file mode 100644
index e43d710..0000000
--- a/web/sites/default/config/block.block.views_block__news_block_1.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 31837708-d3b4-4cd4-b1d7-a4f83c9f51d9
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.news
-  module:
-    - system
-    - views
-  theme:
-    - bootstrap
-id: views_block__news_block_1
-theme: bootstrap
-region: content
-weight: -5
-provider: null
-plugin: 'views_block:news-block_1'
-settings:
-  id: 'views_block:news-block_1'
-  label: ''
-  provider: views
-  label_display: '0'
-  views_label: ''
-  items_per_page: none
-visibility:
-  request_path:
-    id: request_path
-    pages: '<front>'
-    negate: false
-    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__news_block_2.yml b/web/sites/default/config/block.block.views_block__news_block_2.yml
deleted file mode 100644
index bc455c7..0000000
--- a/web/sites/default/config/block.block.views_block__news_block_2.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 2787e407-fec7-4ea1-b875-55b184821221
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.news
-  module:
-    - views
-  theme:
-    - bootstrap
-id: views_block__news_block_2
-theme: bootstrap
-region: sidebar_first
-weight: 0
-provider: null
-plugin: 'views_block:news-block_2'
-settings:
-  id: 'views_block:news-block_2'
-  label: 'Recent news'
-  provider: views
-  label_display: visible
-  views_label: 'Recent news'
-  items_per_page: none
-visibility: {  }

From 698568a36bc4abd0952d38a5db80b4ec8bfc6a74 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 23 Mar 2018 11:27:21 -0700
Subject: [PATCH 064/143] Remove account menu, including 'log in' link

No one's meant to log in, currently, so let's not present the link.

https://github.com/18F/nsf/issues/161
https://github.com/18F/nsf/issues/162
---
 web/sites/default/config/block.block.nsf_account_menu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/sites/default/config/block.block.nsf_account_menu.yml b/web/sites/default/config/block.block.nsf_account_menu.yml
index 2fd953e..025a657 100644
--- a/web/sites/default/config/block.block.nsf_account_menu.yml
+++ b/web/sites/default/config/block.block.nsf_account_menu.yml
@@ -1,6 +1,6 @@
 uuid: 7aae90ad-403c-4150-a032-cf5fdfc15d7d
 langcode: en
-status: true
+status: false
 dependencies:
   config:
     - system.menu.account

From 7e3286d522769b422af59423865aacdb0930dd8d Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 23 Mar 2018 13:34:39 -0700
Subject: [PATCH 065/143] Add standard government banner from USWDS

The banner reads "An official website of the United States
government. Here's how you know", with a link to more information.

https://github.com/18F/nsf/issues/162
https://github.com/18F/nsf/issues/193
---
 web/sites/default/config/nsf.settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/sites/default/config/nsf.settings.yml b/web/sites/default/config/nsf.settings.yml
index c1e51c6..aba9243 100644
--- a/web/sites/default/config/nsf.settings.yml
+++ b/web/sites/default/config/nsf.settings.yml
@@ -12,7 +12,7 @@ favicon:
 uswds_header_style: basic
 uswds_header_mega: 0
 uswds_search: 0
-uswds_government_banner: 0
+uswds_government_banner: 1
 uswds_footer_style: slim
 uswds_footer_agency: 0
 uswds_footer_agency_name: ''

From 4e622e95a89125b024babb43562381a3cb707fb3 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 28 Mar 2018 10:58:06 -0400
Subject: [PATCH 066/143] Uninstall masquerade.

Per the experience we had when uninstalling workflow, we know we need to run
the `module:uninstall` command and _keep_ the PHP code until the modules are
completely removed from all environments. This is the first step of that
process.
---
 bootstrap.sh                                | 2 +-
 web/sites/default/config/core.extension.yml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 7ed6626..37e653e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -31,7 +31,7 @@ if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   # Mild data migration: fully delete database entries related to these
   # modules. These plugins (and the dependencies) can be removed once they've
   # been uninstalled in all environments
-  drupal --root=$APP_ROOT/web module:uninstall workflow
+  drupal --root=$APP_ROOT/web module:uninstall masquerade workflow
   drupal --root=$APP_ROOT/web theme:uninstall bootstrap
 
   # Sync configs from code
diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
index e5c49cc..afb67d6 100644
--- a/web/sites/default/config/core.extension.yml
+++ b/web/sites/default/config/core.extension.yml
@@ -41,7 +41,6 @@ module:
   inline_entity_form: 0
   inline_form_errors: 0
   link: 0
-  masquerade: 0
   media_entity: 0
   media_entity_brightcove: 0
   menu_ui: 0

From 3881a63888adf0afa5184898c044d1b4bcbdd03c Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 22 Mar 2018 11:28:21 -0400
Subject: [PATCH 067/143] Update README to cover cloud.gov, more local dev.

Lots of updates to the README here, including some context around cloud.gov,
a workflow for making configuration changes, and debugging suggestions.
---
 README.md | 413 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 406 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 3eff0fb..7c66a95 100644
--- a/README.md
+++ b/README.md
@@ -3,16 +3,33 @@ This is the working repository for the NSF Site Redesign &amp; Content Discovery
 
 ## Developing locally
 
+We'll use [Git](https://git-scm.com/) to pull down and manage our code base.
+There are [many](https://guides.github.com/introduction/git-handbook/)
+[excellent](https://git-scm.com/book/en/v2/Getting-Started-Git-Basics)
+[tutorials](http://git.huit.harvard.edu/guide/) for getting started with git,
+so we'll defer to them here. We'll assume you have cloned our repository and
+are now within it:
+
+```
+git clone https://github.com/18F/nsf.git
+cd nsf
+```
+
 We use [Docker](https://www.docker.com/) to get a local environment running
-quickly. Once we have cloned this repository to a local directory and have
-[installed
-Docker](https://store.docker.com/search?type=edition&offering=community), we
-can download PHP dependencies. We'll be using the bash-friendly scripts in
-`bin`, but they wouldn't need to be modified substantially for Windows or
-other environments.
+quickly.
+[Download](https://store.docker.com/search?type=edition&offering=community)
+and install the runtime compatible with your system. Note that [Docker for
+Windows](https://www.docker.com/docker-windows) requires Windows 10; use
+[Docker Toolbox](https://docs.docker.com/toolbox/toolbox_install_windows/) on
+older Windows environments. Docker will manage out PHP dependencies, get
+apache running, and generally allow us to run an instance of our application
+locally. We'll be using the
+[bash](https://www.gnu.org/software/bash/)-friendly scripts in `bin`, but they
+wouldn't need to be modified substantially for Windows or other environments.
+
+Our first step is to run
 
 ```
-cd path/to/nsf
 bin/composer install
 ```
 
@@ -80,3 +97,385 @@ Alternatively, if testing S3 integration, it's possible to configure Docker to
 use a real S3 bucket by editing `docker-compose.yml`. That file holds a series
 of values under the "s3" key which will need to be modified with your access
 credentials.
+
+### Workflow
+
+Making configuration changes to the application comes in roughly eight small steps:
+1. get the latest code
+1. create a feature branch
+1. make any dependency changes
+1. edit the Drupal admin
+1. export the configuration
+1. commit the changes
+1. push your branch to GitHub
+1. create a pull request to be reviewed
+
+To get the latest code, we can `fetch` it from GitHub.
+
+```
+git fetch origin
+git checkout origin/master
+```
+
+alternatively:
+
+```
+git checkout master
+git pull origin master
+```
+
+We then create a "feature" branch, meaning a branch of development that's
+focused on adding a single feature. We'll need to name the branch something
+unique, likely related to the task we're working on (perhaps including an
+issue number, for example).
+
+```
+git checkout -b 333-add-the-whatsit
+```
+
+If we are installing a new module or otherwise updating our dependencies, we
+next use composer. For example:
+
+```
+bin/composer require drupal/some-new-module
+```
+
+See the "Removing dependencies" section below for notes on that topic; it's a
+bit different than installation/updates.
+
+If we're making admin changes (including enabling any newly installed
+modules), we'll need to start our app locally.
+
+```sh
+docker-compose down # stop any running instance
+docker-compose up # start a new one with our code
+```
+
+Then navigate to [http://localhost:8080](http://localhost:8080) and log in as
+the root/root. Modify whatever settings desired, which will modify them in
+your local database. We'll next need to export those configurations to the
+file system:
+
+```
+bin/drupal config:export
+```
+
+We're almost done! We next need to review all of the changes and commit those
+that are relevant. Your git tool will have a diff viewer, but if you're using
+the command line, try
+
+```
+git add -p
+```
+
+to interactively select changes to stage for the commit. Note that you may see
+more config changes than expected
+([#189](https://github.com/18F/nsf/issues/189)); only add the changes relevant
+to your edits. Once the changes are staged, commit them, e.g. with
+
+```
+git commit -v
+```
+
+Be sure to add a descriptive commit message. Now we can send the changes to
+GitHub:
+
+```
+git push origin 333-add-the-whatsit
+```
+
+And request a review in GitHub's interface.
+
+### Removing dependencies
+
+As we add modules to our site, they're rolled out via configuration
+synchronization. This'll run the installation of new modules, including
+setting up database tables. Unfortunately, removing modules isn't as simple as
+deleting the PHP lib and deactivating the plugin. Modules and themes need to
+be fully uninstalled, which will remove their content from the database and
+perform other sorts of cleanup. Unfortunately, to do that, we need to have the
+PHP lib around to run the cleanup.
+
+Our solution is to have a step in our bootstrap script which uninstalls
+modules/themes prior to configuration import. To do this, we'll need to keep
+the PHP libs around so that the uninstallation hooks can be called. After
+we're confident that the library is uninstalled in all our environments, we
+can also remove it from the composer dependencies.
+
+See the `module:uninstall` and `theme:uninstall` steps of the bootstrap script
+to see how this is implemented.
+
+### Common errors
+
+#### There are more config file changes than I expected
+See [#189](https://github.com/18F/nsf/issues/189)
+
+#### Edits to `web/sites/default/xxx` won't go away
+Drupal's installation changes the directory permissions for
+`web/sites/default`, which can prevent git from modifying these files. As
+we're working locally, those permissions restrictions aren't incredibly
+important. We can revert them by granting ourselves "write" access again. In
+unix environments, we can run
+
+```
+chmod u+w web/sites/default
+```
+
+### Start from scratch
+
+As Docker is managing our environment, it's relatively easy to blow away our
+database and start from scratch.
+
+```
+docker-compose down -v
+```
+
+Generally, `down` spins down the running environment but doesn't delete any
+data. The `-v` flag, however, tells Docker to delete our data "volumes",
+clearing away all the database files.
+
+## Deploying code
+
+We prefer deploying code through a continuous integration system. This ensures
+reproducibility and allows us to add additional safe guards. Regardless of
+environment, however, our steps for deploying code are more or less the same:
+1. Install the `cf` executable and `autopilot` plugin (this can be done once)
+1. Clone a *fresh* copy of the repository (this must be done every time)
+1. Log into cloud.gov and target the appropriate environment
+1. Send our new code up to cloud.gov for deployment
+
+### Install cf/autopilot
+
+Follow the cloud foundry
+[instructions](https://docs.cloudfoundry.org/cf-cli/install-go-cli.html) for
+installing the `cf` executable. This command-line interface is our primary
+mechanism for interacting with cloud.gov.
+
+Though it's not required, it's also a good idea to install the `autopilot`
+plugin, which lets us deploy without downtime. `cf` will allow us to spin down
+our old code and spin up new code in its place, which implies some downtime.
+The `autopilot` plugin [goes
+further](https://github.com/contraband/autopilot#method) by letting us spin up
+a _second_ set of instances prior to deleting the old. Installation involves
+downloading the latest version of the plugin, ensuring that binary is
+executable, and telling `cf` about it. Below we have commands for a Linux
+environment, but OSX and Windows would be similar:
+
+```sh
+# Get the binary
+wget "https://github.com/contraband/autopilot/releases/download/0.0.3/autopilot-linux"
+# Make it executable
+chmod a+x autopilot-linux
+# Tell cf it exists
+cf install-plugin autopilot-linux
+```
+
+If performing a deployment manually (outside of CI), note that you'll only
+need to install these executables once for use with all future deployments.
+
+### Clone a fresh copy of the repo
+
+In a continuous integration environment, we'll always check out a fresh copy
+of the code base, but if deploying manually, it's import to make a new, clean
+checkout of our repository to ensure we're not sending up additional files.
+Notably, using `git status` to check for a clean environment is _not_ enough;
+our `.gitignore` does not match the `.cfignore` so git's status output isn't a
+guaranty that there are no additional files. If deploying manually, it makes
+sense to create a new directory and perform the checkout within that
+directory, to prevent conflicts with our local checkout.
+
+```
+git clone https://github.com/18F/nsf.git
+```
+
+As we don't need the full repository history, we could instead use an
+optimized version of that checkout:
+
+```
+git clone https://github.com/18F/nsf.git --depth=1
+```
+
+We'll also want to **c**hange our **d**irectory to be inside the repository.
+
+```
+cd nsf
+```
+
+### Log into cloud.gov
+
+We'll next need to log into cloud.gov and set our target environment. Our
+target environment depends on whether we want to deploy to staging or
+production -- we'll use `-s staging` or `-s prod` in the following commands.
+These commands are also slightly different if we're doing this manually or in
+a CI environment. For manual deployments, we'll use
+
+```
+cf login -a https://api.fr.cloud.gov --sso -o nsf-prototyping -s staging
+```
+
+This will prompt us to navigate to a single-singon url, which we'll need to
+use to log in. That process will end with a unique token, which we can paste
+into the terminal.
+
+If we're instead logging in via continuous integration, we'll need a
+[deployment
+account](https://cloud.gov/docs/services/cloud-gov-service-account/)'s
+credentials. With them, we can log in via
+
+```
+cf login -a https://api.fr.cloud.gov -u USERNAME -p PASSWORD -o nsf-prototyping -s staging
+```
+
+### Send our code
+
+Finally, we'll send up our code based on our staging or production "manifest"
+files. The recommended approach (using autopilot, as described above) is
+either
+
+```sh
+cf zero-downtime-push -f manifest.yml   # staging
+```
+
+or
+
+```sh
+cf zero-downtime-push -f manifest-prod.yml  # production
+```
+
+If we're not using autopilot, we can instead use
+
+```sh
+cf push -f manifest.yml # for staging
+```
+or
+```sh
+cf push -f manifest-prod.yml # for production
+```
+
+## Notes on cloud.gov
+
+Our preferred platform-as-a-service is [cloud.gov](https://cloud.gov/), due to
+its
+[FedRAMP-Authorization](https://cloud.gov/overview/security/fedramp-tracker/).
+Cloud.gov runs the open source [Cloud Foundry](https://www.cloudfoundry.org/)
+platform, which is very similar to [Heroku](https://www.heroku.com/). See
+cloud.gov's excellent [user docs](https://cloud.gov/docs/) to get acquainted
+with the system.
+
+### Debugging
+
+We'll assume you're already logged into cloud.gov. From there,
+
+```
+cf apps
+```
+will give a broad overview of the current application instances. We expect two
+"web" instances and one "cronish" worker in our environments, as described in
+our manifest files.
+
+```
+cf app web
+```
+will give us more detail about the "web" instances, specifically CPU, disk,
+and memory usage.
+
+```
+cf logs web
+```
+will let us attach to the emitted apache logs of our running "web" instances.
+If we add the `--recent` flag, we'll instead get output from our *recent* log
+history (and not see new logs as they come in). We can use these logs to debug
+500 errors. Be sure to look at cloud.gov's [logging
+docs](https://cloud.gov/docs/apps/logs/) (particularly, how to use Kibana) for
+more control.
+
+If necessary, we can also `ssh` into running instances. This should generally
+be avoided, however, as all modifications will be lost on next deploy. See the
+cloud.gov [docs on the topic](https://cloud.gov/docs/apps/using-ssh/) for more
+detail -- be sure to read the step about setting up the ssh environment.
+
+```
+cf ssh web
+```
+
+While the database isn't generally accessible outside the app's network, we
+can access it by setting up an SSH tunnel, as described in the
+[cf-service-connect](https://github.com/18F/cf-service-connect#readme) plugin.
+Note that the `web` and `cronish` instances don't have a `mysql` client (aside
+from PHP's PDO); sshing into them likely won't help.
+
+Of course, there are many more useful commands. Explore the cloud.gov [user
+docs](https://cloud.gov/docs/) to learn about more.
+
+### Updating secrets
+
+As our secrets are stored in a cloud.gov "user-provided service", to add new
+ones (or rotate existing secrets), we'll need to call the
+`update-user-provided-service` command. It can't be updated incrementally,
+however, so we'll need to set all of the secrets (including those that remain
+the same) at once.
+
+To grab the previous versions of these values, we can run
+
+```
+cf env web
+```
+
+and look in the results for the credentials of our "secrets" service (it'll be
+part of the `VCAP_SERVICES` section). Then, we update our `secrets` service
+like so:
+
+```
+cf update-user-provided-service secrets -p '{"BRIGHTCOVE_ACCOUNT":"Some Value", "BRIGHTCOVE_CLIENT":"Another value", ...}'
+```
+
+### Setting up a new cloud.gov space
+
+We shouldn't need to set up a cloud.gov space again (we have our `staging` and
+`prod` environments already), but we document setup here, should it be needed
+in the future. We'll assume we're already logged into cloud.gov and in the new
+space.
+
+First, we need to set up our three services (for database access, file
+storage, and secrets storage). This is lightly documented in the manifest
+files, but the first two commands are:
+
+```
+cf create-service aws-rds medium-mysql database
+cf create-service s3 basic storage
+```
+
+Setting up the secrets storage is a bit different, as we need to specify each
+secret in a JSON object:
+
+```
+cf create-user-provided-service secrets -p '{"BRIGHTCOVE_ACCOUNT": ..., ...}'
+```
+
+See the manifest files (or docker-compose.yml) for a full listing of secrets
+the application is anticipating.
+
+We will also likely want to set up a user to deploy our app from within CI.
+Cloud.gov's docs on [service
+accounts](https://cloud.gov/docs/services/cloud-gov-service-account/) describe
+the general steps; one implementation is:
+
+```
+cf create-service cloud-gov-service-account space-deployer deployer
+cf create-service-key deployer creds
+cf service-key deployer creds
+```
+
+The last step gives us the deployer account's username and password.
+
+Finally, if we need to recreate the .gov domain, we can follow the
+[instructions](https://cloud.gov/docs/services/cdn-route/) on cloud.gov:
+
+```sh
+# Kick off the process
+cf create-service cdn-route cdn-route beta.nsf.gov -c '{"domain": "beta.nsf.gov"}'
+# Get the CNAME info
+cf service beta.nsf.gov
+```
+
+We'll then need to create that CNAME record in the nsf.gov DNS.

From c403fde61034e3b0f9ae4a856140cc37ac395736 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 28 Mar 2018 16:23:10 -0400
Subject: [PATCH 068/143] Bump version of Drupal to 8.5.1.

See security release info: https://www.drupal.org/sa-core-2018-002
---
 composer.lock                        | 10 ++---
 web/.csslintrc                       | 40 +++++++++++++++++
 web/.editorconfig                    | 17 ++++++++
 web/.eslintignore                    |  8 ++++
 web/.eslintrc.json                   |  3 ++
 web/.gitattributes                   | 61 ++++++++++++++++++++++++++
 web/.ht.router.php                   | 65 ++++++++++++++++++++++++++++
 web/autoload.php                     |  3 ++
 web/sites/example.settings.local.php | 20 ++++++++-
 web/sites/example.sites.php          |  2 +
 10 files changed, 222 insertions(+), 7 deletions(-)
 create mode 100644 web/.csslintrc
 create mode 100644 web/.editorconfig
 create mode 100644 web/.eslintignore
 create mode 100644 web/.eslintrc.json
 create mode 100644 web/.gitattributes
 create mode 100644 web/.ht.router.php

diff --git a/composer.lock b/composer.lock
index f458f9f..9d85aca 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2002,16 +2002,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "8.5.0",
+            "version": "8.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "0b9070370e272da441b4be52561c559c05f4553d"
+                "reference": "2aeca7dfa2661296602ac16bf9fd6085f0a121be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/0b9070370e272da441b4be52561c559c05f4553d",
-                "reference": "0b9070370e272da441b4be52561c559c05f4553d",
+                "url": "https://api.github.com/repos/drupal/core/zipball/2aeca7dfa2661296602ac16bf9fd6085f0a121be",
+                "reference": "2aeca7dfa2661296602ac16bf9fd6085f0a121be",
                 "shasum": ""
             },
             "require": {
@@ -2233,7 +2233,7 @@
                 "GPL-2.0-or-later"
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-            "time": "2018-03-07T21:10:20+00:00"
+            "time": "2018-03-27T09:58:42+00:00"
         },
         {
             "name": "drupal/ctools",
diff --git a/web/.csslintrc b/web/.csslintrc
new file mode 100644
index 0000000..177e4fc
--- /dev/null
+++ b/web/.csslintrc
@@ -0,0 +1,40 @@
+--errors=box-model,
+         display-property-grouping,
+         duplicate-background-images,
+         duplicate-properties,
+         empty-rules,
+         ids,
+         import,
+         important,
+         known-properties,
+         outline-none,
+         overqualified-elements,
+         qualified-headings,
+         shorthand,
+         star-property-hack,
+         text-indent,
+         underscore-property-hack,
+         unique-headings,
+         unqualified-attributes,
+         vendor-prefix,
+         zero-units
+--ignore=adjoining-classes,
+         box-sizing,
+         bulletproof-font-face,
+         compatible-vendor-prefixes,
+         errors,
+         fallback-colors,
+         floats,
+         font-faces,
+         font-sizes,
+         gradients,
+         import-ie-limit,
+         order-alphabetical,
+         regex-selectors,
+         rules-count,
+         selector-max,
+         selector-max-approaching,
+         selector-newline,
+         universal-selector
+--exclude-list=core/assets,
+               vendor
diff --git a/web/.editorconfig b/web/.editorconfig
new file mode 100644
index 0000000..686c443
--- /dev/null
+++ b/web/.editorconfig
@@ -0,0 +1,17 @@
+# Drupal editor configuration normalization
+# @see http://editorconfig.org/
+
+# This is the top-most .editorconfig file; do not search in parent directories.
+root = true
+
+# All files.
+[*]
+end_of_line = LF
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[composer.{json,lock}]
+indent_size = 4
diff --git a/web/.eslintignore b/web/.eslintignore
new file mode 100644
index 0000000..9c13487
--- /dev/null
+++ b/web/.eslintignore
@@ -0,0 +1,8 @@
+core/**/*
+vendor/**/*
+sites/**/files/**/*
+libraries/**/*
+sites/**/libraries/**/*
+profiles/**/libraries/**/*
+**/js_test_files/**/*
+**/node_modules/**/*
diff --git a/web/.eslintrc.json b/web/.eslintrc.json
new file mode 100644
index 0000000..d4bbc92
--- /dev/null
+++ b/web/.eslintrc.json
@@ -0,0 +1,3 @@
+{
+  "extends": "./core/.eslintrc.json"
+}
diff --git a/web/.gitattributes b/web/.gitattributes
new file mode 100644
index 0000000..a37894e
--- /dev/null
+++ b/web/.gitattributes
@@ -0,0 +1,61 @@
+# Drupal git normalization
+# @see https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
+# @see https://www.drupal.org/node/1542048
+
+# Normally these settings would be done with macro attributes for improved
+# readability and easier maintenance. However macros can only be defined at the
+# repository root directory. Drupal avoids making any assumptions about where it
+# is installed.
+
+# Define text file attributes.
+# - Treat them as text.
+# - Ensure no CRLF line-endings, neither on checkout nor on checkin.
+# - Detect whitespace errors.
+#   - Exposed by default in `git diff --color` on the CLI.
+#   - Validate with `git diff --check`.
+#   - Deny applying with `git apply --whitespace=error-all`.
+#   - Fix automatically with `git apply --whitespace=fix`.
+
+*.config  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.css     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.dist    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.engine  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.html    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
+*.inc     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.js      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.json    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.lock    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.map     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.md      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.module  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.php     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.po      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.script  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.sh      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.sql     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.svg     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.theme   text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.twig    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.txt     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+*.yml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
+
+# Define binary file attributes.
+# - Do not treat them as text.
+# - Include binary diff in patches instead of "binary files differ."
+*.eot     -text diff
+*.exe     -text diff
+*.gif     -text diff
+*.gz      -text diff
+*.ico     -text diff
+*.jpeg    -text diff
+*.jpg     -text diff
+*.otf     -text diff
+*.phar    -text diff
+*.png     -text diff
+*.svgz    -text diff
+*.ttf     -text diff
+*.woff    -text diff
+*.woff2   -text diff
diff --git a/web/.ht.router.php b/web/.ht.router.php
new file mode 100644
index 0000000..3da80a1
--- /dev/null
+++ b/web/.ht.router.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Router script for the built-in PHP web server.
+ *
+ * The built-in web server should only be used for development and testing as it
+ * has a number of limitations that makes running Drupal on it highly insecure
+ * and somewhat limited.
+ *
+ * Note that:
+ * - The server is single-threaded, any requests made during the execution of
+ *   the main request will hang until the main request has been completed.
+ * - The web server does not enforce any of the settings in .htaccess in
+ *   particular a remote user will be able to download files that normally would
+ *   be protected from direct access such as .module files.
+ *
+ * The router script is needed to work around a bug in PHP, see
+ * https://bugs.php.net/bug.php?id=61286.
+ *
+ * Usage:
+ * php -S localhost:8888 .ht.router.php
+ *
+ * @see http://php.net/manual/en/features.commandline.webserver.php
+ */
+
+$url = parse_url($_SERVER['REQUEST_URI']);
+if (file_exists('.' . $url['path'])) {
+  // Serve the requested resource as-is.
+  return FALSE;
+}
+
+// Work around the PHP bug.
+$path = $url['path'];
+$script = 'index.php';
+if (strpos($path, '.php') !== FALSE) {
+  // Work backwards through the path to check if a script exists. Otherwise
+  // fallback to index.php.
+  do {
+    $path = dirname($path);
+    if (preg_match('/\.php$/', $path) && is_file('.' . $path)) {
+      // Discovered that the path contains an existing PHP file. Use that as the
+      // script to include.
+      $script = ltrim($path, '/');
+      break;
+    }
+  } while ($path !== '/' && $path !== '.');
+}
+
+// Update $_SERVER variables to point to the correct index-file.
+$index_file_absolute = $_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $script;
+$index_file_relative = DIRECTORY_SEPARATOR . $script;
+
+// SCRIPT_FILENAME will point to the router script itself, it should point to
+// the full path of index.php.
+$_SERVER['SCRIPT_FILENAME'] = $index_file_absolute;
+
+// SCRIPT_NAME and PHP_SELF will either point to index.php or contain the full
+// virtual path being requested depending on the URL being requested. They
+// should always point to index.php relative to document root.
+$_SERVER['SCRIPT_NAME'] = $index_file_relative;
+$_SERVER['PHP_SELF'] = $index_file_relative;
+
+// Require the script and let core take over.
+require $_SERVER['SCRIPT_FILENAME'];
diff --git a/web/autoload.php b/web/autoload.php
index 7d2408d..4722f6c 100644
--- a/web/autoload.php
+++ b/web/autoload.php
@@ -4,6 +4,9 @@
  * @file
  * Includes the autoloader created by Composer.
  *
+ * This file was generated by drupal-composer/drupal-scaffold.
+ * https://github.com/drupal-composer/drupal-scaffold
+ *
  * @see composer.json
  * @see index.php
  * @see core/install.php
diff --git a/web/sites/example.settings.local.php b/web/sites/example.settings.local.php
index 328779f..4a40a13 100644
--- a/web/sites/example.settings.local.php
+++ b/web/sites/example.settings.local.php
@@ -1,5 +1,7 @@
 <?php
 
+// @codingStandardsIgnoreFile
+
 /**
  * @file
  * Local development override configuration feature.
@@ -53,7 +55,7 @@
 $config['system.performance']['js']['preprocess'] = FALSE;
 
 /**
- * Disable the render cache (this includes the page cache).
+ * Disable the render cache.
  *
  * Note: you should test with the render cache enabled, to ensure the correct
  * cacheability metadata is present. However, in the early stages of
@@ -62,7 +64,7 @@
  * This setting disables the render cache by using the Null cache back-end
  * defined by the development.services.yml file above.
  *
- * Do not use this setting until after the site is installed.
+ * Only use this setting once the site has been installed.
  */
 # $settings['cache']['bins']['render'] = 'cache.backend.null';
 
@@ -74,6 +76,20 @@
  */
 # $settings['cache']['bins']['discovery_migration'] = 'cache.backend.memory';
 
+/**
+ * Disable Internal Page Cache.
+ *
+ * Note: you should test with Internal Page Cache enabled, to ensure the correct
+ * cacheability metadata is present. However, in the early stages of
+ * development, you may want to disable it.
+ *
+ * This setting disables the page cache by using the Null cache back-end
+ * defined by the development.services.yml file above.
+ *
+ * Only use this setting once the site has been installed.
+ */
+# $settings['cache']['bins']['page'] = 'cache.backend.null';
+
 /**
  * Disable Dynamic Page Cache.
  *
diff --git a/web/sites/example.sites.php b/web/sites/example.sites.php
index 60afae7..e4de67e 100644
--- a/web/sites/example.sites.php
+++ b/web/sites/example.sites.php
@@ -1,5 +1,7 @@
 <?php
 
+// @codingStandardsIgnoreFile
+
 /**
  * @file
  * Configuration file for multi-site support and directory aliasing feature.

From 3db512b6b2f057bbd57b48385cffd0743fcbe94b Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 28 Mar 2018 17:00:28 -0400
Subject: [PATCH 069/143] Unbind beta.nsf.gov.

Per conversation with Matt and Theresa, we don't want beta to be associated
with NSF until there's a full time team.
---
 manifest-prod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest-prod.yml b/manifest-prod.yml
index 51fc78f..5a38ab4 100644
--- a/manifest-prod.yml
+++ b/manifest-prod.yml
@@ -21,8 +21,8 @@ applications:
   memory: 256M
   instances: 1
   routes:
-    - route: beta.nsf.gov
     - route: nsf-beta.app.cloud.gov
+#   - route: beta.nsf.gov
 - name: cronish
   <<: *defaults
   no-route: true

From 4fb780c6dd65c3ed000383030e81aee7bd0c75d9 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 29 Mar 2018 11:17:30 -0400
Subject: [PATCH 070/143] Add section to README about upgrading deps.

---
 README.md | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/README.md b/README.md
index 7c66a95..0e9a0f7 100644
--- a/README.md
+++ b/README.md
@@ -205,6 +205,50 @@ can also remove it from the composer dependencies.
 See the `module:uninstall` and `theme:uninstall` steps of the bootstrap script
 to see how this is implemented.
 
+### Upgrading dependencies (e.g. Drupal)
+
+Updating dependencies through Composer is simple, though somewhat slow. First,
+we should spin down our local install:
+
+```
+docker-compose down
+```
+
+Then, we run the
+[`update`](https://getcomposer.org/doc/01-basic-usage.md#updating-dependencies-to-their-latest-versions)
+command:
+
+```
+bin/composer update [name-of-package, e.g. drupal/core]
+```
+
+After crunching away a while, you should see (e.g. via `git status`) that the
+`composer.lock` file has changed. Note that this command *doesn't* modify
+`composer.json` -- it will only update the package in a way that's
+[compatible](https://semver.org/). If you need to upgrade a major version
+(i.e. a backward-incompatible release), use the
+[`require`](https://getcomposer.org/doc/03-cli.md#require) command, e.g.
+
+```
+bin/composer require drupal/core:9.*
+```
+
+After installing the update, we should spin up our local instance
+
+```
+docker-compose up
+```
+
+and browse around [http://localhost:8080/](http://localhost:8080/) to make
+sure nothing's obviously broken. We shouldn't expect to see anything amiss if
+we've just `update`d, but need to be more careful around major version
+changes.
+
+We should then proceed with steps five through eight (exporting the config,
+committing, sending to GitHub, etc.). Even though we haven't actively modified
+any of the configurations, the updated libraries may have generated new ones
+which would be good to capture.
+
 ### Common errors
 
 #### There are more config file changes than I expected

From 611c75f27ff0284cbcd2d47cb49e743679afd234 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 29 Mar 2018 16:43:21 -0400
Subject: [PATCH 071/143] Execute all cron tasks every 15m.

Unfortunately, `cron:execute` claims everything went well, but doesn't
actually execute any cron tasks. By adding the "all" parameter, we solve his
problem.
---
 cronish.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cronish.sh b/cronish.sh
index 8f0c852..ad70591 100755
--- a/cronish.sh
+++ b/cronish.sh
@@ -3,6 +3,6 @@ set -euo pipefail
 
 while true
 do
-  drupal --root=$HOME/web cron:execute
+  drupal --root=$HOME/web cron:execute all
   sleep 15m
 done

From 720b76518e9b5d67f2260b8e8018b4155b257c99 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 09:33:47 -0400
Subject: [PATCH 072/143] Allow Drush to be used locally.

Drush needs to have access to a mysql client, lest it silently fails. We add
that to the base Docker image here.
---
 .docker/Dockerfile | 2 +-
 README.md          | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 56d434c..90132d2 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update &&\
     apt-get install -y \
       libbz2-dev libcurl4-openssl-dev libmcrypt-dev \
       libwebp-dev libjpeg-dev libpng12-dev \
-      git jq wget &&\
+      git jq wget mysql-client &&\
     docker-php-ext-install bz2 curl gd mbstring mcrypt pdo pdo_mysql zip &&\
     apt-get autoremove -y &&\
     rm -rf /var/lib/apt/lists/* &&\
diff --git a/README.md b/README.md
index 7c66a95..7406656 100644
--- a/README.md
+++ b/README.md
@@ -221,6 +221,14 @@ unix environments, we can run
 chmod u+w web/sites/default
 ```
 
+#### Drush is missing many commands
+We only recently added the necessary mysql client to the Dockerfile, so you
+may need to rebuild it:
+
+```
+docker-compose build
+```
+
 ### Start from scratch
 
 As Docker is managing our environment, it's relatively easy to blow away our

From 1d333f62525d19fcffe90eb16d5948e3c8bf0855 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 10:10:14 -0400
Subject: [PATCH 073/143] Switch to multi-buildpack to install mysql.

As drush needs a mysql client, we need to use the apt-buildpack to install one
(the repository already had a configuration for apt). As this means we need
both apt and php, we'll use the multi-buildpack.

Note that this'll require tweaking our ATO language a bit, as we're now more
responsible for updating PHP.
---
 manifest.yml        | 2 +-
 multi-buildpack.yml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 multi-buildpack.yml

diff --git a/manifest.yml b/manifest.yml
index 335a2a9..fba6070 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,6 +1,6 @@
 ---
 default_config: &defaults
-  buildpack: php_buildpack
+  buildpack: https://github.com/cloudfoundry/multi-buildpack#v1.0.3
   disk_quota: 512M
   timeout: 180
   services:
diff --git a/multi-buildpack.yml b/multi-buildpack.yml
new file mode 100644
index 0000000..d344b0a
--- /dev/null
+++ b/multi-buildpack.yml
@@ -0,0 +1,5 @@
+# These dependencies are pinned so that upgrades are explicit
+buildpacks:
+  # We need the "apt" build pack to install a mysql client for drush
+  - https://github.com/cloudfoundry/apt-buildpack#v0.1.1
+  - https://github.com/cloudfoundry/php-buildpack#v4.3.51

From 7c956426e82d7421329bceea71f11c74ecf7a3da Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 10:12:04 -0400
Subject: [PATCH 074/143] Add "Updating PHP" section to README.

---
 README.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/README.md b/README.md
index 7406656..51530b5 100644
--- a/README.md
+++ b/README.md
@@ -487,3 +487,31 @@ cf service beta.nsf.gov
 ```
 
 We'll then need to create that CNAME record in the nsf.gov DNS.
+
+### Updating PHP
+
+We use the Cloud Foundry's
+[Multi-buildpack](https://github.com/cloudfoundry/multi-buildpack) to allow us
+to install a mysql client (essential for Drush). This also requires we specify
+our PHP buildpack, which is unfortunate as it means we can't rely on the
+cloud.gov folks to deploy it for us. Luckily, updating the PHP buildpack is
+easy and we can check the latest version cloud.gov has tested.
+
+First, we'll find the version number by querying cloud.gov.
+```
+cf buildpacks
+```
+
+The output will include a PHP buildpack with version number, e.g.
+`php-buildpack-v4.3.51.zip`. This refers to the upstream (Cloud Foundry)
+buildpack version, so we'll update our `multi-buildpack.yml` accordingly:
+
+```yml
+buildpacks:
+  # We need the "apt" build pack to install a mysql client for drush
+  - https://github.com/cloudfoundry/apt-buildpack#v0.1.1
+  - https://github.com/cloudfoundry/php-buildpack#v4.3.51
+```
+
+We can also review cloud.gov's [release notes](https://cloud.gov/updates/) to
+see which buildpacks have been updated, though it's not as timely.

From f3be6a401d226e1359f3ec2c19a24e71bba8616e Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 10:41:26 -0400
Subject: [PATCH 075/143] Add Default Content Deploy, load content at boot.

We need to set up some content to deploy in all environments (much like
configuration), such as aggregator feeds. After spending several days failing
to use Drupal's migrations, I've gone with a module specialized for this use
case.
---
 README.md                                     |  41 +++++-
 bootstrap.sh                                  |   3 +
 composer.json                                 |   1 +
 composer.lock                                 | 136 +++++++++++++++++-
 web/sites/default/config/core.extension.yml   |   4 +
 web/sites/default/config/hal.settings.yml     |   4 +
 .../default/config/serialization.settings.yml |   4 +
 web/sites/default/content/.htaccess           |  24 ++++
 web/sites/default/settings.php                |   1 +
 9 files changed, 216 insertions(+), 2 deletions(-)
 create mode 100644 web/sites/default/config/hal.settings.yml
 create mode 100644 web/sites/default/config/serialization.settings.yml
 create mode 100644 web/sites/default/content/.htaccess

diff --git a/README.md b/README.md
index 51530b5..16c516a 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ use a real S3 bucket by editing `docker-compose.yml`. That file holds a series
 of values under the "s3" key which will need to be modified with your access
 credentials.
 
-### Workflow
+### Configuration workflow
 
 Making configuration changes to the application comes in roughly eight small steps:
 1. get the latest code
@@ -186,6 +186,45 @@ git push origin 333-add-the-whatsit
 
 And request a review in GitHub's interface.
 
+### Content workflow
+
+We'll also treat some pieces of content similar to configuration -- we want to
+deploy it with the code base rather than add/modify it in individual
+environments. The steps for this are very similar to the Config workflow:
+
+1. get the latest code
+1. create a feature branch
+1. add/edit content in the Drupal admin
+1. export the content
+1. commit the changes
+1. push your branch to GitHub
+1. create a pull request to be reviewed
+
+The first two steps are identical to the Config workflow, so we'll skip to the
+third. Start the application:
+
+```
+docker-compose up
+```
+
+Then [http://localhost:8080/user/login](log in) as root (password: root).
+Create or edit content (e.g. Aggregator feeds, pages, etc.) through the Drupal
+admin.
+
+Next, we'll export this content via Drush:
+
+```sh
+# Export all entities of a particular type
+bin/drush default-content-deploy:export [type-of-entity e.g. aggregator_feed]
+# Export individual entities
+bin/drush default-content-deploy:export [type-of-entity] --entity-id=[ids e.g. 1,3,7]
+```
+
+Then, we'll review all of the changes and commit those that are relevant.
+Notably, we're expecting new or modified files in `web/sites/default/content`.
+After committing, we'll sent to GitHub and create a pull request as with
+config changes.
+
 ### Removing dependencies
 
 As we add modules to our site, they're rolled out via configuration
diff --git a/bootstrap.sh b/bootstrap.sh
index 7ed6626..78aab7c 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -47,6 +47,9 @@ if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove client_id $BRIGHTCOVE_CLIENT > /dev/null
   drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove secret_key $BRIGHTCOVE_SECRET > /dev/null
 
+  # Import initial content
+  drush --root=$APP_ROOT/web default-content-deploy:import
+
   # Clear the cache
   drupal --root=$APP_ROOT/web cache:rebuild --no-interaction
 fi
diff --git a/composer.json b/composer.json
index cb54389..a55f79c 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,7 @@
         "drupal/console": "^1.0.2",
         "drupal/core": "~8.4",
         "drupal/ctools": "^3.0",
+        "drupal/default_content_deploy": "^1.0@alpha",
         "drupal/devel": "^1.2",
         "drupal/diff": "^1.0@RC",
         "drupal/embed": "^1.0",
diff --git a/composer.lock b/composer.lock
index 9d85aca..7292a04 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "1e8f381c09766b5590557d88c592e396",
+    "content-hash": "d46503590f4ef8832e6de4d4641e9e4f",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -2328,6 +2328,139 @@
                 "issues": "https://www.drupal.org/project/issues/ctools"
             }
         },
+        {
+            "name": "drupal/default_content",
+            "version": "1.0.0-alpha7",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/default_content",
+                "reference": "8.x-1.0-alpha7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/default_content-8.x-1.0-alpha7.zip",
+                "reference": "8.x-1.0-alpha7",
+                "shasum": "4f1b49cdad6d74ef879f4700caaa11703ba85ad7"
+            },
+            "require": {
+                "drupal/core": "~8.3"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0-alpha7",
+                    "datestamp": "1508448545",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Alpha releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Berdir",
+                    "homepage": "https://www.drupal.org/user/214652"
+                },
+                {
+                    "name": "Sam152",
+                    "homepage": "https://www.drupal.org/user/1485048"
+                },
+                {
+                    "name": "andypost",
+                    "homepage": "https://www.drupal.org/user/118908"
+                },
+                {
+                    "name": "benjy",
+                    "homepage": "https://www.drupal.org/user/1852732"
+                },
+                {
+                    "name": "dawehner",
+                    "homepage": "https://www.drupal.org/user/99340"
+                },
+                {
+                    "name": "jibran",
+                    "homepage": "https://www.drupal.org/user/1198144"
+                },
+                {
+                    "name": "larowlan",
+                    "homepage": "https://www.drupal.org/user/395439"
+                }
+            ],
+            "description": "Imports default content when a module is enabled",
+            "homepage": "https://www.drupal.org/project/default_content",
+            "support": {
+                "source": "http://cgit.drupalcode.org/default_content"
+            }
+        },
+        {
+            "name": "drupal/default_content_deploy",
+            "version": "1.0.0-alpha5",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/default_content_deploy",
+                "reference": "8.x-1.0-alpha5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/default_content_deploy-8.x-1.0-alpha5.zip",
+                "reference": "8.x-1.0-alpha5",
+                "shasum": "945475c5a46dafd921183cc7c7f0e9bcb0e1c1e2"
+            },
+            "require": {
+                "drupal/core": "~8.0",
+                "drupal/default_content": "1.0-alpha7",
+                "php": ">=5.6.0"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0-alpha5",
+                    "datestamp": "1518545580",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Project has not opted into security advisory coverage!"
+                    }
+                },
+                "drush": {
+                    "services": {
+                        "drush.services.yml": "^9"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Martin Klíma",
+                    "homepage": "https://www.drupal.org/user/340058",
+                    "email": "author@example.com"
+                },
+                {
+                    "name": "Jakub Hnilička",
+                    "homepage": "https://www.drupal.org/user/2784335"
+                },
+                {
+                    "name": "Radoslav Terezka"
+                }
+            ],
+            "description": "Drupal 8 module for deploying content in *.json files. Sponsored by: HBF s.r.o., http://hbf.sk, https://drupal.org/hbf",
+            "homepage": "https://www.drupal.org/project/default_content_deploy",
+            "support": {
+                "source": "http://cgit.drupalcode.org/default_content_deploy"
+            }
+        },
         {
             "name": "drupal/devel",
             "version": "1.2.0",
@@ -7211,6 +7344,7 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
+        "drupal/default_content_deploy": 15,
         "drupal/diff": 5,
         "drupal/entity_embed": 10,
         "drupal/flysystem_s3": 15,
diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
index e5c49cc..2295eec 100644
--- a/web/sites/default/config/core.extension.yml
+++ b/web/sites/default/config/core.extension.yml
@@ -18,6 +18,8 @@ module:
   ctools: 0
   datetime: 0
   dblog: 0
+  default_content: 0
+  default_content_deploy: 0
   devel: 0
   devel_generate: 0
   diff: 0
@@ -35,6 +37,7 @@ module:
   filter: 0
   flysystem: 0
   flysystem_s3: 0
+  hal: 0
   help: 0
   history: 0
   image: 0
@@ -55,6 +58,7 @@ module:
   scheduler: 0
   scheduler_rules_integration: 0
   search: 0
+  serialization: 0
   shortcut: 0
   system: 0
   taxonomy: 0
diff --git a/web/sites/default/config/hal.settings.yml b/web/sites/default/config/hal.settings.yml
new file mode 100644
index 0000000..afd7fa3
--- /dev/null
+++ b/web/sites/default/config/hal.settings.yml
@@ -0,0 +1,4 @@
+link_domain: null
+bc_file_uri_as_url_normalizer: false
+_core:
+  default_config_hash: swYtdod4psGvRvRY6OTGagGJPAuknS7WMgn1089yjL0
diff --git a/web/sites/default/config/serialization.settings.yml b/web/sites/default/config/serialization.settings.yml
new file mode 100644
index 0000000..ea2d8a5
--- /dev/null
+++ b/web/sites/default/config/serialization.settings.yml
@@ -0,0 +1,4 @@
+bc_primitives_as_strings: false
+bc_timestamp_normalizer_unix: false
+_core:
+  default_config_hash: 6A1rmsmNf4SJrwCEt_aZyO_kPYuFnIOPC2n5lJiIftA
diff --git a/web/sites/default/content/.htaccess b/web/sites/default/content/.htaccess
new file mode 100644
index 0000000..50d210b
--- /dev/null
+++ b/web/sites/default/content/.htaccess
@@ -0,0 +1,24 @@
+# Deny all requests from Apache 2.4+.
+<IfModule mod_authz_core.c>
+  Require all denied
+</IfModule>
+
+# Deny all requests from Apache 2.0-2.2.
+<IfModule !mod_authz_core.c>
+  Deny from all
+</IfModule>
+# Turn off all options we don't need.
+Options None
+Options +FollowSymLinks
+
+# Set the catch-all handler to prevent scripts from being executed.
+SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
+<Files *>
+  # Override the handler again if we're run later in the evaluation list.
+  SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
+</Files>
+
+# If we know how to do it safely, disable the PHP engine entirely.
+<IfModule mod_php5.c>
+  php_flag engine off
+</IfModule>
diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php
index 7e4b6fc..13e2ac5 100644
--- a/web/sites/default/settings.php
+++ b/web/sites/default/settings.php
@@ -772,6 +772,7 @@
 $settings['entity_update_batch_size'] = 50;
 
 $config_directories['sync'] = './sites/default/config/';
+$config['content_directory'] = './sites/default/content';
 $settings['install_profile'] = 'standard';
 include $app_root . '/' . $site_path . '/settings.cf.php';
 

From cfe0b0f5ecc2d560533f9839ffcedf4c749174ce Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 11:15:28 -0400
Subject: [PATCH 076/143] Add initial aggregator content.

---
 .../3f9d422e-3eb3-406c-b3e3-c4618832738e.json | 52 ++++++++++++++
 .../c79e1596-ba1f-48be-b953-94815ad66d7e.json | 67 +++++++++++++++++++
 2 files changed, 119 insertions(+)
 create mode 100644 web/sites/default/content/aggregator_feed/3f9d422e-3eb3-406c-b3e3-c4618832738e.json
 create mode 100644 web/sites/default/content/aggregator_feed/c79e1596-ba1f-48be-b953-94815ad66d7e.json

diff --git a/web/sites/default/content/aggregator_feed/3f9d422e-3eb3-406c-b3e3-c4618832738e.json b/web/sites/default/content/aggregator_feed/3f9d422e-3eb3-406c-b3e3-c4618832738e.json
new file mode 100644
index 0000000..635ef9e
--- /dev/null
+++ b/web/sites/default/content/aggregator_feed/3f9d422e-3eb3-406c-b3e3-c4618832738e.json
@@ -0,0 +1,52 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/aggregator\/sources\/2?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/aggregator_feed\/aggregator_feed"
+        }
+    },
+    "fid": [
+        {
+            "value": 2
+        }
+    ],
+    "uuid": [
+        {
+            "value": "3f9d422e-3eb3-406c-b3e3-c4618832738e"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en"
+        }
+    ],
+    "title": [
+        {
+            "value": "Notes from the Field"
+        }
+    ],
+    "url": [
+        {
+            "value": "http:\/\/nsfdirectorfieldnotes.tumblr.com\/rss"
+        }
+    ],
+    "refresh": [
+        {
+            "value": 3600
+        }
+    ],
+    "checked": [
+        {
+            "value": "1970-01-01T00:00:00+00:00",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "queued": [
+        {
+            "value": "1970-01-01T00:00:00+00:00",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/aggregator_feed/c79e1596-ba1f-48be-b953-94815ad66d7e.json b/web/sites/default/content/aggregator_feed/c79e1596-ba1f-48be-b953-94815ad66d7e.json
new file mode 100644
index 0000000..2c066ff
--- /dev/null
+++ b/web/sites/default/content/aggregator_feed/c79e1596-ba1f-48be-b953-94815ad66d7e.json
@@ -0,0 +1,67 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/aggregator\/sources\/1?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/aggregator_feed\/aggregator_feed"
+        }
+    },
+    "fid": [
+        {
+            "value": 1
+        }
+    ],
+    "uuid": [
+        {
+            "value": "c79e1596-ba1f-48be-b953-94815ad66d7e"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en"
+        }
+    ],
+    "title": [
+        {
+            "value": "National Science Foundation"
+        }
+    ],
+    "url": [
+        {
+            "value": "http:\/\/nationalsciencefoundation.tumblr.com\/rss"
+        }
+    ],
+    "refresh": [
+        {
+            "value": 3600
+        }
+    ],
+    "checked": [
+        {
+            "value": "2018-03-30T14:24:49+00:00",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "queued": [
+        {
+            "value": "1970-01-01T00:00:00+00:00",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "link": [
+        {
+            "value": "http:\/\/nationalsciencefoundation.tumblr.com\/"
+        }
+    ],
+    "description": [
+        {
+            "value": "The National Science Foundation (NSF) is an independent federal agency created by Congress in 1950. We fund a significant proportion of federally supported basic research. Follow our Tumblr to learn about projects, people and infrastructure in every\u2026"
+        }
+    ],
+    "hash": [
+        {
+            "value": "83e424da2f3877b827bcb8185732f278f6e234bb61eba0dd3fa47fe985357201"
+        }
+    ]
+}
\ No newline at end of file

From f53885442a0d0f4967e26f68663d8141f65a93d7 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 15:02:18 -0400
Subject: [PATCH 077/143] Ensure we're using the multi-buildpack in prod.

Missed this in #209.
---
 manifest-prod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest-prod.yml b/manifest-prod.yml
index 5a38ab4..eb38c25 100644
--- a/manifest-prod.yml
+++ b/manifest-prod.yml
@@ -1,6 +1,6 @@
 ---
 default_config: &defaults
-  buildpack: php_buildpack
+  buildpack: https://github.com/cloudfoundry/multi-buildpack#v1.0.3
   disk_quota: 512M
   timeout: 180
   services:

From 5379b5b06d05612ceb3ecfd6d37bc075c5d1678b Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 15:03:38 -0400
Subject: [PATCH 078/143] Use drush for cron.

Unfortunately, the Drupal Console cron isn't updating our aggregations.
Drush's version works correctly.
---
 cronish.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cronish.sh b/cronish.sh
index ad70591..b125efe 100755
--- a/cronish.sh
+++ b/cronish.sh
@@ -3,6 +3,6 @@ set -euo pipefail
 
 while true
 do
-  drupal --root=$HOME/web cron:execute all
+  drush --root=$HOME/web core:cron
   sleep 15m
 done

From c07c8101c592185de59d57e22037738f164431fc Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 12:06:47 -0400
Subject: [PATCH 079/143] Update default config.

These new blocks, etc. come from a newer version of Drupal.
---
 web/sites/default/config/README.txt            |  1 -
 ...orm_display.block_content.basic.default.yml |  6 ++++++
 ...e.entity_form_display.node.page.default.yml | 18 ++++++++++++++++++
 ...e.entity_form_display.user.user.default.yml |  6 ++++++
 ...re.entity_view_display.node.news.teaser.yml | 12 +++++++++++-
 web/sites/default/config/nsf.settings.yml      |  2 +-
 web/sites/default/config/search.settings.yml   |  1 -
 7 files changed, 42 insertions(+), 4 deletions(-)
 delete mode 100644 web/sites/default/config/README.txt

diff --git a/web/sites/default/config/README.txt b/web/sites/default/config/README.txt
deleted file mode 100644
index e2f9754..0000000
--- a/web/sites/default/config/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory structure contains the staging config for your site.
diff --git a/web/sites/default/config/core.entity_form_display.block_content.basic.default.yml b/web/sites/default/config/core.entity_form_display.block_content.basic.default.yml
index 8e24fcc..34dd2a4 100644
--- a/web/sites/default/config/core.entity_form_display.block_content.basic.default.yml
+++ b/web/sites/default/config/core.entity_form_display.block_content.basic.default.yml
@@ -31,4 +31,10 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  moderation_state:
+    type: moderation_state_default
+    weight: 100
+    settings: {  }
+    region: content
+    third_party_settings: {  }
 hidden: {  }
diff --git a/web/sites/default/config/core.entity_form_display.node.page.default.yml b/web/sites/default/config/core.entity_form_display.node.page.default.yml
index efe86e8..7e7bc2d 100644
--- a/web/sites/default/config/core.entity_form_display.node.page.default.yml
+++ b/web/sites/default/config/core.entity_form_display.node.page.default.yml
@@ -30,6 +30,12 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  moderation_state:
+    type: moderation_state_default
+    weight: 100
+    settings: {  }
+    region: content
+    third_party_settings: {  }
   path:
     type: path
     weight: 30
@@ -43,6 +49,12 @@ content:
     weight: 15
     region: content
     third_party_settings: {  }
+  publish_on:
+    type: datetime_timestamp_no_default
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   status:
     type: boolean_checkbox
     settings:
@@ -74,4 +86,10 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  unpublish_on:
+    type: datetime_timestamp_no_default
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden: {  }
diff --git a/web/sites/default/config/core.entity_form_display.user.user.default.yml b/web/sites/default/config/core.entity_form_display.user.user.default.yml
index d1fd7df..df4c8c9 100644
--- a/web/sites/default/config/core.entity_form_display.user.user.default.yml
+++ b/web/sites/default/config/core.entity_form_display.user.user.default.yml
@@ -24,6 +24,12 @@ content:
   language:
     weight: 0
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   timezone:
     weight: 6
     region: content
diff --git a/web/sites/default/config/core.entity_view_display.node.news.teaser.yml b/web/sites/default/config/core.entity_view_display.node.news.teaser.yml
index d3bf7dc..1a79e5a 100644
--- a/web/sites/default/config/core.entity_view_display.node.news.teaser.yml
+++ b/web/sites/default/config/core.entity_view_display.node.news.teaser.yml
@@ -22,7 +22,17 @@ content:
       trim_length: 600
     third_party_settings: {  }
     region: content
+  content_moderation_control:
+    weight: -20
+    region: content
   links:
     weight: 100
     region: content
-hidden: {  }
+hidden:
+  field_caption: true
+  field_featured_image: true
+  field_funding: true
+  field_media_queries: true
+  field_press_release_number: true
+  field_publication_date: true
+  field_subtitle: true
diff --git a/web/sites/default/config/nsf.settings.yml b/web/sites/default/config/nsf.settings.yml
index aba9243..8f4f9cd 100644
--- a/web/sites/default/config/nsf.settings.yml
+++ b/web/sites/default/config/nsf.settings.yml
@@ -5,7 +5,7 @@ features:
   favicon: 0
 logo:
   use_default: 0
-  path: 'themes/nsf/logo.png'
+  path: themes/nsf/logo.png
 favicon:
   use_default: 1
   path: ''
diff --git a/web/sites/default/config/search.settings.yml b/web/sites/default/config/search.settings.yml
index 52301dd..8d3840d 100644
--- a/web/sites/default/config/search.settings.yml
+++ b/web/sites/default/config/search.settings.yml
@@ -1,5 +1,4 @@
 and_or_limit: 7
-default_page: node_search
 index:
   cron_limit: 100
   overlap_cjk: true

From 43f7511529007eb57960f4bf65909ba2fb8d0fe1 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 12:16:26 -0400
Subject: [PATCH 080/143] Allow bootstrap to be ran separately.

When changing the bootstrap script, it's helpful to be able to run it outside
the context of running the whole Apache server.
---
 bin/bootstrap | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100755 bin/bootstrap

diff --git a/bin/bootstrap b/bin/bootstrap
new file mode 100755
index 0000000..ec71bc2
--- /dev/null
+++ b/bin/bootstrap
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+docker-compose run \
+  --rm \
+  --workdir /var/www \
+  web \
+  .docker/wait_for_db_then /var/www/bootstrap.sh

From 2f680767cd01cce6db21746ed3c7e788bcab928a Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 12:24:21 -0400
Subject: [PATCH 081/143] Put cron's key in the secrets repo.

We had been generating this randomly at app start, but that produces an
unintended diff every time the config is exported.
---
 bootstrap.sh       | 2 +-
 docker-compose.yml | 1 +
 manifest-prod.yml  | 1 +
 manifest.yml       | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index dca2c47..62ba054 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -38,10 +38,10 @@ if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   drupal --root=$APP_ROOT/web config:import
 
   # Secrets
-  CRON_KEY=$(openssl rand -base64 32)  # Not used, so we set it to a random val
   BRIGHTCOVE_ACCOUNT=$(echo $SECRETS | jq -r '.BRIGHTCOVE_ACCOUNT')
   BRIGHTCOVE_CLIENT=$(echo $SECRETS | jq -r '.BRIGHTCOVE_CLIENT')
   BRIGHTCOVE_SECRET=$(echo $SECRETS | jq -r '.BRIGHTCOVE_SECRET')
+  CRON_KEY=$(echo $SECRETS | jq -r '.CRON_KEY')
   drupal --root=$APP_ROOT/web config:override scheduler.settings lightweight_cron_access_key $CRON_KEY > /dev/null
   drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove account_id $BRIGHTCOVE_ACCOUNT > /dev/null
   drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove client_id $BRIGHTCOVE_CLIENT > /dev/null
diff --git a/docker-compose.yml b/docker-compose.yml
index eabde25..3d0fb9d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,6 +44,7 @@ services:
               "BRIGHTCOVE_ACCOUNT": "SECRET",
               "BRIGHTCOVE_CLIENT": "SECRET",
               "BRIGHTCOVE_SECRET": "SECRET",
+              "CRON_KEY": "SECRET",
               "HASH_SALT": "SECRET",
               "ROOT_USER_NAME": "root",
               "ROOT_USER_PASS": "root"
diff --git a/manifest-prod.yml b/manifest-prod.yml
index 5a38ab4..399600b 100644
--- a/manifest-prod.yml
+++ b/manifest-prod.yml
@@ -9,6 +9,7 @@ default_config: &defaults
                # "BRIGHTCOVE_ACCOUNT": ...
                # "BRIGHTCOVE_CLIENT": ...
                # "BRIGHTCOVE_SECRET": ...
+               # "CRON_KEY": ...
                # "HASH_SALT": ...
                # "ROOT_USER_NAME": ...,
                # "ROOT_USER_PASS": ...,
diff --git a/manifest.yml b/manifest.yml
index fba6070..668a92f 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -9,6 +9,7 @@ default_config: &defaults
                # "BRIGHTCOVE_ACCOUNT": ...
                # "BRIGHTCOVE_CLIENT": ...
                # "BRIGHTCOVE_SECRET": ...
+               # "CRON_KEY": ...
                # "HASH_SALT": ...
                # "ROOT_USER_NAME": ...,
                # "ROOT_USER_PASS": ...,

From 7fa24628c4a68142e0a1c43bae7b834733d4af57 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 12:27:18 -0400
Subject: [PATCH 082/143] Explicitly use the phrase "SECRET" for our secrets.

Our Docker environment uses "SECRET" as a placeholder for secret values as an
empty string is falsey in PHP. This updates our initial config to do the same.
---
 .../brightcove.brightcove_api_client.nsf_brightcove.yml     | 6 +++---
 web/sites/default/config/scheduler.settings.yml             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml b/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
index 1f043c8..eae2944 100644
--- a/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
+++ b/web/sites/default/config/brightcove.brightcove_api_client.nsf_brightcove.yml
@@ -6,8 +6,8 @@ _core:
   default_config_hash: mJhmisLlSYTJccOgeEcFWivzXD9BrliG8wDm1TmuNdA
 id: nsf_brightcove
 label: 'NSF Brightcove'
-account_id: ''
-client_id: ''
+account_id: SECRET
+client_id: SECRET
 default_player: default
-secret_key: ''
+secret_key: SECRET
 max_custom_fields: 10
diff --git a/web/sites/default/config/scheduler.settings.yml b/web/sites/default/config/scheduler.settings.yml
index ca74d6a..7f7ca9a 100644
--- a/web/sites/default/config/scheduler.settings.yml
+++ b/web/sites/default/config/scheduler.settings.yml
@@ -13,7 +13,7 @@ default_time: '09:00:00'
 default_unpublish_enable: false
 default_unpublish_required: false
 default_unpublish_revision: false
-lightweight_cron_access_key: 0f18f312c39cb2e0ab85
+lightweight_cron_access_key: SECRET
 log: true
 time_letters: hHgGisaA
 time_only_format: 'H:i:s'

From e65c7fecd8ff67c7cff134e0a1e54170ad64e38b Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 15:12:42 -0400
Subject: [PATCH 083/143] Remove article body field.

This is part of the standard Drupal install profile, but we don't actually
want it.
---
 bootstrap.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap.sh b/bootstrap.sh
index 62ba054..2750b84 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -21,6 +21,7 @@ install_drupal() {
     # Delete some data created in the "standard" install profile
     # See https://www.drupal.org/project/drupal/issues/2583113
     drupal --root=$APP_ROOT/web entity:delete shortcut_set default --no-interaction
+    drupal --root=$APP_ROOT/web config:delete active field.field.node.article.body --no-interaction
     # Set site uuid to match our config
     UUID=$(grep uuid $APP_ROOT/web/sites/default/config/system.site.yml | cut -d' ' -f2)
     drupal --root=$APP_ROOT/web config:override system.site uuid $UUID

From 5e53ab1ffab16aea73db4d8bfbfb9ec72dac6b41 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 15:15:56 -0400
Subject: [PATCH 084/143] Ensure Drush doesn't wait for input.

---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 2750b84..3aba768 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -49,7 +49,7 @@ if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove secret_key $BRIGHTCOVE_SECRET > /dev/null
 
   # Import initial content
-  drush --root=$APP_ROOT/web default-content-deploy:import
+  drush --root=$APP_ROOT/web default-content-deploy:import --no-interaction
 
   # Clear the cache
   drupal --root=$APP_ROOT/web cache:rebuild --no-interaction

From b276be6f21ef41c3a9e685e21190f1eb377decbb Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 15:50:37 -0400
Subject: [PATCH 085/143] Set admin email from secrets.

---
 bootstrap.sh                                       | 6 +++++-
 docker-compose.yml                                 | 1 +
 web/sites/default/config/contact.form.feedback.yml | 2 +-
 web/sites/default/config/system.site.yml           | 2 +-
 web/sites/default/config/update.settings.yml       | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 3aba768..7dc27a4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -39,14 +39,18 @@ if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   drupal --root=$APP_ROOT/web config:import
 
   # Secrets
+  ADMIN_EMAIL=$(echo $SECRETS | jq -r '.ADMIN_EMAIL')
   BRIGHTCOVE_ACCOUNT=$(echo $SECRETS | jq -r '.BRIGHTCOVE_ACCOUNT')
   BRIGHTCOVE_CLIENT=$(echo $SECRETS | jq -r '.BRIGHTCOVE_CLIENT')
   BRIGHTCOVE_SECRET=$(echo $SECRETS | jq -r '.BRIGHTCOVE_SECRET')
   CRON_KEY=$(echo $SECRETS | jq -r '.CRON_KEY')
-  drupal --root=$APP_ROOT/web config:override scheduler.settings lightweight_cron_access_key $CRON_KEY > /dev/null
   drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove account_id $BRIGHTCOVE_ACCOUNT > /dev/null
   drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove client_id $BRIGHTCOVE_CLIENT > /dev/null
   drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove secret_key $BRIGHTCOVE_SECRET > /dev/null
+  drupal --root=$APP_ROOT/web config:override contact.form.feedback recipients.0 $ADMIN_EMAIL > /dev/null
+  drupal --root=$APP_ROOT/web config:override scheduler.settings lightweight_cron_access_key $CRON_KEY > /dev/null
+  drupal --root=$APP_ROOT/web config:override system.site mail $ADMIN_EMAIL > /dev/null
+  drupal --root=$APP_ROOT/web config:override update.settings notification.emails.0 $ADMIN_EMAIL > /dev/null
 
   # Import initial content
   drush --root=$APP_ROOT/web default-content-deploy:import --no-interaction
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d0fb9d..998cac1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,6 +41,7 @@ services:
           "user-provided": [{
             "name": "secrets",
             "credentials": {
+              "ADMIN_EMAIL": "secret@example.com",
               "BRIGHTCOVE_ACCOUNT": "SECRET",
               "BRIGHTCOVE_CLIENT": "SECRET",
               "BRIGHTCOVE_SECRET": "SECRET",
diff --git a/web/sites/default/config/contact.form.feedback.yml b/web/sites/default/config/contact.form.feedback.yml
index be5afc7..56df2bb 100644
--- a/web/sites/default/config/contact.form.feedback.yml
+++ b/web/sites/default/config/contact.form.feedback.yml
@@ -7,7 +7,7 @@ _core:
 id: feedback
 label: 'Website feedback'
 recipients:
-  - rhys.fureigh@gsa.gov
+  - secret@example.com
 reply: ''
 weight: 0
 message: 'Your message has been sent.'
diff --git a/web/sites/default/config/system.site.yml b/web/sites/default/config/system.site.yml
index bcbc0d4..97a5272 100644
--- a/web/sites/default/config/system.site.yml
+++ b/web/sites/default/config/system.site.yml
@@ -1,6 +1,6 @@
 uuid: f047fa5b-89c8-4f6b-80de-7ea36c91cf55
 name: beta.nsf.gov
-mail: rhys.fureigh@gsa.gov
+mail: secret@example.com
 slogan: ''
 page:
   403: ''
diff --git a/web/sites/default/config/update.settings.yml b/web/sites/default/config/update.settings.yml
index 94078f0..a1d761b 100644
--- a/web/sites/default/config/update.settings.yml
+++ b/web/sites/default/config/update.settings.yml
@@ -7,7 +7,7 @@ fetch:
   timeout: 30
 notification:
   emails:
-    - rhys.fureigh@gsa.gov
+    - secret@example.com
   threshold: all
 _core:
   default_config_hash: 2QzULf0zovJQx3J06Y9rufzzfi-CY2CTTlEfJJh2Qyw

From 8b7266bf97eb7eb979484441cba29dee7f727fe4 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 15:53:00 -0400
Subject: [PATCH 086/143] Remove references to #189.

That's fixed now!
---
 README.md | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 5dae94e..84c27f4 100644
--- a/README.md
+++ b/README.md
@@ -168,10 +168,8 @@ the command line, try
 git add -p
 ```
 
-to interactively select changes to stage for the commit. Note that you may see
-more config changes than expected
-([#189](https://github.com/18F/nsf/issues/189)); only add the changes relevant
-to your edits. Once the changes are staged, commit them, e.g. with
+to interactively select changes to stage for the commit. Once the changes are
+staged, commit them, e.g. with
 
 ```
 git commit -v
@@ -290,9 +288,6 @@ which would be good to capture.
 
 ### Common errors
 
-#### There are more config file changes than I expected
-See [#189](https://github.com/18F/nsf/issues/189)
-
 #### Edits to `web/sites/default/xxx` won't go away
 Drupal's installation changes the directory permissions for
 `web/sites/default`, which can prevent git from modifying these files. As

From f6c26997fd77d20de31d1ea04283e11267df7a74 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 17:20:53 -0400
Subject: [PATCH 087/143] Remove contact form permission from anon users.

Per #205, we don't want anonymous users to be able to submit to the contact
from. We *may* want internal users to have access, in the future, however.
---
 web/sites/default/config/user.role.anonymous.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/sites/default/config/user.role.anonymous.yml b/web/sites/default/config/user.role.anonymous.yml
index 52f3bbe..c3c88eb 100644
--- a/web/sites/default/config/user.role.anonymous.yml
+++ b/web/sites/default/config/user.role.anonymous.yml
@@ -12,6 +12,5 @@ permissions:
   - 'access comments'
   - 'access content'
   - 'access news feeds'
-  - 'access site-wide contact form'
   - 'use text format restricted_html'
   - 'view published brightcove videos'

From b1ab9f4b8f3324609470971994a50eec6ef4f4ca Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 13 Apr 2018 16:59:16 -0700
Subject: [PATCH 088/143] Add `Social Media Policies` link to bottom of page

When the social media page is refactored to be a set of blocks
instead of one page, move this footer to the lowest block. As
it stands, though, we're using the page view of `nsf_blog`.

Fixes https://github.com/18F/nsf/issues/220
---
 web/sites/default/config/views.view.nsf_blog.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/web/sites/default/config/views.view.nsf_blog.yml b/web/sites/default/config/views.view.nsf_blog.yml
index 9a6754c..fa35e29 100644
--- a/web/sites/default/config/views.view.nsf_blog.yml
+++ b/web/sites/default/config/views.view.nsf_blog.yml
@@ -187,6 +187,7 @@ display:
         row: false
         pager: false
         fields: false
+        footer: true
       row:
         type: fields
       pager:
@@ -382,6 +383,20 @@ display:
       use_more: true
       use_more_always: false
       use_more_text: more
+      footer:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content:
+            value: '<a href="https://www.nsf.gov/social/policies.jsp">Social Media Policies</a>'
+            format: basic_html
+          plugin_id: text
     cache_metadata:
       max-age: -1
       contexts:

From cbf6f00f846c1319878266231fb1627e2acf6ed1 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 13 Apr 2018 17:11:36 -0700
Subject: [PATCH 089/143] Remove `more` link and pager

Cleaning up the appearance of the aggregated Tumblr posts.
---
 .../default/config/views.view.nsf_blog.yml    | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/web/sites/default/config/views.view.nsf_blog.yml b/web/sites/default/config/views.view.nsf_blog.yml
index 9a6754c..9960dba 100644
--- a/web/sites/default/config/views.view.nsf_blog.yml
+++ b/web/sites/default/config/views.view.nsf_blog.yml
@@ -44,23 +44,10 @@ display:
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
-        type: mini
+        type: some
         options:
           items_per_page: 10
           offset: 0
-          id: 0
-          total_pages: null
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: ‹‹
-            next: ››
       style:
         type: grid
         options:
@@ -171,7 +158,6 @@ display:
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
-        - url.query_args
       tags: {  }
   block_1:
     display_plugin: block
@@ -379,7 +365,7 @@ display:
         groups:
           1: AND
       enabled: true
-      use_more: true
+      use_more: false
       use_more_always: false
       use_more_text: more
     cache_metadata:
@@ -387,5 +373,4 @@ display:
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
-        - url.query_args
       tags: {  }

From 64dea34b1f3584674d5d83809dc7ea4aca24ea25 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 12 Apr 2018 13:32:24 -0400
Subject: [PATCH 090/143] Replace flysystem with s3fs.

s3fs will allow us to host our "public" files (e.g. compressed CSS/JS) on S3,
a feature flysystem lacks. We need this so that those files are saved between
deployments (and across instances).

This removes S3 from the docker-compose config so that the s3fs config is only
set when in cloud.gov (or mimicking locally).

Generated twig files are no longer stored in the "public" dir (as that'd touch
S3), so we ignore them in a gitignore.
---
 .gitignore                                    |  1 +
 README.md                                     | 39 ++++++------
 bootstrap.sh                                  |  2 +-
 composer.json                                 |  1 +
 composer.lock                                 | 61 ++++++++++++++++++-
 docker-compose.yml                            |  9 ---
 web/sites/default/config/core.extension.yml   |  3 +-
 ...ield.storage.node.field_featured_image.yml |  2 +-
 web/sites/default/settings.cf.php             | 28 ++++-----
 9 files changed, 93 insertions(+), 53 deletions(-)

diff --git a/.gitignore b/.gitignore
index 69b6639..6514bb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ core
 vendor
 
 # Ignore local versions of modules.
+storage
 modules/*
 web/modules/contrib/*
 web/themes/contrib/*
diff --git a/README.md b/README.md
index 84c27f4..b276e17 100644
--- a/README.md
+++ b/README.md
@@ -71,32 +71,27 @@ to port to other environments.
 
 ### File storage
 
-We've configured our file fields to store content in S3; in this way, they
-persist between app restarts and deploys. Unfortunately, those configurations
-are therefore also present locally, which can lead to unexpected results (we
-*don't* include sensitive bucket credentials, so we'll see "The file could not
-be uploaded."). If needing to work with  file uploads locally, modify the
-relevant field's "storage" away from "Flysystem: S3" to "Public files" (which
-means the local disk). This can be configured in the Drupal administration
-interface, or by editing the configuration files in
-`web/sites/default/config`. Notably, all instances of
+By default, we don't use S3 when running Drupal locally. If wanting to
+simulate the S3 environment, we need to add our credentials into the
+`VCAP_SERVICES` environment variable. Edit `docker-compose.yml` and insert
+something similar to the following above "user-provided":
 
-```yaml
-uri_scheme: s3
+```json
+"s3": [{
+  "name": "storage",
+  "credentials": {
+   "access_key_id": "SECRET",
+   "bucket": "SECRET",
+   "region": "SECRET",
+   "secret_access_key": "SECRET"
+  }
+}],
 ```
 
-should become
-
-```yaml
-uri_scheme: public
+To find the values we're using in cloud.gov, use
+```
+cf env web
 ```
-
-and Docker restarted.
-
-Alternatively, if testing S3 integration, it's possible to configure Docker to
-use a real S3 bucket by editing `docker-compose.yml`. That file holds a series
-of values under the "s3" key which will need to be modified with your access
-credentials.
 
 ### Configuration workflow
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 7dc27a4..8168f19 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -32,7 +32,7 @@ if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   # Mild data migration: fully delete database entries related to these
   # modules. These plugins (and the dependencies) can be removed once they've
   # been uninstalled in all environments
-  drupal --root=$APP_ROOT/web module:uninstall masquerade workflow
+  drupal --root=$APP_ROOT/web module:uninstall flysystem flysystem_s3 masquerade workflow
   drupal --root=$APP_ROOT/web theme:uninstall bootstrap
 
   # Sync configs from code
diff --git a/composer.json b/composer.json
index a55f79c..fbbba2d 100644
--- a/composer.json
+++ b/composer.json
@@ -38,6 +38,7 @@
         "drupal/media_entity": "^1.7",
         "drupal/pathauto": "^1.1",
         "drupal/rules": "^3.0@alpha",
+        "drupal/s3fs": "^3.0@alpha",
         "drupal/scheduler": "^1.0",
         "drupal/time_formatter": "1.x-dev",
         "drupal/tour_ui": "^1.0@alpha",
diff --git a/composer.lock b/composer.lock
index 7292a04..15ac780 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "d46503590f4ef8832e6de4d4641e9e4f",
+    "content-hash": "7e621693f087407a8ac39a62cff20d78",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -3447,6 +3447,64 @@
                 "source": "http://cgit.drupalcode.org/rules"
             }
         },
+        {
+            "name": "drupal/s3fs",
+            "version": "3.0.0-alpha9",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/s3fs",
+                "reference": "8.x-3.0-alpha9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/s3fs-8.x-3.0-alpha9.zip",
+                "reference": "8.x-3.0-alpha9",
+                "shasum": "85b564788483506a4a29244af41ee30601ad983c"
+            },
+            "require": {
+                "aws/aws-sdk-php": "^3.18",
+                "drupal/core": "~8.0"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-3.x": "3.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-3.0-alpha9",
+                    "datestamp": "1523006284",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Alpha releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Abhishek Anand",
+                    "homepage": "https://www.drupal.org/user/1140544",
+                    "email": "fly2abhishek@gmail.com"
+                },
+                {
+                    "name": "Juanen Bernal",
+                    "homepage": "https://www.drupal.org/u/jansete"
+                },
+                {
+                    "name": "naveenvalecha",
+                    "homepage": "https://www.drupal.org/user/2665733"
+                }
+            ],
+            "description": "Adds an Amazon Simple Storage Service-based remote file system to Drupal.",
+            "homepage": "https://www.drupal.org/project/s3fs",
+            "support": {
+                "source": "http://cgit.drupalcode.org/s3fs",
+                "issues": "https://www.drupal.org/project/issues/s3fs"
+            }
+        },
         {
             "name": "drupal/scheduler",
             "version": "1.0.0",
@@ -7351,6 +7409,7 @@
         "drupal/inline_entity_form": 10,
         "drupal/masquerade": 10,
         "drupal/rules": 15,
+        "drupal/s3fs": 15,
         "drupal/time_formatter": 20,
         "drupal/tour_ui": 15
     },
diff --git a/docker-compose.yml b/docker-compose.yml
index 998cac1..6e13003 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,15 +29,6 @@ services:
               "username": "root"
             }
           }],
-          "s3": [{
-            "name": "storage",
-            "credentials": {
-             "access_key_id": "SECRET",
-             "bucket": "SECRET",
-             "region": "SECRET",
-             "secret_access_key": "SECRET"
-            }
-          }],
           "user-provided": [{
             "name": "secrets",
             "credentials": {
diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
index 1fb3b4f..6ce764e 100644
--- a/web/sites/default/config/core.extension.yml
+++ b/web/sites/default/config/core.extension.yml
@@ -35,8 +35,6 @@ module:
   field_ui: 0
   file: 0
   filter: 0
-  flysystem: 0
-  flysystem_s3: 0
   hal: 0
   help: 0
   history: 0
@@ -54,6 +52,7 @@ module:
   quickedit: 0
   rdf: 0
   rules: 0
+  s3fs: 0
   scheduler: 0
   scheduler_rules_integration: 0
   search: 0
diff --git a/web/sites/default/config/field.storage.node.field_featured_image.yml b/web/sites/default/config/field.storage.node.field_featured_image.yml
index cc86876..b849e37 100644
--- a/web/sites/default/config/field.storage.node.field_featured_image.yml
+++ b/web/sites/default/config/field.storage.node.field_featured_image.yml
@@ -11,7 +11,7 @@ field_name: field_featured_image
 entity_type: node
 type: image
 settings:
-  uri_scheme: s3
+  uri_scheme: public
   default_image:
     uuid: ''
     alt: ''
diff --git a/web/sites/default/settings.cf.php b/web/sites/default/settings.cf.php
index aded671..dbf46fa 100644
--- a/web/sites/default/settings.cf.php
+++ b/web/sites/default/settings.cf.php
@@ -24,23 +24,17 @@
       $settings['hash_salt'] = $service['credentials']['HASH_SALT'];
     }
     if ($service['name'] === 'storage') {
-      $settings['flysystem']['s3'] = array(
-        'driver' => 's3',
-        'config' => array(
-          'key'    => $service['credentials']['access_key_id'],
-          'secret' => $service['credentials']['secret_access_key'],
-          'region' => $service['credentials']['region'],
-          'bucket' => $service['credentials']['bucket'],
-          // Optional configuration settings.
-          'options' => array(
-            'ACL' => 'public-read',
-            'ServerSideEncryption' => 'AES256',
-          ),
-          'protocol' => 'https',      // Will be autodetected based on the current request.
-          'prefix' => 'flysystem-s3', // Directory prefix for all uploaded/viewed files.
-        ),
-        'cache' => TRUE, // Creates a metadata cache to speed up lookups.
-      );
+      $config['s3fs.settings']['access_key'] = $service['credentials']['access_key_id'];
+      $config['s3fs.settings']['bucket'] = $service['credentials']['bucket'];
+      $config['s3fs.settings']['encryption'] = 'AES256';
+      $config['s3fs.settings']['public_folder'] = 'public';
+      $config['s3fs.settings']['private_folder'] = 'private';
+      $config['s3fs.settings']['region'] = $service['credentials']['region'];
+      $config['s3fs.settings']['secret_key'] = $service['credentials']['secret_access_key'];
+      $config['s3fs.settings']['use_https'] = TRUE;
+      $settings['s3fs.use_s3_for_public'] = TRUE;
+      // Twig templates _shouldn't_ be in the public dir (lest they be very slow)
+      $settings['php_storage']['twig']['directory'] = '../storage/php';
     }
   }
 }

From 7eef7289853819682c2c133692fa5e3af098e3da Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Mon, 16 Apr 2018 12:35:30 -0400
Subject: [PATCH 091/143] Proxy compressed CSS/JS files in S3.

The s3fs module will _store_ generated CSS/JS files in S3, but Drupal will
still generate URLs assuming they're hosted on the same server. s3fs' solution
is to have apache proxy those requests. Unfortunately, we won't know what the
bucket/region is until we're within the cloud.gov environment; this resolves
that by modifying the htaccess file at bootstrap.

This also updates our Dockerfile to include apache's rewrites & proxies (requiring
developers run docker-compose build). Similarly, we tweak the cloud.gov apache
configuration to include the proxy_http module.

Note that we can't use Apache's ProxyPass directive, as our host names are too
long. See
https://unix.stackexchange.com/questions/420615/proxypass-worker-hostname-too-long
---
 .bp-config/httpd/extra/httpd-modules.conf | 114 ++++++++++++++++++++++
 .docker/Dockerfile                        |   2 +
 bootstrap.sh                              |   8 ++
 web/.htaccess                             |   1 +
 4 files changed, 125 insertions(+)
 create mode 100644 .bp-config/httpd/extra/httpd-modules.conf

diff --git a/.bp-config/httpd/extra/httpd-modules.conf b/.bp-config/httpd/extra/httpd-modules.conf
new file mode 100644
index 0000000..9367fc4
--- /dev/null
+++ b/.bp-config/httpd/extra/httpd-modules.conf
@@ -0,0 +1,114 @@
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule env_module modules/mod_env.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule mpm_event_module modules/mod_mpm_event.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
+LoadModule remoteip_module modules/mod_remoteip.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule filter_module modules/mod_filter.so
+LoadModule deflate_module modules/mod_deflate.so
+LoadModule headers_module modules/mod_headers.so
+
+#LoadModule authn_file_module modules/mod_authn_file.so
+#LoadModule authn_dbm_module modules/mod_authn_dbm.so
+#LoadModule authn_anon_module modules/mod_authn_anon.so
+#LoadModule authn_dbd_module modules/mod_authn_dbd.so
+#LoadModule authn_socache_module modules/mod_authn_socache.so
+#LoadModule authn_core_module modules/mod_authn_core.so
+#LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+#LoadModule authz_user_module modules/mod_authz_user.so
+#LoadModule authz_dbm_module modules/mod_authz_dbm.so
+#LoadModule authz_owner_module modules/mod_authz_owner.so
+#LoadModule authz_dbd_module modules/mod_authz_dbd.so
+#LoadModule access_compat_module modules/mod_access_compat.so
+#LoadModule auth_basic_module modules/mod_auth_basic.so
+#LoadModule auth_form_module modules/mod_auth_form.so
+#LoadModule auth_digest_module modules/mod_auth_digest.so
+#LoadModule allowmethods_module modules/mod_allowmethods.so
+#LoadModule isapi_module modules/mod_isapi.so
+#LoadModule file_cache_module modules/mod_file_cache.so
+#LoadModule cache_module modules/mod_cache.so
+#LoadModule cache_disk_module modules/mod_cache_disk.so
+#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+#LoadModule socache_dbm_module modules/mod_socache_dbm.so
+#LoadModule socache_memcache_module modules/mod_socache_memcache.so
+#LoadModule watchdog_module modules/mod_watchdog.so
+#LoadModule dbd_module modules/mod_dbd.so
+#LoadModule bucketeer_module modules/mod_bucketeer.so
+#LoadModule dumpio_module modules/mod_dumpio.so
+#LoadModule echo_module modules/mod_echo.so
+#LoadModule example_hooks_module modules/mod_example_hooks.so
+#LoadModule case_filter_module modules/mod_case_filter.so
+#LoadModule case_filter_in_module modules/mod_case_filter_in.so
+#LoadModule example_ipc_module modules/mod_example_ipc.so
+#LoadModule buffer_module modules/mod_buffer.so
+#LoadModule data_module modules/mod_data.so
+#LoadModule ratelimit_module modules/mod_ratelimit.so
+#LoadModule ext_filter_module modules/mod_ext_filter.so
+#LoadModule request_module modules/mod_request.so
+#LoadModule include_module modules/mod_include.so
+#LoadModule reflector_module modules/mod_reflector.so
+#LoadModule substitute_module modules/mod_substitute.so
+#LoadModule sed_module modules/mod_sed.so
+#LoadModule charset_lite_module modules/mod_charset_lite.so
+#LoadModule xml2enc_module modules/mod_xml2enc.so
+#LoadModule proxy_html_module modules/mod_proxy_html.so
+#LoadModule log_debug_module modules/mod_log_debug.so
+#LoadModule log_forensic_module modules/mod_log_forensic.so
+#LoadModule logio_module modules/mod_logio.so
+#LoadModule mime_magic_module modules/mod_mime_magic.so
+#LoadModule cern_meta_module modules/mod_cern_meta.so
+#LoadModule expires_module modules/mod_expires.so
+#LoadModule ident_module modules/mod_ident.so
+#LoadModule usertrack_module modules/mod_usertrack.so
+#LoadModule unique_id_module modules/mod_unique_id.so
+#LoadModule version_module modules/mod_version.so
+#LoadModule proxy_connect_module modules/mod_proxy_connect.so
+#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
+#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
+#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
+#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
+#LoadModule proxy_express_module modules/mod_proxy_express.so
+#LoadModule session_module modules/mod_session.so
+#LoadModule session_cookie_module modules/mod_session_cookie.so
+#LoadModule session_dbd_module modules/mod_session_dbd.so
+#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
+#LoadModule ssl_module modules/mod_ssl.so
+#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so
+#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so
+#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so
+#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so
+#LoadModule dialup_module modules/mod_dialup.so
+#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
+#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
+#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
+#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
+#LoadModule heartbeat_module modules/mod_heartbeat.so
+#LoadModule heartmonitor_module modules/mod_heartmonitor.so
+#LoadModule dav_module modules/mod_dav.so
+#LoadModule status_module modules/mod_status.so
+#LoadModule autoindex_module modules/mod_autoindex.so
+#LoadModule asis_module modules/mod_asis.so
+#LoadModule info_module modules/mod_info.so
+#LoadModule suexec_module modules/mod_suexec.so
+#LoadModule cgid_module modules/mod_cgid.so
+#LoadModule cgi_module modules/mod_cgi.so
+#LoadModule dav_fs_module modules/mod_dav_fs.so
+#LoadModule dav_lock_module modules/mod_dav_lock.so
+#LoadModule vhost_alias_module modules/mod_vhost_alias.so
+#LoadModule negotiation_module modules/mod_negotiation.so
+#LoadModule imagemap_module modules/mod_imagemap.so
+#LoadModule actions_module modules/mod_actions.so
+#LoadModule speling_module modules/mod_speling.so
+#LoadModule userdir_module modules/mod_userdir.so
+#LoadModule alias_module modules/mod_alias.so
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 90132d2..6f87f3e 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -13,6 +13,8 @@ RUN apt-get update &&\
     rm -rf /var/lib/apt/lists/* &&\
     rm -rf /var/cache/apt/*
 
+RUN a2enmod rewrite proxy proxy_http
+
 COPY ["install-composer.sh", "/tmp"]
 RUN "/tmp/install-composer.sh"
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 8168f19..9935428 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,6 +5,14 @@ SECRETS=$(echo $VCAP_SERVICES | jq -r '.["user-provided"][] | select(.name == "s
 APP_NAME=$(echo $VCAP_APPLICATION | jq -r '.name')
 APP_ROOT=$(dirname "${BASH_SOURCE[0]}")
 
+S3_BUCKET=$(echo $VCAP_SERVICES | jq -r '.["s3"][] | select(.name == "storage") | .credentials.bucket')
+S3_REGION=$(echo $VCAP_SERVICES | jq -r '.["s3"][] | select(.name == "storage") | .credentials.region')
+if [ -n "$S3_BUCKET" ] && [ -n "$S3_REGION" ]; then
+  # Add Proxy rewrite rules to the top of the htaccess file
+  sed -i "s/S3_BUCKET/$S3_BUCKET/g" $APP_ROOT/web/.htaccess
+  sed -i "s/S3_REGION/$S3_REGION/g" $APP_ROOT/web/.htaccess
+fi
+
 install_drupal() {
     ROOT_USER_NAME=$(echo $SECRETS | jq -r '.ROOT_USER_NAME')
     ROOT_USER_PASS=$(echo $SECRETS | jq -r '.ROOT_USER_PASS')
diff --git a/web/.htaccess b/web/.htaccess
index 83cb71a..9603405 100644
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -1,6 +1,7 @@
 #
 # Apache/PHP/Drupal settings:
 #
+RewriteRule ^s3fs-(css|js)/(.*)$ http://S3_BUCKET.s3-S3_REGION.amazonaws.com/public/$2 [P]
 
 # Protect files and directories from prying eyes.
 <FilesMatch "\.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock))$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">

From f8a821612d81a24f179daf09984d965f961cf3ce Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Mon, 16 Apr 2018 13:08:03 -0400
Subject: [PATCH 092/143] Turn on JS and CSS compression.

Now that we can!
---
 web/sites/default/config/system.performance.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/sites/default/config/system.performance.yml b/web/sites/default/config/system.performance.yml
index 65d6e1a..d4f85d5 100644
--- a/web/sites/default/config/system.performance.yml
+++ b/web/sites/default/config/system.performance.yml
@@ -2,7 +2,7 @@ cache:
   page:
     max_age: 0
 css:
-  preprocess: false
+  preprocess: true
   gzip: true
 fast_404:
   enabled: true
@@ -10,7 +10,7 @@ fast_404:
   exclude_paths: '/\/(?:styles|imagecache)\//'
   html: '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'
 js:
-  preprocess: false
+  preprocess: true
   gzip: true
 stale_file_threshold: 2592000
 _core:

From eac9f55f2f6c6db4a41415ff0aa9d0c4dc393147 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Mon, 16 Apr 2018 15:51:37 -0400
Subject: [PATCH 093/143] Bump to two instances.

Now that S3 is properly configured, we can bump up our number of instances.
---
 manifest-prod.yml | 2 +-
 manifest.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest-prod.yml b/manifest-prod.yml
index c0a7466..bdf6384 100644
--- a/manifest-prod.yml
+++ b/manifest-prod.yml
@@ -20,7 +20,7 @@ applications:
 - name: web
   <<: *defaults
   memory: 256M
-  instances: 1
+  instances: 2
   routes:
     - route: nsf-beta.app.cloud.gov
 #   - route: beta.nsf.gov
diff --git a/manifest.yml b/manifest.yml
index 668a92f..36aecec 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -20,7 +20,7 @@ applications:
 - name: web
   <<: *defaults
   memory: 256M
-  instances: 1
+  instances: 2
   routes:
     - route: nsf-demo.app.cloud.gov
 - name: cronish

From 108a45ab4178129349b96bec45220a4652fc2c7c Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 18 Apr 2018 15:02:26 -0700
Subject: [PATCH 094/143] Add `iframe` to list of allowed aggregator tags

Tumblr's RSS feeds use iframes for presenting YouTube videos, so
this commit adds them to the list of allowed tags.

(Please note that this change doesn't affect feed items that have
already been imported. To have this change affect already-posted
feed items, the items must be deleted and re-'updated'.)

https://github.com/18F/nsf/issues/219
---
 web/sites/default/config/aggregator.settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/sites/default/config/aggregator.settings.yml b/web/sites/default/config/aggregator.settings.yml
index ced8fcd..fafd9ef 100644
--- a/web/sites/default/config/aggregator.settings.yml
+++ b/web/sites/default/config/aggregator.settings.yml
@@ -3,7 +3,7 @@ parser: aggregator
 processors:
   - aggregator
 items:
-  allowed_html: '<a> <b> <br> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul> <img> <video> <figure>'
+  allowed_html: '<a> <b> <br> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul> <img> <video> <figure> <iframe>'
   teaser_length: 400
   expire: 0
 source:

From 32fe18a17a1c5ba0f51dfead0664e63d86ce4201 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 19 Apr 2018 14:41:02 -0400
Subject: [PATCH 095/143] Update to Drupal 8.5.2.

There was a security vulnerability around the WYSIWYG editor. We tested
locally.
---
 composer.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.lock b/composer.lock
index 7292a04..0347c8d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2002,16 +2002,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "8.5.1",
+            "version": "8.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "2aeca7dfa2661296602ac16bf9fd6085f0a121be"
+                "reference": "bc21760d4be4ad117851809183c8d18880ab275a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/2aeca7dfa2661296602ac16bf9fd6085f0a121be",
-                "reference": "2aeca7dfa2661296602ac16bf9fd6085f0a121be",
+                "url": "https://api.github.com/repos/drupal/core/zipball/bc21760d4be4ad117851809183c8d18880ab275a",
+                "reference": "bc21760d4be4ad117851809183c8d18880ab275a",
                 "shasum": ""
             },
             "require": {
@@ -2233,7 +2233,7 @@
                 "GPL-2.0-or-later"
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-            "time": "2018-03-27T09:58:42+00:00"
+            "time": "2018-04-18T17:00:56+00:00"
         },
         {
             "name": "drupal/ctools",

From 74410a3ec018ff7e8effd13c5a7938e42f709a54 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 19 Apr 2018 13:25:48 -0700
Subject: [PATCH 096/143] Update composer.json to indicate Drupal 8.5+

The previous commit updated Drupal to the most recent version,
following the announcement of a security vulnerability. This commit
updates composer.json to indicate more clearly (to the human eye)
that we're running Drupal 8.5.* or better.
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a55f79c..b578115 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "drupal/bootstrap": "^3.11",
         "drupal/brightcove": "^1.3",
         "drupal/console": "^1.0.2",
-        "drupal/core": "~8.4",
+        "drupal/core": "~8.5",
         "drupal/ctools": "^3.0",
         "drupal/default_content_deploy": "^1.0@alpha",
         "drupal/devel": "^1.2",

From a93785f63fdb740c099fbb1b19d9da67fd724f3e Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 13 Apr 2018 16:59:16 -0700
Subject: [PATCH 097/143] Add `Social Media Policies` link to bottom of page

When the social media page is refactored to be a set of blocks
instead of one page, move this footer to the lowest block. As
it stands, though, we're using the page view of `nsf_blog`.

Fixes https://github.com/18F/nsf/issues/220
---
 web/sites/default/config/views.view.nsf_blog.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/web/sites/default/config/views.view.nsf_blog.yml b/web/sites/default/config/views.view.nsf_blog.yml
index 9960dba..c7750c9 100644
--- a/web/sites/default/config/views.view.nsf_blog.yml
+++ b/web/sites/default/config/views.view.nsf_blog.yml
@@ -173,6 +173,7 @@ display:
         row: false
         pager: false
         fields: false
+        footer: true
       row:
         type: fields
       pager:
@@ -368,6 +369,20 @@ display:
       use_more: false
       use_more_always: false
       use_more_text: more
+      footer:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content:
+            value: '<a href="https://www.nsf.gov/social/policies.jsp">Social Media Policies</a>'
+            format: basic_html
+          plugin_id: text
     cache_metadata:
       max-age: -1
       contexts:

From 8725a9e6bc8d25bff399ac07786524f681396545 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 19 Apr 2018 19:25:53 -0400
Subject: [PATCH 098/143] Better commentary for apache modules, gitignore.

Thanks for the suggestions, @fureigh!
---
 .bp-config/httpd/extra/httpd-modules.conf | 101 ++--------------------
 .gitignore                                |   4 +-
 2 files changed, 9 insertions(+), 96 deletions(-)

diff --git a/.bp-config/httpd/extra/httpd-modules.conf b/.bp-config/httpd/extra/httpd-modules.conf
index 9367fc4..be6c79f 100644
--- a/.bp-config/httpd/extra/httpd-modules.conf
+++ b/.bp-config/httpd/extra/httpd-modules.conf
@@ -1,3 +1,8 @@
+# This file was built from
+# https://github.com/cloudfoundry/php-buildpack/blob/master/defaults/config/httpd/extra/httpd-modules.conf
+# For more detail, see the description in
+# https://docs-cloudfoundry-staging.cfapps.io/buildpacks/php/gsg-php-config.html#engine-configurations
+
 LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule log_config_module modules/mod_log_config.so
@@ -16,99 +21,5 @@ LoadModule filter_module modules/mod_filter.so
 LoadModule deflate_module modules/mod_deflate.so
 LoadModule headers_module modules/mod_headers.so
 
-#LoadModule authn_file_module modules/mod_authn_file.so
-#LoadModule authn_dbm_module modules/mod_authn_dbm.so
-#LoadModule authn_anon_module modules/mod_authn_anon.so
-#LoadModule authn_dbd_module modules/mod_authn_dbd.so
-#LoadModule authn_socache_module modules/mod_authn_socache.so
-#LoadModule authn_core_module modules/mod_authn_core.so
-#LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
-#LoadModule authz_user_module modules/mod_authz_user.so
-#LoadModule authz_dbm_module modules/mod_authz_dbm.so
-#LoadModule authz_owner_module modules/mod_authz_owner.so
-#LoadModule authz_dbd_module modules/mod_authz_dbd.so
-#LoadModule access_compat_module modules/mod_access_compat.so
-#LoadModule auth_basic_module modules/mod_auth_basic.so
-#LoadModule auth_form_module modules/mod_auth_form.so
-#LoadModule auth_digest_module modules/mod_auth_digest.so
-#LoadModule allowmethods_module modules/mod_allowmethods.so
-#LoadModule isapi_module modules/mod_isapi.so
-#LoadModule file_cache_module modules/mod_file_cache.so
-#LoadModule cache_module modules/mod_cache.so
-#LoadModule cache_disk_module modules/mod_cache_disk.so
-#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
-#LoadModule socache_dbm_module modules/mod_socache_dbm.so
-#LoadModule socache_memcache_module modules/mod_socache_memcache.so
-#LoadModule watchdog_module modules/mod_watchdog.so
-#LoadModule dbd_module modules/mod_dbd.so
-#LoadModule bucketeer_module modules/mod_bucketeer.so
-#LoadModule dumpio_module modules/mod_dumpio.so
-#LoadModule echo_module modules/mod_echo.so
-#LoadModule example_hooks_module modules/mod_example_hooks.so
-#LoadModule case_filter_module modules/mod_case_filter.so
-#LoadModule case_filter_in_module modules/mod_case_filter_in.so
-#LoadModule example_ipc_module modules/mod_example_ipc.so
-#LoadModule buffer_module modules/mod_buffer.so
-#LoadModule data_module modules/mod_data.so
-#LoadModule ratelimit_module modules/mod_ratelimit.so
-#LoadModule ext_filter_module modules/mod_ext_filter.so
-#LoadModule request_module modules/mod_request.so
-#LoadModule include_module modules/mod_include.so
-#LoadModule reflector_module modules/mod_reflector.so
-#LoadModule substitute_module modules/mod_substitute.so
-#LoadModule sed_module modules/mod_sed.so
-#LoadModule charset_lite_module modules/mod_charset_lite.so
-#LoadModule xml2enc_module modules/mod_xml2enc.so
-#LoadModule proxy_html_module modules/mod_proxy_html.so
-#LoadModule log_debug_module modules/mod_log_debug.so
-#LoadModule log_forensic_module modules/mod_log_forensic.so
-#LoadModule logio_module modules/mod_logio.so
-#LoadModule mime_magic_module modules/mod_mime_magic.so
-#LoadModule cern_meta_module modules/mod_cern_meta.so
-#LoadModule expires_module modules/mod_expires.so
-#LoadModule ident_module modules/mod_ident.so
-#LoadModule usertrack_module modules/mod_usertrack.so
-#LoadModule unique_id_module modules/mod_unique_id.so
-#LoadModule version_module modules/mod_version.so
-#LoadModule proxy_connect_module modules/mod_proxy_connect.so
-#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+# Also enable proxy_http for our s3fs module
 LoadModule proxy_http_module modules/mod_proxy_http.so
-#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
-#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
-#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
-#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
-#LoadModule proxy_express_module modules/mod_proxy_express.so
-#LoadModule session_module modules/mod_session.so
-#LoadModule session_cookie_module modules/mod_session_cookie.so
-#LoadModule session_dbd_module modules/mod_session_dbd.so
-#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
-#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
-#LoadModule ssl_module modules/mod_ssl.so
-#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so
-#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so
-#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so
-#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so
-#LoadModule dialup_module modules/mod_dialup.so
-#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
-#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
-#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
-#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
-#LoadModule heartbeat_module modules/mod_heartbeat.so
-#LoadModule heartmonitor_module modules/mod_heartmonitor.so
-#LoadModule dav_module modules/mod_dav.so
-#LoadModule status_module modules/mod_status.so
-#LoadModule autoindex_module modules/mod_autoindex.so
-#LoadModule asis_module modules/mod_asis.so
-#LoadModule info_module modules/mod_info.so
-#LoadModule suexec_module modules/mod_suexec.so
-#LoadModule cgid_module modules/mod_cgid.so
-#LoadModule cgi_module modules/mod_cgi.so
-#LoadModule dav_fs_module modules/mod_dav_fs.so
-#LoadModule dav_lock_module modules/mod_dav_lock.so
-#LoadModule vhost_alias_module modules/mod_vhost_alias.so
-#LoadModule negotiation_module modules/mod_negotiation.so
-#LoadModule imagemap_module modules/mod_imagemap.so
-#LoadModule actions_module modules/mod_actions.so
-#LoadModule speling_module modules/mod_speling.so
-#LoadModule userdir_module modules/mod_userdir.so
-#LoadModule alias_module modules/mod_alias.so
diff --git a/.gitignore b/.gitignore
index 6514bb5..1ea0262 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,11 +17,13 @@ core
 vendor
 
 # Ignore local versions of modules.
-storage
 modules/*
 web/modules/contrib/*
 web/themes/contrib/*
 
+# Ignore compiled twig templates
+storage/php
+
 # Ignore local database dumps.
 db_dumps
 

From e2e25f83d497295035d0c0572fe40e30469b140d Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 19 Apr 2018 16:45:40 -0700
Subject: [PATCH 099/143] Complete the addition of the blog page footer

What a difference a true/false can make! This commit completes the
addition of the `Social Media Policies` link to the footer of the
blog page view.

Fixes https://github.com/18F/nsf/issues/220
---
 web/sites/default/config/views.view.nsf_blog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/sites/default/config/views.view.nsf_blog.yml b/web/sites/default/config/views.view.nsf_blog.yml
index c7750c9..78ab411 100644
--- a/web/sites/default/config/views.view.nsf_blog.yml
+++ b/web/sites/default/config/views.view.nsf_blog.yml
@@ -377,7 +377,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          empty: true
+          empty: false
           tokenize: false
           content:
             value: '<a href="https://www.nsf.gov/social/policies.jsp">Social Media Policies</a>'

From 5b9f716eaa4d8a8ecf626b330f39aa3ef060b865 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 19 Apr 2018 16:47:14 -0700
Subject: [PATCH 100/143] Remove footer from blog view's block display

Considering the placement of the `Tumblr` section of this page,
it's safe to assume we'd want this footer to be associated with a
different social media source's block when the time comes.

https://github.com/18F/nsf/issues/220
---
 web/sites/default/config/views.view.nsf_blog.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/sites/default/config/views.view.nsf_blog.yml b/web/sites/default/config/views.view.nsf_blog.yml
index 78ab411..60578f1 100644
--- a/web/sites/default/config/views.view.nsf_blog.yml
+++ b/web/sites/default/config/views.view.nsf_blog.yml
@@ -361,6 +361,7 @@ display:
         use_more_always: false
         use_more_text: false
         title: true
+        footer: false
       filter_groups:
         operator: AND
         groups:

From 6159924fc703c9ec24fa8bf9e10ca363a12def19 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Mon, 23 Apr 2018 10:51:30 -0400
Subject: [PATCH 101/143] Add note warning about config exports with secrets.

Thanks for the suggestion @fureigh
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index b276e17..b5175fc 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,10 @@ To find the values we're using in cloud.gov, use
 cf env web
 ```
 
+As with other edits to the local secrets, extra care should be taken when
+exporting your config, let those configuration files contain the true secret
+values rather than dummy "SECRET" strings.
+
 ### Configuration workflow
 
 Making configuration changes to the application comes in roughly eight small steps:

From 2254b89bd76af9ab9098083a6baece7dae341970 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 20 Apr 2018 16:45:18 -0700
Subject: [PATCH 102/143] Revert "Remove contact form permission from anon
 users."

This reverts commit f6c26997fd77d20de31d1ea04283e11267df7a74.
Let's address this at the module level instead.

http://github.com/18F/nsf/issues/205
---
 web/sites/default/config/user.role.anonymous.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/sites/default/config/user.role.anonymous.yml b/web/sites/default/config/user.role.anonymous.yml
index c3c88eb..52f3bbe 100644
--- a/web/sites/default/config/user.role.anonymous.yml
+++ b/web/sites/default/config/user.role.anonymous.yml
@@ -12,5 +12,6 @@ permissions:
   - 'access comments'
   - 'access content'
   - 'access news feeds'
+  - 'access site-wide contact form'
   - 'use text format restricted_html'
   - 'view published brightcove videos'

From 49a51987c43ef10954da927e9bd4f4418797d488 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 20 Apr 2018 17:03:00 -0700
Subject: [PATCH 103/143] Uninstall the Contact module

The Contact module is the core module that creates personal
contact forms as well as the sitewide contact form. Because we're
not currently using that functionality, we can turn it off by
uninstalling the Contact module, which includes deleting its
configuration files.

By handling #205 at the module level, we enable a future developer
to reenable the module and have it work as expected, while slightly
improving performance in the meantime (by not loading the Contact
module on every page load even though it's not really being used).

http://github.com/18F/nsf/issues/205
---
 web/sites/default/config/contact.form.feedback.yml | 14 --------------
 web/sites/default/config/contact.form.personal.yml | 13 -------------
 web/sites/default/config/contact.settings.yml      |  7 -------
 ...core.entity_view_mode.contact_message.token.yml | 10 ----------
 4 files changed, 44 deletions(-)
 delete mode 100644 web/sites/default/config/contact.form.feedback.yml
 delete mode 100644 web/sites/default/config/contact.form.personal.yml
 delete mode 100644 web/sites/default/config/contact.settings.yml
 delete mode 100644 web/sites/default/config/core.entity_view_mode.contact_message.token.yml

diff --git a/web/sites/default/config/contact.form.feedback.yml b/web/sites/default/config/contact.form.feedback.yml
deleted file mode 100644
index 56df2bb..0000000
--- a/web/sites/default/config/contact.form.feedback.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 45dbb9b8-18c5-491b-827a-27fcb7c4d119
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: vymHlgJy26BuI5GGj9-IXjwR3dRC5C0tij4BpWJnoqw
-id: feedback
-label: 'Website feedback'
-recipients:
-  - secret@example.com
-reply: ''
-weight: 0
-message: 'Your message has been sent.'
-redirect: ''
diff --git a/web/sites/default/config/contact.form.personal.yml b/web/sites/default/config/contact.form.personal.yml
deleted file mode 100644
index 7e8da0d..0000000
--- a/web/sites/default/config/contact.form.personal.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: d7b275f4-88b8-4c3e-afdf-00d34efccc22
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: jonvgt3CkUM2eMLTFwWfHileWWDC4YtXCuIlCahTk_I
-id: personal
-label: 'Personal contact form'
-recipients: {  }
-reply: ''
-weight: 0
-message: 'Your message has been sent.'
-redirect: ''
diff --git a/web/sites/default/config/contact.settings.yml b/web/sites/default/config/contact.settings.yml
deleted file mode 100644
index a2903f5..0000000
--- a/web/sites/default/config/contact.settings.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-default_form: feedback
-flood:
-  limit: 5
-  interval: 3600
-user_default_enabled: true
-_core:
-  default_config_hash: U69DBeuvXuNVOC15rVNaBjDPK2fWFbo9v4takdYSSO8
diff --git a/web/sites/default/config/core.entity_view_mode.contact_message.token.yml b/web/sites/default/config/core.entity_view_mode.contact_message.token.yml
deleted file mode 100644
index 9355bbf..0000000
--- a/web/sites/default/config/core.entity_view_mode.contact_message.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: e4ae1ab4-e9ce-4d6c-bbb1-4ed10980d056
-langcode: en
-status: true
-dependencies:
-  module:
-    - contact
-id: contact_message.token
-label: Token
-targetEntityType: contact_message
-cache: true

From 25466f4d86ef7d557c68f61443e8a03768f45460 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Mon, 23 Apr 2018 11:07:11 -0700
Subject: [PATCH 104/143] Uninstall Contact module via bootstrap.sh

In order to uninstall the module, it's necessary to run a Drupal
Console or Drush command. This was meant to be part of the last commit.

http://github.com/18F/nsf/issues/205
---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 9935428..93db6c3 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -40,7 +40,7 @@ if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   # Mild data migration: fully delete database entries related to these
   # modules. These plugins (and the dependencies) can be removed once they've
   # been uninstalled in all environments
-  drupal --root=$APP_ROOT/web module:uninstall flysystem flysystem_s3 masquerade workflow
+  drupal --root=$APP_ROOT/web module:uninstall flysystem flysystem_s3 masquerade workflow contact
   drupal --root=$APP_ROOT/web theme:uninstall bootstrap
 
   # Sync configs from code

From 8c1cd235917151e8ae59e0a02ef2261905e70177 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Mon, 23 Apr 2018 11:24:55 -0700
Subject: [PATCH 105/143] Typo fix: 'let' --> 'lest'

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b5175fc..337ffda 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ cf env web
 ```
 
 As with other edits to the local secrets, extra care should be taken when
-exporting your config, let those configuration files contain the true secret
+exporting your config, lest those configuration files contain the true secret
 values rather than dummy "SECRET" strings.
 
 ### Configuration workflow

From 111eafb130da127ed9a83cdc1f553ec747b245f7 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Mon, 23 Apr 2018 11:26:52 -0700
Subject: [PATCH 106/143] Fix markup for a login link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 337ffda..98def07 100644
--- a/README.md
+++ b/README.md
@@ -204,7 +204,7 @@ third. Start the application:
 docker-compose up
 ```
 
-Then [http://localhost:8080/user/login](log in) as root (password: root).
+Then [log in](http://localhost:8080/user/login) as root (password: root).
 Create or edit content (e.g. Aggregator feeds, pages, etc.) through the Drupal
 admin.
 

From ad7de071a69a10cf3ebd4ff6efdaeb30364c1806 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Mon, 23 Apr 2018 15:40:33 -0700
Subject: [PATCH 107/143] Remove Contact from core.extensions.yml

Without this change, Contact gets (re)installed as part of config
sync. Thanks for the catch, @cmc333333!

http://github.com/18F/nsf/issues/205
---
 web/sites/default/config/core.extension.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
index 6ce764e..15903b5 100644
--- a/web/sites/default/config/core.extension.yml
+++ b/web/sites/default/config/core.extension.yml
@@ -12,7 +12,6 @@ module:
   comment: 0
   config: 0
   config_update: 0
-  contact: 0
   content_moderation: 0
   contextual: 0
   ctools: 0

From 8f6178f268ee504c3a5c42810f765aa96a9edbeb Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Mon, 23 Apr 2018 15:56:45 -0700
Subject: [PATCH 108/143] Minor copy edit

'alternatively' --> 'Alternatively'
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 98def07..e86a0e2 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ git fetch origin
 git checkout origin/master
 ```
 
-alternatively:
+Alternatively:
 
 ```
 git checkout master

From 168e4790ec0fb056fcec40e8bc32eb2ada64cdc1 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Mon, 23 Apr 2018 16:22:06 -0700
Subject: [PATCH 109/143] Add "Making styling changes" section to README

---
 README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/README.md b/README.md
index e86a0e2..651d8ea 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,20 @@ faster.
 As the service runs, we can directly modify the PHP files in our app and see
 our changes in near-real time.
 
+### Making styling changes
+
+This codebase's theme is a subtheme of the [U.S. Web Design System](https://drupal.org/project/uswds) theme. Accordingly, its overrides are stored in `/web/themes/nsf`.
+
+To make styling changes, first tell [Sass](https://sass-lang.com) to watch the relevant files:
+
+```
+sass --watch web/themes/nsf/sass:web/themes/nsf/assets/css/
+```
+
+As long as that command is running, it'll watch every `.scss` file in the `sass/` folder for changes, compiling and saving CSS in the `assets/css/` folder every time you save a change to a `.scss` file.
+
+Now, in a separate Terminal window and/or your favorite text editor, you can make changes to `web/themes/nsf/sass/uswds.scss` (or `_variables.scss`) and have your changes saved.
+
 ### Other commands
 
 Within the `bin` directory, there are a handful of helpful scripts to make

From da23c76c222374fa6a7f028072ea205f0c712541 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 25 Apr 2018 10:42:22 -0400
Subject: [PATCH 110/143] Change NSF theme package name.

Slightly moves some dependencies around, likely due to running slightly
different versions of npm.
---
 web/themes/nsf/package-lock.json | 64 ++++++++++++++++----------------
 web/themes/nsf/package.json      |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/web/themes/nsf/package-lock.json b/web/themes/nsf/package-lock.json
index f2b599a..8c14558 100644
--- a/web/themes/nsf/package-lock.json
+++ b/web/themes/nsf/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "my-subtheme",
+  "name": "nsf-subtheme",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -10,6 +10,16 @@
       "integrity": "sha512-54Dm6NwYeiSQmRB1BLXKr5GELi0wFapR1npi8bnZhEcu84d/yQKqnwwXQ56hZ0RUbTG6L5nqDZaN3dgByQXQRQ==",
       "dev": true
     },
+    "JSONStream": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
+      "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
+      "dev": true,
+      "requires": {
+        "jsonparse": "1.3.1",
+        "through": "2.3.8"
+      }
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -328,9 +338,9 @@
       "integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=",
       "dev": true,
       "requires": {
+        "JSONStream": "1.3.1",
         "combine-source-map": "0.7.2",
         "defined": "1.0.0",
-        "JSONStream": "1.3.1",
         "through2": "2.0.3",
         "umd": "3.0.1"
       }
@@ -358,6 +368,7 @@
       "integrity": "sha1-tanJAgJD8McORnW+yCI7xifkFc4=",
       "dev": true,
       "requires": {
+        "JSONStream": "1.3.1",
         "assert": "1.4.1",
         "browser-pack": "6.0.2",
         "browser-resolve": "1.11.2",
@@ -379,7 +390,6 @@
         "https-browserify": "0.0.1",
         "inherits": "2.0.3",
         "insert-module-globals": "7.0.1",
-        "JSONStream": "1.3.1",
         "labeled-stream-splicer": "2.0.0",
         "module-deps": "4.1.1",
         "os-browserify": "0.1.2",
@@ -2275,14 +2285,6 @@
             }
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -2293,6 +2295,14 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "bundled": true,
@@ -2785,10 +2795,10 @@
       "integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=",
       "dev": true,
       "requires": {
+        "JSONStream": "1.3.1",
         "combine-source-map": "0.7.2",
         "concat-stream": "1.5.2",
         "is-buffer": "1.1.6",
-        "JSONStream": "1.3.1",
         "lexical-scope": "1.2.0",
         "process": "0.11.10",
         "through2": "2.0.3",
@@ -3067,16 +3077,6 @@
       "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
       "dev": true
     },
-    "JSONStream": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
-      "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
-      "dev": true,
-      "requires": {
-        "jsonparse": "1.3.1",
-        "through": "2.3.8"
-      }
-    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -3459,6 +3459,7 @@
       "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
       "dev": true,
       "requires": {
+        "JSONStream": "1.3.1",
         "browser-resolve": "1.11.2",
         "cached-path-relative": "1.0.1",
         "concat-stream": "1.5.2",
@@ -3466,7 +3467,6 @@
         "detective": "4.6.0",
         "duplexer2": "0.1.4",
         "inherits": "2.0.3",
-        "JSONStream": "1.3.1",
         "parents": "1.0.1",
         "readable-stream": "2.3.3",
         "resolve": "1.5.0",
@@ -6636,15 +6636,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -6656,6 +6647,15 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/web/themes/nsf/package.json b/web/themes/nsf/package.json
index d34ff5c..d853eb0 100644
--- a/web/themes/nsf/package.json
+++ b/web/themes/nsf/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "my-subtheme",
+  "name": "nsf-subtheme",
   "version": "1.0.0",
   "scripts": {
     "prebuild:css": "node-sass --include-path scss sass/uswds.scss assets/css/uswds.css",

From 6a77622db4bb82f2adf6511acc2f2751535852a6 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 25 Apr 2018 10:10:32 -0700
Subject: [PATCH 111/143] Update core's dependencies

---
 composer.lock | 195 +++++++++++++++++++++++++-------------------------
 1 file changed, 98 insertions(+), 97 deletions(-)

diff --git a/composer.lock b/composer.lock
index 9ba92e2..b6be88b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "7e621693f087407a8ac39a62cff20d78",
+    "content-hash": "2702e95ec30d2a98d4bc7b09a025133d",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -4242,16 +4242,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.3.0",
+            "version": "6.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699"
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699",
-                "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
                 "shasum": ""
             },
             "require": {
@@ -4261,7 +4261,7 @@
             },
             "require-dev": {
                 "ext-curl": "*",
-                "phpunit/phpunit": "^4.0 || ^5.0",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
                 "psr/log": "^1.0"
             },
             "suggest": {
@@ -4270,7 +4270,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.2-dev"
+                    "dev-master": "6.3-dev"
                 }
             },
             "autoload": {
@@ -4303,7 +4303,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2017-06-22T18:50:49+00:00"
+            "time": "2018-04-22T15:46:56+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -4960,16 +4960,16 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.11",
+            "version": "v2.0.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
+                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
-                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
+                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
                 "shasum": ""
             },
             "require": {
@@ -5004,7 +5004,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2017-09-27T21:40:39+00:00"
+            "time": "2018-04-04T21:24:14+00:00"
         },
         {
             "name": "psr/container",
@@ -5470,7 +5470,7 @@
         },
         {
             "name": "symfony/class-loader",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
@@ -5589,16 +5589,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7"
+                "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/067339e9b8ec30d5f19f5950208893ff026b94f7",
-                "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7",
+                "url": "https://api.github.com/repos/symfony/console/zipball/d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf",
+                "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf",
                 "shasum": ""
             },
             "require": {
@@ -5654,7 +5654,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-26T15:46:28+00:00"
+            "time": "2018-04-03T05:22:50+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -5711,16 +5711,16 @@
         },
         {
             "name": "symfony/debug",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "9b1071f86e79e1999b3d3675d2e0e7684268b9bc"
+                "reference": "9cf7c2271cfb89ef9727db1b740ca77be57bf9d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/9b1071f86e79e1999b3d3675d2e0e7684268b9bc",
-                "reference": "9b1071f86e79e1999b3d3675d2e0e7684268b9bc",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/9cf7c2271cfb89ef9727db1b740ca77be57bf9d7",
+                "reference": "9cf7c2271cfb89ef9727db1b740ca77be57bf9d7",
                 "shasum": ""
             },
             "require": {
@@ -5763,20 +5763,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-28T21:49:22+00:00"
+            "time": "2018-04-03T05:22:50+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07"
+                "reference": "24a68710c6ddc1e3d159a110cef94cedfcf3c611"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/12e901abc1cb0d637a0e5abe9923471361d96b07",
-                "reference": "12e901abc1cb0d637a0e5abe9923471361d96b07",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/24a68710c6ddc1e3d159a110cef94cedfcf3c611",
+                "reference": "24a68710c6ddc1e3d159a110cef94cedfcf3c611",
                 "shasum": ""
             },
             "require": {
@@ -5834,7 +5834,7 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-04T03:54:53+00:00"
+            "time": "2018-03-29T11:25:31+00:00"
         },
         {
             "name": "symfony/dom-crawler",
@@ -5894,16 +5894,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "58990682ac3fdc1f563b7e705452921372aad11d"
+                "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/58990682ac3fdc1f563b7e705452921372aad11d",
-                "reference": "58990682ac3fdc1f563b7e705452921372aad11d",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8",
+                "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8",
                 "shasum": ""
             },
             "require": {
@@ -5953,7 +5953,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-14T10:03:57+00:00"
+            "time": "2018-04-06T07:35:25+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -6055,16 +6055,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "6f5935723c11b4125fc9927db6ad2feaa196e175"
+                "reference": "b11e6d165ff4cbf5685d185ab19a90f2f3bb7d1e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6f5935723c11b4125fc9927db6ad2feaa196e175",
-                "reference": "6f5935723c11b4125fc9927db6ad2feaa196e175",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b11e6d165ff4cbf5685d185ab19a90f2f3bb7d1e",
+                "reference": "b11e6d165ff4cbf5685d185ab19a90f2f3bb7d1e",
                 "shasum": ""
             },
             "require": {
@@ -6105,20 +6105,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-22T10:48:49+00:00"
+            "time": "2018-04-03T05:22:50+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "a443bbbd93682aa08e623fade4c94edd586ed2de"
+                "reference": "3cc2d4374aa9590c09277ad68657671cf49dbbf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a443bbbd93682aa08e623fade4c94edd586ed2de",
-                "reference": "a443bbbd93682aa08e623fade4c94edd586ed2de",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3cc2d4374aa9590c09277ad68657671cf49dbbf4",
+                "reference": "3cc2d4374aa9590c09277ad68657671cf49dbbf4",
                 "shasum": ""
             },
             "require": {
@@ -6193,7 +6193,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-05T19:41:07+00:00"
+            "time": "2018-04-06T15:19:48+00:00"
         },
         {
             "name": "symfony/polyfill-iconv",
@@ -6374,16 +6374,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "cc4aea21f619116aaf1c58016a944e4821c8e8af"
+                "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/cc4aea21f619116aaf1c58016a944e4821c8e8af",
-                "reference": "cc4aea21f619116aaf1c58016a944e4821c8e8af",
+                "url": "https://api.github.com/repos/symfony/process/zipball/4b7d64e852886319e93ddfdecff0d744ab87658b",
+                "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b",
                 "shasum": ""
             },
             "require": {
@@ -6419,7 +6419,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-12T17:55:00+00:00"
+            "time": "2018-04-03T05:22:50+00:00"
         },
         {
             "name": "symfony/psr-http-message-bridge",
@@ -6483,23 +6483,23 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "8773a9d52715f1a579576ce0e60213de34f5ef3e"
+                "reference": "50f333b707bef9f6972ad04e6df3ec8875c9a67c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/8773a9d52715f1a579576ce0e60213de34f5ef3e",
-                "reference": "8773a9d52715f1a579576ce0e60213de34f5ef3e",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/50f333b707bef9f6972ad04e6df3ec8875c9a67c",
+                "reference": "50f333b707bef9f6972ad04e6df3ec8875c9a67c",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8"
             },
             "conflict": {
-                "symfony/config": "<2.8",
+                "symfony/config": "<3.3.1",
                 "symfony/dependency-injection": "<3.3",
                 "symfony/yaml": "<3.4"
             },
@@ -6507,7 +6507,7 @@
                 "doctrine/annotations": "~1.0",
                 "doctrine/common": "~2.2",
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/config": "^3.3.1|~4.0",
                 "symfony/dependency-injection": "~3.3|~4.0",
                 "symfony/expression-language": "~2.8|~3.0|~4.0",
                 "symfony/http-foundation": "~2.8|~3.0|~4.0",
@@ -6557,20 +6557,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2018-02-28T21:49:22+00:00"
+            "time": "2018-04-04T13:22:16+00:00"
         },
         {
             "name": "symfony/serializer",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "11bea1aebe9c8d506f47c01931b0df9f18629a8f"
+                "reference": "d4dc1551da627273230fe16511f4bb4844c02399"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/11bea1aebe9c8d506f47c01931b0df9f18629a8f",
-                "reference": "11bea1aebe9c8d506f47c01931b0df9f18629a8f",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/d4dc1551da627273230fe16511f4bb4844c02399",
+                "reference": "d4dc1551da627273230fe16511f4bb4844c02399",
                 "shasum": ""
             },
             "require": {
@@ -6635,11 +6635,11 @@
             ],
             "description": "Symfony Serializer Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-14T14:07:03+00:00"
+            "time": "2018-03-15T19:08:29+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
@@ -6707,16 +6707,16 @@
         },
         {
             "name": "symfony/validator",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "b0dcfa428168b381ac0340e5209a47780799e393"
+                "reference": "6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/b0dcfa428168b381ac0340e5209a47780799e393",
-                "reference": "b0dcfa428168b381ac0340e5209a47780799e393",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7",
+                "reference": "6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7",
                 "shasum": ""
             },
             "require": {
@@ -6787,7 +6787,7 @@
             ],
             "description": "Symfony Validator Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-01T10:20:19+00:00"
+            "time": "2018-04-06T07:35:25+00:00"
         },
         {
             "name": "symfony/var-dumper",
@@ -6860,16 +6860,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb"
+                "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/6af42631dcf89e9c616242c900d6c52bd53bd1bb",
-                "reference": "6af42631dcf89e9c616242c900d6c52bd53bd1bb",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/a42f9da85c7c38d59f5e53f076fe81a091f894d0",
+                "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0",
                 "shasum": ""
             },
             "require": {
@@ -6914,20 +6914,20 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-16T09:50:28+00:00"
+            "time": "2018-04-03T05:14:20+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v1.35.2",
+            "version": "v1.35.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "9c24f2cd39dc1906b76879e099970b7e53724601"
+                "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/9c24f2cd39dc1906b76879e099970b7e53724601",
-                "reference": "9c24f2cd39dc1906b76879e099970b7e53724601",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
+                "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
                 "shasum": ""
             },
             "require": {
@@ -6935,8 +6935,8 @@
             },
             "require-dev": {
                 "psr/container": "^1.0",
-                "symfony/debug": "~2.7",
-                "symfony/phpunit-bridge": "~3.3@dev"
+                "symfony/debug": "^2.7",
+                "symfony/phpunit-bridge": "^3.3"
             },
             "type": "library",
             "extra": {
@@ -6979,7 +6979,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2018-03-03T16:21:29+00:00"
+            "time": "2018-03-20T04:25:58+00:00"
         },
         {
             "name": "twistor/flysystem-stream-wrapper",
@@ -7249,30 +7249,30 @@
         },
         {
             "name": "zendframework/zend-escaper",
-            "version": "2.5.2",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-escaper.git",
-                "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e"
+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
-                "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
+                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/31d8aafae982f9568287cb4dce987e6aff8fd074",
+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+                "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
                 }
             },
             "autoload": {
@@ -7284,12 +7284,13 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-escaper",
+            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
             "keywords": [
+                "ZendFramework",
                 "escaper",
-                "zf2"
+                "zf"
             ],
-            "time": "2016-06-30T19:48:38+00:00"
+            "time": "2018-04-25T15:48:53+00:00"
         },
         {
             "name": "zendframework/zend-feed",
@@ -7354,16 +7355,16 @@
         },
         {
             "name": "zendframework/zend-stdlib",
-            "version": "3.1.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-stdlib.git",
-                "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78"
+                "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78",
-                "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78",
+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/10ef03144902d1955f935fff5346ed52f7d99bcc",
+                "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc",
                 "shasum": ""
             },
             "require": {
@@ -7372,7 +7373,7 @@
             "require-dev": {
                 "athletic/athletic": "~0.1",
                 "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "^2.6.2"
+                "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
             "extra": {
@@ -7395,7 +7396,7 @@
                 "stdlib",
                 "zf2"
             ],
-            "time": "2016-09-13T14:38:50+00:00"
+            "time": "2018-04-12T16:05:42+00:00"
         }
     ],
     "packages-dev": [],

From 154c1097199e8152f3dc7f6ebf7876aa42a8fc20 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 25 Apr 2018 10:24:06 -0700
Subject: [PATCH 112/143] Update to Drupal 8.5.3

For details, see https://www.drupal.org/SA-CORE-2018-004.
---
 composer.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.lock b/composer.lock
index b6be88b..6f3e494 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2002,16 +2002,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "8.5.2",
+            "version": "8.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "bc21760d4be4ad117851809183c8d18880ab275a"
+                "reference": "b012f0ae51504880e920f2c6efdbdf03b6fe2129"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/bc21760d4be4ad117851809183c8d18880ab275a",
-                "reference": "bc21760d4be4ad117851809183c8d18880ab275a",
+                "url": "https://api.github.com/repos/drupal/core/zipball/b012f0ae51504880e920f2c6efdbdf03b6fe2129",
+                "reference": "b012f0ae51504880e920f2c6efdbdf03b6fe2129",
                 "shasum": ""
             },
             "require": {
@@ -2233,7 +2233,7 @@
                 "GPL-2.0-or-later"
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-            "time": "2018-04-18T17:00:56+00:00"
+            "time": "2018-04-25T15:39:01+00:00"
         },
         {
             "name": "drupal/ctools",

From f76c84301d2aeaa78679abc7381faa78e23f2bc9 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 25 Apr 2018 10:44:54 -0400
Subject: [PATCH 113/143] Add Dockerized npm script.

---
 README.md              | 6 ++++--
 web/themes/nsf/bin/npm | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100755 web/themes/nsf/bin/npm

diff --git a/README.md b/README.md
index 651d8ea..08d90aa 100644
--- a/README.md
+++ b/README.md
@@ -66,10 +66,12 @@ our changes in near-real time.
 
 This codebase's theme is a subtheme of the [U.S. Web Design System](https://drupal.org/project/uswds) theme. Accordingly, its overrides are stored in `/web/themes/nsf`.
 
-To make styling changes, first tell [Sass](https://sass-lang.com) to watch the relevant files:
+To make styling changes, first move into the relevant directory, then start
+the "watch" script:
 
 ```
-sass --watch web/themes/nsf/sass:web/themes/nsf/assets/css/
+cd web/themes/nsf
+bin/npm run build:watch
 ```
 
 As long as that command is running, it'll watch every `.scss` file in the `sass/` folder for changes, compiling and saving CSS in the `assets/css/` folder every time you save a change to a `.scss` file.
diff --git a/web/themes/nsf/bin/npm b/web/themes/nsf/bin/npm
new file mode 100755
index 0000000..709c960
--- /dev/null
+++ b/web/themes/nsf/bin/npm
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -euo pipefail
+
+docker run \
+  --rm -it\
+  --volume $PWD:/app \
+  --workdir /app \
+  node:8.11.1\
+  npm "$@"

From 3382e2fe2bf12bcd6be58085f6f9c4af1c37fc18 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 25 Apr 2018 10:45:55 -0400
Subject: [PATCH 114/143] Rebuild CSS using node-sass.

---
 web/themes/nsf/assets/css/uswds.css         | 235 ++++++++++++--------
 web/themes/nsf/assets/css/uswds.min.css     |   2 +-
 web/themes/nsf/assets/css/uswds.min.css.map |   2 +-
 3 files changed, 148 insertions(+), 91 deletions(-)

diff --git a/web/themes/nsf/assets/css/uswds.css b/web/themes/nsf/assets/css/uswds.css
index e575363..dd6c5cc 100644
--- a/web/themes/nsf/assets/css/uswds.css
+++ b/web/themes/nsf/assets/css/uswds.css
@@ -366,41 +366,49 @@ th {
   font-style: normal;
   font-weight: 300;
   src: url("../fonts/sourcesanspro-light-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/sourcesanspro-light-webfont.woff2") format("woff2"), url("../fonts/sourcesanspro-light-webfont.woff") format("woff"), url("../fonts/sourcesanspro-light-webfont.ttf") format("truetype"); }
+
 @font-face {
   font-family: "Source Sans Pro";
   font-style: normal;
   font-weight: 400;
   src: url("../fonts/sourcesanspro-regular-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/sourcesanspro-regular-webfont.woff2") format("woff2"), url("../fonts/sourcesanspro-regular-webfont.woff") format("woff"), url("../fonts/sourcesanspro-regular-webfont.ttf") format("truetype"); }
+
 @font-face {
   font-family: "Source Sans Pro";
   font-style: italic;
   font-weight: 400;
   src: url("../fonts/sourcesanspro-italic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/sourcesanspro-italic-webfont.woff2") format("woff2"), url("../fonts/sourcesanspro-italic-webfont.woff") format("woff"), url("../fonts/sourcesanspro-italic-webfont.ttf") format("truetype"); }
+
 @font-face {
   font-family: "Source Sans Pro";
   font-style: normal;
   font-weight: 700;
   src: url("../fonts/sourcesanspro-bold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/sourcesanspro-bold-webfont.woff2") format("woff2"), url("../fonts/sourcesanspro-bold-webfont.woff") format("woff"), url("../fonts/sourcesanspro-bold-webfont.ttf") format("truetype"); }
+
 @font-face {
   font-family: "Merriweather";
   font-style: normal;
   font-weight: 300;
   src: url("../fonts/merriweather-light-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/merriweather-light-webfont.woff2") format("woff2"), url("../fonts/merriweather-light-webfont.woff") format("woff"), url("../fonts/merriweather-light-webfont.ttf") format("truetype"); }
+
 @font-face {
   font-family: "Merriweather";
   font-style: normal;
   font-weight: 400;
   src: url("../fonts/merriweather-regular-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/merriweather-regular-webfont.woff2") format("woff2"), url("../fonts/merriweather-regular-webfont.woff") format("woff"), url("../fonts/merriweather-regular-webfont.ttf") format("truetype"); }
+
 @font-face {
   font-family: "Merriweather";
   font-style: italic;
   font-weight: 400;
   src: url("../fonts/merriweather-italic-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/merriweather-italic-webfont.woff2") format("woff2"), url("../fonts/merriweather-italic-webfont.woff") format("woff"), url("../fonts/merriweather-italic-webfont.ttf") format("truetype"); }
+
 @font-face {
   font-family: "Merriweather";
   font-style: normal;
   font-weight: 700;
   src: url("../fonts/merriweather-bold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/merriweather-bold-webfont.woff2") format("woff2"), url("../fonts/merriweather-bold-webfont.woff") format("woff"), url("../fonts/merriweather-bold-webfont.ttf") format("truetype"); }
+
 /* stylelint-enable */
 .usa-grid,
 .usa-grid-full {
@@ -429,246 +437,228 @@ th {
   .usa-width-one-whole {
     float: left;
     display: block;
-    margin-right: 4.8291588071%;
+    margin-right: 4.82916%;
     width: 100%; }
     .usa-width-one-whole:last-child {
       margin-right: 0; }
-
   .usa-width-one-half {
     float: left;
     display: block;
-    margin-right: 4.8291588071%;
-    width: 47.5854205965%; }
+    margin-right: 4.82916%;
+    width: 47.58542%; }
     .usa-width-one-half:last-child {
       margin-right: 0; }
-
   .usa-width-one-third {
     float: left;
     display: block;
-    margin-right: 4.8291588071%;
-    width: 30.1138941286%; }
+    margin-right: 4.82916%;
+    width: 30.11389%; }
     .usa-width-one-third:last-child {
       margin-right: 0; }
-
   .usa-width-two-thirds {
     float: left;
     display: block;
-    margin-right: 4.8291588071%;
-    width: 65.0569470643%; }
+    margin-right: 4.82916%;
+    width: 65.05695%; }
     .usa-width-two-thirds:last-child {
       margin-right: 0; }
-
   .usa-width-one-fourth {
     float: left;
     display: block;
-    margin-right: 4.8291588071%;
-    width: 47.5854205965%; }
+    margin-right: 4.82916%;
+    width: 47.58542%; }
     .usa-width-one-fourth:last-child {
       margin-right: 0; }
     .usa-width-one-fourth:nth-child(2n) {
       margin-right: 0; }
-
   .usa-width-three-fourths {
     float: left;
     display: block;
-    margin-right: 4.8291588071%;
+    margin-right: 4.82916%;
     width: 100%; }
     .usa-width-three-fourths:last-child {
       margin-right: 0; }
-
   .usa-width-one-sixth {
     float: left;
     display: block;
-    margin-right: 4.8291588071%;
-    width: 30.1138941286%; }
+    margin-right: 4.82916%;
+    width: 30.11389%; }
     .usa-width-one-sixth:last-child {
       margin-right: 0; }
     .usa-width-one-sixth:nth-child(3n) {
       margin-right: 0; }
-
   .usa-width-five-sixths {
     float: left;
     display: block;
-    margin-right: 4.8291588071%;
-    width: 65.0569470643%; }
+    margin-right: 4.82916%;
+    width: 65.05695%; }
     .usa-width-five-sixths:last-child {
       margin-right: 0; }
-
   .usa-width-one-twelfth {
     float: left;
     display: block;
-    margin-right: 4.8291588071%;
-    width: 30.1138941286%; }
+    margin-right: 4.82916%;
+    width: 30.11389%; }
     .usa-width-one-twelfth:last-child {
       margin-right: 0; }
     .usa-width-one-twelfth:nth-child(3n) {
       margin-right: 0; }
-
   .usa-width-five-twelfths {
     float: left;
     display: block;
-    margin-right: 4.8291588071%;
-    width: 30.1138941286%; }
+    margin-right: 4.82916%;
+    width: 30.11389%; }
     .usa-width-five-twelfths:last-child {
       margin-right: 0; }
-
   .usa-width-seven-twelfths {
     float: left;
     display: block;
-    margin-right: 4.8291588071%;
-    width: 65.0569470643%; }
+    margin-right: 4.82916%;
+    width: 65.05695%; }
     .usa-width-seven-twelfths:last-child {
       margin-right: 0; } }
+
 @media screen and (min-width: 1201px) {
   .usa-width-one-whole {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
+    margin-right: 2.35765%;
     width: 100%; }
     .usa-width-one-whole:last-child {
       margin-right: 0; }
-
   .usa-width-one-half {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 48.8211739883%; }
+    margin-right: 2.35765%;
+    width: 48.82117%; }
     .usa-width-one-half:last-child {
       margin-right: 0; }
-
   .usa-width-one-third {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 31.7615653177%; }
+    margin-right: 2.35765%;
+    width: 31.76157%; }
     .usa-width-one-third:last-child {
       margin-right: 0; }
-
   .usa-width-two-thirds {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 65.8807826589%; }
+    margin-right: 2.35765%;
+    width: 65.88078%; }
     .usa-width-two-thirds:last-child {
       margin-right: 0; }
-
   .usa-width-one-fourth {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 23.2317609825%; }
+    margin-right: 2.35765%;
+    width: 23.23176%; }
     .usa-width-one-fourth:last-child {
       margin-right: 0; }
     .usa-width-one-fourth:nth-child(2n) {
       float: left;
       display: block;
-      margin-right: 2.3576520234%;
-      width: 23.2317609825%; }
+      margin-right: 2.35765%;
+      width: 23.23176%; }
       .usa-width-one-fourth:nth-child(2n):last-child {
         margin-right: 0; }
     .usa-width-one-fourth:nth-child(4n) {
       margin-right: 0; }
-
   .usa-width-three-fourths {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 74.4105869942%; }
+    margin-right: 2.35765%;
+    width: 74.41059%; }
     .usa-width-three-fourths:last-child {
       margin-right: 0; }
-
   .usa-width-one-sixth {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 14.7019566472%; }
+    margin-right: 2.35765%;
+    width: 14.70196%; }
     .usa-width-one-sixth:last-child {
       margin-right: 0; }
     .usa-width-one-sixth:nth-child(3n) {
       float: left;
       display: block;
-      margin-right: 2.3576520234%;
-      width: 14.7019566472%; }
+      margin-right: 2.35765%;
+      width: 14.70196%; }
       .usa-width-one-sixth:nth-child(3n):last-child {
         margin-right: 0; }
     .usa-width-one-sixth:nth-child(6n) {
       margin-right: 0; }
-
   .usa-width-five-sixths {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 82.9403913294%; }
+    margin-right: 2.35765%;
+    width: 82.94039%; }
     .usa-width-five-sixths:last-child {
       margin-right: 0; }
-
   .usa-width-one-twelfth {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 6.1721523119%; }
+    margin-right: 2.35765%;
+    width: 6.17215%; }
     .usa-width-one-twelfth:last-child {
       margin-right: 0; }
     .usa-width-one-twelfth:nth-child(3n) {
       float: left;
       display: block;
-      margin-right: 2.3576520234%;
-      width: 6.1721523119%; }
+      margin-right: 2.35765%;
+      width: 6.17215%; }
       .usa-width-one-twelfth:nth-child(3n):last-child {
         margin-right: 0; }
     .usa-width-one-twelfth:nth-child(12n) {
       margin-right: 0; }
-
   .usa-width-five-twelfths {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 40.291369653%; }
+    margin-right: 2.35765%;
+    width: 40.29137%; }
     .usa-width-five-twelfths:last-child {
       margin-right: 0; }
-
   .usa-width-seven-twelfths {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 57.3509783236%; }
+    margin-right: 2.35765%;
+    width: 57.35098%; }
     .usa-width-seven-twelfths:last-child {
       margin-right: 0; } }
+
 .usa-end-row {
   margin-right: 0; }
 
 .usa-offset-one-twelfth {
-  margin-left: 8.5298043353%; }
+  margin-left: 8.5298%; }
 
 .usa-offset-one-sixth {
-  margin-left: 17.0596086706%; }
+  margin-left: 17.05961%; }
 
 .usa-offset-one-fourth {
-  margin-left: 25.5894130058%; }
+  margin-left: 25.58941%; }
 
 .usa-offset-one-third {
-  margin-left: 34.1192173411%; }
+  margin-left: 34.11922%; }
 
 .usa-offset-five-twelfths {
-  margin-left: 42.6490216764%; }
+  margin-left: 42.64902%; }
 
 .usa-offset-one-half {
-  margin-left: 51.1788260117%; }
+  margin-left: 51.17883%; }
 
 .usa-offset-seven-twelfths {
-  margin-left: 59.708630347%; }
+  margin-left: 59.70863%; }
 
 .usa-offset-two-thirds {
-  margin-left: 68.2384346823%; }
+  margin-left: 68.23843%; }
 
 .usa-offset-three-fourths {
-  margin-left: 76.7682390175%; }
+  margin-left: 76.76824%; }
 
 .usa-offset-five-sixths {
-  margin-left: 85.2980433528%; }
+  margin-left: 85.29804%; }
 
 .usa-offset-eleven-twelfths {
-  margin-left: 93.8278476881%; }
+  margin-left: 93.82785%; }
 
 .usa-sr-only {
   position: absolute;
@@ -1332,11 +1322,12 @@ legend {
   font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   margin-bottom: 0; }
 
-[type=checkbox], [type=radio] {
+[type=checkbox],
+[type=radio] {
   position: absolute;
   left: -999em; }
-  .lt-ie9 [type=checkbox],
-  .lt-ie9 [type=radio] {
+  .lt-ie9 [type=checkbox], .lt-ie9
+  [type=radio] {
     border: 0;
     float: left;
     margin: 0.4em 0.4em 0 0;
@@ -1468,11 +1459,13 @@ legend {
 
 .usa-date-of-birth label {
   margin-top: 0; }
+
 .usa-date-of-birth [type=number]::-webkit-inner-spin-button,
 .usa-date-of-birth [type=number]::-webkit-outer-spin-button {
   -webkit-appearance: none;
   appearance: none;
   margin: 0; }
+
 .usa-date-of-birth [type=number] {
   -moz-appearance: textfield; }
 
@@ -1545,6 +1538,7 @@ table {
 
 thead th {
   font-weight: 700; }
+
 thead th,
 thead td {
   background-color: #e4e4e4; }
@@ -1562,10 +1556,12 @@ td {
 .usa-table-borderless thead th {
   background-color: transparent;
   border-top: 0; }
+
 .usa-table-borderless th,
 .usa-table-borderless td {
   border-left: 0;
   border-right: 0; }
+
 .usa-table-borderless th:first-child {
   padding-left: 0; }
 
@@ -1609,6 +1605,7 @@ a {
   margin-bottom: -1px;
   margin-left: 4px;
   width: 0.65em; }
+
 .usa-external_link:hover::after {
   background-image: url("../img/external-link-hover.png");
   background-image: url("../img/external-link-hover.svg"); }
@@ -1623,6 +1620,7 @@ a {
   margin-bottom: -1px;
   margin-left: 4px;
   width: 0.65em; }
+
 .usa-external_link-alt:hover::after {
   background-image: url("../img/external-link-alt-hover.png");
   background-image: url("../img/external-link-alt-hover.svg"); }
@@ -1686,6 +1684,7 @@ dfn {
 .usa-sans li,
 .usa-sans span {
   font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif; }
+
 .usa-sans a {
   border-bottom: none;
   font-weight: 700; }
@@ -1750,6 +1749,7 @@ dfn {
 .usa-grid > :first-child,
 .usa-grid-full > :first-child {
   margin-top: 0; }
+
 .usa-section > :last-child,
 .usa-grid > :last-child,
 .usa-grid-full > :last-child {
@@ -1765,6 +1765,7 @@ dfn {
 .usa-width-five-sixths:first-child > :first-child,
 .usa-width-one-twelfth:first-child > :first-child {
   margin-top: 0; }
+
 @media screen and (min-width: 600px) {
   .usa-width-one-whole > :first-child,
   .usa-width-one-half > :first-child,
@@ -1776,6 +1777,7 @@ dfn {
   .usa-width-five-sixths > :first-child,
   .usa-width-one-twelfth > :first-child {
     margin-top: 0; } }
+
 .usa-width-one-whole:last-child > :last-child,
 .usa-width-one-half:last-child > :last-child,
 .usa-width-one-third:last-child > :last-child,
@@ -1786,6 +1788,7 @@ dfn {
 .usa-width-five-sixths:last-child > :last-child,
 .usa-width-one-twelfth:last-child > :last-child {
   margin-bottom: 0; }
+
 @media screen and (min-width: 600px) {
   .usa-width-one-whole > :last-child,
   .usa-width-one-half > :last-child,
@@ -2276,6 +2279,7 @@ dfn {
 
 .usa-footer .usa-unstyled-list {
   display: block; }
+
 .usa-footer .usa-footer-primary-link {
   color: #212121;
   display: block;
@@ -2289,6 +2293,7 @@ dfn {
       border-top: none; } }
   .usa-footer .usa-footer-primary-link:hover {
     text-decoration: underline; }
+
 .usa-footer .usa-footer-primary-link ~ li a,
 .usa-footer .usa-footer-secondary-link {
   text-decoration: none; }
@@ -2331,77 +2336,93 @@ dfn {
   @media screen and (min-width: 600px) {
     .usa-footer-medium .usa-footer-contact_info p {
       margin: 0 0 0 1rem; } }
+
 .usa-footer-medium .usa-footer-contact-heading {
   margin-top: 0; }
   @media screen and (min-width: 600px) {
     .usa-footer-medium .usa-footer-contact-heading {
       margin-top: 0.5rem;
       margin-bottom: 0.5rem; } }
+
 .usa-footer-medium .usa-footer-logo {
   padding: 1rem 0; }
   @media screen and (min-width: 600px) {
     .usa-footer-medium .usa-footer-logo {
       padding: 2rem 0; } }
+
 .usa-footer-medium .usa-footer-primary-link {
   padding-bottom: 1.5rem;
   padding-top: 1.5rem; }
+
 .usa-footer-medium .usa-footer-primary-section > .usa-grid {
   padding: 0; }
   @media screen and (min-width: 600px) {
     .usa-footer-medium .usa-footer-primary-section > .usa-grid {
       padding-left: 3rem;
       padding-right: 3rem; } }
+
 @media screen and (min-width: 1201px) {
   .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content {
     margin-right: 5%;
     width: inherit; } }
+
 @media screen and (min-width: 1201px) {
   .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content:last-child {
     margin-right: 0; } }
+
 @media screen and (min-width: 600px) {
   .usa-footer-medium .usa-footer-nav ul {
     align-items: center; } }
 
 .usa-footer-slim .usa-footer-nav a {
   display: block; }
+
 @media screen and (min-width: 1201px) {
   .usa-footer-slim .usa-footer-nav .usa-footer-primary-content {
     margin-right: 5%;
     width: inherit; } }
+
 @media screen and (min-width: 1201px) {
   .usa-footer-slim .usa-footer-nav .usa-footer-primary-content:last-child {
     margin-right: 0; } }
+
 .usa-footer-slim .usa-footer-primary-link {
   padding-bottom: 1.5rem;
   padding-top: 1.5rem; }
+
 .usa-footer-slim .usa-footer-primary-section > .usa-grid {
   padding: 0; }
   @media screen and (min-width: 600px) {
     .usa-footer-slim .usa-footer-primary-section > .usa-grid {
       padding-left: 3rem;
       padding-right: 3rem; } }
+
 @media screen and (min-width: 600px) {
   .usa-footer-slim .usa-footer-primary-section {
     padding-bottom: 0;
     padding-top: 0; }
     .usa-footer-slim .usa-footer-primary-section .usa-grid-full {
       align-items: center; } }
+
 @media screen and (min-width: 600px) {
   .usa-footer-slim .usa-footer-contact_info > * {
     margin: 0; } }
+
 @media screen and (min-width: 600px) {
   .usa-footer-slim .usa-footer-contact_info {
     padding-top: 1.5rem;
     padding-bottom: 1.5rem; } }
+
 @media screen and (min-width: 600px) {
   .usa-footer-slim .usa-footer-contact_info {
     width: 100%; } }
+
 @media screen and (min-width: 1201px) {
   .usa-footer-slim .usa-footer-contact_info {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 48.8211739883%; }
+    margin-right: 2.35765%;
+    width: 48.82117%; }
     .usa-footer-slim .usa-footer-contact_info:last-child {
       margin-right: 0; } }
 
@@ -2469,24 +2490,29 @@ li.usa-footer-primary-content {
     @media screen and (min-width: 600px) {
       .usa-footer-big .usa-footer-contact_info p {
         margin: 0.5rem 0 0 1rem; } }
+
 @media screen and (min-width: 600px) {
   .usa-footer-big .usa-footer-contact-links {
     padding-top: 2rem; } }
+
 .usa-footer-big .usa-footer-logo {
   padding: 1rem 0; }
   @media screen and (min-width: 600px) {
     .usa-footer-big .usa-footer-logo {
       padding: 2rem 0; } }
+
 @media screen and (min-width: 600px) {
   .usa-footer-big .usa-footer-primary-section {
     padding-bottom: 4rem;
     padding-top: 3rem; } }
+
 .usa-footer-big .usa-footer-primary-section > .usa-grid {
   padding: 0; }
   @media screen and (min-width: 600px) {
     .usa-footer-big .usa-footer-primary-section > .usa-grid {
       padding-left: 3rem;
       padding-right: 3rem; } }
+
 .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content {
   padding-left: 0;
   padding-right: 0; }
@@ -2497,6 +2523,7 @@ li.usa-footer-primary-content {
         margin-left: 0; } }
   .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link {
     margin-left: 0; }
+
 .usa-footer-big ul {
   padding-bottom: 2.4rem; }
   @media screen and (min-width: 600px) {
@@ -2629,6 +2656,7 @@ li.usa-footer-primary-content {
 
 form a {
   border-bottom: 0; }
+
 form [type=submit],
 form [type=submit] {
   display: block;
@@ -2640,6 +2668,7 @@ form [type=submit] {
       padding-left: 2.7em;
       padding-right: 2.7em;
       width: auto; } }
+
 form [name=password],
 form [name=confirmPassword] {
   margin-bottom: 1.1rem; }
@@ -2670,6 +2699,7 @@ input.usa-input-tiny {
   @media screen and (min-width: 600px) {
     input.usa-input-tiny {
       max-width: 6rem; } }
+
 input.usa-input-medium {
   /* stylelint-disable-line selector-no-qualifying-type */ }
   @media screen and (min-width: 600px) {
@@ -2688,8 +2718,10 @@ input.usa-input-medium {
   .usa-input-grid-small {
     float: left;
     width: 35%; } }
+
 .usa-input-grid-small input {
   margin-bottom: 3rem; }
+
 .usa-input-grid-small select {
   margin-bottom: 3rem; }
 
@@ -2697,8 +2729,10 @@ input.usa-input-medium {
   .usa-input-grid-medium {
     float: left;
     width: 65%; } }
+
 .usa-input-grid-medium input {
   margin-bottom: 3rem; }
+
 .usa-input-grid-medium select {
   margin-bottom: 3rem; }
 
@@ -2706,8 +2740,10 @@ input.usa-input-medium {
   .usa-input-grid-large {
     float: left;
     width: 100%; } }
+
 .usa-input-grid-large input {
   margin-bottom: 3rem; }
+
 .usa-input-grid-large select {
   margin-bottom: 3rem; }
 
@@ -2744,13 +2780,17 @@ input.usa-input-medium {
   @media screen and (min-width: 600px) {
     .usa-graphic_list .usa-graphic_list-row .usa-media_block {
       margin-bottom: 6rem; } }
+
 @media screen and (min-width: 600px) {
   .usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block {
     margin-bottom: 0; } }
+
 .usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block:last-child {
   margin-bottom: 0; }
+
 .usa-graphic_list .usa-media_block-img {
   margin-right: 3rem; }
+
 .usa-graphic_list .usa-media_block-body > :first-child {
   margin-top: 0; }
 
@@ -2848,6 +2888,7 @@ input.usa-input-medium {
   .usa-header-basic .usa-logo {
     bottom: 0;
     position: absolute; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-basic .usa-navbar {
     position: relative;
@@ -2856,14 +2897,17 @@ input.usa-input-medium {
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-header {
     border-bottom: none; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-logo {
     margin-top: 3rem;
     margin-bottom: 3rem; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-extended em {
     font-size: 3.2rem;
     line-height: 1; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-navbar {
     max-width: 1200px;
@@ -2878,12 +2922,14 @@ input.usa-input-medium {
       clear: both;
       content: "";
       display: block; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-nav {
     border-top: 1px solid #c9c9c9;
     float: none;
     padding: 0;
     width: 100%; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-nav-inner {
     max-width: 1200px;
@@ -2898,24 +2944,29 @@ input.usa-input-medium {
       clear: both;
       content: "";
       display: block; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-nav-primary::after {
     clear: both;
     content: "";
     display: block; } }
+
 .usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {
   /* stylelint-disable-line selector-no-qualifying-type */ }
   @media screen and (min-width: 951px) {
     .usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {
       /* stylelint-disable-line selector-no-qualifying-type */
       background-position: right 1.5rem top 53%; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-nav-link {
     padding-top: 1.8rem;
     padding-bottom: 1.8rem; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-nav-submenu .usa-grid-full {
     padding-left: 1.2rem; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-megamenu {
     padding-left: 3rem; } }
@@ -3210,12 +3261,14 @@ input.usa-input-medium {
   .usa-header-extended .usa-nav-link:hover span {
     border-bottom: 0.7rem solid #0071BC;
     padding-bottom: 0.9rem; } }
+
 .usa-header-extended .usa-nav-primary button[aria-expanded=true] {
   /* stylelint-disable-line selector-no-qualifying-type */ }
   @media screen and (min-width: 951px) {
     .usa-header-extended .usa-nav-primary button[aria-expanded=true] span {
       border-bottom: 0.7rem solid #0071BC;
       padding-bottom: 0.9rem; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-extended .usa-nav-primary .usa-current span {
     border-bottom: 0.7rem solid #0071BC;
@@ -3380,6 +3433,7 @@ input.usa-input-medium {
     padding-bottom: 3.15rem;
     left: -1rem;
     width: 100%; } }
+
 @media screen and (min-width: 951px) {
   .usa-megamenu::before {
     background-color: #112E51;
@@ -3390,6 +3444,7 @@ input.usa-input-medium {
     top: 0;
     width: 1000%;
     right: 100%; } }
+
 @media screen and (min-width: 951px) {
   .usa-megamenu::after {
     background-color: #112E51;
@@ -3406,6 +3461,7 @@ input.usa-input-medium {
     padding-left: 0;
     padding-top: 0;
     width: 100%; } }
+
 .usa-header-basic-megamenu .usa-nav-inner {
   display: flex;
   flex-direction: column; }
@@ -3414,6 +3470,7 @@ input.usa-input-medium {
       display: block;
       float: right;
       margin-top: -3.8rem; } }
+
 @media screen and (min-width: 951px) {
   .usa-header-basic-megamenu .usa-nav-submenu .usa-grid-full {
     margin-left: -1.8rem; } }
@@ -3422,19 +3479,20 @@ input.usa-input-medium {
   .usa-megamenu-col {
     float: left;
     display: block;
-    margin-right: 2.3576520234%;
-    width: 23.2317609825%; }
+    margin-right: 2.35765%;
+    width: 23.23176%; }
     .usa-megamenu-col:last-child {
       margin-right: 0; }
     .usa-megamenu-col:nth-child(2n) {
       float: left;
       display: block;
-      margin-right: 2.3576520234%;
-      width: 23.2317609825%; }
+      margin-right: 2.35765%;
+      width: 23.23176%; }
       .usa-megamenu-col:nth-child(2n):last-child {
         margin-right: 0; }
     .usa-megamenu-col:nth-child(4n) {
       margin-right: 0; } }
+
 .usa-megamenu-col > ul {
   margin-top: 0;
   margin-bottom: 0;
@@ -3695,6 +3753,7 @@ input, textarea, select {
 #block-nsf-views-block-news-block-1 ul {
   margin: 0 auto;
   text-align: center; }
+
 #block-nsf-views-block-news-block-1 li {
   display: inline-block;
   vertical-align: top; }
@@ -3710,5 +3769,3 @@ img.image-style-news-main-story {
 
 .usa-navbar em.usa-logo-text {
   margin-left: -5000em; }
-
-/*# sourceMappingURL=uswds.css.map */
diff --git a/web/themes/nsf/assets/css/uswds.min.css b/web/themes/nsf/assets/css/uswds.min.css
index c1731d2..4d644df 100644
--- a/web/themes/nsf/assets/css/uswds.min.css
+++ b/web/themes/nsf/assets/css/uswds.min.css
@@ -1,4 +1,4 @@
 /*! uswds @version */
 
-/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse}td,th{padding:0}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:300;src:url(../fonts/sourcesanspro-light-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-light-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-light-webfont.woff) format("woff"),url(../fonts/sourcesanspro-light-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:400;src:url(../fonts/sourcesanspro-regular-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-regular-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-regular-webfont.woff) format("woff"),url(../fonts/sourcesanspro-regular-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:italic;font-weight:400;src:url(../fonts/sourcesanspro-italic-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-italic-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-italic-webfont.woff) format("woff"),url(../fonts/sourcesanspro-italic-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:700;src:url(../fonts/sourcesanspro-bold-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-bold-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-bold-webfont.woff) format("woff"),url(../fonts/sourcesanspro-bold-webfont.ttf) format("truetype")}@font-face{font-family:Merriweather;font-style:normal;font-weight:300;src:url(../fonts/merriweather-light-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/merriweather-light-webfont.woff2) format("woff2"),url(../fonts/merriweather-light-webfont.woff) format("woff"),url(../fonts/merriweather-light-webfont.ttf) format("truetype")}@font-face{font-family:Merriweather;font-style:normal;font-weight:400;src:url(../fonts/merriweather-regular-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/merriweather-regular-webfont.woff2) format("woff2"),url(../fonts/merriweather-regular-webfont.woff) format("woff"),url(../fonts/merriweather-regular-webfont.ttf) format("truetype")}@font-face{font-family:Merriweather;font-style:italic;font-weight:400;src:url(../fonts/merriweather-italic-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/merriweather-italic-webfont.woff2) format("woff2"),url(../fonts/merriweather-italic-webfont.woff) format("woff"),url(../fonts/merriweather-italic-webfont.ttf) format("truetype")}@font-face{font-family:Merriweather;font-style:normal;font-weight:700;src:url(../fonts/merriweather-bold-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/merriweather-bold-webfont.woff2) format("woff2"),url(../fonts/merriweather-bold-webfont.woff) format("woff"),url(../fonts/merriweather-bold-webfont.ttf) format("truetype")}.usa-grid,.usa-grid-full{max-width:1200px;margin-left:auto;margin-right:auto;max-width:1040px}.usa-grid-full:after,.usa-grid:after{clear:both;content:"";display:block}.usa-grid{padding-right:1.5rem;padding-left:1.5rem}@media screen and (min-width:600px){.usa-grid{padding-right:3rem;padding-left:3rem}}.usa-grid-full{padding:0}@media screen and (min-width:600px){.usa-width-one-whole{float:left;display:block;margin-right:4.82916%;width:100%}.usa-width-one-whole:last-child{margin-right:0}.usa-width-one-half{float:left;display:block;margin-right:4.82916%;width:47.58542%}.usa-width-one-half:last-child{margin-right:0}.usa-width-one-third{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-third:last-child{margin-right:0}.usa-width-two-thirds{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-two-thirds:last-child{margin-right:0}.usa-width-one-fourth{float:left;display:block;margin-right:4.82916%;width:47.58542%}.usa-width-one-fourth:last-child,.usa-width-one-fourth:nth-child(2n){margin-right:0}.usa-width-three-fourths{float:left;display:block;margin-right:4.82916%;width:100%}.usa-width-three-fourths:last-child{margin-right:0}.usa-width-one-sixth{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-sixth:last-child,.usa-width-one-sixth:nth-child(3n){margin-right:0}.usa-width-five-sixths{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-five-sixths:last-child{margin-right:0}.usa-width-one-twelfth{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-twelfth:last-child,.usa-width-one-twelfth:nth-child(3n){margin-right:0}.usa-width-five-twelfths{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-five-twelfths:last-child{margin-right:0}.usa-width-seven-twelfths{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-seven-twelfths:last-child{margin-right:0}}@media screen and (min-width:1201px){.usa-width-one-whole{float:left;display:block;margin-right:2.35765%;width:100%}.usa-width-one-whole:last-child{margin-right:0}.usa-width-one-half{float:left;display:block;margin-right:2.35765%;width:48.82117%}.usa-width-one-half:last-child{margin-right:0}.usa-width-one-third{float:left;display:block;margin-right:2.35765%;width:31.76157%}.usa-width-one-third:last-child{margin-right:0}.usa-width-two-thirds{float:left;display:block;margin-right:2.35765%;width:65.88078%}.usa-width-two-thirds:last-child{margin-right:0}.usa-width-one-fourth{float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-width-one-fourth:last-child{margin-right:0}.usa-width-one-fourth:nth-child(2n){float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-width-one-fourth:nth-child(2n):last-child,.usa-width-one-fourth:nth-child(4n){margin-right:0}.usa-width-three-fourths{float:left;display:block;margin-right:2.35765%;width:74.41059%}.usa-width-three-fourths:last-child{margin-right:0}.usa-width-one-sixth{float:left;display:block;margin-right:2.35765%;width:14.70196%}.usa-width-one-sixth:last-child{margin-right:0}.usa-width-one-sixth:nth-child(3n){float:left;display:block;margin-right:2.35765%;width:14.70196%}.usa-width-one-sixth:nth-child(3n):last-child,.usa-width-one-sixth:nth-child(6n){margin-right:0}.usa-width-five-sixths{float:left;display:block;margin-right:2.35765%;width:82.94039%}.usa-width-five-sixths:last-child{margin-right:0}.usa-width-one-twelfth{float:left;display:block;margin-right:2.35765%;width:6.17215%}.usa-width-one-twelfth:last-child{margin-right:0}.usa-width-one-twelfth:nth-child(3n){float:left;display:block;margin-right:2.35765%;width:6.17215%}.usa-width-one-twelfth:nth-child(3n):last-child,.usa-width-one-twelfth:nth-child(12n){margin-right:0}.usa-width-five-twelfths{float:left;display:block;margin-right:2.35765%;width:40.29137%}.usa-width-five-twelfths:last-child{margin-right:0}.usa-width-seven-twelfths{float:left;display:block;margin-right:2.35765%;width:57.35098%}.usa-width-seven-twelfths:last-child{margin-right:0}}.usa-end-row{margin-right:0}.usa-offset-one-twelfth{margin-left:8.5298%}.usa-offset-one-sixth{margin-left:17.05961%}.usa-offset-one-fourth{margin-left:25.58941%}.usa-offset-one-third{margin-left:34.11922%}.usa-offset-five-twelfths{margin-left:42.64902%}.usa-offset-one-half{margin-left:51.17883%}.usa-offset-seven-twelfths{margin-left:59.70863%}.usa-offset-two-thirds{margin-left:68.23843%}.usa-offset-three-fourths{margin-left:76.76824%}.usa-offset-five-sixths{margin-left:85.29804%}.usa-offset-eleven-twelfths{margin-left:93.82785%}.usa-sr-only{position:absolute;left:-999em}html{box-sizing:border-box}*,:after,:before{box-sizing:inherit}body{background-color:#fff;overflow-x:hidden}.lt-ie9 *{-webkit-filter:none!important;filter:none!important}[hidden]{display:none!important}.usa-focus,:focus{outline:2px dotted #999;outline-offset:3px}.usa-button,.usa-button-primary,.usa-button-primary:visited,.usa-button:visited,[type=button],[type=image],[type=reset],[type=submit],button{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;margin-top:.5em;margin-right:.5em;margin-bottom:.5em;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#313b52;border:0;border-radius:5px;color:#fff;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:1.7rem;font-weight:700;line-height:1;padding:1rem 2rem;text-align:center;text-decoration:none;width:100%}@media screen and (min-width:481px){.usa-button,.usa-button-primary,.usa-button-primary:visited,.usa-button:visited,[type=button],[type=image],[type=reset],[type=submit],button{width:auto}}.usa-button-primary.usa-button-hover,.usa-button-primary:hover,.usa-button-primary:visited.usa-button-hover,.usa-button-primary:visited:hover,.usa-button.usa-button-hover,.usa-button:hover,.usa-button:visited.usa-button-hover,.usa-button:visited:hover,[type=button].usa-button-hover,[type=button]:hover,[type=image].usa-button-hover,[type=image]:hover,[type=reset].usa-button-hover,[type=reset]:hover,[type=submit].usa-button-hover,[type=submit]:hover,button.usa-button-hover,button:hover{background-color:#1b2847;border-bottom:0;color:#fff;text-decoration:none}.usa-button-primary.usa-button-active,.usa-button-primary:active,.usa-button-primary:visited.usa-button-active,.usa-button-primary:visited:active,.usa-button.usa-button-active,.usa-button:active,.usa-button:visited.usa-button-active,.usa-button:visited:active,[type=button].usa-button-active,[type=button]:active,[type=image].usa-button-active,[type=image]:active,[type=reset].usa-button-active,[type=reset]:active,[type=submit].usa-button-active,[type=submit]:active,button.usa-button-active,button:active{background-color:#03143d}.usa-button-primary.usa-button-primary-alt,.usa-button-primary:visited.usa-button-primary-alt,.usa-button.usa-button-primary-alt,.usa-button:visited.usa-button-primary-alt,[type=button].usa-button-primary-alt,[type=image].usa-button-primary-alt,[type=reset].usa-button-primary-alt,[type=submit].usa-button-primary-alt,button.usa-button-primary-alt{background-color:#c64b00;color:#fff}.usa-button-primary.usa-button-primary-alt.usa-button-hover,.usa-button-primary.usa-button-primary-alt:hover,.usa-button-primary:visited.usa-button-primary-alt.usa-button-hover,.usa-button-primary:visited.usa-button-primary-alt:hover,.usa-button.usa-button-primary-alt.usa-button-hover,.usa-button.usa-button-primary-alt:hover,.usa-button:visited.usa-button-primary-alt.usa-button-hover,.usa-button:visited.usa-button-primary-alt:hover,[type=button].usa-button-primary-alt.usa-button-hover,[type=button].usa-button-primary-alt:hover,[type=image].usa-button-primary-alt.usa-button-hover,[type=image].usa-button-primary-alt:hover,[type=reset].usa-button-primary-alt.usa-button-hover,[type=reset].usa-button-primary-alt:hover,[type=submit].usa-button-primary-alt.usa-button-hover,[type=submit].usa-button-primary-alt:hover,button.usa-button-primary-alt.usa-button-hover,button.usa-button-primary-alt:hover{background-color:#046b99}.usa-button-primary.usa-button-primary-alt.usa-button-active,.usa-button-primary.usa-button-primary-alt:active,.usa-button-primary:visited.usa-button-primary-alt.usa-button-active,.usa-button-primary:visited.usa-button-primary-alt:active,.usa-button.usa-button-primary-alt.usa-button-active,.usa-button.usa-button-primary-alt:active,.usa-button:visited.usa-button-primary-alt.usa-button-active,.usa-button:visited.usa-button-primary-alt:active,[type=button].usa-button-primary-alt.usa-button-active,[type=button].usa-button-primary-alt:active,[type=image].usa-button-primary-alt.usa-button-active,[type=image].usa-button-primary-alt:active,[type=reset].usa-button-primary-alt.usa-button-active,[type=reset].usa-button-primary-alt:active,[type=submit].usa-button-primary-alt.usa-button-active,[type=submit].usa-button-primary-alt:active,button.usa-button-primary-alt.usa-button-active,button.usa-button-primary-alt:active{background-color:#00a6d2;color:#fff}.usa-button-primary.usa-button-secondary,.usa-button-primary:visited.usa-button-secondary,.usa-button.usa-button-secondary,.usa-button:visited.usa-button-secondary,[type=button].usa-button-secondary,[type=image].usa-button-secondary,[type=reset].usa-button-secondary,[type=submit].usa-button-secondary,button.usa-button-secondary{background-color:#fff;box-shadow:inset 0 0 0 2px #313b52;color:#313b52}.usa-button-primary.usa-button-secondary.usa-button-hover,.usa-button-primary.usa-button-secondary:hover,.usa-button-primary:visited.usa-button-secondary.usa-button-hover,.usa-button-primary:visited.usa-button-secondary:hover,.usa-button.usa-button-secondary.usa-button-hover,.usa-button.usa-button-secondary:hover,.usa-button:visited.usa-button-secondary.usa-button-hover,.usa-button:visited.usa-button-secondary:hover,[type=button].usa-button-secondary.usa-button-hover,[type=button].usa-button-secondary:hover,[type=image].usa-button-secondary.usa-button-hover,[type=image].usa-button-secondary:hover,[type=reset].usa-button-secondary.usa-button-hover,[type=reset].usa-button-secondary:hover,[type=submit].usa-button-secondary.usa-button-hover,[type=submit].usa-button-secondary:hover,button.usa-button-secondary.usa-button-hover,button.usa-button-secondary:hover{box-shadow:inset 0 0 0 2px #1b2847;color:#1b2847}.usa-button-primary.usa-button-secondary.usa-button-active,.usa-button-primary.usa-button-secondary:active,.usa-button-primary:visited.usa-button-secondary.usa-button-active,.usa-button-primary:visited.usa-button-secondary:active,.usa-button.usa-button-secondary.usa-button-active,.usa-button.usa-button-secondary:active,.usa-button:visited.usa-button-secondary.usa-button-active,.usa-button:visited.usa-button-secondary:active,[type=button].usa-button-secondary.usa-button-active,[type=button].usa-button-secondary:active,[type=image].usa-button-secondary.usa-button-active,[type=image].usa-button-secondary:active,[type=reset].usa-button-secondary.usa-button-active,[type=reset].usa-button-secondary:active,[type=submit].usa-button-secondary.usa-button-active,[type=submit].usa-button-secondary:active,button.usa-button-secondary.usa-button-active,button.usa-button-secondary:active{box-shadow:inset 0 0 0 2px #03143d;color:#03143d}.usa-button-primary.usa-button-outline-inverse,.usa-button-primary.usa-button-secondary-inverse,.usa-button-primary:visited.usa-button-outline-inverse,.usa-button-primary:visited.usa-button-secondary-inverse,.usa-button.usa-button-outline-inverse,.usa-button.usa-button-secondary-inverse,.usa-button:visited.usa-button-outline-inverse,.usa-button:visited.usa-button-secondary-inverse,[type=button].usa-button-outline-inverse,[type=button].usa-button-secondary-inverse,[type=image].usa-button-outline-inverse,[type=image].usa-button-secondary-inverse,[type=reset].usa-button-outline-inverse,[type=reset].usa-button-secondary-inverse,[type=submit].usa-button-outline-inverse,[type=submit].usa-button-secondary-inverse,button.usa-button-outline-inverse,button.usa-button-secondary-inverse{background:transparent;box-shadow:inset 0 0 0 2px #fff;color:#fff}.usa-button-primary.usa-button-outline-inverse.usa-button-hover,.usa-button-primary.usa-button-outline-inverse:hover,.usa-button-primary.usa-button-secondary-inverse.usa-button-hover,.usa-button-primary.usa-button-secondary-inverse:hover,.usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,.usa-button-primary:visited.usa-button-outline-inverse:hover,.usa-button-primary:visited.usa-button-secondary-inverse.usa-button-hover,.usa-button-primary:visited.usa-button-secondary-inverse:hover,.usa-button.usa-button-outline-inverse.usa-button-hover,.usa-button.usa-button-outline-inverse:hover,.usa-button.usa-button-secondary-inverse.usa-button-hover,.usa-button.usa-button-secondary-inverse:hover,.usa-button:visited.usa-button-outline-inverse.usa-button-hover,.usa-button:visited.usa-button-outline-inverse:hover,.usa-button:visited.usa-button-secondary-inverse.usa-button-hover,.usa-button:visited.usa-button-secondary-inverse:hover,[type=button].usa-button-outline-inverse.usa-button-hover,[type=button].usa-button-outline-inverse:hover,[type=button].usa-button-secondary-inverse.usa-button-hover,[type=button].usa-button-secondary-inverse:hover,[type=image].usa-button-outline-inverse.usa-button-hover,[type=image].usa-button-outline-inverse:hover,[type=image].usa-button-secondary-inverse.usa-button-hover,[type=image].usa-button-secondary-inverse:hover,[type=reset].usa-button-outline-inverse.usa-button-hover,[type=reset].usa-button-outline-inverse:hover,[type=reset].usa-button-secondary-inverse.usa-button-hover,[type=reset].usa-button-secondary-inverse:hover,[type=submit].usa-button-outline-inverse.usa-button-hover,[type=submit].usa-button-outline-inverse:hover,[type=submit].usa-button-secondary-inverse.usa-button-hover,[type=submit].usa-button-secondary-inverse:hover,button.usa-button-outline-inverse.usa-button-hover,button.usa-button-outline-inverse:hover,button.usa-button-secondary-inverse.usa-button-hover,button.usa-button-secondary-inverse:hover{box-shadow:inset 0 0 0 2px #c9c9c9;color:#c9c9c9}.usa-button-primary.usa-button-outline-inverse.usa-button-active,.usa-button-primary.usa-button-outline-inverse:active,.usa-button-primary.usa-button-secondary-inverse.usa-button-active,.usa-button-primary.usa-button-secondary-inverse:active,.usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,.usa-button-primary:visited.usa-button-outline-inverse:active,.usa-button-primary:visited.usa-button-secondary-inverse.usa-button-active,.usa-button-primary:visited.usa-button-secondary-inverse:active,.usa-button.usa-button-outline-inverse.usa-button-active,.usa-button.usa-button-outline-inverse:active,.usa-button.usa-button-secondary-inverse.usa-button-active,.usa-button.usa-button-secondary-inverse:active,.usa-button:visited.usa-button-outline-inverse.usa-button-active,.usa-button:visited.usa-button-outline-inverse:active,.usa-button:visited.usa-button-secondary-inverse.usa-button-active,.usa-button:visited.usa-button-secondary-inverse:active,[type=button].usa-button-outline-inverse.usa-button-active,[type=button].usa-button-outline-inverse:active,[type=button].usa-button-secondary-inverse.usa-button-active,[type=button].usa-button-secondary-inverse:active,[type=image].usa-button-outline-inverse.usa-button-active,[type=image].usa-button-outline-inverse:active,[type=image].usa-button-secondary-inverse.usa-button-active,[type=image].usa-button-secondary-inverse:active,[type=reset].usa-button-outline-inverse.usa-button-active,[type=reset].usa-button-outline-inverse:active,[type=reset].usa-button-secondary-inverse.usa-button-active,[type=reset].usa-button-secondary-inverse:active,[type=submit].usa-button-outline-inverse.usa-button-active,[type=submit].usa-button-outline-inverse:active,[type=submit].usa-button-secondary-inverse.usa-button-active,[type=submit].usa-button-secondary-inverse:active,button.usa-button-outline-inverse.usa-button-active,button.usa-button-outline-inverse:active,button.usa-button-secondary-inverse.usa-button-active,button.usa-button-secondary-inverse:active{box-shadow:inset 0 0 0 2px #999;color:#c9c9c9}.usa-button-primary.usa-button-gray,.usa-button-primary:visited.usa-button-gray,.usa-button.usa-button-gray,.usa-button:visited.usa-button-gray,[type=button].usa-button-gray,[type=image].usa-button-gray,[type=reset].usa-button-gray,[type=submit].usa-button-gray,button.usa-button-gray{background-color:#666}.usa-button-primary.usa-button-gray.usa-button-hover,.usa-button-primary.usa-button-gray:hover,.usa-button-primary:visited.usa-button-gray.usa-button-hover,.usa-button-primary:visited.usa-button-gray:hover,.usa-button.usa-button-gray.usa-button-hover,.usa-button.usa-button-gray:hover,.usa-button:visited.usa-button-gray.usa-button-hover,.usa-button:visited.usa-button-gray:hover,[type=button].usa-button-gray.usa-button-hover,[type=button].usa-button-gray:hover,[type=image].usa-button-gray.usa-button-hover,[type=image].usa-button-gray:hover,[type=reset].usa-button-gray.usa-button-hover,[type=reset].usa-button-gray:hover,[type=submit].usa-button-gray.usa-button-hover,[type=submit].usa-button-gray:hover,button.usa-button-gray.usa-button-hover,button.usa-button-gray:hover{background-color:#333}.usa-button-primary.usa-button-gray.usa-button-active,.usa-button-primary.usa-button-gray:active,.usa-button-primary:visited.usa-button-gray.usa-button-active,.usa-button-primary:visited.usa-button-gray:active,.usa-button.usa-button-gray.usa-button-active,.usa-button.usa-button-gray:active,.usa-button:visited.usa-button-gray.usa-button-active,.usa-button:visited.usa-button-gray:active,[type=button].usa-button-gray.usa-button-active,[type=button].usa-button-gray:active,[type=image].usa-button-gray.usa-button-active,[type=image].usa-button-gray:active,[type=reset].usa-button-gray.usa-button-active,[type=reset].usa-button-gray:active,[type=submit].usa-button-gray.usa-button-active,[type=submit].usa-button-gray:active,button.usa-button-gray.usa-button-active,button.usa-button-gray:active{background-color:#fff}.usa-button-primary.usa-button-red,.usa-button-primary:visited.usa-button-red,.usa-button.usa-button-red,.usa-button:visited.usa-button-red,[type=button].usa-button-red,[type=image].usa-button-red,[type=reset].usa-button-red,[type=submit].usa-button-red,button.usa-button-red{background-color:#005495}.usa-button-primary.usa-button-red.usa-button-hover,.usa-button-primary.usa-button-red:hover,.usa-button-primary:visited.usa-button-red.usa-button-hover,.usa-button-primary:visited.usa-button-red:hover,.usa-button.usa-button-red.usa-button-hover,.usa-button.usa-button-red:hover,.usa-button:visited.usa-button-red.usa-button-hover,.usa-button:visited.usa-button-red:hover,[type=button].usa-button-red.usa-button-hover,[type=button].usa-button-red:hover,[type=image].usa-button-red.usa-button-hover,[type=image].usa-button-red:hover,[type=reset].usa-button-red.usa-button-hover,[type=reset].usa-button-red:hover,[type=submit].usa-button-red.usa-button-hover,[type=submit].usa-button-red:hover,button.usa-button-red.usa-button-hover,button.usa-button-red:hover{background-color:#981b1e}.usa-button-primary.usa-button-red.usa-button-active,.usa-button-primary.usa-button-red:active,.usa-button-primary:visited.usa-button-red.usa-button-active,.usa-button-primary:visited.usa-button-red:active,.usa-button.usa-button-red.usa-button-active,.usa-button.usa-button-red:active,.usa-button:visited.usa-button-red.usa-button-active,.usa-button:visited.usa-button-red:active,[type=button].usa-button-red.usa-button-active,[type=button].usa-button-red:active,[type=image].usa-button-red.usa-button-active,[type=image].usa-button-red:active,[type=reset].usa-button-red.usa-button-active,[type=reset].usa-button-red:active,[type=submit].usa-button-red.usa-button-active,[type=submit].usa-button-red:active,button.usa-button-red.usa-button-active,button.usa-button-red:active{background-color:#cd2026}.usa-button-primary.usa-button-big,.usa-button-primary:visited.usa-button-big,.usa-button.usa-button-big,.usa-button:visited.usa-button-big,[type=button].usa-button-big,[type=image].usa-button-big,[type=reset].usa-button-big,[type=submit].usa-button-big,button.usa-button-big{border-radius:8px;font-size:2.4rem;padding:1.5rem 3rem}.usa-button-primary:disabled,.usa-button-primary:visited:disabled,.usa-button:disabled,.usa-button:visited:disabled,[type=button]:disabled,[type=image]:disabled,[type=reset]:disabled,[type=submit]:disabled,button:disabled{background-color:#c9c9c9;pointer-events:none}.usa-button-primary:disabled.usa-button-active,.usa-button-primary:disabled.usa-button-hover,.usa-button-primary:disabled.usa-focus,.usa-button-primary:disabled:active,.usa-button-primary:disabled:focus,.usa-button-primary:disabled:hover,.usa-button-primary:visited:disabled.usa-button-active,.usa-button-primary:visited:disabled.usa-button-hover,.usa-button-primary:visited:disabled.usa-focus,.usa-button-primary:visited:disabled:active,.usa-button-primary:visited:disabled:focus,.usa-button-primary:visited:disabled:hover,.usa-button:disabled.usa-button-active,.usa-button:disabled.usa-button-hover,.usa-button:disabled.usa-focus,.usa-button:disabled:active,.usa-button:disabled:focus,.usa-button:disabled:hover,.usa-button:visited:disabled.usa-button-active,.usa-button:visited:disabled.usa-button-hover,.usa-button:visited:disabled.usa-focus,.usa-button:visited:disabled:active,.usa-button:visited:disabled:focus,.usa-button:visited:disabled:hover,[type=button]:disabled.usa-button-active,[type=button]:disabled.usa-button-hover,[type=button]:disabled.usa-focus,[type=button]:disabled:active,[type=button]:disabled:focus,[type=button]:disabled:hover,[type=image]:disabled.usa-button-active,[type=image]:disabled.usa-button-hover,[type=image]:disabled.usa-focus,[type=image]:disabled:active,[type=image]:disabled:focus,[type=image]:disabled:hover,[type=reset]:disabled.usa-button-active,[type=reset]:disabled.usa-button-hover,[type=reset]:disabled.usa-focus,[type=reset]:disabled:active,[type=reset]:disabled:focus,[type=reset]:disabled:hover,[type=submit]:disabled.usa-button-active,[type=submit]:disabled.usa-button-hover,[type=submit]:disabled.usa-focus,[type=submit]:disabled:active,[type=submit]:disabled:focus,[type=submit]:disabled:hover,button:disabled.usa-button-active,button:disabled.usa-button-hover,button:disabled.usa-focus,button:disabled:active,button:disabled:focus,button:disabled:hover{background-color:#c9c9c9;border:0;box-shadow:none}.usa-button-disabled{background-color:#c9c9c9;pointer-events:none}.usa-button-disabled.usa-button-active,.usa-button-disabled.usa-button-hover,.usa-button-disabled.usa-focus,.usa-button-disabled:active,.usa-button-disabled:focus,.usa-button-disabled:hover{background-color:#c9c9c9;border:0;box-shadow:none}.usa-button-outline-inverse:disabled,.usa-button-secondary-disabled,.usa-button-secondary-inverse-disabled,.usa-button-secondary-inverse:disabled,.usa-button-secondary:disabled{box-shadow:inset 0 0 0 2px #c9c9c9;pointer-events:none;color:#c9c9c9}.usa-button-outline-inverse:disabled.usa-button-active,.usa-button-outline-inverse:disabled.usa-button-hover,.usa-button-outline-inverse:disabled.usa-focus,.usa-button-outline-inverse:disabled:active,.usa-button-outline-inverse:disabled:focus,.usa-button-outline-inverse:disabled:hover,.usa-button-secondary-disabled.usa-button-active,.usa-button-secondary-disabled.usa-button-hover,.usa-button-secondary-disabled.usa-focus,.usa-button-secondary-disabled:active,.usa-button-secondary-disabled:focus,.usa-button-secondary-disabled:hover,.usa-button-secondary-inverse-disabled.usa-button-active,.usa-button-secondary-inverse-disabled.usa-button-hover,.usa-button-secondary-inverse-disabled.usa-focus,.usa-button-secondary-inverse-disabled:active,.usa-button-secondary-inverse-disabled:focus,.usa-button-secondary-inverse-disabled:hover,.usa-button-secondary-inverse:disabled.usa-button-active,.usa-button-secondary-inverse:disabled.usa-button-hover,.usa-button-secondary-inverse:disabled.usa-focus,.usa-button-secondary-inverse:disabled:active,.usa-button-secondary-inverse:disabled:focus,.usa-button-secondary-inverse:disabled:hover,.usa-button-secondary:disabled.usa-button-active,.usa-button-secondary:disabled.usa-button-hover,.usa-button-secondary:disabled.usa-focus,.usa-button-secondary:disabled:active,.usa-button-secondary:disabled:focus,.usa-button-secondary:disabled:hover{background-color:#fff;border:0}.usa-button-secondary:disabled,html .usa-button-secondary-disabled{background-color:#fff}.usa-button-secondary-inverse:disabled,html .usa-button-secondary-inverse-disabled{background-color:transparent;color:#666;box-shadow:inset 0 0 0 2px #666}.usa-button-unstyled{border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto}.usa-button-unstyled,.usa-button-unstyled:hover{background-color:transparent}.usa-embed-container embed,.usa-embed-container iframe,.usa-embed-container object{position:absolute;top:0;left:0;width:100%;height:100%}.usa-embed-container{padding-bottom:56.25%;position:relative;height:0;overflow:hidden;max-width:100%}img{max-width:100%}.media_link{display:inline-block;line-height:0}input,select,textarea{-webkit-appearance:none;-moz-appearance:none;appearance:none;border:.1rem solid #666;border-radius:0;box-sizing:border-box;color:#fff;display:block;font-size:1.7rem;height:4.4rem;line-height:1.3;margin:.2em 0;max-width:46rem;padding:1rem .7em;width:100%}input.usa-input-success,select.usa-input-success,textarea.usa-input-success{border:3px solid #4aa564}.usa-input-error{border-left:4px solid #981b1e;margin-top:3rem;padding-bottom:.8rem;padding-left:1.5rem;padding-top:.8rem;position:relative;right:1.9rem}.usa-input-error input,.usa-input-error select,.usa-input-error textarea{border:3px solid #981b1e;width:calc(100% + 1.9rem)}.usa-input-error label{margin-top:0}.usa-input-error .usa-input-inline{border:.1rem solid #666;width:inherit}.usa-input-error .usa-input-inline-error{border:3px solid #981b1e}.usa-input-error-label,.usa-input-error-message{display:block;font-size:1.7rem;font-weight:700}.usa-input-error-message{color:#981b1e;padding-bottom:3px;padding-top:3px}.usa-input-required:after{color:#cd2026;content:" (*required)"}.usa-input-optional:after{color:#757575;content:" (optional)"}label{display:block;margin-top:3rem;max-width:46rem}textarea{height:16rem}select{-moz-appearance:none;-webkit-appearance:none;appearance:none;background-color:#fff;background-image:url(../img/arrow-both.png);background-image:url(../img/arrow-both.svg);background-position:right 1.3rem center;background-repeat:no-repeat;background-size:1rem;padding-right:3rem}select::-ms-expand{display:none}select:-webkit-autofill{-webkit-appearance:menulist;appearance:menulist}select:-moz-focusring{color:transparent;text-shadow:0 0 0 #000}legend,option:first-child{font-weight:700}legend{font-size:3rem}.usa-fieldset-inputs label{margin-top:0}.usa-form-hint{color:#757575;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;margin-bottom:0}[type=checkbox],[type=radio]{position:absolute;left:-999em}.lt-ie9 [type=checkbox],.lt-ie9 [type=radio]{border:0;float:left;margin:.4em .4em 0 0;position:static;width:auto}[type=checkbox]+label,[type=radio]+label{cursor:pointer;font-weight:400;margin-bottom:.65em}[type=checkbox]+label:before,[type=radio]+label:before{background:#fff;border-radius:2px;box-shadow:0 0 0 1px #757575;content:"\a0";display:inline-block;height:2rem;line-height:2rem;margin-right:.6em;text-indent:.15em;vertical-align:middle\0;width:2rem}[type=radio]+label:before{border-radius:100%;box-shadow:0 0 0 2px #fff,0 0 0 3px #757575;height:1.4rem;line-height:1.4rem;margin-right:.75em;width:1.4rem}[type=checkbox]:checked+label:before,[type=radio]:checked+label:before{background-color:#313b52;box-shadow:0 0 0 1px #313b52}[type=radio]:checked+label:before{box-shadow:0 0 0 2px #fff,0 0 0 4px #313b52}[type=checkbox]:checked+label:before,[type=checkbox]:checked:disabled+label:before{background-image:url(../img/correct8.png);background-image:url(../img/correct8.svg);background-position:50%;background-repeat:no-repeat}[type=radio]:focus+label:before{outline:2px dotted #999;outline-offset:6px}[type=checkbox]:disabled+label{color:#c9c9c9}[type=checkbox]:focus+label:before{outline:2px dotted #999;outline-offset:3px}[type=checkbox]:disabled+label:before,[type=radio]:disabled+label:before{background:#e4e4e4;box-shadow:0 0 0 1px #999;cursor:not-allowed}[type=range]{-webkit-appearance:none;border:none;padding-left:0;width:100%}[type=range]::-webkit-slider-runnable-track{background:#999;border:1px solid #757575;cursor:pointer;height:1.2rem;width:100%}[type=range]::-moz-range-track{background:#313b52;border:1px solid #757575;cursor:pointer;height:1.2rem;width:100%}[type=range]::-ms-track{background:transparent;color:transparent;cursor:pointer;height:1.2rem;width:100%}[type=range]::-webkit-slider-thumb{-webkit-appearance:none;border:1px solid #757575;height:2.2rem;border-radius:1.5rem;background:#e4e4e4;cursor:pointer;margin-top:-.65rem;width:2.2rem}[type=range]::-moz-range-thumb{background:#e4e4e4;border:1px solid #757575;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-thumb{background:#e4e4e4;border:1px solid #757575;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-fill-lower,[type=range]::-ms-fill-upper{background:#999;border:1px solid #757575;border-radius:2rem}.usa-date-of-birth label{margin-top:0}.usa-date-of-birth [type=number]::-webkit-inner-spin-button,.usa-date-of-birth [type=number]::-webkit-outer-spin-button{-webkit-appearance:none;appearance:none;margin:0}.usa-date-of-birth [type=number]{-moz-appearance:textfield}.usa-form-group-day,.usa-form-group-month,.usa-form-group-year{clear:none;float:left;margin-right:1.5rem;width:5rem}.usa-form-group-year{width:7rem}.usa-label,.usa-label-big{background-color:#666;border-radius:2px;color:#fff;font-size:1.5rem;margin-right:.5rem;padding:.1rem .7rem;text-transform:uppercase}.usa-label-big:only-of-type,.usa-label:only-of-type{margin-right:0}.usa-label-big{font-size:1.7rem;padding-left:.9rem;padding-right:.9rem}ol,ul{margin-top:1em;margin-bottom:1em;padding-left:1.94em}li{line-height:1.5;margin-bottom:.5em}li:last-child{margin-bottom:0}h1+ol,h1+ul,h2+ol,h2+ul,h3+ol,h3+ul,h4+ol,h4+ul,h5+ol,h5+ul,h6+ol,h6+ul,p+ol,p+ul{margin-top:0}.usa-unstyled-list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-unstyled-list>li{margin-bottom:0}table{border-spacing:0;margin:2em 0}thead th{font-weight:700}thead td,thead th{background-color:#e4e4e4}th{text-align:left}td,th{background-color:#fff;border:1px solid #666;font-weight:400;padding:1rem 1.5rem}.usa-table-borderless thead th{background-color:transparent;border-top:0}.usa-table-borderless td,.usa-table-borderless th{border-left:0;border-right:0}.usa-table-borderless th:first-child{padding-left:0}caption{font-size:1.5rem;font-weight:700;font-family:Merriweather,Georgia,Cambria,Times New Roman,Times,serif;margin-bottom:1.2rem;text-align:left}html{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:10px}body{font-size:1.7rem}p{line-height:1.5;margin-bottom:1em;margin-top:1em}a{color:#313b52;text-decoration:underline}a:active,a:hover{color:#1b2847}a:focus{outline:2px dotted #999;outline-offset:3px}a:visited{color:#4c2c92}.usa-external_link:after{background:url(../img/external-link.png) no-repeat 0 0;background:url(../img/external-link.svg) no-repeat 0 0;background-size:100%;content:"";display:inline-block;height:.65em;margin-bottom:-1px;margin-left:4px;width:.65em}.usa-external_link:hover:after{background-image:url(../img/external-link-hover.png);background-image:url(../img/external-link-hover.svg)}.usa-external_link-alt:after{background:url(../img/external-link-alt.png) no-repeat 0 0;background:url(../img/external-link-alt.svg) no-repeat 0 0;background-size:100%;content:"";display:inline-block;height:.65em;margin-bottom:-1px;margin-left:4px;width:.65em}.usa-external_link-alt:hover:after{background-image:url(../img/external-link-alt-hover.png);background-image:url(../img/external-link-alt-hover.svg)}h1,h2,h3,h4,h5{clear:both;font-family:Merriweather,Georgia,Cambria,Times New Roman,Times,serif;line-height:1.3;margin-bottom:.5em;margin-top:1.5em}h6{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}h1{font-size:4rem}h1,h2{font-weight:700}h2{font-size:3rem}h3{font-size:2rem}h3,h4{font-weight:700}h4{font-size:1.7rem}h5{font-size:1.5rem;font-weight:700}h6{font-size:1.3rem;font-weight:400;line-height:1.5;text-transform:uppercase}address,cite,dfn,var{font-style:normal}.usa-content-list,.usa-content ol:not(.usa-accordion):not(.usa-accordion-bordered),.usa-content p,.usa-content ul:not(.usa-accordion):not(.usa-accordion-bordered){max-width:66ch}.usa-sans a,.usa-sans li,.usa-sans p,.usa-sans span{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}.usa-sans a{border-bottom:none;font-weight:700}.usa-serif a,.usa-serif li,.usa-serif p,.usa-serif span{font-family:Merriweather,Georgia,Cambria,Times New Roman,Times,serif}.usa-display{font-size:2rem;font-weight:700;margin-bottom:0}@media screen and (min-width:481px){.usa-display{font-size:4rem;font-weight:700}}@media screen and (min-width:600px){.usa-display{font-size:5.2rem;font-weight:700}}.usa-font-lead{font-family:Merriweather,Georgia,Cambria,Times New Roman,Times,serif;font-size:2rem;font-weight:400;line-height:1.7;max-width:77rem}.usa-image-block{position:relative}.usa-image-text-block{color:#fff;left:0;margin-left:8%;position:absolute;top:0}.usa-image-text{margin-top:0}.usa-drop_text{margin-bottom:0}.usa-background-dark{background-color:#333}.usa-background-dark p,.usa-background-dark span{color:#fff}.usa-background-dark a{color:#c9c9c9}.usa-background-dark a:hover{color:#fff}.usa-text-small{font-size:1.3rem;margin-top:0}.usa-grid-full>:first-child,.usa-grid>:first-child,.usa-section>:first-child{margin-top:0}.usa-grid-full>:last-child,.usa-grid>:last-child,.usa-section>:last-child{margin-bottom:0}.usa-width-five-sixths:first-child>:first-child,.usa-width-one-fourth:first-child>:first-child,.usa-width-one-half:first-child>:first-child,.usa-width-one-sixth:first-child>:first-child,.usa-width-one-third:first-child>:first-child,.usa-width-one-twelfth:first-child>:first-child,.usa-width-one-whole:first-child>:first-child,.usa-width-three-fourths:first-child>:first-child,.usa-width-two-thirds:first-child>:first-child{margin-top:0}@media screen and (min-width:600px){.usa-width-five-sixths>:first-child,.usa-width-one-fourth>:first-child,.usa-width-one-half>:first-child,.usa-width-one-sixth>:first-child,.usa-width-one-third>:first-child,.usa-width-one-twelfth>:first-child,.usa-width-one-whole>:first-child,.usa-width-three-fourths>:first-child,.usa-width-two-thirds>:first-child{margin-top:0}}.usa-width-five-sixths:last-child>:last-child,.usa-width-one-fourth:last-child>:last-child,.usa-width-one-half:last-child>:last-child,.usa-width-one-sixth:last-child>:last-child,.usa-width-one-third:last-child>:last-child,.usa-width-one-twelfth:last-child>:last-child,.usa-width-one-whole:last-child>:last-child,.usa-width-three-fourths:last-child>:last-child,.usa-width-two-thirds:last-child>:last-child{margin-bottom:0}@media screen and (min-width:600px){.usa-width-five-sixths>:last-child,.usa-width-one-fourth>:last-child,.usa-width-one-half>:last-child,.usa-width-one-sixth>:last-child,.usa-width-one-third>:last-child,.usa-width-one-twelfth>:last-child,.usa-width-one-whole>:last-child,.usa-width-three-fourths>:last-child,.usa-width-two-thirds>:last-child{margin-bottom:0}}.usa-accordion,.usa-accordion-bordered{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;color:#fff;margin:0;padding:0;width:100%}.usa-accordion-bordered>li,.usa-accordion>li{margin-bottom:0}.usa-accordion-bordered>ul li ul,.usa-accordion>ul li ul{list-style:disc}.usa-accordion-bordered>ul li ul>li>ul,.usa-accordion>ul li ul>li>ul{list-style:circle}.usa-accordion-bordered>ul li ul>li>ul>li>ul,.usa-accordion>ul li ul>li>ul>li>ul{list-style:square}.usa-accordion+.usa-accordion,.usa-accordion+.usa-accordion-bordered,.usa-accordion-bordered+.usa-accordion,.usa-accordion-bordered+.usa-accordion-bordered{margin-top:1rem}.usa-accordion-bordered>ul,.usa-accordion>ul{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;color:#fff;margin:0;padding:0;width:100%}.usa-accordion-bordered>ul>li,.usa-accordion>ul>li{margin-bottom:0;background-color:#e4e4e4;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;list-style:none;margin-bottom:.5rem;width:100%}.usa-accordion-bordered>ul button,.usa-accordion>ul button{background-color:transparent;border:0;border-radius:0;font-weight:400;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#e4e4e4;background-image:url(../img/minus.png);background-image:url(../img/minus.svg);background-position:right 2rem center;background-repeat:no-repeat;background-size:1.5rem;color:#fff;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-weight:700;margin:0;padding:1.5rem 5.5rem 1.5rem 2rem;width:100%}.usa-accordion-bordered>ul button:hover,.usa-accordion>ul button:hover{background-color:transparent;background-color:#c9c9c9;color:#fff}.usa-accordion-bordered>ul button h1,.usa-accordion-bordered>ul button h2,.usa-accordion-bordered>ul button h3,.usa-accordion-bordered>ul button h4,.usa-accordion-bordered>ul button h5,.usa-accordion-bordered>ul button h6,.usa-accordion>ul button h1,.usa-accordion>ul button h2,.usa-accordion>ul button h3,.usa-accordion>ul button h4,.usa-accordion>ul button h5,.usa-accordion>ul button h6{margin:0}.usa-accordion-bordered>ul [aria-expanded=false],.usa-accordion>ul [aria-expanded=false]{background-image:url(../img/plus.png);background-image:url(../img/plus.svg);background-repeat:no-repeat;background-size:1.5rem}.usa-accordion-bordered>li,.usa-accordion>li{background-color:#e4e4e4;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;list-style:none;margin-bottom:.5rem;width:100%}.usa-accordion-bordered .usa-accordion-content{border-bottom:3px solid #e4e4e4;border-left:3px solid #e4e4e4;border-right:3px solid #e4e4e4}.usa-accordion-content{background-color:#fff;overflow:auto;padding:1.5rem 2rem}.usa-accordion-content>:first-child{margin-top:0}.usa-accordion-content>:last-child{margin-bottom:0}.usa-accordion-content:not([aria-hidden]){position:absolute;left:-999em}.usa-accordion-content[aria-hidden=true]{display:none}.usa-accordion-button{background-color:transparent;border:0;border-radius:0;font-weight:400;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#e4e4e4;background-image:url(../img/minus.png);background-image:url(../img/minus.svg);background-position:right 2rem center;background-repeat:no-repeat;background-size:1.5rem;color:#fff;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-weight:700;margin:0;padding:1.5rem 5.5rem 1.5rem 2rem;width:100%}.usa-accordion-button:hover{background-color:transparent;background-color:#c9c9c9;color:#fff}.usa-accordion-button h1,.usa-accordion-button h2,.usa-accordion-button h3,.usa-accordion-button h4,.usa-accordion-button h5,.usa-accordion-button h6{margin:0}.usa-accordion-button[aria-expanded=false]{background-image:url(../img/plus.png);background-image:url(../img/plus.svg);background-repeat:no-repeat;background-size:1.5rem}.usa-alert{background-color:#e4e4e4;background-position:2rem 2rem;background-repeat:no-repeat;background-size:5.2rem;padding:2rem 2rem 1.4rem 3rem;position:relative}.usa-alert:before{background-color:#7e7e7e;content:"";height:100%;left:0;position:absolute;top:0;width:1rem}.usa-alert a{color:#1b2847}.usa-alert a:focus,.usa-alert a:hover{color:#03143d}.usa-alert ul{margin-bottom:0;margin-top:1rem;padding-left:1rem}.usa-alert-slim{background-position:2rem 1rem;padding-bottom:1rem;padding-top:1rem}.usa-alert-slim .usa-alert-text:only-child{margin-bottom:.5rem;padding-top:.5rem}.usa-alert-icon{display:table-cell;padding-right:1rem}.usa-alert-body{display:table-cell;padding-left:5rem;vertical-align:top}.usa-alert-heading,.usa-alert-text{margin-top:0;margin-bottom:0}.usa-alert-text{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}.usa-alert-text:only-child{margin-bottom:1rem;padding-top:.5rem}.usa-alert-success{background-color:#e7f4e4;background-image:url(../img/alerts/success.png);background-image:url(../img/alerts/success.svg)}.usa-alert-success:before{background-color:#2e8540}.usa-alert-warning{background-color:#fff1d2;background-image:url(../img/alerts/warning.png);background-image:url(../img/alerts/warning.svg)}.usa-alert-warning:before{background-color:#fdb81e}.usa-alert-error{background-color:#f9dede;background-image:url(../img/alerts/error.png);background-image:url(../img/alerts/error.svg)}.usa-alert-error:before{background-color:#005495}.usa-alert-info{background-color:#e1f3f8;background-image:url(../img/alerts/info.png);background-image:url(../img/alerts/info.svg)}.usa-alert-info:before{background-color:#c64b00}.usa-alert-no_icon{background-image:none}.usa-alert-paragraph{width:66ch}.usa-alert{margin-top:1.5em}.usa-banner{background-color:#e4e4e4;padding-bottom:.7rem}@media screen and (min-width:481px){.usa-banner{font-size:1.3rem;padding-bottom:0}}.usa-banner-content{padding:2rem 1.5rem 3px;background-color:transparent;font-size:1.5rem;width:100%}@media screen and (min-width:600px){.usa-banner-content{padding-bottom:2.3rem;padding-top:4rem}}@media screen and (min-width:951px){.usa-banner-content{padding-right:3rem;padding-left:3rem}}.usa-banner-content p:first-child{margin-top:1rem}@media screen and (min-width:600px){.usa-banner-content p:first-child{margin-top:0}}.usa-banner-inner{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:1.5rem;padding-left:1.5rem;max-width:1040px}.usa-banner-inner:after{clear:both;content:"";display:block}@media screen and (min-width:951px){.usa-banner-inner{padding-right:3rem;padding-left:3rem}}.usa-banner-header{padding-top:.55rem;padding-bottom:.55rem;font-size:1.2rem;font-weight:400}@media screen and (min-width:481px){.usa-banner-header{padding-top:0;padding-bottom:0}}.usa-banner-header p{margin-top:0;margin-bottom:0;display:inline;overflow:hidden;vertical-align:middle}@media screen and (min-width:481px){.usa-banner-header p{margin-top:2px;margin-bottom:2px;display:inline-block}}.usa-banner-header img{float:left;margin-right:1rem;margin-top:1px;width:2.4rem}@media screen and (min-width:481px){.usa-banner-header img{margin-right:.7rem;width:2rem}}.usa-banner-header-expanded{-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-bottom:1px solid #999;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:1.5rem;min-height:5.6rem;padding-right:3rem}@media screen and (min-width:481px){.usa-banner-header-expanded{border-bottom:none;display:block;font-size:1.2rem;font-weight:400;min-height:0;padding-right:0}}.usa-banner-header-expanded>.usa-banner-inner{margin-left:0}@media screen and (min-width:481px){.usa-banner-header-expanded>.usa-banner-inner{margin-left:auto}}.usa-banner-header-expanded img{margin-right:2.4rem}@media screen and (min-width:481px){.usa-banner-header-expanded img{margin-right:.7rem}}.usa-banner-header-expanded p{line-height:1.3;vertical-align:top}@media screen and (min-width:481px){.usa-banner-header-expanded p{line-height:1.5;vertical-align:middle}}.usa-banner-button{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;padding-top:1.3rem;padding-left:4.8rem;background-position-x:right;color:#313b52;display:block;font-size:1.2rem;height:4.3rem;left:0;position:absolute;text-decoration:underline;top:0;width:100%}.usa-banner-button:hover{background-color:transparent}@media screen and (min-width:481px){.usa-banner-button{padding-top:0;padding-left:0;display:inline;height:auto;margin-left:3px;position:relative;vertical-align:middle;width:auto}}.usa-banner-button:hover{color:#1b2847;text-decoration:underline}.usa-banner-button[aria-expanded=false]{background-image:none}.usa-banner-button[aria-expanded=false]:after{background-image:url(../img/angle-arrow-down-primary.png);background-image:url(../img/angle-arrow-down-primary.svg);background-size:100%;content:"";display:inline-block;height:1rem;width:1rem;margin-left:0}.usa-banner-button[aria-expanded=false]:hover:after{background-image:url(../img/angle-arrow-down-primary-hover.png);background-image:url(../img/angle-arrow-down-primary-hover.svg)}.usa-banner-button[aria-expanded=false]:after{background-position-y:1px}.usa-banner-button[aria-expanded=true]{background-image:none;height:5.6rem}.usa-banner-button[aria-expanded=true]:after{background-image:url(../img/close.png);background-image:url(../img/close.svg);background-size:100%;content:"";display:inline-block;height:1.3rem;width:1.3rem;margin-left:0}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true]{height:auto;padding:0;position:relative}.usa-banner-button[aria-expanded=true]:after{background-image:url(../img/angle-arrow-up-primary.png);background-image:url(../img/angle-arrow-up-primary.svg);background-size:100%;content:"";display:inline-block;height:1rem;width:1rem;margin-left:0}.usa-banner-button[aria-expanded=true]:hover:after{background-image:url(../img/angle-arrow-up-primary-hover.png);background-image:url(../img/angle-arrow-up-primary-hover.svg)}.usa-banner-button[aria-expanded=true]:after{background-position-y:1px}}.usa-banner-button[aria-expanded=true]:after{position:absolute;right:1.5rem;top:2.15rem}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true]:after{position:static}}.usa-banner-button[aria-expanded=true] .usa-banner-button-text{display:none}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true] .usa-banner-button-text{display:inline}}.usa-banner-icon{width:3.8rem}.usa-footer .usa-unstyled-list{display:block}.usa-footer .usa-footer-primary-link{color:#fff;display:block;font-weight:700;margin-top:0;padding-bottom:2rem;padding-top:2rem;text-decoration:none}@media screen and (min-width:600px){.usa-footer .usa-footer-primary-link{border-top:none}}.usa-footer .usa-footer-primary-link:hover{text-decoration:underline}.usa-footer .usa-footer-primary-link~li a,.usa-footer .usa-footer-secondary-link{text-decoration:none}.usa-footer-contact_info{display:inline-block}.usa-footer-contact_info a{color:#fff;text-decoration:none}.usa-footer-contact_info:hover{text-decoration:underline}.usa-footer-return-to-top{color:#313b52;padding-bottom:2rem;padding-top:2rem;text-decoration:underline}.usa-footer-primary-section{background-color:#e4e4e4}.usa-footer-primary-section .usa-footer-primary-content{padding-left:1.5rem;padding-right:2.5rem}@media screen and (min-width:600px){.usa-footer-primary-section .usa-footer-primary-content{padding-left:0;padding-right:0}}.usa-footer-primary-section .usa-footer-primary-content li{margin-left:1rem}@media screen and (min-width:600px){.usa-footer-primary-section .usa-footer-primary-content li{margin-left:0}}@media screen and (min-width:600px){.usa-footer-primary-section .usa-grid-full{padding-left:2.5rem;padding-right:2.5rem}}.usa-footer-medium .usa-footer-contact_info p{margin:0 1rem 0 0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-contact_info p{margin:0 0 0 1rem}}.usa-footer-medium .usa-footer-contact-heading{margin-top:0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-contact-heading{margin-top:.5rem;margin-bottom:.5rem}}.usa-footer-medium .usa-footer-logo{padding:1rem 0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-logo{padding:2rem 0}}.usa-footer-medium .usa-footer-primary-link{padding-bottom:1.5rem;padding-top:1.5rem}.usa-footer-medium .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}@media screen and (min-width:1201px){.usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content{margin-right:5%;width:inherit}}@media screen and (min-width:1201px){.usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content:last-child{margin-right:0}}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-nav ul{-webkit-box-align:center;-ms-flex-align:center;align-items:center}}.usa-footer-slim .usa-footer-nav a{display:block}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-nav .usa-footer-primary-content{margin-right:5%;width:inherit}}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-nav .usa-footer-primary-content:last-child{margin-right:0}}.usa-footer-slim .usa-footer-primary-link{padding-bottom:1.5rem;padding-top:1.5rem}.usa-footer-slim .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-primary-section{padding-bottom:0;padding-top:0}.usa-footer-slim .usa-footer-primary-section .usa-grid-full{-webkit-box-align:center;-ms-flex-align:center;align-items:center}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-contact_info>*{margin:0}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-contact_info{padding-top:1.5rem;padding-bottom:1.5rem;width:100%}}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-contact_info{float:left;display:block;margin-right:2.35765%;width:48.82117%}.usa-footer-slim .usa-footer-contact_info:last-child{margin-right:0}}li.usa-footer-primary-content,ul.usa-footer-primary-content{border-top:1px solid #999}@media screen and (min-width:600px){li.usa-footer-primary-content,ul.usa-footer-primary-content{border:none}}li.usa-footer-primary-content:last-child,ul.usa-footer-primary-content:last-child{border-bottom:1px solid #999}@media screen and (min-width:600px){li.usa-footer-primary-content:last-child,ul.usa-footer-primary-content:last-child{border-bottom:none}}.usa-sign_up-block{padding-bottom:4.5rem;padding-left:1.5rem;padding-right:1.5rem}@media screen and (min-width:600px){.usa-sign_up-block{float:right;padding:0}}.usa-sign_up-block label:first-of-type{margin-top:0}.usa-sign_up-block button{float:none;margin-right:0;margin-top:1.5rem}.usa-sign_up-block input{width:100%}.usa-footer-secondary_section{background-color:#c9c9c9;padding-bottom:2rem;padding-top:2rem}.usa-footer-secondary_section a{color:#fff}@media screen and (min-width:600px){.usa-footer-big-secondary-section{padding-top:2rem;padding-bottom:2rem}}@media screen and (min-width:600px){.usa-footer-contact-links{text-align:right}}.usa-social-links a{text-decoration:none}.usa-footer-big .usa-footer-contact_info{display:block}.usa-footer-big .usa-footer-contact_info p{margin:0 1rem 0 0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-contact_info p{margin:.5rem 0 0 1rem}}@media screen and (min-width:600px){.usa-footer-big .usa-footer-contact-links{padding-top:2rem}}.usa-footer-big .usa-footer-logo{padding:1rem 0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-logo{padding:2rem 0}}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section{padding-bottom:4rem;padding-top:3rem}}.usa-footer-big .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content{padding-left:0;padding-right:0}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li{margin-left:1.5rem}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li{margin-left:0}}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link{margin-left:0}.usa-footer-big ul{padding-bottom:2.4rem}@media screen and (min-width:600px){.usa-footer-big ul{padding-bottom:0}}.usa-footer-big ul:last-child{border-bottom:1px solid #999}@media screen and (min-width:600px){.usa-footer-big ul:last-child{border-bottom:none}}.usa-footer-big ul li:not(.usa-footer-primary-link){line-height:1.3;padding-bottom:.35em;padding-top:.35em}.usa-footer-big ul .usa-footer-primary-link{background-image:url(../img/arrow-down.png);background-image:url(../img/arrow-down.svg);background-position:1.5rem;background-repeat:no-repeat;background-size:1.3rem;margin-left:0;padding-left:3.5rem}@media screen and (min-width:600px){.usa-footer-big ul .usa-footer-primary-link{background:none;margin-bottom:.8rem;padding-bottom:0;padding-left:0}}.usa-footer-big ul .usa-footer-primary-link>*{margin-top:0;margin-bottom:0}.usa-footer-big ul.hidden{padding-bottom:0}.usa-footer-big ul.hidden li{display:none}.usa-footer-big ul.hidden .usa-footer-primary-link{background-image:url(../img/arrow-right.png);background-image:url(../img/arrow-right.svg);cursor:pointer;display:block}@media screen and (min-width:600px){.usa-footer-big ul.hidden .usa-footer-primary-link{background:none;padding-left:0}}.usa-footer-topic{margin:0;padding:2rem 0}@media screen and (min-width:600px){.usa-sign_up-header{margin:0;padding:2rem 0}}.usa-footer-logo-img{max-width:8rem}@media screen and (min-width:600px){.usa-footer-logo-img{float:left}}.usa-footer-big-logo-img{max-width:10rem}.usa-footer-slim-logo-img{float:left;max-width:5rem}.usa-footer-logo-heading{display:block;margin-top:1rem}@media screen and (min-width:600px){.usa-footer-logo-heading{display:inline-block;margin-top:3rem;padding-left:1.5rem}}.usa-footer-big-logo-heading{margin-top:1.5rem}@media screen and (min-width:600px){.usa-footer-big-logo-heading{margin-top:2rem}}.usa-footer-slim-logo-heading{display:inline-block;margin-top:1.5rem;padding-left:1.5rem}.usa-footer-contact-heading{margin-top:0}@media screen and (min-width:600px){.usa-footer-contact-heading{margin-top:1rem}}.usa-link-facebook,.usa-link-rss,.usa-link-twitter,.usa-link-youtube,.usa-social_link{margin:2.5rem 1rem 1.5rem 0;background-position:50%;background-repeat:no-repeat;background-size:auto 3rem;display:inline-block;height:4.4rem;left:-1.6rem;position:relative;text-align:center;width:4.4rem}@media screen and (min-width:600px){.usa-link-facebook,.usa-link-rss,.usa-link-twitter,.usa-link-youtube,.usa-social_link{margin:0 0 0 .5rem;left:1.5rem}}.usa-link-facebook span,.usa-link-rss span,.usa-link-twitter span,.usa-link-youtube span,.usa-social_link span{position:absolute;left:-999em}.usa-link-facebook{background-image:url(../img/social-icons/png/facebook25.png);background-image:url(../img/social-icons/svg/facebook25.svg)}.usa-link-twitter{background-image:url(../img/social-icons/png/twitter16.png);background-image:url(../img/social-icons/svg/twitter16.svg)}.usa-link-youtube{background-image:url(../img/social-icons/png/youtube15.png);background-image:url(../img/social-icons/svg/youtube15.svg)}.usa-link-rss{background-image:url(../img/social-icons/png/rss25.png);background-image:url(../img/social-icons/svg/rss25.svg)}form a{border-bottom:0}form [type=submit]{display:block;margin-bottom:1.5em;margin-top:2.5rem}@media screen and (min-width:600px){form [type=submit]{padding-left:2.7em;padding-right:2.7em;width:auto}}form [name=confirmPassword],form [name=password]{margin-bottom:1.1rem}@media screen and (min-width:600px){.usa-form{max-width:32rem}}.usa-form-note{float:right;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:1.5rem;margin:0 0 1.5rem}.usa-form-note+*{clear:both}fieldset{border:none;margin:0;padding:0}@media screen and (min-width:600px){.usa-form-large{max-width:46rem}}@media screen and (min-width:600px){input.usa-input-tiny{max-width:6rem}}@media screen and (min-width:600px){input.usa-input-medium{max-width:12rem}}@media screen and (min-width:600px){.usa-input-grid{padding-right:5%}}@media screen and (min-width:600px){.usa-input-grid:last-of-type{padding-right:0}}@media screen and (min-width:600px){.usa-input-grid-small{float:left;width:35%}}.usa-input-grid-small input,.usa-input-grid-small select{margin-bottom:3rem}@media screen and (min-width:600px){.usa-input-grid-medium{float:left;width:65%}}.usa-input-grid-medium input,.usa-input-grid-medium select{margin-bottom:3rem}@media screen and (min-width:600px){.usa-input-grid-large{float:left;width:100%}}.usa-input-grid-large input,.usa-input-grid-large select{margin-bottom:3rem}.usa-additional_text{font-weight:400}.usa-checklist{list-style:none;margin-left:0;padding-left:0}.usa-checklist li{display:inline-block;list-style:none;margin-bottom:0;margin-top:0;padding-left:3em;text-indent:-2em}.usa-checklist li:before{content:" ";display:inline-block;height:.8em;margin-right:.2em;width:1.8em}.usa-checklist-checked:before{background-image:url(../img/correct9.png);background-image:url(../img/correct9.svg);background-position:100%;background-repeat:no-repeat;background-size:100%}.usa-graphic_list .usa-graphic_list-row .usa-media_block{margin-bottom:3rem}@media screen and (min-width:600px){.usa-graphic_list .usa-graphic_list-row .usa-media_block{margin-bottom:6rem}}@media screen and (min-width:600px){.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block{margin-bottom:0}}.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block:last-child{margin-bottom:0}.usa-graphic_list .usa-media_block-img{margin-right:3rem}.usa-graphic_list .usa-media_block-body>:first-child{margin-top:0}.usa-header{width:100%;z-index:3}@media screen and (min-width:951px){.usa-header{border-bottom:1px solid #c9c9c9}}.usa-header a{border-bottom:none}@media screen and (min-width:951px){.usa-header .usa-search{float:right;max-width:21.5rem}}.usa-logo{float:left;line-height:4rem;margin-left:1.5rem}@media screen and (min-width:951px){.usa-logo{line-height:7.5rem;margin-left:0}}.usa-logo a{color:#fff;text-decoration:none}.usa-logo br{display:none}@media screen and (min-width:951px){.usa-logo br{display:block}}.usa-logo-text{display:block;font-size:1.5rem;font-style:normal;font-weight:700;margin:0}@media screen and (min-width:951px){.usa-logo-text{display:block;font-size:2.4rem;line-height:1.3}}.usa-menu-btn{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#313b52;color:#fff;display:inline;float:right;font-size:1.3rem;height:4rem;line-height:4rem;text-align:center;text-decoration:none;text-transform:uppercase;width:5.8rem}.usa-menu-btn:hover{background-color:transparent}@media screen and (min-width:951px){.usa-menu-btn{display:none}}.usa-menu-btn:hover{color:#fff;background-color:#1b2847}.usa-menu-btn:visited{color:#fff}.usa-overlay{position:fixed;top:0;right:0;bottom:0;left:0;background:#000;opacity:0;transition:all .2s ease-in-out;visibility:hidden;z-index:4}.usa-overlay.is-visible{opacity:.1;visibility:visible}@media screen and (min-width:951px){.usa-header-basic .usa-logo{bottom:0;position:absolute}}@media screen and (min-width:951px){.usa-header-basic .usa-navbar{position:relative;width:18%}}@media screen and (min-width:951px){.usa-header-extended .usa-header{border-bottom:none}}@media screen and (min-width:951px){.usa-header-extended .usa-logo{margin-top:3rem;margin-bottom:3rem}}@media screen and (min-width:951px){.usa-header-extended em{font-size:3.2rem;line-height:1}}@media screen and (min-width:951px){.usa-header-extended .usa-navbar{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:3rem;display:block;height:auto;max-width:1040px}.usa-header-extended .usa-navbar:after{clear:both;content:"";display:block}}@media screen and (min-width:951px){.usa-header-extended .usa-nav{border-top:1px solid #c9c9c9;float:none;padding:0;width:100%}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-inner{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:1.5rem;margin-top:-1px;max-width:1040px;position:relative}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-inner:after,.usa-header-extended .usa-nav-primary:after{clear:both;content:"";display:block}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-primary button[aria-expanded=false],.usa-header-extended .usa-nav-primary button[aria-expanded=true]{background-position:right 1.5rem top 53%}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-link{padding-top:1.8rem;padding-bottom:1.8rem}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-submenu .usa-grid-full{padding-left:1.2rem}}@media screen and (min-width:951px){.usa-header-extended .usa-megamenu{padding-left:3rem}}.usa-hero{padding-top:3rem;padding-bottom:3rem;background-image:url(../img/hero.png);background-position:50%;background-size:cover}.usa-hero .usa-button{color:#fff}.usa-section-dark .usa-hero-link{color:#c64b00}.usa-hero-callout{background-color:#03143d;padding:3rem}@media screen and (min-width:481px){.usa-hero-callout{max-width:30rem}}.usa-hero-callout>:first-child{margin-top:0;margin-bottom:2rem}.usa-hero-callout-alt{color:#fff;display:block}.usa-layout-docs{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media screen and (min-width:1201px){.usa-layout-docs{display:inherit}}.usa-layout-docs .usa-grid>:first-child:not(.usa-width-*){margin-top:0}.usa-layout-docs .usa-grid>:last-child:not(.usa-width-*){margin-bottom:0}.usa-layout-docs-sidenav{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.usa-layout-docs-main_content{margin-bottom:3rem;-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}@media screen and (min-width:1201px){.usa-layout-docs-main_content{margin-bottom:0}}.usa-layout-docs-main_content>:first-child{margin-top:0}.usa-media_block-img{float:left;margin-right:1rem}.usa-media_block-body{overflow:hidden}.usa-navbar{border-bottom:1px solid #999;height:4rem}@media screen and (min-width:951px){.usa-navbar{border-bottom:none;display:inline-block;height:7.8rem}}.usa-nav-link{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}@media screen and (min-width:951px){.usa-nav-link:hover span{border-bottom:.4rem solid #313b52;padding-bottom:.6rem}}@media screen and (min-width:951px){.usa-nav-link.usa-accordion-button span{margin-right:0;padding-right:1.5rem}}@media screen and (min-width:951px){.usa-nav-container{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:3rem;max-width:1040px}.usa-nav-container:after{clear:both;content:"";display:block}}.usa-nav{position:fixed;top:0;right:0;bottom:0;left:auto;background:#fff;border-left:1px solid #999;border-right:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;padding:2rem;-webkit-transform:translateX(26rem);transform:translateX(26rem);width:26rem;z-index:5}@media screen and (min-width:951px){.usa-nav{padding-top:4.5rem;padding-right:0;padding-bottom:0;border-left:none;display:block;float:right;overflow-y:visible;position:relative;-webkit-transform:translateX(0);transform:translateX(0);width:auto}}.usa-nav.is-visible{-webkit-transform:translateX(0);transform:translateX(0);transition:all .3s ease-in-out}.usa-nav nav{margin-top:6rem;min-height:100%}@media screen and (min-width:951px){.usa-nav nav{margin-top:0}}.usa-nav .usa-current{border-left:4px solid #313b52;color:#313b52;font-weight:700;padding-left:1.4rem}@media screen and (min-width:951px){.usa-nav .usa-current{color:#fff}}.usa-nav .usa-button{width:100%}@media screen and (min-width:951px){.usa-nav .usa-search{margin-left:1.5rem;top:4px}}.usa-nav-primary{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin-top:1.5rem;-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.usa-nav-primary>li{margin-bottom:0;background-color:transparent;border-top:1px solid #666;font-size:1.7rem}.usa-nav-primary>li:first-child{border-top:none}.usa-nav-primary a{border:none;color:#fff;display:block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;line-height:1.3;padding:.85rem 1rem .85rem 1.8rem;text-decoration:none}.usa-nav-primary a:hover{background-color:#e4e4e4;color:#313b52;text-decoration:none}.usa-nav-primary a:focus{outline-offset:0;position:relative;z-index:1}.usa-nav-primary a.usa-current{border-left:.4rem solid #313b52;color:#313b52;font-weight:700;padding-left:1.4rem}@media screen and (min-width:951px){.usa-nav-primary{display:inline}}@media screen and (min-width:951px){.usa-nav-primary li{border-top:none}}.usa-nav-primary>li{width:auto}@media screen and (min-width:951px){.usa-nav-primary>li{display:inline-block}}@media screen and (min-width:951px){.usa-nav-primary>li>a{padding:1.3rem 1.5rem 2.2rem;color:#666;font-size:1.5rem;font-weight:700;line-height:1}}@media screen and (min-width:951px){.usa-nav-primary>li>a:hover{background-color:transparent}}@media screen and (min-width:951px){.usa-nav-primary a{padding-top:.75rem;padding-bottom:.75rem}}.usa-nav-primary button{border:0;border-radius:0;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-weight:400;line-height:1.3;padding:.85rem 1.5rem .85rem 1.8rem}.usa-nav-primary button,.usa-nav-primary button:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-primary button{padding:1.3rem 1.5rem 2.2rem;color:#666;font-size:1.5rem;font-weight:700;line-height:1;width:auto}}.usa-nav-primary button:active,.usa-nav-primary button:focus{box-shadow:2px dotted #999}.usa-nav-primary button:hover{background-color:#e4e4e4;color:#313b52}@media screen and (min-width:951px){.usa-nav-primary button:hover{background-color:transparent}}.usa-nav-primary button[aria-expanded=false]{background-image:url(../img/plus-alt.png);background-image:url(../img/plus-alt.svg);background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=false]{background-image:url(../img/angle-arrow-down.png);background-image:url(../img/angle-arrow-down.svg);background-position:right 1.5rem top 40%}}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=false]:hover{background-image:url(../img/angle-arrow-down-primary.png);background-image:url(../img/angle-arrow-down-primary.svg)}}.usa-nav-primary button[aria-expanded=true]{background-image:url(../img/minus-alt.png);background-image:url(../img/minus-alt.svg);background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=true]{background-color:#03143d;color:#fff;background-image:url(../img/angle-arrow-down-hover.png);background-image:url(../img/angle-arrow-down-hover.svg);background-position:right 1.5rem top 40%}.usa-nav-primary button[aria-expanded=true]:hover{background-color:#03143d}.usa-nav-primary button[aria-expanded=true] span{border-bottom:.4rem solid #313b52;padding-bottom:.6rem;color:#fff}}@media screen and (min-width:951px){.usa-nav-primary .usa-current,.usa-nav-primary a.usa-current{border-left:0;padding-left:1.5rem}.usa-nav-primary .usa-current:hover span,.usa-nav-primary a.usa-current:hover span{color:#313b52}.usa-nav-primary .usa-current span,.usa-nav-primary a.usa-current span{border-bottom:.4rem solid #313b52;padding-bottom:.6rem;color:#fff}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-link:hover span{border-bottom:.7rem solid #313b52;padding-bottom:.9rem}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-primary .usa-current span,.usa-header-extended .usa-nav-primary button[aria-expanded=true] span{border-bottom:.7rem solid #313b52;padding-bottom:.9rem}}.usa-nav-secondary{margin-top:1.5rem}@media screen and (min-width:951px){.usa-nav-secondary{margin-top:0;position:absolute;right:3rem;top:-5.7rem}}.usa-nav-secondary .usa-search{margin-top:1.5rem;margin-bottom:0}@media screen and (min-width:951px){.usa-nav-secondary .usa-search{margin-top:-.9rem;margin-bottom:0;margin-left:0;float:left}}.usa-nav-secondary-links{margin-top:2.4rem}@media screen and (min-width:951px){.usa-nav-secondary-links{float:left;margin-top:0}}@media screen and (min-width:951px){.usa-nav-secondary-links li{display:inline;padding-left:.5rem}}@media screen and (min-width:951px){.usa-nav-secondary-links li:not(:last-child):after{color:#c9c9c9;content:"|";padding-left:.5rem}}.usa-nav-secondary-links .usa-header-search-button,.usa-nav-secondary-links a{color:#666;display:inline-block;font-size:1.5rem;text-decoration:none}.usa-nav-secondary-links .usa-header-search-button:hover,.usa-nav-secondary-links a:hover{color:#313b52;text-decoration:underline}.usa-nav-secondary-links .usa-header-search-button{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;display:none}.usa-nav-secondary-links .usa-header-search-button:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-secondary-links .usa-header-search-button{background-image:url(../img/search-alt.png);background-image:url(../img/search-alt.svg);background-repeat:no-repeat;background-position:0;background-size:2.2rem;display:inline-block;padding-left:2.3rem}}@media screen and (min-width:951px){.usa-nav-secondary-links .usa-header-search-button.is-hidden{display:none}}@media screen and (min-width:951px){.usa-nav-secondary-links a.usa-current{border-left:0;padding-left:0}}.usa-nav-submenu{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin:0;width:100%}.usa-nav-submenu>li{margin-bottom:0}.usa-nav-submenu li{border:none}.usa-nav-submenu a{padding-left:2.8rem;line-height:1.3}.usa-nav-submenu a.usa-current,.usa-nav-submenu a:hover{border:none;padding-left:2.8rem}.usa-nav-submenu .usa-sidenav-sub_list a{padding-left:3.8rem}.usa-nav-submenu .usa-sidenav-sub_list a:focus{outline-offset:0}.usa-nav-submenu .usa-sidenav-sub_list a:hover{padding-left:3.8rem}@media screen and (min-width:951px){.usa-nav-submenu{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;padding-top:.75rem;padding-bottom:.9rem;background-color:#03143d;width:21.5rem;position:absolute}.usa-nav-submenu>li{margin-bottom:0}}.usa-nav-submenu[aria-hidden=true]{display:none}@media screen and (min-width:951px){.usa-nav-submenu a,.usa-nav-submenu a:hover{color:#fff;padding-left:1.5rem}.usa-nav-submenu a:hover{background-color:#03143d;text-decoration:underline}}.usa-nav-submenu li{font-size:1.5rem;margin-bottom:0}.usa-nav-close{border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;margin:-1.2rem -1.5rem 1.5rem auto;float:right;height:4.4rem;text-align:center;width:4.4rem}.usa-nav-close,.usa-nav-close:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-close{display:none}}.usa-nav-close img{width:1.3rem}.usa-nav-close+*{clear:both}.usa-mobile_nav-active{overflow:hidden}@media screen and (min-width:951px){.usa-megamenu{padding-top:3.15rem;padding-bottom:3.15rem;left:-1rem;width:100%}}@media screen and (min-width:951px){.usa-megamenu:before{right:100%}}@media screen and (min-width:951px){.usa-megamenu:after,.usa-megamenu:before{background-color:#03143d;content:"";display:block;height:100%;position:absolute;top:0;width:1000%}.usa-megamenu:after{left:100%}}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav{padding-left:0;padding-top:0;width:100%}}.usa-header-basic-megamenu .usa-nav-inner{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav-inner{display:block;float:right;margin-top:-3.8rem}}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav-submenu .usa-grid-full{margin-left:-1.8rem}}@media screen and (min-width:951px){.usa-megamenu-col{float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-megamenu-col:last-child{margin-right:0}.usa-megamenu-col:nth-child(2n){float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-megamenu-col:nth-child(2n):last-child,.usa-megamenu-col:nth-child(4n){margin-right:0}}.usa-megamenu-col>ul{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-megamenu-col>ul>li{margin-bottom:0}.usa-search{max-width:none;position:relative}.usa-search:after{clear:both;content:"";display:block}.usa-search .usa-search-submit,.usa-search [type=submit]{background-image:url(../img/search.png);background-image:url(../img/search.svg);background-position:50%;background-repeat:no-repeat;border-bottom-left-radius:0;border-top-left-radius:0;height:3.3rem;margin:0;padding:0;width:4.5rem}@media screen and (min-width:481px){.usa-search .usa-search-submit,.usa-search [type=submit]{background-image:none;width:8.5rem}}@media screen and (min-width:481px){.usa-search.usa-search-big .usa-search-input,.usa-search.usa-search-big [type=search]{font-size:1.7rem;height:4.4rem;width:calc(100% - 11.6rem)}.usa-search.usa-search-big .usa-search-submit,.usa-search.usa-search-big [type=submit]{font-size:2rem;height:4.4rem;width:11.6rem}}@media screen and (min-width:481px){.usa-search.usa-search-small .usa-search-input,.usa-search.usa-search-small [type=search]{width:calc(100% - 4.5rem)}.usa-search.usa-search-small .usa-search-submit,.usa-search.usa-search-small [type=submit]{background-image:url(../img/search.png);background-image:url(../img/search.svg);background-position:50%;background-repeat:no-repeat;width:4.5rem}}@media screen and (max-width:950px){.usa-search.usa-search-small.usa-sr-only{left:auto;position:relative}}input[type=search]{box-sizing:border-box;-webkit-appearance:none}.usa-search-input,[type=search]{padding-top:0;padding-bottom:0;border-bottom-right-radius:0;border-right:none;border-top-right-radius:0;box-sizing:border-box;float:left;font-size:1.4rem;height:3.3rem;margin:0;width:calc(100% - 4.5rem)}@media screen and (min-width:481px){.usa-search-input,[type=search]{width:calc(100% - 8.5rem)}}.usa-search-submit-text{position:absolute;left:-999em}@media screen and (min-width:481px){.usa-search-submit-text{position:static}}.usa-section{padding-top:3rem;padding-bottom:3rem}@media screen and (min-width:600px){.usa-section{padding-top:6rem;padding-bottom:6rem}}.usa-section-light{background-color:#e4e4e4}.usa-section-dark{background-color:#03143d;color:#fff}.usa-section-dark h1,.usa-section-dark h2,.usa-section-dark h3,.usa-section-dark h4,.usa-section-dark h5,.usa-section-dark h6{color:#c64b00}.usa-section-dark p{color:#fff}.usa-section-dark a{color:#c9c9c9}.usa-section-dark a:hover{color:#fff}.usa-sidenav-list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-sidenav-list>li{margin-bottom:0;background-color:transparent;border-top:1px solid #666;font-size:1.7rem}.usa-sidenav-list>li:first-child{border-top:none}.usa-sidenav-list a{border:none;color:#fff;display:block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;line-height:1.3;padding:.85rem 1rem .85rem 1.8rem;text-decoration:none}.usa-sidenav-list a:hover{background-color:#e4e4e4;color:#313b52;text-decoration:none}.usa-sidenav-list a:focus{outline-offset:0;position:relative;z-index:1}.usa-sidenav-list a.usa-current{border-left:.4rem solid #313b52;color:#313b52;font-weight:700;padding-left:1.4rem}.usa-sidenav-sub_list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin:0;width:100%}.usa-sidenav-sub_list>li{margin-bottom:0}.usa-sidenav-sub_list li{border:none;font-size:1.5rem}.usa-sidenav-sub_list a{padding-left:2.8rem;line-height:1.3}.usa-sidenav-sub_list a.usa-current,.usa-sidenav-sub_list a:hover{border:none;padding-left:2.8rem}.usa-sidenav-sub_list .usa-sidenav-sub_list a{padding-left:3.8rem}.usa-sidenav-sub_list .usa-sidenav-sub_list a:focus{outline-offset:0}.usa-sidenav-sub_list .usa-sidenav-sub_list a:hover{padding-left:3.8rem}.usa-skipnav{background:transparent;color:#fff;padding:1rem 1.5rem;top:-4.2rem;z-index:2}.usa-skipnav,.usa-skipnav:focus{left:0;position:absolute;transition:all .2s ease-in-out}.usa-skipnav:focus{background:#fff;outline:0;top:0}
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse}td,th{padding:0}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:300;src:url(../fonts/sourcesanspro-light-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-light-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-light-webfont.woff) format("woff"),url(../fonts/sourcesanspro-light-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:400;src:url(../fonts/sourcesanspro-regular-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-regular-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-regular-webfont.woff) format("woff"),url(../fonts/sourcesanspro-regular-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:italic;font-weight:400;src:url(../fonts/sourcesanspro-italic-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-italic-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-italic-webfont.woff) format("woff"),url(../fonts/sourcesanspro-italic-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:700;src:url(../fonts/sourcesanspro-bold-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-bold-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-bold-webfont.woff) format("woff"),url(../fonts/sourcesanspro-bold-webfont.ttf) format("truetype")}.usa-grid,.usa-grid-full{max-width:1200px;margin-left:auto;margin-right:auto;max-width:1040px}.usa-grid-full:after,.usa-grid:after{clear:both;content:"";display:block}.usa-grid{padding-right:1.5rem;padding-left:1.5rem}@media screen and (min-width:600px){.usa-grid{padding-right:3rem;padding-left:3rem}}.usa-grid-full{padding:0}@media screen and (min-width:600px){.usa-width-one-whole{float:left;display:block;margin-right:4.82916%;width:100%}.usa-width-one-whole:last-child{margin-right:0}.usa-width-one-half{float:left;display:block;margin-right:4.82916%;width:47.58542%}.usa-width-one-half:last-child{margin-right:0}.usa-width-one-third{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-third:last-child{margin-right:0}.usa-width-two-thirds{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-two-thirds:last-child{margin-right:0}.usa-width-one-fourth{float:left;display:block;margin-right:4.82916%;width:47.58542%}.usa-width-one-fourth:last-child,.usa-width-one-fourth:nth-child(2n){margin-right:0}.usa-width-three-fourths{float:left;display:block;margin-right:4.82916%;width:100%}.usa-width-three-fourths:last-child{margin-right:0}.usa-width-one-sixth{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-sixth:last-child,.usa-width-one-sixth:nth-child(3n){margin-right:0}.usa-width-five-sixths{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-five-sixths:last-child{margin-right:0}.usa-width-one-twelfth{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-twelfth:last-child,.usa-width-one-twelfth:nth-child(3n){margin-right:0}.usa-width-five-twelfths{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-five-twelfths:last-child{margin-right:0}.usa-width-seven-twelfths{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-seven-twelfths:last-child{margin-right:0}}@media screen and (min-width:1201px){.usa-width-one-whole{float:left;display:block;margin-right:2.35765%;width:100%}.usa-width-one-whole:last-child{margin-right:0}.usa-width-one-half{float:left;display:block;margin-right:2.35765%;width:48.82117%}.usa-width-one-half:last-child{margin-right:0}.usa-width-one-third{float:left;display:block;margin-right:2.35765%;width:31.76157%}.usa-width-one-third:last-child{margin-right:0}.usa-width-two-thirds{float:left;display:block;margin-right:2.35765%;width:65.88078%}.usa-width-two-thirds:last-child{margin-right:0}.usa-width-one-fourth{float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-width-one-fourth:last-child{margin-right:0}.usa-width-one-fourth:nth-child(2n){float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-width-one-fourth:nth-child(2n):last-child,.usa-width-one-fourth:nth-child(4n){margin-right:0}.usa-width-three-fourths{float:left;display:block;margin-right:2.35765%;width:74.41059%}.usa-width-three-fourths:last-child{margin-right:0}.usa-width-one-sixth{float:left;display:block;margin-right:2.35765%;width:14.70196%}.usa-width-one-sixth:last-child{margin-right:0}.usa-width-one-sixth:nth-child(3n){float:left;display:block;margin-right:2.35765%;width:14.70196%}.usa-width-one-sixth:nth-child(3n):last-child,.usa-width-one-sixth:nth-child(6n){margin-right:0}.usa-width-five-sixths{float:left;display:block;margin-right:2.35765%;width:82.94039%}.usa-width-five-sixths:last-child{margin-right:0}.usa-width-one-twelfth{float:left;display:block;margin-right:2.35765%;width:6.17215%}.usa-width-one-twelfth:last-child{margin-right:0}.usa-width-one-twelfth:nth-child(3n){float:left;display:block;margin-right:2.35765%;width:6.17215%}.usa-width-one-twelfth:nth-child(3n):last-child,.usa-width-one-twelfth:nth-child(12n){margin-right:0}.usa-width-five-twelfths{float:left;display:block;margin-right:2.35765%;width:40.29137%}.usa-width-five-twelfths:last-child{margin-right:0}.usa-width-seven-twelfths{float:left;display:block;margin-right:2.35765%;width:57.35098%}.usa-width-seven-twelfths:last-child{margin-right:0}}.usa-end-row{margin-right:0}.usa-offset-one-twelfth{margin-left:8.5298%}.usa-offset-one-sixth{margin-left:17.05961%}.usa-offset-one-fourth{margin-left:25.58941%}.usa-offset-one-third{margin-left:34.11922%}.usa-offset-five-twelfths{margin-left:42.64902%}.usa-offset-one-half{margin-left:51.17883%}.usa-offset-seven-twelfths{margin-left:59.70863%}.usa-offset-two-thirds{margin-left:68.23843%}.usa-offset-three-fourths{margin-left:76.76824%}.usa-offset-five-sixths{margin-left:85.29804%}.usa-offset-eleven-twelfths{margin-left:93.82785%}.usa-sr-only{position:absolute;left:-999em}html{box-sizing:border-box}*,:after,:before{box-sizing:inherit}body{background-color:#fff;overflow-x:hidden}.lt-ie9 *{-webkit-filter:none!important;filter:none!important}[hidden]{display:none!important}.usa-focus,:focus{outline:2px dotted #999;outline-offset:3px}.usa-button,.usa-button-primary,.usa-button-primary:visited,.usa-button:visited,[type=button],[type=image],[type=reset],[type=submit],button{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;margin-top:.5em;margin-right:.5em;margin-bottom:.5em;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#0071bc;border:0;border-radius:5px;color:#fff;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:1.7rem;font-weight:700;line-height:1;padding:1rem 2rem;text-align:center;text-decoration:none;width:100%}@media screen and (min-width:481px){.usa-button,.usa-button-primary,.usa-button-primary:visited,.usa-button:visited,[type=button],[type=image],[type=reset],[type=submit],button{width:auto}}.usa-button-primary.usa-button-hover,.usa-button-primary:hover,.usa-button-primary:visited.usa-button-hover,.usa-button-primary:visited:hover,.usa-button.usa-button-hover,.usa-button:hover,.usa-button:visited.usa-button-hover,.usa-button:visited:hover,[type=button].usa-button-hover,[type=button]:hover,[type=image].usa-button-hover,[type=image]:hover,[type=reset].usa-button-hover,[type=reset]:hover,[type=submit].usa-button-hover,[type=submit]:hover,button.usa-button-hover,button:hover{background-color:#205493;border-bottom:0;color:#fff;text-decoration:none}.usa-button-primary.usa-button-active,.usa-button-primary:active,.usa-button-primary:visited.usa-button-active,.usa-button-primary:visited:active,.usa-button.usa-button-active,.usa-button:active,.usa-button:visited.usa-button-active,.usa-button:visited:active,[type=button].usa-button-active,[type=button]:active,[type=image].usa-button-active,[type=image]:active,[type=reset].usa-button-active,[type=reset]:active,[type=submit].usa-button-active,[type=submit]:active,button.usa-button-active,button:active{background-color:#112e51}.usa-button-primary.usa-button-primary-alt,.usa-button-primary:visited.usa-button-primary-alt,.usa-button.usa-button-primary-alt,.usa-button:visited.usa-button-primary-alt,[type=button].usa-button-primary-alt,[type=image].usa-button-primary-alt,[type=reset].usa-button-primary-alt,[type=submit].usa-button-primary-alt,button.usa-button-primary-alt{background-color:#c64b00;color:#212121}.usa-button-primary.usa-button-primary-alt.usa-button-hover,.usa-button-primary.usa-button-primary-alt:hover,.usa-button-primary:visited.usa-button-primary-alt.usa-button-hover,.usa-button-primary:visited.usa-button-primary-alt:hover,.usa-button.usa-button-primary-alt.usa-button-hover,.usa-button.usa-button-primary-alt:hover,.usa-button:visited.usa-button-primary-alt.usa-button-hover,.usa-button:visited.usa-button-primary-alt:hover,[type=button].usa-button-primary-alt.usa-button-hover,[type=button].usa-button-primary-alt:hover,[type=image].usa-button-primary-alt.usa-button-hover,[type=image].usa-button-primary-alt:hover,[type=reset].usa-button-primary-alt.usa-button-hover,[type=reset].usa-button-primary-alt:hover,[type=submit].usa-button-primary-alt.usa-button-hover,[type=submit].usa-button-primary-alt:hover,button.usa-button-primary-alt.usa-button-hover,button.usa-button-primary-alt:hover{background-color:#046b99}.usa-button-primary.usa-button-primary-alt.usa-button-active,.usa-button-primary.usa-button-primary-alt:active,.usa-button-primary:visited.usa-button-primary-alt.usa-button-active,.usa-button-primary:visited.usa-button-primary-alt:active,.usa-button.usa-button-primary-alt.usa-button-active,.usa-button.usa-button-primary-alt:active,.usa-button:visited.usa-button-primary-alt.usa-button-active,.usa-button:visited.usa-button-primary-alt:active,[type=button].usa-button-primary-alt.usa-button-active,[type=button].usa-button-primary-alt:active,[type=image].usa-button-primary-alt.usa-button-active,[type=image].usa-button-primary-alt:active,[type=reset].usa-button-primary-alt.usa-button-active,[type=reset].usa-button-primary-alt:active,[type=submit].usa-button-primary-alt.usa-button-active,[type=submit].usa-button-primary-alt:active,button.usa-button-primary-alt.usa-button-active,button.usa-button-primary-alt:active{background-color:#046b99;color:#fff}.usa-button-primary.usa-button-secondary,.usa-button-primary:visited.usa-button-secondary,.usa-button.usa-button-secondary,.usa-button:visited.usa-button-secondary,[type=button].usa-button-secondary,[type=image].usa-button-secondary,[type=reset].usa-button-secondary,[type=submit].usa-button-secondary,button.usa-button-secondary{background-color:#fff;box-shadow:inset 0 0 0 2px #0071bc;color:#0071bc}.usa-button-primary.usa-button-secondary.usa-button-hover,.usa-button-primary.usa-button-secondary:hover,.usa-button-primary:visited.usa-button-secondary.usa-button-hover,.usa-button-primary:visited.usa-button-secondary:hover,.usa-button.usa-button-secondary.usa-button-hover,.usa-button.usa-button-secondary:hover,.usa-button:visited.usa-button-secondary.usa-button-hover,.usa-button:visited.usa-button-secondary:hover,[type=button].usa-button-secondary.usa-button-hover,[type=button].usa-button-secondary:hover,[type=image].usa-button-secondary.usa-button-hover,[type=image].usa-button-secondary:hover,[type=reset].usa-button-secondary.usa-button-hover,[type=reset].usa-button-secondary:hover,[type=submit].usa-button-secondary.usa-button-hover,[type=submit].usa-button-secondary:hover,button.usa-button-secondary.usa-button-hover,button.usa-button-secondary:hover{box-shadow:inset 0 0 0 2px #205493;color:#205493}.usa-button-primary.usa-button-secondary.usa-button-active,.usa-button-primary.usa-button-secondary:active,.usa-button-primary:visited.usa-button-secondary.usa-button-active,.usa-button-primary:visited.usa-button-secondary:active,.usa-button.usa-button-secondary.usa-button-active,.usa-button.usa-button-secondary:active,.usa-button:visited.usa-button-secondary.usa-button-active,.usa-button:visited.usa-button-secondary:active,[type=button].usa-button-secondary.usa-button-active,[type=button].usa-button-secondary:active,[type=image].usa-button-secondary.usa-button-active,[type=image].usa-button-secondary:active,[type=reset].usa-button-secondary.usa-button-active,[type=reset].usa-button-secondary:active,[type=submit].usa-button-secondary.usa-button-active,[type=submit].usa-button-secondary:active,button.usa-button-secondary.usa-button-active,button.usa-button-secondary:active{box-shadow:inset 0 0 0 2px #112e51;color:#112e51}.usa-button-primary.usa-button-outline-inverse,.usa-button-primary.usa-button-secondary-inverse,.usa-button-primary:visited.usa-button-outline-inverse,.usa-button-primary:visited.usa-button-secondary-inverse,.usa-button.usa-button-outline-inverse,.usa-button.usa-button-secondary-inverse,.usa-button:visited.usa-button-outline-inverse,.usa-button:visited.usa-button-secondary-inverse,[type=button].usa-button-outline-inverse,[type=button].usa-button-secondary-inverse,[type=image].usa-button-outline-inverse,[type=image].usa-button-secondary-inverse,[type=reset].usa-button-outline-inverse,[type=reset].usa-button-secondary-inverse,[type=submit].usa-button-outline-inverse,[type=submit].usa-button-secondary-inverse,button.usa-button-outline-inverse,button.usa-button-secondary-inverse{background:transparent;box-shadow:inset 0 0 0 2px #fff;color:#fff}.usa-button-primary.usa-button-outline-inverse.usa-button-hover,.usa-button-primary.usa-button-outline-inverse:hover,.usa-button-primary.usa-button-secondary-inverse.usa-button-hover,.usa-button-primary.usa-button-secondary-inverse:hover,.usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,.usa-button-primary:visited.usa-button-outline-inverse:hover,.usa-button-primary:visited.usa-button-secondary-inverse.usa-button-hover,.usa-button-primary:visited.usa-button-secondary-inverse:hover,.usa-button.usa-button-outline-inverse.usa-button-hover,.usa-button.usa-button-outline-inverse:hover,.usa-button.usa-button-secondary-inverse.usa-button-hover,.usa-button.usa-button-secondary-inverse:hover,.usa-button:visited.usa-button-outline-inverse.usa-button-hover,.usa-button:visited.usa-button-outline-inverse:hover,.usa-button:visited.usa-button-secondary-inverse.usa-button-hover,.usa-button:visited.usa-button-secondary-inverse:hover,[type=button].usa-button-outline-inverse.usa-button-hover,[type=button].usa-button-outline-inverse:hover,[type=button].usa-button-secondary-inverse.usa-button-hover,[type=button].usa-button-secondary-inverse:hover,[type=image].usa-button-outline-inverse.usa-button-hover,[type=image].usa-button-outline-inverse:hover,[type=image].usa-button-secondary-inverse.usa-button-hover,[type=image].usa-button-secondary-inverse:hover,[type=reset].usa-button-outline-inverse.usa-button-hover,[type=reset].usa-button-outline-inverse:hover,[type=reset].usa-button-secondary-inverse.usa-button-hover,[type=reset].usa-button-secondary-inverse:hover,[type=submit].usa-button-outline-inverse.usa-button-hover,[type=submit].usa-button-outline-inverse:hover,[type=submit].usa-button-secondary-inverse.usa-button-hover,[type=submit].usa-button-secondary-inverse:hover,button.usa-button-outline-inverse.usa-button-hover,button.usa-button-outline-inverse:hover,button.usa-button-secondary-inverse.usa-button-hover,button.usa-button-secondary-inverse:hover{box-shadow:inset 0 0 0 2px #c9c9c9;color:#c9c9c9}.usa-button-primary.usa-button-outline-inverse.usa-button-active,.usa-button-primary.usa-button-outline-inverse:active,.usa-button-primary.usa-button-secondary-inverse.usa-button-active,.usa-button-primary.usa-button-secondary-inverse:active,.usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,.usa-button-primary:visited.usa-button-outline-inverse:active,.usa-button-primary:visited.usa-button-secondary-inverse.usa-button-active,.usa-button-primary:visited.usa-button-secondary-inverse:active,.usa-button.usa-button-outline-inverse.usa-button-active,.usa-button.usa-button-outline-inverse:active,.usa-button.usa-button-secondary-inverse.usa-button-active,.usa-button.usa-button-secondary-inverse:active,.usa-button:visited.usa-button-outline-inverse.usa-button-active,.usa-button:visited.usa-button-outline-inverse:active,.usa-button:visited.usa-button-secondary-inverse.usa-button-active,.usa-button:visited.usa-button-secondary-inverse:active,[type=button].usa-button-outline-inverse.usa-button-active,[type=button].usa-button-outline-inverse:active,[type=button].usa-button-secondary-inverse.usa-button-active,[type=button].usa-button-secondary-inverse:active,[type=image].usa-button-outline-inverse.usa-button-active,[type=image].usa-button-outline-inverse:active,[type=image].usa-button-secondary-inverse.usa-button-active,[type=image].usa-button-secondary-inverse:active,[type=reset].usa-button-outline-inverse.usa-button-active,[type=reset].usa-button-outline-inverse:active,[type=reset].usa-button-secondary-inverse.usa-button-active,[type=reset].usa-button-secondary-inverse:active,[type=submit].usa-button-outline-inverse.usa-button-active,[type=submit].usa-button-outline-inverse:active,[type=submit].usa-button-secondary-inverse.usa-button-active,[type=submit].usa-button-secondary-inverse:active,button.usa-button-outline-inverse.usa-button-active,button.usa-button-outline-inverse:active,button.usa-button-secondary-inverse.usa-button-active,button.usa-button-secondary-inverse:active{box-shadow:inset 0 0 0 2px #999;color:#c9c9c9}.usa-button-primary.usa-button-gray,.usa-button-primary:visited.usa-button-gray,.usa-button.usa-button-gray,.usa-button:visited.usa-button-gray,[type=button].usa-button-gray,[type=image].usa-button-gray,[type=reset].usa-button-gray,[type=submit].usa-button-gray,button.usa-button-gray{background-color:#666}.usa-button-primary.usa-button-gray.usa-button-hover,.usa-button-primary.usa-button-gray:hover,.usa-button-primary:visited.usa-button-gray.usa-button-hover,.usa-button-primary:visited.usa-button-gray:hover,.usa-button.usa-button-gray.usa-button-hover,.usa-button.usa-button-gray:hover,.usa-button:visited.usa-button-gray.usa-button-hover,.usa-button:visited.usa-button-gray:hover,[type=button].usa-button-gray.usa-button-hover,[type=button].usa-button-gray:hover,[type=image].usa-button-gray.usa-button-hover,[type=image].usa-button-gray:hover,[type=reset].usa-button-gray.usa-button-hover,[type=reset].usa-button-gray:hover,[type=submit].usa-button-gray.usa-button-hover,[type=submit].usa-button-gray:hover,button.usa-button-gray.usa-button-hover,button.usa-button-gray:hover{background-color:#333}.usa-button-primary.usa-button-gray.usa-button-active,.usa-button-primary.usa-button-gray:active,.usa-button-primary:visited.usa-button-gray.usa-button-active,.usa-button-primary:visited.usa-button-gray:active,.usa-button.usa-button-gray.usa-button-active,.usa-button.usa-button-gray:active,.usa-button:visited.usa-button-gray.usa-button-active,.usa-button:visited.usa-button-gray:active,[type=button].usa-button-gray.usa-button-active,[type=button].usa-button-gray:active,[type=image].usa-button-gray.usa-button-active,[type=image].usa-button-gray:active,[type=reset].usa-button-gray.usa-button-active,[type=reset].usa-button-gray:active,[type=submit].usa-button-gray.usa-button-active,[type=submit].usa-button-gray:active,button.usa-button-gray.usa-button-active,button.usa-button-gray:active{background-color:#212121}.usa-button-primary.usa-button-red,.usa-button-primary:visited.usa-button-red,.usa-button.usa-button-red,.usa-button:visited.usa-button-red,[type=button].usa-button-red,[type=image].usa-button-red,[type=reset].usa-button-red,[type=submit].usa-button-red,button.usa-button-red{background-color:#005495}.usa-button-primary.usa-button-red.usa-button-hover,.usa-button-primary.usa-button-red:hover,.usa-button-primary:visited.usa-button-red.usa-button-hover,.usa-button-primary:visited.usa-button-red:hover,.usa-button.usa-button-red.usa-button-hover,.usa-button.usa-button-red:hover,.usa-button:visited.usa-button-red.usa-button-hover,.usa-button:visited.usa-button-red:hover,[type=button].usa-button-red.usa-button-hover,[type=button].usa-button-red:hover,[type=image].usa-button-red.usa-button-hover,[type=image].usa-button-red:hover,[type=reset].usa-button-red.usa-button-hover,[type=reset].usa-button-red:hover,[type=submit].usa-button-red.usa-button-hover,[type=submit].usa-button-red:hover,button.usa-button-red.usa-button-hover,button.usa-button-red:hover{background-color:#981b1e}.usa-button-primary.usa-button-red.usa-button-active,.usa-button-primary.usa-button-red:active,.usa-button-primary:visited.usa-button-red.usa-button-active,.usa-button-primary:visited.usa-button-red:active,.usa-button.usa-button-red.usa-button-active,.usa-button.usa-button-red:active,.usa-button:visited.usa-button-red.usa-button-active,.usa-button:visited.usa-button-red:active,[type=button].usa-button-red.usa-button-active,[type=button].usa-button-red:active,[type=image].usa-button-red.usa-button-active,[type=image].usa-button-red:active,[type=reset].usa-button-red.usa-button-active,[type=reset].usa-button-red:active,[type=submit].usa-button-red.usa-button-active,[type=submit].usa-button-red:active,button.usa-button-red.usa-button-active,button.usa-button-red:active{background-color:#cd2026}.usa-button-primary.usa-button-big,.usa-button-primary:visited.usa-button-big,.usa-button.usa-button-big,.usa-button:visited.usa-button-big,[type=button].usa-button-big,[type=image].usa-button-big,[type=reset].usa-button-big,[type=submit].usa-button-big,button.usa-button-big{border-radius:8px;font-size:2.4rem;padding:1.5rem 3rem}.usa-button-primary:disabled,.usa-button-primary:visited:disabled,.usa-button:disabled,.usa-button:visited:disabled,[type=button]:disabled,[type=image]:disabled,[type=reset]:disabled,[type=submit]:disabled,button:disabled{background-color:#c9c9c9;pointer-events:none}.usa-button-primary:disabled.usa-button-active,.usa-button-primary:disabled.usa-button-hover,.usa-button-primary:disabled.usa-focus,.usa-button-primary:disabled:active,.usa-button-primary:disabled:focus,.usa-button-primary:disabled:hover,.usa-button-primary:visited:disabled.usa-button-active,.usa-button-primary:visited:disabled.usa-button-hover,.usa-button-primary:visited:disabled.usa-focus,.usa-button-primary:visited:disabled:active,.usa-button-primary:visited:disabled:focus,.usa-button-primary:visited:disabled:hover,.usa-button:disabled.usa-button-active,.usa-button:disabled.usa-button-hover,.usa-button:disabled.usa-focus,.usa-button:disabled:active,.usa-button:disabled:focus,.usa-button:disabled:hover,.usa-button:visited:disabled.usa-button-active,.usa-button:visited:disabled.usa-button-hover,.usa-button:visited:disabled.usa-focus,.usa-button:visited:disabled:active,.usa-button:visited:disabled:focus,.usa-button:visited:disabled:hover,[type=button]:disabled.usa-button-active,[type=button]:disabled.usa-button-hover,[type=button]:disabled.usa-focus,[type=button]:disabled:active,[type=button]:disabled:focus,[type=button]:disabled:hover,[type=image]:disabled.usa-button-active,[type=image]:disabled.usa-button-hover,[type=image]:disabled.usa-focus,[type=image]:disabled:active,[type=image]:disabled:focus,[type=image]:disabled:hover,[type=reset]:disabled.usa-button-active,[type=reset]:disabled.usa-button-hover,[type=reset]:disabled.usa-focus,[type=reset]:disabled:active,[type=reset]:disabled:focus,[type=reset]:disabled:hover,[type=submit]:disabled.usa-button-active,[type=submit]:disabled.usa-button-hover,[type=submit]:disabled.usa-focus,[type=submit]:disabled:active,[type=submit]:disabled:focus,[type=submit]:disabled:hover,button:disabled.usa-button-active,button:disabled.usa-button-hover,button:disabled.usa-focus,button:disabled:active,button:disabled:focus,button:disabled:hover{background-color:#c9c9c9;border:0;box-shadow:none}.usa-button-disabled{background-color:#c9c9c9;pointer-events:none}.usa-button-disabled.usa-button-active,.usa-button-disabled.usa-button-hover,.usa-button-disabled.usa-focus,.usa-button-disabled:active,.usa-button-disabled:focus,.usa-button-disabled:hover{background-color:#c9c9c9;border:0;box-shadow:none}.usa-button-outline-inverse:disabled,.usa-button-secondary-disabled,.usa-button-secondary-inverse-disabled,.usa-button-secondary-inverse:disabled,.usa-button-secondary:disabled{box-shadow:inset 0 0 0 2px #c9c9c9;pointer-events:none;color:#c9c9c9}.usa-button-outline-inverse:disabled.usa-button-active,.usa-button-outline-inverse:disabled.usa-button-hover,.usa-button-outline-inverse:disabled.usa-focus,.usa-button-outline-inverse:disabled:active,.usa-button-outline-inverse:disabled:focus,.usa-button-outline-inverse:disabled:hover,.usa-button-secondary-disabled.usa-button-active,.usa-button-secondary-disabled.usa-button-hover,.usa-button-secondary-disabled.usa-focus,.usa-button-secondary-disabled:active,.usa-button-secondary-disabled:focus,.usa-button-secondary-disabled:hover,.usa-button-secondary-inverse-disabled.usa-button-active,.usa-button-secondary-inverse-disabled.usa-button-hover,.usa-button-secondary-inverse-disabled.usa-focus,.usa-button-secondary-inverse-disabled:active,.usa-button-secondary-inverse-disabled:focus,.usa-button-secondary-inverse-disabled:hover,.usa-button-secondary-inverse:disabled.usa-button-active,.usa-button-secondary-inverse:disabled.usa-button-hover,.usa-button-secondary-inverse:disabled.usa-focus,.usa-button-secondary-inverse:disabled:active,.usa-button-secondary-inverse:disabled:focus,.usa-button-secondary-inverse:disabled:hover,.usa-button-secondary:disabled.usa-button-active,.usa-button-secondary:disabled.usa-button-hover,.usa-button-secondary:disabled.usa-focus,.usa-button-secondary:disabled:active,.usa-button-secondary:disabled:focus,.usa-button-secondary:disabled:hover{background-color:#fff;border:0}.usa-button-secondary:disabled,html .usa-button-secondary-disabled{background-color:#fff}.usa-button-secondary-inverse:disabled,html .usa-button-secondary-inverse-disabled{background-color:transparent;color:#666;box-shadow:inset 0 0 0 2px #666}.usa-button-unstyled{border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto}.usa-button-unstyled,.usa-button-unstyled:hover{background-color:transparent}.usa-embed-container embed,.usa-embed-container iframe,.usa-embed-container object{position:absolute;top:0;left:0;width:100%;height:100%}.usa-embed-container{padding-bottom:56.25%;position:relative;height:0;overflow:hidden;max-width:100%}img{max-width:100%}.media_link{display:inline-block;line-height:0}input,select,textarea{-webkit-appearance:none;-moz-appearance:none;appearance:none;border:.1rem solid #666;border-radius:0;box-sizing:border-box;color:#212121;display:block;font-size:1.7rem;height:4.4rem;line-height:1.3;margin:.2em 0;max-width:46rem;padding:1rem .7em;width:100%}input.usa-input-success,select.usa-input-success,textarea.usa-input-success{border:3px solid #4aa564}.usa-input-error{border-left:4px solid #981b1e;margin-top:3rem;padding-bottom:.8rem;padding-left:1.5rem;padding-top:.8rem;position:relative;right:1.9rem}.usa-input-error input,.usa-input-error select,.usa-input-error textarea{border:3px solid #981b1e;width:calc(100% + 1.9rem)}.usa-input-error label{margin-top:0}.usa-input-error .usa-input-inline{border:.1rem solid #666;width:inherit}.usa-input-error .usa-input-inline-error{border:3px solid #981b1e}.usa-input-error-label,.usa-input-error-message{display:block;font-size:1.7rem;font-weight:700}.usa-input-error-message{color:#981b1e;padding-bottom:3px;padding-top:3px}.usa-input-required:after{color:#cd2026;content:" (*required)"}.usa-input-optional:after{color:#757575;content:" (optional)"}label{display:block;margin-top:3rem;max-width:46rem}textarea{height:16rem}select{-moz-appearance:none;-webkit-appearance:none;appearance:none;background-color:#fff;background-image:url(../img/arrow-both.png);background-image:url(../img/arrow-both.svg);background-position:right 1.3rem center;background-repeat:no-repeat;background-size:1rem;padding-right:3rem}select::-ms-expand{display:none}select:-webkit-autofill{-webkit-appearance:menulist;appearance:menulist}select:-moz-focusring{color:transparent;text-shadow:0 0 0 #000}legend,option:first-child{font-weight:700}legend{font-size:3rem}.usa-fieldset-inputs label{margin-top:0}.usa-form-hint{color:#757575;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;margin-bottom:0}[type=checkbox],[type=radio]{position:absolute;left:-999em}.lt-ie9 [type=checkbox],.lt-ie9 [type=radio]{border:0;float:left;margin:.4em .4em 0 0;position:static;width:auto}[type=checkbox]+label,[type=radio]+label{cursor:pointer;font-weight:400;margin-bottom:.65em}[type=checkbox]+label:before,[type=radio]+label:before{background:#fff;border-radius:2px;box-shadow:0 0 0 1px #757575;content:"\a0";display:inline-block;height:2rem;line-height:2rem;margin-right:.6em;text-indent:.15em;vertical-align:middle\0;width:2rem}[type=radio]+label:before{border-radius:100%;box-shadow:0 0 0 2px #fff,0 0 0 3px #757575;height:1.4rem;line-height:1.4rem;margin-right:.75em;width:1.4rem}[type=checkbox]:checked+label:before,[type=radio]:checked+label:before{background-color:#0071bc;box-shadow:0 0 0 1px #0071bc}[type=radio]:checked+label:before{box-shadow:0 0 0 2px #fff,0 0 0 4px #0071bc}[type=checkbox]:checked+label:before,[type=checkbox]:checked:disabled+label:before{background-image:url(../img/correct8.png);background-image:url(../img/correct8.svg);background-position:50%;background-repeat:no-repeat}[type=radio]:focus+label:before{outline:2px dotted #999;outline-offset:6px}[type=checkbox]:disabled+label{color:#c9c9c9}[type=checkbox]:focus+label:before{outline:2px dotted #999;outline-offset:3px}[type=checkbox]:disabled+label:before,[type=radio]:disabled+label:before{background:#e4e4e4;box-shadow:0 0 0 1px #999;cursor:not-allowed}[type=range]{-webkit-appearance:none;border:none;padding-left:0;width:100%}[type=range]::-webkit-slider-runnable-track{background:#999;border:1px solid #757575;cursor:pointer;height:1.2rem;width:100%}[type=range]::-moz-range-track{background:#0071bc;border:1px solid #757575;cursor:pointer;height:1.2rem;width:100%}[type=range]::-ms-track{background:transparent;color:transparent;cursor:pointer;height:1.2rem;width:100%}[type=range]::-webkit-slider-thumb{-webkit-appearance:none;border:1px solid #757575;height:2.2rem;border-radius:1.5rem;background:#e4e4e4;cursor:pointer;margin-top:-.65rem;width:2.2rem}[type=range]::-moz-range-thumb{background:#e4e4e4;border:1px solid #757575;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-thumb{background:#e4e4e4;border:1px solid #757575;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-fill-lower,[type=range]::-ms-fill-upper{background:#999;border:1px solid #757575;border-radius:2rem}.usa-date-of-birth label{margin-top:0}.usa-date-of-birth [type=number]::-webkit-inner-spin-button,.usa-date-of-birth [type=number]::-webkit-outer-spin-button{-webkit-appearance:none;appearance:none;margin:0}.usa-date-of-birth [type=number]{-moz-appearance:textfield}.usa-form-group-day,.usa-form-group-month,.usa-form-group-year{clear:none;float:left;margin-right:1.5rem;width:5rem}.usa-form-group-year{width:7rem}.usa-label,.usa-label-big{background-color:#666;border-radius:2px;color:#fff;font-size:1.5rem;margin-right:.5rem;padding:.1rem .7rem;text-transform:uppercase}.usa-label-big:only-of-type,.usa-label:only-of-type{margin-right:0}.usa-label-big{font-size:1.7rem;padding-left:.9rem;padding-right:.9rem}ol,ul{margin-top:1em;margin-bottom:1em;padding-left:1.94em}li{line-height:1.5;margin-bottom:.5em}li:last-child{margin-bottom:0}h1+ol,h1+ul,h2+ol,h2+ul,h3+ol,h3+ul,h4+ol,h4+ul,h5+ol,h5+ul,h6+ol,h6+ul,p+ol,p+ul{margin-top:0}.usa-unstyled-list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-unstyled-list>li{margin-bottom:0}table{border-spacing:0;margin:2em 0}thead th{font-weight:700}thead td,thead th{background-color:#e4e4e4}th{text-align:left}td,th{background-color:#fff;border:1px solid #666;font-weight:400;padding:1rem 1.5rem}.usa-table-borderless thead th{background-color:transparent;border-top:0}.usa-table-borderless td,.usa-table-borderless th{border-left:0;border-right:0}.usa-table-borderless th:first-child{padding-left:0}caption{font-size:1.5rem;font-weight:700;font-family:Work Sans,sans-serif;margin-bottom:1.2rem;text-align:left}html{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:10px}body{font-size:1.7rem}p{line-height:1.5;margin-bottom:1em;margin-top:1em}a{color:#0071bc;text-decoration:underline}a:active,a:hover{color:#205493}a:focus{outline:2px dotted #999;outline-offset:3px}a:visited{color:#4c2c92}.usa-external_link:after{background:url(../img/external-link.png) no-repeat 0 0;background:url(../img/external-link.svg) no-repeat 0 0;background-size:100%;content:"";display:inline-block;height:.65em;margin-bottom:-1px;margin-left:4px;width:.65em}.usa-external_link:hover:after{background-image:url(../img/external-link-hover.png);background-image:url(../img/external-link-hover.svg)}.usa-external_link-alt:after{background:url(../img/external-link-alt.png) no-repeat 0 0;background:url(../img/external-link-alt.svg) no-repeat 0 0;background-size:100%;content:"";display:inline-block;height:.65em;margin-bottom:-1px;margin-left:4px;width:.65em}.usa-external_link-alt:hover:after{background-image:url(../img/external-link-alt-hover.png);background-image:url(../img/external-link-alt-hover.svg)}h1,h2,h3,h4,h5{clear:both;font-family:Work Sans,sans-serif;line-height:1.3;margin-bottom:.5em;margin-top:1.5em}h6{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}h1{font-size:4rem}h1,h2{font-weight:700}h2{font-size:3rem}h3{font-size:2rem}h3,h4{font-weight:700}h4{font-size:1.7rem}h5{font-size:1.5rem;font-weight:700}h6{font-size:1.3rem;font-weight:400;line-height:1.5;text-transform:uppercase}address,cite,dfn,var{font-style:normal}.usa-content-list,.usa-content ol:not(.usa-accordion):not(.usa-accordion-bordered),.usa-content p,.usa-content ul:not(.usa-accordion):not(.usa-accordion-bordered){max-width:66ch}.usa-sans a,.usa-sans li,.usa-sans p,.usa-sans span{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}.usa-sans a{border-bottom:none;font-weight:700}.usa-serif a,.usa-serif li,.usa-serif p,.usa-serif span{font-family:Work Sans,sans-serif}.usa-display{font-size:2rem;font-weight:700;margin-bottom:0}@media screen and (min-width:481px){.usa-display{font-size:4rem;font-weight:700}}@media screen and (min-width:600px){.usa-display{font-size:5.2rem;font-weight:700}}.usa-font-lead{font-family:Work Sans,sans-serif;font-size:2rem;font-weight:400;line-height:1.7;max-width:77rem}.usa-image-block{position:relative}.usa-image-text-block{color:#fff;left:0;margin-left:8%;position:absolute;top:0}.usa-image-text{margin-top:0}.usa-drop_text{margin-bottom:0}.usa-background-dark{background-color:#333}.usa-background-dark p,.usa-background-dark span{color:#fff}.usa-background-dark a{color:#c9c9c9}.usa-background-dark a:hover{color:#fff}.usa-text-small{font-size:1.3rem;margin-top:0}.usa-grid-full>:first-child,.usa-grid>:first-child,.usa-section>:first-child{margin-top:0}.usa-grid-full>:last-child,.usa-grid>:last-child,.usa-section>:last-child{margin-bottom:0}.usa-width-five-sixths:first-child>:first-child,.usa-width-one-fourth:first-child>:first-child,.usa-width-one-half:first-child>:first-child,.usa-width-one-sixth:first-child>:first-child,.usa-width-one-third:first-child>:first-child,.usa-width-one-twelfth:first-child>:first-child,.usa-width-one-whole:first-child>:first-child,.usa-width-three-fourths:first-child>:first-child,.usa-width-two-thirds:first-child>:first-child{margin-top:0}@media screen and (min-width:600px){.usa-width-five-sixths>:first-child,.usa-width-one-fourth>:first-child,.usa-width-one-half>:first-child,.usa-width-one-sixth>:first-child,.usa-width-one-third>:first-child,.usa-width-one-twelfth>:first-child,.usa-width-one-whole>:first-child,.usa-width-three-fourths>:first-child,.usa-width-two-thirds>:first-child{margin-top:0}}.usa-width-five-sixths:last-child>:last-child,.usa-width-one-fourth:last-child>:last-child,.usa-width-one-half:last-child>:last-child,.usa-width-one-sixth:last-child>:last-child,.usa-width-one-third:last-child>:last-child,.usa-width-one-twelfth:last-child>:last-child,.usa-width-one-whole:last-child>:last-child,.usa-width-three-fourths:last-child>:last-child,.usa-width-two-thirds:last-child>:last-child{margin-bottom:0}@media screen and (min-width:600px){.usa-width-five-sixths>:last-child,.usa-width-one-fourth>:last-child,.usa-width-one-half>:last-child,.usa-width-one-sixth>:last-child,.usa-width-one-third>:last-child,.usa-width-one-twelfth>:last-child,.usa-width-one-whole>:last-child,.usa-width-three-fourths>:last-child,.usa-width-two-thirds>:last-child{margin-bottom:0}}.usa-accordion,.usa-accordion-bordered{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;color:#212121;margin:0;padding:0;width:100%}.usa-accordion-bordered>li,.usa-accordion>li{margin-bottom:0}.usa-accordion-bordered>ul li ul,.usa-accordion>ul li ul{list-style:disc}.usa-accordion-bordered>ul li ul>li>ul,.usa-accordion>ul li ul>li>ul{list-style:circle}.usa-accordion-bordered>ul li ul>li>ul>li>ul,.usa-accordion>ul li ul>li>ul>li>ul{list-style:square}.usa-accordion+.usa-accordion,.usa-accordion+.usa-accordion-bordered,.usa-accordion-bordered+.usa-accordion,.usa-accordion-bordered+.usa-accordion-bordered{margin-top:1rem}.usa-accordion-bordered>ul,.usa-accordion>ul{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;color:#212121;margin:0;padding:0;width:100%}.usa-accordion-bordered>ul>li,.usa-accordion>ul>li{margin-bottom:0;background-color:#e4e4e4;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;list-style:none;margin-bottom:.5rem;width:100%}.usa-accordion-bordered>ul button,.usa-accordion>ul button{background-color:transparent;border:0;border-radius:0;font-weight:400;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#e4e4e4;background-image:url(../img/minus.png);background-image:url(../img/minus.svg);background-position:right 2rem center;background-repeat:no-repeat;background-size:1.5rem;color:#212121;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-weight:700;margin:0;padding:1.5rem 5.5rem 1.5rem 2rem;width:100%}.usa-accordion-bordered>ul button:hover,.usa-accordion>ul button:hover{background-color:transparent;background-color:#c9c9c9;color:#212121}.usa-accordion-bordered>ul button h1,.usa-accordion-bordered>ul button h2,.usa-accordion-bordered>ul button h3,.usa-accordion-bordered>ul button h4,.usa-accordion-bordered>ul button h5,.usa-accordion-bordered>ul button h6,.usa-accordion>ul button h1,.usa-accordion>ul button h2,.usa-accordion>ul button h3,.usa-accordion>ul button h4,.usa-accordion>ul button h5,.usa-accordion>ul button h6{margin:0}.usa-accordion-bordered>ul [aria-expanded=false],.usa-accordion>ul [aria-expanded=false]{background-image:url(../img/plus.png);background-image:url(../img/plus.svg);background-repeat:no-repeat;background-size:1.5rem}.usa-accordion-bordered>li,.usa-accordion>li{background-color:#e4e4e4;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;list-style:none;margin-bottom:.5rem;width:100%}.usa-accordion-bordered .usa-accordion-content{border-bottom:3px solid #e4e4e4;border-left:3px solid #e4e4e4;border-right:3px solid #e4e4e4}.usa-accordion-content{background-color:#fff;overflow:auto;padding:1.5rem 2rem}.usa-accordion-content>:first-child{margin-top:0}.usa-accordion-content>:last-child{margin-bottom:0}.usa-accordion-content:not([aria-hidden]){position:absolute;left:-999em}.usa-accordion-content[aria-hidden=true]{display:none}.usa-accordion-button{background-color:transparent;border:0;border-radius:0;font-weight:400;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#e4e4e4;background-image:url(../img/minus.png);background-image:url(../img/minus.svg);background-position:right 2rem center;background-repeat:no-repeat;background-size:1.5rem;color:#212121;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-weight:700;margin:0;padding:1.5rem 5.5rem 1.5rem 2rem;width:100%}.usa-accordion-button:hover{background-color:transparent;background-color:#c9c9c9;color:#212121}.usa-accordion-button h1,.usa-accordion-button h2,.usa-accordion-button h3,.usa-accordion-button h4,.usa-accordion-button h5,.usa-accordion-button h6{margin:0}.usa-accordion-button[aria-expanded=false]{background-image:url(../img/plus.png);background-image:url(../img/plus.svg);background-repeat:no-repeat;background-size:1.5rem}.usa-alert{background-color:#e4e4e4;background-position:2rem 2rem;background-repeat:no-repeat;background-size:5.2rem;padding:2rem 2rem 1.4rem 3rem;position:relative}.usa-alert:before{background-color:#7e7e7e;content:"";height:100%;left:0;position:absolute;top:0;width:1rem}.usa-alert a{color:#205493}.usa-alert a:focus,.usa-alert a:hover{color:#112e51}.usa-alert ul{margin-bottom:0;margin-top:1rem;padding-left:1rem}.usa-alert-slim{background-position:2rem 1rem;padding-bottom:1rem;padding-top:1rem}.usa-alert-slim .usa-alert-text:only-child{margin-bottom:.5rem;padding-top:.5rem}.usa-alert-icon{display:table-cell;padding-right:1rem}.usa-alert-body{display:table-cell;padding-left:5rem;vertical-align:top}.usa-alert-heading,.usa-alert-text{margin-top:0;margin-bottom:0}.usa-alert-text{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}.usa-alert-text:only-child{margin-bottom:1rem;padding-top:.5rem}.usa-alert-success{background-color:#e7f4e4;background-image:url(../img/alerts/success.png);background-image:url(../img/alerts/success.svg)}.usa-alert-success:before{background-color:#2e8540}.usa-alert-warning{background-color:#fff1d2;background-image:url(../img/alerts/warning.png);background-image:url(../img/alerts/warning.svg)}.usa-alert-warning:before{background-color:#fdb81e}.usa-alert-error{background-color:#f9dede;background-image:url(../img/alerts/error.png);background-image:url(../img/alerts/error.svg)}.usa-alert-error:before{background-color:#005495}.usa-alert-info{background-color:#e1f3f8;background-image:url(../img/alerts/info.png);background-image:url(../img/alerts/info.svg)}.usa-alert-info:before{background-color:#c64b00}.usa-alert-no_icon{background-image:none}.usa-alert-paragraph{width:66ch}.usa-alert{margin-top:1.5em}.usa-banner{background-color:#e4e4e4;padding-bottom:.7rem}@media screen and (min-width:481px){.usa-banner{font-size:1.3rem;padding-bottom:0}}.usa-banner-content{padding:2rem 1.5rem 3px;background-color:transparent;font-size:1.5rem;width:100%}@media screen and (min-width:600px){.usa-banner-content{padding-bottom:2.3rem;padding-top:4rem}}@media screen and (min-width:951px){.usa-banner-content{padding-right:3rem;padding-left:3rem}}.usa-banner-content p:first-child{margin-top:1rem}@media screen and (min-width:600px){.usa-banner-content p:first-child{margin-top:0}}.usa-banner-inner{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:1.5rem;padding-left:1.5rem;max-width:1040px}.usa-banner-inner:after{clear:both;content:"";display:block}@media screen and (min-width:951px){.usa-banner-inner{padding-right:3rem;padding-left:3rem}}.usa-banner-header{padding-top:.55rem;padding-bottom:.55rem;font-size:1.2rem;font-weight:400}@media screen and (min-width:481px){.usa-banner-header{padding-top:0;padding-bottom:0}}.usa-banner-header p{margin-top:0;margin-bottom:0;display:inline;overflow:hidden;vertical-align:middle}@media screen and (min-width:481px){.usa-banner-header p{margin-top:2px;margin-bottom:2px;display:inline-block}}.usa-banner-header img{float:left;margin-right:1rem;margin-top:1px;width:2.4rem}@media screen and (min-width:481px){.usa-banner-header img{margin-right:.7rem;width:2rem}}.usa-banner-header-expanded{-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-bottom:1px solid #999;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:1.5rem;min-height:5.6rem;padding-right:3rem}@media screen and (min-width:481px){.usa-banner-header-expanded{border-bottom:none;display:block;font-size:1.2rem;font-weight:400;min-height:0;padding-right:0}}.usa-banner-header-expanded>.usa-banner-inner{margin-left:0}@media screen and (min-width:481px){.usa-banner-header-expanded>.usa-banner-inner{margin-left:auto}}.usa-banner-header-expanded img{margin-right:2.4rem}@media screen and (min-width:481px){.usa-banner-header-expanded img{margin-right:.7rem}}.usa-banner-header-expanded p{line-height:1.3;vertical-align:top}@media screen and (min-width:481px){.usa-banner-header-expanded p{line-height:1.5;vertical-align:middle}}.usa-banner-button{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;padding-top:1.3rem;padding-left:4.8rem;background-position-x:right;color:#0071bc;display:block;font-size:1.2rem;height:4.3rem;left:0;position:absolute;text-decoration:underline;top:0;width:100%}.usa-banner-button:hover{background-color:transparent}@media screen and (min-width:481px){.usa-banner-button{padding-top:0;padding-left:0;display:inline;height:auto;margin-left:3px;position:relative;vertical-align:middle;width:auto}}.usa-banner-button:hover{color:#205493;text-decoration:underline}.usa-banner-button[aria-expanded=false]{background-image:none}.usa-banner-button[aria-expanded=false]:after{background-image:url(../img/angle-arrow-down-primary.png);background-image:url(../img/angle-arrow-down-primary.svg);background-size:100%;content:"";display:inline-block;height:1rem;width:1rem;margin-left:0}.usa-banner-button[aria-expanded=false]:hover:after{background-image:url(../img/angle-arrow-down-primary-hover.png);background-image:url(../img/angle-arrow-down-primary-hover.svg)}.usa-banner-button[aria-expanded=false]:after{background-position-y:1px}.usa-banner-button[aria-expanded=true]{background-image:none;height:5.6rem}.usa-banner-button[aria-expanded=true]:after{background-image:url(../img/close.png);background-image:url(../img/close.svg);background-size:100%;content:"";display:inline-block;height:1.3rem;width:1.3rem;margin-left:0}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true]{height:auto;padding:0;position:relative}.usa-banner-button[aria-expanded=true]:after{background-image:url(../img/angle-arrow-up-primary.png);background-image:url(../img/angle-arrow-up-primary.svg);background-size:100%;content:"";display:inline-block;height:1rem;width:1rem;margin-left:0}.usa-banner-button[aria-expanded=true]:hover:after{background-image:url(../img/angle-arrow-up-primary-hover.png);background-image:url(../img/angle-arrow-up-primary-hover.svg)}.usa-banner-button[aria-expanded=true]:after{background-position-y:1px}}.usa-banner-button[aria-expanded=true]:after{position:absolute;right:1.5rem;top:2.15rem}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true]:after{position:static}}.usa-banner-button[aria-expanded=true] .usa-banner-button-text{display:none}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true] .usa-banner-button-text{display:inline}}.usa-banner-icon{width:3.8rem}.usa-footer .usa-unstyled-list{display:block}.usa-footer .usa-footer-primary-link{color:#212121;display:block;font-weight:700;margin-top:0;padding-bottom:2rem;padding-top:2rem;text-decoration:none}@media screen and (min-width:600px){.usa-footer .usa-footer-primary-link{border-top:none}}.usa-footer .usa-footer-primary-link:hover{text-decoration:underline}.usa-footer .usa-footer-primary-link~li a,.usa-footer .usa-footer-secondary-link{text-decoration:none}.usa-footer-contact_info{display:inline-block}.usa-footer-contact_info a{color:#212121;text-decoration:none}.usa-footer-contact_info:hover{text-decoration:underline}.usa-footer-return-to-top{color:#0071bc;padding-bottom:2rem;padding-top:2rem;text-decoration:underline}.usa-footer-primary-section{background-color:#e4e4e4}.usa-footer-primary-section .usa-footer-primary-content{padding-left:1.5rem;padding-right:2.5rem}@media screen and (min-width:600px){.usa-footer-primary-section .usa-footer-primary-content{padding-left:0;padding-right:0}}.usa-footer-primary-section .usa-footer-primary-content li{margin-left:1rem}@media screen and (min-width:600px){.usa-footer-primary-section .usa-footer-primary-content li{margin-left:0}}@media screen and (min-width:600px){.usa-footer-primary-section .usa-grid-full{padding-left:2.5rem;padding-right:2.5rem}}.usa-footer-medium .usa-footer-contact_info p{margin:0 1rem 0 0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-contact_info p{margin:0 0 0 1rem}}.usa-footer-medium .usa-footer-contact-heading{margin-top:0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-contact-heading{margin-top:.5rem;margin-bottom:.5rem}}.usa-footer-medium .usa-footer-logo{padding:1rem 0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-logo{padding:2rem 0}}.usa-footer-medium .usa-footer-primary-link{padding-bottom:1.5rem;padding-top:1.5rem}.usa-footer-medium .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}@media screen and (min-width:1201px){.usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content{margin-right:5%;width:inherit}}@media screen and (min-width:1201px){.usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content:last-child{margin-right:0}}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-nav ul{-webkit-box-align:center;-ms-flex-align:center;align-items:center}}.usa-footer-slim .usa-footer-nav a{display:block}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-nav .usa-footer-primary-content{margin-right:5%;width:inherit}}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-nav .usa-footer-primary-content:last-child{margin-right:0}}.usa-footer-slim .usa-footer-primary-link{padding-bottom:1.5rem;padding-top:1.5rem}.usa-footer-slim .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-primary-section{padding-bottom:0;padding-top:0}.usa-footer-slim .usa-footer-primary-section .usa-grid-full{-webkit-box-align:center;-ms-flex-align:center;align-items:center}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-contact_info>*{margin:0}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-contact_info{padding-top:1.5rem;padding-bottom:1.5rem;width:100%}}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-contact_info{float:left;display:block;margin-right:2.35765%;width:48.82117%}.usa-footer-slim .usa-footer-contact_info:last-child{margin-right:0}}li.usa-footer-primary-content,ul.usa-footer-primary-content{border-top:1px solid #999}@media screen and (min-width:600px){li.usa-footer-primary-content,ul.usa-footer-primary-content{border:none}}li.usa-footer-primary-content:last-child,ul.usa-footer-primary-content:last-child{border-bottom:1px solid #999}@media screen and (min-width:600px){li.usa-footer-primary-content:last-child,ul.usa-footer-primary-content:last-child{border-bottom:none}}.usa-sign_up-block{padding-bottom:4.5rem;padding-left:1.5rem;padding-right:1.5rem}@media screen and (min-width:600px){.usa-sign_up-block{float:right;padding:0}}.usa-sign_up-block label:first-of-type{margin-top:0}.usa-sign_up-block button{float:none;margin-right:0;margin-top:1.5rem}.usa-sign_up-block input{width:100%}.usa-footer-secondary_section{background-color:#c9c9c9;padding-bottom:2rem;padding-top:2rem}.usa-footer-secondary_section a{color:#212121}@media screen and (min-width:600px){.usa-footer-big-secondary-section{padding-top:2rem;padding-bottom:2rem}}@media screen and (min-width:600px){.usa-footer-contact-links{text-align:right}}.usa-social-links a{text-decoration:none}.usa-footer-big .usa-footer-contact_info{display:block}.usa-footer-big .usa-footer-contact_info p{margin:0 1rem 0 0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-contact_info p{margin:.5rem 0 0 1rem}}@media screen and (min-width:600px){.usa-footer-big .usa-footer-contact-links{padding-top:2rem}}.usa-footer-big .usa-footer-logo{padding:1rem 0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-logo{padding:2rem 0}}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section{padding-bottom:4rem;padding-top:3rem}}.usa-footer-big .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content{padding-left:0;padding-right:0}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li{margin-left:1.5rem}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li{margin-left:0}}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link{margin-left:0}.usa-footer-big ul{padding-bottom:2.4rem}@media screen and (min-width:600px){.usa-footer-big ul{padding-bottom:0}}.usa-footer-big ul:last-child{border-bottom:1px solid #999}@media screen and (min-width:600px){.usa-footer-big ul:last-child{border-bottom:none}}.usa-footer-big ul li:not(.usa-footer-primary-link){line-height:1.3;padding-bottom:.35em;padding-top:.35em}.usa-footer-big ul .usa-footer-primary-link{background-image:url(../img/arrow-down.png);background-image:url(../img/arrow-down.svg);background-position:1.5rem;background-repeat:no-repeat;background-size:1.3rem;margin-left:0;padding-left:3.5rem}@media screen and (min-width:600px){.usa-footer-big ul .usa-footer-primary-link{background:none;margin-bottom:.8rem;padding-bottom:0;padding-left:0}}.usa-footer-big ul .usa-footer-primary-link>*{margin-top:0;margin-bottom:0}.usa-footer-big ul.hidden{padding-bottom:0}.usa-footer-big ul.hidden li{display:none}.usa-footer-big ul.hidden .usa-footer-primary-link{background-image:url(../img/arrow-right.png);background-image:url(../img/arrow-right.svg);cursor:pointer;display:block}@media screen and (min-width:600px){.usa-footer-big ul.hidden .usa-footer-primary-link{background:none;padding-left:0}}.usa-footer-topic{margin:0;padding:2rem 0}@media screen and (min-width:600px){.usa-sign_up-header{margin:0;padding:2rem 0}}.usa-footer-logo-img{max-width:8rem}@media screen and (min-width:600px){.usa-footer-logo-img{float:left}}.usa-footer-big-logo-img{max-width:10rem}.usa-footer-slim-logo-img{float:left;max-width:5rem}.usa-footer-logo-heading{display:block;margin-top:1rem}@media screen and (min-width:600px){.usa-footer-logo-heading{display:inline-block;margin-top:3rem;padding-left:1.5rem}}.usa-footer-big-logo-heading{margin-top:1.5rem}@media screen and (min-width:600px){.usa-footer-big-logo-heading{margin-top:2rem}}.usa-footer-slim-logo-heading{display:inline-block;margin-top:1.5rem;padding-left:1.5rem}.usa-footer-contact-heading{margin-top:0}@media screen and (min-width:600px){.usa-footer-contact-heading{margin-top:1rem}}.usa-link-facebook,.usa-link-rss,.usa-link-twitter,.usa-link-youtube,.usa-social_link{margin:2.5rem 1rem 1.5rem 0;background-position:50%;background-repeat:no-repeat;background-size:auto 3rem;display:inline-block;height:4.4rem;left:-1.6rem;position:relative;text-align:center;width:4.4rem}@media screen and (min-width:600px){.usa-link-facebook,.usa-link-rss,.usa-link-twitter,.usa-link-youtube,.usa-social_link{margin:0 0 0 .5rem;left:1.5rem}}.usa-link-facebook span,.usa-link-rss span,.usa-link-twitter span,.usa-link-youtube span,.usa-social_link span{position:absolute;left:-999em}.usa-link-facebook{background-image:url(../img/social-icons/png/facebook25.png);background-image:url(../img/social-icons/svg/facebook25.svg)}.usa-link-twitter{background-image:url(../img/social-icons/png/twitter16.png);background-image:url(../img/social-icons/svg/twitter16.svg)}.usa-link-youtube{background-image:url(../img/social-icons/png/youtube15.png);background-image:url(../img/social-icons/svg/youtube15.svg)}.usa-link-rss{background-image:url(../img/social-icons/png/rss25.png);background-image:url(../img/social-icons/svg/rss25.svg)}form a{border-bottom:0}form [type=submit]{display:block;margin-bottom:1.5em;margin-top:2.5rem}@media screen and (min-width:600px){form [type=submit]{padding-left:2.7em;padding-right:2.7em;width:auto}}form [name=confirmPassword],form [name=password]{margin-bottom:1.1rem}@media screen and (min-width:600px){.usa-form{max-width:32rem}}.usa-form-note{float:right;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:1.5rem;margin:0 0 1.5rem}.usa-form-note+*{clear:both}fieldset{border:none;margin:0;padding:0}@media screen and (min-width:600px){.usa-form-large{max-width:46rem}}@media screen and (min-width:600px){input.usa-input-tiny{max-width:6rem}}@media screen and (min-width:600px){input.usa-input-medium{max-width:12rem}}@media screen and (min-width:600px){.usa-input-grid{padding-right:5%}}@media screen and (min-width:600px){.usa-input-grid:last-of-type{padding-right:0}}@media screen and (min-width:600px){.usa-input-grid-small{float:left;width:35%}}.usa-input-grid-small input,.usa-input-grid-small select{margin-bottom:3rem}@media screen and (min-width:600px){.usa-input-grid-medium{float:left;width:65%}}.usa-input-grid-medium input,.usa-input-grid-medium select{margin-bottom:3rem}@media screen and (min-width:600px){.usa-input-grid-large{float:left;width:100%}}.usa-input-grid-large input,.usa-input-grid-large select{margin-bottom:3rem}.usa-additional_text{font-weight:400}.usa-checklist{list-style:none;margin-left:0;padding-left:0}.usa-checklist li{display:inline-block;list-style:none;margin-bottom:0;margin-top:0;padding-left:3em;text-indent:-2em}.usa-checklist li:before{content:" ";display:inline-block;height:.8em;margin-right:.2em;width:1.8em}.usa-checklist-checked:before{background-image:url(../img/correct9.png);background-image:url(../img/correct9.svg);background-position:100%;background-repeat:no-repeat;background-size:100%}.usa-graphic_list .usa-graphic_list-row .usa-media_block{margin-bottom:3rem}@media screen and (min-width:600px){.usa-graphic_list .usa-graphic_list-row .usa-media_block{margin-bottom:6rem}}@media screen and (min-width:600px){.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block{margin-bottom:0}}.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block:last-child{margin-bottom:0}.usa-graphic_list .usa-media_block-img{margin-right:3rem}.usa-graphic_list .usa-media_block-body>:first-child{margin-top:0}.usa-header{width:100%;z-index:3}@media screen and (min-width:951px){.usa-header{border-bottom:1px solid #c9c9c9}}.usa-header a{border-bottom:none}@media screen and (min-width:951px){.usa-header .usa-search{float:right;max-width:21.5rem}}.usa-logo{float:left;line-height:4rem;margin-left:1.5rem}@media screen and (min-width:951px){.usa-logo{line-height:7.5rem;margin-left:0}}.usa-logo a{color:#212121;text-decoration:none}.usa-logo br{display:none}@media screen and (min-width:951px){.usa-logo br{display:block}}.usa-logo-text{display:block;font-size:1.5rem;font-style:normal;font-weight:700;margin:0}@media screen and (min-width:951px){.usa-logo-text{display:block;font-size:2.4rem;line-height:1.3}}.usa-menu-btn{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#0071bc;color:#fff;display:inline;float:right;font-size:1.3rem;height:4rem;line-height:4rem;text-align:center;text-decoration:none;text-transform:uppercase;width:5.8rem}.usa-menu-btn:hover{background-color:transparent}@media screen and (min-width:951px){.usa-menu-btn{display:none}}.usa-menu-btn:hover{color:#fff;background-color:#205493}.usa-menu-btn:visited{color:#fff}.usa-overlay{position:fixed;top:0;right:0;bottom:0;left:0;background:#000;opacity:0;transition:all .2s ease-in-out;visibility:hidden;z-index:4}.usa-overlay.is-visible{opacity:.1;visibility:visible}@media screen and (min-width:951px){.usa-header-basic .usa-logo{bottom:0;position:absolute}}@media screen and (min-width:951px){.usa-header-basic .usa-navbar{position:relative;width:18%}}@media screen and (min-width:951px){.usa-header-extended .usa-header{border-bottom:none}}@media screen and (min-width:951px){.usa-header-extended .usa-logo{margin-top:3rem;margin-bottom:3rem}}@media screen and (min-width:951px){.usa-header-extended em{font-size:3.2rem;line-height:1}}@media screen and (min-width:951px){.usa-header-extended .usa-navbar{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:3rem;display:block;height:auto;max-width:1040px}.usa-header-extended .usa-navbar:after{clear:both;content:"";display:block}}@media screen and (min-width:951px){.usa-header-extended .usa-nav{border-top:1px solid #c9c9c9;float:none;padding:0;width:100%}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-inner{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:1.5rem;margin-top:-1px;max-width:1040px;position:relative}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-inner:after,.usa-header-extended .usa-nav-primary:after{clear:both;content:"";display:block}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-primary button[aria-expanded=false],.usa-header-extended .usa-nav-primary button[aria-expanded=true]{background-position:right 1.5rem top 53%}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-link{padding-top:1.8rem;padding-bottom:1.8rem}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-submenu .usa-grid-full{padding-left:1.2rem}}@media screen and (min-width:951px){.usa-header-extended .usa-megamenu{padding-left:3rem}}.usa-hero{padding-top:3rem;padding-bottom:3rem;background-image:url(../img/hero.png);background-position:50%;background-size:cover}.usa-hero .usa-button{color:#fff}.usa-section-dark .usa-hero-link{color:#c64b00}.usa-hero-callout{background-color:#112e51;padding:3rem}@media screen and (min-width:481px){.usa-hero-callout{max-width:30rem}}.usa-hero-callout>:first-child{margin-top:0;margin-bottom:2rem}.usa-hero-callout-alt{color:#fff;display:block}.usa-layout-docs{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media screen and (min-width:1201px){.usa-layout-docs{display:inherit}}.usa-layout-docs .usa-grid>:first-child:not(.usa-width-*){margin-top:0}.usa-layout-docs .usa-grid>:last-child:not(.usa-width-*){margin-bottom:0}.usa-layout-docs-sidenav{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.usa-layout-docs-main_content{margin-bottom:3rem;-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}@media screen and (min-width:1201px){.usa-layout-docs-main_content{margin-bottom:0}}.usa-layout-docs-main_content>:first-child{margin-top:0}.usa-media_block-img{float:left;margin-right:1rem}.usa-media_block-body{overflow:hidden}.usa-navbar{border-bottom:1px solid #999;height:4rem}@media screen and (min-width:951px){.usa-navbar{border-bottom:none;display:inline-block;height:7.8rem}}.usa-nav-link{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}@media screen and (min-width:951px){.usa-nav-link:hover span{border-bottom:.4rem solid #0071bc;padding-bottom:.6rem}}@media screen and (min-width:951px){.usa-nav-link.usa-accordion-button span{margin-right:0;padding-right:1.5rem}}@media screen and (min-width:951px){.usa-nav-container{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:3rem;max-width:1040px}.usa-nav-container:after{clear:both;content:"";display:block}}.usa-nav{position:fixed;top:0;right:0;bottom:0;left:auto;background:#fff;border-left:1px solid #999;border-right:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;padding:2rem;-webkit-transform:translateX(26rem);transform:translateX(26rem);width:26rem;z-index:5}@media screen and (min-width:951px){.usa-nav{padding-top:4.5rem;padding-right:0;padding-bottom:0;border-left:none;display:block;float:right;overflow-y:visible;position:relative;-webkit-transform:translateX(0);transform:translateX(0);width:auto}}.usa-nav.is-visible{-webkit-transform:translateX(0);transform:translateX(0);transition:all .3s ease-in-out}.usa-nav nav{margin-top:6rem;min-height:100%}@media screen and (min-width:951px){.usa-nav nav{margin-top:0}}.usa-nav .usa-current{border-left:4px solid #0071bc;color:#0071bc;font-weight:700;padding-left:1.4rem}@media screen and (min-width:951px){.usa-nav .usa-current{color:#212121}}.usa-nav .usa-button{width:100%}@media screen and (min-width:951px){.usa-nav .usa-search{margin-left:1.5rem;top:4px}}.usa-nav-primary{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin-top:1.5rem;-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.usa-nav-primary>li{margin-bottom:0;background-color:transparent;border-top:1px solid #666;font-size:1.7rem}.usa-nav-primary>li:first-child{border-top:none}.usa-nav-primary a{border:none;color:#212121;display:block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;line-height:1.3;padding:.85rem 1rem .85rem 1.8rem;text-decoration:none}.usa-nav-primary a:hover{background-color:#e4e4e4;color:#0071bc;text-decoration:none}.usa-nav-primary a:focus{outline-offset:0;position:relative;z-index:1}.usa-nav-primary a.usa-current{border-left:.4rem solid #0071bc;color:#0071bc;font-weight:700;padding-left:1.4rem}@media screen and (min-width:951px){.usa-nav-primary{display:inline}}@media screen and (min-width:951px){.usa-nav-primary li{border-top:none}}.usa-nav-primary>li{width:auto}@media screen and (min-width:951px){.usa-nav-primary>li{display:inline-block}}@media screen and (min-width:951px){.usa-nav-primary>li>a{padding:1.3rem 1.5rem 2.2rem;color:#666;font-size:1.5rem;font-weight:700;line-height:1}}@media screen and (min-width:951px){.usa-nav-primary>li>a:hover{background-color:transparent}}@media screen and (min-width:951px){.usa-nav-primary a{padding-top:.75rem;padding-bottom:.75rem}}.usa-nav-primary button{border:0;border-radius:0;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-weight:400;line-height:1.3;padding:.85rem 1.5rem .85rem 1.8rem}.usa-nav-primary button,.usa-nav-primary button:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-primary button{padding:1.3rem 1.5rem 2.2rem;color:#666;font-size:1.5rem;font-weight:700;line-height:1;width:auto}}.usa-nav-primary button:active,.usa-nav-primary button:focus{box-shadow:2px dotted #999}.usa-nav-primary button:hover{background-color:#e4e4e4;color:#0071bc}@media screen and (min-width:951px){.usa-nav-primary button:hover{background-color:transparent}}.usa-nav-primary button[aria-expanded=false]{background-image:url(../img/plus-alt.png);background-image:url(../img/plus-alt.svg);background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=false]{background-image:url(../img/angle-arrow-down.png);background-image:url(../img/angle-arrow-down.svg);background-position:right 1.5rem top 40%}}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=false]:hover{background-image:url(../img/angle-arrow-down-primary.png);background-image:url(../img/angle-arrow-down-primary.svg)}}.usa-nav-primary button[aria-expanded=true]{background-image:url(../img/minus-alt.png);background-image:url(../img/minus-alt.svg);background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=true]{background-color:#112e51;color:#fff;background-image:url(../img/angle-arrow-down-hover.png);background-image:url(../img/angle-arrow-down-hover.svg);background-position:right 1.5rem top 40%}.usa-nav-primary button[aria-expanded=true]:hover{background-color:#112e51}.usa-nav-primary button[aria-expanded=true] span{border-bottom:.4rem solid #0071bc;padding-bottom:.6rem;color:#fff}}@media screen and (min-width:951px){.usa-nav-primary .usa-current,.usa-nav-primary a.usa-current{border-left:0;padding-left:1.5rem}.usa-nav-primary .usa-current:hover span,.usa-nav-primary a.usa-current:hover span{color:#0071bc}.usa-nav-primary .usa-current span,.usa-nav-primary a.usa-current span{border-bottom:.4rem solid #0071bc;padding-bottom:.6rem;color:#212121}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-link:hover span{border-bottom:.7rem solid #0071bc;padding-bottom:.9rem}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-primary .usa-current span,.usa-header-extended .usa-nav-primary button[aria-expanded=true] span{border-bottom:.7rem solid #0071bc;padding-bottom:.9rem}}.usa-nav-secondary{margin-top:1.5rem}@media screen and (min-width:951px){.usa-nav-secondary{margin-top:0;position:absolute;right:3rem;top:-5.7rem}}.usa-nav-secondary .usa-search{margin-top:1.5rem;margin-bottom:0}@media screen and (min-width:951px){.usa-nav-secondary .usa-search{margin-top:-.9rem;margin-bottom:0;margin-left:0;float:left}}.usa-nav-secondary-links{margin-top:2.4rem}@media screen and (min-width:951px){.usa-nav-secondary-links{float:left;margin-top:0}}@media screen and (min-width:951px){.usa-nav-secondary-links li{display:inline;padding-left:.5rem}}@media screen and (min-width:951px){.usa-nav-secondary-links li:not(:last-child):after{color:#c9c9c9;content:"|";padding-left:.5rem}}.usa-nav-secondary-links .usa-header-search-button,.usa-nav-secondary-links a{color:#666;display:inline-block;font-size:1.5rem;text-decoration:none}.usa-nav-secondary-links .usa-header-search-button:hover,.usa-nav-secondary-links a:hover{color:#0071bc;text-decoration:underline}.usa-nav-secondary-links .usa-header-search-button{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;display:none}.usa-nav-secondary-links .usa-header-search-button:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-secondary-links .usa-header-search-button{background-image:url(../img/search-alt.png);background-image:url(../img/search-alt.svg);background-repeat:no-repeat;background-position:0;background-size:2.2rem;display:inline-block;padding-left:2.3rem}}@media screen and (min-width:951px){.usa-nav-secondary-links .usa-header-search-button.is-hidden{display:none}}@media screen and (min-width:951px){.usa-nav-secondary-links a.usa-current{border-left:0;padding-left:0}}.usa-nav-submenu{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin:0;width:100%}.usa-nav-submenu>li{margin-bottom:0}.usa-nav-submenu li{border:none}.usa-nav-submenu a{padding-left:2.8rem;line-height:1.3}.usa-nav-submenu a.usa-current,.usa-nav-submenu a:hover{border:none;padding-left:2.8rem}.usa-nav-submenu .usa-sidenav-sub_list a{padding-left:3.8rem}.usa-nav-submenu .usa-sidenav-sub_list a:focus{outline-offset:0}.usa-nav-submenu .usa-sidenav-sub_list a:hover{padding-left:3.8rem}@media screen and (min-width:951px){.usa-nav-submenu{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;padding-top:.75rem;padding-bottom:.9rem;background-color:#112e51;width:21.5rem;position:absolute}.usa-nav-submenu>li{margin-bottom:0}}.usa-nav-submenu[aria-hidden=true]{display:none}@media screen and (min-width:951px){.usa-nav-submenu a,.usa-nav-submenu a:hover{color:#fff;padding-left:1.5rem}.usa-nav-submenu a:hover{background-color:#112e51;text-decoration:underline}}.usa-nav-submenu li{font-size:1.5rem;margin-bottom:0}.usa-nav-close{border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;margin:-1.2rem -1.5rem 1.5rem auto;float:right;height:4.4rem;text-align:center;width:4.4rem}.usa-nav-close,.usa-nav-close:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-close{display:none}}.usa-nav-close img{width:1.3rem}.usa-nav-close+*{clear:both}.usa-mobile_nav-active{overflow:hidden}@media screen and (min-width:951px){.usa-megamenu{padding-top:3.15rem;padding-bottom:3.15rem;left:-1rem;width:100%}}@media screen and (min-width:951px){.usa-megamenu:before{right:100%}}@media screen and (min-width:951px){.usa-megamenu:after,.usa-megamenu:before{background-color:#112e51;content:"";display:block;height:100%;position:absolute;top:0;width:1000%}.usa-megamenu:after{left:100%}}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav{padding-left:0;padding-top:0;width:100%}}.usa-header-basic-megamenu .usa-nav-inner{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav-inner{display:block;float:right;margin-top:-3.8rem}}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav-submenu .usa-grid-full{margin-left:-1.8rem}}@media screen and (min-width:951px){.usa-megamenu-col{float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-megamenu-col:last-child{margin-right:0}.usa-megamenu-col:nth-child(2n){float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-megamenu-col:nth-child(2n):last-child,.usa-megamenu-col:nth-child(4n){margin-right:0}}.usa-megamenu-col>ul{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-megamenu-col>ul>li{margin-bottom:0}.usa-search{max-width:none;position:relative}.usa-search:after{clear:both;content:"";display:block}.usa-search .usa-search-submit,.usa-search [type=submit]{background-image:url(../img/search.png);background-image:url(../img/search.svg);background-position:50%;background-repeat:no-repeat;border-bottom-left-radius:0;border-top-left-radius:0;height:3.3rem;margin:0;padding:0;width:4.5rem}@media screen and (min-width:481px){.usa-search .usa-search-submit,.usa-search [type=submit]{background-image:none;width:8.5rem}}@media screen and (min-width:481px){.usa-search.usa-search-big .usa-search-input,.usa-search.usa-search-big [type=search]{font-size:1.7rem;height:4.4rem;width:calc(100% - 11.6rem)}.usa-search.usa-search-big .usa-search-submit,.usa-search.usa-search-big [type=submit]{font-size:2rem;height:4.4rem;width:11.6rem}}@media screen and (min-width:481px){.usa-search.usa-search-small .usa-search-input,.usa-search.usa-search-small [type=search]{width:calc(100% - 4.5rem)}.usa-search.usa-search-small .usa-search-submit,.usa-search.usa-search-small [type=submit]{background-image:url(../img/search.png);background-image:url(../img/search.svg);background-position:50%;background-repeat:no-repeat;width:4.5rem}}@media screen and (max-width:950px){.usa-search.usa-search-small.usa-sr-only{left:auto;position:relative}}input[type=search]{box-sizing:border-box;-webkit-appearance:none}.usa-search-input,[type=search]{padding-top:0;padding-bottom:0;border-bottom-right-radius:0;border-right:none;border-top-right-radius:0;box-sizing:border-box;float:left;font-size:1.4rem;height:3.3rem;margin:0;width:calc(100% - 4.5rem)}@media screen and (min-width:481px){.usa-search-input,[type=search]{width:calc(100% - 8.5rem)}}.usa-search-submit-text{position:absolute;left:-999em}@media screen and (min-width:481px){.usa-search-submit-text{position:static}}.usa-section{padding-top:3rem;padding-bottom:3rem}@media screen and (min-width:600px){.usa-section{padding-top:6rem;padding-bottom:6rem}}.usa-section-light{background-color:#e4e4e4}.usa-section-dark{background-color:#112e51;color:#fff}.usa-section-dark h1,.usa-section-dark h2,.usa-section-dark h3,.usa-section-dark h4,.usa-section-dark h5,.usa-section-dark h6{color:#c64b00}.usa-section-dark p{color:#fff}.usa-section-dark a{color:#c9c9c9}.usa-section-dark a:hover{color:#fff}.usa-sidenav-list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-sidenav-list>li{margin-bottom:0;background-color:transparent;border-top:1px solid #666;font-size:1.7rem}.usa-sidenav-list>li:first-child{border-top:none}.usa-sidenav-list a{border:none;color:#212121;display:block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;line-height:1.3;padding:.85rem 1rem .85rem 1.8rem;text-decoration:none}.usa-sidenav-list a:hover{background-color:#e4e4e4;color:#0071bc;text-decoration:none}.usa-sidenav-list a:focus{outline-offset:0;position:relative;z-index:1}.usa-sidenav-list a.usa-current{border-left:.4rem solid #0071bc;color:#0071bc;font-weight:700;padding-left:1.4rem}.usa-sidenav-sub_list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin:0;width:100%}.usa-sidenav-sub_list>li{margin-bottom:0}.usa-sidenav-sub_list li{border:none;font-size:1.5rem}.usa-sidenav-sub_list a{padding-left:2.8rem;line-height:1.3}.usa-sidenav-sub_list a.usa-current,.usa-sidenav-sub_list a:hover{border:none;padding-left:2.8rem}.usa-sidenav-sub_list .usa-sidenav-sub_list a{padding-left:3.8rem}.usa-sidenav-sub_list .usa-sidenav-sub_list a:focus{outline-offset:0}.usa-sidenav-sub_list .usa-sidenav-sub_list a:hover{padding-left:3.8rem}.usa-skipnav{background:transparent;color:#212121;padding:1rem 1.5rem;top:-4.2rem;z-index:2}.usa-skipnav,.usa-skipnav:focus{left:0;position:absolute;transition:all .2s ease-in-out}.usa-skipnav:focus{background:#fff;outline:0;top:0}h1,h2,h3,h4,h5,h6{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-weight:700}article.aggregator-item .field--name-fid a,h3.feed-item-title a{text-decoration:none;color:#0071bc}.region-sidebar-first,.region-sidebar-second,.uswds-middle-section{background-color:#e7f5ff}.view-nsf-blog article.aggregator-item{background-color:#fff;padding:2rem;padding-top:.2rem;margin-bottom:3rem}.region-sidebar-second{float:right;padding:1.25rem}.region-sidebar-second h4{text-transform:uppercase;color:#999;font-weight:400}.usa-accordion,.usa-accordion-bordered,.usa-sidenav-list a,input,p,select.form-select,textarea{color:#666}.usa-nav-primary .usa-current span,.usa-nav-primary .usa-nav-link,.usa-nav-primary a.usa-current span,.usa-nav-primary a.usa-nav-link{color:#3e94cf}.filter-wrapper{display:none}.usa-form-large{max-width:none}form [type=submit]{display:inline-block}textarea{height:auto}label{margin-top:1rem}input,select,textarea{max-width:none}#block-nsf-views-block-news-block-1 ul{margin:0 auto;text-align:center}#block-nsf-views-block-news-block-1 li{display:inline-block;vertical-align:top}img.image-style-news-main-story{max-width:none}.usa-header-basic .usa-logo{top:0;bottom:auto}.usa-header-basic .usa-logo img{max-width:none}.usa-navbar em.usa-logo-text{margin-left:-5000em}
 /*# sourceMappingURL=uswds.min.css.map */
\ No newline at end of file
diff --git a/web/themes/nsf/assets/css/uswds.min.css.map b/web/themes/nsf/assets/css/uswds.min.css.map
index 0beb0ef..5bb3d03 100644
--- a/web/themes/nsf/assets/css/uswds.min.css.map
+++ b/web/themes/nsf/assets/css/uswds.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["stdin"],"names":[],"mappings":"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","file":"uswds.min.css","sourcesContent":["/*! uswds @version */\nhtml {\n  box-sizing: border-box; }\n\n*, *::after, *::before {\n  box-sizing: inherit; }\n\n/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */\n/**\n * 1. Set default font family to sans-serif.\n * 2. Prevent iOS and IE text size adjust after device orientation change,\n *    without disabling user zoom.\n */\nhtml {\n  font-family: sans-serif;\n  /* 1 */\n  -ms-text-size-adjust: 100%;\n  /* 2 */\n  -webkit-text-size-adjust: 100%;\n  /* 2 */ }\n\n/**\n * Remove default margin.\n */\nbody {\n  margin: 0; }\n\n/* HTML5 display definitions\n   ========================================================================== */\n/**\n * Correct `block` display not defined for any HTML5 element in IE 8/9.\n * Correct `block` display not defined for `details` or `summary` in IE 10/11\n * and Firefox.\n * Correct `block` display not defined for `main` in IE 11.\n */\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n  display: block; }\n\n/**\n * 1. Correct `inline-block` display not defined in IE 8/9.\n * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.\n */\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block;\n  /* 1 */\n  vertical-align: baseline;\n  /* 2 */ }\n\n/**\n * Prevent modern browsers from displaying `audio` without controls.\n * Remove excess height in iOS 5 devices.\n */\naudio:not([controls]) {\n  display: none;\n  height: 0; }\n\n/**\n * Address `[hidden]` styling not present in IE 8/9/10.\n * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.\n */\n[hidden],\ntemplate {\n  display: none; }\n\n/* Links\n   ========================================================================== */\n/**\n * Remove the gray background color from active links in IE 10.\n */\na {\n  background-color: transparent; }\n\n/**\n * Improve readability of focused elements when they are also in an\n * active/hover state.\n */\na:active,\na:hover {\n  outline: 0; }\n\n/* Text-level semantics\n   ========================================================================== */\n/**\n * Address styling not present in IE 8/9/10/11, Safari, and Chrome.\n */\nabbr[title] {\n  border-bottom: 1px dotted; }\n\n/**\n * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.\n */\nb,\nstrong {\n  font-weight: bold; }\n\n/**\n * Address styling not present in Safari and Chrome.\n */\ndfn {\n  font-style: italic; }\n\n/**\n * Address variable `h1` font-size and margin within `section` and `article`\n * contexts in Firefox 4+, Safari, and Chrome.\n */\nh1 {\n  font-size: 2em;\n  margin: 0.67em 0; }\n\n/**\n * Address styling not present in IE 8/9.\n */\nmark {\n  background: #ff0;\n  color: #000; }\n\n/**\n * Address inconsistent and variable font size in all browsers.\n */\nsmall {\n  font-size: 80%; }\n\n/**\n * Prevent `sub` and `sup` affecting `line-height` in all browsers.\n */\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline; }\n\nsup {\n  top: -0.5em; }\n\nsub {\n  bottom: -0.25em; }\n\n/* Embedded content\n   ========================================================================== */\n/**\n * Remove border when inside `a` element in IE 8/9/10.\n */\nimg {\n  border: 0; }\n\n/**\n * Correct overflow not hidden in IE 9/10/11.\n */\nsvg:not(:root) {\n  overflow: hidden; }\n\n/* Grouping content\n   ========================================================================== */\n/**\n * Address margin not present in IE 8/9 and Safari.\n */\nfigure {\n  margin: 1em 40px; }\n\n/**\n * Address differences between Firefox and other browsers.\n */\nhr {\n  box-sizing: content-box;\n  height: 0; }\n\n/**\n * Contain overflow in all browsers.\n */\npre {\n  overflow: auto; }\n\n/**\n * Address odd `em`-unit font size rendering in all browsers.\n */\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em; }\n\n/* Forms\n   ========================================================================== */\n/**\n * Known limitation: by default, Chrome and Safari on OS X allow very limited\n * styling of `select`, unless a `border` property is set.\n */\n/**\n * 1. Correct color not being inherited.\n *    Known issue: affects color of disabled elements.\n * 2. Correct font properties not being inherited.\n * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.\n */\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  color: inherit;\n  /* 1 */\n  font: inherit;\n  /* 2 */\n  margin: 0;\n  /* 3 */ }\n\n/**\n * Address `overflow` set to `hidden` in IE 8/9/10/11.\n */\nbutton {\n  overflow: visible; }\n\n/**\n * Address inconsistent `text-transform` inheritance for `button` and `select`.\n * All other form control elements do not inherit `text-transform` values.\n * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.\n * Correct `select` style inheritance in Firefox.\n */\nbutton,\nselect {\n  text-transform: none; }\n\n/**\n * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`\n *    and `video` controls.\n * 2. Correct inability to style clickable `input` types in iOS.\n * 3. Improve usability and consistency of cursor style between image-type\n *    `input` and others.\n */\nbutton,\nhtml input[type=\"button\"],\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button;\n  /* 2 */\n  cursor: pointer;\n  /* 3 */ }\n\n/**\n * Re-set default cursor for disabled elements.\n */\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default; }\n\n/**\n * Remove inner padding and border in Firefox 4+.\n */\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  border: 0;\n  padding: 0; }\n\n/**\n * Address Firefox 4+ setting `line-height` on `input` using `!important` in\n * the UA stylesheet.\n */\ninput {\n  line-height: normal; }\n\n/**\n * It's recommended that you don't attempt to style these elements.\n * Firefox's implementation doesn't respect box-sizing, padding, or width.\n *\n * 1. Address box sizing set to `content-box` in IE 8/9/10.\n * 2. Remove excess padding in IE 8/9/10.\n */\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  box-sizing: border-box;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Fix the cursor style for Chrome's increment/decrement buttons. For certain\n * `font-size` values of the `input`, it causes the cursor style of the\n * decrement button to change from `default` to `text`.\n */\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto; }\n\n/**\n * 1. Address `appearance` set to `searchfield` in Safari and Chrome.\n * 2. Address `box-sizing` set to `border-box` in Safari and Chrome.\n */\ninput[type=\"search\"] {\n  -webkit-appearance: textfield;\n  /* 1 */\n  box-sizing: content-box;\n  /* 2 */ }\n\n/**\n * Remove inner padding and search cancel button in Safari and Chrome on OS X.\n * Safari (but not Chrome) clips the cancel button when the search input has\n * padding (and `textfield` appearance).\n */\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none; }\n\n/**\n * Define consistent border, margin, and padding.\n */\nfieldset {\n  border: 1px solid #c0c0c0;\n  margin: 0 2px;\n  padding: 0.35em 0.625em 0.75em; }\n\n/**\n * 1. Correct `color` not being inherited in IE 8/9/10/11.\n * 2. Remove padding so people aren't caught out if they zero out fieldsets.\n */\nlegend {\n  border: 0;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Remove default vertical scrollbar in IE 8/9/10/11.\n */\ntextarea {\n  overflow: auto; }\n\n/**\n * Don't inherit the `font-weight` (applied by a rule above).\n * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.\n */\noptgroup {\n  font-weight: bold; }\n\n/* Tables\n   ========================================================================== */\n/**\n * Remove most spacing between table cells.\n */\ntable {\n  border-collapse: collapse;\n  border-spacing: 0; }\n\ntd,\nth {\n  padding: 0; }\n\n/* stylelint-disable at-rule-empty-line-before */\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/sourcesanspro-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-light-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/sourcesanspro-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-bold-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/merriweather-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-light-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/merriweather-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-bold-webfont.ttf\") format(\"truetype\"); }\n\n/* stylelint-enable */\n.usa-grid,\n.usa-grid-full {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  max-width: 1040px; }\n  .usa-grid::after,\n  .usa-grid-full::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n\n.usa-grid {\n  padding-right: 1.5rem;\n  padding-left: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-grid {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-grid-full {\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 31.76157%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 65.88078%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-width-one-fourth:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-width-one-fourth:nth-child(4n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 74.41059%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 14.70196%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 14.70196%; }\n      .usa-width-one-sixth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-sixth:nth-child(6n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 82.94039%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 6.17215%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 6.17215%; }\n      .usa-width-one-twelfth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(12n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 40.29137%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 57.35098%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n.usa-end-row {\n  margin-right: 0; }\n\n.usa-offset-one-twelfth {\n  margin-left: 8.5298%; }\n\n.usa-offset-one-sixth {\n  margin-left: 17.05961%; }\n\n.usa-offset-one-fourth {\n  margin-left: 25.58941%; }\n\n.usa-offset-one-third {\n  margin-left: 34.11922%; }\n\n.usa-offset-five-twelfths {\n  margin-left: 42.64902%; }\n\n.usa-offset-one-half {\n  margin-left: 51.17883%; }\n\n.usa-offset-seven-twelfths {\n  margin-left: 59.70863%; }\n\n.usa-offset-two-thirds {\n  margin-left: 68.23843%; }\n\n.usa-offset-three-fourths {\n  margin-left: 76.76824%; }\n\n.usa-offset-five-sixths {\n  margin-left: 85.29804%; }\n\n.usa-offset-eleven-twelfths {\n  margin-left: 93.82785%; }\n\n.usa-sr-only {\n  position: absolute;\n  left: -999em; }\n\nhtml {\n  box-sizing: border-box; }\n\n*,\n*::before,\n*::after {\n  box-sizing: inherit; }\n\nbody {\n  background-color: #ffffff;\n  overflow-x: hidden; }\n\n.lt-ie9 * {\n  filter: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n[hidden] {\n  display: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n*:focus,\n.usa-focus {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n/* stylelint-disable selector-no-qualifying-type */\n.usa-button,\n.usa-button-primary,\n.usa-button:visited,\n.usa-button-primary:visited,\nbutton,\n[type=button],\n[type=submit],\n[type=reset],\n[type=image] {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased;\n  margin-top: 0.5em;\n  margin-right: 0.5em;\n  margin-bottom: 0.5em;\n  appearance: none;\n  background-color: #313b52;\n  border: 0;\n  border-radius: 5px;\n  color: #ffffff;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.7rem;\n  font-weight: 700;\n  line-height: 1;\n  padding: 1rem 2rem;\n  text-align: center;\n  text-decoration: none;\n  width: 100%; }\n  @media screen and (min-width: 481px) {\n    .usa-button,\n    .usa-button-primary,\n    .usa-button:visited,\n    .usa-button-primary:visited,\n    button,\n    [type=button],\n    [type=submit],\n    [type=reset],\n    [type=image] {\n      width: auto; } }\n  .usa-button:hover, .usa-button.usa-button-hover,\n  .usa-button-primary:hover,\n  .usa-button-primary.usa-button-hover,\n  .usa-button:visited:hover,\n  .usa-button:visited.usa-button-hover,\n  .usa-button-primary:visited:hover,\n  .usa-button-primary:visited.usa-button-hover,\n  button:hover,\n  button.usa-button-hover,\n  [type=button]:hover,\n  [type=button].usa-button-hover,\n  [type=submit]:hover,\n  [type=submit].usa-button-hover,\n  [type=reset]:hover,\n  [type=reset].usa-button-hover,\n  [type=image]:hover,\n  [type=image].usa-button-hover {\n    background-color: #1b2847;\n    border-bottom: 0;\n    color: #ffffff;\n    text-decoration: none; }\n  .usa-button:active, .usa-button.usa-button-active,\n  .usa-button-primary:active,\n  .usa-button-primary.usa-button-active,\n  .usa-button:visited:active,\n  .usa-button:visited.usa-button-active,\n  .usa-button-primary:visited:active,\n  .usa-button-primary:visited.usa-button-active,\n  button:active,\n  button.usa-button-active,\n  [type=button]:active,\n  [type=button].usa-button-active,\n  [type=submit]:active,\n  [type=submit].usa-button-active,\n  [type=reset]:active,\n  [type=reset].usa-button-active,\n  [type=image]:active,\n  [type=image].usa-button-active {\n    background-color: #03143d; }\n  .usa-button.usa-button-primary-alt,\n  .usa-button-primary.usa-button-primary-alt,\n  .usa-button:visited.usa-button-primary-alt,\n  .usa-button-primary:visited.usa-button-primary-alt,\n  button.usa-button-primary-alt,\n  [type=button].usa-button-primary-alt,\n  [type=submit].usa-button-primary-alt,\n  [type=reset].usa-button-primary-alt,\n  [type=image].usa-button-primary-alt {\n    background-color: #c64b00;\n    color: #ffffff; }\n    .usa-button.usa-button-primary-alt:hover, .usa-button.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary.usa-button-primary-alt:hover,\n    .usa-button-primary.usa-button-primary-alt.usa-button-hover,\n    .usa-button:visited.usa-button-primary-alt:hover,\n    .usa-button:visited.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary:visited.usa-button-primary-alt:hover,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-hover,\n    button.usa-button-primary-alt:hover,\n    button.usa-button-primary-alt.usa-button-hover,\n    [type=button].usa-button-primary-alt:hover,\n    [type=button].usa-button-primary-alt.usa-button-hover,\n    [type=submit].usa-button-primary-alt:hover,\n    [type=submit].usa-button-primary-alt.usa-button-hover,\n    [type=reset].usa-button-primary-alt:hover,\n    [type=reset].usa-button-primary-alt.usa-button-hover,\n    [type=image].usa-button-primary-alt:hover,\n    [type=image].usa-button-primary-alt.usa-button-hover {\n      background-color: #046b99; }\n    .usa-button.usa-button-primary-alt:active, .usa-button.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary.usa-button-primary-alt:active,\n    .usa-button-primary.usa-button-primary-alt.usa-button-active,\n    .usa-button:visited.usa-button-primary-alt:active,\n    .usa-button:visited.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary:visited.usa-button-primary-alt:active,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-active,\n    button.usa-button-primary-alt:active,\n    button.usa-button-primary-alt.usa-button-active,\n    [type=button].usa-button-primary-alt:active,\n    [type=button].usa-button-primary-alt.usa-button-active,\n    [type=submit].usa-button-primary-alt:active,\n    [type=submit].usa-button-primary-alt.usa-button-active,\n    [type=reset].usa-button-primary-alt:active,\n    [type=reset].usa-button-primary-alt.usa-button-active,\n    [type=image].usa-button-primary-alt:active,\n    [type=image].usa-button-primary-alt.usa-button-active {\n      background-color: #00a6d2;\n      color: #ffffff; }\n  .usa-button.usa-button-secondary,\n  .usa-button-primary.usa-button-secondary,\n  .usa-button:visited.usa-button-secondary,\n  .usa-button-primary:visited.usa-button-secondary,\n  button.usa-button-secondary,\n  [type=button].usa-button-secondary,\n  [type=submit].usa-button-secondary,\n  [type=reset].usa-button-secondary,\n  [type=image].usa-button-secondary {\n    background-color: #ffffff;\n    box-shadow: inset 0 0 0 2px #313b52;\n    color: #313b52; }\n    .usa-button.usa-button-secondary:hover, .usa-button.usa-button-secondary.usa-button-hover,\n    .usa-button-primary.usa-button-secondary:hover,\n    .usa-button-primary.usa-button-secondary.usa-button-hover,\n    .usa-button:visited.usa-button-secondary:hover,\n    .usa-button:visited.usa-button-secondary.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary:hover,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-hover,\n    button.usa-button-secondary:hover,\n    button.usa-button-secondary.usa-button-hover,\n    [type=button].usa-button-secondary:hover,\n    [type=button].usa-button-secondary.usa-button-hover,\n    [type=submit].usa-button-secondary:hover,\n    [type=submit].usa-button-secondary.usa-button-hover,\n    [type=reset].usa-button-secondary:hover,\n    [type=reset].usa-button-secondary.usa-button-hover,\n    [type=image].usa-button-secondary:hover,\n    [type=image].usa-button-secondary.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #1b2847;\n      color: #1b2847; }\n    .usa-button.usa-button-secondary:active, .usa-button.usa-button-secondary.usa-button-active,\n    .usa-button-primary.usa-button-secondary:active,\n    .usa-button-primary.usa-button-secondary.usa-button-active,\n    .usa-button:visited.usa-button-secondary:active,\n    .usa-button:visited.usa-button-secondary.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary:active,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-active,\n    button.usa-button-secondary:active,\n    button.usa-button-secondary.usa-button-active,\n    [type=button].usa-button-secondary:active,\n    [type=button].usa-button-secondary.usa-button-active,\n    [type=submit].usa-button-secondary:active,\n    [type=submit].usa-button-secondary.usa-button-active,\n    [type=reset].usa-button-secondary:active,\n    [type=reset].usa-button-secondary.usa-button-active,\n    [type=image].usa-button-secondary:active,\n    [type=image].usa-button-secondary.usa-button-active {\n      box-shadow: inset 0 0 0 2px #03143d;\n      color: #03143d; }\n  .usa-button.usa-button-secondary-inverse, .usa-button.usa-button-outline-inverse,\n  .usa-button-primary.usa-button-secondary-inverse,\n  .usa-button-primary.usa-button-outline-inverse,\n  .usa-button:visited.usa-button-secondary-inverse,\n  .usa-button:visited.usa-button-outline-inverse,\n  .usa-button-primary:visited.usa-button-secondary-inverse,\n  .usa-button-primary:visited.usa-button-outline-inverse,\n  button.usa-button-secondary-inverse,\n  button.usa-button-outline-inverse,\n  [type=button].usa-button-secondary-inverse,\n  [type=button].usa-button-outline-inverse,\n  [type=submit].usa-button-secondary-inverse,\n  [type=submit].usa-button-outline-inverse,\n  [type=reset].usa-button-secondary-inverse,\n  [type=reset].usa-button-outline-inverse,\n  [type=image].usa-button-secondary-inverse,\n  [type=image].usa-button-outline-inverse {\n    background: transparent;\n    box-shadow: inset 0 0 0 2px #ffffff;\n    color: #ffffff; }\n    .usa-button.usa-button-secondary-inverse:hover, .usa-button.usa-button-secondary-inverse.usa-button-hover, .usa-button.usa-button-outline-inverse:hover, .usa-button.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-secondary-inverse:hover,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-outline-inverse:hover,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-secondary-inverse:hover,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-outline-inverse:hover,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse:hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-outline-inverse:hover,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,\n    button.usa-button-secondary-inverse:hover,\n    button.usa-button-secondary-inverse.usa-button-hover,\n    button.usa-button-outline-inverse:hover,\n    button.usa-button-outline-inverse.usa-button-hover,\n    [type=button].usa-button-secondary-inverse:hover,\n    [type=button].usa-button-secondary-inverse.usa-button-hover,\n    [type=button].usa-button-outline-inverse:hover,\n    [type=button].usa-button-outline-inverse.usa-button-hover,\n    [type=submit].usa-button-secondary-inverse:hover,\n    [type=submit].usa-button-secondary-inverse.usa-button-hover,\n    [type=submit].usa-button-outline-inverse:hover,\n    [type=submit].usa-button-outline-inverse.usa-button-hover,\n    [type=reset].usa-button-secondary-inverse:hover,\n    [type=reset].usa-button-secondary-inverse.usa-button-hover,\n    [type=reset].usa-button-outline-inverse:hover,\n    [type=reset].usa-button-outline-inverse.usa-button-hover,\n    [type=image].usa-button-secondary-inverse:hover,\n    [type=image].usa-button-secondary-inverse.usa-button-hover,\n    [type=image].usa-button-outline-inverse:hover,\n    [type=image].usa-button-outline-inverse.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #c9c9c9;\n      color: #c9c9c9; }\n    .usa-button.usa-button-secondary-inverse:active, .usa-button.usa-button-secondary-inverse.usa-button-active, .usa-button.usa-button-outline-inverse:active, .usa-button.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary.usa-button-secondary-inverse:active,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary.usa-button-outline-inverse:active,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-active,\n    .usa-button:visited.usa-button-secondary-inverse:active,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button:visited.usa-button-outline-inverse:active,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary-inverse:active,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-outline-inverse:active,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,\n    button.usa-button-secondary-inverse:active,\n    button.usa-button-secondary-inverse.usa-button-active,\n    button.usa-button-outline-inverse:active,\n    button.usa-button-outline-inverse.usa-button-active,\n    [type=button].usa-button-secondary-inverse:active,\n    [type=button].usa-button-secondary-inverse.usa-button-active,\n    [type=button].usa-button-outline-inverse:active,\n    [type=button].usa-button-outline-inverse.usa-button-active,\n    [type=submit].usa-button-secondary-inverse:active,\n    [type=submit].usa-button-secondary-inverse.usa-button-active,\n    [type=submit].usa-button-outline-inverse:active,\n    [type=submit].usa-button-outline-inverse.usa-button-active,\n    [type=reset].usa-button-secondary-inverse:active,\n    [type=reset].usa-button-secondary-inverse.usa-button-active,\n    [type=reset].usa-button-outline-inverse:active,\n    [type=reset].usa-button-outline-inverse.usa-button-active,\n    [type=image].usa-button-secondary-inverse:active,\n    [type=image].usa-button-secondary-inverse.usa-button-active,\n    [type=image].usa-button-outline-inverse:active,\n    [type=image].usa-button-outline-inverse.usa-button-active {\n      box-shadow: inset 0 0 0 2px #999999;\n      color: #c9c9c9; }\n  .usa-button.usa-button-gray,\n  .usa-button-primary.usa-button-gray,\n  .usa-button:visited.usa-button-gray,\n  .usa-button-primary:visited.usa-button-gray,\n  button.usa-button-gray,\n  [type=button].usa-button-gray,\n  [type=submit].usa-button-gray,\n  [type=reset].usa-button-gray,\n  [type=image].usa-button-gray {\n    background-color: #666666; }\n    .usa-button.usa-button-gray:hover, .usa-button.usa-button-gray.usa-button-hover,\n    .usa-button-primary.usa-button-gray:hover,\n    .usa-button-primary.usa-button-gray.usa-button-hover,\n    .usa-button:visited.usa-button-gray:hover,\n    .usa-button:visited.usa-button-gray.usa-button-hover,\n    .usa-button-primary:visited.usa-button-gray:hover,\n    .usa-button-primary:visited.usa-button-gray.usa-button-hover,\n    button.usa-button-gray:hover,\n    button.usa-button-gray.usa-button-hover,\n    [type=button].usa-button-gray:hover,\n    [type=button].usa-button-gray.usa-button-hover,\n    [type=submit].usa-button-gray:hover,\n    [type=submit].usa-button-gray.usa-button-hover,\n    [type=reset].usa-button-gray:hover,\n    [type=reset].usa-button-gray.usa-button-hover,\n    [type=image].usa-button-gray:hover,\n    [type=image].usa-button-gray.usa-button-hover {\n      background-color: #333333; }\n    .usa-button.usa-button-gray:active, .usa-button.usa-button-gray.usa-button-active,\n    .usa-button-primary.usa-button-gray:active,\n    .usa-button-primary.usa-button-gray.usa-button-active,\n    .usa-button:visited.usa-button-gray:active,\n    .usa-button:visited.usa-button-gray.usa-button-active,\n    .usa-button-primary:visited.usa-button-gray:active,\n    .usa-button-primary:visited.usa-button-gray.usa-button-active,\n    button.usa-button-gray:active,\n    button.usa-button-gray.usa-button-active,\n    [type=button].usa-button-gray:active,\n    [type=button].usa-button-gray.usa-button-active,\n    [type=submit].usa-button-gray:active,\n    [type=submit].usa-button-gray.usa-button-active,\n    [type=reset].usa-button-gray:active,\n    [type=reset].usa-button-gray.usa-button-active,\n    [type=image].usa-button-gray:active,\n    [type=image].usa-button-gray.usa-button-active {\n      background-color: #ffffff; }\n  .usa-button.usa-button-red,\n  .usa-button-primary.usa-button-red,\n  .usa-button:visited.usa-button-red,\n  .usa-button-primary:visited.usa-button-red,\n  button.usa-button-red,\n  [type=button].usa-button-red,\n  [type=submit].usa-button-red,\n  [type=reset].usa-button-red,\n  [type=image].usa-button-red {\n    background-color: #005495; }\n    .usa-button.usa-button-red:hover, .usa-button.usa-button-red.usa-button-hover,\n    .usa-button-primary.usa-button-red:hover,\n    .usa-button-primary.usa-button-red.usa-button-hover,\n    .usa-button:visited.usa-button-red:hover,\n    .usa-button:visited.usa-button-red.usa-button-hover,\n    .usa-button-primary:visited.usa-button-red:hover,\n    .usa-button-primary:visited.usa-button-red.usa-button-hover,\n    button.usa-button-red:hover,\n    button.usa-button-red.usa-button-hover,\n    [type=button].usa-button-red:hover,\n    [type=button].usa-button-red.usa-button-hover,\n    [type=submit].usa-button-red:hover,\n    [type=submit].usa-button-red.usa-button-hover,\n    [type=reset].usa-button-red:hover,\n    [type=reset].usa-button-red.usa-button-hover,\n    [type=image].usa-button-red:hover,\n    [type=image].usa-button-red.usa-button-hover {\n      background-color: #981b1e; }\n    .usa-button.usa-button-red:active, .usa-button.usa-button-red.usa-button-active,\n    .usa-button-primary.usa-button-red:active,\n    .usa-button-primary.usa-button-red.usa-button-active,\n    .usa-button:visited.usa-button-red:active,\n    .usa-button:visited.usa-button-red.usa-button-active,\n    .usa-button-primary:visited.usa-button-red:active,\n    .usa-button-primary:visited.usa-button-red.usa-button-active,\n    button.usa-button-red:active,\n    button.usa-button-red.usa-button-active,\n    [type=button].usa-button-red:active,\n    [type=button].usa-button-red.usa-button-active,\n    [type=submit].usa-button-red:active,\n    [type=submit].usa-button-red.usa-button-active,\n    [type=reset].usa-button-red:active,\n    [type=reset].usa-button-red.usa-button-active,\n    [type=image].usa-button-red:active,\n    [type=image].usa-button-red.usa-button-active {\n      background-color: #cd2026; }\n  .usa-button.usa-button-big,\n  .usa-button-primary.usa-button-big,\n  .usa-button:visited.usa-button-big,\n  .usa-button-primary:visited.usa-button-big,\n  button.usa-button-big,\n  [type=button].usa-button-big,\n  [type=submit].usa-button-big,\n  [type=reset].usa-button-big,\n  [type=image].usa-button-big {\n    border-radius: 8px;\n    font-size: 2.4rem;\n    padding: 1.5rem 3rem; }\n  .usa-button:disabled,\n  .usa-button-primary:disabled,\n  .usa-button:visited:disabled,\n  .usa-button-primary:visited:disabled,\n  button:disabled,\n  [type=button]:disabled,\n  [type=submit]:disabled,\n  [type=reset]:disabled,\n  [type=image]:disabled {\n    background-color: #c9c9c9;\n    pointer-events: none; }\n    .usa-button:disabled:hover, .usa-button:disabled.usa-button-hover, .usa-button:disabled:active, .usa-button:disabled.usa-button-active, .usa-button:disabled:focus, .usa-button:disabled.usa-focus,\n    .usa-button-primary:disabled:hover,\n    .usa-button-primary:disabled.usa-button-hover,\n    .usa-button-primary:disabled:active,\n    .usa-button-primary:disabled.usa-button-active,\n    .usa-button-primary:disabled:focus,\n    .usa-button-primary:disabled.usa-focus,\n    .usa-button:visited:disabled:hover,\n    .usa-button:visited:disabled.usa-button-hover,\n    .usa-button:visited:disabled:active,\n    .usa-button:visited:disabled.usa-button-active,\n    .usa-button:visited:disabled:focus,\n    .usa-button:visited:disabled.usa-focus,\n    .usa-button-primary:visited:disabled:hover,\n    .usa-button-primary:visited:disabled.usa-button-hover,\n    .usa-button-primary:visited:disabled:active,\n    .usa-button-primary:visited:disabled.usa-button-active,\n    .usa-button-primary:visited:disabled:focus,\n    .usa-button-primary:visited:disabled.usa-focus,\n    button:disabled:hover,\n    button:disabled.usa-button-hover,\n    button:disabled:active,\n    button:disabled.usa-button-active,\n    button:disabled:focus,\n    button:disabled.usa-focus,\n    [type=button]:disabled:hover,\n    [type=button]:disabled.usa-button-hover,\n    [type=button]:disabled:active,\n    [type=button]:disabled.usa-button-active,\n    [type=button]:disabled:focus,\n    [type=button]:disabled.usa-focus,\n    [type=submit]:disabled:hover,\n    [type=submit]:disabled.usa-button-hover,\n    [type=submit]:disabled:active,\n    [type=submit]:disabled.usa-button-active,\n    [type=submit]:disabled:focus,\n    [type=submit]:disabled.usa-focus,\n    [type=reset]:disabled:hover,\n    [type=reset]:disabled.usa-button-hover,\n    [type=reset]:disabled:active,\n    [type=reset]:disabled.usa-button-active,\n    [type=reset]:disabled:focus,\n    [type=reset]:disabled.usa-focus,\n    [type=image]:disabled:hover,\n    [type=image]:disabled.usa-button-hover,\n    [type=image]:disabled:active,\n    [type=image]:disabled.usa-button-active,\n    [type=image]:disabled:focus,\n    [type=image]:disabled.usa-focus {\n      background-color: #c9c9c9;\n      border: 0;\n      box-shadow: none; }\n\n/* stylelint-disable */\n.usa-button-disabled {\n  background-color: #c9c9c9;\n  pointer-events: none; }\n  .usa-button-disabled:hover, .usa-button-disabled.usa-button-hover, .usa-button-disabled:active, .usa-button-disabled.usa-button-active, .usa-button-disabled:focus, .usa-button-disabled.usa-focus {\n    background-color: #c9c9c9;\n    border: 0;\n    box-shadow: none; }\n\n.usa-button-secondary-disabled,\n.usa-button-secondary-inverse-disabled,\n.usa-button-secondary:disabled,\n.usa-button-secondary-inverse:disabled,\n.usa-button-outline-inverse:disabled {\n  box-shadow: inset 0 0 0 2px #c9c9c9;\n  pointer-events: none;\n  color: #c9c9c9; }\n  .usa-button-secondary-disabled:hover, .usa-button-secondary-disabled.usa-button-hover, .usa-button-secondary-disabled:active, .usa-button-secondary-disabled.usa-button-active, .usa-button-secondary-disabled:focus, .usa-button-secondary-disabled.usa-focus,\n  .usa-button-secondary-inverse-disabled:hover,\n  .usa-button-secondary-inverse-disabled.usa-button-hover,\n  .usa-button-secondary-inverse-disabled:active,\n  .usa-button-secondary-inverse-disabled.usa-button-active,\n  .usa-button-secondary-inverse-disabled:focus,\n  .usa-button-secondary-inverse-disabled.usa-focus,\n  .usa-button-secondary:disabled:hover,\n  .usa-button-secondary:disabled.usa-button-hover,\n  .usa-button-secondary:disabled:active,\n  .usa-button-secondary:disabled.usa-button-active,\n  .usa-button-secondary:disabled:focus,\n  .usa-button-secondary:disabled.usa-focus,\n  .usa-button-secondary-inverse:disabled:hover,\n  .usa-button-secondary-inverse:disabled.usa-button-hover,\n  .usa-button-secondary-inverse:disabled:active,\n  .usa-button-secondary-inverse:disabled.usa-button-active,\n  .usa-button-secondary-inverse:disabled:focus,\n  .usa-button-secondary-inverse:disabled.usa-focus,\n  .usa-button-outline-inverse:disabled:hover,\n  .usa-button-outline-inverse:disabled.usa-button-hover,\n  .usa-button-outline-inverse:disabled:active,\n  .usa-button-outline-inverse:disabled.usa-button-active,\n  .usa-button-outline-inverse:disabled:focus,\n  .usa-button-outline-inverse:disabled.usa-focus {\n    background-color: #ffffff;\n    border: 0; }\n\nhtml .usa-button-secondary-disabled,\n.usa-button-secondary:disabled {\n  background-color: #ffffff; }\n\nhtml .usa-button-secondary-inverse-disabled,\n.usa-button-secondary-inverse:disabled {\n  background-color: transparent;\n  color: #666666;\n  box-shadow: inset 0 0 0 2px #666666; }\n\n.usa-button-unstyled {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto; }\n  .usa-button-unstyled:hover {\n    background-color: transparent; }\n\n.usa-embed-container iframe,\n.usa-embed-container object,\n.usa-embed-container embed {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 100%;\n  height: 100%; }\n\n.usa-embed-container {\n  padding-bottom: 56.25%;\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  max-width: 100%; }\n\nimg {\n  max-width: 100%; }\n\n.media_link {\n  display: inline-block;\n  line-height: 0; }\n\n/* stylelint-disable selector-no-qualifying-type */\ninput,\ntextarea,\nselect {\n  appearance: none;\n  border: 0.1rem solid #666666;\n  border-radius: 0;\n  box-sizing: border-box;\n  color: #ffffff;\n  display: block;\n  font-size: 1.7rem;\n  height: 4.4rem;\n  line-height: 1.3;\n  margin: 0.2em 0;\n  max-width: 46rem;\n  padding: 1rem 0.7em;\n  width: 100%; }\n  input.usa-input-success,\n  textarea.usa-input-success,\n  select.usa-input-success {\n    border: 3px solid #4aa564; }\n\n/* stylelint-enable */\n.usa-input-error {\n  border-left: 4px solid #981b1e;\n  margin-top: 3rem;\n  padding-bottom: 0.8rem;\n  padding-left: 1.5rem;\n  padding-top: 0.8rem;\n  position: relative;\n  right: 1.9rem; }\n  .usa-input-error input,\n  .usa-input-error textarea,\n  .usa-input-error select {\n    border: 3px solid #981b1e;\n    width: calc(100% + 1.9rem); }\n  .usa-input-error label {\n    margin-top: 0; }\n  .usa-input-error .usa-input-inline {\n    border: 0.1rem solid #666666;\n    width: inherit; }\n  .usa-input-error .usa-input-inline-error {\n    border: 3px solid #981b1e; }\n\n.usa-input-error-label {\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700; }\n\n.usa-input-error-message {\n  color: #981b1e;\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700;\n  padding-bottom: 3px;\n  padding-top: 3px; }\n\n.usa-input-required:after {\n  color: #cd2026;\n  content: ' (*required)'; }\n\n.usa-input-optional:after {\n  color: #757575;\n  content: ' (optional)'; }\n\nlabel {\n  display: block;\n  margin-top: 3rem;\n  max-width: 46rem; }\n\ntextarea {\n  height: 16rem; }\n\nselect {\n  -moz-appearance: none;\n  -webkit-appearance: none;\n  appearance: none;\n  background-color: #ffffff;\n  background-image: url(\"../img/arrow-both.png\");\n  background-image: url(\"../img/arrow-both.svg\");\n  background-position: right 1.3rem center;\n  background-repeat: no-repeat;\n  background-size: 1rem;\n  padding-right: 3rem; }\n  select::-ms-expand {\n    display: none; }\n  select:-webkit-autofill {\n    appearance: menulist; }\n  select:-moz-focusring {\n    color: transparent;\n    text-shadow: 0 0 0 #000000; }\n\noption:first-child {\n  font-weight: 700; }\n\nlegend {\n  font-size: 3rem;\n  font-weight: 700; }\n\n.usa-fieldset-inputs label {\n  margin-top: 0; }\n\n.usa-form-hint {\n  color: #757575;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0; }\n\n[type=checkbox],\n[type=radio] {\n  position: absolute;\n  left: -999em; }\n  .lt-ie9 [type=checkbox], .lt-ie9\n  [type=radio] {\n    border: 0;\n    float: left;\n    margin: 0.4em 0.4em 0 0;\n    position: static;\n    width: auto; }\n\n[type=checkbox] + label,\n[type=radio] + label {\n  cursor: pointer;\n  font-weight: 400;\n  margin-bottom: 0.65em; }\n\n[type=checkbox] + label::before,\n[type=radio] + label::before {\n  background: #ffffff;\n  border-radius: 2px;\n  box-shadow: 0 0 0 1px #757575;\n  content: '\\a0';\n  display: inline-block;\n  height: 2rem;\n  line-height: 2rem;\n  margin-right: 0.6em;\n  text-indent: 0.15em;\n  vertical-align: middle\\0;\n  width: 2rem; }\n\n[type=radio] + label::before {\n  border-radius: 100%;\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 3px #757575;\n  height: 1.4rem;\n  line-height: 1.4rem;\n  margin-right: 0.75em;\n  width: 1.4rem; }\n\n[type=checkbox]:checked + label::before,\n[type=radio]:checked + label::before {\n  background-color: #313b52;\n  box-shadow: 0 0 0 1px #313b52; }\n\n[type=radio]:checked + label::before {\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #313b52; }\n\n[type=checkbox]:checked + label::before,\n[type=checkbox]:checked:disabled + label::before {\n  background-image: url(\"../img/correct8.png\");\n  background-image: url(\"../img/correct8.svg\");\n  background-position: 50%;\n  background-repeat: no-repeat; }\n\n[type=radio]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 6px; }\n\n[type=checkbox]:disabled + label {\n  color: #c9c9c9; }\n\n[type=checkbox]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n[type=checkbox]:disabled + label::before,\n[type=radio]:disabled + label::before {\n  background: #e4e4e4;\n  box-shadow: 0 0 0 1px #999999;\n  cursor: not-allowed; }\n\n[type=range] {\n  -webkit-appearance: none;\n  border: none;\n  padding-left: 0;\n  width: 100%; }\n\n[type=range]::-webkit-slider-runnable-track {\n  background: #999999;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-moz-range-track {\n  background: #313b52;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-ms-track {\n  background: transparent;\n  color: transparent;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-webkit-slider-thumb {\n  -webkit-appearance: none;\n  border: 1px solid #757575;\n  height: 2.2rem;\n  border-radius: 1.5rem;\n  background: #e4e4e4;\n  cursor: pointer;\n  margin-top: -.65rem;\n  width: 2.2rem; }\n\n[type=range]::-moz-range-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-fill-lower {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n[type=range]::-ms-fill-upper {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n.usa-date-of-birth label {\n  margin-top: 0; }\n\n.usa-date-of-birth [type=number]::-webkit-inner-spin-button,\n.usa-date-of-birth [type=number]::-webkit-outer-spin-button {\n  -webkit-appearance: none;\n  appearance: none;\n  margin: 0; }\n\n.usa-date-of-birth [type=number] {\n  -moz-appearance: textfield; }\n\n.usa-form-group-day,\n.usa-form-group-month,\n.usa-form-group-year {\n  clear: none;\n  float: left;\n  margin-right: 1.5rem;\n  width: 5rem; }\n\n.usa-form-group-year {\n  width: 7rem; }\n\n.usa-label, .usa-label-big {\n  background-color: #666666;\n  border-radius: 2px;\n  color: #ffffff;\n  font-size: 1.5rem;\n  margin-right: 0.5rem;\n  padding: 0.1rem 0.7rem;\n  text-transform: uppercase; }\n  .usa-label:only-of-type, .usa-label-big:only-of-type {\n    margin-right: 0; }\n\n.usa-label-big {\n  font-size: 1.7rem;\n  padding-left: 0.9rem;\n  padding-right: 0.9rem; }\n\nul,\nol {\n  margin-top: 1em;\n  margin-bottom: 1em;\n  padding-left: 1.94em; }\n\nli {\n  line-height: 1.5;\n  margin-bottom: 0.5em; }\n  li:last-child {\n    margin-bottom: 0; }\n\nh1 + ul,\nh1 + ol,\nh2 + ul,\nh2 + ol,\nh3 + ul,\nh3 + ol,\nh4 + ul,\nh4 + ol,\nh5 + ul,\nh5 + ol,\nh6 + ul,\nh6 + ol,\np + ul,\np + ol {\n  margin-top: 0; }\n\n.usa-unstyled-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-unstyled-list > li {\n    margin-bottom: 0; }\n\ntable {\n  border-spacing: 0;\n  margin: 2em 0; }\n\nthead th {\n  font-weight: 700; }\n\nthead th,\nthead td {\n  background-color: #e4e4e4; }\n\nth {\n  text-align: left; }\n\nth,\ntd {\n  background-color: #ffffff;\n  border: 1px solid #666666;\n  font-weight: 400;\n  padding: 1rem 1.5rem; }\n\n.usa-table-borderless thead th {\n  background-color: transparent;\n  border-top: 0; }\n\n.usa-table-borderless th,\n.usa-table-borderless td {\n  border-left: 0;\n  border-right: 0; }\n\n.usa-table-borderless th:first-child {\n  padding-left: 0; }\n\ncaption {\n  font-size: 1.5rem;\n  font-weight: 700;\n  font-family: \"Merriweather\", \"Georgia\", \"Cambria\", \"Times New Roman\", \"Times\", serif;\n  margin-bottom: 1.2rem;\n  text-align: left; }\n\nhtml {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 10px; }\n\nbody {\n  font-size: 1.7rem; }\n\np {\n  line-height: 1.5;\n  margin-bottom: 1em;\n  margin-top: 1em; }\n\na {\n  color: #313b52;\n  text-decoration: underline; }\n  a:hover, a:active {\n    color: #1b2847; }\n  a:focus {\n    outline: 2px dotted #999999;\n    outline-offset: 3px; }\n  a:visited {\n    color: #4c2c92; }\n\n.usa-external_link::after {\n  background: url(\"../img/external-link.png\") no-repeat 0 0;\n  background: url(\"../img/external-link.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link:hover::after {\n  background-image: url(\"../img/external-link-hover.png\");\n  background-image: url(\"../img/external-link-hover.svg\"); }\n\n.usa-external_link-alt::after {\n  background: url(\"../img/external-link-alt.png\") no-repeat 0 0;\n  background: url(\"../img/external-link-alt.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link-alt:hover::after {\n  background-image: url(\"../img/external-link-alt-hover.png\");\n  background-image: url(\"../img/external-link-alt-hover.svg\"); }\n\nh1,\nh2,\nh3,\nh4,\nh5 {\n  clear: both;\n  font-family: \"Merriweather\", \"Georgia\", \"Cambria\", \"Times New Roman\", \"Times\", serif;\n  line-height: 1.3;\n  margin-bottom: .5em;\n  margin-top: 1.5em; }\n\nh6 {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\nh1 {\n  font-size: 4rem;\n  font-weight: 700; }\n\nh2 {\n  font-size: 3rem;\n  font-weight: 700; }\n\nh3 {\n  font-size: 2rem;\n  font-weight: 700; }\n\nh4 {\n  font-size: 1.7rem;\n  font-weight: 700; }\n\nh5 {\n  font-size: 1.5rem;\n  font-weight: 700; }\n\nh6 {\n  font-size: 1.3rem;\n  font-weight: 400;\n  line-height: 1.5;\n  text-transform: uppercase; }\n\ncite,\nvar,\naddress,\ndfn {\n  font-style: normal; }\n\n.usa-content p,\n.usa-content ul:not(.usa-accordion):not(.usa-accordion-bordered),\n.usa-content ol:not(.usa-accordion):not(.usa-accordion-bordered) {\n  max-width: 66ch; }\n\n.usa-content-list {\n  max-width: 66ch; }\n\n.usa-sans p,\n.usa-sans a,\n.usa-sans li,\n.usa-sans span {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\n.usa-sans a {\n  border-bottom: none;\n  font-weight: 700; }\n\n.usa-serif p,\n.usa-serif a,\n.usa-serif li,\n.usa-serif span {\n  font-family: \"Merriweather\", \"Georgia\", \"Cambria\", \"Times New Roman\", \"Times\", serif; }\n\n.usa-display {\n  font-size: 2rem;\n  font-weight: 700;\n  margin-bottom: 0; }\n  @media screen and (min-width: 481px) {\n    .usa-display {\n      font-size: 4rem;\n      font-weight: 700; } }\n  @media screen and (min-width: 600px) {\n    .usa-display {\n      font-size: 5.2rem;\n      font-weight: 700; } }\n\n.usa-font-lead {\n  font-family: \"Merriweather\", \"Georgia\", \"Cambria\", \"Times New Roman\", \"Times\", serif;\n  font-size: 2rem;\n  font-weight: 400;\n  line-height: 1.7;\n  max-width: 77rem; }\n\n.usa-image-block {\n  position: relative; }\n\n.usa-image-text-block {\n  color: #ffffff;\n  left: 0;\n  margin-left: 8%;\n  position: absolute;\n  top: 0; }\n\n.usa-image-text {\n  margin-top: 0; }\n\n.usa-drop_text {\n  margin-bottom: 0; }\n\n.usa-background-dark {\n  background-color: #333333; }\n  .usa-background-dark p,\n  .usa-background-dark span {\n    color: #ffffff; }\n  .usa-background-dark a {\n    color: #c9c9c9; }\n    .usa-background-dark a:hover {\n      color: #ffffff; }\n\n.usa-text-small {\n  font-size: 1.3rem;\n  margin-top: 0; }\n\n.usa-section > :first-child,\n.usa-grid > :first-child,\n.usa-grid-full > :first-child {\n  margin-top: 0; }\n\n.usa-section > :last-child,\n.usa-grid > :last-child,\n.usa-grid-full > :last-child {\n  margin-bottom: 0; }\n\n.usa-width-one-whole:first-child > :first-child,\n.usa-width-one-half:first-child > :first-child,\n.usa-width-one-third:first-child > :first-child,\n.usa-width-two-thirds:first-child > :first-child,\n.usa-width-one-fourth:first-child > :first-child,\n.usa-width-three-fourths:first-child > :first-child,\n.usa-width-one-sixth:first-child > :first-child,\n.usa-width-five-sixths:first-child > :first-child,\n.usa-width-one-twelfth:first-child > :first-child {\n  margin-top: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :first-child,\n  .usa-width-one-half > :first-child,\n  .usa-width-one-third > :first-child,\n  .usa-width-two-thirds > :first-child,\n  .usa-width-one-fourth > :first-child,\n  .usa-width-three-fourths > :first-child,\n  .usa-width-one-sixth > :first-child,\n  .usa-width-five-sixths > :first-child,\n  .usa-width-one-twelfth > :first-child {\n    margin-top: 0; } }\n\n.usa-width-one-whole:last-child > :last-child,\n.usa-width-one-half:last-child > :last-child,\n.usa-width-one-third:last-child > :last-child,\n.usa-width-two-thirds:last-child > :last-child,\n.usa-width-one-fourth:last-child > :last-child,\n.usa-width-three-fourths:last-child > :last-child,\n.usa-width-one-sixth:last-child > :last-child,\n.usa-width-five-sixths:last-child > :last-child,\n.usa-width-one-twelfth:last-child > :last-child {\n  margin-bottom: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :last-child,\n  .usa-width-one-half > :last-child,\n  .usa-width-one-third > :last-child,\n  .usa-width-two-thirds > :last-child,\n  .usa-width-one-fourth > :last-child,\n  .usa-width-three-fourths > :last-child,\n  .usa-width-one-sixth > :last-child,\n  .usa-width-five-sixths > :last-child,\n  .usa-width-one-twelfth > :last-child {\n    margin-bottom: 0; } }\n\n.usa-accordion,\n.usa-accordion-bordered {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  color: #ffffff;\n  margin: 0;\n  padding: 0;\n  width: 100%; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    margin-bottom: 0; }\n  .usa-accordion > ul li ul,\n  .usa-accordion-bordered > ul li ul {\n    list-style: disc; }\n    .usa-accordion > ul li ul > li > ul,\n    .usa-accordion-bordered > ul li ul > li > ul {\n      list-style: circle; }\n      .usa-accordion > ul li ul > li > ul > li > ul,\n      .usa-accordion-bordered > ul li ul > li > ul > li > ul {\n        list-style: square; }\n  .usa-accordion + .usa-accordion,\n  .usa-accordion + .usa-accordion-bordered,\n  .usa-accordion-bordered + .usa-accordion,\n  .usa-accordion-bordered + .usa-accordion-bordered {\n    margin-top: 1rem; }\n  .usa-accordion > ul,\n  .usa-accordion-bordered > ul {\n    margin-top: 0;\n    margin-bottom: 0;\n    list-style-type: none;\n    padding-left: 0;\n    color: #ffffff;\n    margin: 0;\n    padding: 0;\n    width: 100%; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      margin-bottom: 0; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      background-color: #e4e4e4;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      list-style: none;\n      margin-bottom: 0.5rem;\n      width: 100%; }\n    .usa-accordion > ul button,\n    .usa-accordion-bordered > ul button {\n      background-color: transparent;\n      border: 0;\n      border-radius: 0;\n      font-weight: 400;\n      margin: 0;\n      padding: 0;\n      text-align: left;\n      -webkit-font-smoothing: auto;\n      background-color: #e4e4e4;\n      background-image: url(\"../img/minus.png\");\n      background-image: url(\"../img/minus.svg\");\n      background-position: right 2rem center;\n      background-repeat: no-repeat;\n      background-size: 1.5rem;\n      color: #ffffff;\n      cursor: pointer;\n      display: inline-block;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      font-weight: 700;\n      margin: 0;\n      padding: 1.5rem 5.5rem 1.5rem 2rem;\n      width: 100%; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: transparent; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: #c9c9c9;\n        color: #ffffff; }\n      .usa-accordion > ul button h1,\n      .usa-accordion > ul button h2,\n      .usa-accordion > ul button h3,\n      .usa-accordion > ul button h4,\n      .usa-accordion > ul button h5,\n      .usa-accordion > ul button h6,\n      .usa-accordion-bordered > ul button h1,\n      .usa-accordion-bordered > ul button h2,\n      .usa-accordion-bordered > ul button h3,\n      .usa-accordion-bordered > ul button h4,\n      .usa-accordion-bordered > ul button h5,\n      .usa-accordion-bordered > ul button h6 {\n        margin: 0; }\n    .usa-accordion > ul [aria-expanded=false],\n    .usa-accordion-bordered > ul [aria-expanded=false] {\n      background-image: url(\"../img/plus.png\");\n      background-image: url(\"../img/plus.svg\");\n      background-repeat: no-repeat;\n      background-size: 1.5rem; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    background-color: #e4e4e4;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    list-style: none;\n    margin-bottom: 0.5rem;\n    width: 100%; }\n\n.usa-accordion-bordered .usa-accordion-content {\n  border-bottom: 3px solid #e4e4e4;\n  border-left: 3px solid #e4e4e4;\n  border-right: 3px solid #e4e4e4; }\n\n.usa-accordion-content {\n  background-color: #ffffff;\n  overflow: auto;\n  padding: 1.5rem 2rem; }\n  .usa-accordion-content > *:first-child {\n    margin-top: 0; }\n  .usa-accordion-content > *:last-child {\n    margin-bottom: 0; }\n  .usa-accordion-content:not([aria-hidden]) {\n    position: absolute;\n    left: -999em; }\n  .usa-accordion-content[aria-hidden=true] {\n    display: none; }\n\n.usa-accordion-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #e4e4e4;\n  background-image: url(\"../img/minus.png\");\n  background-image: url(\"../img/minus.svg\");\n  background-position: right 2rem center;\n  background-repeat: no-repeat;\n  background-size: 1.5rem;\n  color: #ffffff;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-weight: 700;\n  margin: 0;\n  padding: 1.5rem 5.5rem 1.5rem 2rem;\n  width: 100%; }\n  .usa-accordion-button:hover {\n    background-color: transparent; }\n  .usa-accordion-button:hover {\n    background-color: #c9c9c9;\n    color: #ffffff; }\n  .usa-accordion-button h1,\n  .usa-accordion-button h2,\n  .usa-accordion-button h3,\n  .usa-accordion-button h4,\n  .usa-accordion-button h5,\n  .usa-accordion-button h6 {\n    margin: 0; }\n\n.usa-accordion-button[aria-expanded=false] {\n  background-image: url(\"../img/plus.png\");\n  background-image: url(\"../img/plus.svg\");\n  background-repeat: no-repeat;\n  background-size: 1.5rem; }\n\n.usa-alert {\n  background-color: #e4e4e4;\n  background-position: 2rem 2rem;\n  background-repeat: no-repeat;\n  background-size: 5.2rem;\n  padding-bottom: 1.4rem;\n  padding-left: 3rem;\n  padding-right: 2rem;\n  padding-top: 2rem;\n  position: relative; }\n  .usa-alert::before {\n    background-color: #7e7e7e;\n    content: '';\n    height: 100%;\n    left: 0;\n    position: absolute;\n    top: 0;\n    width: 1rem; }\n  .usa-alert a {\n    color: #1b2847; }\n    .usa-alert a:focus, .usa-alert a:hover {\n      color: #03143d; }\n  .usa-alert ul {\n    margin-bottom: 0;\n    margin-top: 1rem;\n    padding-left: 1rem; }\n\n.usa-alert-slim {\n  background-position: 2rem 1rem;\n  padding-bottom: 1rem;\n  padding-top: 1rem; }\n  .usa-alert-slim .usa-alert-text:only-child {\n    margin-bottom: 0.5rem;\n    padding-top: 0.5rem; }\n\n.usa-alert-icon {\n  display: table-cell;\n  padding-right: 1rem; }\n\n.usa-alert-body {\n  display: table-cell;\n  padding-left: 5rem;\n  vertical-align: top; }\n\n.usa-alert-heading {\n  margin-top: 0;\n  margin-bottom: 0; }\n\n.usa-alert-text {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0;\n  margin-top: 0; }\n\n.usa-alert-text:only-child {\n  margin-bottom: 1rem;\n  padding-top: 0.5rem; }\n\n.usa-alert-success {\n  background-color: #e7f4e4;\n  background-image: url(\"../img/alerts/success.png\");\n  background-image: url(\"../img/alerts/success.svg\"); }\n  .usa-alert-success::before {\n    background-color: #2e8540; }\n\n.usa-alert-warning {\n  background-color: #fff1d2;\n  background-image: url(\"../img/alerts/warning.png\");\n  background-image: url(\"../img/alerts/warning.svg\"); }\n  .usa-alert-warning::before {\n    background-color: #fdb81e; }\n\n.usa-alert-error {\n  background-color: #f9dede;\n  background-image: url(\"../img/alerts/error.png\");\n  background-image: url(\"../img/alerts/error.svg\"); }\n  .usa-alert-error::before {\n    background-color: #005495; }\n\n.usa-alert-info {\n  background-color: #e1f3f8;\n  background-image: url(\"../img/alerts/info.png\");\n  background-image: url(\"../img/alerts/info.svg\"); }\n  .usa-alert-info::before {\n    background-color: #c64b00; }\n\n.usa-alert-no_icon {\n  background-image: none; }\n\n.usa-alert-paragraph {\n  width: 66ch; }\n\n.usa-alert {\n  margin-top: 1.5em; }\n\n.usa-banner {\n  background-color: #e4e4e4;\n  padding-bottom: 0.7rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner {\n      font-size: 1.3rem;\n      padding-bottom: 0; } }\n\n.usa-banner-content {\n  padding-right: 1.5rem;\n  padding-bottom: 3px;\n  padding-left: 1.5rem;\n  background-color: transparent;\n  font-size: 1.5rem;\n  padding-top: 2rem;\n  width: 100%; }\n  @media screen and (min-width: 600px) {\n    .usa-banner-content {\n      padding-bottom: 2.3rem;\n      padding-top: 4rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-banner-content {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n  .usa-banner-content p:first-child {\n    margin-top: 1rem; }\n    @media screen and (min-width: 600px) {\n      .usa-banner-content p:first-child {\n        margin-top: 0; } }\n\n.usa-banner-inner {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  padding-right: 1.5rem;\n  padding-left: 1.5rem;\n  max-width: 1040px; }\n  .usa-banner-inner::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  @media screen and (min-width: 951px) {\n    .usa-banner-inner {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-banner-header {\n  padding-top: 0.55rem;\n  padding-bottom: 0.55rem;\n  font-size: 1.2rem;\n  font-weight: 400; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header {\n      padding-top: 0;\n      padding-bottom: 0; } }\n  .usa-banner-header p {\n    margin-top: 0;\n    margin-bottom: 0;\n    display: inline;\n    overflow: hidden;\n    vertical-align: middle; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header p {\n        margin-top: 2px;\n        margin-bottom: 2px;\n        display: inline-block; } }\n  .usa-banner-header img {\n    float: left;\n    margin-right: 1rem;\n    margin-top: 1px;\n    width: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header img {\n        margin-right: 0.7rem;\n        width: 2rem; } }\n\n.usa-banner-header-expanded {\n  align-items: center;\n  border-bottom: 1px solid #999999;\n  display: flex;\n  font-size: 1.5rem;\n  min-height: 5.6rem;\n  padding-right: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header-expanded {\n      border-bottom: none;\n      display: block;\n      font-size: 1.2rem;\n      font-weight: 400;\n      min-height: 0;\n      padding-right: 0; } }\n  .usa-banner-header-expanded > .usa-banner-inner {\n    margin-left: 0; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded > .usa-banner-inner {\n        margin-left: auto; } }\n  .usa-banner-header-expanded img {\n    margin-right: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded img {\n        margin-right: 0.7rem; } }\n  .usa-banner-header-expanded p {\n    line-height: 1.3;\n    vertical-align: top; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded p {\n        line-height: 1.5;\n        vertical-align: middle; } }\n\n.usa-banner-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  padding-top: 1.3rem;\n  padding-left: 4.8rem;\n  background-position-x: right;\n  color: #313b52;\n  display: block;\n  font-size: 1.2rem;\n  height: 4.3rem;\n  left: 0;\n  position: absolute;\n  text-decoration: underline;\n  top: 0;\n  width: 100%; }\n  .usa-banner-button:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-button {\n      padding-top: 0;\n      padding-left: 0;\n      /* stylelint-disable declaration-block-no-ignored-properties */\n      display: inline;\n      height: initial;\n      margin-left: 3px;\n      position: relative;\n      vertical-align: middle;\n      width: initial;\n      /* stylelint-enable */ } }\n  .usa-banner-button:hover {\n    color: #1b2847;\n    text-decoration: underline; }\n  .usa-banner-button[aria-expanded=false] {\n    background-image: none; }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-image: url(\"../img/angle-arrow-down-primary.png\");\n      background-image: url(\"../img/angle-arrow-down-primary.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1rem;\n      width: 1rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    .usa-banner-button[aria-expanded=false]:hover::after {\n      background-image: url(\"../img/angle-arrow-down-primary-hover.png\");\n      background-image: url(\"../img/angle-arrow-down-primary-hover.svg\"); }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-position-y: 1px; }\n  .usa-banner-button[aria-expanded=true] {\n    background-image: none;\n    height: 5.6rem; }\n    .usa-banner-button[aria-expanded=true]::after {\n      background-image: url(\"../img/close.png\");\n      background-image: url(\"../img/close.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1.3rem;\n      width: 1.3rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    @media screen and (min-width: 481px) {\n      .usa-banner-button[aria-expanded=true] {\n        height: initial;\n        padding: 0;\n        position: relative; }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-image: url(\"../img/angle-arrow-up-primary.png\");\n          background-image: url(\"../img/angle-arrow-up-primary.svg\");\n          background-size: 100%;\n          content: '';\n          display: inline-block;\n          height: 1rem;\n          width: 1rem;\n          /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n          margin-left: 0;\n          /* stylelint-enable */ }\n        .usa-banner-button[aria-expanded=true]:hover::after {\n          background-image: url(\"../img/angle-arrow-up-primary-hover.png\");\n          background-image: url(\"../img/angle-arrow-up-primary-hover.svg\"); }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-position-y: 1px; } }\n    .usa-banner-button[aria-expanded=true]::after {\n      position: absolute;\n      right: 1.5rem;\n      top: 2.15rem; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true]::after {\n          position: static; } }\n    .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n      display: none; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n          display: inline; } }\n\n.usa-banner-icon {\n  width: 3.8rem; }\n\n.usa-footer .usa-unstyled-list {\n  display: block; }\n\n.usa-footer .usa-footer-primary-link {\n  color: #ffffff;\n  display: block;\n  font-weight: 700;\n  margin-top: 0;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: none; }\n  @media screen and (min-width: 600px) {\n    .usa-footer .usa-footer-primary-link {\n      border-top: none; } }\n  .usa-footer .usa-footer-primary-link:hover {\n    text-decoration: underline; }\n\n.usa-footer .usa-footer-primary-link ~ li a,\n.usa-footer .usa-footer-secondary-link {\n  text-decoration: none; }\n\n.usa-footer-contact_info {\n  display: inline-block; }\n  .usa-footer-contact_info a {\n    color: #ffffff;\n    text-decoration: none; }\n  .usa-footer-contact_info:hover {\n    text-decoration: underline; }\n\n.usa-footer-return-to-top {\n  color: #313b52;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: underline; }\n\n.usa-footer-primary-section {\n  background-color: #e4e4e4; }\n  .usa-footer-primary-section .usa-footer-primary-content {\n    padding-left: 1.5rem;\n    padding-right: 2.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-primary-section .usa-footer-primary-content {\n        padding-left: 0;\n        padding-right: 0; } }\n    .usa-footer-primary-section .usa-footer-primary-content li {\n      margin-left: 1rem; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-primary-section .usa-footer-primary-content li {\n          margin-left: 0; } }\n  @media screen and (min-width: 600px) {\n    .usa-footer-primary-section .usa-grid-full {\n      padding-left: 2.5rem;\n      padding-right: 2.5rem; } }\n\n.usa-footer-medium .usa-footer-contact_info p {\n  margin: 0 1rem 0 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact_info p {\n      margin: 0 0 0 1rem; } }\n\n.usa-footer-medium .usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact-heading {\n      margin-top: 0.5rem;\n      margin-bottom: 0.5rem; } }\n\n.usa-footer-medium .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-logo {\n      padding: 2rem 0; } }\n\n.usa-footer-medium .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-medium .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-medium .usa-footer-nav ul {\n    align-items: center; } }\n\n.usa-footer-slim .usa-footer-nav a {\n  display: block; }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n.usa-footer-slim .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-slim .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-slim .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-primary-section {\n    padding-bottom: 0;\n    padding-top: 0; }\n    .usa-footer-slim .usa-footer-primary-section .usa-grid-full {\n      align-items: center; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info > * {\n    margin: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    padding-top: 1.5rem;\n    padding-bottom: 1.5rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    width: 100%; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-footer-slim .usa-footer-contact_info:last-child {\n      margin-right: 0; } }\n\n/* stylelint-disable selector-no-qualifying-type */\nul.usa-footer-primary-content,\nli.usa-footer-primary-content,\nli.usa-footer-primary-content {\n  border-top: 1px solid #999999; }\n  @media screen and (min-width: 600px) {\n    ul.usa-footer-primary-content,\n    li.usa-footer-primary-content,\n    li.usa-footer-primary-content {\n      border: none; } }\n  ul.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      ul.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child {\n        border-bottom: none; } }\n\n/* stylelint-enable */\n.usa-sign_up-block {\n  padding-bottom: 4.5rem;\n  padding-left: 1.5rem;\n  padding-right: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-sign_up-block {\n      float: right;\n      padding: 0; } }\n  .usa-sign_up-block label:first-of-type {\n    margin-top: 0; }\n  .usa-sign_up-block button {\n    float: none;\n    margin-right: 0;\n    margin-top: 1.5rem; }\n  .usa-sign_up-block input {\n    width: 100%; }\n\n.usa-footer-secondary_section {\n  background-color: #c9c9c9;\n  padding-bottom: 2rem;\n  padding-top: 2rem; }\n  .usa-footer-secondary_section a {\n    color: #ffffff; }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big-secondary-section {\n    padding-top: 2rem;\n    padding-bottom: 2rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-contact-links {\n    text-align: right; } }\n\n.usa-social-links a {\n  text-decoration: none; }\n\n.usa-footer-big .usa-footer-contact_info {\n  display: block; }\n  .usa-footer-big .usa-footer-contact_info p {\n    margin: 0 1rem 0 0; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-contact_info p {\n        margin: 0.5rem 0 0 1rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-contact-links {\n    padding-top: 2rem; } }\n\n.usa-footer-big .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-logo {\n      padding: 2rem 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-primary-section {\n    padding-bottom: 4rem;\n    padding-top: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content {\n  padding-left: 0;\n  padding-right: 0; }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n    margin-left: 1.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n        margin-left: 0; } }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link {\n    margin-left: 0; }\n\n.usa-footer-big ul {\n  padding-bottom: 2.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big ul {\n      padding-bottom: 0; } }\n  .usa-footer-big ul:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul:last-child {\n        border-bottom: none; } }\n  .usa-footer-big ul li:not(.usa-footer-primary-link) {\n    line-height: 1.3;\n    padding-bottom: 0.35em;\n    padding-top: 0.35em; }\n  .usa-footer-big ul .usa-footer-primary-link {\n    background-image: url(\"../img/arrow-down.png\");\n    background-image: url(\"../img/arrow-down.svg\");\n    background-position: 1.5rem center;\n    background-repeat: no-repeat;\n    background-size: 1.3rem;\n    margin-left: 0;\n    padding-left: 3.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul .usa-footer-primary-link {\n        background: none;\n        margin-bottom: .8rem;\n        padding-bottom: 0;\n        padding-left: 0; } }\n    .usa-footer-big ul .usa-footer-primary-link > * {\n      margin-top: 0;\n      margin-bottom: 0; }\n  .usa-footer-big ul.hidden {\n    /* stylelint-disable-line selector-no-qualifying-type */\n    padding-bottom: 0; }\n    .usa-footer-big ul.hidden li {\n      display: none; }\n    .usa-footer-big ul.hidden .usa-footer-primary-link {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/arrow-right.png\");\n      background-image: url(\"../img/arrow-right.svg\");\n      cursor: pointer;\n      display: block; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-big ul.hidden .usa-footer-primary-link {\n          background: none;\n          padding-left: 0; } }\n\n.usa-footer-topic {\n  margin: 0;\n  padding: 2rem 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-sign_up-header {\n    margin: 0;\n    padding: 2rem 0; } }\n\n.usa-footer-logo-img {\n  max-width: 8rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-img {\n      float: left; } }\n\n.usa-footer-big-logo-img {\n  max-width: 10rem; }\n\n.usa-footer-slim-logo-img {\n  float: left;\n  max-width: 5rem; }\n\n.usa-footer-logo-heading {\n  display: block;\n  margin-top: 1rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-heading {\n      display: inline-block;\n      margin-top: 3rem;\n      padding-left: 1.5rem; } }\n\n.usa-footer-big-logo-heading {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big-logo-heading {\n      margin-top: 2rem; } }\n\n.usa-footer-slim-logo-heading {\n  display: inline-block;\n  margin-top: 1.5rem;\n  padding-left: 1.5rem; }\n\n.usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-contact-heading {\n      margin-top: 1rem; } }\n\n.usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n  margin: 2.5rem 1rem 1.5rem 0;\n  background-position: center center;\n  background-repeat: no-repeat;\n  background-size: auto 3rem;\n  display: inline-block;\n  height: 4.4rem;\n  left: -1.6rem;\n  position: relative;\n  text-align: center;\n  width: 4.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n      margin: 0 0 0 0.5rem;\n      left: 1.5rem; } }\n  .usa-social_link span, .usa-link-facebook span, .usa-link-twitter span, .usa-link-youtube span, .usa-link-rss span {\n    position: absolute;\n    left: -999em; }\n\n.usa-link-facebook {\n  background-image: url(\"../img/social-icons/png/facebook25.png\");\n  background-image: url(\"../img/social-icons/svg/facebook25.svg\"); }\n\n.usa-link-twitter {\n  background-image: url(\"../img/social-icons/png/twitter16.png\");\n  background-image: url(\"../img/social-icons/svg/twitter16.svg\"); }\n\n.usa-link-youtube {\n  background-image: url(\"../img/social-icons/png/youtube15.png\");\n  background-image: url(\"../img/social-icons/svg/youtube15.svg\"); }\n\n.usa-link-rss {\n  background-image: url(\"../img/social-icons/png/rss25.png\");\n  background-image: url(\"../img/social-icons/svg/rss25.svg\"); }\n\nform a {\n  border-bottom: 0; }\n\nform [type=submit],\nform [type=submit] {\n  display: block;\n  margin-bottom: 1.5em;\n  margin-top: 2.5rem; }\n  @media screen and (min-width: 600px) {\n    form [type=submit],\n    form [type=submit] {\n      padding-left: 2.7em;\n      padding-right: 2.7em;\n      width: auto; } }\n\nform [name=password],\nform [name=confirmPassword] {\n  margin-bottom: 1.1rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-form {\n    max-width: 32rem; } }\n\n.usa-form-note {\n  float: right;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.5rem;\n  margin: 0 0 1.5rem; }\n  .usa-form-note + * {\n    clear: both; }\n\nfieldset {\n  border: none;\n  margin: 0;\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-form-large {\n    max-width: 46rem; } }\n\ninput.usa-input-tiny {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-tiny {\n      max-width: 6rem; } }\n\ninput.usa-input-medium {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-medium {\n      max-width: 12rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid {\n    padding-right: 5%; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid:last-of-type {\n    padding-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-small {\n    float: left;\n    width: 35%; } }\n\n.usa-input-grid-small input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-small select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-medium {\n    float: left;\n    width: 65%; } }\n\n.usa-input-grid-medium input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-medium select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-large {\n    float: left;\n    width: 100%; } }\n\n.usa-input-grid-large input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-large select {\n  margin-bottom: 3rem; }\n\n.usa-additional_text {\n  font-weight: normal; }\n\n.usa-checklist {\n  list-style: none;\n  margin-left: 0;\n  padding-left: 0; }\n  .usa-checklist li {\n    display: inline-block;\n    list-style: none;\n    margin-bottom: 0;\n    margin-top: 0;\n    padding-left: 3em;\n    text-indent: -2em; }\n    .usa-checklist li::before {\n      content: ' ';\n      display: inline-block;\n      height: .8em;\n      margin-right: .2em;\n      width: 1.8em; }\n\n.usa-checklist-checked::before {\n  background-image: url(\"../img/correct9.png\");\n  background-image: url(\"../img/correct9.svg\");\n  background-position: 100%;\n  background-repeat: no-repeat;\n  background-size: 100%; }\n\n.usa-graphic_list .usa-graphic_list-row .usa-media_block {\n  margin-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-graphic_list .usa-graphic_list-row .usa-media_block {\n      margin-bottom: 6rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block {\n    margin-bottom: 0; } }\n\n.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block:last-child {\n  margin-bottom: 0; }\n\n.usa-graphic_list .usa-media_block-img {\n  margin-right: 3rem; }\n\n.usa-graphic_list .usa-media_block-body > :first-child {\n  margin-top: 0; }\n\n.usa-header {\n  width: 100%;\n  z-index: 7000; }\n  @media screen and (min-width: 951px) {\n    .usa-header {\n      border-bottom: 1px solid #c9c9c9; } }\n  .usa-header a {\n    border-bottom: none; }\n  @media screen and (min-width: 951px) {\n    .usa-header .usa-search {\n      float: right;\n      max-width: 21.5rem; } }\n\n.usa-logo {\n  float: left;\n  line-height: 4rem;\n  margin-left: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-logo {\n      line-height: 7.5rem;\n      margin-left: 0; } }\n  .usa-logo a {\n    color: #ffffff;\n    text-decoration: none; }\n  .usa-logo br {\n    display: none; }\n    @media screen and (min-width: 951px) {\n      .usa-logo br {\n        display: block; } }\n\n.usa-logo-text {\n  display: block;\n  font-size: 1.5rem;\n  font-style: normal;\n  font-weight: 700;\n  margin: 0; }\n  @media screen and (min-width: 951px) {\n    .usa-logo-text {\n      display: block;\n      font-size: 2.4rem;\n      line-height: 1.3; } }\n\n.usa-menu-btn {\n  /* stylelint-disable declaration-block-no-ignored-properties */\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #313b52;\n  color: #ffffff;\n  display: inline;\n  float: right;\n  font-size: 1.3rem;\n  height: 4rem;\n  line-height: 4rem;\n  text-align: center;\n  text-decoration: none;\n  text-transform: uppercase;\n  width: 5.8rem;\n  /* stylelint-enable */ }\n  .usa-menu-btn:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-menu-btn {\n      display: none; } }\n  .usa-menu-btn:hover {\n    color: #ffffff;\n    background-color: #1b2847; }\n  .usa-menu-btn:visited {\n    color: #ffffff; }\n\n.usa-overlay {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  background: #000000;\n  opacity: 0;\n  transition: all 0.2s ease-in-out;\n  visibility: hidden;\n  z-index: 8000; }\n  .usa-overlay.is-visible {\n    opacity: 0.1;\n    visibility: visible; }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-logo {\n    bottom: 0;\n    position: absolute; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-navbar {\n    position: relative;\n    width: 18%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-header {\n    border-bottom: none; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-logo {\n    margin-top: 3rem;\n    margin-bottom: 3rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended em {\n    font-size: 3.2rem;\n    line-height: 1; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-navbar {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    display: block;\n    height: auto;\n    max-width: 1040px; }\n    .usa-header-extended .usa-navbar::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav {\n    border-top: 1px solid #c9c9c9;\n    float: none;\n    padding: 0;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-inner {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 1.5rem;\n    margin-top: -1px;\n    max-width: 1040px;\n    position: relative; }\n    .usa-header-extended .usa-nav-inner::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary::after {\n    clear: both;\n    content: \"\";\n    display: block; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-position: right 1.5rem top 53%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link {\n    padding-top: 1.8rem;\n    padding-bottom: 1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-submenu .usa-grid-full {\n    padding-left: 1.2rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-megamenu {\n    padding-left: 3rem; } }\n\n.usa-hero {\n  padding-top: 3rem;\n  padding-bottom: 3rem;\n  background-image: url(\"../img/hero.png\");\n  background-position: center;\n  background-size: cover; }\n  .usa-hero .usa-button {\n    color: #ffffff; }\n\n.usa-section-dark .usa-hero-link {\n  color: #c64b00; }\n\n.usa-hero-callout {\n  background-color: #03143d;\n  padding: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-hero-callout {\n      max-width: 30rem; } }\n  .usa-hero-callout > *:first-child {\n    margin-top: 0;\n    margin-bottom: 2rem; }\n\n.usa-hero-callout-alt {\n  color: #ffffff;\n  display: block; }\n\n.usa-layout-docs {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs {\n      display: inherit; } }\n  .usa-layout-docs .usa-grid > :first-child:not(.usa-width-*) {\n    margin-top: 0; }\n  .usa-layout-docs .usa-grid > :last-child:not(.usa-width-*) {\n    margin-bottom: 0; }\n\n.usa-layout-docs-sidenav {\n  order: 2; }\n\n.usa-layout-docs-main_content {\n  margin-bottom: 3rem;\n  order: 1; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs-main_content {\n      margin-bottom: 0; } }\n  .usa-layout-docs-main_content > :first-child {\n    margin-top: 0; }\n\n.usa-media_block-img {\n  float: left;\n  margin-right: 1rem; }\n\n.usa-media_block-body {\n  overflow: hidden; }\n\n.usa-navbar {\n  border-bottom: 1px solid #999999;\n  height: 4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-navbar {\n      border-bottom: none;\n      display: inline-block;\n      height: 7.8rem; } }\n\n.usa-nav-link {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link:hover span {\n      border-bottom: 0.4rem solid #313b52;\n      padding-bottom: 0.6rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link.usa-accordion-button span {\n      margin-right: 0;\n      padding-right: 1.5rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-nav-container {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    max-width: 1040px; }\n    .usa-nav-container::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n.usa-nav {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: auto;\n  background: #ffffff;\n  border-left: 1px solid #999999;\n  border-right: 0;\n  display: flex;\n  flex-direction: column;\n  overflow-y: auto;\n  padding: 2rem;\n  transform: translateX(26rem);\n  width: 26rem;\n  z-index: 9000; }\n  @media screen and (min-width: 951px) {\n    .usa-nav {\n      padding-top: 4.5rem;\n      padding-right: 0;\n      padding-bottom: 0;\n      border-left: none;\n      display: block;\n      float: right;\n      overflow-y: visible;\n      position: relative;\n      transform: translateX(0);\n      width: auto; } }\n  .usa-nav.is-visible {\n    transform: translateX(0);\n    transition: all 0.3s ease-in-out; }\n  .usa-nav nav {\n    margin-top: 6rem;\n    min-height: 100%; }\n    @media screen and (min-width: 951px) {\n      .usa-nav nav {\n        margin-top: 0; } }\n  .usa-nav .usa-current {\n    border-left: 4px solid #313b52;\n    color: #313b52;\n    font-weight: 700;\n    padding-left: 1.4rem; }\n    @media screen and (min-width: 951px) {\n      .usa-nav .usa-current {\n        color: #ffffff; } }\n  .usa-nav .usa-button {\n    width: 100%; }\n  @media screen and (min-width: 951px) {\n    .usa-nav .usa-search {\n      margin-left: 1.5rem;\n      top: 4px; } }\n\n.usa-nav-primary {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin-top: 1.5rem;\n  order: 2; }\n  .usa-nav-primary > li {\n    margin-bottom: 0; }\n  .usa-nav-primary > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-nav-primary > li:first-child {\n      border-top: none; }\n  .usa-nav-primary a {\n    border: none;\n    color: #ffffff;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-nav-primary a:hover {\n      background-color: #e4e4e4;\n      color: #313b52;\n      text-decoration: none; }\n    .usa-nav-primary a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-nav-primary a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #313b52;\n      color: #313b52;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary {\n      display: inline; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary li {\n      border-top: none; } }\n  .usa-nav-primary > li {\n    width: auto; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li {\n        display: inline-block; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a:hover {\n        background-color: transparent; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a {\n      padding-top: 0.75rem;\n      padding-bottom: 0.75rem; } }\n  .usa-nav-primary button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    -moz-osx-font-smoothing: grayscale;\n    -webkit-font-smoothing: antialiased;\n    font-weight: 400;\n    line-height: 1.3;\n    padding: 0.85rem 1.5rem 0.85rem 1.8rem; }\n    .usa-nav-primary button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary button {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1;\n        width: initial; } }\n    .usa-nav-primary button:focus, .usa-nav-primary button:active {\n      box-shadow: 2px dotted #999999; }\n    .usa-nav-primary button:hover {\n      background-color: #e4e4e4;\n      color: #313b52; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button:hover {\n          background-color: transparent; } }\n    .usa-nav-primary button[aria-expanded=false] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/plus-alt.png\");\n      background-image: url(\"../img/plus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false] {\n          background-image: url(\"../img/angle-arrow-down.png\");\n          background-image: url(\"../img/angle-arrow-down.svg\");\n          background-position: right 1.5rem top 40%; } }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false]:hover {\n          background-image: url(\"../img/angle-arrow-down-primary.png\");\n          background-image: url(\"../img/angle-arrow-down-primary.svg\"); } }\n    .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/minus-alt.png\");\n      background-image: url(\"../img/minus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=true] {\n          background-color: #03143d;\n          color: #ffffff;\n          background-image: url(\"../img/angle-arrow-down-hover.png\");\n          background-image: url(\"../img/angle-arrow-down-hover.svg\");\n          background-position: right 1.5rem top 40%; }\n          .usa-nav-primary button[aria-expanded=true]:hover {\n            background-color: #03143d; }\n          .usa-nav-primary button[aria-expanded=true] span {\n            border-bottom: 0.4rem solid #313b52;\n            padding-bottom: 0.6rem;\n            color: #ffffff; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a.usa-current,\n    .usa-nav-primary .usa-current {\n      border-left: 0;\n      padding-left: 1.5rem; }\n      .usa-nav-primary a.usa-current:hover span,\n      .usa-nav-primary .usa-current:hover span {\n        color: #313b52; }\n      .usa-nav-primary a.usa-current span,\n      .usa-nav-primary .usa-current span {\n        border-bottom: 0.4rem solid #313b52;\n        padding-bottom: 0.6rem;\n        color: #ffffff; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link:hover span {\n    border-bottom: 0.7rem solid #313b52;\n    padding-bottom: 0.9rem; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=true] span {\n      border-bottom: 0.7rem solid #313b52;\n      padding-bottom: 0.9rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary .usa-current span {\n    border-bottom: 0.7rem solid #313b52;\n    padding-bottom: 0.9rem; } }\n\n.usa-nav-secondary {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary {\n      margin-top: 0;\n      position: absolute;\n      right: 3rem;\n      top: -5.7rem; } }\n  .usa-nav-secondary .usa-search {\n    margin-top: 1.5rem;\n    margin-bottom: 0; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary .usa-search {\n        margin-top: -0.9rem;\n        margin-bottom: 0;\n        margin-left: 0;\n        float: left; } }\n\n.usa-nav-secondary-links {\n  margin-top: 2.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links {\n      float: left;\n      margin-top: 0; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li {\n      display: inline;\n      padding-left: 0.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li:not(:last-child)::after {\n      color: #c9c9c9;\n      content: '|';\n      padding-left: 0.5rem; } }\n  .usa-nav-secondary-links a,\n  .usa-nav-secondary-links .usa-header-search-button {\n    color: #666666;\n    display: inline-block;\n    font-size: 1.5rem;\n    text-decoration: none; }\n    .usa-nav-secondary-links a:hover,\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      color: #313b52;\n      text-decoration: underline; }\n  .usa-nav-secondary-links .usa-header-search-button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    display: none; }\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button {\n        background-image: url(\"../img/search-alt.png\");\n        background-image: url(\"../img/search-alt.svg\");\n        background-repeat: no-repeat;\n        background-position: left center;\n        background-size: 2.2rem;\n        display: inline-block;\n        padding-left: 2.3rem; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button.is-hidden {\n        display: none; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links a.usa-current {\n      border-left: 0;\n      padding-left: 0; } }\n\n.usa-nav-submenu {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-nav-submenu > li {\n    margin-bottom: 0; }\n  .usa-nav-submenu li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-nav-submenu a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-nav-submenu a:hover, .usa-nav-submenu a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-nav-submenu .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu {\n      margin-top: 0;\n      margin-bottom: 0;\n      list-style-type: none;\n      padding-left: 0;\n      padding-top: 0.75rem;\n      padding-bottom: 0.9rem;\n      background-color: #03143d;\n      width: 21.5rem;\n      position: absolute; }\n      .usa-nav-submenu > li {\n        margin-bottom: 0; } }\n  .usa-nav-submenu[aria-hidden=true] {\n    display: none; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a {\n      color: #ffffff;\n      padding-left: 1.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a:hover {\n      background-color: #03143d;\n      color: #ffffff;\n      padding-left: 1.5rem;\n      text-decoration: underline; } }\n  .usa-nav-submenu li {\n    font-size: 1.5rem;\n    margin-bottom: 0; }\n\n.usa-nav-close {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  margin: -1.2rem -1.5rem 1.5rem auto;\n  float: right;\n  height: 4.4rem;\n  text-align: center;\n  width: 4.4rem; }\n  .usa-nav-close:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-close {\n      display: none; } }\n  .usa-nav-close img {\n    width: 1.3rem; }\n  .usa-nav-close + * {\n    clear: both; }\n\n.usa-mobile_nav-active {\n  overflow: hidden; }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu {\n    padding-top: 3.15rem;\n    padding-bottom: 3.15rem;\n    left: -1rem;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::before {\n    background-color: #03143d;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    right: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::after {\n    background-color: #03143d;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    left: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav {\n    padding-left: 0;\n    padding-top: 0;\n    width: 100%; } }\n\n.usa-header-basic-megamenu .usa-nav-inner {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 951px) {\n    .usa-header-basic-megamenu .usa-nav-inner {\n      display: block;\n      float: right;\n      margin-top: -3.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav-submenu .usa-grid-full {\n    margin-left: -1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu-col {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-megamenu-col:last-child {\n      margin-right: 0; }\n    .usa-megamenu-col:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-megamenu-col:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-megamenu-col:nth-child(4n) {\n      margin-right: 0; } }\n\n.usa-megamenu-col > ul {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-megamenu-col > ul > li {\n    margin-bottom: 0; }\n\n.usa-search {\n  max-width: none;\n  position: relative; }\n  .usa-search::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  .usa-search [type=submit],\n  .usa-search .usa-search-submit {\n    background-image: url(\"../img/search.png\");\n    background-image: url(\"../img/search.svg\");\n    background-position: 50%;\n    background-repeat: no-repeat;\n    border-bottom-left-radius: 0;\n    border-top-left-radius: 0;\n    height: 3.3rem;\n    margin: 0;\n    padding: 0;\n    width: 4.5rem; }\n    @media screen and (min-width: 481px) {\n      .usa-search [type=submit],\n      .usa-search .usa-search-submit {\n        background-image: none;\n        width: 8.5rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-big [type=search],\n    .usa-search.usa-search-big .usa-search-input {\n      font-size: 1.7rem;\n      height: 4.4rem;\n      width: calc(100% - 11.6rem); }\n    .usa-search.usa-search-big [type=submit],\n    .usa-search.usa-search-big .usa-search-submit {\n      font-size: 2rem;\n      height: 4.4rem;\n      width: 11.6rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-small [type=search],\n    .usa-search.usa-search-small .usa-search-input {\n      width: calc(100% - 4.5rem); }\n    .usa-search.usa-search-small [type=submit],\n    .usa-search.usa-search-small .usa-search-submit {\n      background-image: url(\"../img/search.png\");\n      background-image: url(\"../img/search.svg\");\n      background-position: 50%;\n      background-repeat: no-repeat;\n      width: 4.5rem; } }\n  @media screen and (max-width: 950px) {\n    .usa-search.usa-search-small.usa-sr-only {\n      left: auto;\n      position: relative; } }\n\ninput[type=search] {\n  /* stylelint-disable-line selector-no-qualifying-type */\n  box-sizing: border-box;\n  -webkit-appearance: none; }\n\n[type=search],\n.usa-search-input {\n  padding-top: 0;\n  padding-bottom: 0;\n  border-bottom-right-radius: 0;\n  border-right: none;\n  border-top-right-radius: 0;\n  box-sizing: border-box;\n  float: left;\n  font-size: 1.4rem;\n  height: 3.3rem;\n  margin: 0;\n  width: calc(100% - 4.5rem); }\n  @media screen and (min-width: 481px) {\n    [type=search],\n    .usa-search-input {\n      width: calc(100% - 8.5rem); } }\n\n.usa-search-submit-text {\n  position: absolute;\n  left: -999em; }\n  @media screen and (min-width: 481px) {\n    .usa-search-submit-text {\n      position: static; } }\n\n.usa-section {\n  padding-top: 3rem;\n  padding-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-section {\n      padding-top: 6rem;\n      padding-bottom: 6rem; } }\n\n.usa-section-light {\n  background-color: #e4e4e4; }\n\n.usa-section-dark {\n  background-color: #03143d;\n  color: #ffffff; }\n  .usa-section-dark h1,\n  .usa-section-dark h2,\n  .usa-section-dark h3,\n  .usa-section-dark h4,\n  .usa-section-dark h5,\n  .usa-section-dark h6 {\n    color: #c64b00; }\n  .usa-section-dark p {\n    color: #ffffff; }\n  .usa-section-dark a {\n    color: #c9c9c9; }\n    .usa-section-dark a:hover {\n      color: #ffffff; }\n\n.usa-sidenav-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-sidenav-list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-list > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-sidenav-list > li:first-child {\n      border-top: none; }\n  .usa-sidenav-list a {\n    border: none;\n    color: #ffffff;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-sidenav-list a:hover {\n      background-color: #e4e4e4;\n      color: #313b52;\n      text-decoration: none; }\n    .usa-sidenav-list a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-sidenav-list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #313b52;\n      color: #313b52;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n\n.usa-sidenav-sub_list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-sidenav-sub_list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-sub_list li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-sidenav-sub_list a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-sidenav-sub_list a:hover, .usa-sidenav-sub_list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-sidenav-sub_list .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n\n.usa-skipnav {\n  background: transparent;\n  color: #ffffff;\n  left: 0;\n  padding: 1rem 1.5rem;\n  position: absolute;\n  top: -4.2rem;\n  transition: all 0.2s ease-in-out;\n  z-index: 100; }\n  .usa-skipnav:focus {\n    background: #ffffff;\n    left: 0;\n    outline: 0;\n    position: absolute;\n    top: 0;\n    transition: all 0.2s ease-in-out; }\n"]}
\ No newline at end of file
+{"version":3,"sources":["stdin"],"names":[],"mappings":"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","file":"uswds.min.css","sourcesContent":["/*! uswds @version */\nhtml {\n  box-sizing: border-box; }\n\n*, *::after, *::before {\n  box-sizing: inherit; }\n\n/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */\n/**\n * 1. Set default font family to sans-serif.\n * 2. Prevent iOS and IE text size adjust after device orientation change,\n *    without disabling user zoom.\n */\nhtml {\n  font-family: sans-serif;\n  /* 1 */\n  -ms-text-size-adjust: 100%;\n  /* 2 */\n  -webkit-text-size-adjust: 100%;\n  /* 2 */ }\n\n/**\n * Remove default margin.\n */\nbody {\n  margin: 0; }\n\n/* HTML5 display definitions\n   ========================================================================== */\n/**\n * Correct `block` display not defined for any HTML5 element in IE 8/9.\n * Correct `block` display not defined for `details` or `summary` in IE 10/11\n * and Firefox.\n * Correct `block` display not defined for `main` in IE 11.\n */\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n  display: block; }\n\n/**\n * 1. Correct `inline-block` display not defined in IE 8/9.\n * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.\n */\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block;\n  /* 1 */\n  vertical-align: baseline;\n  /* 2 */ }\n\n/**\n * Prevent modern browsers from displaying `audio` without controls.\n * Remove excess height in iOS 5 devices.\n */\naudio:not([controls]) {\n  display: none;\n  height: 0; }\n\n/**\n * Address `[hidden]` styling not present in IE 8/9/10.\n * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.\n */\n[hidden],\ntemplate {\n  display: none; }\n\n/* Links\n   ========================================================================== */\n/**\n * Remove the gray background color from active links in IE 10.\n */\na {\n  background-color: transparent; }\n\n/**\n * Improve readability of focused elements when they are also in an\n * active/hover state.\n */\na:active,\na:hover {\n  outline: 0; }\n\n/* Text-level semantics\n   ========================================================================== */\n/**\n * Address styling not present in IE 8/9/10/11, Safari, and Chrome.\n */\nabbr[title] {\n  border-bottom: 1px dotted; }\n\n/**\n * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.\n */\nb,\nstrong {\n  font-weight: bold; }\n\n/**\n * Address styling not present in Safari and Chrome.\n */\ndfn {\n  font-style: italic; }\n\n/**\n * Address variable `h1` font-size and margin within `section` and `article`\n * contexts in Firefox 4+, Safari, and Chrome.\n */\nh1 {\n  font-size: 2em;\n  margin: 0.67em 0; }\n\n/**\n * Address styling not present in IE 8/9.\n */\nmark {\n  background: #ff0;\n  color: #000; }\n\n/**\n * Address inconsistent and variable font size in all browsers.\n */\nsmall {\n  font-size: 80%; }\n\n/**\n * Prevent `sub` and `sup` affecting `line-height` in all browsers.\n */\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline; }\n\nsup {\n  top: -0.5em; }\n\nsub {\n  bottom: -0.25em; }\n\n/* Embedded content\n   ========================================================================== */\n/**\n * Remove border when inside `a` element in IE 8/9/10.\n */\nimg {\n  border: 0; }\n\n/**\n * Correct overflow not hidden in IE 9/10/11.\n */\nsvg:not(:root) {\n  overflow: hidden; }\n\n/* Grouping content\n   ========================================================================== */\n/**\n * Address margin not present in IE 8/9 and Safari.\n */\nfigure {\n  margin: 1em 40px; }\n\n/**\n * Address differences between Firefox and other browsers.\n */\nhr {\n  box-sizing: content-box;\n  height: 0; }\n\n/**\n * Contain overflow in all browsers.\n */\npre {\n  overflow: auto; }\n\n/**\n * Address odd `em`-unit font size rendering in all browsers.\n */\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em; }\n\n/* Forms\n   ========================================================================== */\n/**\n * Known limitation: by default, Chrome and Safari on OS X allow very limited\n * styling of `select`, unless a `border` property is set.\n */\n/**\n * 1. Correct color not being inherited.\n *    Known issue: affects color of disabled elements.\n * 2. Correct font properties not being inherited.\n * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.\n */\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  color: inherit;\n  /* 1 */\n  font: inherit;\n  /* 2 */\n  margin: 0;\n  /* 3 */ }\n\n/**\n * Address `overflow` set to `hidden` in IE 8/9/10/11.\n */\nbutton {\n  overflow: visible; }\n\n/**\n * Address inconsistent `text-transform` inheritance for `button` and `select`.\n * All other form control elements do not inherit `text-transform` values.\n * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.\n * Correct `select` style inheritance in Firefox.\n */\nbutton,\nselect {\n  text-transform: none; }\n\n/**\n * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`\n *    and `video` controls.\n * 2. Correct inability to style clickable `input` types in iOS.\n * 3. Improve usability and consistency of cursor style between image-type\n *    `input` and others.\n */\nbutton,\nhtml input[type=\"button\"],\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button;\n  /* 2 */\n  cursor: pointer;\n  /* 3 */ }\n\n/**\n * Re-set default cursor for disabled elements.\n */\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default; }\n\n/**\n * Remove inner padding and border in Firefox 4+.\n */\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  border: 0;\n  padding: 0; }\n\n/**\n * Address Firefox 4+ setting `line-height` on `input` using `!important` in\n * the UA stylesheet.\n */\ninput {\n  line-height: normal; }\n\n/**\n * It's recommended that you don't attempt to style these elements.\n * Firefox's implementation doesn't respect box-sizing, padding, or width.\n *\n * 1. Address box sizing set to `content-box` in IE 8/9/10.\n * 2. Remove excess padding in IE 8/9/10.\n */\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  box-sizing: border-box;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Fix the cursor style for Chrome's increment/decrement buttons. For certain\n * `font-size` values of the `input`, it causes the cursor style of the\n * decrement button to change from `default` to `text`.\n */\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto; }\n\n/**\n * 1. Address `appearance` set to `searchfield` in Safari and Chrome.\n * 2. Address `box-sizing` set to `border-box` in Safari and Chrome.\n */\ninput[type=\"search\"] {\n  -webkit-appearance: textfield;\n  /* 1 */\n  box-sizing: content-box;\n  /* 2 */ }\n\n/**\n * Remove inner padding and search cancel button in Safari and Chrome on OS X.\n * Safari (but not Chrome) clips the cancel button when the search input has\n * padding (and `textfield` appearance).\n */\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none; }\n\n/**\n * Define consistent border, margin, and padding.\n */\nfieldset {\n  border: 1px solid #c0c0c0;\n  margin: 0 2px;\n  padding: 0.35em 0.625em 0.75em; }\n\n/**\n * 1. Correct `color` not being inherited in IE 8/9/10/11.\n * 2. Remove padding so people aren't caught out if they zero out fieldsets.\n */\nlegend {\n  border: 0;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Remove default vertical scrollbar in IE 8/9/10/11.\n */\ntextarea {\n  overflow: auto; }\n\n/**\n * Don't inherit the `font-weight` (applied by a rule above).\n * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.\n */\noptgroup {\n  font-weight: bold; }\n\n/* Tables\n   ========================================================================== */\n/**\n * Remove most spacing between table cells.\n */\ntable {\n  border-collapse: collapse;\n  border-spacing: 0; }\n\ntd,\nth {\n  padding: 0; }\n\n/* stylelint-disable at-rule-empty-line-before */\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/sourcesanspro-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-light-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/sourcesanspro-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-bold-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/merriweather-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-light-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/merriweather-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-bold-webfont.ttf\") format(\"truetype\"); }\n\n/* stylelint-enable */\n.usa-grid,\n.usa-grid-full {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  max-width: 1040px; }\n  .usa-grid::after,\n  .usa-grid-full::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n\n.usa-grid {\n  padding-right: 1.5rem;\n  padding-left: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-grid {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-grid-full {\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 31.76157%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 65.88078%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-width-one-fourth:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-width-one-fourth:nth-child(4n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 74.41059%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 14.70196%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 14.70196%; }\n      .usa-width-one-sixth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-sixth:nth-child(6n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 82.94039%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 6.17215%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 6.17215%; }\n      .usa-width-one-twelfth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(12n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 40.29137%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 57.35098%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n.usa-end-row {\n  margin-right: 0; }\n\n.usa-offset-one-twelfth {\n  margin-left: 8.5298%; }\n\n.usa-offset-one-sixth {\n  margin-left: 17.05961%; }\n\n.usa-offset-one-fourth {\n  margin-left: 25.58941%; }\n\n.usa-offset-one-third {\n  margin-left: 34.11922%; }\n\n.usa-offset-five-twelfths {\n  margin-left: 42.64902%; }\n\n.usa-offset-one-half {\n  margin-left: 51.17883%; }\n\n.usa-offset-seven-twelfths {\n  margin-left: 59.70863%; }\n\n.usa-offset-two-thirds {\n  margin-left: 68.23843%; }\n\n.usa-offset-three-fourths {\n  margin-left: 76.76824%; }\n\n.usa-offset-five-sixths {\n  margin-left: 85.29804%; }\n\n.usa-offset-eleven-twelfths {\n  margin-left: 93.82785%; }\n\n.usa-sr-only {\n  position: absolute;\n  left: -999em; }\n\nhtml {\n  box-sizing: border-box; }\n\n*,\n*::before,\n*::after {\n  box-sizing: inherit; }\n\nbody {\n  background-color: #ffffff;\n  overflow-x: hidden; }\n\n.lt-ie9 * {\n  filter: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n[hidden] {\n  display: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n*:focus,\n.usa-focus {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n/* stylelint-disable selector-no-qualifying-type */\n.usa-button,\n.usa-button-primary,\n.usa-button:visited,\n.usa-button-primary:visited,\nbutton,\n[type=button],\n[type=submit],\n[type=reset],\n[type=image] {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased;\n  margin-top: 0.5em;\n  margin-right: 0.5em;\n  margin-bottom: 0.5em;\n  appearance: none;\n  background-color: #0071BC;\n  border: 0;\n  border-radius: 5px;\n  color: #ffffff;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.7rem;\n  font-weight: 700;\n  line-height: 1;\n  padding: 1rem 2rem;\n  text-align: center;\n  text-decoration: none;\n  width: 100%; }\n  @media screen and (min-width: 481px) {\n    .usa-button,\n    .usa-button-primary,\n    .usa-button:visited,\n    .usa-button-primary:visited,\n    button,\n    [type=button],\n    [type=submit],\n    [type=reset],\n    [type=image] {\n      width: auto; } }\n  .usa-button:hover, .usa-button.usa-button-hover,\n  .usa-button-primary:hover,\n  .usa-button-primary.usa-button-hover,\n  .usa-button:visited:hover,\n  .usa-button:visited.usa-button-hover,\n  .usa-button-primary:visited:hover,\n  .usa-button-primary:visited.usa-button-hover,\n  button:hover,\n  button.usa-button-hover,\n  [type=button]:hover,\n  [type=button].usa-button-hover,\n  [type=submit]:hover,\n  [type=submit].usa-button-hover,\n  [type=reset]:hover,\n  [type=reset].usa-button-hover,\n  [type=image]:hover,\n  [type=image].usa-button-hover {\n    background-color: #205493;\n    border-bottom: 0;\n    color: #ffffff;\n    text-decoration: none; }\n  .usa-button:active, .usa-button.usa-button-active,\n  .usa-button-primary:active,\n  .usa-button-primary.usa-button-active,\n  .usa-button:visited:active,\n  .usa-button:visited.usa-button-active,\n  .usa-button-primary:visited:active,\n  .usa-button-primary:visited.usa-button-active,\n  button:active,\n  button.usa-button-active,\n  [type=button]:active,\n  [type=button].usa-button-active,\n  [type=submit]:active,\n  [type=submit].usa-button-active,\n  [type=reset]:active,\n  [type=reset].usa-button-active,\n  [type=image]:active,\n  [type=image].usa-button-active {\n    background-color: #112E51; }\n  .usa-button.usa-button-primary-alt,\n  .usa-button-primary.usa-button-primary-alt,\n  .usa-button:visited.usa-button-primary-alt,\n  .usa-button-primary:visited.usa-button-primary-alt,\n  button.usa-button-primary-alt,\n  [type=button].usa-button-primary-alt,\n  [type=submit].usa-button-primary-alt,\n  [type=reset].usa-button-primary-alt,\n  [type=image].usa-button-primary-alt {\n    background-color: #c64b00;\n    color: #212121; }\n    .usa-button.usa-button-primary-alt:hover, .usa-button.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary.usa-button-primary-alt:hover,\n    .usa-button-primary.usa-button-primary-alt.usa-button-hover,\n    .usa-button:visited.usa-button-primary-alt:hover,\n    .usa-button:visited.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary:visited.usa-button-primary-alt:hover,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-hover,\n    button.usa-button-primary-alt:hover,\n    button.usa-button-primary-alt.usa-button-hover,\n    [type=button].usa-button-primary-alt:hover,\n    [type=button].usa-button-primary-alt.usa-button-hover,\n    [type=submit].usa-button-primary-alt:hover,\n    [type=submit].usa-button-primary-alt.usa-button-hover,\n    [type=reset].usa-button-primary-alt:hover,\n    [type=reset].usa-button-primary-alt.usa-button-hover,\n    [type=image].usa-button-primary-alt:hover,\n    [type=image].usa-button-primary-alt.usa-button-hover {\n      background-color: #046b99; }\n    .usa-button.usa-button-primary-alt:active, .usa-button.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary.usa-button-primary-alt:active,\n    .usa-button-primary.usa-button-primary-alt.usa-button-active,\n    .usa-button:visited.usa-button-primary-alt:active,\n    .usa-button:visited.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary:visited.usa-button-primary-alt:active,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-active,\n    button.usa-button-primary-alt:active,\n    button.usa-button-primary-alt.usa-button-active,\n    [type=button].usa-button-primary-alt:active,\n    [type=button].usa-button-primary-alt.usa-button-active,\n    [type=submit].usa-button-primary-alt:active,\n    [type=submit].usa-button-primary-alt.usa-button-active,\n    [type=reset].usa-button-primary-alt:active,\n    [type=reset].usa-button-primary-alt.usa-button-active,\n    [type=image].usa-button-primary-alt:active,\n    [type=image].usa-button-primary-alt.usa-button-active {\n      background-color: #046b99;\n      color: #ffffff; }\n  .usa-button.usa-button-secondary,\n  .usa-button-primary.usa-button-secondary,\n  .usa-button:visited.usa-button-secondary,\n  .usa-button-primary:visited.usa-button-secondary,\n  button.usa-button-secondary,\n  [type=button].usa-button-secondary,\n  [type=submit].usa-button-secondary,\n  [type=reset].usa-button-secondary,\n  [type=image].usa-button-secondary {\n    background-color: #ffffff;\n    box-shadow: inset 0 0 0 2px #0071BC;\n    color: #0071BC; }\n    .usa-button.usa-button-secondary:hover, .usa-button.usa-button-secondary.usa-button-hover,\n    .usa-button-primary.usa-button-secondary:hover,\n    .usa-button-primary.usa-button-secondary.usa-button-hover,\n    .usa-button:visited.usa-button-secondary:hover,\n    .usa-button:visited.usa-button-secondary.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary:hover,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-hover,\n    button.usa-button-secondary:hover,\n    button.usa-button-secondary.usa-button-hover,\n    [type=button].usa-button-secondary:hover,\n    [type=button].usa-button-secondary.usa-button-hover,\n    [type=submit].usa-button-secondary:hover,\n    [type=submit].usa-button-secondary.usa-button-hover,\n    [type=reset].usa-button-secondary:hover,\n    [type=reset].usa-button-secondary.usa-button-hover,\n    [type=image].usa-button-secondary:hover,\n    [type=image].usa-button-secondary.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #205493;\n      color: #205493; }\n    .usa-button.usa-button-secondary:active, .usa-button.usa-button-secondary.usa-button-active,\n    .usa-button-primary.usa-button-secondary:active,\n    .usa-button-primary.usa-button-secondary.usa-button-active,\n    .usa-button:visited.usa-button-secondary:active,\n    .usa-button:visited.usa-button-secondary.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary:active,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-active,\n    button.usa-button-secondary:active,\n    button.usa-button-secondary.usa-button-active,\n    [type=button].usa-button-secondary:active,\n    [type=button].usa-button-secondary.usa-button-active,\n    [type=submit].usa-button-secondary:active,\n    [type=submit].usa-button-secondary.usa-button-active,\n    [type=reset].usa-button-secondary:active,\n    [type=reset].usa-button-secondary.usa-button-active,\n    [type=image].usa-button-secondary:active,\n    [type=image].usa-button-secondary.usa-button-active {\n      box-shadow: inset 0 0 0 2px #112E51;\n      color: #112E51; }\n  .usa-button.usa-button-secondary-inverse, .usa-button.usa-button-outline-inverse,\n  .usa-button-primary.usa-button-secondary-inverse,\n  .usa-button-primary.usa-button-outline-inverse,\n  .usa-button:visited.usa-button-secondary-inverse,\n  .usa-button:visited.usa-button-outline-inverse,\n  .usa-button-primary:visited.usa-button-secondary-inverse,\n  .usa-button-primary:visited.usa-button-outline-inverse,\n  button.usa-button-secondary-inverse,\n  button.usa-button-outline-inverse,\n  [type=button].usa-button-secondary-inverse,\n  [type=button].usa-button-outline-inverse,\n  [type=submit].usa-button-secondary-inverse,\n  [type=submit].usa-button-outline-inverse,\n  [type=reset].usa-button-secondary-inverse,\n  [type=reset].usa-button-outline-inverse,\n  [type=image].usa-button-secondary-inverse,\n  [type=image].usa-button-outline-inverse {\n    background: transparent;\n    box-shadow: inset 0 0 0 2px #ffffff;\n    color: #ffffff; }\n    .usa-button.usa-button-secondary-inverse:hover, .usa-button.usa-button-secondary-inverse.usa-button-hover, .usa-button.usa-button-outline-inverse:hover, .usa-button.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-secondary-inverse:hover,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-outline-inverse:hover,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-secondary-inverse:hover,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-outline-inverse:hover,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse:hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-outline-inverse:hover,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,\n    button.usa-button-secondary-inverse:hover,\n    button.usa-button-secondary-inverse.usa-button-hover,\n    button.usa-button-outline-inverse:hover,\n    button.usa-button-outline-inverse.usa-button-hover,\n    [type=button].usa-button-secondary-inverse:hover,\n    [type=button].usa-button-secondary-inverse.usa-button-hover,\n    [type=button].usa-button-outline-inverse:hover,\n    [type=button].usa-button-outline-inverse.usa-button-hover,\n    [type=submit].usa-button-secondary-inverse:hover,\n    [type=submit].usa-button-secondary-inverse.usa-button-hover,\n    [type=submit].usa-button-outline-inverse:hover,\n    [type=submit].usa-button-outline-inverse.usa-button-hover,\n    [type=reset].usa-button-secondary-inverse:hover,\n    [type=reset].usa-button-secondary-inverse.usa-button-hover,\n    [type=reset].usa-button-outline-inverse:hover,\n    [type=reset].usa-button-outline-inverse.usa-button-hover,\n    [type=image].usa-button-secondary-inverse:hover,\n    [type=image].usa-button-secondary-inverse.usa-button-hover,\n    [type=image].usa-button-outline-inverse:hover,\n    [type=image].usa-button-outline-inverse.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #c9c9c9;\n      color: #c9c9c9; }\n    .usa-button.usa-button-secondary-inverse:active, .usa-button.usa-button-secondary-inverse.usa-button-active, .usa-button.usa-button-outline-inverse:active, .usa-button.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary.usa-button-secondary-inverse:active,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary.usa-button-outline-inverse:active,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-active,\n    .usa-button:visited.usa-button-secondary-inverse:active,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button:visited.usa-button-outline-inverse:active,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary-inverse:active,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-outline-inverse:active,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,\n    button.usa-button-secondary-inverse:active,\n    button.usa-button-secondary-inverse.usa-button-active,\n    button.usa-button-outline-inverse:active,\n    button.usa-button-outline-inverse.usa-button-active,\n    [type=button].usa-button-secondary-inverse:active,\n    [type=button].usa-button-secondary-inverse.usa-button-active,\n    [type=button].usa-button-outline-inverse:active,\n    [type=button].usa-button-outline-inverse.usa-button-active,\n    [type=submit].usa-button-secondary-inverse:active,\n    [type=submit].usa-button-secondary-inverse.usa-button-active,\n    [type=submit].usa-button-outline-inverse:active,\n    [type=submit].usa-button-outline-inverse.usa-button-active,\n    [type=reset].usa-button-secondary-inverse:active,\n    [type=reset].usa-button-secondary-inverse.usa-button-active,\n    [type=reset].usa-button-outline-inverse:active,\n    [type=reset].usa-button-outline-inverse.usa-button-active,\n    [type=image].usa-button-secondary-inverse:active,\n    [type=image].usa-button-secondary-inverse.usa-button-active,\n    [type=image].usa-button-outline-inverse:active,\n    [type=image].usa-button-outline-inverse.usa-button-active {\n      box-shadow: inset 0 0 0 2px #999999;\n      color: #c9c9c9; }\n  .usa-button.usa-button-gray,\n  .usa-button-primary.usa-button-gray,\n  .usa-button:visited.usa-button-gray,\n  .usa-button-primary:visited.usa-button-gray,\n  button.usa-button-gray,\n  [type=button].usa-button-gray,\n  [type=submit].usa-button-gray,\n  [type=reset].usa-button-gray,\n  [type=image].usa-button-gray {\n    background-color: #666666; }\n    .usa-button.usa-button-gray:hover, .usa-button.usa-button-gray.usa-button-hover,\n    .usa-button-primary.usa-button-gray:hover,\n    .usa-button-primary.usa-button-gray.usa-button-hover,\n    .usa-button:visited.usa-button-gray:hover,\n    .usa-button:visited.usa-button-gray.usa-button-hover,\n    .usa-button-primary:visited.usa-button-gray:hover,\n    .usa-button-primary:visited.usa-button-gray.usa-button-hover,\n    button.usa-button-gray:hover,\n    button.usa-button-gray.usa-button-hover,\n    [type=button].usa-button-gray:hover,\n    [type=button].usa-button-gray.usa-button-hover,\n    [type=submit].usa-button-gray:hover,\n    [type=submit].usa-button-gray.usa-button-hover,\n    [type=reset].usa-button-gray:hover,\n    [type=reset].usa-button-gray.usa-button-hover,\n    [type=image].usa-button-gray:hover,\n    [type=image].usa-button-gray.usa-button-hover {\n      background-color: #333333; }\n    .usa-button.usa-button-gray:active, .usa-button.usa-button-gray.usa-button-active,\n    .usa-button-primary.usa-button-gray:active,\n    .usa-button-primary.usa-button-gray.usa-button-active,\n    .usa-button:visited.usa-button-gray:active,\n    .usa-button:visited.usa-button-gray.usa-button-active,\n    .usa-button-primary:visited.usa-button-gray:active,\n    .usa-button-primary:visited.usa-button-gray.usa-button-active,\n    button.usa-button-gray:active,\n    button.usa-button-gray.usa-button-active,\n    [type=button].usa-button-gray:active,\n    [type=button].usa-button-gray.usa-button-active,\n    [type=submit].usa-button-gray:active,\n    [type=submit].usa-button-gray.usa-button-active,\n    [type=reset].usa-button-gray:active,\n    [type=reset].usa-button-gray.usa-button-active,\n    [type=image].usa-button-gray:active,\n    [type=image].usa-button-gray.usa-button-active {\n      background-color: #212121; }\n  .usa-button.usa-button-red,\n  .usa-button-primary.usa-button-red,\n  .usa-button:visited.usa-button-red,\n  .usa-button-primary:visited.usa-button-red,\n  button.usa-button-red,\n  [type=button].usa-button-red,\n  [type=submit].usa-button-red,\n  [type=reset].usa-button-red,\n  [type=image].usa-button-red {\n    background-color: #005495; }\n    .usa-button.usa-button-red:hover, .usa-button.usa-button-red.usa-button-hover,\n    .usa-button-primary.usa-button-red:hover,\n    .usa-button-primary.usa-button-red.usa-button-hover,\n    .usa-button:visited.usa-button-red:hover,\n    .usa-button:visited.usa-button-red.usa-button-hover,\n    .usa-button-primary:visited.usa-button-red:hover,\n    .usa-button-primary:visited.usa-button-red.usa-button-hover,\n    button.usa-button-red:hover,\n    button.usa-button-red.usa-button-hover,\n    [type=button].usa-button-red:hover,\n    [type=button].usa-button-red.usa-button-hover,\n    [type=submit].usa-button-red:hover,\n    [type=submit].usa-button-red.usa-button-hover,\n    [type=reset].usa-button-red:hover,\n    [type=reset].usa-button-red.usa-button-hover,\n    [type=image].usa-button-red:hover,\n    [type=image].usa-button-red.usa-button-hover {\n      background-color: #981b1e; }\n    .usa-button.usa-button-red:active, .usa-button.usa-button-red.usa-button-active,\n    .usa-button-primary.usa-button-red:active,\n    .usa-button-primary.usa-button-red.usa-button-active,\n    .usa-button:visited.usa-button-red:active,\n    .usa-button:visited.usa-button-red.usa-button-active,\n    .usa-button-primary:visited.usa-button-red:active,\n    .usa-button-primary:visited.usa-button-red.usa-button-active,\n    button.usa-button-red:active,\n    button.usa-button-red.usa-button-active,\n    [type=button].usa-button-red:active,\n    [type=button].usa-button-red.usa-button-active,\n    [type=submit].usa-button-red:active,\n    [type=submit].usa-button-red.usa-button-active,\n    [type=reset].usa-button-red:active,\n    [type=reset].usa-button-red.usa-button-active,\n    [type=image].usa-button-red:active,\n    [type=image].usa-button-red.usa-button-active {\n      background-color: #cd2026; }\n  .usa-button.usa-button-big,\n  .usa-button-primary.usa-button-big,\n  .usa-button:visited.usa-button-big,\n  .usa-button-primary:visited.usa-button-big,\n  button.usa-button-big,\n  [type=button].usa-button-big,\n  [type=submit].usa-button-big,\n  [type=reset].usa-button-big,\n  [type=image].usa-button-big {\n    border-radius: 8px;\n    font-size: 2.4rem;\n    padding: 1.5rem 3rem; }\n  .usa-button:disabled,\n  .usa-button-primary:disabled,\n  .usa-button:visited:disabled,\n  .usa-button-primary:visited:disabled,\n  button:disabled,\n  [type=button]:disabled,\n  [type=submit]:disabled,\n  [type=reset]:disabled,\n  [type=image]:disabled {\n    background-color: #c9c9c9;\n    pointer-events: none; }\n    .usa-button:disabled:hover, .usa-button:disabled.usa-button-hover, .usa-button:disabled:active, .usa-button:disabled.usa-button-active, .usa-button:disabled:focus, .usa-button:disabled.usa-focus,\n    .usa-button-primary:disabled:hover,\n    .usa-button-primary:disabled.usa-button-hover,\n    .usa-button-primary:disabled:active,\n    .usa-button-primary:disabled.usa-button-active,\n    .usa-button-primary:disabled:focus,\n    .usa-button-primary:disabled.usa-focus,\n    .usa-button:visited:disabled:hover,\n    .usa-button:visited:disabled.usa-button-hover,\n    .usa-button:visited:disabled:active,\n    .usa-button:visited:disabled.usa-button-active,\n    .usa-button:visited:disabled:focus,\n    .usa-button:visited:disabled.usa-focus,\n    .usa-button-primary:visited:disabled:hover,\n    .usa-button-primary:visited:disabled.usa-button-hover,\n    .usa-button-primary:visited:disabled:active,\n    .usa-button-primary:visited:disabled.usa-button-active,\n    .usa-button-primary:visited:disabled:focus,\n    .usa-button-primary:visited:disabled.usa-focus,\n    button:disabled:hover,\n    button:disabled.usa-button-hover,\n    button:disabled:active,\n    button:disabled.usa-button-active,\n    button:disabled:focus,\n    button:disabled.usa-focus,\n    [type=button]:disabled:hover,\n    [type=button]:disabled.usa-button-hover,\n    [type=button]:disabled:active,\n    [type=button]:disabled.usa-button-active,\n    [type=button]:disabled:focus,\n    [type=button]:disabled.usa-focus,\n    [type=submit]:disabled:hover,\n    [type=submit]:disabled.usa-button-hover,\n    [type=submit]:disabled:active,\n    [type=submit]:disabled.usa-button-active,\n    [type=submit]:disabled:focus,\n    [type=submit]:disabled.usa-focus,\n    [type=reset]:disabled:hover,\n    [type=reset]:disabled.usa-button-hover,\n    [type=reset]:disabled:active,\n    [type=reset]:disabled.usa-button-active,\n    [type=reset]:disabled:focus,\n    [type=reset]:disabled.usa-focus,\n    [type=image]:disabled:hover,\n    [type=image]:disabled.usa-button-hover,\n    [type=image]:disabled:active,\n    [type=image]:disabled.usa-button-active,\n    [type=image]:disabled:focus,\n    [type=image]:disabled.usa-focus {\n      background-color: #c9c9c9;\n      border: 0;\n      box-shadow: none; }\n\n/* stylelint-disable */\n.usa-button-disabled {\n  background-color: #c9c9c9;\n  pointer-events: none; }\n  .usa-button-disabled:hover, .usa-button-disabled.usa-button-hover, .usa-button-disabled:active, .usa-button-disabled.usa-button-active, .usa-button-disabled:focus, .usa-button-disabled.usa-focus {\n    background-color: #c9c9c9;\n    border: 0;\n    box-shadow: none; }\n\n.usa-button-secondary-disabled,\n.usa-button-secondary-inverse-disabled,\n.usa-button-secondary:disabled,\n.usa-button-secondary-inverse:disabled,\n.usa-button-outline-inverse:disabled {\n  box-shadow: inset 0 0 0 2px #c9c9c9;\n  pointer-events: none;\n  color: #c9c9c9; }\n  .usa-button-secondary-disabled:hover, .usa-button-secondary-disabled.usa-button-hover, .usa-button-secondary-disabled:active, .usa-button-secondary-disabled.usa-button-active, .usa-button-secondary-disabled:focus, .usa-button-secondary-disabled.usa-focus,\n  .usa-button-secondary-inverse-disabled:hover,\n  .usa-button-secondary-inverse-disabled.usa-button-hover,\n  .usa-button-secondary-inverse-disabled:active,\n  .usa-button-secondary-inverse-disabled.usa-button-active,\n  .usa-button-secondary-inverse-disabled:focus,\n  .usa-button-secondary-inverse-disabled.usa-focus,\n  .usa-button-secondary:disabled:hover,\n  .usa-button-secondary:disabled.usa-button-hover,\n  .usa-button-secondary:disabled:active,\n  .usa-button-secondary:disabled.usa-button-active,\n  .usa-button-secondary:disabled:focus,\n  .usa-button-secondary:disabled.usa-focus,\n  .usa-button-secondary-inverse:disabled:hover,\n  .usa-button-secondary-inverse:disabled.usa-button-hover,\n  .usa-button-secondary-inverse:disabled:active,\n  .usa-button-secondary-inverse:disabled.usa-button-active,\n  .usa-button-secondary-inverse:disabled:focus,\n  .usa-button-secondary-inverse:disabled.usa-focus,\n  .usa-button-outline-inverse:disabled:hover,\n  .usa-button-outline-inverse:disabled.usa-button-hover,\n  .usa-button-outline-inverse:disabled:active,\n  .usa-button-outline-inverse:disabled.usa-button-active,\n  .usa-button-outline-inverse:disabled:focus,\n  .usa-button-outline-inverse:disabled.usa-focus {\n    background-color: #ffffff;\n    border: 0; }\n\nhtml .usa-button-secondary-disabled,\n.usa-button-secondary:disabled {\n  background-color: #ffffff; }\n\nhtml .usa-button-secondary-inverse-disabled,\n.usa-button-secondary-inverse:disabled {\n  background-color: transparent;\n  color: #666666;\n  box-shadow: inset 0 0 0 2px #666666; }\n\n.usa-button-unstyled {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto; }\n  .usa-button-unstyled:hover {\n    background-color: transparent; }\n\n.usa-embed-container iframe,\n.usa-embed-container object,\n.usa-embed-container embed {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 100%;\n  height: 100%; }\n\n.usa-embed-container {\n  padding-bottom: 56.25%;\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  max-width: 100%; }\n\nimg {\n  max-width: 100%; }\n\n.media_link {\n  display: inline-block;\n  line-height: 0; }\n\n/* stylelint-disable selector-no-qualifying-type */\ninput,\ntextarea,\nselect {\n  appearance: none;\n  border: 0.1rem solid #666666;\n  border-radius: 0;\n  box-sizing: border-box;\n  color: #212121;\n  display: block;\n  font-size: 1.7rem;\n  height: 4.4rem;\n  line-height: 1.3;\n  margin: 0.2em 0;\n  max-width: 46rem;\n  padding: 1rem 0.7em;\n  width: 100%; }\n  input.usa-input-success,\n  textarea.usa-input-success,\n  select.usa-input-success {\n    border: 3px solid #4aa564; }\n\n/* stylelint-enable */\n.usa-input-error {\n  border-left: 4px solid #981b1e;\n  margin-top: 3rem;\n  padding-bottom: 0.8rem;\n  padding-left: 1.5rem;\n  padding-top: 0.8rem;\n  position: relative;\n  right: 1.9rem; }\n  .usa-input-error input,\n  .usa-input-error textarea,\n  .usa-input-error select {\n    border: 3px solid #981b1e;\n    width: calc(100% + 1.9rem); }\n  .usa-input-error label {\n    margin-top: 0; }\n  .usa-input-error .usa-input-inline {\n    border: 0.1rem solid #666666;\n    width: inherit; }\n  .usa-input-error .usa-input-inline-error {\n    border: 3px solid #981b1e; }\n\n.usa-input-error-label {\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700; }\n\n.usa-input-error-message {\n  color: #981b1e;\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700;\n  padding-bottom: 3px;\n  padding-top: 3px; }\n\n.usa-input-required:after {\n  color: #cd2026;\n  content: ' (*required)'; }\n\n.usa-input-optional:after {\n  color: #757575;\n  content: ' (optional)'; }\n\nlabel {\n  display: block;\n  margin-top: 3rem;\n  max-width: 46rem; }\n\ntextarea {\n  height: 16rem; }\n\nselect {\n  -moz-appearance: none;\n  -webkit-appearance: none;\n  appearance: none;\n  background-color: #ffffff;\n  background-image: url(\"../img/arrow-both.png\");\n  background-image: url(\"../img/arrow-both.svg\");\n  background-position: right 1.3rem center;\n  background-repeat: no-repeat;\n  background-size: 1rem;\n  padding-right: 3rem; }\n  select::-ms-expand {\n    display: none; }\n  select:-webkit-autofill {\n    appearance: menulist; }\n  select:-moz-focusring {\n    color: transparent;\n    text-shadow: 0 0 0 #000000; }\n\noption:first-child {\n  font-weight: 700; }\n\nlegend {\n  font-size: 3rem;\n  font-weight: 700; }\n\n.usa-fieldset-inputs label {\n  margin-top: 0; }\n\n.usa-form-hint {\n  color: #757575;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0; }\n\n[type=checkbox],\n[type=radio] {\n  position: absolute;\n  left: -999em; }\n  .lt-ie9 [type=checkbox], .lt-ie9\n  [type=radio] {\n    border: 0;\n    float: left;\n    margin: 0.4em 0.4em 0 0;\n    position: static;\n    width: auto; }\n\n[type=checkbox] + label,\n[type=radio] + label {\n  cursor: pointer;\n  font-weight: 400;\n  margin-bottom: 0.65em; }\n\n[type=checkbox] + label::before,\n[type=radio] + label::before {\n  background: #ffffff;\n  border-radius: 2px;\n  box-shadow: 0 0 0 1px #757575;\n  content: '\\a0';\n  display: inline-block;\n  height: 2rem;\n  line-height: 2rem;\n  margin-right: 0.6em;\n  text-indent: 0.15em;\n  vertical-align: middle\\0;\n  width: 2rem; }\n\n[type=radio] + label::before {\n  border-radius: 100%;\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 3px #757575;\n  height: 1.4rem;\n  line-height: 1.4rem;\n  margin-right: 0.75em;\n  width: 1.4rem; }\n\n[type=checkbox]:checked + label::before,\n[type=radio]:checked + label::before {\n  background-color: #0071BC;\n  box-shadow: 0 0 0 1px #0071BC; }\n\n[type=radio]:checked + label::before {\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #0071BC; }\n\n[type=checkbox]:checked + label::before,\n[type=checkbox]:checked:disabled + label::before {\n  background-image: url(\"../img/correct8.png\");\n  background-image: url(\"../img/correct8.svg\");\n  background-position: 50%;\n  background-repeat: no-repeat; }\n\n[type=radio]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 6px; }\n\n[type=checkbox]:disabled + label {\n  color: #c9c9c9; }\n\n[type=checkbox]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n[type=checkbox]:disabled + label::before,\n[type=radio]:disabled + label::before {\n  background: #e4e4e4;\n  box-shadow: 0 0 0 1px #999999;\n  cursor: not-allowed; }\n\n[type=range] {\n  -webkit-appearance: none;\n  border: none;\n  padding-left: 0;\n  width: 100%; }\n\n[type=range]::-webkit-slider-runnable-track {\n  background: #999999;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-moz-range-track {\n  background: #0071BC;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-ms-track {\n  background: transparent;\n  color: transparent;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-webkit-slider-thumb {\n  -webkit-appearance: none;\n  border: 1px solid #757575;\n  height: 2.2rem;\n  border-radius: 1.5rem;\n  background: #e4e4e4;\n  cursor: pointer;\n  margin-top: -.65rem;\n  width: 2.2rem; }\n\n[type=range]::-moz-range-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-fill-lower {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n[type=range]::-ms-fill-upper {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n.usa-date-of-birth label {\n  margin-top: 0; }\n\n.usa-date-of-birth [type=number]::-webkit-inner-spin-button,\n.usa-date-of-birth [type=number]::-webkit-outer-spin-button {\n  -webkit-appearance: none;\n  appearance: none;\n  margin: 0; }\n\n.usa-date-of-birth [type=number] {\n  -moz-appearance: textfield; }\n\n.usa-form-group-day,\n.usa-form-group-month,\n.usa-form-group-year {\n  clear: none;\n  float: left;\n  margin-right: 1.5rem;\n  width: 5rem; }\n\n.usa-form-group-year {\n  width: 7rem; }\n\n.usa-label, .usa-label-big {\n  background-color: #666666;\n  border-radius: 2px;\n  color: #ffffff;\n  font-size: 1.5rem;\n  margin-right: 0.5rem;\n  padding: 0.1rem 0.7rem;\n  text-transform: uppercase; }\n  .usa-label:only-of-type, .usa-label-big:only-of-type {\n    margin-right: 0; }\n\n.usa-label-big {\n  font-size: 1.7rem;\n  padding-left: 0.9rem;\n  padding-right: 0.9rem; }\n\nul,\nol {\n  margin-top: 1em;\n  margin-bottom: 1em;\n  padding-left: 1.94em; }\n\nli {\n  line-height: 1.5;\n  margin-bottom: 0.5em; }\n  li:last-child {\n    margin-bottom: 0; }\n\nh1 + ul,\nh1 + ol,\nh2 + ul,\nh2 + ol,\nh3 + ul,\nh3 + ol,\nh4 + ul,\nh4 + ol,\nh5 + ul,\nh5 + ol,\nh6 + ul,\nh6 + ol,\np + ul,\np + ol {\n  margin-top: 0; }\n\n.usa-unstyled-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-unstyled-list > li {\n    margin-bottom: 0; }\n\ntable {\n  border-spacing: 0;\n  margin: 2em 0; }\n\nthead th {\n  font-weight: 700; }\n\nthead th,\nthead td {\n  background-color: #e4e4e4; }\n\nth {\n  text-align: left; }\n\nth,\ntd {\n  background-color: #ffffff;\n  border: 1px solid #666666;\n  font-weight: 400;\n  padding: 1rem 1.5rem; }\n\n.usa-table-borderless thead th {\n  background-color: transparent;\n  border-top: 0; }\n\n.usa-table-borderless th,\n.usa-table-borderless td {\n  border-left: 0;\n  border-right: 0; }\n\n.usa-table-borderless th:first-child {\n  padding-left: 0; }\n\ncaption {\n  font-size: 1.5rem;\n  font-weight: 700;\n  font-family: \"Work Sans\", sans-serif;\n  margin-bottom: 1.2rem;\n  text-align: left; }\n\nhtml {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 10px; }\n\nbody {\n  font-size: 1.7rem; }\n\np {\n  line-height: 1.5;\n  margin-bottom: 1em;\n  margin-top: 1em; }\n\na {\n  color: #0071BC;\n  text-decoration: underline; }\n  a:hover, a:active {\n    color: #205493; }\n  a:focus {\n    outline: 2px dotted #999999;\n    outline-offset: 3px; }\n  a:visited {\n    color: #4c2c92; }\n\n.usa-external_link::after {\n  background: url(\"../img/external-link.png\") no-repeat 0 0;\n  background: url(\"../img/external-link.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link:hover::after {\n  background-image: url(\"../img/external-link-hover.png\");\n  background-image: url(\"../img/external-link-hover.svg\"); }\n\n.usa-external_link-alt::after {\n  background: url(\"../img/external-link-alt.png\") no-repeat 0 0;\n  background: url(\"../img/external-link-alt.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link-alt:hover::after {\n  background-image: url(\"../img/external-link-alt-hover.png\");\n  background-image: url(\"../img/external-link-alt-hover.svg\"); }\n\nh1,\nh2,\nh3,\nh4,\nh5 {\n  clear: both;\n  font-family: \"Work Sans\", sans-serif;\n  line-height: 1.3;\n  margin-bottom: .5em;\n  margin-top: 1.5em; }\n\nh6 {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\nh1 {\n  font-size: 4rem;\n  font-weight: 700; }\n\nh2 {\n  font-size: 3rem;\n  font-weight: 700; }\n\nh3 {\n  font-size: 2rem;\n  font-weight: 700; }\n\nh4 {\n  font-size: 1.7rem;\n  font-weight: 700; }\n\nh5 {\n  font-size: 1.5rem;\n  font-weight: 700; }\n\nh6 {\n  font-size: 1.3rem;\n  font-weight: 400;\n  line-height: 1.5;\n  text-transform: uppercase; }\n\ncite,\nvar,\naddress,\ndfn {\n  font-style: normal; }\n\n.usa-content p,\n.usa-content ul:not(.usa-accordion):not(.usa-accordion-bordered),\n.usa-content ol:not(.usa-accordion):not(.usa-accordion-bordered) {\n  max-width: 66ch; }\n\n.usa-content-list {\n  max-width: 66ch; }\n\n.usa-sans p,\n.usa-sans a,\n.usa-sans li,\n.usa-sans span {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\n.usa-sans a {\n  border-bottom: none;\n  font-weight: 700; }\n\n.usa-serif p,\n.usa-serif a,\n.usa-serif li,\n.usa-serif span {\n  font-family: \"Work Sans\", sans-serif; }\n\n.usa-display {\n  font-size: 2rem;\n  font-weight: 700;\n  margin-bottom: 0; }\n  @media screen and (min-width: 481px) {\n    .usa-display {\n      font-size: 4rem;\n      font-weight: 700; } }\n  @media screen and (min-width: 600px) {\n    .usa-display {\n      font-size: 5.2rem;\n      font-weight: 700; } }\n\n.usa-font-lead {\n  font-family: \"Work Sans\", sans-serif;\n  font-size: 2rem;\n  font-weight: 400;\n  line-height: 1.7;\n  max-width: 77rem; }\n\n.usa-image-block {\n  position: relative; }\n\n.usa-image-text-block {\n  color: #ffffff;\n  left: 0;\n  margin-left: 8%;\n  position: absolute;\n  top: 0; }\n\n.usa-image-text {\n  margin-top: 0; }\n\n.usa-drop_text {\n  margin-bottom: 0; }\n\n.usa-background-dark {\n  background-color: #333333; }\n  .usa-background-dark p,\n  .usa-background-dark span {\n    color: #ffffff; }\n  .usa-background-dark a {\n    color: #c9c9c9; }\n    .usa-background-dark a:hover {\n      color: #ffffff; }\n\n.usa-text-small {\n  font-size: 1.3rem;\n  margin-top: 0; }\n\n.usa-section > :first-child,\n.usa-grid > :first-child,\n.usa-grid-full > :first-child {\n  margin-top: 0; }\n\n.usa-section > :last-child,\n.usa-grid > :last-child,\n.usa-grid-full > :last-child {\n  margin-bottom: 0; }\n\n.usa-width-one-whole:first-child > :first-child,\n.usa-width-one-half:first-child > :first-child,\n.usa-width-one-third:first-child > :first-child,\n.usa-width-two-thirds:first-child > :first-child,\n.usa-width-one-fourth:first-child > :first-child,\n.usa-width-three-fourths:first-child > :first-child,\n.usa-width-one-sixth:first-child > :first-child,\n.usa-width-five-sixths:first-child > :first-child,\n.usa-width-one-twelfth:first-child > :first-child {\n  margin-top: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :first-child,\n  .usa-width-one-half > :first-child,\n  .usa-width-one-third > :first-child,\n  .usa-width-two-thirds > :first-child,\n  .usa-width-one-fourth > :first-child,\n  .usa-width-three-fourths > :first-child,\n  .usa-width-one-sixth > :first-child,\n  .usa-width-five-sixths > :first-child,\n  .usa-width-one-twelfth > :first-child {\n    margin-top: 0; } }\n\n.usa-width-one-whole:last-child > :last-child,\n.usa-width-one-half:last-child > :last-child,\n.usa-width-one-third:last-child > :last-child,\n.usa-width-two-thirds:last-child > :last-child,\n.usa-width-one-fourth:last-child > :last-child,\n.usa-width-three-fourths:last-child > :last-child,\n.usa-width-one-sixth:last-child > :last-child,\n.usa-width-five-sixths:last-child > :last-child,\n.usa-width-one-twelfth:last-child > :last-child {\n  margin-bottom: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :last-child,\n  .usa-width-one-half > :last-child,\n  .usa-width-one-third > :last-child,\n  .usa-width-two-thirds > :last-child,\n  .usa-width-one-fourth > :last-child,\n  .usa-width-three-fourths > :last-child,\n  .usa-width-one-sixth > :last-child,\n  .usa-width-five-sixths > :last-child,\n  .usa-width-one-twelfth > :last-child {\n    margin-bottom: 0; } }\n\n.usa-accordion,\n.usa-accordion-bordered {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  color: #212121;\n  margin: 0;\n  padding: 0;\n  width: 100%; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    margin-bottom: 0; }\n  .usa-accordion > ul li ul,\n  .usa-accordion-bordered > ul li ul {\n    list-style: disc; }\n    .usa-accordion > ul li ul > li > ul,\n    .usa-accordion-bordered > ul li ul > li > ul {\n      list-style: circle; }\n      .usa-accordion > ul li ul > li > ul > li > ul,\n      .usa-accordion-bordered > ul li ul > li > ul > li > ul {\n        list-style: square; }\n  .usa-accordion + .usa-accordion,\n  .usa-accordion + .usa-accordion-bordered,\n  .usa-accordion-bordered + .usa-accordion,\n  .usa-accordion-bordered + .usa-accordion-bordered {\n    margin-top: 1rem; }\n  .usa-accordion > ul,\n  .usa-accordion-bordered > ul {\n    margin-top: 0;\n    margin-bottom: 0;\n    list-style-type: none;\n    padding-left: 0;\n    color: #212121;\n    margin: 0;\n    padding: 0;\n    width: 100%; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      margin-bottom: 0; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      background-color: #e4e4e4;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      list-style: none;\n      margin-bottom: 0.5rem;\n      width: 100%; }\n    .usa-accordion > ul button,\n    .usa-accordion-bordered > ul button {\n      background-color: transparent;\n      border: 0;\n      border-radius: 0;\n      font-weight: 400;\n      margin: 0;\n      padding: 0;\n      text-align: left;\n      -webkit-font-smoothing: auto;\n      background-color: #e4e4e4;\n      background-image: url(\"../img/minus.png\");\n      background-image: url(\"../img/minus.svg\");\n      background-position: right 2rem center;\n      background-repeat: no-repeat;\n      background-size: 1.5rem;\n      color: #212121;\n      cursor: pointer;\n      display: inline-block;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      font-weight: 700;\n      margin: 0;\n      padding: 1.5rem 5.5rem 1.5rem 2rem;\n      width: 100%; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: transparent; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: #c9c9c9;\n        color: #212121; }\n      .usa-accordion > ul button h1,\n      .usa-accordion > ul button h2,\n      .usa-accordion > ul button h3,\n      .usa-accordion > ul button h4,\n      .usa-accordion > ul button h5,\n      .usa-accordion > ul button h6,\n      .usa-accordion-bordered > ul button h1,\n      .usa-accordion-bordered > ul button h2,\n      .usa-accordion-bordered > ul button h3,\n      .usa-accordion-bordered > ul button h4,\n      .usa-accordion-bordered > ul button h5,\n      .usa-accordion-bordered > ul button h6 {\n        margin: 0; }\n    .usa-accordion > ul [aria-expanded=false],\n    .usa-accordion-bordered > ul [aria-expanded=false] {\n      background-image: url(\"../img/plus.png\");\n      background-image: url(\"../img/plus.svg\");\n      background-repeat: no-repeat;\n      background-size: 1.5rem; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    background-color: #e4e4e4;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    list-style: none;\n    margin-bottom: 0.5rem;\n    width: 100%; }\n\n.usa-accordion-bordered .usa-accordion-content {\n  border-bottom: 3px solid #e4e4e4;\n  border-left: 3px solid #e4e4e4;\n  border-right: 3px solid #e4e4e4; }\n\n.usa-accordion-content {\n  background-color: #ffffff;\n  overflow: auto;\n  padding: 1.5rem 2rem; }\n  .usa-accordion-content > *:first-child {\n    margin-top: 0; }\n  .usa-accordion-content > *:last-child {\n    margin-bottom: 0; }\n  .usa-accordion-content:not([aria-hidden]) {\n    position: absolute;\n    left: -999em; }\n  .usa-accordion-content[aria-hidden=true] {\n    display: none; }\n\n.usa-accordion-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #e4e4e4;\n  background-image: url(\"../img/minus.png\");\n  background-image: url(\"../img/minus.svg\");\n  background-position: right 2rem center;\n  background-repeat: no-repeat;\n  background-size: 1.5rem;\n  color: #212121;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-weight: 700;\n  margin: 0;\n  padding: 1.5rem 5.5rem 1.5rem 2rem;\n  width: 100%; }\n  .usa-accordion-button:hover {\n    background-color: transparent; }\n  .usa-accordion-button:hover {\n    background-color: #c9c9c9;\n    color: #212121; }\n  .usa-accordion-button h1,\n  .usa-accordion-button h2,\n  .usa-accordion-button h3,\n  .usa-accordion-button h4,\n  .usa-accordion-button h5,\n  .usa-accordion-button h6 {\n    margin: 0; }\n\n.usa-accordion-button[aria-expanded=false] {\n  background-image: url(\"../img/plus.png\");\n  background-image: url(\"../img/plus.svg\");\n  background-repeat: no-repeat;\n  background-size: 1.5rem; }\n\n.usa-alert {\n  background-color: #e4e4e4;\n  background-position: 2rem 2rem;\n  background-repeat: no-repeat;\n  background-size: 5.2rem;\n  padding-bottom: 1.4rem;\n  padding-left: 3rem;\n  padding-right: 2rem;\n  padding-top: 2rem;\n  position: relative; }\n  .usa-alert::before {\n    background-color: #7e7e7e;\n    content: '';\n    height: 100%;\n    left: 0;\n    position: absolute;\n    top: 0;\n    width: 1rem; }\n  .usa-alert a {\n    color: #205493; }\n    .usa-alert a:focus, .usa-alert a:hover {\n      color: #112E51; }\n  .usa-alert ul {\n    margin-bottom: 0;\n    margin-top: 1rem;\n    padding-left: 1rem; }\n\n.usa-alert-slim {\n  background-position: 2rem 1rem;\n  padding-bottom: 1rem;\n  padding-top: 1rem; }\n  .usa-alert-slim .usa-alert-text:only-child {\n    margin-bottom: 0.5rem;\n    padding-top: 0.5rem; }\n\n.usa-alert-icon {\n  display: table-cell;\n  padding-right: 1rem; }\n\n.usa-alert-body {\n  display: table-cell;\n  padding-left: 5rem;\n  vertical-align: top; }\n\n.usa-alert-heading {\n  margin-top: 0;\n  margin-bottom: 0; }\n\n.usa-alert-text {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0;\n  margin-top: 0; }\n\n.usa-alert-text:only-child {\n  margin-bottom: 1rem;\n  padding-top: 0.5rem; }\n\n.usa-alert-success {\n  background-color: #e7f4e4;\n  background-image: url(\"../img/alerts/success.png\");\n  background-image: url(\"../img/alerts/success.svg\"); }\n  .usa-alert-success::before {\n    background-color: #2e8540; }\n\n.usa-alert-warning {\n  background-color: #fff1d2;\n  background-image: url(\"../img/alerts/warning.png\");\n  background-image: url(\"../img/alerts/warning.svg\"); }\n  .usa-alert-warning::before {\n    background-color: #fdb81e; }\n\n.usa-alert-error {\n  background-color: #f9dede;\n  background-image: url(\"../img/alerts/error.png\");\n  background-image: url(\"../img/alerts/error.svg\"); }\n  .usa-alert-error::before {\n    background-color: #005495; }\n\n.usa-alert-info {\n  background-color: #e1f3f8;\n  background-image: url(\"../img/alerts/info.png\");\n  background-image: url(\"../img/alerts/info.svg\"); }\n  .usa-alert-info::before {\n    background-color: #c64b00; }\n\n.usa-alert-no_icon {\n  background-image: none; }\n\n.usa-alert-paragraph {\n  width: 66ch; }\n\n.usa-alert {\n  margin-top: 1.5em; }\n\n.usa-banner {\n  background-color: #e4e4e4;\n  padding-bottom: 0.7rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner {\n      font-size: 1.3rem;\n      padding-bottom: 0; } }\n\n.usa-banner-content {\n  padding-right: 1.5rem;\n  padding-bottom: 3px;\n  padding-left: 1.5rem;\n  background-color: transparent;\n  font-size: 1.5rem;\n  padding-top: 2rem;\n  width: 100%; }\n  @media screen and (min-width: 600px) {\n    .usa-banner-content {\n      padding-bottom: 2.3rem;\n      padding-top: 4rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-banner-content {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n  .usa-banner-content p:first-child {\n    margin-top: 1rem; }\n    @media screen and (min-width: 600px) {\n      .usa-banner-content p:first-child {\n        margin-top: 0; } }\n\n.usa-banner-inner {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  padding-right: 1.5rem;\n  padding-left: 1.5rem;\n  max-width: 1040px; }\n  .usa-banner-inner::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  @media screen and (min-width: 951px) {\n    .usa-banner-inner {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-banner-header {\n  padding-top: 0.55rem;\n  padding-bottom: 0.55rem;\n  font-size: 1.2rem;\n  font-weight: 400; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header {\n      padding-top: 0;\n      padding-bottom: 0; } }\n  .usa-banner-header p {\n    margin-top: 0;\n    margin-bottom: 0;\n    display: inline;\n    overflow: hidden;\n    vertical-align: middle; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header p {\n        margin-top: 2px;\n        margin-bottom: 2px;\n        display: inline-block; } }\n  .usa-banner-header img {\n    float: left;\n    margin-right: 1rem;\n    margin-top: 1px;\n    width: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header img {\n        margin-right: 0.7rem;\n        width: 2rem; } }\n\n.usa-banner-header-expanded {\n  align-items: center;\n  border-bottom: 1px solid #999999;\n  display: flex;\n  font-size: 1.5rem;\n  min-height: 5.6rem;\n  padding-right: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header-expanded {\n      border-bottom: none;\n      display: block;\n      font-size: 1.2rem;\n      font-weight: 400;\n      min-height: 0;\n      padding-right: 0; } }\n  .usa-banner-header-expanded > .usa-banner-inner {\n    margin-left: 0; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded > .usa-banner-inner {\n        margin-left: auto; } }\n  .usa-banner-header-expanded img {\n    margin-right: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded img {\n        margin-right: 0.7rem; } }\n  .usa-banner-header-expanded p {\n    line-height: 1.3;\n    vertical-align: top; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded p {\n        line-height: 1.5;\n        vertical-align: middle; } }\n\n.usa-banner-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  padding-top: 1.3rem;\n  padding-left: 4.8rem;\n  background-position-x: right;\n  color: #0071BC;\n  display: block;\n  font-size: 1.2rem;\n  height: 4.3rem;\n  left: 0;\n  position: absolute;\n  text-decoration: underline;\n  top: 0;\n  width: 100%; }\n  .usa-banner-button:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-button {\n      padding-top: 0;\n      padding-left: 0;\n      /* stylelint-disable declaration-block-no-ignored-properties */\n      display: inline;\n      height: initial;\n      margin-left: 3px;\n      position: relative;\n      vertical-align: middle;\n      width: initial;\n      /* stylelint-enable */ } }\n  .usa-banner-button:hover {\n    color: #205493;\n    text-decoration: underline; }\n  .usa-banner-button[aria-expanded=false] {\n    background-image: none; }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-image: url(\"../img/angle-arrow-down-primary.png\");\n      background-image: url(\"../img/angle-arrow-down-primary.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1rem;\n      width: 1rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    .usa-banner-button[aria-expanded=false]:hover::after {\n      background-image: url(\"../img/angle-arrow-down-primary-hover.png\");\n      background-image: url(\"../img/angle-arrow-down-primary-hover.svg\"); }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-position-y: 1px; }\n  .usa-banner-button[aria-expanded=true] {\n    background-image: none;\n    height: 5.6rem; }\n    .usa-banner-button[aria-expanded=true]::after {\n      background-image: url(\"../img/close.png\");\n      background-image: url(\"../img/close.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1.3rem;\n      width: 1.3rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    @media screen and (min-width: 481px) {\n      .usa-banner-button[aria-expanded=true] {\n        height: initial;\n        padding: 0;\n        position: relative; }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-image: url(\"../img/angle-arrow-up-primary.png\");\n          background-image: url(\"../img/angle-arrow-up-primary.svg\");\n          background-size: 100%;\n          content: '';\n          display: inline-block;\n          height: 1rem;\n          width: 1rem;\n          /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n          margin-left: 0;\n          /* stylelint-enable */ }\n        .usa-banner-button[aria-expanded=true]:hover::after {\n          background-image: url(\"../img/angle-arrow-up-primary-hover.png\");\n          background-image: url(\"../img/angle-arrow-up-primary-hover.svg\"); }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-position-y: 1px; } }\n    .usa-banner-button[aria-expanded=true]::after {\n      position: absolute;\n      right: 1.5rem;\n      top: 2.15rem; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true]::after {\n          position: static; } }\n    .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n      display: none; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n          display: inline; } }\n\n.usa-banner-icon {\n  width: 3.8rem; }\n\n.usa-footer .usa-unstyled-list {\n  display: block; }\n\n.usa-footer .usa-footer-primary-link {\n  color: #212121;\n  display: block;\n  font-weight: 700;\n  margin-top: 0;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: none; }\n  @media screen and (min-width: 600px) {\n    .usa-footer .usa-footer-primary-link {\n      border-top: none; } }\n  .usa-footer .usa-footer-primary-link:hover {\n    text-decoration: underline; }\n\n.usa-footer .usa-footer-primary-link ~ li a,\n.usa-footer .usa-footer-secondary-link {\n  text-decoration: none; }\n\n.usa-footer-contact_info {\n  display: inline-block; }\n  .usa-footer-contact_info a {\n    color: #212121;\n    text-decoration: none; }\n  .usa-footer-contact_info:hover {\n    text-decoration: underline; }\n\n.usa-footer-return-to-top {\n  color: #0071BC;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: underline; }\n\n.usa-footer-primary-section {\n  background-color: #e4e4e4; }\n  .usa-footer-primary-section .usa-footer-primary-content {\n    padding-left: 1.5rem;\n    padding-right: 2.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-primary-section .usa-footer-primary-content {\n        padding-left: 0;\n        padding-right: 0; } }\n    .usa-footer-primary-section .usa-footer-primary-content li {\n      margin-left: 1rem; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-primary-section .usa-footer-primary-content li {\n          margin-left: 0; } }\n  @media screen and (min-width: 600px) {\n    .usa-footer-primary-section .usa-grid-full {\n      padding-left: 2.5rem;\n      padding-right: 2.5rem; } }\n\n.usa-footer-medium .usa-footer-contact_info p {\n  margin: 0 1rem 0 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact_info p {\n      margin: 0 0 0 1rem; } }\n\n.usa-footer-medium .usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact-heading {\n      margin-top: 0.5rem;\n      margin-bottom: 0.5rem; } }\n\n.usa-footer-medium .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-logo {\n      padding: 2rem 0; } }\n\n.usa-footer-medium .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-medium .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-medium .usa-footer-nav ul {\n    align-items: center; } }\n\n.usa-footer-slim .usa-footer-nav a {\n  display: block; }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n.usa-footer-slim .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-slim .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-slim .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-primary-section {\n    padding-bottom: 0;\n    padding-top: 0; }\n    .usa-footer-slim .usa-footer-primary-section .usa-grid-full {\n      align-items: center; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info > * {\n    margin: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    padding-top: 1.5rem;\n    padding-bottom: 1.5rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    width: 100%; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-footer-slim .usa-footer-contact_info:last-child {\n      margin-right: 0; } }\n\n/* stylelint-disable selector-no-qualifying-type */\nul.usa-footer-primary-content,\nli.usa-footer-primary-content,\nli.usa-footer-primary-content {\n  border-top: 1px solid #999999; }\n  @media screen and (min-width: 600px) {\n    ul.usa-footer-primary-content,\n    li.usa-footer-primary-content,\n    li.usa-footer-primary-content {\n      border: none; } }\n  ul.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      ul.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child {\n        border-bottom: none; } }\n\n/* stylelint-enable */\n.usa-sign_up-block {\n  padding-bottom: 4.5rem;\n  padding-left: 1.5rem;\n  padding-right: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-sign_up-block {\n      float: right;\n      padding: 0; } }\n  .usa-sign_up-block label:first-of-type {\n    margin-top: 0; }\n  .usa-sign_up-block button {\n    float: none;\n    margin-right: 0;\n    margin-top: 1.5rem; }\n  .usa-sign_up-block input {\n    width: 100%; }\n\n.usa-footer-secondary_section {\n  background-color: #c9c9c9;\n  padding-bottom: 2rem;\n  padding-top: 2rem; }\n  .usa-footer-secondary_section a {\n    color: #212121; }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big-secondary-section {\n    padding-top: 2rem;\n    padding-bottom: 2rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-contact-links {\n    text-align: right; } }\n\n.usa-social-links a {\n  text-decoration: none; }\n\n.usa-footer-big .usa-footer-contact_info {\n  display: block; }\n  .usa-footer-big .usa-footer-contact_info p {\n    margin: 0 1rem 0 0; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-contact_info p {\n        margin: 0.5rem 0 0 1rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-contact-links {\n    padding-top: 2rem; } }\n\n.usa-footer-big .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-logo {\n      padding: 2rem 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-primary-section {\n    padding-bottom: 4rem;\n    padding-top: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content {\n  padding-left: 0;\n  padding-right: 0; }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n    margin-left: 1.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n        margin-left: 0; } }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link {\n    margin-left: 0; }\n\n.usa-footer-big ul {\n  padding-bottom: 2.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big ul {\n      padding-bottom: 0; } }\n  .usa-footer-big ul:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul:last-child {\n        border-bottom: none; } }\n  .usa-footer-big ul li:not(.usa-footer-primary-link) {\n    line-height: 1.3;\n    padding-bottom: 0.35em;\n    padding-top: 0.35em; }\n  .usa-footer-big ul .usa-footer-primary-link {\n    background-image: url(\"../img/arrow-down.png\");\n    background-image: url(\"../img/arrow-down.svg\");\n    background-position: 1.5rem center;\n    background-repeat: no-repeat;\n    background-size: 1.3rem;\n    margin-left: 0;\n    padding-left: 3.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul .usa-footer-primary-link {\n        background: none;\n        margin-bottom: .8rem;\n        padding-bottom: 0;\n        padding-left: 0; } }\n    .usa-footer-big ul .usa-footer-primary-link > * {\n      margin-top: 0;\n      margin-bottom: 0; }\n  .usa-footer-big ul.hidden {\n    /* stylelint-disable-line selector-no-qualifying-type */\n    padding-bottom: 0; }\n    .usa-footer-big ul.hidden li {\n      display: none; }\n    .usa-footer-big ul.hidden .usa-footer-primary-link {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/arrow-right.png\");\n      background-image: url(\"../img/arrow-right.svg\");\n      cursor: pointer;\n      display: block; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-big ul.hidden .usa-footer-primary-link {\n          background: none;\n          padding-left: 0; } }\n\n.usa-footer-topic {\n  margin: 0;\n  padding: 2rem 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-sign_up-header {\n    margin: 0;\n    padding: 2rem 0; } }\n\n.usa-footer-logo-img {\n  max-width: 8rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-img {\n      float: left; } }\n\n.usa-footer-big-logo-img {\n  max-width: 10rem; }\n\n.usa-footer-slim-logo-img {\n  float: left;\n  max-width: 5rem; }\n\n.usa-footer-logo-heading {\n  display: block;\n  margin-top: 1rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-heading {\n      display: inline-block;\n      margin-top: 3rem;\n      padding-left: 1.5rem; } }\n\n.usa-footer-big-logo-heading {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big-logo-heading {\n      margin-top: 2rem; } }\n\n.usa-footer-slim-logo-heading {\n  display: inline-block;\n  margin-top: 1.5rem;\n  padding-left: 1.5rem; }\n\n.usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-contact-heading {\n      margin-top: 1rem; } }\n\n.usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n  margin: 2.5rem 1rem 1.5rem 0;\n  background-position: center center;\n  background-repeat: no-repeat;\n  background-size: auto 3rem;\n  display: inline-block;\n  height: 4.4rem;\n  left: -1.6rem;\n  position: relative;\n  text-align: center;\n  width: 4.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n      margin: 0 0 0 0.5rem;\n      left: 1.5rem; } }\n  .usa-social_link span, .usa-link-facebook span, .usa-link-twitter span, .usa-link-youtube span, .usa-link-rss span {\n    position: absolute;\n    left: -999em; }\n\n.usa-link-facebook {\n  background-image: url(\"../img/social-icons/png/facebook25.png\");\n  background-image: url(\"../img/social-icons/svg/facebook25.svg\"); }\n\n.usa-link-twitter {\n  background-image: url(\"../img/social-icons/png/twitter16.png\");\n  background-image: url(\"../img/social-icons/svg/twitter16.svg\"); }\n\n.usa-link-youtube {\n  background-image: url(\"../img/social-icons/png/youtube15.png\");\n  background-image: url(\"../img/social-icons/svg/youtube15.svg\"); }\n\n.usa-link-rss {\n  background-image: url(\"../img/social-icons/png/rss25.png\");\n  background-image: url(\"../img/social-icons/svg/rss25.svg\"); }\n\nform a {\n  border-bottom: 0; }\n\nform [type=submit],\nform [type=submit] {\n  display: block;\n  margin-bottom: 1.5em;\n  margin-top: 2.5rem; }\n  @media screen and (min-width: 600px) {\n    form [type=submit],\n    form [type=submit] {\n      padding-left: 2.7em;\n      padding-right: 2.7em;\n      width: auto; } }\n\nform [name=password],\nform [name=confirmPassword] {\n  margin-bottom: 1.1rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-form {\n    max-width: 32rem; } }\n\n.usa-form-note {\n  float: right;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.5rem;\n  margin: 0 0 1.5rem; }\n  .usa-form-note + * {\n    clear: both; }\n\nfieldset {\n  border: none;\n  margin: 0;\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-form-large {\n    max-width: 46rem; } }\n\ninput.usa-input-tiny {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-tiny {\n      max-width: 6rem; } }\n\ninput.usa-input-medium {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-medium {\n      max-width: 12rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid {\n    padding-right: 5%; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid:last-of-type {\n    padding-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-small {\n    float: left;\n    width: 35%; } }\n\n.usa-input-grid-small input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-small select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-medium {\n    float: left;\n    width: 65%; } }\n\n.usa-input-grid-medium input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-medium select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-large {\n    float: left;\n    width: 100%; } }\n\n.usa-input-grid-large input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-large select {\n  margin-bottom: 3rem; }\n\n.usa-additional_text {\n  font-weight: normal; }\n\n.usa-checklist {\n  list-style: none;\n  margin-left: 0;\n  padding-left: 0; }\n  .usa-checklist li {\n    display: inline-block;\n    list-style: none;\n    margin-bottom: 0;\n    margin-top: 0;\n    padding-left: 3em;\n    text-indent: -2em; }\n    .usa-checklist li::before {\n      content: ' ';\n      display: inline-block;\n      height: .8em;\n      margin-right: .2em;\n      width: 1.8em; }\n\n.usa-checklist-checked::before {\n  background-image: url(\"../img/correct9.png\");\n  background-image: url(\"../img/correct9.svg\");\n  background-position: 100%;\n  background-repeat: no-repeat;\n  background-size: 100%; }\n\n.usa-graphic_list .usa-graphic_list-row .usa-media_block {\n  margin-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-graphic_list .usa-graphic_list-row .usa-media_block {\n      margin-bottom: 6rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block {\n    margin-bottom: 0; } }\n\n.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block:last-child {\n  margin-bottom: 0; }\n\n.usa-graphic_list .usa-media_block-img {\n  margin-right: 3rem; }\n\n.usa-graphic_list .usa-media_block-body > :first-child {\n  margin-top: 0; }\n\n.usa-header {\n  width: 100%;\n  z-index: 7000; }\n  @media screen and (min-width: 951px) {\n    .usa-header {\n      border-bottom: 1px solid #c9c9c9; } }\n  .usa-header a {\n    border-bottom: none; }\n  @media screen and (min-width: 951px) {\n    .usa-header .usa-search {\n      float: right;\n      max-width: 21.5rem; } }\n\n.usa-logo {\n  float: left;\n  line-height: 4rem;\n  margin-left: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-logo {\n      line-height: 7.5rem;\n      margin-left: 0; } }\n  .usa-logo a {\n    color: #212121;\n    text-decoration: none; }\n  .usa-logo br {\n    display: none; }\n    @media screen and (min-width: 951px) {\n      .usa-logo br {\n        display: block; } }\n\n.usa-logo-text {\n  display: block;\n  font-size: 1.5rem;\n  font-style: normal;\n  font-weight: 700;\n  margin: 0; }\n  @media screen and (min-width: 951px) {\n    .usa-logo-text {\n      display: block;\n      font-size: 2.4rem;\n      line-height: 1.3; } }\n\n.usa-menu-btn {\n  /* stylelint-disable declaration-block-no-ignored-properties */\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #0071BC;\n  color: #ffffff;\n  display: inline;\n  float: right;\n  font-size: 1.3rem;\n  height: 4rem;\n  line-height: 4rem;\n  text-align: center;\n  text-decoration: none;\n  text-transform: uppercase;\n  width: 5.8rem;\n  /* stylelint-enable */ }\n  .usa-menu-btn:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-menu-btn {\n      display: none; } }\n  .usa-menu-btn:hover {\n    color: #ffffff;\n    background-color: #205493; }\n  .usa-menu-btn:visited {\n    color: #ffffff; }\n\n.usa-overlay {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  background: #000000;\n  opacity: 0;\n  transition: all 0.2s ease-in-out;\n  visibility: hidden;\n  z-index: 8000; }\n  .usa-overlay.is-visible {\n    opacity: 0.1;\n    visibility: visible; }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-logo {\n    bottom: 0;\n    position: absolute; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-navbar {\n    position: relative;\n    width: 18%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-header {\n    border-bottom: none; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-logo {\n    margin-top: 3rem;\n    margin-bottom: 3rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended em {\n    font-size: 3.2rem;\n    line-height: 1; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-navbar {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    display: block;\n    height: auto;\n    max-width: 1040px; }\n    .usa-header-extended .usa-navbar::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav {\n    border-top: 1px solid #c9c9c9;\n    float: none;\n    padding: 0;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-inner {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 1.5rem;\n    margin-top: -1px;\n    max-width: 1040px;\n    position: relative; }\n    .usa-header-extended .usa-nav-inner::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary::after {\n    clear: both;\n    content: \"\";\n    display: block; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-position: right 1.5rem top 53%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link {\n    padding-top: 1.8rem;\n    padding-bottom: 1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-submenu .usa-grid-full {\n    padding-left: 1.2rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-megamenu {\n    padding-left: 3rem; } }\n\n.usa-hero {\n  padding-top: 3rem;\n  padding-bottom: 3rem;\n  background-image: url(\"../img/hero.png\");\n  background-position: center;\n  background-size: cover; }\n  .usa-hero .usa-button {\n    color: #ffffff; }\n\n.usa-section-dark .usa-hero-link {\n  color: #c64b00; }\n\n.usa-hero-callout {\n  background-color: #112E51;\n  padding: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-hero-callout {\n      max-width: 30rem; } }\n  .usa-hero-callout > *:first-child {\n    margin-top: 0;\n    margin-bottom: 2rem; }\n\n.usa-hero-callout-alt {\n  color: #ffffff;\n  display: block; }\n\n.usa-layout-docs {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs {\n      display: inherit; } }\n  .usa-layout-docs .usa-grid > :first-child:not(.usa-width-*) {\n    margin-top: 0; }\n  .usa-layout-docs .usa-grid > :last-child:not(.usa-width-*) {\n    margin-bottom: 0; }\n\n.usa-layout-docs-sidenav {\n  order: 2; }\n\n.usa-layout-docs-main_content {\n  margin-bottom: 3rem;\n  order: 1; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs-main_content {\n      margin-bottom: 0; } }\n  .usa-layout-docs-main_content > :first-child {\n    margin-top: 0; }\n\n.usa-media_block-img {\n  float: left;\n  margin-right: 1rem; }\n\n.usa-media_block-body {\n  overflow: hidden; }\n\n.usa-navbar {\n  border-bottom: 1px solid #999999;\n  height: 4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-navbar {\n      border-bottom: none;\n      display: inline-block;\n      height: 7.8rem; } }\n\n.usa-nav-link {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link:hover span {\n      border-bottom: 0.4rem solid #0071BC;\n      padding-bottom: 0.6rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link.usa-accordion-button span {\n      margin-right: 0;\n      padding-right: 1.5rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-nav-container {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    max-width: 1040px; }\n    .usa-nav-container::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n.usa-nav {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: auto;\n  background: #ffffff;\n  border-left: 1px solid #999999;\n  border-right: 0;\n  display: flex;\n  flex-direction: column;\n  overflow-y: auto;\n  padding: 2rem;\n  transform: translateX(26rem);\n  width: 26rem;\n  z-index: 9000; }\n  @media screen and (min-width: 951px) {\n    .usa-nav {\n      padding-top: 4.5rem;\n      padding-right: 0;\n      padding-bottom: 0;\n      border-left: none;\n      display: block;\n      float: right;\n      overflow-y: visible;\n      position: relative;\n      transform: translateX(0);\n      width: auto; } }\n  .usa-nav.is-visible {\n    transform: translateX(0);\n    transition: all 0.3s ease-in-out; }\n  .usa-nav nav {\n    margin-top: 6rem;\n    min-height: 100%; }\n    @media screen and (min-width: 951px) {\n      .usa-nav nav {\n        margin-top: 0; } }\n  .usa-nav .usa-current {\n    border-left: 4px solid #0071BC;\n    color: #0071BC;\n    font-weight: 700;\n    padding-left: 1.4rem; }\n    @media screen and (min-width: 951px) {\n      .usa-nav .usa-current {\n        color: #212121; } }\n  .usa-nav .usa-button {\n    width: 100%; }\n  @media screen and (min-width: 951px) {\n    .usa-nav .usa-search {\n      margin-left: 1.5rem;\n      top: 4px; } }\n\n.usa-nav-primary {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin-top: 1.5rem;\n  order: 2; }\n  .usa-nav-primary > li {\n    margin-bottom: 0; }\n  .usa-nav-primary > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-nav-primary > li:first-child {\n      border-top: none; }\n  .usa-nav-primary a {\n    border: none;\n    color: #212121;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-nav-primary a:hover {\n      background-color: #e4e4e4;\n      color: #0071BC;\n      text-decoration: none; }\n    .usa-nav-primary a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-nav-primary a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #0071BC;\n      color: #0071BC;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary {\n      display: inline; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary li {\n      border-top: none; } }\n  .usa-nav-primary > li {\n    width: auto; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li {\n        display: inline-block; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a:hover {\n        background-color: transparent; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a {\n      padding-top: 0.75rem;\n      padding-bottom: 0.75rem; } }\n  .usa-nav-primary button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    -moz-osx-font-smoothing: grayscale;\n    -webkit-font-smoothing: antialiased;\n    font-weight: 400;\n    line-height: 1.3;\n    padding: 0.85rem 1.5rem 0.85rem 1.8rem; }\n    .usa-nav-primary button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary button {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1;\n        width: initial; } }\n    .usa-nav-primary button:focus, .usa-nav-primary button:active {\n      box-shadow: 2px dotted #999999; }\n    .usa-nav-primary button:hover {\n      background-color: #e4e4e4;\n      color: #0071BC; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button:hover {\n          background-color: transparent; } }\n    .usa-nav-primary button[aria-expanded=false] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/plus-alt.png\");\n      background-image: url(\"../img/plus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false] {\n          background-image: url(\"../img/angle-arrow-down.png\");\n          background-image: url(\"../img/angle-arrow-down.svg\");\n          background-position: right 1.5rem top 40%; } }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false]:hover {\n          background-image: url(\"../img/angle-arrow-down-primary.png\");\n          background-image: url(\"../img/angle-arrow-down-primary.svg\"); } }\n    .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/minus-alt.png\");\n      background-image: url(\"../img/minus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=true] {\n          background-color: #112E51;\n          color: #ffffff;\n          background-image: url(\"../img/angle-arrow-down-hover.png\");\n          background-image: url(\"../img/angle-arrow-down-hover.svg\");\n          background-position: right 1.5rem top 40%; }\n          .usa-nav-primary button[aria-expanded=true]:hover {\n            background-color: #112E51; }\n          .usa-nav-primary button[aria-expanded=true] span {\n            border-bottom: 0.4rem solid #0071BC;\n            padding-bottom: 0.6rem;\n            color: #ffffff; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a.usa-current,\n    .usa-nav-primary .usa-current {\n      border-left: 0;\n      padding-left: 1.5rem; }\n      .usa-nav-primary a.usa-current:hover span,\n      .usa-nav-primary .usa-current:hover span {\n        color: #0071BC; }\n      .usa-nav-primary a.usa-current span,\n      .usa-nav-primary .usa-current span {\n        border-bottom: 0.4rem solid #0071BC;\n        padding-bottom: 0.6rem;\n        color: #212121; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link:hover span {\n    border-bottom: 0.7rem solid #0071BC;\n    padding-bottom: 0.9rem; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=true] span {\n      border-bottom: 0.7rem solid #0071BC;\n      padding-bottom: 0.9rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary .usa-current span {\n    border-bottom: 0.7rem solid #0071BC;\n    padding-bottom: 0.9rem; } }\n\n.usa-nav-secondary {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary {\n      margin-top: 0;\n      position: absolute;\n      right: 3rem;\n      top: -5.7rem; } }\n  .usa-nav-secondary .usa-search {\n    margin-top: 1.5rem;\n    margin-bottom: 0; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary .usa-search {\n        margin-top: -0.9rem;\n        margin-bottom: 0;\n        margin-left: 0;\n        float: left; } }\n\n.usa-nav-secondary-links {\n  margin-top: 2.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links {\n      float: left;\n      margin-top: 0; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li {\n      display: inline;\n      padding-left: 0.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li:not(:last-child)::after {\n      color: #c9c9c9;\n      content: '|';\n      padding-left: 0.5rem; } }\n  .usa-nav-secondary-links a,\n  .usa-nav-secondary-links .usa-header-search-button {\n    color: #666666;\n    display: inline-block;\n    font-size: 1.5rem;\n    text-decoration: none; }\n    .usa-nav-secondary-links a:hover,\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      color: #0071BC;\n      text-decoration: underline; }\n  .usa-nav-secondary-links .usa-header-search-button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    display: none; }\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button {\n        background-image: url(\"../img/search-alt.png\");\n        background-image: url(\"../img/search-alt.svg\");\n        background-repeat: no-repeat;\n        background-position: left center;\n        background-size: 2.2rem;\n        display: inline-block;\n        padding-left: 2.3rem; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button.is-hidden {\n        display: none; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links a.usa-current {\n      border-left: 0;\n      padding-left: 0; } }\n\n.usa-nav-submenu {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-nav-submenu > li {\n    margin-bottom: 0; }\n  .usa-nav-submenu li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-nav-submenu a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-nav-submenu a:hover, .usa-nav-submenu a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-nav-submenu .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu {\n      margin-top: 0;\n      margin-bottom: 0;\n      list-style-type: none;\n      padding-left: 0;\n      padding-top: 0.75rem;\n      padding-bottom: 0.9rem;\n      background-color: #112E51;\n      width: 21.5rem;\n      position: absolute; }\n      .usa-nav-submenu > li {\n        margin-bottom: 0; } }\n  .usa-nav-submenu[aria-hidden=true] {\n    display: none; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a {\n      color: #ffffff;\n      padding-left: 1.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a:hover {\n      background-color: #112E51;\n      color: #ffffff;\n      padding-left: 1.5rem;\n      text-decoration: underline; } }\n  .usa-nav-submenu li {\n    font-size: 1.5rem;\n    margin-bottom: 0; }\n\n.usa-nav-close {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  margin: -1.2rem -1.5rem 1.5rem auto;\n  float: right;\n  height: 4.4rem;\n  text-align: center;\n  width: 4.4rem; }\n  .usa-nav-close:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-close {\n      display: none; } }\n  .usa-nav-close img {\n    width: 1.3rem; }\n  .usa-nav-close + * {\n    clear: both; }\n\n.usa-mobile_nav-active {\n  overflow: hidden; }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu {\n    padding-top: 3.15rem;\n    padding-bottom: 3.15rem;\n    left: -1rem;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::before {\n    background-color: #112E51;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    right: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::after {\n    background-color: #112E51;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    left: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav {\n    padding-left: 0;\n    padding-top: 0;\n    width: 100%; } }\n\n.usa-header-basic-megamenu .usa-nav-inner {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 951px) {\n    .usa-header-basic-megamenu .usa-nav-inner {\n      display: block;\n      float: right;\n      margin-top: -3.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav-submenu .usa-grid-full {\n    margin-left: -1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu-col {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-megamenu-col:last-child {\n      margin-right: 0; }\n    .usa-megamenu-col:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-megamenu-col:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-megamenu-col:nth-child(4n) {\n      margin-right: 0; } }\n\n.usa-megamenu-col > ul {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-megamenu-col > ul > li {\n    margin-bottom: 0; }\n\n.usa-search {\n  max-width: none;\n  position: relative; }\n  .usa-search::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  .usa-search [type=submit],\n  .usa-search .usa-search-submit {\n    background-image: url(\"../img/search.png\");\n    background-image: url(\"../img/search.svg\");\n    background-position: 50%;\n    background-repeat: no-repeat;\n    border-bottom-left-radius: 0;\n    border-top-left-radius: 0;\n    height: 3.3rem;\n    margin: 0;\n    padding: 0;\n    width: 4.5rem; }\n    @media screen and (min-width: 481px) {\n      .usa-search [type=submit],\n      .usa-search .usa-search-submit {\n        background-image: none;\n        width: 8.5rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-big [type=search],\n    .usa-search.usa-search-big .usa-search-input {\n      font-size: 1.7rem;\n      height: 4.4rem;\n      width: calc(100% - 11.6rem); }\n    .usa-search.usa-search-big [type=submit],\n    .usa-search.usa-search-big .usa-search-submit {\n      font-size: 2rem;\n      height: 4.4rem;\n      width: 11.6rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-small [type=search],\n    .usa-search.usa-search-small .usa-search-input {\n      width: calc(100% - 4.5rem); }\n    .usa-search.usa-search-small [type=submit],\n    .usa-search.usa-search-small .usa-search-submit {\n      background-image: url(\"../img/search.png\");\n      background-image: url(\"../img/search.svg\");\n      background-position: 50%;\n      background-repeat: no-repeat;\n      width: 4.5rem; } }\n  @media screen and (max-width: 950px) {\n    .usa-search.usa-search-small.usa-sr-only {\n      left: auto;\n      position: relative; } }\n\ninput[type=search] {\n  /* stylelint-disable-line selector-no-qualifying-type */\n  box-sizing: border-box;\n  -webkit-appearance: none; }\n\n[type=search],\n.usa-search-input {\n  padding-top: 0;\n  padding-bottom: 0;\n  border-bottom-right-radius: 0;\n  border-right: none;\n  border-top-right-radius: 0;\n  box-sizing: border-box;\n  float: left;\n  font-size: 1.4rem;\n  height: 3.3rem;\n  margin: 0;\n  width: calc(100% - 4.5rem); }\n  @media screen and (min-width: 481px) {\n    [type=search],\n    .usa-search-input {\n      width: calc(100% - 8.5rem); } }\n\n.usa-search-submit-text {\n  position: absolute;\n  left: -999em; }\n  @media screen and (min-width: 481px) {\n    .usa-search-submit-text {\n      position: static; } }\n\n.usa-section {\n  padding-top: 3rem;\n  padding-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-section {\n      padding-top: 6rem;\n      padding-bottom: 6rem; } }\n\n.usa-section-light {\n  background-color: #e4e4e4; }\n\n.usa-section-dark {\n  background-color: #112E51;\n  color: #ffffff; }\n  .usa-section-dark h1,\n  .usa-section-dark h2,\n  .usa-section-dark h3,\n  .usa-section-dark h4,\n  .usa-section-dark h5,\n  .usa-section-dark h6 {\n    color: #c64b00; }\n  .usa-section-dark p {\n    color: #ffffff; }\n  .usa-section-dark a {\n    color: #c9c9c9; }\n    .usa-section-dark a:hover {\n      color: #ffffff; }\n\n.usa-sidenav-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-sidenav-list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-list > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-sidenav-list > li:first-child {\n      border-top: none; }\n  .usa-sidenav-list a {\n    border: none;\n    color: #212121;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-sidenav-list a:hover {\n      background-color: #e4e4e4;\n      color: #0071BC;\n      text-decoration: none; }\n    .usa-sidenav-list a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-sidenav-list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #0071BC;\n      color: #0071BC;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n\n.usa-sidenav-sub_list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-sidenav-sub_list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-sub_list li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-sidenav-sub_list a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-sidenav-sub_list a:hover, .usa-sidenav-sub_list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-sidenav-sub_list .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n\n.usa-skipnav {\n  background: transparent;\n  color: #212121;\n  left: 0;\n  padding: 1rem 1.5rem;\n  position: absolute;\n  top: -4.2rem;\n  transition: all 0.2s ease-in-out;\n  z-index: 100; }\n  .usa-skipnav:focus {\n    background: #ffffff;\n    left: 0;\n    outline: 0;\n    position: absolute;\n    top: 0;\n    transition: all 0.2s ease-in-out; }\n\nh1, h2, h3, h4, h5, h6 {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-weight: bold; }\n\nh3.feed-item-title a,\narticle.aggregator-item .field--name-fid a {\n  text-decoration: none;\n  color: #0071BC; }\n\n.region-sidebar-first,\n.region-sidebar-second,\n.uswds-middle-section {\n  background-color: #E7F5FF; }\n\n.view-nsf-blog article.aggregator-item {\n  background-color: #ffffff;\n  padding: 2rem;\n  padding-top: 0.2rem;\n  margin-bottom: 3rem; }\n\n.region-sidebar-second {\n  float: right;\n  padding: 1.25rem; }\n  .region-sidebar-second h4 {\n    text-transform: uppercase;\n    color: #999999;\n    font-weight: normal; }\n\np,\ninput,\ntextarea,\n.usa-sidenav-list a,\n.usa-accordion,\n.usa-accordion-bordered,\nselect.form-select {\n  color: #666666; }\n\n.usa-nav-primary a.usa-nav-link,\n.usa-nav-primary .usa-nav-link,\n.usa-nav-primary a.usa-current span,\n.usa-nav-primary .usa-current span {\n  color: #3e94cf; }\n\n.filter-wrapper {\n  display: none; }\n\n.usa-form-large {\n  max-width: none; }\n\nform [type=\"submit\"], form [type=\"submit\"] {\n  display: inline-block; }\n\ntextarea {\n  height: auto; }\n\nlabel {\n  margin-top: 1rem; }\n\ninput, textarea, select {\n  max-width: none; }\n\n#block-nsf-views-block-news-block-1 ul {\n  margin: 0 auto;\n  text-align: center; }\n\n#block-nsf-views-block-news-block-1 li {\n  display: inline-block;\n  vertical-align: top; }\n\nimg.image-style-news-main-story {\n  max-width: none; }\n\n.usa-header-basic .usa-logo {\n  top: 0;\n  bottom: auto; }\n  .usa-header-basic .usa-logo img {\n    max-width: none; }\n\n.usa-navbar em.usa-logo-text {\n  margin-left: -5000em; }\n"]}
\ No newline at end of file

From 37d2deded6451c224b8b4ca269443859a1133dd0 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 25 Apr 2018 15:15:50 -0400
Subject: [PATCH 115/143] Use prod docs url for cloudfoundry.

Thanks for catching this @jmcarp!
---
 .bp-config/httpd/extra/httpd-modules.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bp-config/httpd/extra/httpd-modules.conf b/.bp-config/httpd/extra/httpd-modules.conf
index be6c79f..bbfbf99 100644
--- a/.bp-config/httpd/extra/httpd-modules.conf
+++ b/.bp-config/httpd/extra/httpd-modules.conf
@@ -1,7 +1,7 @@
 # This file was built from
 # https://github.com/cloudfoundry/php-buildpack/blob/master/defaults/config/httpd/extra/httpd-modules.conf
 # For more detail, see the description in
-# https://docs-cloudfoundry-staging.cfapps.io/buildpacks/php/gsg-php-config.html#engine-configurations
+# https://docs.cloudfoundry.org/buildpacks/php/gsg-php-config.html#engine-configurations
 
 LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authz_host_module modules/mod_authz_host.so

From e76ce34e33b0cada9d1dd59fc098fd87aaa62728 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 26 Apr 2018 14:36:57 -0700
Subject: [PATCH 116/143] Refrain from setting contact form destination

Otherwise, 'drush cex' will dutifully export it even though the
Contact module isn't currently enabled.

http://github.com/18F/nsf/issues/205
---
 bootstrap.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 93db6c3..6887355 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -55,7 +55,6 @@ if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove account_id $BRIGHTCOVE_ACCOUNT > /dev/null
   drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove client_id $BRIGHTCOVE_CLIENT > /dev/null
   drupal --root=$APP_ROOT/web config:override brightcove.brightcove_api_client.nsf_brightcove secret_key $BRIGHTCOVE_SECRET > /dev/null
-  drupal --root=$APP_ROOT/web config:override contact.form.feedback recipients.0 $ADMIN_EMAIL > /dev/null
   drupal --root=$APP_ROOT/web config:override scheduler.settings lightweight_cron_access_key $CRON_KEY > /dev/null
   drupal --root=$APP_ROOT/web config:override system.site mail $ADMIN_EMAIL > /dev/null
   drupal --root=$APP_ROOT/web config:override update.settings notification.emails.0 $ADMIN_EMAIL > /dev/null

From 32e4728dd80056cb167ce986e3fd54fcde1d0b6c Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Thu, 26 Apr 2018 09:21:28 -0400
Subject: [PATCH 117/143] Remove unused theme and modules.

Now that we've uninstalled these modules and theme in all environments, we can
delete the libraries from our dependencies. The README documents the reasoning
a bit more thoroughly.
---
 bootstrap.sh  |   4 +-
 composer.json |   4 -
 composer.lock | 603 +-------------------------------------------------
 3 files changed, 8 insertions(+), 603 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 6887355..4fa4e95 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -40,8 +40,8 @@ if [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ "${APP_NAME}" == "web" ]; then
   # Mild data migration: fully delete database entries related to these
   # modules. These plugins (and the dependencies) can be removed once they've
   # been uninstalled in all environments
-  drupal --root=$APP_ROOT/web module:uninstall flysystem flysystem_s3 masquerade workflow contact
-  drupal --root=$APP_ROOT/web theme:uninstall bootstrap
+  drupal --root=$APP_ROOT/web module:uninstall contact
+  # drupal --root=$APP_ROOT/web theme:uninstall bootstrap
 
   # Sync configs from code
   drupal --root=$APP_ROOT/web config:import
diff --git a/composer.json b/composer.json
index be55aae..c8c1448 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,6 @@
         "composer/installers": "^1.2",
         "cweagans/composer-patches": "^1.6",
         "drupal-composer/drupal-scaffold": "^2.2",
-        "drupal/bootstrap": "^3.11",
         "drupal/brightcove": "^1.3",
         "drupal/console": "^1.0.2",
         "drupal/core": "~8.5",
@@ -32,9 +31,7 @@
         "drupal/entity_browser": "^2.0",
         "drupal/entity_embed": "^1.0@beta",
         "drupal/features": "^3.5",
-        "drupal/flysystem_s3": "^1.0@alpha",
         "drupal/inline_entity_form": "^1.0@beta",
-        "drupal/masquerade": "^2.0@beta",
         "drupal/media_entity": "^1.7",
         "drupal/pathauto": "^1.1",
         "drupal/rules": "^3.0@alpha",
@@ -42,7 +39,6 @@
         "drupal/scheduler": "^1.0",
         "drupal/time_formatter": "1.x-dev",
         "drupal/tour_ui": "^1.0@alpha",
-        "drupal/workflow": "^1.0",
         "drush/drush": "~8.0|^9.0.0-beta8",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3"
diff --git a/composer.lock b/composer.lock
index 6f3e494..4af63e0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "2702e95ec30d2a98d4bc7b09a025133d",
+    "content-hash": "97556542f216666eb2286dbafb5ebacf",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -124,16 +124,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.52.27",
+            "version": "3.55.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "2ff982460d5c5eb0a57b7c38bd9ad4e9c2f05c86"
+                "reference": "3be3068a3a643f5029f18714b3fe26733a51e07c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2ff982460d5c5eb0a57b7c38bd9ad4e9c2f05c86",
-                "reference": "2ff982460d5c5eb0a57b7c38bd9ad4e9c2f05c86",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3be3068a3a643f5029f18714b3fe26733a51e07c",
+                "reference": "3be3068a3a643f5029f18714b3fe26733a51e07c",
                 "shasum": ""
             },
             "require": {
@@ -200,7 +200,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2018-03-15T19:43:26+00:00"
+            "time": "2018-04-25T18:33:29+00:00"
         },
         {
             "name": "brightcove/api",
@@ -1541,71 +1541,6 @@
             "description": "Composer Plugin for updating the Drupal scaffold files when using drupal/core",
             "time": "2017-12-08T22:53:11+00:00"
         },
-        {
-            "name": "drupal/bootstrap",
-            "version": "3.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupal.org/project/bootstrap",
-                "reference": "8.x-3.11"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/bootstrap-8.x-3.11.zip",
-                "reference": "8.x-3.11",
-                "shasum": "6ff80e37e2e1f916646300889f3392764c9cdb32"
-            },
-            "require": {
-                "drupal/core": "~8.0"
-            },
-            "type": "drupal-theme",
-            "extra": {
-                "branch-alias": {
-                    "dev-3.x": "3.x-dev"
-                },
-                "drupal": {
-                    "version": "8.x-3.11",
-                    "datestamp": "1520792884",
-                    "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Mark Carver (markcarver)",
-                    "homepage": "https://www.drupal.org/u/markcarver",
-                    "role": "Maintainer"
-                },
-                {
-                    "name": "John McCormick (neardark)",
-                    "homepage": "https://www.drupal.org/u/neardark",
-                    "role": "Co-maintainer"
-                },
-                {
-                    "name": "Fabiano Sant'Ana (wundo)",
-                    "homepage": "https://www.drupal.org/u/wundo",
-                    "role": "Co-maintainer"
-                },
-                {
-                    "name": "wundo",
-                    "homepage": "https://www.drupal.org/user/25523"
-                }
-            ],
-            "description": "Built to use Bootstrap, a sleek, intuitive, and powerful front-end framework for faster and easier web development.",
-            "homepage": "https://www.drupal.org/project/bootstrap",
-            "support": {
-                "source": "http://cgit.drupalcode.org/bootstrap",
-                "docs": "https://drupal-bootstrap.org",
-                "issues": "https://www.drupal.org/project/issues/bootstrap",
-                "irc": "irc://irc.freenode.org/drupal-bootstrap"
-            }
-        },
         {
             "name": "drupal/brightcove",
             "version": "1.3.0",
@@ -2981,126 +2916,6 @@
                 "source": "http://cgit.drupalcode.org/features"
             }
         },
-        {
-            "name": "drupal/flysystem",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupal.org/project/flysystem",
-                "reference": "8.x-1.0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/flysystem-8.x-1.0.zip",
-                "reference": "8.x-1.0",
-                "shasum": "8b6bd358c24e7ec8504d324f6a50bdc11ac1dc14"
-            },
-            "require": {
-                "drupal/core": "~8.0",
-                "league/flysystem": "^1.0.3",
-                "league/flysystem-replicate-adapter": "~1.0",
-                "twistor/flysystem-stream-wrapper": "^1.0.5"
-            },
-            "require-dev": {
-                "league/flysystem-memory": "~1.0"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                },
-                "drupal": {
-                    "version": "8.x-1.0",
-                    "datestamp": "1497585842",
-                    "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
-                    }
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Drupal\\flysystem\\": "src/"
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "twistor",
-                    "homepage": "https://www.drupal.org/user/473738"
-                },
-                {
-                    "name": "vijaycs85",
-                    "homepage": "https://www.drupal.org/user/93488"
-                }
-            ],
-            "description": "Provides access to various filesystem backends using Flysystem.",
-            "homepage": "https://www.drupal.org/project/flysystem",
-            "support": {
-                "source": "http://cgit.drupalcode.org/flysystem"
-            }
-        },
-        {
-            "name": "drupal/flysystem_s3",
-            "version": "1.0.0-alpha2",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupal.org/project/flysystem_s3",
-                "reference": "8.x-1.0-alpha2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/flysystem_s3-8.x-1.0-alpha2.zip",
-                "reference": "8.x-1.0-alpha2",
-                "shasum": "8793c4324e561c0dfe99acf164fc0883b880f348"
-            },
-            "require": {
-                "drupal/core": "~8.0",
-                "drupal/flysystem": "*",
-                "league/flysystem": "^1.0.20",
-                "league/flysystem-aws-s3-v3": "^1.0, !=1.0.12, !=1.0.13"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                },
-                "drupal": {
-                    "version": "8.x-1.0-alpha2",
-                    "datestamp": "1469068442",
-                    "security-coverage": {
-                        "status": "not-covered",
-                        "message": "Alpha releases are not covered by Drupal security advisories."
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "cweagans",
-                    "homepage": "https://www.drupal.org/user/404732"
-                },
-                {
-                    "name": "twistor",
-                    "homepage": "https://www.drupal.org/user/473738"
-                },
-                {
-                    "name": "vijaycs85",
-                    "homepage": "https://www.drupal.org/user/93488"
-                }
-            ],
-            "description": "Provides an Amazon S3 plugin for Flysystem.",
-            "homepage": "https://www.drupal.org/project/flysystem_s3",
-            "support": {
-                "source": "http://cgit.drupalcode.org/flysystem_s3"
-            }
-        },
         {
             "name": "drupal/inline_entity_form",
             "version": "1.0.0-beta1",
@@ -3167,73 +2982,6 @@
                 "source": "http://cgit.drupalcode.org/inline_entity_form"
             }
         },
-        {
-            "name": "drupal/masquerade",
-            "version": "2.0.0-beta1",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupal.org/project/masquerade",
-                "reference": "8.x-2.0-beta1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/masquerade-8.x-2.0-beta1.zip",
-                "reference": "8.x-2.0-beta1",
-                "shasum": "d8071c2b01db9a3cc5d5bc8ecd570276e12840d4"
-            },
-            "require": {
-                "drupal/core": "*"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                },
-                "drupal": {
-                    "version": "8.x-2.0-beta1",
-                    "datestamp": "1481184923",
-                    "security-coverage": {
-                        "status": "not-covered",
-                        "message": "Project has not opted into security advisory coverage!"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Gurpartap Singh",
-                    "homepage": "https://www.drupal.org/user/41470"
-                },
-                {
-                    "name": "andypost",
-                    "homepage": "https://www.drupal.org/user/118908"
-                },
-                {
-                    "name": "deekayen",
-                    "homepage": "https://www.drupal.org/user/972"
-                },
-                {
-                    "name": "deviantintegral",
-                    "homepage": "https://www.drupal.org/user/71291"
-                },
-                {
-                    "name": "shrop",
-                    "homepage": "https://www.drupal.org/user/14767"
-                },
-                {
-                    "name": "sun",
-                    "homepage": "https://www.drupal.org/user/54136"
-                }
-            ],
-            "description": "Allows privileged users to masquerade as another user.",
-            "homepage": "https://www.drupal.org/project/masquerade",
-            "support": {
-                "source": "http://cgit.drupalcode.org/masquerade"
-            }
-        },
         {
             "name": "drupal/media_entity",
             "version": "1.7.0",
@@ -3804,85 +3552,6 @@
                 "source": "http://cgit.drupalcode.org/typed_data"
             }
         },
-        {
-            "name": "drupal/workflow",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupal.org/project/workflow",
-                "reference": "8.x-1.0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/workflow-8.x-1.0.zip",
-                "reference": "8.x-1.0",
-                "shasum": "2c439aab3f92b476cb88dbc517e131ea3cd7be47"
-            },
-            "require": {
-                "drupal/core": "*"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                },
-                "drupal": {
-                    "version": "8.x-1.0",
-                    "datestamp": "1513552385",
-                    "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Bastlynn",
-                    "homepage": "https://www.drupal.org/user/275249"
-                },
-                {
-                    "name": "Heine",
-                    "homepage": "https://www.drupal.org/user/17943"
-                },
-                {
-                    "name": "JacobSingh",
-                    "homepage": "https://www.drupal.org/user/68912"
-                },
-                {
-                    "name": "NancyDru",
-                    "homepage": "https://www.drupal.org/user/101412"
-                },
-                {
-                    "name": "eaton",
-                    "homepage": "https://www.drupal.org/user/16496"
-                },
-                {
-                    "name": "johnv",
-                    "homepage": "https://www.drupal.org/user/591042"
-                },
-                {
-                    "name": "jvandyk",
-                    "homepage": "https://www.drupal.org/user/2375"
-                },
-                {
-                    "name": "mfredrickson",
-                    "homepage": "https://www.drupal.org/user/31994"
-                },
-                {
-                    "name": "q0rban",
-                    "homepage": "https://www.drupal.org/user/31022"
-                }
-            ],
-            "description": "Defines a field type with Workflows, containing customizable state transitions.",
-            "homepage": "https://www.drupal.org/project/workflow",
-            "support": {
-                "source": "http://cgit.drupalcode.org/workflow"
-            }
-        },
         {
             "name": "drush/drush",
             "version": "9.2.1",
@@ -4573,183 +4242,6 @@
             ],
             "time": "2017-05-10T09:20:27+00:00"
         },
-        {
-            "name": "league/flysystem",
-            "version": "1.0.43",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "1ce7cc142d906ba58dc54c82915d355a9191c8a8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/1ce7cc142d906ba58dc54c82915d355a9191c8a8",
-                "reference": "1ce7cc142d906ba58dc54c82915d355a9191c8a8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "conflict": {
-                "league/flysystem-sftp": "<1.0.6"
-            },
-            "require-dev": {
-                "ext-fileinfo": "*",
-                "phpspec/phpspec": "^3.4",
-                "phpunit/phpunit": "^5.7"
-            },
-            "suggest": {
-                "ext-fileinfo": "Required for MimeType",
-                "ext-ftp": "Allows you to use FTP server storage",
-                "ext-openssl": "Allows you to use FTPS server storage",
-                "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
-                "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
-                "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
-                "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
-                "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
-                "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
-                "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
-                "league/flysystem-webdav": "Allows you to use WebDAV storage",
-                "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
-                "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
-                "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Flysystem\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Frank de Jonge",
-                    "email": "info@frenky.net"
-                }
-            ],
-            "description": "Filesystem abstraction: Many filesystems, one API.",
-            "keywords": [
-                "Cloud Files",
-                "WebDAV",
-                "abstraction",
-                "aws",
-                "cloud",
-                "copy.com",
-                "dropbox",
-                "file systems",
-                "files",
-                "filesystem",
-                "filesystems",
-                "ftp",
-                "rackspace",
-                "remote",
-                "s3",
-                "sftp",
-                "storage"
-            ],
-            "time": "2018-03-01T10:27:04+00:00"
-        },
-        {
-            "name": "league/flysystem-aws-s3-v3",
-            "version": "1.0.18",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "dc09b19f455750663b922ed52dcc0ff215bed284"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/dc09b19f455750663b922ed52dcc0ff215bed284",
-                "reference": "dc09b19f455750663b922ed52dcc0ff215bed284",
-                "shasum": ""
-            },
-            "require": {
-                "aws/aws-sdk-php": "^3.0.0",
-                "league/flysystem": "^1.0.40",
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "henrikbjorn/phpspec-code-coverage": "~1.0.1",
-                "phpspec/phpspec": "^2.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Flysystem\\AwsS3v3\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Frank de Jonge",
-                    "email": "info@frenky.net"
-                }
-            ],
-            "description": "Flysystem adapter for the AWS S3 SDK v3.x",
-            "time": "2017-06-30T06:29:25+00:00"
-        },
-        {
-            "name": "league/flysystem-replicate-adapter",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/flysystem-replicate-adapter.git",
-                "reference": "864e80409c0918b0ed6921c3941247017d9db77c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-replicate-adapter/zipball/864e80409c0918b0ed6921c3941247017d9db77c",
-                "reference": "864e80409c0918b0ed6921c3941247017d9db77c",
-                "shasum": ""
-            },
-            "require": {
-                "league/flysystem": "~1.0",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "0.9.*",
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Flysystem\\Replicate\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Frank de Jonge",
-                    "email": "info@frenky.net"
-                }
-            ],
-            "description": "Flysystem adapter for Replica's",
-            "time": "2015-08-18T21:07:17+00:00"
-        },
         {
             "name": "masterminds/html5",
             "version": "2.3.0",
@@ -6981,87 +6473,6 @@
             ],
             "time": "2018-03-20T04:25:58+00:00"
         },
-        {
-            "name": "twistor/flysystem-stream-wrapper",
-            "version": "v1.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twistor/flysystem-stream-wrapper.git",
-                "reference": "00278abc16bc4bd759e1ec4f2eadb0432fe8d5ac"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twistor/flysystem-stream-wrapper/zipball/00278abc16bc4bd759e1ec4f2eadb0432fe8d5ac",
-                "reference": "00278abc16bc4bd759e1ec4f2eadb0432fe8d5ac",
-                "shasum": ""
-            },
-            "require": {
-                "league/flysystem": "~1.0",
-                "twistor/stream-util": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Twistor\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Chris Leppanen",
-                    "email": "chris.leppanen@gmail.com"
-                }
-            ],
-            "description": "Adapts Flysystem filesystems to PHP stream wrappers.",
-            "homepage": "http://github.com/twistor/flysystem-stream-wrapper",
-            "time": "2017-11-06T05:32:20+00:00"
-        },
-        {
-            "name": "twistor/stream-util",
-            "version": "v1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twistor/stream-util.git",
-                "reference": "226e74e6234508a53639b960c4a2752aee61799a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twistor/stream-util/zipball/226e74e6234508a53639b960c4a2752aee61799a",
-                "reference": "226e74e6234508a53639b960c4a2752aee61799a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Twistor\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Chris Leppanen",
-                    "email": "chris.leppanen@gmail.com"
-                }
-            ],
-            "description": "Helper utilities for dealing with streams.",
-            "homepage": "http://github.com/twistor/stream-util",
-            "time": "2015-06-12T11:33:28+00:00"
-        },
         {
             "name": "webflo/drupal-finder",
             "version": "1.1.0",
@@ -7406,9 +6817,7 @@
         "drupal/default_content_deploy": 15,
         "drupal/diff": 5,
         "drupal/entity_embed": 10,
-        "drupal/flysystem_s3": 15,
         "drupal/inline_entity_form": 10,
-        "drupal/masquerade": 10,
         "drupal/rules": 15,
         "drupal/s3fs": 15,
         "drupal/time_formatter": 20,

From bc131b81f9f43381c916a1c5376282ecb7cc48a2 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 27 Apr 2018 09:44:15 -0400
Subject: [PATCH 118/143] Add note around running npm install.

Thanks for the catch, @fureigh!
---
 README.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 08d90aa..694e485 100644
--- a/README.md
+++ b/README.md
@@ -66,11 +66,23 @@ our changes in near-real time.
 
 This codebase's theme is a subtheme of the [U.S. Web Design System](https://drupal.org/project/uswds) theme. Accordingly, its overrides are stored in `/web/themes/nsf`.
 
-To make styling changes, first move into the relevant directory, then start
-the "watch" script:
+Our style changes are all within the context of the `nsf` "theme", so we'll
+start by getting there:
 
 ```
 cd web/themes/nsf
+```
+
+If this is the first time we're editing a theme, we next need to install all
+of the relevant node modules:
+
+```
+bin/npm install
+```
+
+Finally, we'll start our "watch" script:
+
+```
 bin/npm run build:watch
 ```
 

From 2fe9c0702c0ad93ff212648b4c1fb3e41fd69920 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 27 Apr 2018 09:45:35 -0400
Subject: [PATCH 119/143] Name node packages "nsf".

H/t @fureigh
---
 web/themes/nsf/package-lock.json | 2 +-
 web/themes/nsf/package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/themes/nsf/package-lock.json b/web/themes/nsf/package-lock.json
index 8c14558..908df52 100644
--- a/web/themes/nsf/package-lock.json
+++ b/web/themes/nsf/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "nsf-subtheme",
+  "name": "nsf",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
diff --git a/web/themes/nsf/package.json b/web/themes/nsf/package.json
index d853eb0..c0ecd40 100644
--- a/web/themes/nsf/package.json
+++ b/web/themes/nsf/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "nsf-subtheme",
+  "name": "nsf",
   "version": "1.0.0",
   "scripts": {
     "prebuild:css": "node-sass --include-path scss sass/uswds.scss assets/css/uswds.css",

From a2738d8b58b59d8ceac6f78d43c1b81d1c5f057a Mon Sep 17 00:00:00 2001
From: Matt Boesch <mboesch@nsf.gov>
Date: Mon, 30 Apr 2018 13:53:29 -0400
Subject: [PATCH 120/143] Updated php-buildpack to v4.3.53 per issue 234

---
 multi-buildpack.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multi-buildpack.yml b/multi-buildpack.yml
index d344b0a..57efcf7 100644
--- a/multi-buildpack.yml
+++ b/multi-buildpack.yml
@@ -2,4 +2,4 @@
 buildpacks:
   # We need the "apt" build pack to install a mysql client for drush
   - https://github.com/cloudfoundry/apt-buildpack#v0.1.1
-  - https://github.com/cloudfoundry/php-buildpack#v4.3.51
+  - https://github.com/cloudfoundry/php-buildpack#v4.3.53

From 9a97b96e9b4f5cb58338314c7e2bf41003e33b94 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 23 Mar 2018 10:46:57 -0700
Subject: [PATCH 121/143] Add NSF and Research.gov footer menus

This commit does the following:
- Add a footer menu for National Science Foundation links
- Add a footer menu for Research.gov links
- Add both menu blocks to the footer region

`drupal cex` includes menu definitions but not links, so we'll
need to handle those by different means.

https://github.com/18F/nsf/issues/190
---
 ....block.footernationalsciencefoundation.yml | 24 +++++++++++++++++++
 .../config/block.block.footerresearch.gov.yml | 24 +++++++++++++++++++
 .../default/config/block.block.nsf_footer.yml |  2 +-
 ...ystem.menu.footer-national-science-fou.yml |  8 +++++++
 .../system.menu.footer-research-gov.yml       |  8 +++++++
 5 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 web/sites/default/config/block.block.footernationalsciencefoundation.yml
 create mode 100644 web/sites/default/config/block.block.footerresearch.gov.yml
 create mode 100644 web/sites/default/config/system.menu.footer-national-science-fou.yml
 create mode 100644 web/sites/default/config/system.menu.footer-research-gov.yml

diff --git a/web/sites/default/config/block.block.footernationalsciencefoundation.yml b/web/sites/default/config/block.block.footernationalsciencefoundation.yml
new file mode 100644
index 0000000..23d5313
--- /dev/null
+++ b/web/sites/default/config/block.block.footernationalsciencefoundation.yml
@@ -0,0 +1,24 @@
+uuid: 2ef021c2-0395-414b-a5cf-2d0242ace566
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.footer-national-science-fou
+  module:
+    - system
+  theme:
+    - nsf
+id: footernationalsciencefoundation
+theme: nsf
+region: footer_menu
+weight: 0
+provider: null
+plugin: 'system_menu_block:footer-national-science-fou'
+settings:
+  id: 'system_menu_block:footer-national-science-fou'
+  label: 'National Science Foundation'
+  provider: system
+  label_display: visible
+  level: 1
+  depth: 0
+visibility: {  }
diff --git a/web/sites/default/config/block.block.footerresearch.gov.yml b/web/sites/default/config/block.block.footerresearch.gov.yml
new file mode 100644
index 0000000..834f886
--- /dev/null
+++ b/web/sites/default/config/block.block.footerresearch.gov.yml
@@ -0,0 +1,24 @@
+uuid: ab29e5ed-fc41-46e6-9ce8-5449727b6d97
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.footer-research-gov
+  module:
+    - system
+  theme:
+    - nsf
+id: footerresearch.gov
+theme: nsf
+region: footer_menu
+weight: 0
+provider: null
+plugin: 'system_menu_block:footer-research-gov'
+settings:
+  id: 'system_menu_block:footer-research-gov'
+  label: Research.gov
+  provider: system
+  label_display: visible
+  level: 1
+  depth: 0
+visibility: {  }
diff --git a/web/sites/default/config/block.block.nsf_footer.yml b/web/sites/default/config/block.block.nsf_footer.yml
index f45b6f6..3adb2e7 100644
--- a/web/sites/default/config/block.block.nsf_footer.yml
+++ b/web/sites/default/config/block.block.nsf_footer.yml
@@ -1,6 +1,6 @@
 uuid: 55389443-45a7-429a-9c06-7f834d48388d
 langcode: en
-status: true
+status: false
 dependencies:
   config:
     - system.menu.footer
diff --git a/web/sites/default/config/system.menu.footer-national-science-fou.yml b/web/sites/default/config/system.menu.footer-national-science-fou.yml
new file mode 100644
index 0000000..f78357b
--- /dev/null
+++ b/web/sites/default/config/system.menu.footer-national-science-fou.yml
@@ -0,0 +1,8 @@
+uuid: e6aeed50-3dc2-4de9-a1fb-4bd68577a1c7
+langcode: en
+status: true
+dependencies: {  }
+id: footer-national-science-fou
+label: 'Footer: National Science Foundation'
+description: 'NSF links for footer'
+locked: false
diff --git a/web/sites/default/config/system.menu.footer-research-gov.yml b/web/sites/default/config/system.menu.footer-research-gov.yml
new file mode 100644
index 0000000..e94dd12
--- /dev/null
+++ b/web/sites/default/config/system.menu.footer-research-gov.yml
@@ -0,0 +1,8 @@
+uuid: 15a5991d-1290-428a-864d-c62b25259c85
+langcode: en
+status: true
+dependencies: {  }
+id: footer-research-gov
+label: 'Footer: Research.gov'
+description: 'Research.gov links for footer'
+locked: false

From 942c584a655bd391c9299b429cc9f69d9d78deeb Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Fri, 30 Mar 2018 17:59:07 -0400
Subject: [PATCH 122/143] Add two menu items to default content.

These were added through the GUI, then exported via

bin/drush dcde menu_link_content
---
 .../3c435fbc-9a02-4315-8b3d-f297529c922c.json | 87 +++++++++++++++++++
 .../6e3de191-6840-4ccf-8242-1d44a20ea30f.json | 87 +++++++++++++++++++
 2 files changed, 174 insertions(+)
 create mode 100644 web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json
 create mode 100644 web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json

diff --git a/web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json b/web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json
new file mode 100644
index 0000000..1981175
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json
@@ -0,0 +1,87 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/2\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 2
+        }
+    ],
+    "uuid": [
+        {
+            "value": "3c435fbc-9a02-4315-8b3d-f297529c922c"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Multimedia Gallery",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/news\/mmg\/",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 0
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-03-30T21:54:16+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json b/web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json
new file mode 100644
index 0000000..67d9cb6
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json
@@ -0,0 +1,87 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/1\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 1
+        }
+    ],
+    "uuid": [
+        {
+            "value": "6e3de191-6840-4ccf-8242-1d44a20ea30f"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "All News",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/news\/",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 0
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-03-30T21:35:35+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file

From 10b778e3174a32e7fde8b0804a89f89563dc8784 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 5 Apr 2018 13:44:17 -0700
Subject: [PATCH 123/143] Add remaining links to 'NSF' footer menu

These were added through the GUI and exported via:
`bin/drush dcde menu_link_content`

https://github.com/18F/nsf/issues/190
---
 .../01582e73-b3b4-4eeb-a2dd-515b2c9f0f49.json | 93 ++++++++++++++++++
 .../03197086-5fd9-4e3a-a547-590ac79cfd47.json | 98 +++++++++++++++++++
 .../2e65221d-2749-4290-a7d9-e3feeee2acd0.json | 98 +++++++++++++++++++
 .../30ad5447-8c6a-4b91-9258-6c2cedece8ed.json | 98 +++++++++++++++++++
 .../338ca875-8de5-4d34-bb7d-6202958e1341.json | 98 +++++++++++++++++++
 .../3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json | 98 +++++++++++++++++++
 .../3c435fbc-9a02-4315-8b3d-f297529c922c.json |  9 +-
 .../6a9f3d91-eef8-4b68-8b60-a0be43df62c1.json | 98 +++++++++++++++++++
 .../6e293a07-90b9-4763-bf40-3d21be9c0feb.json | 93 ++++++++++++++++++
 .../6e3de191-6840-4ccf-8242-1d44a20ea30f.json |  9 +-
 .../8e8be807-dd24-458c-bb43-419f4c5da5f9.json | 98 +++++++++++++++++++
 .../bfbf32c3-c2f6-48b7-8fd4-c5a64b0f0616.json | 98 +++++++++++++++++++
 .../d1cd56a7-4282-4395-bc21-433ef1d3238b.json | 98 +++++++++++++++++++
 .../e0128ba5-720a-4b7c-a006-533598f1a9a5.json | 98 +++++++++++++++++++
 .../f49e138a-1106-4930-91c8-0cf26bc0c66d.json | 93 ++++++++++++++++++
 15 files changed, 1273 insertions(+), 4 deletions(-)
 create mode 100644 web/sites/default/content/menu_link_content/01582e73-b3b4-4eeb-a2dd-515b2c9f0f49.json
 create mode 100644 web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json
 create mode 100644 web/sites/default/content/menu_link_content/2e65221d-2749-4290-a7d9-e3feeee2acd0.json
 create mode 100644 web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json
 create mode 100644 web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json
 create mode 100644 web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json
 create mode 100644 web/sites/default/content/menu_link_content/6a9f3d91-eef8-4b68-8b60-a0be43df62c1.json
 create mode 100644 web/sites/default/content/menu_link_content/6e293a07-90b9-4763-bf40-3d21be9c0feb.json
 create mode 100644 web/sites/default/content/menu_link_content/8e8be807-dd24-458c-bb43-419f4c5da5f9.json
 create mode 100644 web/sites/default/content/menu_link_content/bfbf32c3-c2f6-48b7-8fd4-c5a64b0f0616.json
 create mode 100644 web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json
 create mode 100644 web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json
 create mode 100644 web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json

diff --git a/web/sites/default/content/menu_link_content/01582e73-b3b4-4eeb-a2dd-515b2c9f0f49.json b/web/sites/default/content/menu_link_content/01582e73-b3b4-4eeb-a2dd-515b2c9f0f49.json
new file mode 100644
index 0000000..31bd23e
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/01582e73-b3b4-4eeb-a2dd-515b2c9f0f49.json
@@ -0,0 +1,93 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/11\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 11
+        }
+    ],
+    "uuid": [
+        {
+            "value": "01582e73-b3b4-4eeb-a2dd-515b2c9f0f49"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Document Library &  About NSF",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Document Library &  About NSF",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "internal:#",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": true
+        }
+    ],
+    "weight": [
+        {
+            "value": 3
+        }
+    ],
+    "expanded": [
+        {
+            "value": true
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:22:49+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json b/web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json
new file mode 100644
index 0000000..5839d65
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/9\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 9
+        }
+    ],
+    "uuid": [
+        {
+            "value": "03197086-5fd9-4e3a-a547-590ac79cfd47"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Recently Announced Funding Opportunities",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Recently Announced Funding Opportunities",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/funding\/pgm_list.jsp?org=NSF&ord=rcnt",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 4
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:f49e138a-1106-4930-91c8-0cf26bc0c66d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:21:45+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/2e65221d-2749-4290-a7d9-e3feeee2acd0.json b/web/sites/default/content/menu_link_content/2e65221d-2749-4290-a7d9-e3feeee2acd0.json
new file mode 100644
index 0000000..f19d69c
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/2e65221d-2749-4290-a7d9-e3feeee2acd0.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/15\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 15
+        }
+    ],
+    "uuid": [
+        {
+            "value": "2e65221d-2749-4290-a7d9-e3feeee2acd0"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Staff Directory",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Staff Directory",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/staff\/",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 3
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:01582e73-b3b4-4eeb-a2dd-515b2c9f0f49"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:25:54+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json b/web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json
new file mode 100644
index 0000000..a29b637
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/7\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 7
+        }
+    ],
+    "uuid": [
+        {
+            "value": "30ad5447-8c6a-4b91-9258-6c2cedece8ed"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Award Search",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Award Search",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/awardsearch\/",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 2
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:f49e138a-1106-4930-91c8-0cf26bc0c66d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T20:38:58+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json b/web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json
new file mode 100644
index 0000000..5bc8c5c
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/10\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 10
+        }
+    ],
+    "uuid": [
+        {
+            "value": "338ca875-8de5-4d34-bb7d-6202958e1341"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Upcoming Funding Opportunity Due Dates",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Upcoming Funding Opportunity Due Dates",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/funding\/pgm_list.jsp?org=NSF&ord=date",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 5
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:f49e138a-1106-4930-91c8-0cf26bc0c66d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:22:19+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json b/web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json
new file mode 100644
index 0000000..a9dbfe7
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/5\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 5
+        }
+    ],
+    "uuid": [
+        {
+            "value": "3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "A-Z Index of Funding Opportunities",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "A-Z Index of Funding Opportunities",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/funding\/azindex.jsp",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 0
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:f49e138a-1106-4930-91c8-0cf26bc0c66d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T20:26:01+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json b/web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json
index 1981175..f8026aa 100644
--- a/web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json
+++ b/web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json
@@ -58,7 +58,7 @@
     ],
     "weight": [
         {
-            "value": 0
+            "value": -49
         }
     ],
     "expanded": [
@@ -71,9 +71,14 @@
             "value": true
         }
     ],
+    "parent": [
+        {
+            "value": "menu_link_content:6e293a07-90b9-4763-bf40-3d21be9c0feb"
+        }
+    ],
     "changed": [
         {
-            "value": "2018-03-30T21:54:16+00:00",
+            "value": "2018-04-05T20:20:49+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/6a9f3d91-eef8-4b68-8b60-a0be43df62c1.json b/web/sites/default/content/menu_link_content/6a9f3d91-eef8-4b68-8b60-a0be43df62c1.json
new file mode 100644
index 0000000..e4305ec
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/6a9f3d91-eef8-4b68-8b60-a0be43df62c1.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/14\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 14
+        }
+    ],
+    "uuid": [
+        {
+            "value": "6a9f3d91-eef8-4b68-8b60-a0be43df62c1"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Careers",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Careers",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/careers\/",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 2
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:01582e73-b3b4-4eeb-a2dd-515b2c9f0f49"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:25:21+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/6e293a07-90b9-4763-bf40-3d21be9c0feb.json b/web/sites/default/content/menu_link_content/6e293a07-90b9-4763-bf40-3d21be9c0feb.json
new file mode 100644
index 0000000..e6201dd
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/6e293a07-90b9-4763-bf40-3d21be9c0feb.json
@@ -0,0 +1,93 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/3\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 3
+        }
+    ],
+    "uuid": [
+        {
+            "value": "6e293a07-90b9-4763-bf40-3d21be9c0feb"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "News",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "News",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "internal:#",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": true
+        }
+    ],
+    "weight": [
+        {
+            "value": -50
+        }
+    ],
+    "expanded": [
+        {
+            "value": true
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T20:20:49+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json b/web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json
index 67d9cb6..2b0ff9d 100644
--- a/web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json
+++ b/web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json
@@ -58,7 +58,7 @@
     ],
     "weight": [
         {
-            "value": 0
+            "value": -50
         }
     ],
     "expanded": [
@@ -71,9 +71,14 @@
             "value": true
         }
     ],
+    "parent": [
+        {
+            "value": "menu_link_content:6e293a07-90b9-4763-bf40-3d21be9c0feb"
+        }
+    ],
     "changed": [
         {
-            "value": "2018-03-30T21:35:35+00:00",
+            "value": "2018-04-05T20:20:49+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/8e8be807-dd24-458c-bb43-419f4c5da5f9.json b/web/sites/default/content/menu_link_content/8e8be807-dd24-458c-bb43-419f4c5da5f9.json
new file mode 100644
index 0000000..781d722
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/8e8be807-dd24-458c-bb43-419f4c5da5f9.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/13\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 13
+        }
+    ],
+    "uuid": [
+        {
+            "value": "8e8be807-dd24-458c-bb43-419f4c5da5f9"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "About NSF",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "About NSF",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/about\/",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 1
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:01582e73-b3b4-4eeb-a2dd-515b2c9f0f49"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:24:18+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/bfbf32c3-c2f6-48b7-8fd4-c5a64b0f0616.json b/web/sites/default/content/menu_link_content/bfbf32c3-c2f6-48b7-8fd4-c5a64b0f0616.json
new file mode 100644
index 0000000..3bb3c75
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/bfbf32c3-c2f6-48b7-8fd4-c5a64b0f0616.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/12\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 12
+        }
+    ],
+    "uuid": [
+        {
+            "value": "bfbf32c3-c2f6-48b7-8fd4-c5a64b0f0616"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Document Library",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Document Library",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/publications\/",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 0
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:01582e73-b3b4-4eeb-a2dd-515b2c9f0f49"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:23:27+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json b/web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json
new file mode 100644
index 0000000..dfc66c3
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/8\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 8
+        }
+    ],
+    "uuid": [
+        {
+            "value": "d1cd56a7-4282-4395-bc21-433ef1d3238b"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Proposal & Award Policies Procedures Guide (PAPPG)",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Proposal & Award Policies Procedures Guide (PAPPG)",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/publications\/pub_summ.jsp?ods_key=papp",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 3
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:f49e138a-1106-4930-91c8-0cf26bc0c66d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T20:40:49+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json b/web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json
new file mode 100644
index 0000000..1ffa17c
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/6\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 6
+        }
+    ],
+    "uuid": [
+        {
+            "value": "e0128ba5-720a-4b7c-a006-533598f1a9a5"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Find Funding",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Find Funding",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.nsf.gov\/funding\/pgm_list.jsp?org=NSF&ord=date",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 1
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:f49e138a-1106-4930-91c8-0cf26bc0c66d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T20:38:03+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json b/web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json
new file mode 100644
index 0000000..76ac8c1
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json
@@ -0,0 +1,93 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 4
+        }
+    ],
+    "uuid": [
+        {
+            "value": "f49e138a-1106-4930-91c8-0cf26bc0c66d"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Funding & Awards",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Funding & Awards",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-national-science-fou"
+        }
+    ],
+    "link": [
+        {
+            "uri": "internal:#",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": true
+        }
+    ],
+    "weight": [
+        {
+            "value": 1
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T20:24:07+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file

From a8d1a91923a7339d20ccc22cf0072b2d6585cf5c Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 5 Apr 2018 14:54:38 -0700
Subject: [PATCH 124/143] Add links to 'Research.gov' footer menu

These were added through the GUI and exported via:
`bin/drush dcde menu_link_content`

https://github.com/18F/nsf/issues/190
---
 .../8a3132e5-7037-4fe2-b0de-aef0207b54bf.json | 98 +++++++++++++++++++
 .../8d70e856-5580-40c5-a1f8-428f7a331b5f.json | 98 +++++++++++++++++++
 .../900d3fd6-0737-4995-9472-9301a3800811.json | 98 +++++++++++++++++++
 .../add1d072-0d79-4878-9781-2f9141e77c84.json | 98 +++++++++++++++++++
 .../ae222b1f-b138-466b-ae33-0a464bae5993.json | 98 +++++++++++++++++++
 .../b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json | 98 +++++++++++++++++++
 .../b9b37cba-942c-443b-803e-e9301f330ad7.json | 98 +++++++++++++++++++
 .../c43f2f1b-86dd-462b-ac15-fc241e1af751.json | 93 ++++++++++++++++++
 .../d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json | 98 +++++++++++++++++++
 .../e4168237-4768-4bb1-9eb8-01a4f0ac055d.json | 93 ++++++++++++++++++
 .../ebcd6b15-f09f-4d5e-9478-ada67aba04bd.json | 93 ++++++++++++++++++
 .../f4df684c-896a-49f6-8302-bad77d152982.json | 98 +++++++++++++++++++
 12 files changed, 1161 insertions(+)
 create mode 100644 web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json
 create mode 100644 web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json
 create mode 100644 web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json
 create mode 100644 web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json
 create mode 100644 web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json
 create mode 100644 web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json
 create mode 100644 web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json
 create mode 100644 web/sites/default/content/menu_link_content/c43f2f1b-86dd-462b-ac15-fc241e1af751.json
 create mode 100644 web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json
 create mode 100644 web/sites/default/content/menu_link_content/e4168237-4768-4bb1-9eb8-01a4f0ac055d.json
 create mode 100644 web/sites/default/content/menu_link_content/ebcd6b15-f09f-4d5e-9478-ada67aba04bd.json
 create mode 100644 web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json

diff --git a/web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json b/web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json
new file mode 100644
index 0000000..2bb4858
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/19\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 19
+        }
+    ],
+    "uuid": [
+        {
+            "value": "8a3132e5-7037-4fe2-b0de-aef0207b54bf"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Notifications & Requests",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Notifications & Requests",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.research.gov\/research-portal\/appmanager\/base\/desktop?_nfpb=true&_pageLabel=research_node_display&_nodePath=\/researchGov\/Service\/Desktop\/NotificationRequest.html",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 2
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:46:29+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json b/web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json
new file mode 100644
index 0000000..b7972d5
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/17\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 17
+        }
+    ],
+    "uuid": [
+        {
+            "value": "8d70e856-5580-40c5-a1f8-428f7a331b5f"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Application Submission",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Application Submission",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.research.gov\/research-portal\/appmanager\/base\/desktop?_nfpb=true&_pageLabel=research_node_display&_nodePath=\/researchGov\/Service\/Desktop\/ApplicationSubmissionWebServicesPilot.html",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 0
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:42:48+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json b/web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json
new file mode 100644
index 0000000..e24681c
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/18\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 18
+        }
+    ],
+    "uuid": [
+        {
+            "value": "900d3fd6-0737-4995-9472-9301a3800811"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "ACM$ (Award Cash Management Service)",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "ACM$ (Award Cash Management Service)",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.research.gov\/research-portal\/appmanager\/base\/desktop?_nfpb=true&_pageLabel=research_node_display&_nodePath=\/researchGov\/Service\/Desktop\/AwardCashManagementService.html",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 1
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:43:44+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json b/web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json
new file mode 100644
index 0000000..bb195c3
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/23\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 23
+        }
+    ],
+    "uuid": [
+        {
+            "value": "add1d072-0d79-4878-9781-2f9141e77c84"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "User Management",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "User Management",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.research.gov\/research-portal\/appmanager\/base\/desktop?_nfpb=true&_pageLabel=research_node_display&_nodePath=\/researchGov\/Service\/Desktop\/InstitutionAndUserManagement.html",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 6
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:50:03+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json b/web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json
new file mode 100644
index 0000000..7ac4bb3
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/21\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 21
+        }
+    ],
+    "uuid": [
+        {
+            "value": "ae222b1f-b138-466b-ae33-0a464bae5993"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Project Reports",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Project Reports",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.research.gov\/research-portal\/appmanager\/base\/desktop?_nfpb=true&_pageLabel=research_node_display&_nodePath=\/researchGov\/Service\/Desktop\/PublicOutcomesReport.html",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 3
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:47:16+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json b/web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json
new file mode 100644
index 0000000..0ba0c55
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/22\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 22
+        }
+    ],
+    "uuid": [
+        {
+            "value": "b8aa0e4a-b52e-4e1f-acfc-c80555e41b66"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Public Access",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Public Access",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.research.gov\/research-portal\/appmanager\/base\/desktop?_nfpb=true&_pageLabel=research_node_display&_nodePath=\/researchGov\/Service\/Desktop\/AboutPublicAccess.html",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 5
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:49:21+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json b/web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json
new file mode 100644
index 0000000..19fccb8
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/25\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 25
+        }
+    ],
+    "uuid": [
+        {
+            "value": "b9b37cba-942c-443b-803e-e9301f330ad7"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Research Spending & Results",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Research Spending & Results",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.research.gov\/research-portal\/appmanager\/base\/desktop?_nfpb=true&_eventName=viewQuickSearchFormEvent_so_rsr",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 0
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:c43f2f1b-86dd-462b-ac15-fc241e1af751"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:52:21+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/c43f2f1b-86dd-462b-ac15-fc241e1af751.json b/web/sites/default/content/menu_link_content/c43f2f1b-86dd-462b-ac15-fc241e1af751.json
new file mode 100644
index 0000000..0eccc95
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/c43f2f1b-86dd-462b-ac15-fc241e1af751.json
@@ -0,0 +1,93 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/24\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 24
+        }
+    ],
+    "uuid": [
+        {
+            "value": "c43f2f1b-86dd-462b-ac15-fc241e1af751"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "NSF Award Highlights",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "NSF Award Highlights",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "internal:#",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": true
+        }
+    ],
+    "weight": [
+        {
+            "value": 1
+        }
+    ],
+    "expanded": [
+        {
+            "value": true
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:51:15+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json b/web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json
new file mode 100644
index 0000000..9406f2c
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/27\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 27
+        }
+    ],
+    "uuid": [
+        {
+            "value": "d5e5aad6-f42c-48d3-8825-fe56b62fc1f6"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Contact Help Desk",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Contact Help Desk",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.research.gov\/research-portal\/appmanager\/base\/desktop?_nfpb=true&_pageLabel=research_contact_us",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 0
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:ebcd6b15-f09f-4d5e-9478-ada67aba04bd"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:53:32+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/e4168237-4768-4bb1-9eb8-01a4f0ac055d.json b/web/sites/default/content/menu_link_content/e4168237-4768-4bb1-9eb8-01a4f0ac055d.json
new file mode 100644
index 0000000..d043cba
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/e4168237-4768-4bb1-9eb8-01a4f0ac055d.json
@@ -0,0 +1,93 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 16
+        }
+    ],
+    "uuid": [
+        {
+            "value": "e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "About Services",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "About Services",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "internal:#",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": true
+        }
+    ],
+    "weight": [
+        {
+            "value": 0
+        }
+    ],
+    "expanded": [
+        {
+            "value": true
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:30:37+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/ebcd6b15-f09f-4d5e-9478-ada67aba04bd.json b/web/sites/default/content/menu_link_content/ebcd6b15-f09f-4d5e-9478-ada67aba04bd.json
new file mode 100644
index 0000000..fdddd8d
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/ebcd6b15-f09f-4d5e-9478-ada67aba04bd.json
@@ -0,0 +1,93 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/26\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 26
+        }
+    ],
+    "uuid": [
+        {
+            "value": "ebcd6b15-f09f-4d5e-9478-ada67aba04bd"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Contact",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Contact",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "internal:#",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": true
+        }
+    ],
+    "weight": [
+        {
+            "value": 2
+        }
+    ],
+    "expanded": [
+        {
+            "value": true
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:52:54+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json b/web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json
new file mode 100644
index 0000000..d3f1c9d
--- /dev/null
+++ b/web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json
@@ -0,0 +1,98 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/admin\/structure\/menu\/item\/20\/edit?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+        }
+    },
+    "id": [
+        {
+            "value": 20
+        }
+    ],
+    "uuid": [
+        {
+            "value": "f4df684c-896a-49f6-8302-bad77d152982"
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "bundle": [
+        {
+            "value": "menu_link_content"
+        }
+    ],
+    "title": [
+        {
+            "value": "Proposal Status",
+            "lang": "en"
+        }
+    ],
+    "description": [
+        {
+            "value": "Proposal Status",
+            "lang": "en"
+        }
+    ],
+    "menu_name": [
+        {
+            "value": "footer-research-gov"
+        }
+    ],
+    "link": [
+        {
+            "uri": "https:\/\/www.research.gov\/research-portal\/appmanager\/base\/desktop?_nfpb=true&_pageLabel=research_node_display&_nodePath=\/researchGov\/Service\/Desktop\/grantsapplicationstatus.html",
+            "title": "",
+            "options": []
+        }
+    ],
+    "external": [
+        {
+            "value": false
+        }
+    ],
+    "rediscover": [
+        {
+            "value": false
+        }
+    ],
+    "weight": [
+        {
+            "value": 3
+        }
+    ],
+    "expanded": [
+        {
+            "value": false
+        }
+    ],
+    "enabled": [
+        {
+            "value": true
+        }
+    ],
+    "parent": [
+        {
+            "value": "menu_link_content:e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-04-05T21:47:42+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file

From 5ab0ed1f47603853f9e5d36506f10dc205e13054 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 6 Apr 2018 10:46:20 -0700
Subject: [PATCH 125/143] Set the `Funding & Awards` menu to always display
 expanded

...like the others.

https://github.com/18F/nsf/issues/190
---
 .../menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json b/web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json
index 76ac8c1..5a03fdc 100644
--- a/web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json
+++ b/web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json
@@ -69,7 +69,7 @@
     ],
     "expanded": [
         {
-            "value": false
+            "value": true
         }
     ],
     "enabled": [

From d36f1f72636d6fce67f9b9d0f0262c7a5268a980 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 6 Apr 2018 10:48:47 -0700
Subject: [PATCH 126/143] Make custom footer menus display all links, not just
 top level

This commit applies the USWDS 'big' option to our two custom
footer menus so that all of their links get rendered.

https://github.com/18F/nsf/issues/190
---
 web/sites/default/config/nsf.settings.yml     |  2 +-
 ...enu--footer-national-science-fou.html.twig | 58 +++++++++++++++++++
 .../menu/menu--footer-research-gov.html.twig  | 58 +++++++++++++++++++
 3 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 web/themes/nsf/templates/system/menu/menu--footer-national-science-fou.html.twig
 create mode 100644 web/themes/nsf/templates/system/menu/menu--footer-research-gov.html.twig

diff --git a/web/sites/default/config/nsf.settings.yml b/web/sites/default/config/nsf.settings.yml
index 8f4f9cd..7d42039 100644
--- a/web/sites/default/config/nsf.settings.yml
+++ b/web/sites/default/config/nsf.settings.yml
@@ -13,7 +13,7 @@ uswds_header_style: basic
 uswds_header_mega: 0
 uswds_search: 0
 uswds_government_banner: 1
-uswds_footer_style: slim
+uswds_footer_style: big
 uswds_footer_agency: 0
 uswds_footer_agency_name: ''
 uswds_footer_agency_url: ''
diff --git a/web/themes/nsf/templates/system/menu/menu--footer-national-science-fou.html.twig b/web/themes/nsf/templates/system/menu/menu--footer-national-science-fou.html.twig
new file mode 100644
index 0000000..bf52010
--- /dev/null
+++ b/web/themes/nsf/templates/system/menu/menu--footer-national-science-fou.html.twig
@@ -0,0 +1,58 @@
+{#
+/**
+ * @file
+ * Override of system/menu.html.twig for the `Footer: National
+ * Science Foundation` menu.
+ */
+#}
+
+{% import _self as menus %}
+
+{#
+  We call a macro which calls itself to render the full tree.
+  @see http://twig.sensiolabs.org/doc/tags/macro.html
+#}
+{{ menus.menu_links(items, 0, footer_style) }}
+
+{% macro menu_links(items, menu_level, footer_style) %}
+  {% import _self as menus %}
+  {% if items %}
+
+    {% if not 'big' == footer_style %}
+    <ul class="usa-unstyled-list">
+    {% endif %}
+
+    {% for item in items %}
+
+      {% if menu_level == 0 and 'big' == footer_style %}
+      <ul class="usa-unstyled-list usa-width-one-fourth usa-footer-primary-content">
+        <li class="usa-footer-primary-link">
+          <h4>{{ item.title }}</h4>
+        </li>
+
+        {% if item.below %}
+        {{ menus.menu_links(item.below, 1, footer_style) }}
+        {% endif %}
+      </ul>
+      {% elseif 'big' == footer_style %}
+      <li>
+        <a href="{{ item.url }}">{{ item.title }}</a>
+      </li>
+      {% elseif 'medium' == footer_style %}
+      <li class="usa-width-one-sixth usa-footer-primary-content">
+        <a class="usa-footer-primary-link" href="{{ item.url }}">{{ item.title }}</a>
+      </li>
+      {% else %}
+      <li class="usa-width-one-fourth usa-footer-primary-content">
+        <a class="usa-footer-primary-link" href="{{ item.url }}">{{ item.title }}</a>
+      </li>
+      {% endif %}
+
+    {% endfor %}
+
+    {% if not 'big' == footer_style %}
+    </ul>
+    {% endif %}
+
+  {% endif %}
+{% endmacro %}
diff --git a/web/themes/nsf/templates/system/menu/menu--footer-research-gov.html.twig b/web/themes/nsf/templates/system/menu/menu--footer-research-gov.html.twig
new file mode 100644
index 0000000..aa9ab82
--- /dev/null
+++ b/web/themes/nsf/templates/system/menu/menu--footer-research-gov.html.twig
@@ -0,0 +1,58 @@
+{#
+/**
+ * @file
+ * Override of system/menu.html.twig for the
+ * `Footer: Research.gov` menu.
+ */
+#}
+
+{% import _self as menus %}
+
+{#
+  We call a macro which calls itself to render the full tree.
+  @see http://twig.sensiolabs.org/doc/tags/macro.html
+#}
+{{ menus.menu_links(items, 0, footer_style) }}
+
+{% macro menu_links(items, menu_level, footer_style) %}
+  {% import _self as menus %}
+  {% if items %}
+
+    {% if not 'big' == footer_style %}
+    <ul class="usa-unstyled-list">
+    {% endif %}
+
+    {% for item in items %}
+
+      {% if menu_level == 0 and 'big' == footer_style %}
+      <ul class="usa-unstyled-list usa-width-one-fourth usa-footer-primary-content">
+        <li class="usa-footer-primary-link">
+          <h4>{{ item.title }}</h4>
+        </li>
+
+        {% if item.below %}
+        {{ menus.menu_links(item.below, 1, footer_style) }}
+        {% endif %}
+      </ul>
+      {% elseif 'big' == footer_style %}
+      <li>
+        <a href="{{ item.url }}">{{ item.title }}</a>
+      </li>
+      {% elseif 'medium' == footer_style %}
+      <li class="usa-width-one-sixth usa-footer-primary-content">
+        <a class="usa-footer-primary-link" href="{{ item.url }}">{{ item.title }}</a>
+      </li>
+      {% else %}
+      <li class="usa-width-one-fourth usa-footer-primary-content">
+        <a class="usa-footer-primary-link" href="{{ item.url }}">{{ item.title }}</a>
+      </li>
+      {% endif %}
+
+    {% endfor %}
+
+    {% if not 'big' == footer_style %}
+    </ul>
+    {% endif %}
+
+  {% endif %}
+{% endmacro %}

From c83ba34d62342baf4293de2b126e4d63bcf60e14 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 6 Apr 2018 12:20:45 -0700
Subject: [PATCH 127/143] Disable links for top-level footer menu items

On the current nsf.gov site, items such as `News` and `About
Services` display in the footer menu but aren't links. This commit
allows us to match that.

https://github.com/18F/nsf/issues/190
---
 web/themes/nsf/assets/css/uswds.css         | 12 +++++++++---
 web/themes/nsf/assets/css/uswds.css.map     |  2 +-
 web/themes/nsf/assets/css/uswds.min.css     |  2 +-
 web/themes/nsf/assets/css/uswds.min.css.map |  2 +-
 web/themes/nsf/sass/uswds.scss              |  4 ++++
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/web/themes/nsf/assets/css/uswds.css b/web/themes/nsf/assets/css/uswds.css
index dd6c5cc..dec7d62 100644
--- a/web/themes/nsf/assets/css/uswds.css
+++ b/web/themes/nsf/assets/css/uswds.css
@@ -3552,7 +3552,7 @@ input.usa-input-medium {
       left: auto;
       position: relative; } }
 
-input[type=search] {
+input[type="search"] {
   /* stylelint-disable-line selector-no-qualifying-type */
   box-sizing: border-box;
   -webkit-appearance: none; }
@@ -3738,7 +3738,8 @@ select.form-select {
 .usa-form-large {
   max-width: none; }
 
-form [type="submit"], form [type="submit"] {
+form [type=submit],
+form [type=submit] {
   display: inline-block; }
 
 textarea {
@@ -3747,7 +3748,9 @@ textarea {
 label {
   margin-top: 1rem; }
 
-input, textarea, select {
+input,
+textarea,
+select {
   max-width: none; }
 
 #block-nsf-views-block-news-block-1 ul {
@@ -3769,3 +3772,6 @@ img.image-style-news-main-story {
 
 .usa-navbar em.usa-logo-text {
   margin-left: -5000em; }
+
+.region-footer-menu li.usa-footer-primary-link {
+  pointer-events: none; }
diff --git a/web/themes/nsf/assets/css/uswds.css.map b/web/themes/nsf/assets/css/uswds.css.map
index 1b3d454..f9c4233 100644
--- a/web/themes/nsf/assets/css/uswds.css.map
+++ b/web/themes/nsf/assets/css/uswds.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../scss/uswds.scss","../scss/lib/grid/_box-sizing.scss","../scss/lib/_normalize.scss","../scss/core/_fonts.scss","../scss/lib/css3/_font-face.scss","../scss/lib/helpers/_font-source-declaration.scss","../scss/core/_grid.scss","../scss/lib/grid/_outer-container.scss","../scss/lib/settings/_grid.scss","../scss/core/_variables.scss","../scss/lib/mixins/_clearfix.scss","../scss/lib/helpers/_directional-values.scss","../scss/lib/grid/_media.scss","../scss/lib/grid/_span-columns.scss","../scss/lib/grid/_omega.scss","../scss/lib/grid/_shift.scss","../scss/core/_utilities.scss","../scss/core/_base.scss","../scss/elements/_buttons.scss","../../sass/_variables.scss","../scss/elements/_embed.scss","../scss/elements/_figure.scss","../scss/elements/_inputs.scss","../scss/elements/_labels.scss","../scss/elements/_list.scss","../scss/elements/_table.scss","../scss/elements/_typography.scss","../scss/components/_accordions.scss","../scss/components/_alerts.scss","../scss/components/_banner.scss","../scss/components/_footer.scss","../scss/components/_forms.scss","../scss/components/_graphic-list.scss","../scss/components/_header.scss","../scss/lib/addons/_position.scss","../scss/components/_hero.scss","../scss/components/_layout.scss","../scss/components/_media-block.scss","../scss/components/_navigation.scss","../scss/components/_search.scss","../scss/components/_section.scss","../scss/components/_sidenav.scss","../scss/components/_skipnav.scss","../../sass/uswds.scss"],
 "names": [],
 "file": "uswds.css"
diff --git a/web/themes/nsf/assets/css/uswds.min.css b/web/themes/nsf/assets/css/uswds.min.css
index 4d644df..b9fb59f 100644
--- a/web/themes/nsf/assets/css/uswds.min.css
+++ b/web/themes/nsf/assets/css/uswds.min.css
@@ -1,4 +1,4 @@
 /*! uswds @version */
 
-/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse}td,th{padding:0}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:300;src:url(../fonts/sourcesanspro-light-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-light-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-light-webfont.woff) format("woff"),url(../fonts/sourcesanspro-light-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:400;src:url(../fonts/sourcesanspro-regular-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-regular-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-regular-webfont.woff) format("woff"),url(../fonts/sourcesanspro-regular-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:italic;font-weight:400;src:url(../fonts/sourcesanspro-italic-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-italic-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-italic-webfont.woff) format("woff"),url(../fonts/sourcesanspro-italic-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:700;src:url(../fonts/sourcesanspro-bold-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-bold-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-bold-webfont.woff) format("woff"),url(../fonts/sourcesanspro-bold-webfont.ttf) format("truetype")}.usa-grid,.usa-grid-full{max-width:1200px;margin-left:auto;margin-right:auto;max-width:1040px}.usa-grid-full:after,.usa-grid:after{clear:both;content:"";display:block}.usa-grid{padding-right:1.5rem;padding-left:1.5rem}@media screen and (min-width:600px){.usa-grid{padding-right:3rem;padding-left:3rem}}.usa-grid-full{padding:0}@media screen and (min-width:600px){.usa-width-one-whole{float:left;display:block;margin-right:4.82916%;width:100%}.usa-width-one-whole:last-child{margin-right:0}.usa-width-one-half{float:left;display:block;margin-right:4.82916%;width:47.58542%}.usa-width-one-half:last-child{margin-right:0}.usa-width-one-third{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-third:last-child{margin-right:0}.usa-width-two-thirds{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-two-thirds:last-child{margin-right:0}.usa-width-one-fourth{float:left;display:block;margin-right:4.82916%;width:47.58542%}.usa-width-one-fourth:last-child,.usa-width-one-fourth:nth-child(2n){margin-right:0}.usa-width-three-fourths{float:left;display:block;margin-right:4.82916%;width:100%}.usa-width-three-fourths:last-child{margin-right:0}.usa-width-one-sixth{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-sixth:last-child,.usa-width-one-sixth:nth-child(3n){margin-right:0}.usa-width-five-sixths{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-five-sixths:last-child{margin-right:0}.usa-width-one-twelfth{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-twelfth:last-child,.usa-width-one-twelfth:nth-child(3n){margin-right:0}.usa-width-five-twelfths{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-five-twelfths:last-child{margin-right:0}.usa-width-seven-twelfths{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-seven-twelfths:last-child{margin-right:0}}@media screen and (min-width:1201px){.usa-width-one-whole{float:left;display:block;margin-right:2.35765%;width:100%}.usa-width-one-whole:last-child{margin-right:0}.usa-width-one-half{float:left;display:block;margin-right:2.35765%;width:48.82117%}.usa-width-one-half:last-child{margin-right:0}.usa-width-one-third{float:left;display:block;margin-right:2.35765%;width:31.76157%}.usa-width-one-third:last-child{margin-right:0}.usa-width-two-thirds{float:left;display:block;margin-right:2.35765%;width:65.88078%}.usa-width-two-thirds:last-child{margin-right:0}.usa-width-one-fourth{float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-width-one-fourth:last-child{margin-right:0}.usa-width-one-fourth:nth-child(2n){float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-width-one-fourth:nth-child(2n):last-child,.usa-width-one-fourth:nth-child(4n){margin-right:0}.usa-width-three-fourths{float:left;display:block;margin-right:2.35765%;width:74.41059%}.usa-width-three-fourths:last-child{margin-right:0}.usa-width-one-sixth{float:left;display:block;margin-right:2.35765%;width:14.70196%}.usa-width-one-sixth:last-child{margin-right:0}.usa-width-one-sixth:nth-child(3n){float:left;display:block;margin-right:2.35765%;width:14.70196%}.usa-width-one-sixth:nth-child(3n):last-child,.usa-width-one-sixth:nth-child(6n){margin-right:0}.usa-width-five-sixths{float:left;display:block;margin-right:2.35765%;width:82.94039%}.usa-width-five-sixths:last-child{margin-right:0}.usa-width-one-twelfth{float:left;display:block;margin-right:2.35765%;width:6.17215%}.usa-width-one-twelfth:last-child{margin-right:0}.usa-width-one-twelfth:nth-child(3n){float:left;display:block;margin-right:2.35765%;width:6.17215%}.usa-width-one-twelfth:nth-child(3n):last-child,.usa-width-one-twelfth:nth-child(12n){margin-right:0}.usa-width-five-twelfths{float:left;display:block;margin-right:2.35765%;width:40.29137%}.usa-width-five-twelfths:last-child{margin-right:0}.usa-width-seven-twelfths{float:left;display:block;margin-right:2.35765%;width:57.35098%}.usa-width-seven-twelfths:last-child{margin-right:0}}.usa-end-row{margin-right:0}.usa-offset-one-twelfth{margin-left:8.5298%}.usa-offset-one-sixth{margin-left:17.05961%}.usa-offset-one-fourth{margin-left:25.58941%}.usa-offset-one-third{margin-left:34.11922%}.usa-offset-five-twelfths{margin-left:42.64902%}.usa-offset-one-half{margin-left:51.17883%}.usa-offset-seven-twelfths{margin-left:59.70863%}.usa-offset-two-thirds{margin-left:68.23843%}.usa-offset-three-fourths{margin-left:76.76824%}.usa-offset-five-sixths{margin-left:85.29804%}.usa-offset-eleven-twelfths{margin-left:93.82785%}.usa-sr-only{position:absolute;left:-999em}html{box-sizing:border-box}*,:after,:before{box-sizing:inherit}body{background-color:#fff;overflow-x:hidden}.lt-ie9 *{-webkit-filter:none!important;filter:none!important}[hidden]{display:none!important}.usa-focus,:focus{outline:2px dotted #999;outline-offset:3px}.usa-button,.usa-button-primary,.usa-button-primary:visited,.usa-button:visited,[type=button],[type=image],[type=reset],[type=submit],button{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;margin-top:.5em;margin-right:.5em;margin-bottom:.5em;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#0071bc;border:0;border-radius:5px;color:#fff;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:1.7rem;font-weight:700;line-height:1;padding:1rem 2rem;text-align:center;text-decoration:none;width:100%}@media screen and (min-width:481px){.usa-button,.usa-button-primary,.usa-button-primary:visited,.usa-button:visited,[type=button],[type=image],[type=reset],[type=submit],button{width:auto}}.usa-button-primary.usa-button-hover,.usa-button-primary:hover,.usa-button-primary:visited.usa-button-hover,.usa-button-primary:visited:hover,.usa-button.usa-button-hover,.usa-button:hover,.usa-button:visited.usa-button-hover,.usa-button:visited:hover,[type=button].usa-button-hover,[type=button]:hover,[type=image].usa-button-hover,[type=image]:hover,[type=reset].usa-button-hover,[type=reset]:hover,[type=submit].usa-button-hover,[type=submit]:hover,button.usa-button-hover,button:hover{background-color:#205493;border-bottom:0;color:#fff;text-decoration:none}.usa-button-primary.usa-button-active,.usa-button-primary:active,.usa-button-primary:visited.usa-button-active,.usa-button-primary:visited:active,.usa-button.usa-button-active,.usa-button:active,.usa-button:visited.usa-button-active,.usa-button:visited:active,[type=button].usa-button-active,[type=button]:active,[type=image].usa-button-active,[type=image]:active,[type=reset].usa-button-active,[type=reset]:active,[type=submit].usa-button-active,[type=submit]:active,button.usa-button-active,button:active{background-color:#112e51}.usa-button-primary.usa-button-primary-alt,.usa-button-primary:visited.usa-button-primary-alt,.usa-button.usa-button-primary-alt,.usa-button:visited.usa-button-primary-alt,[type=button].usa-button-primary-alt,[type=image].usa-button-primary-alt,[type=reset].usa-button-primary-alt,[type=submit].usa-button-primary-alt,button.usa-button-primary-alt{background-color:#c64b00;color:#212121}.usa-button-primary.usa-button-primary-alt.usa-button-hover,.usa-button-primary.usa-button-primary-alt:hover,.usa-button-primary:visited.usa-button-primary-alt.usa-button-hover,.usa-button-primary:visited.usa-button-primary-alt:hover,.usa-button.usa-button-primary-alt.usa-button-hover,.usa-button.usa-button-primary-alt:hover,.usa-button:visited.usa-button-primary-alt.usa-button-hover,.usa-button:visited.usa-button-primary-alt:hover,[type=button].usa-button-primary-alt.usa-button-hover,[type=button].usa-button-primary-alt:hover,[type=image].usa-button-primary-alt.usa-button-hover,[type=image].usa-button-primary-alt:hover,[type=reset].usa-button-primary-alt.usa-button-hover,[type=reset].usa-button-primary-alt:hover,[type=submit].usa-button-primary-alt.usa-button-hover,[type=submit].usa-button-primary-alt:hover,button.usa-button-primary-alt.usa-button-hover,button.usa-button-primary-alt:hover{background-color:#046b99}.usa-button-primary.usa-button-primary-alt.usa-button-active,.usa-button-primary.usa-button-primary-alt:active,.usa-button-primary:visited.usa-button-primary-alt.usa-button-active,.usa-button-primary:visited.usa-button-primary-alt:active,.usa-button.usa-button-primary-alt.usa-button-active,.usa-button.usa-button-primary-alt:active,.usa-button:visited.usa-button-primary-alt.usa-button-active,.usa-button:visited.usa-button-primary-alt:active,[type=button].usa-button-primary-alt.usa-button-active,[type=button].usa-button-primary-alt:active,[type=image].usa-button-primary-alt.usa-button-active,[type=image].usa-button-primary-alt:active,[type=reset].usa-button-primary-alt.usa-button-active,[type=reset].usa-button-primary-alt:active,[type=submit].usa-button-primary-alt.usa-button-active,[type=submit].usa-button-primary-alt:active,button.usa-button-primary-alt.usa-button-active,button.usa-button-primary-alt:active{background-color:#046b99;color:#fff}.usa-button-primary.usa-button-secondary,.usa-button-primary:visited.usa-button-secondary,.usa-button.usa-button-secondary,.usa-button:visited.usa-button-secondary,[type=button].usa-button-secondary,[type=image].usa-button-secondary,[type=reset].usa-button-secondary,[type=submit].usa-button-secondary,button.usa-button-secondary{background-color:#fff;box-shadow:inset 0 0 0 2px #0071bc;color:#0071bc}.usa-button-primary.usa-button-secondary.usa-button-hover,.usa-button-primary.usa-button-secondary:hover,.usa-button-primary:visited.usa-button-secondary.usa-button-hover,.usa-button-primary:visited.usa-button-secondary:hover,.usa-button.usa-button-secondary.usa-button-hover,.usa-button.usa-button-secondary:hover,.usa-button:visited.usa-button-secondary.usa-button-hover,.usa-button:visited.usa-button-secondary:hover,[type=button].usa-button-secondary.usa-button-hover,[type=button].usa-button-secondary:hover,[type=image].usa-button-secondary.usa-button-hover,[type=image].usa-button-secondary:hover,[type=reset].usa-button-secondary.usa-button-hover,[type=reset].usa-button-secondary:hover,[type=submit].usa-button-secondary.usa-button-hover,[type=submit].usa-button-secondary:hover,button.usa-button-secondary.usa-button-hover,button.usa-button-secondary:hover{box-shadow:inset 0 0 0 2px #205493;color:#205493}.usa-button-primary.usa-button-secondary.usa-button-active,.usa-button-primary.usa-button-secondary:active,.usa-button-primary:visited.usa-button-secondary.usa-button-active,.usa-button-primary:visited.usa-button-secondary:active,.usa-button.usa-button-secondary.usa-button-active,.usa-button.usa-button-secondary:active,.usa-button:visited.usa-button-secondary.usa-button-active,.usa-button:visited.usa-button-secondary:active,[type=button].usa-button-secondary.usa-button-active,[type=button].usa-button-secondary:active,[type=image].usa-button-secondary.usa-button-active,[type=image].usa-button-secondary:active,[type=reset].usa-button-secondary.usa-button-active,[type=reset].usa-button-secondary:active,[type=submit].usa-button-secondary.usa-button-active,[type=submit].usa-button-secondary:active,button.usa-button-secondary.usa-button-active,button.usa-button-secondary:active{box-shadow:inset 0 0 0 2px #112e51;color:#112e51}.usa-button-primary.usa-button-outline-inverse,.usa-button-primary.usa-button-secondary-inverse,.usa-button-primary:visited.usa-button-outline-inverse,.usa-button-primary:visited.usa-button-secondary-inverse,.usa-button.usa-button-outline-inverse,.usa-button.usa-button-secondary-inverse,.usa-button:visited.usa-button-outline-inverse,.usa-button:visited.usa-button-secondary-inverse,[type=button].usa-button-outline-inverse,[type=button].usa-button-secondary-inverse,[type=image].usa-button-outline-inverse,[type=image].usa-button-secondary-inverse,[type=reset].usa-button-outline-inverse,[type=reset].usa-button-secondary-inverse,[type=submit].usa-button-outline-inverse,[type=submit].usa-button-secondary-inverse,button.usa-button-outline-inverse,button.usa-button-secondary-inverse{background:transparent;box-shadow:inset 0 0 0 2px #fff;color:#fff}.usa-button-primary.usa-button-outline-inverse.usa-button-hover,.usa-button-primary.usa-button-outline-inverse:hover,.usa-button-primary.usa-button-secondary-inverse.usa-button-hover,.usa-button-primary.usa-button-secondary-inverse:hover,.usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,.usa-button-primary:visited.usa-button-outline-inverse:hover,.usa-button-primary:visited.usa-button-secondary-inverse.usa-button-hover,.usa-button-primary:visited.usa-button-secondary-inverse:hover,.usa-button.usa-button-outline-inverse.usa-button-hover,.usa-button.usa-button-outline-inverse:hover,.usa-button.usa-button-secondary-inverse.usa-button-hover,.usa-button.usa-button-secondary-inverse:hover,.usa-button:visited.usa-button-outline-inverse.usa-button-hover,.usa-button:visited.usa-button-outline-inverse:hover,.usa-button:visited.usa-button-secondary-inverse.usa-button-hover,.usa-button:visited.usa-button-secondary-inverse:hover,[type=button].usa-button-outline-inverse.usa-button-hover,[type=button].usa-button-outline-inverse:hover,[type=button].usa-button-secondary-inverse.usa-button-hover,[type=button].usa-button-secondary-inverse:hover,[type=image].usa-button-outline-inverse.usa-button-hover,[type=image].usa-button-outline-inverse:hover,[type=image].usa-button-secondary-inverse.usa-button-hover,[type=image].usa-button-secondary-inverse:hover,[type=reset].usa-button-outline-inverse.usa-button-hover,[type=reset].usa-button-outline-inverse:hover,[type=reset].usa-button-secondary-inverse.usa-button-hover,[type=reset].usa-button-secondary-inverse:hover,[type=submit].usa-button-outline-inverse.usa-button-hover,[type=submit].usa-button-outline-inverse:hover,[type=submit].usa-button-secondary-inverse.usa-button-hover,[type=submit].usa-button-secondary-inverse:hover,button.usa-button-outline-inverse.usa-button-hover,button.usa-button-outline-inverse:hover,button.usa-button-secondary-inverse.usa-button-hover,button.usa-button-secondary-inverse:hover{box-shadow:inset 0 0 0 2px #c9c9c9;color:#c9c9c9}.usa-button-primary.usa-button-outline-inverse.usa-button-active,.usa-button-primary.usa-button-outline-inverse:active,.usa-button-primary.usa-button-secondary-inverse.usa-button-active,.usa-button-primary.usa-button-secondary-inverse:active,.usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,.usa-button-primary:visited.usa-button-outline-inverse:active,.usa-button-primary:visited.usa-button-secondary-inverse.usa-button-active,.usa-button-primary:visited.usa-button-secondary-inverse:active,.usa-button.usa-button-outline-inverse.usa-button-active,.usa-button.usa-button-outline-inverse:active,.usa-button.usa-button-secondary-inverse.usa-button-active,.usa-button.usa-button-secondary-inverse:active,.usa-button:visited.usa-button-outline-inverse.usa-button-active,.usa-button:visited.usa-button-outline-inverse:active,.usa-button:visited.usa-button-secondary-inverse.usa-button-active,.usa-button:visited.usa-button-secondary-inverse:active,[type=button].usa-button-outline-inverse.usa-button-active,[type=button].usa-button-outline-inverse:active,[type=button].usa-button-secondary-inverse.usa-button-active,[type=button].usa-button-secondary-inverse:active,[type=image].usa-button-outline-inverse.usa-button-active,[type=image].usa-button-outline-inverse:active,[type=image].usa-button-secondary-inverse.usa-button-active,[type=image].usa-button-secondary-inverse:active,[type=reset].usa-button-outline-inverse.usa-button-active,[type=reset].usa-button-outline-inverse:active,[type=reset].usa-button-secondary-inverse.usa-button-active,[type=reset].usa-button-secondary-inverse:active,[type=submit].usa-button-outline-inverse.usa-button-active,[type=submit].usa-button-outline-inverse:active,[type=submit].usa-button-secondary-inverse.usa-button-active,[type=submit].usa-button-secondary-inverse:active,button.usa-button-outline-inverse.usa-button-active,button.usa-button-outline-inverse:active,button.usa-button-secondary-inverse.usa-button-active,button.usa-button-secondary-inverse:active{box-shadow:inset 0 0 0 2px #999;color:#c9c9c9}.usa-button-primary.usa-button-gray,.usa-button-primary:visited.usa-button-gray,.usa-button.usa-button-gray,.usa-button:visited.usa-button-gray,[type=button].usa-button-gray,[type=image].usa-button-gray,[type=reset].usa-button-gray,[type=submit].usa-button-gray,button.usa-button-gray{background-color:#666}.usa-button-primary.usa-button-gray.usa-button-hover,.usa-button-primary.usa-button-gray:hover,.usa-button-primary:visited.usa-button-gray.usa-button-hover,.usa-button-primary:visited.usa-button-gray:hover,.usa-button.usa-button-gray.usa-button-hover,.usa-button.usa-button-gray:hover,.usa-button:visited.usa-button-gray.usa-button-hover,.usa-button:visited.usa-button-gray:hover,[type=button].usa-button-gray.usa-button-hover,[type=button].usa-button-gray:hover,[type=image].usa-button-gray.usa-button-hover,[type=image].usa-button-gray:hover,[type=reset].usa-button-gray.usa-button-hover,[type=reset].usa-button-gray:hover,[type=submit].usa-button-gray.usa-button-hover,[type=submit].usa-button-gray:hover,button.usa-button-gray.usa-button-hover,button.usa-button-gray:hover{background-color:#333}.usa-button-primary.usa-button-gray.usa-button-active,.usa-button-primary.usa-button-gray:active,.usa-button-primary:visited.usa-button-gray.usa-button-active,.usa-button-primary:visited.usa-button-gray:active,.usa-button.usa-button-gray.usa-button-active,.usa-button.usa-button-gray:active,.usa-button:visited.usa-button-gray.usa-button-active,.usa-button:visited.usa-button-gray:active,[type=button].usa-button-gray.usa-button-active,[type=button].usa-button-gray:active,[type=image].usa-button-gray.usa-button-active,[type=image].usa-button-gray:active,[type=reset].usa-button-gray.usa-button-active,[type=reset].usa-button-gray:active,[type=submit].usa-button-gray.usa-button-active,[type=submit].usa-button-gray:active,button.usa-button-gray.usa-button-active,button.usa-button-gray:active{background-color:#212121}.usa-button-primary.usa-button-red,.usa-button-primary:visited.usa-button-red,.usa-button.usa-button-red,.usa-button:visited.usa-button-red,[type=button].usa-button-red,[type=image].usa-button-red,[type=reset].usa-button-red,[type=submit].usa-button-red,button.usa-button-red{background-color:#005495}.usa-button-primary.usa-button-red.usa-button-hover,.usa-button-primary.usa-button-red:hover,.usa-button-primary:visited.usa-button-red.usa-button-hover,.usa-button-primary:visited.usa-button-red:hover,.usa-button.usa-button-red.usa-button-hover,.usa-button.usa-button-red:hover,.usa-button:visited.usa-button-red.usa-button-hover,.usa-button:visited.usa-button-red:hover,[type=button].usa-button-red.usa-button-hover,[type=button].usa-button-red:hover,[type=image].usa-button-red.usa-button-hover,[type=image].usa-button-red:hover,[type=reset].usa-button-red.usa-button-hover,[type=reset].usa-button-red:hover,[type=submit].usa-button-red.usa-button-hover,[type=submit].usa-button-red:hover,button.usa-button-red.usa-button-hover,button.usa-button-red:hover{background-color:#981b1e}.usa-button-primary.usa-button-red.usa-button-active,.usa-button-primary.usa-button-red:active,.usa-button-primary:visited.usa-button-red.usa-button-active,.usa-button-primary:visited.usa-button-red:active,.usa-button.usa-button-red.usa-button-active,.usa-button.usa-button-red:active,.usa-button:visited.usa-button-red.usa-button-active,.usa-button:visited.usa-button-red:active,[type=button].usa-button-red.usa-button-active,[type=button].usa-button-red:active,[type=image].usa-button-red.usa-button-active,[type=image].usa-button-red:active,[type=reset].usa-button-red.usa-button-active,[type=reset].usa-button-red:active,[type=submit].usa-button-red.usa-button-active,[type=submit].usa-button-red:active,button.usa-button-red.usa-button-active,button.usa-button-red:active{background-color:#cd2026}.usa-button-primary.usa-button-big,.usa-button-primary:visited.usa-button-big,.usa-button.usa-button-big,.usa-button:visited.usa-button-big,[type=button].usa-button-big,[type=image].usa-button-big,[type=reset].usa-button-big,[type=submit].usa-button-big,button.usa-button-big{border-radius:8px;font-size:2.4rem;padding:1.5rem 3rem}.usa-button-primary:disabled,.usa-button-primary:visited:disabled,.usa-button:disabled,.usa-button:visited:disabled,[type=button]:disabled,[type=image]:disabled,[type=reset]:disabled,[type=submit]:disabled,button:disabled{background-color:#c9c9c9;pointer-events:none}.usa-button-primary:disabled.usa-button-active,.usa-button-primary:disabled.usa-button-hover,.usa-button-primary:disabled.usa-focus,.usa-button-primary:disabled:active,.usa-button-primary:disabled:focus,.usa-button-primary:disabled:hover,.usa-button-primary:visited:disabled.usa-button-active,.usa-button-primary:visited:disabled.usa-button-hover,.usa-button-primary:visited:disabled.usa-focus,.usa-button-primary:visited:disabled:active,.usa-button-primary:visited:disabled:focus,.usa-button-primary:visited:disabled:hover,.usa-button:disabled.usa-button-active,.usa-button:disabled.usa-button-hover,.usa-button:disabled.usa-focus,.usa-button:disabled:active,.usa-button:disabled:focus,.usa-button:disabled:hover,.usa-button:visited:disabled.usa-button-active,.usa-button:visited:disabled.usa-button-hover,.usa-button:visited:disabled.usa-focus,.usa-button:visited:disabled:active,.usa-button:visited:disabled:focus,.usa-button:visited:disabled:hover,[type=button]:disabled.usa-button-active,[type=button]:disabled.usa-button-hover,[type=button]:disabled.usa-focus,[type=button]:disabled:active,[type=button]:disabled:focus,[type=button]:disabled:hover,[type=image]:disabled.usa-button-active,[type=image]:disabled.usa-button-hover,[type=image]:disabled.usa-focus,[type=image]:disabled:active,[type=image]:disabled:focus,[type=image]:disabled:hover,[type=reset]:disabled.usa-button-active,[type=reset]:disabled.usa-button-hover,[type=reset]:disabled.usa-focus,[type=reset]:disabled:active,[type=reset]:disabled:focus,[type=reset]:disabled:hover,[type=submit]:disabled.usa-button-active,[type=submit]:disabled.usa-button-hover,[type=submit]:disabled.usa-focus,[type=submit]:disabled:active,[type=submit]:disabled:focus,[type=submit]:disabled:hover,button:disabled.usa-button-active,button:disabled.usa-button-hover,button:disabled.usa-focus,button:disabled:active,button:disabled:focus,button:disabled:hover{background-color:#c9c9c9;border:0;box-shadow:none}.usa-button-disabled{background-color:#c9c9c9;pointer-events:none}.usa-button-disabled.usa-button-active,.usa-button-disabled.usa-button-hover,.usa-button-disabled.usa-focus,.usa-button-disabled:active,.usa-button-disabled:focus,.usa-button-disabled:hover{background-color:#c9c9c9;border:0;box-shadow:none}.usa-button-outline-inverse:disabled,.usa-button-secondary-disabled,.usa-button-secondary-inverse-disabled,.usa-button-secondary-inverse:disabled,.usa-button-secondary:disabled{box-shadow:inset 0 0 0 2px #c9c9c9;pointer-events:none;color:#c9c9c9}.usa-button-outline-inverse:disabled.usa-button-active,.usa-button-outline-inverse:disabled.usa-button-hover,.usa-button-outline-inverse:disabled.usa-focus,.usa-button-outline-inverse:disabled:active,.usa-button-outline-inverse:disabled:focus,.usa-button-outline-inverse:disabled:hover,.usa-button-secondary-disabled.usa-button-active,.usa-button-secondary-disabled.usa-button-hover,.usa-button-secondary-disabled.usa-focus,.usa-button-secondary-disabled:active,.usa-button-secondary-disabled:focus,.usa-button-secondary-disabled:hover,.usa-button-secondary-inverse-disabled.usa-button-active,.usa-button-secondary-inverse-disabled.usa-button-hover,.usa-button-secondary-inverse-disabled.usa-focus,.usa-button-secondary-inverse-disabled:active,.usa-button-secondary-inverse-disabled:focus,.usa-button-secondary-inverse-disabled:hover,.usa-button-secondary-inverse:disabled.usa-button-active,.usa-button-secondary-inverse:disabled.usa-button-hover,.usa-button-secondary-inverse:disabled.usa-focus,.usa-button-secondary-inverse:disabled:active,.usa-button-secondary-inverse:disabled:focus,.usa-button-secondary-inverse:disabled:hover,.usa-button-secondary:disabled.usa-button-active,.usa-button-secondary:disabled.usa-button-hover,.usa-button-secondary:disabled.usa-focus,.usa-button-secondary:disabled:active,.usa-button-secondary:disabled:focus,.usa-button-secondary:disabled:hover{background-color:#fff;border:0}.usa-button-secondary:disabled,html .usa-button-secondary-disabled{background-color:#fff}.usa-button-secondary-inverse:disabled,html .usa-button-secondary-inverse-disabled{background-color:transparent;color:#666;box-shadow:inset 0 0 0 2px #666}.usa-button-unstyled{border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto}.usa-button-unstyled,.usa-button-unstyled:hover{background-color:transparent}.usa-embed-container embed,.usa-embed-container iframe,.usa-embed-container object{position:absolute;top:0;left:0;width:100%;height:100%}.usa-embed-container{padding-bottom:56.25%;position:relative;height:0;overflow:hidden;max-width:100%}img{max-width:100%}.media_link{display:inline-block;line-height:0}input,select,textarea{-webkit-appearance:none;-moz-appearance:none;appearance:none;border:.1rem solid #666;border-radius:0;box-sizing:border-box;color:#212121;display:block;font-size:1.7rem;height:4.4rem;line-height:1.3;margin:.2em 0;max-width:46rem;padding:1rem .7em;width:100%}input.usa-input-success,select.usa-input-success,textarea.usa-input-success{border:3px solid #4aa564}.usa-input-error{border-left:4px solid #981b1e;margin-top:3rem;padding-bottom:.8rem;padding-left:1.5rem;padding-top:.8rem;position:relative;right:1.9rem}.usa-input-error input,.usa-input-error select,.usa-input-error textarea{border:3px solid #981b1e;width:calc(100% + 1.9rem)}.usa-input-error label{margin-top:0}.usa-input-error .usa-input-inline{border:.1rem solid #666;width:inherit}.usa-input-error .usa-input-inline-error{border:3px solid #981b1e}.usa-input-error-label,.usa-input-error-message{display:block;font-size:1.7rem;font-weight:700}.usa-input-error-message{color:#981b1e;padding-bottom:3px;padding-top:3px}.usa-input-required:after{color:#cd2026;content:" (*required)"}.usa-input-optional:after{color:#757575;content:" (optional)"}label{display:block;margin-top:3rem;max-width:46rem}textarea{height:16rem}select{-moz-appearance:none;-webkit-appearance:none;appearance:none;background-color:#fff;background-image:url(../img/arrow-both.png);background-image:url(../img/arrow-both.svg);background-position:right 1.3rem center;background-repeat:no-repeat;background-size:1rem;padding-right:3rem}select::-ms-expand{display:none}select:-webkit-autofill{-webkit-appearance:menulist;appearance:menulist}select:-moz-focusring{color:transparent;text-shadow:0 0 0 #000}legend,option:first-child{font-weight:700}legend{font-size:3rem}.usa-fieldset-inputs label{margin-top:0}.usa-form-hint{color:#757575;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;margin-bottom:0}[type=checkbox],[type=radio]{position:absolute;left:-999em}.lt-ie9 [type=checkbox],.lt-ie9 [type=radio]{border:0;float:left;margin:.4em .4em 0 0;position:static;width:auto}[type=checkbox]+label,[type=radio]+label{cursor:pointer;font-weight:400;margin-bottom:.65em}[type=checkbox]+label:before,[type=radio]+label:before{background:#fff;border-radius:2px;box-shadow:0 0 0 1px #757575;content:"\a0";display:inline-block;height:2rem;line-height:2rem;margin-right:.6em;text-indent:.15em;vertical-align:middle\0;width:2rem}[type=radio]+label:before{border-radius:100%;box-shadow:0 0 0 2px #fff,0 0 0 3px #757575;height:1.4rem;line-height:1.4rem;margin-right:.75em;width:1.4rem}[type=checkbox]:checked+label:before,[type=radio]:checked+label:before{background-color:#0071bc;box-shadow:0 0 0 1px #0071bc}[type=radio]:checked+label:before{box-shadow:0 0 0 2px #fff,0 0 0 4px #0071bc}[type=checkbox]:checked+label:before,[type=checkbox]:checked:disabled+label:before{background-image:url(../img/correct8.png);background-image:url(../img/correct8.svg);background-position:50%;background-repeat:no-repeat}[type=radio]:focus+label:before{outline:2px dotted #999;outline-offset:6px}[type=checkbox]:disabled+label{color:#c9c9c9}[type=checkbox]:focus+label:before{outline:2px dotted #999;outline-offset:3px}[type=checkbox]:disabled+label:before,[type=radio]:disabled+label:before{background:#e4e4e4;box-shadow:0 0 0 1px #999;cursor:not-allowed}[type=range]{-webkit-appearance:none;border:none;padding-left:0;width:100%}[type=range]::-webkit-slider-runnable-track{background:#999;border:1px solid #757575;cursor:pointer;height:1.2rem;width:100%}[type=range]::-moz-range-track{background:#0071bc;border:1px solid #757575;cursor:pointer;height:1.2rem;width:100%}[type=range]::-ms-track{background:transparent;color:transparent;cursor:pointer;height:1.2rem;width:100%}[type=range]::-webkit-slider-thumb{-webkit-appearance:none;border:1px solid #757575;height:2.2rem;border-radius:1.5rem;background:#e4e4e4;cursor:pointer;margin-top:-.65rem;width:2.2rem}[type=range]::-moz-range-thumb{background:#e4e4e4;border:1px solid #757575;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-thumb{background:#e4e4e4;border:1px solid #757575;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-fill-lower,[type=range]::-ms-fill-upper{background:#999;border:1px solid #757575;border-radius:2rem}.usa-date-of-birth label{margin-top:0}.usa-date-of-birth [type=number]::-webkit-inner-spin-button,.usa-date-of-birth [type=number]::-webkit-outer-spin-button{-webkit-appearance:none;appearance:none;margin:0}.usa-date-of-birth [type=number]{-moz-appearance:textfield}.usa-form-group-day,.usa-form-group-month,.usa-form-group-year{clear:none;float:left;margin-right:1.5rem;width:5rem}.usa-form-group-year{width:7rem}.usa-label,.usa-label-big{background-color:#666;border-radius:2px;color:#fff;font-size:1.5rem;margin-right:.5rem;padding:.1rem .7rem;text-transform:uppercase}.usa-label-big:only-of-type,.usa-label:only-of-type{margin-right:0}.usa-label-big{font-size:1.7rem;padding-left:.9rem;padding-right:.9rem}ol,ul{margin-top:1em;margin-bottom:1em;padding-left:1.94em}li{line-height:1.5;margin-bottom:.5em}li:last-child{margin-bottom:0}h1+ol,h1+ul,h2+ol,h2+ul,h3+ol,h3+ul,h4+ol,h4+ul,h5+ol,h5+ul,h6+ol,h6+ul,p+ol,p+ul{margin-top:0}.usa-unstyled-list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-unstyled-list>li{margin-bottom:0}table{border-spacing:0;margin:2em 0}thead th{font-weight:700}thead td,thead th{background-color:#e4e4e4}th{text-align:left}td,th{background-color:#fff;border:1px solid #666;font-weight:400;padding:1rem 1.5rem}.usa-table-borderless thead th{background-color:transparent;border-top:0}.usa-table-borderless td,.usa-table-borderless th{border-left:0;border-right:0}.usa-table-borderless th:first-child{padding-left:0}caption{font-size:1.5rem;font-weight:700;font-family:Work Sans,sans-serif;margin-bottom:1.2rem;text-align:left}html{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:10px}body{font-size:1.7rem}p{line-height:1.5;margin-bottom:1em;margin-top:1em}a{color:#0071bc;text-decoration:underline}a:active,a:hover{color:#205493}a:focus{outline:2px dotted #999;outline-offset:3px}a:visited{color:#4c2c92}.usa-external_link:after{background:url(../img/external-link.png) no-repeat 0 0;background:url(../img/external-link.svg) no-repeat 0 0;background-size:100%;content:"";display:inline-block;height:.65em;margin-bottom:-1px;margin-left:4px;width:.65em}.usa-external_link:hover:after{background-image:url(../img/external-link-hover.png);background-image:url(../img/external-link-hover.svg)}.usa-external_link-alt:after{background:url(../img/external-link-alt.png) no-repeat 0 0;background:url(../img/external-link-alt.svg) no-repeat 0 0;background-size:100%;content:"";display:inline-block;height:.65em;margin-bottom:-1px;margin-left:4px;width:.65em}.usa-external_link-alt:hover:after{background-image:url(../img/external-link-alt-hover.png);background-image:url(../img/external-link-alt-hover.svg)}h1,h2,h3,h4,h5{clear:both;font-family:Work Sans,sans-serif;line-height:1.3;margin-bottom:.5em;margin-top:1.5em}h6{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}h1{font-size:4rem}h1,h2{font-weight:700}h2{font-size:3rem}h3{font-size:2rem}h3,h4{font-weight:700}h4{font-size:1.7rem}h5{font-size:1.5rem;font-weight:700}h6{font-size:1.3rem;font-weight:400;line-height:1.5;text-transform:uppercase}address,cite,dfn,var{font-style:normal}.usa-content-list,.usa-content ol:not(.usa-accordion):not(.usa-accordion-bordered),.usa-content p,.usa-content ul:not(.usa-accordion):not(.usa-accordion-bordered){max-width:66ch}.usa-sans a,.usa-sans li,.usa-sans p,.usa-sans span{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}.usa-sans a{border-bottom:none;font-weight:700}.usa-serif a,.usa-serif li,.usa-serif p,.usa-serif span{font-family:Work Sans,sans-serif}.usa-display{font-size:2rem;font-weight:700;margin-bottom:0}@media screen and (min-width:481px){.usa-display{font-size:4rem;font-weight:700}}@media screen and (min-width:600px){.usa-display{font-size:5.2rem;font-weight:700}}.usa-font-lead{font-family:Work Sans,sans-serif;font-size:2rem;font-weight:400;line-height:1.7;max-width:77rem}.usa-image-block{position:relative}.usa-image-text-block{color:#fff;left:0;margin-left:8%;position:absolute;top:0}.usa-image-text{margin-top:0}.usa-drop_text{margin-bottom:0}.usa-background-dark{background-color:#333}.usa-background-dark p,.usa-background-dark span{color:#fff}.usa-background-dark a{color:#c9c9c9}.usa-background-dark a:hover{color:#fff}.usa-text-small{font-size:1.3rem;margin-top:0}.usa-grid-full>:first-child,.usa-grid>:first-child,.usa-section>:first-child{margin-top:0}.usa-grid-full>:last-child,.usa-grid>:last-child,.usa-section>:last-child{margin-bottom:0}.usa-width-five-sixths:first-child>:first-child,.usa-width-one-fourth:first-child>:first-child,.usa-width-one-half:first-child>:first-child,.usa-width-one-sixth:first-child>:first-child,.usa-width-one-third:first-child>:first-child,.usa-width-one-twelfth:first-child>:first-child,.usa-width-one-whole:first-child>:first-child,.usa-width-three-fourths:first-child>:first-child,.usa-width-two-thirds:first-child>:first-child{margin-top:0}@media screen and (min-width:600px){.usa-width-five-sixths>:first-child,.usa-width-one-fourth>:first-child,.usa-width-one-half>:first-child,.usa-width-one-sixth>:first-child,.usa-width-one-third>:first-child,.usa-width-one-twelfth>:first-child,.usa-width-one-whole>:first-child,.usa-width-three-fourths>:first-child,.usa-width-two-thirds>:first-child{margin-top:0}}.usa-width-five-sixths:last-child>:last-child,.usa-width-one-fourth:last-child>:last-child,.usa-width-one-half:last-child>:last-child,.usa-width-one-sixth:last-child>:last-child,.usa-width-one-third:last-child>:last-child,.usa-width-one-twelfth:last-child>:last-child,.usa-width-one-whole:last-child>:last-child,.usa-width-three-fourths:last-child>:last-child,.usa-width-two-thirds:last-child>:last-child{margin-bottom:0}@media screen and (min-width:600px){.usa-width-five-sixths>:last-child,.usa-width-one-fourth>:last-child,.usa-width-one-half>:last-child,.usa-width-one-sixth>:last-child,.usa-width-one-third>:last-child,.usa-width-one-twelfth>:last-child,.usa-width-one-whole>:last-child,.usa-width-three-fourths>:last-child,.usa-width-two-thirds>:last-child{margin-bottom:0}}.usa-accordion,.usa-accordion-bordered{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;color:#212121;margin:0;padding:0;width:100%}.usa-accordion-bordered>li,.usa-accordion>li{margin-bottom:0}.usa-accordion-bordered>ul li ul,.usa-accordion>ul li ul{list-style:disc}.usa-accordion-bordered>ul li ul>li>ul,.usa-accordion>ul li ul>li>ul{list-style:circle}.usa-accordion-bordered>ul li ul>li>ul>li>ul,.usa-accordion>ul li ul>li>ul>li>ul{list-style:square}.usa-accordion+.usa-accordion,.usa-accordion+.usa-accordion-bordered,.usa-accordion-bordered+.usa-accordion,.usa-accordion-bordered+.usa-accordion-bordered{margin-top:1rem}.usa-accordion-bordered>ul,.usa-accordion>ul{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;color:#212121;margin:0;padding:0;width:100%}.usa-accordion-bordered>ul>li,.usa-accordion>ul>li{margin-bottom:0;background-color:#e4e4e4;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;list-style:none;margin-bottom:.5rem;width:100%}.usa-accordion-bordered>ul button,.usa-accordion>ul button{background-color:transparent;border:0;border-radius:0;font-weight:400;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#e4e4e4;background-image:url(../img/minus.png);background-image:url(../img/minus.svg);background-position:right 2rem center;background-repeat:no-repeat;background-size:1.5rem;color:#212121;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-weight:700;margin:0;padding:1.5rem 5.5rem 1.5rem 2rem;width:100%}.usa-accordion-bordered>ul button:hover,.usa-accordion>ul button:hover{background-color:transparent;background-color:#c9c9c9;color:#212121}.usa-accordion-bordered>ul button h1,.usa-accordion-bordered>ul button h2,.usa-accordion-bordered>ul button h3,.usa-accordion-bordered>ul button h4,.usa-accordion-bordered>ul button h5,.usa-accordion-bordered>ul button h6,.usa-accordion>ul button h1,.usa-accordion>ul button h2,.usa-accordion>ul button h3,.usa-accordion>ul button h4,.usa-accordion>ul button h5,.usa-accordion>ul button h6{margin:0}.usa-accordion-bordered>ul [aria-expanded=false],.usa-accordion>ul [aria-expanded=false]{background-image:url(../img/plus.png);background-image:url(../img/plus.svg);background-repeat:no-repeat;background-size:1.5rem}.usa-accordion-bordered>li,.usa-accordion>li{background-color:#e4e4e4;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;list-style:none;margin-bottom:.5rem;width:100%}.usa-accordion-bordered .usa-accordion-content{border-bottom:3px solid #e4e4e4;border-left:3px solid #e4e4e4;border-right:3px solid #e4e4e4}.usa-accordion-content{background-color:#fff;overflow:auto;padding:1.5rem 2rem}.usa-accordion-content>:first-child{margin-top:0}.usa-accordion-content>:last-child{margin-bottom:0}.usa-accordion-content:not([aria-hidden]){position:absolute;left:-999em}.usa-accordion-content[aria-hidden=true]{display:none}.usa-accordion-button{background-color:transparent;border:0;border-radius:0;font-weight:400;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#e4e4e4;background-image:url(../img/minus.png);background-image:url(../img/minus.svg);background-position:right 2rem center;background-repeat:no-repeat;background-size:1.5rem;color:#212121;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-weight:700;margin:0;padding:1.5rem 5.5rem 1.5rem 2rem;width:100%}.usa-accordion-button:hover{background-color:transparent;background-color:#c9c9c9;color:#212121}.usa-accordion-button h1,.usa-accordion-button h2,.usa-accordion-button h3,.usa-accordion-button h4,.usa-accordion-button h5,.usa-accordion-button h6{margin:0}.usa-accordion-button[aria-expanded=false]{background-image:url(../img/plus.png);background-image:url(../img/plus.svg);background-repeat:no-repeat;background-size:1.5rem}.usa-alert{background-color:#e4e4e4;background-position:2rem 2rem;background-repeat:no-repeat;background-size:5.2rem;padding:2rem 2rem 1.4rem 3rem;position:relative}.usa-alert:before{background-color:#7e7e7e;content:"";height:100%;left:0;position:absolute;top:0;width:1rem}.usa-alert a{color:#205493}.usa-alert a:focus,.usa-alert a:hover{color:#112e51}.usa-alert ul{margin-bottom:0;margin-top:1rem;padding-left:1rem}.usa-alert-slim{background-position:2rem 1rem;padding-bottom:1rem;padding-top:1rem}.usa-alert-slim .usa-alert-text:only-child{margin-bottom:.5rem;padding-top:.5rem}.usa-alert-icon{display:table-cell;padding-right:1rem}.usa-alert-body{display:table-cell;padding-left:5rem;vertical-align:top}.usa-alert-heading,.usa-alert-text{margin-top:0;margin-bottom:0}.usa-alert-text{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}.usa-alert-text:only-child{margin-bottom:1rem;padding-top:.5rem}.usa-alert-success{background-color:#e7f4e4;background-image:url(../img/alerts/success.png);background-image:url(../img/alerts/success.svg)}.usa-alert-success:before{background-color:#2e8540}.usa-alert-warning{background-color:#fff1d2;background-image:url(../img/alerts/warning.png);background-image:url(../img/alerts/warning.svg)}.usa-alert-warning:before{background-color:#fdb81e}.usa-alert-error{background-color:#f9dede;background-image:url(../img/alerts/error.png);background-image:url(../img/alerts/error.svg)}.usa-alert-error:before{background-color:#005495}.usa-alert-info{background-color:#e1f3f8;background-image:url(../img/alerts/info.png);background-image:url(../img/alerts/info.svg)}.usa-alert-info:before{background-color:#c64b00}.usa-alert-no_icon{background-image:none}.usa-alert-paragraph{width:66ch}.usa-alert{margin-top:1.5em}.usa-banner{background-color:#e4e4e4;padding-bottom:.7rem}@media screen and (min-width:481px){.usa-banner{font-size:1.3rem;padding-bottom:0}}.usa-banner-content{padding:2rem 1.5rem 3px;background-color:transparent;font-size:1.5rem;width:100%}@media screen and (min-width:600px){.usa-banner-content{padding-bottom:2.3rem;padding-top:4rem}}@media screen and (min-width:951px){.usa-banner-content{padding-right:3rem;padding-left:3rem}}.usa-banner-content p:first-child{margin-top:1rem}@media screen and (min-width:600px){.usa-banner-content p:first-child{margin-top:0}}.usa-banner-inner{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:1.5rem;padding-left:1.5rem;max-width:1040px}.usa-banner-inner:after{clear:both;content:"";display:block}@media screen and (min-width:951px){.usa-banner-inner{padding-right:3rem;padding-left:3rem}}.usa-banner-header{padding-top:.55rem;padding-bottom:.55rem;font-size:1.2rem;font-weight:400}@media screen and (min-width:481px){.usa-banner-header{padding-top:0;padding-bottom:0}}.usa-banner-header p{margin-top:0;margin-bottom:0;display:inline;overflow:hidden;vertical-align:middle}@media screen and (min-width:481px){.usa-banner-header p{margin-top:2px;margin-bottom:2px;display:inline-block}}.usa-banner-header img{float:left;margin-right:1rem;margin-top:1px;width:2.4rem}@media screen and (min-width:481px){.usa-banner-header img{margin-right:.7rem;width:2rem}}.usa-banner-header-expanded{-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-bottom:1px solid #999;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:1.5rem;min-height:5.6rem;padding-right:3rem}@media screen and (min-width:481px){.usa-banner-header-expanded{border-bottom:none;display:block;font-size:1.2rem;font-weight:400;min-height:0;padding-right:0}}.usa-banner-header-expanded>.usa-banner-inner{margin-left:0}@media screen and (min-width:481px){.usa-banner-header-expanded>.usa-banner-inner{margin-left:auto}}.usa-banner-header-expanded img{margin-right:2.4rem}@media screen and (min-width:481px){.usa-banner-header-expanded img{margin-right:.7rem}}.usa-banner-header-expanded p{line-height:1.3;vertical-align:top}@media screen and (min-width:481px){.usa-banner-header-expanded p{line-height:1.5;vertical-align:middle}}.usa-banner-button{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;padding-top:1.3rem;padding-left:4.8rem;background-position-x:right;color:#0071bc;display:block;font-size:1.2rem;height:4.3rem;left:0;position:absolute;text-decoration:underline;top:0;width:100%}.usa-banner-button:hover{background-color:transparent}@media screen and (min-width:481px){.usa-banner-button{padding-top:0;padding-left:0;display:inline;height:auto;margin-left:3px;position:relative;vertical-align:middle;width:auto}}.usa-banner-button:hover{color:#205493;text-decoration:underline}.usa-banner-button[aria-expanded=false]{background-image:none}.usa-banner-button[aria-expanded=false]:after{background-image:url(../img/angle-arrow-down-primary.png);background-image:url(../img/angle-arrow-down-primary.svg);background-size:100%;content:"";display:inline-block;height:1rem;width:1rem;margin-left:0}.usa-banner-button[aria-expanded=false]:hover:after{background-image:url(../img/angle-arrow-down-primary-hover.png);background-image:url(../img/angle-arrow-down-primary-hover.svg)}.usa-banner-button[aria-expanded=false]:after{background-position-y:1px}.usa-banner-button[aria-expanded=true]{background-image:none;height:5.6rem}.usa-banner-button[aria-expanded=true]:after{background-image:url(../img/close.png);background-image:url(../img/close.svg);background-size:100%;content:"";display:inline-block;height:1.3rem;width:1.3rem;margin-left:0}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true]{height:auto;padding:0;position:relative}.usa-banner-button[aria-expanded=true]:after{background-image:url(../img/angle-arrow-up-primary.png);background-image:url(../img/angle-arrow-up-primary.svg);background-size:100%;content:"";display:inline-block;height:1rem;width:1rem;margin-left:0}.usa-banner-button[aria-expanded=true]:hover:after{background-image:url(../img/angle-arrow-up-primary-hover.png);background-image:url(../img/angle-arrow-up-primary-hover.svg)}.usa-banner-button[aria-expanded=true]:after{background-position-y:1px}}.usa-banner-button[aria-expanded=true]:after{position:absolute;right:1.5rem;top:2.15rem}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true]:after{position:static}}.usa-banner-button[aria-expanded=true] .usa-banner-button-text{display:none}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true] .usa-banner-button-text{display:inline}}.usa-banner-icon{width:3.8rem}.usa-footer .usa-unstyled-list{display:block}.usa-footer .usa-footer-primary-link{color:#212121;display:block;font-weight:700;margin-top:0;padding-bottom:2rem;padding-top:2rem;text-decoration:none}@media screen and (min-width:600px){.usa-footer .usa-footer-primary-link{border-top:none}}.usa-footer .usa-footer-primary-link:hover{text-decoration:underline}.usa-footer .usa-footer-primary-link~li a,.usa-footer .usa-footer-secondary-link{text-decoration:none}.usa-footer-contact_info{display:inline-block}.usa-footer-contact_info a{color:#212121;text-decoration:none}.usa-footer-contact_info:hover{text-decoration:underline}.usa-footer-return-to-top{color:#0071bc;padding-bottom:2rem;padding-top:2rem;text-decoration:underline}.usa-footer-primary-section{background-color:#e4e4e4}.usa-footer-primary-section .usa-footer-primary-content{padding-left:1.5rem;padding-right:2.5rem}@media screen and (min-width:600px){.usa-footer-primary-section .usa-footer-primary-content{padding-left:0;padding-right:0}}.usa-footer-primary-section .usa-footer-primary-content li{margin-left:1rem}@media screen and (min-width:600px){.usa-footer-primary-section .usa-footer-primary-content li{margin-left:0}}@media screen and (min-width:600px){.usa-footer-primary-section .usa-grid-full{padding-left:2.5rem;padding-right:2.5rem}}.usa-footer-medium .usa-footer-contact_info p{margin:0 1rem 0 0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-contact_info p{margin:0 0 0 1rem}}.usa-footer-medium .usa-footer-contact-heading{margin-top:0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-contact-heading{margin-top:.5rem;margin-bottom:.5rem}}.usa-footer-medium .usa-footer-logo{padding:1rem 0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-logo{padding:2rem 0}}.usa-footer-medium .usa-footer-primary-link{padding-bottom:1.5rem;padding-top:1.5rem}.usa-footer-medium .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}@media screen and (min-width:1201px){.usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content{margin-right:5%;width:inherit}}@media screen and (min-width:1201px){.usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content:last-child{margin-right:0}}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-nav ul{-webkit-box-align:center;-ms-flex-align:center;align-items:center}}.usa-footer-slim .usa-footer-nav a{display:block}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-nav .usa-footer-primary-content{margin-right:5%;width:inherit}}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-nav .usa-footer-primary-content:last-child{margin-right:0}}.usa-footer-slim .usa-footer-primary-link{padding-bottom:1.5rem;padding-top:1.5rem}.usa-footer-slim .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-primary-section{padding-bottom:0;padding-top:0}.usa-footer-slim .usa-footer-primary-section .usa-grid-full{-webkit-box-align:center;-ms-flex-align:center;align-items:center}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-contact_info>*{margin:0}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-contact_info{padding-top:1.5rem;padding-bottom:1.5rem;width:100%}}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-contact_info{float:left;display:block;margin-right:2.35765%;width:48.82117%}.usa-footer-slim .usa-footer-contact_info:last-child{margin-right:0}}li.usa-footer-primary-content,ul.usa-footer-primary-content{border-top:1px solid #999}@media screen and (min-width:600px){li.usa-footer-primary-content,ul.usa-footer-primary-content{border:none}}li.usa-footer-primary-content:last-child,ul.usa-footer-primary-content:last-child{border-bottom:1px solid #999}@media screen and (min-width:600px){li.usa-footer-primary-content:last-child,ul.usa-footer-primary-content:last-child{border-bottom:none}}.usa-sign_up-block{padding-bottom:4.5rem;padding-left:1.5rem;padding-right:1.5rem}@media screen and (min-width:600px){.usa-sign_up-block{float:right;padding:0}}.usa-sign_up-block label:first-of-type{margin-top:0}.usa-sign_up-block button{float:none;margin-right:0;margin-top:1.5rem}.usa-sign_up-block input{width:100%}.usa-footer-secondary_section{background-color:#c9c9c9;padding-bottom:2rem;padding-top:2rem}.usa-footer-secondary_section a{color:#212121}@media screen and (min-width:600px){.usa-footer-big-secondary-section{padding-top:2rem;padding-bottom:2rem}}@media screen and (min-width:600px){.usa-footer-contact-links{text-align:right}}.usa-social-links a{text-decoration:none}.usa-footer-big .usa-footer-contact_info{display:block}.usa-footer-big .usa-footer-contact_info p{margin:0 1rem 0 0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-contact_info p{margin:.5rem 0 0 1rem}}@media screen and (min-width:600px){.usa-footer-big .usa-footer-contact-links{padding-top:2rem}}.usa-footer-big .usa-footer-logo{padding:1rem 0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-logo{padding:2rem 0}}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section{padding-bottom:4rem;padding-top:3rem}}.usa-footer-big .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content{padding-left:0;padding-right:0}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li{margin-left:1.5rem}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li{margin-left:0}}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link{margin-left:0}.usa-footer-big ul{padding-bottom:2.4rem}@media screen and (min-width:600px){.usa-footer-big ul{padding-bottom:0}}.usa-footer-big ul:last-child{border-bottom:1px solid #999}@media screen and (min-width:600px){.usa-footer-big ul:last-child{border-bottom:none}}.usa-footer-big ul li:not(.usa-footer-primary-link){line-height:1.3;padding-bottom:.35em;padding-top:.35em}.usa-footer-big ul .usa-footer-primary-link{background-image:url(../img/arrow-down.png);background-image:url(../img/arrow-down.svg);background-position:1.5rem;background-repeat:no-repeat;background-size:1.3rem;margin-left:0;padding-left:3.5rem}@media screen and (min-width:600px){.usa-footer-big ul .usa-footer-primary-link{background:none;margin-bottom:.8rem;padding-bottom:0;padding-left:0}}.usa-footer-big ul .usa-footer-primary-link>*{margin-top:0;margin-bottom:0}.usa-footer-big ul.hidden{padding-bottom:0}.usa-footer-big ul.hidden li{display:none}.usa-footer-big ul.hidden .usa-footer-primary-link{background-image:url(../img/arrow-right.png);background-image:url(../img/arrow-right.svg);cursor:pointer;display:block}@media screen and (min-width:600px){.usa-footer-big ul.hidden .usa-footer-primary-link{background:none;padding-left:0}}.usa-footer-topic{margin:0;padding:2rem 0}@media screen and (min-width:600px){.usa-sign_up-header{margin:0;padding:2rem 0}}.usa-footer-logo-img{max-width:8rem}@media screen and (min-width:600px){.usa-footer-logo-img{float:left}}.usa-footer-big-logo-img{max-width:10rem}.usa-footer-slim-logo-img{float:left;max-width:5rem}.usa-footer-logo-heading{display:block;margin-top:1rem}@media screen and (min-width:600px){.usa-footer-logo-heading{display:inline-block;margin-top:3rem;padding-left:1.5rem}}.usa-footer-big-logo-heading{margin-top:1.5rem}@media screen and (min-width:600px){.usa-footer-big-logo-heading{margin-top:2rem}}.usa-footer-slim-logo-heading{display:inline-block;margin-top:1.5rem;padding-left:1.5rem}.usa-footer-contact-heading{margin-top:0}@media screen and (min-width:600px){.usa-footer-contact-heading{margin-top:1rem}}.usa-link-facebook,.usa-link-rss,.usa-link-twitter,.usa-link-youtube,.usa-social_link{margin:2.5rem 1rem 1.5rem 0;background-position:50%;background-repeat:no-repeat;background-size:auto 3rem;display:inline-block;height:4.4rem;left:-1.6rem;position:relative;text-align:center;width:4.4rem}@media screen and (min-width:600px){.usa-link-facebook,.usa-link-rss,.usa-link-twitter,.usa-link-youtube,.usa-social_link{margin:0 0 0 .5rem;left:1.5rem}}.usa-link-facebook span,.usa-link-rss span,.usa-link-twitter span,.usa-link-youtube span,.usa-social_link span{position:absolute;left:-999em}.usa-link-facebook{background-image:url(../img/social-icons/png/facebook25.png);background-image:url(../img/social-icons/svg/facebook25.svg)}.usa-link-twitter{background-image:url(../img/social-icons/png/twitter16.png);background-image:url(../img/social-icons/svg/twitter16.svg)}.usa-link-youtube{background-image:url(../img/social-icons/png/youtube15.png);background-image:url(../img/social-icons/svg/youtube15.svg)}.usa-link-rss{background-image:url(../img/social-icons/png/rss25.png);background-image:url(../img/social-icons/svg/rss25.svg)}form a{border-bottom:0}form [type=submit]{display:block;margin-bottom:1.5em;margin-top:2.5rem}@media screen and (min-width:600px){form [type=submit]{padding-left:2.7em;padding-right:2.7em;width:auto}}form [name=confirmPassword],form [name=password]{margin-bottom:1.1rem}@media screen and (min-width:600px){.usa-form{max-width:32rem}}.usa-form-note{float:right;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:1.5rem;margin:0 0 1.5rem}.usa-form-note+*{clear:both}fieldset{border:none;margin:0;padding:0}@media screen and (min-width:600px){.usa-form-large{max-width:46rem}}@media screen and (min-width:600px){input.usa-input-tiny{max-width:6rem}}@media screen and (min-width:600px){input.usa-input-medium{max-width:12rem}}@media screen and (min-width:600px){.usa-input-grid{padding-right:5%}}@media screen and (min-width:600px){.usa-input-grid:last-of-type{padding-right:0}}@media screen and (min-width:600px){.usa-input-grid-small{float:left;width:35%}}.usa-input-grid-small input,.usa-input-grid-small select{margin-bottom:3rem}@media screen and (min-width:600px){.usa-input-grid-medium{float:left;width:65%}}.usa-input-grid-medium input,.usa-input-grid-medium select{margin-bottom:3rem}@media screen and (min-width:600px){.usa-input-grid-large{float:left;width:100%}}.usa-input-grid-large input,.usa-input-grid-large select{margin-bottom:3rem}.usa-additional_text{font-weight:400}.usa-checklist{list-style:none;margin-left:0;padding-left:0}.usa-checklist li{display:inline-block;list-style:none;margin-bottom:0;margin-top:0;padding-left:3em;text-indent:-2em}.usa-checklist li:before{content:" ";display:inline-block;height:.8em;margin-right:.2em;width:1.8em}.usa-checklist-checked:before{background-image:url(../img/correct9.png);background-image:url(../img/correct9.svg);background-position:100%;background-repeat:no-repeat;background-size:100%}.usa-graphic_list .usa-graphic_list-row .usa-media_block{margin-bottom:3rem}@media screen and (min-width:600px){.usa-graphic_list .usa-graphic_list-row .usa-media_block{margin-bottom:6rem}}@media screen and (min-width:600px){.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block{margin-bottom:0}}.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block:last-child{margin-bottom:0}.usa-graphic_list .usa-media_block-img{margin-right:3rem}.usa-graphic_list .usa-media_block-body>:first-child{margin-top:0}.usa-header{width:100%;z-index:3}@media screen and (min-width:951px){.usa-header{border-bottom:1px solid #c9c9c9}}.usa-header a{border-bottom:none}@media screen and (min-width:951px){.usa-header .usa-search{float:right;max-width:21.5rem}}.usa-logo{float:left;line-height:4rem;margin-left:1.5rem}@media screen and (min-width:951px){.usa-logo{line-height:7.5rem;margin-left:0}}.usa-logo a{color:#212121;text-decoration:none}.usa-logo br{display:none}@media screen and (min-width:951px){.usa-logo br{display:block}}.usa-logo-text{display:block;font-size:1.5rem;font-style:normal;font-weight:700;margin:0}@media screen and (min-width:951px){.usa-logo-text{display:block;font-size:2.4rem;line-height:1.3}}.usa-menu-btn{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#0071bc;color:#fff;display:inline;float:right;font-size:1.3rem;height:4rem;line-height:4rem;text-align:center;text-decoration:none;text-transform:uppercase;width:5.8rem}.usa-menu-btn:hover{background-color:transparent}@media screen and (min-width:951px){.usa-menu-btn{display:none}}.usa-menu-btn:hover{color:#fff;background-color:#205493}.usa-menu-btn:visited{color:#fff}.usa-overlay{position:fixed;top:0;right:0;bottom:0;left:0;background:#000;opacity:0;transition:all .2s ease-in-out;visibility:hidden;z-index:4}.usa-overlay.is-visible{opacity:.1;visibility:visible}@media screen and (min-width:951px){.usa-header-basic .usa-logo{bottom:0;position:absolute}}@media screen and (min-width:951px){.usa-header-basic .usa-navbar{position:relative;width:18%}}@media screen and (min-width:951px){.usa-header-extended .usa-header{border-bottom:none}}@media screen and (min-width:951px){.usa-header-extended .usa-logo{margin-top:3rem;margin-bottom:3rem}}@media screen and (min-width:951px){.usa-header-extended em{font-size:3.2rem;line-height:1}}@media screen and (min-width:951px){.usa-header-extended .usa-navbar{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:3rem;display:block;height:auto;max-width:1040px}.usa-header-extended .usa-navbar:after{clear:both;content:"";display:block}}@media screen and (min-width:951px){.usa-header-extended .usa-nav{border-top:1px solid #c9c9c9;float:none;padding:0;width:100%}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-inner{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:1.5rem;margin-top:-1px;max-width:1040px;position:relative}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-inner:after,.usa-header-extended .usa-nav-primary:after{clear:both;content:"";display:block}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-primary button[aria-expanded=false],.usa-header-extended .usa-nav-primary button[aria-expanded=true]{background-position:right 1.5rem top 53%}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-link{padding-top:1.8rem;padding-bottom:1.8rem}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-submenu .usa-grid-full{padding-left:1.2rem}}@media screen and (min-width:951px){.usa-header-extended .usa-megamenu{padding-left:3rem}}.usa-hero{padding-top:3rem;padding-bottom:3rem;background-image:url(../img/hero.png);background-position:50%;background-size:cover}.usa-hero .usa-button{color:#fff}.usa-section-dark .usa-hero-link{color:#c64b00}.usa-hero-callout{background-color:#112e51;padding:3rem}@media screen and (min-width:481px){.usa-hero-callout{max-width:30rem}}.usa-hero-callout>:first-child{margin-top:0;margin-bottom:2rem}.usa-hero-callout-alt{color:#fff;display:block}.usa-layout-docs{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media screen and (min-width:1201px){.usa-layout-docs{display:inherit}}.usa-layout-docs .usa-grid>:first-child:not(.usa-width-*){margin-top:0}.usa-layout-docs .usa-grid>:last-child:not(.usa-width-*){margin-bottom:0}.usa-layout-docs-sidenav{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.usa-layout-docs-main_content{margin-bottom:3rem;-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}@media screen and (min-width:1201px){.usa-layout-docs-main_content{margin-bottom:0}}.usa-layout-docs-main_content>:first-child{margin-top:0}.usa-media_block-img{float:left;margin-right:1rem}.usa-media_block-body{overflow:hidden}.usa-navbar{border-bottom:1px solid #999;height:4rem}@media screen and (min-width:951px){.usa-navbar{border-bottom:none;display:inline-block;height:7.8rem}}.usa-nav-link{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}@media screen and (min-width:951px){.usa-nav-link:hover span{border-bottom:.4rem solid #0071bc;padding-bottom:.6rem}}@media screen and (min-width:951px){.usa-nav-link.usa-accordion-button span{margin-right:0;padding-right:1.5rem}}@media screen and (min-width:951px){.usa-nav-container{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:3rem;max-width:1040px}.usa-nav-container:after{clear:both;content:"";display:block}}.usa-nav{position:fixed;top:0;right:0;bottom:0;left:auto;background:#fff;border-left:1px solid #999;border-right:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;padding:2rem;-webkit-transform:translateX(26rem);transform:translateX(26rem);width:26rem;z-index:5}@media screen and (min-width:951px){.usa-nav{padding-top:4.5rem;padding-right:0;padding-bottom:0;border-left:none;display:block;float:right;overflow-y:visible;position:relative;-webkit-transform:translateX(0);transform:translateX(0);width:auto}}.usa-nav.is-visible{-webkit-transform:translateX(0);transform:translateX(0);transition:all .3s ease-in-out}.usa-nav nav{margin-top:6rem;min-height:100%}@media screen and (min-width:951px){.usa-nav nav{margin-top:0}}.usa-nav .usa-current{border-left:4px solid #0071bc;color:#0071bc;font-weight:700;padding-left:1.4rem}@media screen and (min-width:951px){.usa-nav .usa-current{color:#212121}}.usa-nav .usa-button{width:100%}@media screen and (min-width:951px){.usa-nav .usa-search{margin-left:1.5rem;top:4px}}.usa-nav-primary{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin-top:1.5rem;-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.usa-nav-primary>li{margin-bottom:0;background-color:transparent;border-top:1px solid #666;font-size:1.7rem}.usa-nav-primary>li:first-child{border-top:none}.usa-nav-primary a{border:none;color:#212121;display:block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;line-height:1.3;padding:.85rem 1rem .85rem 1.8rem;text-decoration:none}.usa-nav-primary a:hover{background-color:#e4e4e4;color:#0071bc;text-decoration:none}.usa-nav-primary a:focus{outline-offset:0;position:relative;z-index:1}.usa-nav-primary a.usa-current{border-left:.4rem solid #0071bc;color:#0071bc;font-weight:700;padding-left:1.4rem}@media screen and (min-width:951px){.usa-nav-primary{display:inline}}@media screen and (min-width:951px){.usa-nav-primary li{border-top:none}}.usa-nav-primary>li{width:auto}@media screen and (min-width:951px){.usa-nav-primary>li{display:inline-block}}@media screen and (min-width:951px){.usa-nav-primary>li>a{padding:1.3rem 1.5rem 2.2rem;color:#666;font-size:1.5rem;font-weight:700;line-height:1}}@media screen and (min-width:951px){.usa-nav-primary>li>a:hover{background-color:transparent}}@media screen and (min-width:951px){.usa-nav-primary a{padding-top:.75rem;padding-bottom:.75rem}}.usa-nav-primary button{border:0;border-radius:0;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-weight:400;line-height:1.3;padding:.85rem 1.5rem .85rem 1.8rem}.usa-nav-primary button,.usa-nav-primary button:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-primary button{padding:1.3rem 1.5rem 2.2rem;color:#666;font-size:1.5rem;font-weight:700;line-height:1;width:auto}}.usa-nav-primary button:active,.usa-nav-primary button:focus{box-shadow:2px dotted #999}.usa-nav-primary button:hover{background-color:#e4e4e4;color:#0071bc}@media screen and (min-width:951px){.usa-nav-primary button:hover{background-color:transparent}}.usa-nav-primary button[aria-expanded=false]{background-image:url(../img/plus-alt.png);background-image:url(../img/plus-alt.svg);background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=false]{background-image:url(../img/angle-arrow-down.png);background-image:url(../img/angle-arrow-down.svg);background-position:right 1.5rem top 40%}}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=false]:hover{background-image:url(../img/angle-arrow-down-primary.png);background-image:url(../img/angle-arrow-down-primary.svg)}}.usa-nav-primary button[aria-expanded=true]{background-image:url(../img/minus-alt.png);background-image:url(../img/minus-alt.svg);background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=true]{background-color:#112e51;color:#fff;background-image:url(../img/angle-arrow-down-hover.png);background-image:url(../img/angle-arrow-down-hover.svg);background-position:right 1.5rem top 40%}.usa-nav-primary button[aria-expanded=true]:hover{background-color:#112e51}.usa-nav-primary button[aria-expanded=true] span{border-bottom:.4rem solid #0071bc;padding-bottom:.6rem;color:#fff}}@media screen and (min-width:951px){.usa-nav-primary .usa-current,.usa-nav-primary a.usa-current{border-left:0;padding-left:1.5rem}.usa-nav-primary .usa-current:hover span,.usa-nav-primary a.usa-current:hover span{color:#0071bc}.usa-nav-primary .usa-current span,.usa-nav-primary a.usa-current span{border-bottom:.4rem solid #0071bc;padding-bottom:.6rem;color:#212121}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-link:hover span{border-bottom:.7rem solid #0071bc;padding-bottom:.9rem}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-primary .usa-current span,.usa-header-extended .usa-nav-primary button[aria-expanded=true] span{border-bottom:.7rem solid #0071bc;padding-bottom:.9rem}}.usa-nav-secondary{margin-top:1.5rem}@media screen and (min-width:951px){.usa-nav-secondary{margin-top:0;position:absolute;right:3rem;top:-5.7rem}}.usa-nav-secondary .usa-search{margin-top:1.5rem;margin-bottom:0}@media screen and (min-width:951px){.usa-nav-secondary .usa-search{margin-top:-.9rem;margin-bottom:0;margin-left:0;float:left}}.usa-nav-secondary-links{margin-top:2.4rem}@media screen and (min-width:951px){.usa-nav-secondary-links{float:left;margin-top:0}}@media screen and (min-width:951px){.usa-nav-secondary-links li{display:inline;padding-left:.5rem}}@media screen and (min-width:951px){.usa-nav-secondary-links li:not(:last-child):after{color:#c9c9c9;content:"|";padding-left:.5rem}}.usa-nav-secondary-links .usa-header-search-button,.usa-nav-secondary-links a{color:#666;display:inline-block;font-size:1.5rem;text-decoration:none}.usa-nav-secondary-links .usa-header-search-button:hover,.usa-nav-secondary-links a:hover{color:#0071bc;text-decoration:underline}.usa-nav-secondary-links .usa-header-search-button{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;display:none}.usa-nav-secondary-links .usa-header-search-button:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-secondary-links .usa-header-search-button{background-image:url(../img/search-alt.png);background-image:url(../img/search-alt.svg);background-repeat:no-repeat;background-position:0;background-size:2.2rem;display:inline-block;padding-left:2.3rem}}@media screen and (min-width:951px){.usa-nav-secondary-links .usa-header-search-button.is-hidden{display:none}}@media screen and (min-width:951px){.usa-nav-secondary-links a.usa-current{border-left:0;padding-left:0}}.usa-nav-submenu{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin:0;width:100%}.usa-nav-submenu>li{margin-bottom:0}.usa-nav-submenu li{border:none}.usa-nav-submenu a{padding-left:2.8rem;line-height:1.3}.usa-nav-submenu a.usa-current,.usa-nav-submenu a:hover{border:none;padding-left:2.8rem}.usa-nav-submenu .usa-sidenav-sub_list a{padding-left:3.8rem}.usa-nav-submenu .usa-sidenav-sub_list a:focus{outline-offset:0}.usa-nav-submenu .usa-sidenav-sub_list a:hover{padding-left:3.8rem}@media screen and (min-width:951px){.usa-nav-submenu{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;padding-top:.75rem;padding-bottom:.9rem;background-color:#112e51;width:21.5rem;position:absolute}.usa-nav-submenu>li{margin-bottom:0}}.usa-nav-submenu[aria-hidden=true]{display:none}@media screen and (min-width:951px){.usa-nav-submenu a,.usa-nav-submenu a:hover{color:#fff;padding-left:1.5rem}.usa-nav-submenu a:hover{background-color:#112e51;text-decoration:underline}}.usa-nav-submenu li{font-size:1.5rem;margin-bottom:0}.usa-nav-close{border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;margin:-1.2rem -1.5rem 1.5rem auto;float:right;height:4.4rem;text-align:center;width:4.4rem}.usa-nav-close,.usa-nav-close:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-close{display:none}}.usa-nav-close img{width:1.3rem}.usa-nav-close+*{clear:both}.usa-mobile_nav-active{overflow:hidden}@media screen and (min-width:951px){.usa-megamenu{padding-top:3.15rem;padding-bottom:3.15rem;left:-1rem;width:100%}}@media screen and (min-width:951px){.usa-megamenu:before{right:100%}}@media screen and (min-width:951px){.usa-megamenu:after,.usa-megamenu:before{background-color:#112e51;content:"";display:block;height:100%;position:absolute;top:0;width:1000%}.usa-megamenu:after{left:100%}}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav{padding-left:0;padding-top:0;width:100%}}.usa-header-basic-megamenu .usa-nav-inner{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav-inner{display:block;float:right;margin-top:-3.8rem}}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav-submenu .usa-grid-full{margin-left:-1.8rem}}@media screen and (min-width:951px){.usa-megamenu-col{float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-megamenu-col:last-child{margin-right:0}.usa-megamenu-col:nth-child(2n){float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-megamenu-col:nth-child(2n):last-child,.usa-megamenu-col:nth-child(4n){margin-right:0}}.usa-megamenu-col>ul{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-megamenu-col>ul>li{margin-bottom:0}.usa-search{max-width:none;position:relative}.usa-search:after{clear:both;content:"";display:block}.usa-search .usa-search-submit,.usa-search [type=submit]{background-image:url(../img/search.png);background-image:url(../img/search.svg);background-position:50%;background-repeat:no-repeat;border-bottom-left-radius:0;border-top-left-radius:0;height:3.3rem;margin:0;padding:0;width:4.5rem}@media screen and (min-width:481px){.usa-search .usa-search-submit,.usa-search [type=submit]{background-image:none;width:8.5rem}}@media screen and (min-width:481px){.usa-search.usa-search-big .usa-search-input,.usa-search.usa-search-big [type=search]{font-size:1.7rem;height:4.4rem;width:calc(100% - 11.6rem)}.usa-search.usa-search-big .usa-search-submit,.usa-search.usa-search-big [type=submit]{font-size:2rem;height:4.4rem;width:11.6rem}}@media screen and (min-width:481px){.usa-search.usa-search-small .usa-search-input,.usa-search.usa-search-small [type=search]{width:calc(100% - 4.5rem)}.usa-search.usa-search-small .usa-search-submit,.usa-search.usa-search-small [type=submit]{background-image:url(../img/search.png);background-image:url(../img/search.svg);background-position:50%;background-repeat:no-repeat;width:4.5rem}}@media screen and (max-width:950px){.usa-search.usa-search-small.usa-sr-only{left:auto;position:relative}}input[type=search]{box-sizing:border-box;-webkit-appearance:none}.usa-search-input,[type=search]{padding-top:0;padding-bottom:0;border-bottom-right-radius:0;border-right:none;border-top-right-radius:0;box-sizing:border-box;float:left;font-size:1.4rem;height:3.3rem;margin:0;width:calc(100% - 4.5rem)}@media screen and (min-width:481px){.usa-search-input,[type=search]{width:calc(100% - 8.5rem)}}.usa-search-submit-text{position:absolute;left:-999em}@media screen and (min-width:481px){.usa-search-submit-text{position:static}}.usa-section{padding-top:3rem;padding-bottom:3rem}@media screen and (min-width:600px){.usa-section{padding-top:6rem;padding-bottom:6rem}}.usa-section-light{background-color:#e4e4e4}.usa-section-dark{background-color:#112e51;color:#fff}.usa-section-dark h1,.usa-section-dark h2,.usa-section-dark h3,.usa-section-dark h4,.usa-section-dark h5,.usa-section-dark h6{color:#c64b00}.usa-section-dark p{color:#fff}.usa-section-dark a{color:#c9c9c9}.usa-section-dark a:hover{color:#fff}.usa-sidenav-list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-sidenav-list>li{margin-bottom:0;background-color:transparent;border-top:1px solid #666;font-size:1.7rem}.usa-sidenav-list>li:first-child{border-top:none}.usa-sidenav-list a{border:none;color:#212121;display:block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;line-height:1.3;padding:.85rem 1rem .85rem 1.8rem;text-decoration:none}.usa-sidenav-list a:hover{background-color:#e4e4e4;color:#0071bc;text-decoration:none}.usa-sidenav-list a:focus{outline-offset:0;position:relative;z-index:1}.usa-sidenav-list a.usa-current{border-left:.4rem solid #0071bc;color:#0071bc;font-weight:700;padding-left:1.4rem}.usa-sidenav-sub_list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin:0;width:100%}.usa-sidenav-sub_list>li{margin-bottom:0}.usa-sidenav-sub_list li{border:none;font-size:1.5rem}.usa-sidenav-sub_list a{padding-left:2.8rem;line-height:1.3}.usa-sidenav-sub_list a.usa-current,.usa-sidenav-sub_list a:hover{border:none;padding-left:2.8rem}.usa-sidenav-sub_list .usa-sidenav-sub_list a{padding-left:3.8rem}.usa-sidenav-sub_list .usa-sidenav-sub_list a:focus{outline-offset:0}.usa-sidenav-sub_list .usa-sidenav-sub_list a:hover{padding-left:3.8rem}.usa-skipnav{background:transparent;color:#212121;padding:1rem 1.5rem;top:-4.2rem;z-index:2}.usa-skipnav,.usa-skipnav:focus{left:0;position:absolute;transition:all .2s ease-in-out}.usa-skipnav:focus{background:#fff;outline:0;top:0}h1,h2,h3,h4,h5,h6{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-weight:700}article.aggregator-item .field--name-fid a,h3.feed-item-title a{text-decoration:none;color:#0071bc}.region-sidebar-first,.region-sidebar-second,.uswds-middle-section{background-color:#e7f5ff}.view-nsf-blog article.aggregator-item{background-color:#fff;padding:2rem;padding-top:.2rem;margin-bottom:3rem}.region-sidebar-second{float:right;padding:1.25rem}.region-sidebar-second h4{text-transform:uppercase;color:#999;font-weight:400}.usa-accordion,.usa-accordion-bordered,.usa-sidenav-list a,input,p,select.form-select,textarea{color:#666}.usa-nav-primary .usa-current span,.usa-nav-primary .usa-nav-link,.usa-nav-primary a.usa-current span,.usa-nav-primary a.usa-nav-link{color:#3e94cf}.filter-wrapper{display:none}.usa-form-large{max-width:none}form [type=submit]{display:inline-block}textarea{height:auto}label{margin-top:1rem}input,select,textarea{max-width:none}#block-nsf-views-block-news-block-1 ul{margin:0 auto;text-align:center}#block-nsf-views-block-news-block-1 li{display:inline-block;vertical-align:top}img.image-style-news-main-story{max-width:none}.usa-header-basic .usa-logo{top:0;bottom:auto}.usa-header-basic .usa-logo img{max-width:none}.usa-navbar em.usa-logo-text{margin-left:-5000em}
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse}td,th{padding:0}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:300;src:url(../fonts/sourcesanspro-light-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-light-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-light-webfont.woff) format("woff"),url(../fonts/sourcesanspro-light-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:400;src:url(../fonts/sourcesanspro-regular-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-regular-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-regular-webfont.woff) format("woff"),url(../fonts/sourcesanspro-regular-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:italic;font-weight:400;src:url(../fonts/sourcesanspro-italic-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-italic-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-italic-webfont.woff) format("woff"),url(../fonts/sourcesanspro-italic-webfont.ttf) format("truetype")}@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:700;src:url(../fonts/sourcesanspro-bold-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/sourcesanspro-bold-webfont.woff2) format("woff2"),url(../fonts/sourcesanspro-bold-webfont.woff) format("woff"),url(../fonts/sourcesanspro-bold-webfont.ttf) format("truetype")}.usa-grid,.usa-grid-full{max-width:1200px;margin-left:auto;margin-right:auto;max-width:1040px}.usa-grid-full:after,.usa-grid:after{clear:both;content:"";display:block}.usa-grid{padding-right:1.5rem;padding-left:1.5rem}@media screen and (min-width:600px){.usa-grid{padding-right:3rem;padding-left:3rem}}.usa-grid-full{padding:0}@media screen and (min-width:600px){.usa-width-one-whole{float:left;display:block;margin-right:4.82916%;width:100%}.usa-width-one-whole:last-child{margin-right:0}.usa-width-one-half{float:left;display:block;margin-right:4.82916%;width:47.58542%}.usa-width-one-half:last-child{margin-right:0}.usa-width-one-third{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-third:last-child{margin-right:0}.usa-width-two-thirds{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-two-thirds:last-child{margin-right:0}.usa-width-one-fourth{float:left;display:block;margin-right:4.82916%;width:47.58542%}.usa-width-one-fourth:last-child,.usa-width-one-fourth:nth-child(2n){margin-right:0}.usa-width-three-fourths{float:left;display:block;margin-right:4.82916%;width:100%}.usa-width-three-fourths:last-child{margin-right:0}.usa-width-one-sixth{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-sixth:last-child,.usa-width-one-sixth:nth-child(3n){margin-right:0}.usa-width-five-sixths{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-five-sixths:last-child{margin-right:0}.usa-width-one-twelfth{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-one-twelfth:last-child,.usa-width-one-twelfth:nth-child(3n){margin-right:0}.usa-width-five-twelfths{float:left;display:block;margin-right:4.82916%;width:30.11389%}.usa-width-five-twelfths:last-child{margin-right:0}.usa-width-seven-twelfths{float:left;display:block;margin-right:4.82916%;width:65.05695%}.usa-width-seven-twelfths:last-child{margin-right:0}}@media screen and (min-width:1201px){.usa-width-one-whole{float:left;display:block;margin-right:2.35765%;width:100%}.usa-width-one-whole:last-child{margin-right:0}.usa-width-one-half{float:left;display:block;margin-right:2.35765%;width:48.82117%}.usa-width-one-half:last-child{margin-right:0}.usa-width-one-third{float:left;display:block;margin-right:2.35765%;width:31.76157%}.usa-width-one-third:last-child{margin-right:0}.usa-width-two-thirds{float:left;display:block;margin-right:2.35765%;width:65.88078%}.usa-width-two-thirds:last-child{margin-right:0}.usa-width-one-fourth{float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-width-one-fourth:last-child{margin-right:0}.usa-width-one-fourth:nth-child(2n){float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-width-one-fourth:nth-child(2n):last-child,.usa-width-one-fourth:nth-child(4n){margin-right:0}.usa-width-three-fourths{float:left;display:block;margin-right:2.35765%;width:74.41059%}.usa-width-three-fourths:last-child{margin-right:0}.usa-width-one-sixth{float:left;display:block;margin-right:2.35765%;width:14.70196%}.usa-width-one-sixth:last-child{margin-right:0}.usa-width-one-sixth:nth-child(3n){float:left;display:block;margin-right:2.35765%;width:14.70196%}.usa-width-one-sixth:nth-child(3n):last-child,.usa-width-one-sixth:nth-child(6n){margin-right:0}.usa-width-five-sixths{float:left;display:block;margin-right:2.35765%;width:82.94039%}.usa-width-five-sixths:last-child{margin-right:0}.usa-width-one-twelfth{float:left;display:block;margin-right:2.35765%;width:6.17215%}.usa-width-one-twelfth:last-child{margin-right:0}.usa-width-one-twelfth:nth-child(3n){float:left;display:block;margin-right:2.35765%;width:6.17215%}.usa-width-one-twelfth:nth-child(3n):last-child,.usa-width-one-twelfth:nth-child(12n){margin-right:0}.usa-width-five-twelfths{float:left;display:block;margin-right:2.35765%;width:40.29137%}.usa-width-five-twelfths:last-child{margin-right:0}.usa-width-seven-twelfths{float:left;display:block;margin-right:2.35765%;width:57.35098%}.usa-width-seven-twelfths:last-child{margin-right:0}}.usa-end-row{margin-right:0}.usa-offset-one-twelfth{margin-left:8.5298%}.usa-offset-one-sixth{margin-left:17.05961%}.usa-offset-one-fourth{margin-left:25.58941%}.usa-offset-one-third{margin-left:34.11922%}.usa-offset-five-twelfths{margin-left:42.64902%}.usa-offset-one-half{margin-left:51.17883%}.usa-offset-seven-twelfths{margin-left:59.70863%}.usa-offset-two-thirds{margin-left:68.23843%}.usa-offset-three-fourths{margin-left:76.76824%}.usa-offset-five-sixths{margin-left:85.29804%}.usa-offset-eleven-twelfths{margin-left:93.82785%}.usa-sr-only{position:absolute;left:-999em}html{box-sizing:border-box}*,:after,:before{box-sizing:inherit}body{background-color:#fff;overflow-x:hidden}.lt-ie9 *{-webkit-filter:none!important;filter:none!important}[hidden]{display:none!important}.usa-focus,:focus{outline:2px dotted #999;outline-offset:3px}.usa-button,.usa-button-primary,.usa-button-primary:visited,.usa-button:visited,[type=button],[type=image],[type=reset],[type=submit],button{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;margin-top:.5em;margin-right:.5em;margin-bottom:.5em;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#0071bc;border:0;border-radius:5px;color:#fff;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:1.7rem;font-weight:700;line-height:1;padding:1rem 2rem;text-align:center;text-decoration:none;width:100%}@media screen and (min-width:481px){.usa-button,.usa-button-primary,.usa-button-primary:visited,.usa-button:visited,[type=button],[type=image],[type=reset],[type=submit],button{width:auto}}.usa-button-primary.usa-button-hover,.usa-button-primary:hover,.usa-button-primary:visited.usa-button-hover,.usa-button-primary:visited:hover,.usa-button.usa-button-hover,.usa-button:hover,.usa-button:visited.usa-button-hover,.usa-button:visited:hover,[type=button].usa-button-hover,[type=button]:hover,[type=image].usa-button-hover,[type=image]:hover,[type=reset].usa-button-hover,[type=reset]:hover,[type=submit].usa-button-hover,[type=submit]:hover,button.usa-button-hover,button:hover{background-color:#205493;border-bottom:0;color:#fff;text-decoration:none}.usa-button-primary.usa-button-active,.usa-button-primary:active,.usa-button-primary:visited.usa-button-active,.usa-button-primary:visited:active,.usa-button.usa-button-active,.usa-button:active,.usa-button:visited.usa-button-active,.usa-button:visited:active,[type=button].usa-button-active,[type=button]:active,[type=image].usa-button-active,[type=image]:active,[type=reset].usa-button-active,[type=reset]:active,[type=submit].usa-button-active,[type=submit]:active,button.usa-button-active,button:active{background-color:#112e51}.usa-button-primary.usa-button-primary-alt,.usa-button-primary:visited.usa-button-primary-alt,.usa-button.usa-button-primary-alt,.usa-button:visited.usa-button-primary-alt,[type=button].usa-button-primary-alt,[type=image].usa-button-primary-alt,[type=reset].usa-button-primary-alt,[type=submit].usa-button-primary-alt,button.usa-button-primary-alt{background-color:#c64b00;color:#212121}.usa-button-primary.usa-button-primary-alt.usa-button-hover,.usa-button-primary.usa-button-primary-alt:hover,.usa-button-primary:visited.usa-button-primary-alt.usa-button-hover,.usa-button-primary:visited.usa-button-primary-alt:hover,.usa-button.usa-button-primary-alt.usa-button-hover,.usa-button.usa-button-primary-alt:hover,.usa-button:visited.usa-button-primary-alt.usa-button-hover,.usa-button:visited.usa-button-primary-alt:hover,[type=button].usa-button-primary-alt.usa-button-hover,[type=button].usa-button-primary-alt:hover,[type=image].usa-button-primary-alt.usa-button-hover,[type=image].usa-button-primary-alt:hover,[type=reset].usa-button-primary-alt.usa-button-hover,[type=reset].usa-button-primary-alt:hover,[type=submit].usa-button-primary-alt.usa-button-hover,[type=submit].usa-button-primary-alt:hover,button.usa-button-primary-alt.usa-button-hover,button.usa-button-primary-alt:hover{background-color:#046b99}.usa-button-primary.usa-button-primary-alt.usa-button-active,.usa-button-primary.usa-button-primary-alt:active,.usa-button-primary:visited.usa-button-primary-alt.usa-button-active,.usa-button-primary:visited.usa-button-primary-alt:active,.usa-button.usa-button-primary-alt.usa-button-active,.usa-button.usa-button-primary-alt:active,.usa-button:visited.usa-button-primary-alt.usa-button-active,.usa-button:visited.usa-button-primary-alt:active,[type=button].usa-button-primary-alt.usa-button-active,[type=button].usa-button-primary-alt:active,[type=image].usa-button-primary-alt.usa-button-active,[type=image].usa-button-primary-alt:active,[type=reset].usa-button-primary-alt.usa-button-active,[type=reset].usa-button-primary-alt:active,[type=submit].usa-button-primary-alt.usa-button-active,[type=submit].usa-button-primary-alt:active,button.usa-button-primary-alt.usa-button-active,button.usa-button-primary-alt:active{background-color:#046b99;color:#fff}.usa-button-primary.usa-button-secondary,.usa-button-primary:visited.usa-button-secondary,.usa-button.usa-button-secondary,.usa-button:visited.usa-button-secondary,[type=button].usa-button-secondary,[type=image].usa-button-secondary,[type=reset].usa-button-secondary,[type=submit].usa-button-secondary,button.usa-button-secondary{background-color:#fff;box-shadow:inset 0 0 0 2px #0071bc;color:#0071bc}.usa-button-primary.usa-button-secondary.usa-button-hover,.usa-button-primary.usa-button-secondary:hover,.usa-button-primary:visited.usa-button-secondary.usa-button-hover,.usa-button-primary:visited.usa-button-secondary:hover,.usa-button.usa-button-secondary.usa-button-hover,.usa-button.usa-button-secondary:hover,.usa-button:visited.usa-button-secondary.usa-button-hover,.usa-button:visited.usa-button-secondary:hover,[type=button].usa-button-secondary.usa-button-hover,[type=button].usa-button-secondary:hover,[type=image].usa-button-secondary.usa-button-hover,[type=image].usa-button-secondary:hover,[type=reset].usa-button-secondary.usa-button-hover,[type=reset].usa-button-secondary:hover,[type=submit].usa-button-secondary.usa-button-hover,[type=submit].usa-button-secondary:hover,button.usa-button-secondary.usa-button-hover,button.usa-button-secondary:hover{box-shadow:inset 0 0 0 2px #205493;color:#205493}.usa-button-primary.usa-button-secondary.usa-button-active,.usa-button-primary.usa-button-secondary:active,.usa-button-primary:visited.usa-button-secondary.usa-button-active,.usa-button-primary:visited.usa-button-secondary:active,.usa-button.usa-button-secondary.usa-button-active,.usa-button.usa-button-secondary:active,.usa-button:visited.usa-button-secondary.usa-button-active,.usa-button:visited.usa-button-secondary:active,[type=button].usa-button-secondary.usa-button-active,[type=button].usa-button-secondary:active,[type=image].usa-button-secondary.usa-button-active,[type=image].usa-button-secondary:active,[type=reset].usa-button-secondary.usa-button-active,[type=reset].usa-button-secondary:active,[type=submit].usa-button-secondary.usa-button-active,[type=submit].usa-button-secondary:active,button.usa-button-secondary.usa-button-active,button.usa-button-secondary:active{box-shadow:inset 0 0 0 2px #112e51;color:#112e51}.usa-button-primary.usa-button-outline-inverse,.usa-button-primary.usa-button-secondary-inverse,.usa-button-primary:visited.usa-button-outline-inverse,.usa-button-primary:visited.usa-button-secondary-inverse,.usa-button.usa-button-outline-inverse,.usa-button.usa-button-secondary-inverse,.usa-button:visited.usa-button-outline-inverse,.usa-button:visited.usa-button-secondary-inverse,[type=button].usa-button-outline-inverse,[type=button].usa-button-secondary-inverse,[type=image].usa-button-outline-inverse,[type=image].usa-button-secondary-inverse,[type=reset].usa-button-outline-inverse,[type=reset].usa-button-secondary-inverse,[type=submit].usa-button-outline-inverse,[type=submit].usa-button-secondary-inverse,button.usa-button-outline-inverse,button.usa-button-secondary-inverse{background:transparent;box-shadow:inset 0 0 0 2px #fff;color:#fff}.usa-button-primary.usa-button-outline-inverse.usa-button-hover,.usa-button-primary.usa-button-outline-inverse:hover,.usa-button-primary.usa-button-secondary-inverse.usa-button-hover,.usa-button-primary.usa-button-secondary-inverse:hover,.usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,.usa-button-primary:visited.usa-button-outline-inverse:hover,.usa-button-primary:visited.usa-button-secondary-inverse.usa-button-hover,.usa-button-primary:visited.usa-button-secondary-inverse:hover,.usa-button.usa-button-outline-inverse.usa-button-hover,.usa-button.usa-button-outline-inverse:hover,.usa-button.usa-button-secondary-inverse.usa-button-hover,.usa-button.usa-button-secondary-inverse:hover,.usa-button:visited.usa-button-outline-inverse.usa-button-hover,.usa-button:visited.usa-button-outline-inverse:hover,.usa-button:visited.usa-button-secondary-inverse.usa-button-hover,.usa-button:visited.usa-button-secondary-inverse:hover,[type=button].usa-button-outline-inverse.usa-button-hover,[type=button].usa-button-outline-inverse:hover,[type=button].usa-button-secondary-inverse.usa-button-hover,[type=button].usa-button-secondary-inverse:hover,[type=image].usa-button-outline-inverse.usa-button-hover,[type=image].usa-button-outline-inverse:hover,[type=image].usa-button-secondary-inverse.usa-button-hover,[type=image].usa-button-secondary-inverse:hover,[type=reset].usa-button-outline-inverse.usa-button-hover,[type=reset].usa-button-outline-inverse:hover,[type=reset].usa-button-secondary-inverse.usa-button-hover,[type=reset].usa-button-secondary-inverse:hover,[type=submit].usa-button-outline-inverse.usa-button-hover,[type=submit].usa-button-outline-inverse:hover,[type=submit].usa-button-secondary-inverse.usa-button-hover,[type=submit].usa-button-secondary-inverse:hover,button.usa-button-outline-inverse.usa-button-hover,button.usa-button-outline-inverse:hover,button.usa-button-secondary-inverse.usa-button-hover,button.usa-button-secondary-inverse:hover{box-shadow:inset 0 0 0 2px #c9c9c9;color:#c9c9c9}.usa-button-primary.usa-button-outline-inverse.usa-button-active,.usa-button-primary.usa-button-outline-inverse:active,.usa-button-primary.usa-button-secondary-inverse.usa-button-active,.usa-button-primary.usa-button-secondary-inverse:active,.usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,.usa-button-primary:visited.usa-button-outline-inverse:active,.usa-button-primary:visited.usa-button-secondary-inverse.usa-button-active,.usa-button-primary:visited.usa-button-secondary-inverse:active,.usa-button.usa-button-outline-inverse.usa-button-active,.usa-button.usa-button-outline-inverse:active,.usa-button.usa-button-secondary-inverse.usa-button-active,.usa-button.usa-button-secondary-inverse:active,.usa-button:visited.usa-button-outline-inverse.usa-button-active,.usa-button:visited.usa-button-outline-inverse:active,.usa-button:visited.usa-button-secondary-inverse.usa-button-active,.usa-button:visited.usa-button-secondary-inverse:active,[type=button].usa-button-outline-inverse.usa-button-active,[type=button].usa-button-outline-inverse:active,[type=button].usa-button-secondary-inverse.usa-button-active,[type=button].usa-button-secondary-inverse:active,[type=image].usa-button-outline-inverse.usa-button-active,[type=image].usa-button-outline-inverse:active,[type=image].usa-button-secondary-inverse.usa-button-active,[type=image].usa-button-secondary-inverse:active,[type=reset].usa-button-outline-inverse.usa-button-active,[type=reset].usa-button-outline-inverse:active,[type=reset].usa-button-secondary-inverse.usa-button-active,[type=reset].usa-button-secondary-inverse:active,[type=submit].usa-button-outline-inverse.usa-button-active,[type=submit].usa-button-outline-inverse:active,[type=submit].usa-button-secondary-inverse.usa-button-active,[type=submit].usa-button-secondary-inverse:active,button.usa-button-outline-inverse.usa-button-active,button.usa-button-outline-inverse:active,button.usa-button-secondary-inverse.usa-button-active,button.usa-button-secondary-inverse:active{box-shadow:inset 0 0 0 2px #999;color:#c9c9c9}.usa-button-primary.usa-button-gray,.usa-button-primary:visited.usa-button-gray,.usa-button.usa-button-gray,.usa-button:visited.usa-button-gray,[type=button].usa-button-gray,[type=image].usa-button-gray,[type=reset].usa-button-gray,[type=submit].usa-button-gray,button.usa-button-gray{background-color:#666}.usa-button-primary.usa-button-gray.usa-button-hover,.usa-button-primary.usa-button-gray:hover,.usa-button-primary:visited.usa-button-gray.usa-button-hover,.usa-button-primary:visited.usa-button-gray:hover,.usa-button.usa-button-gray.usa-button-hover,.usa-button.usa-button-gray:hover,.usa-button:visited.usa-button-gray.usa-button-hover,.usa-button:visited.usa-button-gray:hover,[type=button].usa-button-gray.usa-button-hover,[type=button].usa-button-gray:hover,[type=image].usa-button-gray.usa-button-hover,[type=image].usa-button-gray:hover,[type=reset].usa-button-gray.usa-button-hover,[type=reset].usa-button-gray:hover,[type=submit].usa-button-gray.usa-button-hover,[type=submit].usa-button-gray:hover,button.usa-button-gray.usa-button-hover,button.usa-button-gray:hover{background-color:#333}.usa-button-primary.usa-button-gray.usa-button-active,.usa-button-primary.usa-button-gray:active,.usa-button-primary:visited.usa-button-gray.usa-button-active,.usa-button-primary:visited.usa-button-gray:active,.usa-button.usa-button-gray.usa-button-active,.usa-button.usa-button-gray:active,.usa-button:visited.usa-button-gray.usa-button-active,.usa-button:visited.usa-button-gray:active,[type=button].usa-button-gray.usa-button-active,[type=button].usa-button-gray:active,[type=image].usa-button-gray.usa-button-active,[type=image].usa-button-gray:active,[type=reset].usa-button-gray.usa-button-active,[type=reset].usa-button-gray:active,[type=submit].usa-button-gray.usa-button-active,[type=submit].usa-button-gray:active,button.usa-button-gray.usa-button-active,button.usa-button-gray:active{background-color:#212121}.usa-button-primary.usa-button-red,.usa-button-primary:visited.usa-button-red,.usa-button.usa-button-red,.usa-button:visited.usa-button-red,[type=button].usa-button-red,[type=image].usa-button-red,[type=reset].usa-button-red,[type=submit].usa-button-red,button.usa-button-red{background-color:#005495}.usa-button-primary.usa-button-red.usa-button-hover,.usa-button-primary.usa-button-red:hover,.usa-button-primary:visited.usa-button-red.usa-button-hover,.usa-button-primary:visited.usa-button-red:hover,.usa-button.usa-button-red.usa-button-hover,.usa-button.usa-button-red:hover,.usa-button:visited.usa-button-red.usa-button-hover,.usa-button:visited.usa-button-red:hover,[type=button].usa-button-red.usa-button-hover,[type=button].usa-button-red:hover,[type=image].usa-button-red.usa-button-hover,[type=image].usa-button-red:hover,[type=reset].usa-button-red.usa-button-hover,[type=reset].usa-button-red:hover,[type=submit].usa-button-red.usa-button-hover,[type=submit].usa-button-red:hover,button.usa-button-red.usa-button-hover,button.usa-button-red:hover{background-color:#981b1e}.usa-button-primary.usa-button-red.usa-button-active,.usa-button-primary.usa-button-red:active,.usa-button-primary:visited.usa-button-red.usa-button-active,.usa-button-primary:visited.usa-button-red:active,.usa-button.usa-button-red.usa-button-active,.usa-button.usa-button-red:active,.usa-button:visited.usa-button-red.usa-button-active,.usa-button:visited.usa-button-red:active,[type=button].usa-button-red.usa-button-active,[type=button].usa-button-red:active,[type=image].usa-button-red.usa-button-active,[type=image].usa-button-red:active,[type=reset].usa-button-red.usa-button-active,[type=reset].usa-button-red:active,[type=submit].usa-button-red.usa-button-active,[type=submit].usa-button-red:active,button.usa-button-red.usa-button-active,button.usa-button-red:active{background-color:#cd2026}.usa-button-primary.usa-button-big,.usa-button-primary:visited.usa-button-big,.usa-button.usa-button-big,.usa-button:visited.usa-button-big,[type=button].usa-button-big,[type=image].usa-button-big,[type=reset].usa-button-big,[type=submit].usa-button-big,button.usa-button-big{border-radius:8px;font-size:2.4rem;padding:1.5rem 3rem}.usa-button-primary:disabled,.usa-button-primary:visited:disabled,.usa-button:disabled,.usa-button:visited:disabled,[type=button]:disabled,[type=image]:disabled,[type=reset]:disabled,[type=submit]:disabled,button:disabled{background-color:#c9c9c9;pointer-events:none}.usa-button-primary:disabled.usa-button-active,.usa-button-primary:disabled.usa-button-hover,.usa-button-primary:disabled.usa-focus,.usa-button-primary:disabled:active,.usa-button-primary:disabled:focus,.usa-button-primary:disabled:hover,.usa-button-primary:visited:disabled.usa-button-active,.usa-button-primary:visited:disabled.usa-button-hover,.usa-button-primary:visited:disabled.usa-focus,.usa-button-primary:visited:disabled:active,.usa-button-primary:visited:disabled:focus,.usa-button-primary:visited:disabled:hover,.usa-button:disabled.usa-button-active,.usa-button:disabled.usa-button-hover,.usa-button:disabled.usa-focus,.usa-button:disabled:active,.usa-button:disabled:focus,.usa-button:disabled:hover,.usa-button:visited:disabled.usa-button-active,.usa-button:visited:disabled.usa-button-hover,.usa-button:visited:disabled.usa-focus,.usa-button:visited:disabled:active,.usa-button:visited:disabled:focus,.usa-button:visited:disabled:hover,[type=button]:disabled.usa-button-active,[type=button]:disabled.usa-button-hover,[type=button]:disabled.usa-focus,[type=button]:disabled:active,[type=button]:disabled:focus,[type=button]:disabled:hover,[type=image]:disabled.usa-button-active,[type=image]:disabled.usa-button-hover,[type=image]:disabled.usa-focus,[type=image]:disabled:active,[type=image]:disabled:focus,[type=image]:disabled:hover,[type=reset]:disabled.usa-button-active,[type=reset]:disabled.usa-button-hover,[type=reset]:disabled.usa-focus,[type=reset]:disabled:active,[type=reset]:disabled:focus,[type=reset]:disabled:hover,[type=submit]:disabled.usa-button-active,[type=submit]:disabled.usa-button-hover,[type=submit]:disabled.usa-focus,[type=submit]:disabled:active,[type=submit]:disabled:focus,[type=submit]:disabled:hover,button:disabled.usa-button-active,button:disabled.usa-button-hover,button:disabled.usa-focus,button:disabled:active,button:disabled:focus,button:disabled:hover{background-color:#c9c9c9;border:0;box-shadow:none}.usa-button-disabled{background-color:#c9c9c9;pointer-events:none}.usa-button-disabled.usa-button-active,.usa-button-disabled.usa-button-hover,.usa-button-disabled.usa-focus,.usa-button-disabled:active,.usa-button-disabled:focus,.usa-button-disabled:hover{background-color:#c9c9c9;border:0;box-shadow:none}.usa-button-outline-inverse:disabled,.usa-button-secondary-disabled,.usa-button-secondary-inverse-disabled,.usa-button-secondary-inverse:disabled,.usa-button-secondary:disabled{box-shadow:inset 0 0 0 2px #c9c9c9;pointer-events:none;color:#c9c9c9}.usa-button-outline-inverse:disabled.usa-button-active,.usa-button-outline-inverse:disabled.usa-button-hover,.usa-button-outline-inverse:disabled.usa-focus,.usa-button-outline-inverse:disabled:active,.usa-button-outline-inverse:disabled:focus,.usa-button-outline-inverse:disabled:hover,.usa-button-secondary-disabled.usa-button-active,.usa-button-secondary-disabled.usa-button-hover,.usa-button-secondary-disabled.usa-focus,.usa-button-secondary-disabled:active,.usa-button-secondary-disabled:focus,.usa-button-secondary-disabled:hover,.usa-button-secondary-inverse-disabled.usa-button-active,.usa-button-secondary-inverse-disabled.usa-button-hover,.usa-button-secondary-inverse-disabled.usa-focus,.usa-button-secondary-inverse-disabled:active,.usa-button-secondary-inverse-disabled:focus,.usa-button-secondary-inverse-disabled:hover,.usa-button-secondary-inverse:disabled.usa-button-active,.usa-button-secondary-inverse:disabled.usa-button-hover,.usa-button-secondary-inverse:disabled.usa-focus,.usa-button-secondary-inverse:disabled:active,.usa-button-secondary-inverse:disabled:focus,.usa-button-secondary-inverse:disabled:hover,.usa-button-secondary:disabled.usa-button-active,.usa-button-secondary:disabled.usa-button-hover,.usa-button-secondary:disabled.usa-focus,.usa-button-secondary:disabled:active,.usa-button-secondary:disabled:focus,.usa-button-secondary:disabled:hover{background-color:#fff;border:0}.usa-button-secondary:disabled,html .usa-button-secondary-disabled{background-color:#fff}.usa-button-secondary-inverse:disabled,html .usa-button-secondary-inverse-disabled{background-color:transparent;color:#666;box-shadow:inset 0 0 0 2px #666}.usa-button-unstyled{border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto}.usa-button-unstyled,.usa-button-unstyled:hover{background-color:transparent}.usa-embed-container embed,.usa-embed-container iframe,.usa-embed-container object{position:absolute;top:0;left:0;width:100%;height:100%}.usa-embed-container{padding-bottom:56.25%;position:relative;height:0;overflow:hidden;max-width:100%}img{max-width:100%}.media_link{display:inline-block;line-height:0}input,select,textarea{-webkit-appearance:none;-moz-appearance:none;appearance:none;border:.1rem solid #666;border-radius:0;box-sizing:border-box;color:#212121;display:block;font-size:1.7rem;height:4.4rem;line-height:1.3;margin:.2em 0;max-width:46rem;padding:1rem .7em;width:100%}input.usa-input-success,select.usa-input-success,textarea.usa-input-success{border:3px solid #4aa564}.usa-input-error{border-left:4px solid #981b1e;margin-top:3rem;padding-bottom:.8rem;padding-left:1.5rem;padding-top:.8rem;position:relative;right:1.9rem}.usa-input-error input,.usa-input-error select,.usa-input-error textarea{border:3px solid #981b1e;width:calc(100% + 1.9rem)}.usa-input-error label{margin-top:0}.usa-input-error .usa-input-inline{border:.1rem solid #666;width:inherit}.usa-input-error .usa-input-inline-error{border:3px solid #981b1e}.usa-input-error-label,.usa-input-error-message{display:block;font-size:1.7rem;font-weight:700}.usa-input-error-message{color:#981b1e;padding-bottom:3px;padding-top:3px}.usa-input-required:after{color:#cd2026;content:" (*required)"}.usa-input-optional:after{color:#757575;content:" (optional)"}label{display:block;margin-top:3rem;max-width:46rem}textarea{height:16rem}select{-moz-appearance:none;-webkit-appearance:none;appearance:none;background-color:#fff;background-image:url(../img/arrow-both.png);background-image:url(../img/arrow-both.svg);background-position:right 1.3rem center;background-repeat:no-repeat;background-size:1rem;padding-right:3rem}select::-ms-expand{display:none}select:-webkit-autofill{-webkit-appearance:menulist;appearance:menulist}select:-moz-focusring{color:transparent;text-shadow:0 0 0 #000}legend,option:first-child{font-weight:700}legend{font-size:3rem}.usa-fieldset-inputs label{margin-top:0}.usa-form-hint{color:#757575;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;margin-bottom:0}[type=checkbox],[type=radio]{position:absolute;left:-999em}.lt-ie9 [type=checkbox],.lt-ie9 [type=radio]{border:0;float:left;margin:.4em .4em 0 0;position:static;width:auto}[type=checkbox]+label,[type=radio]+label{cursor:pointer;font-weight:400;margin-bottom:.65em}[type=checkbox]+label:before,[type=radio]+label:before{background:#fff;border-radius:2px;box-shadow:0 0 0 1px #757575;content:"\a0";display:inline-block;height:2rem;line-height:2rem;margin-right:.6em;text-indent:.15em;vertical-align:middle\0;width:2rem}[type=radio]+label:before{border-radius:100%;box-shadow:0 0 0 2px #fff,0 0 0 3px #757575;height:1.4rem;line-height:1.4rem;margin-right:.75em;width:1.4rem}[type=checkbox]:checked+label:before,[type=radio]:checked+label:before{background-color:#0071bc;box-shadow:0 0 0 1px #0071bc}[type=radio]:checked+label:before{box-shadow:0 0 0 2px #fff,0 0 0 4px #0071bc}[type=checkbox]:checked+label:before,[type=checkbox]:checked:disabled+label:before{background-image:url(../img/correct8.png);background-image:url(../img/correct8.svg);background-position:50%;background-repeat:no-repeat}[type=radio]:focus+label:before{outline:2px dotted #999;outline-offset:6px}[type=checkbox]:disabled+label{color:#c9c9c9}[type=checkbox]:focus+label:before{outline:2px dotted #999;outline-offset:3px}[type=checkbox]:disabled+label:before,[type=radio]:disabled+label:before{background:#e4e4e4;box-shadow:0 0 0 1px #999;cursor:not-allowed}[type=range]{-webkit-appearance:none;border:none;padding-left:0;width:100%}[type=range]::-webkit-slider-runnable-track{background:#999;border:1px solid #757575;cursor:pointer;height:1.2rem;width:100%}[type=range]::-moz-range-track{background:#0071bc;border:1px solid #757575;cursor:pointer;height:1.2rem;width:100%}[type=range]::-ms-track{background:transparent;color:transparent;cursor:pointer;height:1.2rem;width:100%}[type=range]::-webkit-slider-thumb{-webkit-appearance:none;border:1px solid #757575;height:2.2rem;border-radius:1.5rem;background:#e4e4e4;cursor:pointer;margin-top:-.65rem;width:2.2rem}[type=range]::-moz-range-thumb{background:#e4e4e4;border:1px solid #757575;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-thumb{background:#e4e4e4;border:1px solid #757575;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-fill-lower,[type=range]::-ms-fill-upper{background:#999;border:1px solid #757575;border-radius:2rem}.usa-date-of-birth label{margin-top:0}.usa-date-of-birth [type=number]::-webkit-inner-spin-button,.usa-date-of-birth [type=number]::-webkit-outer-spin-button{-webkit-appearance:none;appearance:none;margin:0}.usa-date-of-birth [type=number]{-moz-appearance:textfield}.usa-form-group-day,.usa-form-group-month,.usa-form-group-year{clear:none;float:left;margin-right:1.5rem;width:5rem}.usa-form-group-year{width:7rem}.usa-label,.usa-label-big{background-color:#666;border-radius:2px;color:#fff;font-size:1.5rem;margin-right:.5rem;padding:.1rem .7rem;text-transform:uppercase}.usa-label-big:only-of-type,.usa-label:only-of-type{margin-right:0}.usa-label-big{font-size:1.7rem;padding-left:.9rem;padding-right:.9rem}ol,ul{margin-top:1em;margin-bottom:1em;padding-left:1.94em}li{line-height:1.5;margin-bottom:.5em}li:last-child{margin-bottom:0}h1+ol,h1+ul,h2+ol,h2+ul,h3+ol,h3+ul,h4+ol,h4+ul,h5+ol,h5+ul,h6+ol,h6+ul,p+ol,p+ul{margin-top:0}.usa-unstyled-list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-unstyled-list>li{margin-bottom:0}table{border-spacing:0;margin:2em 0}thead th{font-weight:700}thead td,thead th{background-color:#e4e4e4}th{text-align:left}td,th{background-color:#fff;border:1px solid #666;font-weight:400;padding:1rem 1.5rem}.usa-table-borderless thead th{background-color:transparent;border-top:0}.usa-table-borderless td,.usa-table-borderless th{border-left:0;border-right:0}.usa-table-borderless th:first-child{padding-left:0}caption{font-size:1.5rem;font-weight:700;font-family:Work Sans,sans-serif;margin-bottom:1.2rem;text-align:left}html{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:10px}body{font-size:1.7rem}p{line-height:1.5;margin-bottom:1em;margin-top:1em}a{color:#0071bc;text-decoration:underline}a:active,a:hover{color:#205493}a:focus{outline:2px dotted #999;outline-offset:3px}a:visited{color:#4c2c92}.usa-external_link:after{background:url(../img/external-link.png) no-repeat 0 0;background:url(../img/external-link.svg) no-repeat 0 0;background-size:100%;content:"";display:inline-block;height:.65em;margin-bottom:-1px;margin-left:4px;width:.65em}.usa-external_link:hover:after{background-image:url(../img/external-link-hover.png);background-image:url(../img/external-link-hover.svg)}.usa-external_link-alt:after{background:url(../img/external-link-alt.png) no-repeat 0 0;background:url(../img/external-link-alt.svg) no-repeat 0 0;background-size:100%;content:"";display:inline-block;height:.65em;margin-bottom:-1px;margin-left:4px;width:.65em}.usa-external_link-alt:hover:after{background-image:url(../img/external-link-alt-hover.png);background-image:url(../img/external-link-alt-hover.svg)}h1,h2,h3,h4,h5{clear:both;font-family:Work Sans,sans-serif;line-height:1.3;margin-bottom:.5em;margin-top:1.5em}h6{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}h1{font-size:4rem}h1,h2{font-weight:700}h2{font-size:3rem}h3{font-size:2rem}h3,h4{font-weight:700}h4{font-size:1.7rem}h5{font-size:1.5rem;font-weight:700}h6{font-size:1.3rem;font-weight:400;line-height:1.5;text-transform:uppercase}address,cite,dfn,var{font-style:normal}.usa-content-list,.usa-content ol:not(.usa-accordion):not(.usa-accordion-bordered),.usa-content p,.usa-content ul:not(.usa-accordion):not(.usa-accordion-bordered){max-width:66ch}.usa-sans a,.usa-sans li,.usa-sans p,.usa-sans span{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}.usa-sans a{border-bottom:none;font-weight:700}.usa-serif a,.usa-serif li,.usa-serif p,.usa-serif span{font-family:Work Sans,sans-serif}.usa-display{font-size:2rem;font-weight:700;margin-bottom:0}@media screen and (min-width:481px){.usa-display{font-size:4rem;font-weight:700}}@media screen and (min-width:600px){.usa-display{font-size:5.2rem;font-weight:700}}.usa-font-lead{font-family:Work Sans,sans-serif;font-size:2rem;font-weight:400;line-height:1.7;max-width:77rem}.usa-image-block{position:relative}.usa-image-text-block{color:#fff;left:0;margin-left:8%;position:absolute;top:0}.usa-image-text{margin-top:0}.usa-drop_text{margin-bottom:0}.usa-background-dark{background-color:#333}.usa-background-dark p,.usa-background-dark span{color:#fff}.usa-background-dark a{color:#c9c9c9}.usa-background-dark a:hover{color:#fff}.usa-text-small{font-size:1.3rem;margin-top:0}.usa-grid-full>:first-child,.usa-grid>:first-child,.usa-section>:first-child{margin-top:0}.usa-grid-full>:last-child,.usa-grid>:last-child,.usa-section>:last-child{margin-bottom:0}.usa-width-five-sixths:first-child>:first-child,.usa-width-one-fourth:first-child>:first-child,.usa-width-one-half:first-child>:first-child,.usa-width-one-sixth:first-child>:first-child,.usa-width-one-third:first-child>:first-child,.usa-width-one-twelfth:first-child>:first-child,.usa-width-one-whole:first-child>:first-child,.usa-width-three-fourths:first-child>:first-child,.usa-width-two-thirds:first-child>:first-child{margin-top:0}@media screen and (min-width:600px){.usa-width-five-sixths>:first-child,.usa-width-one-fourth>:first-child,.usa-width-one-half>:first-child,.usa-width-one-sixth>:first-child,.usa-width-one-third>:first-child,.usa-width-one-twelfth>:first-child,.usa-width-one-whole>:first-child,.usa-width-three-fourths>:first-child,.usa-width-two-thirds>:first-child{margin-top:0}}.usa-width-five-sixths:last-child>:last-child,.usa-width-one-fourth:last-child>:last-child,.usa-width-one-half:last-child>:last-child,.usa-width-one-sixth:last-child>:last-child,.usa-width-one-third:last-child>:last-child,.usa-width-one-twelfth:last-child>:last-child,.usa-width-one-whole:last-child>:last-child,.usa-width-three-fourths:last-child>:last-child,.usa-width-two-thirds:last-child>:last-child{margin-bottom:0}@media screen and (min-width:600px){.usa-width-five-sixths>:last-child,.usa-width-one-fourth>:last-child,.usa-width-one-half>:last-child,.usa-width-one-sixth>:last-child,.usa-width-one-third>:last-child,.usa-width-one-twelfth>:last-child,.usa-width-one-whole>:last-child,.usa-width-three-fourths>:last-child,.usa-width-two-thirds>:last-child{margin-bottom:0}}.usa-accordion,.usa-accordion-bordered{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;color:#212121;margin:0;padding:0;width:100%}.usa-accordion-bordered>li,.usa-accordion>li{margin-bottom:0}.usa-accordion-bordered>ul li ul,.usa-accordion>ul li ul{list-style:disc}.usa-accordion-bordered>ul li ul>li>ul,.usa-accordion>ul li ul>li>ul{list-style:circle}.usa-accordion-bordered>ul li ul>li>ul>li>ul,.usa-accordion>ul li ul>li>ul>li>ul{list-style:square}.usa-accordion+.usa-accordion,.usa-accordion+.usa-accordion-bordered,.usa-accordion-bordered+.usa-accordion,.usa-accordion-bordered+.usa-accordion-bordered{margin-top:1rem}.usa-accordion-bordered>ul,.usa-accordion>ul{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;color:#212121;margin:0;padding:0;width:100%}.usa-accordion-bordered>ul>li,.usa-accordion>ul>li{margin-bottom:0;background-color:#e4e4e4;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;list-style:none;margin-bottom:.5rem;width:100%}.usa-accordion-bordered>ul button,.usa-accordion>ul button{background-color:transparent;border:0;border-radius:0;font-weight:400;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#e4e4e4;background-image:url(../img/minus.png);background-image:url(../img/minus.svg);background-position:right 2rem center;background-repeat:no-repeat;background-size:1.5rem;color:#212121;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-weight:700;margin:0;padding:1.5rem 5.5rem 1.5rem 2rem;width:100%}.usa-accordion-bordered>ul button:hover,.usa-accordion>ul button:hover{background-color:transparent;background-color:#c9c9c9;color:#212121}.usa-accordion-bordered>ul button h1,.usa-accordion-bordered>ul button h2,.usa-accordion-bordered>ul button h3,.usa-accordion-bordered>ul button h4,.usa-accordion-bordered>ul button h5,.usa-accordion-bordered>ul button h6,.usa-accordion>ul button h1,.usa-accordion>ul button h2,.usa-accordion>ul button h3,.usa-accordion>ul button h4,.usa-accordion>ul button h5,.usa-accordion>ul button h6{margin:0}.usa-accordion-bordered>ul [aria-expanded=false],.usa-accordion>ul [aria-expanded=false]{background-image:url(../img/plus.png);background-image:url(../img/plus.svg);background-repeat:no-repeat;background-size:1.5rem}.usa-accordion-bordered>li,.usa-accordion>li{background-color:#e4e4e4;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;list-style:none;margin-bottom:.5rem;width:100%}.usa-accordion-bordered .usa-accordion-content{border-bottom:3px solid #e4e4e4;border-left:3px solid #e4e4e4;border-right:3px solid #e4e4e4}.usa-accordion-content{background-color:#fff;overflow:auto;padding:1.5rem 2rem}.usa-accordion-content>:first-child{margin-top:0}.usa-accordion-content>:last-child{margin-bottom:0}.usa-accordion-content:not([aria-hidden]){position:absolute;left:-999em}.usa-accordion-content[aria-hidden=true]{display:none}.usa-accordion-button{background-color:transparent;border:0;border-radius:0;font-weight:400;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#e4e4e4;background-image:url(../img/minus.png);background-image:url(../img/minus.svg);background-position:right 2rem center;background-repeat:no-repeat;background-size:1.5rem;color:#212121;cursor:pointer;display:inline-block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-weight:700;margin:0;padding:1.5rem 5.5rem 1.5rem 2rem;width:100%}.usa-accordion-button:hover{background-color:transparent;background-color:#c9c9c9;color:#212121}.usa-accordion-button h1,.usa-accordion-button h2,.usa-accordion-button h3,.usa-accordion-button h4,.usa-accordion-button h5,.usa-accordion-button h6{margin:0}.usa-accordion-button[aria-expanded=false]{background-image:url(../img/plus.png);background-image:url(../img/plus.svg);background-repeat:no-repeat;background-size:1.5rem}.usa-alert{background-color:#e4e4e4;background-position:2rem 2rem;background-repeat:no-repeat;background-size:5.2rem;padding:2rem 2rem 1.4rem 3rem;position:relative}.usa-alert:before{background-color:#7e7e7e;content:"";height:100%;left:0;position:absolute;top:0;width:1rem}.usa-alert a{color:#205493}.usa-alert a:focus,.usa-alert a:hover{color:#112e51}.usa-alert ul{margin-bottom:0;margin-top:1rem;padding-left:1rem}.usa-alert-slim{background-position:2rem 1rem;padding-bottom:1rem;padding-top:1rem}.usa-alert-slim .usa-alert-text:only-child{margin-bottom:.5rem;padding-top:.5rem}.usa-alert-icon{display:table-cell;padding-right:1rem}.usa-alert-body{display:table-cell;padding-left:5rem;vertical-align:top}.usa-alert-heading,.usa-alert-text{margin-top:0;margin-bottom:0}.usa-alert-text{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif}.usa-alert-text:only-child{margin-bottom:1rem;padding-top:.5rem}.usa-alert-success{background-color:#e7f4e4;background-image:url(../img/alerts/success.png);background-image:url(../img/alerts/success.svg)}.usa-alert-success:before{background-color:#2e8540}.usa-alert-warning{background-color:#fff1d2;background-image:url(../img/alerts/warning.png);background-image:url(../img/alerts/warning.svg)}.usa-alert-warning:before{background-color:#fdb81e}.usa-alert-error{background-color:#f9dede;background-image:url(../img/alerts/error.png);background-image:url(../img/alerts/error.svg)}.usa-alert-error:before{background-color:#005495}.usa-alert-info{background-color:#e1f3f8;background-image:url(../img/alerts/info.png);background-image:url(../img/alerts/info.svg)}.usa-alert-info:before{background-color:#c64b00}.usa-alert-no_icon{background-image:none}.usa-alert-paragraph{width:66ch}.usa-alert{margin-top:1.5em}.usa-banner{background-color:#e4e4e4;padding-bottom:.7rem}@media screen and (min-width:481px){.usa-banner{font-size:1.3rem;padding-bottom:0}}.usa-banner-content{padding:2rem 1.5rem 3px;background-color:transparent;font-size:1.5rem;width:100%}@media screen and (min-width:600px){.usa-banner-content{padding-bottom:2.3rem;padding-top:4rem}}@media screen and (min-width:951px){.usa-banner-content{padding-right:3rem;padding-left:3rem}}.usa-banner-content p:first-child{margin-top:1rem}@media screen and (min-width:600px){.usa-banner-content p:first-child{margin-top:0}}.usa-banner-inner{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:1.5rem;padding-left:1.5rem;max-width:1040px}.usa-banner-inner:after{clear:both;content:"";display:block}@media screen and (min-width:951px){.usa-banner-inner{padding-right:3rem;padding-left:3rem}}.usa-banner-header{padding-top:.55rem;padding-bottom:.55rem;font-size:1.2rem;font-weight:400}@media screen and (min-width:481px){.usa-banner-header{padding-top:0;padding-bottom:0}}.usa-banner-header p{margin-top:0;margin-bottom:0;display:inline;overflow:hidden;vertical-align:middle}@media screen and (min-width:481px){.usa-banner-header p{margin-top:2px;margin-bottom:2px;display:inline-block}}.usa-banner-header img{float:left;margin-right:1rem;margin-top:1px;width:2.4rem}@media screen and (min-width:481px){.usa-banner-header img{margin-right:.7rem;width:2rem}}.usa-banner-header-expanded{-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-bottom:1px solid #999;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:1.5rem;min-height:5.6rem;padding-right:3rem}@media screen and (min-width:481px){.usa-banner-header-expanded{border-bottom:none;display:block;font-size:1.2rem;font-weight:400;min-height:0;padding-right:0}}.usa-banner-header-expanded>.usa-banner-inner{margin-left:0}@media screen and (min-width:481px){.usa-banner-header-expanded>.usa-banner-inner{margin-left:auto}}.usa-banner-header-expanded img{margin-right:2.4rem}@media screen and (min-width:481px){.usa-banner-header-expanded img{margin-right:.7rem}}.usa-banner-header-expanded p{line-height:1.3;vertical-align:top}@media screen and (min-width:481px){.usa-banner-header-expanded p{line-height:1.5;vertical-align:middle}}.usa-banner-button{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;padding-top:1.3rem;padding-left:4.8rem;background-position-x:right;color:#0071bc;display:block;font-size:1.2rem;height:4.3rem;left:0;position:absolute;text-decoration:underline;top:0;width:100%}.usa-banner-button:hover{background-color:transparent}@media screen and (min-width:481px){.usa-banner-button{padding-top:0;padding-left:0;display:inline;height:auto;margin-left:3px;position:relative;vertical-align:middle;width:auto}}.usa-banner-button:hover{color:#205493;text-decoration:underline}.usa-banner-button[aria-expanded=false]{background-image:none}.usa-banner-button[aria-expanded=false]:after{background-image:url(../img/angle-arrow-down-primary.png);background-image:url(../img/angle-arrow-down-primary.svg);background-size:100%;content:"";display:inline-block;height:1rem;width:1rem;margin-left:0}.usa-banner-button[aria-expanded=false]:hover:after{background-image:url(../img/angle-arrow-down-primary-hover.png);background-image:url(../img/angle-arrow-down-primary-hover.svg)}.usa-banner-button[aria-expanded=false]:after{background-position-y:1px}.usa-banner-button[aria-expanded=true]{background-image:none;height:5.6rem}.usa-banner-button[aria-expanded=true]:after{background-image:url(../img/close.png);background-image:url(../img/close.svg);background-size:100%;content:"";display:inline-block;height:1.3rem;width:1.3rem;margin-left:0}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true]{height:auto;padding:0;position:relative}.usa-banner-button[aria-expanded=true]:after{background-image:url(../img/angle-arrow-up-primary.png);background-image:url(../img/angle-arrow-up-primary.svg);background-size:100%;content:"";display:inline-block;height:1rem;width:1rem;margin-left:0}.usa-banner-button[aria-expanded=true]:hover:after{background-image:url(../img/angle-arrow-up-primary-hover.png);background-image:url(../img/angle-arrow-up-primary-hover.svg)}.usa-banner-button[aria-expanded=true]:after{background-position-y:1px}}.usa-banner-button[aria-expanded=true]:after{position:absolute;right:1.5rem;top:2.15rem}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true]:after{position:static}}.usa-banner-button[aria-expanded=true] .usa-banner-button-text{display:none}@media screen and (min-width:481px){.usa-banner-button[aria-expanded=true] .usa-banner-button-text{display:inline}}.usa-banner-icon{width:3.8rem}.usa-footer .usa-unstyled-list{display:block}.usa-footer .usa-footer-primary-link{color:#212121;display:block;font-weight:700;margin-top:0;padding-bottom:2rem;padding-top:2rem;text-decoration:none}@media screen and (min-width:600px){.usa-footer .usa-footer-primary-link{border-top:none}}.usa-footer .usa-footer-primary-link:hover{text-decoration:underline}.usa-footer .usa-footer-primary-link~li a,.usa-footer .usa-footer-secondary-link{text-decoration:none}.usa-footer-contact_info{display:inline-block}.usa-footer-contact_info a{color:#212121;text-decoration:none}.usa-footer-contact_info:hover{text-decoration:underline}.usa-footer-return-to-top{color:#0071bc;padding-bottom:2rem;padding-top:2rem;text-decoration:underline}.usa-footer-primary-section{background-color:#e4e4e4}.usa-footer-primary-section .usa-footer-primary-content{padding-left:1.5rem;padding-right:2.5rem}@media screen and (min-width:600px){.usa-footer-primary-section .usa-footer-primary-content{padding-left:0;padding-right:0}}.usa-footer-primary-section .usa-footer-primary-content li{margin-left:1rem}@media screen and (min-width:600px){.usa-footer-primary-section .usa-footer-primary-content li{margin-left:0}}@media screen and (min-width:600px){.usa-footer-primary-section .usa-grid-full{padding-left:2.5rem;padding-right:2.5rem}}.usa-footer-medium .usa-footer-contact_info p{margin:0 1rem 0 0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-contact_info p{margin:0 0 0 1rem}}.usa-footer-medium .usa-footer-contact-heading{margin-top:0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-contact-heading{margin-top:.5rem;margin-bottom:.5rem}}.usa-footer-medium .usa-footer-logo{padding:1rem 0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-logo{padding:2rem 0}}.usa-footer-medium .usa-footer-primary-link{padding-bottom:1.5rem;padding-top:1.5rem}.usa-footer-medium .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}@media screen and (min-width:1201px){.usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content{margin-right:5%;width:inherit}}@media screen and (min-width:1201px){.usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content:last-child{margin-right:0}}@media screen and (min-width:600px){.usa-footer-medium .usa-footer-nav ul{-webkit-box-align:center;-ms-flex-align:center;align-items:center}}.usa-footer-slim .usa-footer-nav a{display:block}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-nav .usa-footer-primary-content{margin-right:5%;width:inherit}}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-nav .usa-footer-primary-content:last-child{margin-right:0}}.usa-footer-slim .usa-footer-primary-link{padding-bottom:1.5rem;padding-top:1.5rem}.usa-footer-slim .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-primary-section{padding-bottom:0;padding-top:0}.usa-footer-slim .usa-footer-primary-section .usa-grid-full{-webkit-box-align:center;-ms-flex-align:center;align-items:center}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-contact_info>*{margin:0}}@media screen and (min-width:600px){.usa-footer-slim .usa-footer-contact_info{padding-top:1.5rem;padding-bottom:1.5rem;width:100%}}@media screen and (min-width:1201px){.usa-footer-slim .usa-footer-contact_info{float:left;display:block;margin-right:2.35765%;width:48.82117%}.usa-footer-slim .usa-footer-contact_info:last-child{margin-right:0}}li.usa-footer-primary-content,ul.usa-footer-primary-content{border-top:1px solid #999}@media screen and (min-width:600px){li.usa-footer-primary-content,ul.usa-footer-primary-content{border:none}}li.usa-footer-primary-content:last-child,ul.usa-footer-primary-content:last-child{border-bottom:1px solid #999}@media screen and (min-width:600px){li.usa-footer-primary-content:last-child,ul.usa-footer-primary-content:last-child{border-bottom:none}}.usa-sign_up-block{padding-bottom:4.5rem;padding-left:1.5rem;padding-right:1.5rem}@media screen and (min-width:600px){.usa-sign_up-block{float:right;padding:0}}.usa-sign_up-block label:first-of-type{margin-top:0}.usa-sign_up-block button{float:none;margin-right:0;margin-top:1.5rem}.usa-sign_up-block input{width:100%}.usa-footer-secondary_section{background-color:#c9c9c9;padding-bottom:2rem;padding-top:2rem}.usa-footer-secondary_section a{color:#212121}@media screen and (min-width:600px){.usa-footer-big-secondary-section{padding-top:2rem;padding-bottom:2rem}}@media screen and (min-width:600px){.usa-footer-contact-links{text-align:right}}.usa-social-links a{text-decoration:none}.usa-footer-big .usa-footer-contact_info{display:block}.usa-footer-big .usa-footer-contact_info p{margin:0 1rem 0 0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-contact_info p{margin:.5rem 0 0 1rem}}@media screen and (min-width:600px){.usa-footer-big .usa-footer-contact-links{padding-top:2rem}}.usa-footer-big .usa-footer-logo{padding:1rem 0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-logo{padding:2rem 0}}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section{padding-bottom:4rem;padding-top:3rem}}.usa-footer-big .usa-footer-primary-section>.usa-grid{padding:0}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section>.usa-grid{padding-left:3rem;padding-right:3rem}}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content{padding-left:0;padding-right:0}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li{margin-left:1.5rem}@media screen and (min-width:600px){.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li{margin-left:0}}.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link{margin-left:0}.usa-footer-big ul{padding-bottom:2.4rem}@media screen and (min-width:600px){.usa-footer-big ul{padding-bottom:0}}.usa-footer-big ul:last-child{border-bottom:1px solid #999}@media screen and (min-width:600px){.usa-footer-big ul:last-child{border-bottom:none}}.usa-footer-big ul li:not(.usa-footer-primary-link){line-height:1.3;padding-bottom:.35em;padding-top:.35em}.usa-footer-big ul .usa-footer-primary-link{background-image:url(../img/arrow-down.png);background-image:url(../img/arrow-down.svg);background-position:1.5rem;background-repeat:no-repeat;background-size:1.3rem;margin-left:0;padding-left:3.5rem}@media screen and (min-width:600px){.usa-footer-big ul .usa-footer-primary-link{background:none;margin-bottom:.8rem;padding-bottom:0;padding-left:0}}.usa-footer-big ul .usa-footer-primary-link>*{margin-top:0;margin-bottom:0}.usa-footer-big ul.hidden{padding-bottom:0}.usa-footer-big ul.hidden li{display:none}.usa-footer-big ul.hidden .usa-footer-primary-link{background-image:url(../img/arrow-right.png);background-image:url(../img/arrow-right.svg);cursor:pointer;display:block}@media screen and (min-width:600px){.usa-footer-big ul.hidden .usa-footer-primary-link{background:none;padding-left:0}}.usa-footer-topic{margin:0;padding:2rem 0}@media screen and (min-width:600px){.usa-sign_up-header{margin:0;padding:2rem 0}}.usa-footer-logo-img{max-width:8rem}@media screen and (min-width:600px){.usa-footer-logo-img{float:left}}.usa-footer-big-logo-img{max-width:10rem}.usa-footer-slim-logo-img{float:left;max-width:5rem}.usa-footer-logo-heading{display:block;margin-top:1rem}@media screen and (min-width:600px){.usa-footer-logo-heading{display:inline-block;margin-top:3rem;padding-left:1.5rem}}.usa-footer-big-logo-heading{margin-top:1.5rem}@media screen and (min-width:600px){.usa-footer-big-logo-heading{margin-top:2rem}}.usa-footer-slim-logo-heading{display:inline-block;margin-top:1.5rem;padding-left:1.5rem}.usa-footer-contact-heading{margin-top:0}@media screen and (min-width:600px){.usa-footer-contact-heading{margin-top:1rem}}.usa-link-facebook,.usa-link-rss,.usa-link-twitter,.usa-link-youtube,.usa-social_link{margin:2.5rem 1rem 1.5rem 0;background-position:50%;background-repeat:no-repeat;background-size:auto 3rem;display:inline-block;height:4.4rem;left:-1.6rem;position:relative;text-align:center;width:4.4rem}@media screen and (min-width:600px){.usa-link-facebook,.usa-link-rss,.usa-link-twitter,.usa-link-youtube,.usa-social_link{margin:0 0 0 .5rem;left:1.5rem}}.usa-link-facebook span,.usa-link-rss span,.usa-link-twitter span,.usa-link-youtube span,.usa-social_link span{position:absolute;left:-999em}.usa-link-facebook{background-image:url(../img/social-icons/png/facebook25.png);background-image:url(../img/social-icons/svg/facebook25.svg)}.usa-link-twitter{background-image:url(../img/social-icons/png/twitter16.png);background-image:url(../img/social-icons/svg/twitter16.svg)}.usa-link-youtube{background-image:url(../img/social-icons/png/youtube15.png);background-image:url(../img/social-icons/svg/youtube15.svg)}.usa-link-rss{background-image:url(../img/social-icons/png/rss25.png);background-image:url(../img/social-icons/svg/rss25.svg)}form a{border-bottom:0}form [type=submit]{display:block;margin-bottom:1.5em;margin-top:2.5rem}@media screen and (min-width:600px){form [type=submit]{padding-left:2.7em;padding-right:2.7em;width:auto}}form [name=confirmPassword],form [name=password]{margin-bottom:1.1rem}@media screen and (min-width:600px){.usa-form{max-width:32rem}}.usa-form-note{float:right;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-size:1.5rem;margin:0 0 1.5rem}.usa-form-note+*{clear:both}fieldset{border:none;margin:0;padding:0}@media screen and (min-width:600px){.usa-form-large{max-width:46rem}}@media screen and (min-width:600px){input.usa-input-tiny{max-width:6rem}}@media screen and (min-width:600px){input.usa-input-medium{max-width:12rem}}@media screen and (min-width:600px){.usa-input-grid{padding-right:5%}}@media screen and (min-width:600px){.usa-input-grid:last-of-type{padding-right:0}}@media screen and (min-width:600px){.usa-input-grid-small{float:left;width:35%}}.usa-input-grid-small input,.usa-input-grid-small select{margin-bottom:3rem}@media screen and (min-width:600px){.usa-input-grid-medium{float:left;width:65%}}.usa-input-grid-medium input,.usa-input-grid-medium select{margin-bottom:3rem}@media screen and (min-width:600px){.usa-input-grid-large{float:left;width:100%}}.usa-input-grid-large input,.usa-input-grid-large select{margin-bottom:3rem}.usa-additional_text{font-weight:400}.usa-checklist{list-style:none;margin-left:0;padding-left:0}.usa-checklist li{display:inline-block;list-style:none;margin-bottom:0;margin-top:0;padding-left:3em;text-indent:-2em}.usa-checklist li:before{content:" ";display:inline-block;height:.8em;margin-right:.2em;width:1.8em}.usa-checklist-checked:before{background-image:url(../img/correct9.png);background-image:url(../img/correct9.svg);background-position:100%;background-repeat:no-repeat;background-size:100%}.usa-graphic_list .usa-graphic_list-row .usa-media_block{margin-bottom:3rem}@media screen and (min-width:600px){.usa-graphic_list .usa-graphic_list-row .usa-media_block{margin-bottom:6rem}}@media screen and (min-width:600px){.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block{margin-bottom:0}}.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block:last-child{margin-bottom:0}.usa-graphic_list .usa-media_block-img{margin-right:3rem}.usa-graphic_list .usa-media_block-body>:first-child{margin-top:0}.usa-header{width:100%;z-index:3}@media screen and (min-width:951px){.usa-header{border-bottom:1px solid #c9c9c9}}.usa-header a{border-bottom:none}@media screen and (min-width:951px){.usa-header .usa-search{float:right;max-width:21.5rem}}.usa-logo{float:left;line-height:4rem;margin-left:1.5rem}@media screen and (min-width:951px){.usa-logo{line-height:7.5rem;margin-left:0}}.usa-logo a{color:#212121;text-decoration:none}.usa-logo br{display:none}@media screen and (min-width:951px){.usa-logo br{display:block}}.usa-logo-text{display:block;font-size:1.5rem;font-style:normal;font-weight:700;margin:0}@media screen and (min-width:951px){.usa-logo-text{display:block;font-size:2.4rem;line-height:1.3}}.usa-menu-btn{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;background-color:#0071bc;color:#fff;display:inline;float:right;font-size:1.3rem;height:4rem;line-height:4rem;text-align:center;text-decoration:none;text-transform:uppercase;width:5.8rem}.usa-menu-btn:hover{background-color:transparent}@media screen and (min-width:951px){.usa-menu-btn{display:none}}.usa-menu-btn:hover{color:#fff;background-color:#205493}.usa-menu-btn:visited{color:#fff}.usa-overlay{position:fixed;top:0;right:0;bottom:0;left:0;background:#000;opacity:0;transition:all .2s ease-in-out;visibility:hidden;z-index:4}.usa-overlay.is-visible{opacity:.1;visibility:visible}@media screen and (min-width:951px){.usa-header-basic .usa-logo{bottom:0;position:absolute}}@media screen and (min-width:951px){.usa-header-basic .usa-navbar{position:relative;width:18%}}@media screen and (min-width:951px){.usa-header-extended .usa-header{border-bottom:none}}@media screen and (min-width:951px){.usa-header-extended .usa-logo{margin-top:3rem;margin-bottom:3rem}}@media screen and (min-width:951px){.usa-header-extended em{font-size:3.2rem;line-height:1}}@media screen and (min-width:951px){.usa-header-extended .usa-navbar{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:3rem;display:block;height:auto;max-width:1040px}.usa-header-extended .usa-navbar:after{clear:both;content:"";display:block}}@media screen and (min-width:951px){.usa-header-extended .usa-nav{border-top:1px solid #c9c9c9;float:none;padding:0;width:100%}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-inner{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:1.5rem;margin-top:-1px;max-width:1040px;position:relative}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-inner:after,.usa-header-extended .usa-nav-primary:after{clear:both;content:"";display:block}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-primary button[aria-expanded=false],.usa-header-extended .usa-nav-primary button[aria-expanded=true]{background-position:right 1.5rem top 53%}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-link{padding-top:1.8rem;padding-bottom:1.8rem}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-submenu .usa-grid-full{padding-left:1.2rem}}@media screen and (min-width:951px){.usa-header-extended .usa-megamenu{padding-left:3rem}}.usa-hero{padding-top:3rem;padding-bottom:3rem;background-image:url(../img/hero.png);background-position:50%;background-size:cover}.usa-hero .usa-button{color:#fff}.usa-section-dark .usa-hero-link{color:#c64b00}.usa-hero-callout{background-color:#112e51;padding:3rem}@media screen and (min-width:481px){.usa-hero-callout{max-width:30rem}}.usa-hero-callout>:first-child{margin-top:0;margin-bottom:2rem}.usa-hero-callout-alt{color:#fff;display:block}.usa-layout-docs{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media screen and (min-width:1201px){.usa-layout-docs{display:inherit}}.usa-layout-docs .usa-grid>:first-child:not(.usa-width-*){margin-top:0}.usa-layout-docs .usa-grid>:last-child:not(.usa-width-*){margin-bottom:0}.usa-layout-docs-sidenav{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.usa-layout-docs-main_content{margin-bottom:3rem;-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}@media screen and (min-width:1201px){.usa-layout-docs-main_content{margin-bottom:0}}.usa-layout-docs-main_content>:first-child{margin-top:0}.usa-media_block-img{float:left;margin-right:1rem}.usa-media_block-body{overflow:hidden}.usa-navbar{border-bottom:1px solid #999;height:4rem}@media screen and (min-width:951px){.usa-navbar{border-bottom:none;display:inline-block;height:7.8rem}}.usa-nav-link{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}@media screen and (min-width:951px){.usa-nav-link:hover span{border-bottom:.4rem solid #0071bc;padding-bottom:.6rem}}@media screen and (min-width:951px){.usa-nav-link.usa-accordion-button span{margin-right:0;padding-right:1.5rem}}@media screen and (min-width:951px){.usa-nav-container{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:3rem;max-width:1040px}.usa-nav-container:after{clear:both;content:"";display:block}}.usa-nav{position:fixed;top:0;right:0;bottom:0;left:auto;background:#fff;border-left:1px solid #999;border-right:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;padding:2rem;-webkit-transform:translateX(26rem);transform:translateX(26rem);width:26rem;z-index:5}@media screen and (min-width:951px){.usa-nav{padding-top:4.5rem;padding-right:0;padding-bottom:0;border-left:none;display:block;float:right;overflow-y:visible;position:relative;-webkit-transform:translateX(0);transform:translateX(0);width:auto}}.usa-nav.is-visible{-webkit-transform:translateX(0);transform:translateX(0);transition:all .3s ease-in-out}.usa-nav nav{margin-top:6rem;min-height:100%}@media screen and (min-width:951px){.usa-nav nav{margin-top:0}}.usa-nav .usa-current{border-left:4px solid #0071bc;color:#0071bc;font-weight:700;padding-left:1.4rem}@media screen and (min-width:951px){.usa-nav .usa-current{color:#212121}}.usa-nav .usa-button{width:100%}@media screen and (min-width:951px){.usa-nav .usa-search{margin-left:1.5rem;top:4px}}.usa-nav-primary{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin-top:1.5rem;-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.usa-nav-primary>li{margin-bottom:0;background-color:transparent;border-top:1px solid #666;font-size:1.7rem}.usa-nav-primary>li:first-child{border-top:none}.usa-nav-primary a{border:none;color:#212121;display:block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;line-height:1.3;padding:.85rem 1rem .85rem 1.8rem;text-decoration:none}.usa-nav-primary a:hover{background-color:#e4e4e4;color:#0071bc;text-decoration:none}.usa-nav-primary a:focus{outline-offset:0;position:relative;z-index:1}.usa-nav-primary a.usa-current{border-left:.4rem solid #0071bc;color:#0071bc;font-weight:700;padding-left:1.4rem}@media screen and (min-width:951px){.usa-nav-primary{display:inline}}@media screen and (min-width:951px){.usa-nav-primary li{border-top:none}}.usa-nav-primary>li{width:auto}@media screen and (min-width:951px){.usa-nav-primary>li{display:inline-block}}@media screen and (min-width:951px){.usa-nav-primary>li>a{padding:1.3rem 1.5rem 2.2rem;color:#666;font-size:1.5rem;font-weight:700;line-height:1}}@media screen and (min-width:951px){.usa-nav-primary>li>a:hover{background-color:transparent}}@media screen and (min-width:951px){.usa-nav-primary a{padding-top:.75rem;padding-bottom:.75rem}}.usa-nav-primary button{border:0;border-radius:0;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-weight:400;line-height:1.3;padding:.85rem 1.5rem .85rem 1.8rem}.usa-nav-primary button,.usa-nav-primary button:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-primary button{padding:1.3rem 1.5rem 2.2rem;color:#666;font-size:1.5rem;font-weight:700;line-height:1;width:auto}}.usa-nav-primary button:active,.usa-nav-primary button:focus{box-shadow:2px dotted #999}.usa-nav-primary button:hover{background-color:#e4e4e4;color:#0071bc}@media screen and (min-width:951px){.usa-nav-primary button:hover{background-color:transparent}}.usa-nav-primary button[aria-expanded=false]{background-image:url(../img/plus-alt.png);background-image:url(../img/plus-alt.svg);background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=false]{background-image:url(../img/angle-arrow-down.png);background-image:url(../img/angle-arrow-down.svg);background-position:right 1.5rem top 40%}}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=false]:hover{background-image:url(../img/angle-arrow-down-primary.png);background-image:url(../img/angle-arrow-down-primary.svg)}}.usa-nav-primary button[aria-expanded=true]{background-image:url(../img/minus-alt.png);background-image:url(../img/minus-alt.svg);background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width:951px){.usa-nav-primary button[aria-expanded=true]{background-color:#112e51;color:#fff;background-image:url(../img/angle-arrow-down-hover.png);background-image:url(../img/angle-arrow-down-hover.svg);background-position:right 1.5rem top 40%}.usa-nav-primary button[aria-expanded=true]:hover{background-color:#112e51}.usa-nav-primary button[aria-expanded=true] span{border-bottom:.4rem solid #0071bc;padding-bottom:.6rem;color:#fff}}@media screen and (min-width:951px){.usa-nav-primary .usa-current,.usa-nav-primary a.usa-current{border-left:0;padding-left:1.5rem}.usa-nav-primary .usa-current:hover span,.usa-nav-primary a.usa-current:hover span{color:#0071bc}.usa-nav-primary .usa-current span,.usa-nav-primary a.usa-current span{border-bottom:.4rem solid #0071bc;padding-bottom:.6rem;color:#212121}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-link:hover span{border-bottom:.7rem solid #0071bc;padding-bottom:.9rem}}@media screen and (min-width:951px){.usa-header-extended .usa-nav-primary .usa-current span,.usa-header-extended .usa-nav-primary button[aria-expanded=true] span{border-bottom:.7rem solid #0071bc;padding-bottom:.9rem}}.usa-nav-secondary{margin-top:1.5rem}@media screen and (min-width:951px){.usa-nav-secondary{margin-top:0;position:absolute;right:3rem;top:-5.7rem}}.usa-nav-secondary .usa-search{margin-top:1.5rem;margin-bottom:0}@media screen and (min-width:951px){.usa-nav-secondary .usa-search{margin-top:-.9rem;margin-bottom:0;margin-left:0;float:left}}.usa-nav-secondary-links{margin-top:2.4rem}@media screen and (min-width:951px){.usa-nav-secondary-links{float:left;margin-top:0}}@media screen and (min-width:951px){.usa-nav-secondary-links li{display:inline;padding-left:.5rem}}@media screen and (min-width:951px){.usa-nav-secondary-links li:not(:last-child):after{color:#c9c9c9;content:"|";padding-left:.5rem}}.usa-nav-secondary-links .usa-header-search-button,.usa-nav-secondary-links a{color:#666;display:inline-block;font-size:1.5rem;text-decoration:none}.usa-nav-secondary-links .usa-header-search-button:hover,.usa-nav-secondary-links a:hover{color:#0071bc;text-decoration:underline}.usa-nav-secondary-links .usa-header-search-button{background-color:transparent;border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;display:none}.usa-nav-secondary-links .usa-header-search-button:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-secondary-links .usa-header-search-button{background-image:url(../img/search-alt.png);background-image:url(../img/search-alt.svg);background-repeat:no-repeat;background-position:0;background-size:2.2rem;display:inline-block;padding-left:2.3rem}}@media screen and (min-width:951px){.usa-nav-secondary-links .usa-header-search-button.is-hidden{display:none}}@media screen and (min-width:951px){.usa-nav-secondary-links a.usa-current{border-left:0;padding-left:0}}.usa-nav-submenu{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin:0;width:100%}.usa-nav-submenu>li{margin-bottom:0}.usa-nav-submenu li{border:none}.usa-nav-submenu a{padding-left:2.8rem;line-height:1.3}.usa-nav-submenu a.usa-current,.usa-nav-submenu a:hover{border:none;padding-left:2.8rem}.usa-nav-submenu .usa-sidenav-sub_list a{padding-left:3.8rem}.usa-nav-submenu .usa-sidenav-sub_list a:focus{outline-offset:0}.usa-nav-submenu .usa-sidenav-sub_list a:hover{padding-left:3.8rem}@media screen and (min-width:951px){.usa-nav-submenu{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;padding-top:.75rem;padding-bottom:.9rem;background-color:#112e51;width:21.5rem;position:absolute}.usa-nav-submenu>li{margin-bottom:0}}.usa-nav-submenu[aria-hidden=true]{display:none}@media screen and (min-width:951px){.usa-nav-submenu a,.usa-nav-submenu a:hover{color:#fff;padding-left:1.5rem}.usa-nav-submenu a:hover{background-color:#112e51;text-decoration:underline}}.usa-nav-submenu li{font-size:1.5rem;margin-bottom:0}.usa-nav-close{border:0;border-radius:0;font-weight:400;margin:0;padding:0;text-align:left;-webkit-font-smoothing:auto;margin:-1.2rem -1.5rem 1.5rem auto;float:right;height:4.4rem;text-align:center;width:4.4rem}.usa-nav-close,.usa-nav-close:hover{background-color:transparent}@media screen and (min-width:951px){.usa-nav-close{display:none}}.usa-nav-close img{width:1.3rem}.usa-nav-close+*{clear:both}.usa-mobile_nav-active{overflow:hidden}@media screen and (min-width:951px){.usa-megamenu{padding-top:3.15rem;padding-bottom:3.15rem;left:-1rem;width:100%}}@media screen and (min-width:951px){.usa-megamenu:before{right:100%}}@media screen and (min-width:951px){.usa-megamenu:after,.usa-megamenu:before{background-color:#112e51;content:"";display:block;height:100%;position:absolute;top:0;width:1000%}.usa-megamenu:after{left:100%}}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav{padding-left:0;padding-top:0;width:100%}}.usa-header-basic-megamenu .usa-nav-inner{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav-inner{display:block;float:right;margin-top:-3.8rem}}@media screen and (min-width:951px){.usa-header-basic-megamenu .usa-nav-submenu .usa-grid-full{margin-left:-1.8rem}}@media screen and (min-width:951px){.usa-megamenu-col{float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-megamenu-col:last-child{margin-right:0}.usa-megamenu-col:nth-child(2n){float:left;display:block;margin-right:2.35765%;width:23.23176%}.usa-megamenu-col:nth-child(2n):last-child,.usa-megamenu-col:nth-child(4n){margin-right:0}}.usa-megamenu-col>ul{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-megamenu-col>ul>li{margin-bottom:0}.usa-search{max-width:none;position:relative}.usa-search:after{clear:both;content:"";display:block}.usa-search .usa-search-submit,.usa-search [type=submit]{background-image:url(../img/search.png);background-image:url(../img/search.svg);background-position:50%;background-repeat:no-repeat;border-bottom-left-radius:0;border-top-left-radius:0;height:3.3rem;margin:0;padding:0;width:4.5rem}@media screen and (min-width:481px){.usa-search .usa-search-submit,.usa-search [type=submit]{background-image:none;width:8.5rem}}@media screen and (min-width:481px){.usa-search.usa-search-big .usa-search-input,.usa-search.usa-search-big [type=search]{font-size:1.7rem;height:4.4rem;width:calc(100% - 11.6rem)}.usa-search.usa-search-big .usa-search-submit,.usa-search.usa-search-big [type=submit]{font-size:2rem;height:4.4rem;width:11.6rem}}@media screen and (min-width:481px){.usa-search.usa-search-small .usa-search-input,.usa-search.usa-search-small [type=search]{width:calc(100% - 4.5rem)}.usa-search.usa-search-small .usa-search-submit,.usa-search.usa-search-small [type=submit]{background-image:url(../img/search.png);background-image:url(../img/search.svg);background-position:50%;background-repeat:no-repeat;width:4.5rem}}@media screen and (max-width:950px){.usa-search.usa-search-small.usa-sr-only{left:auto;position:relative}}input[type=search]{box-sizing:border-box;-webkit-appearance:none}.usa-search-input,[type=search]{padding-top:0;padding-bottom:0;border-bottom-right-radius:0;border-right:none;border-top-right-radius:0;box-sizing:border-box;float:left;font-size:1.4rem;height:3.3rem;margin:0;width:calc(100% - 4.5rem)}@media screen and (min-width:481px){.usa-search-input,[type=search]{width:calc(100% - 8.5rem)}}.usa-search-submit-text{position:absolute;left:-999em}@media screen and (min-width:481px){.usa-search-submit-text{position:static}}.usa-section{padding-top:3rem;padding-bottom:3rem}@media screen and (min-width:600px){.usa-section{padding-top:6rem;padding-bottom:6rem}}.usa-section-light{background-color:#e4e4e4}.usa-section-dark{background-color:#112e51;color:#fff}.usa-section-dark h1,.usa-section-dark h2,.usa-section-dark h3,.usa-section-dark h4,.usa-section-dark h5,.usa-section-dark h6{color:#c64b00}.usa-section-dark p{color:#fff}.usa-section-dark a{color:#c9c9c9}.usa-section-dark a:hover{color:#fff}.usa-sidenav-list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0}.usa-sidenav-list>li{margin-bottom:0;background-color:transparent;border-top:1px solid #666;font-size:1.7rem}.usa-sidenav-list>li:first-child{border-top:none}.usa-sidenav-list a{border:none;color:#212121;display:block;font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;line-height:1.3;padding:.85rem 1rem .85rem 1.8rem;text-decoration:none}.usa-sidenav-list a:hover{background-color:#e4e4e4;color:#0071bc;text-decoration:none}.usa-sidenav-list a:focus{outline-offset:0;position:relative;z-index:1}.usa-sidenav-list a.usa-current{border-left:.4rem solid #0071bc;color:#0071bc;font-weight:700;padding-left:1.4rem}.usa-sidenav-sub_list{margin-top:0;margin-bottom:0;list-style-type:none;padding-left:0;margin:0;width:100%}.usa-sidenav-sub_list>li{margin-bottom:0}.usa-sidenav-sub_list li{border:none;font-size:1.5rem}.usa-sidenav-sub_list a{padding-left:2.8rem;line-height:1.3}.usa-sidenav-sub_list a.usa-current,.usa-sidenav-sub_list a:hover{border:none;padding-left:2.8rem}.usa-sidenav-sub_list .usa-sidenav-sub_list a{padding-left:3.8rem}.usa-sidenav-sub_list .usa-sidenav-sub_list a:focus{outline-offset:0}.usa-sidenav-sub_list .usa-sidenav-sub_list a:hover{padding-left:3.8rem}.usa-skipnav{background:transparent;color:#212121;padding:1rem 1.5rem;top:-4.2rem;z-index:2}.usa-skipnav,.usa-skipnav:focus{left:0;position:absolute;transition:all .2s ease-in-out}.usa-skipnav:focus{background:#fff;outline:0;top:0}h1,h2,h3,h4,h5,h6{font-family:Source Sans Pro,Helvetica Neue,Helvetica,Roboto,Arial,sans-serif;font-weight:700}article.aggregator-item .field--name-fid a,h3.feed-item-title a{text-decoration:none;color:#0071bc}.region-sidebar-first,.region-sidebar-second,.uswds-middle-section{background-color:#e7f5ff}.view-nsf-blog article.aggregator-item{background-color:#fff;padding:2rem;padding-top:.2rem;margin-bottom:3rem}.region-sidebar-second{float:right;padding:1.25rem}.region-sidebar-second h4{text-transform:uppercase;color:#999;font-weight:400}.usa-accordion,.usa-accordion-bordered,.usa-sidenav-list a,input,p,select.form-select,textarea{color:#666}.usa-nav-primary .usa-current span,.usa-nav-primary .usa-nav-link,.usa-nav-primary a.usa-current span,.usa-nav-primary a.usa-nav-link{color:#3e94cf}.filter-wrapper{display:none}.usa-form-large{max-width:none}form [type=submit]{display:inline-block}textarea{height:auto}label{margin-top:1rem}input,select,textarea{max-width:none}#block-nsf-views-block-news-block-1 ul{margin:0 auto;text-align:center}#block-nsf-views-block-news-block-1 li{display:inline-block;vertical-align:top}img.image-style-news-main-story{max-width:none}.usa-header-basic .usa-logo{top:0;bottom:auto}.usa-header-basic .usa-logo img{max-width:none}.usa-navbar em.usa-logo-text{margin-left:-5000em}.region-footer-menu li.usa-footer-primary-link{pointer-events:none}
 /*# sourceMappingURL=uswds.min.css.map */
\ No newline at end of file
diff --git a/web/themes/nsf/assets/css/uswds.min.css.map b/web/themes/nsf/assets/css/uswds.min.css.map
index 5bb3d03..05f816b 100644
--- a/web/themes/nsf/assets/css/uswds.min.css.map
+++ b/web/themes/nsf/assets/css/uswds.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["stdin"],"names":[],"mappings":"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","file":"uswds.min.css","sourcesContent":["/*! uswds @version */\nhtml {\n  box-sizing: border-box; }\n\n*, *::after, *::before {\n  box-sizing: inherit; }\n\n/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */\n/**\n * 1. Set default font family to sans-serif.\n * 2. Prevent iOS and IE text size adjust after device orientation change,\n *    without disabling user zoom.\n */\nhtml {\n  font-family: sans-serif;\n  /* 1 */\n  -ms-text-size-adjust: 100%;\n  /* 2 */\n  -webkit-text-size-adjust: 100%;\n  /* 2 */ }\n\n/**\n * Remove default margin.\n */\nbody {\n  margin: 0; }\n\n/* HTML5 display definitions\n   ========================================================================== */\n/**\n * Correct `block` display not defined for any HTML5 element in IE 8/9.\n * Correct `block` display not defined for `details` or `summary` in IE 10/11\n * and Firefox.\n * Correct `block` display not defined for `main` in IE 11.\n */\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n  display: block; }\n\n/**\n * 1. Correct `inline-block` display not defined in IE 8/9.\n * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.\n */\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block;\n  /* 1 */\n  vertical-align: baseline;\n  /* 2 */ }\n\n/**\n * Prevent modern browsers from displaying `audio` without controls.\n * Remove excess height in iOS 5 devices.\n */\naudio:not([controls]) {\n  display: none;\n  height: 0; }\n\n/**\n * Address `[hidden]` styling not present in IE 8/9/10.\n * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.\n */\n[hidden],\ntemplate {\n  display: none; }\n\n/* Links\n   ========================================================================== */\n/**\n * Remove the gray background color from active links in IE 10.\n */\na {\n  background-color: transparent; }\n\n/**\n * Improve readability of focused elements when they are also in an\n * active/hover state.\n */\na:active,\na:hover {\n  outline: 0; }\n\n/* Text-level semantics\n   ========================================================================== */\n/**\n * Address styling not present in IE 8/9/10/11, Safari, and Chrome.\n */\nabbr[title] {\n  border-bottom: 1px dotted; }\n\n/**\n * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.\n */\nb,\nstrong {\n  font-weight: bold; }\n\n/**\n * Address styling not present in Safari and Chrome.\n */\ndfn {\n  font-style: italic; }\n\n/**\n * Address variable `h1` font-size and margin within `section` and `article`\n * contexts in Firefox 4+, Safari, and Chrome.\n */\nh1 {\n  font-size: 2em;\n  margin: 0.67em 0; }\n\n/**\n * Address styling not present in IE 8/9.\n */\nmark {\n  background: #ff0;\n  color: #000; }\n\n/**\n * Address inconsistent and variable font size in all browsers.\n */\nsmall {\n  font-size: 80%; }\n\n/**\n * Prevent `sub` and `sup` affecting `line-height` in all browsers.\n */\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline; }\n\nsup {\n  top: -0.5em; }\n\nsub {\n  bottom: -0.25em; }\n\n/* Embedded content\n   ========================================================================== */\n/**\n * Remove border when inside `a` element in IE 8/9/10.\n */\nimg {\n  border: 0; }\n\n/**\n * Correct overflow not hidden in IE 9/10/11.\n */\nsvg:not(:root) {\n  overflow: hidden; }\n\n/* Grouping content\n   ========================================================================== */\n/**\n * Address margin not present in IE 8/9 and Safari.\n */\nfigure {\n  margin: 1em 40px; }\n\n/**\n * Address differences between Firefox and other browsers.\n */\nhr {\n  box-sizing: content-box;\n  height: 0; }\n\n/**\n * Contain overflow in all browsers.\n */\npre {\n  overflow: auto; }\n\n/**\n * Address odd `em`-unit font size rendering in all browsers.\n */\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em; }\n\n/* Forms\n   ========================================================================== */\n/**\n * Known limitation: by default, Chrome and Safari on OS X allow very limited\n * styling of `select`, unless a `border` property is set.\n */\n/**\n * 1. Correct color not being inherited.\n *    Known issue: affects color of disabled elements.\n * 2. Correct font properties not being inherited.\n * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.\n */\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  color: inherit;\n  /* 1 */\n  font: inherit;\n  /* 2 */\n  margin: 0;\n  /* 3 */ }\n\n/**\n * Address `overflow` set to `hidden` in IE 8/9/10/11.\n */\nbutton {\n  overflow: visible; }\n\n/**\n * Address inconsistent `text-transform` inheritance for `button` and `select`.\n * All other form control elements do not inherit `text-transform` values.\n * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.\n * Correct `select` style inheritance in Firefox.\n */\nbutton,\nselect {\n  text-transform: none; }\n\n/**\n * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`\n *    and `video` controls.\n * 2. Correct inability to style clickable `input` types in iOS.\n * 3. Improve usability and consistency of cursor style between image-type\n *    `input` and others.\n */\nbutton,\nhtml input[type=\"button\"],\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button;\n  /* 2 */\n  cursor: pointer;\n  /* 3 */ }\n\n/**\n * Re-set default cursor for disabled elements.\n */\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default; }\n\n/**\n * Remove inner padding and border in Firefox 4+.\n */\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  border: 0;\n  padding: 0; }\n\n/**\n * Address Firefox 4+ setting `line-height` on `input` using `!important` in\n * the UA stylesheet.\n */\ninput {\n  line-height: normal; }\n\n/**\n * It's recommended that you don't attempt to style these elements.\n * Firefox's implementation doesn't respect box-sizing, padding, or width.\n *\n * 1. Address box sizing set to `content-box` in IE 8/9/10.\n * 2. Remove excess padding in IE 8/9/10.\n */\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  box-sizing: border-box;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Fix the cursor style for Chrome's increment/decrement buttons. For certain\n * `font-size` values of the `input`, it causes the cursor style of the\n * decrement button to change from `default` to `text`.\n */\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto; }\n\n/**\n * 1. Address `appearance` set to `searchfield` in Safari and Chrome.\n * 2. Address `box-sizing` set to `border-box` in Safari and Chrome.\n */\ninput[type=\"search\"] {\n  -webkit-appearance: textfield;\n  /* 1 */\n  box-sizing: content-box;\n  /* 2 */ }\n\n/**\n * Remove inner padding and search cancel button in Safari and Chrome on OS X.\n * Safari (but not Chrome) clips the cancel button when the search input has\n * padding (and `textfield` appearance).\n */\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none; }\n\n/**\n * Define consistent border, margin, and padding.\n */\nfieldset {\n  border: 1px solid #c0c0c0;\n  margin: 0 2px;\n  padding: 0.35em 0.625em 0.75em; }\n\n/**\n * 1. Correct `color` not being inherited in IE 8/9/10/11.\n * 2. Remove padding so people aren't caught out if they zero out fieldsets.\n */\nlegend {\n  border: 0;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Remove default vertical scrollbar in IE 8/9/10/11.\n */\ntextarea {\n  overflow: auto; }\n\n/**\n * Don't inherit the `font-weight` (applied by a rule above).\n * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.\n */\noptgroup {\n  font-weight: bold; }\n\n/* Tables\n   ========================================================================== */\n/**\n * Remove most spacing between table cells.\n */\ntable {\n  border-collapse: collapse;\n  border-spacing: 0; }\n\ntd,\nth {\n  padding: 0; }\n\n/* stylelint-disable at-rule-empty-line-before */\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/sourcesanspro-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-light-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/sourcesanspro-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-bold-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/merriweather-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-light-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/merriweather-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-bold-webfont.ttf\") format(\"truetype\"); }\n\n/* stylelint-enable */\n.usa-grid,\n.usa-grid-full {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  max-width: 1040px; }\n  .usa-grid::after,\n  .usa-grid-full::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n\n.usa-grid {\n  padding-right: 1.5rem;\n  padding-left: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-grid {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-grid-full {\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 31.76157%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 65.88078%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-width-one-fourth:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-width-one-fourth:nth-child(4n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 74.41059%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 14.70196%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 14.70196%; }\n      .usa-width-one-sixth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-sixth:nth-child(6n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 82.94039%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 6.17215%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 6.17215%; }\n      .usa-width-one-twelfth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(12n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 40.29137%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 57.35098%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n.usa-end-row {\n  margin-right: 0; }\n\n.usa-offset-one-twelfth {\n  margin-left: 8.5298%; }\n\n.usa-offset-one-sixth {\n  margin-left: 17.05961%; }\n\n.usa-offset-one-fourth {\n  margin-left: 25.58941%; }\n\n.usa-offset-one-third {\n  margin-left: 34.11922%; }\n\n.usa-offset-five-twelfths {\n  margin-left: 42.64902%; }\n\n.usa-offset-one-half {\n  margin-left: 51.17883%; }\n\n.usa-offset-seven-twelfths {\n  margin-left: 59.70863%; }\n\n.usa-offset-two-thirds {\n  margin-left: 68.23843%; }\n\n.usa-offset-three-fourths {\n  margin-left: 76.76824%; }\n\n.usa-offset-five-sixths {\n  margin-left: 85.29804%; }\n\n.usa-offset-eleven-twelfths {\n  margin-left: 93.82785%; }\n\n.usa-sr-only {\n  position: absolute;\n  left: -999em; }\n\nhtml {\n  box-sizing: border-box; }\n\n*,\n*::before,\n*::after {\n  box-sizing: inherit; }\n\nbody {\n  background-color: #ffffff;\n  overflow-x: hidden; }\n\n.lt-ie9 * {\n  filter: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n[hidden] {\n  display: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n*:focus,\n.usa-focus {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n/* stylelint-disable selector-no-qualifying-type */\n.usa-button,\n.usa-button-primary,\n.usa-button:visited,\n.usa-button-primary:visited,\nbutton,\n[type=button],\n[type=submit],\n[type=reset],\n[type=image] {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased;\n  margin-top: 0.5em;\n  margin-right: 0.5em;\n  margin-bottom: 0.5em;\n  appearance: none;\n  background-color: #0071BC;\n  border: 0;\n  border-radius: 5px;\n  color: #ffffff;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.7rem;\n  font-weight: 700;\n  line-height: 1;\n  padding: 1rem 2rem;\n  text-align: center;\n  text-decoration: none;\n  width: 100%; }\n  @media screen and (min-width: 481px) {\n    .usa-button,\n    .usa-button-primary,\n    .usa-button:visited,\n    .usa-button-primary:visited,\n    button,\n    [type=button],\n    [type=submit],\n    [type=reset],\n    [type=image] {\n      width: auto; } }\n  .usa-button:hover, .usa-button.usa-button-hover,\n  .usa-button-primary:hover,\n  .usa-button-primary.usa-button-hover,\n  .usa-button:visited:hover,\n  .usa-button:visited.usa-button-hover,\n  .usa-button-primary:visited:hover,\n  .usa-button-primary:visited.usa-button-hover,\n  button:hover,\n  button.usa-button-hover,\n  [type=button]:hover,\n  [type=button].usa-button-hover,\n  [type=submit]:hover,\n  [type=submit].usa-button-hover,\n  [type=reset]:hover,\n  [type=reset].usa-button-hover,\n  [type=image]:hover,\n  [type=image].usa-button-hover {\n    background-color: #205493;\n    border-bottom: 0;\n    color: #ffffff;\n    text-decoration: none; }\n  .usa-button:active, .usa-button.usa-button-active,\n  .usa-button-primary:active,\n  .usa-button-primary.usa-button-active,\n  .usa-button:visited:active,\n  .usa-button:visited.usa-button-active,\n  .usa-button-primary:visited:active,\n  .usa-button-primary:visited.usa-button-active,\n  button:active,\n  button.usa-button-active,\n  [type=button]:active,\n  [type=button].usa-button-active,\n  [type=submit]:active,\n  [type=submit].usa-button-active,\n  [type=reset]:active,\n  [type=reset].usa-button-active,\n  [type=image]:active,\n  [type=image].usa-button-active {\n    background-color: #112E51; }\n  .usa-button.usa-button-primary-alt,\n  .usa-button-primary.usa-button-primary-alt,\n  .usa-button:visited.usa-button-primary-alt,\n  .usa-button-primary:visited.usa-button-primary-alt,\n  button.usa-button-primary-alt,\n  [type=button].usa-button-primary-alt,\n  [type=submit].usa-button-primary-alt,\n  [type=reset].usa-button-primary-alt,\n  [type=image].usa-button-primary-alt {\n    background-color: #c64b00;\n    color: #212121; }\n    .usa-button.usa-button-primary-alt:hover, .usa-button.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary.usa-button-primary-alt:hover,\n    .usa-button-primary.usa-button-primary-alt.usa-button-hover,\n    .usa-button:visited.usa-button-primary-alt:hover,\n    .usa-button:visited.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary:visited.usa-button-primary-alt:hover,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-hover,\n    button.usa-button-primary-alt:hover,\n    button.usa-button-primary-alt.usa-button-hover,\n    [type=button].usa-button-primary-alt:hover,\n    [type=button].usa-button-primary-alt.usa-button-hover,\n    [type=submit].usa-button-primary-alt:hover,\n    [type=submit].usa-button-primary-alt.usa-button-hover,\n    [type=reset].usa-button-primary-alt:hover,\n    [type=reset].usa-button-primary-alt.usa-button-hover,\n    [type=image].usa-button-primary-alt:hover,\n    [type=image].usa-button-primary-alt.usa-button-hover {\n      background-color: #046b99; }\n    .usa-button.usa-button-primary-alt:active, .usa-button.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary.usa-button-primary-alt:active,\n    .usa-button-primary.usa-button-primary-alt.usa-button-active,\n    .usa-button:visited.usa-button-primary-alt:active,\n    .usa-button:visited.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary:visited.usa-button-primary-alt:active,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-active,\n    button.usa-button-primary-alt:active,\n    button.usa-button-primary-alt.usa-button-active,\n    [type=button].usa-button-primary-alt:active,\n    [type=button].usa-button-primary-alt.usa-button-active,\n    [type=submit].usa-button-primary-alt:active,\n    [type=submit].usa-button-primary-alt.usa-button-active,\n    [type=reset].usa-button-primary-alt:active,\n    [type=reset].usa-button-primary-alt.usa-button-active,\n    [type=image].usa-button-primary-alt:active,\n    [type=image].usa-button-primary-alt.usa-button-active {\n      background-color: #046b99;\n      color: #ffffff; }\n  .usa-button.usa-button-secondary,\n  .usa-button-primary.usa-button-secondary,\n  .usa-button:visited.usa-button-secondary,\n  .usa-button-primary:visited.usa-button-secondary,\n  button.usa-button-secondary,\n  [type=button].usa-button-secondary,\n  [type=submit].usa-button-secondary,\n  [type=reset].usa-button-secondary,\n  [type=image].usa-button-secondary {\n    background-color: #ffffff;\n    box-shadow: inset 0 0 0 2px #0071BC;\n    color: #0071BC; }\n    .usa-button.usa-button-secondary:hover, .usa-button.usa-button-secondary.usa-button-hover,\n    .usa-button-primary.usa-button-secondary:hover,\n    .usa-button-primary.usa-button-secondary.usa-button-hover,\n    .usa-button:visited.usa-button-secondary:hover,\n    .usa-button:visited.usa-button-secondary.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary:hover,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-hover,\n    button.usa-button-secondary:hover,\n    button.usa-button-secondary.usa-button-hover,\n    [type=button].usa-button-secondary:hover,\n    [type=button].usa-button-secondary.usa-button-hover,\n    [type=submit].usa-button-secondary:hover,\n    [type=submit].usa-button-secondary.usa-button-hover,\n    [type=reset].usa-button-secondary:hover,\n    [type=reset].usa-button-secondary.usa-button-hover,\n    [type=image].usa-button-secondary:hover,\n    [type=image].usa-button-secondary.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #205493;\n      color: #205493; }\n    .usa-button.usa-button-secondary:active, .usa-button.usa-button-secondary.usa-button-active,\n    .usa-button-primary.usa-button-secondary:active,\n    .usa-button-primary.usa-button-secondary.usa-button-active,\n    .usa-button:visited.usa-button-secondary:active,\n    .usa-button:visited.usa-button-secondary.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary:active,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-active,\n    button.usa-button-secondary:active,\n    button.usa-button-secondary.usa-button-active,\n    [type=button].usa-button-secondary:active,\n    [type=button].usa-button-secondary.usa-button-active,\n    [type=submit].usa-button-secondary:active,\n    [type=submit].usa-button-secondary.usa-button-active,\n    [type=reset].usa-button-secondary:active,\n    [type=reset].usa-button-secondary.usa-button-active,\n    [type=image].usa-button-secondary:active,\n    [type=image].usa-button-secondary.usa-button-active {\n      box-shadow: inset 0 0 0 2px #112E51;\n      color: #112E51; }\n  .usa-button.usa-button-secondary-inverse, .usa-button.usa-button-outline-inverse,\n  .usa-button-primary.usa-button-secondary-inverse,\n  .usa-button-primary.usa-button-outline-inverse,\n  .usa-button:visited.usa-button-secondary-inverse,\n  .usa-button:visited.usa-button-outline-inverse,\n  .usa-button-primary:visited.usa-button-secondary-inverse,\n  .usa-button-primary:visited.usa-button-outline-inverse,\n  button.usa-button-secondary-inverse,\n  button.usa-button-outline-inverse,\n  [type=button].usa-button-secondary-inverse,\n  [type=button].usa-button-outline-inverse,\n  [type=submit].usa-button-secondary-inverse,\n  [type=submit].usa-button-outline-inverse,\n  [type=reset].usa-button-secondary-inverse,\n  [type=reset].usa-button-outline-inverse,\n  [type=image].usa-button-secondary-inverse,\n  [type=image].usa-button-outline-inverse {\n    background: transparent;\n    box-shadow: inset 0 0 0 2px #ffffff;\n    color: #ffffff; }\n    .usa-button.usa-button-secondary-inverse:hover, .usa-button.usa-button-secondary-inverse.usa-button-hover, .usa-button.usa-button-outline-inverse:hover, .usa-button.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-secondary-inverse:hover,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-outline-inverse:hover,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-secondary-inverse:hover,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-outline-inverse:hover,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse:hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-outline-inverse:hover,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,\n    button.usa-button-secondary-inverse:hover,\n    button.usa-button-secondary-inverse.usa-button-hover,\n    button.usa-button-outline-inverse:hover,\n    button.usa-button-outline-inverse.usa-button-hover,\n    [type=button].usa-button-secondary-inverse:hover,\n    [type=button].usa-button-secondary-inverse.usa-button-hover,\n    [type=button].usa-button-outline-inverse:hover,\n    [type=button].usa-button-outline-inverse.usa-button-hover,\n    [type=submit].usa-button-secondary-inverse:hover,\n    [type=submit].usa-button-secondary-inverse.usa-button-hover,\n    [type=submit].usa-button-outline-inverse:hover,\n    [type=submit].usa-button-outline-inverse.usa-button-hover,\n    [type=reset].usa-button-secondary-inverse:hover,\n    [type=reset].usa-button-secondary-inverse.usa-button-hover,\n    [type=reset].usa-button-outline-inverse:hover,\n    [type=reset].usa-button-outline-inverse.usa-button-hover,\n    [type=image].usa-button-secondary-inverse:hover,\n    [type=image].usa-button-secondary-inverse.usa-button-hover,\n    [type=image].usa-button-outline-inverse:hover,\n    [type=image].usa-button-outline-inverse.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #c9c9c9;\n      color: #c9c9c9; }\n    .usa-button.usa-button-secondary-inverse:active, .usa-button.usa-button-secondary-inverse.usa-button-active, .usa-button.usa-button-outline-inverse:active, .usa-button.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary.usa-button-secondary-inverse:active,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary.usa-button-outline-inverse:active,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-active,\n    .usa-button:visited.usa-button-secondary-inverse:active,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button:visited.usa-button-outline-inverse:active,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary-inverse:active,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-outline-inverse:active,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,\n    button.usa-button-secondary-inverse:active,\n    button.usa-button-secondary-inverse.usa-button-active,\n    button.usa-button-outline-inverse:active,\n    button.usa-button-outline-inverse.usa-button-active,\n    [type=button].usa-button-secondary-inverse:active,\n    [type=button].usa-button-secondary-inverse.usa-button-active,\n    [type=button].usa-button-outline-inverse:active,\n    [type=button].usa-button-outline-inverse.usa-button-active,\n    [type=submit].usa-button-secondary-inverse:active,\n    [type=submit].usa-button-secondary-inverse.usa-button-active,\n    [type=submit].usa-button-outline-inverse:active,\n    [type=submit].usa-button-outline-inverse.usa-button-active,\n    [type=reset].usa-button-secondary-inverse:active,\n    [type=reset].usa-button-secondary-inverse.usa-button-active,\n    [type=reset].usa-button-outline-inverse:active,\n    [type=reset].usa-button-outline-inverse.usa-button-active,\n    [type=image].usa-button-secondary-inverse:active,\n    [type=image].usa-button-secondary-inverse.usa-button-active,\n    [type=image].usa-button-outline-inverse:active,\n    [type=image].usa-button-outline-inverse.usa-button-active {\n      box-shadow: inset 0 0 0 2px #999999;\n      color: #c9c9c9; }\n  .usa-button.usa-button-gray,\n  .usa-button-primary.usa-button-gray,\n  .usa-button:visited.usa-button-gray,\n  .usa-button-primary:visited.usa-button-gray,\n  button.usa-button-gray,\n  [type=button].usa-button-gray,\n  [type=submit].usa-button-gray,\n  [type=reset].usa-button-gray,\n  [type=image].usa-button-gray {\n    background-color: #666666; }\n    .usa-button.usa-button-gray:hover, .usa-button.usa-button-gray.usa-button-hover,\n    .usa-button-primary.usa-button-gray:hover,\n    .usa-button-primary.usa-button-gray.usa-button-hover,\n    .usa-button:visited.usa-button-gray:hover,\n    .usa-button:visited.usa-button-gray.usa-button-hover,\n    .usa-button-primary:visited.usa-button-gray:hover,\n    .usa-button-primary:visited.usa-button-gray.usa-button-hover,\n    button.usa-button-gray:hover,\n    button.usa-button-gray.usa-button-hover,\n    [type=button].usa-button-gray:hover,\n    [type=button].usa-button-gray.usa-button-hover,\n    [type=submit].usa-button-gray:hover,\n    [type=submit].usa-button-gray.usa-button-hover,\n    [type=reset].usa-button-gray:hover,\n    [type=reset].usa-button-gray.usa-button-hover,\n    [type=image].usa-button-gray:hover,\n    [type=image].usa-button-gray.usa-button-hover {\n      background-color: #333333; }\n    .usa-button.usa-button-gray:active, .usa-button.usa-button-gray.usa-button-active,\n    .usa-button-primary.usa-button-gray:active,\n    .usa-button-primary.usa-button-gray.usa-button-active,\n    .usa-button:visited.usa-button-gray:active,\n    .usa-button:visited.usa-button-gray.usa-button-active,\n    .usa-button-primary:visited.usa-button-gray:active,\n    .usa-button-primary:visited.usa-button-gray.usa-button-active,\n    button.usa-button-gray:active,\n    button.usa-button-gray.usa-button-active,\n    [type=button].usa-button-gray:active,\n    [type=button].usa-button-gray.usa-button-active,\n    [type=submit].usa-button-gray:active,\n    [type=submit].usa-button-gray.usa-button-active,\n    [type=reset].usa-button-gray:active,\n    [type=reset].usa-button-gray.usa-button-active,\n    [type=image].usa-button-gray:active,\n    [type=image].usa-button-gray.usa-button-active {\n      background-color: #212121; }\n  .usa-button.usa-button-red,\n  .usa-button-primary.usa-button-red,\n  .usa-button:visited.usa-button-red,\n  .usa-button-primary:visited.usa-button-red,\n  button.usa-button-red,\n  [type=button].usa-button-red,\n  [type=submit].usa-button-red,\n  [type=reset].usa-button-red,\n  [type=image].usa-button-red {\n    background-color: #005495; }\n    .usa-button.usa-button-red:hover, .usa-button.usa-button-red.usa-button-hover,\n    .usa-button-primary.usa-button-red:hover,\n    .usa-button-primary.usa-button-red.usa-button-hover,\n    .usa-button:visited.usa-button-red:hover,\n    .usa-button:visited.usa-button-red.usa-button-hover,\n    .usa-button-primary:visited.usa-button-red:hover,\n    .usa-button-primary:visited.usa-button-red.usa-button-hover,\n    button.usa-button-red:hover,\n    button.usa-button-red.usa-button-hover,\n    [type=button].usa-button-red:hover,\n    [type=button].usa-button-red.usa-button-hover,\n    [type=submit].usa-button-red:hover,\n    [type=submit].usa-button-red.usa-button-hover,\n    [type=reset].usa-button-red:hover,\n    [type=reset].usa-button-red.usa-button-hover,\n    [type=image].usa-button-red:hover,\n    [type=image].usa-button-red.usa-button-hover {\n      background-color: #981b1e; }\n    .usa-button.usa-button-red:active, .usa-button.usa-button-red.usa-button-active,\n    .usa-button-primary.usa-button-red:active,\n    .usa-button-primary.usa-button-red.usa-button-active,\n    .usa-button:visited.usa-button-red:active,\n    .usa-button:visited.usa-button-red.usa-button-active,\n    .usa-button-primary:visited.usa-button-red:active,\n    .usa-button-primary:visited.usa-button-red.usa-button-active,\n    button.usa-button-red:active,\n    button.usa-button-red.usa-button-active,\n    [type=button].usa-button-red:active,\n    [type=button].usa-button-red.usa-button-active,\n    [type=submit].usa-button-red:active,\n    [type=submit].usa-button-red.usa-button-active,\n    [type=reset].usa-button-red:active,\n    [type=reset].usa-button-red.usa-button-active,\n    [type=image].usa-button-red:active,\n    [type=image].usa-button-red.usa-button-active {\n      background-color: #cd2026; }\n  .usa-button.usa-button-big,\n  .usa-button-primary.usa-button-big,\n  .usa-button:visited.usa-button-big,\n  .usa-button-primary:visited.usa-button-big,\n  button.usa-button-big,\n  [type=button].usa-button-big,\n  [type=submit].usa-button-big,\n  [type=reset].usa-button-big,\n  [type=image].usa-button-big {\n    border-radius: 8px;\n    font-size: 2.4rem;\n    padding: 1.5rem 3rem; }\n  .usa-button:disabled,\n  .usa-button-primary:disabled,\n  .usa-button:visited:disabled,\n  .usa-button-primary:visited:disabled,\n  button:disabled,\n  [type=button]:disabled,\n  [type=submit]:disabled,\n  [type=reset]:disabled,\n  [type=image]:disabled {\n    background-color: #c9c9c9;\n    pointer-events: none; }\n    .usa-button:disabled:hover, .usa-button:disabled.usa-button-hover, .usa-button:disabled:active, .usa-button:disabled.usa-button-active, .usa-button:disabled:focus, .usa-button:disabled.usa-focus,\n    .usa-button-primary:disabled:hover,\n    .usa-button-primary:disabled.usa-button-hover,\n    .usa-button-primary:disabled:active,\n    .usa-button-primary:disabled.usa-button-active,\n    .usa-button-primary:disabled:focus,\n    .usa-button-primary:disabled.usa-focus,\n    .usa-button:visited:disabled:hover,\n    .usa-button:visited:disabled.usa-button-hover,\n    .usa-button:visited:disabled:active,\n    .usa-button:visited:disabled.usa-button-active,\n    .usa-button:visited:disabled:focus,\n    .usa-button:visited:disabled.usa-focus,\n    .usa-button-primary:visited:disabled:hover,\n    .usa-button-primary:visited:disabled.usa-button-hover,\n    .usa-button-primary:visited:disabled:active,\n    .usa-button-primary:visited:disabled.usa-button-active,\n    .usa-button-primary:visited:disabled:focus,\n    .usa-button-primary:visited:disabled.usa-focus,\n    button:disabled:hover,\n    button:disabled.usa-button-hover,\n    button:disabled:active,\n    button:disabled.usa-button-active,\n    button:disabled:focus,\n    button:disabled.usa-focus,\n    [type=button]:disabled:hover,\n    [type=button]:disabled.usa-button-hover,\n    [type=button]:disabled:active,\n    [type=button]:disabled.usa-button-active,\n    [type=button]:disabled:focus,\n    [type=button]:disabled.usa-focus,\n    [type=submit]:disabled:hover,\n    [type=submit]:disabled.usa-button-hover,\n    [type=submit]:disabled:active,\n    [type=submit]:disabled.usa-button-active,\n    [type=submit]:disabled:focus,\n    [type=submit]:disabled.usa-focus,\n    [type=reset]:disabled:hover,\n    [type=reset]:disabled.usa-button-hover,\n    [type=reset]:disabled:active,\n    [type=reset]:disabled.usa-button-active,\n    [type=reset]:disabled:focus,\n    [type=reset]:disabled.usa-focus,\n    [type=image]:disabled:hover,\n    [type=image]:disabled.usa-button-hover,\n    [type=image]:disabled:active,\n    [type=image]:disabled.usa-button-active,\n    [type=image]:disabled:focus,\n    [type=image]:disabled.usa-focus {\n      background-color: #c9c9c9;\n      border: 0;\n      box-shadow: none; }\n\n/* stylelint-disable */\n.usa-button-disabled {\n  background-color: #c9c9c9;\n  pointer-events: none; }\n  .usa-button-disabled:hover, .usa-button-disabled.usa-button-hover, .usa-button-disabled:active, .usa-button-disabled.usa-button-active, .usa-button-disabled:focus, .usa-button-disabled.usa-focus {\n    background-color: #c9c9c9;\n    border: 0;\n    box-shadow: none; }\n\n.usa-button-secondary-disabled,\n.usa-button-secondary-inverse-disabled,\n.usa-button-secondary:disabled,\n.usa-button-secondary-inverse:disabled,\n.usa-button-outline-inverse:disabled {\n  box-shadow: inset 0 0 0 2px #c9c9c9;\n  pointer-events: none;\n  color: #c9c9c9; }\n  .usa-button-secondary-disabled:hover, .usa-button-secondary-disabled.usa-button-hover, .usa-button-secondary-disabled:active, .usa-button-secondary-disabled.usa-button-active, .usa-button-secondary-disabled:focus, .usa-button-secondary-disabled.usa-focus,\n  .usa-button-secondary-inverse-disabled:hover,\n  .usa-button-secondary-inverse-disabled.usa-button-hover,\n  .usa-button-secondary-inverse-disabled:active,\n  .usa-button-secondary-inverse-disabled.usa-button-active,\n  .usa-button-secondary-inverse-disabled:focus,\n  .usa-button-secondary-inverse-disabled.usa-focus,\n  .usa-button-secondary:disabled:hover,\n  .usa-button-secondary:disabled.usa-button-hover,\n  .usa-button-secondary:disabled:active,\n  .usa-button-secondary:disabled.usa-button-active,\n  .usa-button-secondary:disabled:focus,\n  .usa-button-secondary:disabled.usa-focus,\n  .usa-button-secondary-inverse:disabled:hover,\n  .usa-button-secondary-inverse:disabled.usa-button-hover,\n  .usa-button-secondary-inverse:disabled:active,\n  .usa-button-secondary-inverse:disabled.usa-button-active,\n  .usa-button-secondary-inverse:disabled:focus,\n  .usa-button-secondary-inverse:disabled.usa-focus,\n  .usa-button-outline-inverse:disabled:hover,\n  .usa-button-outline-inverse:disabled.usa-button-hover,\n  .usa-button-outline-inverse:disabled:active,\n  .usa-button-outline-inverse:disabled.usa-button-active,\n  .usa-button-outline-inverse:disabled:focus,\n  .usa-button-outline-inverse:disabled.usa-focus {\n    background-color: #ffffff;\n    border: 0; }\n\nhtml .usa-button-secondary-disabled,\n.usa-button-secondary:disabled {\n  background-color: #ffffff; }\n\nhtml .usa-button-secondary-inverse-disabled,\n.usa-button-secondary-inverse:disabled {\n  background-color: transparent;\n  color: #666666;\n  box-shadow: inset 0 0 0 2px #666666; }\n\n.usa-button-unstyled {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto; }\n  .usa-button-unstyled:hover {\n    background-color: transparent; }\n\n.usa-embed-container iframe,\n.usa-embed-container object,\n.usa-embed-container embed {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 100%;\n  height: 100%; }\n\n.usa-embed-container {\n  padding-bottom: 56.25%;\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  max-width: 100%; }\n\nimg {\n  max-width: 100%; }\n\n.media_link {\n  display: inline-block;\n  line-height: 0; }\n\n/* stylelint-disable selector-no-qualifying-type */\ninput,\ntextarea,\nselect {\n  appearance: none;\n  border: 0.1rem solid #666666;\n  border-radius: 0;\n  box-sizing: border-box;\n  color: #212121;\n  display: block;\n  font-size: 1.7rem;\n  height: 4.4rem;\n  line-height: 1.3;\n  margin: 0.2em 0;\n  max-width: 46rem;\n  padding: 1rem 0.7em;\n  width: 100%; }\n  input.usa-input-success,\n  textarea.usa-input-success,\n  select.usa-input-success {\n    border: 3px solid #4aa564; }\n\n/* stylelint-enable */\n.usa-input-error {\n  border-left: 4px solid #981b1e;\n  margin-top: 3rem;\n  padding-bottom: 0.8rem;\n  padding-left: 1.5rem;\n  padding-top: 0.8rem;\n  position: relative;\n  right: 1.9rem; }\n  .usa-input-error input,\n  .usa-input-error textarea,\n  .usa-input-error select {\n    border: 3px solid #981b1e;\n    width: calc(100% + 1.9rem); }\n  .usa-input-error label {\n    margin-top: 0; }\n  .usa-input-error .usa-input-inline {\n    border: 0.1rem solid #666666;\n    width: inherit; }\n  .usa-input-error .usa-input-inline-error {\n    border: 3px solid #981b1e; }\n\n.usa-input-error-label {\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700; }\n\n.usa-input-error-message {\n  color: #981b1e;\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700;\n  padding-bottom: 3px;\n  padding-top: 3px; }\n\n.usa-input-required:after {\n  color: #cd2026;\n  content: ' (*required)'; }\n\n.usa-input-optional:after {\n  color: #757575;\n  content: ' (optional)'; }\n\nlabel {\n  display: block;\n  margin-top: 3rem;\n  max-width: 46rem; }\n\ntextarea {\n  height: 16rem; }\n\nselect {\n  -moz-appearance: none;\n  -webkit-appearance: none;\n  appearance: none;\n  background-color: #ffffff;\n  background-image: url(\"../img/arrow-both.png\");\n  background-image: url(\"../img/arrow-both.svg\");\n  background-position: right 1.3rem center;\n  background-repeat: no-repeat;\n  background-size: 1rem;\n  padding-right: 3rem; }\n  select::-ms-expand {\n    display: none; }\n  select:-webkit-autofill {\n    appearance: menulist; }\n  select:-moz-focusring {\n    color: transparent;\n    text-shadow: 0 0 0 #000000; }\n\noption:first-child {\n  font-weight: 700; }\n\nlegend {\n  font-size: 3rem;\n  font-weight: 700; }\n\n.usa-fieldset-inputs label {\n  margin-top: 0; }\n\n.usa-form-hint {\n  color: #757575;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0; }\n\n[type=checkbox],\n[type=radio] {\n  position: absolute;\n  left: -999em; }\n  .lt-ie9 [type=checkbox], .lt-ie9\n  [type=radio] {\n    border: 0;\n    float: left;\n    margin: 0.4em 0.4em 0 0;\n    position: static;\n    width: auto; }\n\n[type=checkbox] + label,\n[type=radio] + label {\n  cursor: pointer;\n  font-weight: 400;\n  margin-bottom: 0.65em; }\n\n[type=checkbox] + label::before,\n[type=radio] + label::before {\n  background: #ffffff;\n  border-radius: 2px;\n  box-shadow: 0 0 0 1px #757575;\n  content: '\\a0';\n  display: inline-block;\n  height: 2rem;\n  line-height: 2rem;\n  margin-right: 0.6em;\n  text-indent: 0.15em;\n  vertical-align: middle\\0;\n  width: 2rem; }\n\n[type=radio] + label::before {\n  border-radius: 100%;\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 3px #757575;\n  height: 1.4rem;\n  line-height: 1.4rem;\n  margin-right: 0.75em;\n  width: 1.4rem; }\n\n[type=checkbox]:checked + label::before,\n[type=radio]:checked + label::before {\n  background-color: #0071BC;\n  box-shadow: 0 0 0 1px #0071BC; }\n\n[type=radio]:checked + label::before {\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #0071BC; }\n\n[type=checkbox]:checked + label::before,\n[type=checkbox]:checked:disabled + label::before {\n  background-image: url(\"../img/correct8.png\");\n  background-image: url(\"../img/correct8.svg\");\n  background-position: 50%;\n  background-repeat: no-repeat; }\n\n[type=radio]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 6px; }\n\n[type=checkbox]:disabled + label {\n  color: #c9c9c9; }\n\n[type=checkbox]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n[type=checkbox]:disabled + label::before,\n[type=radio]:disabled + label::before {\n  background: #e4e4e4;\n  box-shadow: 0 0 0 1px #999999;\n  cursor: not-allowed; }\n\n[type=range] {\n  -webkit-appearance: none;\n  border: none;\n  padding-left: 0;\n  width: 100%; }\n\n[type=range]::-webkit-slider-runnable-track {\n  background: #999999;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-moz-range-track {\n  background: #0071BC;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-ms-track {\n  background: transparent;\n  color: transparent;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-webkit-slider-thumb {\n  -webkit-appearance: none;\n  border: 1px solid #757575;\n  height: 2.2rem;\n  border-radius: 1.5rem;\n  background: #e4e4e4;\n  cursor: pointer;\n  margin-top: -.65rem;\n  width: 2.2rem; }\n\n[type=range]::-moz-range-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-fill-lower {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n[type=range]::-ms-fill-upper {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n.usa-date-of-birth label {\n  margin-top: 0; }\n\n.usa-date-of-birth [type=number]::-webkit-inner-spin-button,\n.usa-date-of-birth [type=number]::-webkit-outer-spin-button {\n  -webkit-appearance: none;\n  appearance: none;\n  margin: 0; }\n\n.usa-date-of-birth [type=number] {\n  -moz-appearance: textfield; }\n\n.usa-form-group-day,\n.usa-form-group-month,\n.usa-form-group-year {\n  clear: none;\n  float: left;\n  margin-right: 1.5rem;\n  width: 5rem; }\n\n.usa-form-group-year {\n  width: 7rem; }\n\n.usa-label, .usa-label-big {\n  background-color: #666666;\n  border-radius: 2px;\n  color: #ffffff;\n  font-size: 1.5rem;\n  margin-right: 0.5rem;\n  padding: 0.1rem 0.7rem;\n  text-transform: uppercase; }\n  .usa-label:only-of-type, .usa-label-big:only-of-type {\n    margin-right: 0; }\n\n.usa-label-big {\n  font-size: 1.7rem;\n  padding-left: 0.9rem;\n  padding-right: 0.9rem; }\n\nul,\nol {\n  margin-top: 1em;\n  margin-bottom: 1em;\n  padding-left: 1.94em; }\n\nli {\n  line-height: 1.5;\n  margin-bottom: 0.5em; }\n  li:last-child {\n    margin-bottom: 0; }\n\nh1 + ul,\nh1 + ol,\nh2 + ul,\nh2 + ol,\nh3 + ul,\nh3 + ol,\nh4 + ul,\nh4 + ol,\nh5 + ul,\nh5 + ol,\nh6 + ul,\nh6 + ol,\np + ul,\np + ol {\n  margin-top: 0; }\n\n.usa-unstyled-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-unstyled-list > li {\n    margin-bottom: 0; }\n\ntable {\n  border-spacing: 0;\n  margin: 2em 0; }\n\nthead th {\n  font-weight: 700; }\n\nthead th,\nthead td {\n  background-color: #e4e4e4; }\n\nth {\n  text-align: left; }\n\nth,\ntd {\n  background-color: #ffffff;\n  border: 1px solid #666666;\n  font-weight: 400;\n  padding: 1rem 1.5rem; }\n\n.usa-table-borderless thead th {\n  background-color: transparent;\n  border-top: 0; }\n\n.usa-table-borderless th,\n.usa-table-borderless td {\n  border-left: 0;\n  border-right: 0; }\n\n.usa-table-borderless th:first-child {\n  padding-left: 0; }\n\ncaption {\n  font-size: 1.5rem;\n  font-weight: 700;\n  font-family: \"Work Sans\", sans-serif;\n  margin-bottom: 1.2rem;\n  text-align: left; }\n\nhtml {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 10px; }\n\nbody {\n  font-size: 1.7rem; }\n\np {\n  line-height: 1.5;\n  margin-bottom: 1em;\n  margin-top: 1em; }\n\na {\n  color: #0071BC;\n  text-decoration: underline; }\n  a:hover, a:active {\n    color: #205493; }\n  a:focus {\n    outline: 2px dotted #999999;\n    outline-offset: 3px; }\n  a:visited {\n    color: #4c2c92; }\n\n.usa-external_link::after {\n  background: url(\"../img/external-link.png\") no-repeat 0 0;\n  background: url(\"../img/external-link.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link:hover::after {\n  background-image: url(\"../img/external-link-hover.png\");\n  background-image: url(\"../img/external-link-hover.svg\"); }\n\n.usa-external_link-alt::after {\n  background: url(\"../img/external-link-alt.png\") no-repeat 0 0;\n  background: url(\"../img/external-link-alt.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link-alt:hover::after {\n  background-image: url(\"../img/external-link-alt-hover.png\");\n  background-image: url(\"../img/external-link-alt-hover.svg\"); }\n\nh1,\nh2,\nh3,\nh4,\nh5 {\n  clear: both;\n  font-family: \"Work Sans\", sans-serif;\n  line-height: 1.3;\n  margin-bottom: .5em;\n  margin-top: 1.5em; }\n\nh6 {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\nh1 {\n  font-size: 4rem;\n  font-weight: 700; }\n\nh2 {\n  font-size: 3rem;\n  font-weight: 700; }\n\nh3 {\n  font-size: 2rem;\n  font-weight: 700; }\n\nh4 {\n  font-size: 1.7rem;\n  font-weight: 700; }\n\nh5 {\n  font-size: 1.5rem;\n  font-weight: 700; }\n\nh6 {\n  font-size: 1.3rem;\n  font-weight: 400;\n  line-height: 1.5;\n  text-transform: uppercase; }\n\ncite,\nvar,\naddress,\ndfn {\n  font-style: normal; }\n\n.usa-content p,\n.usa-content ul:not(.usa-accordion):not(.usa-accordion-bordered),\n.usa-content ol:not(.usa-accordion):not(.usa-accordion-bordered) {\n  max-width: 66ch; }\n\n.usa-content-list {\n  max-width: 66ch; }\n\n.usa-sans p,\n.usa-sans a,\n.usa-sans li,\n.usa-sans span {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\n.usa-sans a {\n  border-bottom: none;\n  font-weight: 700; }\n\n.usa-serif p,\n.usa-serif a,\n.usa-serif li,\n.usa-serif span {\n  font-family: \"Work Sans\", sans-serif; }\n\n.usa-display {\n  font-size: 2rem;\n  font-weight: 700;\n  margin-bottom: 0; }\n  @media screen and (min-width: 481px) {\n    .usa-display {\n      font-size: 4rem;\n      font-weight: 700; } }\n  @media screen and (min-width: 600px) {\n    .usa-display {\n      font-size: 5.2rem;\n      font-weight: 700; } }\n\n.usa-font-lead {\n  font-family: \"Work Sans\", sans-serif;\n  font-size: 2rem;\n  font-weight: 400;\n  line-height: 1.7;\n  max-width: 77rem; }\n\n.usa-image-block {\n  position: relative; }\n\n.usa-image-text-block {\n  color: #ffffff;\n  left: 0;\n  margin-left: 8%;\n  position: absolute;\n  top: 0; }\n\n.usa-image-text {\n  margin-top: 0; }\n\n.usa-drop_text {\n  margin-bottom: 0; }\n\n.usa-background-dark {\n  background-color: #333333; }\n  .usa-background-dark p,\n  .usa-background-dark span {\n    color: #ffffff; }\n  .usa-background-dark a {\n    color: #c9c9c9; }\n    .usa-background-dark a:hover {\n      color: #ffffff; }\n\n.usa-text-small {\n  font-size: 1.3rem;\n  margin-top: 0; }\n\n.usa-section > :first-child,\n.usa-grid > :first-child,\n.usa-grid-full > :first-child {\n  margin-top: 0; }\n\n.usa-section > :last-child,\n.usa-grid > :last-child,\n.usa-grid-full > :last-child {\n  margin-bottom: 0; }\n\n.usa-width-one-whole:first-child > :first-child,\n.usa-width-one-half:first-child > :first-child,\n.usa-width-one-third:first-child > :first-child,\n.usa-width-two-thirds:first-child > :first-child,\n.usa-width-one-fourth:first-child > :first-child,\n.usa-width-three-fourths:first-child > :first-child,\n.usa-width-one-sixth:first-child > :first-child,\n.usa-width-five-sixths:first-child > :first-child,\n.usa-width-one-twelfth:first-child > :first-child {\n  margin-top: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :first-child,\n  .usa-width-one-half > :first-child,\n  .usa-width-one-third > :first-child,\n  .usa-width-two-thirds > :first-child,\n  .usa-width-one-fourth > :first-child,\n  .usa-width-three-fourths > :first-child,\n  .usa-width-one-sixth > :first-child,\n  .usa-width-five-sixths > :first-child,\n  .usa-width-one-twelfth > :first-child {\n    margin-top: 0; } }\n\n.usa-width-one-whole:last-child > :last-child,\n.usa-width-one-half:last-child > :last-child,\n.usa-width-one-third:last-child > :last-child,\n.usa-width-two-thirds:last-child > :last-child,\n.usa-width-one-fourth:last-child > :last-child,\n.usa-width-three-fourths:last-child > :last-child,\n.usa-width-one-sixth:last-child > :last-child,\n.usa-width-five-sixths:last-child > :last-child,\n.usa-width-one-twelfth:last-child > :last-child {\n  margin-bottom: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :last-child,\n  .usa-width-one-half > :last-child,\n  .usa-width-one-third > :last-child,\n  .usa-width-two-thirds > :last-child,\n  .usa-width-one-fourth > :last-child,\n  .usa-width-three-fourths > :last-child,\n  .usa-width-one-sixth > :last-child,\n  .usa-width-five-sixths > :last-child,\n  .usa-width-one-twelfth > :last-child {\n    margin-bottom: 0; } }\n\n.usa-accordion,\n.usa-accordion-bordered {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  color: #212121;\n  margin: 0;\n  padding: 0;\n  width: 100%; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    margin-bottom: 0; }\n  .usa-accordion > ul li ul,\n  .usa-accordion-bordered > ul li ul {\n    list-style: disc; }\n    .usa-accordion > ul li ul > li > ul,\n    .usa-accordion-bordered > ul li ul > li > ul {\n      list-style: circle; }\n      .usa-accordion > ul li ul > li > ul > li > ul,\n      .usa-accordion-bordered > ul li ul > li > ul > li > ul {\n        list-style: square; }\n  .usa-accordion + .usa-accordion,\n  .usa-accordion + .usa-accordion-bordered,\n  .usa-accordion-bordered + .usa-accordion,\n  .usa-accordion-bordered + .usa-accordion-bordered {\n    margin-top: 1rem; }\n  .usa-accordion > ul,\n  .usa-accordion-bordered > ul {\n    margin-top: 0;\n    margin-bottom: 0;\n    list-style-type: none;\n    padding-left: 0;\n    color: #212121;\n    margin: 0;\n    padding: 0;\n    width: 100%; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      margin-bottom: 0; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      background-color: #e4e4e4;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      list-style: none;\n      margin-bottom: 0.5rem;\n      width: 100%; }\n    .usa-accordion > ul button,\n    .usa-accordion-bordered > ul button {\n      background-color: transparent;\n      border: 0;\n      border-radius: 0;\n      font-weight: 400;\n      margin: 0;\n      padding: 0;\n      text-align: left;\n      -webkit-font-smoothing: auto;\n      background-color: #e4e4e4;\n      background-image: url(\"../img/minus.png\");\n      background-image: url(\"../img/minus.svg\");\n      background-position: right 2rem center;\n      background-repeat: no-repeat;\n      background-size: 1.5rem;\n      color: #212121;\n      cursor: pointer;\n      display: inline-block;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      font-weight: 700;\n      margin: 0;\n      padding: 1.5rem 5.5rem 1.5rem 2rem;\n      width: 100%; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: transparent; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: #c9c9c9;\n        color: #212121; }\n      .usa-accordion > ul button h1,\n      .usa-accordion > ul button h2,\n      .usa-accordion > ul button h3,\n      .usa-accordion > ul button h4,\n      .usa-accordion > ul button h5,\n      .usa-accordion > ul button h6,\n      .usa-accordion-bordered > ul button h1,\n      .usa-accordion-bordered > ul button h2,\n      .usa-accordion-bordered > ul button h3,\n      .usa-accordion-bordered > ul button h4,\n      .usa-accordion-bordered > ul button h5,\n      .usa-accordion-bordered > ul button h6 {\n        margin: 0; }\n    .usa-accordion > ul [aria-expanded=false],\n    .usa-accordion-bordered > ul [aria-expanded=false] {\n      background-image: url(\"../img/plus.png\");\n      background-image: url(\"../img/plus.svg\");\n      background-repeat: no-repeat;\n      background-size: 1.5rem; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    background-color: #e4e4e4;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    list-style: none;\n    margin-bottom: 0.5rem;\n    width: 100%; }\n\n.usa-accordion-bordered .usa-accordion-content {\n  border-bottom: 3px solid #e4e4e4;\n  border-left: 3px solid #e4e4e4;\n  border-right: 3px solid #e4e4e4; }\n\n.usa-accordion-content {\n  background-color: #ffffff;\n  overflow: auto;\n  padding: 1.5rem 2rem; }\n  .usa-accordion-content > *:first-child {\n    margin-top: 0; }\n  .usa-accordion-content > *:last-child {\n    margin-bottom: 0; }\n  .usa-accordion-content:not([aria-hidden]) {\n    position: absolute;\n    left: -999em; }\n  .usa-accordion-content[aria-hidden=true] {\n    display: none; }\n\n.usa-accordion-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #e4e4e4;\n  background-image: url(\"../img/minus.png\");\n  background-image: url(\"../img/minus.svg\");\n  background-position: right 2rem center;\n  background-repeat: no-repeat;\n  background-size: 1.5rem;\n  color: #212121;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-weight: 700;\n  margin: 0;\n  padding: 1.5rem 5.5rem 1.5rem 2rem;\n  width: 100%; }\n  .usa-accordion-button:hover {\n    background-color: transparent; }\n  .usa-accordion-button:hover {\n    background-color: #c9c9c9;\n    color: #212121; }\n  .usa-accordion-button h1,\n  .usa-accordion-button h2,\n  .usa-accordion-button h3,\n  .usa-accordion-button h4,\n  .usa-accordion-button h5,\n  .usa-accordion-button h6 {\n    margin: 0; }\n\n.usa-accordion-button[aria-expanded=false] {\n  background-image: url(\"../img/plus.png\");\n  background-image: url(\"../img/plus.svg\");\n  background-repeat: no-repeat;\n  background-size: 1.5rem; }\n\n.usa-alert {\n  background-color: #e4e4e4;\n  background-position: 2rem 2rem;\n  background-repeat: no-repeat;\n  background-size: 5.2rem;\n  padding-bottom: 1.4rem;\n  padding-left: 3rem;\n  padding-right: 2rem;\n  padding-top: 2rem;\n  position: relative; }\n  .usa-alert::before {\n    background-color: #7e7e7e;\n    content: '';\n    height: 100%;\n    left: 0;\n    position: absolute;\n    top: 0;\n    width: 1rem; }\n  .usa-alert a {\n    color: #205493; }\n    .usa-alert a:focus, .usa-alert a:hover {\n      color: #112E51; }\n  .usa-alert ul {\n    margin-bottom: 0;\n    margin-top: 1rem;\n    padding-left: 1rem; }\n\n.usa-alert-slim {\n  background-position: 2rem 1rem;\n  padding-bottom: 1rem;\n  padding-top: 1rem; }\n  .usa-alert-slim .usa-alert-text:only-child {\n    margin-bottom: 0.5rem;\n    padding-top: 0.5rem; }\n\n.usa-alert-icon {\n  display: table-cell;\n  padding-right: 1rem; }\n\n.usa-alert-body {\n  display: table-cell;\n  padding-left: 5rem;\n  vertical-align: top; }\n\n.usa-alert-heading {\n  margin-top: 0;\n  margin-bottom: 0; }\n\n.usa-alert-text {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0;\n  margin-top: 0; }\n\n.usa-alert-text:only-child {\n  margin-bottom: 1rem;\n  padding-top: 0.5rem; }\n\n.usa-alert-success {\n  background-color: #e7f4e4;\n  background-image: url(\"../img/alerts/success.png\");\n  background-image: url(\"../img/alerts/success.svg\"); }\n  .usa-alert-success::before {\n    background-color: #2e8540; }\n\n.usa-alert-warning {\n  background-color: #fff1d2;\n  background-image: url(\"../img/alerts/warning.png\");\n  background-image: url(\"../img/alerts/warning.svg\"); }\n  .usa-alert-warning::before {\n    background-color: #fdb81e; }\n\n.usa-alert-error {\n  background-color: #f9dede;\n  background-image: url(\"../img/alerts/error.png\");\n  background-image: url(\"../img/alerts/error.svg\"); }\n  .usa-alert-error::before {\n    background-color: #005495; }\n\n.usa-alert-info {\n  background-color: #e1f3f8;\n  background-image: url(\"../img/alerts/info.png\");\n  background-image: url(\"../img/alerts/info.svg\"); }\n  .usa-alert-info::before {\n    background-color: #c64b00; }\n\n.usa-alert-no_icon {\n  background-image: none; }\n\n.usa-alert-paragraph {\n  width: 66ch; }\n\n.usa-alert {\n  margin-top: 1.5em; }\n\n.usa-banner {\n  background-color: #e4e4e4;\n  padding-bottom: 0.7rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner {\n      font-size: 1.3rem;\n      padding-bottom: 0; } }\n\n.usa-banner-content {\n  padding-right: 1.5rem;\n  padding-bottom: 3px;\n  padding-left: 1.5rem;\n  background-color: transparent;\n  font-size: 1.5rem;\n  padding-top: 2rem;\n  width: 100%; }\n  @media screen and (min-width: 600px) {\n    .usa-banner-content {\n      padding-bottom: 2.3rem;\n      padding-top: 4rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-banner-content {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n  .usa-banner-content p:first-child {\n    margin-top: 1rem; }\n    @media screen and (min-width: 600px) {\n      .usa-banner-content p:first-child {\n        margin-top: 0; } }\n\n.usa-banner-inner {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  padding-right: 1.5rem;\n  padding-left: 1.5rem;\n  max-width: 1040px; }\n  .usa-banner-inner::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  @media screen and (min-width: 951px) {\n    .usa-banner-inner {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-banner-header {\n  padding-top: 0.55rem;\n  padding-bottom: 0.55rem;\n  font-size: 1.2rem;\n  font-weight: 400; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header {\n      padding-top: 0;\n      padding-bottom: 0; } }\n  .usa-banner-header p {\n    margin-top: 0;\n    margin-bottom: 0;\n    display: inline;\n    overflow: hidden;\n    vertical-align: middle; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header p {\n        margin-top: 2px;\n        margin-bottom: 2px;\n        display: inline-block; } }\n  .usa-banner-header img {\n    float: left;\n    margin-right: 1rem;\n    margin-top: 1px;\n    width: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header img {\n        margin-right: 0.7rem;\n        width: 2rem; } }\n\n.usa-banner-header-expanded {\n  align-items: center;\n  border-bottom: 1px solid #999999;\n  display: flex;\n  font-size: 1.5rem;\n  min-height: 5.6rem;\n  padding-right: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header-expanded {\n      border-bottom: none;\n      display: block;\n      font-size: 1.2rem;\n      font-weight: 400;\n      min-height: 0;\n      padding-right: 0; } }\n  .usa-banner-header-expanded > .usa-banner-inner {\n    margin-left: 0; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded > .usa-banner-inner {\n        margin-left: auto; } }\n  .usa-banner-header-expanded img {\n    margin-right: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded img {\n        margin-right: 0.7rem; } }\n  .usa-banner-header-expanded p {\n    line-height: 1.3;\n    vertical-align: top; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded p {\n        line-height: 1.5;\n        vertical-align: middle; } }\n\n.usa-banner-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  padding-top: 1.3rem;\n  padding-left: 4.8rem;\n  background-position-x: right;\n  color: #0071BC;\n  display: block;\n  font-size: 1.2rem;\n  height: 4.3rem;\n  left: 0;\n  position: absolute;\n  text-decoration: underline;\n  top: 0;\n  width: 100%; }\n  .usa-banner-button:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-button {\n      padding-top: 0;\n      padding-left: 0;\n      /* stylelint-disable declaration-block-no-ignored-properties */\n      display: inline;\n      height: initial;\n      margin-left: 3px;\n      position: relative;\n      vertical-align: middle;\n      width: initial;\n      /* stylelint-enable */ } }\n  .usa-banner-button:hover {\n    color: #205493;\n    text-decoration: underline; }\n  .usa-banner-button[aria-expanded=false] {\n    background-image: none; }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-image: url(\"../img/angle-arrow-down-primary.png\");\n      background-image: url(\"../img/angle-arrow-down-primary.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1rem;\n      width: 1rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    .usa-banner-button[aria-expanded=false]:hover::after {\n      background-image: url(\"../img/angle-arrow-down-primary-hover.png\");\n      background-image: url(\"../img/angle-arrow-down-primary-hover.svg\"); }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-position-y: 1px; }\n  .usa-banner-button[aria-expanded=true] {\n    background-image: none;\n    height: 5.6rem; }\n    .usa-banner-button[aria-expanded=true]::after {\n      background-image: url(\"../img/close.png\");\n      background-image: url(\"../img/close.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1.3rem;\n      width: 1.3rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    @media screen and (min-width: 481px) {\n      .usa-banner-button[aria-expanded=true] {\n        height: initial;\n        padding: 0;\n        position: relative; }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-image: url(\"../img/angle-arrow-up-primary.png\");\n          background-image: url(\"../img/angle-arrow-up-primary.svg\");\n          background-size: 100%;\n          content: '';\n          display: inline-block;\n          height: 1rem;\n          width: 1rem;\n          /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n          margin-left: 0;\n          /* stylelint-enable */ }\n        .usa-banner-button[aria-expanded=true]:hover::after {\n          background-image: url(\"../img/angle-arrow-up-primary-hover.png\");\n          background-image: url(\"../img/angle-arrow-up-primary-hover.svg\"); }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-position-y: 1px; } }\n    .usa-banner-button[aria-expanded=true]::after {\n      position: absolute;\n      right: 1.5rem;\n      top: 2.15rem; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true]::after {\n          position: static; } }\n    .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n      display: none; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n          display: inline; } }\n\n.usa-banner-icon {\n  width: 3.8rem; }\n\n.usa-footer .usa-unstyled-list {\n  display: block; }\n\n.usa-footer .usa-footer-primary-link {\n  color: #212121;\n  display: block;\n  font-weight: 700;\n  margin-top: 0;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: none; }\n  @media screen and (min-width: 600px) {\n    .usa-footer .usa-footer-primary-link {\n      border-top: none; } }\n  .usa-footer .usa-footer-primary-link:hover {\n    text-decoration: underline; }\n\n.usa-footer .usa-footer-primary-link ~ li a,\n.usa-footer .usa-footer-secondary-link {\n  text-decoration: none; }\n\n.usa-footer-contact_info {\n  display: inline-block; }\n  .usa-footer-contact_info a {\n    color: #212121;\n    text-decoration: none; }\n  .usa-footer-contact_info:hover {\n    text-decoration: underline; }\n\n.usa-footer-return-to-top {\n  color: #0071BC;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: underline; }\n\n.usa-footer-primary-section {\n  background-color: #e4e4e4; }\n  .usa-footer-primary-section .usa-footer-primary-content {\n    padding-left: 1.5rem;\n    padding-right: 2.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-primary-section .usa-footer-primary-content {\n        padding-left: 0;\n        padding-right: 0; } }\n    .usa-footer-primary-section .usa-footer-primary-content li {\n      margin-left: 1rem; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-primary-section .usa-footer-primary-content li {\n          margin-left: 0; } }\n  @media screen and (min-width: 600px) {\n    .usa-footer-primary-section .usa-grid-full {\n      padding-left: 2.5rem;\n      padding-right: 2.5rem; } }\n\n.usa-footer-medium .usa-footer-contact_info p {\n  margin: 0 1rem 0 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact_info p {\n      margin: 0 0 0 1rem; } }\n\n.usa-footer-medium .usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact-heading {\n      margin-top: 0.5rem;\n      margin-bottom: 0.5rem; } }\n\n.usa-footer-medium .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-logo {\n      padding: 2rem 0; } }\n\n.usa-footer-medium .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-medium .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-medium .usa-footer-nav ul {\n    align-items: center; } }\n\n.usa-footer-slim .usa-footer-nav a {\n  display: block; }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n.usa-footer-slim .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-slim .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-slim .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-primary-section {\n    padding-bottom: 0;\n    padding-top: 0; }\n    .usa-footer-slim .usa-footer-primary-section .usa-grid-full {\n      align-items: center; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info > * {\n    margin: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    padding-top: 1.5rem;\n    padding-bottom: 1.5rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    width: 100%; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-footer-slim .usa-footer-contact_info:last-child {\n      margin-right: 0; } }\n\n/* stylelint-disable selector-no-qualifying-type */\nul.usa-footer-primary-content,\nli.usa-footer-primary-content,\nli.usa-footer-primary-content {\n  border-top: 1px solid #999999; }\n  @media screen and (min-width: 600px) {\n    ul.usa-footer-primary-content,\n    li.usa-footer-primary-content,\n    li.usa-footer-primary-content {\n      border: none; } }\n  ul.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      ul.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child {\n        border-bottom: none; } }\n\n/* stylelint-enable */\n.usa-sign_up-block {\n  padding-bottom: 4.5rem;\n  padding-left: 1.5rem;\n  padding-right: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-sign_up-block {\n      float: right;\n      padding: 0; } }\n  .usa-sign_up-block label:first-of-type {\n    margin-top: 0; }\n  .usa-sign_up-block button {\n    float: none;\n    margin-right: 0;\n    margin-top: 1.5rem; }\n  .usa-sign_up-block input {\n    width: 100%; }\n\n.usa-footer-secondary_section {\n  background-color: #c9c9c9;\n  padding-bottom: 2rem;\n  padding-top: 2rem; }\n  .usa-footer-secondary_section a {\n    color: #212121; }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big-secondary-section {\n    padding-top: 2rem;\n    padding-bottom: 2rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-contact-links {\n    text-align: right; } }\n\n.usa-social-links a {\n  text-decoration: none; }\n\n.usa-footer-big .usa-footer-contact_info {\n  display: block; }\n  .usa-footer-big .usa-footer-contact_info p {\n    margin: 0 1rem 0 0; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-contact_info p {\n        margin: 0.5rem 0 0 1rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-contact-links {\n    padding-top: 2rem; } }\n\n.usa-footer-big .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-logo {\n      padding: 2rem 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-primary-section {\n    padding-bottom: 4rem;\n    padding-top: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content {\n  padding-left: 0;\n  padding-right: 0; }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n    margin-left: 1.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n        margin-left: 0; } }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link {\n    margin-left: 0; }\n\n.usa-footer-big ul {\n  padding-bottom: 2.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big ul {\n      padding-bottom: 0; } }\n  .usa-footer-big ul:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul:last-child {\n        border-bottom: none; } }\n  .usa-footer-big ul li:not(.usa-footer-primary-link) {\n    line-height: 1.3;\n    padding-bottom: 0.35em;\n    padding-top: 0.35em; }\n  .usa-footer-big ul .usa-footer-primary-link {\n    background-image: url(\"../img/arrow-down.png\");\n    background-image: url(\"../img/arrow-down.svg\");\n    background-position: 1.5rem center;\n    background-repeat: no-repeat;\n    background-size: 1.3rem;\n    margin-left: 0;\n    padding-left: 3.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul .usa-footer-primary-link {\n        background: none;\n        margin-bottom: .8rem;\n        padding-bottom: 0;\n        padding-left: 0; } }\n    .usa-footer-big ul .usa-footer-primary-link > * {\n      margin-top: 0;\n      margin-bottom: 0; }\n  .usa-footer-big ul.hidden {\n    /* stylelint-disable-line selector-no-qualifying-type */\n    padding-bottom: 0; }\n    .usa-footer-big ul.hidden li {\n      display: none; }\n    .usa-footer-big ul.hidden .usa-footer-primary-link {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/arrow-right.png\");\n      background-image: url(\"../img/arrow-right.svg\");\n      cursor: pointer;\n      display: block; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-big ul.hidden .usa-footer-primary-link {\n          background: none;\n          padding-left: 0; } }\n\n.usa-footer-topic {\n  margin: 0;\n  padding: 2rem 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-sign_up-header {\n    margin: 0;\n    padding: 2rem 0; } }\n\n.usa-footer-logo-img {\n  max-width: 8rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-img {\n      float: left; } }\n\n.usa-footer-big-logo-img {\n  max-width: 10rem; }\n\n.usa-footer-slim-logo-img {\n  float: left;\n  max-width: 5rem; }\n\n.usa-footer-logo-heading {\n  display: block;\n  margin-top: 1rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-heading {\n      display: inline-block;\n      margin-top: 3rem;\n      padding-left: 1.5rem; } }\n\n.usa-footer-big-logo-heading {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big-logo-heading {\n      margin-top: 2rem; } }\n\n.usa-footer-slim-logo-heading {\n  display: inline-block;\n  margin-top: 1.5rem;\n  padding-left: 1.5rem; }\n\n.usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-contact-heading {\n      margin-top: 1rem; } }\n\n.usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n  margin: 2.5rem 1rem 1.5rem 0;\n  background-position: center center;\n  background-repeat: no-repeat;\n  background-size: auto 3rem;\n  display: inline-block;\n  height: 4.4rem;\n  left: -1.6rem;\n  position: relative;\n  text-align: center;\n  width: 4.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n      margin: 0 0 0 0.5rem;\n      left: 1.5rem; } }\n  .usa-social_link span, .usa-link-facebook span, .usa-link-twitter span, .usa-link-youtube span, .usa-link-rss span {\n    position: absolute;\n    left: -999em; }\n\n.usa-link-facebook {\n  background-image: url(\"../img/social-icons/png/facebook25.png\");\n  background-image: url(\"../img/social-icons/svg/facebook25.svg\"); }\n\n.usa-link-twitter {\n  background-image: url(\"../img/social-icons/png/twitter16.png\");\n  background-image: url(\"../img/social-icons/svg/twitter16.svg\"); }\n\n.usa-link-youtube {\n  background-image: url(\"../img/social-icons/png/youtube15.png\");\n  background-image: url(\"../img/social-icons/svg/youtube15.svg\"); }\n\n.usa-link-rss {\n  background-image: url(\"../img/social-icons/png/rss25.png\");\n  background-image: url(\"../img/social-icons/svg/rss25.svg\"); }\n\nform a {\n  border-bottom: 0; }\n\nform [type=submit],\nform [type=submit] {\n  display: block;\n  margin-bottom: 1.5em;\n  margin-top: 2.5rem; }\n  @media screen and (min-width: 600px) {\n    form [type=submit],\n    form [type=submit] {\n      padding-left: 2.7em;\n      padding-right: 2.7em;\n      width: auto; } }\n\nform [name=password],\nform [name=confirmPassword] {\n  margin-bottom: 1.1rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-form {\n    max-width: 32rem; } }\n\n.usa-form-note {\n  float: right;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.5rem;\n  margin: 0 0 1.5rem; }\n  .usa-form-note + * {\n    clear: both; }\n\nfieldset {\n  border: none;\n  margin: 0;\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-form-large {\n    max-width: 46rem; } }\n\ninput.usa-input-tiny {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-tiny {\n      max-width: 6rem; } }\n\ninput.usa-input-medium {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-medium {\n      max-width: 12rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid {\n    padding-right: 5%; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid:last-of-type {\n    padding-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-small {\n    float: left;\n    width: 35%; } }\n\n.usa-input-grid-small input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-small select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-medium {\n    float: left;\n    width: 65%; } }\n\n.usa-input-grid-medium input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-medium select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-large {\n    float: left;\n    width: 100%; } }\n\n.usa-input-grid-large input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-large select {\n  margin-bottom: 3rem; }\n\n.usa-additional_text {\n  font-weight: normal; }\n\n.usa-checklist {\n  list-style: none;\n  margin-left: 0;\n  padding-left: 0; }\n  .usa-checklist li {\n    display: inline-block;\n    list-style: none;\n    margin-bottom: 0;\n    margin-top: 0;\n    padding-left: 3em;\n    text-indent: -2em; }\n    .usa-checklist li::before {\n      content: ' ';\n      display: inline-block;\n      height: .8em;\n      margin-right: .2em;\n      width: 1.8em; }\n\n.usa-checklist-checked::before {\n  background-image: url(\"../img/correct9.png\");\n  background-image: url(\"../img/correct9.svg\");\n  background-position: 100%;\n  background-repeat: no-repeat;\n  background-size: 100%; }\n\n.usa-graphic_list .usa-graphic_list-row .usa-media_block {\n  margin-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-graphic_list .usa-graphic_list-row .usa-media_block {\n      margin-bottom: 6rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block {\n    margin-bottom: 0; } }\n\n.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block:last-child {\n  margin-bottom: 0; }\n\n.usa-graphic_list .usa-media_block-img {\n  margin-right: 3rem; }\n\n.usa-graphic_list .usa-media_block-body > :first-child {\n  margin-top: 0; }\n\n.usa-header {\n  width: 100%;\n  z-index: 7000; }\n  @media screen and (min-width: 951px) {\n    .usa-header {\n      border-bottom: 1px solid #c9c9c9; } }\n  .usa-header a {\n    border-bottom: none; }\n  @media screen and (min-width: 951px) {\n    .usa-header .usa-search {\n      float: right;\n      max-width: 21.5rem; } }\n\n.usa-logo {\n  float: left;\n  line-height: 4rem;\n  margin-left: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-logo {\n      line-height: 7.5rem;\n      margin-left: 0; } }\n  .usa-logo a {\n    color: #212121;\n    text-decoration: none; }\n  .usa-logo br {\n    display: none; }\n    @media screen and (min-width: 951px) {\n      .usa-logo br {\n        display: block; } }\n\n.usa-logo-text {\n  display: block;\n  font-size: 1.5rem;\n  font-style: normal;\n  font-weight: 700;\n  margin: 0; }\n  @media screen and (min-width: 951px) {\n    .usa-logo-text {\n      display: block;\n      font-size: 2.4rem;\n      line-height: 1.3; } }\n\n.usa-menu-btn {\n  /* stylelint-disable declaration-block-no-ignored-properties */\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #0071BC;\n  color: #ffffff;\n  display: inline;\n  float: right;\n  font-size: 1.3rem;\n  height: 4rem;\n  line-height: 4rem;\n  text-align: center;\n  text-decoration: none;\n  text-transform: uppercase;\n  width: 5.8rem;\n  /* stylelint-enable */ }\n  .usa-menu-btn:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-menu-btn {\n      display: none; } }\n  .usa-menu-btn:hover {\n    color: #ffffff;\n    background-color: #205493; }\n  .usa-menu-btn:visited {\n    color: #ffffff; }\n\n.usa-overlay {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  background: #000000;\n  opacity: 0;\n  transition: all 0.2s ease-in-out;\n  visibility: hidden;\n  z-index: 8000; }\n  .usa-overlay.is-visible {\n    opacity: 0.1;\n    visibility: visible; }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-logo {\n    bottom: 0;\n    position: absolute; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-navbar {\n    position: relative;\n    width: 18%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-header {\n    border-bottom: none; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-logo {\n    margin-top: 3rem;\n    margin-bottom: 3rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended em {\n    font-size: 3.2rem;\n    line-height: 1; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-navbar {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    display: block;\n    height: auto;\n    max-width: 1040px; }\n    .usa-header-extended .usa-navbar::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav {\n    border-top: 1px solid #c9c9c9;\n    float: none;\n    padding: 0;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-inner {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 1.5rem;\n    margin-top: -1px;\n    max-width: 1040px;\n    position: relative; }\n    .usa-header-extended .usa-nav-inner::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary::after {\n    clear: both;\n    content: \"\";\n    display: block; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-position: right 1.5rem top 53%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link {\n    padding-top: 1.8rem;\n    padding-bottom: 1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-submenu .usa-grid-full {\n    padding-left: 1.2rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-megamenu {\n    padding-left: 3rem; } }\n\n.usa-hero {\n  padding-top: 3rem;\n  padding-bottom: 3rem;\n  background-image: url(\"../img/hero.png\");\n  background-position: center;\n  background-size: cover; }\n  .usa-hero .usa-button {\n    color: #ffffff; }\n\n.usa-section-dark .usa-hero-link {\n  color: #c64b00; }\n\n.usa-hero-callout {\n  background-color: #112E51;\n  padding: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-hero-callout {\n      max-width: 30rem; } }\n  .usa-hero-callout > *:first-child {\n    margin-top: 0;\n    margin-bottom: 2rem; }\n\n.usa-hero-callout-alt {\n  color: #ffffff;\n  display: block; }\n\n.usa-layout-docs {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs {\n      display: inherit; } }\n  .usa-layout-docs .usa-grid > :first-child:not(.usa-width-*) {\n    margin-top: 0; }\n  .usa-layout-docs .usa-grid > :last-child:not(.usa-width-*) {\n    margin-bottom: 0; }\n\n.usa-layout-docs-sidenav {\n  order: 2; }\n\n.usa-layout-docs-main_content {\n  margin-bottom: 3rem;\n  order: 1; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs-main_content {\n      margin-bottom: 0; } }\n  .usa-layout-docs-main_content > :first-child {\n    margin-top: 0; }\n\n.usa-media_block-img {\n  float: left;\n  margin-right: 1rem; }\n\n.usa-media_block-body {\n  overflow: hidden; }\n\n.usa-navbar {\n  border-bottom: 1px solid #999999;\n  height: 4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-navbar {\n      border-bottom: none;\n      display: inline-block;\n      height: 7.8rem; } }\n\n.usa-nav-link {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link:hover span {\n      border-bottom: 0.4rem solid #0071BC;\n      padding-bottom: 0.6rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link.usa-accordion-button span {\n      margin-right: 0;\n      padding-right: 1.5rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-nav-container {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    max-width: 1040px; }\n    .usa-nav-container::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n.usa-nav {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: auto;\n  background: #ffffff;\n  border-left: 1px solid #999999;\n  border-right: 0;\n  display: flex;\n  flex-direction: column;\n  overflow-y: auto;\n  padding: 2rem;\n  transform: translateX(26rem);\n  width: 26rem;\n  z-index: 9000; }\n  @media screen and (min-width: 951px) {\n    .usa-nav {\n      padding-top: 4.5rem;\n      padding-right: 0;\n      padding-bottom: 0;\n      border-left: none;\n      display: block;\n      float: right;\n      overflow-y: visible;\n      position: relative;\n      transform: translateX(0);\n      width: auto; } }\n  .usa-nav.is-visible {\n    transform: translateX(0);\n    transition: all 0.3s ease-in-out; }\n  .usa-nav nav {\n    margin-top: 6rem;\n    min-height: 100%; }\n    @media screen and (min-width: 951px) {\n      .usa-nav nav {\n        margin-top: 0; } }\n  .usa-nav .usa-current {\n    border-left: 4px solid #0071BC;\n    color: #0071BC;\n    font-weight: 700;\n    padding-left: 1.4rem; }\n    @media screen and (min-width: 951px) {\n      .usa-nav .usa-current {\n        color: #212121; } }\n  .usa-nav .usa-button {\n    width: 100%; }\n  @media screen and (min-width: 951px) {\n    .usa-nav .usa-search {\n      margin-left: 1.5rem;\n      top: 4px; } }\n\n.usa-nav-primary {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin-top: 1.5rem;\n  order: 2; }\n  .usa-nav-primary > li {\n    margin-bottom: 0; }\n  .usa-nav-primary > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-nav-primary > li:first-child {\n      border-top: none; }\n  .usa-nav-primary a {\n    border: none;\n    color: #212121;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-nav-primary a:hover {\n      background-color: #e4e4e4;\n      color: #0071BC;\n      text-decoration: none; }\n    .usa-nav-primary a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-nav-primary a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #0071BC;\n      color: #0071BC;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary {\n      display: inline; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary li {\n      border-top: none; } }\n  .usa-nav-primary > li {\n    width: auto; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li {\n        display: inline-block; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a:hover {\n        background-color: transparent; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a {\n      padding-top: 0.75rem;\n      padding-bottom: 0.75rem; } }\n  .usa-nav-primary button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    -moz-osx-font-smoothing: grayscale;\n    -webkit-font-smoothing: antialiased;\n    font-weight: 400;\n    line-height: 1.3;\n    padding: 0.85rem 1.5rem 0.85rem 1.8rem; }\n    .usa-nav-primary button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary button {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1;\n        width: initial; } }\n    .usa-nav-primary button:focus, .usa-nav-primary button:active {\n      box-shadow: 2px dotted #999999; }\n    .usa-nav-primary button:hover {\n      background-color: #e4e4e4;\n      color: #0071BC; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button:hover {\n          background-color: transparent; } }\n    .usa-nav-primary button[aria-expanded=false] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/plus-alt.png\");\n      background-image: url(\"../img/plus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false] {\n          background-image: url(\"../img/angle-arrow-down.png\");\n          background-image: url(\"../img/angle-arrow-down.svg\");\n          background-position: right 1.5rem top 40%; } }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false]:hover {\n          background-image: url(\"../img/angle-arrow-down-primary.png\");\n          background-image: url(\"../img/angle-arrow-down-primary.svg\"); } }\n    .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/minus-alt.png\");\n      background-image: url(\"../img/minus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=true] {\n          background-color: #112E51;\n          color: #ffffff;\n          background-image: url(\"../img/angle-arrow-down-hover.png\");\n          background-image: url(\"../img/angle-arrow-down-hover.svg\");\n          background-position: right 1.5rem top 40%; }\n          .usa-nav-primary button[aria-expanded=true]:hover {\n            background-color: #112E51; }\n          .usa-nav-primary button[aria-expanded=true] span {\n            border-bottom: 0.4rem solid #0071BC;\n            padding-bottom: 0.6rem;\n            color: #ffffff; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a.usa-current,\n    .usa-nav-primary .usa-current {\n      border-left: 0;\n      padding-left: 1.5rem; }\n      .usa-nav-primary a.usa-current:hover span,\n      .usa-nav-primary .usa-current:hover span {\n        color: #0071BC; }\n      .usa-nav-primary a.usa-current span,\n      .usa-nav-primary .usa-current span {\n        border-bottom: 0.4rem solid #0071BC;\n        padding-bottom: 0.6rem;\n        color: #212121; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link:hover span {\n    border-bottom: 0.7rem solid #0071BC;\n    padding-bottom: 0.9rem; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=true] span {\n      border-bottom: 0.7rem solid #0071BC;\n      padding-bottom: 0.9rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary .usa-current span {\n    border-bottom: 0.7rem solid #0071BC;\n    padding-bottom: 0.9rem; } }\n\n.usa-nav-secondary {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary {\n      margin-top: 0;\n      position: absolute;\n      right: 3rem;\n      top: -5.7rem; } }\n  .usa-nav-secondary .usa-search {\n    margin-top: 1.5rem;\n    margin-bottom: 0; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary .usa-search {\n        margin-top: -0.9rem;\n        margin-bottom: 0;\n        margin-left: 0;\n        float: left; } }\n\n.usa-nav-secondary-links {\n  margin-top: 2.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links {\n      float: left;\n      margin-top: 0; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li {\n      display: inline;\n      padding-left: 0.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li:not(:last-child)::after {\n      color: #c9c9c9;\n      content: '|';\n      padding-left: 0.5rem; } }\n  .usa-nav-secondary-links a,\n  .usa-nav-secondary-links .usa-header-search-button {\n    color: #666666;\n    display: inline-block;\n    font-size: 1.5rem;\n    text-decoration: none; }\n    .usa-nav-secondary-links a:hover,\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      color: #0071BC;\n      text-decoration: underline; }\n  .usa-nav-secondary-links .usa-header-search-button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    display: none; }\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button {\n        background-image: url(\"../img/search-alt.png\");\n        background-image: url(\"../img/search-alt.svg\");\n        background-repeat: no-repeat;\n        background-position: left center;\n        background-size: 2.2rem;\n        display: inline-block;\n        padding-left: 2.3rem; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button.is-hidden {\n        display: none; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links a.usa-current {\n      border-left: 0;\n      padding-left: 0; } }\n\n.usa-nav-submenu {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-nav-submenu > li {\n    margin-bottom: 0; }\n  .usa-nav-submenu li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-nav-submenu a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-nav-submenu a:hover, .usa-nav-submenu a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-nav-submenu .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu {\n      margin-top: 0;\n      margin-bottom: 0;\n      list-style-type: none;\n      padding-left: 0;\n      padding-top: 0.75rem;\n      padding-bottom: 0.9rem;\n      background-color: #112E51;\n      width: 21.5rem;\n      position: absolute; }\n      .usa-nav-submenu > li {\n        margin-bottom: 0; } }\n  .usa-nav-submenu[aria-hidden=true] {\n    display: none; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a {\n      color: #ffffff;\n      padding-left: 1.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a:hover {\n      background-color: #112E51;\n      color: #ffffff;\n      padding-left: 1.5rem;\n      text-decoration: underline; } }\n  .usa-nav-submenu li {\n    font-size: 1.5rem;\n    margin-bottom: 0; }\n\n.usa-nav-close {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  margin: -1.2rem -1.5rem 1.5rem auto;\n  float: right;\n  height: 4.4rem;\n  text-align: center;\n  width: 4.4rem; }\n  .usa-nav-close:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-close {\n      display: none; } }\n  .usa-nav-close img {\n    width: 1.3rem; }\n  .usa-nav-close + * {\n    clear: both; }\n\n.usa-mobile_nav-active {\n  overflow: hidden; }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu {\n    padding-top: 3.15rem;\n    padding-bottom: 3.15rem;\n    left: -1rem;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::before {\n    background-color: #112E51;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    right: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::after {\n    background-color: #112E51;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    left: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav {\n    padding-left: 0;\n    padding-top: 0;\n    width: 100%; } }\n\n.usa-header-basic-megamenu .usa-nav-inner {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 951px) {\n    .usa-header-basic-megamenu .usa-nav-inner {\n      display: block;\n      float: right;\n      margin-top: -3.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav-submenu .usa-grid-full {\n    margin-left: -1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu-col {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-megamenu-col:last-child {\n      margin-right: 0; }\n    .usa-megamenu-col:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-megamenu-col:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-megamenu-col:nth-child(4n) {\n      margin-right: 0; } }\n\n.usa-megamenu-col > ul {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-megamenu-col > ul > li {\n    margin-bottom: 0; }\n\n.usa-search {\n  max-width: none;\n  position: relative; }\n  .usa-search::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  .usa-search [type=submit],\n  .usa-search .usa-search-submit {\n    background-image: url(\"../img/search.png\");\n    background-image: url(\"../img/search.svg\");\n    background-position: 50%;\n    background-repeat: no-repeat;\n    border-bottom-left-radius: 0;\n    border-top-left-radius: 0;\n    height: 3.3rem;\n    margin: 0;\n    padding: 0;\n    width: 4.5rem; }\n    @media screen and (min-width: 481px) {\n      .usa-search [type=submit],\n      .usa-search .usa-search-submit {\n        background-image: none;\n        width: 8.5rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-big [type=search],\n    .usa-search.usa-search-big .usa-search-input {\n      font-size: 1.7rem;\n      height: 4.4rem;\n      width: calc(100% - 11.6rem); }\n    .usa-search.usa-search-big [type=submit],\n    .usa-search.usa-search-big .usa-search-submit {\n      font-size: 2rem;\n      height: 4.4rem;\n      width: 11.6rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-small [type=search],\n    .usa-search.usa-search-small .usa-search-input {\n      width: calc(100% - 4.5rem); }\n    .usa-search.usa-search-small [type=submit],\n    .usa-search.usa-search-small .usa-search-submit {\n      background-image: url(\"../img/search.png\");\n      background-image: url(\"../img/search.svg\");\n      background-position: 50%;\n      background-repeat: no-repeat;\n      width: 4.5rem; } }\n  @media screen and (max-width: 950px) {\n    .usa-search.usa-search-small.usa-sr-only {\n      left: auto;\n      position: relative; } }\n\ninput[type=search] {\n  /* stylelint-disable-line selector-no-qualifying-type */\n  box-sizing: border-box;\n  -webkit-appearance: none; }\n\n[type=search],\n.usa-search-input {\n  padding-top: 0;\n  padding-bottom: 0;\n  border-bottom-right-radius: 0;\n  border-right: none;\n  border-top-right-radius: 0;\n  box-sizing: border-box;\n  float: left;\n  font-size: 1.4rem;\n  height: 3.3rem;\n  margin: 0;\n  width: calc(100% - 4.5rem); }\n  @media screen and (min-width: 481px) {\n    [type=search],\n    .usa-search-input {\n      width: calc(100% - 8.5rem); } }\n\n.usa-search-submit-text {\n  position: absolute;\n  left: -999em; }\n  @media screen and (min-width: 481px) {\n    .usa-search-submit-text {\n      position: static; } }\n\n.usa-section {\n  padding-top: 3rem;\n  padding-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-section {\n      padding-top: 6rem;\n      padding-bottom: 6rem; } }\n\n.usa-section-light {\n  background-color: #e4e4e4; }\n\n.usa-section-dark {\n  background-color: #112E51;\n  color: #ffffff; }\n  .usa-section-dark h1,\n  .usa-section-dark h2,\n  .usa-section-dark h3,\n  .usa-section-dark h4,\n  .usa-section-dark h5,\n  .usa-section-dark h6 {\n    color: #c64b00; }\n  .usa-section-dark p {\n    color: #ffffff; }\n  .usa-section-dark a {\n    color: #c9c9c9; }\n    .usa-section-dark a:hover {\n      color: #ffffff; }\n\n.usa-sidenav-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-sidenav-list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-list > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-sidenav-list > li:first-child {\n      border-top: none; }\n  .usa-sidenav-list a {\n    border: none;\n    color: #212121;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-sidenav-list a:hover {\n      background-color: #e4e4e4;\n      color: #0071BC;\n      text-decoration: none; }\n    .usa-sidenav-list a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-sidenav-list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #0071BC;\n      color: #0071BC;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n\n.usa-sidenav-sub_list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-sidenav-sub_list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-sub_list li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-sidenav-sub_list a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-sidenav-sub_list a:hover, .usa-sidenav-sub_list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-sidenav-sub_list .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n\n.usa-skipnav {\n  background: transparent;\n  color: #212121;\n  left: 0;\n  padding: 1rem 1.5rem;\n  position: absolute;\n  top: -4.2rem;\n  transition: all 0.2s ease-in-out;\n  z-index: 100; }\n  .usa-skipnav:focus {\n    background: #ffffff;\n    left: 0;\n    outline: 0;\n    position: absolute;\n    top: 0;\n    transition: all 0.2s ease-in-out; }\n\nh1, h2, h3, h4, h5, h6 {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-weight: bold; }\n\nh3.feed-item-title a,\narticle.aggregator-item .field--name-fid a {\n  text-decoration: none;\n  color: #0071BC; }\n\n.region-sidebar-first,\n.region-sidebar-second,\n.uswds-middle-section {\n  background-color: #E7F5FF; }\n\n.view-nsf-blog article.aggregator-item {\n  background-color: #ffffff;\n  padding: 2rem;\n  padding-top: 0.2rem;\n  margin-bottom: 3rem; }\n\n.region-sidebar-second {\n  float: right;\n  padding: 1.25rem; }\n  .region-sidebar-second h4 {\n    text-transform: uppercase;\n    color: #999999;\n    font-weight: normal; }\n\np,\ninput,\ntextarea,\n.usa-sidenav-list a,\n.usa-accordion,\n.usa-accordion-bordered,\nselect.form-select {\n  color: #666666; }\n\n.usa-nav-primary a.usa-nav-link,\n.usa-nav-primary .usa-nav-link,\n.usa-nav-primary a.usa-current span,\n.usa-nav-primary .usa-current span {\n  color: #3e94cf; }\n\n.filter-wrapper {\n  display: none; }\n\n.usa-form-large {\n  max-width: none; }\n\nform [type=\"submit\"], form [type=\"submit\"] {\n  display: inline-block; }\n\ntextarea {\n  height: auto; }\n\nlabel {\n  margin-top: 1rem; }\n\ninput, textarea, select {\n  max-width: none; }\n\n#block-nsf-views-block-news-block-1 ul {\n  margin: 0 auto;\n  text-align: center; }\n\n#block-nsf-views-block-news-block-1 li {\n  display: inline-block;\n  vertical-align: top; }\n\nimg.image-style-news-main-story {\n  max-width: none; }\n\n.usa-header-basic .usa-logo {\n  top: 0;\n  bottom: auto; }\n  .usa-header-basic .usa-logo img {\n    max-width: none; }\n\n.usa-navbar em.usa-logo-text {\n  margin-left: -5000em; }\n"]}
\ No newline at end of file
+{"version":3,"sources":["stdin"],"names":[],"mappings":"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","file":"uswds.min.css","sourcesContent":["/*! uswds @version */\nhtml {\n  box-sizing: border-box; }\n\n*, *::after, *::before {\n  box-sizing: inherit; }\n\n/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */\n/**\n * 1. Set default font family to sans-serif.\n * 2. Prevent iOS and IE text size adjust after device orientation change,\n *    without disabling user zoom.\n */\nhtml {\n  font-family: sans-serif;\n  /* 1 */\n  -ms-text-size-adjust: 100%;\n  /* 2 */\n  -webkit-text-size-adjust: 100%;\n  /* 2 */ }\n\n/**\n * Remove default margin.\n */\nbody {\n  margin: 0; }\n\n/* HTML5 display definitions\n   ========================================================================== */\n/**\n * Correct `block` display not defined for any HTML5 element in IE 8/9.\n * Correct `block` display not defined for `details` or `summary` in IE 10/11\n * and Firefox.\n * Correct `block` display not defined for `main` in IE 11.\n */\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n  display: block; }\n\n/**\n * 1. Correct `inline-block` display not defined in IE 8/9.\n * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.\n */\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block;\n  /* 1 */\n  vertical-align: baseline;\n  /* 2 */ }\n\n/**\n * Prevent modern browsers from displaying `audio` without controls.\n * Remove excess height in iOS 5 devices.\n */\naudio:not([controls]) {\n  display: none;\n  height: 0; }\n\n/**\n * Address `[hidden]` styling not present in IE 8/9/10.\n * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.\n */\n[hidden],\ntemplate {\n  display: none; }\n\n/* Links\n   ========================================================================== */\n/**\n * Remove the gray background color from active links in IE 10.\n */\na {\n  background-color: transparent; }\n\n/**\n * Improve readability of focused elements when they are also in an\n * active/hover state.\n */\na:active,\na:hover {\n  outline: 0; }\n\n/* Text-level semantics\n   ========================================================================== */\n/**\n * Address styling not present in IE 8/9/10/11, Safari, and Chrome.\n */\nabbr[title] {\n  border-bottom: 1px dotted; }\n\n/**\n * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.\n */\nb,\nstrong {\n  font-weight: bold; }\n\n/**\n * Address styling not present in Safari and Chrome.\n */\ndfn {\n  font-style: italic; }\n\n/**\n * Address variable `h1` font-size and margin within `section` and `article`\n * contexts in Firefox 4+, Safari, and Chrome.\n */\nh1 {\n  font-size: 2em;\n  margin: 0.67em 0; }\n\n/**\n * Address styling not present in IE 8/9.\n */\nmark {\n  background: #ff0;\n  color: #000; }\n\n/**\n * Address inconsistent and variable font size in all browsers.\n */\nsmall {\n  font-size: 80%; }\n\n/**\n * Prevent `sub` and `sup` affecting `line-height` in all browsers.\n */\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline; }\n\nsup {\n  top: -0.5em; }\n\nsub {\n  bottom: -0.25em; }\n\n/* Embedded content\n   ========================================================================== */\n/**\n * Remove border when inside `a` element in IE 8/9/10.\n */\nimg {\n  border: 0; }\n\n/**\n * Correct overflow not hidden in IE 9/10/11.\n */\nsvg:not(:root) {\n  overflow: hidden; }\n\n/* Grouping content\n   ========================================================================== */\n/**\n * Address margin not present in IE 8/9 and Safari.\n */\nfigure {\n  margin: 1em 40px; }\n\n/**\n * Address differences between Firefox and other browsers.\n */\nhr {\n  box-sizing: content-box;\n  height: 0; }\n\n/**\n * Contain overflow in all browsers.\n */\npre {\n  overflow: auto; }\n\n/**\n * Address odd `em`-unit font size rendering in all browsers.\n */\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em; }\n\n/* Forms\n   ========================================================================== */\n/**\n * Known limitation: by default, Chrome and Safari on OS X allow very limited\n * styling of `select`, unless a `border` property is set.\n */\n/**\n * 1. Correct color not being inherited.\n *    Known issue: affects color of disabled elements.\n * 2. Correct font properties not being inherited.\n * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.\n */\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  color: inherit;\n  /* 1 */\n  font: inherit;\n  /* 2 */\n  margin: 0;\n  /* 3 */ }\n\n/**\n * Address `overflow` set to `hidden` in IE 8/9/10/11.\n */\nbutton {\n  overflow: visible; }\n\n/**\n * Address inconsistent `text-transform` inheritance for `button` and `select`.\n * All other form control elements do not inherit `text-transform` values.\n * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.\n * Correct `select` style inheritance in Firefox.\n */\nbutton,\nselect {\n  text-transform: none; }\n\n/**\n * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`\n *    and `video` controls.\n * 2. Correct inability to style clickable `input` types in iOS.\n * 3. Improve usability and consistency of cursor style between image-type\n *    `input` and others.\n */\nbutton,\nhtml input[type=\"button\"],\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button;\n  /* 2 */\n  cursor: pointer;\n  /* 3 */ }\n\n/**\n * Re-set default cursor for disabled elements.\n */\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default; }\n\n/**\n * Remove inner padding and border in Firefox 4+.\n */\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  border: 0;\n  padding: 0; }\n\n/**\n * Address Firefox 4+ setting `line-height` on `input` using `!important` in\n * the UA stylesheet.\n */\ninput {\n  line-height: normal; }\n\n/**\n * It's recommended that you don't attempt to style these elements.\n * Firefox's implementation doesn't respect box-sizing, padding, or width.\n *\n * 1. Address box sizing set to `content-box` in IE 8/9/10.\n * 2. Remove excess padding in IE 8/9/10.\n */\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  box-sizing: border-box;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Fix the cursor style for Chrome's increment/decrement buttons. For certain\n * `font-size` values of the `input`, it causes the cursor style of the\n * decrement button to change from `default` to `text`.\n */\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto; }\n\n/**\n * 1. Address `appearance` set to `searchfield` in Safari and Chrome.\n * 2. Address `box-sizing` set to `border-box` in Safari and Chrome.\n */\ninput[type=\"search\"] {\n  -webkit-appearance: textfield;\n  /* 1 */\n  box-sizing: content-box;\n  /* 2 */ }\n\n/**\n * Remove inner padding and search cancel button in Safari and Chrome on OS X.\n * Safari (but not Chrome) clips the cancel button when the search input has\n * padding (and `textfield` appearance).\n */\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none; }\n\n/**\n * Define consistent border, margin, and padding.\n */\nfieldset {\n  border: 1px solid #c0c0c0;\n  margin: 0 2px;\n  padding: 0.35em 0.625em 0.75em; }\n\n/**\n * 1. Correct `color` not being inherited in IE 8/9/10/11.\n * 2. Remove padding so people aren't caught out if they zero out fieldsets.\n */\nlegend {\n  border: 0;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Remove default vertical scrollbar in IE 8/9/10/11.\n */\ntextarea {\n  overflow: auto; }\n\n/**\n * Don't inherit the `font-weight` (applied by a rule above).\n * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.\n */\noptgroup {\n  font-weight: bold; }\n\n/* Tables\n   ========================================================================== */\n/**\n * Remove most spacing between table cells.\n */\ntable {\n  border-collapse: collapse;\n  border-spacing: 0; }\n\ntd,\nth {\n  padding: 0; }\n\n/* stylelint-disable at-rule-empty-line-before */\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/sourcesanspro-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-light-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/sourcesanspro-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-bold-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/merriweather-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-light-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/merriweather-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-bold-webfont.ttf\") format(\"truetype\"); }\n\n/* stylelint-enable */\n.usa-grid,\n.usa-grid-full {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  max-width: 1040px; }\n  .usa-grid::after,\n  .usa-grid-full::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n\n.usa-grid {\n  padding-right: 1.5rem;\n  padding-left: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-grid {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-grid-full {\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 31.76157%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 65.88078%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-width-one-fourth:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-width-one-fourth:nth-child(4n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 74.41059%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 14.70196%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 14.70196%; }\n      .usa-width-one-sixth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-sixth:nth-child(6n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 82.94039%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 6.17215%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 6.17215%; }\n      .usa-width-one-twelfth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(12n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 40.29137%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 57.35098%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n.usa-end-row {\n  margin-right: 0; }\n\n.usa-offset-one-twelfth {\n  margin-left: 8.5298%; }\n\n.usa-offset-one-sixth {\n  margin-left: 17.05961%; }\n\n.usa-offset-one-fourth {\n  margin-left: 25.58941%; }\n\n.usa-offset-one-third {\n  margin-left: 34.11922%; }\n\n.usa-offset-five-twelfths {\n  margin-left: 42.64902%; }\n\n.usa-offset-one-half {\n  margin-left: 51.17883%; }\n\n.usa-offset-seven-twelfths {\n  margin-left: 59.70863%; }\n\n.usa-offset-two-thirds {\n  margin-left: 68.23843%; }\n\n.usa-offset-three-fourths {\n  margin-left: 76.76824%; }\n\n.usa-offset-five-sixths {\n  margin-left: 85.29804%; }\n\n.usa-offset-eleven-twelfths {\n  margin-left: 93.82785%; }\n\n.usa-sr-only {\n  position: absolute;\n  left: -999em; }\n\nhtml {\n  box-sizing: border-box; }\n\n*,\n*::before,\n*::after {\n  box-sizing: inherit; }\n\nbody {\n  background-color: #ffffff;\n  overflow-x: hidden; }\n\n.lt-ie9 * {\n  filter: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n[hidden] {\n  display: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n*:focus,\n.usa-focus {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n/* stylelint-disable selector-no-qualifying-type */\n.usa-button,\n.usa-button-primary,\n.usa-button:visited,\n.usa-button-primary:visited,\nbutton,\n[type=button],\n[type=submit],\n[type=reset],\n[type=image] {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased;\n  margin-top: 0.5em;\n  margin-right: 0.5em;\n  margin-bottom: 0.5em;\n  appearance: none;\n  background-color: #0071BC;\n  border: 0;\n  border-radius: 5px;\n  color: #ffffff;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.7rem;\n  font-weight: 700;\n  line-height: 1;\n  padding: 1rem 2rem;\n  text-align: center;\n  text-decoration: none;\n  width: 100%; }\n  @media screen and (min-width: 481px) {\n    .usa-button,\n    .usa-button-primary,\n    .usa-button:visited,\n    .usa-button-primary:visited,\n    button,\n    [type=button],\n    [type=submit],\n    [type=reset],\n    [type=image] {\n      width: auto; } }\n  .usa-button:hover, .usa-button.usa-button-hover,\n  .usa-button-primary:hover,\n  .usa-button-primary.usa-button-hover,\n  .usa-button:visited:hover,\n  .usa-button:visited.usa-button-hover,\n  .usa-button-primary:visited:hover,\n  .usa-button-primary:visited.usa-button-hover,\n  button:hover,\n  button.usa-button-hover,\n  [type=button]:hover,\n  [type=button].usa-button-hover,\n  [type=submit]:hover,\n  [type=submit].usa-button-hover,\n  [type=reset]:hover,\n  [type=reset].usa-button-hover,\n  [type=image]:hover,\n  [type=image].usa-button-hover {\n    background-color: #205493;\n    border-bottom: 0;\n    color: #ffffff;\n    text-decoration: none; }\n  .usa-button:active, .usa-button.usa-button-active,\n  .usa-button-primary:active,\n  .usa-button-primary.usa-button-active,\n  .usa-button:visited:active,\n  .usa-button:visited.usa-button-active,\n  .usa-button-primary:visited:active,\n  .usa-button-primary:visited.usa-button-active,\n  button:active,\n  button.usa-button-active,\n  [type=button]:active,\n  [type=button].usa-button-active,\n  [type=submit]:active,\n  [type=submit].usa-button-active,\n  [type=reset]:active,\n  [type=reset].usa-button-active,\n  [type=image]:active,\n  [type=image].usa-button-active {\n    background-color: #112E51; }\n  .usa-button.usa-button-primary-alt,\n  .usa-button-primary.usa-button-primary-alt,\n  .usa-button:visited.usa-button-primary-alt,\n  .usa-button-primary:visited.usa-button-primary-alt,\n  button.usa-button-primary-alt,\n  [type=button].usa-button-primary-alt,\n  [type=submit].usa-button-primary-alt,\n  [type=reset].usa-button-primary-alt,\n  [type=image].usa-button-primary-alt {\n    background-color: #c64b00;\n    color: #212121; }\n    .usa-button.usa-button-primary-alt:hover, .usa-button.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary.usa-button-primary-alt:hover,\n    .usa-button-primary.usa-button-primary-alt.usa-button-hover,\n    .usa-button:visited.usa-button-primary-alt:hover,\n    .usa-button:visited.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary:visited.usa-button-primary-alt:hover,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-hover,\n    button.usa-button-primary-alt:hover,\n    button.usa-button-primary-alt.usa-button-hover,\n    [type=button].usa-button-primary-alt:hover,\n    [type=button].usa-button-primary-alt.usa-button-hover,\n    [type=submit].usa-button-primary-alt:hover,\n    [type=submit].usa-button-primary-alt.usa-button-hover,\n    [type=reset].usa-button-primary-alt:hover,\n    [type=reset].usa-button-primary-alt.usa-button-hover,\n    [type=image].usa-button-primary-alt:hover,\n    [type=image].usa-button-primary-alt.usa-button-hover {\n      background-color: #046b99; }\n    .usa-button.usa-button-primary-alt:active, .usa-button.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary.usa-button-primary-alt:active,\n    .usa-button-primary.usa-button-primary-alt.usa-button-active,\n    .usa-button:visited.usa-button-primary-alt:active,\n    .usa-button:visited.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary:visited.usa-button-primary-alt:active,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-active,\n    button.usa-button-primary-alt:active,\n    button.usa-button-primary-alt.usa-button-active,\n    [type=button].usa-button-primary-alt:active,\n    [type=button].usa-button-primary-alt.usa-button-active,\n    [type=submit].usa-button-primary-alt:active,\n    [type=submit].usa-button-primary-alt.usa-button-active,\n    [type=reset].usa-button-primary-alt:active,\n    [type=reset].usa-button-primary-alt.usa-button-active,\n    [type=image].usa-button-primary-alt:active,\n    [type=image].usa-button-primary-alt.usa-button-active {\n      background-color: #046b99;\n      color: #ffffff; }\n  .usa-button.usa-button-secondary,\n  .usa-button-primary.usa-button-secondary,\n  .usa-button:visited.usa-button-secondary,\n  .usa-button-primary:visited.usa-button-secondary,\n  button.usa-button-secondary,\n  [type=button].usa-button-secondary,\n  [type=submit].usa-button-secondary,\n  [type=reset].usa-button-secondary,\n  [type=image].usa-button-secondary {\n    background-color: #ffffff;\n    box-shadow: inset 0 0 0 2px #0071BC;\n    color: #0071BC; }\n    .usa-button.usa-button-secondary:hover, .usa-button.usa-button-secondary.usa-button-hover,\n    .usa-button-primary.usa-button-secondary:hover,\n    .usa-button-primary.usa-button-secondary.usa-button-hover,\n    .usa-button:visited.usa-button-secondary:hover,\n    .usa-button:visited.usa-button-secondary.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary:hover,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-hover,\n    button.usa-button-secondary:hover,\n    button.usa-button-secondary.usa-button-hover,\n    [type=button].usa-button-secondary:hover,\n    [type=button].usa-button-secondary.usa-button-hover,\n    [type=submit].usa-button-secondary:hover,\n    [type=submit].usa-button-secondary.usa-button-hover,\n    [type=reset].usa-button-secondary:hover,\n    [type=reset].usa-button-secondary.usa-button-hover,\n    [type=image].usa-button-secondary:hover,\n    [type=image].usa-button-secondary.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #205493;\n      color: #205493; }\n    .usa-button.usa-button-secondary:active, .usa-button.usa-button-secondary.usa-button-active,\n    .usa-button-primary.usa-button-secondary:active,\n    .usa-button-primary.usa-button-secondary.usa-button-active,\n    .usa-button:visited.usa-button-secondary:active,\n    .usa-button:visited.usa-button-secondary.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary:active,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-active,\n    button.usa-button-secondary:active,\n    button.usa-button-secondary.usa-button-active,\n    [type=button].usa-button-secondary:active,\n    [type=button].usa-button-secondary.usa-button-active,\n    [type=submit].usa-button-secondary:active,\n    [type=submit].usa-button-secondary.usa-button-active,\n    [type=reset].usa-button-secondary:active,\n    [type=reset].usa-button-secondary.usa-button-active,\n    [type=image].usa-button-secondary:active,\n    [type=image].usa-button-secondary.usa-button-active {\n      box-shadow: inset 0 0 0 2px #112E51;\n      color: #112E51; }\n  .usa-button.usa-button-secondary-inverse, .usa-button.usa-button-outline-inverse,\n  .usa-button-primary.usa-button-secondary-inverse,\n  .usa-button-primary.usa-button-outline-inverse,\n  .usa-button:visited.usa-button-secondary-inverse,\n  .usa-button:visited.usa-button-outline-inverse,\n  .usa-button-primary:visited.usa-button-secondary-inverse,\n  .usa-button-primary:visited.usa-button-outline-inverse,\n  button.usa-button-secondary-inverse,\n  button.usa-button-outline-inverse,\n  [type=button].usa-button-secondary-inverse,\n  [type=button].usa-button-outline-inverse,\n  [type=submit].usa-button-secondary-inverse,\n  [type=submit].usa-button-outline-inverse,\n  [type=reset].usa-button-secondary-inverse,\n  [type=reset].usa-button-outline-inverse,\n  [type=image].usa-button-secondary-inverse,\n  [type=image].usa-button-outline-inverse {\n    background: transparent;\n    box-shadow: inset 0 0 0 2px #ffffff;\n    color: #ffffff; }\n    .usa-button.usa-button-secondary-inverse:hover, .usa-button.usa-button-secondary-inverse.usa-button-hover, .usa-button.usa-button-outline-inverse:hover, .usa-button.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-secondary-inverse:hover,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-outline-inverse:hover,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-secondary-inverse:hover,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-outline-inverse:hover,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse:hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-outline-inverse:hover,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,\n    button.usa-button-secondary-inverse:hover,\n    button.usa-button-secondary-inverse.usa-button-hover,\n    button.usa-button-outline-inverse:hover,\n    button.usa-button-outline-inverse.usa-button-hover,\n    [type=button].usa-button-secondary-inverse:hover,\n    [type=button].usa-button-secondary-inverse.usa-button-hover,\n    [type=button].usa-button-outline-inverse:hover,\n    [type=button].usa-button-outline-inverse.usa-button-hover,\n    [type=submit].usa-button-secondary-inverse:hover,\n    [type=submit].usa-button-secondary-inverse.usa-button-hover,\n    [type=submit].usa-button-outline-inverse:hover,\n    [type=submit].usa-button-outline-inverse.usa-button-hover,\n    [type=reset].usa-button-secondary-inverse:hover,\n    [type=reset].usa-button-secondary-inverse.usa-button-hover,\n    [type=reset].usa-button-outline-inverse:hover,\n    [type=reset].usa-button-outline-inverse.usa-button-hover,\n    [type=image].usa-button-secondary-inverse:hover,\n    [type=image].usa-button-secondary-inverse.usa-button-hover,\n    [type=image].usa-button-outline-inverse:hover,\n    [type=image].usa-button-outline-inverse.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #c9c9c9;\n      color: #c9c9c9; }\n    .usa-button.usa-button-secondary-inverse:active, .usa-button.usa-button-secondary-inverse.usa-button-active, .usa-button.usa-button-outline-inverse:active, .usa-button.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary.usa-button-secondary-inverse:active,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary.usa-button-outline-inverse:active,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-active,\n    .usa-button:visited.usa-button-secondary-inverse:active,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button:visited.usa-button-outline-inverse:active,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary-inverse:active,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-outline-inverse:active,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,\n    button.usa-button-secondary-inverse:active,\n    button.usa-button-secondary-inverse.usa-button-active,\n    button.usa-button-outline-inverse:active,\n    button.usa-button-outline-inverse.usa-button-active,\n    [type=button].usa-button-secondary-inverse:active,\n    [type=button].usa-button-secondary-inverse.usa-button-active,\n    [type=button].usa-button-outline-inverse:active,\n    [type=button].usa-button-outline-inverse.usa-button-active,\n    [type=submit].usa-button-secondary-inverse:active,\n    [type=submit].usa-button-secondary-inverse.usa-button-active,\n    [type=submit].usa-button-outline-inverse:active,\n    [type=submit].usa-button-outline-inverse.usa-button-active,\n    [type=reset].usa-button-secondary-inverse:active,\n    [type=reset].usa-button-secondary-inverse.usa-button-active,\n    [type=reset].usa-button-outline-inverse:active,\n    [type=reset].usa-button-outline-inverse.usa-button-active,\n    [type=image].usa-button-secondary-inverse:active,\n    [type=image].usa-button-secondary-inverse.usa-button-active,\n    [type=image].usa-button-outline-inverse:active,\n    [type=image].usa-button-outline-inverse.usa-button-active {\n      box-shadow: inset 0 0 0 2px #999999;\n      color: #c9c9c9; }\n  .usa-button.usa-button-gray,\n  .usa-button-primary.usa-button-gray,\n  .usa-button:visited.usa-button-gray,\n  .usa-button-primary:visited.usa-button-gray,\n  button.usa-button-gray,\n  [type=button].usa-button-gray,\n  [type=submit].usa-button-gray,\n  [type=reset].usa-button-gray,\n  [type=image].usa-button-gray {\n    background-color: #666666; }\n    .usa-button.usa-button-gray:hover, .usa-button.usa-button-gray.usa-button-hover,\n    .usa-button-primary.usa-button-gray:hover,\n    .usa-button-primary.usa-button-gray.usa-button-hover,\n    .usa-button:visited.usa-button-gray:hover,\n    .usa-button:visited.usa-button-gray.usa-button-hover,\n    .usa-button-primary:visited.usa-button-gray:hover,\n    .usa-button-primary:visited.usa-button-gray.usa-button-hover,\n    button.usa-button-gray:hover,\n    button.usa-button-gray.usa-button-hover,\n    [type=button].usa-button-gray:hover,\n    [type=button].usa-button-gray.usa-button-hover,\n    [type=submit].usa-button-gray:hover,\n    [type=submit].usa-button-gray.usa-button-hover,\n    [type=reset].usa-button-gray:hover,\n    [type=reset].usa-button-gray.usa-button-hover,\n    [type=image].usa-button-gray:hover,\n    [type=image].usa-button-gray.usa-button-hover {\n      background-color: #333333; }\n    .usa-button.usa-button-gray:active, .usa-button.usa-button-gray.usa-button-active,\n    .usa-button-primary.usa-button-gray:active,\n    .usa-button-primary.usa-button-gray.usa-button-active,\n    .usa-button:visited.usa-button-gray:active,\n    .usa-button:visited.usa-button-gray.usa-button-active,\n    .usa-button-primary:visited.usa-button-gray:active,\n    .usa-button-primary:visited.usa-button-gray.usa-button-active,\n    button.usa-button-gray:active,\n    button.usa-button-gray.usa-button-active,\n    [type=button].usa-button-gray:active,\n    [type=button].usa-button-gray.usa-button-active,\n    [type=submit].usa-button-gray:active,\n    [type=submit].usa-button-gray.usa-button-active,\n    [type=reset].usa-button-gray:active,\n    [type=reset].usa-button-gray.usa-button-active,\n    [type=image].usa-button-gray:active,\n    [type=image].usa-button-gray.usa-button-active {\n      background-color: #212121; }\n  .usa-button.usa-button-red,\n  .usa-button-primary.usa-button-red,\n  .usa-button:visited.usa-button-red,\n  .usa-button-primary:visited.usa-button-red,\n  button.usa-button-red,\n  [type=button].usa-button-red,\n  [type=submit].usa-button-red,\n  [type=reset].usa-button-red,\n  [type=image].usa-button-red {\n    background-color: #005495; }\n    .usa-button.usa-button-red:hover, .usa-button.usa-button-red.usa-button-hover,\n    .usa-button-primary.usa-button-red:hover,\n    .usa-button-primary.usa-button-red.usa-button-hover,\n    .usa-button:visited.usa-button-red:hover,\n    .usa-button:visited.usa-button-red.usa-button-hover,\n    .usa-button-primary:visited.usa-button-red:hover,\n    .usa-button-primary:visited.usa-button-red.usa-button-hover,\n    button.usa-button-red:hover,\n    button.usa-button-red.usa-button-hover,\n    [type=button].usa-button-red:hover,\n    [type=button].usa-button-red.usa-button-hover,\n    [type=submit].usa-button-red:hover,\n    [type=submit].usa-button-red.usa-button-hover,\n    [type=reset].usa-button-red:hover,\n    [type=reset].usa-button-red.usa-button-hover,\n    [type=image].usa-button-red:hover,\n    [type=image].usa-button-red.usa-button-hover {\n      background-color: #981b1e; }\n    .usa-button.usa-button-red:active, .usa-button.usa-button-red.usa-button-active,\n    .usa-button-primary.usa-button-red:active,\n    .usa-button-primary.usa-button-red.usa-button-active,\n    .usa-button:visited.usa-button-red:active,\n    .usa-button:visited.usa-button-red.usa-button-active,\n    .usa-button-primary:visited.usa-button-red:active,\n    .usa-button-primary:visited.usa-button-red.usa-button-active,\n    button.usa-button-red:active,\n    button.usa-button-red.usa-button-active,\n    [type=button].usa-button-red:active,\n    [type=button].usa-button-red.usa-button-active,\n    [type=submit].usa-button-red:active,\n    [type=submit].usa-button-red.usa-button-active,\n    [type=reset].usa-button-red:active,\n    [type=reset].usa-button-red.usa-button-active,\n    [type=image].usa-button-red:active,\n    [type=image].usa-button-red.usa-button-active {\n      background-color: #cd2026; }\n  .usa-button.usa-button-big,\n  .usa-button-primary.usa-button-big,\n  .usa-button:visited.usa-button-big,\n  .usa-button-primary:visited.usa-button-big,\n  button.usa-button-big,\n  [type=button].usa-button-big,\n  [type=submit].usa-button-big,\n  [type=reset].usa-button-big,\n  [type=image].usa-button-big {\n    border-radius: 8px;\n    font-size: 2.4rem;\n    padding: 1.5rem 3rem; }\n  .usa-button:disabled,\n  .usa-button-primary:disabled,\n  .usa-button:visited:disabled,\n  .usa-button-primary:visited:disabled,\n  button:disabled,\n  [type=button]:disabled,\n  [type=submit]:disabled,\n  [type=reset]:disabled,\n  [type=image]:disabled {\n    background-color: #c9c9c9;\n    pointer-events: none; }\n    .usa-button:disabled:hover, .usa-button:disabled.usa-button-hover, .usa-button:disabled:active, .usa-button:disabled.usa-button-active, .usa-button:disabled:focus, .usa-button:disabled.usa-focus,\n    .usa-button-primary:disabled:hover,\n    .usa-button-primary:disabled.usa-button-hover,\n    .usa-button-primary:disabled:active,\n    .usa-button-primary:disabled.usa-button-active,\n    .usa-button-primary:disabled:focus,\n    .usa-button-primary:disabled.usa-focus,\n    .usa-button:visited:disabled:hover,\n    .usa-button:visited:disabled.usa-button-hover,\n    .usa-button:visited:disabled:active,\n    .usa-button:visited:disabled.usa-button-active,\n    .usa-button:visited:disabled:focus,\n    .usa-button:visited:disabled.usa-focus,\n    .usa-button-primary:visited:disabled:hover,\n    .usa-button-primary:visited:disabled.usa-button-hover,\n    .usa-button-primary:visited:disabled:active,\n    .usa-button-primary:visited:disabled.usa-button-active,\n    .usa-button-primary:visited:disabled:focus,\n    .usa-button-primary:visited:disabled.usa-focus,\n    button:disabled:hover,\n    button:disabled.usa-button-hover,\n    button:disabled:active,\n    button:disabled.usa-button-active,\n    button:disabled:focus,\n    button:disabled.usa-focus,\n    [type=button]:disabled:hover,\n    [type=button]:disabled.usa-button-hover,\n    [type=button]:disabled:active,\n    [type=button]:disabled.usa-button-active,\n    [type=button]:disabled:focus,\n    [type=button]:disabled.usa-focus,\n    [type=submit]:disabled:hover,\n    [type=submit]:disabled.usa-button-hover,\n    [type=submit]:disabled:active,\n    [type=submit]:disabled.usa-button-active,\n    [type=submit]:disabled:focus,\n    [type=submit]:disabled.usa-focus,\n    [type=reset]:disabled:hover,\n    [type=reset]:disabled.usa-button-hover,\n    [type=reset]:disabled:active,\n    [type=reset]:disabled.usa-button-active,\n    [type=reset]:disabled:focus,\n    [type=reset]:disabled.usa-focus,\n    [type=image]:disabled:hover,\n    [type=image]:disabled.usa-button-hover,\n    [type=image]:disabled:active,\n    [type=image]:disabled.usa-button-active,\n    [type=image]:disabled:focus,\n    [type=image]:disabled.usa-focus {\n      background-color: #c9c9c9;\n      border: 0;\n      box-shadow: none; }\n\n/* stylelint-disable */\n.usa-button-disabled {\n  background-color: #c9c9c9;\n  pointer-events: none; }\n  .usa-button-disabled:hover, .usa-button-disabled.usa-button-hover, .usa-button-disabled:active, .usa-button-disabled.usa-button-active, .usa-button-disabled:focus, .usa-button-disabled.usa-focus {\n    background-color: #c9c9c9;\n    border: 0;\n    box-shadow: none; }\n\n.usa-button-secondary-disabled,\n.usa-button-secondary-inverse-disabled,\n.usa-button-secondary:disabled,\n.usa-button-secondary-inverse:disabled,\n.usa-button-outline-inverse:disabled {\n  box-shadow: inset 0 0 0 2px #c9c9c9;\n  pointer-events: none;\n  color: #c9c9c9; }\n  .usa-button-secondary-disabled:hover, .usa-button-secondary-disabled.usa-button-hover, .usa-button-secondary-disabled:active, .usa-button-secondary-disabled.usa-button-active, .usa-button-secondary-disabled:focus, .usa-button-secondary-disabled.usa-focus,\n  .usa-button-secondary-inverse-disabled:hover,\n  .usa-button-secondary-inverse-disabled.usa-button-hover,\n  .usa-button-secondary-inverse-disabled:active,\n  .usa-button-secondary-inverse-disabled.usa-button-active,\n  .usa-button-secondary-inverse-disabled:focus,\n  .usa-button-secondary-inverse-disabled.usa-focus,\n  .usa-button-secondary:disabled:hover,\n  .usa-button-secondary:disabled.usa-button-hover,\n  .usa-button-secondary:disabled:active,\n  .usa-button-secondary:disabled.usa-button-active,\n  .usa-button-secondary:disabled:focus,\n  .usa-button-secondary:disabled.usa-focus,\n  .usa-button-secondary-inverse:disabled:hover,\n  .usa-button-secondary-inverse:disabled.usa-button-hover,\n  .usa-button-secondary-inverse:disabled:active,\n  .usa-button-secondary-inverse:disabled.usa-button-active,\n  .usa-button-secondary-inverse:disabled:focus,\n  .usa-button-secondary-inverse:disabled.usa-focus,\n  .usa-button-outline-inverse:disabled:hover,\n  .usa-button-outline-inverse:disabled.usa-button-hover,\n  .usa-button-outline-inverse:disabled:active,\n  .usa-button-outline-inverse:disabled.usa-button-active,\n  .usa-button-outline-inverse:disabled:focus,\n  .usa-button-outline-inverse:disabled.usa-focus {\n    background-color: #ffffff;\n    border: 0; }\n\nhtml .usa-button-secondary-disabled,\n.usa-button-secondary:disabled {\n  background-color: #ffffff; }\n\nhtml .usa-button-secondary-inverse-disabled,\n.usa-button-secondary-inverse:disabled {\n  background-color: transparent;\n  color: #666666;\n  box-shadow: inset 0 0 0 2px #666666; }\n\n.usa-button-unstyled {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto; }\n  .usa-button-unstyled:hover {\n    background-color: transparent; }\n\n.usa-embed-container iframe,\n.usa-embed-container object,\n.usa-embed-container embed {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 100%;\n  height: 100%; }\n\n.usa-embed-container {\n  padding-bottom: 56.25%;\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  max-width: 100%; }\n\nimg {\n  max-width: 100%; }\n\n.media_link {\n  display: inline-block;\n  line-height: 0; }\n\n/* stylelint-disable selector-no-qualifying-type */\ninput,\ntextarea,\nselect {\n  appearance: none;\n  border: 0.1rem solid #666666;\n  border-radius: 0;\n  box-sizing: border-box;\n  color: #212121;\n  display: block;\n  font-size: 1.7rem;\n  height: 4.4rem;\n  line-height: 1.3;\n  margin: 0.2em 0;\n  max-width: 46rem;\n  padding: 1rem 0.7em;\n  width: 100%; }\n  input.usa-input-success,\n  textarea.usa-input-success,\n  select.usa-input-success {\n    border: 3px solid #4aa564; }\n\n/* stylelint-enable */\n.usa-input-error {\n  border-left: 4px solid #981b1e;\n  margin-top: 3rem;\n  padding-bottom: 0.8rem;\n  padding-left: 1.5rem;\n  padding-top: 0.8rem;\n  position: relative;\n  right: 1.9rem; }\n  .usa-input-error input,\n  .usa-input-error textarea,\n  .usa-input-error select {\n    border: 3px solid #981b1e;\n    width: calc(100% + 1.9rem); }\n  .usa-input-error label {\n    margin-top: 0; }\n  .usa-input-error .usa-input-inline {\n    border: 0.1rem solid #666666;\n    width: inherit; }\n  .usa-input-error .usa-input-inline-error {\n    border: 3px solid #981b1e; }\n\n.usa-input-error-label {\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700; }\n\n.usa-input-error-message {\n  color: #981b1e;\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700;\n  padding-bottom: 3px;\n  padding-top: 3px; }\n\n.usa-input-required:after {\n  color: #cd2026;\n  content: ' (*required)'; }\n\n.usa-input-optional:after {\n  color: #757575;\n  content: ' (optional)'; }\n\nlabel {\n  display: block;\n  margin-top: 3rem;\n  max-width: 46rem; }\n\ntextarea {\n  height: 16rem; }\n\nselect {\n  -moz-appearance: none;\n  -webkit-appearance: none;\n  appearance: none;\n  background-color: #ffffff;\n  background-image: url(\"../img/arrow-both.png\");\n  background-image: url(\"../img/arrow-both.svg\");\n  background-position: right 1.3rem center;\n  background-repeat: no-repeat;\n  background-size: 1rem;\n  padding-right: 3rem; }\n  select::-ms-expand {\n    display: none; }\n  select:-webkit-autofill {\n    appearance: menulist; }\n  select:-moz-focusring {\n    color: transparent;\n    text-shadow: 0 0 0 #000000; }\n\noption:first-child {\n  font-weight: 700; }\n\nlegend {\n  font-size: 3rem;\n  font-weight: 700; }\n\n.usa-fieldset-inputs label {\n  margin-top: 0; }\n\n.usa-form-hint {\n  color: #757575;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0; }\n\n[type=checkbox],\n[type=radio] {\n  position: absolute;\n  left: -999em; }\n  .lt-ie9 [type=checkbox], .lt-ie9\n  [type=radio] {\n    border: 0;\n    float: left;\n    margin: 0.4em 0.4em 0 0;\n    position: static;\n    width: auto; }\n\n[type=checkbox] + label,\n[type=radio] + label {\n  cursor: pointer;\n  font-weight: 400;\n  margin-bottom: 0.65em; }\n\n[type=checkbox] + label::before,\n[type=radio] + label::before {\n  background: #ffffff;\n  border-radius: 2px;\n  box-shadow: 0 0 0 1px #757575;\n  content: '\\a0';\n  display: inline-block;\n  height: 2rem;\n  line-height: 2rem;\n  margin-right: 0.6em;\n  text-indent: 0.15em;\n  vertical-align: middle\\0;\n  width: 2rem; }\n\n[type=radio] + label::before {\n  border-radius: 100%;\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 3px #757575;\n  height: 1.4rem;\n  line-height: 1.4rem;\n  margin-right: 0.75em;\n  width: 1.4rem; }\n\n[type=checkbox]:checked + label::before,\n[type=radio]:checked + label::before {\n  background-color: #0071BC;\n  box-shadow: 0 0 0 1px #0071BC; }\n\n[type=radio]:checked + label::before {\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #0071BC; }\n\n[type=checkbox]:checked + label::before,\n[type=checkbox]:checked:disabled + label::before {\n  background-image: url(\"../img/correct8.png\");\n  background-image: url(\"../img/correct8.svg\");\n  background-position: 50%;\n  background-repeat: no-repeat; }\n\n[type=radio]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 6px; }\n\n[type=checkbox]:disabled + label {\n  color: #c9c9c9; }\n\n[type=checkbox]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n[type=checkbox]:disabled + label::before,\n[type=radio]:disabled + label::before {\n  background: #e4e4e4;\n  box-shadow: 0 0 0 1px #999999;\n  cursor: not-allowed; }\n\n[type=range] {\n  -webkit-appearance: none;\n  border: none;\n  padding-left: 0;\n  width: 100%; }\n\n[type=range]::-webkit-slider-runnable-track {\n  background: #999999;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-moz-range-track {\n  background: #0071BC;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-ms-track {\n  background: transparent;\n  color: transparent;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-webkit-slider-thumb {\n  -webkit-appearance: none;\n  border: 1px solid #757575;\n  height: 2.2rem;\n  border-radius: 1.5rem;\n  background: #e4e4e4;\n  cursor: pointer;\n  margin-top: -.65rem;\n  width: 2.2rem; }\n\n[type=range]::-moz-range-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-fill-lower {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n[type=range]::-ms-fill-upper {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n.usa-date-of-birth label {\n  margin-top: 0; }\n\n.usa-date-of-birth [type=number]::-webkit-inner-spin-button,\n.usa-date-of-birth [type=number]::-webkit-outer-spin-button {\n  -webkit-appearance: none;\n  appearance: none;\n  margin: 0; }\n\n.usa-date-of-birth [type=number] {\n  -moz-appearance: textfield; }\n\n.usa-form-group-day,\n.usa-form-group-month,\n.usa-form-group-year {\n  clear: none;\n  float: left;\n  margin-right: 1.5rem;\n  width: 5rem; }\n\n.usa-form-group-year {\n  width: 7rem; }\n\n.usa-label, .usa-label-big {\n  background-color: #666666;\n  border-radius: 2px;\n  color: #ffffff;\n  font-size: 1.5rem;\n  margin-right: 0.5rem;\n  padding: 0.1rem 0.7rem;\n  text-transform: uppercase; }\n  .usa-label:only-of-type, .usa-label-big:only-of-type {\n    margin-right: 0; }\n\n.usa-label-big {\n  font-size: 1.7rem;\n  padding-left: 0.9rem;\n  padding-right: 0.9rem; }\n\nul,\nol {\n  margin-top: 1em;\n  margin-bottom: 1em;\n  padding-left: 1.94em; }\n\nli {\n  line-height: 1.5;\n  margin-bottom: 0.5em; }\n  li:last-child {\n    margin-bottom: 0; }\n\nh1 + ul,\nh1 + ol,\nh2 + ul,\nh2 + ol,\nh3 + ul,\nh3 + ol,\nh4 + ul,\nh4 + ol,\nh5 + ul,\nh5 + ol,\nh6 + ul,\nh6 + ol,\np + ul,\np + ol {\n  margin-top: 0; }\n\n.usa-unstyled-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-unstyled-list > li {\n    margin-bottom: 0; }\n\ntable {\n  border-spacing: 0;\n  margin: 2em 0; }\n\nthead th {\n  font-weight: 700; }\n\nthead th,\nthead td {\n  background-color: #e4e4e4; }\n\nth {\n  text-align: left; }\n\nth,\ntd {\n  background-color: #ffffff;\n  border: 1px solid #666666;\n  font-weight: 400;\n  padding: 1rem 1.5rem; }\n\n.usa-table-borderless thead th {\n  background-color: transparent;\n  border-top: 0; }\n\n.usa-table-borderless th,\n.usa-table-borderless td {\n  border-left: 0;\n  border-right: 0; }\n\n.usa-table-borderless th:first-child {\n  padding-left: 0; }\n\ncaption {\n  font-size: 1.5rem;\n  font-weight: 700;\n  font-family: \"Work Sans\", sans-serif;\n  margin-bottom: 1.2rem;\n  text-align: left; }\n\nhtml {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 10px; }\n\nbody {\n  font-size: 1.7rem; }\n\np {\n  line-height: 1.5;\n  margin-bottom: 1em;\n  margin-top: 1em; }\n\na {\n  color: #0071BC;\n  text-decoration: underline; }\n  a:hover, a:active {\n    color: #205493; }\n  a:focus {\n    outline: 2px dotted #999999;\n    outline-offset: 3px; }\n  a:visited {\n    color: #4c2c92; }\n\n.usa-external_link::after {\n  background: url(\"../img/external-link.png\") no-repeat 0 0;\n  background: url(\"../img/external-link.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link:hover::after {\n  background-image: url(\"../img/external-link-hover.png\");\n  background-image: url(\"../img/external-link-hover.svg\"); }\n\n.usa-external_link-alt::after {\n  background: url(\"../img/external-link-alt.png\") no-repeat 0 0;\n  background: url(\"../img/external-link-alt.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link-alt:hover::after {\n  background-image: url(\"../img/external-link-alt-hover.png\");\n  background-image: url(\"../img/external-link-alt-hover.svg\"); }\n\nh1,\nh2,\nh3,\nh4,\nh5 {\n  clear: both;\n  font-family: \"Work Sans\", sans-serif;\n  line-height: 1.3;\n  margin-bottom: .5em;\n  margin-top: 1.5em; }\n\nh6 {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\nh1 {\n  font-size: 4rem;\n  font-weight: 700; }\n\nh2 {\n  font-size: 3rem;\n  font-weight: 700; }\n\nh3 {\n  font-size: 2rem;\n  font-weight: 700; }\n\nh4 {\n  font-size: 1.7rem;\n  font-weight: 700; }\n\nh5 {\n  font-size: 1.5rem;\n  font-weight: 700; }\n\nh6 {\n  font-size: 1.3rem;\n  font-weight: 400;\n  line-height: 1.5;\n  text-transform: uppercase; }\n\ncite,\nvar,\naddress,\ndfn {\n  font-style: normal; }\n\n.usa-content p,\n.usa-content ul:not(.usa-accordion):not(.usa-accordion-bordered),\n.usa-content ol:not(.usa-accordion):not(.usa-accordion-bordered) {\n  max-width: 66ch; }\n\n.usa-content-list {\n  max-width: 66ch; }\n\n.usa-sans p,\n.usa-sans a,\n.usa-sans li,\n.usa-sans span {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\n.usa-sans a {\n  border-bottom: none;\n  font-weight: 700; }\n\n.usa-serif p,\n.usa-serif a,\n.usa-serif li,\n.usa-serif span {\n  font-family: \"Work Sans\", sans-serif; }\n\n.usa-display {\n  font-size: 2rem;\n  font-weight: 700;\n  margin-bottom: 0; }\n  @media screen and (min-width: 481px) {\n    .usa-display {\n      font-size: 4rem;\n      font-weight: 700; } }\n  @media screen and (min-width: 600px) {\n    .usa-display {\n      font-size: 5.2rem;\n      font-weight: 700; } }\n\n.usa-font-lead {\n  font-family: \"Work Sans\", sans-serif;\n  font-size: 2rem;\n  font-weight: 400;\n  line-height: 1.7;\n  max-width: 77rem; }\n\n.usa-image-block {\n  position: relative; }\n\n.usa-image-text-block {\n  color: #ffffff;\n  left: 0;\n  margin-left: 8%;\n  position: absolute;\n  top: 0; }\n\n.usa-image-text {\n  margin-top: 0; }\n\n.usa-drop_text {\n  margin-bottom: 0; }\n\n.usa-background-dark {\n  background-color: #333333; }\n  .usa-background-dark p,\n  .usa-background-dark span {\n    color: #ffffff; }\n  .usa-background-dark a {\n    color: #c9c9c9; }\n    .usa-background-dark a:hover {\n      color: #ffffff; }\n\n.usa-text-small {\n  font-size: 1.3rem;\n  margin-top: 0; }\n\n.usa-section > :first-child,\n.usa-grid > :first-child,\n.usa-grid-full > :first-child {\n  margin-top: 0; }\n\n.usa-section > :last-child,\n.usa-grid > :last-child,\n.usa-grid-full > :last-child {\n  margin-bottom: 0; }\n\n.usa-width-one-whole:first-child > :first-child,\n.usa-width-one-half:first-child > :first-child,\n.usa-width-one-third:first-child > :first-child,\n.usa-width-two-thirds:first-child > :first-child,\n.usa-width-one-fourth:first-child > :first-child,\n.usa-width-three-fourths:first-child > :first-child,\n.usa-width-one-sixth:first-child > :first-child,\n.usa-width-five-sixths:first-child > :first-child,\n.usa-width-one-twelfth:first-child > :first-child {\n  margin-top: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :first-child,\n  .usa-width-one-half > :first-child,\n  .usa-width-one-third > :first-child,\n  .usa-width-two-thirds > :first-child,\n  .usa-width-one-fourth > :first-child,\n  .usa-width-three-fourths > :first-child,\n  .usa-width-one-sixth > :first-child,\n  .usa-width-five-sixths > :first-child,\n  .usa-width-one-twelfth > :first-child {\n    margin-top: 0; } }\n\n.usa-width-one-whole:last-child > :last-child,\n.usa-width-one-half:last-child > :last-child,\n.usa-width-one-third:last-child > :last-child,\n.usa-width-two-thirds:last-child > :last-child,\n.usa-width-one-fourth:last-child > :last-child,\n.usa-width-three-fourths:last-child > :last-child,\n.usa-width-one-sixth:last-child > :last-child,\n.usa-width-five-sixths:last-child > :last-child,\n.usa-width-one-twelfth:last-child > :last-child {\n  margin-bottom: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :last-child,\n  .usa-width-one-half > :last-child,\n  .usa-width-one-third > :last-child,\n  .usa-width-two-thirds > :last-child,\n  .usa-width-one-fourth > :last-child,\n  .usa-width-three-fourths > :last-child,\n  .usa-width-one-sixth > :last-child,\n  .usa-width-five-sixths > :last-child,\n  .usa-width-one-twelfth > :last-child {\n    margin-bottom: 0; } }\n\n.usa-accordion,\n.usa-accordion-bordered {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  color: #212121;\n  margin: 0;\n  padding: 0;\n  width: 100%; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    margin-bottom: 0; }\n  .usa-accordion > ul li ul,\n  .usa-accordion-bordered > ul li ul {\n    list-style: disc; }\n    .usa-accordion > ul li ul > li > ul,\n    .usa-accordion-bordered > ul li ul > li > ul {\n      list-style: circle; }\n      .usa-accordion > ul li ul > li > ul > li > ul,\n      .usa-accordion-bordered > ul li ul > li > ul > li > ul {\n        list-style: square; }\n  .usa-accordion + .usa-accordion,\n  .usa-accordion + .usa-accordion-bordered,\n  .usa-accordion-bordered + .usa-accordion,\n  .usa-accordion-bordered + .usa-accordion-bordered {\n    margin-top: 1rem; }\n  .usa-accordion > ul,\n  .usa-accordion-bordered > ul {\n    margin-top: 0;\n    margin-bottom: 0;\n    list-style-type: none;\n    padding-left: 0;\n    color: #212121;\n    margin: 0;\n    padding: 0;\n    width: 100%; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      margin-bottom: 0; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      background-color: #e4e4e4;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      list-style: none;\n      margin-bottom: 0.5rem;\n      width: 100%; }\n    .usa-accordion > ul button,\n    .usa-accordion-bordered > ul button {\n      background-color: transparent;\n      border: 0;\n      border-radius: 0;\n      font-weight: 400;\n      margin: 0;\n      padding: 0;\n      text-align: left;\n      -webkit-font-smoothing: auto;\n      background-color: #e4e4e4;\n      background-image: url(\"../img/minus.png\");\n      background-image: url(\"../img/minus.svg\");\n      background-position: right 2rem center;\n      background-repeat: no-repeat;\n      background-size: 1.5rem;\n      color: #212121;\n      cursor: pointer;\n      display: inline-block;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      font-weight: 700;\n      margin: 0;\n      padding: 1.5rem 5.5rem 1.5rem 2rem;\n      width: 100%; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: transparent; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: #c9c9c9;\n        color: #212121; }\n      .usa-accordion > ul button h1,\n      .usa-accordion > ul button h2,\n      .usa-accordion > ul button h3,\n      .usa-accordion > ul button h4,\n      .usa-accordion > ul button h5,\n      .usa-accordion > ul button h6,\n      .usa-accordion-bordered > ul button h1,\n      .usa-accordion-bordered > ul button h2,\n      .usa-accordion-bordered > ul button h3,\n      .usa-accordion-bordered > ul button h4,\n      .usa-accordion-bordered > ul button h5,\n      .usa-accordion-bordered > ul button h6 {\n        margin: 0; }\n    .usa-accordion > ul [aria-expanded=false],\n    .usa-accordion-bordered > ul [aria-expanded=false] {\n      background-image: url(\"../img/plus.png\");\n      background-image: url(\"../img/plus.svg\");\n      background-repeat: no-repeat;\n      background-size: 1.5rem; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    background-color: #e4e4e4;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    list-style: none;\n    margin-bottom: 0.5rem;\n    width: 100%; }\n\n.usa-accordion-bordered .usa-accordion-content {\n  border-bottom: 3px solid #e4e4e4;\n  border-left: 3px solid #e4e4e4;\n  border-right: 3px solid #e4e4e4; }\n\n.usa-accordion-content {\n  background-color: #ffffff;\n  overflow: auto;\n  padding: 1.5rem 2rem; }\n  .usa-accordion-content > *:first-child {\n    margin-top: 0; }\n  .usa-accordion-content > *:last-child {\n    margin-bottom: 0; }\n  .usa-accordion-content:not([aria-hidden]) {\n    position: absolute;\n    left: -999em; }\n  .usa-accordion-content[aria-hidden=true] {\n    display: none; }\n\n.usa-accordion-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #e4e4e4;\n  background-image: url(\"../img/minus.png\");\n  background-image: url(\"../img/minus.svg\");\n  background-position: right 2rem center;\n  background-repeat: no-repeat;\n  background-size: 1.5rem;\n  color: #212121;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-weight: 700;\n  margin: 0;\n  padding: 1.5rem 5.5rem 1.5rem 2rem;\n  width: 100%; }\n  .usa-accordion-button:hover {\n    background-color: transparent; }\n  .usa-accordion-button:hover {\n    background-color: #c9c9c9;\n    color: #212121; }\n  .usa-accordion-button h1,\n  .usa-accordion-button h2,\n  .usa-accordion-button h3,\n  .usa-accordion-button h4,\n  .usa-accordion-button h5,\n  .usa-accordion-button h6 {\n    margin: 0; }\n\n.usa-accordion-button[aria-expanded=false] {\n  background-image: url(\"../img/plus.png\");\n  background-image: url(\"../img/plus.svg\");\n  background-repeat: no-repeat;\n  background-size: 1.5rem; }\n\n.usa-alert {\n  background-color: #e4e4e4;\n  background-position: 2rem 2rem;\n  background-repeat: no-repeat;\n  background-size: 5.2rem;\n  padding-bottom: 1.4rem;\n  padding-left: 3rem;\n  padding-right: 2rem;\n  padding-top: 2rem;\n  position: relative; }\n  .usa-alert::before {\n    background-color: #7e7e7e;\n    content: '';\n    height: 100%;\n    left: 0;\n    position: absolute;\n    top: 0;\n    width: 1rem; }\n  .usa-alert a {\n    color: #205493; }\n    .usa-alert a:focus, .usa-alert a:hover {\n      color: #112E51; }\n  .usa-alert ul {\n    margin-bottom: 0;\n    margin-top: 1rem;\n    padding-left: 1rem; }\n\n.usa-alert-slim {\n  background-position: 2rem 1rem;\n  padding-bottom: 1rem;\n  padding-top: 1rem; }\n  .usa-alert-slim .usa-alert-text:only-child {\n    margin-bottom: 0.5rem;\n    padding-top: 0.5rem; }\n\n.usa-alert-icon {\n  display: table-cell;\n  padding-right: 1rem; }\n\n.usa-alert-body {\n  display: table-cell;\n  padding-left: 5rem;\n  vertical-align: top; }\n\n.usa-alert-heading {\n  margin-top: 0;\n  margin-bottom: 0; }\n\n.usa-alert-text {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0;\n  margin-top: 0; }\n\n.usa-alert-text:only-child {\n  margin-bottom: 1rem;\n  padding-top: 0.5rem; }\n\n.usa-alert-success {\n  background-color: #e7f4e4;\n  background-image: url(\"../img/alerts/success.png\");\n  background-image: url(\"../img/alerts/success.svg\"); }\n  .usa-alert-success::before {\n    background-color: #2e8540; }\n\n.usa-alert-warning {\n  background-color: #fff1d2;\n  background-image: url(\"../img/alerts/warning.png\");\n  background-image: url(\"../img/alerts/warning.svg\"); }\n  .usa-alert-warning::before {\n    background-color: #fdb81e; }\n\n.usa-alert-error {\n  background-color: #f9dede;\n  background-image: url(\"../img/alerts/error.png\");\n  background-image: url(\"../img/alerts/error.svg\"); }\n  .usa-alert-error::before {\n    background-color: #005495; }\n\n.usa-alert-info {\n  background-color: #e1f3f8;\n  background-image: url(\"../img/alerts/info.png\");\n  background-image: url(\"../img/alerts/info.svg\"); }\n  .usa-alert-info::before {\n    background-color: #c64b00; }\n\n.usa-alert-no_icon {\n  background-image: none; }\n\n.usa-alert-paragraph {\n  width: 66ch; }\n\n.usa-alert {\n  margin-top: 1.5em; }\n\n.usa-banner {\n  background-color: #e4e4e4;\n  padding-bottom: 0.7rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner {\n      font-size: 1.3rem;\n      padding-bottom: 0; } }\n\n.usa-banner-content {\n  padding-right: 1.5rem;\n  padding-bottom: 3px;\n  padding-left: 1.5rem;\n  background-color: transparent;\n  font-size: 1.5rem;\n  padding-top: 2rem;\n  width: 100%; }\n  @media screen and (min-width: 600px) {\n    .usa-banner-content {\n      padding-bottom: 2.3rem;\n      padding-top: 4rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-banner-content {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n  .usa-banner-content p:first-child {\n    margin-top: 1rem; }\n    @media screen and (min-width: 600px) {\n      .usa-banner-content p:first-child {\n        margin-top: 0; } }\n\n.usa-banner-inner {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  padding-right: 1.5rem;\n  padding-left: 1.5rem;\n  max-width: 1040px; }\n  .usa-banner-inner::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  @media screen and (min-width: 951px) {\n    .usa-banner-inner {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-banner-header {\n  padding-top: 0.55rem;\n  padding-bottom: 0.55rem;\n  font-size: 1.2rem;\n  font-weight: 400; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header {\n      padding-top: 0;\n      padding-bottom: 0; } }\n  .usa-banner-header p {\n    margin-top: 0;\n    margin-bottom: 0;\n    display: inline;\n    overflow: hidden;\n    vertical-align: middle; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header p {\n        margin-top: 2px;\n        margin-bottom: 2px;\n        display: inline-block; } }\n  .usa-banner-header img {\n    float: left;\n    margin-right: 1rem;\n    margin-top: 1px;\n    width: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header img {\n        margin-right: 0.7rem;\n        width: 2rem; } }\n\n.usa-banner-header-expanded {\n  align-items: center;\n  border-bottom: 1px solid #999999;\n  display: flex;\n  font-size: 1.5rem;\n  min-height: 5.6rem;\n  padding-right: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header-expanded {\n      border-bottom: none;\n      display: block;\n      font-size: 1.2rem;\n      font-weight: 400;\n      min-height: 0;\n      padding-right: 0; } }\n  .usa-banner-header-expanded > .usa-banner-inner {\n    margin-left: 0; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded > .usa-banner-inner {\n        margin-left: auto; } }\n  .usa-banner-header-expanded img {\n    margin-right: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded img {\n        margin-right: 0.7rem; } }\n  .usa-banner-header-expanded p {\n    line-height: 1.3;\n    vertical-align: top; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded p {\n        line-height: 1.5;\n        vertical-align: middle; } }\n\n.usa-banner-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  padding-top: 1.3rem;\n  padding-left: 4.8rem;\n  background-position-x: right;\n  color: #0071BC;\n  display: block;\n  font-size: 1.2rem;\n  height: 4.3rem;\n  left: 0;\n  position: absolute;\n  text-decoration: underline;\n  top: 0;\n  width: 100%; }\n  .usa-banner-button:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-button {\n      padding-top: 0;\n      padding-left: 0;\n      /* stylelint-disable declaration-block-no-ignored-properties */\n      display: inline;\n      height: initial;\n      margin-left: 3px;\n      position: relative;\n      vertical-align: middle;\n      width: initial;\n      /* stylelint-enable */ } }\n  .usa-banner-button:hover {\n    color: #205493;\n    text-decoration: underline; }\n  .usa-banner-button[aria-expanded=false] {\n    background-image: none; }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-image: url(\"../img/angle-arrow-down-primary.png\");\n      background-image: url(\"../img/angle-arrow-down-primary.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1rem;\n      width: 1rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    .usa-banner-button[aria-expanded=false]:hover::after {\n      background-image: url(\"../img/angle-arrow-down-primary-hover.png\");\n      background-image: url(\"../img/angle-arrow-down-primary-hover.svg\"); }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-position-y: 1px; }\n  .usa-banner-button[aria-expanded=true] {\n    background-image: none;\n    height: 5.6rem; }\n    .usa-banner-button[aria-expanded=true]::after {\n      background-image: url(\"../img/close.png\");\n      background-image: url(\"../img/close.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1.3rem;\n      width: 1.3rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    @media screen and (min-width: 481px) {\n      .usa-banner-button[aria-expanded=true] {\n        height: initial;\n        padding: 0;\n        position: relative; }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-image: url(\"../img/angle-arrow-up-primary.png\");\n          background-image: url(\"../img/angle-arrow-up-primary.svg\");\n          background-size: 100%;\n          content: '';\n          display: inline-block;\n          height: 1rem;\n          width: 1rem;\n          /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n          margin-left: 0;\n          /* stylelint-enable */ }\n        .usa-banner-button[aria-expanded=true]:hover::after {\n          background-image: url(\"../img/angle-arrow-up-primary-hover.png\");\n          background-image: url(\"../img/angle-arrow-up-primary-hover.svg\"); }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-position-y: 1px; } }\n    .usa-banner-button[aria-expanded=true]::after {\n      position: absolute;\n      right: 1.5rem;\n      top: 2.15rem; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true]::after {\n          position: static; } }\n    .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n      display: none; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n          display: inline; } }\n\n.usa-banner-icon {\n  width: 3.8rem; }\n\n.usa-footer .usa-unstyled-list {\n  display: block; }\n\n.usa-footer .usa-footer-primary-link {\n  color: #212121;\n  display: block;\n  font-weight: 700;\n  margin-top: 0;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: none; }\n  @media screen and (min-width: 600px) {\n    .usa-footer .usa-footer-primary-link {\n      border-top: none; } }\n  .usa-footer .usa-footer-primary-link:hover {\n    text-decoration: underline; }\n\n.usa-footer .usa-footer-primary-link ~ li a,\n.usa-footer .usa-footer-secondary-link {\n  text-decoration: none; }\n\n.usa-footer-contact_info {\n  display: inline-block; }\n  .usa-footer-contact_info a {\n    color: #212121;\n    text-decoration: none; }\n  .usa-footer-contact_info:hover {\n    text-decoration: underline; }\n\n.usa-footer-return-to-top {\n  color: #0071BC;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: underline; }\n\n.usa-footer-primary-section {\n  background-color: #e4e4e4; }\n  .usa-footer-primary-section .usa-footer-primary-content {\n    padding-left: 1.5rem;\n    padding-right: 2.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-primary-section .usa-footer-primary-content {\n        padding-left: 0;\n        padding-right: 0; } }\n    .usa-footer-primary-section .usa-footer-primary-content li {\n      margin-left: 1rem; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-primary-section .usa-footer-primary-content li {\n          margin-left: 0; } }\n  @media screen and (min-width: 600px) {\n    .usa-footer-primary-section .usa-grid-full {\n      padding-left: 2.5rem;\n      padding-right: 2.5rem; } }\n\n.usa-footer-medium .usa-footer-contact_info p {\n  margin: 0 1rem 0 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact_info p {\n      margin: 0 0 0 1rem; } }\n\n.usa-footer-medium .usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact-heading {\n      margin-top: 0.5rem;\n      margin-bottom: 0.5rem; } }\n\n.usa-footer-medium .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-logo {\n      padding: 2rem 0; } }\n\n.usa-footer-medium .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-medium .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-medium .usa-footer-nav ul {\n    align-items: center; } }\n\n.usa-footer-slim .usa-footer-nav a {\n  display: block; }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n.usa-footer-slim .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-slim .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-slim .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-primary-section {\n    padding-bottom: 0;\n    padding-top: 0; }\n    .usa-footer-slim .usa-footer-primary-section .usa-grid-full {\n      align-items: center; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info > * {\n    margin: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    padding-top: 1.5rem;\n    padding-bottom: 1.5rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    width: 100%; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-footer-slim .usa-footer-contact_info:last-child {\n      margin-right: 0; } }\n\n/* stylelint-disable selector-no-qualifying-type */\nul.usa-footer-primary-content,\nli.usa-footer-primary-content,\nli.usa-footer-primary-content {\n  border-top: 1px solid #999999; }\n  @media screen and (min-width: 600px) {\n    ul.usa-footer-primary-content,\n    li.usa-footer-primary-content,\n    li.usa-footer-primary-content {\n      border: none; } }\n  ul.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      ul.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child {\n        border-bottom: none; } }\n\n/* stylelint-enable */\n.usa-sign_up-block {\n  padding-bottom: 4.5rem;\n  padding-left: 1.5rem;\n  padding-right: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-sign_up-block {\n      float: right;\n      padding: 0; } }\n  .usa-sign_up-block label:first-of-type {\n    margin-top: 0; }\n  .usa-sign_up-block button {\n    float: none;\n    margin-right: 0;\n    margin-top: 1.5rem; }\n  .usa-sign_up-block input {\n    width: 100%; }\n\n.usa-footer-secondary_section {\n  background-color: #c9c9c9;\n  padding-bottom: 2rem;\n  padding-top: 2rem; }\n  .usa-footer-secondary_section a {\n    color: #212121; }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big-secondary-section {\n    padding-top: 2rem;\n    padding-bottom: 2rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-contact-links {\n    text-align: right; } }\n\n.usa-social-links a {\n  text-decoration: none; }\n\n.usa-footer-big .usa-footer-contact_info {\n  display: block; }\n  .usa-footer-big .usa-footer-contact_info p {\n    margin: 0 1rem 0 0; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-contact_info p {\n        margin: 0.5rem 0 0 1rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-contact-links {\n    padding-top: 2rem; } }\n\n.usa-footer-big .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-logo {\n      padding: 2rem 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-primary-section {\n    padding-bottom: 4rem;\n    padding-top: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content {\n  padding-left: 0;\n  padding-right: 0; }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n    margin-left: 1.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n        margin-left: 0; } }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link {\n    margin-left: 0; }\n\n.usa-footer-big ul {\n  padding-bottom: 2.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big ul {\n      padding-bottom: 0; } }\n  .usa-footer-big ul:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul:last-child {\n        border-bottom: none; } }\n  .usa-footer-big ul li:not(.usa-footer-primary-link) {\n    line-height: 1.3;\n    padding-bottom: 0.35em;\n    padding-top: 0.35em; }\n  .usa-footer-big ul .usa-footer-primary-link {\n    background-image: url(\"../img/arrow-down.png\");\n    background-image: url(\"../img/arrow-down.svg\");\n    background-position: 1.5rem center;\n    background-repeat: no-repeat;\n    background-size: 1.3rem;\n    margin-left: 0;\n    padding-left: 3.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul .usa-footer-primary-link {\n        background: none;\n        margin-bottom: .8rem;\n        padding-bottom: 0;\n        padding-left: 0; } }\n    .usa-footer-big ul .usa-footer-primary-link > * {\n      margin-top: 0;\n      margin-bottom: 0; }\n  .usa-footer-big ul.hidden {\n    /* stylelint-disable-line selector-no-qualifying-type */\n    padding-bottom: 0; }\n    .usa-footer-big ul.hidden li {\n      display: none; }\n    .usa-footer-big ul.hidden .usa-footer-primary-link {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/arrow-right.png\");\n      background-image: url(\"../img/arrow-right.svg\");\n      cursor: pointer;\n      display: block; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-big ul.hidden .usa-footer-primary-link {\n          background: none;\n          padding-left: 0; } }\n\n.usa-footer-topic {\n  margin: 0;\n  padding: 2rem 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-sign_up-header {\n    margin: 0;\n    padding: 2rem 0; } }\n\n.usa-footer-logo-img {\n  max-width: 8rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-img {\n      float: left; } }\n\n.usa-footer-big-logo-img {\n  max-width: 10rem; }\n\n.usa-footer-slim-logo-img {\n  float: left;\n  max-width: 5rem; }\n\n.usa-footer-logo-heading {\n  display: block;\n  margin-top: 1rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-heading {\n      display: inline-block;\n      margin-top: 3rem;\n      padding-left: 1.5rem; } }\n\n.usa-footer-big-logo-heading {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big-logo-heading {\n      margin-top: 2rem; } }\n\n.usa-footer-slim-logo-heading {\n  display: inline-block;\n  margin-top: 1.5rem;\n  padding-left: 1.5rem; }\n\n.usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-contact-heading {\n      margin-top: 1rem; } }\n\n.usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n  margin: 2.5rem 1rem 1.5rem 0;\n  background-position: center center;\n  background-repeat: no-repeat;\n  background-size: auto 3rem;\n  display: inline-block;\n  height: 4.4rem;\n  left: -1.6rem;\n  position: relative;\n  text-align: center;\n  width: 4.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n      margin: 0 0 0 0.5rem;\n      left: 1.5rem; } }\n  .usa-social_link span, .usa-link-facebook span, .usa-link-twitter span, .usa-link-youtube span, .usa-link-rss span {\n    position: absolute;\n    left: -999em; }\n\n.usa-link-facebook {\n  background-image: url(\"../img/social-icons/png/facebook25.png\");\n  background-image: url(\"../img/social-icons/svg/facebook25.svg\"); }\n\n.usa-link-twitter {\n  background-image: url(\"../img/social-icons/png/twitter16.png\");\n  background-image: url(\"../img/social-icons/svg/twitter16.svg\"); }\n\n.usa-link-youtube {\n  background-image: url(\"../img/social-icons/png/youtube15.png\");\n  background-image: url(\"../img/social-icons/svg/youtube15.svg\"); }\n\n.usa-link-rss {\n  background-image: url(\"../img/social-icons/png/rss25.png\");\n  background-image: url(\"../img/social-icons/svg/rss25.svg\"); }\n\nform a {\n  border-bottom: 0; }\n\nform [type=submit],\nform [type=submit] {\n  display: block;\n  margin-bottom: 1.5em;\n  margin-top: 2.5rem; }\n  @media screen and (min-width: 600px) {\n    form [type=submit],\n    form [type=submit] {\n      padding-left: 2.7em;\n      padding-right: 2.7em;\n      width: auto; } }\n\nform [name=password],\nform [name=confirmPassword] {\n  margin-bottom: 1.1rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-form {\n    max-width: 32rem; } }\n\n.usa-form-note {\n  float: right;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.5rem;\n  margin: 0 0 1.5rem; }\n  .usa-form-note + * {\n    clear: both; }\n\nfieldset {\n  border: none;\n  margin: 0;\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-form-large {\n    max-width: 46rem; } }\n\ninput.usa-input-tiny {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-tiny {\n      max-width: 6rem; } }\n\ninput.usa-input-medium {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-medium {\n      max-width: 12rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid {\n    padding-right: 5%; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid:last-of-type {\n    padding-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-small {\n    float: left;\n    width: 35%; } }\n\n.usa-input-grid-small input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-small select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-medium {\n    float: left;\n    width: 65%; } }\n\n.usa-input-grid-medium input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-medium select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-large {\n    float: left;\n    width: 100%; } }\n\n.usa-input-grid-large input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-large select {\n  margin-bottom: 3rem; }\n\n.usa-additional_text {\n  font-weight: normal; }\n\n.usa-checklist {\n  list-style: none;\n  margin-left: 0;\n  padding-left: 0; }\n  .usa-checklist li {\n    display: inline-block;\n    list-style: none;\n    margin-bottom: 0;\n    margin-top: 0;\n    padding-left: 3em;\n    text-indent: -2em; }\n    .usa-checklist li::before {\n      content: ' ';\n      display: inline-block;\n      height: .8em;\n      margin-right: .2em;\n      width: 1.8em; }\n\n.usa-checklist-checked::before {\n  background-image: url(\"../img/correct9.png\");\n  background-image: url(\"../img/correct9.svg\");\n  background-position: 100%;\n  background-repeat: no-repeat;\n  background-size: 100%; }\n\n.usa-graphic_list .usa-graphic_list-row .usa-media_block {\n  margin-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-graphic_list .usa-graphic_list-row .usa-media_block {\n      margin-bottom: 6rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block {\n    margin-bottom: 0; } }\n\n.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block:last-child {\n  margin-bottom: 0; }\n\n.usa-graphic_list .usa-media_block-img {\n  margin-right: 3rem; }\n\n.usa-graphic_list .usa-media_block-body > :first-child {\n  margin-top: 0; }\n\n.usa-header {\n  width: 100%;\n  z-index: 7000; }\n  @media screen and (min-width: 951px) {\n    .usa-header {\n      border-bottom: 1px solid #c9c9c9; } }\n  .usa-header a {\n    border-bottom: none; }\n  @media screen and (min-width: 951px) {\n    .usa-header .usa-search {\n      float: right;\n      max-width: 21.5rem; } }\n\n.usa-logo {\n  float: left;\n  line-height: 4rem;\n  margin-left: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-logo {\n      line-height: 7.5rem;\n      margin-left: 0; } }\n  .usa-logo a {\n    color: #212121;\n    text-decoration: none; }\n  .usa-logo br {\n    display: none; }\n    @media screen and (min-width: 951px) {\n      .usa-logo br {\n        display: block; } }\n\n.usa-logo-text {\n  display: block;\n  font-size: 1.5rem;\n  font-style: normal;\n  font-weight: 700;\n  margin: 0; }\n  @media screen and (min-width: 951px) {\n    .usa-logo-text {\n      display: block;\n      font-size: 2.4rem;\n      line-height: 1.3; } }\n\n.usa-menu-btn {\n  /* stylelint-disable declaration-block-no-ignored-properties */\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #0071BC;\n  color: #ffffff;\n  display: inline;\n  float: right;\n  font-size: 1.3rem;\n  height: 4rem;\n  line-height: 4rem;\n  text-align: center;\n  text-decoration: none;\n  text-transform: uppercase;\n  width: 5.8rem;\n  /* stylelint-enable */ }\n  .usa-menu-btn:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-menu-btn {\n      display: none; } }\n  .usa-menu-btn:hover {\n    color: #ffffff;\n    background-color: #205493; }\n  .usa-menu-btn:visited {\n    color: #ffffff; }\n\n.usa-overlay {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  background: #000000;\n  opacity: 0;\n  transition: all 0.2s ease-in-out;\n  visibility: hidden;\n  z-index: 8000; }\n  .usa-overlay.is-visible {\n    opacity: 0.1;\n    visibility: visible; }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-logo {\n    bottom: 0;\n    position: absolute; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-navbar {\n    position: relative;\n    width: 18%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-header {\n    border-bottom: none; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-logo {\n    margin-top: 3rem;\n    margin-bottom: 3rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended em {\n    font-size: 3.2rem;\n    line-height: 1; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-navbar {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    display: block;\n    height: auto;\n    max-width: 1040px; }\n    .usa-header-extended .usa-navbar::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav {\n    border-top: 1px solid #c9c9c9;\n    float: none;\n    padding: 0;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-inner {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 1.5rem;\n    margin-top: -1px;\n    max-width: 1040px;\n    position: relative; }\n    .usa-header-extended .usa-nav-inner::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary::after {\n    clear: both;\n    content: \"\";\n    display: block; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-position: right 1.5rem top 53%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link {\n    padding-top: 1.8rem;\n    padding-bottom: 1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-submenu .usa-grid-full {\n    padding-left: 1.2rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-megamenu {\n    padding-left: 3rem; } }\n\n.usa-hero {\n  padding-top: 3rem;\n  padding-bottom: 3rem;\n  background-image: url(\"../img/hero.png\");\n  background-position: center;\n  background-size: cover; }\n  .usa-hero .usa-button {\n    color: #ffffff; }\n\n.usa-section-dark .usa-hero-link {\n  color: #c64b00; }\n\n.usa-hero-callout {\n  background-color: #112E51;\n  padding: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-hero-callout {\n      max-width: 30rem; } }\n  .usa-hero-callout > *:first-child {\n    margin-top: 0;\n    margin-bottom: 2rem; }\n\n.usa-hero-callout-alt {\n  color: #ffffff;\n  display: block; }\n\n.usa-layout-docs {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs {\n      display: inherit; } }\n  .usa-layout-docs .usa-grid > :first-child:not(.usa-width-*) {\n    margin-top: 0; }\n  .usa-layout-docs .usa-grid > :last-child:not(.usa-width-*) {\n    margin-bottom: 0; }\n\n.usa-layout-docs-sidenav {\n  order: 2; }\n\n.usa-layout-docs-main_content {\n  margin-bottom: 3rem;\n  order: 1; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs-main_content {\n      margin-bottom: 0; } }\n  .usa-layout-docs-main_content > :first-child {\n    margin-top: 0; }\n\n.usa-media_block-img {\n  float: left;\n  margin-right: 1rem; }\n\n.usa-media_block-body {\n  overflow: hidden; }\n\n.usa-navbar {\n  border-bottom: 1px solid #999999;\n  height: 4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-navbar {\n      border-bottom: none;\n      display: inline-block;\n      height: 7.8rem; } }\n\n.usa-nav-link {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link:hover span {\n      border-bottom: 0.4rem solid #0071BC;\n      padding-bottom: 0.6rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link.usa-accordion-button span {\n      margin-right: 0;\n      padding-right: 1.5rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-nav-container {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    max-width: 1040px; }\n    .usa-nav-container::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n.usa-nav {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: auto;\n  background: #ffffff;\n  border-left: 1px solid #999999;\n  border-right: 0;\n  display: flex;\n  flex-direction: column;\n  overflow-y: auto;\n  padding: 2rem;\n  transform: translateX(26rem);\n  width: 26rem;\n  z-index: 9000; }\n  @media screen and (min-width: 951px) {\n    .usa-nav {\n      padding-top: 4.5rem;\n      padding-right: 0;\n      padding-bottom: 0;\n      border-left: none;\n      display: block;\n      float: right;\n      overflow-y: visible;\n      position: relative;\n      transform: translateX(0);\n      width: auto; } }\n  .usa-nav.is-visible {\n    transform: translateX(0);\n    transition: all 0.3s ease-in-out; }\n  .usa-nav nav {\n    margin-top: 6rem;\n    min-height: 100%; }\n    @media screen and (min-width: 951px) {\n      .usa-nav nav {\n        margin-top: 0; } }\n  .usa-nav .usa-current {\n    border-left: 4px solid #0071BC;\n    color: #0071BC;\n    font-weight: 700;\n    padding-left: 1.4rem; }\n    @media screen and (min-width: 951px) {\n      .usa-nav .usa-current {\n        color: #212121; } }\n  .usa-nav .usa-button {\n    width: 100%; }\n  @media screen and (min-width: 951px) {\n    .usa-nav .usa-search {\n      margin-left: 1.5rem;\n      top: 4px; } }\n\n.usa-nav-primary {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin-top: 1.5rem;\n  order: 2; }\n  .usa-nav-primary > li {\n    margin-bottom: 0; }\n  .usa-nav-primary > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-nav-primary > li:first-child {\n      border-top: none; }\n  .usa-nav-primary a {\n    border: none;\n    color: #212121;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-nav-primary a:hover {\n      background-color: #e4e4e4;\n      color: #0071BC;\n      text-decoration: none; }\n    .usa-nav-primary a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-nav-primary a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #0071BC;\n      color: #0071BC;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary {\n      display: inline; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary li {\n      border-top: none; } }\n  .usa-nav-primary > li {\n    width: auto; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li {\n        display: inline-block; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a:hover {\n        background-color: transparent; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a {\n      padding-top: 0.75rem;\n      padding-bottom: 0.75rem; } }\n  .usa-nav-primary button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    -moz-osx-font-smoothing: grayscale;\n    -webkit-font-smoothing: antialiased;\n    font-weight: 400;\n    line-height: 1.3;\n    padding: 0.85rem 1.5rem 0.85rem 1.8rem; }\n    .usa-nav-primary button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary button {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1;\n        width: initial; } }\n    .usa-nav-primary button:focus, .usa-nav-primary button:active {\n      box-shadow: 2px dotted #999999; }\n    .usa-nav-primary button:hover {\n      background-color: #e4e4e4;\n      color: #0071BC; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button:hover {\n          background-color: transparent; } }\n    .usa-nav-primary button[aria-expanded=false] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/plus-alt.png\");\n      background-image: url(\"../img/plus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false] {\n          background-image: url(\"../img/angle-arrow-down.png\");\n          background-image: url(\"../img/angle-arrow-down.svg\");\n          background-position: right 1.5rem top 40%; } }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false]:hover {\n          background-image: url(\"../img/angle-arrow-down-primary.png\");\n          background-image: url(\"../img/angle-arrow-down-primary.svg\"); } }\n    .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/minus-alt.png\");\n      background-image: url(\"../img/minus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=true] {\n          background-color: #112E51;\n          color: #ffffff;\n          background-image: url(\"../img/angle-arrow-down-hover.png\");\n          background-image: url(\"../img/angle-arrow-down-hover.svg\");\n          background-position: right 1.5rem top 40%; }\n          .usa-nav-primary button[aria-expanded=true]:hover {\n            background-color: #112E51; }\n          .usa-nav-primary button[aria-expanded=true] span {\n            border-bottom: 0.4rem solid #0071BC;\n            padding-bottom: 0.6rem;\n            color: #ffffff; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a.usa-current,\n    .usa-nav-primary .usa-current {\n      border-left: 0;\n      padding-left: 1.5rem; }\n      .usa-nav-primary a.usa-current:hover span,\n      .usa-nav-primary .usa-current:hover span {\n        color: #0071BC; }\n      .usa-nav-primary a.usa-current span,\n      .usa-nav-primary .usa-current span {\n        border-bottom: 0.4rem solid #0071BC;\n        padding-bottom: 0.6rem;\n        color: #212121; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link:hover span {\n    border-bottom: 0.7rem solid #0071BC;\n    padding-bottom: 0.9rem; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=true] span {\n      border-bottom: 0.7rem solid #0071BC;\n      padding-bottom: 0.9rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary .usa-current span {\n    border-bottom: 0.7rem solid #0071BC;\n    padding-bottom: 0.9rem; } }\n\n.usa-nav-secondary {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary {\n      margin-top: 0;\n      position: absolute;\n      right: 3rem;\n      top: -5.7rem; } }\n  .usa-nav-secondary .usa-search {\n    margin-top: 1.5rem;\n    margin-bottom: 0; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary .usa-search {\n        margin-top: -0.9rem;\n        margin-bottom: 0;\n        margin-left: 0;\n        float: left; } }\n\n.usa-nav-secondary-links {\n  margin-top: 2.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links {\n      float: left;\n      margin-top: 0; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li {\n      display: inline;\n      padding-left: 0.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li:not(:last-child)::after {\n      color: #c9c9c9;\n      content: '|';\n      padding-left: 0.5rem; } }\n  .usa-nav-secondary-links a,\n  .usa-nav-secondary-links .usa-header-search-button {\n    color: #666666;\n    display: inline-block;\n    font-size: 1.5rem;\n    text-decoration: none; }\n    .usa-nav-secondary-links a:hover,\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      color: #0071BC;\n      text-decoration: underline; }\n  .usa-nav-secondary-links .usa-header-search-button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    display: none; }\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button {\n        background-image: url(\"../img/search-alt.png\");\n        background-image: url(\"../img/search-alt.svg\");\n        background-repeat: no-repeat;\n        background-position: left center;\n        background-size: 2.2rem;\n        display: inline-block;\n        padding-left: 2.3rem; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button.is-hidden {\n        display: none; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links a.usa-current {\n      border-left: 0;\n      padding-left: 0; } }\n\n.usa-nav-submenu {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-nav-submenu > li {\n    margin-bottom: 0; }\n  .usa-nav-submenu li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-nav-submenu a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-nav-submenu a:hover, .usa-nav-submenu a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-nav-submenu .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu {\n      margin-top: 0;\n      margin-bottom: 0;\n      list-style-type: none;\n      padding-left: 0;\n      padding-top: 0.75rem;\n      padding-bottom: 0.9rem;\n      background-color: #112E51;\n      width: 21.5rem;\n      position: absolute; }\n      .usa-nav-submenu > li {\n        margin-bottom: 0; } }\n  .usa-nav-submenu[aria-hidden=true] {\n    display: none; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a {\n      color: #ffffff;\n      padding-left: 1.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a:hover {\n      background-color: #112E51;\n      color: #ffffff;\n      padding-left: 1.5rem;\n      text-decoration: underline; } }\n  .usa-nav-submenu li {\n    font-size: 1.5rem;\n    margin-bottom: 0; }\n\n.usa-nav-close {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  margin: -1.2rem -1.5rem 1.5rem auto;\n  float: right;\n  height: 4.4rem;\n  text-align: center;\n  width: 4.4rem; }\n  .usa-nav-close:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-close {\n      display: none; } }\n  .usa-nav-close img {\n    width: 1.3rem; }\n  .usa-nav-close + * {\n    clear: both; }\n\n.usa-mobile_nav-active {\n  overflow: hidden; }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu {\n    padding-top: 3.15rem;\n    padding-bottom: 3.15rem;\n    left: -1rem;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::before {\n    background-color: #112E51;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    right: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::after {\n    background-color: #112E51;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    left: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav {\n    padding-left: 0;\n    padding-top: 0;\n    width: 100%; } }\n\n.usa-header-basic-megamenu .usa-nav-inner {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 951px) {\n    .usa-header-basic-megamenu .usa-nav-inner {\n      display: block;\n      float: right;\n      margin-top: -3.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav-submenu .usa-grid-full {\n    margin-left: -1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu-col {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-megamenu-col:last-child {\n      margin-right: 0; }\n    .usa-megamenu-col:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-megamenu-col:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-megamenu-col:nth-child(4n) {\n      margin-right: 0; } }\n\n.usa-megamenu-col > ul {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-megamenu-col > ul > li {\n    margin-bottom: 0; }\n\n.usa-search {\n  max-width: none;\n  position: relative; }\n  .usa-search::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  .usa-search [type=submit],\n  .usa-search .usa-search-submit {\n    background-image: url(\"../img/search.png\");\n    background-image: url(\"../img/search.svg\");\n    background-position: 50%;\n    background-repeat: no-repeat;\n    border-bottom-left-radius: 0;\n    border-top-left-radius: 0;\n    height: 3.3rem;\n    margin: 0;\n    padding: 0;\n    width: 4.5rem; }\n    @media screen and (min-width: 481px) {\n      .usa-search [type=submit],\n      .usa-search .usa-search-submit {\n        background-image: none;\n        width: 8.5rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-big [type=search],\n    .usa-search.usa-search-big .usa-search-input {\n      font-size: 1.7rem;\n      height: 4.4rem;\n      width: calc(100% - 11.6rem); }\n    .usa-search.usa-search-big [type=submit],\n    .usa-search.usa-search-big .usa-search-submit {\n      font-size: 2rem;\n      height: 4.4rem;\n      width: 11.6rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-small [type=search],\n    .usa-search.usa-search-small .usa-search-input {\n      width: calc(100% - 4.5rem); }\n    .usa-search.usa-search-small [type=submit],\n    .usa-search.usa-search-small .usa-search-submit {\n      background-image: url(\"../img/search.png\");\n      background-image: url(\"../img/search.svg\");\n      background-position: 50%;\n      background-repeat: no-repeat;\n      width: 4.5rem; } }\n  @media screen and (max-width: 950px) {\n    .usa-search.usa-search-small.usa-sr-only {\n      left: auto;\n      position: relative; } }\n\ninput[type=\"search\"] {\n  /* stylelint-disable-line selector-no-qualifying-type */\n  box-sizing: border-box;\n  -webkit-appearance: none; }\n\n[type=search],\n.usa-search-input {\n  padding-top: 0;\n  padding-bottom: 0;\n  border-bottom-right-radius: 0;\n  border-right: none;\n  border-top-right-radius: 0;\n  box-sizing: border-box;\n  float: left;\n  font-size: 1.4rem;\n  height: 3.3rem;\n  margin: 0;\n  width: calc(100% - 4.5rem); }\n  @media screen and (min-width: 481px) {\n    [type=search],\n    .usa-search-input {\n      width: calc(100% - 8.5rem); } }\n\n.usa-search-submit-text {\n  position: absolute;\n  left: -999em; }\n  @media screen and (min-width: 481px) {\n    .usa-search-submit-text {\n      position: static; } }\n\n.usa-section {\n  padding-top: 3rem;\n  padding-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-section {\n      padding-top: 6rem;\n      padding-bottom: 6rem; } }\n\n.usa-section-light {\n  background-color: #e4e4e4; }\n\n.usa-section-dark {\n  background-color: #112E51;\n  color: #ffffff; }\n  .usa-section-dark h1,\n  .usa-section-dark h2,\n  .usa-section-dark h3,\n  .usa-section-dark h4,\n  .usa-section-dark h5,\n  .usa-section-dark h6 {\n    color: #c64b00; }\n  .usa-section-dark p {\n    color: #ffffff; }\n  .usa-section-dark a {\n    color: #c9c9c9; }\n    .usa-section-dark a:hover {\n      color: #ffffff; }\n\n.usa-sidenav-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-sidenav-list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-list > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-sidenav-list > li:first-child {\n      border-top: none; }\n  .usa-sidenav-list a {\n    border: none;\n    color: #212121;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-sidenav-list a:hover {\n      background-color: #e4e4e4;\n      color: #0071BC;\n      text-decoration: none; }\n    .usa-sidenav-list a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-sidenav-list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #0071BC;\n      color: #0071BC;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n\n.usa-sidenav-sub_list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-sidenav-sub_list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-sub_list li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-sidenav-sub_list a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-sidenav-sub_list a:hover, .usa-sidenav-sub_list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-sidenav-sub_list .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n\n.usa-skipnav {\n  background: transparent;\n  color: #212121;\n  left: 0;\n  padding: 1rem 1.5rem;\n  position: absolute;\n  top: -4.2rem;\n  transition: all 0.2s ease-in-out;\n  z-index: 100; }\n  .usa-skipnav:focus {\n    background: #ffffff;\n    left: 0;\n    outline: 0;\n    position: absolute;\n    top: 0;\n    transition: all 0.2s ease-in-out; }\n\nh1, h2, h3, h4, h5, h6 {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-weight: bold; }\n\nh3.feed-item-title a,\narticle.aggregator-item .field--name-fid a {\n  text-decoration: none;\n  color: #0071BC; }\n\n.region-sidebar-first,\n.region-sidebar-second,\n.uswds-middle-section {\n  background-color: #E7F5FF; }\n\n.view-nsf-blog article.aggregator-item {\n  background-color: #ffffff;\n  padding: 2rem;\n  padding-top: 0.2rem;\n  margin-bottom: 3rem; }\n\n.region-sidebar-second {\n  float: right;\n  padding: 1.25rem; }\n  .region-sidebar-second h4 {\n    text-transform: uppercase;\n    color: #999999;\n    font-weight: normal; }\n\np,\ninput,\ntextarea,\n.usa-sidenav-list a,\n.usa-accordion,\n.usa-accordion-bordered,\nselect.form-select {\n  color: #666666; }\n\n.usa-nav-primary a.usa-nav-link,\n.usa-nav-primary .usa-nav-link,\n.usa-nav-primary a.usa-current span,\n.usa-nav-primary .usa-current span {\n  color: #3e94cf; }\n\n.filter-wrapper {\n  display: none; }\n\n.usa-form-large {\n  max-width: none; }\n\nform [type=submit],\nform [type=submit] {\n  display: inline-block; }\n\ntextarea {\n  height: auto; }\n\nlabel {\n  margin-top: 1rem; }\n\ninput,\ntextarea,\nselect {\n  max-width: none; }\n\n#block-nsf-views-block-news-block-1 ul {\n  margin: 0 auto;\n  text-align: center; }\n\n#block-nsf-views-block-news-block-1 li {\n  display: inline-block;\n  vertical-align: top; }\n\nimg.image-style-news-main-story {\n  max-width: none; }\n\n.usa-header-basic .usa-logo {\n  top: 0;\n  bottom: auto; }\n  .usa-header-basic .usa-logo img {\n    max-width: none; }\n\n.usa-navbar em.usa-logo-text {\n  margin-left: -5000em; }\n\n.region-footer-menu li.usa-footer-primary-link {\n  pointer-events: none; }\n"]}
\ No newline at end of file
diff --git a/web/themes/nsf/sass/uswds.scss b/web/themes/nsf/sass/uswds.scss
index 964ab77..e9396ab 100644
--- a/web/themes/nsf/sass/uswds.scss
+++ b/web/themes/nsf/sass/uswds.scss
@@ -113,3 +113,7 @@ img.image-style-news-main-story {
 .usa-navbar em.usa-logo-text {
     margin-left: -5000em;
 }
+
+.region-footer-menu li.usa-footer-primary-link {
+    pointer-events: none;
+}
\ No newline at end of file

From b29612e9fc93c081f6f75d42763dbc6135f574b4 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Mon, 9 Apr 2018 12:54:48 -0700
Subject: [PATCH 128/143] Make footer menus' block titles display

By default, the USWDS theme doesn't render block titles for footer
menu blocks. This commit overrides that. Now, if a footer menu
block has a title, that title will display.

Note: the default heading level for block titles is h2. This
commit wraps the block titles in h3 tags instead, because 1) that
more closely approximates the appearance of the mockup and 2) more
importantly, there doesn't seem to be a semantic reason for using
h2 instead. Consistency is valuable, though, so I flag the
divergence here in case it's worth reconsidering.

https://github.com/18F/nsf/issues/190
---
 ...block--system-menu-block--footer_menu.html.twig | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 web/themes/nsf/templates/system/block/block--system-menu-block--footer_menu.html.twig

diff --git a/web/themes/nsf/templates/system/block/block--system-menu-block--footer_menu.html.twig b/web/themes/nsf/templates/system/block/block--system-menu-block--footer_menu.html.twig
new file mode 100644
index 0000000..59a9e75
--- /dev/null
+++ b/web/themes/nsf/templates/system/block/block--system-menu-block--footer_menu.html.twig
@@ -0,0 +1,14 @@
+{#
+/**
+ * @file
+ * Minimal markup for a NSF footer menu block.
+ * By default the USWDS theme doesn't render menu
+ * blocks' titles.
+ */
+#}
+{{ title_prefix }}
+  {% if label %}
+    <h3{{ title_attributes }}>{{ label }}</h3>
+  {% endif %}
+{{ title_suffix }}
+{{ content }}

From 1aae5c1ad3728f8ac6fd60c423e260fc82ea262a Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 26 Apr 2018 15:36:36 -0700
Subject: [PATCH 129/143] DRY out the footer menus' templating

These two were identical in all but name, and they're now
sufficiently covered by block--system-menu-block--footer_menu.html.twig.

https://github.com/18F/nsf/issues/190
---
 ...enu--footer-national-science-fou.html.twig | 58 -------------------
 .../menu/menu--footer-research-gov.html.twig  | 58 -------------------
 2 files changed, 116 deletions(-)
 delete mode 100644 web/themes/nsf/templates/system/menu/menu--footer-national-science-fou.html.twig
 delete mode 100644 web/themes/nsf/templates/system/menu/menu--footer-research-gov.html.twig

diff --git a/web/themes/nsf/templates/system/menu/menu--footer-national-science-fou.html.twig b/web/themes/nsf/templates/system/menu/menu--footer-national-science-fou.html.twig
deleted file mode 100644
index bf52010..0000000
--- a/web/themes/nsf/templates/system/menu/menu--footer-national-science-fou.html.twig
+++ /dev/null
@@ -1,58 +0,0 @@
-{#
-/**
- * @file
- * Override of system/menu.html.twig for the `Footer: National
- * Science Foundation` menu.
- */
-#}
-
-{% import _self as menus %}
-
-{#
-  We call a macro which calls itself to render the full tree.
-  @see http://twig.sensiolabs.org/doc/tags/macro.html
-#}
-{{ menus.menu_links(items, 0, footer_style) }}
-
-{% macro menu_links(items, menu_level, footer_style) %}
-  {% import _self as menus %}
-  {% if items %}
-
-    {% if not 'big' == footer_style %}
-    <ul class="usa-unstyled-list">
-    {% endif %}
-
-    {% for item in items %}
-
-      {% if menu_level == 0 and 'big' == footer_style %}
-      <ul class="usa-unstyled-list usa-width-one-fourth usa-footer-primary-content">
-        <li class="usa-footer-primary-link">
-          <h4>{{ item.title }}</h4>
-        </li>
-
-        {% if item.below %}
-        {{ menus.menu_links(item.below, 1, footer_style) }}
-        {% endif %}
-      </ul>
-      {% elseif 'big' == footer_style %}
-      <li>
-        <a href="{{ item.url }}">{{ item.title }}</a>
-      </li>
-      {% elseif 'medium' == footer_style %}
-      <li class="usa-width-one-sixth usa-footer-primary-content">
-        <a class="usa-footer-primary-link" href="{{ item.url }}">{{ item.title }}</a>
-      </li>
-      {% else %}
-      <li class="usa-width-one-fourth usa-footer-primary-content">
-        <a class="usa-footer-primary-link" href="{{ item.url }}">{{ item.title }}</a>
-      </li>
-      {% endif %}
-
-    {% endfor %}
-
-    {% if not 'big' == footer_style %}
-    </ul>
-    {% endif %}
-
-  {% endif %}
-{% endmacro %}
diff --git a/web/themes/nsf/templates/system/menu/menu--footer-research-gov.html.twig b/web/themes/nsf/templates/system/menu/menu--footer-research-gov.html.twig
deleted file mode 100644
index aa9ab82..0000000
--- a/web/themes/nsf/templates/system/menu/menu--footer-research-gov.html.twig
+++ /dev/null
@@ -1,58 +0,0 @@
-{#
-/**
- * @file
- * Override of system/menu.html.twig for the
- * `Footer: Research.gov` menu.
- */
-#}
-
-{% import _self as menus %}
-
-{#
-  We call a macro which calls itself to render the full tree.
-  @see http://twig.sensiolabs.org/doc/tags/macro.html
-#}
-{{ menus.menu_links(items, 0, footer_style) }}
-
-{% macro menu_links(items, menu_level, footer_style) %}
-  {% import _self as menus %}
-  {% if items %}
-
-    {% if not 'big' == footer_style %}
-    <ul class="usa-unstyled-list">
-    {% endif %}
-
-    {% for item in items %}
-
-      {% if menu_level == 0 and 'big' == footer_style %}
-      <ul class="usa-unstyled-list usa-width-one-fourth usa-footer-primary-content">
-        <li class="usa-footer-primary-link">
-          <h4>{{ item.title }}</h4>
-        </li>
-
-        {% if item.below %}
-        {{ menus.menu_links(item.below, 1, footer_style) }}
-        {% endif %}
-      </ul>
-      {% elseif 'big' == footer_style %}
-      <li>
-        <a href="{{ item.url }}">{{ item.title }}</a>
-      </li>
-      {% elseif 'medium' == footer_style %}
-      <li class="usa-width-one-sixth usa-footer-primary-content">
-        <a class="usa-footer-primary-link" href="{{ item.url }}">{{ item.title }}</a>
-      </li>
-      {% else %}
-      <li class="usa-width-one-fourth usa-footer-primary-content">
-        <a class="usa-footer-primary-link" href="{{ item.url }}">{{ item.title }}</a>
-      </li>
-      {% endif %}
-
-    {% endfor %}
-
-    {% if not 'big' == footer_style %}
-    </ul>
-    {% endif %}
-
-  {% endif %}
-{% endmacro %}

From a70fecb5b61fd2c81cde83ed63ede6f7bce15f74 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 26 Apr 2018 15:42:37 -0700
Subject: [PATCH 130/143] Give footer menu blocks a width of one-half

Thanks, USWDS!

https://github.com/18F/nsf/issues/190
---
 .../block/block--system-menu-block--footer_menu.html.twig       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/themes/nsf/templates/system/block/block--system-menu-block--footer_menu.html.twig b/web/themes/nsf/templates/system/block/block--system-menu-block--footer_menu.html.twig
index 59a9e75..8ddd069 100644
--- a/web/themes/nsf/templates/system/block/block--system-menu-block--footer_menu.html.twig
+++ b/web/themes/nsf/templates/system/block/block--system-menu-block--footer_menu.html.twig
@@ -6,9 +6,11 @@
  * blocks' titles.
  */
 #}
+<div class="usa-width-one-half">
 {{ title_prefix }}
   {% if label %}
     <h3{{ title_attributes }}>{{ label }}</h3>
   {% endif %}
 {{ title_suffix }}
 {{ content }}
+</div>

From dd2a576689d4a1f65fc9338e3a1ab1e6b0238cc2 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 26 Apr 2018 15:46:03 -0700
Subject: [PATCH 131/143] Change footer menu lists' width from one-fourth to
 one-third

By default, the USWDS theme implements 'big' footers' lists with
a width of one-fourth. (This matches the specifications at
https://designsystem.digital.gov/components/footers/.) The NSF's
mockups specify breaking these lists into no more than three parts,
though, so this override changes their width to 'one-third' and
provides a little bit of breathing room.

https://github.com/18F/nsf/issues/190
---
 .../system/menu/menu--footer_menu.html.twig   | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 web/themes/nsf/templates/system/menu/menu--footer_menu.html.twig

diff --git a/web/themes/nsf/templates/system/menu/menu--footer_menu.html.twig b/web/themes/nsf/templates/system/menu/menu--footer_menu.html.twig
new file mode 100644
index 0000000..d7a745c
--- /dev/null
+++ b/web/themes/nsf/templates/system/menu/menu--footer_menu.html.twig
@@ -0,0 +1,57 @@
+{#
+/**
+ * @file
+ * Override of system/menu.html.twig for the footer menu.
+ */
+#}
+
+{% import _self as menus %}
+
+{#
+  We call a macro which calls itself to render the full tree.
+  @see http://twig.sensiolabs.org/doc/tags/macro.html
+#}
+{{ menus.menu_links(items, 0, footer_style) }}
+
+{% macro menu_links(items, menu_level, footer_style) %}
+  {% import _self as menus %}
+  {% if items %}
+
+    {% if not 'big' == footer_style %}
+    <ul class="usa-unstyled-list">
+    {% endif %}
+
+    {% for item in items %}
+
+      {% if menu_level == 0 and 'big' == footer_style %}
+      <ul class="usa-unstyled-list usa-width-one-third usa-footer-primary-content">
+        <li class="usa-footer-primary-link">
+          <h4>{{ item.title }}</h4>
+        </li>
+
+        {% if item.below %}
+        {{ menus.menu_links(item.below, 1, footer_style) }}
+        {% endif %}
+      </ul>
+      {% elseif 'big' == footer_style %}
+      <li>
+        <a href="{{ item.url }}">{{ item.title }}</a>
+      </li>
+      {% elseif 'medium' == footer_style %}
+      <li class="usa-width-one-sixth usa-footer-primary-content">
+        <a class="usa-footer-primary-link" href="{{ item.url }}">{{ item.title }}</a>
+      </li>
+      {% else %}
+      <li class="usa-width-one-third usa-footer-primary-content">
+        <a class="usa-footer-primary-link" href="{{ item.url }}">{{ item.title }}</a>
+      </li>
+      {% endif %}
+
+    {% endfor %}
+
+    {% if not 'big' == footer_style %}
+    </ul>
+    {% endif %}
+
+  {% endif %}
+{% endmacro %}

From d2a444cf6c33fbf4220e6f0cb23afc8d01698712 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 26 Apr 2018 15:56:54 -0700
Subject: [PATCH 132/143] Reposition footer menus' links

The links had been exported once before, but their
relationships evidently weren't respected, so they weren't
displaying with appropriate weight and nesting.

These corrections were made through the GUI and exported via:
`bin/drush dcde menu_link_content`

https://github.com/18F/nsf/issues/190
---
 .../03197086-5fd9-4e3a-a547-590ac79cfd47.json                 | 4 ++--
 .../30ad5447-8c6a-4b91-9258-6c2cedece8ed.json                 | 4 ++--
 .../338ca875-8de5-4d34-bb7d-6202958e1341.json                 | 4 ++--
 .../3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json                 | 4 ++--
 .../8a3132e5-7037-4fe2-b0de-aef0207b54bf.json                 | 4 ++--
 .../8d70e856-5580-40c5-a1f8-428f7a331b5f.json                 | 4 ++--
 .../900d3fd6-0737-4995-9472-9301a3800811.json                 | 4 ++--
 .../add1d072-0d79-4878-9781-2f9141e77c84.json                 | 4 ++--
 .../ae222b1f-b138-466b-ae33-0a464bae5993.json                 | 4 ++--
 .../b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json                 | 4 ++--
 .../b9b37cba-942c-443b-803e-e9301f330ad7.json                 | 4 ++--
 .../d1cd56a7-4282-4395-bc21-433ef1d3238b.json                 | 4 ++--
 .../d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json                 | 4 ++--
 .../e0128ba5-720a-4b7c-a006-533598f1a9a5.json                 | 4 ++--
 .../f4df684c-896a-49f6-8302-bad77d152982.json                 | 4 ++--
 15 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json b/web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json
index 5839d65..7f1557c 100644
--- a/web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json
+++ b/web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 4
+            "value": -46
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:21:45+00:00",
+            "value": "2018-04-26T22:31:57+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json b/web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json
index a29b637..b4d6872 100644
--- a/web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json
+++ b/web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 2
+            "value": -48
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T20:38:58+00:00",
+            "value": "2018-04-26T22:31:57+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json b/web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json
index 5bc8c5c..2ba91dd 100644
--- a/web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json
+++ b/web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 5
+            "value": -45
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:22:19+00:00",
+            "value": "2018-04-26T22:31:57+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json b/web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json
index a9dbfe7..a62b493 100644
--- a/web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json
+++ b/web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 0
+            "value": -50
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T20:26:01+00:00",
+            "value": "2018-04-26T22:31:57+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json b/web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json
index 2bb4858..08df48b 100644
--- a/web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json
+++ b/web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 2
+            "value": -48
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:46:29+00:00",
+            "value": "2018-04-26T22:28:04+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json b/web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json
index b7972d5..7bb78ff 100644
--- a/web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json
+++ b/web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 0
+            "value": -50
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:42:48+00:00",
+            "value": "2018-04-26T22:28:04+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json b/web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json
index e24681c..fbd67ae 100644
--- a/web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json
+++ b/web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 1
+            "value": -49
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:43:44+00:00",
+            "value": "2018-04-26T22:28:04+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json b/web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json
index bb195c3..8a92e86 100644
--- a/web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json
+++ b/web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 6
+            "value": -44
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:50:03+00:00",
+            "value": "2018-04-26T22:28:04+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json b/web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json
index 7ac4bb3..775db97 100644
--- a/web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json
+++ b/web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 3
+            "value": -47
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:47:16+00:00",
+            "value": "2018-04-26T22:28:04+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json b/web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json
index 0ba0c55..25dc880 100644
--- a/web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json
+++ b/web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 5
+            "value": -45
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:49:21+00:00",
+            "value": "2018-04-26T22:28:04+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json b/web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json
index 19fccb8..e9bdc7e 100644
--- a/web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json
+++ b/web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 0
+            "value": -50
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:52:21+00:00",
+            "value": "2018-04-26T22:28:04+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json b/web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json
index dfc66c3..f4eac01 100644
--- a/web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json
+++ b/web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 3
+            "value": -47
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T20:40:49+00:00",
+            "value": "2018-04-26T22:31:57+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json b/web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json
index 9406f2c..6d6b7c3 100644
--- a/web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json
+++ b/web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 0
+            "value": -50
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:53:32+00:00",
+            "value": "2018-04-26T22:28:04+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json b/web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json
index 1ffa17c..ba597da 100644
--- a/web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json
+++ b/web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 1
+            "value": -49
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T20:38:03+00:00",
+            "value": "2018-04-26T22:31:57+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json b/web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json
index d3f1c9d..d532b75 100644
--- a/web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json
+++ b/web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 3
+            "value": -46
         }
     ],
     "expanded": [
@@ -84,7 +84,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:47:42+00:00",
+            "value": "2018-04-26T22:28:04+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }

From cb183c571577ff9c1719211bfa5fb5ba09b5388d Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 27 Apr 2018 16:44:07 -0700
Subject: [PATCH 133/143] Add Better Normalizers, require it in Default Content

This commit adds and enables the Better Normalizers module and
specifies it as a dependency of the Default Content module. This
is meant to address the issue that menu links' weight and
relationships weren't being consistently respected in deployment.

A few notes on implementation:
  * The patch is a locally rolled version of #52 from https://www.drupal.org/project/default_content/issues/2670954.
  * Why roll it locally? Because #52 was rolled against the dev
    version, and using the dev version currently breaks
    default_content_deploy.
  * The patch modifies, among other things, default_content's
    composer.json file. This change doesn't actually take effect,
    though, because patching occurs *after* Composer calculates
    dependencies and installs packages. (For further details, see
    https://github.com/cweagans/composer-patches#patches-containing-modifications-to-composerjson-files.) I've included the default_content
    composer.json modification for the sake of clarity, but also
    included it in our main codebase's composer.json file so
    that it will take effect (and Better Normalizers will be
    installed).

https://github.com/18F/nsf/issues/190
---
 composer.json                                 |   6 +
 composer.lock                                 | 285 +++++++++++-------
 .../menu_link_uuid_nid-2670954-reroll.patch   |  23 ++
 web/sites/default/config/core.extension.yml   |   1 +
 4 files changed, 208 insertions(+), 107 deletions(-)
 create mode 100644 web/patches/menu_link_uuid_nid-2670954-reroll.patch

diff --git a/composer.json b/composer.json
index c8c1448..368469c 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
         "composer/installers": "^1.2",
         "cweagans/composer-patches": "^1.6",
         "drupal-composer/drupal-scaffold": "^2.2",
+        "drupal/better_normalizers": "^1.0@beta",
         "drupal/brightcove": "^1.3",
         "drupal/console": "^1.0.2",
         "drupal/core": "~8.5",
@@ -81,6 +82,11 @@
             "web/drush/contrib/{$name}": ["type:drupal-drush"],
             "web/modules/custom/{$name}": ["type:drupal-custom-module"],
             "web/themes/custom/{$name}": ["type:drupal-custom-theme"]
+        },
+        "patches": {
+            "drupal/default_content": {
+                "Make menu items export properly": "web/patches/menu_link_uuid_nid-2670954-reroll.patch"
+            }
         }
     }
 }
diff --git a/composer.lock b/composer.lock
index 4af63e0..641bf9a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "97556542f216666eb2286dbafb5ebacf",
+    "content-hash": "9c274b6077552f4d4e0457fa53843d0e",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -124,16 +124,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.55.2",
+            "version": "3.55.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "3be3068a3a643f5029f18714b3fe26733a51e07c"
+                "reference": "28a1828814ce34d056492fa494f1e4bbaddaf33e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3be3068a3a643f5029f18714b3fe26733a51e07c",
-                "reference": "3be3068a3a643f5029f18714b3fe26733a51e07c",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/28a1828814ce34d056492fa494f1e4bbaddaf33e",
+                "reference": "28a1828814ce34d056492fa494f1e4bbaddaf33e",
                 "shasum": ""
             },
             "require": {
@@ -200,7 +200,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2018-04-25T18:33:29+00:00"
+            "time": "2018-04-26T21:09:13+00:00"
         },
         {
             "name": "brightcove/api",
@@ -317,16 +317,16 @@
         },
         {
             "name": "chi-teck/drupal-code-generator",
-            "version": "1.23.2",
+            "version": "1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Chi-teck/drupal-code-generator.git",
-                "reference": "b157b38c8c148c67d5b80c7c349b1a446115ea0e"
+                "reference": "20682ec4acc92e9671ba7b9bd0e972978c3a08f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/b157b38c8c148c67d5b80c7c349b1a446115ea0e",
-                "reference": "b157b38c8c148c67d5b80c7c349b1a446115ea0e",
+                "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/20682ec4acc92e9671ba7b9bd0e972978c3a08f2",
+                "reference": "20682ec4acc92e9671ba7b9bd0e972978c3a08f2",
                 "shasum": ""
             },
             "require": {
@@ -352,7 +352,7 @@
                 "GPL-2.0-or-later"
             ],
             "description": "Drupal code generator",
-            "time": "2018-03-03T04:17:26+00:00"
+            "time": "2018-04-25T17:35:50+00:00"
         },
         {
             "name": "composer/installers",
@@ -692,16 +692,16 @@
         },
         {
             "name": "consolidation/output-formatters",
-            "version": "3.1.13",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/output-formatters.git",
-                "reference": "3188461e965b32148c8fb85261833b2b72d34b8c"
+                "reference": "da889e4bce19f145ca4ec5b1725a946f4eb625a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/3188461e965b32148c8fb85261833b2b72d34b8c",
-                "reference": "3188461e965b32148c8fb85261833b2b72d34b8c",
+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/da889e4bce19f145ca4ec5b1725a946f4eb625a9",
+                "reference": "da889e4bce19f145ca4ec5b1725a946f4eb625a9",
                 "shasum": ""
             },
             "require": {
@@ -710,11 +710,17 @@
                 "symfony/finder": "^2.5|^3|^4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8",
-                "satooshi/php-coveralls": "^1.0.2 | dev-master",
+                "g-1-a/composer-test-scenarios": "^2",
+                "phpunit/phpunit": "^5.7.27",
+                "satooshi/php-coveralls": "^2",
                 "squizlabs/php_codesniffer": "^2.7",
+                "symfony/console": "3.2.3",
+                "symfony/var-dumper": "^2.8|^3|^4",
                 "victorjonsson/markdowndocs": "^1.3"
             },
+            "suggest": {
+                "symfony/var-dumper": "For using the var_dump formatter"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -737,20 +743,20 @@
                 }
             ],
             "description": "Format text by applying transformations provided by plug-in formatters.",
-            "time": "2017-11-29T15:25:38+00:00"
+            "time": "2018-03-20T15:18:32+00:00"
         },
         {
             "name": "consolidation/robo",
-            "version": "1.2.2",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/Robo.git",
-                "reference": "9ef2724f72feb017517a755564516dbde99e15e4"
+                "reference": "54a13e268917b92576d75e10dca8227b95a574d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/9ef2724f72feb017517a755564516dbde99e15e4",
-                "reference": "9ef2724f72feb017517a755564516dbde99e15e4",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/54a13e268917b92576d75e10dca8227b95a574d9",
+                "reference": "54a13e268917b92576d75e10dca8227b95a574d9",
                 "shasum": ""
             },
             "require": {
@@ -774,9 +780,11 @@
                 "codeception/aspect-mock": "^1|^2.1.1",
                 "codeception/base": "^2.3.7",
                 "codeception/verify": "^0.3.2",
+                "g-1-a/composer-test-scenarios": "^2",
                 "goaop/framework": "~2.1.2",
-                "greg-1-anderson/composer-test-scenarios": "^1",
+                "goaop/parser-reflection": "^1.1.0",
                 "natxet/cssmin": "3.0.4",
+                "nikic/php-parser": "^3.1.5",
                 "patchwork/jsqueeze": "~2",
                 "pear/archive_tar": "^1.4.2",
                 "phpunit/php-code-coverage": "~2|~4",
@@ -815,7 +823,7 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2018-02-28T01:03:54+00:00"
+            "time": "2018-04-06T05:27:37+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -1541,6 +1549,65 @@
             "description": "Composer Plugin for updating the Drupal scaffold files when using drupal/core",
             "time": "2017-12-08T22:53:11+00:00"
         },
+        {
+            "name": "drupal/better_normalizers",
+            "version": "1.0.0-beta3",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/better_normalizers",
+                "reference": "8.x-1.0-beta3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/better_normalizers-8.x-1.0-beta3.zip",
+                "reference": "8.x-1.0-beta3",
+                "shasum": "876c5f0006c3764677e1dbe6dec60a32d5a2d636"
+            },
+            "require": {
+                "drupal/core": "^8.3"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0-beta3",
+                    "datestamp": "1493796785",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Project has not opted into security advisory coverage!"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Sam152",
+                    "homepage": "https://www.drupal.org/user/1485048"
+                },
+                {
+                    "name": "andypost",
+                    "homepage": "https://www.drupal.org/user/118908"
+                },
+                {
+                    "name": "chr.fritsch",
+                    "homepage": "https://www.drupal.org/user/2103716"
+                },
+                {
+                    "name": "larowlan",
+                    "homepage": "https://www.drupal.org/user/395439"
+                }
+            ],
+            "description": "Improve the normalizers in core.",
+            "homepage": "https://www.drupal.org/project/better_normalizers",
+            "support": {
+                "source": "http://cgit.drupalcode.org/better_normalizers"
+            }
+        },
         {
             "name": "drupal/brightcove",
             "version": "1.3.0",
@@ -1681,16 +1748,16 @@
         },
         {
             "name": "drupal/console",
-            "version": "1.7.0",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hechoendrupal/drupal-console.git",
-                "reference": "f4edcad048bd70fa2e74a6858c061425117c1ace"
+                "reference": "368bbfa44dc6b957eb4db01977f7c39e83032d18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hechoendrupal/drupal-console/zipball/f4edcad048bd70fa2e74a6858c061425117c1ace",
-                "reference": "f4edcad048bd70fa2e74a6858c061425117c1ace",
+                "url": "https://api.github.com/repos/hechoendrupal/drupal-console/zipball/368bbfa44dc6b957eb4db01977f7c39e83032d18",
+                "reference": "368bbfa44dc6b957eb4db01977f7c39e83032d18",
                 "shasum": ""
             },
             "require": {
@@ -1698,7 +1765,7 @@
                 "composer/installers": "~1.0",
                 "doctrine/annotations": "^1.2",
                 "doctrine/collections": "^1.3",
-                "drupal/console-core": "1.7.0",
+                "drupal/console-core": "1.8.0",
                 "drupal/console-extend-plugin": "~0",
                 "guzzlehttp/guzzle": "~6.1",
                 "php": "^5.5.9 || ^7.0",
@@ -1757,25 +1824,25 @@
                 "drupal",
                 "symfony"
             ],
-            "time": "2018-03-06T21:58:52+00:00"
+            "time": "2018-03-21T20:50:16+00:00"
         },
         {
             "name": "drupal/console-core",
-            "version": "1.7.0",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hechoendrupal/drupal-console-core.git",
-                "reference": "af8b3e42d225a2782f14163aafdeebbc486fd3e5"
+                "reference": "bf1fb4a6f689377acec1694267f674178d28e5d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/af8b3e42d225a2782f14163aafdeebbc486fd3e5",
-                "reference": "af8b3e42d225a2782f14163aafdeebbc486fd3e5",
+                "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/bf1fb4a6f689377acec1694267f674178d28e5d1",
+                "reference": "bf1fb4a6f689377acec1694267f674178d28e5d1",
                 "shasum": ""
             },
             "require": {
                 "dflydev/dot-access-configuration": "^1.0",
-                "drupal/console-en": "1.7.0",
+                "drupal/console-en": "1.8.0",
                 "php": "^5.5.9 || ^7.0",
                 "stecman/symfony-console-completion": "~0.7",
                 "symfony/config": "~2.8|~3.0",
@@ -1838,20 +1905,20 @@
                 "drupal",
                 "symfony"
             ],
-            "time": "2018-03-06T21:34:03+00:00"
+            "time": "2018-03-21T19:33:23+00:00"
         },
         {
             "name": "drupal/console-en",
-            "version": "1.7.0",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hechoendrupal/drupal-console-en.git",
-                "reference": "916e121fad50155fc96d1fc98fed2e4aa0d6cd85"
+                "reference": "ea956ddffab04f519a89858810e5f695b9def92b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/916e121fad50155fc96d1fc98fed2e4aa0d6cd85",
-                "reference": "916e121fad50155fc96d1fc98fed2e4aa0d6cd85",
+                "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/ea956ddffab04f519a89858810e5f695b9def92b",
+                "reference": "ea956ddffab04f519a89858810e5f695b9def92b",
                 "shasum": ""
             },
             "type": "drupal-console-language",
@@ -1892,7 +1959,7 @@
                 "drupal",
                 "symfony"
             ],
-            "time": "2018-03-06T15:51:54+00:00"
+            "time": "2018-03-21T19:16:27+00:00"
         },
         {
             "name": "drupal/console-extend-plugin",
@@ -2292,6 +2359,9 @@
                         "status": "not-covered",
                         "message": "Alpha releases are not covered by Drupal security advisories."
                     }
+                },
+                "patches_applied": {
+                    "Make menu items export properly": "web/patches/menu_link_uuid_nid-2670954-reroll.patch"
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
@@ -3084,17 +3154,17 @@
         },
         {
             "name": "drupal/pathauto",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/pathauto",
-                "reference": "8.x-1.1"
+                "reference": "8.x-1.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.1.zip",
-                "reference": "8.x-1.1",
-                "shasum": "3e24c9ff419c1f4bbe9d638eb7477a2169777a11"
+                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.2.zip",
+                "reference": "8.x-1.2",
+                "shasum": "ba265dbafb27e93d4a61655d783441b653206c73"
             },
             "require": {
                 "drupal/core": "*",
@@ -3107,8 +3177,8 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.1",
-                    "datestamp": "1520092685",
+                    "version": "8.x-1.2",
+                    "datestamp": "1524421084",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3554,16 +3624,16 @@
         },
         {
             "name": "drush/drush",
-            "version": "9.2.1",
+            "version": "9.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drush-ops/drush.git",
-                "reference": "e40f5bb6a291f643d4699a95ef6873ac40ae8302"
+                "reference": "c07b5b4527d6fb9226adaee14a33de5d4aa93ce8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drush-ops/drush/zipball/e40f5bb6a291f643d4699a95ef6873ac40ae8302",
-                "reference": "e40f5bb6a291f643d4699a95ef6873ac40ae8302",
+                "url": "https://api.github.com/repos/drush-ops/drush/zipball/c07b5b4527d6fb9226adaee14a33de5d4aa93ce8",
+                "reference": "c07b5b4527d6fb9226adaee14a33de5d4aa93ce8",
                 "shasum": ""
             },
             "require": {
@@ -3651,7 +3721,7 @@
             ],
             "description": "Drush is a command line shell and scripting interface for Drupal, a veritable Swiss Army knife designed to make life easier for those of us who spend some of our working hours hacking away at the command prompt.",
             "homepage": "http://www.drush.org",
-            "time": "2018-02-27T21:26:53+00:00"
+            "time": "2018-04-03T13:45:59+00:00"
         },
         {
             "name": "easyrdf/easyrdf",
@@ -4401,24 +4471,24 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v3.1.5",
+            "version": "v4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
+                "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
+                "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=5.5"
+                "php": ">=7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0|~5.0"
+                "phpunit/phpunit": "^6.5 || ^7.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -4426,7 +4496,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4448,7 +4518,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2018-02-28T20:30:58+00:00"
+            "time": "2018-03-25T17:35:16+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -4646,29 +4716,29 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.8.17",
+            "version": "v0.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec"
+                "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5069b70e8c4ea492c2b5939b6eddc78bfe41cfec",
-                "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/79c280013cf0b30fa23f3ba8bd3649218075adf4",
+                "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4",
                 "shasum": ""
             },
             "require": {
                 "dnoegel/php-xdg-base-dir": "0.1",
                 "jakub-onderka/php-console-highlighter": "0.3.*",
-                "nikic/php-parser": "~1.3|~2.0|~3.0",
-                "php": ">=5.3.9",
+                "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
+                "php": ">=5.4.0",
                 "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
                 "symfony/var-dumper": "~2.7|~3.0|~4.0"
             },
             "require-dev": {
-                "hoa/console": "~3.16|~1.14",
-                "phpunit/phpunit": "^4.8.35|^5.4.3",
+                "hoa/console": "~2.15|~3.16",
+                "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0",
                 "symfony/finder": "~2.1|~3.0|~4.0"
             },
             "suggest": {
@@ -4684,15 +4754,15 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-develop": "0.8.x-dev"
+                    "dev-develop": "0.9.x-dev"
                 }
             },
             "autoload": {
                 "files": [
-                    "src/Psy/functions.php"
+                    "src/functions.php"
                 ],
                 "psr-4": {
-                    "Psy\\": "src/Psy/"
+                    "Psy\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4714,7 +4784,7 @@
                 "interactive",
                 "shell"
             ],
-            "time": "2017-12-28T16:14:16+00:00"
+            "time": "2018-04-18T12:32:50+00:00"
         },
         {
             "name": "sebastian/version",
@@ -4810,24 +4880,24 @@
         },
         {
             "name": "stecman/symfony-console-completion",
-            "version": "0.7.0",
+            "version": "0.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/stecman/symfony-console-completion.git",
-                "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb"
+                "reference": "cd738867503477e91dbe84173dfabd431c883431"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/stecman/symfony-console-completion/zipball/5461d43e53092b3d3b9dbd9d999f2054730f4bbb",
-                "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb",
+                "url": "https://api.github.com/repos/stecman/symfony-console-completion/zipball/cd738867503477e91dbe84173dfabd431c883431",
+                "reference": "cd738867503477e91dbe84173dfabd431c883431",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2",
-                "symfony/console": "~2.3 || ~3.0"
+                "symfony/console": "~2.3 || ~3.0 || ~4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "~4.8.36 || ~5.7 || ~6.4"
             },
             "type": "library",
             "extra": {
@@ -4851,7 +4921,7 @@
                 }
             ],
             "description": "Automatic BASH completion for Symfony Console Component based applications.",
-            "time": "2016-02-24T05:08:54+00:00"
+            "time": "2018-02-10T04:28:01+00:00"
         },
         {
             "name": "sunra/php-simple-html-dom-parser",
@@ -5018,16 +5088,16 @@
         },
         {
             "name": "symfony/config",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "05e10567b529476a006b00746c5f538f1636810e"
+                "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/05e10567b529476a006b00746c5f538f1636810e",
-                "reference": "05e10567b529476a006b00746c5f538f1636810e",
+                "url": "https://api.github.com/repos/symfony/config/zipball/7c2a9d44f4433863e9bca682e7f03609234657f9",
+                "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9",
                 "shasum": ""
             },
             "require": {
@@ -5077,7 +5147,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-14T10:03:57+00:00"
+            "time": "2018-03-19T22:32:39+00:00"
         },
         {
             "name": "symfony/console",
@@ -5150,16 +5220,16 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "544655f1fc078a9cd839fdda2b7b1e64627c826a"
+                "reference": "519a80d7c1d95c6cc0b67f686d15fe27c6910de0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/544655f1fc078a9cd839fdda2b7b1e64627c826a",
-                "reference": "544655f1fc078a9cd839fdda2b7b1e64627c826a",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/519a80d7c1d95c6cc0b67f686d15fe27c6910de0",
+                "reference": "519a80d7c1d95c6cc0b67f686d15fe27c6910de0",
                 "shasum": ""
             },
             "require": {
@@ -5199,7 +5269,7 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-03T14:55:07+00:00"
+            "time": "2018-03-19T22:32:39+00:00"
         },
         {
             "name": "symfony/debug",
@@ -5330,16 +5400,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "2bb5d3101cc01f4fe580e536daf4f1959bc2d24d"
+                "reference": "1a4cffeb059226ff6bee9f48acb388faf674afff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2bb5d3101cc01f4fe580e536daf4f1959bc2d24d",
-                "reference": "2bb5d3101cc01f4fe580e536daf4f1959bc2d24d",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1a4cffeb059226ff6bee9f48acb388faf674afff",
+                "reference": "1a4cffeb059226ff6bee9f48acb388faf674afff",
                 "shasum": ""
             },
             "require": {
@@ -5382,7 +5452,7 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-22T10:48:49+00:00"
+            "time": "2018-03-19T22:32:39+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -5449,7 +5519,7 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -5498,16 +5568,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625"
+                "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/a479817ce0a9e4adfd7d39c6407c95d97c254625",
-                "reference": "a479817ce0a9e4adfd7d39c6407c95d97c254625",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/bd14efe8b1fabc4de82bf50dce62f05f9a102433",
+                "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433",
                 "shasum": ""
             },
             "require": {
@@ -5543,7 +5613,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-05T18:28:11+00:00"
+            "time": "2018-04-04T05:07:11+00:00"
         },
         {
             "name": "symfony/http-foundation",
@@ -6283,16 +6353,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.4.6",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "80964679d81da3d5618519e0e4be488c3d7ecd7d"
+                "reference": "951643091b39a6fd40fce56cd16e21e12bef3feb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/80964679d81da3d5618519e0e4be488c3d7ecd7d",
-                "reference": "80964679d81da3d5618519e0e4be488c3d7ecd7d",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/951643091b39a6fd40fce56cd16e21e12bef3feb",
+                "reference": "951643091b39a6fd40fce56cd16e21e12bef3feb",
                 "shasum": ""
             },
             "require": {
@@ -6348,7 +6418,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2018-02-22T17:29:24+00:00"
+            "time": "2018-04-03T20:34:11+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -6814,6 +6884,7 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
+        "drupal/better_normalizers": 10,
         "drupal/default_content_deploy": 15,
         "drupal/diff": 5,
         "drupal/entity_embed": 10,
diff --git a/web/patches/menu_link_uuid_nid-2670954-reroll.patch b/web/patches/menu_link_uuid_nid-2670954-reroll.patch
new file mode 100644
index 0000000..0aa6558
--- /dev/null
+++ b/web/patches/menu_link_uuid_nid-2670954-reroll.patch
@@ -0,0 +1,23 @@
+diff -Naur default_content/composer.json default_content_patched/composer.json
+--- default_content/composer.json	2018-04-27 15:49:03.000000000 -0700
++++ default_content_patched/composer.json	2018-04-27 15:50:22.000000000 -0700
+@@ -5,6 +5,7 @@
+   "license": "GPL-2.0+",
+   "minimum-stability": "dev",
+   "require": {
+-    "drupal/core": "~8.3"
++    "drupal/core": "~8.3",
++    "drupal/better_normalizers": "^1.0@beta"
+   }
+ }
+diff -Naur default_content/default_content.info.yml default_content_patched/default_content.info.yml
+--- default_content/default_content.info.yml	2018-04-27 15:49:18.000000000 -0700
++++ default_content_patched/default_content.info.yml	2018-04-27 15:50:22.000000000 -0700
+@@ -5,6 +5,7 @@
+ # core: 8.x
+ dependencies:
+   - drupal:hal (>=8.3.x)
++  - better_normalizers
+ 
+ # Information added by Drupal.org packaging script on 2017-10-19
+ version: '8.x-1.0-alpha7'
diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
index 15903b5..e697e80 100644
--- a/web/sites/default/config/core.extension.yml
+++ b/web/sites/default/config/core.extension.yml
@@ -2,6 +2,7 @@ module:
   action: 0
   aggregator: 0
   automated_cron: 0
+  better_normalizers: 0
   block: 0
   block_content: 0
   breakpoint: 0

From 1f30e47582a4094919076ea26ab0fe564140c0bb Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 27 Apr 2018 16:58:51 -0700
Subject: [PATCH 134/143] Re-attempting to reposition footer menus' links

...now that the Better Normalization module is enabled.

This is essentially a redo of 948bf8bad9ec766ebf411eec6e0ce29533b6d709.

https://github.com/18F/nsf/issues/190
---
 .../01582e73-b3b4-4eeb-a2dd-515b2c9f0f49.json |  4 +--
 .../03197086-5fd9-4e3a-a547-590ac79cfd47.json | 28 +++++++++++++++++--
 .../2e65221d-2749-4290-a7d9-e3feeee2acd0.json | 28 +++++++++++++++++--
 .../30ad5447-8c6a-4b91-9258-6c2cedece8ed.json | 28 +++++++++++++++++--
 .../338ca875-8de5-4d34-bb7d-6202958e1341.json | 28 +++++++++++++++++--
 .../3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json | 28 +++++++++++++++++--
 .../3c435fbc-9a02-4315-8b3d-f297529c922c.json | 28 +++++++++++++++++--
 .../6a9f3d91-eef8-4b68-8b60-a0be43df62c1.json | 28 +++++++++++++++++--
 .../6e293a07-90b9-4763-bf40-3d21be9c0feb.json |  4 +--
 .../6e3de191-6840-4ccf-8242-1d44a20ea30f.json | 28 +++++++++++++++++--
 .../8a3132e5-7037-4fe2-b0de-aef0207b54bf.json | 28 +++++++++++++++++--
 .../8d70e856-5580-40c5-a1f8-428f7a331b5f.json | 28 +++++++++++++++++--
 .../8e8be807-dd24-458c-bb43-419f4c5da5f9.json | 28 +++++++++++++++++--
 .../900d3fd6-0737-4995-9472-9301a3800811.json | 28 +++++++++++++++++--
 .../add1d072-0d79-4878-9781-2f9141e77c84.json | 28 +++++++++++++++++--
 .../ae222b1f-b138-466b-ae33-0a464bae5993.json | 28 +++++++++++++++++--
 .../b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json | 28 +++++++++++++++++--
 .../b9b37cba-942c-443b-803e-e9301f330ad7.json | 28 +++++++++++++++++--
 .../bfbf32c3-c2f6-48b7-8fd4-c5a64b0f0616.json | 28 +++++++++++++++++--
 .../c43f2f1b-86dd-462b-ac15-fc241e1af751.json |  4 +--
 .../d1cd56a7-4282-4395-bc21-433ef1d3238b.json | 28 +++++++++++++++++--
 .../d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json | 28 +++++++++++++++++--
 .../e0128ba5-720a-4b7c-a006-533598f1a9a5.json | 28 +++++++++++++++++--
 .../e4168237-4768-4bb1-9eb8-01a4f0ac055d.json |  4 +--
 .../ebcd6b15-f09f-4d5e-9478-ada67aba04bd.json |  4 +--
 .../f49e138a-1106-4930-91c8-0cf26bc0c66d.json |  4 +--
 .../f4df684c-896a-49f6-8302-bad77d152982.json | 28 +++++++++++++++++--
 27 files changed, 558 insertions(+), 54 deletions(-)

diff --git a/web/sites/default/content/menu_link_content/01582e73-b3b4-4eeb-a2dd-515b2c9f0f49.json b/web/sites/default/content/menu_link_content/01582e73-b3b4-4eeb-a2dd-515b2c9f0f49.json
index 31bd23e..6dd6789 100644
--- a/web/sites/default/content/menu_link_content/01582e73-b3b4-4eeb-a2dd-515b2c9f0f49.json
+++ b/web/sites/default/content/menu_link_content/01582e73-b3b4-4eeb-a2dd-515b2c9f0f49.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 3
+            "value": -41
         }
     ],
     "expanded": [
@@ -79,7 +79,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:22:49+00:00",
+            "value": "2018-04-27T23:18:21+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json b/web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json
index 7f1557c..2f15615 100644
--- a/web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json
+++ b/web/sites/default/content/menu_link_content/03197086-5fd9-4e3a-a547-590ac79cfd47.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "f49e138a-1106-4930-91c8-0cf26bc0c66d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/2e65221d-2749-4290-a7d9-e3feeee2acd0.json b/web/sites/default/content/menu_link_content/2e65221d-2749-4290-a7d9-e3feeee2acd0.json
index f19d69c..ca6be03 100644
--- a/web/sites/default/content/menu_link_content/2e65221d-2749-4290-a7d9-e3feeee2acd0.json
+++ b/web/sites/default/content/menu_link_content/2e65221d-2749-4290-a7d9-e3feeee2acd0.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/11\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/11\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "01582e73-b3b4-4eeb-a2dd-515b2c9f0f49"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json b/web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json
index b4d6872..b88973d 100644
--- a/web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json
+++ b/web/sites/default/content/menu_link_content/30ad5447-8c6a-4b91-9258-6c2cedece8ed.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "f49e138a-1106-4930-91c8-0cf26bc0c66d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json b/web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json
index 2ba91dd..8207dc0 100644
--- a/web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json
+++ b/web/sites/default/content/menu_link_content/338ca875-8de5-4d34-bb7d-6202958e1341.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "f49e138a-1106-4930-91c8-0cf26bc0c66d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json b/web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json
index a62b493..f31b343 100644
--- a/web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json
+++ b/web/sites/default/content/menu_link_content/3814ce2d-b38f-4cc3-87aa-dd46bd35cf4b.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "f49e138a-1106-4930-91c8-0cf26bc0c66d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json b/web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json
index f8026aa..4e2977b 100644
--- a/web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json
+++ b/web/sites/default/content/menu_link_content/3c435fbc-9a02-4315-8b3d-f297529c922c.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/3\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -88,5 +93,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/3\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "6e293a07-90b9-4763-bf40-3d21be9c0feb"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/6a9f3d91-eef8-4b68-8b60-a0be43df62c1.json b/web/sites/default/content/menu_link_content/6a9f3d91-eef8-4b68-8b60-a0be43df62c1.json
index e4305ec..35999c1 100644
--- a/web/sites/default/content/menu_link_content/6a9f3d91-eef8-4b68-8b60-a0be43df62c1.json
+++ b/web/sites/default/content/menu_link_content/6a9f3d91-eef8-4b68-8b60-a0be43df62c1.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/11\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/11\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "01582e73-b3b4-4eeb-a2dd-515b2c9f0f49"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/6e293a07-90b9-4763-bf40-3d21be9c0feb.json b/web/sites/default/content/menu_link_content/6e293a07-90b9-4763-bf40-3d21be9c0feb.json
index e6201dd..9513b75 100644
--- a/web/sites/default/content/menu_link_content/6e293a07-90b9-4763-bf40-3d21be9c0feb.json
+++ b/web/sites/default/content/menu_link_content/6e293a07-90b9-4763-bf40-3d21be9c0feb.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": -50
+            "value": -49
         }
     ],
     "expanded": [
@@ -79,7 +79,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T20:20:49+00:00",
+            "value": "2018-04-27T23:18:21+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json b/web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json
index 2b0ff9d..f4a1633 100644
--- a/web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json
+++ b/web/sites/default/content/menu_link_content/6e3de191-6840-4ccf-8242-1d44a20ea30f.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/3\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -88,5 +93,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/3\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "6e293a07-90b9-4763-bf40-3d21be9c0feb"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json b/web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json
index 08df48b..1f5c9b4 100644
--- a/web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json
+++ b/web/sites/default/content/menu_link_content/8a3132e5-7037-4fe2-b0de-aef0207b54bf.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json b/web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json
index 7bb78ff..054fe15 100644
--- a/web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json
+++ b/web/sites/default/content/menu_link_content/8d70e856-5580-40c5-a1f8-428f7a331b5f.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/8e8be807-dd24-458c-bb43-419f4c5da5f9.json b/web/sites/default/content/menu_link_content/8e8be807-dd24-458c-bb43-419f4c5da5f9.json
index 781d722..4a03edb 100644
--- a/web/sites/default/content/menu_link_content/8e8be807-dd24-458c-bb43-419f4c5da5f9.json
+++ b/web/sites/default/content/menu_link_content/8e8be807-dd24-458c-bb43-419f4c5da5f9.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/11\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/11\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "01582e73-b3b4-4eeb-a2dd-515b2c9f0f49"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json b/web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json
index fbd67ae..8dd9ec5 100644
--- a/web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json
+++ b/web/sites/default/content/menu_link_content/900d3fd6-0737-4995-9472-9301a3800811.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json b/web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json
index 8a92e86..b97606f 100644
--- a/web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json
+++ b/web/sites/default/content/menu_link_content/add1d072-0d79-4878-9781-2f9141e77c84.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json b/web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json
index 775db97..f615514 100644
--- a/web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json
+++ b/web/sites/default/content/menu_link_content/ae222b1f-b138-466b-ae33-0a464bae5993.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json b/web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json
index 25dc880..393c2be 100644
--- a/web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json
+++ b/web/sites/default/content/menu_link_content/b8aa0e4a-b52e-4e1f-acfc-c80555e41b66.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json b/web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json
index e9bdc7e..ac39622 100644
--- a/web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json
+++ b/web/sites/default/content/menu_link_content/b9b37cba-942c-443b-803e-e9301f330ad7.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/24\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/24\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "c43f2f1b-86dd-462b-ac15-fc241e1af751"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/bfbf32c3-c2f6-48b7-8fd4-c5a64b0f0616.json b/web/sites/default/content/menu_link_content/bfbf32c3-c2f6-48b7-8fd4-c5a64b0f0616.json
index 3bb3c75..495a11d 100644
--- a/web/sites/default/content/menu_link_content/bfbf32c3-c2f6-48b7-8fd4-c5a64b0f0616.json
+++ b/web/sites/default/content/menu_link_content/bfbf32c3-c2f6-48b7-8fd4-c5a64b0f0616.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/11\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/11\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "01582e73-b3b4-4eeb-a2dd-515b2c9f0f49"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/c43f2f1b-86dd-462b-ac15-fc241e1af751.json b/web/sites/default/content/menu_link_content/c43f2f1b-86dd-462b-ac15-fc241e1af751.json
index 0eccc95..00d941e 100644
--- a/web/sites/default/content/menu_link_content/c43f2f1b-86dd-462b-ac15-fc241e1af751.json
+++ b/web/sites/default/content/menu_link_content/c43f2f1b-86dd-462b-ac15-fc241e1af751.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 1
+            "value": -43
         }
     ],
     "expanded": [
@@ -79,7 +79,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:51:15+00:00",
+            "value": "2018-04-27T23:17:34+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json b/web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json
index f4eac01..c07f786 100644
--- a/web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json
+++ b/web/sites/default/content/menu_link_content/d1cd56a7-4282-4395-bc21-433ef1d3238b.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "f49e138a-1106-4930-91c8-0cf26bc0c66d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json b/web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json
index 6d6b7c3..56a0632 100644
--- a/web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json
+++ b/web/sites/default/content/menu_link_content/d5e5aad6-f42c-48d3-8825-fe56b62fc1f6.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/26\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/26\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "ebcd6b15-f09f-4d5e-9478-ada67aba04bd"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json b/web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json
index ba597da..1c51d7f 100644
--- a/web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json
+++ b/web/sites/default/content/menu_link_content/e0128ba5-720a-4b7c-a006-533598f1a9a5.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "f49e138a-1106-4930-91c8-0cf26bc0c66d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/web/sites/default/content/menu_link_content/e4168237-4768-4bb1-9eb8-01a4f0ac055d.json b/web/sites/default/content/menu_link_content/e4168237-4768-4bb1-9eb8-01a4f0ac055d.json
index d043cba..781d1b5 100644
--- a/web/sites/default/content/menu_link_content/e4168237-4768-4bb1-9eb8-01a4f0ac055d.json
+++ b/web/sites/default/content/menu_link_content/e4168237-4768-4bb1-9eb8-01a4f0ac055d.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 0
+            "value": -50
         }
     ],
     "expanded": [
@@ -79,7 +79,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:30:37+00:00",
+            "value": "2018-04-27T23:17:34+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/ebcd6b15-f09f-4d5e-9478-ada67aba04bd.json b/web/sites/default/content/menu_link_content/ebcd6b15-f09f-4d5e-9478-ada67aba04bd.json
index fdddd8d..1733681 100644
--- a/web/sites/default/content/menu_link_content/ebcd6b15-f09f-4d5e-9478-ada67aba04bd.json
+++ b/web/sites/default/content/menu_link_content/ebcd6b15-f09f-4d5e-9478-ada67aba04bd.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 2
+            "value": -42
         }
     ],
     "expanded": [
@@ -79,7 +79,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T21:52:54+00:00",
+            "value": "2018-04-27T23:17:34+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json b/web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json
index 5a03fdc..cdfca15 100644
--- a/web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json
+++ b/web/sites/default/content/menu_link_content/f49e138a-1106-4930-91c8-0cf26bc0c66d.json
@@ -64,7 +64,7 @@
     ],
     "weight": [
         {
-            "value": 1
+            "value": -48
         }
     ],
     "expanded": [
@@ -79,7 +79,7 @@
     ],
     "changed": [
         {
-            "value": "2018-04-05T20:24:07+00:00",
+            "value": "2018-04-27T23:18:21+00:00",
             "lang": "en",
             "format": "Y-m-d\\TH:i:sP"
         }
diff --git a/web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json b/web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json
index d532b75..eda9481 100644
--- a/web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json
+++ b/web/sites/default/content/menu_link_content/f4df684c-896a-49f6-8302-bad77d152982.json
@@ -5,7 +5,12 @@
         },
         "type": {
             "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
-        }
+        },
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+            }
+        ]
     },
     "id": [
         {
@@ -94,5 +99,24 @@
             "value": true,
             "lang": "en"
         }
-    ]
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/menu_link_content\/menu_link_content\/menu_link_content_parent_entity": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/admin\/structure\/menu\/item\/16\/edit?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "e4168237-4768-4bb1-9eb8-01a4f0ac055d"
+                    }
+                ]
+            }
+        ]
+    }
 }
\ No newline at end of file

From aacea8af97df3b186cb3528ab208cc442d4bf1be Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 4 May 2018 16:35:18 -0700
Subject: [PATCH 135/143] Add Instagram Block module

This commit includes and enables the module but not its configuration.

https://github.com/18F/nsf/issues/155
---
 composer.json                               |  1 +
 composer.lock                               | 53 ++++++++++++++++++++-
 web/sites/default/config/core.extension.yml |  1 +
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 368469c..0cb20b9 100644
--- a/composer.json
+++ b/composer.json
@@ -33,6 +33,7 @@
         "drupal/entity_embed": "^1.0@beta",
         "drupal/features": "^3.5",
         "drupal/inline_entity_form": "^1.0@beta",
+        "drupal/instagram_block": "^2.0",
         "drupal/media_entity": "^1.7",
         "drupal/pathauto": "^1.1",
         "drupal/rules": "^3.0@alpha",
diff --git a/composer.lock b/composer.lock
index 641bf9a..4760fc4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9c274b6077552f4d4e0457fa53843d0e",
+    "content-hash": "1b2a7d900d4071782bb826277dc05fcc",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -3052,6 +3052,57 @@
                 "source": "http://cgit.drupalcode.org/inline_entity_form"
             }
         },
+        {
+            "name": "drupal/instagram_block",
+            "version": "2.0.0-beta2",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/instagram_block",
+                "reference": "8.x-2.0-beta2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/instagram_block-8.x-2.0-beta2.zip",
+                "reference": "8.x-2.0-beta2",
+                "shasum": "f90294fa109540358fc8f5b336139bbe6899b91b"
+            },
+            "require": {
+                "drupal/core": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-2.0-beta2",
+                    "datestamp": "1523290080",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Beta releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "naveenvalecha",
+                    "homepage": "https://www.drupal.org/user/2665733"
+                },
+                {
+                    "name": "yanniboi",
+                    "homepage": "https://www.drupal.org/user/1837556"
+                }
+            ],
+            "description": "Creates a block that displays images from instagram.",
+            "homepage": "https://www.drupal.org/project/instagram_block",
+            "support": {
+                "source": "http://cgit.drupalcode.org/instagram_block"
+            }
+        },
         {
             "name": "drupal/media_entity",
             "version": "1.7.0",
diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
index e697e80..ec2cf27 100644
--- a/web/sites/default/config/core.extension.yml
+++ b/web/sites/default/config/core.extension.yml
@@ -41,6 +41,7 @@ module:
   image: 0
   inline_entity_form: 0
   inline_form_errors: 0
+  instagram_block: 0
   link: 0
   media_entity: 0
   media_entity_brightcove: 0

From d89c786a07976670cab7d2920c8347b6cd3738d5 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 4 May 2018 16:48:17 -0700
Subject: [PATCH 136/143] Position block and add Instagram Block credentials

...set to SECRET, of course.

https://github.com/18F/nsf/issues/155
---
 docker-compose.yml                            |  1 +
 manifest-prod.yml                             |  1 +
 manifest.yml                                  |  1 +
 .../config/block.block.instagramblock.yml     | 32 +++++++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 100644 web/sites/default/config/block.block.instagramblock.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 6e13003..71c1a8a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,6 +36,7 @@ services:
               "BRIGHTCOVE_ACCOUNT": "SECRET",
               "BRIGHTCOVE_CLIENT": "SECRET",
               "BRIGHTCOVE_SECRET": "SECRET",
+              "INSTAGRAM_ACCESS_TOKEN": "SECRET",
               "CRON_KEY": "SECRET",
               "HASH_SALT": "SECRET",
               "ROOT_USER_NAME": "root",
diff --git a/manifest-prod.yml b/manifest-prod.yml
index bdf6384..5a76a51 100644
--- a/manifest-prod.yml
+++ b/manifest-prod.yml
@@ -9,6 +9,7 @@ default_config: &defaults
                # "BRIGHTCOVE_ACCOUNT": ...
                # "BRIGHTCOVE_CLIENT": ...
                # "BRIGHTCOVE_SECRET": ...
+               # "INSTAGRAM_ACCESS_TOKEN": ...
                # "CRON_KEY": ...
                # "HASH_SALT": ...
                # "ROOT_USER_NAME": ...,
diff --git a/manifest.yml b/manifest.yml
index 36aecec..664f804 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -9,6 +9,7 @@ default_config: &defaults
                # "BRIGHTCOVE_ACCOUNT": ...
                # "BRIGHTCOVE_CLIENT": ...
                # "BRIGHTCOVE_SECRET": ...
+               # "INSTAGRAM_ACCESS_TOKEN": ...
                # "CRON_KEY": ...
                # "HASH_SALT": ...
                # "ROOT_USER_NAME": ...,
diff --git a/web/sites/default/config/block.block.instagramblock.yml b/web/sites/default/config/block.block.instagramblock.yml
new file mode 100644
index 0000000..d09975e
--- /dev/null
+++ b/web/sites/default/config/block.block.instagramblock.yml
@@ -0,0 +1,32 @@
+uuid: 4fe47205-ad99-41c4-b10e-a7303517f0b2
+langcode: en
+status: true
+dependencies:
+  module:
+    - instagram_block
+    - system
+  theme:
+    - nsf
+id: instagramblock
+theme: nsf
+region: content
+weight: -5
+provider: null
+plugin: instagram_block_block
+settings:
+  id: instagram_block_block
+  label: 'NSF on Instagram'
+  provider: instagram_block
+  label_display: visible
+  access_token: SECRET
+  count: 6
+  width: 250
+  height: 250
+  img_resolution: thumbnail
+  cache_time_minutes: 1440
+visibility:
+  request_path:
+    id: request_path
+    pages: '<front>'
+    negate: false
+    context_mapping: {  }

From 9da82c974678a193c913b78ae9ea6f9623a57bf9 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Fri, 4 May 2018 16:57:20 -0700
Subject: [PATCH 137/143] Refactor the 'homepage' to be a regular page plus
 blocks

Previously, the main page was generated by a view (as a 'page'
display). This commit adds a blank page node at the same URL,
deletes the no-longer-used page display of that view, and updates
the block view to 1) match the appearance of the earlier approach
and 2) be Tumblr-specific.

The Tumblr feeds are aggregator sources 1 and 2, hence the filter
for "less than or equal to 2".

https://github.com/18F/nsf/issues/155
https://github.com/18F/nsf/issues/162
---
 .../config/block.block.nsf_page_title.yml     |  11 +-
 ...ck.block.views_block__nsf_blog_block_1.yml |  30 ++++
 .../default/config/views.view.nsf_blog.yml    | 137 ++++++++--------
 .../ce367652-adf0-41fb-ba60-bc548040cca3.json | 153 ++++++++++++++++++
 4 files changed, 266 insertions(+), 65 deletions(-)
 create mode 100644 web/sites/default/config/block.block.views_block__nsf_blog_block_1.yml
 create mode 100644 web/sites/default/content/node/ce367652-adf0-41fb-ba60-bc548040cca3.json

diff --git a/web/sites/default/config/block.block.nsf_page_title.yml b/web/sites/default/config/block.block.nsf_page_title.yml
index 8ab51af..d08d4da 100644
--- a/web/sites/default/config/block.block.nsf_page_title.yml
+++ b/web/sites/default/config/block.block.nsf_page_title.yml
@@ -2,6 +2,8 @@ uuid: 1f8d24dc-a5d7-4f72-b183-4432efefea2b
 langcode: en
 status: true
 dependencies:
+  module:
+    - system
   theme:
     - nsf
 _core:
@@ -9,7 +11,7 @@ _core:
 id: nsf_page_title
 theme: nsf
 region: content
-weight: -5
+weight: -8
 provider: null
 plugin: page_title_block
 settings:
@@ -17,4 +19,9 @@ settings:
   label: 'Page title'
   provider: core
   label_display: '0'
-visibility: {  }
+visibility:
+  request_path:
+    id: request_path
+    pages: '<front>'
+    negate: true
+    context_mapping: {  }
diff --git a/web/sites/default/config/block.block.views_block__nsf_blog_block_1.yml b/web/sites/default/config/block.block.views_block__nsf_blog_block_1.yml
new file mode 100644
index 0000000..a44d850
--- /dev/null
+++ b/web/sites/default/config/block.block.views_block__nsf_blog_block_1.yml
@@ -0,0 +1,30 @@
+uuid: 12a04aa3-6f99-4beb-8dfc-59881beed555
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.nsf_blog
+  module:
+    - system
+    - views
+  theme:
+    - nsf
+id: views_block__nsf_blog_block_1
+theme: nsf
+region: content
+weight: -4
+provider: null
+plugin: 'views_block:nsf_blog-block_1'
+settings:
+  id: 'views_block:nsf_blog-block_1'
+  label: ''
+  provider: views
+  label_display: visible
+  views_label: ''
+  items_per_page: none
+visibility:
+  request_path:
+    id: request_path
+    pages: '<front>'
+    negate: false
+    context_mapping: {  }
diff --git a/web/sites/default/config/views.view.nsf_blog.yml b/web/sites/default/config/views.view.nsf_blog.yml
index 60578f1..42eeec3 100644
--- a/web/sites/default/config/views.view.nsf_blog.yml
+++ b/web/sites/default/config/views.view.nsf_blog.yml
@@ -5,9 +5,9 @@ dependencies:
   module:
     - aggregator
 id: nsf_blog
-label: Blog
+label: 'External blogs'
 module: views
-description: 'NSF custom view. Displays blog entries imported from external blog.'
+description: 'NSF custom view. Displays blog entries imported from external sources.'
 tag: ''
 base_table: aggregator_item
 base_field: iid
@@ -148,7 +148,20 @@ display:
           plugin_id: date
       title: 'NSF on Tumblr'
       header: {  }
-      footer: {  }
+      footer:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: false
+          content:
+            value: '<a href="https://www.nsf.gov/social/policies.jsp">Social Media Policies</a>'
+            format: basic_html
+          plugin_id: text
       empty: {  }
       relationships: {  }
       arguments: {  }
@@ -162,26 +175,19 @@ display:
   block_1:
     display_plugin: block
     id: block_1
-    display_title: Block
+    display_title: 'Tumblr block'
     position: 3
     display_options:
       display_extenders: {  }
-      style:
-        type: default
       defaults:
-        style: false
-        row: false
-        pager: false
+        style: true
+        row: true
+        pager: true
         fields: false
         footer: true
-      row:
-        type: fields
-      pager:
-        type: some
-        options:
-          items_per_page: 5
-          offset: 0
-      block_description: 'Blog entries (all)'
+        filters: false
+        filter_groups: false
+      block_description: 'NSF on Tumblr'
       fields:
         title:
           table: aggregator_item
@@ -314,6 +320,57 @@ display:
           entity_type: aggregator_item
           entity_field: timestamp
           plugin_id: field
+      display_description: ''
+      block_category: 'Social Media'
+      filters:
+        fid:
+          id: fid
+          table: aggregator_item
+          field: fid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '<='
+          value:
+            min: ''
+            max: ''
+            value: '2'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            placeholder: ''
+            min_placeholder: ''
+            max_placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: aggregator_item
+          entity_field: fid
+          plugin_id: numeric
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
     cache_metadata:
       max-age: -1
       contexts:
@@ -338,52 +395,6 @@ display:
       path: blog.xml
       displays:
         default: default
-        page_1: page_1
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-      tags: {  }
-  page_1:
-    display_plugin: page
-    id: page_1
-    display_title: Page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: blog
-      filters: {  }
-      defaults:
-        filters: false
-        filter_groups: false
-        use_more: false
-        use_more_always: false
-        use_more_text: false
-        title: true
-        footer: false
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      enabled: true
-      use_more: false
-      use_more_always: false
-      use_more_text: more
-      footer:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: false
-          tokenize: false
-          content:
-            value: '<a href="https://www.nsf.gov/social/policies.jsp">Social Media Policies</a>'
-            format: basic_html
-          plugin_id: text
     cache_metadata:
       max-age: -1
       contexts:
diff --git a/web/sites/default/content/node/ce367652-adf0-41fb-ba60-bc548040cca3.json b/web/sites/default/content/node/ce367652-adf0-41fb-ba60-bc548040cca3.json
new file mode 100644
index 0000000..f72f234
--- /dev/null
+++ b/web/sites/default/content/node/ce367652-adf0-41fb-ba60-bc548040cca3.json
@@ -0,0 +1,153 @@
+{
+    "_links": {
+        "self": {
+            "href": "http:\/\/default\/blog?_format=hal_json"
+        },
+        "type": {
+            "href": "http:\/\/drupal.org\/rest\/type\/node\/page"
+        },
+        "http:\/\/drupal.org\/rest\/relation\/node\/page\/revision_uid": [
+            {
+                "href": "http:\/\/default\/user\/1?_format=hal_json"
+            }
+        ],
+        "http:\/\/drupal.org\/rest\/relation\/node\/page\/uid": [
+            {
+                "href": "http:\/\/default\/user\/1?_format=hal_json",
+                "lang": "en"
+            }
+        ]
+    },
+    "nid": [
+        {
+            "value": 3
+        }
+    ],
+    "uuid": [
+        {
+            "value": "ce367652-adf0-41fb-ba60-bc548040cca3"
+        }
+    ],
+    "vid": [
+        {
+            "value": 3
+        }
+    ],
+    "langcode": [
+        {
+            "value": "en",
+            "lang": "en"
+        }
+    ],
+    "type": [
+        {
+            "target_id": "page"
+        }
+    ],
+    "revision_timestamp": [
+        {
+            "value": "2018-05-04T23:24:09+00:00",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "_embedded": {
+        "http:\/\/drupal.org\/rest\/relation\/node\/page\/revision_uid": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/user\/1?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/user\/user"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "41754bd2-a1ed-4d85-afcd-d950e0e73015"
+                    }
+                ]
+            }
+        ],
+        "http:\/\/drupal.org\/rest\/relation\/node\/page\/uid": [
+            {
+                "_links": {
+                    "self": {
+                        "href": "http:\/\/default\/user\/1?_format=hal_json"
+                    },
+                    "type": {
+                        "href": "http:\/\/drupal.org\/rest\/type\/user\/user"
+                    }
+                },
+                "uuid": [
+                    {
+                        "value": "41754bd2-a1ed-4d85-afcd-d950e0e73015"
+                    }
+                ],
+                "lang": "en"
+            }
+        ]
+    },
+    "status": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ],
+    "title": [
+        {
+            "value": "National Science Foundation",
+            "lang": "en"
+        }
+    ],
+    "created": [
+        {
+            "value": "2018-05-04T23:23:32+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "changed": [
+        {
+            "value": "2018-05-04T23:24:09+00:00",
+            "lang": "en",
+            "format": "Y-m-d\\TH:i:sP"
+        }
+    ],
+    "promote": [
+        {
+            "value": false
+        }
+    ],
+    "sticky": [
+        {
+            "value": false,
+            "lang": "en"
+        }
+    ],
+    "default_langcode": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ],
+    "revision_translation_affected": [
+        {
+            "value": true,
+            "lang": "en"
+        }
+    ],
+    "moderation_state": [
+        {
+            "value": "published",
+            "lang": "en"
+        }
+    ],
+    "path": [
+        {
+            "alias": "\/blog",
+            "pid": 2,
+            "langcode": "en",
+            "lang": "en"
+        }
+    ]
+}
\ No newline at end of file

From ffd5519da9f72a8bdd72591fd4cbf3c2acf80154 Mon Sep 17 00:00:00 2001
From: CM Lubinski <christopher.lubinski@gsa.gov>
Date: Wed, 1 Aug 2018 19:55:01 -0400
Subject: [PATCH 138/143] Bump to Drupal 8.5.6.

Drupal core issued a security release today that bumps up their dependent
libraries: https://www.drupal.org/SA-CORE-2018-005

To satisfy, this updates Drupal and three of the symfony libraries it depends
on. In one of the patch releases sine 8.5.3, Drupal also modified two of the
files it auto-creates; we've included those changes here as well.
---
 composer.lock      | 130 +++++++++++++++++++++++++++++++++------------
 web/.ht.router.php |   4 +-
 web/robots.txt     |   4 +-
 3 files changed, 99 insertions(+), 39 deletions(-)

diff --git a/composer.lock b/composer.lock
index 641bf9a..18303d5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "9c274b6077552f4d4e0457fa53843d0e",
+    "content-hash": "2413b98f2cc7d345c4ae8f13f78b0753",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -2004,16 +2004,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "8.5.3",
+            "version": "8.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "b012f0ae51504880e920f2c6efdbdf03b6fe2129"
+                "reference": "7d7184a69ac90ce53929ce99f18458043416107a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/b012f0ae51504880e920f2c6efdbdf03b6fe2129",
-                "reference": "b012f0ae51504880e920f2c6efdbdf03b6fe2129",
+                "url": "https://api.github.com/repos/drupal/core/zipball/7d7184a69ac90ce53929ce99f18458043416107a",
+                "reference": "7d7184a69ac90ce53929ce99f18458043416107a",
                 "shasum": ""
             },
             "require": {
@@ -2046,8 +2046,8 @@
                 "symfony/console": "~3.4.0",
                 "symfony/dependency-injection": "~3.4.0",
                 "symfony/event-dispatcher": "~3.4.0",
-                "symfony/http-foundation": "~3.4.0",
-                "symfony/http-kernel": "~3.4.0",
+                "symfony/http-foundation": "~3.4.14",
+                "symfony/http-kernel": "~3.4.14",
                 "symfony/polyfill-iconv": "^1.0",
                 "symfony/process": "~3.4.0",
                 "symfony/psr-http-message-bridge": "^1.0",
@@ -2235,7 +2235,7 @@
                 "GPL-2.0-or-later"
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-            "time": "2018-04-25T15:39:01+00:00"
+            "time": "2018-08-01T20:50:42+00:00"
         },
         {
             "name": "drupal/ctools",
@@ -2573,7 +2573,7 @@
                 },
                 "drupal": {
                     "version": "8.x-1.0-rc1",
-                    "datestamp": "1484566683",
+                    "datestamp": "1530178424",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "RC releases are not covered by Drupal security advisories."
@@ -2723,7 +2723,7 @@
                 },
                 "drupal": {
                     "version": "8.x-1.0-beta3",
-                    "datestamp": "1520958485",
+                    "datestamp": "1528452184",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Beta releases are not covered by Drupal security advisories."
@@ -2793,7 +2793,7 @@
                 },
                 "drupal": {
                     "version": "8.x-2.0-alpha2",
-                    "datestamp": "1512118387",
+                    "datestamp": "1528141081",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Alpha releases are not covered by Drupal security advisories."
@@ -3013,7 +3013,7 @@
                 },
                 "drupal": {
                     "version": "8.x-1.0-beta1",
-                    "datestamp": "1477868343",
+                    "datestamp": "1527030784",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Beta releases are not covered by Drupal security advisories."
@@ -3081,7 +3081,7 @@
                 },
                 "drupal": {
                     "version": "8.x-1.7",
-                    "datestamp": "1510737185",
+                    "datestamp": "1532693881",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3238,7 +3238,7 @@
                 },
                 "drupal": {
                     "version": "8.x-3.0-alpha3",
-                    "datestamp": "1495743783",
+                    "datestamp": "1526654284",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Alpha releases are not covered by Drupal security advisories."
@@ -3250,6 +3250,10 @@
                 "GPL-2.0+"
             ],
             "authors": [
+                {
+                    "name": "TR",
+                    "homepage": "https://www.drupal.org/user/202830"
+                },
                 {
                     "name": "fago",
                     "homepage": "https://www.drupal.org/user/16747"
@@ -3290,7 +3294,7 @@
                 },
                 "drupal": {
                     "version": "8.x-3.0-alpha9",
-                    "datestamp": "1523006284",
+                    "datestamp": "1525449183",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Alpha releases are not covered by Drupal security advisories."
@@ -3477,7 +3481,7 @@
                 },
                 "drupal": {
                     "version": "8.x-1.1",
-                    "datestamp": "1513810384",
+                    "datestamp": "1527112080",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5329,16 +5333,16 @@
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "24a68710c6ddc1e3d159a110cef94cedfcf3c611"
+                "reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/24a68710c6ddc1e3d159a110cef94cedfcf3c611",
-                "reference": "24a68710c6ddc1e3d159a110cef94cedfcf3c611",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1c0e679e522591fd744fdf242fec41a43d62b2b1",
+                "reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1",
                 "shasum": ""
             },
             "require": {
@@ -5396,7 +5400,7 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-29T11:25:31+00:00"
+            "time": "2018-07-29T15:19:31+00:00"
         },
         {
             "name": "symfony/dom-crawler",
@@ -5617,16 +5621,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "b11e6d165ff4cbf5685d185ab19a90f2f3bb7d1e"
+                "reference": "19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b11e6d165ff4cbf5685d185ab19a90f2f3bb7d1e",
-                "reference": "b11e6d165ff4cbf5685d185ab19a90f2f3bb7d1e",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6",
+                "reference": "19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6",
                 "shasum": ""
             },
             "require": {
@@ -5667,20 +5671,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-03T05:22:50+00:00"
+            "time": "2018-08-01T14:04:26+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "3cc2d4374aa9590c09277ad68657671cf49dbbf4"
+                "reference": "8e84cc498f0ffecfbabdea78b87828fd66189544"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3cc2d4374aa9590c09277ad68657671cf49dbbf4",
-                "reference": "3cc2d4374aa9590c09277ad68657671cf49dbbf4",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8e84cc498f0ffecfbabdea78b87828fd66189544",
+                "reference": "8e84cc498f0ffecfbabdea78b87828fd66189544",
                 "shasum": ""
             },
             "require": {
@@ -5688,11 +5692,12 @@
                 "psr/log": "~1.0",
                 "symfony/debug": "~2.8|~3.0|~4.0",
                 "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-                "symfony/http-foundation": "^3.4.4|^4.0.4"
+                "symfony/http-foundation": "~3.4.12|~4.0.12|^4.1.1",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
                 "symfony/config": "<2.8",
-                "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4",
+                "symfony/dependency-injection": "<3.4.10|<4.0.10,>=4",
                 "symfony/var-dumper": "<3.3",
                 "twig/twig": "<1.34|<2.4,>=2"
             },
@@ -5706,7 +5711,7 @@
                 "symfony/config": "~2.8|~3.0|~4.0",
                 "symfony/console": "~2.8|~3.0|~4.0",
                 "symfony/css-selector": "~2.8|~3.0|~4.0",
-                "symfony/dependency-injection": "^3.4.5|^4.0.5",
+                "symfony/dependency-injection": "^3.4.10|^4.0.10",
                 "symfony/dom-crawler": "~2.8|~3.0|~4.0",
                 "symfony/expression-language": "~2.8|~3.0|~4.0",
                 "symfony/finder": "~2.8|~3.0|~4.0",
@@ -5755,7 +5760,62 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-06T15:19:48+00:00"
+            "time": "2018-08-01T14:47:47+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "time": "2018-04-30T19:57:29+00:00"
         },
         {
             "name": "symfony/polyfill-iconv",
diff --git a/web/.ht.router.php b/web/.ht.router.php
index 3da80a1..054f711 100644
--- a/web/.ht.router.php
+++ b/web/.ht.router.php
@@ -25,7 +25,7 @@
  */
 
 $url = parse_url($_SERVER['REQUEST_URI']);
-if (file_exists('.' . $url['path'])) {
+if (file_exists(__DIR__ . $url['path'])) {
   // Serve the requested resource as-is.
   return FALSE;
 }
@@ -38,7 +38,7 @@
   // fallback to index.php.
   do {
     $path = dirname($path);
-    if (preg_match('/\.php$/', $path) && is_file('.' . $path)) {
+    if (preg_match('/\.php$/', $path) && is_file(__DIR__ . $path)) {
       // Discovered that the path contains an existing PHP file. Use that as the
       // script to include.
       $script = ltrim($path, '/');
diff --git a/web/robots.txt b/web/robots.txt
index 13483a8..54da162 100644
--- a/web/robots.txt
+++ b/web/robots.txt
@@ -42,7 +42,7 @@ Disallow: /web.config
 # Paths (clean URLs)
 Disallow: /admin/
 Disallow: /comment/reply/
-Disallow: /filter/tips/
+Disallow: /filter/tips
 Disallow: /node/add/
 Disallow: /search/
 Disallow: /user/register/
@@ -52,7 +52,7 @@ Disallow: /user/logout/
 # Paths (no clean URLs)
 Disallow: /index.php/admin/
 Disallow: /index.php/comment/reply/
-Disallow: /index.php/filter/tips/
+Disallow: /index.php/filter/tips
 Disallow: /index.php/node/add/
 Disallow: /index.php/search/
 Disallow: /index.php/user/password/

From 737cbca389ef2056e14c517eac551bf8da88d175 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Wed, 15 Aug 2018 16:17:22 -0700
Subject: [PATCH 139/143] Bump USWDS to 1.6.8

Security vulnerabilities were discovered in the USWDS dependencies
`lodash` and `node-sshpk`. By updating to the most recent version
of the USWDS, we're effectively updating those dependencies.
---
 web/themes/nsf/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/themes/nsf/package.json b/web/themes/nsf/package.json
index c0ecd40..4066979 100644
--- a/web/themes/nsf/package.json
+++ b/web/themes/nsf/package.json
@@ -13,7 +13,7 @@
     "node-sass": "^4.5.3",
     "postcss": "^6.0.2",
     "postcss-cli": "^4.1.0",
-    "uswds": "^1.3.0",
+    "uswds": "^1.6.8",
     "watch": "^1.0.2"
   }
 }

From 0d951cda44537300aaa7f9832c60952a55cc8136 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 16 Aug 2018 11:15:10 -0700
Subject: [PATCH 140/143] Update nsf theme's package-lock.json file

This commit updates the nsf theme's package-lock.json file to
reflect the changes in 737cbca389ef2056e14c517eac551bf8da88d175.
---
 web/themes/nsf/package-lock.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/themes/nsf/package-lock.json b/web/themes/nsf/package-lock.json
index 908df52..99a07d6 100644
--- a/web/themes/nsf/package-lock.json
+++ b/web/themes/nsf/package-lock.json
@@ -4,12 +4,6 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@types/node": {
-      "version": "8.0.53",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.53.tgz",
-      "integrity": "sha512-54Dm6NwYeiSQmRB1BLXKr5GELi0wFapR1npi8bnZhEcu84d/yQKqnwwXQ56hZ0RUbTG6L5nqDZaN3dgByQXQRQ==",
-      "dev": true
-    },
     "JSONStream": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
@@ -6909,12 +6903,12 @@
       }
     },
     "uswds": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/uswds/-/uswds-1.4.3.tgz",
-      "integrity": "sha1-hZ4zEq06ZLmQH+b0rLSt0T7ts80=",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/uswds/-/uswds-1.6.8.tgz",
+      "integrity": "sha512-W0IFpBP7ycOzqxrSJ7B2j8KGEm0HcUZBIXmhmDeHW122jRMfHHwuPBP6vgh78IgkSv0mH3900Fa5XumkjpSBxg==",
       "dev": true,
       "requires": {
-        "@types/node": "8.0.53",
+        "@types/node": "8.10.26",
         "array-filter": "1.0.0",
         "array-foreach": "1.0.2",
         "browserify": "13.3.0",
@@ -6929,6 +6923,12 @@
         "yargs": "8.0.2"
       },
       "dependencies": {
+        "@types/node": {
+          "version": "8.10.26",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.26.tgz",
+          "integrity": "sha512-opk6bLLErLSwyVVJeSH5Ek7ZWOBSsN0JrvXTNVGLXLAXKB9xlTYajrplR44xVyMrmbut94H6uJ9jqzM/12jxkA==",
+          "dev": true
+        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",

From 7c38b27725f5717545e83532df0c770cb312b0be Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 16 Aug 2018 11:16:28 -0700
Subject: [PATCH 141/143] Rebuild stylesheets to incorporate USWDS 1.6.8

---
 web/themes/nsf/assets/css/uswds.css         | 9 +++------
 web/themes/nsf/assets/css/uswds.min.css.map | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/web/themes/nsf/assets/css/uswds.css b/web/themes/nsf/assets/css/uswds.css
index dec7d62..542031b 100644
--- a/web/themes/nsf/assets/css/uswds.css
+++ b/web/themes/nsf/assets/css/uswds.css
@@ -3552,7 +3552,7 @@ input.usa-input-medium {
       left: auto;
       position: relative; } }
 
-input[type="search"] {
+input[type=search] {
   /* stylelint-disable-line selector-no-qualifying-type */
   box-sizing: border-box;
   -webkit-appearance: none; }
@@ -3738,8 +3738,7 @@ select.form-select {
 .usa-form-large {
   max-width: none; }
 
-form [type=submit],
-form [type=submit] {
+form [type="submit"], form [type="submit"] {
   display: inline-block; }
 
 textarea {
@@ -3748,9 +3747,7 @@ textarea {
 label {
   margin-top: 1rem; }
 
-input,
-textarea,
-select {
+input, textarea, select {
   max-width: none; }
 
 #block-nsf-views-block-news-block-1 ul {
diff --git a/web/themes/nsf/assets/css/uswds.min.css.map b/web/themes/nsf/assets/css/uswds.min.css.map
index 05f816b..db5c3e1 100644
--- a/web/themes/nsf/assets/css/uswds.min.css.map
+++ b/web/themes/nsf/assets/css/uswds.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["stdin"],"names":[],"mappings":"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","file":"uswds.min.css","sourcesContent":["/*! uswds @version */\nhtml {\n  box-sizing: border-box; }\n\n*, *::after, *::before {\n  box-sizing: inherit; }\n\n/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */\n/**\n * 1. Set default font family to sans-serif.\n * 2. Prevent iOS and IE text size adjust after device orientation change,\n *    without disabling user zoom.\n */\nhtml {\n  font-family: sans-serif;\n  /* 1 */\n  -ms-text-size-adjust: 100%;\n  /* 2 */\n  -webkit-text-size-adjust: 100%;\n  /* 2 */ }\n\n/**\n * Remove default margin.\n */\nbody {\n  margin: 0; }\n\n/* HTML5 display definitions\n   ========================================================================== */\n/**\n * Correct `block` display not defined for any HTML5 element in IE 8/9.\n * Correct `block` display not defined for `details` or `summary` in IE 10/11\n * and Firefox.\n * Correct `block` display not defined for `main` in IE 11.\n */\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n  display: block; }\n\n/**\n * 1. Correct `inline-block` display not defined in IE 8/9.\n * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.\n */\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block;\n  /* 1 */\n  vertical-align: baseline;\n  /* 2 */ }\n\n/**\n * Prevent modern browsers from displaying `audio` without controls.\n * Remove excess height in iOS 5 devices.\n */\naudio:not([controls]) {\n  display: none;\n  height: 0; }\n\n/**\n * Address `[hidden]` styling not present in IE 8/9/10.\n * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.\n */\n[hidden],\ntemplate {\n  display: none; }\n\n/* Links\n   ========================================================================== */\n/**\n * Remove the gray background color from active links in IE 10.\n */\na {\n  background-color: transparent; }\n\n/**\n * Improve readability of focused elements when they are also in an\n * active/hover state.\n */\na:active,\na:hover {\n  outline: 0; }\n\n/* Text-level semantics\n   ========================================================================== */\n/**\n * Address styling not present in IE 8/9/10/11, Safari, and Chrome.\n */\nabbr[title] {\n  border-bottom: 1px dotted; }\n\n/**\n * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.\n */\nb,\nstrong {\n  font-weight: bold; }\n\n/**\n * Address styling not present in Safari and Chrome.\n */\ndfn {\n  font-style: italic; }\n\n/**\n * Address variable `h1` font-size and margin within `section` and `article`\n * contexts in Firefox 4+, Safari, and Chrome.\n */\nh1 {\n  font-size: 2em;\n  margin: 0.67em 0; }\n\n/**\n * Address styling not present in IE 8/9.\n */\nmark {\n  background: #ff0;\n  color: #000; }\n\n/**\n * Address inconsistent and variable font size in all browsers.\n */\nsmall {\n  font-size: 80%; }\n\n/**\n * Prevent `sub` and `sup` affecting `line-height` in all browsers.\n */\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline; }\n\nsup {\n  top: -0.5em; }\n\nsub {\n  bottom: -0.25em; }\n\n/* Embedded content\n   ========================================================================== */\n/**\n * Remove border when inside `a` element in IE 8/9/10.\n */\nimg {\n  border: 0; }\n\n/**\n * Correct overflow not hidden in IE 9/10/11.\n */\nsvg:not(:root) {\n  overflow: hidden; }\n\n/* Grouping content\n   ========================================================================== */\n/**\n * Address margin not present in IE 8/9 and Safari.\n */\nfigure {\n  margin: 1em 40px; }\n\n/**\n * Address differences between Firefox and other browsers.\n */\nhr {\n  box-sizing: content-box;\n  height: 0; }\n\n/**\n * Contain overflow in all browsers.\n */\npre {\n  overflow: auto; }\n\n/**\n * Address odd `em`-unit font size rendering in all browsers.\n */\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em; }\n\n/* Forms\n   ========================================================================== */\n/**\n * Known limitation: by default, Chrome and Safari on OS X allow very limited\n * styling of `select`, unless a `border` property is set.\n */\n/**\n * 1. Correct color not being inherited.\n *    Known issue: affects color of disabled elements.\n * 2. Correct font properties not being inherited.\n * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.\n */\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  color: inherit;\n  /* 1 */\n  font: inherit;\n  /* 2 */\n  margin: 0;\n  /* 3 */ }\n\n/**\n * Address `overflow` set to `hidden` in IE 8/9/10/11.\n */\nbutton {\n  overflow: visible; }\n\n/**\n * Address inconsistent `text-transform` inheritance for `button` and `select`.\n * All other form control elements do not inherit `text-transform` values.\n * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.\n * Correct `select` style inheritance in Firefox.\n */\nbutton,\nselect {\n  text-transform: none; }\n\n/**\n * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`\n *    and `video` controls.\n * 2. Correct inability to style clickable `input` types in iOS.\n * 3. Improve usability and consistency of cursor style between image-type\n *    `input` and others.\n */\nbutton,\nhtml input[type=\"button\"],\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button;\n  /* 2 */\n  cursor: pointer;\n  /* 3 */ }\n\n/**\n * Re-set default cursor for disabled elements.\n */\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default; }\n\n/**\n * Remove inner padding and border in Firefox 4+.\n */\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  border: 0;\n  padding: 0; }\n\n/**\n * Address Firefox 4+ setting `line-height` on `input` using `!important` in\n * the UA stylesheet.\n */\ninput {\n  line-height: normal; }\n\n/**\n * It's recommended that you don't attempt to style these elements.\n * Firefox's implementation doesn't respect box-sizing, padding, or width.\n *\n * 1. Address box sizing set to `content-box` in IE 8/9/10.\n * 2. Remove excess padding in IE 8/9/10.\n */\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  box-sizing: border-box;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Fix the cursor style for Chrome's increment/decrement buttons. For certain\n * `font-size` values of the `input`, it causes the cursor style of the\n * decrement button to change from `default` to `text`.\n */\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto; }\n\n/**\n * 1. Address `appearance` set to `searchfield` in Safari and Chrome.\n * 2. Address `box-sizing` set to `border-box` in Safari and Chrome.\n */\ninput[type=\"search\"] {\n  -webkit-appearance: textfield;\n  /* 1 */\n  box-sizing: content-box;\n  /* 2 */ }\n\n/**\n * Remove inner padding and search cancel button in Safari and Chrome on OS X.\n * Safari (but not Chrome) clips the cancel button when the search input has\n * padding (and `textfield` appearance).\n */\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none; }\n\n/**\n * Define consistent border, margin, and padding.\n */\nfieldset {\n  border: 1px solid #c0c0c0;\n  margin: 0 2px;\n  padding: 0.35em 0.625em 0.75em; }\n\n/**\n * 1. Correct `color` not being inherited in IE 8/9/10/11.\n * 2. Remove padding so people aren't caught out if they zero out fieldsets.\n */\nlegend {\n  border: 0;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Remove default vertical scrollbar in IE 8/9/10/11.\n */\ntextarea {\n  overflow: auto; }\n\n/**\n * Don't inherit the `font-weight` (applied by a rule above).\n * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.\n */\noptgroup {\n  font-weight: bold; }\n\n/* Tables\n   ========================================================================== */\n/**\n * Remove most spacing between table cells.\n */\ntable {\n  border-collapse: collapse;\n  border-spacing: 0; }\n\ntd,\nth {\n  padding: 0; }\n\n/* stylelint-disable at-rule-empty-line-before */\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/sourcesanspro-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-light-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/sourcesanspro-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-bold-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/merriweather-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-light-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/merriweather-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-bold-webfont.ttf\") format(\"truetype\"); }\n\n/* stylelint-enable */\n.usa-grid,\n.usa-grid-full {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  max-width: 1040px; }\n  .usa-grid::after,\n  .usa-grid-full::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n\n.usa-grid {\n  padding-right: 1.5rem;\n  padding-left: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-grid {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-grid-full {\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 31.76157%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 65.88078%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-width-one-fourth:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-width-one-fourth:nth-child(4n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 74.41059%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 14.70196%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 14.70196%; }\n      .usa-width-one-sixth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-sixth:nth-child(6n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 82.94039%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 6.17215%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 6.17215%; }\n      .usa-width-one-twelfth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(12n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 40.29137%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 57.35098%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n.usa-end-row {\n  margin-right: 0; }\n\n.usa-offset-one-twelfth {\n  margin-left: 8.5298%; }\n\n.usa-offset-one-sixth {\n  margin-left: 17.05961%; }\n\n.usa-offset-one-fourth {\n  margin-left: 25.58941%; }\n\n.usa-offset-one-third {\n  margin-left: 34.11922%; }\n\n.usa-offset-five-twelfths {\n  margin-left: 42.64902%; }\n\n.usa-offset-one-half {\n  margin-left: 51.17883%; }\n\n.usa-offset-seven-twelfths {\n  margin-left: 59.70863%; }\n\n.usa-offset-two-thirds {\n  margin-left: 68.23843%; }\n\n.usa-offset-three-fourths {\n  margin-left: 76.76824%; }\n\n.usa-offset-five-sixths {\n  margin-left: 85.29804%; }\n\n.usa-offset-eleven-twelfths {\n  margin-left: 93.82785%; }\n\n.usa-sr-only {\n  position: absolute;\n  left: -999em; }\n\nhtml {\n  box-sizing: border-box; }\n\n*,\n*::before,\n*::after {\n  box-sizing: inherit; }\n\nbody {\n  background-color: #ffffff;\n  overflow-x: hidden; }\n\n.lt-ie9 * {\n  filter: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n[hidden] {\n  display: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n*:focus,\n.usa-focus {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n/* stylelint-disable selector-no-qualifying-type */\n.usa-button,\n.usa-button-primary,\n.usa-button:visited,\n.usa-button-primary:visited,\nbutton,\n[type=button],\n[type=submit],\n[type=reset],\n[type=image] {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased;\n  margin-top: 0.5em;\n  margin-right: 0.5em;\n  margin-bottom: 0.5em;\n  appearance: none;\n  background-color: #0071BC;\n  border: 0;\n  border-radius: 5px;\n  color: #ffffff;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.7rem;\n  font-weight: 700;\n  line-height: 1;\n  padding: 1rem 2rem;\n  text-align: center;\n  text-decoration: none;\n  width: 100%; }\n  @media screen and (min-width: 481px) {\n    .usa-button,\n    .usa-button-primary,\n    .usa-button:visited,\n    .usa-button-primary:visited,\n    button,\n    [type=button],\n    [type=submit],\n    [type=reset],\n    [type=image] {\n      width: auto; } }\n  .usa-button:hover, .usa-button.usa-button-hover,\n  .usa-button-primary:hover,\n  .usa-button-primary.usa-button-hover,\n  .usa-button:visited:hover,\n  .usa-button:visited.usa-button-hover,\n  .usa-button-primary:visited:hover,\n  .usa-button-primary:visited.usa-button-hover,\n  button:hover,\n  button.usa-button-hover,\n  [type=button]:hover,\n  [type=button].usa-button-hover,\n  [type=submit]:hover,\n  [type=submit].usa-button-hover,\n  [type=reset]:hover,\n  [type=reset].usa-button-hover,\n  [type=image]:hover,\n  [type=image].usa-button-hover {\n    background-color: #205493;\n    border-bottom: 0;\n    color: #ffffff;\n    text-decoration: none; }\n  .usa-button:active, .usa-button.usa-button-active,\n  .usa-button-primary:active,\n  .usa-button-primary.usa-button-active,\n  .usa-button:visited:active,\n  .usa-button:visited.usa-button-active,\n  .usa-button-primary:visited:active,\n  .usa-button-primary:visited.usa-button-active,\n  button:active,\n  button.usa-button-active,\n  [type=button]:active,\n  [type=button].usa-button-active,\n  [type=submit]:active,\n  [type=submit].usa-button-active,\n  [type=reset]:active,\n  [type=reset].usa-button-active,\n  [type=image]:active,\n  [type=image].usa-button-active {\n    background-color: #112E51; }\n  .usa-button.usa-button-primary-alt,\n  .usa-button-primary.usa-button-primary-alt,\n  .usa-button:visited.usa-button-primary-alt,\n  .usa-button-primary:visited.usa-button-primary-alt,\n  button.usa-button-primary-alt,\n  [type=button].usa-button-primary-alt,\n  [type=submit].usa-button-primary-alt,\n  [type=reset].usa-button-primary-alt,\n  [type=image].usa-button-primary-alt {\n    background-color: #c64b00;\n    color: #212121; }\n    .usa-button.usa-button-primary-alt:hover, .usa-button.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary.usa-button-primary-alt:hover,\n    .usa-button-primary.usa-button-primary-alt.usa-button-hover,\n    .usa-button:visited.usa-button-primary-alt:hover,\n    .usa-button:visited.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary:visited.usa-button-primary-alt:hover,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-hover,\n    button.usa-button-primary-alt:hover,\n    button.usa-button-primary-alt.usa-button-hover,\n    [type=button].usa-button-primary-alt:hover,\n    [type=button].usa-button-primary-alt.usa-button-hover,\n    [type=submit].usa-button-primary-alt:hover,\n    [type=submit].usa-button-primary-alt.usa-button-hover,\n    [type=reset].usa-button-primary-alt:hover,\n    [type=reset].usa-button-primary-alt.usa-button-hover,\n    [type=image].usa-button-primary-alt:hover,\n    [type=image].usa-button-primary-alt.usa-button-hover {\n      background-color: #046b99; }\n    .usa-button.usa-button-primary-alt:active, .usa-button.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary.usa-button-primary-alt:active,\n    .usa-button-primary.usa-button-primary-alt.usa-button-active,\n    .usa-button:visited.usa-button-primary-alt:active,\n    .usa-button:visited.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary:visited.usa-button-primary-alt:active,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-active,\n    button.usa-button-primary-alt:active,\n    button.usa-button-primary-alt.usa-button-active,\n    [type=button].usa-button-primary-alt:active,\n    [type=button].usa-button-primary-alt.usa-button-active,\n    [type=submit].usa-button-primary-alt:active,\n    [type=submit].usa-button-primary-alt.usa-button-active,\n    [type=reset].usa-button-primary-alt:active,\n    [type=reset].usa-button-primary-alt.usa-button-active,\n    [type=image].usa-button-primary-alt:active,\n    [type=image].usa-button-primary-alt.usa-button-active {\n      background-color: #046b99;\n      color: #ffffff; }\n  .usa-button.usa-button-secondary,\n  .usa-button-primary.usa-button-secondary,\n  .usa-button:visited.usa-button-secondary,\n  .usa-button-primary:visited.usa-button-secondary,\n  button.usa-button-secondary,\n  [type=button].usa-button-secondary,\n  [type=submit].usa-button-secondary,\n  [type=reset].usa-button-secondary,\n  [type=image].usa-button-secondary {\n    background-color: #ffffff;\n    box-shadow: inset 0 0 0 2px #0071BC;\n    color: #0071BC; }\n    .usa-button.usa-button-secondary:hover, .usa-button.usa-button-secondary.usa-button-hover,\n    .usa-button-primary.usa-button-secondary:hover,\n    .usa-button-primary.usa-button-secondary.usa-button-hover,\n    .usa-button:visited.usa-button-secondary:hover,\n    .usa-button:visited.usa-button-secondary.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary:hover,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-hover,\n    button.usa-button-secondary:hover,\n    button.usa-button-secondary.usa-button-hover,\n    [type=button].usa-button-secondary:hover,\n    [type=button].usa-button-secondary.usa-button-hover,\n    [type=submit].usa-button-secondary:hover,\n    [type=submit].usa-button-secondary.usa-button-hover,\n    [type=reset].usa-button-secondary:hover,\n    [type=reset].usa-button-secondary.usa-button-hover,\n    [type=image].usa-button-secondary:hover,\n    [type=image].usa-button-secondary.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #205493;\n      color: #205493; }\n    .usa-button.usa-button-secondary:active, .usa-button.usa-button-secondary.usa-button-active,\n    .usa-button-primary.usa-button-secondary:active,\n    .usa-button-primary.usa-button-secondary.usa-button-active,\n    .usa-button:visited.usa-button-secondary:active,\n    .usa-button:visited.usa-button-secondary.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary:active,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-active,\n    button.usa-button-secondary:active,\n    button.usa-button-secondary.usa-button-active,\n    [type=button].usa-button-secondary:active,\n    [type=button].usa-button-secondary.usa-button-active,\n    [type=submit].usa-button-secondary:active,\n    [type=submit].usa-button-secondary.usa-button-active,\n    [type=reset].usa-button-secondary:active,\n    [type=reset].usa-button-secondary.usa-button-active,\n    [type=image].usa-button-secondary:active,\n    [type=image].usa-button-secondary.usa-button-active {\n      box-shadow: inset 0 0 0 2px #112E51;\n      color: #112E51; }\n  .usa-button.usa-button-secondary-inverse, .usa-button.usa-button-outline-inverse,\n  .usa-button-primary.usa-button-secondary-inverse,\n  .usa-button-primary.usa-button-outline-inverse,\n  .usa-button:visited.usa-button-secondary-inverse,\n  .usa-button:visited.usa-button-outline-inverse,\n  .usa-button-primary:visited.usa-button-secondary-inverse,\n  .usa-button-primary:visited.usa-button-outline-inverse,\n  button.usa-button-secondary-inverse,\n  button.usa-button-outline-inverse,\n  [type=button].usa-button-secondary-inverse,\n  [type=button].usa-button-outline-inverse,\n  [type=submit].usa-button-secondary-inverse,\n  [type=submit].usa-button-outline-inverse,\n  [type=reset].usa-button-secondary-inverse,\n  [type=reset].usa-button-outline-inverse,\n  [type=image].usa-button-secondary-inverse,\n  [type=image].usa-button-outline-inverse {\n    background: transparent;\n    box-shadow: inset 0 0 0 2px #ffffff;\n    color: #ffffff; }\n    .usa-button.usa-button-secondary-inverse:hover, .usa-button.usa-button-secondary-inverse.usa-button-hover, .usa-button.usa-button-outline-inverse:hover, .usa-button.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-secondary-inverse:hover,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-outline-inverse:hover,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-secondary-inverse:hover,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-outline-inverse:hover,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse:hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-outline-inverse:hover,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,\n    button.usa-button-secondary-inverse:hover,\n    button.usa-button-secondary-inverse.usa-button-hover,\n    button.usa-button-outline-inverse:hover,\n    button.usa-button-outline-inverse.usa-button-hover,\n    [type=button].usa-button-secondary-inverse:hover,\n    [type=button].usa-button-secondary-inverse.usa-button-hover,\n    [type=button].usa-button-outline-inverse:hover,\n    [type=button].usa-button-outline-inverse.usa-button-hover,\n    [type=submit].usa-button-secondary-inverse:hover,\n    [type=submit].usa-button-secondary-inverse.usa-button-hover,\n    [type=submit].usa-button-outline-inverse:hover,\n    [type=submit].usa-button-outline-inverse.usa-button-hover,\n    [type=reset].usa-button-secondary-inverse:hover,\n    [type=reset].usa-button-secondary-inverse.usa-button-hover,\n    [type=reset].usa-button-outline-inverse:hover,\n    [type=reset].usa-button-outline-inverse.usa-button-hover,\n    [type=image].usa-button-secondary-inverse:hover,\n    [type=image].usa-button-secondary-inverse.usa-button-hover,\n    [type=image].usa-button-outline-inverse:hover,\n    [type=image].usa-button-outline-inverse.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #c9c9c9;\n      color: #c9c9c9; }\n    .usa-button.usa-button-secondary-inverse:active, .usa-button.usa-button-secondary-inverse.usa-button-active, .usa-button.usa-button-outline-inverse:active, .usa-button.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary.usa-button-secondary-inverse:active,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary.usa-button-outline-inverse:active,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-active,\n    .usa-button:visited.usa-button-secondary-inverse:active,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button:visited.usa-button-outline-inverse:active,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary-inverse:active,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-outline-inverse:active,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,\n    button.usa-button-secondary-inverse:active,\n    button.usa-button-secondary-inverse.usa-button-active,\n    button.usa-button-outline-inverse:active,\n    button.usa-button-outline-inverse.usa-button-active,\n    [type=button].usa-button-secondary-inverse:active,\n    [type=button].usa-button-secondary-inverse.usa-button-active,\n    [type=button].usa-button-outline-inverse:active,\n    [type=button].usa-button-outline-inverse.usa-button-active,\n    [type=submit].usa-button-secondary-inverse:active,\n    [type=submit].usa-button-secondary-inverse.usa-button-active,\n    [type=submit].usa-button-outline-inverse:active,\n    [type=submit].usa-button-outline-inverse.usa-button-active,\n    [type=reset].usa-button-secondary-inverse:active,\n    [type=reset].usa-button-secondary-inverse.usa-button-active,\n    [type=reset].usa-button-outline-inverse:active,\n    [type=reset].usa-button-outline-inverse.usa-button-active,\n    [type=image].usa-button-secondary-inverse:active,\n    [type=image].usa-button-secondary-inverse.usa-button-active,\n    [type=image].usa-button-outline-inverse:active,\n    [type=image].usa-button-outline-inverse.usa-button-active {\n      box-shadow: inset 0 0 0 2px #999999;\n      color: #c9c9c9; }\n  .usa-button.usa-button-gray,\n  .usa-button-primary.usa-button-gray,\n  .usa-button:visited.usa-button-gray,\n  .usa-button-primary:visited.usa-button-gray,\n  button.usa-button-gray,\n  [type=button].usa-button-gray,\n  [type=submit].usa-button-gray,\n  [type=reset].usa-button-gray,\n  [type=image].usa-button-gray {\n    background-color: #666666; }\n    .usa-button.usa-button-gray:hover, .usa-button.usa-button-gray.usa-button-hover,\n    .usa-button-primary.usa-button-gray:hover,\n    .usa-button-primary.usa-button-gray.usa-button-hover,\n    .usa-button:visited.usa-button-gray:hover,\n    .usa-button:visited.usa-button-gray.usa-button-hover,\n    .usa-button-primary:visited.usa-button-gray:hover,\n    .usa-button-primary:visited.usa-button-gray.usa-button-hover,\n    button.usa-button-gray:hover,\n    button.usa-button-gray.usa-button-hover,\n    [type=button].usa-button-gray:hover,\n    [type=button].usa-button-gray.usa-button-hover,\n    [type=submit].usa-button-gray:hover,\n    [type=submit].usa-button-gray.usa-button-hover,\n    [type=reset].usa-button-gray:hover,\n    [type=reset].usa-button-gray.usa-button-hover,\n    [type=image].usa-button-gray:hover,\n    [type=image].usa-button-gray.usa-button-hover {\n      background-color: #333333; }\n    .usa-button.usa-button-gray:active, .usa-button.usa-button-gray.usa-button-active,\n    .usa-button-primary.usa-button-gray:active,\n    .usa-button-primary.usa-button-gray.usa-button-active,\n    .usa-button:visited.usa-button-gray:active,\n    .usa-button:visited.usa-button-gray.usa-button-active,\n    .usa-button-primary:visited.usa-button-gray:active,\n    .usa-button-primary:visited.usa-button-gray.usa-button-active,\n    button.usa-button-gray:active,\n    button.usa-button-gray.usa-button-active,\n    [type=button].usa-button-gray:active,\n    [type=button].usa-button-gray.usa-button-active,\n    [type=submit].usa-button-gray:active,\n    [type=submit].usa-button-gray.usa-button-active,\n    [type=reset].usa-button-gray:active,\n    [type=reset].usa-button-gray.usa-button-active,\n    [type=image].usa-button-gray:active,\n    [type=image].usa-button-gray.usa-button-active {\n      background-color: #212121; }\n  .usa-button.usa-button-red,\n  .usa-button-primary.usa-button-red,\n  .usa-button:visited.usa-button-red,\n  .usa-button-primary:visited.usa-button-red,\n  button.usa-button-red,\n  [type=button].usa-button-red,\n  [type=submit].usa-button-red,\n  [type=reset].usa-button-red,\n  [type=image].usa-button-red {\n    background-color: #005495; }\n    .usa-button.usa-button-red:hover, .usa-button.usa-button-red.usa-button-hover,\n    .usa-button-primary.usa-button-red:hover,\n    .usa-button-primary.usa-button-red.usa-button-hover,\n    .usa-button:visited.usa-button-red:hover,\n    .usa-button:visited.usa-button-red.usa-button-hover,\n    .usa-button-primary:visited.usa-button-red:hover,\n    .usa-button-primary:visited.usa-button-red.usa-button-hover,\n    button.usa-button-red:hover,\n    button.usa-button-red.usa-button-hover,\n    [type=button].usa-button-red:hover,\n    [type=button].usa-button-red.usa-button-hover,\n    [type=submit].usa-button-red:hover,\n    [type=submit].usa-button-red.usa-button-hover,\n    [type=reset].usa-button-red:hover,\n    [type=reset].usa-button-red.usa-button-hover,\n    [type=image].usa-button-red:hover,\n    [type=image].usa-button-red.usa-button-hover {\n      background-color: #981b1e; }\n    .usa-button.usa-button-red:active, .usa-button.usa-button-red.usa-button-active,\n    .usa-button-primary.usa-button-red:active,\n    .usa-button-primary.usa-button-red.usa-button-active,\n    .usa-button:visited.usa-button-red:active,\n    .usa-button:visited.usa-button-red.usa-button-active,\n    .usa-button-primary:visited.usa-button-red:active,\n    .usa-button-primary:visited.usa-button-red.usa-button-active,\n    button.usa-button-red:active,\n    button.usa-button-red.usa-button-active,\n    [type=button].usa-button-red:active,\n    [type=button].usa-button-red.usa-button-active,\n    [type=submit].usa-button-red:active,\n    [type=submit].usa-button-red.usa-button-active,\n    [type=reset].usa-button-red:active,\n    [type=reset].usa-button-red.usa-button-active,\n    [type=image].usa-button-red:active,\n    [type=image].usa-button-red.usa-button-active {\n      background-color: #cd2026; }\n  .usa-button.usa-button-big,\n  .usa-button-primary.usa-button-big,\n  .usa-button:visited.usa-button-big,\n  .usa-button-primary:visited.usa-button-big,\n  button.usa-button-big,\n  [type=button].usa-button-big,\n  [type=submit].usa-button-big,\n  [type=reset].usa-button-big,\n  [type=image].usa-button-big {\n    border-radius: 8px;\n    font-size: 2.4rem;\n    padding: 1.5rem 3rem; }\n  .usa-button:disabled,\n  .usa-button-primary:disabled,\n  .usa-button:visited:disabled,\n  .usa-button-primary:visited:disabled,\n  button:disabled,\n  [type=button]:disabled,\n  [type=submit]:disabled,\n  [type=reset]:disabled,\n  [type=image]:disabled {\n    background-color: #c9c9c9;\n    pointer-events: none; }\n    .usa-button:disabled:hover, .usa-button:disabled.usa-button-hover, .usa-button:disabled:active, .usa-button:disabled.usa-button-active, .usa-button:disabled:focus, .usa-button:disabled.usa-focus,\n    .usa-button-primary:disabled:hover,\n    .usa-button-primary:disabled.usa-button-hover,\n    .usa-button-primary:disabled:active,\n    .usa-button-primary:disabled.usa-button-active,\n    .usa-button-primary:disabled:focus,\n    .usa-button-primary:disabled.usa-focus,\n    .usa-button:visited:disabled:hover,\n    .usa-button:visited:disabled.usa-button-hover,\n    .usa-button:visited:disabled:active,\n    .usa-button:visited:disabled.usa-button-active,\n    .usa-button:visited:disabled:focus,\n    .usa-button:visited:disabled.usa-focus,\n    .usa-button-primary:visited:disabled:hover,\n    .usa-button-primary:visited:disabled.usa-button-hover,\n    .usa-button-primary:visited:disabled:active,\n    .usa-button-primary:visited:disabled.usa-button-active,\n    .usa-button-primary:visited:disabled:focus,\n    .usa-button-primary:visited:disabled.usa-focus,\n    button:disabled:hover,\n    button:disabled.usa-button-hover,\n    button:disabled:active,\n    button:disabled.usa-button-active,\n    button:disabled:focus,\n    button:disabled.usa-focus,\n    [type=button]:disabled:hover,\n    [type=button]:disabled.usa-button-hover,\n    [type=button]:disabled:active,\n    [type=button]:disabled.usa-button-active,\n    [type=button]:disabled:focus,\n    [type=button]:disabled.usa-focus,\n    [type=submit]:disabled:hover,\n    [type=submit]:disabled.usa-button-hover,\n    [type=submit]:disabled:active,\n    [type=submit]:disabled.usa-button-active,\n    [type=submit]:disabled:focus,\n    [type=submit]:disabled.usa-focus,\n    [type=reset]:disabled:hover,\n    [type=reset]:disabled.usa-button-hover,\n    [type=reset]:disabled:active,\n    [type=reset]:disabled.usa-button-active,\n    [type=reset]:disabled:focus,\n    [type=reset]:disabled.usa-focus,\n    [type=image]:disabled:hover,\n    [type=image]:disabled.usa-button-hover,\n    [type=image]:disabled:active,\n    [type=image]:disabled.usa-button-active,\n    [type=image]:disabled:focus,\n    [type=image]:disabled.usa-focus {\n      background-color: #c9c9c9;\n      border: 0;\n      box-shadow: none; }\n\n/* stylelint-disable */\n.usa-button-disabled {\n  background-color: #c9c9c9;\n  pointer-events: none; }\n  .usa-button-disabled:hover, .usa-button-disabled.usa-button-hover, .usa-button-disabled:active, .usa-button-disabled.usa-button-active, .usa-button-disabled:focus, .usa-button-disabled.usa-focus {\n    background-color: #c9c9c9;\n    border: 0;\n    box-shadow: none; }\n\n.usa-button-secondary-disabled,\n.usa-button-secondary-inverse-disabled,\n.usa-button-secondary:disabled,\n.usa-button-secondary-inverse:disabled,\n.usa-button-outline-inverse:disabled {\n  box-shadow: inset 0 0 0 2px #c9c9c9;\n  pointer-events: none;\n  color: #c9c9c9; }\n  .usa-button-secondary-disabled:hover, .usa-button-secondary-disabled.usa-button-hover, .usa-button-secondary-disabled:active, .usa-button-secondary-disabled.usa-button-active, .usa-button-secondary-disabled:focus, .usa-button-secondary-disabled.usa-focus,\n  .usa-button-secondary-inverse-disabled:hover,\n  .usa-button-secondary-inverse-disabled.usa-button-hover,\n  .usa-button-secondary-inverse-disabled:active,\n  .usa-button-secondary-inverse-disabled.usa-button-active,\n  .usa-button-secondary-inverse-disabled:focus,\n  .usa-button-secondary-inverse-disabled.usa-focus,\n  .usa-button-secondary:disabled:hover,\n  .usa-button-secondary:disabled.usa-button-hover,\n  .usa-button-secondary:disabled:active,\n  .usa-button-secondary:disabled.usa-button-active,\n  .usa-button-secondary:disabled:focus,\n  .usa-button-secondary:disabled.usa-focus,\n  .usa-button-secondary-inverse:disabled:hover,\n  .usa-button-secondary-inverse:disabled.usa-button-hover,\n  .usa-button-secondary-inverse:disabled:active,\n  .usa-button-secondary-inverse:disabled.usa-button-active,\n  .usa-button-secondary-inverse:disabled:focus,\n  .usa-button-secondary-inverse:disabled.usa-focus,\n  .usa-button-outline-inverse:disabled:hover,\n  .usa-button-outline-inverse:disabled.usa-button-hover,\n  .usa-button-outline-inverse:disabled:active,\n  .usa-button-outline-inverse:disabled.usa-button-active,\n  .usa-button-outline-inverse:disabled:focus,\n  .usa-button-outline-inverse:disabled.usa-focus {\n    background-color: #ffffff;\n    border: 0; }\n\nhtml .usa-button-secondary-disabled,\n.usa-button-secondary:disabled {\n  background-color: #ffffff; }\n\nhtml .usa-button-secondary-inverse-disabled,\n.usa-button-secondary-inverse:disabled {\n  background-color: transparent;\n  color: #666666;\n  box-shadow: inset 0 0 0 2px #666666; }\n\n.usa-button-unstyled {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto; }\n  .usa-button-unstyled:hover {\n    background-color: transparent; }\n\n.usa-embed-container iframe,\n.usa-embed-container object,\n.usa-embed-container embed {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 100%;\n  height: 100%; }\n\n.usa-embed-container {\n  padding-bottom: 56.25%;\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  max-width: 100%; }\n\nimg {\n  max-width: 100%; }\n\n.media_link {\n  display: inline-block;\n  line-height: 0; }\n\n/* stylelint-disable selector-no-qualifying-type */\ninput,\ntextarea,\nselect {\n  appearance: none;\n  border: 0.1rem solid #666666;\n  border-radius: 0;\n  box-sizing: border-box;\n  color: #212121;\n  display: block;\n  font-size: 1.7rem;\n  height: 4.4rem;\n  line-height: 1.3;\n  margin: 0.2em 0;\n  max-width: 46rem;\n  padding: 1rem 0.7em;\n  width: 100%; }\n  input.usa-input-success,\n  textarea.usa-input-success,\n  select.usa-input-success {\n    border: 3px solid #4aa564; }\n\n/* stylelint-enable */\n.usa-input-error {\n  border-left: 4px solid #981b1e;\n  margin-top: 3rem;\n  padding-bottom: 0.8rem;\n  padding-left: 1.5rem;\n  padding-top: 0.8rem;\n  position: relative;\n  right: 1.9rem; }\n  .usa-input-error input,\n  .usa-input-error textarea,\n  .usa-input-error select {\n    border: 3px solid #981b1e;\n    width: calc(100% + 1.9rem); }\n  .usa-input-error label {\n    margin-top: 0; }\n  .usa-input-error .usa-input-inline {\n    border: 0.1rem solid #666666;\n    width: inherit; }\n  .usa-input-error .usa-input-inline-error {\n    border: 3px solid #981b1e; }\n\n.usa-input-error-label {\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700; }\n\n.usa-input-error-message {\n  color: #981b1e;\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700;\n  padding-bottom: 3px;\n  padding-top: 3px; }\n\n.usa-input-required:after {\n  color: #cd2026;\n  content: ' (*required)'; }\n\n.usa-input-optional:after {\n  color: #757575;\n  content: ' (optional)'; }\n\nlabel {\n  display: block;\n  margin-top: 3rem;\n  max-width: 46rem; }\n\ntextarea {\n  height: 16rem; }\n\nselect {\n  -moz-appearance: none;\n  -webkit-appearance: none;\n  appearance: none;\n  background-color: #ffffff;\n  background-image: url(\"../img/arrow-both.png\");\n  background-image: url(\"../img/arrow-both.svg\");\n  background-position: right 1.3rem center;\n  background-repeat: no-repeat;\n  background-size: 1rem;\n  padding-right: 3rem; }\n  select::-ms-expand {\n    display: none; }\n  select:-webkit-autofill {\n    appearance: menulist; }\n  select:-moz-focusring {\n    color: transparent;\n    text-shadow: 0 0 0 #000000; }\n\noption:first-child {\n  font-weight: 700; }\n\nlegend {\n  font-size: 3rem;\n  font-weight: 700; }\n\n.usa-fieldset-inputs label {\n  margin-top: 0; }\n\n.usa-form-hint {\n  color: #757575;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0; }\n\n[type=checkbox],\n[type=radio] {\n  position: absolute;\n  left: -999em; }\n  .lt-ie9 [type=checkbox], .lt-ie9\n  [type=radio] {\n    border: 0;\n    float: left;\n    margin: 0.4em 0.4em 0 0;\n    position: static;\n    width: auto; }\n\n[type=checkbox] + label,\n[type=radio] + label {\n  cursor: pointer;\n  font-weight: 400;\n  margin-bottom: 0.65em; }\n\n[type=checkbox] + label::before,\n[type=radio] + label::before {\n  background: #ffffff;\n  border-radius: 2px;\n  box-shadow: 0 0 0 1px #757575;\n  content: '\\a0';\n  display: inline-block;\n  height: 2rem;\n  line-height: 2rem;\n  margin-right: 0.6em;\n  text-indent: 0.15em;\n  vertical-align: middle\\0;\n  width: 2rem; }\n\n[type=radio] + label::before {\n  border-radius: 100%;\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 3px #757575;\n  height: 1.4rem;\n  line-height: 1.4rem;\n  margin-right: 0.75em;\n  width: 1.4rem; }\n\n[type=checkbox]:checked + label::before,\n[type=radio]:checked + label::before {\n  background-color: #0071BC;\n  box-shadow: 0 0 0 1px #0071BC; }\n\n[type=radio]:checked + label::before {\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #0071BC; }\n\n[type=checkbox]:checked + label::before,\n[type=checkbox]:checked:disabled + label::before {\n  background-image: url(\"../img/correct8.png\");\n  background-image: url(\"../img/correct8.svg\");\n  background-position: 50%;\n  background-repeat: no-repeat; }\n\n[type=radio]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 6px; }\n\n[type=checkbox]:disabled + label {\n  color: #c9c9c9; }\n\n[type=checkbox]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n[type=checkbox]:disabled + label::before,\n[type=radio]:disabled + label::before {\n  background: #e4e4e4;\n  box-shadow: 0 0 0 1px #999999;\n  cursor: not-allowed; }\n\n[type=range] {\n  -webkit-appearance: none;\n  border: none;\n  padding-left: 0;\n  width: 100%; }\n\n[type=range]::-webkit-slider-runnable-track {\n  background: #999999;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-moz-range-track {\n  background: #0071BC;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-ms-track {\n  background: transparent;\n  color: transparent;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-webkit-slider-thumb {\n  -webkit-appearance: none;\n  border: 1px solid #757575;\n  height: 2.2rem;\n  border-radius: 1.5rem;\n  background: #e4e4e4;\n  cursor: pointer;\n  margin-top: -.65rem;\n  width: 2.2rem; }\n\n[type=range]::-moz-range-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-fill-lower {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n[type=range]::-ms-fill-upper {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n.usa-date-of-birth label {\n  margin-top: 0; }\n\n.usa-date-of-birth [type=number]::-webkit-inner-spin-button,\n.usa-date-of-birth [type=number]::-webkit-outer-spin-button {\n  -webkit-appearance: none;\n  appearance: none;\n  margin: 0; }\n\n.usa-date-of-birth [type=number] {\n  -moz-appearance: textfield; }\n\n.usa-form-group-day,\n.usa-form-group-month,\n.usa-form-group-year {\n  clear: none;\n  float: left;\n  margin-right: 1.5rem;\n  width: 5rem; }\n\n.usa-form-group-year {\n  width: 7rem; }\n\n.usa-label, .usa-label-big {\n  background-color: #666666;\n  border-radius: 2px;\n  color: #ffffff;\n  font-size: 1.5rem;\n  margin-right: 0.5rem;\n  padding: 0.1rem 0.7rem;\n  text-transform: uppercase; }\n  .usa-label:only-of-type, .usa-label-big:only-of-type {\n    margin-right: 0; }\n\n.usa-label-big {\n  font-size: 1.7rem;\n  padding-left: 0.9rem;\n  padding-right: 0.9rem; }\n\nul,\nol {\n  margin-top: 1em;\n  margin-bottom: 1em;\n  padding-left: 1.94em; }\n\nli {\n  line-height: 1.5;\n  margin-bottom: 0.5em; }\n  li:last-child {\n    margin-bottom: 0; }\n\nh1 + ul,\nh1 + ol,\nh2 + ul,\nh2 + ol,\nh3 + ul,\nh3 + ol,\nh4 + ul,\nh4 + ol,\nh5 + ul,\nh5 + ol,\nh6 + ul,\nh6 + ol,\np + ul,\np + ol {\n  margin-top: 0; }\n\n.usa-unstyled-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-unstyled-list > li {\n    margin-bottom: 0; }\n\ntable {\n  border-spacing: 0;\n  margin: 2em 0; }\n\nthead th {\n  font-weight: 700; }\n\nthead th,\nthead td {\n  background-color: #e4e4e4; }\n\nth {\n  text-align: left; }\n\nth,\ntd {\n  background-color: #ffffff;\n  border: 1px solid #666666;\n  font-weight: 400;\n  padding: 1rem 1.5rem; }\n\n.usa-table-borderless thead th {\n  background-color: transparent;\n  border-top: 0; }\n\n.usa-table-borderless th,\n.usa-table-borderless td {\n  border-left: 0;\n  border-right: 0; }\n\n.usa-table-borderless th:first-child {\n  padding-left: 0; }\n\ncaption {\n  font-size: 1.5rem;\n  font-weight: 700;\n  font-family: \"Work Sans\", sans-serif;\n  margin-bottom: 1.2rem;\n  text-align: left; }\n\nhtml {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 10px; }\n\nbody {\n  font-size: 1.7rem; }\n\np {\n  line-height: 1.5;\n  margin-bottom: 1em;\n  margin-top: 1em; }\n\na {\n  color: #0071BC;\n  text-decoration: underline; }\n  a:hover, a:active {\n    color: #205493; }\n  a:focus {\n    outline: 2px dotted #999999;\n    outline-offset: 3px; }\n  a:visited {\n    color: #4c2c92; }\n\n.usa-external_link::after {\n  background: url(\"../img/external-link.png\") no-repeat 0 0;\n  background: url(\"../img/external-link.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link:hover::after {\n  background-image: url(\"../img/external-link-hover.png\");\n  background-image: url(\"../img/external-link-hover.svg\"); }\n\n.usa-external_link-alt::after {\n  background: url(\"../img/external-link-alt.png\") no-repeat 0 0;\n  background: url(\"../img/external-link-alt.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link-alt:hover::after {\n  background-image: url(\"../img/external-link-alt-hover.png\");\n  background-image: url(\"../img/external-link-alt-hover.svg\"); }\n\nh1,\nh2,\nh3,\nh4,\nh5 {\n  clear: both;\n  font-family: \"Work Sans\", sans-serif;\n  line-height: 1.3;\n  margin-bottom: .5em;\n  margin-top: 1.5em; }\n\nh6 {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\nh1 {\n  font-size: 4rem;\n  font-weight: 700; }\n\nh2 {\n  font-size: 3rem;\n  font-weight: 700; }\n\nh3 {\n  font-size: 2rem;\n  font-weight: 700; }\n\nh4 {\n  font-size: 1.7rem;\n  font-weight: 700; }\n\nh5 {\n  font-size: 1.5rem;\n  font-weight: 700; }\n\nh6 {\n  font-size: 1.3rem;\n  font-weight: 400;\n  line-height: 1.5;\n  text-transform: uppercase; }\n\ncite,\nvar,\naddress,\ndfn {\n  font-style: normal; }\n\n.usa-content p,\n.usa-content ul:not(.usa-accordion):not(.usa-accordion-bordered),\n.usa-content ol:not(.usa-accordion):not(.usa-accordion-bordered) {\n  max-width: 66ch; }\n\n.usa-content-list {\n  max-width: 66ch; }\n\n.usa-sans p,\n.usa-sans a,\n.usa-sans li,\n.usa-sans span {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\n.usa-sans a {\n  border-bottom: none;\n  font-weight: 700; }\n\n.usa-serif p,\n.usa-serif a,\n.usa-serif li,\n.usa-serif span {\n  font-family: \"Work Sans\", sans-serif; }\n\n.usa-display {\n  font-size: 2rem;\n  font-weight: 700;\n  margin-bottom: 0; }\n  @media screen and (min-width: 481px) {\n    .usa-display {\n      font-size: 4rem;\n      font-weight: 700; } }\n  @media screen and (min-width: 600px) {\n    .usa-display {\n      font-size: 5.2rem;\n      font-weight: 700; } }\n\n.usa-font-lead {\n  font-family: \"Work Sans\", sans-serif;\n  font-size: 2rem;\n  font-weight: 400;\n  line-height: 1.7;\n  max-width: 77rem; }\n\n.usa-image-block {\n  position: relative; }\n\n.usa-image-text-block {\n  color: #ffffff;\n  left: 0;\n  margin-left: 8%;\n  position: absolute;\n  top: 0; }\n\n.usa-image-text {\n  margin-top: 0; }\n\n.usa-drop_text {\n  margin-bottom: 0; }\n\n.usa-background-dark {\n  background-color: #333333; }\n  .usa-background-dark p,\n  .usa-background-dark span {\n    color: #ffffff; }\n  .usa-background-dark a {\n    color: #c9c9c9; }\n    .usa-background-dark a:hover {\n      color: #ffffff; }\n\n.usa-text-small {\n  font-size: 1.3rem;\n  margin-top: 0; }\n\n.usa-section > :first-child,\n.usa-grid > :first-child,\n.usa-grid-full > :first-child {\n  margin-top: 0; }\n\n.usa-section > :last-child,\n.usa-grid > :last-child,\n.usa-grid-full > :last-child {\n  margin-bottom: 0; }\n\n.usa-width-one-whole:first-child > :first-child,\n.usa-width-one-half:first-child > :first-child,\n.usa-width-one-third:first-child > :first-child,\n.usa-width-two-thirds:first-child > :first-child,\n.usa-width-one-fourth:first-child > :first-child,\n.usa-width-three-fourths:first-child > :first-child,\n.usa-width-one-sixth:first-child > :first-child,\n.usa-width-five-sixths:first-child > :first-child,\n.usa-width-one-twelfth:first-child > :first-child {\n  margin-top: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :first-child,\n  .usa-width-one-half > :first-child,\n  .usa-width-one-third > :first-child,\n  .usa-width-two-thirds > :first-child,\n  .usa-width-one-fourth > :first-child,\n  .usa-width-three-fourths > :first-child,\n  .usa-width-one-sixth > :first-child,\n  .usa-width-five-sixths > :first-child,\n  .usa-width-one-twelfth > :first-child {\n    margin-top: 0; } }\n\n.usa-width-one-whole:last-child > :last-child,\n.usa-width-one-half:last-child > :last-child,\n.usa-width-one-third:last-child > :last-child,\n.usa-width-two-thirds:last-child > :last-child,\n.usa-width-one-fourth:last-child > :last-child,\n.usa-width-three-fourths:last-child > :last-child,\n.usa-width-one-sixth:last-child > :last-child,\n.usa-width-five-sixths:last-child > :last-child,\n.usa-width-one-twelfth:last-child > :last-child {\n  margin-bottom: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :last-child,\n  .usa-width-one-half > :last-child,\n  .usa-width-one-third > :last-child,\n  .usa-width-two-thirds > :last-child,\n  .usa-width-one-fourth > :last-child,\n  .usa-width-three-fourths > :last-child,\n  .usa-width-one-sixth > :last-child,\n  .usa-width-five-sixths > :last-child,\n  .usa-width-one-twelfth > :last-child {\n    margin-bottom: 0; } }\n\n.usa-accordion,\n.usa-accordion-bordered {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  color: #212121;\n  margin: 0;\n  padding: 0;\n  width: 100%; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    margin-bottom: 0; }\n  .usa-accordion > ul li ul,\n  .usa-accordion-bordered > ul li ul {\n    list-style: disc; }\n    .usa-accordion > ul li ul > li > ul,\n    .usa-accordion-bordered > ul li ul > li > ul {\n      list-style: circle; }\n      .usa-accordion > ul li ul > li > ul > li > ul,\n      .usa-accordion-bordered > ul li ul > li > ul > li > ul {\n        list-style: square; }\n  .usa-accordion + .usa-accordion,\n  .usa-accordion + .usa-accordion-bordered,\n  .usa-accordion-bordered + .usa-accordion,\n  .usa-accordion-bordered + .usa-accordion-bordered {\n    margin-top: 1rem; }\n  .usa-accordion > ul,\n  .usa-accordion-bordered > ul {\n    margin-top: 0;\n    margin-bottom: 0;\n    list-style-type: none;\n    padding-left: 0;\n    color: #212121;\n    margin: 0;\n    padding: 0;\n    width: 100%; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      margin-bottom: 0; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      background-color: #e4e4e4;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      list-style: none;\n      margin-bottom: 0.5rem;\n      width: 100%; }\n    .usa-accordion > ul button,\n    .usa-accordion-bordered > ul button {\n      background-color: transparent;\n      border: 0;\n      border-radius: 0;\n      font-weight: 400;\n      margin: 0;\n      padding: 0;\n      text-align: left;\n      -webkit-font-smoothing: auto;\n      background-color: #e4e4e4;\n      background-image: url(\"../img/minus.png\");\n      background-image: url(\"../img/minus.svg\");\n      background-position: right 2rem center;\n      background-repeat: no-repeat;\n      background-size: 1.5rem;\n      color: #212121;\n      cursor: pointer;\n      display: inline-block;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      font-weight: 700;\n      margin: 0;\n      padding: 1.5rem 5.5rem 1.5rem 2rem;\n      width: 100%; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: transparent; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: #c9c9c9;\n        color: #212121; }\n      .usa-accordion > ul button h1,\n      .usa-accordion > ul button h2,\n      .usa-accordion > ul button h3,\n      .usa-accordion > ul button h4,\n      .usa-accordion > ul button h5,\n      .usa-accordion > ul button h6,\n      .usa-accordion-bordered > ul button h1,\n      .usa-accordion-bordered > ul button h2,\n      .usa-accordion-bordered > ul button h3,\n      .usa-accordion-bordered > ul button h4,\n      .usa-accordion-bordered > ul button h5,\n      .usa-accordion-bordered > ul button h6 {\n        margin: 0; }\n    .usa-accordion > ul [aria-expanded=false],\n    .usa-accordion-bordered > ul [aria-expanded=false] {\n      background-image: url(\"../img/plus.png\");\n      background-image: url(\"../img/plus.svg\");\n      background-repeat: no-repeat;\n      background-size: 1.5rem; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    background-color: #e4e4e4;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    list-style: none;\n    margin-bottom: 0.5rem;\n    width: 100%; }\n\n.usa-accordion-bordered .usa-accordion-content {\n  border-bottom: 3px solid #e4e4e4;\n  border-left: 3px solid #e4e4e4;\n  border-right: 3px solid #e4e4e4; }\n\n.usa-accordion-content {\n  background-color: #ffffff;\n  overflow: auto;\n  padding: 1.5rem 2rem; }\n  .usa-accordion-content > *:first-child {\n    margin-top: 0; }\n  .usa-accordion-content > *:last-child {\n    margin-bottom: 0; }\n  .usa-accordion-content:not([aria-hidden]) {\n    position: absolute;\n    left: -999em; }\n  .usa-accordion-content[aria-hidden=true] {\n    display: none; }\n\n.usa-accordion-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #e4e4e4;\n  background-image: url(\"../img/minus.png\");\n  background-image: url(\"../img/minus.svg\");\n  background-position: right 2rem center;\n  background-repeat: no-repeat;\n  background-size: 1.5rem;\n  color: #212121;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-weight: 700;\n  margin: 0;\n  padding: 1.5rem 5.5rem 1.5rem 2rem;\n  width: 100%; }\n  .usa-accordion-button:hover {\n    background-color: transparent; }\n  .usa-accordion-button:hover {\n    background-color: #c9c9c9;\n    color: #212121; }\n  .usa-accordion-button h1,\n  .usa-accordion-button h2,\n  .usa-accordion-button h3,\n  .usa-accordion-button h4,\n  .usa-accordion-button h5,\n  .usa-accordion-button h6 {\n    margin: 0; }\n\n.usa-accordion-button[aria-expanded=false] {\n  background-image: url(\"../img/plus.png\");\n  background-image: url(\"../img/plus.svg\");\n  background-repeat: no-repeat;\n  background-size: 1.5rem; }\n\n.usa-alert {\n  background-color: #e4e4e4;\n  background-position: 2rem 2rem;\n  background-repeat: no-repeat;\n  background-size: 5.2rem;\n  padding-bottom: 1.4rem;\n  padding-left: 3rem;\n  padding-right: 2rem;\n  padding-top: 2rem;\n  position: relative; }\n  .usa-alert::before {\n    background-color: #7e7e7e;\n    content: '';\n    height: 100%;\n    left: 0;\n    position: absolute;\n    top: 0;\n    width: 1rem; }\n  .usa-alert a {\n    color: #205493; }\n    .usa-alert a:focus, .usa-alert a:hover {\n      color: #112E51; }\n  .usa-alert ul {\n    margin-bottom: 0;\n    margin-top: 1rem;\n    padding-left: 1rem; }\n\n.usa-alert-slim {\n  background-position: 2rem 1rem;\n  padding-bottom: 1rem;\n  padding-top: 1rem; }\n  .usa-alert-slim .usa-alert-text:only-child {\n    margin-bottom: 0.5rem;\n    padding-top: 0.5rem; }\n\n.usa-alert-icon {\n  display: table-cell;\n  padding-right: 1rem; }\n\n.usa-alert-body {\n  display: table-cell;\n  padding-left: 5rem;\n  vertical-align: top; }\n\n.usa-alert-heading {\n  margin-top: 0;\n  margin-bottom: 0; }\n\n.usa-alert-text {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0;\n  margin-top: 0; }\n\n.usa-alert-text:only-child {\n  margin-bottom: 1rem;\n  padding-top: 0.5rem; }\n\n.usa-alert-success {\n  background-color: #e7f4e4;\n  background-image: url(\"../img/alerts/success.png\");\n  background-image: url(\"../img/alerts/success.svg\"); }\n  .usa-alert-success::before {\n    background-color: #2e8540; }\n\n.usa-alert-warning {\n  background-color: #fff1d2;\n  background-image: url(\"../img/alerts/warning.png\");\n  background-image: url(\"../img/alerts/warning.svg\"); }\n  .usa-alert-warning::before {\n    background-color: #fdb81e; }\n\n.usa-alert-error {\n  background-color: #f9dede;\n  background-image: url(\"../img/alerts/error.png\");\n  background-image: url(\"../img/alerts/error.svg\"); }\n  .usa-alert-error::before {\n    background-color: #005495; }\n\n.usa-alert-info {\n  background-color: #e1f3f8;\n  background-image: url(\"../img/alerts/info.png\");\n  background-image: url(\"../img/alerts/info.svg\"); }\n  .usa-alert-info::before {\n    background-color: #c64b00; }\n\n.usa-alert-no_icon {\n  background-image: none; }\n\n.usa-alert-paragraph {\n  width: 66ch; }\n\n.usa-alert {\n  margin-top: 1.5em; }\n\n.usa-banner {\n  background-color: #e4e4e4;\n  padding-bottom: 0.7rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner {\n      font-size: 1.3rem;\n      padding-bottom: 0; } }\n\n.usa-banner-content {\n  padding-right: 1.5rem;\n  padding-bottom: 3px;\n  padding-left: 1.5rem;\n  background-color: transparent;\n  font-size: 1.5rem;\n  padding-top: 2rem;\n  width: 100%; }\n  @media screen and (min-width: 600px) {\n    .usa-banner-content {\n      padding-bottom: 2.3rem;\n      padding-top: 4rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-banner-content {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n  .usa-banner-content p:first-child {\n    margin-top: 1rem; }\n    @media screen and (min-width: 600px) {\n      .usa-banner-content p:first-child {\n        margin-top: 0; } }\n\n.usa-banner-inner {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  padding-right: 1.5rem;\n  padding-left: 1.5rem;\n  max-width: 1040px; }\n  .usa-banner-inner::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  @media screen and (min-width: 951px) {\n    .usa-banner-inner {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-banner-header {\n  padding-top: 0.55rem;\n  padding-bottom: 0.55rem;\n  font-size: 1.2rem;\n  font-weight: 400; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header {\n      padding-top: 0;\n      padding-bottom: 0; } }\n  .usa-banner-header p {\n    margin-top: 0;\n    margin-bottom: 0;\n    display: inline;\n    overflow: hidden;\n    vertical-align: middle; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header p {\n        margin-top: 2px;\n        margin-bottom: 2px;\n        display: inline-block; } }\n  .usa-banner-header img {\n    float: left;\n    margin-right: 1rem;\n    margin-top: 1px;\n    width: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header img {\n        margin-right: 0.7rem;\n        width: 2rem; } }\n\n.usa-banner-header-expanded {\n  align-items: center;\n  border-bottom: 1px solid #999999;\n  display: flex;\n  font-size: 1.5rem;\n  min-height: 5.6rem;\n  padding-right: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header-expanded {\n      border-bottom: none;\n      display: block;\n      font-size: 1.2rem;\n      font-weight: 400;\n      min-height: 0;\n      padding-right: 0; } }\n  .usa-banner-header-expanded > .usa-banner-inner {\n    margin-left: 0; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded > .usa-banner-inner {\n        margin-left: auto; } }\n  .usa-banner-header-expanded img {\n    margin-right: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded img {\n        margin-right: 0.7rem; } }\n  .usa-banner-header-expanded p {\n    line-height: 1.3;\n    vertical-align: top; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded p {\n        line-height: 1.5;\n        vertical-align: middle; } }\n\n.usa-banner-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  padding-top: 1.3rem;\n  padding-left: 4.8rem;\n  background-position-x: right;\n  color: #0071BC;\n  display: block;\n  font-size: 1.2rem;\n  height: 4.3rem;\n  left: 0;\n  position: absolute;\n  text-decoration: underline;\n  top: 0;\n  width: 100%; }\n  .usa-banner-button:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-button {\n      padding-top: 0;\n      padding-left: 0;\n      /* stylelint-disable declaration-block-no-ignored-properties */\n      display: inline;\n      height: initial;\n      margin-left: 3px;\n      position: relative;\n      vertical-align: middle;\n      width: initial;\n      /* stylelint-enable */ } }\n  .usa-banner-button:hover {\n    color: #205493;\n    text-decoration: underline; }\n  .usa-banner-button[aria-expanded=false] {\n    background-image: none; }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-image: url(\"../img/angle-arrow-down-primary.png\");\n      background-image: url(\"../img/angle-arrow-down-primary.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1rem;\n      width: 1rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    .usa-banner-button[aria-expanded=false]:hover::after {\n      background-image: url(\"../img/angle-arrow-down-primary-hover.png\");\n      background-image: url(\"../img/angle-arrow-down-primary-hover.svg\"); }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-position-y: 1px; }\n  .usa-banner-button[aria-expanded=true] {\n    background-image: none;\n    height: 5.6rem; }\n    .usa-banner-button[aria-expanded=true]::after {\n      background-image: url(\"../img/close.png\");\n      background-image: url(\"../img/close.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1.3rem;\n      width: 1.3rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    @media screen and (min-width: 481px) {\n      .usa-banner-button[aria-expanded=true] {\n        height: initial;\n        padding: 0;\n        position: relative; }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-image: url(\"../img/angle-arrow-up-primary.png\");\n          background-image: url(\"../img/angle-arrow-up-primary.svg\");\n          background-size: 100%;\n          content: '';\n          display: inline-block;\n          height: 1rem;\n          width: 1rem;\n          /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n          margin-left: 0;\n          /* stylelint-enable */ }\n        .usa-banner-button[aria-expanded=true]:hover::after {\n          background-image: url(\"../img/angle-arrow-up-primary-hover.png\");\n          background-image: url(\"../img/angle-arrow-up-primary-hover.svg\"); }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-position-y: 1px; } }\n    .usa-banner-button[aria-expanded=true]::after {\n      position: absolute;\n      right: 1.5rem;\n      top: 2.15rem; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true]::after {\n          position: static; } }\n    .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n      display: none; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n          display: inline; } }\n\n.usa-banner-icon {\n  width: 3.8rem; }\n\n.usa-footer .usa-unstyled-list {\n  display: block; }\n\n.usa-footer .usa-footer-primary-link {\n  color: #212121;\n  display: block;\n  font-weight: 700;\n  margin-top: 0;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: none; }\n  @media screen and (min-width: 600px) {\n    .usa-footer .usa-footer-primary-link {\n      border-top: none; } }\n  .usa-footer .usa-footer-primary-link:hover {\n    text-decoration: underline; }\n\n.usa-footer .usa-footer-primary-link ~ li a,\n.usa-footer .usa-footer-secondary-link {\n  text-decoration: none; }\n\n.usa-footer-contact_info {\n  display: inline-block; }\n  .usa-footer-contact_info a {\n    color: #212121;\n    text-decoration: none; }\n  .usa-footer-contact_info:hover {\n    text-decoration: underline; }\n\n.usa-footer-return-to-top {\n  color: #0071BC;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: underline; }\n\n.usa-footer-primary-section {\n  background-color: #e4e4e4; }\n  .usa-footer-primary-section .usa-footer-primary-content {\n    padding-left: 1.5rem;\n    padding-right: 2.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-primary-section .usa-footer-primary-content {\n        padding-left: 0;\n        padding-right: 0; } }\n    .usa-footer-primary-section .usa-footer-primary-content li {\n      margin-left: 1rem; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-primary-section .usa-footer-primary-content li {\n          margin-left: 0; } }\n  @media screen and (min-width: 600px) {\n    .usa-footer-primary-section .usa-grid-full {\n      padding-left: 2.5rem;\n      padding-right: 2.5rem; } }\n\n.usa-footer-medium .usa-footer-contact_info p {\n  margin: 0 1rem 0 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact_info p {\n      margin: 0 0 0 1rem; } }\n\n.usa-footer-medium .usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact-heading {\n      margin-top: 0.5rem;\n      margin-bottom: 0.5rem; } }\n\n.usa-footer-medium .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-logo {\n      padding: 2rem 0; } }\n\n.usa-footer-medium .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-medium .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-medium .usa-footer-nav ul {\n    align-items: center; } }\n\n.usa-footer-slim .usa-footer-nav a {\n  display: block; }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n.usa-footer-slim .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-slim .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-slim .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-primary-section {\n    padding-bottom: 0;\n    padding-top: 0; }\n    .usa-footer-slim .usa-footer-primary-section .usa-grid-full {\n      align-items: center; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info > * {\n    margin: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    padding-top: 1.5rem;\n    padding-bottom: 1.5rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    width: 100%; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-footer-slim .usa-footer-contact_info:last-child {\n      margin-right: 0; } }\n\n/* stylelint-disable selector-no-qualifying-type */\nul.usa-footer-primary-content,\nli.usa-footer-primary-content,\nli.usa-footer-primary-content {\n  border-top: 1px solid #999999; }\n  @media screen and (min-width: 600px) {\n    ul.usa-footer-primary-content,\n    li.usa-footer-primary-content,\n    li.usa-footer-primary-content {\n      border: none; } }\n  ul.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      ul.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child {\n        border-bottom: none; } }\n\n/* stylelint-enable */\n.usa-sign_up-block {\n  padding-bottom: 4.5rem;\n  padding-left: 1.5rem;\n  padding-right: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-sign_up-block {\n      float: right;\n      padding: 0; } }\n  .usa-sign_up-block label:first-of-type {\n    margin-top: 0; }\n  .usa-sign_up-block button {\n    float: none;\n    margin-right: 0;\n    margin-top: 1.5rem; }\n  .usa-sign_up-block input {\n    width: 100%; }\n\n.usa-footer-secondary_section {\n  background-color: #c9c9c9;\n  padding-bottom: 2rem;\n  padding-top: 2rem; }\n  .usa-footer-secondary_section a {\n    color: #212121; }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big-secondary-section {\n    padding-top: 2rem;\n    padding-bottom: 2rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-contact-links {\n    text-align: right; } }\n\n.usa-social-links a {\n  text-decoration: none; }\n\n.usa-footer-big .usa-footer-contact_info {\n  display: block; }\n  .usa-footer-big .usa-footer-contact_info p {\n    margin: 0 1rem 0 0; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-contact_info p {\n        margin: 0.5rem 0 0 1rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-contact-links {\n    padding-top: 2rem; } }\n\n.usa-footer-big .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-logo {\n      padding: 2rem 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-primary-section {\n    padding-bottom: 4rem;\n    padding-top: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content {\n  padding-left: 0;\n  padding-right: 0; }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n    margin-left: 1.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n        margin-left: 0; } }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link {\n    margin-left: 0; }\n\n.usa-footer-big ul {\n  padding-bottom: 2.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big ul {\n      padding-bottom: 0; } }\n  .usa-footer-big ul:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul:last-child {\n        border-bottom: none; } }\n  .usa-footer-big ul li:not(.usa-footer-primary-link) {\n    line-height: 1.3;\n    padding-bottom: 0.35em;\n    padding-top: 0.35em; }\n  .usa-footer-big ul .usa-footer-primary-link {\n    background-image: url(\"../img/arrow-down.png\");\n    background-image: url(\"../img/arrow-down.svg\");\n    background-position: 1.5rem center;\n    background-repeat: no-repeat;\n    background-size: 1.3rem;\n    margin-left: 0;\n    padding-left: 3.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul .usa-footer-primary-link {\n        background: none;\n        margin-bottom: .8rem;\n        padding-bottom: 0;\n        padding-left: 0; } }\n    .usa-footer-big ul .usa-footer-primary-link > * {\n      margin-top: 0;\n      margin-bottom: 0; }\n  .usa-footer-big ul.hidden {\n    /* stylelint-disable-line selector-no-qualifying-type */\n    padding-bottom: 0; }\n    .usa-footer-big ul.hidden li {\n      display: none; }\n    .usa-footer-big ul.hidden .usa-footer-primary-link {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/arrow-right.png\");\n      background-image: url(\"../img/arrow-right.svg\");\n      cursor: pointer;\n      display: block; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-big ul.hidden .usa-footer-primary-link {\n          background: none;\n          padding-left: 0; } }\n\n.usa-footer-topic {\n  margin: 0;\n  padding: 2rem 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-sign_up-header {\n    margin: 0;\n    padding: 2rem 0; } }\n\n.usa-footer-logo-img {\n  max-width: 8rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-img {\n      float: left; } }\n\n.usa-footer-big-logo-img {\n  max-width: 10rem; }\n\n.usa-footer-slim-logo-img {\n  float: left;\n  max-width: 5rem; }\n\n.usa-footer-logo-heading {\n  display: block;\n  margin-top: 1rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-heading {\n      display: inline-block;\n      margin-top: 3rem;\n      padding-left: 1.5rem; } }\n\n.usa-footer-big-logo-heading {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big-logo-heading {\n      margin-top: 2rem; } }\n\n.usa-footer-slim-logo-heading {\n  display: inline-block;\n  margin-top: 1.5rem;\n  padding-left: 1.5rem; }\n\n.usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-contact-heading {\n      margin-top: 1rem; } }\n\n.usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n  margin: 2.5rem 1rem 1.5rem 0;\n  background-position: center center;\n  background-repeat: no-repeat;\n  background-size: auto 3rem;\n  display: inline-block;\n  height: 4.4rem;\n  left: -1.6rem;\n  position: relative;\n  text-align: center;\n  width: 4.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n      margin: 0 0 0 0.5rem;\n      left: 1.5rem; } }\n  .usa-social_link span, .usa-link-facebook span, .usa-link-twitter span, .usa-link-youtube span, .usa-link-rss span {\n    position: absolute;\n    left: -999em; }\n\n.usa-link-facebook {\n  background-image: url(\"../img/social-icons/png/facebook25.png\");\n  background-image: url(\"../img/social-icons/svg/facebook25.svg\"); }\n\n.usa-link-twitter {\n  background-image: url(\"../img/social-icons/png/twitter16.png\");\n  background-image: url(\"../img/social-icons/svg/twitter16.svg\"); }\n\n.usa-link-youtube {\n  background-image: url(\"../img/social-icons/png/youtube15.png\");\n  background-image: url(\"../img/social-icons/svg/youtube15.svg\"); }\n\n.usa-link-rss {\n  background-image: url(\"../img/social-icons/png/rss25.png\");\n  background-image: url(\"../img/social-icons/svg/rss25.svg\"); }\n\nform a {\n  border-bottom: 0; }\n\nform [type=submit],\nform [type=submit] {\n  display: block;\n  margin-bottom: 1.5em;\n  margin-top: 2.5rem; }\n  @media screen and (min-width: 600px) {\n    form [type=submit],\n    form [type=submit] {\n      padding-left: 2.7em;\n      padding-right: 2.7em;\n      width: auto; } }\n\nform [name=password],\nform [name=confirmPassword] {\n  margin-bottom: 1.1rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-form {\n    max-width: 32rem; } }\n\n.usa-form-note {\n  float: right;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.5rem;\n  margin: 0 0 1.5rem; }\n  .usa-form-note + * {\n    clear: both; }\n\nfieldset {\n  border: none;\n  margin: 0;\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-form-large {\n    max-width: 46rem; } }\n\ninput.usa-input-tiny {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-tiny {\n      max-width: 6rem; } }\n\ninput.usa-input-medium {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-medium {\n      max-width: 12rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid {\n    padding-right: 5%; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid:last-of-type {\n    padding-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-small {\n    float: left;\n    width: 35%; } }\n\n.usa-input-grid-small input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-small select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-medium {\n    float: left;\n    width: 65%; } }\n\n.usa-input-grid-medium input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-medium select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-large {\n    float: left;\n    width: 100%; } }\n\n.usa-input-grid-large input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-large select {\n  margin-bottom: 3rem; }\n\n.usa-additional_text {\n  font-weight: normal; }\n\n.usa-checklist {\n  list-style: none;\n  margin-left: 0;\n  padding-left: 0; }\n  .usa-checklist li {\n    display: inline-block;\n    list-style: none;\n    margin-bottom: 0;\n    margin-top: 0;\n    padding-left: 3em;\n    text-indent: -2em; }\n    .usa-checklist li::before {\n      content: ' ';\n      display: inline-block;\n      height: .8em;\n      margin-right: .2em;\n      width: 1.8em; }\n\n.usa-checklist-checked::before {\n  background-image: url(\"../img/correct9.png\");\n  background-image: url(\"../img/correct9.svg\");\n  background-position: 100%;\n  background-repeat: no-repeat;\n  background-size: 100%; }\n\n.usa-graphic_list .usa-graphic_list-row .usa-media_block {\n  margin-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-graphic_list .usa-graphic_list-row .usa-media_block {\n      margin-bottom: 6rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block {\n    margin-bottom: 0; } }\n\n.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block:last-child {\n  margin-bottom: 0; }\n\n.usa-graphic_list .usa-media_block-img {\n  margin-right: 3rem; }\n\n.usa-graphic_list .usa-media_block-body > :first-child {\n  margin-top: 0; }\n\n.usa-header {\n  width: 100%;\n  z-index: 7000; }\n  @media screen and (min-width: 951px) {\n    .usa-header {\n      border-bottom: 1px solid #c9c9c9; } }\n  .usa-header a {\n    border-bottom: none; }\n  @media screen and (min-width: 951px) {\n    .usa-header .usa-search {\n      float: right;\n      max-width: 21.5rem; } }\n\n.usa-logo {\n  float: left;\n  line-height: 4rem;\n  margin-left: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-logo {\n      line-height: 7.5rem;\n      margin-left: 0; } }\n  .usa-logo a {\n    color: #212121;\n    text-decoration: none; }\n  .usa-logo br {\n    display: none; }\n    @media screen and (min-width: 951px) {\n      .usa-logo br {\n        display: block; } }\n\n.usa-logo-text {\n  display: block;\n  font-size: 1.5rem;\n  font-style: normal;\n  font-weight: 700;\n  margin: 0; }\n  @media screen and (min-width: 951px) {\n    .usa-logo-text {\n      display: block;\n      font-size: 2.4rem;\n      line-height: 1.3; } }\n\n.usa-menu-btn {\n  /* stylelint-disable declaration-block-no-ignored-properties */\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #0071BC;\n  color: #ffffff;\n  display: inline;\n  float: right;\n  font-size: 1.3rem;\n  height: 4rem;\n  line-height: 4rem;\n  text-align: center;\n  text-decoration: none;\n  text-transform: uppercase;\n  width: 5.8rem;\n  /* stylelint-enable */ }\n  .usa-menu-btn:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-menu-btn {\n      display: none; } }\n  .usa-menu-btn:hover {\n    color: #ffffff;\n    background-color: #205493; }\n  .usa-menu-btn:visited {\n    color: #ffffff; }\n\n.usa-overlay {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  background: #000000;\n  opacity: 0;\n  transition: all 0.2s ease-in-out;\n  visibility: hidden;\n  z-index: 8000; }\n  .usa-overlay.is-visible {\n    opacity: 0.1;\n    visibility: visible; }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-logo {\n    bottom: 0;\n    position: absolute; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-navbar {\n    position: relative;\n    width: 18%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-header {\n    border-bottom: none; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-logo {\n    margin-top: 3rem;\n    margin-bottom: 3rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended em {\n    font-size: 3.2rem;\n    line-height: 1; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-navbar {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    display: block;\n    height: auto;\n    max-width: 1040px; }\n    .usa-header-extended .usa-navbar::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav {\n    border-top: 1px solid #c9c9c9;\n    float: none;\n    padding: 0;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-inner {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 1.5rem;\n    margin-top: -1px;\n    max-width: 1040px;\n    position: relative; }\n    .usa-header-extended .usa-nav-inner::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary::after {\n    clear: both;\n    content: \"\";\n    display: block; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-position: right 1.5rem top 53%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link {\n    padding-top: 1.8rem;\n    padding-bottom: 1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-submenu .usa-grid-full {\n    padding-left: 1.2rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-megamenu {\n    padding-left: 3rem; } }\n\n.usa-hero {\n  padding-top: 3rem;\n  padding-bottom: 3rem;\n  background-image: url(\"../img/hero.png\");\n  background-position: center;\n  background-size: cover; }\n  .usa-hero .usa-button {\n    color: #ffffff; }\n\n.usa-section-dark .usa-hero-link {\n  color: #c64b00; }\n\n.usa-hero-callout {\n  background-color: #112E51;\n  padding: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-hero-callout {\n      max-width: 30rem; } }\n  .usa-hero-callout > *:first-child {\n    margin-top: 0;\n    margin-bottom: 2rem; }\n\n.usa-hero-callout-alt {\n  color: #ffffff;\n  display: block; }\n\n.usa-layout-docs {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs {\n      display: inherit; } }\n  .usa-layout-docs .usa-grid > :first-child:not(.usa-width-*) {\n    margin-top: 0; }\n  .usa-layout-docs .usa-grid > :last-child:not(.usa-width-*) {\n    margin-bottom: 0; }\n\n.usa-layout-docs-sidenav {\n  order: 2; }\n\n.usa-layout-docs-main_content {\n  margin-bottom: 3rem;\n  order: 1; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs-main_content {\n      margin-bottom: 0; } }\n  .usa-layout-docs-main_content > :first-child {\n    margin-top: 0; }\n\n.usa-media_block-img {\n  float: left;\n  margin-right: 1rem; }\n\n.usa-media_block-body {\n  overflow: hidden; }\n\n.usa-navbar {\n  border-bottom: 1px solid #999999;\n  height: 4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-navbar {\n      border-bottom: none;\n      display: inline-block;\n      height: 7.8rem; } }\n\n.usa-nav-link {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link:hover span {\n      border-bottom: 0.4rem solid #0071BC;\n      padding-bottom: 0.6rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link.usa-accordion-button span {\n      margin-right: 0;\n      padding-right: 1.5rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-nav-container {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    max-width: 1040px; }\n    .usa-nav-container::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n.usa-nav {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: auto;\n  background: #ffffff;\n  border-left: 1px solid #999999;\n  border-right: 0;\n  display: flex;\n  flex-direction: column;\n  overflow-y: auto;\n  padding: 2rem;\n  transform: translateX(26rem);\n  width: 26rem;\n  z-index: 9000; }\n  @media screen and (min-width: 951px) {\n    .usa-nav {\n      padding-top: 4.5rem;\n      padding-right: 0;\n      padding-bottom: 0;\n      border-left: none;\n      display: block;\n      float: right;\n      overflow-y: visible;\n      position: relative;\n      transform: translateX(0);\n      width: auto; } }\n  .usa-nav.is-visible {\n    transform: translateX(0);\n    transition: all 0.3s ease-in-out; }\n  .usa-nav nav {\n    margin-top: 6rem;\n    min-height: 100%; }\n    @media screen and (min-width: 951px) {\n      .usa-nav nav {\n        margin-top: 0; } }\n  .usa-nav .usa-current {\n    border-left: 4px solid #0071BC;\n    color: #0071BC;\n    font-weight: 700;\n    padding-left: 1.4rem; }\n    @media screen and (min-width: 951px) {\n      .usa-nav .usa-current {\n        color: #212121; } }\n  .usa-nav .usa-button {\n    width: 100%; }\n  @media screen and (min-width: 951px) {\n    .usa-nav .usa-search {\n      margin-left: 1.5rem;\n      top: 4px; } }\n\n.usa-nav-primary {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin-top: 1.5rem;\n  order: 2; }\n  .usa-nav-primary > li {\n    margin-bottom: 0; }\n  .usa-nav-primary > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-nav-primary > li:first-child {\n      border-top: none; }\n  .usa-nav-primary a {\n    border: none;\n    color: #212121;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-nav-primary a:hover {\n      background-color: #e4e4e4;\n      color: #0071BC;\n      text-decoration: none; }\n    .usa-nav-primary a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-nav-primary a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #0071BC;\n      color: #0071BC;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary {\n      display: inline; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary li {\n      border-top: none; } }\n  .usa-nav-primary > li {\n    width: auto; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li {\n        display: inline-block; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a:hover {\n        background-color: transparent; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a {\n      padding-top: 0.75rem;\n      padding-bottom: 0.75rem; } }\n  .usa-nav-primary button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    -moz-osx-font-smoothing: grayscale;\n    -webkit-font-smoothing: antialiased;\n    font-weight: 400;\n    line-height: 1.3;\n    padding: 0.85rem 1.5rem 0.85rem 1.8rem; }\n    .usa-nav-primary button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary button {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1;\n        width: initial; } }\n    .usa-nav-primary button:focus, .usa-nav-primary button:active {\n      box-shadow: 2px dotted #999999; }\n    .usa-nav-primary button:hover {\n      background-color: #e4e4e4;\n      color: #0071BC; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button:hover {\n          background-color: transparent; } }\n    .usa-nav-primary button[aria-expanded=false] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/plus-alt.png\");\n      background-image: url(\"../img/plus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false] {\n          background-image: url(\"../img/angle-arrow-down.png\");\n          background-image: url(\"../img/angle-arrow-down.svg\");\n          background-position: right 1.5rem top 40%; } }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false]:hover {\n          background-image: url(\"../img/angle-arrow-down-primary.png\");\n          background-image: url(\"../img/angle-arrow-down-primary.svg\"); } }\n    .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/minus-alt.png\");\n      background-image: url(\"../img/minus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=true] {\n          background-color: #112E51;\n          color: #ffffff;\n          background-image: url(\"../img/angle-arrow-down-hover.png\");\n          background-image: url(\"../img/angle-arrow-down-hover.svg\");\n          background-position: right 1.5rem top 40%; }\n          .usa-nav-primary button[aria-expanded=true]:hover {\n            background-color: #112E51; }\n          .usa-nav-primary button[aria-expanded=true] span {\n            border-bottom: 0.4rem solid #0071BC;\n            padding-bottom: 0.6rem;\n            color: #ffffff; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a.usa-current,\n    .usa-nav-primary .usa-current {\n      border-left: 0;\n      padding-left: 1.5rem; }\n      .usa-nav-primary a.usa-current:hover span,\n      .usa-nav-primary .usa-current:hover span {\n        color: #0071BC; }\n      .usa-nav-primary a.usa-current span,\n      .usa-nav-primary .usa-current span {\n        border-bottom: 0.4rem solid #0071BC;\n        padding-bottom: 0.6rem;\n        color: #212121; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link:hover span {\n    border-bottom: 0.7rem solid #0071BC;\n    padding-bottom: 0.9rem; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=true] span {\n      border-bottom: 0.7rem solid #0071BC;\n      padding-bottom: 0.9rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary .usa-current span {\n    border-bottom: 0.7rem solid #0071BC;\n    padding-bottom: 0.9rem; } }\n\n.usa-nav-secondary {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary {\n      margin-top: 0;\n      position: absolute;\n      right: 3rem;\n      top: -5.7rem; } }\n  .usa-nav-secondary .usa-search {\n    margin-top: 1.5rem;\n    margin-bottom: 0; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary .usa-search {\n        margin-top: -0.9rem;\n        margin-bottom: 0;\n        margin-left: 0;\n        float: left; } }\n\n.usa-nav-secondary-links {\n  margin-top: 2.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links {\n      float: left;\n      margin-top: 0; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li {\n      display: inline;\n      padding-left: 0.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li:not(:last-child)::after {\n      color: #c9c9c9;\n      content: '|';\n      padding-left: 0.5rem; } }\n  .usa-nav-secondary-links a,\n  .usa-nav-secondary-links .usa-header-search-button {\n    color: #666666;\n    display: inline-block;\n    font-size: 1.5rem;\n    text-decoration: none; }\n    .usa-nav-secondary-links a:hover,\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      color: #0071BC;\n      text-decoration: underline; }\n  .usa-nav-secondary-links .usa-header-search-button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    display: none; }\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button {\n        background-image: url(\"../img/search-alt.png\");\n        background-image: url(\"../img/search-alt.svg\");\n        background-repeat: no-repeat;\n        background-position: left center;\n        background-size: 2.2rem;\n        display: inline-block;\n        padding-left: 2.3rem; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button.is-hidden {\n        display: none; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links a.usa-current {\n      border-left: 0;\n      padding-left: 0; } }\n\n.usa-nav-submenu {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-nav-submenu > li {\n    margin-bottom: 0; }\n  .usa-nav-submenu li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-nav-submenu a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-nav-submenu a:hover, .usa-nav-submenu a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-nav-submenu .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu {\n      margin-top: 0;\n      margin-bottom: 0;\n      list-style-type: none;\n      padding-left: 0;\n      padding-top: 0.75rem;\n      padding-bottom: 0.9rem;\n      background-color: #112E51;\n      width: 21.5rem;\n      position: absolute; }\n      .usa-nav-submenu > li {\n        margin-bottom: 0; } }\n  .usa-nav-submenu[aria-hidden=true] {\n    display: none; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a {\n      color: #ffffff;\n      padding-left: 1.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a:hover {\n      background-color: #112E51;\n      color: #ffffff;\n      padding-left: 1.5rem;\n      text-decoration: underline; } }\n  .usa-nav-submenu li {\n    font-size: 1.5rem;\n    margin-bottom: 0; }\n\n.usa-nav-close {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  margin: -1.2rem -1.5rem 1.5rem auto;\n  float: right;\n  height: 4.4rem;\n  text-align: center;\n  width: 4.4rem; }\n  .usa-nav-close:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-close {\n      display: none; } }\n  .usa-nav-close img {\n    width: 1.3rem; }\n  .usa-nav-close + * {\n    clear: both; }\n\n.usa-mobile_nav-active {\n  overflow: hidden; }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu {\n    padding-top: 3.15rem;\n    padding-bottom: 3.15rem;\n    left: -1rem;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::before {\n    background-color: #112E51;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    right: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::after {\n    background-color: #112E51;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    left: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav {\n    padding-left: 0;\n    padding-top: 0;\n    width: 100%; } }\n\n.usa-header-basic-megamenu .usa-nav-inner {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 951px) {\n    .usa-header-basic-megamenu .usa-nav-inner {\n      display: block;\n      float: right;\n      margin-top: -3.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav-submenu .usa-grid-full {\n    margin-left: -1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu-col {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-megamenu-col:last-child {\n      margin-right: 0; }\n    .usa-megamenu-col:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-megamenu-col:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-megamenu-col:nth-child(4n) {\n      margin-right: 0; } }\n\n.usa-megamenu-col > ul {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-megamenu-col > ul > li {\n    margin-bottom: 0; }\n\n.usa-search {\n  max-width: none;\n  position: relative; }\n  .usa-search::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  .usa-search [type=submit],\n  .usa-search .usa-search-submit {\n    background-image: url(\"../img/search.png\");\n    background-image: url(\"../img/search.svg\");\n    background-position: 50%;\n    background-repeat: no-repeat;\n    border-bottom-left-radius: 0;\n    border-top-left-radius: 0;\n    height: 3.3rem;\n    margin: 0;\n    padding: 0;\n    width: 4.5rem; }\n    @media screen and (min-width: 481px) {\n      .usa-search [type=submit],\n      .usa-search .usa-search-submit {\n        background-image: none;\n        width: 8.5rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-big [type=search],\n    .usa-search.usa-search-big .usa-search-input {\n      font-size: 1.7rem;\n      height: 4.4rem;\n      width: calc(100% - 11.6rem); }\n    .usa-search.usa-search-big [type=submit],\n    .usa-search.usa-search-big .usa-search-submit {\n      font-size: 2rem;\n      height: 4.4rem;\n      width: 11.6rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-small [type=search],\n    .usa-search.usa-search-small .usa-search-input {\n      width: calc(100% - 4.5rem); }\n    .usa-search.usa-search-small [type=submit],\n    .usa-search.usa-search-small .usa-search-submit {\n      background-image: url(\"../img/search.png\");\n      background-image: url(\"../img/search.svg\");\n      background-position: 50%;\n      background-repeat: no-repeat;\n      width: 4.5rem; } }\n  @media screen and (max-width: 950px) {\n    .usa-search.usa-search-small.usa-sr-only {\n      left: auto;\n      position: relative; } }\n\ninput[type=\"search\"] {\n  /* stylelint-disable-line selector-no-qualifying-type */\n  box-sizing: border-box;\n  -webkit-appearance: none; }\n\n[type=search],\n.usa-search-input {\n  padding-top: 0;\n  padding-bottom: 0;\n  border-bottom-right-radius: 0;\n  border-right: none;\n  border-top-right-radius: 0;\n  box-sizing: border-box;\n  float: left;\n  font-size: 1.4rem;\n  height: 3.3rem;\n  margin: 0;\n  width: calc(100% - 4.5rem); }\n  @media screen and (min-width: 481px) {\n    [type=search],\n    .usa-search-input {\n      width: calc(100% - 8.5rem); } }\n\n.usa-search-submit-text {\n  position: absolute;\n  left: -999em; }\n  @media screen and (min-width: 481px) {\n    .usa-search-submit-text {\n      position: static; } }\n\n.usa-section {\n  padding-top: 3rem;\n  padding-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-section {\n      padding-top: 6rem;\n      padding-bottom: 6rem; } }\n\n.usa-section-light {\n  background-color: #e4e4e4; }\n\n.usa-section-dark {\n  background-color: #112E51;\n  color: #ffffff; }\n  .usa-section-dark h1,\n  .usa-section-dark h2,\n  .usa-section-dark h3,\n  .usa-section-dark h4,\n  .usa-section-dark h5,\n  .usa-section-dark h6 {\n    color: #c64b00; }\n  .usa-section-dark p {\n    color: #ffffff; }\n  .usa-section-dark a {\n    color: #c9c9c9; }\n    .usa-section-dark a:hover {\n      color: #ffffff; }\n\n.usa-sidenav-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-sidenav-list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-list > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-sidenav-list > li:first-child {\n      border-top: none; }\n  .usa-sidenav-list a {\n    border: none;\n    color: #212121;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-sidenav-list a:hover {\n      background-color: #e4e4e4;\n      color: #0071BC;\n      text-decoration: none; }\n    .usa-sidenav-list a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-sidenav-list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #0071BC;\n      color: #0071BC;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n\n.usa-sidenav-sub_list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-sidenav-sub_list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-sub_list li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-sidenav-sub_list a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-sidenav-sub_list a:hover, .usa-sidenav-sub_list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-sidenav-sub_list .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n\n.usa-skipnav {\n  background: transparent;\n  color: #212121;\n  left: 0;\n  padding: 1rem 1.5rem;\n  position: absolute;\n  top: -4.2rem;\n  transition: all 0.2s ease-in-out;\n  z-index: 100; }\n  .usa-skipnav:focus {\n    background: #ffffff;\n    left: 0;\n    outline: 0;\n    position: absolute;\n    top: 0;\n    transition: all 0.2s ease-in-out; }\n\nh1, h2, h3, h4, h5, h6 {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-weight: bold; }\n\nh3.feed-item-title a,\narticle.aggregator-item .field--name-fid a {\n  text-decoration: none;\n  color: #0071BC; }\n\n.region-sidebar-first,\n.region-sidebar-second,\n.uswds-middle-section {\n  background-color: #E7F5FF; }\n\n.view-nsf-blog article.aggregator-item {\n  background-color: #ffffff;\n  padding: 2rem;\n  padding-top: 0.2rem;\n  margin-bottom: 3rem; }\n\n.region-sidebar-second {\n  float: right;\n  padding: 1.25rem; }\n  .region-sidebar-second h4 {\n    text-transform: uppercase;\n    color: #999999;\n    font-weight: normal; }\n\np,\ninput,\ntextarea,\n.usa-sidenav-list a,\n.usa-accordion,\n.usa-accordion-bordered,\nselect.form-select {\n  color: #666666; }\n\n.usa-nav-primary a.usa-nav-link,\n.usa-nav-primary .usa-nav-link,\n.usa-nav-primary a.usa-current span,\n.usa-nav-primary .usa-current span {\n  color: #3e94cf; }\n\n.filter-wrapper {\n  display: none; }\n\n.usa-form-large {\n  max-width: none; }\n\nform [type=submit],\nform [type=submit] {\n  display: inline-block; }\n\ntextarea {\n  height: auto; }\n\nlabel {\n  margin-top: 1rem; }\n\ninput,\ntextarea,\nselect {\n  max-width: none; }\n\n#block-nsf-views-block-news-block-1 ul {\n  margin: 0 auto;\n  text-align: center; }\n\n#block-nsf-views-block-news-block-1 li {\n  display: inline-block;\n  vertical-align: top; }\n\nimg.image-style-news-main-story {\n  max-width: none; }\n\n.usa-header-basic .usa-logo {\n  top: 0;\n  bottom: auto; }\n  .usa-header-basic .usa-logo img {\n    max-width: none; }\n\n.usa-navbar em.usa-logo-text {\n  margin-left: -5000em; }\n\n.region-footer-menu li.usa-footer-primary-link {\n  pointer-events: none; }\n"]}
\ No newline at end of file
+{"version":3,"sources":["stdin"],"names":[],"mappings":"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","file":"uswds.min.css","sourcesContent":["/*! uswds @version */\nhtml {\n  box-sizing: border-box; }\n\n*, *::after, *::before {\n  box-sizing: inherit; }\n\n/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */\n/**\n * 1. Set default font family to sans-serif.\n * 2. Prevent iOS and IE text size adjust after device orientation change,\n *    without disabling user zoom.\n */\nhtml {\n  font-family: sans-serif;\n  /* 1 */\n  -ms-text-size-adjust: 100%;\n  /* 2 */\n  -webkit-text-size-adjust: 100%;\n  /* 2 */ }\n\n/**\n * Remove default margin.\n */\nbody {\n  margin: 0; }\n\n/* HTML5 display definitions\n   ========================================================================== */\n/**\n * Correct `block` display not defined for any HTML5 element in IE 8/9.\n * Correct `block` display not defined for `details` or `summary` in IE 10/11\n * and Firefox.\n * Correct `block` display not defined for `main` in IE 11.\n */\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nmenu,\nnav,\nsection,\nsummary {\n  display: block; }\n\n/**\n * 1. Correct `inline-block` display not defined in IE 8/9.\n * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.\n */\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block;\n  /* 1 */\n  vertical-align: baseline;\n  /* 2 */ }\n\n/**\n * Prevent modern browsers from displaying `audio` without controls.\n * Remove excess height in iOS 5 devices.\n */\naudio:not([controls]) {\n  display: none;\n  height: 0; }\n\n/**\n * Address `[hidden]` styling not present in IE 8/9/10.\n * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.\n */\n[hidden],\ntemplate {\n  display: none; }\n\n/* Links\n   ========================================================================== */\n/**\n * Remove the gray background color from active links in IE 10.\n */\na {\n  background-color: transparent; }\n\n/**\n * Improve readability of focused elements when they are also in an\n * active/hover state.\n */\na:active,\na:hover {\n  outline: 0; }\n\n/* Text-level semantics\n   ========================================================================== */\n/**\n * Address styling not present in IE 8/9/10/11, Safari, and Chrome.\n */\nabbr[title] {\n  border-bottom: 1px dotted; }\n\n/**\n * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.\n */\nb,\nstrong {\n  font-weight: bold; }\n\n/**\n * Address styling not present in Safari and Chrome.\n */\ndfn {\n  font-style: italic; }\n\n/**\n * Address variable `h1` font-size and margin within `section` and `article`\n * contexts in Firefox 4+, Safari, and Chrome.\n */\nh1 {\n  font-size: 2em;\n  margin: 0.67em 0; }\n\n/**\n * Address styling not present in IE 8/9.\n */\nmark {\n  background: #ff0;\n  color: #000; }\n\n/**\n * Address inconsistent and variable font size in all browsers.\n */\nsmall {\n  font-size: 80%; }\n\n/**\n * Prevent `sub` and `sup` affecting `line-height` in all browsers.\n */\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline; }\n\nsup {\n  top: -0.5em; }\n\nsub {\n  bottom: -0.25em; }\n\n/* Embedded content\n   ========================================================================== */\n/**\n * Remove border when inside `a` element in IE 8/9/10.\n */\nimg {\n  border: 0; }\n\n/**\n * Correct overflow not hidden in IE 9/10/11.\n */\nsvg:not(:root) {\n  overflow: hidden; }\n\n/* Grouping content\n   ========================================================================== */\n/**\n * Address margin not present in IE 8/9 and Safari.\n */\nfigure {\n  margin: 1em 40px; }\n\n/**\n * Address differences between Firefox and other browsers.\n */\nhr {\n  box-sizing: content-box;\n  height: 0; }\n\n/**\n * Contain overflow in all browsers.\n */\npre {\n  overflow: auto; }\n\n/**\n * Address odd `em`-unit font size rendering in all browsers.\n */\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em; }\n\n/* Forms\n   ========================================================================== */\n/**\n * Known limitation: by default, Chrome and Safari on OS X allow very limited\n * styling of `select`, unless a `border` property is set.\n */\n/**\n * 1. Correct color not being inherited.\n *    Known issue: affects color of disabled elements.\n * 2. Correct font properties not being inherited.\n * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.\n */\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  color: inherit;\n  /* 1 */\n  font: inherit;\n  /* 2 */\n  margin: 0;\n  /* 3 */ }\n\n/**\n * Address `overflow` set to `hidden` in IE 8/9/10/11.\n */\nbutton {\n  overflow: visible; }\n\n/**\n * Address inconsistent `text-transform` inheritance for `button` and `select`.\n * All other form control elements do not inherit `text-transform` values.\n * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.\n * Correct `select` style inheritance in Firefox.\n */\nbutton,\nselect {\n  text-transform: none; }\n\n/**\n * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`\n *    and `video` controls.\n * 2. Correct inability to style clickable `input` types in iOS.\n * 3. Improve usability and consistency of cursor style between image-type\n *    `input` and others.\n */\nbutton,\nhtml input[type=\"button\"],\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button;\n  /* 2 */\n  cursor: pointer;\n  /* 3 */ }\n\n/**\n * Re-set default cursor for disabled elements.\n */\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default; }\n\n/**\n * Remove inner padding and border in Firefox 4+.\n */\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  border: 0;\n  padding: 0; }\n\n/**\n * Address Firefox 4+ setting `line-height` on `input` using `!important` in\n * the UA stylesheet.\n */\ninput {\n  line-height: normal; }\n\n/**\n * It's recommended that you don't attempt to style these elements.\n * Firefox's implementation doesn't respect box-sizing, padding, or width.\n *\n * 1. Address box sizing set to `content-box` in IE 8/9/10.\n * 2. Remove excess padding in IE 8/9/10.\n */\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  box-sizing: border-box;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Fix the cursor style for Chrome's increment/decrement buttons. For certain\n * `font-size` values of the `input`, it causes the cursor style of the\n * decrement button to change from `default` to `text`.\n */\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto; }\n\n/**\n * 1. Address `appearance` set to `searchfield` in Safari and Chrome.\n * 2. Address `box-sizing` set to `border-box` in Safari and Chrome.\n */\ninput[type=\"search\"] {\n  -webkit-appearance: textfield;\n  /* 1 */\n  box-sizing: content-box;\n  /* 2 */ }\n\n/**\n * Remove inner padding and search cancel button in Safari and Chrome on OS X.\n * Safari (but not Chrome) clips the cancel button when the search input has\n * padding (and `textfield` appearance).\n */\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none; }\n\n/**\n * Define consistent border, margin, and padding.\n */\nfieldset {\n  border: 1px solid #c0c0c0;\n  margin: 0 2px;\n  padding: 0.35em 0.625em 0.75em; }\n\n/**\n * 1. Correct `color` not being inherited in IE 8/9/10/11.\n * 2. Remove padding so people aren't caught out if they zero out fieldsets.\n */\nlegend {\n  border: 0;\n  /* 1 */\n  padding: 0;\n  /* 2 */ }\n\n/**\n * Remove default vertical scrollbar in IE 8/9/10/11.\n */\ntextarea {\n  overflow: auto; }\n\n/**\n * Don't inherit the `font-weight` (applied by a rule above).\n * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.\n */\noptgroup {\n  font-weight: bold; }\n\n/* Tables\n   ========================================================================== */\n/**\n * Remove most spacing between table cells.\n */\ntable {\n  border-collapse: collapse;\n  border-spacing: 0; }\n\ntd,\nth {\n  padding: 0; }\n\n/* stylelint-disable at-rule-empty-line-before */\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/sourcesanspro-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-light-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/sourcesanspro-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Source Sans Pro\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/sourcesanspro-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/sourcesanspro-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/sourcesanspro-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/sourcesanspro-bold-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 300;\n  src: url(\"../fonts/merriweather-light-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-light-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-light-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-light-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-regular-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-regular-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-regular-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-regular-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: italic;\n  font-weight: 400;\n  src: url(\"../fonts/merriweather-italic-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-italic-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-italic-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-italic-webfont.ttf\") format(\"truetype\"); }\n\n@font-face {\n  font-family: \"Merriweather\";\n  font-style: normal;\n  font-weight: 700;\n  src: url(\"../fonts/merriweather-bold-webfont.eot?#iefix\") format(\"embedded-opentype\"), url(\"../fonts/merriweather-bold-webfont.woff2\") format(\"woff2\"), url(\"../fonts/merriweather-bold-webfont.woff\") format(\"woff\"), url(\"../fonts/merriweather-bold-webfont.ttf\") format(\"truetype\"); }\n\n/* stylelint-enable */\n.usa-grid,\n.usa-grid-full {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  max-width: 1040px; }\n  .usa-grid::after,\n  .usa-grid-full::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n\n.usa-grid {\n  padding-right: 1.5rem;\n  padding-left: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-grid {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-grid-full {\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 47.58542%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 100%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 30.11389%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 4.82916%;\n    width: 65.05695%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-width-one-whole {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 100%; }\n    .usa-width-one-whole:last-child {\n      margin-right: 0; }\n  .usa-width-one-half {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-width-one-half:last-child {\n      margin-right: 0; }\n  .usa-width-one-third {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 31.76157%; }\n    .usa-width-one-third:last-child {\n      margin-right: 0; }\n  .usa-width-two-thirds {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 65.88078%; }\n    .usa-width-two-thirds:last-child {\n      margin-right: 0; }\n  .usa-width-one-fourth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-width-one-fourth:last-child {\n      margin-right: 0; }\n    .usa-width-one-fourth:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-width-one-fourth:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-width-one-fourth:nth-child(4n) {\n      margin-right: 0; }\n  .usa-width-three-fourths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 74.41059%; }\n    .usa-width-three-fourths:last-child {\n      margin-right: 0; }\n  .usa-width-one-sixth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 14.70196%; }\n    .usa-width-one-sixth:last-child {\n      margin-right: 0; }\n    .usa-width-one-sixth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 14.70196%; }\n      .usa-width-one-sixth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-sixth:nth-child(6n) {\n      margin-right: 0; }\n  .usa-width-five-sixths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 82.94039%; }\n    .usa-width-five-sixths:last-child {\n      margin-right: 0; }\n  .usa-width-one-twelfth {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 6.17215%; }\n    .usa-width-one-twelfth:last-child {\n      margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(3n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 6.17215%; }\n      .usa-width-one-twelfth:nth-child(3n):last-child {\n        margin-right: 0; }\n    .usa-width-one-twelfth:nth-child(12n) {\n      margin-right: 0; }\n  .usa-width-five-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 40.29137%; }\n    .usa-width-five-twelfths:last-child {\n      margin-right: 0; }\n  .usa-width-seven-twelfths {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 57.35098%; }\n    .usa-width-seven-twelfths:last-child {\n      margin-right: 0; } }\n\n.usa-end-row {\n  margin-right: 0; }\n\n.usa-offset-one-twelfth {\n  margin-left: 8.5298%; }\n\n.usa-offset-one-sixth {\n  margin-left: 17.05961%; }\n\n.usa-offset-one-fourth {\n  margin-left: 25.58941%; }\n\n.usa-offset-one-third {\n  margin-left: 34.11922%; }\n\n.usa-offset-five-twelfths {\n  margin-left: 42.64902%; }\n\n.usa-offset-one-half {\n  margin-left: 51.17883%; }\n\n.usa-offset-seven-twelfths {\n  margin-left: 59.70863%; }\n\n.usa-offset-two-thirds {\n  margin-left: 68.23843%; }\n\n.usa-offset-three-fourths {\n  margin-left: 76.76824%; }\n\n.usa-offset-five-sixths {\n  margin-left: 85.29804%; }\n\n.usa-offset-eleven-twelfths {\n  margin-left: 93.82785%; }\n\n.usa-sr-only {\n  position: absolute;\n  left: -999em; }\n\nhtml {\n  box-sizing: border-box; }\n\n*,\n*::before,\n*::after {\n  box-sizing: inherit; }\n\nbody {\n  background-color: #ffffff;\n  overflow-x: hidden; }\n\n.lt-ie9 * {\n  filter: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n[hidden] {\n  display: none !important;\n  /* stylelint-disable-line declaration-no-important */ }\n\n*:focus,\n.usa-focus {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n/* stylelint-disable selector-no-qualifying-type */\n.usa-button,\n.usa-button-primary,\n.usa-button:visited,\n.usa-button-primary:visited,\nbutton,\n[type=button],\n[type=submit],\n[type=reset],\n[type=image] {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased;\n  margin-top: 0.5em;\n  margin-right: 0.5em;\n  margin-bottom: 0.5em;\n  appearance: none;\n  background-color: #0071BC;\n  border: 0;\n  border-radius: 5px;\n  color: #ffffff;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.7rem;\n  font-weight: 700;\n  line-height: 1;\n  padding: 1rem 2rem;\n  text-align: center;\n  text-decoration: none;\n  width: 100%; }\n  @media screen and (min-width: 481px) {\n    .usa-button,\n    .usa-button-primary,\n    .usa-button:visited,\n    .usa-button-primary:visited,\n    button,\n    [type=button],\n    [type=submit],\n    [type=reset],\n    [type=image] {\n      width: auto; } }\n  .usa-button:hover, .usa-button.usa-button-hover,\n  .usa-button-primary:hover,\n  .usa-button-primary.usa-button-hover,\n  .usa-button:visited:hover,\n  .usa-button:visited.usa-button-hover,\n  .usa-button-primary:visited:hover,\n  .usa-button-primary:visited.usa-button-hover,\n  button:hover,\n  button.usa-button-hover,\n  [type=button]:hover,\n  [type=button].usa-button-hover,\n  [type=submit]:hover,\n  [type=submit].usa-button-hover,\n  [type=reset]:hover,\n  [type=reset].usa-button-hover,\n  [type=image]:hover,\n  [type=image].usa-button-hover {\n    background-color: #205493;\n    border-bottom: 0;\n    color: #ffffff;\n    text-decoration: none; }\n  .usa-button:active, .usa-button.usa-button-active,\n  .usa-button-primary:active,\n  .usa-button-primary.usa-button-active,\n  .usa-button:visited:active,\n  .usa-button:visited.usa-button-active,\n  .usa-button-primary:visited:active,\n  .usa-button-primary:visited.usa-button-active,\n  button:active,\n  button.usa-button-active,\n  [type=button]:active,\n  [type=button].usa-button-active,\n  [type=submit]:active,\n  [type=submit].usa-button-active,\n  [type=reset]:active,\n  [type=reset].usa-button-active,\n  [type=image]:active,\n  [type=image].usa-button-active {\n    background-color: #112E51; }\n  .usa-button.usa-button-primary-alt,\n  .usa-button-primary.usa-button-primary-alt,\n  .usa-button:visited.usa-button-primary-alt,\n  .usa-button-primary:visited.usa-button-primary-alt,\n  button.usa-button-primary-alt,\n  [type=button].usa-button-primary-alt,\n  [type=submit].usa-button-primary-alt,\n  [type=reset].usa-button-primary-alt,\n  [type=image].usa-button-primary-alt {\n    background-color: #c64b00;\n    color: #212121; }\n    .usa-button.usa-button-primary-alt:hover, .usa-button.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary.usa-button-primary-alt:hover,\n    .usa-button-primary.usa-button-primary-alt.usa-button-hover,\n    .usa-button:visited.usa-button-primary-alt:hover,\n    .usa-button:visited.usa-button-primary-alt.usa-button-hover,\n    .usa-button-primary:visited.usa-button-primary-alt:hover,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-hover,\n    button.usa-button-primary-alt:hover,\n    button.usa-button-primary-alt.usa-button-hover,\n    [type=button].usa-button-primary-alt:hover,\n    [type=button].usa-button-primary-alt.usa-button-hover,\n    [type=submit].usa-button-primary-alt:hover,\n    [type=submit].usa-button-primary-alt.usa-button-hover,\n    [type=reset].usa-button-primary-alt:hover,\n    [type=reset].usa-button-primary-alt.usa-button-hover,\n    [type=image].usa-button-primary-alt:hover,\n    [type=image].usa-button-primary-alt.usa-button-hover {\n      background-color: #046b99; }\n    .usa-button.usa-button-primary-alt:active, .usa-button.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary.usa-button-primary-alt:active,\n    .usa-button-primary.usa-button-primary-alt.usa-button-active,\n    .usa-button:visited.usa-button-primary-alt:active,\n    .usa-button:visited.usa-button-primary-alt.usa-button-active,\n    .usa-button-primary:visited.usa-button-primary-alt:active,\n    .usa-button-primary:visited.usa-button-primary-alt.usa-button-active,\n    button.usa-button-primary-alt:active,\n    button.usa-button-primary-alt.usa-button-active,\n    [type=button].usa-button-primary-alt:active,\n    [type=button].usa-button-primary-alt.usa-button-active,\n    [type=submit].usa-button-primary-alt:active,\n    [type=submit].usa-button-primary-alt.usa-button-active,\n    [type=reset].usa-button-primary-alt:active,\n    [type=reset].usa-button-primary-alt.usa-button-active,\n    [type=image].usa-button-primary-alt:active,\n    [type=image].usa-button-primary-alt.usa-button-active {\n      background-color: #046b99;\n      color: #ffffff; }\n  .usa-button.usa-button-secondary,\n  .usa-button-primary.usa-button-secondary,\n  .usa-button:visited.usa-button-secondary,\n  .usa-button-primary:visited.usa-button-secondary,\n  button.usa-button-secondary,\n  [type=button].usa-button-secondary,\n  [type=submit].usa-button-secondary,\n  [type=reset].usa-button-secondary,\n  [type=image].usa-button-secondary {\n    background-color: #ffffff;\n    box-shadow: inset 0 0 0 2px #0071BC;\n    color: #0071BC; }\n    .usa-button.usa-button-secondary:hover, .usa-button.usa-button-secondary.usa-button-hover,\n    .usa-button-primary.usa-button-secondary:hover,\n    .usa-button-primary.usa-button-secondary.usa-button-hover,\n    .usa-button:visited.usa-button-secondary:hover,\n    .usa-button:visited.usa-button-secondary.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary:hover,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-hover,\n    button.usa-button-secondary:hover,\n    button.usa-button-secondary.usa-button-hover,\n    [type=button].usa-button-secondary:hover,\n    [type=button].usa-button-secondary.usa-button-hover,\n    [type=submit].usa-button-secondary:hover,\n    [type=submit].usa-button-secondary.usa-button-hover,\n    [type=reset].usa-button-secondary:hover,\n    [type=reset].usa-button-secondary.usa-button-hover,\n    [type=image].usa-button-secondary:hover,\n    [type=image].usa-button-secondary.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #205493;\n      color: #205493; }\n    .usa-button.usa-button-secondary:active, .usa-button.usa-button-secondary.usa-button-active,\n    .usa-button-primary.usa-button-secondary:active,\n    .usa-button-primary.usa-button-secondary.usa-button-active,\n    .usa-button:visited.usa-button-secondary:active,\n    .usa-button:visited.usa-button-secondary.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary:active,\n    .usa-button-primary:visited.usa-button-secondary.usa-button-active,\n    button.usa-button-secondary:active,\n    button.usa-button-secondary.usa-button-active,\n    [type=button].usa-button-secondary:active,\n    [type=button].usa-button-secondary.usa-button-active,\n    [type=submit].usa-button-secondary:active,\n    [type=submit].usa-button-secondary.usa-button-active,\n    [type=reset].usa-button-secondary:active,\n    [type=reset].usa-button-secondary.usa-button-active,\n    [type=image].usa-button-secondary:active,\n    [type=image].usa-button-secondary.usa-button-active {\n      box-shadow: inset 0 0 0 2px #112E51;\n      color: #112E51; }\n  .usa-button.usa-button-secondary-inverse, .usa-button.usa-button-outline-inverse,\n  .usa-button-primary.usa-button-secondary-inverse,\n  .usa-button-primary.usa-button-outline-inverse,\n  .usa-button:visited.usa-button-secondary-inverse,\n  .usa-button:visited.usa-button-outline-inverse,\n  .usa-button-primary:visited.usa-button-secondary-inverse,\n  .usa-button-primary:visited.usa-button-outline-inverse,\n  button.usa-button-secondary-inverse,\n  button.usa-button-outline-inverse,\n  [type=button].usa-button-secondary-inverse,\n  [type=button].usa-button-outline-inverse,\n  [type=submit].usa-button-secondary-inverse,\n  [type=submit].usa-button-outline-inverse,\n  [type=reset].usa-button-secondary-inverse,\n  [type=reset].usa-button-outline-inverse,\n  [type=image].usa-button-secondary-inverse,\n  [type=image].usa-button-outline-inverse {\n    background: transparent;\n    box-shadow: inset 0 0 0 2px #ffffff;\n    color: #ffffff; }\n    .usa-button.usa-button-secondary-inverse:hover, .usa-button.usa-button-secondary-inverse.usa-button-hover, .usa-button.usa-button-outline-inverse:hover, .usa-button.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-secondary-inverse:hover,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary.usa-button-outline-inverse:hover,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-secondary-inverse:hover,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button:visited.usa-button-outline-inverse:hover,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse:hover,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-hover,\n    .usa-button-primary:visited.usa-button-outline-inverse:hover,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-hover,\n    button.usa-button-secondary-inverse:hover,\n    button.usa-button-secondary-inverse.usa-button-hover,\n    button.usa-button-outline-inverse:hover,\n    button.usa-button-outline-inverse.usa-button-hover,\n    [type=button].usa-button-secondary-inverse:hover,\n    [type=button].usa-button-secondary-inverse.usa-button-hover,\n    [type=button].usa-button-outline-inverse:hover,\n    [type=button].usa-button-outline-inverse.usa-button-hover,\n    [type=submit].usa-button-secondary-inverse:hover,\n    [type=submit].usa-button-secondary-inverse.usa-button-hover,\n    [type=submit].usa-button-outline-inverse:hover,\n    [type=submit].usa-button-outline-inverse.usa-button-hover,\n    [type=reset].usa-button-secondary-inverse:hover,\n    [type=reset].usa-button-secondary-inverse.usa-button-hover,\n    [type=reset].usa-button-outline-inverse:hover,\n    [type=reset].usa-button-outline-inverse.usa-button-hover,\n    [type=image].usa-button-secondary-inverse:hover,\n    [type=image].usa-button-secondary-inverse.usa-button-hover,\n    [type=image].usa-button-outline-inverse:hover,\n    [type=image].usa-button-outline-inverse.usa-button-hover {\n      box-shadow: inset 0 0 0 2px #c9c9c9;\n      color: #c9c9c9; }\n    .usa-button.usa-button-secondary-inverse:active, .usa-button.usa-button-secondary-inverse.usa-button-active, .usa-button.usa-button-outline-inverse:active, .usa-button.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary.usa-button-secondary-inverse:active,\n    .usa-button-primary.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary.usa-button-outline-inverse:active,\n    .usa-button-primary.usa-button-outline-inverse.usa-button-active,\n    .usa-button:visited.usa-button-secondary-inverse:active,\n    .usa-button:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button:visited.usa-button-outline-inverse:active,\n    .usa-button:visited.usa-button-outline-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-secondary-inverse:active,\n    .usa-button-primary:visited.usa-button-secondary-inverse.usa-button-active,\n    .usa-button-primary:visited.usa-button-outline-inverse:active,\n    .usa-button-primary:visited.usa-button-outline-inverse.usa-button-active,\n    button.usa-button-secondary-inverse:active,\n    button.usa-button-secondary-inverse.usa-button-active,\n    button.usa-button-outline-inverse:active,\n    button.usa-button-outline-inverse.usa-button-active,\n    [type=button].usa-button-secondary-inverse:active,\n    [type=button].usa-button-secondary-inverse.usa-button-active,\n    [type=button].usa-button-outline-inverse:active,\n    [type=button].usa-button-outline-inverse.usa-button-active,\n    [type=submit].usa-button-secondary-inverse:active,\n    [type=submit].usa-button-secondary-inverse.usa-button-active,\n    [type=submit].usa-button-outline-inverse:active,\n    [type=submit].usa-button-outline-inverse.usa-button-active,\n    [type=reset].usa-button-secondary-inverse:active,\n    [type=reset].usa-button-secondary-inverse.usa-button-active,\n    [type=reset].usa-button-outline-inverse:active,\n    [type=reset].usa-button-outline-inverse.usa-button-active,\n    [type=image].usa-button-secondary-inverse:active,\n    [type=image].usa-button-secondary-inverse.usa-button-active,\n    [type=image].usa-button-outline-inverse:active,\n    [type=image].usa-button-outline-inverse.usa-button-active {\n      box-shadow: inset 0 0 0 2px #999999;\n      color: #c9c9c9; }\n  .usa-button.usa-button-gray,\n  .usa-button-primary.usa-button-gray,\n  .usa-button:visited.usa-button-gray,\n  .usa-button-primary:visited.usa-button-gray,\n  button.usa-button-gray,\n  [type=button].usa-button-gray,\n  [type=submit].usa-button-gray,\n  [type=reset].usa-button-gray,\n  [type=image].usa-button-gray {\n    background-color: #666666; }\n    .usa-button.usa-button-gray:hover, .usa-button.usa-button-gray.usa-button-hover,\n    .usa-button-primary.usa-button-gray:hover,\n    .usa-button-primary.usa-button-gray.usa-button-hover,\n    .usa-button:visited.usa-button-gray:hover,\n    .usa-button:visited.usa-button-gray.usa-button-hover,\n    .usa-button-primary:visited.usa-button-gray:hover,\n    .usa-button-primary:visited.usa-button-gray.usa-button-hover,\n    button.usa-button-gray:hover,\n    button.usa-button-gray.usa-button-hover,\n    [type=button].usa-button-gray:hover,\n    [type=button].usa-button-gray.usa-button-hover,\n    [type=submit].usa-button-gray:hover,\n    [type=submit].usa-button-gray.usa-button-hover,\n    [type=reset].usa-button-gray:hover,\n    [type=reset].usa-button-gray.usa-button-hover,\n    [type=image].usa-button-gray:hover,\n    [type=image].usa-button-gray.usa-button-hover {\n      background-color: #333333; }\n    .usa-button.usa-button-gray:active, .usa-button.usa-button-gray.usa-button-active,\n    .usa-button-primary.usa-button-gray:active,\n    .usa-button-primary.usa-button-gray.usa-button-active,\n    .usa-button:visited.usa-button-gray:active,\n    .usa-button:visited.usa-button-gray.usa-button-active,\n    .usa-button-primary:visited.usa-button-gray:active,\n    .usa-button-primary:visited.usa-button-gray.usa-button-active,\n    button.usa-button-gray:active,\n    button.usa-button-gray.usa-button-active,\n    [type=button].usa-button-gray:active,\n    [type=button].usa-button-gray.usa-button-active,\n    [type=submit].usa-button-gray:active,\n    [type=submit].usa-button-gray.usa-button-active,\n    [type=reset].usa-button-gray:active,\n    [type=reset].usa-button-gray.usa-button-active,\n    [type=image].usa-button-gray:active,\n    [type=image].usa-button-gray.usa-button-active {\n      background-color: #212121; }\n  .usa-button.usa-button-red,\n  .usa-button-primary.usa-button-red,\n  .usa-button:visited.usa-button-red,\n  .usa-button-primary:visited.usa-button-red,\n  button.usa-button-red,\n  [type=button].usa-button-red,\n  [type=submit].usa-button-red,\n  [type=reset].usa-button-red,\n  [type=image].usa-button-red {\n    background-color: #005495; }\n    .usa-button.usa-button-red:hover, .usa-button.usa-button-red.usa-button-hover,\n    .usa-button-primary.usa-button-red:hover,\n    .usa-button-primary.usa-button-red.usa-button-hover,\n    .usa-button:visited.usa-button-red:hover,\n    .usa-button:visited.usa-button-red.usa-button-hover,\n    .usa-button-primary:visited.usa-button-red:hover,\n    .usa-button-primary:visited.usa-button-red.usa-button-hover,\n    button.usa-button-red:hover,\n    button.usa-button-red.usa-button-hover,\n    [type=button].usa-button-red:hover,\n    [type=button].usa-button-red.usa-button-hover,\n    [type=submit].usa-button-red:hover,\n    [type=submit].usa-button-red.usa-button-hover,\n    [type=reset].usa-button-red:hover,\n    [type=reset].usa-button-red.usa-button-hover,\n    [type=image].usa-button-red:hover,\n    [type=image].usa-button-red.usa-button-hover {\n      background-color: #981b1e; }\n    .usa-button.usa-button-red:active, .usa-button.usa-button-red.usa-button-active,\n    .usa-button-primary.usa-button-red:active,\n    .usa-button-primary.usa-button-red.usa-button-active,\n    .usa-button:visited.usa-button-red:active,\n    .usa-button:visited.usa-button-red.usa-button-active,\n    .usa-button-primary:visited.usa-button-red:active,\n    .usa-button-primary:visited.usa-button-red.usa-button-active,\n    button.usa-button-red:active,\n    button.usa-button-red.usa-button-active,\n    [type=button].usa-button-red:active,\n    [type=button].usa-button-red.usa-button-active,\n    [type=submit].usa-button-red:active,\n    [type=submit].usa-button-red.usa-button-active,\n    [type=reset].usa-button-red:active,\n    [type=reset].usa-button-red.usa-button-active,\n    [type=image].usa-button-red:active,\n    [type=image].usa-button-red.usa-button-active {\n      background-color: #cd2026; }\n  .usa-button.usa-button-big,\n  .usa-button-primary.usa-button-big,\n  .usa-button:visited.usa-button-big,\n  .usa-button-primary:visited.usa-button-big,\n  button.usa-button-big,\n  [type=button].usa-button-big,\n  [type=submit].usa-button-big,\n  [type=reset].usa-button-big,\n  [type=image].usa-button-big {\n    border-radius: 8px;\n    font-size: 2.4rem;\n    padding: 1.5rem 3rem; }\n  .usa-button:disabled,\n  .usa-button-primary:disabled,\n  .usa-button:visited:disabled,\n  .usa-button-primary:visited:disabled,\n  button:disabled,\n  [type=button]:disabled,\n  [type=submit]:disabled,\n  [type=reset]:disabled,\n  [type=image]:disabled {\n    background-color: #c9c9c9;\n    pointer-events: none; }\n    .usa-button:disabled:hover, .usa-button:disabled.usa-button-hover, .usa-button:disabled:active, .usa-button:disabled.usa-button-active, .usa-button:disabled:focus, .usa-button:disabled.usa-focus,\n    .usa-button-primary:disabled:hover,\n    .usa-button-primary:disabled.usa-button-hover,\n    .usa-button-primary:disabled:active,\n    .usa-button-primary:disabled.usa-button-active,\n    .usa-button-primary:disabled:focus,\n    .usa-button-primary:disabled.usa-focus,\n    .usa-button:visited:disabled:hover,\n    .usa-button:visited:disabled.usa-button-hover,\n    .usa-button:visited:disabled:active,\n    .usa-button:visited:disabled.usa-button-active,\n    .usa-button:visited:disabled:focus,\n    .usa-button:visited:disabled.usa-focus,\n    .usa-button-primary:visited:disabled:hover,\n    .usa-button-primary:visited:disabled.usa-button-hover,\n    .usa-button-primary:visited:disabled:active,\n    .usa-button-primary:visited:disabled.usa-button-active,\n    .usa-button-primary:visited:disabled:focus,\n    .usa-button-primary:visited:disabled.usa-focus,\n    button:disabled:hover,\n    button:disabled.usa-button-hover,\n    button:disabled:active,\n    button:disabled.usa-button-active,\n    button:disabled:focus,\n    button:disabled.usa-focus,\n    [type=button]:disabled:hover,\n    [type=button]:disabled.usa-button-hover,\n    [type=button]:disabled:active,\n    [type=button]:disabled.usa-button-active,\n    [type=button]:disabled:focus,\n    [type=button]:disabled.usa-focus,\n    [type=submit]:disabled:hover,\n    [type=submit]:disabled.usa-button-hover,\n    [type=submit]:disabled:active,\n    [type=submit]:disabled.usa-button-active,\n    [type=submit]:disabled:focus,\n    [type=submit]:disabled.usa-focus,\n    [type=reset]:disabled:hover,\n    [type=reset]:disabled.usa-button-hover,\n    [type=reset]:disabled:active,\n    [type=reset]:disabled.usa-button-active,\n    [type=reset]:disabled:focus,\n    [type=reset]:disabled.usa-focus,\n    [type=image]:disabled:hover,\n    [type=image]:disabled.usa-button-hover,\n    [type=image]:disabled:active,\n    [type=image]:disabled.usa-button-active,\n    [type=image]:disabled:focus,\n    [type=image]:disabled.usa-focus {\n      background-color: #c9c9c9;\n      border: 0;\n      box-shadow: none; }\n\n/* stylelint-disable */\n.usa-button-disabled {\n  background-color: #c9c9c9;\n  pointer-events: none; }\n  .usa-button-disabled:hover, .usa-button-disabled.usa-button-hover, .usa-button-disabled:active, .usa-button-disabled.usa-button-active, .usa-button-disabled:focus, .usa-button-disabled.usa-focus {\n    background-color: #c9c9c9;\n    border: 0;\n    box-shadow: none; }\n\n.usa-button-secondary-disabled,\n.usa-button-secondary-inverse-disabled,\n.usa-button-secondary:disabled,\n.usa-button-secondary-inverse:disabled,\n.usa-button-outline-inverse:disabled {\n  box-shadow: inset 0 0 0 2px #c9c9c9;\n  pointer-events: none;\n  color: #c9c9c9; }\n  .usa-button-secondary-disabled:hover, .usa-button-secondary-disabled.usa-button-hover, .usa-button-secondary-disabled:active, .usa-button-secondary-disabled.usa-button-active, .usa-button-secondary-disabled:focus, .usa-button-secondary-disabled.usa-focus,\n  .usa-button-secondary-inverse-disabled:hover,\n  .usa-button-secondary-inverse-disabled.usa-button-hover,\n  .usa-button-secondary-inverse-disabled:active,\n  .usa-button-secondary-inverse-disabled.usa-button-active,\n  .usa-button-secondary-inverse-disabled:focus,\n  .usa-button-secondary-inverse-disabled.usa-focus,\n  .usa-button-secondary:disabled:hover,\n  .usa-button-secondary:disabled.usa-button-hover,\n  .usa-button-secondary:disabled:active,\n  .usa-button-secondary:disabled.usa-button-active,\n  .usa-button-secondary:disabled:focus,\n  .usa-button-secondary:disabled.usa-focus,\n  .usa-button-secondary-inverse:disabled:hover,\n  .usa-button-secondary-inverse:disabled.usa-button-hover,\n  .usa-button-secondary-inverse:disabled:active,\n  .usa-button-secondary-inverse:disabled.usa-button-active,\n  .usa-button-secondary-inverse:disabled:focus,\n  .usa-button-secondary-inverse:disabled.usa-focus,\n  .usa-button-outline-inverse:disabled:hover,\n  .usa-button-outline-inverse:disabled.usa-button-hover,\n  .usa-button-outline-inverse:disabled:active,\n  .usa-button-outline-inverse:disabled.usa-button-active,\n  .usa-button-outline-inverse:disabled:focus,\n  .usa-button-outline-inverse:disabled.usa-focus {\n    background-color: #ffffff;\n    border: 0; }\n\nhtml .usa-button-secondary-disabled,\n.usa-button-secondary:disabled {\n  background-color: #ffffff; }\n\nhtml .usa-button-secondary-inverse-disabled,\n.usa-button-secondary-inverse:disabled {\n  background-color: transparent;\n  color: #666666;\n  box-shadow: inset 0 0 0 2px #666666; }\n\n.usa-button-unstyled {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto; }\n  .usa-button-unstyled:hover {\n    background-color: transparent; }\n\n.usa-embed-container iframe,\n.usa-embed-container object,\n.usa-embed-container embed {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 100%;\n  height: 100%; }\n\n.usa-embed-container {\n  padding-bottom: 56.25%;\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  max-width: 100%; }\n\nimg {\n  max-width: 100%; }\n\n.media_link {\n  display: inline-block;\n  line-height: 0; }\n\n/* stylelint-disable selector-no-qualifying-type */\ninput,\ntextarea,\nselect {\n  appearance: none;\n  border: 0.1rem solid #666666;\n  border-radius: 0;\n  box-sizing: border-box;\n  color: #212121;\n  display: block;\n  font-size: 1.7rem;\n  height: 4.4rem;\n  line-height: 1.3;\n  margin: 0.2em 0;\n  max-width: 46rem;\n  padding: 1rem 0.7em;\n  width: 100%; }\n  input.usa-input-success,\n  textarea.usa-input-success,\n  select.usa-input-success {\n    border: 3px solid #4aa564; }\n\n/* stylelint-enable */\n.usa-input-error {\n  border-left: 4px solid #981b1e;\n  margin-top: 3rem;\n  padding-bottom: 0.8rem;\n  padding-left: 1.5rem;\n  padding-top: 0.8rem;\n  position: relative;\n  right: 1.9rem; }\n  .usa-input-error input,\n  .usa-input-error textarea,\n  .usa-input-error select {\n    border: 3px solid #981b1e;\n    width: calc(100% + 1.9rem); }\n  .usa-input-error label {\n    margin-top: 0; }\n  .usa-input-error .usa-input-inline {\n    border: 0.1rem solid #666666;\n    width: inherit; }\n  .usa-input-error .usa-input-inline-error {\n    border: 3px solid #981b1e; }\n\n.usa-input-error-label {\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700; }\n\n.usa-input-error-message {\n  color: #981b1e;\n  display: block;\n  font-size: 1.7rem;\n  font-weight: 700;\n  padding-bottom: 3px;\n  padding-top: 3px; }\n\n.usa-input-required:after {\n  color: #cd2026;\n  content: ' (*required)'; }\n\n.usa-input-optional:after {\n  color: #757575;\n  content: ' (optional)'; }\n\nlabel {\n  display: block;\n  margin-top: 3rem;\n  max-width: 46rem; }\n\ntextarea {\n  height: 16rem; }\n\nselect {\n  -moz-appearance: none;\n  -webkit-appearance: none;\n  appearance: none;\n  background-color: #ffffff;\n  background-image: url(\"../img/arrow-both.png\");\n  background-image: url(\"../img/arrow-both.svg\");\n  background-position: right 1.3rem center;\n  background-repeat: no-repeat;\n  background-size: 1rem;\n  padding-right: 3rem; }\n  select::-ms-expand {\n    display: none; }\n  select:-webkit-autofill {\n    appearance: menulist; }\n  select:-moz-focusring {\n    color: transparent;\n    text-shadow: 0 0 0 #000000; }\n\noption:first-child {\n  font-weight: 700; }\n\nlegend {\n  font-size: 3rem;\n  font-weight: 700; }\n\n.usa-fieldset-inputs label {\n  margin-top: 0; }\n\n.usa-form-hint {\n  color: #757575;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0; }\n\n[type=checkbox],\n[type=radio] {\n  position: absolute;\n  left: -999em; }\n  .lt-ie9 [type=checkbox], .lt-ie9\n  [type=radio] {\n    border: 0;\n    float: left;\n    margin: 0.4em 0.4em 0 0;\n    position: static;\n    width: auto; }\n\n[type=checkbox] + label,\n[type=radio] + label {\n  cursor: pointer;\n  font-weight: 400;\n  margin-bottom: 0.65em; }\n\n[type=checkbox] + label::before,\n[type=radio] + label::before {\n  background: #ffffff;\n  border-radius: 2px;\n  box-shadow: 0 0 0 1px #757575;\n  content: '\\a0';\n  display: inline-block;\n  height: 2rem;\n  line-height: 2rem;\n  margin-right: 0.6em;\n  text-indent: 0.15em;\n  vertical-align: middle\\0;\n  width: 2rem; }\n\n[type=radio] + label::before {\n  border-radius: 100%;\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 3px #757575;\n  height: 1.4rem;\n  line-height: 1.4rem;\n  margin-right: 0.75em;\n  width: 1.4rem; }\n\n[type=checkbox]:checked + label::before,\n[type=radio]:checked + label::before {\n  background-color: #0071BC;\n  box-shadow: 0 0 0 1px #0071BC; }\n\n[type=radio]:checked + label::before {\n  box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px #0071BC; }\n\n[type=checkbox]:checked + label::before,\n[type=checkbox]:checked:disabled + label::before {\n  background-image: url(\"../img/correct8.png\");\n  background-image: url(\"../img/correct8.svg\");\n  background-position: 50%;\n  background-repeat: no-repeat; }\n\n[type=radio]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 6px; }\n\n[type=checkbox]:disabled + label {\n  color: #c9c9c9; }\n\n[type=checkbox]:focus + label::before {\n  outline: 2px dotted #999999;\n  outline-offset: 3px; }\n\n[type=checkbox]:disabled + label::before,\n[type=radio]:disabled + label::before {\n  background: #e4e4e4;\n  box-shadow: 0 0 0 1px #999999;\n  cursor: not-allowed; }\n\n[type=range] {\n  -webkit-appearance: none;\n  border: none;\n  padding-left: 0;\n  width: 100%; }\n\n[type=range]::-webkit-slider-runnable-track {\n  background: #999999;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-moz-range-track {\n  background: #0071BC;\n  border: 1px solid #757575;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-ms-track {\n  background: transparent;\n  color: transparent;\n  cursor: pointer;\n  height: 1.2rem;\n  width: 100%; }\n\n[type=range]::-webkit-slider-thumb {\n  -webkit-appearance: none;\n  border: 1px solid #757575;\n  height: 2.2rem;\n  border-radius: 1.5rem;\n  background: #e4e4e4;\n  cursor: pointer;\n  margin-top: -.65rem;\n  width: 2.2rem; }\n\n[type=range]::-moz-range-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-thumb {\n  background: #e4e4e4;\n  border: 1px solid #757575;\n  border-radius: 1.5rem;\n  cursor: pointer;\n  height: 2.2rem;\n  width: 2.2rem; }\n\n[type=range]::-ms-fill-lower {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n[type=range]::-ms-fill-upper {\n  background: #999999;\n  border: 1px solid #757575;\n  border-radius: 2rem; }\n\n.usa-date-of-birth label {\n  margin-top: 0; }\n\n.usa-date-of-birth [type=number]::-webkit-inner-spin-button,\n.usa-date-of-birth [type=number]::-webkit-outer-spin-button {\n  -webkit-appearance: none;\n  appearance: none;\n  margin: 0; }\n\n.usa-date-of-birth [type=number] {\n  -moz-appearance: textfield; }\n\n.usa-form-group-day,\n.usa-form-group-month,\n.usa-form-group-year {\n  clear: none;\n  float: left;\n  margin-right: 1.5rem;\n  width: 5rem; }\n\n.usa-form-group-year {\n  width: 7rem; }\n\n.usa-label, .usa-label-big {\n  background-color: #666666;\n  border-radius: 2px;\n  color: #ffffff;\n  font-size: 1.5rem;\n  margin-right: 0.5rem;\n  padding: 0.1rem 0.7rem;\n  text-transform: uppercase; }\n  .usa-label:only-of-type, .usa-label-big:only-of-type {\n    margin-right: 0; }\n\n.usa-label-big {\n  font-size: 1.7rem;\n  padding-left: 0.9rem;\n  padding-right: 0.9rem; }\n\nul,\nol {\n  margin-top: 1em;\n  margin-bottom: 1em;\n  padding-left: 1.94em; }\n\nli {\n  line-height: 1.5;\n  margin-bottom: 0.5em; }\n  li:last-child {\n    margin-bottom: 0; }\n\nh1 + ul,\nh1 + ol,\nh2 + ul,\nh2 + ol,\nh3 + ul,\nh3 + ol,\nh4 + ul,\nh4 + ol,\nh5 + ul,\nh5 + ol,\nh6 + ul,\nh6 + ol,\np + ul,\np + ol {\n  margin-top: 0; }\n\n.usa-unstyled-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-unstyled-list > li {\n    margin-bottom: 0; }\n\ntable {\n  border-spacing: 0;\n  margin: 2em 0; }\n\nthead th {\n  font-weight: 700; }\n\nthead th,\nthead td {\n  background-color: #e4e4e4; }\n\nth {\n  text-align: left; }\n\nth,\ntd {\n  background-color: #ffffff;\n  border: 1px solid #666666;\n  font-weight: 400;\n  padding: 1rem 1.5rem; }\n\n.usa-table-borderless thead th {\n  background-color: transparent;\n  border-top: 0; }\n\n.usa-table-borderless th,\n.usa-table-borderless td {\n  border-left: 0;\n  border-right: 0; }\n\n.usa-table-borderless th:first-child {\n  padding-left: 0; }\n\ncaption {\n  font-size: 1.5rem;\n  font-weight: 700;\n  font-family: \"Work Sans\", sans-serif;\n  margin-bottom: 1.2rem;\n  text-align: left; }\n\nhtml {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 10px; }\n\nbody {\n  font-size: 1.7rem; }\n\np {\n  line-height: 1.5;\n  margin-bottom: 1em;\n  margin-top: 1em; }\n\na {\n  color: #0071BC;\n  text-decoration: underline; }\n  a:hover, a:active {\n    color: #205493; }\n  a:focus {\n    outline: 2px dotted #999999;\n    outline-offset: 3px; }\n  a:visited {\n    color: #4c2c92; }\n\n.usa-external_link::after {\n  background: url(\"../img/external-link.png\") no-repeat 0 0;\n  background: url(\"../img/external-link.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link:hover::after {\n  background-image: url(\"../img/external-link-hover.png\");\n  background-image: url(\"../img/external-link-hover.svg\"); }\n\n.usa-external_link-alt::after {\n  background: url(\"../img/external-link-alt.png\") no-repeat 0 0;\n  background: url(\"../img/external-link-alt.svg\") no-repeat 0 0;\n  background-size: 100%;\n  content: '';\n  display: inline-block;\n  height: 0.65em;\n  margin-bottom: -1px;\n  margin-left: 4px;\n  width: 0.65em; }\n\n.usa-external_link-alt:hover::after {\n  background-image: url(\"../img/external-link-alt-hover.png\");\n  background-image: url(\"../img/external-link-alt-hover.svg\"); }\n\nh1,\nh2,\nh3,\nh4,\nh5 {\n  clear: both;\n  font-family: \"Work Sans\", sans-serif;\n  line-height: 1.3;\n  margin-bottom: .5em;\n  margin-top: 1.5em; }\n\nh6 {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\nh1 {\n  font-size: 4rem;\n  font-weight: 700; }\n\nh2 {\n  font-size: 3rem;\n  font-weight: 700; }\n\nh3 {\n  font-size: 2rem;\n  font-weight: 700; }\n\nh4 {\n  font-size: 1.7rem;\n  font-weight: 700; }\n\nh5 {\n  font-size: 1.5rem;\n  font-weight: 700; }\n\nh6 {\n  font-size: 1.3rem;\n  font-weight: 400;\n  line-height: 1.5;\n  text-transform: uppercase; }\n\ncite,\nvar,\naddress,\ndfn {\n  font-style: normal; }\n\n.usa-content p,\n.usa-content ul:not(.usa-accordion):not(.usa-accordion-bordered),\n.usa-content ol:not(.usa-accordion):not(.usa-accordion-bordered) {\n  max-width: 66ch; }\n\n.usa-content-list {\n  max-width: 66ch; }\n\n.usa-sans p,\n.usa-sans a,\n.usa-sans li,\n.usa-sans span {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif; }\n\n.usa-sans a {\n  border-bottom: none;\n  font-weight: 700; }\n\n.usa-serif p,\n.usa-serif a,\n.usa-serif li,\n.usa-serif span {\n  font-family: \"Work Sans\", sans-serif; }\n\n.usa-display {\n  font-size: 2rem;\n  font-weight: 700;\n  margin-bottom: 0; }\n  @media screen and (min-width: 481px) {\n    .usa-display {\n      font-size: 4rem;\n      font-weight: 700; } }\n  @media screen and (min-width: 600px) {\n    .usa-display {\n      font-size: 5.2rem;\n      font-weight: 700; } }\n\n.usa-font-lead {\n  font-family: \"Work Sans\", sans-serif;\n  font-size: 2rem;\n  font-weight: 400;\n  line-height: 1.7;\n  max-width: 77rem; }\n\n.usa-image-block {\n  position: relative; }\n\n.usa-image-text-block {\n  color: #ffffff;\n  left: 0;\n  margin-left: 8%;\n  position: absolute;\n  top: 0; }\n\n.usa-image-text {\n  margin-top: 0; }\n\n.usa-drop_text {\n  margin-bottom: 0; }\n\n.usa-background-dark {\n  background-color: #333333; }\n  .usa-background-dark p,\n  .usa-background-dark span {\n    color: #ffffff; }\n  .usa-background-dark a {\n    color: #c9c9c9; }\n    .usa-background-dark a:hover {\n      color: #ffffff; }\n\n.usa-text-small {\n  font-size: 1.3rem;\n  margin-top: 0; }\n\n.usa-section > :first-child,\n.usa-grid > :first-child,\n.usa-grid-full > :first-child {\n  margin-top: 0; }\n\n.usa-section > :last-child,\n.usa-grid > :last-child,\n.usa-grid-full > :last-child {\n  margin-bottom: 0; }\n\n.usa-width-one-whole:first-child > :first-child,\n.usa-width-one-half:first-child > :first-child,\n.usa-width-one-third:first-child > :first-child,\n.usa-width-two-thirds:first-child > :first-child,\n.usa-width-one-fourth:first-child > :first-child,\n.usa-width-three-fourths:first-child > :first-child,\n.usa-width-one-sixth:first-child > :first-child,\n.usa-width-five-sixths:first-child > :first-child,\n.usa-width-one-twelfth:first-child > :first-child {\n  margin-top: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :first-child,\n  .usa-width-one-half > :first-child,\n  .usa-width-one-third > :first-child,\n  .usa-width-two-thirds > :first-child,\n  .usa-width-one-fourth > :first-child,\n  .usa-width-three-fourths > :first-child,\n  .usa-width-one-sixth > :first-child,\n  .usa-width-five-sixths > :first-child,\n  .usa-width-one-twelfth > :first-child {\n    margin-top: 0; } }\n\n.usa-width-one-whole:last-child > :last-child,\n.usa-width-one-half:last-child > :last-child,\n.usa-width-one-third:last-child > :last-child,\n.usa-width-two-thirds:last-child > :last-child,\n.usa-width-one-fourth:last-child > :last-child,\n.usa-width-three-fourths:last-child > :last-child,\n.usa-width-one-sixth:last-child > :last-child,\n.usa-width-five-sixths:last-child > :last-child,\n.usa-width-one-twelfth:last-child > :last-child {\n  margin-bottom: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-width-one-whole > :last-child,\n  .usa-width-one-half > :last-child,\n  .usa-width-one-third > :last-child,\n  .usa-width-two-thirds > :last-child,\n  .usa-width-one-fourth > :last-child,\n  .usa-width-three-fourths > :last-child,\n  .usa-width-one-sixth > :last-child,\n  .usa-width-five-sixths > :last-child,\n  .usa-width-one-twelfth > :last-child {\n    margin-bottom: 0; } }\n\n.usa-accordion,\n.usa-accordion-bordered {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  color: #212121;\n  margin: 0;\n  padding: 0;\n  width: 100%; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    margin-bottom: 0; }\n  .usa-accordion > ul li ul,\n  .usa-accordion-bordered > ul li ul {\n    list-style: disc; }\n    .usa-accordion > ul li ul > li > ul,\n    .usa-accordion-bordered > ul li ul > li > ul {\n      list-style: circle; }\n      .usa-accordion > ul li ul > li > ul > li > ul,\n      .usa-accordion-bordered > ul li ul > li > ul > li > ul {\n        list-style: square; }\n  .usa-accordion + .usa-accordion,\n  .usa-accordion + .usa-accordion-bordered,\n  .usa-accordion-bordered + .usa-accordion,\n  .usa-accordion-bordered + .usa-accordion-bordered {\n    margin-top: 1rem; }\n  .usa-accordion > ul,\n  .usa-accordion-bordered > ul {\n    margin-top: 0;\n    margin-bottom: 0;\n    list-style-type: none;\n    padding-left: 0;\n    color: #212121;\n    margin: 0;\n    padding: 0;\n    width: 100%; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      margin-bottom: 0; }\n    .usa-accordion > ul > li,\n    .usa-accordion-bordered > ul > li {\n      background-color: #e4e4e4;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      list-style: none;\n      margin-bottom: 0.5rem;\n      width: 100%; }\n    .usa-accordion > ul button,\n    .usa-accordion-bordered > ul button {\n      background-color: transparent;\n      border: 0;\n      border-radius: 0;\n      font-weight: 400;\n      margin: 0;\n      padding: 0;\n      text-align: left;\n      -webkit-font-smoothing: auto;\n      background-color: #e4e4e4;\n      background-image: url(\"../img/minus.png\");\n      background-image: url(\"../img/minus.svg\");\n      background-position: right 2rem center;\n      background-repeat: no-repeat;\n      background-size: 1.5rem;\n      color: #212121;\n      cursor: pointer;\n      display: inline-block;\n      font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n      font-weight: 700;\n      margin: 0;\n      padding: 1.5rem 5.5rem 1.5rem 2rem;\n      width: 100%; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: transparent; }\n      .usa-accordion > ul button:hover,\n      .usa-accordion-bordered > ul button:hover {\n        background-color: #c9c9c9;\n        color: #212121; }\n      .usa-accordion > ul button h1,\n      .usa-accordion > ul button h2,\n      .usa-accordion > ul button h3,\n      .usa-accordion > ul button h4,\n      .usa-accordion > ul button h5,\n      .usa-accordion > ul button h6,\n      .usa-accordion-bordered > ul button h1,\n      .usa-accordion-bordered > ul button h2,\n      .usa-accordion-bordered > ul button h3,\n      .usa-accordion-bordered > ul button h4,\n      .usa-accordion-bordered > ul button h5,\n      .usa-accordion-bordered > ul button h6 {\n        margin: 0; }\n    .usa-accordion > ul [aria-expanded=false],\n    .usa-accordion-bordered > ul [aria-expanded=false] {\n      background-image: url(\"../img/plus.png\");\n      background-image: url(\"../img/plus.svg\");\n      background-repeat: no-repeat;\n      background-size: 1.5rem; }\n  .usa-accordion > li,\n  .usa-accordion-bordered > li {\n    background-color: #e4e4e4;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    list-style: none;\n    margin-bottom: 0.5rem;\n    width: 100%; }\n\n.usa-accordion-bordered .usa-accordion-content {\n  border-bottom: 3px solid #e4e4e4;\n  border-left: 3px solid #e4e4e4;\n  border-right: 3px solid #e4e4e4; }\n\n.usa-accordion-content {\n  background-color: #ffffff;\n  overflow: auto;\n  padding: 1.5rem 2rem; }\n  .usa-accordion-content > *:first-child {\n    margin-top: 0; }\n  .usa-accordion-content > *:last-child {\n    margin-bottom: 0; }\n  .usa-accordion-content:not([aria-hidden]) {\n    position: absolute;\n    left: -999em; }\n  .usa-accordion-content[aria-hidden=true] {\n    display: none; }\n\n.usa-accordion-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #e4e4e4;\n  background-image: url(\"../img/minus.png\");\n  background-image: url(\"../img/minus.svg\");\n  background-position: right 2rem center;\n  background-repeat: no-repeat;\n  background-size: 1.5rem;\n  color: #212121;\n  cursor: pointer;\n  display: inline-block;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-weight: 700;\n  margin: 0;\n  padding: 1.5rem 5.5rem 1.5rem 2rem;\n  width: 100%; }\n  .usa-accordion-button:hover {\n    background-color: transparent; }\n  .usa-accordion-button:hover {\n    background-color: #c9c9c9;\n    color: #212121; }\n  .usa-accordion-button h1,\n  .usa-accordion-button h2,\n  .usa-accordion-button h3,\n  .usa-accordion-button h4,\n  .usa-accordion-button h5,\n  .usa-accordion-button h6 {\n    margin: 0; }\n\n.usa-accordion-button[aria-expanded=false] {\n  background-image: url(\"../img/plus.png\");\n  background-image: url(\"../img/plus.svg\");\n  background-repeat: no-repeat;\n  background-size: 1.5rem; }\n\n.usa-alert {\n  background-color: #e4e4e4;\n  background-position: 2rem 2rem;\n  background-repeat: no-repeat;\n  background-size: 5.2rem;\n  padding-bottom: 1.4rem;\n  padding-left: 3rem;\n  padding-right: 2rem;\n  padding-top: 2rem;\n  position: relative; }\n  .usa-alert::before {\n    background-color: #7e7e7e;\n    content: '';\n    height: 100%;\n    left: 0;\n    position: absolute;\n    top: 0;\n    width: 1rem; }\n  .usa-alert a {\n    color: #205493; }\n    .usa-alert a:focus, .usa-alert a:hover {\n      color: #112E51; }\n  .usa-alert ul {\n    margin-bottom: 0;\n    margin-top: 1rem;\n    padding-left: 1rem; }\n\n.usa-alert-slim {\n  background-position: 2rem 1rem;\n  padding-bottom: 1rem;\n  padding-top: 1rem; }\n  .usa-alert-slim .usa-alert-text:only-child {\n    margin-bottom: 0.5rem;\n    padding-top: 0.5rem; }\n\n.usa-alert-icon {\n  display: table-cell;\n  padding-right: 1rem; }\n\n.usa-alert-body {\n  display: table-cell;\n  padding-left: 5rem;\n  vertical-align: top; }\n\n.usa-alert-heading {\n  margin-top: 0;\n  margin-bottom: 0; }\n\n.usa-alert-text {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  margin-bottom: 0;\n  margin-top: 0; }\n\n.usa-alert-text:only-child {\n  margin-bottom: 1rem;\n  padding-top: 0.5rem; }\n\n.usa-alert-success {\n  background-color: #e7f4e4;\n  background-image: url(\"../img/alerts/success.png\");\n  background-image: url(\"../img/alerts/success.svg\"); }\n  .usa-alert-success::before {\n    background-color: #2e8540; }\n\n.usa-alert-warning {\n  background-color: #fff1d2;\n  background-image: url(\"../img/alerts/warning.png\");\n  background-image: url(\"../img/alerts/warning.svg\"); }\n  .usa-alert-warning::before {\n    background-color: #fdb81e; }\n\n.usa-alert-error {\n  background-color: #f9dede;\n  background-image: url(\"../img/alerts/error.png\");\n  background-image: url(\"../img/alerts/error.svg\"); }\n  .usa-alert-error::before {\n    background-color: #005495; }\n\n.usa-alert-info {\n  background-color: #e1f3f8;\n  background-image: url(\"../img/alerts/info.png\");\n  background-image: url(\"../img/alerts/info.svg\"); }\n  .usa-alert-info::before {\n    background-color: #c64b00; }\n\n.usa-alert-no_icon {\n  background-image: none; }\n\n.usa-alert-paragraph {\n  width: 66ch; }\n\n.usa-alert {\n  margin-top: 1.5em; }\n\n.usa-banner {\n  background-color: #e4e4e4;\n  padding-bottom: 0.7rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner {\n      font-size: 1.3rem;\n      padding-bottom: 0; } }\n\n.usa-banner-content {\n  padding-right: 1.5rem;\n  padding-bottom: 3px;\n  padding-left: 1.5rem;\n  background-color: transparent;\n  font-size: 1.5rem;\n  padding-top: 2rem;\n  width: 100%; }\n  @media screen and (min-width: 600px) {\n    .usa-banner-content {\n      padding-bottom: 2.3rem;\n      padding-top: 4rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-banner-content {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n  .usa-banner-content p:first-child {\n    margin-top: 1rem; }\n    @media screen and (min-width: 600px) {\n      .usa-banner-content p:first-child {\n        margin-top: 0; } }\n\n.usa-banner-inner {\n  max-width: 1200px;\n  margin-left: auto;\n  margin-right: auto;\n  padding-right: 1.5rem;\n  padding-left: 1.5rem;\n  max-width: 1040px; }\n  .usa-banner-inner::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  @media screen and (min-width: 951px) {\n    .usa-banner-inner {\n      padding-right: 3rem;\n      padding-left: 3rem; } }\n\n.usa-banner-header {\n  padding-top: 0.55rem;\n  padding-bottom: 0.55rem;\n  font-size: 1.2rem;\n  font-weight: 400; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header {\n      padding-top: 0;\n      padding-bottom: 0; } }\n  .usa-banner-header p {\n    margin-top: 0;\n    margin-bottom: 0;\n    display: inline;\n    overflow: hidden;\n    vertical-align: middle; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header p {\n        margin-top: 2px;\n        margin-bottom: 2px;\n        display: inline-block; } }\n  .usa-banner-header img {\n    float: left;\n    margin-right: 1rem;\n    margin-top: 1px;\n    width: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header img {\n        margin-right: 0.7rem;\n        width: 2rem; } }\n\n.usa-banner-header-expanded {\n  align-items: center;\n  border-bottom: 1px solid #999999;\n  display: flex;\n  font-size: 1.5rem;\n  min-height: 5.6rem;\n  padding-right: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-header-expanded {\n      border-bottom: none;\n      display: block;\n      font-size: 1.2rem;\n      font-weight: 400;\n      min-height: 0;\n      padding-right: 0; } }\n  .usa-banner-header-expanded > .usa-banner-inner {\n    margin-left: 0; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded > .usa-banner-inner {\n        margin-left: auto; } }\n  .usa-banner-header-expanded img {\n    margin-right: 2.4rem; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded img {\n        margin-right: 0.7rem; } }\n  .usa-banner-header-expanded p {\n    line-height: 1.3;\n    vertical-align: top; }\n    @media screen and (min-width: 481px) {\n      .usa-banner-header-expanded p {\n        line-height: 1.5;\n        vertical-align: middle; } }\n\n.usa-banner-button {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  padding-top: 1.3rem;\n  padding-left: 4.8rem;\n  background-position-x: right;\n  color: #0071BC;\n  display: block;\n  font-size: 1.2rem;\n  height: 4.3rem;\n  left: 0;\n  position: absolute;\n  text-decoration: underline;\n  top: 0;\n  width: 100%; }\n  .usa-banner-button:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 481px) {\n    .usa-banner-button {\n      padding-top: 0;\n      padding-left: 0;\n      /* stylelint-disable declaration-block-no-ignored-properties */\n      display: inline;\n      height: initial;\n      margin-left: 3px;\n      position: relative;\n      vertical-align: middle;\n      width: initial;\n      /* stylelint-enable */ } }\n  .usa-banner-button:hover {\n    color: #205493;\n    text-decoration: underline; }\n  .usa-banner-button[aria-expanded=false] {\n    background-image: none; }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-image: url(\"../img/angle-arrow-down-primary.png\");\n      background-image: url(\"../img/angle-arrow-down-primary.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1rem;\n      width: 1rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    .usa-banner-button[aria-expanded=false]:hover::after {\n      background-image: url(\"../img/angle-arrow-down-primary-hover.png\");\n      background-image: url(\"../img/angle-arrow-down-primary-hover.svg\"); }\n    .usa-banner-button[aria-expanded=false]::after {\n      background-position-y: 1px; }\n  .usa-banner-button[aria-expanded=true] {\n    background-image: none;\n    height: 5.6rem; }\n    .usa-banner-button[aria-expanded=true]::after {\n      background-image: url(\"../img/close.png\");\n      background-image: url(\"../img/close.svg\");\n      background-size: 100%;\n      content: '';\n      display: inline-block;\n      height: 1.3rem;\n      width: 1.3rem;\n      /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n      margin-left: 0;\n      /* stylelint-enable */ }\n    @media screen and (min-width: 481px) {\n      .usa-banner-button[aria-expanded=true] {\n        height: initial;\n        padding: 0;\n        position: relative; }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-image: url(\"../img/angle-arrow-up-primary.png\");\n          background-image: url(\"../img/angle-arrow-up-primary.svg\");\n          background-size: 100%;\n          content: '';\n          display: inline-block;\n          height: 1rem;\n          width: 1rem;\n          /* stylelint-disable block-closing-brace-newline-after, at-rule-empty-line-before */\n          margin-left: 0;\n          /* stylelint-enable */ }\n        .usa-banner-button[aria-expanded=true]:hover::after {\n          background-image: url(\"../img/angle-arrow-up-primary-hover.png\");\n          background-image: url(\"../img/angle-arrow-up-primary-hover.svg\"); }\n        .usa-banner-button[aria-expanded=true]::after {\n          background-position-y: 1px; } }\n    .usa-banner-button[aria-expanded=true]::after {\n      position: absolute;\n      right: 1.5rem;\n      top: 2.15rem; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true]::after {\n          position: static; } }\n    .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n      display: none; }\n      @media screen and (min-width: 481px) {\n        .usa-banner-button[aria-expanded=true] .usa-banner-button-text {\n          display: inline; } }\n\n.usa-banner-icon {\n  width: 3.8rem; }\n\n.usa-footer .usa-unstyled-list {\n  display: block; }\n\n.usa-footer .usa-footer-primary-link {\n  color: #212121;\n  display: block;\n  font-weight: 700;\n  margin-top: 0;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: none; }\n  @media screen and (min-width: 600px) {\n    .usa-footer .usa-footer-primary-link {\n      border-top: none; } }\n  .usa-footer .usa-footer-primary-link:hover {\n    text-decoration: underline; }\n\n.usa-footer .usa-footer-primary-link ~ li a,\n.usa-footer .usa-footer-secondary-link {\n  text-decoration: none; }\n\n.usa-footer-contact_info {\n  display: inline-block; }\n  .usa-footer-contact_info a {\n    color: #212121;\n    text-decoration: none; }\n  .usa-footer-contact_info:hover {\n    text-decoration: underline; }\n\n.usa-footer-return-to-top {\n  color: #0071BC;\n  padding-bottom: 2rem;\n  padding-top: 2rem;\n  text-decoration: underline; }\n\n.usa-footer-primary-section {\n  background-color: #e4e4e4; }\n  .usa-footer-primary-section .usa-footer-primary-content {\n    padding-left: 1.5rem;\n    padding-right: 2.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-primary-section .usa-footer-primary-content {\n        padding-left: 0;\n        padding-right: 0; } }\n    .usa-footer-primary-section .usa-footer-primary-content li {\n      margin-left: 1rem; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-primary-section .usa-footer-primary-content li {\n          margin-left: 0; } }\n  @media screen and (min-width: 600px) {\n    .usa-footer-primary-section .usa-grid-full {\n      padding-left: 2.5rem;\n      padding-right: 2.5rem; } }\n\n.usa-footer-medium .usa-footer-contact_info p {\n  margin: 0 1rem 0 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact_info p {\n      margin: 0 0 0 1rem; } }\n\n.usa-footer-medium .usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-contact-heading {\n      margin-top: 0.5rem;\n      margin-bottom: 0.5rem; } }\n\n.usa-footer-medium .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-logo {\n      padding: 2rem 0; } }\n\n.usa-footer-medium .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-medium .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-medium .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-medium .usa-footer-primary-section .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-medium .usa-footer-nav ul {\n    align-items: center; } }\n\n.usa-footer-slim .usa-footer-nav a {\n  display: block; }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content {\n    margin-right: 5%;\n    width: inherit; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-nav .usa-footer-primary-content:last-child {\n    margin-right: 0; } }\n\n.usa-footer-slim .usa-footer-primary-link {\n  padding-bottom: 1.5rem;\n  padding-top: 1.5rem; }\n\n.usa-footer-slim .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-slim .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-primary-section {\n    padding-bottom: 0;\n    padding-top: 0; }\n    .usa-footer-slim .usa-footer-primary-section .usa-grid-full {\n      align-items: center; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info > * {\n    margin: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    padding-top: 1.5rem;\n    padding-bottom: 1.5rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    width: 100%; } }\n\n@media screen and (min-width: 1201px) {\n  .usa-footer-slim .usa-footer-contact_info {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 48.82117%; }\n    .usa-footer-slim .usa-footer-contact_info:last-child {\n      margin-right: 0; } }\n\n/* stylelint-disable selector-no-qualifying-type */\nul.usa-footer-primary-content,\nli.usa-footer-primary-content,\nli.usa-footer-primary-content {\n  border-top: 1px solid #999999; }\n  @media screen and (min-width: 600px) {\n    ul.usa-footer-primary-content,\n    li.usa-footer-primary-content,\n    li.usa-footer-primary-content {\n      border: none; } }\n  ul.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child,\n  li.usa-footer-primary-content:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      ul.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child,\n      li.usa-footer-primary-content:last-child {\n        border-bottom: none; } }\n\n/* stylelint-enable */\n.usa-sign_up-block {\n  padding-bottom: 4.5rem;\n  padding-left: 1.5rem;\n  padding-right: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-sign_up-block {\n      float: right;\n      padding: 0; } }\n  .usa-sign_up-block label:first-of-type {\n    margin-top: 0; }\n  .usa-sign_up-block button {\n    float: none;\n    margin-right: 0;\n    margin-top: 1.5rem; }\n  .usa-sign_up-block input {\n    width: 100%; }\n\n.usa-footer-secondary_section {\n  background-color: #c9c9c9;\n  padding-bottom: 2rem;\n  padding-top: 2rem; }\n  .usa-footer-secondary_section a {\n    color: #212121; }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big-secondary-section {\n    padding-top: 2rem;\n    padding-bottom: 2rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-contact-links {\n    text-align: right; } }\n\n.usa-social-links a {\n  text-decoration: none; }\n\n.usa-footer-big .usa-footer-contact_info {\n  display: block; }\n  .usa-footer-big .usa-footer-contact_info p {\n    margin: 0 1rem 0 0; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-contact_info p {\n        margin: 0.5rem 0 0 1rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-contact-links {\n    padding-top: 2rem; } }\n\n.usa-footer-big .usa-footer-logo {\n  padding: 1rem 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-logo {\n      padding: 2rem 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-footer-big .usa-footer-primary-section {\n    padding-bottom: 4rem;\n    padding-top: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section > .usa-grid {\n  padding: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big .usa-footer-primary-section > .usa-grid {\n      padding-left: 3rem;\n      padding-right: 3rem; } }\n\n.usa-footer-big .usa-footer-primary-section .usa-footer-primary-content {\n  padding-left: 0;\n  padding-right: 0; }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n    margin-left: 1.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content li {\n        margin-left: 0; } }\n  .usa-footer-big .usa-footer-primary-section .usa-footer-primary-content .usa-footer-primary-link {\n    margin-left: 0; }\n\n.usa-footer-big ul {\n  padding-bottom: 2.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big ul {\n      padding-bottom: 0; } }\n  .usa-footer-big ul:last-child {\n    border-bottom: 1px solid #999999; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul:last-child {\n        border-bottom: none; } }\n  .usa-footer-big ul li:not(.usa-footer-primary-link) {\n    line-height: 1.3;\n    padding-bottom: 0.35em;\n    padding-top: 0.35em; }\n  .usa-footer-big ul .usa-footer-primary-link {\n    background-image: url(\"../img/arrow-down.png\");\n    background-image: url(\"../img/arrow-down.svg\");\n    background-position: 1.5rem center;\n    background-repeat: no-repeat;\n    background-size: 1.3rem;\n    margin-left: 0;\n    padding-left: 3.5rem; }\n    @media screen and (min-width: 600px) {\n      .usa-footer-big ul .usa-footer-primary-link {\n        background: none;\n        margin-bottom: .8rem;\n        padding-bottom: 0;\n        padding-left: 0; } }\n    .usa-footer-big ul .usa-footer-primary-link > * {\n      margin-top: 0;\n      margin-bottom: 0; }\n  .usa-footer-big ul.hidden {\n    /* stylelint-disable-line selector-no-qualifying-type */\n    padding-bottom: 0; }\n    .usa-footer-big ul.hidden li {\n      display: none; }\n    .usa-footer-big ul.hidden .usa-footer-primary-link {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/arrow-right.png\");\n      background-image: url(\"../img/arrow-right.svg\");\n      cursor: pointer;\n      display: block; }\n      @media screen and (min-width: 600px) {\n        .usa-footer-big ul.hidden .usa-footer-primary-link {\n          background: none;\n          padding-left: 0; } }\n\n.usa-footer-topic {\n  margin: 0;\n  padding: 2rem 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-sign_up-header {\n    margin: 0;\n    padding: 2rem 0; } }\n\n.usa-footer-logo-img {\n  max-width: 8rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-img {\n      float: left; } }\n\n.usa-footer-big-logo-img {\n  max-width: 10rem; }\n\n.usa-footer-slim-logo-img {\n  float: left;\n  max-width: 5rem; }\n\n.usa-footer-logo-heading {\n  display: block;\n  margin-top: 1rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-logo-heading {\n      display: inline-block;\n      margin-top: 3rem;\n      padding-left: 1.5rem; } }\n\n.usa-footer-big-logo-heading {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-big-logo-heading {\n      margin-top: 2rem; } }\n\n.usa-footer-slim-logo-heading {\n  display: inline-block;\n  margin-top: 1.5rem;\n  padding-left: 1.5rem; }\n\n.usa-footer-contact-heading {\n  margin-top: 0; }\n  @media screen and (min-width: 600px) {\n    .usa-footer-contact-heading {\n      margin-top: 1rem; } }\n\n.usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n  margin: 2.5rem 1rem 1.5rem 0;\n  background-position: center center;\n  background-repeat: no-repeat;\n  background-size: auto 3rem;\n  display: inline-block;\n  height: 4.4rem;\n  left: -1.6rem;\n  position: relative;\n  text-align: center;\n  width: 4.4rem; }\n  @media screen and (min-width: 600px) {\n    .usa-social_link, .usa-link-facebook, .usa-link-twitter, .usa-link-youtube, .usa-link-rss {\n      margin: 0 0 0 0.5rem;\n      left: 1.5rem; } }\n  .usa-social_link span, .usa-link-facebook span, .usa-link-twitter span, .usa-link-youtube span, .usa-link-rss span {\n    position: absolute;\n    left: -999em; }\n\n.usa-link-facebook {\n  background-image: url(\"../img/social-icons/png/facebook25.png\");\n  background-image: url(\"../img/social-icons/svg/facebook25.svg\"); }\n\n.usa-link-twitter {\n  background-image: url(\"../img/social-icons/png/twitter16.png\");\n  background-image: url(\"../img/social-icons/svg/twitter16.svg\"); }\n\n.usa-link-youtube {\n  background-image: url(\"../img/social-icons/png/youtube15.png\");\n  background-image: url(\"../img/social-icons/svg/youtube15.svg\"); }\n\n.usa-link-rss {\n  background-image: url(\"../img/social-icons/png/rss25.png\");\n  background-image: url(\"../img/social-icons/svg/rss25.svg\"); }\n\nform a {\n  border-bottom: 0; }\n\nform [type=submit],\nform [type=submit] {\n  display: block;\n  margin-bottom: 1.5em;\n  margin-top: 2.5rem; }\n  @media screen and (min-width: 600px) {\n    form [type=submit],\n    form [type=submit] {\n      padding-left: 2.7em;\n      padding-right: 2.7em;\n      width: auto; } }\n\nform [name=password],\nform [name=confirmPassword] {\n  margin-bottom: 1.1rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-form {\n    max-width: 32rem; } }\n\n.usa-form-note {\n  float: right;\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-size: 1.5rem;\n  margin: 0 0 1.5rem; }\n  .usa-form-note + * {\n    clear: both; }\n\nfieldset {\n  border: none;\n  margin: 0;\n  padding: 0; }\n\n@media screen and (min-width: 600px) {\n  .usa-form-large {\n    max-width: 46rem; } }\n\ninput.usa-input-tiny {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-tiny {\n      max-width: 6rem; } }\n\ninput.usa-input-medium {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 600px) {\n    input.usa-input-medium {\n      max-width: 12rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid {\n    padding-right: 5%; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid:last-of-type {\n    padding-right: 0; } }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-small {\n    float: left;\n    width: 35%; } }\n\n.usa-input-grid-small input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-small select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-medium {\n    float: left;\n    width: 65%; } }\n\n.usa-input-grid-medium input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-medium select {\n  margin-bottom: 3rem; }\n\n@media screen and (min-width: 600px) {\n  .usa-input-grid-large {\n    float: left;\n    width: 100%; } }\n\n.usa-input-grid-large input {\n  margin-bottom: 3rem; }\n\n.usa-input-grid-large select {\n  margin-bottom: 3rem; }\n\n.usa-additional_text {\n  font-weight: normal; }\n\n.usa-checklist {\n  list-style: none;\n  margin-left: 0;\n  padding-left: 0; }\n  .usa-checklist li {\n    display: inline-block;\n    list-style: none;\n    margin-bottom: 0;\n    margin-top: 0;\n    padding-left: 3em;\n    text-indent: -2em; }\n    .usa-checklist li::before {\n      content: ' ';\n      display: inline-block;\n      height: .8em;\n      margin-right: .2em;\n      width: 1.8em; }\n\n.usa-checklist-checked::before {\n  background-image: url(\"../img/correct9.png\");\n  background-image: url(\"../img/correct9.svg\");\n  background-position: 100%;\n  background-repeat: no-repeat;\n  background-size: 100%; }\n\n.usa-graphic_list .usa-graphic_list-row .usa-media_block {\n  margin-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-graphic_list .usa-graphic_list-row .usa-media_block {\n      margin-bottom: 6rem; } }\n\n@media screen and (min-width: 600px) {\n  .usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block {\n    margin-bottom: 0; } }\n\n.usa-graphic_list .usa-graphic_list-row:last-child .usa-media_block:last-child {\n  margin-bottom: 0; }\n\n.usa-graphic_list .usa-media_block-img {\n  margin-right: 3rem; }\n\n.usa-graphic_list .usa-media_block-body > :first-child {\n  margin-top: 0; }\n\n.usa-header {\n  width: 100%;\n  z-index: 7000; }\n  @media screen and (min-width: 951px) {\n    .usa-header {\n      border-bottom: 1px solid #c9c9c9; } }\n  .usa-header a {\n    border-bottom: none; }\n  @media screen and (min-width: 951px) {\n    .usa-header .usa-search {\n      float: right;\n      max-width: 21.5rem; } }\n\n.usa-logo {\n  float: left;\n  line-height: 4rem;\n  margin-left: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-logo {\n      line-height: 7.5rem;\n      margin-left: 0; } }\n  .usa-logo a {\n    color: #212121;\n    text-decoration: none; }\n  .usa-logo br {\n    display: none; }\n    @media screen and (min-width: 951px) {\n      .usa-logo br {\n        display: block; } }\n\n.usa-logo-text {\n  display: block;\n  font-size: 1.5rem;\n  font-style: normal;\n  font-weight: 700;\n  margin: 0; }\n  @media screen and (min-width: 951px) {\n    .usa-logo-text {\n      display: block;\n      font-size: 2.4rem;\n      line-height: 1.3; } }\n\n.usa-menu-btn {\n  /* stylelint-disable declaration-block-no-ignored-properties */\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  background-color: #0071BC;\n  color: #ffffff;\n  display: inline;\n  float: right;\n  font-size: 1.3rem;\n  height: 4rem;\n  line-height: 4rem;\n  text-align: center;\n  text-decoration: none;\n  text-transform: uppercase;\n  width: 5.8rem;\n  /* stylelint-enable */ }\n  .usa-menu-btn:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-menu-btn {\n      display: none; } }\n  .usa-menu-btn:hover {\n    color: #ffffff;\n    background-color: #205493; }\n  .usa-menu-btn:visited {\n    color: #ffffff; }\n\n.usa-overlay {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  background: #000000;\n  opacity: 0;\n  transition: all 0.2s ease-in-out;\n  visibility: hidden;\n  z-index: 8000; }\n  .usa-overlay.is-visible {\n    opacity: 0.1;\n    visibility: visible; }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-logo {\n    bottom: 0;\n    position: absolute; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic .usa-navbar {\n    position: relative;\n    width: 18%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-header {\n    border-bottom: none; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-logo {\n    margin-top: 3rem;\n    margin-bottom: 3rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended em {\n    font-size: 3.2rem;\n    line-height: 1; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-navbar {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    display: block;\n    height: auto;\n    max-width: 1040px; }\n    .usa-header-extended .usa-navbar::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav {\n    border-top: 1px solid #c9c9c9;\n    float: none;\n    padding: 0;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-inner {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 1.5rem;\n    margin-top: -1px;\n    max-width: 1040px;\n    position: relative; }\n    .usa-header-extended .usa-nav-inner::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary::after {\n    clear: both;\n    content: \"\";\n    display: block; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=false], .usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-position: right 1.5rem top 53%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link {\n    padding-top: 1.8rem;\n    padding-bottom: 1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-submenu .usa-grid-full {\n    padding-left: 1.2rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-megamenu {\n    padding-left: 3rem; } }\n\n.usa-hero {\n  padding-top: 3rem;\n  padding-bottom: 3rem;\n  background-image: url(\"../img/hero.png\");\n  background-position: center;\n  background-size: cover; }\n  .usa-hero .usa-button {\n    color: #ffffff; }\n\n.usa-section-dark .usa-hero-link {\n  color: #c64b00; }\n\n.usa-hero-callout {\n  background-color: #112E51;\n  padding: 3rem; }\n  @media screen and (min-width: 481px) {\n    .usa-hero-callout {\n      max-width: 30rem; } }\n  .usa-hero-callout > *:first-child {\n    margin-top: 0;\n    margin-bottom: 2rem; }\n\n.usa-hero-callout-alt {\n  color: #ffffff;\n  display: block; }\n\n.usa-layout-docs {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs {\n      display: inherit; } }\n  .usa-layout-docs .usa-grid > :first-child:not(.usa-width-*) {\n    margin-top: 0; }\n  .usa-layout-docs .usa-grid > :last-child:not(.usa-width-*) {\n    margin-bottom: 0; }\n\n.usa-layout-docs-sidenav {\n  order: 2; }\n\n.usa-layout-docs-main_content {\n  margin-bottom: 3rem;\n  order: 1; }\n  @media screen and (min-width: 1201px) {\n    .usa-layout-docs-main_content {\n      margin-bottom: 0; } }\n  .usa-layout-docs-main_content > :first-child {\n    margin-top: 0; }\n\n.usa-media_block-img {\n  float: left;\n  margin-right: 1rem; }\n\n.usa-media_block-body {\n  overflow: hidden; }\n\n.usa-navbar {\n  border-bottom: 1px solid #999999;\n  height: 4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-navbar {\n      border-bottom: none;\n      display: inline-block;\n      height: 7.8rem; } }\n\n.usa-nav-link {\n  -moz-osx-font-smoothing: grayscale;\n  -webkit-font-smoothing: antialiased; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link:hover span {\n      border-bottom: 0.4rem solid #0071BC;\n      padding-bottom: 0.6rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-link.usa-accordion-button span {\n      margin-right: 0;\n      padding-right: 1.5rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-nav-container {\n    max-width: 1200px;\n    margin-left: auto;\n    margin-right: auto;\n    padding-right: 3rem;\n    padding-left: 3rem;\n    max-width: 1040px; }\n    .usa-nav-container::after {\n      clear: both;\n      content: \"\";\n      display: block; } }\n\n.usa-nav {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: auto;\n  background: #ffffff;\n  border-left: 1px solid #999999;\n  border-right: 0;\n  display: flex;\n  flex-direction: column;\n  overflow-y: auto;\n  padding: 2rem;\n  transform: translateX(26rem);\n  width: 26rem;\n  z-index: 9000; }\n  @media screen and (min-width: 951px) {\n    .usa-nav {\n      padding-top: 4.5rem;\n      padding-right: 0;\n      padding-bottom: 0;\n      border-left: none;\n      display: block;\n      float: right;\n      overflow-y: visible;\n      position: relative;\n      transform: translateX(0);\n      width: auto; } }\n  .usa-nav.is-visible {\n    transform: translateX(0);\n    transition: all 0.3s ease-in-out; }\n  .usa-nav nav {\n    margin-top: 6rem;\n    min-height: 100%; }\n    @media screen and (min-width: 951px) {\n      .usa-nav nav {\n        margin-top: 0; } }\n  .usa-nav .usa-current {\n    border-left: 4px solid #0071BC;\n    color: #0071BC;\n    font-weight: 700;\n    padding-left: 1.4rem; }\n    @media screen and (min-width: 951px) {\n      .usa-nav .usa-current {\n        color: #212121; } }\n  .usa-nav .usa-button {\n    width: 100%; }\n  @media screen and (min-width: 951px) {\n    .usa-nav .usa-search {\n      margin-left: 1.5rem;\n      top: 4px; } }\n\n.usa-nav-primary {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin-top: 1.5rem;\n  order: 2; }\n  .usa-nav-primary > li {\n    margin-bottom: 0; }\n  .usa-nav-primary > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-nav-primary > li:first-child {\n      border-top: none; }\n  .usa-nav-primary a {\n    border: none;\n    color: #212121;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-nav-primary a:hover {\n      background-color: #e4e4e4;\n      color: #0071BC;\n      text-decoration: none; }\n    .usa-nav-primary a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-nav-primary a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #0071BC;\n      color: #0071BC;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary {\n      display: inline; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary li {\n      border-top: none; } }\n  .usa-nav-primary > li {\n    width: auto; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li {\n        display: inline-block; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary > li > a:hover {\n        background-color: transparent; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a {\n      padding-top: 0.75rem;\n      padding-bottom: 0.75rem; } }\n  .usa-nav-primary button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    -moz-osx-font-smoothing: grayscale;\n    -webkit-font-smoothing: antialiased;\n    font-weight: 400;\n    line-height: 1.3;\n    padding: 0.85rem 1.5rem 0.85rem 1.8rem; }\n    .usa-nav-primary button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-primary button {\n        padding: 1.3rem 1.5rem 2.2rem;\n        color: #666666;\n        font-size: 1.5rem;\n        font-weight: 700;\n        line-height: 1;\n        width: initial; } }\n    .usa-nav-primary button:focus, .usa-nav-primary button:active {\n      box-shadow: 2px dotted #999999; }\n    .usa-nav-primary button:hover {\n      background-color: #e4e4e4;\n      color: #0071BC; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button:hover {\n          background-color: transparent; } }\n    .usa-nav-primary button[aria-expanded=false] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/plus-alt.png\");\n      background-image: url(\"../img/plus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false] {\n          background-image: url(\"../img/angle-arrow-down.png\");\n          background-image: url(\"../img/angle-arrow-down.svg\");\n          background-position: right 1.5rem top 40%; } }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=false]:hover {\n          background-image: url(\"../img/angle-arrow-down-primary.png\");\n          background-image: url(\"../img/angle-arrow-down-primary.svg\"); } }\n    .usa-nav-primary button[aria-expanded=true] {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      background-image: url(\"../img/minus-alt.png\");\n      background-image: url(\"../img/minus-alt.svg\");\n      background-repeat: no-repeat;\n      background-position: right 0 center;\n      background-size: 1rem; }\n      @media screen and (min-width: 951px) {\n        .usa-nav-primary button[aria-expanded=true] {\n          background-color: #112E51;\n          color: #ffffff;\n          background-image: url(\"../img/angle-arrow-down-hover.png\");\n          background-image: url(\"../img/angle-arrow-down-hover.svg\");\n          background-position: right 1.5rem top 40%; }\n          .usa-nav-primary button[aria-expanded=true]:hover {\n            background-color: #112E51; }\n          .usa-nav-primary button[aria-expanded=true] span {\n            border-bottom: 0.4rem solid #0071BC;\n            padding-bottom: 0.6rem;\n            color: #ffffff; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-primary a.usa-current,\n    .usa-nav-primary .usa-current {\n      border-left: 0;\n      padding-left: 1.5rem; }\n      .usa-nav-primary a.usa-current:hover span,\n      .usa-nav-primary .usa-current:hover span {\n        color: #0071BC; }\n      .usa-nav-primary a.usa-current span,\n      .usa-nav-primary .usa-current span {\n        border-bottom: 0.4rem solid #0071BC;\n        padding-bottom: 0.6rem;\n        color: #212121; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-link:hover span {\n    border-bottom: 0.7rem solid #0071BC;\n    padding-bottom: 0.9rem; } }\n\n.usa-header-extended .usa-nav-primary button[aria-expanded=true] {\n  /* stylelint-disable-line selector-no-qualifying-type */ }\n  @media screen and (min-width: 951px) {\n    .usa-header-extended .usa-nav-primary button[aria-expanded=true] span {\n      border-bottom: 0.7rem solid #0071BC;\n      padding-bottom: 0.9rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-extended .usa-nav-primary .usa-current span {\n    border-bottom: 0.7rem solid #0071BC;\n    padding-bottom: 0.9rem; } }\n\n.usa-nav-secondary {\n  margin-top: 1.5rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary {\n      margin-top: 0;\n      position: absolute;\n      right: 3rem;\n      top: -5.7rem; } }\n  .usa-nav-secondary .usa-search {\n    margin-top: 1.5rem;\n    margin-bottom: 0; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary .usa-search {\n        margin-top: -0.9rem;\n        margin-bottom: 0;\n        margin-left: 0;\n        float: left; } }\n\n.usa-nav-secondary-links {\n  margin-top: 2.4rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links {\n      float: left;\n      margin-top: 0; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li {\n      display: inline;\n      padding-left: 0.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links li:not(:last-child)::after {\n      color: #c9c9c9;\n      content: '|';\n      padding-left: 0.5rem; } }\n  .usa-nav-secondary-links a,\n  .usa-nav-secondary-links .usa-header-search-button {\n    color: #666666;\n    display: inline-block;\n    font-size: 1.5rem;\n    text-decoration: none; }\n    .usa-nav-secondary-links a:hover,\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      color: #0071BC;\n      text-decoration: underline; }\n  .usa-nav-secondary-links .usa-header-search-button {\n    background-color: transparent;\n    border: 0;\n    border-radius: 0;\n    font-weight: 400;\n    margin: 0;\n    padding: 0;\n    text-align: left;\n    -webkit-font-smoothing: auto;\n    display: none; }\n    .usa-nav-secondary-links .usa-header-search-button:hover {\n      background-color: transparent; }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button {\n        background-image: url(\"../img/search-alt.png\");\n        background-image: url(\"../img/search-alt.svg\");\n        background-repeat: no-repeat;\n        background-position: left center;\n        background-size: 2.2rem;\n        display: inline-block;\n        padding-left: 2.3rem; } }\n    @media screen and (min-width: 951px) {\n      .usa-nav-secondary-links .usa-header-search-button.is-hidden {\n        display: none; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-secondary-links a.usa-current {\n      border-left: 0;\n      padding-left: 0; } }\n\n.usa-nav-submenu {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-nav-submenu > li {\n    margin-bottom: 0; }\n  .usa-nav-submenu li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-nav-submenu a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-nav-submenu a:hover, .usa-nav-submenu a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-nav-submenu .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-nav-submenu .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu {\n      margin-top: 0;\n      margin-bottom: 0;\n      list-style-type: none;\n      padding-left: 0;\n      padding-top: 0.75rem;\n      padding-bottom: 0.9rem;\n      background-color: #112E51;\n      width: 21.5rem;\n      position: absolute; }\n      .usa-nav-submenu > li {\n        margin-bottom: 0; } }\n  .usa-nav-submenu[aria-hidden=true] {\n    display: none; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a {\n      color: #ffffff;\n      padding-left: 1.5rem; } }\n  @media screen and (min-width: 951px) {\n    .usa-nav-submenu a:hover {\n      background-color: #112E51;\n      color: #ffffff;\n      padding-left: 1.5rem;\n      text-decoration: underline; } }\n  .usa-nav-submenu li {\n    font-size: 1.5rem;\n    margin-bottom: 0; }\n\n.usa-nav-close {\n  background-color: transparent;\n  border: 0;\n  border-radius: 0;\n  font-weight: 400;\n  margin: 0;\n  padding: 0;\n  text-align: left;\n  -webkit-font-smoothing: auto;\n  margin: -1.2rem -1.5rem 1.5rem auto;\n  float: right;\n  height: 4.4rem;\n  text-align: center;\n  width: 4.4rem; }\n  .usa-nav-close:hover {\n    background-color: transparent; }\n  @media screen and (min-width: 951px) {\n    .usa-nav-close {\n      display: none; } }\n  .usa-nav-close img {\n    width: 1.3rem; }\n  .usa-nav-close + * {\n    clear: both; }\n\n.usa-mobile_nav-active {\n  overflow: hidden; }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu {\n    padding-top: 3.15rem;\n    padding-bottom: 3.15rem;\n    left: -1rem;\n    width: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::before {\n    background-color: #112E51;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    right: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu::after {\n    background-color: #112E51;\n    content: '';\n    display: block;\n    height: 100%;\n    position: absolute;\n    top: 0;\n    width: 1000%;\n    left: 100%; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav {\n    padding-left: 0;\n    padding-top: 0;\n    width: 100%; } }\n\n.usa-header-basic-megamenu .usa-nav-inner {\n  display: flex;\n  flex-direction: column; }\n  @media screen and (min-width: 951px) {\n    .usa-header-basic-megamenu .usa-nav-inner {\n      display: block;\n      float: right;\n      margin-top: -3.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-header-basic-megamenu .usa-nav-submenu .usa-grid-full {\n    margin-left: -1.8rem; } }\n\n@media screen and (min-width: 951px) {\n  .usa-megamenu-col {\n    float: left;\n    display: block;\n    margin-right: 2.35765%;\n    width: 23.23176%; }\n    .usa-megamenu-col:last-child {\n      margin-right: 0; }\n    .usa-megamenu-col:nth-child(2n) {\n      float: left;\n      display: block;\n      margin-right: 2.35765%;\n      width: 23.23176%; }\n      .usa-megamenu-col:nth-child(2n):last-child {\n        margin-right: 0; }\n    .usa-megamenu-col:nth-child(4n) {\n      margin-right: 0; } }\n\n.usa-megamenu-col > ul {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-megamenu-col > ul > li {\n    margin-bottom: 0; }\n\n.usa-search {\n  max-width: none;\n  position: relative; }\n  .usa-search::after {\n    clear: both;\n    content: \"\";\n    display: block; }\n  .usa-search [type=submit],\n  .usa-search .usa-search-submit {\n    background-image: url(\"../img/search.png\");\n    background-image: url(\"../img/search.svg\");\n    background-position: 50%;\n    background-repeat: no-repeat;\n    border-bottom-left-radius: 0;\n    border-top-left-radius: 0;\n    height: 3.3rem;\n    margin: 0;\n    padding: 0;\n    width: 4.5rem; }\n    @media screen and (min-width: 481px) {\n      .usa-search [type=submit],\n      .usa-search .usa-search-submit {\n        background-image: none;\n        width: 8.5rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-big [type=search],\n    .usa-search.usa-search-big .usa-search-input {\n      font-size: 1.7rem;\n      height: 4.4rem;\n      width: calc(100% - 11.6rem); }\n    .usa-search.usa-search-big [type=submit],\n    .usa-search.usa-search-big .usa-search-submit {\n      font-size: 2rem;\n      height: 4.4rem;\n      width: 11.6rem; } }\n  @media screen and (min-width: 481px) {\n    .usa-search.usa-search-small [type=search],\n    .usa-search.usa-search-small .usa-search-input {\n      width: calc(100% - 4.5rem); }\n    .usa-search.usa-search-small [type=submit],\n    .usa-search.usa-search-small .usa-search-submit {\n      background-image: url(\"../img/search.png\");\n      background-image: url(\"../img/search.svg\");\n      background-position: 50%;\n      background-repeat: no-repeat;\n      width: 4.5rem; } }\n  @media screen and (max-width: 950px) {\n    .usa-search.usa-search-small.usa-sr-only {\n      left: auto;\n      position: relative; } }\n\ninput[type=search] {\n  /* stylelint-disable-line selector-no-qualifying-type */\n  box-sizing: border-box;\n  -webkit-appearance: none; }\n\n[type=search],\n.usa-search-input {\n  padding-top: 0;\n  padding-bottom: 0;\n  border-bottom-right-radius: 0;\n  border-right: none;\n  border-top-right-radius: 0;\n  box-sizing: border-box;\n  float: left;\n  font-size: 1.4rem;\n  height: 3.3rem;\n  margin: 0;\n  width: calc(100% - 4.5rem); }\n  @media screen and (min-width: 481px) {\n    [type=search],\n    .usa-search-input {\n      width: calc(100% - 8.5rem); } }\n\n.usa-search-submit-text {\n  position: absolute;\n  left: -999em; }\n  @media screen and (min-width: 481px) {\n    .usa-search-submit-text {\n      position: static; } }\n\n.usa-section {\n  padding-top: 3rem;\n  padding-bottom: 3rem; }\n  @media screen and (min-width: 600px) {\n    .usa-section {\n      padding-top: 6rem;\n      padding-bottom: 6rem; } }\n\n.usa-section-light {\n  background-color: #e4e4e4; }\n\n.usa-section-dark {\n  background-color: #112E51;\n  color: #ffffff; }\n  .usa-section-dark h1,\n  .usa-section-dark h2,\n  .usa-section-dark h3,\n  .usa-section-dark h4,\n  .usa-section-dark h5,\n  .usa-section-dark h6 {\n    color: #c64b00; }\n  .usa-section-dark p {\n    color: #ffffff; }\n  .usa-section-dark a {\n    color: #c9c9c9; }\n    .usa-section-dark a:hover {\n      color: #ffffff; }\n\n.usa-sidenav-list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0; }\n  .usa-sidenav-list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-list > li {\n    background-color: transparent;\n    border-top: 1px solid #666666;\n    font-size: 1.7rem; }\n    .usa-sidenav-list > li:first-child {\n      border-top: none; }\n  .usa-sidenav-list a {\n    border: none;\n    color: #212121;\n    display: block;\n    font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n    line-height: 1.3;\n    padding: 0.85rem 1rem 0.85rem 1.8rem;\n    text-decoration: none; }\n    .usa-sidenav-list a:hover {\n      background-color: #e4e4e4;\n      color: #0071BC;\n      text-decoration: none; }\n    .usa-sidenav-list a:focus {\n      outline-offset: 0;\n      position: relative;\n      z-index: 1; }\n    .usa-sidenav-list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border-left: 0.4rem solid #0071BC;\n      color: #0071BC;\n      font-weight: 700;\n      padding-left: 1.4rem; }\n\n.usa-sidenav-sub_list {\n  margin-top: 0;\n  margin-bottom: 0;\n  list-style-type: none;\n  padding-left: 0;\n  margin: 0;\n  width: 100%; }\n  .usa-sidenav-sub_list > li {\n    margin-bottom: 0; }\n  .usa-sidenav-sub_list li {\n    border: none;\n    font-size: 1.5rem; }\n  .usa-sidenav-sub_list a {\n    padding-left: 2.8rem;\n    line-height: 1.3; }\n    .usa-sidenav-sub_list a:hover, .usa-sidenav-sub_list a.usa-current {\n      /* stylelint-disable-line selector-no-qualifying-type */\n      border: none;\n      padding-left: 2.8rem; }\n  .usa-sidenav-sub_list .usa-sidenav-sub_list a {\n    padding-left: 3.8rem; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:focus {\n      outline-offset: 0; }\n    .usa-sidenav-sub_list .usa-sidenav-sub_list a:hover {\n      padding-left: 3.8rem; }\n\n.usa-skipnav {\n  background: transparent;\n  color: #212121;\n  left: 0;\n  padding: 1rem 1.5rem;\n  position: absolute;\n  top: -4.2rem;\n  transition: all 0.2s ease-in-out;\n  z-index: 100; }\n  .usa-skipnav:focus {\n    background: #ffffff;\n    left: 0;\n    outline: 0;\n    position: absolute;\n    top: 0;\n    transition: all 0.2s ease-in-out; }\n\nh1, h2, h3, h4, h5, h6 {\n  font-family: \"Source Sans Pro\", \"Helvetica Neue\", \"Helvetica\", \"Roboto\", \"Arial\", sans-serif;\n  font-weight: bold; }\n\nh3.feed-item-title a,\narticle.aggregator-item .field--name-fid a {\n  text-decoration: none;\n  color: #0071BC; }\n\n.region-sidebar-first,\n.region-sidebar-second,\n.uswds-middle-section {\n  background-color: #E7F5FF; }\n\n.view-nsf-blog article.aggregator-item {\n  background-color: #ffffff;\n  padding: 2rem;\n  padding-top: 0.2rem;\n  margin-bottom: 3rem; }\n\n.region-sidebar-second {\n  float: right;\n  padding: 1.25rem; }\n  .region-sidebar-second h4 {\n    text-transform: uppercase;\n    color: #999999;\n    font-weight: normal; }\n\np,\ninput,\ntextarea,\n.usa-sidenav-list a,\n.usa-accordion,\n.usa-accordion-bordered,\nselect.form-select {\n  color: #666666; }\n\n.usa-nav-primary a.usa-nav-link,\n.usa-nav-primary .usa-nav-link,\n.usa-nav-primary a.usa-current span,\n.usa-nav-primary .usa-current span {\n  color: #3e94cf; }\n\n.filter-wrapper {\n  display: none; }\n\n.usa-form-large {\n  max-width: none; }\n\nform [type=\"submit\"], form [type=\"submit\"] {\n  display: inline-block; }\n\ntextarea {\n  height: auto; }\n\nlabel {\n  margin-top: 1rem; }\n\ninput, textarea, select {\n  max-width: none; }\n\n#block-nsf-views-block-news-block-1 ul {\n  margin: 0 auto;\n  text-align: center; }\n\n#block-nsf-views-block-news-block-1 li {\n  display: inline-block;\n  vertical-align: top; }\n\nimg.image-style-news-main-story {\n  max-width: none; }\n\n.usa-header-basic .usa-logo {\n  top: 0;\n  bottom: auto; }\n  .usa-header-basic .usa-logo img {\n    max-width: none; }\n\n.usa-navbar em.usa-logo-text {\n  margin-left: -5000em; }\n\n.region-footer-menu li.usa-footer-primary-link {\n  pointer-events: none; }\n"]}
\ No newline at end of file

From 430c208ebc5049684b661f5e0bb0e88b32c635e4 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 16 Aug 2018 11:57:19 -0700
Subject: [PATCH 142/143] Update composer.lock

...after the Drupal update in 73592dd0409cac7f65f44ca3cd4c0d087751d790.
---
 composer.lock | 992 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 690 insertions(+), 302 deletions(-)

diff --git a/composer.lock b/composer.lock
index 18303d5..809bcbf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2413b98f2cc7d345c4ae8f13f78b0753",
+    "content-hash": "9c274b6077552f4d4e0457fa53843d0e",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -124,16 +124,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.55.3",
+            "version": "3.64.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "28a1828814ce34d056492fa494f1e4bbaddaf33e"
+                "reference": "daff999e06bc5334e9bb90286514f1c2db0c4cbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/28a1828814ce34d056492fa494f1e4bbaddaf33e",
-                "reference": "28a1828814ce34d056492fa494f1e4bbaddaf33e",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/daff999e06bc5334e9bb90286514f1c2db0c4cbb",
+                "reference": "daff999e06bc5334e9bb90286514f1c2db0c4cbb",
                 "shasum": ""
             },
             "require": {
@@ -200,7 +200,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2018-04-26T21:09:13+00:00"
+            "time": "2018-08-15T23:03:41+00:00"
         },
         {
             "name": "brightcove/api",
@@ -317,16 +317,16 @@
         },
         {
             "name": "chi-teck/drupal-code-generator",
-            "version": "1.24.0",
+            "version": "1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Chi-teck/drupal-code-generator.git",
-                "reference": "20682ec4acc92e9671ba7b9bd0e972978c3a08f2"
+                "reference": "3090fabdbf3dd4b66e0fa0e4ed5d8adab6deb974"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/20682ec4acc92e9671ba7b9bd0e972978c3a08f2",
-                "reference": "20682ec4acc92e9671ba7b9bd0e972978c3a08f2",
+                "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/3090fabdbf3dd4b66e0fa0e4ed5d8adab6deb974",
+                "reference": "3090fabdbf3dd4b66e0fa0e4ed5d8adab6deb974",
                 "shasum": ""
             },
             "require": {
@@ -352,7 +352,7 @@
                 "GPL-2.0-or-later"
             ],
             "description": "Drupal code generator",
-            "time": "2018-04-25T17:35:50+00:00"
+            "time": "2018-08-06T08:54:16+00:00"
         },
         {
             "name": "composer/installers",
@@ -538,16 +538,16 @@
         },
         {
             "name": "consolidation/annotated-command",
-            "version": "2.8.3",
+            "version": "2.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "8f8f5da2ca06fbd3a85f7d551c49f844b7c59437"
+                "reference": "651541a0b68318a2a202bda558a676e5ad92223c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/8f8f5da2ca06fbd3a85f7d551c49f844b7c59437",
-                "reference": "8f8f5da2ca06fbd3a85f7d551c49f844b7c59437",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/651541a0b68318a2a202bda558a676e5ad92223c",
+                "reference": "651541a0b68318a2a202bda558a676e5ad92223c",
                 "shasum": ""
             },
             "require": {
@@ -559,9 +559,9 @@
                 "symfony/finder": "^2.5|^3|^4"
             },
             "require-dev": {
-                "greg-1-anderson/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "^4.8",
-                "satooshi/php-coveralls": "^1.0.2 | dev-master",
+                "g1a/composer-test-scenarios": "^2",
+                "phpunit/phpunit": "^6",
+                "satooshi/php-coveralls": "^2",
                 "squizlabs/php_codesniffer": "^2.7"
             },
             "type": "library",
@@ -586,20 +586,20 @@
                 }
             ],
             "description": "Initialize Symfony Console commands from annotated command class methods.",
-            "time": "2018-02-23T16:32:04+00:00"
+            "time": "2018-05-25T18:04:25+00:00"
         },
         {
             "name": "consolidation/config",
-            "version": "1.0.9",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/config.git",
-                "reference": "34ca8d7c1ee60a7b591b10617114cf1210a2e92c"
+                "reference": "c9fc25e9088a708637e18a256321addc0670e578"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/config/zipball/34ca8d7c1ee60a7b591b10617114cf1210a2e92c",
-                "reference": "34ca8d7c1ee60a7b591b10617114cf1210a2e92c",
+                "url": "https://api.github.com/repos/consolidation/config/zipball/c9fc25e9088a708637e18a256321addc0670e578",
+                "reference": "c9fc25e9088a708637e18a256321addc0670e578",
                 "shasum": ""
             },
             "require": {
@@ -608,8 +608,8 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "greg-1-anderson/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "^4",
+                "g1a/composer-test-scenarios": "^1",
+                "phpunit/phpunit": "^5",
                 "satooshi/php-coveralls": "^1.0",
                 "squizlabs/php_codesniffer": "2.*",
                 "symfony/console": "^2.5|^3|^4",
@@ -640,20 +640,20 @@
                 }
             ],
             "description": "Provide configuration services for a commandline tool.",
-            "time": "2017-12-22T17:28:19+00:00"
+            "time": "2018-08-07T22:57:00+00:00"
         },
         {
             "name": "consolidation/log",
-            "version": "1.0.5",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/log.git",
-                "reference": "dbc7c535f319a4a2d5a5077738f8eb7c10df8821"
+                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/log/zipball/dbc7c535f319a4a2d5a5077738f8eb7c10df8821",
-                "reference": "dbc7c535f319a4a2d5a5077738f8eb7c10df8821",
+                "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395",
+                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395",
                 "shasum": ""
             },
             "require": {
@@ -662,8 +662,9 @@
                 "symfony/console": "^2.8|^3|^4"
             },
             "require-dev": {
+                "g1a/composer-test-scenarios": "^1",
                 "phpunit/phpunit": "4.*",
-                "satooshi/php-coveralls": "dev-master",
+                "satooshi/php-coveralls": "^2",
                 "squizlabs/php_codesniffer": "2.*"
             },
             "type": "library",
@@ -688,20 +689,20 @@
                 }
             ],
             "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
-            "time": "2017-11-29T01:44:16+00:00"
+            "time": "2018-05-25T18:14:39+00:00"
         },
         {
             "name": "consolidation/output-formatters",
-            "version": "3.2.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/output-formatters.git",
-                "reference": "da889e4bce19f145ca4ec5b1725a946f4eb625a9"
+                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/da889e4bce19f145ca4ec5b1725a946f4eb625a9",
-                "reference": "da889e4bce19f145ca4ec5b1725a946f4eb625a9",
+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
+                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
                 "shasum": ""
             },
             "require": {
@@ -710,7 +711,7 @@
                 "symfony/finder": "^2.5|^3|^4"
             },
             "require-dev": {
-                "g-1-a/composer-test-scenarios": "^2",
+                "g1a/composer-test-scenarios": "^2",
                 "phpunit/phpunit": "^5.7.27",
                 "satooshi/php-coveralls": "^2",
                 "squizlabs/php_codesniffer": "^2.7",
@@ -743,25 +744,25 @@
                 }
             ],
             "description": "Format text by applying transformations provided by plug-in formatters.",
-            "time": "2018-03-20T15:18:32+00:00"
+            "time": "2018-05-25T18:02:34+00:00"
         },
         {
             "name": "consolidation/robo",
-            "version": "1.2.3",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/Robo.git",
-                "reference": "54a13e268917b92576d75e10dca8227b95a574d9"
+                "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/54a13e268917b92576d75e10dca8227b95a574d9",
-                "reference": "54a13e268917b92576d75e10dca8227b95a574d9",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/ac563abfadf7cb7314b4e152f2b5033a6c255f6f",
+                "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f",
                 "shasum": ""
             },
             "require": {
                 "consolidation/annotated-command": "^2.8.2",
-                "consolidation/config": "^1.0.1",
+                "consolidation/config": "^1.0.10",
                 "consolidation/log": "~1",
                 "consolidation/output-formatters": "^3.1.13",
                 "grasmash/yaml-expander": "^1.3",
@@ -780,7 +781,7 @@
                 "codeception/aspect-mock": "^1|^2.1.1",
                 "codeception/base": "^2.3.7",
                 "codeception/verify": "^0.3.2",
-                "g-1-a/composer-test-scenarios": "^2",
+                "g1a/composer-test-scenarios": "^2",
                 "goaop/framework": "~2.1.2",
                 "goaop/parser-reflection": "^1.1.0",
                 "natxet/cssmin": "3.0.4",
@@ -823,7 +824,63 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2018-04-06T05:27:37+00:00"
+            "time": "2018-05-27T01:42:53+00:00"
+        },
+        {
+            "name": "consolidation/site-alias",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/consolidation/site-alias.git",
+                "reference": "42a3e287806d70c37f3c467457b487d9ee7f32c7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/consolidation/site-alias/zipball/42a3e287806d70c37f3c467457b487d9ee7f32c7",
+                "reference": "42a3e287806d70c37f3c467457b487d9ee7f32c7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "consolidation/robo": "^1.2.3",
+                "g1a/composer-test-scenarios": "^2",
+                "knplabs/github-api": "^2.7",
+                "php-http/guzzle6-adapter": "^1.1",
+                "phpunit/phpunit": "^5",
+                "satooshi/php-coveralls": "^2",
+                "squizlabs/php_codesniffer": "^2.8",
+                "symfony/console": "^2.8|^3|^4",
+                "symfony/yaml": "~2.3|^3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Consolidation\\SiteAlias\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Moshe Weitzman",
+                    "email": "weitzman@tejasa.com"
+                },
+                {
+                    "name": "Greg Anderson",
+                    "email": "greg.1.anderson@greenknowe.org"
+                }
+            ],
+            "description": "Template project for PHP libraries.",
+            "time": "2018-08-14T20:08:01+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -858,16 +915,16 @@
         },
         {
             "name": "cweagans/composer-patches",
-            "version": "1.6.4",
+            "version": "1.6.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cweagans/composer-patches.git",
-                "reference": "462e65061606dc6149349535d4322241515d1b16"
+                "reference": "2ec4f00ff5fb64de584c8c4aea53bf9053ecb0b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/462e65061606dc6149349535d4322241515d1b16",
-                "reference": "462e65061606dc6149349535d4322241515d1b16",
+                "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/2ec4f00ff5fb64de584c8c4aea53bf9053ecb0b3",
+                "reference": "2ec4f00ff5fb64de584c8c4aea53bf9053ecb0b3",
                 "shasum": ""
             },
             "require": {
@@ -889,7 +946,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-2-Clause"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
@@ -898,7 +955,7 @@
                 }
             ],
             "description": "Provides a way to patch Composer packages.",
-            "time": "2017-12-07T16:16:31+00:00"
+            "time": "2018-05-11T18:00:16+00:00"
         },
         {
             "name": "dflydev/dot-access-configuration",
@@ -1315,33 +1372,39 @@
         },
         {
             "name": "doctrine/common",
-            "version": "v2.8.1",
+            "version": "v2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common.git",
-                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66"
+                "reference": "a210246d286c77d2b89040f8691ba7b3a713d2c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
-                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/a210246d286c77d2b89040f8691ba7b3a713d2c1",
+                "reference": "a210246d286c77d2b89040f8691ba7b3a713d2c1",
                 "shasum": ""
             },
             "require": {
-                "doctrine/annotations": "1.*",
-                "doctrine/cache": "1.*",
-                "doctrine/collections": "1.*",
-                "doctrine/inflector": "1.*",
-                "doctrine/lexer": "1.*",
-                "php": "~7.1"
+                "doctrine/annotations": "^1.0",
+                "doctrine/cache": "^1.0",
+                "doctrine/collections": "^1.0",
+                "doctrine/event-manager": "^1.0",
+                "doctrine/inflector": "^1.0",
+                "doctrine/lexer": "^1.0",
+                "doctrine/persistence": "^1.0",
+                "doctrine/reflection": "^1.0",
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7"
+                "doctrine/coding-standard": "^1.0",
+                "phpunit/phpunit": "^6.3",
+                "squizlabs/php_codesniffer": "^3.0",
+                "symfony/phpunit-bridge": "^4.0.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8.x-dev"
+                    "dev-master": "2.9.x-dev"
                 }
             },
             "autoload": {
@@ -1373,10 +1436,14 @@
                 {
                     "name": "Johannes Schmitt",
                     "email": "schmittjoh@gmail.com"
+                },
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com"
                 }
             ],
             "description": "Common Library for Doctrine projects",
-            "homepage": "http://www.doctrine-project.org",
+            "homepage": "https://www.doctrine-project.org",
             "keywords": [
                 "annotations",
                 "collections",
@@ -1384,7 +1451,81 @@
                 "persistence",
                 "spl"
             ],
-            "time": "2017-08-31T08:43:38+00:00"
+            "time": "2018-07-12T21:16:12+00:00"
+        },
+        {
+            "name": "doctrine/event-manager",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/event-manager.git",
+                "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3",
+                "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "conflict": {
+                "doctrine/common": "<2.9@dev"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^4.0",
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\": "lib/Doctrine/Common"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                },
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com"
+                }
+            ],
+            "description": "Doctrine Event Manager component",
+            "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
+            "keywords": [
+                "event",
+                "eventdispatcher",
+                "eventmanager"
+            ],
+            "time": "2018-06-11T11:59:03+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -1507,18 +1648,171 @@
             ],
             "time": "2014-09-09T13:34:57+00:00"
         },
+        {
+            "name": "doctrine/persistence",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/persistence.git",
+                "reference": "17896f6d56a2794a1619e019596ae627aabd8fd5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/persistence/zipball/17896f6d56a2794a1619e019596ae627aabd8fd5",
+                "reference": "17896f6d56a2794a1619e019596ae627aabd8fd5",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/annotations": "^1.0",
+                "doctrine/cache": "^1.0",
+                "doctrine/collections": "^1.0",
+                "doctrine/event-manager": "^1.0",
+                "doctrine/reflection": "^1.0",
+                "php": "^7.1"
+            },
+            "conflict": {
+                "doctrine/common": "<2.9@dev"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^4.0",
+                "phpstan/phpstan": "^0.8",
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\": "lib/Doctrine/Common"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                },
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com"
+                }
+            ],
+            "description": "Doctrine Persistence abstractions.",
+            "homepage": "https://doctrine-project.org/projects/persistence.html",
+            "keywords": [
+                "persistence"
+            ],
+            "time": "2018-06-14T18:57:48+00:00"
+        },
+        {
+            "name": "doctrine/reflection",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/reflection.git",
+                "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/reflection/zipball/02538d3f95e88eb397a5f86274deb2c6175c2ab6",
+                "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/annotations": "^1.0",
+                "ext-tokenizer": "*",
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^4.0",
+                "doctrine/common": "^2.8",
+                "phpstan/phpstan": "^0.9.2",
+                "phpstan/phpstan-phpunit": "^0.9.4",
+                "phpunit/phpunit": "^7.0",
+                "squizlabs/php_codesniffer": "^3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\": "lib/Doctrine/Common"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                },
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com"
+                }
+            ],
+            "description": "Doctrine Reflection component",
+            "homepage": "https://www.doctrine-project.org/projects/reflection.html",
+            "keywords": [
+                "reflection"
+            ],
+            "time": "2018-06-14T14:45:07+00:00"
+        },
         {
             "name": "drupal-composer/drupal-scaffold",
-            "version": "2.4.0",
+            "version": "2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal-composer/drupal-scaffold.git",
-                "reference": "745f0a2d4141fc83d3b42222beff43d66afb3dc6"
+                "reference": "fc6bf4ceecb5d47327f54d48d4d4f67b17da956d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal-composer/drupal-scaffold/zipball/745f0a2d4141fc83d3b42222beff43d66afb3dc6",
-                "reference": "745f0a2d4141fc83d3b42222beff43d66afb3dc6",
+                "url": "https://api.github.com/repos/drupal-composer/drupal-scaffold/zipball/fc6bf4ceecb5d47327f54d48d4d4f67b17da956d",
+                "reference": "fc6bf4ceecb5d47327f54d48d4d4f67b17da956d",
                 "shasum": ""
             },
             "require": {
@@ -1528,7 +1822,9 @@
             },
             "require-dev": {
                 "composer/composer": "dev-master",
-                "phpunit/phpunit": "^4.4.0"
+                "g1a/composer-test-scenarios": "^2.1.0",
+                "phpunit/phpunit": "^6",
+                "squizlabs/php_codesniffer": "^2.8"
             },
             "type": "composer-plugin",
             "extra": {
@@ -1544,10 +1840,10 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "GPL-2.0+"
+                "GPL-2.0-or-later"
             ],
             "description": "Composer Plugin for updating the Drupal scaffold files when using drupal/core",
-            "time": "2017-12-08T22:53:11+00:00"
+            "time": "2018-07-27T10:07:07+00:00"
         },
         {
             "name": "drupal/better_normalizers",
@@ -2550,17 +2846,17 @@
         },
         {
             "name": "drupal/diff",
-            "version": "1.0.0-rc1",
+            "version": "1.0.0-rc2",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/diff",
-                "reference": "8.x-1.0-rc1"
+                "reference": "8.x-1.0-rc2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/diff-8.x-1.0-rc1.zip",
-                "reference": "8.x-1.0-rc1",
-                "shasum": "4945154c2c07444195a7ae07011a3b3db941c72a"
+                "url": "https://ftp.drupal.org/files/projects/diff-8.x-1.0-rc2.zip",
+                "reference": "8.x-1.0-rc2",
+                "shasum": "2e8f4efe6e7d355a3d07d33531f077348b13f68d"
             },
             "require": {
                 "drupal/core": "~8.0",
@@ -2572,7 +2868,7 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.0-rc1",
+                    "version": "8.x-1.0-rc2",
                     "datestamp": "1530178424",
                     "security-coverage": {
                         "status": "not-covered",
@@ -2701,17 +2997,17 @@
         },
         {
             "name": "drupal/entity",
-            "version": "1.0.0-beta3",
+            "version": "1.0.0-beta4",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/entity",
-                "reference": "8.x-1.0-beta3"
+                "reference": "8.x-1.0-beta4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/entity-8.x-1.0-beta3.zip",
-                "reference": "8.x-1.0-beta3",
-                "shasum": "5d74dbef7bff0db099517b2c7aad14312eb02afa"
+                "url": "https://ftp.drupal.org/files/projects/entity-8.x-1.0-beta4.zip",
+                "reference": "8.x-1.0-beta4",
+                "shasum": "00c1ae1fd4942285564af4325c0c98f895dac754"
             },
             "require": {
                 "drupal/core": "~8.5"
@@ -2722,7 +3018,7 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.0-beta3",
+                    "version": "8.x-1.0-beta4",
                     "datestamp": "1528452184",
                     "security-coverage": {
                         "status": "not-covered",
@@ -2764,17 +3060,17 @@
         },
         {
             "name": "drupal/entity_browser",
-            "version": "2.0.0-alpha2",
+            "version": "2.0.0-alpha3",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/entity_browser",
-                "reference": "8.x-2.0-alpha2"
+                "reference": "8.x-2.0-alpha3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/entity_browser-8.x-2.0-alpha2.zip",
-                "reference": "8.x-2.0-alpha2",
-                "shasum": "f31ad069e5c5e95db9b9410a4d71038ac0c5b370"
+                "url": "https://ftp.drupal.org/files/projects/entity_browser-8.x-2.0-alpha3.zip",
+                "reference": "8.x-2.0-alpha3",
+                "shasum": "bd8537cda5f287ecca273a5c5a9c36b020c522fe"
             },
             "require": {
                 "drupal/core": "~8.0"
@@ -2792,7 +3088,7 @@
                     "dev-8.x-1.x": "8.1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-2.0-alpha2",
+                    "version": "8.x-2.0-alpha3",
                     "datestamp": "1528141081",
                     "security-coverage": {
                         "status": "not-covered",
@@ -2988,17 +3284,17 @@
         },
         {
             "name": "drupal/inline_entity_form",
-            "version": "1.0.0-beta1",
+            "version": "1.0.0-rc1",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/inline_entity_form",
-                "reference": "8.x-1.0-beta1"
+                "reference": "8.x-1.0-rc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-beta1.zip",
-                "reference": "8.x-1.0-beta1",
-                "shasum": "185ffc28a7b68d19cce057855d1c111f1741a3ea"
+                "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc1.zip",
+                "reference": "8.x-1.0-rc1",
+                "shasum": "898789fb6a0662fc2572b87f8d0654a0241473f9"
             },
             "require": {
                 "drupal/core": "~8.0"
@@ -3012,11 +3308,11 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.0-beta1",
+                    "version": "8.x-1.0-rc1",
                     "datestamp": "1527030784",
                     "security-coverage": {
                         "status": "not-covered",
-                        "message": "Beta releases are not covered by Drupal security advisories."
+                        "message": "RC releases are not covered by Drupal security advisories."
                     }
                 }
             },
@@ -3054,17 +3350,17 @@
         },
         {
             "name": "drupal/media_entity",
-            "version": "1.7.0",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/media_entity",
-                "reference": "8.x-1.7"
+                "reference": "8.x-1.8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/media_entity-8.x-1.7.zip",
-                "reference": "8.x-1.7",
-                "shasum": "5f7ccdf1db07732f3c94e642e60d88746e73cc86"
+                "url": "https://ftp.drupal.org/files/projects/media_entity-8.x-1.8.zip",
+                "reference": "8.x-1.8",
+                "shasum": "c0ab77156c0e431f958d615f043e0255486db155"
             },
             "require": {
                 "drupal/core": "*",
@@ -3080,7 +3376,7 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.7",
+                    "version": "8.x-1.8",
                     "datestamp": "1532693881",
                     "security-coverage": {
                         "status": "covered",
@@ -3215,29 +3511,34 @@
         },
         {
             "name": "drupal/rules",
-            "version": "3.0.0-alpha3",
+            "version": "3.0.0-alpha4",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/rules",
-                "reference": "8.x-3.0-alpha3"
+                "reference": "8.x-3.0-alpha4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/rules-8.x-3.0-alpha3.zip",
-                "reference": "8.x-3.0-alpha3",
-                "shasum": "e8cf4212479a6f8418b519c93b08a8bd22cf00d3"
+                "url": "https://ftp.drupal.org/files/projects/rules-8.x-3.0-alpha4.zip",
+                "reference": "8.x-3.0-alpha4",
+                "shasum": "d6f11a6bd867b3479504b00278b4465a5b138d3a"
             },
             "require": {
                 "drupal/core": "~8.0",
                 "drupal/typed_data": "*"
             },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+                "drupal/coder": "8.2.*",
+                "squizlabs/php_codesniffer": "2.9.*"
+            },
             "type": "drupal-module",
             "extra": {
                 "branch-alias": {
                     "dev-3.x": "3.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-3.0-alpha3",
+                    "version": "8.x-3.0-alpha4",
                     "datestamp": "1526654284",
                     "security-coverage": {
                         "status": "not-covered",
@@ -3271,17 +3572,17 @@
         },
         {
             "name": "drupal/s3fs",
-            "version": "3.0.0-alpha9",
+            "version": "3.0.0-alpha13",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/s3fs",
-                "reference": "8.x-3.0-alpha9"
+                "reference": "8.x-3.0-alpha13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/s3fs-8.x-3.0-alpha9.zip",
-                "reference": "8.x-3.0-alpha9",
-                "shasum": "85b564788483506a4a29244af41ee30601ad983c"
+                "url": "https://ftp.drupal.org/files/projects/s3fs-8.x-3.0-alpha13.zip",
+                "reference": "8.x-3.0-alpha13",
+                "shasum": "809a6f5f148416c165f9595b8e3797e77087bef5"
             },
             "require": {
                 "aws/aws-sdk-php": "^3.18",
@@ -3293,8 +3594,8 @@
                     "dev-3.x": "3.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-3.0-alpha9",
-                    "datestamp": "1525449183",
+                    "version": "8.x-3.0-alpha13",
+                    "datestamp": "1531121921",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Alpha releases are not covered by Drupal security advisories."
@@ -3459,17 +3760,17 @@
         },
         {
             "name": "drupal/token",
-            "version": "1.1.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/token",
-                "reference": "8.x-1.1"
+                "reference": "8.x-1.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/token-8.x-1.1.zip",
-                "reference": "8.x-1.1",
-                "shasum": "f11042a76bec028b0a86dc33cf6daa19eb55d545"
+                "url": "https://ftp.drupal.org/files/projects/token-8.x-1.3.zip",
+                "reference": "8.x-1.3",
+                "shasum": "360f4f16985a2005b1ab5d8a8628b73a5012c902"
             },
             "require": {
                 "drupal/core": "~8.0"
@@ -3480,8 +3781,8 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.1",
-                    "datestamp": "1527112080",
+                    "version": "8.x-1.3",
+                    "datestamp": "1527232684",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3628,25 +3929,26 @@
         },
         {
             "name": "drush/drush",
-            "version": "9.2.3",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drush-ops/drush.git",
-                "reference": "c07b5b4527d6fb9226adaee14a33de5d4aa93ce8"
+                "reference": "1844496e1f526631c98453d5767984b795fc1dc9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drush-ops/drush/zipball/c07b5b4527d6fb9226adaee14a33de5d4aa93ce8",
-                "reference": "c07b5b4527d6fb9226adaee14a33de5d4aa93ce8",
+                "url": "https://api.github.com/repos/drush-ops/drush/zipball/1844496e1f526631c98453d5767984b795fc1dc9",
+                "reference": "1844496e1f526631c98453d5767984b795fc1dc9",
                 "shasum": ""
             },
             "require": {
-                "chi-teck/drupal-code-generator": "^1.21.0",
+                "chi-teck/drupal-code-generator": "^1.24.0",
                 "composer/semver": "^1.4",
                 "consolidation/annotated-command": "^2.8.1",
-                "consolidation/config": "^1.0.9",
+                "consolidation/config": "^1.1.0",
                 "consolidation/output-formatters": "^3.1.12",
                 "consolidation/robo": "^1.1.5",
+                "consolidation/site-alias": "^1.1.1",
                 "ext-dom": "*",
                 "grasmash/yaml-expander": "^1.1.1",
                 "league/container": "~2",
@@ -3659,14 +3961,15 @@
                 "symfony/event-dispatcher": "~2.7|^3",
                 "symfony/finder": "~2.7|^3",
                 "symfony/process": "~2.7|^3",
-                "symfony/var-dumper": "~2.7|^3",
+                "symfony/var-dumper": "~2.7|^3|^4",
                 "symfony/yaml": "~2.3|^3",
                 "webflo/drupal-finder": "^1.1",
                 "webmozart/path-util": "^2.1.0"
             },
             "require-dev": {
+                "g1a/composer-test-scenarios": "^2.2.0",
                 "lox/xhprof": "dev-master",
-                "phpunit/phpunit": "^4.8|^5.5.4",
+                "phpunit/phpunit": "^4.8.36|^5.5.4",
                 "squizlabs/php_codesniffer": "^2.7"
             },
             "bin": [
@@ -3675,7 +3978,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.0.x-dev"
+                    "dev-master": "9.x-dev"
                 }
             },
             "autoload": {
@@ -3725,7 +4028,7 @@
             ],
             "description": "Drush is a command line shell and scripting interface for Drupal, a veritable Swiss Army knife designed to make life easier for those of us who spend some of our working hours hacking away at the command prompt.",
             "homepage": "http://www.drush.org",
-            "time": "2018-04-03T13:45:59+00:00"
+            "time": "2018-08-14T20:10:33+00:00"
         },
         {
             "name": "easyrdf/easyrdf",
@@ -4475,16 +4778,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.0.1",
+            "version": "v4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3"
+                "reference": "bd088dc940a418f09cda079a9b5c7c478890fb8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
-                "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bd088dc940a418f09cda079a9b5c7c478890fb8d",
+                "reference": "bd088dc940a418f09cda079a9b5c7c478890fb8d",
                 "shasum": ""
             },
             "require": {
@@ -4522,20 +4825,20 @@
                 "parser",
                 "php"
             ],
-            "time": "2018-03-25T17:35:16+00:00"
+            "time": "2018-07-15T17:25:16+00:00"
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.12",
+            "version": "v2.0.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
+                "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
-                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
+                "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
                 "shasum": ""
             },
             "require": {
@@ -4567,10 +4870,11 @@
             "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
             "keywords": [
                 "csprng",
+                "polyfill",
                 "pseudorandom",
                 "random"
             ],
-            "time": "2018-04-04T21:24:14+00:00"
+            "time": "2018-07-04T16:31:37+00:00"
         },
         {
             "name": "psr/container",
@@ -4720,20 +5024,22 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.9.3",
+            "version": "v0.9.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4"
+                "reference": "4f5b6c090948773a8bfeea6a0f07ab7d0b24e932"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/79c280013cf0b30fa23f3ba8bd3649218075adf4",
-                "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f5b6c090948773a8bfeea6a0f07ab7d0b24e932",
+                "reference": "4f5b6c090948773a8bfeea6a0f07ab7d0b24e932",
                 "shasum": ""
             },
             "require": {
                 "dnoegel/php-xdg-base-dir": "0.1",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
                 "jakub-onderka/php-console-highlighter": "0.3.*",
                 "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
                 "php": ">=5.4.0",
@@ -4741,9 +5047,9 @@
                 "symfony/var-dumper": "~2.7|~3.0|~4.0"
             },
             "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.2",
                 "hoa/console": "~2.15|~3.16",
-                "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0",
-                "symfony/finder": "~2.1|~3.0|~4.0"
+                "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0"
             },
             "suggest": {
                 "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
@@ -4788,7 +5094,7 @@
                 "interactive",
                 "shell"
             ],
-            "time": "2018-04-18T12:32:50+00:00"
+            "time": "2018-08-11T15:54:43+00:00"
         },
         {
             "name": "sebastian/version",
@@ -5036,16 +5342,16 @@
         },
         {
             "name": "symfony/class-loader",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
-                "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e"
+                "reference": "31db283fc86d3143e7ff87e922177b457d909c30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/e63c12699822bb3b667e7216ba07fbcc3a3e203e",
-                "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/31db283fc86d3143e7ff87e922177b457d909c30",
+                "reference": "31db283fc86d3143e7ff87e922177b457d909c30",
                 "shasum": ""
             },
             "require": {
@@ -5088,25 +5394,26 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2018-01-03T07:37:34+00:00"
+            "time": "2018-07-26T11:19:56+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9"
+                "reference": "7b08223b7f6abd859651c56bcabf900d1627d085"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/7c2a9d44f4433863e9bca682e7f03609234657f9",
-                "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9",
+                "url": "https://api.github.com/repos/symfony/config/zipball/7b08223b7f6abd859651c56bcabf900d1627d085",
+                "reference": "7b08223b7f6abd859651c56bcabf900d1627d085",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
-                "symfony/filesystem": "~2.8|~3.0|~4.0"
+                "symfony/filesystem": "~2.8|~3.0|~4.0",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
                 "symfony/dependency-injection": "<3.3",
@@ -5151,20 +5458,20 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-19T22:32:39+00:00"
+            "time": "2018-07-26T11:19:56+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf"
+                "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf",
-                "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf",
+                "url": "https://api.github.com/repos/symfony/console/zipball/6b217594552b9323bcdcfc14f8a0ce126e84cd73",
+                "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73",
                 "shasum": ""
             },
             "require": {
@@ -5185,7 +5492,7 @@
                 "symfony/process": "~3.3|~4.0"
             },
             "suggest": {
-                "psr/log": "For using the console logger",
+                "psr/log-implementation": "For using the console logger",
                 "symfony/event-dispatcher": "",
                 "symfony/lock": "",
                 "symfony/process": ""
@@ -5220,20 +5527,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-03T05:22:50+00:00"
+            "time": "2018-07-26T11:19:56+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "519a80d7c1d95c6cc0b67f686d15fe27c6910de0"
+                "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/519a80d7c1d95c6cc0b67f686d15fe27c6910de0",
-                "reference": "519a80d7c1d95c6cc0b67f686d15fe27c6910de0",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/edda5a6155000ff8c3a3f85ee5c421af93cca416",
+                "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416",
                 "shasum": ""
             },
             "require": {
@@ -5273,20 +5580,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-19T22:32:39+00:00"
+            "time": "2018-07-26T09:06:28+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "9cf7c2271cfb89ef9727db1b740ca77be57bf9d7"
+                "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/9cf7c2271cfb89ef9727db1b740ca77be57bf9d7",
-                "reference": "9cf7c2271cfb89ef9727db1b740ca77be57bf9d7",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/d5a058ff6ecad26b30c1ba452241306ea34c65cc",
+                "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc",
                 "shasum": ""
             },
             "require": {
@@ -5329,7 +5636,7 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-03T05:22:50+00:00"
+            "time": "2018-07-26T11:19:56+00:00"
         },
         {
             "name": "symfony/dependency-injection",
@@ -5404,20 +5711,21 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "1a4cffeb059226ff6bee9f48acb388faf674afff"
+                "reference": "452bfc854b60134438e3824b159b0d24a5892331"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1a4cffeb059226ff6bee9f48acb388faf674afff",
-                "reference": "1a4cffeb059226ff6bee9f48acb388faf674afff",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/452bfc854b60134438e3824b159b0d24a5892331",
+                "reference": "452bfc854b60134438e3824b159b0d24a5892331",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
@@ -5456,20 +5764,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-19T22:32:39+00:00"
+            "time": "2018-07-26T10:03:52+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8"
+                "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8",
-                "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
+                "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
                 "shasum": ""
             },
             "require": {
@@ -5519,24 +5827,25 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-06T07:35:25+00:00"
+            "time": "2018-07-26T09:06:28+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541"
+                "reference": "a59f917e3c5d82332514cb4538387638f5bde2d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/253a4490b528597aa14d2bf5aeded6f5e5e4a541",
-                "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/a59f917e3c5d82332514cb4538387638f5bde2d6",
+                "reference": "a59f917e3c5d82332514cb4538387638f5bde2d6",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "extra": {
@@ -5568,20 +5877,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-22T10:48:49+00:00"
+            "time": "2018-07-26T11:19:56+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433"
+                "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/bd14efe8b1fabc4de82bf50dce62f05f9a102433",
-                "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/8a84fcb207451df0013b2c74cbbf1b62d47b999a",
+                "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a",
                 "shasum": ""
             },
             "require": {
@@ -5617,7 +5926,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-04T05:07:11+00:00"
+            "time": "2018-07-26T11:19:56+00:00"
         },
         {
             "name": "symfony/http-foundation",
@@ -5764,25 +6073,28 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.8.0",
+            "version": "v1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
-                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -5815,20 +6127,20 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2018-04-30T19:57:29+00:00"
+            "time": "2018-08-06T14:22:27+00:00"
         },
         {
             "name": "symfony/polyfill-iconv",
-            "version": "v1.7.0",
+            "version": "v1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "bd515d8f392730c833bc1ba993a4f598da64fa5b"
+                "reference": "bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/bd515d8f392730c833bc1ba993a4f598da64fa5b",
-                "reference": "bd515d8f392730c833bc1ba993a4f598da64fa5b",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2",
+                "reference": "bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2",
                 "shasum": ""
             },
             "require": {
@@ -5840,7 +6152,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -5874,20 +6186,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-01-30T19:27:44+00:00"
+            "time": "2018-08-06T14:22:27+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.7.0",
+            "version": "v1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
+                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
-                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
+                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
                 "shasum": ""
             },
             "require": {
@@ -5899,7 +6211,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -5933,30 +6245,30 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-01-30T19:27:44+00:00"
+            "time": "2018-08-06T14:22:27+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.7.0",
+            "version": "v1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f"
+                "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f",
-                "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
+                "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
                 "shasum": ""
             },
             "require": {
-                "paragonie/random_compat": "~1.0|~2.0",
+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
                 "php": ">=5.3.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -5992,20 +6304,75 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-01-30T19:27:44+00:00"
+            "time": "2018-08-06T14:22:27+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php72",
+            "version": "v1.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae",
+                "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2018-08-06T14:22:27+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b"
+                "reference": "0414db29bd770ec5a4152683e655f55efd4fa60f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/4b7d64e852886319e93ddfdecff0d744ab87658b",
-                "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b",
+                "url": "https://api.github.com/repos/symfony/process/zipball/0414db29bd770ec5a4152683e655f55efd4fa60f",
+                "reference": "0414db29bd770ec5a4152683e655f55efd4fa60f",
                 "shasum": ""
             },
             "require": {
@@ -6041,7 +6408,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-03T05:22:50+00:00"
+            "time": "2018-07-26T11:19:56+00:00"
         },
         {
             "name": "symfony/psr-http-message-bridge",
@@ -6105,16 +6472,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "50f333b707bef9f6972ad04e6df3ec8875c9a67c"
+                "reference": "e20f4bb79502c3c0db86d572f7683a30d4143911"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/50f333b707bef9f6972ad04e6df3ec8875c9a67c",
-                "reference": "50f333b707bef9f6972ad04e6df3ec8875c9a67c",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/e20f4bb79502c3c0db86d572f7683a30d4143911",
+                "reference": "e20f4bb79502c3c0db86d572f7683a30d4143911",
                 "shasum": ""
             },
             "require": {
@@ -6127,7 +6494,6 @@
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
-                "doctrine/common": "~2.2",
                 "psr/log": "~1.0",
                 "symfony/config": "^3.3.1|~4.0",
                 "symfony/dependency-injection": "~3.3|~4.0",
@@ -6179,24 +6545,25 @@
                 "uri",
                 "url"
             ],
-            "time": "2018-04-04T13:22:16+00:00"
+            "time": "2018-07-26T11:19:56+00:00"
         },
         {
             "name": "symfony/serializer",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "d4dc1551da627273230fe16511f4bb4844c02399"
+                "reference": "40031683816470610af87c2d03ea86d1cf0f0104"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/d4dc1551da627273230fe16511f4bb4844c02399",
-                "reference": "d4dc1551da627273230fe16511f4bb4844c02399",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/40031683816470610af87c2d03ea86d1cf0f0104",
+                "reference": "40031683816470610af87c2d03ea86d1cf0f0104",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
                 "phpdocumentor/type-resolver": "<0.2.1",
@@ -6257,20 +6624,20 @@
             ],
             "description": "Symfony Serializer Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-15T19:08:29+00:00"
+            "time": "2018-07-26T11:58:24+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "80e19eaf12cbb546ac40384e5c55c36306823e57"
+                "reference": "9749930bfc825139aadd2d28461ddbaed6577862"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/80e19eaf12cbb546ac40384e5c55c36306823e57",
-                "reference": "80e19eaf12cbb546ac40384e5c55c36306823e57",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/9749930bfc825139aadd2d28461ddbaed6577862",
+                "reference": "9749930bfc825139aadd2d28461ddbaed6577862",
                 "shasum": ""
             },
             "require": {
@@ -6291,7 +6658,7 @@
                 "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
-                "psr/log": "To use logging capability in translator",
+                "psr/log-implementation": "To use logging capability in translator",
                 "symfony/config": "",
                 "symfony/yaml": ""
             },
@@ -6325,24 +6692,25 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-22T06:28:18+00:00"
+            "time": "2018-07-26T11:19:56+00:00"
         },
         {
             "name": "symfony/validator",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7"
+                "reference": "364b818b5cc813282f19fefb364c24424210634a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7",
-                "reference": "6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/364b818b5cc813282f19fefb364c24424210634a",
+                "reference": "364b818b5cc813282f19fefb364c24424210634a",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/translation": "~2.8|~3.0|~4.0"
             },
@@ -6409,42 +6777,48 @@
             ],
             "description": "Symfony Validator Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-06T07:35:25+00:00"
+            "time": "2018-07-26T11:58:24+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.4.8",
+            "version": "v4.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "951643091b39a6fd40fce56cd16e21e12bef3feb"
+                "reference": "69e174f4c02ec43919380171c6f7550753299316"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/951643091b39a6fd40fce56cd16e21e12bef3feb",
-                "reference": "951643091b39a6fd40fce56cd16e21e12bef3feb",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/69e174f4c02ec43919380171c6f7550753299316",
+                "reference": "69e174f4c02ec43919380171c6f7550753299316",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-mbstring": "~1.0"
+                "php": "^7.1.3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php72": "~1.5"
             },
             "conflict": {
-                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
+                "symfony/console": "<3.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
+                "symfony/process": "~3.4|~4.0",
                 "twig/twig": "~1.34|~2.4"
             },
             "suggest": {
                 "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
                 "ext-intl": "To show region name in time zone dump",
-                "ext-symfony_debug": ""
+                "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
             },
+            "bin": [
+                "Resources/bin/var-dump-server"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -6478,24 +6852,25 @@
                 "debug",
                 "dump"
             ],
-            "time": "2018-04-03T20:34:11+00:00"
+            "time": "2018-07-26T11:24:31+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.4.8",
+            "version": "v3.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0"
+                "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/a42f9da85c7c38d59f5e53f076fe81a091f894d0",
-                "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/810af2d35fc72b6cf5c01116806d2b65ccaaf2e2",
+                "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
                 "symfony/console": "<3.4"
@@ -6536,24 +6911,25 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-03T05:14:20+00:00"
+            "time": "2018-07-26T11:19:56+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v1.35.3",
+            "version": "v1.35.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f"
+                "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
-                "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
+                "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.3",
+                "symfony/polyfill-ctype": "^1.8"
             },
             "require-dev": {
                 "psr/container": "^1.0",
@@ -6592,16 +6968,16 @@
                 },
                 {
                     "name": "Twig Team",
-                    "homepage": "http://twig.sensiolabs.org/contributors",
+                    "homepage": "https://twig.symfony.com/contributors",
                     "role": "Contributors"
                 }
             ],
             "description": "Twig, the flexible, fast, and secure template language for PHP",
-            "homepage": "http://twig.sensiolabs.org",
+            "homepage": "https://twig.symfony.com",
             "keywords": [
                 "templating"
             ],
-            "time": "2018-03-20T04:25:58+00:00"
+            "time": "2018-07-13T07:12:17+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -6738,16 +7114,16 @@
         },
         {
             "name": "zendframework/zend-diactoros",
-            "version": "1.7.1",
+            "version": "1.8.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-diactoros.git",
-                "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1"
+                "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/bf26aff803a11c5cc8eb7c4878a702c403ec67f1",
-                "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1",
+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/3e4edb822c942f37ade0d09579cfbab11e2fee87",
+                "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87",
                 "shasum": ""
             },
             "require": {
@@ -6760,17 +7136,28 @@
             "require-dev": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
-                "phpunit/phpunit": "^5.7.16 || ^6.0.8",
+                "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
                 "zendframework/zend-coding-standard": "~1.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7.x-dev",
-                    "dev-develop": "1.8.x-dev"
+                    "dev-master": "1.8.x-dev",
+                    "dev-develop": "1.9.x-dev",
+                    "dev-release-2.0": "2.0.x-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/functions/create_uploaded_file.php",
+                    "src/functions/marshal_headers_from_sapi.php",
+                    "src/functions/marshal_method_from_sapi.php",
+                    "src/functions/marshal_protocol_version_from_sapi.php",
+                    "src/functions/marshal_uri_from_sapi.php",
+                    "src/functions/normalize_server.php",
+                    "src/functions/normalize_uploaded_files.php",
+                    "src/functions/parse_cookie_header.php"
+                ],
                 "psr-4": {
                     "Zend\\Diactoros\\": "src/"
                 }
@@ -6786,7 +7173,7 @@
                 "psr",
                 "psr-7"
             ],
-            "time": "2018-02-26T15:44:50+00:00"
+            "time": "2018-08-10T14:16:32+00:00"
         },
         {
             "name": "zendframework/zend-escaper",
@@ -6835,16 +7222,16 @@
         },
         {
             "name": "zendframework/zend-feed",
-            "version": "2.9.0",
+            "version": "2.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-feed.git",
-                "reference": "abe88686124d492e0a2a84656f15e5482bfbe030"
+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/abe88686124d492e0a2a84656f15e5482bfbe030",
-                "reference": "abe88686124d492e0a2a84656f15e5482bfbe030",
+                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/6641f4cf3f4586c63f83fd70b6d19966025c8888",
+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888",
                 "shasum": ""
             },
             "require": {
@@ -6873,8 +7260,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.9-dev",
-                    "dev-develop": "2.10-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
                 }
             },
             "autoload": {
@@ -6892,35 +7279,35 @@
                 "feed",
                 "zf"
             ],
-            "time": "2017-12-04T17:59:38+00:00"
+            "time": "2018-08-01T13:53:20+00:00"
         },
         {
             "name": "zendframework/zend-stdlib",
-            "version": "3.1.1",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-stdlib.git",
-                "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc"
+                "reference": "cd164b4a18b5d1aeb69be2c26db035b5ed6925ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/10ef03144902d1955f935fff5346ed52f7d99bcc",
-                "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc",
+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cd164b4a18b5d1aeb69be2c26db035b5ed6925ae",
+                "reference": "cd164b4a18b5d1aeb69be2c26db035b5ed6925ae",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1",
-                "phpunit/phpunit": "~4.0",
+                "phpbench/phpbench": "^0.13",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
                 "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev",
-                    "dev-develop": "3.2-dev"
+                    "dev-master": "3.2.x-dev",
+                    "dev-develop": "3.3.x-dev"
                 }
             },
             "autoload": {
@@ -6932,12 +7319,13 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-stdlib",
+            "description": "SPL extensions, array utilities, error handlers, and more",
             "keywords": [
+                "ZendFramework",
                 "stdlib",
-                "zf2"
+                "zf"
             ],
-            "time": "2018-04-12T16:05:42+00:00"
+            "time": "2018-04-30T13:50:40+00:00"
         }
     ],
     "packages-dev": [],

From 78b2703b6fb299de53926cf4da1a6e7f4c970914 Mon Sep 17 00:00:00 2001
From: Fureigh <rhys.fureigh@gsa.gov>
Date: Thu, 16 Aug 2018 13:34:27 -0700
Subject: [PATCH 143/143] Update all packages identified by npm-audit

---
 web/themes/nsf/package-lock.json | 6972 ++++++++++++++----------------
 web/themes/nsf/package.json      |   10 +-
 2 files changed, 3226 insertions(+), 3756 deletions(-)

diff --git a/web/themes/nsf/package-lock.json b/web/themes/nsf/package-lock.json
index 99a07d6..48d81c1 100644
--- a/web/themes/nsf/package-lock.json
+++ b/web/themes/nsf/package-lock.json
@@ -4,14 +4,30 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@mrmlnc/readdir-enhanced": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+      "dev": true,
+      "requires": {
+        "call-me-maybe": "^1.0.1",
+        "glob-to-regexp": "^0.3.0"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz",
+      "integrity": "sha512-LAQ1d4OPfSJ/BMbI2DuizmYrrkD9JMaTdi2hQTlI53lQ4kRQPyZQRS4CYQ7O66bnBBnP/oYdRxbk++X0xuFU6A==",
+      "dev": true
+    },
     "JSONStream": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
       "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
       "dev": true,
       "requires": {
-        "jsonparse": "1.3.1",
-        "through": "2.3.8"
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
       }
     },
     "abbrev": {
@@ -26,6 +42,18 @@
       "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
       "dev": true
     },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "dev": true,
+      "requires": {
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
+      }
+    },
     "alphanum-sort": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
@@ -45,22 +73,22 @@
       "dev": true
     },
     "ansi-styles": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-      "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
-        "color-convert": "1.9.1"
+        "color-convert": "^1.9.0"
       }
     },
     "anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "requires": {
-        "micromatch": "2.3.11",
-        "normalize-path": "2.1.1"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
     "aproba": {
@@ -70,32 +98,29 @@
       "dev": true
     },
     "are-we-there-yet": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
       "requires": {
-        "delegates": "1.0.0",
-        "readable-stream": "2.3.3"
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
       }
     },
     "argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
-        "sprintf-js": "1.0.3"
+        "sprintf-js": "~1.0.2"
       }
     },
     "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.1.0"
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
     },
     "arr-flatten": {
       "version": "1.1.0",
@@ -103,6 +128,12 @@
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true
     },
+    "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-filter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz",
@@ -139,7 +170,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "1.0.3"
+        "array-uniq": "^1.0.1"
       }
     },
     "array-uniq": {
@@ -149,26 +180,35 @@
       "dev": true
     },
     "array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true
     },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true
     },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
     "asn1.js": {
       "version": "4.9.2",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz",
       "integrity": "sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "assert": {
@@ -181,9 +221,15 @@
       }
     },
     "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "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
     },
     "astw": {
@@ -192,7 +238,7 @@
       "integrity": "sha1-e9QXhNMkk5h66yOba04cV6hzuRc=",
       "dev": true,
       "requires": {
-        "acorn": "4.0.13"
+        "acorn": "^4.0.3"
       }
     },
     "async-each": {
@@ -213,37 +259,92 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
       "dev": true
     },
+    "atob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
+      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=",
+      "dev": true
+    },
     "autoprefixer": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz",
-      "integrity": "sha512-C9yv/UF3X+eJTi/zvfxuyfxmLibYrntpF3qoJYrMeQwgUJOZrZvpJiMG2FMQ3qnhWtF/be4pYONBBw95ZGe3vA==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.1.1.tgz",
+      "integrity": "sha512-Q/2zhVEglXXCBNCOFfnihQcQystPYJt4GrIopeWhPjFxRPXya8eOstB89AafW0nWhSscByp+rSXp9EE5X4zgXQ==",
       "dev": true,
       "requires": {
-        "browserslist": "2.9.1",
-        "caniuse-lite": "1.0.30000775",
-        "normalize-range": "0.1.2",
-        "num2fraction": "1.2.2",
-        "postcss": "6.0.14",
-        "postcss-value-parser": "3.3.0"
+        "browserslist": "^4.0.2",
+        "caniuse-lite": "^1.0.30000876",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.2",
+        "postcss-value-parser": "^3.2.3"
       }
     },
     "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "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.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
       "dev": true
     },
-    "balanced-match": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-      "dev": true
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "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": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "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": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "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": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
     },
     "base64-js": {
       "version": "1.2.1",
@@ -252,13 +353,13 @@
       "dev": true
     },
     "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "dev": true,
       "optional": true,
       "requires": {
-        "tweetnacl": "0.14.5"
+        "tweetnacl": "^0.14.3"
       }
     },
     "binary-extensions": {
@@ -273,7 +374,7 @@
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "~2.0.0"
       }
     },
     "bn.js": {
@@ -282,14 +383,11 @@
       "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
       "dev": true
     },
-    "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-      "dev": true,
-      "requires": {
-        "hoek": "2.16.3"
-      }
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
     },
     "brace-expansion": {
       "version": "1.1.8",
@@ -297,7 +395,7 @@
       "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
       "dev": true,
       "requires": {
-        "balanced-match": "1.0.0",
+        "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       },
       "dependencies": {
@@ -310,14 +408,32 @@
       }
     },
     "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.2",
-        "preserve": "0.2.0",
-        "repeat-element": "1.1.2"
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "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"
+          }
+        }
       }
     },
     "brorand": {
@@ -332,11 +448,11 @@
       "integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=",
       "dev": true,
       "requires": {
-        "JSONStream": "1.3.1",
-        "combine-source-map": "0.7.2",
-        "defined": "1.0.0",
-        "through2": "2.0.3",
-        "umd": "3.0.1"
+        "JSONStream": "^1.0.3",
+        "combine-source-map": "~0.7.1",
+        "defined": "^1.0.0",
+        "through2": "^2.0.0",
+        "umd": "^3.0.0"
       }
     },
     "browser-resolve": {
@@ -362,53 +478,53 @@
       "integrity": "sha1-tanJAgJD8McORnW+yCI7xifkFc4=",
       "dev": true,
       "requires": {
-        "JSONStream": "1.3.1",
-        "assert": "1.4.1",
-        "browser-pack": "6.0.2",
-        "browser-resolve": "1.11.2",
-        "browserify-zlib": "0.1.4",
-        "buffer": "4.9.1",
-        "cached-path-relative": "1.0.1",
-        "concat-stream": "1.5.2",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.12.0",
-        "defined": "1.0.0",
-        "deps-sort": "2.0.0",
-        "domain-browser": "1.1.7",
-        "duplexer2": "0.1.4",
-        "events": "1.1.1",
-        "glob": "7.1.2",
-        "has": "1.0.1",
-        "htmlescape": "1.1.1",
-        "https-browserify": "0.0.1",
-        "inherits": "2.0.3",
-        "insert-module-globals": "7.0.1",
-        "labeled-stream-splicer": "2.0.0",
-        "module-deps": "4.1.1",
-        "os-browserify": "0.1.2",
-        "parents": "1.0.1",
-        "path-browserify": "0.0.0",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "read-only-stream": "2.0.0",
-        "readable-stream": "2.3.3",
-        "resolve": "1.5.0",
-        "shasum": "1.0.2",
-        "shell-quote": "1.6.1",
-        "stream-browserify": "2.0.1",
-        "stream-http": "2.7.2",
-        "string_decoder": "0.10.31",
-        "subarg": "1.0.0",
-        "syntax-error": "1.3.0",
-        "through2": "2.0.3",
-        "timers-browserify": "1.4.2",
-        "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.10.3",
-        "vm-browserify": "0.0.4",
-        "xtend": "4.0.1"
+        "JSONStream": "^1.0.3",
+        "assert": "^1.4.0",
+        "browser-pack": "^6.0.1",
+        "browser-resolve": "^1.11.0",
+        "browserify-zlib": "~0.1.2",
+        "buffer": "^4.1.0",
+        "cached-path-relative": "^1.0.0",
+        "concat-stream": "~1.5.1",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "~1.0.0",
+        "crypto-browserify": "^3.0.0",
+        "defined": "^1.0.0",
+        "deps-sort": "^2.0.0",
+        "domain-browser": "~1.1.0",
+        "duplexer2": "~0.1.2",
+        "events": "~1.1.0",
+        "glob": "^7.1.0",
+        "has": "^1.0.0",
+        "htmlescape": "^1.1.0",
+        "https-browserify": "~0.0.0",
+        "inherits": "~2.0.1",
+        "insert-module-globals": "^7.0.0",
+        "labeled-stream-splicer": "^2.0.0",
+        "module-deps": "^4.0.8",
+        "os-browserify": "~0.1.1",
+        "parents": "^1.0.1",
+        "path-browserify": "~0.0.0",
+        "process": "~0.11.0",
+        "punycode": "^1.3.2",
+        "querystring-es3": "~0.2.0",
+        "read-only-stream": "^2.0.0",
+        "readable-stream": "^2.0.2",
+        "resolve": "^1.1.4",
+        "shasum": "^1.0.0",
+        "shell-quote": "^1.6.1",
+        "stream-browserify": "^2.0.0",
+        "stream-http": "^2.0.0",
+        "string_decoder": "~0.10.0",
+        "subarg": "^1.0.0",
+        "syntax-error": "^1.1.1",
+        "through2": "^2.0.0",
+        "timers-browserify": "^1.0.1",
+        "tty-browserify": "~0.0.0",
+        "url": "~0.11.0",
+        "util": "~0.10.1",
+        "vm-browserify": "~0.0.1",
+        "xtend": "^4.0.0"
       },
       "dependencies": {
         "string_decoder": {
@@ -425,12 +541,12 @@
       "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==",
       "dev": true,
       "requires": {
-        "buffer-xor": "1.0.3",
-        "cipher-base": "1.0.4",
-        "create-hash": "1.1.3",
-        "evp_bytestokey": "1.0.3",
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "browserify-cipher": {
@@ -439,9 +555,9 @@
       "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
       "dev": true,
       "requires": {
-        "browserify-aes": "1.1.1",
-        "browserify-des": "1.0.0",
-        "evp_bytestokey": "1.0.3"
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
       }
     },
     "browserify-des": {
@@ -450,9 +566,9 @@
       "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "des.js": "1.0.0",
-        "inherits": "2.0.3"
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1"
       }
     },
     "browserify-rsa": {
@@ -461,8 +577,8 @@
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "randombytes": "2.0.5"
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
       }
     },
     "browserify-sign": {
@@ -471,13 +587,13 @@
       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
-        "elliptic": "6.4.0",
-        "inherits": "2.0.3",
-        "parse-asn1": "5.1.0"
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
       }
     },
     "browserify-zlib": {
@@ -486,17 +602,18 @@
       "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
       "dev": true,
       "requires": {
-        "pako": "0.2.9"
+        "pako": "~0.2.0"
       }
     },
     "browserslist": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.9.1.tgz",
-      "integrity": "sha512-3n3nPdbUqn3nWmsy4PeSQthz2ja1ndpoXta+dwFFNhveGjMg6FXpWYe12vsTpNoXJbzx3j7GZXdtoVIdvh3JbA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.0.2.tgz",
+      "integrity": "sha512-lpujC4zv1trcKUUwfD4pFVNga4YSpB3sLB+/I+A8gvGQxno1c0dMB2aCQy0FE5oUNIDjD9puFiFF0zeS6Ji48w==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "1.0.30000775",
-        "electron-to-chromium": "1.3.27"
+        "caniuse-lite": "^1.0.30000876",
+        "electron-to-chromium": "^1.3.57",
+        "node-releases": "^1.0.0-alpha.11"
       }
     },
     "buffer": {
@@ -505,9 +622,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "1.2.1",
-        "ieee754": "1.1.8",
-        "isarray": "1.0.0"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
       }
     },
     "buffer-xor": {
@@ -528,12 +645,35 @@
       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
       "dev": true
     },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "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"
+      }
+    },
     "cached-path-relative": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz",
       "integrity": "sha1-0JxLUoAKpMB44t2BqGmqyQ0uVOc=",
       "dev": true
     },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+      "dev": true
+    },
     "camelcase": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
@@ -546,78 +686,64 @@
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
-        "camelcase": "2.1.1",
-        "map-obj": "1.0.1"
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
       }
     },
     "caniuse-api": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
-      "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
       "dev": true,
       "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000775",
-        "lodash.memoize": "4.1.2",
-        "lodash.uniq": "4.5.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "1.7.7",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-          "dev": true,
-          "requires": {
-            "caniuse-db": "1.0.30000775",
-            "electron-to-chromium": "1.3.27"
-          }
-        }
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
       }
     },
-    "caniuse-db": {
-      "version": "1.0.30000775",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000775.tgz",
-      "integrity": "sha1-BLzN0CFO3yW5f2GglmCfetaQQzM=",
-      "dev": true
-    },
     "caniuse-lite": {
-      "version": "1.0.30000775",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000775.tgz",
-      "integrity": "sha1-dNJ/7dxH88hM+8sTDDCSo168LeI=",
+      "version": "1.0.30000877",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000877.tgz",
+      "integrity": "sha512-h04kV/lcuhItU1CZTJOxUEk/9R+1XeJqgc67E+XC8J9TjPM8kzVgOn27ZtRdDUo8O5F8U4QRCzDWJrVym3w3Cg==",
       "dev": true
     },
     "caseless": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-      "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
       "dev": true
     },
     "chalk": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-      "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "3.2.0",
-        "escape-string-regexp": "1.0.5",
-        "supports-color": "4.5.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
     "chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+      "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
       "dev": true,
       "requires": {
-        "anymatch": "1.3.2",
-        "async-each": "1.0.1",
-        "fsevents": "1.1.3",
-        "glob-parent": "2.0.0",
-        "inherits": "2.0.3",
-        "is-binary-path": "1.0.1",
-        "is-glob": "2.0.1",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.1.0"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.0",
+        "braces": "^2.3.0",
+        "fsevents": "^1.2.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "lodash.debounce": "^4.0.8",
+        "normalize-path": "^2.1.1",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0",
+        "upath": "^1.0.5"
       }
     },
     "cipher-base": {
@@ -626,43 +752,30 @@
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
-    "clap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
-      "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3"
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.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
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+        "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": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
+            "is-descriptor": "^0.1.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
         }
       }
     },
@@ -672,45 +785,30 @@
       "integrity": "sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4=",
       "dev": true
     },
-    "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-spinners": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz",
-      "integrity": "sha1-8YR7FohE2RemceudFH499JfJDQY=",
-      "dev": true
-    },
     "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.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
       }
     },
-    "clone": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-      "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true
     },
     "coa": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz",
-      "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz",
+      "integrity": "sha512-5wfTTO8E2/ja4jFSxePXlG5nRu5bBtL/r1HCIpJW/lzT6yDtKl0u0Z4o/Vpz32IpKmBn7HerheEZQgA9N2DarQ==",
       "dev": true,
       "requires": {
-        "q": "1.5.1"
+        "q": "^1.1.2"
       }
     },
     "code-point-at": {
@@ -719,50 +817,49 @@
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
       "dev": true
     },
+    "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": "0.11.4",
-      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
+      "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
       "dev": true,
       "requires": {
-        "clone": "1.0.3",
-        "color-convert": "1.9.1",
-        "color-string": "0.3.0"
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
       }
     },
     "color-convert": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
+      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
       "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "1.1.1"
       }
     },
     "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
       "dev": true
     },
     "color-string": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
-      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "colormin": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
-      "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
       "dev": true,
       "requires": {
-        "color": "0.11.4",
-        "css-color-names": "0.0.4",
-        "has": "1.0.1"
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
       }
     },
     "colors": {
@@ -777,10 +874,10 @@
       "integrity": "sha1-CHAxKFazB6h8xKxIbzqaYq7MwJ4=",
       "dev": true,
       "requires": {
-        "convert-source-map": "1.1.3",
-        "inline-source-map": "0.6.2",
-        "lodash.memoize": "3.0.4",
-        "source-map": "0.5.7"
+        "convert-source-map": "~1.1.0",
+        "inline-source-map": "~0.6.0",
+        "lodash.memoize": "~3.0.3",
+        "source-map": "~0.5.3"
       },
       "dependencies": {
         "lodash.memoize": {
@@ -798,18 +895,18 @@
       }
     },
     "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "dev": true,
       "requires": {
-        "delayed-stream": "1.0.0"
+        "delayed-stream": "~1.0.0"
       }
     },
-    "commander": {
-      "version": "2.12.2",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
-      "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
+    "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
     },
     "concat-map": {
@@ -824,9 +921,9 @@
       "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.0.6",
-        "typedarray": "0.0.6"
+        "inherits": "~2.0.1",
+        "readable-stream": "~2.0.0",
+        "typedarray": "~0.0.5"
       },
       "dependencies": {
         "readable-stream": {
@@ -835,12 +932,12 @@
           "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "0.10.31",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~1.0.6",
+            "string_decoder": "~0.10.x",
+            "util-deprecate": "~1.0.1"
           }
         },
         "string_decoder": {
@@ -857,7 +954,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "0.1.4"
+        "date-now": "^0.1.4"
       }
     },
     "console-control-strings": {
@@ -878,6 +975,12 @@
       "integrity": "sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=",
       "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
+    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -885,25 +988,25 @@
       "dev": true
     },
     "cosmiconfig": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.6.tgz",
+      "integrity": "sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ==",
       "dev": true,
       "requires": {
-        "is-directory": "0.3.1",
-        "js-yaml": "3.7.0",
-        "minimist": "1.2.0",
-        "object-assign": "4.1.1",
-        "os-homedir": "1.0.2",
-        "parse-json": "2.2.0",
-        "require-from-string": "1.2.1"
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.9.0",
+        "parse-json": "^4.0.0"
       },
       "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
+        "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"
+          }
         }
       }
     },
@@ -913,8 +1016,8 @@
       "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "elliptic": "6.4.0"
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
       }
     },
     "create-hash": {
@@ -923,10 +1026,10 @@
       "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "inherits": "2.0.3",
-        "ripemd160": "2.0.1",
-        "sha.js": "2.4.9"
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "sha.js": "^2.4.0"
       }
     },
     "create-hmac": {
@@ -935,12 +1038,12 @@
       "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "create-hash": "1.1.3",
-        "inherits": "2.0.3",
-        "ripemd160": "2.0.1",
-        "safe-buffer": "5.1.1",
-        "sha.js": "2.4.9"
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
     "cross-spawn": {
@@ -949,17 +1052,8 @@
       "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.1",
-        "which": "1.3.0"
-      }
-    },
-    "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-      "dev": true,
-      "requires": {
-        "boom": "2.10.1"
+        "lru-cache": "^4.0.1",
+        "which": "^1.2.9"
       }
     },
     "crypto-browserify": {
@@ -968,17 +1062,17 @@
       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
-        "browserify-cipher": "1.0.0",
-        "browserify-sign": "4.0.4",
-        "create-ecdh": "4.0.0",
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
-        "diffie-hellman": "5.0.2",
-        "inherits": "2.0.3",
-        "pbkdf2": "3.0.14",
-        "public-encrypt": "4.0.0",
-        "randombytes": "2.0.5",
-        "randomfill": "1.0.3"
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
       }
     },
     "css-color-names": {
@@ -987,140 +1081,55 @@
       "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
       "dev": true
     },
-    "cssnano": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
-      "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
-      "dev": true,
-      "requires": {
-        "autoprefixer": "6.7.7",
-        "decamelize": "1.2.0",
-        "defined": "1.0.0",
-        "has": "1.0.1",
-        "object-assign": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-calc": "5.3.1",
-        "postcss-colormin": "2.2.2",
-        "postcss-convert-values": "2.6.1",
-        "postcss-discard-comments": "2.0.4",
-        "postcss-discard-duplicates": "2.1.0",
-        "postcss-discard-empty": "2.1.0",
-        "postcss-discard-overridden": "0.1.1",
-        "postcss-discard-unused": "2.2.3",
-        "postcss-filter-plugins": "2.0.2",
-        "postcss-merge-idents": "2.1.7",
-        "postcss-merge-longhand": "2.0.2",
-        "postcss-merge-rules": "2.1.2",
-        "postcss-minify-font-values": "1.0.5",
-        "postcss-minify-gradients": "1.0.5",
-        "postcss-minify-params": "1.2.2",
-        "postcss-minify-selectors": "2.1.1",
-        "postcss-normalize-charset": "1.1.1",
-        "postcss-normalize-url": "3.0.8",
-        "postcss-ordered-values": "2.2.3",
-        "postcss-reduce-idents": "2.4.0",
-        "postcss-reduce-initial": "1.0.1",
-        "postcss-reduce-transforms": "1.0.4",
-        "postcss-svgo": "2.1.6",
-        "postcss-unique-selectors": "2.0.2",
-        "postcss-value-parser": "3.3.0",
-        "postcss-zindex": "2.2.0"
+    "css-declaration-sorter": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-3.0.1.tgz",
+      "integrity": "sha512-jH4024SHZ3e0M7ann9VxpFpH3moplRXNz9ZBqvFMZqi09Yo5ARbs2wdPH8GqN9iRTlQynrbGbraNbBxBLei85Q==",
+      "dev": true,
+      "requires": {
+        "postcss": "^6.0.0",
+        "timsort": "^0.3.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
-        },
-        "autoprefixer": {
-          "version": "6.7.7",
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
-          "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
-          "dev": true,
-          "requires": {
-            "browserslist": "1.7.7",
-            "caniuse-db": "1.0.30000775",
-            "normalize-range": "0.1.2",
-            "num2fraction": "1.2.2",
-            "postcss": "5.2.18",
-            "postcss-value-parser": "3.3.0"
-          }
-        },
-        "browserslist": {
-          "version": "1.7.7",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-          "dev": true,
-          "requires": {
-            "caniuse-db": "1.0.30000775",
-            "electron-to-chromium": "1.3.27"
-          }
-        },
-        "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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "csso": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
-      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
+    "css-select": {
+      "version": "1.3.0-rc0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz",
+      "integrity": "sha1-b5MZaqrnN2ZuoQNqjLFKj8t6kjE=",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "^1.0.1"
+      }
+    },
+    "css-select-base-adapter": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz",
+      "integrity": "sha1-AQKz0UYw34bD65+p9UVicBBs+ZA=",
+      "dev": true
+    },
+    "css-tree": {
+      "version": "1.0.0-alpha25",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz",
+      "integrity": "sha512-XC6xLW/JqIGirnZuUWHXCHRaAjje2b3OIB0Vj5RIJo6mIi/AdJo30quQl5LxUl0gkXDIrTrFGbMlcZjyFplz1A==",
       "dev": true,
       "requires": {
-        "clap": "1.2.3",
-        "source-map": "0.5.7"
+        "mdn-data": "^1.0.0",
+        "source-map": "^0.5.3"
       },
       "dependencies": {
         "source-map": {
@@ -1131,44 +1140,262 @@
         }
       }
     },
-    "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,
-      "requires": {
-        "array-find-index": "1.0.2"
-      }
+    "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
     },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+    "css-url-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
+      "integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=",
+      "dev": true
+    },
+    "css-what": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
+      "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
+      "dev": true
+    },
+    "cssnano": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.0.5.tgz",
+      "integrity": "sha512-P2O0sz/YAAzqZVsSWOrbliPCr0c6abwVNQmFZ48AgejN/GbzwEf6IVFGQAj0UKHC+crv60wUAPQocAnDmeWlkg==",
       "dev": true,
       "requires": {
-        "assert-plus": "1.0.0"
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.0",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^6.0.0"
       },
       "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
+          }
         }
       }
     },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+    "cssnano-preset-default": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.0.tgz",
+      "integrity": "sha1-wzQoe099SfstFwqS+SFGVXiOO2s=",
+      "dev": true,
+      "requires": {
+        "css-declaration-sorter": "^3.0.0",
+        "cssnano-util-raw-cache": "^4.0.0",
+        "postcss": "^6.0.0",
+        "postcss-calc": "^6.0.0",
+        "postcss-colormin": "^4.0.0",
+        "postcss-convert-values": "^4.0.0",
+        "postcss-discard-comments": "^4.0.0",
+        "postcss-discard-duplicates": "^4.0.0",
+        "postcss-discard-empty": "^4.0.0",
+        "postcss-discard-overridden": "^4.0.0",
+        "postcss-merge-longhand": "^4.0.0",
+        "postcss-merge-rules": "^4.0.0",
+        "postcss-minify-font-values": "^4.0.0",
+        "postcss-minify-gradients": "^4.0.0",
+        "postcss-minify-params": "^4.0.0",
+        "postcss-minify-selectors": "^4.0.0",
+        "postcss-normalize-charset": "^4.0.0",
+        "postcss-normalize-display-values": "^4.0.0",
+        "postcss-normalize-positions": "^4.0.0",
+        "postcss-normalize-repeat-style": "^4.0.0",
+        "postcss-normalize-string": "^4.0.0",
+        "postcss-normalize-timing-functions": "^4.0.0",
+        "postcss-normalize-unicode": "^4.0.0",
+        "postcss-normalize-url": "^4.0.0",
+        "postcss-normalize-whitespace": "^4.0.0",
+        "postcss-ordered-values": "^4.0.0",
+        "postcss-reduce-initial": "^4.0.0",
+        "postcss-reduce-transforms": "^4.0.0",
+        "postcss-svgo": "^4.0.0",
+        "postcss-unique-selectors": "^4.0.0"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
+          }
+        }
+      }
+    },
+    "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.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.0.tgz",
+      "integrity": "sha1-vgooVuJfGF9feivMBiTii38Xmp8=",
+      "dev": true,
+      "requires": {
+        "postcss": "^6.0.0"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
+          }
+        }
+      }
+    },
+    "cssnano-util-same-parent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.0.tgz",
+      "integrity": "sha1-0qPeEDmqmLxOwlAB+gUDMMKhbaw=",
+      "dev": true
+    },
+    "csso": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
+      "integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
+      "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": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
+          "dev": true,
+          "requires": {
+            "mdn-data": "~1.1.0",
+            "source-map": "^0.5.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "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,
+      "requires": {
+        "array-find-index": "^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"
+      }
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
       "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
       "dev": true
     },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "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
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "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": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "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": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "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": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "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": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
     "defined": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
@@ -1188,9 +1415,9 @@
       "dev": true
     },
     "dependency-graph": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.5.2.tgz",
-      "integrity": "sha512-fuF8ISen2Rk75wQ4tWHcfJ/IV1cmPMFE+wth10tAnj/JkpqMJzNW5oKpVOCAkpdfYD+NwtA3kL3nOeyprxPG2A==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.1.tgz",
+      "integrity": "sha512-2s2uojwu7aq0K94DwrnJwo/mTkGiPqy2cU7z5BVXmhb564WgITZR3ruZMUIJ8Ymb5ruew244odZCR23/lZoxXg==",
       "dev": true
     },
     "deps-sort": {
@@ -1199,10 +1426,10 @@
       "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=",
       "dev": true,
       "requires": {
-        "JSONStream": "1.3.1",
-        "shasum": "1.0.2",
-        "subarg": "1.0.0",
-        "through2": "2.0.3"
+        "JSONStream": "^1.0.3",
+        "shasum": "^1.0.0",
+        "subarg": "^1.0.0",
+        "through2": "^2.0.0"
       }
     },
     "des.js": {
@@ -1211,8 +1438,8 @@
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "detective": {
@@ -1221,8 +1448,8 @@
       "integrity": "sha512-bvuiWqtm2RYtEnfjAuRw9XTJhUbfbOfsmtIRXQcNgMyUplxJP611EzoVxObkSvaSnfBUEjoKVzaUzdtIRMcCXg==",
       "dev": true,
       "requires": {
-        "acorn": "5.2.1",
-        "defined": "1.0.0"
+        "acorn": "^5.2.1",
+        "defined": "^1.0.0"
       },
       "dependencies": {
         "acorn": {
@@ -1239,9 +1466,54 @@
       "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "miller-rabin": "4.0.1",
-        "randombytes": "2.0.5"
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "dir-glob": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+      "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+      "dev": true,
+      "requires": {
+        "arrify": "^1.0.1",
+        "path-type": "^3.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": 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
+        }
+      }
+    },
+    "dom-serializer": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "~1.1.1",
+        "entities": "~1.1.1"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
+          "dev": true
+        }
       }
     },
     "domain-browser": {
@@ -1250,35 +1522,61 @@
       "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
       "dev": true
     },
+    "domelementtype": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
+      "dev": true
+    },
     "domready": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/domready/-/domready-1.0.8.tgz",
       "integrity": "sha1-kfJS5Ze2Wvd+dFriTdAYXV4m1Yw=",
       "dev": true
     },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "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": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "dev": true,
+      "requires": {
+        "is-obj": "^1.0.0"
+      }
+    },
     "duplexer2": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
       "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.3"
+        "readable-stream": "^2.0.2"
       }
     },
     "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "dev": true,
       "optional": true,
       "requires": {
-        "jsbn": "0.1.1"
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
-      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
+      "version": "1.3.58",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz",
+      "integrity": "sha512-AGJxlBEn2wOohxqWZkISVsOjZueKTQljfEODTDSEiMqSpH0S+xzV+/5oEM9AGaqhu7DzrpKOgU7ocQRjj0nJmg==",
       "dev": true
     },
     "elem-dataset": {
@@ -1299,22 +1597,52 @@
       "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "brorand": "1.1.0",
-        "hash.js": "1.1.3",
-        "hmac-drbg": "1.0.1",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0",
-        "minimalistic-crypto-utils": "1.0.1"
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
       }
     },
+    "entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
+      "dev": true
+    },
     "error-ex": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
       "dev": true,
       "requires": {
-        "is-arrayish": "0.2.1"
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
+      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
+      "dev": 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.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.1",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.1"
       }
     },
     "escape-string-regexp": {
@@ -1324,9 +1652,9 @@
       "dev": true
     },
     "esprima": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true
     },
     "events": {
@@ -1341,8 +1669,8 @@
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
-        "md5.js": "1.3.4",
-        "safe-buffer": "5.1.1"
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
       }
     },
     "exec-sh": {
@@ -1351,7 +1679,7 @@
       "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==",
       "dev": true,
       "requires": {
-        "merge": "1.2.0"
+        "merge": "^1.1.3"
       }
     },
     "execa": {
@@ -1360,13 +1688,13 @@
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "dev": true,
       "requires": {
-        "cross-spawn": "5.1.0",
-        "get-stream": "3.0.0",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
+        "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": {
@@ -1375,44 +1703,138 @@
           "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
           "requires": {
-            "lru-cache": "4.1.1",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         }
       }
     },
     "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.1"
-      }
-    },
-    "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=",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
-        "fill-range": "2.2.3"
+        "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": {
+        "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"
+          }
+        }
       }
     },
     "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true
     },
-    "extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+    "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": {
-        "is-extglob": "1.0.0"
+        "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": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "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": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "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": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "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": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
       }
     },
     "extsprintf": {
@@ -1421,23 +1843,53 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
       "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=",
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+      "dev": true
+    },
+    "fast-glob": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz",
+      "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==",
+      "dev": true,
+      "requires": {
+        "@mrmlnc/readdir-enhanced": "^2.2.1",
+        "@nodelib/fs.stat": "^1.0.1",
+        "glob-parent": "^3.1.0",
+        "is-glob": "^4.0.0",
+        "merge2": "^1.2.1",
+        "micromatch": "^3.1.10"
+      }
+    },
+    "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
     },
     "fill-range": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "requires": {
-        "is-number": "2.1.0",
-        "isobject": "2.1.0",
-        "randomatic": "1.1.7",
-        "repeat-element": "1.1.2",
-        "repeat-string": "1.6.1"
+        "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"
+          }
+        }
       }
     },
     "find-up": {
@@ -1446,8 +1898,8 @@
       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
       "dev": true,
       "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "flatten": {
@@ -1462,15 +1914,6 @@
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true
     },
-    "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.2"
-      }
-    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -1478,25 +1921,34 @@
       "dev": true
     },
     "form-data": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "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": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.17"
+        "map-cache": "^0.2.2"
       }
     },
     "fs-extra": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
-      "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
+      "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "4.0.0",
-        "universalify": "0.1.1"
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       }
     },
     "fs.realpath": {
@@ -1506,39 +1958,29 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
-      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "2.8.0",
-        "node-pre-gyp": "0.6.39"
+        "nan": "^2.9.2",
+        "node-pre-gyp": "^0.10.0"
       },
       "dependencies": {
         "abbrev": {
-          "version": "1.1.0",
+          "version": "1.1.1",
           "bundled": true,
           "dev": true,
           "optional": true
         },
-        "ajv": {
-          "version": "4.11.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
+        "ansi-regex": {
+          "version": "2.1.1",
           "bundled": true,
           "dev": true
         },
         "aproba": {
-          "version": "1.1.1",
+          "version": "1.2.0",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -1549,92 +1991,26 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.2.9"
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
           }
         },
-        "asn1": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "assert-plus": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws4": {
-          "version": "1.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
         "balanced-match": {
-          "version": "0.4.2",
+          "version": "1.0.0",
           "bundled": true,
           "dev": true
         },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "tweetnacl": "0.14.5"
-          }
-        },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        },
-        "boom": {
-          "version": "2.10.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
         "brace-expansion": {
-          "version": "1.1.7",
+          "version": "1.1.11",
           "bundled": true,
           "dev": true,
           "requires": {
-            "balanced-match": "0.4.2",
+            "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
           }
         },
-        "buffer-shims": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "co": {
-          "version": "4.6.0",
+        "chownr": {
+          "version": "1.0.1",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -1644,14 +2020,6 @@
           "bundled": true,
           "dev": true
         },
-        "combined-stream": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "delayed-stream": "1.0.0"
-          }
-        },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
@@ -1665,35 +2033,11 @@
         "core-util-is": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "bundled": true,
           "dev": true,
-          "requires": {
-            "boom": "2.10.1"
-          }
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
+          "optional": true
         },
         "debug": {
-          "version": "2.6.8",
+          "version": "2.6.9",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1702,16 +2046,11 @@
           }
         },
         "deep-extend": {
-          "version": "0.4.2",
+          "version": "0.5.1",
           "bundled": true,
           "dev": true,
           "optional": true
         },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
         "delegates": {
           "version": "1.0.0",
           "bundled": true,
@@ -1719,74 +2058,25 @@
           "optional": true
         },
         "detect-libc": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "extend": {
-          "version": "3.0.1",
+          "version": "1.0.3",
           "bundled": true,
           "dev": true,
           "optional": true
         },
-        "extsprintf": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "form-data": {
-          "version": "2.1.4",
+        "fs-minipass": {
+          "version": "1.2.5",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
+            "minipass": "^2.2.1"
           }
         },
         "fs.realpath": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "inherits": "2.0.3",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.1"
-          }
-        },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "bundled": true,
           "dev": true,
-          "optional": true,
-          "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
-          }
+          "optional": true
         },
         "gauge": {
           "version": "2.7.4",
@@ -1794,65 +2084,28 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "aproba": "1.1.1",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
+            "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.2",
           "bundled": true,
           "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "bundled": true,
-          "dev": true
-        },
-        "har-schema": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "har-validator": {
-          "version": "4.2.1",
-          "bundled": true,
-          "dev": true,
           "optional": true,
           "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
+            "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": {
@@ -1861,40 +2114,32 @@
           "dev": true,
           "optional": true
         },
-        "hawk": {
-          "version": "3.1.3",
+        "iconv-lite": {
+          "version": "0.4.21",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
+            "safer-buffer": "^2.1.0"
           }
         },
-        "hoek": {
-          "version": "2.16.3",
-          "bundled": true,
-          "dev": true
-        },
-        "http-signature": {
-          "version": "1.1.1",
+        "ignore-walk": {
+          "version": "3.0.1",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
+            "minimatch": "^3.0.4"
           }
         },
         "inflight": {
           "version": "1.0.6",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "once": "^1.3.0",
+            "wrappy": "1"
           }
         },
         "inherits": {
@@ -1903,7 +2148,7 @@
           "dev": true
         },
         "ini": {
-          "version": "1.3.4",
+          "version": "1.3.5",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -1913,167 +2158,132 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
         "isarray": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true,
           "dev": true,
           "optional": true
         },
-        "jodid25519": {
-          "version": "1.0.2",
+        "minimatch": {
+          "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
-            "jsbn": "0.1.1"
+            "brace-expansion": "^1.1.7"
           }
         },
-        "jsbn": {
-          "version": "0.1.1",
+        "minimist": {
+          "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
-        "json-schema": {
-          "version": "0.2.3",
+        "minipass": {
+          "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true
+          "requires": {
+            "safe-buffer": "^5.1.1",
+            "yallist": "^3.0.0"
+          }
         },
-        "json-stable-stringify": {
-          "version": "1.0.1",
+        "minizlib": {
+          "version": "1.1.0",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "jsonify": "0.0.0"
+            "minipass": "^2.2.1"
           }
         },
-        "json-stringify-safe": {
-          "version": "5.0.1",
+        "mkdirp": {
+          "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true
+          "requires": {
+            "minimist": "0.0.8"
+          }
         },
-        "jsonify": {
-          "version": "0.0.0",
+        "ms": {
+          "version": "2.0.0",
           "bundled": true,
           "dev": true,
           "optional": true
         },
-        "jsprim": {
-          "version": "1.4.0",
-          "bundled": true,
+        "nan": {
+          "version": "2.10.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+          "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
           "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.0.2",
-            "json-schema": "0.2.3",
-            "verror": "1.3.6"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "mime-db": {
-          "version": "1.27.0",
-          "bundled": true,
-          "dev": true
+          "optional": true
         },
-        "mime-types": {
-          "version": "2.1.15",
+        "needle": {
+          "version": "2.2.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "mime-db": "1.27.0"
+            "debug": "^2.1.2",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
           }
         },
-        "minimatch": {
-          "version": "3.0.4",
+        "node-pre-gyp": {
+          "version": "0.10.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "brace-expansion": "1.1.7"
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.0",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.1.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
           }
         },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
+        "nopt": {
+          "version": "4.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "minimist": "0.0.8"
+            "abbrev": "1",
+            "osenv": "^0.1.4"
           }
         },
-        "ms": {
-          "version": "2.0.0",
+        "npm-bundled": {
+          "version": "1.0.3",
           "bundled": true,
           "dev": true,
           "optional": true
         },
-        "node-pre-gyp": {
-          "version": "0.6.39",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "1.0.2",
-            "hawk": "3.1.3",
-            "mkdirp": "0.5.1",
-            "nopt": "4.0.1",
-            "npmlog": "4.1.0",
-            "rc": "1.2.1",
-            "request": "2.81.0",
-            "rimraf": "2.6.1",
-            "semver": "5.3.0",
-            "tar": "2.2.1",
-            "tar-pack": "3.4.0"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
+        "npm-packlist": {
+          "version": "1.1.10",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
           }
         },
         "npmlog": {
-          "version": "4.1.0",
+          "version": "4.1.2",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
+            "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": {
@@ -2081,12 +2291,6 @@
           "bundled": true,
           "dev": true
         },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
         "object-assign": {
           "version": "4.1.1",
           "bundled": true,
@@ -2098,7 +2302,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "wrappy": "1.0.2"
+            "wrappy": "1"
           }
         },
         "os-homedir": {
@@ -2114,53 +2318,37 @@
           "optional": true
         },
         "osenv": {
-          "version": "0.1.4",
+          "version": "0.1.5",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
           }
         },
         "path-is-absolute": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
-        },
-        "performance-now": {
-          "version": "0.2.0",
-          "bundled": true,
           "dev": true,
           "optional": true
         },
         "process-nextick-args": {
-          "version": "1.0.7",
-          "bundled": true,
-          "dev": true
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "qs": {
-          "version": "6.4.0",
+          "version": "2.0.0",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "rc": {
-          "version": "1.2.1",
+          "version": "1.2.7",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.4",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
+            "deep-extend": "^0.5.1",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
           },
           "dependencies": {
             "minimist": {
@@ -2172,64 +2360,48 @@
           }
         },
         "readable-stream": {
-          "version": "2.2.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "buffer-shims": "1.0.0",
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "1.0.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "request": {
-          "version": "2.81.0",
+          "version": "2.3.6",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "4.2.1",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.15",
-            "oauth-sign": "0.8.2",
-            "performance-now": "0.2.0",
-            "qs": "6.4.0",
-            "safe-buffer": "5.0.1",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.0.1"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
         "rimraf": {
-          "version": "2.6.1",
+          "version": "2.6.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "glob": "7.1.2"
+            "glob": "^7.0.5"
           }
         },
         "safe-buffer": {
-          "version": "5.0.1",
+          "version": "5.1.1",
           "bundled": true,
           "dev": 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.3.0",
+          "version": "5.5.0",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -2246,69 +2418,31 @@
           "dev": true,
           "optional": true
         },
-        "sntp": {
-          "version": "1.0.9",
+        "string-width": {
+          "version": "1.0.2",
           "bundled": true,
           "dev": true,
           "requires": {
-            "hoek": "2.16.3"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         },
-        "sshpk": {
-          "version": "1.13.0",
+        "string_decoder": {
+          "version": "1.1.1",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "asn1": "0.2.3",
-            "assert-plus": "1.0.0",
-            "bcrypt-pbkdf": "1.0.1",
-            "dashdash": "1.14.1",
-            "ecc-jsbn": "0.1.1",
-            "getpass": "0.1.7",
-            "jodid25519": "1.0.2",
-            "jsbn": "0.1.1",
-            "tweetnacl": "0.14.5"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
+            "safe-buffer": "~5.1.0"
           }
         },
-        "stringstream": {
-          "version": "0.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
           "requires": {
-            "ansi-regex": "2.1.1"
+            "ansi-regex": "^2.0.0"
           }
         },
         "strip-json-comments": {
@@ -2318,94 +2452,44 @@
           "optional": true
         },
         "tar": {
-          "version": "2.2.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "block-stream": "0.0.9",
-            "fstream": "1.0.11",
-            "inherits": "2.0.3"
-          }
-        },
-        "tar-pack": {
-          "version": "3.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "2.6.8",
-            "fstream": "1.0.11",
-            "fstream-ignore": "1.0.5",
-            "once": "1.4.0",
-            "readable-stream": "2.2.9",
-            "rimraf": "2.6.1",
-            "tar": "2.2.1",
-            "uid-number": "0.0.6"
-          }
-        },
-        "tough-cookie": {
-          "version": "2.3.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "punycode": "1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
+          "version": "4.4.1",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "5.0.1"
+            "chownr": "^1.0.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.2.4",
+            "minizlib": "^1.1.0",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.1",
+            "yallist": "^3.0.2"
           }
         },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
         "util-deprecate": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "bundled": true,
           "dev": true,
           "optional": true
         },
-        "verror": {
-          "version": "1.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extsprintf": "1.0.2"
-          }
-        },
         "wide-align": {
           "version": "1.1.2",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "1.0.2"
+            "string-width": "^1.0.2"
           }
         },
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
           "dev": true
+        },
+        "yallist": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true
         }
       }
     },
@@ -2415,10 +2499,10 @@
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "inherits": "2.0.3",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.2"
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
       }
     },
     "function-bind": {
@@ -2433,38 +2517,23 @@
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0",
-        "console-control-strings": "1.1.0",
-        "has-unicode": "2.0.1",
-        "object-assign": "4.1.1",
-        "signal-exit": "3.0.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wide-align": "1.1.2"
+        "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"
       }
     },
     "gaze": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
-      "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
-      "dev": true,
-      "requires": {
-        "globule": "1.2.0"
-      }
-    },
-    "generate-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-      "dev": true
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
       "dev": true,
       "requires": {
-        "is-property": "1.0.2"
+        "globule": "^1.0.0"
       }
     },
     "get-caller-file": {
@@ -2485,21 +2554,19 @@
       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
       "dev": 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"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
+        "assert-plus": "^1.0.0"
       }
     },
     "glob": {
@@ -2508,55 +2575,73 @@
       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "dev": true,
       "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
-      }
-    },
-    "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.1"
+        "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-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "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": "2.0.1"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
       }
     },
+    "glob-to-regexp": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+      "dev": true
+    },
     "globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "dev": true,
-      "requires": {
-        "array-union": "1.0.2",
-        "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz",
+      "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "dir-glob": "^2.0.0",
+        "fast-glob": "^2.0.2",
+        "glob": "^7.1.2",
+        "ignore": "^3.3.5",
+        "pify": "^3.0.0",
+        "slash": "^1.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
+        }
       }
     },
     "globule": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
-      "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
       "dev": true,
       "requires": {
-        "glob": "7.1.2",
-        "lodash": "4.17.4",
-        "minimatch": "3.0.4"
+        "glob": "~7.1.1",
+        "lodash": "~4.17.10",
+        "minimatch": "~3.0.2"
       }
     },
     "graceful-fs": {
@@ -2565,43 +2650,20 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
       "dev": true
     },
+    "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": "2.0.6",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-      "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "commander": "2.12.2",
-        "is-my-json-valid": "2.16.1",
-        "pinkie-promise": "2.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
-        },
-        "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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "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
-        }
+        "ajv": "^5.1.0",
+        "har-schema": "^2.0.0"
       }
     },
     "has": {
@@ -2610,7 +2672,7 @@
       "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
       "dev": true,
       "requires": {
-        "function-bind": "1.1.1"
+        "function-bind": "^1.0.2"
       }
     },
     "has-ansi": {
@@ -2619,13 +2681,13 @@
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "has-flag": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
     "has-unicode": {
@@ -2634,13 +2696,45 @@
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
       "dev": true
     },
+    "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"
+          }
+        }
+      }
+    },
     "hash-base": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
       "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "^2.0.1"
       }
     },
     "hash.js": {
@@ -2649,21 +2743,15 @@
       "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.0"
       }
     },
-    "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-      "dev": true,
-      "requires": {
-        "boom": "2.10.1",
-        "cryptiles": "2.0.5",
-        "hoek": "2.16.3",
-        "sntp": "1.0.9"
-      }
+    "hex-color-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
+      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
+      "dev": true
     },
     "hmac-drbg": {
       "version": "1.0.1",
@@ -2671,23 +2759,29 @@
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
       "dev": true,
       "requires": {
-        "hash.js": "1.1.3",
-        "minimalistic-assert": "1.0.0",
-        "minimalistic-crypto-utils": "1.0.1"
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
       }
     },
-    "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true
-    },
     "hosted-git-info": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
       "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
       "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.1",
       "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz",
@@ -2701,14 +2795,14 @@
       "dev": true
     },
     "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "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": "0.2.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.13.1"
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
       }
     },
     "https-browserify": {
@@ -2723,6 +2817,30 @@
       "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
       "dev": true
     },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "dev": true
+    },
+    "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-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"
+      }
+    },
     "in-publish": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
@@ -2735,7 +2853,7 @@
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
       "requires": {
-        "repeating": "2.0.1"
+        "repeating": "^2.0.0"
       }
     },
     "indexes-of": {
@@ -2756,8 +2874,8 @@
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
     "inherits": {
@@ -2772,7 +2890,7 @@
       "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7"
+        "source-map": "~0.5.3"
       },
       "dependencies": {
         "source-map": {
@@ -2789,14 +2907,14 @@
       "integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=",
       "dev": true,
       "requires": {
-        "JSONStream": "1.3.1",
-        "combine-source-map": "0.7.2",
-        "concat-stream": "1.5.2",
-        "is-buffer": "1.1.6",
-        "lexical-scope": "1.2.0",
-        "process": "0.11.10",
-        "through2": "2.0.3",
-        "xtend": "4.0.1"
+        "JSONStream": "^1.0.3",
+        "combine-source-map": "~0.7.1",
+        "concat-stream": "~1.5.1",
+        "is-buffer": "^1.1.0",
+        "lexical-scope": "^1.2.0",
+        "process": "~0.11.0",
+        "through2": "^2.0.0",
+        "xtend": "^4.0.0"
       }
     },
     "invert-kv": {
@@ -2811,6 +2929,26 @@
       "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",
@@ -2823,7 +2961,7 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "1.11.0"
+        "binary-extensions": "^1.0.0"
       }
     },
     "is-buffer": {
@@ -2838,30 +2976,80 @@
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "dev": true,
       "requires": {
-        "builtin-modules": "1.1.1"
+        "builtin-modules": "^1.0.0"
       }
     },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
       "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=",
+    "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-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
-        "is-primitive": "2.0.0"
+        "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": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "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-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -2869,9 +3057,9 @@
       "dev": true
     },
     "is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "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": {
@@ -2880,7 +3068,7 @@
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
       }
     },
     "is-fullwidth-code-point": {
@@ -2889,61 +3077,66 @@
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "dev": true,
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
       }
     },
     "is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "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": {
-        "is-extglob": "1.0.0"
+        "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-my-json-valid": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
-      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
+    "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-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "requires": {
-        "generate-function": "2.0.0",
-        "generate-object-property": "1.2.0",
-        "jsonpointer": "4.0.1",
-        "xtend": "4.0.1"
+        "isobject": "^3.0.1"
       }
     },
-    "is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+    "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": {
-        "kind-of": "3.2.2"
+        "has": "^1.0.1"
       }
     },
-    "is-plain-obj": {
+    "is-resolvable": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": 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-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true
-    },
-    "is-property": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
     "is-stream": {
@@ -2953,14 +3146,20 @@
       "dev": true
     },
     "is-svg": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
-      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
+      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
       "dev": true,
       "requires": {
-        "html-comment-regex": "1.1.1"
+        "html-comment-regex": "^1.1.0"
       }
     },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
+    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -2973,6 +3172,12 @@
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -2986,13 +3191,10 @@
       "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"
-      }
+      "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",
@@ -3001,19 +3203,19 @@
       "dev": true
     },
     "js-base64": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.0.tgz",
-      "integrity": "sha512-Wehd+7Pf9tFvGb+ydPm9TjYjV8X1YHOVyG8QyELZxEMqOhemVwGRmoG8iQ/soqI3n8v4xn59zaLxiCJiaaRzKA==",
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz",
+      "integrity": "sha512-hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q==",
       "dev": true
     },
     "js-yaml": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
-      "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
+      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
       "dev": true,
       "requires": {
-        "argparse": "1.0.9",
-        "esprima": "2.7.3"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       }
     },
     "jsbn": {
@@ -3023,19 +3225,31 @@
       "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": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "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.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+      "dev": true
+    },
     "json-stable-stringify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
       "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
       "dev": true,
       "requires": {
-        "jsonify": "0.0.0"
+        "jsonify": "~0.0.0"
       }
     },
     "json-stringify-safe": {
@@ -3050,7 +3264,7 @@
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11"
+        "graceful-fs": "^4.1.6"
       }
     },
     "jsonify": {
@@ -3065,12 +3279,6 @@
       "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
       "dev": true
     },
-    "jsonpointer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-      "dev": true
-    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -3081,14 +3289,6 @@
         "extsprintf": "1.3.0",
         "json-schema": "0.2.3",
         "verror": "1.10.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "keyboardevent-key-polyfill": {
@@ -3098,13 +3298,10 @@
       "dev": true
     },
     "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.6"
-      }
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "dev": true
     },
     "labeled-stream-splicer": {
       "version": "2.0.0",
@@ -3112,9 +3309,9 @@
       "integrity": "sha1-pS4dE4AkwAuGscDJH2d5GLiuClk=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "isarray": "0.0.1",
-        "stream-splicer": "2.0.0"
+        "inherits": "^2.0.1",
+        "isarray": "~0.0.1",
+        "stream-splicer": "^2.0.0"
       },
       "dependencies": {
         "isarray": {
@@ -3131,7 +3328,7 @@
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
       "requires": {
-        "invert-kv": "1.0.0"
+        "invert-kv": "^1.0.0"
       }
     },
     "lexical-scope": {
@@ -3140,7 +3337,7 @@
       "integrity": "sha1-/Ope3HBKSzqHls3KQZw6CvryLfQ=",
       "dev": true,
       "requires": {
-        "astw": "2.2.0"
+        "astw": "^2.0.0"
       }
     },
     "load-json-file": {
@@ -3149,11 +3346,11 @@
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "parse-json": "2.2.0",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "strip-bom": "2.0.0"
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
       }
     },
     "locate-path": {
@@ -3162,8 +3359,8 @@
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "requires": {
-        "p-locate": "2.0.0",
-        "path-exists": "3.0.0"
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
       },
       "dependencies": {
         "path-exists": {
@@ -3175,9 +3372,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
       "dev": true
     },
     "lodash.assign": {
@@ -3205,9 +3402,9 @@
       "dev": true
     },
     "lodash.mergewith": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
-      "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
       "dev": true
     },
     "lodash.uniq": {
@@ -3217,39 +3414,12 @@
       "dev": true
     },
     "log-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3"
-      },
-      "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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "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
-        }
+        "chalk": "^2.0.1"
       }
     },
     "loud-rejection": {
@@ -3258,8 +3428,8 @@
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
       "requires": {
-        "currently-unhandled": "0.4.1",
-        "signal-exit": "3.0.2"
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
       }
     },
     "lru-cache": {
@@ -3268,14 +3438,14 @@
       "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
       "dev": true,
       "requires": {
-        "pseudomap": "1.0.2",
-        "yallist": "2.1.2"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
-    "macaddress": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz",
-      "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=",
+    "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": {
@@ -3284,26 +3454,29 @@
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
       "dev": 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"
+      }
+    },
     "matches-selector": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/matches-selector/-/matches-selector-1.2.0.tgz",
       "integrity": "sha512-c4vLwYWyl+Ji+U43eU/G5FwxWd4ZH0ePUsFs5y0uwD9HUEFBXUQ1zUUan+78IpRD+y4pUfG0nAzNM292K7ItvA==",
       "dev": true
     },
-    "math-expression-evaluator": {
-      "version": "1.2.17",
-      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
-      "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=",
-      "dev": true
-    },
     "md5.js": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
       "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
       "dev": true,
       "requires": {
-        "hash-base": "3.0.4",
-        "inherits": "2.0.3"
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
       },
       "dependencies": {
         "hash-base": {
@@ -3312,19 +3485,25 @@
           "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
           "dev": true,
           "requires": {
-            "inherits": "2.0.3",
-            "safe-buffer": "5.1.1"
+            "inherits": "^2.0.1",
+            "safe-buffer": "^5.0.1"
           }
         }
       }
     },
+    "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
+    },
     "mem": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
       "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "dev": true,
       "requires": {
-        "mimic-fn": "1.1.0"
+        "mimic-fn": "^1.0.0"
       }
     },
     "meow": {
@@ -3333,16 +3512,16 @@
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
-        "camelcase-keys": "2.1.0",
-        "decamelize": "1.2.0",
-        "loud-rejection": "1.6.0",
-        "map-obj": "1.0.1",
-        "minimist": "1.2.0",
-        "normalize-package-data": "2.4.0",
-        "object-assign": "4.1.1",
-        "read-pkg-up": "1.0.1",
-        "redent": "1.0.0",
-        "trim-newlines": "1.0.0"
+        "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": {
         "minimist": {
@@ -3359,25 +3538,31 @@
       "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=",
       "dev": true
     },
+    "merge2": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz",
+      "integrity": "sha512-bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg==",
+      "dev": true
+    },
     "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.5",
-        "expand-brackets": "0.1.5",
-        "extglob": "0.3.2",
-        "filename-regex": "2.0.1",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1",
-        "kind-of": "3.2.2",
-        "normalize-path": "2.1.1",
-        "object.omit": "2.0.1",
-        "parse-glob": "3.0.4",
-        "regex-cache": "0.4.4"
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "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"
       }
     },
     "miller-rabin": {
@@ -3386,23 +3571,23 @@
       "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "brorand": "1.1.0"
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
       }
     },
     "mime-db": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
+      "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.17",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
+      "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
       "dev": true,
       "requires": {
-        "mime-db": "1.30.0"
+        "mime-db": "~1.35.0"
       }
     },
     "mimic-fn": {
@@ -3429,7 +3614,7 @@
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
       "requires": {
-        "brace-expansion": "1.1.8"
+        "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
@@ -3438,6 +3623,27 @@
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
       "dev": true
     },
+    "mixin-deep": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "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": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "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",
@@ -3453,48 +3659,72 @@
       "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
       "dev": true,
       "requires": {
-        "JSONStream": "1.3.1",
-        "browser-resolve": "1.11.2",
-        "cached-path-relative": "1.0.1",
-        "concat-stream": "1.5.2",
-        "defined": "1.0.0",
-        "detective": "4.6.0",
-        "duplexer2": "0.1.4",
-        "inherits": "2.0.3",
-        "parents": "1.0.1",
-        "readable-stream": "2.3.3",
-        "resolve": "1.5.0",
-        "stream-combiner2": "1.1.1",
-        "subarg": "1.0.0",
-        "through2": "2.0.3",
-        "xtend": "4.0.1"
-      }
+        "JSONStream": "^1.0.3",
+        "browser-resolve": "^1.7.0",
+        "cached-path-relative": "^1.0.0",
+        "concat-stream": "~1.5.0",
+        "defined": "^1.0.0",
+        "detective": "^4.0.0",
+        "duplexer2": "^0.1.2",
+        "inherits": "^2.0.1",
+        "parents": "^1.0.0",
+        "readable-stream": "^2.0.2",
+        "resolve": "^1.1.3",
+        "stream-combiner2": "^1.1.1",
+        "subarg": "^1.0.0",
+        "through2": "^2.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
     },
     "nan": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
       "dev": true
     },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "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"
+      }
+    },
     "node-gyp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
-      "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
-      "dev": true,
-      "requires": {
-        "fstream": "1.0.11",
-        "glob": "7.1.2",
-        "graceful-fs": "4.1.11",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6",
-        "npmlog": "4.1.2",
-        "osenv": "0.1.4",
-        "request": "2.79.0",
-        "rimraf": "2.6.2",
-        "semver": "5.3.0",
-        "tar": "2.2.1",
-        "which": "1.3.0"
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+      "dev": true,
+      "requires": {
+        "fstream": "^1.0.0",
+        "glob": "^7.0.3",
+        "graceful-fs": "^4.1.2",
+        "mkdirp": "^0.5.0",
+        "nopt": "2 || 3",
+        "npmlog": "0 || 1 || 2 || 3 || 4",
+        "osenv": "0",
+        "request": "^2.87.0",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
       },
       "dependencies": {
         "semver": {
@@ -3505,31 +3735,40 @@
         }
       }
     },
+    "node-releases": {
+      "version": "1.0.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.0-alpha.11.tgz",
+      "integrity": "sha512-CaViu+2FqTNYOYNihXa5uPS/zry92I3vPU4nCB6JB3OeZ2UGtOpF5gRwuN4+m3hbEcL47bOXyun1jX2iC+3uEQ==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
     "node-sass": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz",
-      "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==",
-      "dev": true,
-      "requires": {
-        "async-foreach": "0.1.3",
-        "chalk": "1.1.3",
-        "cross-spawn": "3.0.1",
-        "gaze": "1.1.2",
-        "get-stdin": "4.0.1",
-        "glob": "7.1.2",
-        "in-publish": "2.0.0",
-        "lodash.assign": "4.2.0",
-        "lodash.clonedeep": "4.5.0",
-        "lodash.mergewith": "4.6.0",
-        "meow": "3.7.0",
-        "mkdirp": "0.5.1",
-        "nan": "2.8.0",
-        "node-gyp": "3.6.2",
-        "npmlog": "4.1.2",
-        "request": "2.79.0",
-        "sass-graph": "2.2.4",
-        "stdout-stream": "1.4.0",
-        "true-case-path": "1.0.2"
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.3.tgz",
+      "integrity": "sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==",
+      "dev": true,
+      "requires": {
+        "async-foreach": "^0.1.3",
+        "chalk": "^1.1.1",
+        "cross-spawn": "^3.0.0",
+        "gaze": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "glob": "^7.0.3",
+        "in-publish": "^2.0.0",
+        "lodash.assign": "^4.2.0",
+        "lodash.clonedeep": "^4.3.2",
+        "lodash.mergewith": "^4.6.0",
+        "meow": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "nan": "^2.10.0",
+        "node-gyp": "^3.8.0",
+        "npmlog": "^4.0.0",
+        "request": "2.87.0",
+        "sass-graph": "^2.2.4",
+        "stdout-stream": "^1.4.0",
+        "true-case-path": "^1.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -3544,11 +3783,11 @@
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
+            "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": {
@@ -3565,7 +3804,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1.1.1"
+        "abbrev": "1"
       }
     },
     "normalize-package-data": {
@@ -3574,10 +3813,10 @@
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "2.5.0",
-        "is-builtin-module": "1.0.0",
-        "semver": "5.4.1",
-        "validate-npm-package-license": "3.0.1"
+        "hosted-git-info": "^2.1.4",
+        "is-builtin-module": "^1.0.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
       }
     },
     "normalize-path": {
@@ -3586,7 +3825,7 @@
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "requires": {
-        "remove-trailing-separator": "1.1.0"
+        "remove-trailing-separator": "^1.0.1"
       }
     },
     "normalize-range": {
@@ -3596,16 +3835,10 @@
       "dev": true
     },
     "normalize-url": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-      "dev": true,
-      "requires": {
-        "object-assign": "4.1.1",
-        "prepend-http": "1.0.4",
-        "query-string": "4.3.4",
-        "sort-keys": "1.1.2"
-      }
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.2.0.tgz",
+      "integrity": "sha512-WvF3Myk0NhXkG8S9bygFM4IC1KOvnVJGq0QoGeoqOYOBeinBZp5ybW3QuYbTc89lkWBMM9ZBO4QGRoc0353kKA==",
+      "dev": true
     },
     "npm-run-path": {
       "version": "2.0.2",
@@ -3613,7 +3846,7 @@
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "requires": {
-        "path-key": "2.0.1"
+        "path-key": "^2.0.0"
       }
     },
     "npmlog": {
@@ -3622,10 +3855,19 @@
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "1.1.4",
-        "console-control-strings": "1.1.0",
-        "gauge": "2.7.4",
-        "set-blocking": "2.0.0"
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
+    "nth-check": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0"
       }
     },
     "num2fraction": {
@@ -3652,71 +3894,90 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "dev": true
     },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+    "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": {
-        "for-own": "0.1.5",
-        "is-extendable": "0.1.1"
+        "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"
+          }
+        }
       }
     },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+    "object-keys": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+      "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": {
-        "wrappy": "1.0.2"
+        "isobject": "^3.0.0"
       }
     },
-    "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+    "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": {
-        "mimic-fn": "1.1.0"
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
       }
     },
-    "ora": {
+    "object.pick": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz",
-      "integrity": "sha1-gAeN0rkqk0r2ajrXKluRBpTt5Ro=",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "cli-cursor": "2.1.0",
-        "cli-spinners": "1.1.0",
-        "log-symbols": "1.0.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
-        },
-        "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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "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
-        }
+        "isobject": "^3.0.1"
+      }
+    },
+    "object.values": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz",
+      "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.6.1",
+        "function-bind": "^1.1.0",
+        "has": "^1.0.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
       }
     },
     "os-browserify": {
@@ -3737,7 +3998,7 @@
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
-        "lcid": "1.0.0"
+        "lcid": "^1.0.0"
       }
     },
     "os-tmpdir": {
@@ -3747,13 +4008,13 @@
       "dev": true
     },
     "osenv": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
       "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
       }
     },
     "p-finally": {
@@ -3774,9 +4035,15 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "1.1.0"
+        "p-limit": "^1.1.0"
       }
     },
+    "p-try": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+      "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+      "dev": true
+    },
     "pako": {
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
@@ -3789,7 +4056,7 @@
       "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
       "dev": true,
       "requires": {
-        "path-platform": "0.11.15"
+        "path-platform": "~0.11.15"
       }
     },
     "parse-asn1": {
@@ -3798,23 +4065,11 @@
       "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
       "dev": true,
       "requires": {
-        "asn1.js": "4.9.2",
-        "browserify-aes": "1.1.1",
-        "create-hash": "1.1.3",
-        "evp_bytestokey": "1.0.3",
-        "pbkdf2": "3.0.14"
-      }
-    },
-    "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.3",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1"
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3"
       }
     },
     "parse-json": {
@@ -3823,22 +4078,34 @@
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "dev": true,
       "requires": {
-        "error-ex": "1.3.1"
+        "error-ex": "^1.2.0"
       }
     },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
     "path-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
       "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
       "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.1"
+        "pinkie-promise": "^2.0.0"
       }
     },
     "path-is-absolute": {
@@ -3871,9 +4138,9 @@
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "pbkdf2": {
@@ -3882,13 +4149,19 @@
       "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
       "dev": true,
       "requires": {
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
-        "ripemd160": "2.0.1",
-        "safe-buffer": "5.1.1",
-        "sha.js": "2.4.9"
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -3907,112 +4180,69 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
-        "pinkie": "2.0.4"
+        "pinkie": "^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": "6.0.14",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-      "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.2.tgz",
+      "integrity": "sha512-fmaUY5370keLUTx+CnwRxtGiuFTcNBLQBqr1oE3WZ/euIYmGAo0OAgOhVJ3ByDnVmOR3PK+0V9VebzfjRIUcqw==",
       "dev": true,
       "requires": {
-        "chalk": "2.3.0",
-        "source-map": "0.6.1",
-        "supports-color": "4.5.0"
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
       }
     },
     "postcss-calc": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
-      "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.1.tgz",
+      "integrity": "sha1-PSQXG79udinUIqQ26/5t2VEfQzA=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-message-helpers": "2.0.0",
-        "reduce-css-calc": "1.3.0"
+        "css-unit-converter": "^1.1.1",
+        "postcss": "^6.0.0",
+        "postcss-selector-parser": "^2.2.2",
+        "reduce-css-calc": "^2.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
     "postcss-cli": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-4.1.1.tgz",
-      "integrity": "sha1-uUvY//u3rB9i8mB+ePyTl/f2Ol0=",
-      "dev": true,
-      "requires": {
-        "chalk": "2.3.0",
-        "chokidar": "1.7.0",
-        "dependency-graph": "0.5.2",
-        "fs-extra": "4.0.2",
-        "get-stdin": "5.0.1",
-        "globby": "6.1.0",
-        "ora": "1.3.0",
-        "postcss": "6.0.14",
-        "postcss-load-config": "1.2.0",
-        "postcss-reporter": "5.0.0",
-        "pretty-hrtime": "1.0.3",
-        "read-cache": "1.0.0",
-        "yargs": "8.0.2"
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-6.0.0.tgz",
+      "integrity": "sha512-7DuxMn1Wj6dJKbjKpZXOdAc5nl5NfPXiJbg0m/+tdObPvgk1xv4+lZgNKD3jL/kCrDRPf1jgFlmq1cHh8lBR2w==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.1.0",
+        "chokidar": "^2.0.0",
+        "dependency-graph": "^0.7.0",
+        "fs-extra": "^7.0.0",
+        "get-stdin": "^6.0.0",
+        "globby": "^8.0.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "postcss-reporter": "^5.0.0",
+        "pretty-hrtime": "^1.0.3",
+        "read-cache": "^1.0.0",
+        "yargs": "^12.0.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -4027,19 +4257,39 @@
           "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
           "dev": true
         },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          }
+        },
+        "decamelize": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+          "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+          "dev": true,
+          "requires": {
+            "xregexp": "4.0.0"
+          }
+        },
         "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "2.0.0"
+            "locate-path": "^3.0.0"
           }
         },
         "get-stdin": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
-          "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
+          "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==",
           "dev": true
         },
         "is-fullwidth-code-point": {
@@ -4048,16 +4298,14 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "2.2.0",
-            "pify": "2.3.0",
-            "strip-bom": "3.0.0"
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
           }
         },
         "os-locale": {
@@ -4066,40 +4314,34 @@
           "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
           }
         },
-        "path-type": {
+        "p-limit": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
+          "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
           "dev": true,
           "requires": {
-            "pify": "2.3.0"
+            "p-try": "^2.0.0"
           }
         },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "load-json-file": "2.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "2.0.0"
+            "p-limit": "^2.0.0"
           }
         },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "dev": true,
-          "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "2.0.0"
-          }
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
         },
         "string-width": {
           "version": "2.1.1",
@@ -4107,8 +4349,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -4117,15 +4359,9 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
         "which-module": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
@@ -4133,1599 +4369,665 @@
           "dev": true
         },
         "yargs": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+          "version": "12.0.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.1.tgz",
+          "integrity": "sha512-B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ==",
           "dev": true,
           "requires": {
-            "camelcase": "4.1.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "2.1.0",
-            "read-pkg-up": "2.0.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "7.0.0"
+            "cliui": "^4.0.0",
+            "decamelize": "^2.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^10.1.0"
           }
         },
         "yargs-parser": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
           "dev": true,
           "requires": {
-            "camelcase": "4.1.0"
+            "camelcase": "^4.1.0"
           }
         }
       }
     },
     "postcss-colormin": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz",
-      "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.1.tgz",
+      "integrity": "sha1-bxwYoBVbxpYT8v8ThD4uSuj/C74=",
       "dev": true,
       "requires": {
-        "colormin": "1.1.2",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "browserslist": "^4.0.0",
+        "color": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
     "postcss-convert-values": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz",
-      "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.0.tgz",
+      "integrity": "sha1-d9d9mu0dxOaVbmUcw0nVMwWHb2I=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
     "postcss-discard-comments": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
-      "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.0.tgz",
+      "integrity": "sha1-loSimedrPpMmPvj9KtvxocCP2I0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^6.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
     "postcss-discard-duplicates": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz",
-      "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.0.tgz",
+      "integrity": "sha1-QvPCZ/hfqQngQsNXZ+z9Zcsr1yw=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^6.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.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
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+        }
+      }
+    },
+    "postcss-discard-empty": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.0.tgz",
+      "integrity": "sha1-VeGKWcdBKOOMfSgEvPpAVmEfuX8=",
+      "dev": true,
+      "requires": {
+        "postcss": "^6.0.0"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-discard-empty": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
-      "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
+    "postcss-discard-overridden": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.0.tgz",
+      "integrity": "sha1-Sgv4WXh4TPH4HtLBwf2dlkodofo=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "postcss": "^6.0.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=",
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+        }
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
+      "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^4.0.0",
+        "import-cwd": "^2.0.0"
+      },
+      "dependencies": {
+        "cosmiconfig": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+          "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "is-directory": "^0.3.1",
+            "js-yaml": "^3.9.0",
+            "parse-json": "^4.0.0",
+            "require-from-string": "^2.0.1"
           }
         },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+        "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": {
-            "has-flag": "1.0.0"
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
           }
         }
       }
     },
-    "postcss-discard-overridden": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
-      "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
+    "postcss-merge-longhand": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.4.tgz",
+      "integrity": "sha512-wLi2u22mSdBDBjLF8pyaPCNppOmqb+B4O0Dlt/4nUwn79EltDUJmCeCDYqo7SB2z9puOHTftnxviY4J9xS+ygQ==",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "css-color-names": "0.0.4",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "stylehacks": "^4.0.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=",
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
+        }
+      }
+    },
+    "postcss-merge-rules": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.1.tgz",
+      "integrity": "sha1-Qw/Vmz8u0uivzQsxJ47aOYVKuxA=",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-util-same-parent": "^4.0.0",
+        "postcss": "^6.0.0",
+        "postcss-selector-parser": "^3.0.0",
+        "vendors": "^1.0.0"
+      },
+      "dependencies": {
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.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
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+        "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": {
-            "has-flag": "1.0.0"
+            "dot-prop": "^4.1.1",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
           }
         }
       }
     },
-    "postcss-discard-unused": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
-      "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
+    "postcss-minify-font-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.0.tgz",
+      "integrity": "sha1-TMM9KD1qgXWQNudX75gdksvYW+0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "uniqs": "2.0.0"
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.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=",
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-filter-plugins": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz",
-      "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18",
-        "uniqid": "4.1.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
-        },
-        "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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-load-config": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz",
-      "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1",
-        "postcss-load-options": "1.2.0",
-        "postcss-load-plugins": "2.3.0"
-      }
-    },
-    "postcss-load-options": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz",
-      "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1"
-      }
-    },
-    "postcss-load-plugins": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz",
-      "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1"
-      }
-    },
-    "postcss-merge-idents": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
-      "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
+    "postcss-minify-gradients": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.0.tgz",
+      "integrity": "sha1-P8ORZDnSepu4Bm23za2AFlDrCQ4=",
       "dev": true,
       "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "is-color-stop": "^1.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-merge-longhand": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz",
-      "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
+    "postcss-minify-params": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.0.tgz",
+      "integrity": "sha1-BekWbuSMBa9lGYnOhNOcG015BnQ=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "alphanum-sort": "^1.0.0",
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "uniqs": "^2.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-merge-rules": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz",
-      "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
+    "postcss-minify-selectors": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.0.tgz",
+      "integrity": "sha1-sen2xGNBbT/Nyybnt4XZX2FXiq0=",
       "dev": true,
       "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-api": "1.6.1",
-        "postcss": "5.2.18",
-        "postcss-selector-parser": "2.2.3",
-        "vendors": "1.0.1"
+        "alphanum-sort": "^1.0.0",
+        "has": "^1.0.0",
+        "postcss": "^6.0.0",
+        "postcss-selector-parser": "^3.0.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
-        },
-        "browserslist": {
-          "version": "1.7.7",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-          "dev": true,
-          "requires": {
-            "caniuse-db": "1.0.30000775",
-            "electron-to-chromium": "1.3.27"
-          }
-        },
-        "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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.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
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+        "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": {
-            "has-flag": "1.0.0"
+            "dot-prop": "^4.1.1",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
           }
         }
       }
     },
-    "postcss-message-helpers": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
-      "dev": true
-    },
-    "postcss-minify-font-values": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
-      "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
+    "postcss-normalize-charset": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.0.tgz",
+      "integrity": "sha1-JFJyknAtXoEp6vo9HeSe1RpqtzA=",
       "dev": true,
       "requires": {
-        "object-assign": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "postcss": "^6.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-minify-gradients": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
-      "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-params": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
-      "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
+    "postcss-normalize-display-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.0.tgz",
+      "integrity": "sha1-lQ4Me+NEV3ChYP/9a2ZEw8DNj4k=",
       "dev": true,
       "requires": {
-        "alphanum-sort": "1.0.2",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0",
-        "uniqs": "2.0.0"
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-minify-selectors": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
-      "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
+    "postcss-normalize-positions": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.0.tgz",
+      "integrity": "sha1-7pNDq5gbgixjq3JhXszNCFZERaM=",
       "dev": true,
       "requires": {
-        "alphanum-sort": "1.0.2",
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "postcss-selector-parser": "2.2.3"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-normalize-charset": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
-      "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
+    "postcss-normalize-repeat-style": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.0.tgz",
+      "integrity": "sha1-txHFks8W+vn/V15C+hALZ5kIPv8=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-normalize-url": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
-      "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
+    "postcss-normalize-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.0.tgz",
+      "integrity": "sha1-cYy20wpvrGrGqDDjLAbAfbxm/l0=",
       "dev": true,
       "requires": {
-        "is-absolute-url": "2.1.0",
-        "normalize-url": "1.9.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "has": "^1.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-ordered-values": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz",
-      "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
+    "postcss-normalize-timing-functions": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.0.tgz",
+      "integrity": "sha1-A1HymIaqmB1D2RssK9GuptCvbSM=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-reduce-idents": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
-      "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
+    "postcss-normalize-unicode": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.0.tgz",
+      "integrity": "sha1-Ws1dR7rqXRdnSyzMSuUWb6iM35c=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-reduce-initial": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
-      "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
+    "postcss-normalize-url": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.0.tgz",
+      "integrity": "sha1-t6nIrSbPJmlMFG6y1ovQz0mVbw0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18"
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.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
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+        }
+      }
+    },
+    "postcss-normalize-whitespace": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.0.tgz",
+      "integrity": "sha1-HafnaxCuY8EYJ/oE/Du0oe/pnMA=",
+      "dev": true,
+      "requires": {
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
-    "postcss-reduce-transforms": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
-      "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
+    "postcss-ordered-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.0.0.tgz",
+      "integrity": "sha1-WLQMdPcuAi6zQVLBLksPk1RIL8I=",
       "dev": true,
       "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.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=",
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
+        }
+      }
+    },
+    "postcss-reduce-initial": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.1.tgz",
+      "integrity": "sha1-8tWPUM6isMXcEnjW6l7Q/1gpwpM=",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^6.0.0"
+      },
+      "dependencies": {
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.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
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+        }
+      }
+    },
+    "postcss-reduce-transforms": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.0.tgz",
+      "integrity": "sha1-9kX8dEDDUnT0DegQThStcWPt8Yg=",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
@@ -5736,19 +5038,21 @@
       "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==",
       "dev": true,
       "requires": {
-        "chalk": "2.3.0",
-        "lodash": "4.17.4",
-        "log-symbols": "2.1.0",
-        "postcss": "6.0.14"
+        "chalk": "^2.0.1",
+        "lodash": "^4.17.4",
+        "log-symbols": "^2.0.0",
+        "postcss": "^6.0.8"
       },
       "dependencies": {
-        "log-symbols": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz",
-          "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==",
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
@@ -5759,154 +5063,56 @@
       "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
       "dev": true,
       "requires": {
-        "flatten": "1.0.2",
-        "indexes-of": "1.0.1",
-        "uniq": "1.0.1"
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
       }
     },
     "postcss-svgo": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
-      "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.0.tgz",
+      "integrity": "sha1-wLutAlIPxjbJ14sOhAPi5RXDIoU=",
       "dev": true,
       "requires": {
-        "is-svg": "2.1.0",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0",
-        "svgo": "0.7.2"
+        "is-svg": "^3.0.0",
+        "postcss": "^6.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "svgo": "^1.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
     },
     "postcss-unique-selectors": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
-      "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.0.tgz",
+      "integrity": "sha1-BMHpdkx1h0JhMDQCxB8Ol2n8VQE=",
       "dev": true,
       "requires": {
-        "alphanum-sort": "1.0.2",
-        "postcss": "5.2.18",
-        "uniqs": "2.0.0"
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^6.0.0",
+        "uniqs": "^2.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
         "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         }
       }
@@ -5917,91 +5123,6 @@
       "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
       "dev": true
     },
-    "postcss-zindex": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
-      "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
-      "dev": true,
-      "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "uniqs": "2.0.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.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.4.0",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true
-    },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-      "dev": true
-    },
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
@@ -6032,11 +5153,11 @@
       "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.1.3",
-        "parse-asn1": "5.1.0",
-        "randombytes": "2.0.5"
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1"
       }
     },
     "punycode": {
@@ -6052,21 +5173,11 @@
       "dev": true
     },
     "qs": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-      "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
+      "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": "4.3.4",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-      "dev": true,
-      "requires": {
-        "object-assign": "4.1.1",
-        "strict-uri-encode": "1.1.0"
-      }
-    },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -6079,54 +5190,13 @@
       "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
       "dev": true
     },
-    "randomatic": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-      "dev": true,
-      "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
-      },
-      "dependencies": {
-        "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.2.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.6"
-              }
-            }
-          }
-        },
-        "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.6"
-          }
-        }
-      }
-    },
     "randombytes": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
       "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "^5.1.0"
       }
     },
     "randomfill": {
@@ -6135,8 +5205,8 @@
       "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==",
       "dev": true,
       "requires": {
-        "randombytes": "2.0.5",
-        "safe-buffer": "5.1.1"
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
       }
     },
     "read-cache": {
@@ -6145,7 +5215,7 @@
       "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "dev": true,
       "requires": {
-        "pify": "2.3.0"
+        "pify": "^2.3.0"
       }
     },
     "read-only-stream": {
@@ -6154,7 +5224,7 @@
       "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.3"
+        "readable-stream": "^2.0.2"
       }
     },
     "read-pkg": {
@@ -6163,9 +5233,9 @@
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
       "requires": {
-        "load-json-file": "1.1.0",
-        "normalize-package-data": "2.4.0",
-        "path-type": "1.1.0"
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
       }
     },
     "read-pkg-up": {
@@ -6174,8 +5244,8 @@
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
       }
     },
     "readable-stream": {
@@ -6184,13 +5254,13 @@
       "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
       "dev": true,
       "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "1.0.7",
-        "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
-        "util-deprecate": "1.0.2"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~1.0.6",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.0.3",
+        "util-deprecate": "~1.0.1"
       }
     },
     "readdirp": {
@@ -6199,10 +5269,10 @@
       "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "minimatch": "3.0.4",
-        "readable-stream": "2.3.3",
-        "set-immediate-shim": "1.0.1"
+        "graceful-fs": "^4.1.2",
+        "minimatch": "^3.0.2",
+        "readable-stream": "^2.0.2",
+        "set-immediate-shim": "^1.0.1"
       }
     },
     "receptor": {
@@ -6211,10 +5281,10 @@
       "integrity": "sha1-v1RHfgOH5Evr84VRILvaWt6gj4s=",
       "dev": true,
       "requires": {
-        "element-closest": "2.0.2",
-        "keyboardevent-key-polyfill": "1.1.0",
-        "matches-selector": "1.2.0",
-        "object-assign": "4.1.1"
+        "element-closest": "^2.0.1",
+        "keyboardevent-key-polyfill": "^1.0.2",
+        "matches-selector": "^1.0.0",
+        "object-assign": "^4.1.0"
       }
     },
     "redent": {
@@ -6223,37 +5293,28 @@
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
       "requires": {
-        "indent-string": "2.1.0",
-        "strip-indent": "1.0.1"
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
       }
     },
     "reduce-css-calc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.4.tgz",
+      "integrity": "sha512-i/vWQbyd3aJRmip9OVSN9V6nIjLf/gg/ctxb0CpvHWtcRysFl/ngDBQD+rqavxdw/doScA3GMBXhzkHQ4GCzFQ==",
       "dev": true,
       "requires": {
-        "balanced-match": "0.4.2",
-        "math-expression-evaluator": "1.2.17",
-        "reduce-function-call": "1.0.2"
+        "css-unit-converter": "^1.1.1",
+        "postcss-value-parser": "^3.3.0"
       }
     },
-    "reduce-function-call": {
+    "regex-not": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
-      "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
-      "dev": true,
-      "requires": {
-        "balanced-match": "0.4.2"
-      }
-    },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "0.1.3"
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
     "remove-trailing-separator": {
@@ -6280,35 +5341,35 @@
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
-        "is-finite": "1.0.2"
+        "is-finite": "^1.0.0"
       }
     },
     "request": {
-      "version": "2.79.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-      "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "0.6.0",
-        "aws4": "1.6.0",
-        "caseless": "0.11.0",
-        "combined-stream": "1.0.5",
-        "extend": "3.0.1",
-        "forever-agent": "0.6.1",
-        "form-data": "2.1.4",
-        "har-validator": "2.0.6",
-        "hawk": "3.1.3",
-        "http-signature": "1.1.1",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.17",
-        "oauth-sign": "0.8.2",
-        "qs": "6.3.2",
-        "stringstream": "0.0.5",
-        "tough-cookie": "2.3.3",
-        "tunnel-agent": "0.4.3",
-        "uuid": "3.1.0"
+      "version": "2.87.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+      "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.6.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.5",
+        "extend": "~3.0.1",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.1",
+        "har-validator": "~5.0.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.17",
+        "oauth-sign": "~0.8.2",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.1",
+        "safe-buffer": "^5.1.1",
+        "tough-cookie": "~2.3.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.1.0"
       }
     },
     "require-directory": {
@@ -6318,9 +5379,9 @@
       "dev": true
     },
     "require-from-string": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
-      "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
     "require-main-filename": {
@@ -6335,24 +5396,44 @@
       "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
       "dev": true,
       "requires": {
-        "path-parse": "1.0.5"
+        "path-parse": "^1.0.5"
       }
     },
+    "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-id-refs": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/resolve-id-refs/-/resolve-id-refs-0.1.0.tgz",
       "integrity": "sha1-MSZiS4h0idqPwK6IljL4QTrGw+w=",
       "dev": true
     },
-    "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.1",
-        "signal-exit": "3.0.2"
-      }
+    "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
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "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
     },
     "rimraf": {
       "version": "2.6.2",
@@ -6360,7 +5441,7 @@
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "dev": true,
       "requires": {
-        "glob": "7.1.2"
+        "glob": "^7.0.5"
       }
     },
     "ripemd160": {
@@ -6369,8 +5450,8 @@
       "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
       "dev": true,
       "requires": {
-        "hash-base": "2.0.2",
-        "inherits": "2.0.3"
+        "hash-base": "^2.0.0",
+        "inherits": "^2.0.1"
       }
     },
     "safe-buffer": {
@@ -6379,16 +5460,31 @@
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
       "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": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
     "sass-graph": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
-        "glob": "7.1.2",
-        "lodash": "4.17.4",
-        "scss-tokenizer": "0.2.3",
-        "yargs": "7.1.0"
+        "glob": "^7.0.0",
+        "lodash": "^4.0.0",
+        "scss-tokenizer": "^0.2.3",
+        "yargs": "^7.0.0"
       }
     },
     "sax": {
@@ -6403,8 +5499,8 @@
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
-        "js-base64": "2.4.0",
-        "source-map": "0.4.4"
+        "js-base64": "^2.1.8",
+        "source-map": "^0.4.2"
       },
       "dependencies": {
         "source-map": {
@@ -6413,7 +5509,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         }
       }
@@ -6436,14 +5532,37 @@
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
       "dev": true
     },
+    "set-value": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "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"
+          }
+        }
+      }
+    },
     "sha.js": {
       "version": "2.4.9",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz",
       "integrity": "sha512-G8zektVqbiPHrylgew9Zg1VRB1L/DtXNUVAM6q4QLy8NE3qtHlFXTf8VLL4k1Yl6c7NMjtZUTdXV+X44nFaT6A==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "shasum": {
@@ -6452,8 +5571,8 @@
       "integrity": "sha1-5wEjENj0F/TetXEhUOVni4euVl8=",
       "dev": true,
       "requires": {
-        "json-stable-stringify": "0.0.1",
-        "sha.js": "2.4.9"
+        "json-stable-stringify": "~0.0.0",
+        "sha.js": "~2.4.4"
       }
     },
     "shebang-command": {
@@ -6462,7 +5581,7 @@
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "requires": {
-        "shebang-regex": "1.0.0"
+        "shebang-regex": "^1.0.0"
       }
     },
     "shebang-regex": {
@@ -6477,10 +5596,10 @@
       "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
       "dev": true,
       "requires": {
-        "array-filter": "0.0.1",
-        "array-map": "0.0.0",
-        "array-reduce": "0.0.0",
-        "jsonify": "0.0.0"
+        "array-filter": "~0.0.0",
+        "array-map": "~0.0.0",
+        "array-reduce": "~0.0.0",
+        "jsonify": "~0.0.0"
       },
       "dependencies": {
         "array-filter": {
@@ -6497,22 +5616,140 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
       "dev": true
     },
-    "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+    "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": {
-        "hoek": "2.16.3"
+        "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": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+          "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=",
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "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": {
+        "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"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "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": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "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": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "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": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "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": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
-        "is-plain-obj": "1.1.0"
+        "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"
+          }
+        }
       }
     },
     "source-map": {
@@ -6521,13 +5758,32 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "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": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "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
+    },
     "spdx-correct": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
       "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
       "dev": true,
       "requires": {
-        "spdx-license-ids": "1.2.2"
+        "spdx-license-ids": "^1.0.2"
       }
     },
     "spdx-expression-parse": {
@@ -6542,6 +5798,15 @@
       "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
       "dev": true
     },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "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",
@@ -6549,26 +5814,46 @@
       "dev": true
     },
     "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
+      "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
       "dev": true,
       "requires": {
-        "asn1": "0.2.3",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.1",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.1",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "tweetnacl": "0.14.5"
+        "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": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "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": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+        "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"
+          }
         }
       }
     },
@@ -6578,7 +5863,7 @@
       "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.3"
+        "readable-stream": "^2.0.1"
       }
     },
     "stream-browserify": {
@@ -6587,8 +5872,8 @@
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
       }
     },
     "stream-combiner2": {
@@ -6597,8 +5882,8 @@
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
       "dev": true,
       "requires": {
-        "duplexer2": "0.1.4",
-        "readable-stream": "2.3.3"
+        "duplexer2": "~0.1.0",
+        "readable-stream": "^2.0.2"
       }
     },
     "stream-http": {
@@ -6607,11 +5892,11 @@
       "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "3.0.0",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "to-arraybuffer": "1.0.1",
-        "xtend": "4.0.1"
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.2.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
       }
     },
     "stream-splicer": {
@@ -6620,25 +5905,19 @@
       "integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.2"
       }
     },
-    "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
-    },
     "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.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
       }
     },
     "string_decoder": {
@@ -6647,22 +5926,16 @@
       "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "~5.1.0"
       }
     },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-      "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.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "strip-bom": {
@@ -6671,7 +5944,7 @@
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
-        "is-utf8": "0.2.1"
+        "is-utf8": "^0.2.0"
       }
     },
     "strip-eof": {
@@ -6686,7 +5959,42 @@
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "dev": true,
       "requires": {
-        "get-stdin": "4.0.1"
+        "get-stdin": "^4.0.1"
+      }
+    },
+    "stylehacks": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.0.tgz",
+      "integrity": "sha1-ZLMjlRxKJOX8ey7AbBN78y0VXoo=",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^6.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
+          }
+        },
+        "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"
+          }
+        }
       }
     },
     "subarg": {
@@ -6695,7 +6003,7 @@
       "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
       "dev": true,
       "requires": {
-        "minimist": "1.2.0"
+        "minimist": "^1.1.0"
       },
       "dependencies": {
         "minimist": {
@@ -6707,27 +6015,46 @@
       }
     },
     "supports-color": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-      "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
       "dev": true,
       "requires": {
-        "has-flag": "2.0.0"
+        "has-flag": "^3.0.0"
       }
     },
     "svgo": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
-      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
-      "dev": true,
-      "requires": {
-        "coa": "1.0.4",
-        "colors": "1.1.2",
-        "csso": "2.3.2",
-        "js-yaml": "3.7.0",
-        "mkdirp": "0.5.1",
-        "sax": "1.2.4",
-        "whet.extend": "0.9.9"
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.0.5.tgz",
+      "integrity": "sha512-nYrifviB77aNKDNKKyuay3M9aYiK6Hv5gJVDdjj2ZXTQmI8WZc8+UPLR5IpVlktJfSu3co/4XcWgrgI6seGBPg==",
+      "dev": true,
+      "requires": {
+        "coa": "~2.0.1",
+        "colors": "~1.1.2",
+        "css-select": "~1.3.0-rc0",
+        "css-select-base-adapter": "~0.1.0",
+        "css-tree": "1.0.0-alpha25",
+        "css-url-regex": "^1.1.0",
+        "csso": "^3.5.0",
+        "js-yaml": "~3.10.0",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.0.4",
+        "sax": "~1.2.4",
+        "stable": "~0.1.6",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
+      },
+      "dependencies": {
+        "js-yaml": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+          "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        }
       }
     },
     "syntax-error": {
@@ -6736,7 +6063,7 @@
       "integrity": "sha1-HtkmbE1AvnXcVb+bsct3Biu5bKE=",
       "dev": true,
       "requires": {
-        "acorn": "4.0.13"
+        "acorn": "^4.0.3"
       }
     },
     "tar": {
@@ -6745,9 +6072,9 @@
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "dev": true,
       "requires": {
-        "block-stream": "0.0.9",
-        "fstream": "1.0.11",
-        "inherits": "2.0.3"
+        "block-stream": "*",
+        "fstream": "^1.0.2",
+        "inherits": "2"
       }
     },
     "through": {
@@ -6762,8 +6089,8 @@
       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.3",
-        "xtend": "4.0.1"
+        "readable-stream": "^2.1.5",
+        "xtend": "~4.0.1"
       }
     },
     "timers-browserify": {
@@ -6772,22 +6099,70 @@
       "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
       "dev": true,
       "requires": {
-        "process": "0.11.10"
+        "process": "~0.11.0"
       }
     },
+    "timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+      "dev": true
+    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
       "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
       "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": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "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"
+      }
+    },
     "tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
       "dev": true,
       "requires": {
-        "punycode": "1.4.1"
+        "punycode": "^1.4.1"
       }
     },
     "trim-newlines": {
@@ -6802,7 +6177,7 @@
       "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
       "dev": true,
       "requires": {
-        "glob": "6.0.4"
+        "glob": "^6.0.4"
       },
       "dependencies": {
         "glob": {
@@ -6811,11 +6186,11 @@
           "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
           "dev": true,
           "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         }
       }
@@ -6827,10 +6202,13 @@
       "dev": true
     },
     "tunnel-agent": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-      "dev": true
+      "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",
@@ -6857,21 +6235,47 @@
       "integrity": "sha1-iuVW4RAR9jwllnCKiDclnwGz1g4=",
       "dev": true
     },
+    "union-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^0.4.3"
+      },
+      "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"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
+          }
+        }
+      }
+    },
     "uniq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
       "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
       "dev": true
     },
-    "uniqid": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz",
-      "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=",
-      "dev": true,
-      "requires": {
-        "macaddress": "0.2.8"
-      }
-    },
     "uniqs": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
@@ -6879,9 +6283,67 @@
       "dev": true
     },
     "universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "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
+        }
+      }
+    },
+    "upath": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "dev": true
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
     "url": {
@@ -6902,25 +6364,31 @@
         }
       }
     },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
     "uswds": {
       "version": "1.6.8",
       "resolved": "https://registry.npmjs.org/uswds/-/uswds-1.6.8.tgz",
       "integrity": "sha512-W0IFpBP7ycOzqxrSJ7B2j8KGEm0HcUZBIXmhmDeHW122jRMfHHwuPBP6vgh78IgkSv0mH3900Fa5XumkjpSBxg==",
       "dev": true,
       "requires": {
-        "@types/node": "8.10.26",
-        "array-filter": "1.0.0",
-        "array-foreach": "1.0.2",
-        "browserify": "13.3.0",
-        "classlist-polyfill": "1.2.0",
-        "domready": "1.0.8",
-        "elem-dataset": "1.1.1",
-        "lodash.debounce": "4.0.8",
-        "object-assign": "4.1.1",
-        "receptor": "1.0.0",
-        "resolve-id-refs": "0.1.0",
-        "typescript": "2.6.2",
-        "yargs": "8.0.2"
+        "@types/node": "^8.5.5",
+        "array-filter": "^1.0.0",
+        "array-foreach": "^1.0.2",
+        "browserify": "^13.0.0",
+        "classlist-polyfill": "^1.0.3",
+        "domready": "^1.0.8",
+        "elem-dataset": "^1.1.1",
+        "lodash.debounce": "^4.0.7",
+        "object-assign": "^4.1.1",
+        "receptor": "^1.0.0",
+        "resolve-id-refs": "^0.1.0",
+        "typescript": "^2.4.1",
+        "yargs": "^8.0.2"
       },
       "dependencies": {
         "@types/node": {
@@ -6947,7 +6415,7 @@
           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
           "requires": {
-            "locate-path": "2.0.0"
+            "locate-path": "^2.0.0"
           }
         },
         "is-fullwidth-code-point": {
@@ -6962,10 +6430,10 @@
           "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "2.2.0",
-            "pify": "2.3.0",
-            "strip-bom": "3.0.0"
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
           }
         },
         "os-locale": {
@@ -6974,9 +6442,9 @@
           "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
           }
         },
         "path-type": {
@@ -6985,7 +6453,7 @@
           "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
           "dev": true,
           "requires": {
-            "pify": "2.3.0"
+            "pify": "^2.0.0"
           }
         },
         "read-pkg": {
@@ -6994,9 +6462,9 @@
           "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
           "dev": true,
           "requires": {
-            "load-json-file": "2.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "2.0.0"
+            "load-json-file": "^2.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^2.0.0"
           }
         },
         "read-pkg-up": {
@@ -7005,8 +6473,8 @@
           "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
           "dev": true,
           "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "2.0.0"
+            "find-up": "^2.0.0",
+            "read-pkg": "^2.0.0"
           }
         },
         "string-width": {
@@ -7015,8 +6483,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -7025,7 +6493,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "strip-bom": {
@@ -7046,19 +6514,19 @@
           "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
           "dev": true,
           "requires": {
-            "camelcase": "4.1.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "2.1.0",
-            "read-pkg-up": "2.0.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "7.0.0"
+            "camelcase": "^4.1.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.0.0",
+            "read-pkg-up": "^2.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^7.0.0"
           }
         },
         "yargs-parser": {
@@ -7067,7 +6535,7 @@
           "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
           "dev": true,
           "requires": {
-            "camelcase": "4.1.0"
+            "camelcase": "^4.1.0"
           }
         }
       }
@@ -7095,10 +6563,20 @@
       "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": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
     "uuid": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
       "dev": true
     },
     "validate-npm-package-license": {
@@ -7107,14 +6585,14 @@
       "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
       "dev": true,
       "requires": {
-        "spdx-correct": "1.0.2",
-        "spdx-expression-parse": "1.0.4"
+        "spdx-correct": "~1.0.0",
+        "spdx-expression-parse": "~1.0.0"
       }
     },
     "vendors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz",
-      "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz",
+      "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==",
       "dev": true
     },
     "verror": {
@@ -7123,17 +6601,9 @@
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
-        "assert-plus": "1.0.0",
+        "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
+        "extsprintf": "^1.2.0"
       }
     },
     "vm-browserify": {
@@ -7151,8 +6621,8 @@
       "integrity": "sha1-NApxe952Vyb6CqB9ch4BR6VR3ww=",
       "dev": true,
       "requires": {
-        "exec-sh": "0.2.1",
-        "minimist": "1.2.0"
+        "exec-sh": "^0.2.0",
+        "minimist": "^1.2.0"
       },
       "dependencies": {
         "minimist": {
@@ -7163,19 +6633,13 @@
         }
       }
     },
-    "whet.extend": {
-      "version": "0.9.9",
-      "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
-      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=",
-      "dev": true
-    },
     "which": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
       "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
       "dev": true,
       "requires": {
-        "isexe": "2.0.0"
+        "isexe": "^2.0.0"
       }
     },
     "which-module": {
@@ -7185,12 +6649,12 @@
       "dev": true
     },
     "wide-align": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2"
+        "string-width": "^1.0.2 || 2"
       }
     },
     "wrap-ansi": {
@@ -7199,8 +6663,8 @@
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
       }
     },
     "wrappy": {
@@ -7209,6 +6673,12 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
+    "xregexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
+      "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
+      "dev": true
+    },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
@@ -7233,19 +6703,19 @@
       "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
       "dev": true,
       "requires": {
-        "camelcase": "3.0.0",
-        "cliui": "3.2.0",
-        "decamelize": "1.2.0",
-        "get-caller-file": "1.0.2",
-        "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"
+        "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"
       },
       "dependencies": {
         "camelcase": {
@@ -7262,7 +6732,7 @@
       "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
       "dev": true,
       "requires": {
-        "camelcase": "3.0.0"
+        "camelcase": "^3.0.0"
       },
       "dependencies": {
         "camelcase": {
diff --git a/web/themes/nsf/package.json b/web/themes/nsf/package.json
index 4066979..c079edf 100644
--- a/web/themes/nsf/package.json
+++ b/web/themes/nsf/package.json
@@ -8,11 +8,11 @@
     "build:watch": "watch 'npm run build' sass"
   },
   "devDependencies": {
-    "autoprefixer": "^7.1.1",
-    "cssnano": "^3.10.0",
-    "node-sass": "^4.5.3",
-    "postcss": "^6.0.2",
-    "postcss-cli": "^4.1.0",
+    "autoprefixer": "^9.1.1",
+    "cssnano": "^4.0.5",
+    "node-sass": "^4.9.3",
+    "postcss": "^7.0.2",
+    "postcss-cli": "^6.0.0",
     "uswds": "^1.6.8",
     "watch": "^1.0.2"
   }